diff --git a/.cargo/audit.toml b/.cargo/audit.toml
index 2ba828d61ecf..b8a4b1e1e507 100644
--- a/.cargo/audit.toml
+++ b/.cargo/audit.toml
@@ -11,8 +11,4 @@ ignore = [
   "RUSTSEC-2026-0097",
   # glib 0.18.5 unsoundness, fixed by updating to gtk4
   "RUSTSEC-2024-0429",
-  # quick-xml, need an update in plist
-  "RUSTSEC-2026-0194",
-  # quick-xml, need an update in plist
-  "RUSTSEC-2026-0195",
 ]
diff --git a/.changes/android-compileroptions-dsl.md b/.changes/android-compileroptions-dsl.md
new file mode 100644
index 000000000000..3e3fcbd36e82
--- /dev/null
+++ b/.changes/android-compileroptions-dsl.md
@@ -0,0 +1,9 @@
+---
+"tauri": patch:enhance
+"tauri-cli": patch:enhance
+"@tauri-apps/cli": patch:enhance
+---
+
+Migrate the Android Gradle scripts from the deprecated `kotlinOptions` DSL to `compilerOptions`, which is accepted by both Kotlin Gradle Plugin 1.9.x and 2.x. This lets projects move to Kotlin 2.x without hitting the hard error that 2.3+ raises on the old DSL.
+
+This increased the minimum supported Gradle version to 8.13. If your Gradle version is earlier, delete `src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties` and re-run `tauri android init` to update it.
diff --git a/.changes/android-material3.md b/.changes/android-material3.md
new file mode 100644
index 000000000000..1f013f7d3a21
--- /dev/null
+++ b/.changes/android-material3.md
@@ -0,0 +1,6 @@
+---
+"tauri-cli": patch:enhance
+"@tauri-apps/cli": patch:enhance
+---
+
+Use `Theme.Material3.DayNight.NoActionBar` instead of `Theme.MaterialComponents.DayNight.NoActionBar` when running `tauri android init`
diff --git a/.changes/app-bound-domains.md b/.changes/app-bound-domains.md
new file mode 100644
index 000000000000..ea5a24f56939
--- /dev/null
+++ b/.changes/app-bound-domains.md
@@ -0,0 +1,8 @@
+---
+"tauri": minor:feat
+"tauri-runtime": minor:feat
+"tauri-runtime-wry": minor:feat
+"tauri-utils": minor:feat
+---
+
+Add `WebviewBuilder::limit_navigations_to_app_bound_domains`, `WebviewWindowBuilder::limit_navigations_to_app_bound_domains`, and limitNavigationsToAppBoundDomains to tauri.config.json.
diff --git a/.changes/bundler-show-sizes.md b/.changes/bundler-show-sizes.md
new file mode 100644
index 000000000000..6525c8067d75
--- /dev/null
+++ b/.changes/bundler-show-sizes.md
@@ -0,0 +1,7 @@
+---
+"tauri-bundler": "minor:feat"
+"tauri-cli": "minor:feat"
+"@tauri-apps/cli": "minor:feat"
+---
+
+The bundler now prints the size of each generated bundle next to its path in the `Finished N bundles at:` output (directories such as macOS `.app` bundles are measured recursively).
diff --git a/.changes/cleanup-js-menu-channel.md b/.changes/cleanup-js-menu-channel.md
new file mode 100644
index 000000000000..980ea277c36c
--- /dev/null
+++ b/.changes/cleanup-js-menu-channel.md
@@ -0,0 +1,5 @@
+---
+"tauri": "patch:bug"
+---
+
+Remove the `Channel` used to send events to the JavaScript side when the menu is dropped.
diff --git a/.changes/fix-wix-resource-target-name.md b/.changes/fix-wix-resource-target-name.md
new file mode 100644
index 000000000000..c773020d7bfd
--- /dev/null
+++ b/.changes/fix-wix-resource-target-name.md
@@ -0,0 +1,8 @@
+---
+"tauri-bundler": patch:bug
+"tauri-cli": patch:bug
+"@tauri-apps/cli": patch:bug
+---
+
+
+Fix the WiX bundler so it respects the resource's target file name.
diff --git a/.changes/resolved-command-reference-debug-assertion.md b/.changes/resolved-command-reference-debug-assertion.md
new file mode 100644
index 000000000000..a91a2b66cb2c
--- /dev/null
+++ b/.changes/resolved-command-reference-debug-assertion.md
@@ -0,0 +1,8 @@
+---
+tauri: minor:enhance
+tauri-macros: minor:enhance
+tauri-utils: minor:enhance
+tauri-build: minor:enhance
+---
+
+Fix compilation errors when `tauri-utils` is built with different debug-assertion settings for the build and runtime profiles.
diff --git a/.changes/tauri-info-skip-rust-only-js.md b/.changes/tauri-info-skip-rust-only-js.md
new file mode 100644
index 000000000000..ab905fe4012b
--- /dev/null
+++ b/.changes/tauri-info-skip-rust-only-js.md
@@ -0,0 +1,6 @@
+---
+"tauri-cli": "patch:bug"
+"@tauri-apps/cli": "patch:bug"
+---
+
+Prevent `tauri info` from reporting Rust-only plugins as having a missing npm package.
diff --git a/.changes/wry-callback-sync.md b/.changes/wry-callback-sync.md
new file mode 100644
index 000000000000..c6d581d47edc
--- /dev/null
+++ b/.changes/wry-callback-sync.md
@@ -0,0 +1,6 @@
+---
+"tauri": minor:breaking
+"tauri-runtime": minor:breaking
+---
+
+Require webview navigation, IPC, page-load, and document-title callbacks to be `Sync` in addition to `Send`, matching the thread-safety contract of the vendored Wry runtime.
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index 9be465957136..fbb9bfb7c528 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v7
         with:
           persist-credentials: false
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v7
         with:
           node-version: 'lts/*'
       - run: corepack enable
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index 62fc97221fb9..10e990109a61 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -50,12 +50,13 @@ jobs:
           components: rust-src
           targets: ${{ matrix.platform.target }}
 
-      - name: install webkit2gtk and xvfb (ubuntu only)
+      - name: install WebKitGTK and xvfb (ubuntu only)
         if: contains(matrix.platform.target, 'gnu')
         run: |
+          sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends \
-            webkit2gtk-4.1 libayatana-appindicator3-dev \
+            libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev \
             xvfb \
             at-spi2-core
 
@@ -86,11 +87,13 @@ jobs:
           cargo +nightly build --release -Z build-std=std,panic_abort -Z build-std-features= --target ${{ matrix.platform.target }} --manifest-path bench/tests/helloworld/src-tauri/Cargo.toml
 
       - name: run benchmarks
+        env:
+          WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS: ${{ contains(matrix.platform.target, 'gnu') && '1' || '' }}
         run: ${{ matrix.platform.runner }}cargo run --manifest-path ./bench/Cargo.toml --bin run_benchmark
 
       - name: clone benchmarks_results
         if: github.repository == 'tauri-apps/tauri' && github.ref == 'refs/heads/dev'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           token: ${{ secrets.ORG_TAURI_BOT_PAT }}
           path: gh-pages
diff --git a/.github/workflows/check-change-tags.yml b/.github/workflows/check-change-tags.yml
index d10c5a09912b..f13e29e8beef 100644
--- a/.github/workflows/check-change-tags.yml
+++ b/.github/workflows/check-change-tags.yml
@@ -17,7 +17,9 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
       - name: check change files end with .md
         run: |
diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml
index fb1e59866d2f..d6fb0226f2e5 100644
--- a/.github/workflows/check-generated-files.yml
+++ b/.github/workflows/check-generated-files.yml
@@ -26,7 +26,9 @@ jobs:
       api: ${{ steps.filter.outputs.api }}
       schema: ${{ steps.filter.outputs.schema }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
       - uses: dorny/paths-filter@v3
         id: filter
         with:
@@ -45,9 +47,13 @@ jobs:
     needs: changes
     if: needs.changes.outputs.api == 'true'
     steps:
-      - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+      - run: |
+          npm i -g --force corepack@0.34.0
+          corepack enable pnpm
+      - uses: actions/setup-node@v7
         with:
           node-version: 'lts/*'
           cache: 'pnpm'
@@ -65,15 +71,18 @@ jobs:
     needs: changes
     if: needs.changes.outputs.schema == 'true'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
       - name: install stable
         uses: dtolnay/rust-toolchain@stable
 
       - name: install Linux dependencies
         run: |
+          sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev
+          sudo apt-get install -y libgtk-4-dev
 
       - uses: Swatinem/rust-cache@v2
 
diff --git a/.github/workflows/check-license-header.yml b/.github/workflows/check-license-header.yml
index 9b850deccb17..f035328208d6 100644
--- a/.github/workflows/check-license-header.yml
+++ b/.github/workflows/check-license-header.yml
@@ -15,7 +15,9 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
       - uses: dorny/paths-filter@v3
         id: filter
         with:
diff --git a/.github/workflows/covector-status.yml b/.github/workflows/covector-status.yml
index 9b13dc2215d8..d98311a526eb 100644
--- a/.github/workflows/covector-status.yml
+++ b/.github/workflows/covector-status.yml
@@ -10,9 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
+          persist-credentials: false
       - name: covector status
         uses: jbolda/covector/packages/action@covector-v0
         id: covector
diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml
index 170bc3ef31b0..3c76c8ef0661 100644
--- a/.github/workflows/covector-version-or-publish.yml
+++ b/.github/workflows/covector-version-or-publish.yml
@@ -19,14 +19,16 @@ jobs:
         platform: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
+          persist-credentials: false
 
-      - run: npm i -g --force corepack
-      - uses: actions/setup-node@v4
+      - run: |
+          npm i -g --force corepack@0.34.0
+          corepack enable pnpm
+      - uses: actions/setup-node@v7
         with:
-          node-version: 20
           cache: 'pnpm'
 
       - name: install stable
@@ -35,8 +37,9 @@ jobs:
       - name: install Linux dependencies
         if: matrix.platform == 'ubuntu-latest'
         run: |
+          sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev libfuse2 librsvg2-dev
+          sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev libfuse2 librsvg2-dev
 
       - uses: Swatinem/rust-cache@v2
 
@@ -70,11 +73,14 @@ jobs:
       - run-integration-tests
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
-      - run: npm i -g --force corepack
-      - uses: actions/setup-node@v6
+          persist-credentials: false
+      - run: |
+          npm i -g --force corepack@0.34.0
+          corepack enable pnpm
+      - uses: actions/setup-node@v7
         with:
           node-version: 24
 
@@ -87,8 +93,9 @@ jobs:
 
       - name: install Linux dependencies
         run: |
+          sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
+          sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev librsvg2-dev
 
       - name: covector version or publish (publish when no change files present)
         uses: jbolda/covector/packages/action@covector-v0
@@ -108,7 +115,7 @@ jobs:
 
       - name: Create Pull Request With Versions Bumped
         if: steps.covector.outputs.commandRan == 'version'
-        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # 7.0.6
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: release/version-updates
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ca9b2623640f..8baa7d1a14d9 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,15 +17,18 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
       - name: install stable
         uses: dtolnay/rust-toolchain@stable
 
       - name: install Linux dependencies
         run: |
+          sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev
+          sudo apt-get install -y libgtk-4-dev
 
       - name: install cross
         run: cargo install cross --git https://github.com/cross-rs/cross
@@ -59,7 +62,9 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
       - name: install stable
         uses: dtolnay/rust-toolchain@stable
@@ -68,7 +73,7 @@ jobs:
 
       - run: npm i -g --force corepack
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v7
         with:
           node-version: 'lts/*'
 
@@ -85,20 +90,20 @@ jobs:
           path: 'examples/api'
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and export to Docker
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v7
         with:
           context: .docker/cross
           file: .docker/cross/${{ matrix.target.filename }}.Dockerfile
@@ -107,8 +112,9 @@ jobs:
 
       - name: install dependencies
         run: |
+          sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev
+          sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev
 
       - name: Test
         run: |
@@ -122,7 +128,7 @@ jobs:
           ./cargo-tauri build --runner cross --bundles deb --target ${{ matrix.target.name }} --verbose
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v7
         with:
           context: .docker/cross
           file: .docker/cross/${{ matrix.target.filename }}.Dockerfile
diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml
index db0a735cec63..12cc93a37710 100644
--- a/.github/workflows/fmt.yml
+++ b/.github/workflows/fmt.yml
@@ -12,7 +12,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
       - name: install Rust stable and rustfmt
         uses: dtolnay/rust-toolchain@stable
@@ -25,9 +27,13 @@ jobs:
   prettier:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+      - run: |
+          npm i -g --force corepack@0.34.0
+          corepack enable pnpm
+      - uses: actions/setup-node@v7
         with:
           node-version: 'lts/*'
           cache: 'pnpm'
@@ -38,7 +44,9 @@ jobs:
     name: taplo (.toml files)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml
index f997bb72cedf..9df617a6bfac 100644
--- a/.github/workflows/lint-js.yml
+++ b/.github/workflows/lint-js.yml
@@ -18,9 +18,13 @@ jobs:
   eslint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+      - run: |
+          npm i -g --force corepack@0.34.0
+          corepack enable pnpm
+      - uses: actions/setup-node@v7
         with:
           node-version: 'lts/*'
           cache: 'pnpm'
@@ -30,9 +34,13 @@ jobs:
   typescript:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+      - run: |
+          npm i -g --force corepack@0.34.0
+          corepack enable pnpm
+      - uses: actions/setup-node@v7
         with:
           node-version: 'lts/*'
           cache: 'pnpm'
diff --git a/.github/workflows/lint-rust.yml b/.github/workflows/lint-rust.yml
index fb0d8ed45603..1cfa73c79760 100644
--- a/.github/workflows/lint-rust.yml
+++ b/.github/workflows/lint-rust.yml
@@ -68,7 +68,7 @@ jobs:
         run: |
           sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1 libayatana-appindicator3-dev
+          sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev
 
       - name: Install cross
         if: ${{ matrix.platform.cargo == 'cross' }}
diff --git a/.github/workflows/publish-cli-js.yml b/.github/workflows/publish-cli-js.yml
index d5960789d2a2..429d47002985 100644
--- a/.github/workflows/publish-cli-js.yml
+++ b/.github/workflows/publish-cli-js.yml
@@ -57,6 +57,7 @@ jobs:
             target: aarch64-unknown-linux-gnu
             build: pnpm build --target=aarch64-unknown-linux-gnu --cross-compile
             setup: |
+              sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
               sudo apt-get update
               sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu -y
           - host: ubuntu-latest
@@ -69,18 +70,22 @@ jobs:
             target: riscv64gc-unknown-linux-gnu
             build: pnpm build --target=riscv64gc-unknown-linux-gnu --cross-compile
             setup: |
+              sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
               sudo apt-get update
               sudo apt-get install gcc-riscv64-linux-gnu g++-riscv64-linux-gnu -y
-    name: stable - ${{ matrix.settings.target }} - node@20
+    name: stable - ${{ matrix.settings.target }} - node@22
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v7
-      - run: npm i -g --force corepack
+        with:
+          persist-credentials: false
+      - run: |
+          npm i -g --force corepack@0.34.0
+          corepack enable pnpm
       - name: Setup node
-        uses: actions/setup-node@v6
-        if: ${{ !matrix.settings.docker }}
+        uses: actions/setup-node@v7
         with:
-          node-version: 20
+          node-version: 22
           cache: 'pnpm'
 
       - name: Install Rust
@@ -148,9 +153,11 @@ jobs:
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
       - run: npm i -g --force corepack
       - name: Setup node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: ${{ matrix.node }}
           cache: pnpm
@@ -186,9 +193,11 @@ jobs:
     runs-on: ${{ contains(matrix.target, 'aarch64') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
     steps:
       - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
       - run: npm i -g --force corepack
       - name: Setup node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: ${{ matrix.node }}
           cache: pnpm
@@ -208,8 +217,9 @@ jobs:
       - name: install system dependencies (gnu)
         if: ${{ endsWith(matrix.target, 'gnu') }}
         run: |
+          sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
+          sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev librsvg2-dev
 
       - name: Setup and run tests (gnu)
         if: ${{ endsWith(matrix.target, 'gnu') }}
@@ -266,9 +276,11 @@ jobs:
       - test-linux-binding
     steps:
       - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
       - run: npm i -g --force corepack
       - name: Setup node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: 24
           cache: 'pnpm'
diff --git a/.github/workflows/publish-cli-rs.yml b/.github/workflows/publish-cli-rs.yml
index e40a2ddd42d4..f98701c7cedc 100644
--- a/.github/workflows/publish-cli-rs.yml
+++ b/.github/workflows/publish-cli-rs.yml
@@ -45,7 +45,9 @@ jobs:
             cross: true
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
       - name: 'Setup Rust'
         if: ${{ !matrix.config.cross }}
@@ -61,8 +63,9 @@ jobs:
       - name: install Linux dependencies
         if: ${{ !matrix.config.cross && startsWith(matrix.config.os, 'ubuntu') }}
         run: |
+          sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev
+          sudo apt-get install -y libgtk-4-dev
 
       - name: Install cross
         if: ${{ matrix.config.cross }}
@@ -99,7 +102,9 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
       - name: Download built CLIs
         uses: actions/download-artifact@v4.1.7
diff --git a/.github/workflows/test-android.yml b/.github/workflows/test-android.yml
index 5790e5dafcf9..ceb5d8103d90 100644
--- a/.github/workflows/test-android.yml
+++ b/.github/workflows/test-android.yml
@@ -31,25 +31,30 @@ jobs:
         platform: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
-      - name: install Rust 1.90
-        uses: dtolnay/rust-toolchain@1.90
+      - name: install Rust 1.92
+        uses: dtolnay/rust-toolchain@1.92
 
       - name: install Linux dependencies
         if: matrix.platform == 'ubuntu-latest'
         run: |
+          sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1
+          sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev
 
-      - run: npm i -g --force corepack
+      - run: |
+          npm i -g --force corepack@0.34.0
+          corepack enable pnpm
       - name: setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v7
         with:
           node-version: lts/*
           cache: 'pnpm'
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 17
@@ -65,8 +70,15 @@ jobs:
       # TODO check after https://github.com/nttld/setup-ndk/issues/518 is fixed
       - name: Restore Android Symlinks
         if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'macos-latest'
+        env:
+          NDK_PATH: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
-          directory="${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin"
+          case "$RUNNER_OS" in
+            Linux) prebuilt="linux-x86_64" ;;
+            macOS) prebuilt="darwin-x86_64" ;;
+          esac
+
+          directory="${NDK_PATH}/toolchains/llvm/prebuilt/${prebuilt}/bin"
           find "$directory" -type l | while read link; do
               current_target=$(readlink "$link")
               new_target="$directory/$(basename "$current_target")"
diff --git a/.github/workflows/test-cli-js.yml b/.github/workflows/test-cli-js.yml
index 212a915551f2..ea16ba0db7c2 100644
--- a/.github/workflows/test-cli-js.yml
+++ b/.github/workflows/test-cli-js.yml
@@ -33,14 +33,18 @@ jobs:
         platform: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
 
-      - run: npm i -g --force corepack
+      - run: |
+          npm i -g --force corepack@0.34.0
+          corepack enable pnpm
       - name: setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v7
         with:
           node-version: 'lts/*'
           cache: 'pnpm'
@@ -48,8 +52,9 @@ jobs:
       - name: install Linux dependencies
         if: matrix.platform == 'ubuntu-latest'
         run: |
+          sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
+          sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev librsvg2-dev
 
       - uses: Swatinem/rust-cache@v2
 
diff --git a/.github/workflows/test-cli-rs.yml b/.github/workflows/test-cli-rs.yml
index 532eb568f6dd..e9d623a802b9 100644
--- a/.github/workflows/test-cli-rs.yml
+++ b/.github/workflows/test-cli-rs.yml
@@ -14,6 +14,8 @@ on:
       - 'crates/tauri-utils/**'
       - 'crates/tauri-bundler/**'
       - 'crates/tauri-cli/**'
+      - 'ports/**'
+      - 'vendor/wayland-scanner/**'
       - 'Cargo.toml'
       - 'Cargo.lock'
 
@@ -43,10 +45,12 @@ jobs:
           - { target: x86_64-apple-darwin, os: macos-latest }
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
       - name: 'Setup Rust'
-        uses: dtolnay/rust-toolchain@1.90
+        uses: dtolnay/rust-toolchain@1.92
         with:
           targets: ${{ matrix.platform.target }}
 
@@ -55,7 +59,7 @@ jobs:
         run: |
           sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
+          sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev librsvg2-dev
 
       - uses: Swatinem/rust-cache@v2
 
diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
index 8550f7695a58..4e9b87d8cd9f 100644
--- a/.github/workflows/test-core.yml
+++ b/.github/workflows/test-core.yml
@@ -12,6 +12,8 @@ on:
     paths:
       - '.github/workflows/test-core.yml'
       - 'crates/**'
+      - 'ports/**'
+      - 'vendor/wayland-scanner/**'
       - 'Cargo.toml'
       - 'Cargo.lock'
       - '!crates/tauri/scripts/**'
@@ -39,35 +41,35 @@ jobs:
           - {
               target: x86_64-pc-windows-msvc,
               os: windows-latest,
-              toolchain: '1.90',
+              toolchain: '1.92',
               cargo: cargo,
               command: 'test'
             }
           - {
               target: x86_64-unknown-linux-gnu,
               os: ubuntu-latest,
-              toolchain: '1.90',
+              toolchain: '1.92',
               cargo: cargo,
               command: 'test'
             }
           - {
               target: aarch64-apple-darwin,
               os: macos-14,
-              toolchain: '1.90',
+              toolchain: '1.92',
               cargo: cargo,
               command: 'test'
             }
           - {
               target: aarch64-apple-ios,
               os: macos-latest,
-              toolchain: '1.90',
+              toolchain: '1.92',
               cargo: cargo,
               command: 'build'
             }
           - {
               target: aarch64-linux-android,
               os: ubuntu-latest,
-              toolchain: '1.90',
+              toolchain: '1.92',
               cargo: cross,
               command: 'build'
             }
@@ -76,7 +78,9 @@ jobs:
           - { args: --all-features, key: all }
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
       - name: install Rust
         uses: dtolnay/rust-toolchain@master
@@ -89,7 +93,7 @@ jobs:
         run: |
           sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1 libxdo-dev libayatana-appindicator3-dev
+          sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev libxdo-dev
 
       - uses: Swatinem/rust-cache@v2
         with:
diff --git a/.github/workflows/udeps.yml b/.github/workflows/udeps.yml
index 155f09eb4333..0b9df44d10d1 100644
--- a/.github/workflows/udeps.yml
+++ b/.github/workflows/udeps.yml
@@ -27,11 +27,19 @@ jobs:
       macros: ${{ steps.filter.outputs.macros }}
       runtime: ${{ steps.filter.outputs.runtime }}
       wry: ${{ steps.filter.outputs.wry }}
+      muda: ${{ steps.filter.outputs.muda }}
+      tao: ${{ steps.filter.outputs.tao }}
+      tray_icon: ${{ steps.filter.outputs.tray_icon }}
+      port_wry: ${{ steps.filter.outputs.port_wry }}
+      wayland_scanner: ${{ steps.filter.outputs.wayland_scanner }}
       utils: ${{ steps.filter.outputs.utils }}
       bundler: ${{ steps.filter.outputs.bundler }}
       cli: ${{ steps.filter.outputs.cli }}
+      macossign: ${{ steps.filter.outputs.macossign }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
       - uses: dorny/paths-filter@v3
         id: filter
         with:
@@ -49,6 +57,18 @@ jobs:
               - 'crates/tauri-runtime/**'
             wry:
               - 'crates/tauri-runtime-wry/**'
+              - 'ports/**'
+              - 'vendor/wayland-scanner/**'
+            muda:
+              - 'ports/muda/**'
+            tao:
+              - 'ports/tao/**'
+            tray_icon:
+              - 'ports/tray-icon/**'
+            port_wry:
+              - 'ports/wry/**'
+            wayland_scanner:
+              - 'vendor/wayland-scanner/**'
             utils:
               - 'crates/tauri-utils/**'
             bundler:
@@ -68,13 +88,20 @@ jobs:
       needs.changes.outputs.macros == 'true' ||
       needs.changes.outputs.runtime == 'true' ||
       needs.changes.outputs.wry == 'true' ||
+      needs.changes.outputs.muda == 'true' ||
+      needs.changes.outputs.tao == 'true' ||
+      needs.changes.outputs.tray_icon == 'true' ||
+      needs.changes.outputs.port_wry == 'true' ||
+      needs.changes.outputs.wayland_scanner == 'true' ||
       needs.changes.outputs.utils == 'true' ||
       needs.changes.outputs.bundler == 'true' ||
       needs.changes.outputs.cli == 'true' ||
       needs.changes.outputs.macossign == 'true'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
       - name: Install Rust nightly
         uses: dtolnay/rust-toolchain@nightly
@@ -98,6 +125,11 @@ jobs:
           MACROS: ${{ needs.changes.outputs.macros == 'true' }}
           RUNTIME: ${{ needs.changes.outputs.runtime == 'true' }}
           WRY: ${{ needs.changes.outputs.wry == 'true' }}
+          MUDA: ${{ needs.changes.outputs.muda == 'true' }}
+          TAO: ${{ needs.changes.outputs.tao == 'true' }}
+          TRAY_ICON: ${{ needs.changes.outputs.tray_icon == 'true' }}
+          PORT_WRY: ${{ needs.changes.outputs.port_wry == 'true' }}
+          WAYLAND_SCANNER: ${{ needs.changes.outputs.wayland_scanner == 'true' }}
           UTILS: ${{ needs.changes.outputs.utils == 'true' }}
           BUNDLER: ${{ needs.changes.outputs.bundler == 'true' }}
           CLI: ${{ needs.changes.outputs.cli == 'true' }}
@@ -110,11 +142,17 @@ jobs:
           if [ "${MACROS}" == "true" ]; then crates[${#crates[@]}]="\"./crates/tauri-macros\""; fi
           if [ "${RUNTIME}" == "true" ]; then crates[${#crates[@]}]="\"./crates/tauri-runtime\""; fi
           if [ "${WRY}" == "true" ]; then crates[${#crates[@]}]="\"./crates/tauri-runtime-wry\""; fi
+          if [ "${MUDA}" == "true" ]; then crates[${#crates[@]}]="\"./ports/muda\""; fi
+          if [ "${TAO}" == "true" ]; then crates[${#crates[@]}]="\"./ports/tao\""; fi
+          if [ "${TRAY_ICON}" == "true" ]; then crates[${#crates[@]}]="\"./ports/tray-icon\""; fi
+          if [ "${PORT_WRY}" == "true" ]; then crates[${#crates[@]}]="\"./ports/wry\""; fi
+          if [ "${WAYLAND_SCANNER}" == "true" ]; then crates[${#crates[@]}]="\"./vendor/wayland-scanner\""; fi
           if [ "${UTILS}" == "true" ]; then crates[${#crates[@]}]="\"./crates/tauri-utils\""; fi
           if [ "${BUNDLER}" == "true" ]; then crates[${#crates[@]}]="\"./crates/tauri-bundler\""; fi
           if [ "${CLI}" == "true" ]; then crates[${#crates[@]}]="\"./crates/tauri-cli\""; fi
           if [ "${MACOSSIGN}" == "true" ]; then crates[${#crates[@]}]="\"./crates/tauri-macos-sign\""; fi
-          echo "matrix=[$crates]" >> "$GITHUB_OUTPUT"
+          printf -v matrix '%s,' "${crates[@]}"
+          echo "matrix=[${matrix%,}]" >> "$GITHUB_OUTPUT"
     outputs:
       matrix: ${{ steps.create-matrix.outputs.matrix }}
 
@@ -125,15 +163,18 @@ jobs:
       matrix:
         path: ${{ fromJson(needs.setup.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
 
       - name: Install Rust nightly
         uses: dtolnay/rust-toolchain@nightly
 
       - name: install dependencies
         run: |
+          sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev
+          sudo apt-get install -y libgtk-4-dev
 
       - uses: Swatinem/rust-cache@v2
 
@@ -147,8 +188,9 @@ jobs:
 
       - name: Install required packages
         run: |
+          sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev
+          sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev libxdo-dev
 
       - name: Run udeps
         run: cargo udeps --manifest-path ${{ matrix.path }}/Cargo.toml --all-targets --all-features
diff --git a/.prettierignore b/.prettierignore
index 3494710b79e3..c4e373a9a6e2 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -9,6 +9,7 @@
 node_modules/
 target/
 dist/
+/vendor/
 
 # lock files
 pnpm-lock.yaml
diff --git a/.scripts/ci/check-license-header.js b/.scripts/ci/check-license-header.js
index 4dd48fa46150..fb07f23a3278 100644
--- a/.scripts/ci/check-license-header.js
+++ b/.scripts/ci/check-license-header.js
@@ -22,14 +22,16 @@ const ignore = [
   'templates',
   'node_modules',
   'gen',
+  'vendor',
   'dist',
   'bundle.global.js'
 ]
 
 async function checkFile(file) {
+  const pathParts = path.normalize(file).split(path.sep)
   if (
     extensions.some((e) => file.endsWith(e))
-    && !ignore.some((i) => file.includes(`/${i}/`) || path.basename(file) === i)
+    && !ignore.some((i) => pathParts.includes(i))
   ) {
     const fileStream = fs.createReadStream(file)
     const rl = readline.createInterface({
diff --git a/Cargo.lock b/Cargo.lock
index 71196189ceeb..4a63c03852bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -187,6 +187,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "anstream"
 version = "0.6.18"
@@ -282,7 +291,7 @@ dependencies = [
  "bitflags 2.13.0",
  "bytes",
  "chrono",
- "clap",
+ "clap 4.5.26",
  "cryptographic-message-syntax",
  "der",
  "dialoguer 0.11.0",
@@ -406,6 +415,15 @@ dependencies = [
  "derive_arbitrary",
 ]
 
+[[package]]
+name = "arc-swap"
+version = "1.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "arg_enum_proc_macro"
 version = "0.3.4"
@@ -489,6 +507,18 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.88"
@@ -500,29 +530,6 @@ dependencies = [
  "syn 2.0.117",
 ]
 
-[[package]]
-name = "atk"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b"
-dependencies = [
- "atk-sys",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "atk-sys"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
 [[package]]
 name = "atomic"
 version = "0.6.0"
@@ -538,6 +545,17 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.4.0"
@@ -901,7 +919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3"
 dependencies = [
  "once_cell",
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.5.0",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -928,6 +946,15 @@ dependencies = [
  "alloc-stdlib",
 ]
 
+[[package]]
+name = "bs58"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
+dependencies = [
+ "tinyvec",
+]
+
 [[package]]
 name = "bstr"
 version = "1.11.3"
@@ -1031,6 +1058,12 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
 
+[[package]]
+name = "bytesize"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d7c8918969267b2932ffd5655509bbbea0833823058c378876953217f5fc50e"
+
 [[package]]
 name = "bzip2"
 version = "0.4.4"
@@ -1054,23 +1087,21 @@ dependencies = [
 
 [[package]]
 name = "cairo-rs"
-version = "0.18.5"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
+checksum = "5cc8d9aa793480744cd9a0524fef1a2e197d9eaa0f739cde19d16aba530dcb95"
 dependencies = [
  "bitflags 2.13.0",
  "cairo-sys-rs",
  "glib",
  "libc",
- "once_cell",
- "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "cairo-sys-rs"
-version = "0.18.2"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
+checksum = "f8b4985713047f5faee02b8db6a6ef32bbb50269ff53c1aee716d1d195b76d54"
 dependencies = [
  "glib-sys",
  "libc",
@@ -1111,7 +1142,7 @@ dependencies = [
  "english-numbers",
  "freedesktop_entry_parser",
  "handlebars",
- "heck 0.5.0",
+ "heck",
  "home",
  "ignore",
  "java-properties",
@@ -1125,7 +1156,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "textwrap",
+ "textwrap 0.16.2",
  "thiserror 2.0.12",
  "toml 1.0.6+spec-1.1.0",
  "ureq",
@@ -1235,9 +1266,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.8"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+checksum = "fb693542bcafa528e198be0ebd9d3632ca5b7c93dbe7237460e199910835997c"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -1291,6 +1322,21 @@ dependencies = [
  "inout",
 ]
 
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags 1.3.2",
+ "strsim 0.8.0",
+ "textwrap 0.11.0",
+ "unicode-width 0.1.14",
+ "vec_map",
+]
+
 [[package]]
 name = "clap"
 version = "4.5.26"
@@ -1310,7 +1356,7 @@ dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim",
+ "strsim 0.11.1",
 ]
 
 [[package]]
@@ -1319,7 +1365,7 @@ version = "4.5.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33a7e468e750fa4b6be660e8b5651ad47372e8fb114030b594c2d75d48c5ffd0"
 dependencies = [
- "clap",
+ "clap 4.5.26",
 ]
 
 [[package]]
@@ -1328,7 +1374,7 @@ version = "4.5.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -1370,7 +1416,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1412,6 +1458,15 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "console"
 version = "0.15.10"
@@ -1421,7 +1476,7 @@ dependencies = [
  "encode_unicode",
  "libc",
  "once_cell",
- "unicode-width",
+ "unicode-width 0.2.0",
  "windows-sys 0.59.0",
 ]
 
@@ -1433,7 +1488,7 @@ checksum = "4fe5f465a4f6fee88fad41b85d990f84c835335e85b5d9e6e63e0d06d28cba7c"
 dependencies = [
  "encode_unicode",
  "libc",
- "unicode-width",
+ "unicode-width 0.2.0",
  "windows-sys 0.61.2",
 ]
 
@@ -1729,7 +1784,7 @@ version = "0.29.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa"
 dependencies = [
- "cssparser-macros",
+ "cssparser-macros 0.6.1",
  "dtoa-short",
  "itoa",
  "matches",
@@ -1746,7 +1801,20 @@ version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dae61cf9c0abb83bd659dab65b7e4e38d8236824c85f0f804f173567bda257d2"
 dependencies = [
- "cssparser-macros",
+ "cssparser-macros 0.6.1",
+ "dtoa-short",
+ "itoa",
+ "phf 0.13.1",
+ "smallvec",
+]
+
+[[package]]
+name = "cssparser"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c9cdaae01d5ed7882b04d795e7f752f46ff52d2fa3b50a20d28c464510bba98"
+dependencies = [
+ "cssparser-macros 0.7.0",
  "dtoa-short",
  "itoa",
  "phf 0.13.1",
@@ -1763,6 +1831,16 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "cssparser-macros"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a2a99df6e410a8ff4245aa2006499ea662245f967cc7c0a38c83ef8eb44dbf"
+dependencies = [
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "ct-codecs"
 version = "1.1.7"
@@ -1828,8 +1906,18 @@ version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.20.10",
+ "darling_macro 0.20.10",
+]
+
+[[package]]
+name = "darling"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
+dependencies = [
+ "darling_core 0.23.0",
+ "darling_macro 0.23.0",
 ]
 
 [[package]]
@@ -1842,7 +1930,20 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim",
+ "strsim 0.11.1",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0"
+dependencies = [
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.11.1",
  "syn 2.0.117",
 ]
 
@@ -1852,7 +1953,18 @@ version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
- "darling_core",
+ "darling_core 0.20.10",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
+dependencies = [
+ "darling_core 0.23.0",
  "quote",
  "syn 2.0.117",
 ]
@@ -1889,6 +2001,26 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "dbus-codegen"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a49da9fdfbe872d4841d56605dc42efa5e6ca3291299b87f44e1cde91a28617c"
+dependencies = [
+ "clap 2.34.0",
+ "dbus",
+ "xml-rs",
+]
+
+[[package]]
+name = "dbus-tree"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f456e698ae8e54575e19ddb1f9b7bce2298568524f215496b248eb9498b4f508"
+dependencies = [
+ "dbus",
+]
+
 [[package]]
 name = "der"
 version = "0.7.9"
@@ -1935,7 +2067,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
 dependencies = [
- "darling",
+ "darling 0.20.10",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -2145,6 +2277,15 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "dlib"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab8ecd87370524b461f8557c119c405552c396ed91fc0a8eec68679eab26f94a"
+dependencies = [
+ "libloading 0.7.4",
+]
+
 [[package]]
 name = "dlopen2"
 version = "0.8.0"
@@ -2183,6 +2324,27 @@ dependencies = [
  "tendril 0.5.0",
 ]
 
+[[package]]
+name = "dom_query"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fac5fca71e65e94cc718a6e2af65d6e0f9c6027751c2aa562fbb5087fda639bc"
+dependencies = [
+ "bit-set",
+ "cssparser 0.37.0",
+ "foldhash 0.2.0",
+ "html5ever 0.39.0",
+ "precomputed-hash",
+ "selectors 0.38.0",
+ "tendril 0.5.0",
+]
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
 [[package]]
 name = "dpi"
 version = "0.1.1"
@@ -2515,6 +2677,27 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "exr"
 version = "1.74.0"
@@ -2532,9 +2715,9 @@ dependencies = [
 
 [[package]]
 name = "fancy-regex"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72cf461f865c862bb7dc573f643dd6a2b6842f7c30b07882b56bd148cc2761b8"
+checksum = "e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277"
 dependencies = [
  "bit-set",
  "regex-automata",
@@ -2913,39 +3096,23 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "gdk"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691"
-dependencies = [
- "cairo-rs",
- "gdk-pixbuf",
- "gdk-sys",
- "gio",
- "glib",
- "libc",
- "pango",
-]
-
 [[package]]
 name = "gdk-pixbuf"
-version = "0.18.5"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec"
+checksum = "25f420376dbee041b2db374ce4573892a36222bb3f6c0c43e24f0d67eae9b646"
 dependencies = [
  "gdk-pixbuf-sys",
  "gio",
  "glib",
  "libc",
- "once_cell",
 ]
 
 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.18.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
+checksum = "48f31b37b1fc4b48b54f6b91b7ef04c18e00b4585d98359dd7b998774bbd91fb"
 dependencies = [
  "gio-sys",
  "glib-sys",
@@ -2955,10 +3122,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "gdk-sys"
-version = "0.18.2"
+name = "gdk4"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d81e2a6c6ecba2aab60633a98df1868b03fa0bfdce8105edc27c1bccf71f0e39"
+dependencies = [
+ "cairo-rs",
+ "gdk-pixbuf",
+ "gdk4-sys",
+ "gio",
+ "glib",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gdk4-sys"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7"
+checksum = "3d8f608d8d7d229975c4d0d026f5d3071598c4ddab3c5262b0a31840fec78d13"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -2972,44 +3154,55 @@ dependencies = [
 ]
 
 [[package]]
-name = "gdkwayland-sys"
-version = "0.18.2"
+name = "gdk4-wayland"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32d95828dadc0357dee236cc6a5712808bd894d3217159982592ce24f2b8aaf7"
+dependencies = [
+ "gdk4",
+ "gdk4-wayland-sys",
+ "gio",
+ "glib",
+ "libc",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+]
+
+[[package]]
+name = "gdk4-wayland-sys"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "140071d506d223f7572b9f09b5e155afbd77428cd5cc7af8f2694c41d98dfe69"
+checksum = "653cafb8715f2ac1c56edaf8060d9360ae3acbe3c6fb61b676a2917d42b668cf"
 dependencies = [
- "gdk-sys",
  "glib-sys",
- "gobject-sys",
  "libc",
- "pkg-config",
  "system-deps",
 ]
 
 [[package]]
-name = "gdkx11"
-version = "0.18.2"
+name = "gdk4-x11"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3caa00e14351bebbc8183b3c36690327eb77c49abc2268dd4bd36b856db3fbfe"
+checksum = "9d892b4cf5a07e90e1390e93cd792975746c68b59f790a2de9e96ce77211ea9a"
 dependencies = [
- "gdk",
- "gdkx11-sys",
+ "gdk4",
+ "gdk4-x11-sys",
  "gio",
  "glib",
  "libc",
- "x11",
 ]
 
 [[package]]
-name = "gdkx11-sys"
-version = "0.18.2"
+name = "gdk4-x11-sys"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e7445fe01ac26f11601db260dd8608fe172514eb63b3b5e261ea6b0f4428d"
+checksum = "24d41f2e28f62378b081288914325d73bddbb6ccbbadb41aa6392afc71d27002"
 dependencies = [
- "gdk-sys",
+ "gdk4-sys",
  "glib-sys",
  "libc",
  "system-deps",
- "x11",
 ]
 
 [[package]]
@@ -3103,9 +3296,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "gio"
-version = "0.18.4"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73"
+checksum = "8b3e1f669909c326b9413bde5a742097b8c90a7d78f45326db13668984769ded"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -3114,30 +3307,28 @@ dependencies = [
  "gio-sys",
  "glib",
  "libc",
- "once_cell",
  "pin-project-lite",
  "smallvec",
- "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "gio-sys"
-version = "0.18.1"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
+checksum = "353fdc7da7cd16da916104b1e0e4e7de380ec9c8aaa20d4d742d66310ab4b0d5"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
  "system-deps",
- "winapi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "glib"
-version = "0.18.5"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
+checksum = "ddbcf514bd1881fc1b960e4e52b4e82873f4da3bceddbd58d42827b508888100"
 dependencies = [
  "bitflags 2.13.0",
  "futures-channel",
@@ -3151,20 +3342,16 @@ dependencies = [
  "gobject-sys",
  "libc",
  "memchr",
- "once_cell",
  "smallvec",
- "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "glib-macros"
-version = "0.18.5"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc"
+checksum = "506d23499707c7142898429757e8d9a3871d965239a2cb66dfa05052be6d6f19"
 dependencies = [
- "heck 0.4.1",
- "proc-macro-crate 2.0.0",
- "proc-macro-error",
+ "heck",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -3172,9 +3359,9 @@ dependencies = [
 
 [[package]]
 name = "glib-sys"
-version = "0.18.1"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
+checksum = "030967459f9f676851872c6304adea7825c6d462ec9b72554c733cf0c5952233"
 dependencies = [
  "libc",
  "system-deps",
@@ -3201,9 +3388,9 @@ dependencies = [
 
 [[package]]
 name = "gobject-sys"
-version = "0.18.0"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
+checksum = "22a861859b887a79cf461359c192c97a57d8fb0229dd291232e57aa11f6fa72c"
 dependencies = [
  "glib-sys",
  "libc",
@@ -3221,6 +3408,27 @@ dependencies = [
  "scroll",
 ]
 
+[[package]]
+name = "graphene-rs"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb856b9c558971c3f13ab692358926da710b046932a4e087aedcc35b040d7dff"
+dependencies = [
+ "glib",
+ "graphene-sys",
+]
+
+[[package]]
+name = "graphene-sys"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7ffdfde88f3570d3705e0d8a2433e036d387a1f2930bbf47eafcb5f569fd04"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
 [[package]]
 name = "group"
 version = "0.13.0"
@@ -3233,57 +3441,88 @@ dependencies = [
 ]
 
 [[package]]
-name = "gtk"
-version = "0.18.2"
+name = "gsk4"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a"
+checksum = "b867be1c5f14dcb8f552c0eff6e9a9b1da5f8b43943e8efc3a63c889d84952ff"
 dependencies = [
- "atk",
  "cairo-rs",
- "field-offset",
- "futures-channel",
- "gdk",
- "gdk-pixbuf",
- "gio",
+ "gdk4",
  "glib",
- "gtk-sys",
- "gtk3-macros",
+ "graphene-rs",
+ "gsk4-sys",
  "libc",
  "pango",
- "pkg-config",
 ]
 
 [[package]]
-name = "gtk-sys"
-version = "0.18.2"
+name = "gsk4-sys"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414"
+checksum = "5b7c7eb2e681ee896646cfb8872b431f24d09f53ba9283289d9b10caa6707088"
 dependencies = [
- "atk-sys",
  "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk-sys",
- "gio-sys",
+ "gdk4-sys",
  "glib-sys",
  "gobject-sys",
+ "graphene-sys",
  "libc",
  "pango-sys",
  "system-deps",
 ]
 
 [[package]]
-name = "gtk3-macros"
-version = "0.18.2"
+name = "gtk4"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98a0a0466484f64b07b5b8184d43fa46be78eb0b8e04ae4e179af31d770b76d9"
+dependencies = [
+ "cairo-rs",
+ "field-offset",
+ "futures-channel",
+ "gdk-pixbuf",
+ "gdk4",
+ "gio",
+ "glib",
+ "graphene-rs",
+ "gsk4",
+ "gtk4-macros",
+ "gtk4-sys",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gtk4-macros"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d"
+checksum = "5ac7179400a36a04de039c24206bb841c5596992b907b43b23ee8d5bdc40d00e"
 dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro-error",
+ "proc-macro-crate 3.5.0",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "gtk4-sys"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b8f954786af0b1984425c4446b77f5ff6594346181316be3f850caab1c6f01"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gdk4-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "graphene-sys",
+ "gsk4-sys",
+ "libc",
+ "pango-sys",
+ "system-deps",
+]
+
 [[package]]
 name = "h2"
 version = "0.4.7"
@@ -3363,15 +3602,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 dependencies = [
  "allocator-api2",
- "equivalent",
- "foldhash 0.2.0",
 ]
 
 [[package]]
-name = "heck"
-version = "0.4.1"
+name = "hashbrown"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.2.0",
+]
 
 [[package]]
 name = "heck"
@@ -3379,6 +3621,15 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -3434,6 +3685,16 @@ dependencies = [
  "markup5ever 0.38.0",
 ]
 
+[[package]]
+name = "html5ever"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8"
+dependencies = [
+ "log",
+ "markup5ever 0.39.0",
+]
+
 [[package]]
 name = "http"
 version = "1.3.1"
@@ -3987,21 +4248,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "javascriptcore-rs"
-version = "1.1.2"
+name = "javascriptcore6"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc"
+checksum = "8d8d4f64d976c6dc6068723b6ef7838acf954d56b675f376c826f7e773362ddb"
 dependencies = [
- "bitflags 1.3.2",
  "glib",
- "javascriptcore-rs-sys",
+ "javascriptcore6-sys",
+ "libc",
 ]
 
 [[package]]
-name = "javascriptcore-rs-sys"
-version = "1.1.1"
+name = "javascriptcore6-sys"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124"
+checksum = "f2b9787581c8949a7061c9b8593c4d1faf4b0fe5e5643c6c7793df20dbe39cf6"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -4197,9 +4458,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema"
-version = "0.46.2"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50180452e7808015fe083eae3efcf1ec98b89b45dd8cc204f7b4a6b7b81ea675"
+checksum = "281c43ff06dcb331e9356d30e38853d559ce3d0a3f693e0b0e102667dec14fb1"
 dependencies = [
  "ahash 0.8.11",
  "bytecount",
@@ -4210,18 +4471,27 @@ dependencies = [
  "getrandom 0.3.4",
  "idna",
  "itoa",
+ "jsonschema-regex",
  "num-cmp",
  "num-traits",
  "percent-encoding",
  "referencing",
  "regex",
- "regex-syntax",
  "serde",
  "serde_json",
  "unicode-general-category",
  "uuid-simd",
 ]
 
+[[package]]
+name = "jsonschema-regex"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee0b351864e7ffbc5db9273daf7fa1b4d5177b0946713d667ca571b83c0b4045"
+dependencies = [
+ "regex-syntax",
+]
+
 [[package]]
 name = "k256"
 version = "0.13.4"
@@ -4296,6 +4566,18 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "ksni"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4934310bdd016e55725482b8d35ac0c16fd058c1b955d8959aa2d953b918c85b"
+dependencies = [
+ "dbus",
+ "dbus-codegen",
+ "dbus-tree",
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "kuchikiki"
 version = "0.8.8-speedreader"
@@ -4335,30 +4617,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
-[[package]]
-name = "libappindicator"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a"
-dependencies = [
- "glib",
- "gtk",
- "gtk-sys",
- "libappindicator-sys",
- "log",
-]
-
-[[package]]
-name = "libappindicator-sys"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
-dependencies = [
- "gtk-sys",
- "libloading 0.7.4",
- "once_cell",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.178"
@@ -4408,36 +4666,17 @@ dependencies = [
 name = "libm"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
-
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.13.0",
- "libc",
- "redox_syscall",
-]
-
-[[package]]
-name = "libxdo"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00333b8756a3d28e78def82067a377de7fa61b24909000aeaa2b446a948d14db"
-dependencies = [
- "libxdo-sys",
-]
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
-name = "libxdo-sys"
-version = "0.11.0"
+name = "libredox"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db23b9e7e2b7831bbd8aac0bbeeeb7b68cbebc162b227e7052e8e55829a09212"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
+ "bitflags 2.13.0",
  "libc",
- "x11",
+ "redox_syscall",
 ]
 
 [[package]]
@@ -4580,6 +4819,17 @@ dependencies = [
  "web_atoms",
 ]
 
+[[package]]
+name = "markup5ever"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7122d987ec5f704ee56f6e5b41a7d93722e9aae27ae07cafa4036c4d3f9757de"
+dependencies = [
+ "log",
+ "tendril 0.5.0",
+ "web_atoms",
+]
+
 [[package]]
 name = "match_token"
 version = "0.1.0"
@@ -4743,19 +4993,17 @@ dependencies = [
 
 [[package]]
 name = "muda"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ae8844f63b5b118e334e205585b8c5c17b984121dbdb179d44aeb087ffad3cb"
+version = "0.19.3"
 dependencies = [
+ "arc-swap",
  "crossbeam-channel",
  "dpi",
- "gtk",
+ "gtk4",
  "keyboard-types",
- "libxdo",
  "objc2 0.6.4",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
  "once_cell",
  "png 0.18.1",
  "serde",
@@ -5137,7 +5385,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -5180,55 +5428,57 @@ dependencies = [
 
 [[package]]
 name = "objc2-app-kit"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5906f93257178e2f7ae069efb89fbd6ee94f0592740b5f8a1512ca498814d0fb"
+checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
  "bitflags 2.13.0",
  "block2 0.6.2",
  "objc2 0.6.4",
  "objc2-core-foundation",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
 ]
 
 [[package]]
 name = "objc2-cloud-kit"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c1948a9be5f469deadbd6bcb86ad7ff9e47b4f632380139722f7d9840c0d42c"
+checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
 dependencies = [
  "bitflags 2.13.0",
  "objc2 0.6.4",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
 ]
 
 [[package]]
 name = "objc2-core-data"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f860f8e841f6d32f754836f51e6bc7777cd7e7053cf18528233f6811d3eceb4"
+checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
 dependencies = [
  "objc2 0.6.4",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
 ]
 
 [[package]]
 name = "objc2-core-foundation"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daeaf60f25471d26948a1c2f840e3f7d86f4109e3af4e8e4b5cd70c39690d925"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
  "bitflags 2.13.0",
+ "dispatch2",
  "objc2 0.6.4",
 ]
 
 [[package]]
 name = "objc2-core-graphics"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dca602628b65356b6513290a21a6405b4d4027b8b250f0b98dddbb28b7de02"
+checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
  "bitflags 2.13.0",
+ "dispatch2",
  "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-io-surface",
@@ -5236,22 +5486,34 @@ dependencies = [
 
 [[package]]
 name = "objc2-core-image"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ffa6bea72bf42c78b0b34e89c0bafac877d5f80bf91e159a5d96ea7f693ca56"
+checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
 dependencies = [
  "objc2 0.6.4",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
 ]
 
 [[package]]
 name = "objc2-core-location"
-version = "0.3.0"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-core-text"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d31f4c5b5192304996badc466aeadffe1411d73a9bbd3b18b6b2ee9d048b07bd"
+checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
 dependencies = [
+ "bitflags 2.13.0",
  "objc2 0.6.4",
- "objc2-foundation 0.3.0",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
 ]
 
 [[package]]
@@ -5283,9 +5545,9 @@ dependencies = [
 
 [[package]]
 name = "objc2-foundation"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a21c6c9014b82c39515db5b396f91645182611c97d24637cf56ac01e5f8d998"
+checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
  "bitflags 2.13.0",
  "block2 0.6.2",
@@ -5295,9 +5557,9 @@ dependencies = [
 
 [[package]]
 name = "objc2-io-surface"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161a8b87e32610086e1a7a9e9ec39f84459db7b3a0881c1f16ca5a2605581c19"
+checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
  "bitflags 2.13.0",
  "objc2 0.6.4",
@@ -5331,21 +5593,21 @@ dependencies = [
 
 [[package]]
 name = "objc2-quartz-core"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb3794501bb1bee12f08dcad8c61f2a5875791ad1c6f47faa71a0f033f20071"
+checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
  "bitflags 2.13.0",
  "objc2 0.6.4",
  "objc2-core-foundation",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
 ]
 
 [[package]]
 name = "objc2-ui-kit"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777a571be14a42a3990d4ebedaeb8b54cd17377ec21b92e8200ac03797b3bee1"
+checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
  "bitflags 2.13.0",
  "block2 0.6.2",
@@ -5356,33 +5618,34 @@ dependencies = [
  "objc2-core-graphics",
  "objc2-core-image",
  "objc2-core-location",
- "objc2-foundation 0.3.0",
- "objc2-quartz-core 0.3.0",
+ "objc2-core-text",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core 0.3.2",
  "objc2-user-notifications",
 ]
 
 [[package]]
 name = "objc2-user-notifications"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670fe793adbf3b5e93686d48a05a7ed7ee53dfa65d106ced4805fae8969059b2"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
 dependencies = [
  "objc2 0.6.4",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
 ]
 
 [[package]]
 name = "objc2-web-kit"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b717127e4014b0f9f3e8bba3d3f2acec81f1bde01f656823036e823ed2c94dce"
+checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
 dependencies = [
  "bitflags 2.13.0",
  "block2 0.6.2",
  "objc2 0.6.4",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
 ]
 
 [[package]]
@@ -5557,10 +5820,10 @@ dependencies = [
  "cfg-if",
  "owo-colors",
  "oxc-miette-derive",
- "textwrap",
+ "textwrap 0.16.2",
  "thiserror 2.0.12",
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -5793,22 +6056,20 @@ dependencies = [
 
 [[package]]
 name = "pango"
-version = "0.18.3"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4"
+checksum = "5d800d8d0de2ad5d0fb046f5344dbaba14a003cf3dd27cc21d85893d35ea316c"
 dependencies = [
  "gio",
  "glib",
- "libc",
- "once_cell",
  "pango-sys",
 ]
 
 [[package]]
 name = "pango-sys"
-version = "0.18.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
+checksum = "bbd111a20ca90fedf03e09c59783c679c00900f1d8491cca5399f5e33609d5d6"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -5816,6 +6077,12 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -6321,9 +6588,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.31"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
 
 [[package]]
 name = "plain"
@@ -6333,9 +6600,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
 [[package]]
 name = "plist"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
+checksum = "7da1d65da6dd5d1e44199ac0f58712d241c0f439f80adea8924d832384087f85"
 dependencies = [
  "base64 0.22.1",
  "indexmap 2.11.4",
@@ -6440,16 +6707,6 @@ dependencies = [
  "elliptic-curve",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "2.0.0"
@@ -6461,35 +6718,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
-dependencies = [
- "toml_edit 0.22.24",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
+ "toml_edit 0.25.4+spec-1.1.0",
 ]
 
 [[package]]
@@ -6608,9 +6841,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quick-xml"
-version = "0.32.0"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
+checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
 dependencies = [
  "memchr",
 ]
@@ -7032,14 +7265,14 @@ dependencies = [
 
 [[package]]
 name = "referencing"
-version = "0.46.9"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77954d81b2e1c5e8ab889f9f597a92f852ab073255de9e37ee3fb443efd57051"
+checksum = "348e860aeb0b7bd035778fd11dd9cd5290d32e4aed3b8f2274a00287a9fd362b"
 dependencies = [
  "ahash 0.8.11",
  "fluent-uri",
  "getrandom 0.3.4",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.1",
  "itoa",
  "micromap",
  "parking_lot",
@@ -7061,9 +7294,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "1f388202e4b80542a0921078cc23b6333bcf1409c1e3f86404cae4766a6131db"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -7072,9 +7305,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "rend"
@@ -7629,6 +7862,30 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "schemars"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "schemars_derive"
 version = "0.8.21"
@@ -7640,6 +7897,12 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -7770,6 +8033,25 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "selectors"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8adfa1c298912827b8a28b223b3b874357397ae706e6190acd9bf28cee99114d"
+dependencies = [
+ "bitflags 2.13.0",
+ "cssparser 0.37.0",
+ "derive_more 2.0.1",
+ "log",
+ "new_debug_unreachable",
+ "phf 0.13.1",
+ "phf_codegen 0.13.1",
+ "precomputed-hash",
+ "rustc-hash",
+ "servo_arc 0.4.3",
+ "smallvec",
+]
+
 [[package]]
 name = "semver"
 version = "1.0.28"
@@ -7947,17 +8229,19 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.12.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
+checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c"
 dependencies = [
  "base64 0.22.1",
+ "bs58",
  "chrono",
  "hex",
  "indexmap 1.9.3",
  "indexmap 2.11.4",
- "serde",
- "serde_derive",
+ "schemars 0.9.0",
+ "schemars 1.2.1",
+ "serde_core",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -7965,11 +8249,11 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.12.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
+checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660"
 dependencies = [
- "darling",
+ "darling 0.23.0",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -8315,7 +8599,7 @@ version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1c97747dbf44bb1ca44a561ece23508e99cb592e862f22222dcf42f51d1e451"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -8392,9 +8676,9 @@ dependencies = [
 
 [[package]]
 name = "soup3"
-version = "0.5.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f"
+checksum = "92d38b59ff6d302538efd337e15d04d61c5b909ec223c60ae4061d74605a962a"
 dependencies = [
  "futures-channel",
  "gio",
@@ -8405,9 +8689,9 @@ dependencies = [
 
 [[package]]
 name = "soup3-sys"
-version = "0.5.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27"
+checksum = "79d5d25225bb06f83b78ff8cc35973b56d45fcdd21af6ed6d2bbd67f5a6f9bea"
 dependencies = [
  "gio-sys",
  "glib-sys",
@@ -8550,6 +8834,12 @@ dependencies = [
  "quote",
 ]
 
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -8571,7 +8861,7 @@ version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -8745,23 +9035,22 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "6.2.2"
+version = "7.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+checksum = "396a35feb67335377e0251fcbc1092fc85c484bd4e3a7a54319399da127796e7"
 dependencies = [
  "cfg-expr",
- "heck 0.5.0",
+ "heck",
  "pkg-config",
- "toml 0.8.20",
+ "toml 1.0.6+spec-1.1.0",
  "version-compare",
 ]
 
 [[package]]
 name = "tao"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cf65722394c2ac443e80120064987f8914ee1d4e4e36e63cdf10f2990f01159"
+version = "0.35.3"
 dependencies = [
+ "async-channel",
  "bitflags 2.13.0",
  "block2 0.6.2",
  "core-foundation 0.10.0",
@@ -8771,9 +9060,9 @@ dependencies = [
  "dispatch2",
  "dlopen2",
  "dpi",
- "gdkwayland-sys",
- "gdkx11-sys",
- "gtk",
+ "gdk4-wayland",
+ "gdk4-x11",
+ "gtk4",
  "jni",
  "libc",
  "log",
@@ -8781,13 +9070,13 @@ dependencies = [
  "ndk-sys",
  "objc2 0.6.4",
  "objc2-app-kit",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
  "objc2-ui-kit",
  "once_cell",
  "parking_lot",
  "percent-encoding",
  "raw-window-handle",
- "tao-macros",
+ "tao-macros 0.1.3",
  "unicode-segmentation",
  "url",
  "windows 0.61.1",
@@ -8796,6 +9085,15 @@ dependencies = [
  "x11-dl",
 ]
 
+[[package]]
+name = "tao-macros"
+version = "0.1.3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "tao-macros"
 version = "0.1.3"
@@ -8826,9 +9124,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
 
 [[package]]
 name = "tauri"
@@ -8844,8 +9142,8 @@ dependencies = [
  "embed_plist",
  "getrandom 0.3.4",
  "glob",
- "gtk",
- "heck 0.5.0",
+ "gtk4",
+ "heck",
  "http",
  "http-range",
  "image",
@@ -8856,7 +9154,7 @@ dependencies = [
  "muda",
  "objc2 0.6.4",
  "objc2-app-kit",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
  "objc2-ui-kit",
  "objc2-web-kit",
  "percent-encoding",
@@ -8885,7 +9183,7 @@ dependencies = [
  "tray-icon",
  "url",
  "uuid",
- "webkit2gtk",
+ "webkit6",
  "webview2-com",
  "window-vibrancy",
  "windows 0.61.1",
@@ -8899,10 +9197,10 @@ dependencies = [
  "cargo_toml",
  "dirs 6.0.0",
  "glob",
- "heck 0.5.0",
+ "heck",
  "json-patch",
  "quote",
- "schemars",
+ "schemars 0.8.21",
  "semver",
  "serde",
  "serde_json",
@@ -8919,12 +9217,13 @@ dependencies = [
  "anyhow",
  "ar",
  "bitness",
+ "bytesize 2.4.2",
  "dirs 6.0.0",
  "dunce",
  "flate2",
  "glob",
  "handlebars",
- "heck 0.5.0",
+ "heck",
  "hex",
  "image",
  "log",
@@ -8939,7 +9238,7 @@ dependencies = [
  "serde_json",
  "sha1 0.11.0",
  "sha2 0.11.0",
- "strsim",
+ "strsim 0.11.1",
  "tar",
  "tauri-icns",
  "tauri-macos-sign",
@@ -8965,7 +9264,7 @@ dependencies = [
  "axum",
  "base64 0.22.1",
  "cargo-mobile2",
- "clap",
+ "clap 4.5.26",
  "clap_complete",
  "colored 3.1.1",
  "common-path",
@@ -8979,7 +9278,7 @@ dependencies = [
  "env_logger 0.11.6",
  "glob",
  "handlebars",
- "heck 0.5.0",
+ "heck",
  "ignore",
  "image",
  "include_dir",
@@ -9141,7 +9440,7 @@ dependencies = [
 name = "tauri-macros"
 version = "2.6.3"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -9156,7 +9455,7 @@ dependencies = [
  "anyhow",
  "glob",
  "plist",
- "schemars",
+ "schemars 0.8.21",
  "serde",
  "serde_json",
  "tauri-utils",
@@ -9174,7 +9473,7 @@ dependencies = [
  "fern",
  "log",
  "objc2 0.6.4",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
  "serde",
  "serde_json",
  "serde_repr",
@@ -9202,7 +9501,7 @@ version = "2.11.3"
 dependencies = [
  "cookie",
  "dpi",
- "gtk",
+ "gtk4",
  "http",
  "jni",
  "objc2 0.6.4",
@@ -9214,7 +9513,7 @@ dependencies = [
  "tauri-utils",
  "thiserror 2.0.12",
  "url",
- "webkit2gtk",
+ "webkit6",
  "webview2-com",
  "windows 0.61.1",
 ]
@@ -9223,7 +9522,7 @@ dependencies = [
 name = "tauri-runtime-wry"
 version = "2.11.4"
 dependencies = [
- "gtk",
+ "gtk4",
  "http",
  "jni",
  "log",
@@ -9238,7 +9537,7 @@ dependencies = [
  "tauri-utils",
  "tracing",
  "url",
- "webkit2gtk",
+ "webkit6",
  "webview2-com",
  "windows 0.61.1",
  "wry",
@@ -9248,7 +9547,7 @@ dependencies = [
 name = "tauri-schema-generator"
 version = "0.0.0"
 dependencies = [
- "schemars",
+ "schemars 0.8.21",
  "serde",
  "serde_json",
  "tauri-utils",
@@ -9278,7 +9577,7 @@ dependencies = [
  "brotli",
  "cargo_metadata",
  "ctor",
- "dom_query",
+ "dom_query 0.27.0",
  "dunce",
  "getrandom 0.3.4",
  "glob",
@@ -9295,7 +9594,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "schemars",
+ "schemars 0.8.21",
  "semver",
  "serde",
  "serde-untagged",
@@ -9381,6 +9680,15 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width 0.1.14",
+]
+
 [[package]]
 name = "textwrap"
 version = "0.16.2"
@@ -9390,7 +9698,7 @@ dependencies = [
  "smawk",
  "terminal_size",
  "unicode-linebreak",
- "unicode-width",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -9662,17 +9970,6 @@ dependencies = [
  "serde_core",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap 2.11.4",
- "toml_datetime 0.6.8",
- "winnow 0.5.40",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.20.7"
@@ -9807,19 +10104,18 @@ dependencies = [
 
 [[package]]
 name = "tray-icon"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e47e6d063cfe4ad2e416fcbb310be3a37c5fd85c745b62cb562bfa4a003df674"
+version = "0.24.1"
 dependencies = [
+ "arc-swap",
  "crossbeam-channel",
  "dirs 6.0.0",
- "libappindicator",
+ "ksni",
  "muda",
  "objc2 0.6.4",
  "objc2-app-kit",
  "objc2-core-foundation",
  "objc2-core-graphics",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
  "once_cell",
  "png 0.18.1",
  "serde",
@@ -10028,6 +10324,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
 
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
 [[package]]
 name = "unicode-width"
 version = "0.2.0"
@@ -10247,6 +10549,12 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
 [[package]]
 name = "version-compare"
 version = "0.2.0"
@@ -10421,6 +10729,64 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "wayland-backend"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix 1.0.7",
+ "scoped-tls",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
+dependencies = [
+ "bitflags 2.13.0",
+ "rustix 1.0.7",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.32.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6"
+dependencies = [
+ "bitflags 2.13.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.10"
+dependencies = [
+ "proc-macro2",
+ "quick-xml",
+ "quote",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
+dependencies = [
+ "dlib",
+ "log",
+ "pkg-config",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.102"
@@ -10454,45 +10820,34 @@ dependencies = [
 ]
 
 [[package]]
-name = "webkit2gtk"
-version = "2.0.2"
+name = "webkit6"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1027150013530fb2eaf806408df88461ae4815a45c541c8975e61d6f2fc4793"
+checksum = "4959dd2a92813d4b2ae134e71345a03030bcff189b4f79cd131e9218aba22b70"
 dependencies = [
- "bitflags 1.3.2",
- "cairo-rs",
- "gdk",
- "gdk-sys",
+ "gdk4",
  "gio",
- "gio-sys",
  "glib",
- "glib-sys",
- "gobject-sys",
- "gtk",
- "gtk-sys",
- "javascriptcore-rs",
+ "gtk4",
+ "javascriptcore6",
  "libc",
- "once_cell",
  "soup3",
- "webkit2gtk-sys",
+ "webkit6-sys",
 ]
 
 [[package]]
-name = "webkit2gtk-sys"
-version = "2.0.2"
+name = "webkit6-sys"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "916a5f65c2ef0dfe12fff695960a2ec3d4565359fdbb2e9943c974e06c734ea5"
+checksum = "236078ce03ff041bf87904c8257e6a9b0e9e0f957267c15f9c1756aadcf02581"
 dependencies = [
- "bitflags 1.3.2",
- "cairo-sys-rs",
- "gdk-sys",
+ "gdk4-sys",
  "gio-sys",
  "glib-sys",
  "gobject-sys",
- "gtk-sys",
- "javascriptcore-rs-sys",
+ "gtk4-sys",
+ "javascriptcore6-sys",
  "libc",
- "pkg-config",
  "soup3-sys",
  "system-deps",
 ]
@@ -10615,7 +10970,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -10633,7 +10988,7 @@ dependencies = [
  "objc2 0.6.4",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
  "raw-window-handle",
  "windows-sys 0.59.0",
  "windows-version",
@@ -11207,29 +11562,25 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
 [[package]]
 name = "wry"
-version = "0.55.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3013fd6116aac351dd2e18f349b28b2cfef3a5ff3253a9d0ce2d7193bb1b4429"
+version = "0.55.1"
 dependencies = [
  "base64 0.22.1",
  "block2 0.6.2",
  "cookie",
  "crossbeam-channel",
  "dirs 6.0.0",
- "dom_query",
+ "dom_query 0.28.0",
  "dpi",
  "dunce",
- "gdkx11",
- "gtk",
+ "gtk4",
  "http",
- "javascriptcore-rs",
  "jni",
  "libc",
  "ndk",
  "objc2 0.6.4",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.2",
  "objc2-ui-kit",
  "objc2-web-kit",
  "once_cell",
@@ -11237,17 +11588,16 @@ dependencies = [
  "raw-window-handle",
  "sha2 0.10.8",
  "soup3",
- "tao-macros",
+ "tao",
+ "tao-macros 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "thiserror 2.0.12",
  "tracing",
  "url",
- "webkit2gtk",
- "webkit2gtk-sys",
+ "webkit6",
  "webview2-com",
  "windows 0.61.1",
  "windows-core 0.61.0",
  "windows-version",
- "x11-dl",
 ]
 
 [[package]]
@@ -11259,16 +11609,6 @@ dependencies = [
  "tap",
 ]
 
-[[package]]
-name = "x11"
-version = "2.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "x11-dl"
 version = "2.21.0"
@@ -11538,7 +11878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce824a6bfffe8942820fa36d24973b7c83a40896749a42e33de0abdd11750ee5"
 dependencies = [
  "byteorder",
- "bytesize",
+ "bytesize 1.3.0",
  "thiserror 1.0.69",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 3bf88a350845..bcf63f174663 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,6 +34,7 @@ members = [
   "examples/api/src-tauri",
   "examples/api/src-tauri/tauri-plugin-sample",
 ]
+exclude = ["ports/muda", "ports/tao", "ports/tray-icon", "ports/wry"]
 resolver = "2"
 
 [workspace.package]
@@ -43,7 +44,7 @@ repository = "https://github.com/tauri-apps/tauri"
 categories = ["gui", "web-programming"]
 license = "Apache-2.0 OR MIT"
 edition = "2021"
-rust-version = "1.90"
+rust-version = "1.92"
 
 # default to small, optimized workspace release binaries
 [profile.release]
@@ -68,7 +69,12 @@ opt-level = "s"
 # Temporary patch to schemars to preserve newlines in docstrings for our reference docs schemas
 # See https://github.com/GREsau/schemars/issues/120 for reference
 [patch.crates-io]
+muda = { path = "./ports/muda" }
 schemars_derive = { git = 'https://github.com/tauri-apps/schemars.git', branch = 'feat/preserve-description-newlines' }
+tao = { path = "./ports/tao" }
 tauri = { path = "./crates/tauri" }
 tauri-plugin = { path = "./crates/tauri-plugin" }
 tauri-utils = { path = "./crates/tauri-utils" }
+tray-icon = { path = "./ports/tray-icon" }
+wayland-scanner = { path = "./vendor/wayland-scanner" }
+wry = { path = "./ports/wry" }
diff --git a/audits/GTK4_WebKit6_supply_chain_notes.md b/audits/GTK4_WebKit6_supply_chain_notes.md
new file mode 100644
index 000000000000..95df5c249b71
--- /dev/null
+++ b/audits/GTK4_WebKit6_supply_chain_notes.md
@@ -0,0 +1,164 @@
+# GTK4 / WebKitGTK 6 Supply Chain Notes
+
+Date: 2026-07-19
+
+This note separates the Linux GTK4/WebKitGTK 6 runtime dependency changes from
+standalone example dependencies and scanner noise. It is intended as a
+review-facing artifact, not as a claim that the entire repository is currently
+`cargo-vet` clean.
+
+## Runtime Graph
+
+Checked with:
+
+```powershell
+cargo metadata --format-version 1 --locked --all-features --filter-platform x86_64-unknown-linux-gnu
+```
+
+The Linux all-features graph contains the expected GTK4/WebKitGTK 6 crates:
+
+| Package | Version | Repository | Notes |
+|---------|---------|------------|-------|
+| `gtk4` / `gdk4` / `gdk4-wayland` / `gdk4-x11` | `0.11.4` | `https://github.com/gtk-rs/gtk4-rs` | Active gtk-rs bindings for GTK4/GDK4. |
+| `webkit6` | `0.6.1` | `https://gitlab.gnome.org/World/Rust/webkit6-rs` | WebKitGTK 6 binding; required for the GTK4 migration. |
+| `javascriptcore6` | `0.6.0` | `https://gitlab.gnome.org/World/Rust/webkit6-rs` | Transitive WebKitGTK 6 binding. |
+| `soup3` | `0.9.0` | `https://gitlab.gnome.org/World/Rust/soup3-rs` | Transitive GNOME/libsoup binding. |
+| `ksni` | `0.2.2` | `https://github.com/iovxw/ksni` | Real optional Linux StatusNotifier tray backend. |
+| `arc-swap` | `1.9.2` | `https://github.com/vorner/arc-swap` | Used by Linux menu/tray support. |
+| `async-channel` | `2.5.0` | `https://github.com/smol-rs/async-channel` | Transitive async utility. |
+
+`wayland-scanner 0.31.10` is vendored from its crates.io release under
+`vendor/wayland-scanner`. It carries Smithay's one-line `xml10_content` parser
+adapter from `ec2d9328` and the upstream `quick-xml 0.41` bump from `d07c4f91`,
+resolving `RUSTSEC-2026-0194` and `RUSTSEC-2026-0195`. The other Wayland crates
+remain on their compatible crates.io releases. Using Smithay's full unreleased
+snapshot would also pull intentional code-generation and public-API changes,
+breaking released consumers such as `wayland-cursor` and Smithay Client Toolkit.
+Remove the vendor patch after Smithay publishes a compatible scanner release
+containing the security bump.
+
+`ksni` is intentionally pulled through `tauri -> tray-icon/linux-ksni`.
+Removing it means deliberately dropping or replacing that StatusNotifier tray
+path, not merely trimming dead dependency weight.
+
+`libadwaita` is not in the default root graph. It is an optional Tao feature:
+
+```powershell
+cargo tree --features libadwaita --target x86_64-unknown-linux-gnu -i libadwaita
+```
+
+## Example-Only Graphics Deps
+
+The Socket table lists `wgpu`, `glow`, `pollster`, and `eframe`, but they are
+not in the root Linux all-features graph.
+
+Checked with:
+
+```powershell
+cargo tree --all-features --target x86_64-unknown-linux-gnu -i wgpu
+cargo tree --all-features --target x86_64-unknown-linux-gnu -i eframe
+```
+
+Both commands report no package match from the root workspace.
+
+Their actual locations are standalone vendored-port examples:
+
+| Package | Location | Use |
+|---------|----------|-----|
+| `wgpu` | `ports/wry/Cargo.toml` dev-dependency | `ports/wry/examples/wgpu.rs` |
+| `pollster` | `ports/wry/Cargo.toml` dev-dependency | `ports/wry/examples/wgpu.rs` |
+| `glow` | `ports/wry/Cargo.toml` dev-dependency | `ports/wry/examples/gtk_opengl.rs` |
+| `eframe` | `ports/tray-icon/Cargo.toml` dev-dependency | `ports/tray-icon/examples/egui.rs` |
+
+The standalone Muda, Tao, Tray Icon, and Wry repositories carry the same
+API-compatible scanner vendor patch and tracked lockfile metadata. Tray Icon's
+`eframe` example disables the default AccessKit feature, removing the obsolete
+`zbus_xml -> quick-xml 0.30` path, and Tao's lockfile updates
+`crossbeam-epoch` to `0.9.20`. Wry no longer ignores the two `quick-xml`
+advisories in its audit configuration.
+
+The root workspace explicitly excludes `ports/muda`, `ports/tao`,
+`ports/tray-icon`, and `ports/wry`, while patching crates.io to those local
+paths. These example deps should not be treated as shipped Tauri runtime deps.
+
+## Socket Warning Triage
+
+Socket's "obfuscated code" warnings hit foundational ecosystem crates:
+
+| Package | Root Graph Status | Triage |
+|---------|-------------------|--------|
+| `hyper-util` `0.1.20` | Present | Comes through networking/client/server tooling such as `reqwest`, `axum`, and `jsonrpsee`; Hyperium-maintained. |
+| `tokio` `1.52.3` | Present | Core async runtime; Tokio-maintained. |
+| `libc` `0.2.186` | Present | Rust-lang maintained low-level platform crate. |
+| `zerocopy` `0.8.53` | Present | Google-maintained parsing/layout crate. |
+| `openssl` `0.10.81` | Present only with all-features Linux resolution | Comes through `native-tls`, then `tauri-bundler` / `ureq`; absent from the default Linux tree. |
+
+These warnings should be handled as scanner false-positive triage, not as a
+reason to revert the GTK4/WebKitGTK 6 migration.
+
+## cargo-vet Status
+
+`cargo-vet` store version is `0.9`. On Windows with Rust `1.95`, installing
+`cargo-vet 0.9.1` without its old lockfile fails in `flock.rs` because the
+Windows handle type resolves to a different `c_void`.
+
+Working bootstrap command:
+
+```powershell
+cargo +1.92 install cargo-vet --version 0.9.1 --locked --root .\.tmp-cargo-vet-0.9.1
+$env:PATH = "$PWD\.tmp-cargo-vet-0.9.1\bin;$env:PATH"
+cargo +1.92 vet --version
+```
+
+This branch now adds `audit-as-crates-io` policy entries for local patched
+crates that match published crate versions:
+
+```text
+muda, tao, tao-macros, tauri-bundler, tauri-cli, tauri-driver,
+tauri-macos-sign, tray-icon, wry
+```
+
+After formatting a disposable copy of the `supply-chain` store and running:
+
+```powershell
+cargo-vet.exe vet check --store-path <formatted-copy> --locked --output-format=json
+```
+
+the policy mismatch is gone, but the full graph still fails vetting with 985
+missing criteria. The GTK/WebKit-related missing criteria are:
+
+```text
+arc-swap 1.9.2
+async-channel 2.5.0
+gdk4 0.11.4
+gdk4-sys 0.11.4
+gdk4-wayland 0.11.4
+gdk4-wayland-sys 0.11.0
+gdk4-x11 0.11.4
+gdk4-x11-sys 0.11.0
+gtk4 0.11.4
+gtk4-macros 0.11.4
+gtk4-sys 0.11.4
+javascriptcore6 0.6.0
+javascriptcore6-sys 0.6.0
+ksni 0.2.2
+soup3 0.9.0
+soup3-sys 0.9.0
+webkit6 0.6.1
+webkit6-sys 0.6.0
+```
+
+Recommendation: do not mass-exempt the full 985-package graph in this GTK
+migration patch. Split cargo-vet remediation into its own supply-chain PR or
+audit packet. For this migration, document the GTK/WebKit-specific delta and
+avoid conflating it with stale repo-wide vet coverage.
+
+## Recommendation
+
+Keep the GTK4/WebKitGTK 6 runtime dependencies and keep `ksni` if the
+StatusNotifier tray path is in scope.
+
+If the goal is to reduce scanner noise, remove or quarantine the standalone
+vendored-port examples that pull `wgpu`, `glow`, `pollster`, and `eframe`.
+That is a maintenance decision for the vendored ports, not a runtime security
+fix for Tauri's Linux GTK4/WebKitGTK 6 path.
diff --git a/crates/tauri-bundler/Cargo.toml b/crates/tauri-bundler/Cargo.toml
index 4d3255875587..ae51b02d9c81 100644
--- a/crates/tauri-bundler/Cargo.toml
+++ b/crates/tauri-bundler/Cargo.toml
@@ -27,6 +27,7 @@ serde = { version = "1", features = ["derive"] }
 strsim = "0.11"
 tar = "0.4"
 walkdir = "2"
+bytesize = "2"
 handlebars = "6"
 tempfile = "3"
 log = { version = "0.4.21", features = ["kv"] }
diff --git a/crates/tauri-bundler/README.md b/crates/tauri-bundler/README.md
index afd6a5b90bed..60fb8438b52d 100644
--- a/crates/tauri-bundler/README.md
+++ b/crates/tauri-bundler/README.md
@@ -4,7 +4,7 @@ Wrap Rust executables in OS-specific app bundles.
 
 ## About
 
-This is a fork of the awesome [cargo-bundle](https://github.com/burtonageo/cargo-bundle), turned into a library used by the [Tauri CLI](../cli).
+This is a fork of the awesome [cargo-bundle](https://github.com/burtonageo/cargo-bundle), turned into a library used by the [Tauri CLI](../tauri-cli).
 
 ### Stability
 
diff --git a/crates/tauri-bundler/src/bundle.rs b/crates/tauri-bundler/src/bundle.rs
index 34d79f5f5bdb..60685a421ef5 100644
--- a/crates/tauri-bundler/src/bundle.rs
+++ b/crates/tauri-bundler/src/bundle.rs
@@ -16,6 +16,7 @@ mod windows;
 
 use crate::error::ErrorExt;
 use anyhow::Context;
+use bytesize::ByteSize;
 use std::{
   fmt::Write,
   io::{Seek, SeekFrom},
@@ -290,7 +291,10 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<Bundle>> {
         ""
       };
       let path_display = display_path(path);
-      writeln!(printable_paths, "        {path_display}{note}").unwrap();
+      let size = bundle_size(path)
+        .map(|bytes| format!(" ({:.2})", ByteSize::b(bytes).display()))
+        .unwrap_or_default();
+      writeln!(printable_paths, "        {path_display}{note}{size}").unwrap();
     }
   }
 
@@ -299,6 +303,23 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<Bundle>> {
   Ok(bundles)
 }
 
+/// Total size in bytes of a bundle path, recursing into directories (e.g. macOS `.app`).
+fn bundle_size(path: &std::path::Path) -> crate::Result<u64> {
+  let metadata = std::fs::symlink_metadata(path)?;
+  if metadata.is_dir() {
+    let mut total = 0;
+    for entry in walkdir::WalkDir::new(path) {
+      let entry = entry?;
+      if entry.file_type().is_file() || entry.path_is_symlink() {
+        total += entry.metadata()?.len();
+      }
+    }
+    Ok(total)
+  } else {
+    Ok(metadata.len())
+  }
+}
+
 fn sign_binaries_if_needed(settings: &Settings, target_os: &TargetPlatform) -> crate::Result<()> {
   if matches!(target_os, TargetPlatform::Windows) {
     if settings.windows().can_sign() {
@@ -356,3 +377,19 @@ pub fn check_icons(settings: &Settings) -> crate::Result<bool> {
     Ok(true)
   }
 }
+
+#[cfg(test)]
+mod tests {
+  use super::bundle_size;
+
+  #[test]
+  fn bundle_size_excludes_directory_metadata() {
+    let temp = tempfile::tempdir().unwrap();
+    let nested = temp.path().join("nested");
+    std::fs::create_dir(&nested).unwrap();
+    std::fs::write(temp.path().join("one"), [0; 3]).unwrap();
+    std::fs::write(nested.join("two"), [0; 5]).unwrap();
+
+    assert_eq!(bundle_size(temp.path()).unwrap(), 8);
+  }
+}
diff --git a/crates/tauri-bundler/src/bundle/linux/appimage/linuxdeploy-plugin-gtk.sh b/crates/tauri-bundler/src/bundle/linux/appimage/linuxdeploy-plugin-gtk.sh
index 65ead4b7313f..eec65b5932f6 100644
--- a/crates/tauri-bundler/src/bundle/linux/appimage/linuxdeploy-plugin-gtk.sh
+++ b/crates/tauri-bundler/src/bundle/linux/appimage/linuxdeploy-plugin-gtk.sh
@@ -87,7 +87,7 @@ search_tool() {
 }
 
 #DEPLOY_GTK_VERSION="${DEPLOY_GTK_VERSION:-0}" # When not set by user, this variable use the integer '0' as a sentinel value
-DEPLOY_GTK_VERSION=3 # Force GTK3 for tauri apps
+DEPLOY_GTK_VERSION=4 # Force GTK4 for tauri apps
 APPDIR=
 
 while [ "$1" != "" ]; do
@@ -324,4 +324,3 @@ EOF
 
 #binary patch absolute paths in libwebkit files
 find "$APPDIR"/usr/lib* -name 'libwebkit*' -exec sed -i -e "s|/usr|././|g" '{}' \;
-
diff --git a/crates/tauri-bundler/src/bundle/linux/appimage/linuxdeploy.rs b/crates/tauri-bundler/src/bundle/linux/appimage/linuxdeploy.rs
index 87364eb0cd41..a5e0f59a0653 100644
--- a/crates/tauri-bundler/src/bundle/linux/appimage/linuxdeploy.rs
+++ b/crates/tauri-bundler/src/bundle/linux/appimage/linuxdeploy.rs
@@ -149,11 +149,11 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
   for file in [
     "WebKitNetworkProcess",
     "WebKitWebProcess",
-    "injected-bundle/libwebkit2gtkinjectedbundle.so",
+    "injected-bundle/libwebkitgtkinjectedbundle.so",
   ] {
     for source in search_dirs.map(PathBuf::from) {
       // TODO: Check if it's the same dir name on all systems
-      let source = source.join("webkit2gtk-4.1").join(file);
+      let source = source.join("webkitgtk-6.0").join(file);
       if source.exists() {
         fs_utils::copy_file(
           &source,
@@ -237,10 +237,7 @@ fn prepare_tools(tools_path: &Path, arch: &str, verbose: bool) -> crate::Result<
   }
 
   let gtk = tools_path.join("linuxdeploy-plugin-gtk.sh");
-  if !gtk.exists() {
-    let data = download("https://raw.githubusercontent.com/tauri-apps/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh")?;
-    write_and_make_executable(&gtk, data)?;
-  }
+  write_and_make_executable(&gtk, include_bytes!("linuxdeploy-plugin-gtk.sh").to_vec())?;
 
   let gstreamer = tools_path.join("linuxdeploy-plugin-gstreamer.sh");
   if !gstreamer.exists() {
diff --git a/crates/tauri-bundler/src/bundle/windows/msi/mod.rs b/crates/tauri-bundler/src/bundle/windows/msi/mod.rs
index c7d15fb501d3..59be1efc5ace 100644
--- a/crates/tauri-bundler/src/bundle/windows/msi/mod.rs
+++ b/crates/tauri-bundler/src/bundle/windows/msi/mod.rs
@@ -97,9 +97,6 @@ const UUID_NAMESPACE: [u8; 16] = [
   0xfd, 0x85, 0x95, 0xa8, 0x17, 0xa3, 0x47, 0x4e, 0xa6, 0x16, 0x76, 0x14, 0x8d, 0xfa, 0x0c, 0x7b,
 ];
 
-/// Mapper between a resource directory name and its ResourceDirectory descriptor.
-type ResourceMap = BTreeMap<String, ResourceDirectory>;
-
 #[derive(Debug, Deserialize)]
 struct LanguageMetadata {
   #[serde(rename = "asciiCode")]
@@ -123,28 +120,36 @@ struct Binary {
 
 /// A Resource file to bundle with WIX.
 /// This data structure is needed because WIX requires each path to have its own `id` and `guid`.
-#[derive(Serialize, Clone)]
 struct ResourceFile {
   /// the GUID to use on the WIX XML.
   guid: String,
   /// the id to use on the WIX XML.
   id: String,
-  /// the file path.
-  path: PathBuf,
+  /// the source file path.
+  source_path: PathBuf,
+  /// file name override, defaulting to the file name of [`Self::source_path`].
+  target_name_override: Option<String>,
+}
+
+impl ResourceFile {
+  fn new(source_path: PathBuf, target_name_override: Option<String>) -> Self {
+    Self {
+      id: format!("I{}", Uuid::new_v4().as_simple()),
+      guid: Uuid::new_v4().to_string(),
+      source_path,
+      target_name_override,
+    }
+  }
 }
 
 /// A resource directory to bundle with WIX.
 /// This data structure is needed because WIX requires each path to have its own `id` and `guid`.
-#[derive(Serialize)]
+#[derive(Default)]
 struct ResourceDirectory {
-  /// the directory path.
-  path: String,
-  /// the directory name of the described resource.
-  name: String,
   /// the files of the described resource directory.
   files: Vec<ResourceFile>,
   /// the directories that are children of the described resource directory.
-  directories: Vec<ResourceDirectory>,
+  directories: BTreeMap<String, ResourceDirectory>,
 }
 
 impl ResourceDirectory {
@@ -154,38 +159,45 @@ impl ResourceDirectory {
   }
 
   /// Generates the wix XML string to bundle this directory resources recursively
-  fn get_wix_data(self) -> crate::Result<(String, Vec<String>)> {
+  fn render_wix(self, directory_name: Option<String>) -> crate::Result<(String, Vec<String>)> {
     let mut files = String::from("");
     let mut file_ids = Vec::new();
     for file in self.files {
-      file_ids.push(file.id.clone());
+      let ResourceFile {
+        id,
+        guid,
+        source_path,
+        target_name_override,
+      } = file;
+      let name_attribute = target_name_override
+        .map(|name| format!(r#"Name="{}" "#, html_escape(&name)))
+        .unwrap_or_default();
+      let source_path = html_escape(&source_path.to_string_lossy());
       files.push_str(
-        format!(
-          r#"<Component Id="{id}" Guid="{guid}" Win64="$(var.Win64)" KeyPath="yes"><File Id="PathFile_{id}" Source="{path}" /></Component>"#,
-          id = file.id,
-          guid = file.guid,
-          path = html_escape(&file.path.display().to_string())
-        ).as_str()
+        &format!(
+          r#"<Component Id="{id}" Guid="{guid}" Win64="$(var.Win64)" KeyPath="yes"><File Id="PathFile_{id}" Source="{source_path}" {name_attribute}/></Component>"#,
+        )
       );
+      file_ids.push(id);
     }
     let mut directories = String::from("");
-    for directory in self.directories {
-      let (wix_string, ids) = directory.get_wix_data()?;
+    for (directory_name, directory) in self.directories {
+      let (wix_string, ids) = directory.render_wix(Some(directory_name))?;
       for id in ids {
         file_ids.push(id)
       }
       directories.push_str(wix_string.as_str());
     }
-    let wix_string = if self.name.is_empty() {
-      format!("{files}{directories}")
-    } else {
+    let wix_string = if let Some(directory_name) = directory_name {
       format!(
         r#"<Directory Id="I{id}" Name="{name}">{files}{directories}</Directory>"#,
         id = Uuid::new_v4().as_simple(),
-        name = html_escape(&self.name),
+        name = html_escape(&directory_name),
         files = files,
         directories = directories,
       )
+    } else {
+      format!("{files}{directories}")
     };
 
     Ok((wix_string, file_ids))
@@ -633,15 +645,7 @@ pub fn build_wix_app_installer(
   data.insert("binaries", binaries_json);
 
   let resources = generate_resource_data(settings)?;
-  let mut resources_wix_string = String::from("");
-  let mut files_ids = Vec::new();
-  for (_, dir) in resources {
-    let (wix_string, ids) = dir.get_wix_data()?;
-    resources_wix_string.push_str(wix_string.as_str());
-    for id in ids {
-      files_ids.push(id);
-    }
-  }
+  let (resources_wix_string, files_ids) = resources.render_wix(None)?;
 
   data.insert("resources", to_json(resources_wix_string));
   data.insert("resource_file_ids", to_json(files_ids));
@@ -987,11 +991,11 @@ fn get_merge_modules(settings: &Settings) -> crate::Result<Vec<MergeModule>> {
 }
 
 /// Generates the data required for the resource bundling on wix
-fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
-  let mut resources = ResourceMap::new();
+fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceDirectory> {
   let cwd = std::env::current_dir()?;
 
-  let mut added_resources = Vec::new();
+  let mut root_resource_directory = ResourceDirectory::default();
+  let mut added_resources = HashSet::new();
 
   for resource in settings.resource_files().iter() {
     let resource = resource?;
@@ -1004,19 +1008,24 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
     if added_resources.contains(&resource_path) {
       continue;
     }
-    added_resources.push(resource_path.clone());
+    added_resources.insert(resource_path.clone());
 
     if settings.windows().can_sign() && should_sign(&resource_path)? {
       try_sign(&resource_path, settings)?;
     }
 
-    let resource_entry = ResourceFile {
-      id: format!("I{}", Uuid::new_v4().as_simple()),
-      guid: Uuid::new_v4().to_string(),
-      path: resource_path.clone(),
-    };
+    let resource_entry = ResourceFile::new(
+      resource_path,
+      Some(
+        resource
+          .target()
+          .file_name()
+          .expect("failed to read resource file name")
+          .to_string_lossy()
+          .into_owned(),
+      ),
+    );
 
-    // split the resource path directories
     let target_path = resource.target();
     let components_count = target_path.components().count();
     let directories = target_path
@@ -1024,55 +1033,19 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
       .take(components_count - 1) // the last component is the file
       .collect::<Vec<_>>();
 
-    // transform the directory structure to a chained vec structure
-    let first_directory = directories
-      .first()
-      .map(|d| d.as_os_str().to_string_lossy().into_owned())
-      .unwrap_or_else(String::new);
-
-    if !resources.contains_key(&first_directory) {
-      resources.insert(
-        first_directory.clone(),
-        ResourceDirectory {
-          path: first_directory.clone(),
-          name: first_directory.clone(),
-          directories: vec![],
-          files: vec![],
-        },
-      );
-    }
+    let mut directory_entry = &mut root_resource_directory;
 
-    let mut directory_entry = resources
-      .get_mut(&first_directory)
-      .expect("Unable to handle resources");
-
-    let mut path = String::new();
-    // the first component is already parsed on `first_directory` so we skip(1)
-    for directory in directories.into_iter().skip(1) {
+    for directory in directories {
       let directory_name = directory
         .as_os_str()
         .to_os_string()
         .into_string()
         .expect("failed to read resource folder name");
-      path.push_str(directory_name.as_str());
-      path.push(std::path::MAIN_SEPARATOR);
 
-      let index = directory_entry
+      directory_entry = directory_entry
         .directories
-        .iter()
-        .position(|f| f.path == path);
-      match index {
-        Some(i) => directory_entry = directory_entry.directories.get_mut(i).unwrap(),
-        None => {
-          directory_entry.directories.push(ResourceDirectory {
-            path: path.clone(),
-            name: directory_name,
-            directories: vec![],
-            files: vec![],
-          });
-          directory_entry = directory_entry.directories.iter_mut().last().unwrap();
-        }
-      }
+        .entry(directory_name)
+        .or_default();
     }
     directory_entry.add_file(resource_entry);
   }
@@ -1085,12 +1058,8 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
       if added_resources.contains(&resource_path.to_path_buf()) {
         continue;
       }
-      added_resources.push(resource_path.to_path_buf());
-      dlls.push(ResourceFile {
-        id: format!("I{}", Uuid::new_v4().as_simple()),
-        guid: Uuid::new_v4().to_string(),
-        path: resource_path.to_path_buf(),
-      });
+      added_resources.insert(resource_path.to_path_buf());
+      dlls.push(ResourceFile::new(resource_path.to_path_buf(), None));
     }
   }
 
@@ -1113,27 +1082,13 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
         try_sign(resource_path, settings)?;
       }
 
-      dlls.push(ResourceFile {
-        id: format!("I{}", Uuid::new_v4().as_simple()),
-        guid: Uuid::new_v4().to_string(),
-        path: resource_path.to_path_buf(),
-      });
+      dlls.push(ResourceFile::new(resource_path.to_path_buf(), None));
     }
   }
 
-  if !dlls.is_empty() {
-    resources
-      .entry("".to_string())
-      .and_modify(|r| r.files.append(&mut dlls))
-      .or_insert(ResourceDirectory {
-        path: "".to_string(),
-        name: "".to_string(),
-        directories: vec![],
-        files: dlls,
-      });
-  }
+  root_resource_directory.files.extend(dlls);
 
-  Ok(resources)
+  Ok(root_resource_directory)
 }
 
 #[cfg(test)]
@@ -1176,4 +1131,20 @@ mod tests {
     assert_eq!(wix_identifier(""), "_");
     assert_eq!(wix_identifier("app_1.2"), "app_1.2");
   }
+
+  #[test]
+  fn includes_mapped_resource_file_name_in_wix_data() {
+    let resource = ResourceFile::new("MyFile".into(), Some("myFileRenamed".into()));
+    let resource_id = resource.id.clone();
+    let directory = ResourceDirectory {
+      files: vec![resource],
+      directories: BTreeMap::new(),
+    };
+
+    let (wix_data, file_ids) = directory.render_wix(None).unwrap();
+
+    assert_eq!(file_ids, vec![resource_id]);
+    assert!(wix_data.contains(r#"Name="myFileRenamed""#));
+    assert!(wix_data.contains(r#"Source="MyFile""#));
+  }
 }
diff --git a/crates/tauri-cli/Cargo.toml b/crates/tauri-cli/Cargo.toml
index 2d6085777f32..d1caa9581bf0 100644
--- a/crates/tauri-cli/Cargo.toml
+++ b/crates/tauri-cli/Cargo.toml
@@ -67,7 +67,7 @@ tauri-utils = { version = "2.9.3", path = "../tauri-utils", features = [
   "html-manipulation-2",
 ] }
 toml = "1"
-jsonschema = { version = "0.46", default-features = false }
+jsonschema = { version = "0.47", default-features = false }
 handlebars = "6"
 include_dir = "0.7"
 dirs = "6"
diff --git a/crates/tauri-cli/config.schema.json b/crates/tauri-cli/config.schema.json
index 83e3f88a3d0e..74560b92b988 100644
--- a/crates/tauri-cli/config.schema.json
+++ b/crates/tauri-cli/config.schema.json
@@ -257,7 +257,7 @@
           ]
         },
         "dragDropEnabled": {
-          "description": "Whether the drag and drop is enabled or not on the webview. By default it is enabled.\n\n Disabling it is required to use HTML5 drag and drop on the frontend on Windows.",
+          "description": "Whether the drag and drop handlers used internally to generate [`DragDropEvent`]s are enabled on the webview. By default it is enabled.\n\n Disabling it is required to use HTML5 drag and drop on the frontend on Windows since we replace the drag drop handler of WebView2.\n\n Note: this setting maps to [`WebviewBuilder::disable_drag_drop_handler`], not [`WindowBuilder::drag_and_drop`].\n\n [`DragDropEvent`]: https://docs.rs/tauri/latest/tauri/enum.DragDropEvent.html\n [`WebviewBuilder::disable_drag_drop_handler`]: https://docs.rs/tauri/latest/tauri/webview/struct.WebviewBuilder.html#method.disable_drag_drop_handler\n [`WindowBuilder::drag_and_drop`]: https://docs.rs/tauri/latest/x86_64-pc-windows-msvc/tauri/window/struct.WindowBuilder.html#method.drag_and_drop",
           "default": true,
           "type": "boolean"
         },
@@ -614,6 +614,11 @@
             }
           ]
         },
+        "limitNavigationsToAppBoundDomains": {
+          "description": "Whether to limit navigations to App-Bound Domains. This is necessary to\n enable Service Workers on iOS according to\n [StackOverflow](https://stackoverflow.com/questions/49673399/service-workers-unavailable-in-wkwebview-in-ios-11-3/64155509#64155509).\n\n Default is false.\n\n Note: If you set this to `true` make sure to add localhost and any [`registrable\n domains`](https://developer.mozilla.org/en-US/docs/Glossary/Registrable_domain)\n used in this webview to src-tauri/Info.ios.plist:\n\n ```xml\n <plist>\n <dict>\n     <key>WKAppBoundDomains</key>\n     <array>\n         <string>localhost</string>\n         <string>aregistrabledomain.example</string>\n     </array>\n </dict>\n </plist>\n ```\n\n You must add `localhost` if any webview with this set to true opens a\n local webpage, makes any localhost calls, or uses the isolation pattern\n because Tauri uses the `localhost` domain for hosting the application\n webpage, the IPC protocol, and the isolation pattern's iframe.\n\n Requests served through custom uri schemes are allowed so long as they use\n a registrable domain specified in the `WKAppBoundDomains` array for all the\n requests from the app, including requests for the `localhost` domain.\n\n In theory, you can whitelist an entire uri scheme by including the\n protocol name followed by a colon. For example, to allow all requests\n using a custom \"stream\" uri scheme (see [this tauri\n example](https://github.com/tauri-apps/tauri/blob/dev/examples/streaming/main.rs)),\n you could add `stream:` to the AppBoundDomains array. That said, I'm not\n sure whether Apple would let your app through app review if you do\n whitelist an entire protocol because this feature is not mentioned in\n [their blog post on App-Bound\n Domains](https://webkit.org/blog/10882/app-bound-domains/).\n\n See https://webkit.org/blog/10882/app-bound-domains/ and\n https://developer.apple.com/documentation/webkit/wkwebviewconfiguration/limitsnavigationstoappbounddomains\n for the official documentation on App-Bound Domains.\n\n ## Platform-specific\n\n - **iOS**: Supported since version 14.0+.\n - **Linux / Windows / Android / MacOS:** Unsupported.",
+          "default": false,
+          "type": "boolean"
+        },
         "activityName": {
           "description": "The name of the Android activity to create for this window.",
           "type": [
diff --git a/crates/tauri-cli/src/info/env_system.rs b/crates/tauri-cli/src/info/env_system.rs
index fb429c0db8f5..a5a1cdc3b429 100644
--- a/crates/tauri-cli/src/info/env_system.rs
+++ b/crates/tauri-cli/src/info/env_system.rs
@@ -167,8 +167,8 @@ fn pkg_conf_version(package: &str) -> Option<String> {
   target_os = "openbsd",
   target_os = "netbsd"
 ))]
-fn webkit2gtk_ver() -> Option<String> {
-  pkg_conf_version("webkit2gtk-4.1")
+fn webkitgtk_ver() -> Option<String> {
+  pkg_conf_version("webkitgtk-6.0")
 }
 #[cfg(any(
   target_os = "linux",
@@ -294,12 +294,12 @@ pub fn items() -> Vec<SectionItem> {
       target_os = "netbsd"
     ))]
     SectionItem::new().action(|| {
-          webkit2gtk_ver()
-            .map(|v| (format!("webkit2gtk-4.1: {v}"), Status::Success))
+          webkitgtk_ver()
+            .map(|v| (format!("webkitgtk-6.0: {v}"), Status::Success))
             .unwrap_or_else(|| {
               (
                 format!(
-                  "webkit2gtk-4.1: {}\nVisit {} to learn more about tauri prerequisites",
+                  "webkitgtk-6.0: {}\nVisit {} to learn more about tauri prerequisites",
                   "not installed".red(),
                   "https://v2.tauri.app/start/prerequisites/".cyan()
                 ),
diff --git a/crates/tauri-cli/src/info/plugins.rs b/crates/tauri-cli/src/info/plugins.rs
index d0ede6b259b3..3764af8bd77b 100644
--- a/crates/tauri-cli/src/info/plugins.rs
+++ b/crates/tauri-cli/src/info/plugins.rs
@@ -47,17 +47,17 @@ pub fn installed_tauri_packages(
   tauri_dir: &Path,
   package_manager: PackageManager,
 ) -> InstalledPackages {
-  let know_plugins = helpers::plugins::known_plugins();
+  let known_plugins = helpers::plugins::known_plugins();
   let crate_names: Vec<String> = iter::once("tauri".to_owned())
     .chain(
-      know_plugins
+      known_plugins
         .keys()
         .map(|plugin_name| format!("tauri-plugin-{plugin_name}")),
     )
     .collect();
   let npm_names: Vec<String> = iter::once("@tauri-apps/api".to_owned())
     .chain(
-      know_plugins
+      known_plugins
         .keys()
         .map(|plugin_name| format!("@tauri-apps/plugin-{plugin_name}")),
     )
@@ -114,8 +114,8 @@ pub fn items(
   if let Some(tauri_dir) = tauri_dir {
     let (manifest, lock) = cargo_manifest_and_lock(tauri_dir);
 
-    for p in helpers::plugins::known_plugins().keys() {
-      let dep = format!("tauri-plugin-{p}");
+    for (name, metadata) in helpers::plugins::known_plugins() {
+      let dep = format!("tauri-plugin-{name}");
       let crate_version = crate_version(tauri_dir, manifest.as_ref(), lock.as_ref(), &dep);
       if !crate_version.has_version() {
         continue;
@@ -123,11 +123,15 @@ pub fn items(
       let item = packages_rust::rust_section_item(&dep, crate_version);
       items.push(item);
 
+      if metadata.rust_only {
+        continue;
+      }
+
       let Some(frontend_dir) = frontend_dir else {
         continue;
       };
 
-      let package = format!("@tauri-apps/plugin-{p}");
+      let package = format!("@tauri-apps/plugin-{name}");
 
       let item =
         packages_nodejs::nodejs_section_item(package, None, frontend_dir.clone(), package_manager);
diff --git a/crates/tauri-cli/src/init.rs b/crates/tauri-cli/src/init.rs
index a809ba317b7e..268f5fb9ca07 100644
--- a/crates/tauri-cli/src/init.rs
+++ b/crates/tauri-cli/src/init.rs
@@ -200,34 +200,62 @@ pub fn command(mut options: Options) -> Result<()> {
       template_target_path
     );
   } else {
-    let (tauri_dep, tauri_build_dep, tauri_utils_dep, tauri_plugin_dep) =
-      if let Some(tauri_path) = &options.tauri_path {
-        (
-          format!(
-            r#"{{  path = {:?} }}"#,
-            resolve_tauri_path(tauri_path, "crates/tauri")
-          ),
-          format!(
-            "{{  path = {:?} }}",
-            resolve_tauri_path(tauri_path, "crates/tauri-build")
-          ),
-          format!(
-            "{{  path = {:?} }}",
-            resolve_tauri_path(tauri_path, "crates/tauri-utils")
-          ),
-          format!(
-            "{{  path = {:?} }}",
-            resolve_tauri_path(tauri_path, "crates/tauri-plugin")
-          ),
-        )
-      } else {
-        (
-          format!(r#"{{ version = "{}" }}"#, metadata.tauri),
-          format!(r#"{{ version = "{}" }}"#, metadata.tauri_build),
-          r#"{{ version = "2" }}"#.to_string(),
-          r#"{{ version = "2" }}"#.to_string(),
-        )
-      };
+    let (
+      tauri_dep,
+      tauri_build_dep,
+      tauri_utils_dep,
+      tauri_plugin_dep,
+      muda_dep,
+      tao_dep,
+      tray_icon_dep,
+      wry_dep,
+    ) = if let Some(tauri_path) = &options.tauri_path {
+      (
+        format!(
+          r#"{{  path = {:?} }}"#,
+          resolve_tauri_path(tauri_path, "crates/tauri")
+        ),
+        format!(
+          "{{  path = {:?} }}",
+          resolve_tauri_path(tauri_path, "crates/tauri-build")
+        ),
+        format!(
+          "{{  path = {:?} }}",
+          resolve_tauri_path(tauri_path, "crates/tauri-utils")
+        ),
+        format!(
+          "{{  path = {:?} }}",
+          resolve_tauri_path(tauri_path, "crates/tauri-plugin")
+        ),
+        format!(
+          "{{  path = {:?} }}",
+          resolve_tauri_path(tauri_path, "ports/muda")
+        ),
+        format!(
+          "{{  path = {:?} }}",
+          resolve_tauri_path(tauri_path, "ports/tao")
+        ),
+        format!(
+          "{{  path = {:?} }}",
+          resolve_tauri_path(tauri_path, "ports/tray-icon")
+        ),
+        format!(
+          "{{  path = {:?} }}",
+          resolve_tauri_path(tauri_path, "ports/wry")
+        ),
+      )
+    } else {
+      (
+        format!(r#"{{ version = "{}" }}"#, metadata.tauri),
+        format!(r#"{{ version = "{}" }}"#, metadata.tauri_build),
+        r#"{{ version = "2" }}"#.to_string(),
+        r#"{{ version = "2" }}"#.to_string(),
+        String::new(),
+        String::new(),
+        String::new(),
+        String::new(),
+      )
+    };
 
     let _ = remove_dir_all(&template_target_path);
     let mut handlebars = Handlebars::new();
@@ -241,6 +269,10 @@ pub fn command(mut options: Options) -> Result<()> {
     data.insert("tauri_build_dep", to_json(tauri_build_dep));
     data.insert("tauri_utils_dep", to_json(tauri_utils_dep));
     data.insert("tauri_plugin_dep", to_json(tauri_plugin_dep));
+    data.insert("muda_dep", to_json(muda_dep));
+    data.insert("tao_dep", to_json(tao_dep));
+    data.insert("tray_icon_dep", to_json(tray_icon_dep));
+    data.insert("wry_dep", to_json(wry_dep));
     data.insert(
       "frontend_dist",
       to_json(options.frontend_dist.as_deref().unwrap_or("../dist")),
diff --git a/crates/tauri-cli/src/interface/rust.rs b/crates/tauri-cli/src/interface/rust.rs
index 78fc38f8476a..669d839e97fa 100644
--- a/crates/tauri-cli/src/interface/rust.rs
+++ b/crates/tauri-cli/src/interface/rust.rs
@@ -46,6 +46,27 @@ use crate::helpers::config::custom_sign_settings;
 use cargo_config::Config as CargoConfig;
 use manifest::{rewrite_manifest, Manifest};
 
+#[cfg(any(target_os = "linux", test))]
+const LINUX_DEB_RUNTIME_DEPENDENCIES: &[&str] =
+  &["libwebkitgtk-6.0-4", "libgtk-4-1", "libdbus-1-3"];
+#[cfg(any(target_os = "linux", test))]
+const LINUX_RPM_RUNTIME_LIBRARIES: &[&str] =
+  &["libwebkitgtk-6.0.so.4", "libgtk-4.so.1", "libdbus-1.so.3"];
+
+#[cfg(any(target_os = "linux", test))]
+fn linux_rpm_runtime_dependencies(arch64bits: bool) -> Vec<String> {
+  LINUX_RPM_RUNTIME_LIBRARIES
+    .iter()
+    .map(|lib| {
+      let mut requires = (*lib).to_string();
+      if arch64bits {
+        requires.push_str("()(64bit)");
+      }
+      requires
+    })
+    .collect()
+}
+
 #[derive(Debug, Default, Clone)]
 pub struct Options {
   pub runner: Option<RunnerConfig>,
@@ -1371,12 +1392,6 @@ fn tauri_config_to_bundle_settings(
   updater_config: Option<UpdaterSettings>,
   arch64bits: bool,
 ) -> crate::Result<BundleSettings> {
-  let enabled_features = settings
-    .manifest
-    .lock()
-    .unwrap()
-    .all_enabled_features(features);
-
   #[allow(unused_mut)]
   let mut resources = config
     .resources
@@ -1393,66 +1408,12 @@ fn tauri_config_to_bundle_settings(
   // set env vars used by the bundler and inject dependencies
   #[cfg(target_os = "linux")]
   {
-    let mut libs: Vec<String> = Vec::new();
-
-    if enabled_features.contains(&"tray-icon".into())
-      || enabled_features.contains(&"tauri/tray-icon".into())
-    {
-      let (tray_kind, path) = std::env::var_os("TAURI_LINUX_AYATANA_APPINDICATOR")
-        .map(|ayatana| {
-          if ayatana == "true" || ayatana == "1" {
-            (
-              pkgconfig_utils::TrayKind::Ayatana,
-              format!(
-                "{}/libayatana-appindicator3.so.1",
-                pkgconfig_utils::get_library_path("ayatana-appindicator3-0.1")
-                  .expect("failed to get ayatana-appindicator library path using pkg-config.")
-              ),
-            )
-          } else {
-            (
-              pkgconfig_utils::TrayKind::Libappindicator,
-              format!(
-                "{}/libappindicator3.so.1",
-                pkgconfig_utils::get_library_path("appindicator3-0.1")
-                  .expect("failed to get libappindicator-gtk library path using pkg-config.")
-              ),
-            )
-          }
-        })
-        .unwrap_or_else(pkgconfig_utils::get_appindicator_library_path);
-      match tray_kind {
-        pkgconfig_utils::TrayKind::Ayatana => {
-          depends_deb.push("libayatana-appindicator3-1".into());
-          libs.push("libayatana-appindicator3.so.1".into());
-        }
-        pkgconfig_utils::TrayKind::Libappindicator => {
-          depends_deb.push("libappindicator3-1".into());
-          libs.push("libappindicator3.so.1".into());
-        }
-      }
-
-      // conditionally setting it in case the user provided its own version for some reason
-      let path = PathBuf::from(path);
-      if !appimage_files.contains_key(&path) {
-        // manually construct target path, just in case the source path is something unexpected
-        appimage_files.insert(Path::new("/usr/lib/").join(path.file_name().unwrap()), path);
-      }
-    }
-
-    depends_deb.push("libwebkit2gtk-4.1-0".to_string());
-    depends_deb.push("libgtk-3-0".to_string());
-
-    libs.push("libwebkit2gtk-4.1.so.0".into());
-    libs.push("libgtk-3.so.0".into());
-
-    for lib in libs {
-      let mut requires = lib;
-      if arch64bits {
-        requires.push_str("()(64bit)");
-      }
-      depends_rpm.push(requires);
-    }
+    depends_deb.extend(
+      LINUX_DEB_RUNTIME_DEPENDENCIES
+        .iter()
+        .map(|dependency| (*dependency).to_string()),
+    );
+    depends_rpm.extend(linux_rpm_runtime_dependencies(arch64bits));
   }
 
   #[cfg(windows)]
@@ -1700,51 +1661,6 @@ fn tauri_config_to_bundle_settings(
   })
 }
 
-#[cfg(target_os = "linux")]
-mod pkgconfig_utils {
-  use std::process::Command;
-
-  pub enum TrayKind {
-    Ayatana,
-    Libappindicator,
-  }
-
-  pub fn get_appindicator_library_path() -> (TrayKind, String) {
-    match get_library_path("ayatana-appindicator3-0.1") {
-      Some(p) => (
-        TrayKind::Ayatana,
-        format!("{p}/libayatana-appindicator3.so.1"),
-      ),
-      None => match get_library_path("appindicator3-0.1") {
-        Some(p) => (
-          TrayKind::Libappindicator,
-          format!("{p}/libappindicator3.so.1"),
-        ),
-        None => panic!("Can't detect any appindicator library"),
-      },
-    }
-  }
-
-  /// Gets the folder in which a library is located using `pkg-config`.
-  pub fn get_library_path(name: &str) -> Option<String> {
-    let mut cmd = Command::new("pkg-config");
-    cmd.env("PKG_CONFIG_ALLOW_SYSTEM_LIBS", "1");
-    cmd.arg("--libs-only-L");
-    cmd.arg(name);
-    if let Ok(output) = cmd.output() {
-      if !output.stdout.is_empty() {
-        // output would be "-L/path/to/library\n"
-        let word = output.stdout[2..].to_vec();
-        Some(String::from_utf8_lossy(&word).trim().to_string())
-      } else {
-        None
-      }
-    } else {
-      None
-    }
-  }
-}
-
 #[cfg(test)]
 mod tests {
   use super::*;
@@ -1806,6 +1722,40 @@ mod tests {
     assert_eq!(get_cargo_option(&args, "--non-existent"), None);
   }
 
+  #[test]
+  fn linux_deb_runtime_dependencies_use_gtk4_webkitgtk6_and_ksni() {
+    assert_eq!(
+      LINUX_DEB_RUNTIME_DEPENDENCIES,
+      &["libwebkitgtk-6.0-4", "libgtk-4-1", "libdbus-1-3"]
+    );
+    assert!(!LINUX_DEB_RUNTIME_DEPENDENCIES
+      .iter()
+      .any(|dependency| dependency.contains("webkit2gtk")
+        || dependency.contains("gtk-3")
+        || dependency.contains("appindicator")));
+  }
+
+  #[test]
+  fn linux_rpm_runtime_dependencies_use_gtk4_webkitgtk6_and_ksni() {
+    assert_eq!(
+      linux_rpm_runtime_dependencies(false),
+      ["libwebkitgtk-6.0.so.4", "libgtk-4.so.1", "libdbus-1.so.3"]
+    );
+    assert_eq!(
+      linux_rpm_runtime_dependencies(true),
+      [
+        "libwebkitgtk-6.0.so.4()(64bit)",
+        "libgtk-4.so.1()(64bit)",
+        "libdbus-1.so.3()(64bit)"
+      ]
+    );
+    assert!(!LINUX_RPM_RUNTIME_LIBRARIES
+      .iter()
+      .any(|library| library.contains("webkit2gtk")
+        || library.contains("gtk-3")
+        || library.contains("appindicator")));
+  }
+
   #[test]
   fn get_binaries_ignores_src_bin_with_disabled_required_features() {
     let cargo_toml = r#"
diff --git a/crates/tauri-cli/src/interface/rust/manifest.rs b/crates/tauri-cli/src/interface/rust/manifest.rs
index 40d307c2bcf3..ab50d99e9c36 100644
--- a/crates/tauri-cli/src/interface/rust/manifest.rs
+++ b/crates/tauri-cli/src/interface/rust/manifest.rs
@@ -18,7 +18,6 @@ use std::{
 #[derive(Default)]
 pub struct Manifest {
   pub inner: DocumentMut,
-  pub tauri_features: HashSet<String>,
 }
 
 impl Manifest {
@@ -46,37 +45,6 @@ impl Manifest {
 
     f
   }
-
-  pub fn all_enabled_features(&self, enabled_features: &[String]) -> Vec<String> {
-    let mut all_enabled_features: Vec<String> = self
-      .tauri_features
-      .iter()
-      .map(|f| format!("tauri/{f}"))
-      .collect();
-
-    let manifest_features = self.features();
-    for f in enabled_features {
-      all_enabled_features.extend(get_enabled_features(&manifest_features, f));
-    }
-
-    all_enabled_features
-  }
-}
-
-fn get_enabled_features(list: &HashMap<String, Vec<String>>, feature: &str) -> Vec<String> {
-  let mut f = Vec::new();
-
-  if let Some(enabled_features) = list.get(feature) {
-    for enabled in enabled_features {
-      if list.contains_key(enabled) {
-        f.extend(get_enabled_features(list, enabled));
-      } else {
-        f.push(enabled.clone());
-      }
-    }
-  }
-
-  f
 }
 
 pub fn read_manifest(manifest_path: &Path) -> crate::Result<(DocumentMut, String)> {
@@ -301,32 +269,14 @@ pub fn rewrite_manifest(config: &Config, tauri_dir: &Path) -> crate::Result<(Man
 
   let persist = inject_features(&mut manifest, &mut dependencies)?;
 
-  let tauri_features = dependencies
-    .into_iter()
-    .find(|d| d.name == "tauri")
-    .unwrap()
-    .features;
-
   let new_manifest_str = serialize_manifest(&manifest);
 
   if persist && original_manifest_str != new_manifest_str {
     std::fs::write(&manifest_path, new_manifest_str)
       .fs_context("failed to rewrite Cargo manifest", &manifest_path)?;
-    Ok((
-      Manifest {
-        inner: manifest,
-        tauri_features,
-      },
-      true,
-    ))
+    Ok((Manifest { inner: manifest }, true))
   } else {
-    Ok((
-      Manifest {
-        inner: manifest,
-        tauri_features,
-      },
-      false,
-    ))
+    Ok((Manifest { inner: manifest }, false))
   }
 }
 
diff --git a/crates/tauri-cli/src/mobile/android/mod.rs b/crates/tauri-cli/src/mobile/android/mod.rs
index c0add29e61bc..9cbcd8ec0b5f 100644
--- a/crates/tauri-cli/src/mobile/android/mod.rs
+++ b/crates/tauri-cli/src/mobile/android/mod.rs
@@ -917,11 +917,7 @@ fn restart_emulator(env: &Env, serial_no: &str, emulator: &emulator::Emulator) -
   log::info!("Waiting for emulator to exit...");
   loop {
     let devices = adb::device_list(env).unwrap_or_default();
-    if devices
-      .into_iter()
-      .find(|d| d.serial_no() == serial_no)
-      .is_none()
-    {
+    if !devices.into_iter().any(|d| d.serial_no() == serial_no) {
       break;
     }
     sleep(Duration::from_secs(1));
diff --git a/crates/tauri-cli/templates/app/src-tauri/Cargo.crate-manifest b/crates/tauri-cli/templates/app/src-tauri/Cargo.crate-manifest
index bf092645cdd1..87d59422e664 100644
--- a/crates/tauri-cli/templates/app/src-tauri/Cargo.crate-manifest
+++ b/crates/tauri-cli/templates/app/src-tauri/Cargo.crate-manifest
@@ -25,7 +25,11 @@ tauri = {{  tauri_dep  }}
 tauri-plugin-log = "2"
 {{#if patch_tauri_dep}}
 [patch.crates-io]
+muda = {{ muda_dep }}
+tao = {{ tao_dep }}
 tauri = {{ tauri_dep }}
 tauri-utils = {{ tauri_utils_dep }}
 tauri-plugin = {{ tauri_plugin_dep }}
+tray-icon = {{ tray_icon_dep }}
+wry = {{ wry_dep }}
 {{/if}}
diff --git a/crates/tauri-cli/templates/mobile/android/app/build.gradle.kts b/crates/tauri-cli/templates/mobile/android/app/build.gradle.kts
index 0f73195fa008..944e218eefe4 100644
--- a/crates/tauri-cli/templates/mobile/android/app/build.gradle.kts
+++ b/crates/tauri-cli/templates/mobile/android/app/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.util.Properties
 
 plugins {
@@ -50,12 +51,19 @@ android {
             )
         }
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
     buildFeatures {
         buildConfig = true
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_1_8
+    }
 }
 
 rust {
@@ -77,4 +85,4 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
 }
 
-apply(from = "tauri.build.gradle.kts")
\ No newline at end of file
+apply(from = "tauri.build.gradle.kts")
diff --git a/crates/tauri-cli/templates/mobile/android/app/src/main/res/values-night/themes.xml b/crates/tauri-cli/templates/mobile/android/app/src/main/res/values-night/themes.xml
index d4abdc82e8c9..75861db36a76 100644
--- a/crates/tauri-cli/templates/mobile/android/app/src/main/res/values-night/themes.xml
+++ b/crates/tauri-cli/templates/mobile/android/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.{{snake-case app.name}}" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Theme.{{snake-case app.name}}" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
     </style>
 </resources>
diff --git a/crates/tauri-cli/templates/mobile/android/app/src/main/res/values/themes.xml b/crates/tauri-cli/templates/mobile/android/app/src/main/res/values/themes.xml
index d4abdc82e8c9..75861db36a76 100644
--- a/crates/tauri-cli/templates/mobile/android/app/src/main/res/values/themes.xml
+++ b/crates/tauri-cli/templates/mobile/android/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.{{snake-case app.name}}" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Theme.{{snake-case app.name}}" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
     </style>
 </resources>
diff --git a/crates/tauri-cli/templates/plugin/.github/workflows/audit.yml b/crates/tauri-cli/templates/plugin/.github/workflows/audit.yml
index 4121fa6470da..3bc3a459280e 100644
--- a/crates/tauri-cli/templates/plugin/.github/workflows/audit.yml
+++ b/crates/tauri-cli/templates/plugin/.github/workflows/audit.yml
@@ -27,8 +27,8 @@ jobs:
   audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: rustsec/audit-check@v1
+      - uses: actions/checkout@v7
+      - uses: rustsec/audit-check@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 {{{{/raw}}}}
diff --git a/crates/tauri-cli/templates/plugin/.github/workflows/clippy.yml b/crates/tauri-cli/templates/plugin/.github/workflows/clippy.yml
index 23556aeb345a..a716b14cde3f 100644
--- a/crates/tauri-cli/templates/plugin/.github/workflows/clippy.yml
+++ b/crates/tauri-cli/templates/plugin/.github/workflows/clippy.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt
@@ -41,15 +41,15 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy
-      - name: install webkit2gtk
+      - name: install WebKitGTK and GTK
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1
+          sudo apt-get install -y libwebkitgtk-6.0-dev libgtk-4-dev
       - uses: Swatinem/rust-cache@v2
       - run: cargo clippy --all-targets --all-features -- -D warnings
 {{{{/raw}}}}
diff --git a/crates/tauri-cli/templates/plugin/.github/workflows/test.yml b/crates/tauri-cli/templates/plugin/.github/workflows/test.yml
index c528a4506fde..c44ef69cd2a5 100644
--- a/crates/tauri-cli/templates/plugin/.github/workflows/test.yml
+++ b/crates/tauri-cli/templates/plugin/.github/workflows/test.yml
@@ -23,13 +23,13 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: dtolnay/rust-toolchain@stable
-      - name: install webkit2gtk
+      - name: install WebKitGTK and GTK
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1
+          sudo apt-get install -y libwebkitgtk-6.0-dev libgtk-4-dev
       - uses: Swatinem/rust-cache@v2
       - run: cargo test --all-targets --all-features -- -D warnings
 {{{{/raw}}}}
diff --git a/crates/tauri-cli/templates/plugin/android/build.gradle.kts b/crates/tauri-cli/templates/plugin/android/build.gradle.kts
index f788a85fb6c7..b999d6b65e3d 100644
--- a/crates/tauri-cli/templates/plugin/android/build.gradle.kts
+++ b/crates/tauri-cli/templates/plugin/android/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
@@ -27,8 +29,11 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_1_8
     }
 }
 
diff --git a/crates/tauri-macros/src/lib.rs b/crates/tauri-macros/src/lib.rs
index cf02da7f49c0..034f991447ab 100644
--- a/crates/tauri-macros/src/lib.rs
+++ b/crates/tauri-macros/src/lib.rs
@@ -131,27 +131,27 @@ pub fn default_runtime(attributes: TokenStream, input: TokenStream) -> TokenStre
 ///  let kind = ItemKind::Check;
 ///  let resources_table = app.resources_table();
 ///  match kind {
-///  ItemKind::Submenu => {
-///    let i = resources_table.get::<Submenu<R>>(rid)?;
-///    i.set_text(text)
-///  }
-///  ItemKind::MenuItem => {
-///    let i = resources_table.get::<MenuItem<R>>(rid)?;
-///    i.set_text(text)
-///  }
-///  ItemKind::Predefined => {
-///    let i = resources_table.get::<PredefinedMenuItem<R>>(rid)?;
-///    i.set_text(text)
-///  }
-///  ItemKind::Check => {
-///    let i = resources_table.get::<CheckMenuItem<R>>(rid)?;
-///    i.set_text(text)
-///  }
-///  ItemKind::Icon => {
-///    let i = resources_table.get::<IconMenuItem<R>>(rid)?;
-///    i.set_text(text)
-///  }
-///  _ => unreachable!(),
+///    ItemKind::Submenu => {
+///      let i = resources_table.get::<Submenu<R>>(rid)?;
+///      i.set_text(text)
+///    }
+///    ItemKind::MenuItem => {
+///      let i = resources_table.get::<MenuItem<R>>(rid)?;
+///      i.set_text(text)
+///    }
+///    ItemKind::Predefined => {
+///      let i = resources_table.get::<PredefinedMenuItem<R>>(rid)?;
+///      i.set_text(text)
+///    }
+///    ItemKind::Check => {
+///      let i = resources_table.get::<CheckMenuItem<R>>(rid)?;
+///      i.set_text(text)
+///    }
+///    ItemKind::Icon => {
+///      let i = resources_table.get::<IconMenuItem<R>>(rid)?;
+///      i.set_text(text)
+///    }
+///    _ => unreachable!(),
 ///  }
 /// ```
 #[proc_macro]
diff --git a/crates/tauri-runtime-wry/Cargo.toml b/crates/tauri-runtime-wry/Cargo.toml
index 7c576dea5ec2..b4600a86f4cd 100644
--- a/crates/tauri-runtime-wry/Cargo.toml
+++ b/crates/tauri-runtime-wry/Cargo.toml
@@ -37,8 +37,8 @@ version = "0.61"
 features = ["Win32_Foundation", "Win32_Graphics_Dwm"]
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
-gtk = { version = "0.18", features = ["v3_24"] }
-webkit2gtk = { version = "=2.0", features = ["v2_40"] }
+gtk = { package = "gtk4", version = "0.11", features = ["v4_10"] }
+webkit = { package = "webkit6", version = "0.6", features = ["v2_42"] }
 percent-encoding = "2"
 
 [target.'cfg(target_vendor = "apple")'.dependencies]
diff --git a/crates/tauri-runtime-wry/src/lib.rs b/crates/tauri-runtime-wry/src/lib.rs
index 8a3da8d31fdc..9ad759075f4f 100644
--- a/crates/tauri-runtime-wry/src/lib.rs
+++ b/crates/tauri-runtime-wry/src/lib.rs
@@ -33,6 +33,14 @@ use tauri_runtime::{
   UserAttentionType, UserEvent, WebviewDispatch, WebviewEventId, WindowDispatch, WindowEventId,
 };
 
+#[cfg(any(
+  target_os = "linux",
+  target_os = "dragonfly",
+  target_os = "freebsd",
+  target_os = "netbsd",
+  target_os = "openbsd"
+))]
+use gtk::glib::object::Cast;
 #[cfg(target_vendor = "apple")]
 use objc2::rc::Retained;
 #[cfg(target_os = "android")]
@@ -138,7 +146,7 @@ use std::{
 };
 
 pub type WebviewId = u32;
-type IpcHandler = dyn Fn(Request<String>) + 'static;
+type IpcHandler = dyn Fn(Request<String>) + Send + Sync + 'static;
 
 #[cfg(not(debug_assertions))]
 mod dialog;
@@ -940,7 +948,10 @@ impl WindowBuilder for WindowBuilderWrapper {
     self
   }
 
-  /// Prevent the window from overflowing the working area (e.g. monitor size - taskbar size) on creation
+  /// Prevent the window from overflowing the working area (e.g. monitor size - taskbar size) on creation.
+  ///
+  /// On Linux/GTK4, this currently falls back to the full monitor geometry because
+  /// GDK4 no longer exposes a portable taskbar/panel-aware work area.
   ///
   /// ## Platform-specific
   ///
@@ -952,7 +963,10 @@ impl WindowBuilder for WindowBuilderWrapper {
     self
   }
 
-  /// Prevent the window from overflowing the working area (e.g. monitor size - taskbar size)
+  /// Prevent the window from overflowing the working area (e.g. monitor size - taskbar size).
+  ///
+  /// On Linux/GTK4, this currently falls back to the full monitor geometry because
+  /// GDK4 no longer exposes a portable taskbar/panel-aware work area.
   /// on creation with a margin
   ///
   /// ## Platform-specific
@@ -1089,7 +1103,7 @@ impl WindowBuilder for WindowBuilderWrapper {
     target_os = "netbsd",
     target_os = "openbsd"
   ))]
-  fn transient_for(mut self, parent: &impl gtk::glib::IsA<gtk::Window>) -> Self {
+  fn transient_for(mut self, parent: &impl gtk::glib::object::IsA<gtk::Window>) -> Self {
     self.inner = self.inner.with_transient_for(parent);
     self
   }
@@ -3330,7 +3344,9 @@ fn handle_user_message<T: UserEvent>(
             target_os = "netbsd",
             target_os = "openbsd"
           ))]
-          WindowMessage::GtkWindow(tx) => tx.send(GtkWindow(window.gtk_window().clone())).unwrap(),
+          WindowMessage::GtkWindow(tx) => tx
+            .send(GtkWindow(window.gtk_window().clone().into()))
+            .unwrap(),
           #[cfg(any(
             target_os = "linux",
             target_os = "dragonfly",
@@ -4564,7 +4580,7 @@ fn create_window<T: UserEvent, F: Fn(RawWindow) + Send + 'static>(
         target_os = "netbsd",
         target_os = "openbsd"
       ))]
-      gtk_window: window.gtk_window(),
+      gtk_window: window.gtk_window().upcast_ref(),
       #[cfg(any(
         target_os = "linux",
         target_os = "dragonfly",
@@ -5051,6 +5067,10 @@ You may have it installed on another user account, but it is not available for t
 
   #[cfg(target_os = "ios")]
   {
+    webview_builder = webview_builder.with_limit_navigations_to_app_bound_domains(
+      webview_attributes.limit_navigations_to_app_bound_domains,
+    );
+
     if let Some(input_accessory_view_builder) = webview_attributes.input_accessory_view_builder {
       webview_builder = webview_builder
         .with_input_accessory_view_builder(move |webview| input_accessory_view_builder.0(webview));
@@ -5145,7 +5165,7 @@ You may have it installed on another user account, but it is not available for t
       target_os = "ios",
       target_os = "android"
     ))]
-    WebviewKind::WindowChild => webview_builder.build_as_child(&window),
+    WebviewKind::WindowChild => webview_builder.build_as_child(window),
     WebviewKind::WindowContent => {
       #[cfg(any(
         target_os = "windows",
@@ -5153,7 +5173,7 @@ You may have it installed on another user account, but it is not available for t
         target_os = "ios",
         target_os = "android"
       ))]
-      let builder = webview_builder.build(&window);
+      let builder = webview_builder.build(window);
       #[cfg(not(any(
         target_os = "windows",
         target_os = "macos",
diff --git a/crates/tauri-runtime-wry/src/monitor/linux.rs b/crates/tauri-runtime-wry/src/monitor/linux.rs
index 62f87eb05c03..e8645d9bf719 100644
--- a/crates/tauri-runtime-wry/src/monitor/linux.rs
+++ b/crates/tauri-runtime-wry/src/monitor/linux.rs
@@ -2,13 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use gtk::prelude::MonitorExt;
+use gtk::gdk::prelude::MonitorExt;
 use tao::platform::unix::MonitorHandleExtUnix;
 use tauri_runtime::dpi::{LogicalPosition, LogicalSize, PhysicalRect};
 
 impl super::MonitorExt for tao::monitor::MonitorHandle {
   fn work_area(&self) -> PhysicalRect<i32, u32> {
-    let rect = self.gdk_monitor().workarea();
+    // GTK4/GDK4 no longer exposes a portable work-area API, so Linux falls
+    // back to full monitor geometry and does not account for panels/taskbars.
+    let rect = self.gdk_monitor().geometry();
     let scale_factor = self.scale_factor();
     PhysicalRect {
       size: LogicalSize::new(rect.width() as u32, rect.height() as u32).to_physical(scale_factor),
diff --git a/crates/tauri-runtime-wry/src/undecorated_resizing.rs b/crates/tauri-runtime-wry/src/undecorated_resizing.rs
index 7a1dad6ff5c9..de392e53de32 100644
--- a/crates/tauri-runtime-wry/src/undecorated_resizing.rs
+++ b/crates/tauri-runtime-wry/src/undecorated_resizing.rs
@@ -506,123 +506,83 @@ mod gtk {
   const BORDERLESS_RESIZE_INSET: i32 = 5;
 
   impl HitTestResult {
-    fn to_gtk_edge(self) -> gtk::gdk::WindowEdge {
+    fn to_gtk_edge(self) -> gtk::gdk::SurfaceEdge {
       match self {
-        HitTestResult::Client | HitTestResult::NoWhere => gtk::gdk::WindowEdge::__Unknown(0),
-        HitTestResult::Left => gtk::gdk::WindowEdge::West,
-        HitTestResult::Right => gtk::gdk::WindowEdge::East,
-        HitTestResult::Top => gtk::gdk::WindowEdge::North,
-        HitTestResult::Bottom => gtk::gdk::WindowEdge::South,
-        HitTestResult::TopLeft => gtk::gdk::WindowEdge::NorthWest,
-        HitTestResult::TopRight => gtk::gdk::WindowEdge::NorthEast,
-        HitTestResult::BottomLeft => gtk::gdk::WindowEdge::SouthWest,
-        HitTestResult::BottomRight => gtk::gdk::WindowEdge::SouthEast,
+        HitTestResult::Client | HitTestResult::NoWhere => gtk::gdk::SurfaceEdge::__Unknown(8),
+        HitTestResult::Left => gtk::gdk::SurfaceEdge::West,
+        HitTestResult::Right => gtk::gdk::SurfaceEdge::East,
+        HitTestResult::Top => gtk::gdk::SurfaceEdge::North,
+        HitTestResult::Bottom => gtk::gdk::SurfaceEdge::South,
+        HitTestResult::TopLeft => gtk::gdk::SurfaceEdge::NorthWest,
+        HitTestResult::TopRight => gtk::gdk::SurfaceEdge::NorthEast,
+        HitTestResult::BottomLeft => gtk::gdk::SurfaceEdge::SouthWest,
+        HitTestResult::BottomRight => gtk::gdk::SurfaceEdge::SouthEast,
       }
     }
   }
 
   pub fn attach_resize_handler(webview: &wry::WebView) {
     use gtk::{
-      gdk::{prelude::*, WindowEdge},
-      glib::Propagation,
+      gdk::{self, SurfaceEdge},
       prelude::*,
+      GestureClick,
     };
     use wry::WebViewExtUnix;
 
     let webview = webview.webview();
+    let click_controller = GestureClick::new();
+    click_controller.set_button(gdk::BUTTON_PRIMARY);
+
+    let webview_ = webview.clone();
+    click_controller.connect_pressed(move |event, _, x, y| {
+      let Some(window) = webview_
+        .root()
+        .and_then(|root| root.downcast::<gtk::Window>().ok())
+      else {
+        return;
+      };
 
-    webview.add_events(
-      gtk::gdk::EventMask::BUTTON1_MOTION_MASK
-        | gtk::gdk::EventMask::BUTTON_PRESS_MASK
-        | gtk::gdk::EventMask::TOUCH_MASK,
-    );
-
-    webview.connect_button_press_event(
-      move |webview: &webkit2gtk::WebView, event: &gtk::gdk::EventButton| {
-        if event.button() == 1 {
-          // This one should be GtkBox
-          if let Some(window) = webview.parent().and_then(|w| w.parent()) {
-            // Safe to unwrap unless this is not from tao
-            let window: gtk::Window = window.downcast().unwrap();
-            if !window.is_decorated() && window.is_resizable() && !window.is_maximized() {
-              if let Some(window) = window.window() {
-                let (root_x, root_y) = event.root();
-                let (window_x, window_y) = window.position();
-                let (client_x, client_y) = (root_x - window_x as f64, root_y - window_y as f64);
-                let border = window.scale_factor() * BORDERLESS_RESIZE_INSET;
-                let edge = hit_test(
-                  0.0,
-                  0.0,
-                  window.width() as f64,
-                  window.height() as f64,
-                  client_x,
-                  client_y,
-                  border as _,
-                  border as _,
-                )
-                .to_gtk_edge();
-
-                // we ignore the `__Unknown` variant so the webview receives the click correctly if it is not on the edges.
-                match edge {
-                  WindowEdge::__Unknown(_) => (),
-                  _ => {
-                    window.begin_resize_drag(edge, 1, root_x as i32, root_y as i32, event.time())
-                  }
-                }
-              }
-            }
-          }
-        }
+      if window.is_decorated() || !window.is_resizable() || window.is_maximized() {
+        return;
+      }
 
-        Propagation::Proceed
-      },
-    );
-
-    webview.connect_touch_event(
-      move |webview: &webkit2gtk::WebView, event: &gtk::gdk::Event| {
-        // This one should be GtkBox
-        if let Some(window) = webview.parent().and_then(|w| w.parent()) {
-          // Safe to unwrap unless this is not from tao
-          let window: gtk::Window = window.downcast().unwrap();
-          if !window.is_decorated() && window.is_resizable() && !window.is_maximized() {
-            if let Some(window) = window.window() {
-              if let Some((root_x, root_y)) = event.root_coords() {
-                if let Some(device) = event.device() {
-                  let (window_x, window_y) = window.position();
-                  let (client_x, client_y) = (root_x - window_x as f64, root_y - window_y as f64);
-                  let border = window.scale_factor() * BORDERLESS_RESIZE_INSET;
-                  let edge = hit_test(
-                    0.0,
-                    0.0,
-                    window.width() as f64,
-                    window.height() as f64,
-                    client_x,
-                    client_y,
-                    border as _,
-                    border as _,
-                  )
-                  .to_gtk_edge();
-
-                  // we ignore the `__Unknown` variant so the window receives the click correctly if it is not on the edges.
-                  match edge {
-                    WindowEdge::__Unknown(_) => (),
-                    _ => window.begin_resize_drag_for_device(
-                      edge,
-                      &device,
-                      0,
-                      root_x as i32,
-                      root_y as i32,
-                      event.time(),
-                    ),
-                  }
-                }
-              }
+      let Some((client_x, client_y)) = webview_.translate_coordinates(&window, x, y) else {
+        return;
+      };
+
+      let border = window.scale_factor() * BORDERLESS_RESIZE_INSET;
+      let edge = hit_test(
+        0.0,
+        0.0,
+        window.width() as f64,
+        window.height() as f64,
+        client_x,
+        client_y,
+        border as _,
+        border as _,
+      )
+      .to_gtk_edge();
+
+      // Ignore the `__Unknown` variant so the webview receives the click correctly if it is not on the edges.
+      match edge {
+        SurfaceEdge::__Unknown(_) => (),
+        _ => {
+          if let Some(surface) = window.surface() {
+            if let Ok(toplevel) = surface.downcast::<gdk::Toplevel>() {
+              toplevel.begin_resize(
+                edge,
+                event.device().as_ref(),
+                event.button() as i32,
+                client_x,
+                client_y,
+                event.current_event_time(),
+              );
             }
           }
         }
+      }
+    });
 
-        Propagation::Proceed
-      },
-    );
+    webview.add_controller(click_controller);
   }
 }
diff --git a/crates/tauri-runtime-wry/src/webview.rs b/crates/tauri-runtime-wry/src/webview.rs
index 69a7863a4fd3..73f4c702c3a8 100644
--- a/crates/tauri-runtime-wry/src/webview.rs
+++ b/crates/tauri-runtime-wry/src/webview.rs
@@ -10,7 +10,7 @@
   target_os = "openbsd"
 ))]
 mod imp {
-  pub type Webview = webkit2gtk::WebView;
+  pub type Webview = webkit::WebView;
 }
 
 #[cfg(target_vendor = "apple")]
diff --git a/crates/tauri-runtime-wry/src/window/macos.rs b/crates/tauri-runtime-wry/src/window/macos.rs
index 6bb16ce3e5f1..4a1d9a360599 100644
--- a/crates/tauri-runtime-wry/src/window/macos.rs
+++ b/crates/tauri-runtime-wry/src/window/macos.rs
@@ -24,16 +24,16 @@ impl super::WindowExt for tao::window::Window {
           false,
         )
       };
-      unsafe { sheet.setAlphaValue(0.5) };
-      unsafe { ns_window.beginSheet_completionHandler(&sheet, None) };
-    } else if let Some(attached) = unsafe { ns_window.attachedSheet() } {
-      unsafe { ns_window.endSheet(&attached) };
+      sheet.setAlphaValue(0.5);
+      ns_window.beginSheet_completionHandler(&sheet, None);
+    } else if let Some(attached) = ns_window.attachedSheet() {
+      ns_window.endSheet(&attached);
     }
   }
 
   fn is_enabled(&self) -> bool {
     let ns_window: &NSWindow = unsafe { &*self.ns_window().cast() };
-    unsafe { ns_window.attachedSheet() }.is_none()
+    ns_window.attachedSheet().is_none()
   }
 
   fn center(&self) {
diff --git a/crates/tauri-runtime/Cargo.toml b/crates/tauri-runtime/Cargo.toml
index c2c54cccc519..e034a688aed3 100644
--- a/crates/tauri-runtime/Cargo.toml
+++ b/crates/tauri-runtime/Cargo.toml
@@ -43,8 +43,8 @@ features = ["Win32_Foundation", "Win32_System_WinRT"]
 webview2-com = "0.38"
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
-gtk = { version = "0.18", features = ["v3_24"] }
-webkit2gtk = { version = "=2.0", features = ["v2_40"] }
+gtk = { package = "gtk4", version = "0.11", features = ["v4_10"] }
+webkit = { package = "webkit6", version = "0.6", features = ["v2_42"] }
 
 [target."cfg(target_os = \"android\")".dependencies]
 jni = "0.21"
diff --git a/crates/tauri-runtime/src/webview.rs b/crates/tauri-runtime/src/webview.rs
index d7fb9c80f311..36206e1d6541 100644
--- a/crates/tauri-runtime/src/webview.rs
+++ b/crates/tauri-runtime/src/webview.rs
@@ -31,13 +31,13 @@ type UriSchemeProtocolHandler = dyn Fn(&str, http::Request<Vec<u8>>, Box<dyn FnO
 type WebResourceRequestHandler =
   dyn Fn(http::Request<Vec<u8>>, &mut http::Response<Cow<'static, [u8]>>) + Send + Sync;
 
-type NavigationHandler = dyn Fn(&Url) -> bool + Send;
+type NavigationHandler = dyn Fn(&Url) -> bool + Send + Sync;
 
 type NewWindowHandler = dyn Fn(Url, NewWindowFeatures) -> NewWindowResponse + Send;
 
-type OnPageLoadHandler = dyn Fn(Url, PageLoadEvent) + Send;
+type OnPageLoadHandler = dyn Fn(Url, PageLoadEvent) + Send + Sync;
 
-type DocumentTitleChangedHandler = dyn Fn(String) + Send + 'static;
+type DocumentTitleChangedHandler = dyn Fn(String) + Send + Sync + 'static;
 
 type DownloadHandler = dyn Fn(DownloadEvent) -> bool + Send + Sync;
 
@@ -101,7 +101,7 @@ pub struct NewWindowOpener {
     target_os = "netbsd",
     target_os = "openbsd",
   ))]
-  pub webview: webkit2gtk::WebView,
+  pub webview: webkit::WebView,
   /// The instance of the webview that initiated the new window request.
   ///
   /// The target webview environment **MUST** match the environment of the opener webview. See [`WebviewAttributes::with_environment`].
@@ -402,6 +402,8 @@ pub struct WebviewAttributes {
   /// This relies on [`objc2_ui_kit`] which does not provide a stable API yet, so it can receive breaking changes in minor releases.
   #[cfg(target_os = "ios")]
   pub input_accessory_view_builder: Option<InputAccessoryViewBuilder>,
+  #[cfg(target_os = "ios")]
+  pub limit_navigations_to_app_bound_domains: bool,
 
   /// Set the environment for the webview.
   /// Useful if you need to share the same environment, for instance when using the [`PendingWebview::new_window_handler`].
@@ -417,7 +419,7 @@ pub struct WebviewAttributes {
     target_os = "netbsd",
     target_os = "openbsd",
   ))]
-  pub related_view: Option<webkit2gtk::WebView>,
+  pub related_view: Option<webkit::WebView>,
 
   #[cfg(target_os = "macos")]
   pub webview_configuration: Option<objc2::rc::Retained<objc2_web_kit::WKWebViewConfiguration>>,
@@ -460,6 +462,7 @@ impl From<&WindowConfig> for WebviewAttributes {
         ConfigScrollBarStyle::FluentOverlay => ScrollBarStyle::FluentOverlay,
         _ => ScrollBarStyle::Default,
       })
+      .limit_navigations_to_app_bound_domains(config.limit_navigations_to_app_bound_domains)
       .general_autofill_enabled(config.general_autofill_enabled);
 
     #[cfg(any(not(target_os = "macos"), feature = "macos-private-api"))]
@@ -538,6 +541,8 @@ impl WebviewAttributes {
       general_autofill_enabled: true,
       #[cfg(target_os = "ios")]
       input_accessory_view_builder: None,
+      #[cfg(target_os = "ios")]
+      limit_navigations_to_app_bound_domains: false,
       #[cfg(windows)]
       environment: None,
       #[cfg(any(
@@ -619,7 +624,9 @@ impl WebviewAttributes {
     self
   }
 
-  /// Disables the drag and drop handler. This is required to use HTML5 drag and drop APIs on the frontend on Windows.
+  /// Disables the drag and drop handler used internally to generate [`DragDropEvent`](crate::window::DragDropEvent)s.
+  ///
+  /// This is required to use HTML5 drag and drop APIs on the frontend on Windows since we replace the drag drop handler of WebView2.
   #[must_use]
   pub fn disable_drag_drop_handler(mut self) -> Self {
     self.drag_drop_handler_enabled = false;
@@ -789,6 +796,65 @@ impl WebviewAttributes {
     self
   }
 
+  /// Whether to limit navigations to App-Bound Domains. This is necessary to
+  /// enable Service Workers on iOS according to
+  /// [StackOverflow](https://stackoverflow.com/questions/49673399/service-workers-unavailable-in-wkwebview-in-ios-11-3/64155509#64155509).
+  ///
+  /// Default is false.
+  ///
+  /// Note: If you pass in `true` make sure to add localhost and any [`registrable
+  /// domains`](https://developer.mozilla.org/en-US/docs/Glossary/Registrable_domain)
+  /// used in this webview to tauri-src/Info.ios.plist:
+  ///
+  /// ```xml
+  /// <plist>
+  /// <dict>
+  ///     <key>WKAppBoundDomains</key>
+  ///     <array>
+  ///         <string>localhost</string>
+  ///         <string>aregistrabledomain.example</string>
+  ///     </array>
+  /// </dict>
+  /// </plist>
+  /// ```
+  ///
+  /// You must add `localhost` if any webview with this set to true opens a
+  /// local webpage, makes any localhost calls, or uses the isolation pattern
+  /// because Tauri uses the `localhost` domain for hosting the application
+  /// webpage, the IPC protocol, and the isolation pattern's iframe.
+  ///
+  /// Requests served through custom uri schemes are allowed so long as they use
+  /// a registrable domain specified in the `WKAppBoundDomains` array for all the
+  /// requests from the app, including requests for the `localhost` domain.
+  ///
+  /// In theory, you can whitelist an entire uri scheme by including the
+  /// protocol name followed by a colon. For example, to allow all requests
+  /// using a custom "stream" uri scheme (see [this tauri
+  /// example](https://github.com/tauri-apps/tauri/blob/dev/examples/streaming/main.rs)),
+  /// you could add `stream:` to the AppBoundDomains array. That said, I'm not
+  /// sure whether Apple would let your app through app review if you do
+  /// whitelist an entire protocol because this feature is not mentioned in
+  /// [their blog post on App-Bound
+  /// Domains](https://webkit.org/blog/10882/app-bound-domains/).
+  ///
+  /// See https://webkit.org/blog/10882/app-bound-domains/ and
+  /// https://developer.apple.com/documentation/webkit/wkwebviewconfiguration/limitsnavigationstoappbounddomains
+  /// for the official documentation on App-Bound Domains.
+  ///
+  /// ## Platform-specific
+  ///
+  /// - **iOS**: Supported since version 14.0+.
+  /// - **Linux / Windows / Android / MacOS:** Unsupported.
+  #[must_use]
+  #[allow(unused_variables, unused_mut)]
+  pub fn limit_navigations_to_app_bound_domains(mut self, limit_navigations: bool) -> Self {
+    #[cfg(target_os = "ios")]
+    {
+      self.limit_navigations_to_app_bound_domains = limit_navigations;
+    }
+    self
+  }
+
   /// Change the default background throttling behavior.
   ///
   /// By default, browsers use a suspend policy that will throttle timers and even unload
@@ -853,7 +919,8 @@ impl WebviewAttributes {
 }
 
 /// IPC handler.
-pub type WebviewIpcHandler<T, R> = Box<dyn Fn(DetachedWebview<T, R>, Request<String>) + Send>;
+pub type WebviewIpcHandler<T, R> =
+  Box<dyn Fn(DetachedWebview<T, R>, Request<String>) + Send + Sync>;
 
 /// An initialization script
 #[derive(Debug, Clone)]
diff --git a/crates/tauri-runtime/src/window.rs b/crates/tauri-runtime/src/window.rs
index 936280ca18c3..94cf98381aef 100644
--- a/crates/tauri-runtime/src/window.rs
+++ b/crates/tauri-runtime/src/window.rs
@@ -287,7 +287,10 @@ pub trait WindowBuilder: WindowBuilderBase {
   #[must_use]
   fn inner_size_constraints(self, constraints: WindowSizeConstraints) -> Self;
 
-  /// Prevent the window from overflowing the working area (e.g. monitor size - taskbar size) on creation
+  /// Prevent the window from overflowing the working area (e.g. monitor size - taskbar size) on creation.
+  ///
+  /// On Linux/GTK4, this currently falls back to the full monitor geometry because
+  /// GDK4 no longer exposes a portable taskbar/panel-aware work area.
   ///
   /// ## Platform-specific
   ///
@@ -295,7 +298,10 @@ pub trait WindowBuilder: WindowBuilderBase {
   #[must_use]
   fn prevent_overflow(self) -> Self;
 
-  /// Prevent the window from overflowing the working area (e.g. monitor size - taskbar size)
+  /// Prevent the window from overflowing the working area (e.g. monitor size - taskbar size).
+  ///
+  /// On Linux/GTK4, this currently falls back to the full monitor geometry because
+  /// GDK4 no longer exposes a portable taskbar/panel-aware work area.
   /// on creation with a margin
   ///
   /// ## Platform-specific
@@ -447,7 +453,7 @@ pub trait WindowBuilder: WindowBuilderBase {
 
   /// Sets the window to be created transient for parent.
   ///
-  /// See <https://docs.gtk.org/gtk3/method.Window.set_transient_for.html>
+  /// See <https://docs.gtk.org/gtk4/method.Window.set_transient_for.html>
   #[cfg(any(
     target_os = "linux",
     target_os = "dragonfly",
@@ -455,7 +461,7 @@ pub trait WindowBuilder: WindowBuilderBase {
     target_os = "netbsd",
     target_os = "openbsd"
   ))]
-  fn transient_for(self, parent: &impl gtk::glib::IsA<gtk::Window>) -> Self;
+  fn transient_for(self, parent: &impl gtk::glib::object::IsA<gtk::Window>) -> Self;
 
   /// Enables or disables drag and drop support.
   #[cfg(windows)]
diff --git a/crates/tauri-schema-generator/schemas/config.schema.json b/crates/tauri-schema-generator/schemas/config.schema.json
index 83e3f88a3d0e..74560b92b988 100644
--- a/crates/tauri-schema-generator/schemas/config.schema.json
+++ b/crates/tauri-schema-generator/schemas/config.schema.json
@@ -257,7 +257,7 @@
           ]
         },
         "dragDropEnabled": {
-          "description": "Whether the drag and drop is enabled or not on the webview. By default it is enabled.\n\n Disabling it is required to use HTML5 drag and drop on the frontend on Windows.",
+          "description": "Whether the drag and drop handlers used internally to generate [`DragDropEvent`]s are enabled on the webview. By default it is enabled.\n\n Disabling it is required to use HTML5 drag and drop on the frontend on Windows since we replace the drag drop handler of WebView2.\n\n Note: this setting maps to [`WebviewBuilder::disable_drag_drop_handler`], not [`WindowBuilder::drag_and_drop`].\n\n [`DragDropEvent`]: https://docs.rs/tauri/latest/tauri/enum.DragDropEvent.html\n [`WebviewBuilder::disable_drag_drop_handler`]: https://docs.rs/tauri/latest/tauri/webview/struct.WebviewBuilder.html#method.disable_drag_drop_handler\n [`WindowBuilder::drag_and_drop`]: https://docs.rs/tauri/latest/x86_64-pc-windows-msvc/tauri/window/struct.WindowBuilder.html#method.drag_and_drop",
           "default": true,
           "type": "boolean"
         },
@@ -614,6 +614,11 @@
             }
           ]
         },
+        "limitNavigationsToAppBoundDomains": {
+          "description": "Whether to limit navigations to App-Bound Domains. This is necessary to\n enable Service Workers on iOS according to\n [StackOverflow](https://stackoverflow.com/questions/49673399/service-workers-unavailable-in-wkwebview-in-ios-11-3/64155509#64155509).\n\n Default is false.\n\n Note: If you set this to `true` make sure to add localhost and any [`registrable\n domains`](https://developer.mozilla.org/en-US/docs/Glossary/Registrable_domain)\n used in this webview to src-tauri/Info.ios.plist:\n\n ```xml\n <plist>\n <dict>\n     <key>WKAppBoundDomains</key>\n     <array>\n         <string>localhost</string>\n         <string>aregistrabledomain.example</string>\n     </array>\n </dict>\n </plist>\n ```\n\n You must add `localhost` if any webview with this set to true opens a\n local webpage, makes any localhost calls, or uses the isolation pattern\n because Tauri uses the `localhost` domain for hosting the application\n webpage, the IPC protocol, and the isolation pattern's iframe.\n\n Requests served through custom uri schemes are allowed so long as they use\n a registrable domain specified in the `WKAppBoundDomains` array for all the\n requests from the app, including requests for the `localhost` domain.\n\n In theory, you can whitelist an entire uri scheme by including the\n protocol name followed by a colon. For example, to allow all requests\n using a custom \"stream\" uri scheme (see [this tauri\n example](https://github.com/tauri-apps/tauri/blob/dev/examples/streaming/main.rs)),\n you could add `stream:` to the AppBoundDomains array. That said, I'm not\n sure whether Apple would let your app through app review if you do\n whitelist an entire protocol because this feature is not mentioned in\n [their blog post on App-Bound\n Domains](https://webkit.org/blog/10882/app-bound-domains/).\n\n See https://webkit.org/blog/10882/app-bound-domains/ and\n https://developer.apple.com/documentation/webkit/wkwebviewconfiguration/limitsnavigationstoappbounddomains\n for the official documentation on App-Bound Domains.\n\n ## Platform-specific\n\n - **iOS**: Supported since version 14.0+.\n - **Linux / Windows / Android / MacOS:** Unsupported.",
+          "default": false,
+          "type": "boolean"
+        },
         "activityName": {
           "description": "The name of the Android activity to create for this window.",
           "type": [
diff --git a/crates/tauri-utils/src/acl/resolved.rs b/crates/tauri-utils/src/acl/resolved.rs
index 8aa4322f5640..101725e95874 100644
--- a/crates/tauri-utils/src/acl/resolved.rs
+++ b/crates/tauri-utils/src/acl/resolved.rs
@@ -19,16 +19,37 @@ use super::{
 /// A key for a scope, used to link a [`ResolvedCommand#structfield.scope`] to the store [`Resolved#structfield.scopes`].
 pub type ScopeKey = u64;
 
+// All the fields are marked with `#[cfg(debug_assertions)]` but not the struct itself is because
+// we want to avoid compilation errors on different `debug_assertions` settings,
+// see https://github.com/tauri-apps/tauri/issues/13865
 /// Metadata for what referenced a [`ResolvedCommand`].
-#[cfg(debug_assertions)]
 #[derive(Default, Clone, PartialEq, Eq)]
 pub struct ResolvedCommandReference {
   /// Identifier of the capability.
+  #[cfg(debug_assertions)]
   pub capability: String,
   /// Identifier of the permission.
+  #[cfg(debug_assertions)]
   pub permission: String,
 }
 
+impl ResolvedCommandReference {
+  /// Internal helper for tauri-macros to avoid compilation errors on different `debug_assertions` settings,
+  /// see https://github.com/tauri-apps/tauri/issues/13865
+  #[doc(hidden)]
+  pub fn new(
+    #[cfg_attr(not(debug_assertions), allow(unused))] capability: String,
+    #[cfg_attr(not(debug_assertions), allow(unused))] permission: String,
+  ) -> Self {
+    Self {
+      #[cfg(debug_assertions)]
+      capability,
+      #[cfg(debug_assertions)]
+      permission,
+    }
+  }
+}
+
 /// A resolved command permission.
 #[derive(Default, Clone, PartialEq, Eq)]
 pub struct ResolvedCommand {
@@ -45,6 +66,28 @@ pub struct ResolvedCommand {
   pub scope_id: Option<ScopeKey>,
 }
 
+impl ResolvedCommand {
+  /// Internal helper for tauri-macros to avoid compilation errors on different `debug_assertions` settings,
+  /// see https://github.com/tauri-apps/tauri/issues/13865
+  #[doc(hidden)]
+  pub fn new(
+    context: ExecutionContext,
+    #[cfg_attr(not(debug_assertions), allow(unused))] referenced_by: ResolvedCommandReference,
+    windows: Vec<glob::Pattern>,
+    webviews: Vec<glob::Pattern>,
+    scope_id: Option<ScopeKey>,
+  ) -> Self {
+    Self {
+      context,
+      #[cfg(debug_assertions)]
+      referenced_by,
+      windows,
+      webviews,
+      scope_id,
+    }
+  }
+}
+
 impl fmt::Debug for ResolvedCommand {
   fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     f.debug_struct("ResolvedCommand")
@@ -452,12 +495,9 @@ mod build {
     fn to_tokens(&self, tokens: &mut TokenStream) {
       let capability = str_lit(&self.capability);
       let permission = str_lit(&self.permission);
-      literal_struct!(
-        tokens,
-        ::tauri::utils::acl::resolved::ResolvedCommandReference,
-        capability,
-        permission
-      )
+      tokens.append_all(quote! {
+        ::tauri::utils::acl::resolved::ResolvedCommandReference::new(#capability, #permission)
+      });
     }
   }
 
@@ -465,6 +505,9 @@ mod build {
     fn to_tokens(&self, tokens: &mut TokenStream) {
       #[cfg(debug_assertions)]
       let referenced_by = &self.referenced_by;
+      #[cfg(not(debug_assertions))]
+      let referenced_by =
+        quote!(::tauri::utils::acl::resolved::ResolvedCommandReference::default());
 
       let context = &self.context;
 
@@ -478,27 +521,15 @@ mod build {
       });
       let scope_id = opt_lit(self.scope_id.as_ref());
 
-      #[cfg(debug_assertions)]
-      {
-        literal_struct!(
-          tokens,
-          ::tauri::utils::acl::resolved::ResolvedCommand,
-          context,
-          referenced_by,
-          windows,
-          webviews,
-          scope_id
+      tokens.append_all(quote! {
+        ::tauri::utils::acl::resolved::ResolvedCommand::new(
+          #context,
+          #referenced_by,
+          #windows,
+          #webviews,
+          #scope_id
         )
-      }
-      #[cfg(not(debug_assertions))]
-      literal_struct!(
-        tokens,
-        ::tauri::utils::acl::resolved::ResolvedCommand,
-        context,
-        windows,
-        webviews,
-        scope_id
-      )
+      })
     }
   }
 
diff --git a/crates/tauri-utils/src/config.rs b/crates/tauri-utils/src/config.rs
index d464af84e874..da0c5369760c 100644
--- a/crates/tauri-utils/src/config.rs
+++ b/crates/tauri-utils/src/config.rs
@@ -1953,9 +1953,15 @@ pub struct WindowConfig {
   /// The user agent for the webview
   #[serde(alias = "user-agent")]
   pub user_agent: Option<String>,
-  /// Whether the drag and drop is enabled or not on the webview. By default it is enabled.
+  /// Whether the drag and drop handlers used internally to generate [`DragDropEvent`]s are enabled on the webview. By default it is enabled.
   ///
-  /// Disabling it is required to use HTML5 drag and drop on the frontend on Windows.
+  /// Disabling it is required to use HTML5 drag and drop on the frontend on Windows since we replace the drag drop handler of WebView2.
+  ///
+  /// Note: this setting maps to [`WebviewBuilder::disable_drag_drop_handler`], not [`WindowBuilder::drag_and_drop`].
+  ///
+  /// [`DragDropEvent`]: https://docs.rs/tauri/latest/tauri/enum.DragDropEvent.html
+  /// [`WebviewBuilder::disable_drag_drop_handler`]: https://docs.rs/tauri/latest/tauri/webview/struct.WebviewBuilder.html#method.disable_drag_drop_handler
+  /// [`WindowBuilder::drag_and_drop`]: https://docs.rs/tauri/latest/x86_64-pc-windows-msvc/tauri/window/struct.WindowBuilder.html#method.drag_and_drop
   #[serde(default = "default_true", alias = "drag-drop-enabled")]
   pub drag_drop_enabled: bool,
   /// Whether or not the window starts centered or not.
@@ -2276,6 +2282,58 @@ pub struct WindowConfig {
   /// - **Linux / Android / iOS / macOS**: Unsupported. Only supports `Default` and performs no operation.
   #[serde(default, alias = "scroll-bar-style")]
   pub scroll_bar_style: ScrollBarStyle,
+
+  /// Whether to limit navigations to App-Bound Domains. This is necessary to
+  /// enable Service Workers on iOS according to
+  /// [StackOverflow](https://stackoverflow.com/questions/49673399/service-workers-unavailable-in-wkwebview-in-ios-11-3/64155509#64155509).
+  ///
+  /// Default is false.
+  ///
+  /// Note: If you set this to `true` make sure to add localhost and any [`registrable
+  /// domains`](https://developer.mozilla.org/en-US/docs/Glossary/Registrable_domain)
+  /// used in this webview to src-tauri/Info.ios.plist:
+  ///
+  /// ```xml
+  /// <plist>
+  /// <dict>
+  ///     <key>WKAppBoundDomains</key>
+  ///     <array>
+  ///         <string>localhost</string>
+  ///         <string>aregistrabledomain.example</string>
+  ///     </array>
+  /// </dict>
+  /// </plist>
+  /// ```
+  ///
+  /// You must add `localhost` if any webview with this set to true opens a
+  /// local webpage, makes any localhost calls, or uses the isolation pattern
+  /// because Tauri uses the `localhost` domain for hosting the application
+  /// webpage, the IPC protocol, and the isolation pattern's iframe.
+  ///
+  /// Requests served through custom uri schemes are allowed so long as they use
+  /// a registrable domain specified in the `WKAppBoundDomains` array for all the
+  /// requests from the app, including requests for the `localhost` domain.
+  ///
+  /// In theory, you can whitelist an entire uri scheme by including the
+  /// protocol name followed by a colon. For example, to allow all requests
+  /// using a custom "stream" uri scheme (see [this tauri
+  /// example](https://github.com/tauri-apps/tauri/blob/dev/examples/streaming/main.rs)),
+  /// you could add `stream:` to the AppBoundDomains array. That said, I'm not
+  /// sure whether Apple would let your app through app review if you do
+  /// whitelist an entire protocol because this feature is not mentioned in
+  /// [their blog post on App-Bound
+  /// Domains](https://webkit.org/blog/10882/app-bound-domains/).
+  ///
+  /// See https://webkit.org/blog/10882/app-bound-domains/ and
+  /// https://developer.apple.com/documentation/webkit/wkwebviewconfiguration/limitsnavigationstoappbounddomains
+  /// for the official documentation on App-Bound Domains.
+  ///
+  /// ## Platform-specific
+  ///
+  /// - **iOS**: Supported since version 14.0+.
+  /// - **Linux / Windows / Android / MacOS:** Unsupported.
+  #[serde(default, alias = "limit-navigations-to-app-bound-domains")]
+  pub limit_navigations_to_app_bound_domains: bool,
   /// The name of the Android activity to create for this window.
   #[serde(default, alias = "activity-name")]
   pub activity_name: Option<String>,
@@ -2373,6 +2431,7 @@ impl Default for WindowConfig {
       data_directory: None,
       data_store_identifier: None,
       scroll_bar_style: ScrollBarStyle::Default,
+      limit_navigations_to_app_bound_domains: false,
       activity_name: None,
       created_by_activity_name: None,
       requested_by_scene_identifier: None,
@@ -3950,6 +4009,7 @@ mod build {
       let data_directory = opt_lit(self.data_directory.as_ref().map(path_buf_lit).as_ref());
       let data_store_identifier = opt_vec_lit(self.data_store_identifier, identity);
       let scroll_bar_style = &self.scroll_bar_style;
+      let limit_navigations_to_app_bound_domains = self.limit_navigations_to_app_bound_domains;
       let activity_name = opt_lit(self.activity_name.as_ref());
       let created_by_activity_name = opt_lit(self.created_by_activity_name.as_ref());
       let requested_by_scene_identifier = opt_lit(self.requested_by_scene_identifier.as_ref());
@@ -4016,6 +4076,7 @@ mod build {
         data_directory,
         data_store_identifier,
         scroll_bar_style,
+        limit_navigations_to_app_bound_domains,
         activity_name,
         created_by_activity_name,
         requested_by_scene_identifier,
diff --git a/crates/tauri/Cargo.toml b/crates/tauri/Cargo.toml
index 3f1dd5f82e2d..8b9d862db938 100644
--- a/crates/tauri/Cargo.toml
+++ b/crates/tauri/Cargo.toml
@@ -93,13 +93,15 @@ muda = { version = "0.19", default-features = false, features = [
 ] }
 tray-icon = { version = "0.24", default-features = false, features = [
   "serde",
-  "gtk",
+  "linux-ksni",
 ], optional = true }
 
 # linux
 [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd"))'.dependencies]
-gtk = { version = "0.18", features = ["v3_24"] }
-webkit2gtk = { version = "2", features = ["v2_40"], optional = true }
+gtk = { package = "gtk4", version = "0.11", features = ["v4_10"] }
+webkit = { package = "webkit6", version = "0.6", features = [
+  "v2_42",
+], optional = true }
 
 # darwin
 [target.'cfg(target_vendor = "apple")'.dependencies]
@@ -206,7 +208,7 @@ tray-icon = ["dep:tray-icon"]
 tracing = ["dep:tracing", "tauri-macros/tracing", "tauri-runtime-wry?/tracing"]
 test = []
 compression = ["tauri-macros/compression", "tauri-utils/compression"]
-wry = ["webview2-com", "webkit2gtk", "tauri-runtime-wry"]
+wry = ["webview2-com", "webkit", "tauri-runtime-wry"]
 # TODO: Remove in v3 - wry does not have this feature anymore
 objc-exception = []
 linux-libxdo = ["tray-icon/libxdo", "muda/libxdo"]
diff --git a/crates/tauri/mobile/android/build.gradle.kts b/crates/tauri/mobile/android/build.gradle.kts
index f997910c9b33..e633a072f429 100644
--- a/crates/tauri/mobile/android/build.gradle.kts
+++ b/crates/tauri/mobile/android/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
@@ -27,14 +29,17 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
     buildFeatures {
         buildConfig = true
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_1_8
+    }
+}
+
 dependencies {
 
     implementation("androidx.core:core-ktx:1.7.0")
diff --git a/crates/tauri/src/app.rs b/crates/tauri/src/app.rs
index 27f2131dba59..1b47f1b380de 100644
--- a/crates/tauri/src/app.rs
+++ b/crates/tauri/src/app.rs
@@ -536,7 +536,7 @@ impl<R: Runtime> AppHandle<R> {
   pub fn plugin_boxed(&self, mut plugin: Box<dyn Plugin<R>>) -> crate::Result<()> {
     let mut store = self.manager().plugins.lock().unwrap();
     store.initialize(&mut plugin, self, &self.config().plugins)?;
-    store.register(plugin);
+    store.register_initialized(plugin);
 
     Ok(())
   }
@@ -679,11 +679,16 @@ impl<R: Runtime> AppHandle<R> {
   #[cfg(target_os = "ios")]
   pub fn supports_multiple_windows(&self) -> bool {
     let (tx, rx) = std::sync::mpsc::channel();
-    let _ = self.run_on_main_thread(move || unsafe {
-      let mtm = objc2::MainThreadMarker::new().unwrap();
-      let ui_application = objc2_ui_kit::UIApplication::sharedApplication(mtm);
-      tx.send(ui_application.supportsMultipleScenes()).unwrap();
-    });
+    if self
+      .run_on_main_thread(move || {
+        let mtm = objc2::MainThreadMarker::new().unwrap();
+        let ui_application = objc2_ui_kit::UIApplication::sharedApplication(mtm);
+        tx.send(ui_application.supportsMultipleScenes()).unwrap();
+      })
+      .is_err()
+    {
+      return false;
+    }
     rx.recv().unwrap()
   }
 }
@@ -1263,11 +1268,9 @@ impl<R: Runtime> App<R> {
   /// Whether the application supports multiple windows.
   #[cfg(target_os = "ios")]
   pub fn supports_multiple_windows(&self) -> bool {
-    unsafe {
-      let mtm = objc2::MainThreadMarker::new().unwrap();
-      let ui_application = objc2_ui_kit::UIApplication::sharedApplication(mtm);
-      ui_application.supportsMultipleScenes()
-    }
+    let mtm = objc2::MainThreadMarker::new().unwrap();
+    let ui_application = objc2_ui_kit::UIApplication::sharedApplication(mtm);
+    ui_application.supportsMultipleScenes()
   }
 
   /// Sets the activation policy for the application. It is set to `NSApplicationActivationPolicyRegular` by default.
@@ -2090,7 +2093,7 @@ tauri::Builder::default()
   ///
   /// Leverages [setURLSchemeHandler](https://developer.apple.com/documentation/webkit/wkwebviewconfiguration/2875766-seturlschemehandler) on macOS,
   /// [AddWebResourceRequestedFilter](https://docs.microsoft.com/en-us/dotnet/api/microsoft.web.webview2.core.corewebview2.addwebresourcerequestedfilter?view=webview2-dotnet-1.0.774.44) on Windows
-  /// and [webkit-web-context-register-uri-scheme](https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebContext.html#webkit-web-context-register-uri-scheme) on Linux.
+  /// and `webkit_web_context_register_uri_scheme` on Linux.
   ///
   /// # Arguments
   ///
@@ -2380,6 +2383,8 @@ tauri::Builder::default()
       ran_setup: false,
     };
 
+    app.register_core_plugins()?;
+
     #[cfg(desktop)]
     if let Some(menu) = self.menu {
       let menu = menu(&app.handle)?;
@@ -2395,8 +2400,6 @@ tauri::Builder::default()
       app.manager.menu.menu_lock().replace(menu);
     }
 
-    app.register_core_plugins()?;
-
     let env = Env::default();
     app.manage(env);
 
diff --git a/crates/tauri/src/ipc/channel.rs b/crates/tauri/src/ipc/channel.rs
index 0b3eb6778920..76fffed89ecb 100644
--- a/crates/tauri/src/ipc/channel.rs
+++ b/crates/tauri/src/ipc/channel.rs
@@ -56,7 +56,7 @@ const _: () = {
   #[derive(specta::Type)]
   #[specta(remote = super::Channel)]
   #[allow(dead_code, non_camel_case_types)]
-  struct TAURI_CHANNEL<TSend>(std::marker::PhantomData<TSend>);
+  struct TAURI_CHANNEL<TSend>(#[specta(skip)] std::marker::PhantomData<TSend>);
 };
 
 impl<TSend> Clone for Channel<TSend> {
diff --git a/crates/tauri/src/ipc/protocol.rs b/crates/tauri/src/ipc/protocol.rs
index 455b1d01a42c..66f9abe1a804 100644
--- a/crates/tauri/src/ipc/protocol.rs
+++ b/crates/tauri/src/ipc/protocol.rs
@@ -328,12 +328,10 @@ fn handle_ipc_message<R: Runtime>(request: Request<String>, manager: &AppManager
             js: crate::Result<String>,
             error: CallbackFn,
           ) {
-            let eval_js = match js {
-              Ok(js) => js,
-              Err(e) => crate::ipc::format_callback::format(error, &e.to_string())
-                .expect("unable to serialize response error string to json"),
-            };
-
+            let eval_js = js.unwrap_or_else(|e| {
+              crate::ipc::format_callback::format(error, &e.to_string())
+                .expect("unable to serialize response error string to json")
+            });
             let _ = webview.eval(eval_js);
           }
 
diff --git a/crates/tauri/src/manager/menu.rs b/crates/tauri/src/manager/menu.rs
index 2695dd115a3a..182a8d0aef67 100644
--- a/crates/tauri/src/manager/menu.rs
+++ b/crates/tauri/src/manager/menu.rs
@@ -56,20 +56,18 @@ impl<R: Runtime> MenuManager<R> {
     window_menu: Option<&crate::window::WindowMenu<R>>,
     #[allow(unused)] theme: Option<tauri_utils::Theme>,
   ) -> Option<impl Fn(tauri_runtime::window::RawWindow<'_>)> {
-    {
-      if let Some(menu) = window_menu {
-        self
-          .menus_stash_lock()
-          .insert(menu.menu.id().clone(), menu.menu.clone());
-      }
-    }
+    let window_menu = window_menu?;
+
+    self
+      .menus_stash_lock()
+      .insert(window_menu.menu.id().clone(), window_menu.menu.clone());
 
     #[cfg(target_os = "macos")]
     return None;
 
     #[cfg_attr(target_os = "macos", allow(unused_variables, unreachable_code))]
-    if let Some(menu) = &window_menu {
-      let menu = menu.menu.clone();
+    {
+      let menu = window_menu.menu.clone();
       Some(move |raw: tauri_runtime::window::RawWindow<'_>| {
         #[cfg(target_os = "windows")]
         {
@@ -89,8 +87,6 @@ impl<R: Runtime> MenuManager<R> {
           .inner()
           .init_for_gtk_window(raw.gtk_window, raw.default_vbox);
       })
-    } else {
-      None
     }
   }
 
diff --git a/crates/tauri/src/manager/mod.rs b/crates/tauri/src/manager/mod.rs
index ccc5ffbaf896..9a61be604713 100644
--- a/crates/tauri/src/manager/mod.rs
+++ b/crates/tauri/src/manager/mod.rs
@@ -472,12 +472,15 @@ impl<R: Runtime> AppManager<R> {
     (self.webview.invoke_handler)(invoke)
   }
 
-  pub fn extend_api(&self, plugin: &str, invoke: Invoke<R>) -> bool {
+  /// Runs the plugin [`crate::plugin::Plugin::extend_api`] hook if it exists. Returns whether the invoke message was handled or not.
+  ///
+  /// The message is not handled when the plugin exists **and** the command does not.
+  pub fn run_plugin_invoke_handler(&self, plugin: &str, invoke: Invoke<R>) -> bool {
     self
       .plugins
       .lock()
       .expect("poisoned plugin store")
-      .extend_api(plugin, invoke)
+      .run_invoke_handler(plugin, invoke)
   }
 
   pub fn initialize_plugins(&self, app: &AppHandle<R>) -> crate::Result<()> {
diff --git a/crates/tauri/src/manager/tray.rs b/crates/tauri/src/manager/tray.rs
index a3da8715a8a0..7ad709f5adcd 100644
--- a/crates/tauri/src/manager/tray.rs
+++ b/crates/tauri/src/manager/tray.rs
@@ -16,6 +16,8 @@ use crate::{
 };
 
 pub struct TrayManager<R: Runtime> {
+  /// icon passed in from [`tauri_utils::config::TrayIconConfig::icon_path`],
+  /// used when creating tray icons from the configs.
   pub(crate) icon: Option<Image<'static>>,
   /// Tray icons
   pub(crate) icons: Mutex<Vec<(TrayIconId, ResourceId)>>,
diff --git a/crates/tauri/src/menu/mod.rs b/crates/tauri/src/menu/mod.rs
index fa4abff2a575..51d377fbf35c 100644
--- a/crates/tauri/src/menu/mod.rs
+++ b/crates/tauri/src/menu/mod.rs
@@ -13,15 +13,24 @@ mod normal;
 pub(crate) mod plugin;
 mod predefined;
 mod submenu;
-use std::{mem::ManuallyDrop, sync::Arc};
+use std::{
+  mem::ManuallyDrop,
+  sync::{
+    atomic::{AtomicU64, Ordering},
+    Arc,
+  },
+};
 
 pub use builders::*;
 pub use menu::{HELP_SUBMENU_ID, WINDOW_SUBMENU_ID};
 use serde::{Deserialize, Serialize};
 
+use crate::menu::plugin::remove_menu_channel;
 use crate::{image::Image, AppHandle, Runtime};
 pub use muda::MenuId;
 
+static MENU_CHANNEL_OWNER: AtomicU64 = AtomicU64::new(1);
+
 macro_rules! run_item_main_thread {
   ($self:ident, $ex:expr) => {{
     use std::sync::mpsc::channel;
@@ -73,6 +82,7 @@ macro_rules! gen_wrappers {
         // This [`ManuallyDrop`] is used to [`ManuallyDrop::take`] in [`Self::drop`] to drop it on main thread
         inner: ManuallyDrop<::muda::$type>,
         app_handle: $crate::AppHandle<R>,
+        channel_owner: u64,
       }
 
       impl<R: $crate::Runtime> $inner<R> {
@@ -80,6 +90,7 @@ macro_rules! gen_wrappers {
           Self {
             inner: ManuallyDrop::new(menu),
             app_handle,
+            channel_owner: MENU_CHANNEL_OWNER.fetch_add(1, Ordering::Relaxed),
           }
         }
       }
@@ -94,6 +105,7 @@ macro_rules! gen_wrappers {
 
       impl<R: Runtime> Drop for $inner<R> {
         fn drop(&mut self) {
+          remove_menu_channel(&self.app_handle, self.inner.id(), self.channel_owner);
           // SAFETY: we will not access `self.inner` after this
           let inner = unsafe { ManuallyDrop::take(&mut self.inner) };
           // SAFETY: inner was created on main thread and is being dropped on main thread
@@ -119,6 +131,12 @@ macro_rules! gen_wrappers {
         }
       }
 
+      impl<R: $crate::Runtime> $type<R> {
+        pub(crate) fn channel_owner(&self) -> u64 {
+          self.0.channel_owner
+        }
+      }
+
       $(
         impl<R: $crate::Runtime> $crate::menu::sealed::IsMenuItemBase for $type<R> {
           fn inner_muda(&self) -> &dyn muda::IsMenuItem {
diff --git a/crates/tauri/src/menu/plugin.rs b/crates/tauri/src/menu/plugin.rs
index 7f6741d00315..7fa3a3f277be 100644
--- a/crates/tauri/src/menu/plugin.rs
+++ b/crates/tauri/src/menu/plugin.rs
@@ -161,12 +161,13 @@ impl CheckMenuItemPayload {
 
     if let Some(handler) = self.handler {
       let handler = handler.channel_on(webview.clone());
+      let owner = item.channel_owner();
       webview
         .state::<MenuChannels>()
         .0
         .lock()
         .unwrap()
-        .insert(item.id().clone(), handler);
+        .insert(item.id().clone(), (owner, handler));
     }
 
     Ok(item)
@@ -217,12 +218,13 @@ impl IconMenuItemPayload {
 
     if let Some(handler) = self.handler {
       let handler = handler.channel_on(webview.clone());
+      let owner = item.channel_owner();
       webview
         .state::<MenuChannels>()
         .0
         .lock()
         .unwrap()
-        .insert(item.id().clone(), handler);
+        .insert(item.id().clone(), (owner, handler));
     }
 
     Ok(item)
@@ -256,12 +258,13 @@ impl MenuItemPayload {
 
     if let Some(handler) = self.handler {
       let handler = handler.channel_on(webview.clone());
+      let owner = item.channel_owner();
       webview
         .state::<MenuChannels>()
         .0
         .lock()
         .unwrap()
-        .insert(item.id().clone(), handler);
+        .insert(item.id().clone(), (owner, handler));
     }
 
     Ok(item)
@@ -359,7 +362,6 @@ struct NewOptions {
 
 #[command(root = "crate")]
 fn new<R: Runtime>(
-  app: Webview<R>,
   webview: Webview<R>,
   kind: ItemKind,
   options: Option<NewOptions>,
@@ -367,11 +369,11 @@ fn new<R: Runtime>(
   handler: Channel<MenuId>,
 ) -> crate::Result<(ResourceId, MenuId)> {
   let options = options.unwrap_or_default();
-  let mut resources_table = app.resources_table();
+  let mut resources_table = webview.resources_table();
 
-  let (rid, id) = match kind {
+  let (rid, id, owner) = match kind {
     ItemKind::Menu => {
-      let mut builder = MenuBuilder::new(&app);
+      let mut builder = MenuBuilder::new(&webview);
       if let Some(id) = options.id {
         builder = builder.id(id);
       }
@@ -382,9 +384,10 @@ fn new<R: Runtime>(
       }
       let menu = builder.build()?;
       let id = menu.id().clone();
+      let owner = menu.channel_owner();
       let rid = resources_table.add(menu);
 
-      (rid, id)
+      (rid, id, owner)
     }
 
     ItemKind::Submenu => {
@@ -397,9 +400,10 @@ fn new<R: Runtime>(
       }
       .create_item(&webview, &resources_table)?;
       let id = submenu.id().clone();
+      let owner = submenu.channel_owner();
       let rid = resources_table.add(submenu);
 
-      (rid, id)
+      (rid, id, owner)
     }
 
     ItemKind::MenuItem => {
@@ -413,8 +417,9 @@ fn new<R: Runtime>(
       }
       .create_item(&webview)?;
       let id = item.id().clone();
+      let owner = item.channel_owner();
       let rid = resources_table.add(item);
-      (rid, id)
+      (rid, id, owner)
     }
 
     ItemKind::Predefined => {
@@ -424,8 +429,9 @@ fn new<R: Runtime>(
       }
       .create_item(&webview, &resources_table)?;
       let id = item.id().clone();
+      let owner = item.channel_owner();
       let rid = resources_table.add(item);
-      (rid, id)
+      (rid, id, owner)
     }
 
     ItemKind::Check => {
@@ -440,8 +446,9 @@ fn new<R: Runtime>(
       }
       .create_item(&webview)?;
       let id = item.id().clone();
+      let owner = item.channel_owner();
       let rid = resources_table.add(item);
-      (rid, id)
+      (rid, id, owner)
     }
 
     ItemKind::Icon => {
@@ -456,12 +463,17 @@ fn new<R: Runtime>(
       }
       .create_item(&webview, &resources_table)?;
       let id = item.id().clone();
+      let owner = item.channel_owner();
       let rid = resources_table.add(item);
-      (rid, id)
+      (rid, id, owner)
     }
   };
 
-  channels.0.lock().unwrap().insert(id.clone(), handler);
+  channels
+    .0
+    .lock()
+    .unwrap()
+    .insert(id.clone(), (owner, handler));
 
   Ok((rid, id))
 }
@@ -886,7 +898,27 @@ fn set_icon<R: Runtime>(
   )
 }
 
-struct MenuChannels(Mutex<HashMap<MenuId, Channel<MenuId>>>);
+struct MenuChannels(Mutex<HashMap<MenuId, (u64, Channel<MenuId>)>>);
+
+fn remove_menu_channel_if_owner(
+  channels: &mut HashMap<MenuId, (u64, Channel<MenuId>)>,
+  id: &MenuId,
+  owner: u64,
+) {
+  if channels
+    .get(id)
+    .is_some_and(|(registered_owner, _)| *registered_owner == owner)
+  {
+    channels.remove(id);
+  }
+}
+
+// Called in `Menu`'s `Drop` to clean up the event handlers
+pub(crate) fn remove_menu_channel<R: Runtime>(app: &AppHandle<R>, id: &MenuId, owner: u64) {
+  let menu_channels = app.state::<MenuChannels>();
+  let mut channels = menu_channels.0.lock().unwrap();
+  remove_menu_channel_if_owner(&mut channels, id, owner);
+}
 
 pub(crate) fn init<R: Runtime>() -> TauriPlugin<R> {
   Builder::new("menu")
@@ -896,7 +928,15 @@ pub(crate) fn init<R: Runtime>() -> TauriPlugin<R> {
     })
     .on_event(|app, e| {
       if let RunEvent::MenuEvent(e) = e {
-        if let Some(channel) = app.state::<MenuChannels>().0.lock().unwrap().get(&e.id) {
+        // Cloning the channel out in case the menu gets dropped during the channel send through `channel_interceptor`
+        let channel = app
+          .state::<MenuChannels>()
+          .0
+          .lock()
+          .unwrap()
+          .get(&e.id)
+          .map(|(_, channel)| channel.clone());
+        if let Some(channel) = channel {
           let _ = channel.send(e.id.clone());
         }
       }
@@ -928,3 +968,20 @@ pub(crate) fn init<R: Runtime>() -> TauriPlugin<R> {
     ])
     .build()
 }
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  #[test]
+  fn stale_owner_cannot_remove_replacement_channel() {
+    let id = MenuId::new("shared");
+    let channel = Channel::<MenuId>::new(|_| Ok(()));
+    let channel_id = channel.id();
+    let mut channels = HashMap::from([(id.clone(), (2, channel))]);
+
+    remove_menu_channel_if_owner(&mut channels, &id, 1);
+
+    assert_eq!(channels.get(&id).unwrap().1.id(), channel_id);
+  }
+}
diff --git a/crates/tauri/src/plugin.rs b/crates/tauri/src/plugin.rs
index 3a22de7bc700..153a6ab03900 100644
--- a/crates/tauri/src/plugin.rs
+++ b/crates/tauri/src/plugin.rs
@@ -24,7 +24,7 @@ use url::Url;
 
 use std::{
   borrow::Cow,
-  collections::HashMap,
+  collections::{HashMap, HashSet},
   fmt::{self, Debug},
   sync::Arc,
 };
@@ -104,6 +104,7 @@ pub trait Plugin<R: Runtime>: Send {
   #[allow(unused_variables)]
   fn on_event(&mut self, app: &AppHandle<R>, event: &RunEvent) {}
 
+  // TODO: Change this to `run_invoke_handler` in v3
   /// Extend commands to [`crate::Builder::invoke_handler`].
   #[allow(unused_variables)]
   fn extend_api(&mut self, invoke: Invoke<R>) -> bool {
@@ -596,7 +597,7 @@ impl<R: Runtime, C: DeserializeOwned> Builder<R, C> {
   ///
   /// Leverages [setURLSchemeHandler](https://developer.apple.com/documentation/webkit/wkwebviewconfiguration/2875766-seturlschemehandler) on macOS,
   /// [AddWebResourceRequestedFilter](https://docs.microsoft.com/en-us/dotnet/api/microsoft.web.webview2.core.corewebview2.addwebresourcerequestedfilter?view=webview2-dotnet-1.0.774.44) on Windows
-  /// and [webkit-web-context-register-uri-scheme](https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebContext.html#webkit-web-context-register-uri-scheme) on Linux.
+  /// and `webkit_web_context_register_uri_scheme` on Linux.
   ///
   /// # Known limitations
   ///
@@ -856,6 +857,7 @@ impl<R: Runtime, C: DeserializeOwned> Plugin<R> for TauriPlugin<R, C> {
 #[default_runtime(crate::Wry, wry)]
 pub(crate) struct PluginStore<R: Runtime> {
   store: Vec<Box<dyn Plugin<R>>>,
+  initialized: HashSet<&'static str>,
 }
 
 impl<R: Runtime> fmt::Debug for PluginStore<R> {
@@ -869,7 +871,10 @@ impl<R: Runtime> fmt::Debug for PluginStore<R> {
 
 impl<R: Runtime> Default for PluginStore<R> {
   fn default() -> Self {
-    Self { store: Vec::new() }
+    Self {
+      store: Vec::new(),
+      initialized: HashSet::new(),
+    }
   }
 }
 
@@ -878,18 +883,32 @@ impl<R: Runtime> PluginStore<R> {
   ///
   /// Returns `true` if a plugin with the same name is already in the store.
   pub fn register(&mut self, plugin: Box<dyn Plugin<R>>) -> bool {
+    let name = plugin.name();
     let len = self.store.len();
-    self.store.retain(|p| p.name() != plugin.name());
+    self.store.retain(|p| p.name() != name);
     let result = len != self.store.len();
+    self.initialized.remove(name);
     self.store.push(plugin);
     result
   }
 
+  /// Adds an already initialized plugin to the store.
+  pub(crate) fn register_initialized(&mut self, plugin: Box<dyn Plugin<R>>) -> bool {
+    let name = plugin.name();
+    let replaced = self.register(plugin);
+    self.initialized.insert(name);
+    replaced
+  }
+
   /// Removes the plugin with the given name from the store.
   pub fn unregister(&mut self, plugin: &str) -> bool {
     let len = self.store.len();
     self.store.retain(|p| p.name() != plugin);
-    len != self.store.len()
+    let removed = len != self.store.len();
+    if removed {
+      self.initialized.remove(plugin);
+    }
+    removed
   }
 
   /// Initializes the given plugin.
@@ -908,10 +927,15 @@ impl<R: Runtime> PluginStore<R> {
     app: &AppHandle<R>,
     config: &PluginConfig,
   ) -> crate::Result<()> {
-    self
-      .store
-      .iter_mut()
-      .try_for_each(|plugin| initialize(plugin, app, config))
+    for plugin in &mut self.store {
+      let name = plugin.name();
+      if self.initialized.contains(name) {
+        continue;
+      }
+      initialize(plugin, app, config)?;
+      self.initialized.insert(name);
+    }
+    Ok(())
   }
 
   /// Generates an initialization script from all plugins in the store.
@@ -979,10 +1003,10 @@ impl<R: Runtime> PluginStore<R> {
       .for_each(|plugin| plugin.on_event(app, event))
   }
 
-  /// Runs the plugin `extend_api` hook if it exists. Returns whether the invoke message was handled or not.
+  /// Runs the plugin [`Plugin::extend_api`] hook if it exists. Returns whether the invoke message was handled or not.
   ///
   /// The message is not handled when the plugin exists **and** the command does not.
-  pub(crate) fn extend_api(&mut self, plugin: &str, invoke: Invoke<R>) -> bool {
+  pub(crate) fn run_invoke_handler(&mut self, plugin: &str, invoke: Invoke<R>) -> bool {
     for p in self.store.iter_mut() {
       if p.name() == plugin {
         #[cfg(feature = "tracing")]
@@ -1009,6 +1033,51 @@ fn initialize<R: Runtime>(
     .map_err(|e| Error::PluginInitialization(plugin.name().to_string(), e.to_string()))
 }
 
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use std::sync::{
+    atomic::{AtomicUsize, Ordering},
+    Arc,
+  };
+
+  struct CountingPlugin(Arc<AtomicUsize>);
+
+  impl Plugin<crate::test::MockRuntime> for CountingPlugin {
+    fn name(&self) -> &'static str {
+      "counting"
+    }
+
+    fn initialize(
+      &mut self,
+      _app: &AppHandle<crate::test::MockRuntime>,
+      _config: JsonValue,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+      self.0.fetch_add(1, Ordering::SeqCst);
+      Ok(())
+    }
+  }
+
+  #[test]
+  fn initialize_all_skips_plugins_already_initialized_at_registration() {
+    let app = crate::test::mock_app();
+    let count = Arc::new(AtomicUsize::new(0));
+    let mut plugin: Box<dyn Plugin<crate::test::MockRuntime>> =
+      Box::new(CountingPlugin(count.clone()));
+    let mut store = PluginStore::default();
+
+    store
+      .initialize(&mut plugin, app.handle(), &app.config().plugins)
+      .unwrap();
+    store.register_initialized(plugin);
+    store
+      .initialize_all(app.handle(), &app.config().plugins)
+      .unwrap();
+
+    assert_eq!(count.load(Ordering::SeqCst), 1);
+  }
+}
+
 /// Permission state.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 #[cfg_attr(feature = "specta", derive(specta::Type))]
diff --git a/crates/tauri/src/test/mock_runtime.rs b/crates/tauri/src/test/mock_runtime.rs
index a1f4c88745c9..29505fd573b6 100644
--- a/crates/tauri/src/test/mock_runtime.rs
+++ b/crates/tauri/src/test/mock_runtime.rs
@@ -503,7 +503,7 @@ impl WindowBuilder for MockWindowBuilder {
     target_os = "netbsd",
     target_os = "openbsd"
   ))]
-  fn transient_for(self, parent: &impl gtk::glib::IsA<gtk::Window>) -> Self {
+  fn transient_for(self, parent: &impl gtk::glib::object::IsA<gtk::Window>) -> Self {
     self
   }
 
diff --git a/crates/tauri/src/webview/mod.rs b/crates/tauri/src/webview/mod.rs
index b89d3c95d0e8..9b4d9175eca6 100644
--- a/crates/tauri/src/webview/mod.rs
+++ b/crates/tauri/src/webview/mod.rs
@@ -57,12 +57,12 @@ use std::{
 
 pub(crate) type WebResourceRequestHandler =
   dyn Fn(http::Request<Vec<u8>>, &mut http::Response<Cow<'static, [u8]>>) + Send + Sync;
-pub(crate) type NavigationHandler = dyn Fn(&Url) -> bool + Send;
+pub(crate) type NavigationHandler = dyn Fn(&Url) -> bool + Send + Sync;
 pub(crate) type NewWindowHandler<R> = dyn Fn(Url, NewWindowFeatures) -> NewWindowResponse<R> + Send;
 pub(crate) type UriSchemeProtocolHandler =
   Box<dyn Fn(&str, http::Request<Vec<u8>>, UriSchemeResponder) + Send + Sync>;
 pub(crate) type OnPageLoad<R> = dyn Fn(Webview<R>, PageLoadPayload<'_>) + Send + Sync + 'static;
-pub(crate) type OnDocumentTitleChanged<R> = dyn Fn(Webview<R>, String) + Send + 'static;
+pub(crate) type OnDocumentTitleChanged<R> = dyn Fn(Webview<R>, String) + Send + Sync + 'static;
 pub(crate) type DownloadHandler<R> = dyn Fn(Webview<R>, DownloadEvent<'_>) -> bool + Send + Sync;
 
 #[derive(Clone, Serialize)]
@@ -152,7 +152,7 @@ pub struct PlatformWebview(tauri_runtime_wry::Webview);
 
 #[cfg(feature = "wry")]
 impl PlatformWebview {
-  /// Returns [`webkit2gtk::WebView`] handle.
+  /// Returns [`webkit::WebView`] handle.
   #[cfg(any(
     target_os = "linux",
     target_os = "dragonfly",
@@ -170,7 +170,7 @@ impl PlatformWebview {
       target_os = "openbsd"
     )))
   )]
-  pub fn inner(&self) -> webkit2gtk::WebView {
+  pub fn inner(&self) -> webkit::WebView {
     self.0.clone()
   }
 
@@ -525,7 +525,7 @@ tauri::Builder::default()
 ```
   "####
   )]
-  pub fn on_navigation<F: Fn(&Url) -> bool + Send + 'static>(mut self, f: F) -> Self {
+  pub fn on_navigation<F: Fn(&Url) -> bool + Send + Sync + 'static>(mut self, f: F) -> Self {
     self.navigation_handler.replace(Box::new(f));
     self
   }
@@ -591,7 +591,7 @@ tauri::Builder::default()
   }
 
   /// Defines a closure to be executed when document title change.
-  pub fn on_document_title_changed<F: Fn(Webview<R>, String) + Send + 'static>(
+  pub fn on_document_title_changed<F: Fn(Webview<R>, String) + Send + Sync + 'static>(
     mut self,
     f: F,
   ) -> Self {
@@ -968,7 +968,9 @@ fn main() {
     self
   }
 
-  /// Disables the drag and drop handler. This is required to use HTML5 drag and drop APIs on the frontend on Windows.
+  /// Disables the drag and drop handler used internally to generate [`DragDropEvent`](crate::DragDropEvent)s.
+  ///
+  /// This is required to use HTML5 drag and drop APIs on the frontend on Windows since we replace the drag drop handler of WebView2.
   #[must_use]
   pub fn disable_drag_drop_handler(mut self) -> Self {
     self.webview_attributes.drag_drop_handler_enabled = false;
@@ -1219,6 +1221,62 @@ fn main() {
       .allow_link_preview(allow_link_preview);
     self
   }
+  /// Whether to limit navigations to App-Bound Domains. This is necessary to
+  /// enable Service Workers on iOS according to
+  /// [StackOverflow](https://stackoverflow.com/questions/49673399/service-workers-unavailable-in-wkwebview-in-ios-11-3/64155509#64155509).
+  ///
+  /// Default is false.
+  ///
+  /// Note: If you pass in `true` make sure to add localhost and any [`registrable
+  /// domains`](https://developer.mozilla.org/en-US/docs/Glossary/Registrable_domain)
+  /// used in this webview to tauri-src/Info.ios.plist:
+  ///
+  /// ```xml
+  /// <plist>
+  /// <dict>
+  ///     <key>WKAppBoundDomains</key>
+  ///     <array>
+  ///         <string>localhost</string>
+  ///         <string>aregistrabledomain.example</string>
+  ///     </array>
+  /// </dict>
+  /// </plist>
+  /// ```
+  ///
+  /// You must add `localhost` if any webview with this set to true opens a
+  /// local webpage, makes any localhost calls, or uses the isolation pattern
+  /// because Tauri uses the `localhost` domain for hosting the application
+  /// webpage, the IPC protocol, and the isolation pattern's iframe.
+  ///
+  /// Requests served through custom uri schemes are allowed so long as they use
+  /// a registrable domain specified in the `WKAppBoundDomains` array for all the
+  /// requests from the app, including requests for the `localhost` domain.
+  ///
+  /// In theory, you can whitelist an entire uri scheme by including the
+  /// protocol name followed by a colon. For example, to allow all requests
+  /// using a custom "stream" uri scheme (see [this tauri
+  /// example](https://github.com/tauri-apps/tauri/blob/dev/examples/streaming/main.rs)),
+  /// you could add `stream:` to the AppBoundDomains array. That said, I'm not
+  /// sure whether Apple would let your app through app review if you do
+  /// whitelist an entire protocol because this feature is not mentioned in
+  /// [their blog post on App-Bound
+  /// Domains](https://webkit.org/blog/10882/app-bound-domains/).
+  ///
+  /// See https://webkit.org/blog/10882/app-bound-domains/ and
+  /// https://developer.apple.com/documentation/webkit/wkwebviewconfiguration/limitsnavigationstoappbounddomains
+  /// for the official documentation on App-Bound Domains.
+  ///
+  /// ## Platform-specific
+  ///
+  /// - **iOS**: Supported since version 14.0+.
+  /// - **Linux / Windows / Android / MacOS:** Unsupported.
+  #[must_use]
+  pub fn limit_navigations_to_app_bound_domains(mut self, limit_navigations: bool) -> Self {
+    self.webview_attributes = self
+      .webview_attributes
+      .limit_navigations_to_app_bound_domains(limit_navigations);
+    self
+  }
 
   /// Allows overriding the keyboard accessory view on iOS.
   /// Returning `None` effectively removes the view.
@@ -1273,7 +1331,7 @@ fn main() {
       target_os = "openbsd",
     )
   ))]
-  pub fn with_related_view(mut self, related_view: webkit2gtk::WebView) -> Self {
+  pub fn with_related_view(mut self, related_view: webkit::WebView) -> Self {
     self.webview_attributes.related_view.replace(related_view);
     self
   }
@@ -1609,7 +1667,7 @@ impl<R: Runtime> Webview<R> {
   ///
   /// The closure is executed on the main thread.
   ///
-  /// Note that `webview2-com`, `webkit2gtk`, `objc2_web_kit` and similar crates may be updated in minor releases of Tauri.
+  /// Note that `webview2-com`, `webkit`, `objc2_web_kit` and similar crates may be updated in minor releases of Tauri.
   /// Therefore it's recommended to pin Tauri to at least a minor version when you're using `with_webview`.
   ///
   /// # Examples
@@ -1626,9 +1684,9 @@ tauri::Builder::default()
     main_webview.with_webview(|webview| {
       #[cfg(target_os = "linux")]
       {
-        // see <https://docs.rs/webkit2gtk/2.0.0/webkit2gtk/struct.WebView.html>
-        // and <https://docs.rs/webkit2gtk/2.0.0/webkit2gtk/trait.WebViewExt.html>
-        use webkit2gtk::WebViewExt;
+        // see <https://docs.rs/webkit6/latest/webkit6/struct.WebView.html>
+        // and <https://docs.rs/webkit6/latest/webkit6/prelude/trait.WebViewExt.html>
+        use webkit::prelude::WebViewExt;
         webview.inner().set_zoom_level(4.);
       }
 
@@ -1860,7 +1918,7 @@ tauri::Builder::default()
       let message = invoke.message.clone();
 
       #[allow(unused_mut)]
-      let mut handled = manager.extend_api(plugin, invoke);
+      let mut handled = manager.run_plugin_invoke_handler(plugin, invoke);
 
       #[cfg(mobile)]
       {
diff --git a/crates/tauri/src/webview/webview_window.rs b/crates/tauri/src/webview/webview_window.rs
index 1f101de350ec..d841d954d887 100644
--- a/crates/tauri/src/webview/webview_window.rs
+++ b/crates/tauri/src/webview/webview_window.rs
@@ -263,7 +263,7 @@ impl<'a, R: Runtime, M: Manager<R>> WebviewWindowBuilder<'a, R, M> {
   ///     Ok(())
   ///   });
   /// ```
-  pub fn on_navigation<F: Fn(&Url) -> bool + Send + 'static>(mut self, f: F) -> Self {
+  pub fn on_navigation<F: Fn(&Url) -> bool + Send + Sync + 'static>(mut self, f: F) -> Self {
     self.webview_builder = self.webview_builder.on_navigation(f);
     self
   }
@@ -323,7 +323,7 @@ impl<'a, R: Runtime, M: Manager<R>> WebviewWindowBuilder<'a, R, M> {
   /// Defines a closure to be executed when the document title changes.
   ///
   /// Note that it may run before or after the navigation event.
-  pub fn on_document_title_changed<F: Fn(WebviewWindow<R>, String) + Send + 'static>(
+  pub fn on_document_title_changed<F: Fn(WebviewWindow<R>, String) + Send + Sync + 'static>(
     mut self,
     f: F,
   ) -> Self {
@@ -717,12 +717,14 @@ impl<'a, R: Runtime, M: Manager<R>> WebviewWindowBuilder<'a, R, M> {
     target_os = "openbsd"
   ))]
   #[must_use]
-  pub fn transient_for_raw(mut self, parent: &impl gtk::glib::IsA<gtk::Window>) -> Self {
+  pub fn transient_for_raw(mut self, parent: &impl gtk::glib::object::IsA<gtk::Window>) -> Self {
     self.window_builder = self.window_builder.transient_for_raw(parent);
     self
   }
 
-  /// Enables or disables drag and drop support.
+  /// Enables or disables drag and drop support of this window.
+  ///
+  /// Note: this is a different config from [`Self::disable_drag_drop_handler`]
   #[cfg(windows)]
   #[must_use]
   pub fn drag_and_drop(mut self, enabled: bool) -> Self {
@@ -1036,7 +1038,9 @@ impl<R: Runtime, M: Manager<R>> WebviewWindowBuilder<'_, R, M> {
     self
   }
 
-  /// Disables the drag and drop handler. This is required to use HTML5 drag and drop APIs on the frontend on Windows.
+  /// Disables the webview drag and drop handler used internally to generate [`DragDropEvent`](crate::DragDropEvent)s.
+  ///
+  /// This is required to use HTML5 drag and drop APIs on the frontend on Windows since we replace the drag drop handler of WebView2.
   #[must_use]
   pub fn disable_drag_drop_handler(mut self) -> Self {
     self.webview_builder = self.webview_builder.disable_drag_drop_handler();
@@ -1318,6 +1322,62 @@ impl<R: Runtime, M: Manager<R>> WebviewWindowBuilder<'_, R, M> {
     self
   }
 
+  /// Whether to limit navigations to App-Bound Domains. This is necessary to
+  /// enable Service Workers on iOS according to
+  /// [StackOverflow](https://stackoverflow.com/questions/49673399/service-workers-unavailable-in-wkwebview-in-ios-11-3/64155509#64155509).
+  ///
+  /// Default is false.
+  ///
+  /// Note: If you pass in `true` make sure to add localhost and any [`registrable
+  /// domains`](https://developer.mozilla.org/en-US/docs/Glossary/Registrable_domain)
+  /// used in this webview to tauri-src/Info.ios.plist:
+  ///
+  /// ```xml
+  /// <plist>
+  /// <dict>
+  ///     <key>WKAppBoundDomains</key>
+  ///     <array>
+  ///         <string>localhost</string>
+  ///         <string>aregistrabledomain.example</string>
+  ///     </array>
+  /// </dict>
+  /// </plist>
+  /// ```
+  ///
+  /// You must add `localhost` if any webview with this set to true opens a
+  /// local webpage, makes any localhost calls, or uses the isolation pattern
+  /// because Tauri uses the `localhost` domain for hosting the application
+  /// webpage, the IPC protocol, and the isolation pattern's iframe.
+  ///
+  /// Requests served through custom uri schemes are allowed so long as they use
+  /// a registrable domain specified in the `WKAppBoundDomains` array for all the
+  /// requests from the app, including requests for the `localhost` domain.
+  ///
+  /// In theory, you can whitelist an entire uri scheme by including the
+  /// protocol name followed by a colon. For example, to allow all requests
+  /// using a custom "stream" uri scheme (see [this tauri
+  /// example](https://github.com/tauri-apps/tauri/blob/dev/examples/streaming/main.rs)),
+  /// you could add `stream:` to the AppBoundDomains array. That said, I'm not
+  /// sure whether Apple would let your app through app review if you do
+  /// whitelist an entire protocol because this feature is not mentioned in
+  /// [their blog post on App-Bound
+  /// Domains](https://webkit.org/blog/10882/app-bound-domains/).
+  ///
+  /// See https://webkit.org/blog/10882/app-bound-domains/ and
+  /// https://developer.apple.com/documentation/webkit/wkwebviewconfiguration/limitsnavigationstoappbounddomains
+  /// for the official documentation on App-Bound Domains.
+  ///
+  /// ## Platform-specific
+  ///
+  /// - **iOS**: Supported since version 14.0+.
+  /// - **Linux / Windows / Android / MacOS:** Unsupported.
+  pub fn limit_navigations_to_app_bound_domains(mut self, limit_navigations: bool) -> Self {
+    self.webview_builder = self
+      .webview_builder
+      .limit_navigations_to_app_bound_domains(limit_navigations);
+    self
+  }
+
   /// Set the environment for the webview.
   /// Useful if you need to share the same environment, for instance when using the [`Self::on_new_window`].
   #[cfg(all(feature = "wry", windows))]
@@ -1341,7 +1401,7 @@ impl<R: Runtime, M: Manager<R>> WebviewWindowBuilder<'_, R, M> {
       target_os = "openbsd",
     )
   ))]
-  pub fn with_related_view(mut self, related_view: webkit2gtk::WebView) -> Self {
+  pub fn with_related_view(mut self, related_view: webkit::WebView) -> Self {
     self.webview_builder = self.webview_builder.with_related_view(related_view);
     self
   }
@@ -2325,7 +2385,7 @@ impl<R: Runtime> WebviewWindow<R> {
   ///
   /// The closure is executed on the main thread.
   ///
-  /// Note that `webview2-com`, `webkit2gtk`, `objc2_web_kit` and similar crates may be updated in minor releases of Tauri.
+  /// Note that `webview2-com`, `webkit`, `objc2_web_kit` and similar crates may be updated in minor releases of Tauri.
   /// Therefore it's recommended to pin Tauri to at least a minor version when you're using `with_webview`.
   ///
   /// # Examples
@@ -2340,9 +2400,9 @@ impl<R: Runtime> WebviewWindow<R> {
   ///       main_webview.with_webview(|webview| {
   ///         #[cfg(target_os = "linux")]
   ///         {
-  ///           // see <https://docs.rs/webkit2gtk/2.0.0/webkit2gtk/struct.WebView.html>
-  ///           // and <https://docs.rs/webkit2gtk/2.0.0/webkit2gtk/trait.WebViewExt.html>
-  ///           use webkit2gtk::WebViewExt;
+  ///           // see <https://docs.rs/webkit6/latest/webkit6/struct.WebView.html>
+  ///           // and <https://docs.rs/webkit6/latest/webkit6/prelude/trait.WebViewExt.html>
+  ///           use webkit::prelude::WebViewExt;
   ///           webview.inner().set_zoom_level(4.);
   ///         }
   ///
diff --git a/crates/tauri/src/window/mod.rs b/crates/tauri/src/window/mod.rs
index e2f36441c778..5717ac1f4ab7 100644
--- a/crates/tauri/src/window/mod.rs
+++ b/crates/tauri/src/window/mod.rs
@@ -355,7 +355,7 @@ tauri::Builder::default()
 
   /// Creates a new window with an optional webview.
   fn build_internal(
-    // mutable on Android
+    // mutable on mobile
     #[allow(unused_mut)] mut self,
     webview: Option<PendingWebview<EventLoopMessage, R>>,
   ) -> crate::Result<Window<R>> {
@@ -759,7 +759,7 @@ impl<'a, R: Runtime, M: Manager<R>> WindowBuilder<'a, R, M> {
     target_os = "openbsd"
   ))]
   #[must_use]
-  pub fn transient_for_raw(mut self, parent: &impl gtk::glib::IsA<gtk::Window>) -> Self {
+  pub fn transient_for_raw(mut self, parent: &impl gtk::glib::object::IsA<gtk::Window>) -> Self {
     self.window_builder = self.window_builder.transient_for(parent);
     self
   }
diff --git a/examples/api/index.html b/examples/api/index.html
index 010944d8e277..98132dfd03c5 100644
--- a/examples/api/index.html
+++ b/examples/api/index.html
@@ -1,13 +1,14 @@
 <!doctype html>
-<html lang="en" theme="dark">
+<html lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="color-scheme" content="dark light" />
     <title>API Example App</title>
   </head>
 
   <body>
     <div id="app"></div>
-    <script type="module" src="/src/main.js"></script>
+    <script type="module" src="/src/main.ts"></script>
   </body>
 </html>
diff --git a/examples/api/jsconfig.json b/examples/api/jsconfig.json
deleted file mode 100644
index 5696a2de74a0..000000000000
--- a/examples/api/jsconfig.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "compilerOptions": {
-    "moduleResolution": "bundler",
-    "target": "ESNext",
-    "module": "ESNext",
-    /**
-     * svelte-preprocess cannot figure out whether you have
-     * a value or a type, so tell TypeScript to enforce using
-     * `import type` instead of `import` for Types.
-     */
-    "verbatimModuleSyntax": true,
-    "isolatedModules": true,
-    "resolveJsonModule": true,
-    /**
-     * To have warnings / errors of the Svelte compiler at the
-     * correct position, enable source maps by default.
-     */
-    "sourceMap": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    /**
-     * Typecheck JS in `.svelte` and `.js` files by default.
-     * Disable this if you'd like to use dynamic types.
-     */
-    "checkJs": true
-  },
-  /**
-   * Use global.d.ts instead of compilerOptions.types
-   * to avoid limiting type declarations.
-   */
-  "include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"]
-}
diff --git a/examples/api/package.json b/examples/api/package.json
index c0f15c0f1bac..0ba26f005ea4 100644
--- a/examples/api/package.json
+++ b/examples/api/package.json
@@ -15,10 +15,12 @@
   "devDependencies": {
     "@iconify-json/codicon": "^1.2.49",
     "@iconify-json/ph": "^1.2.2",
-    "@sveltejs/vite-plugin-svelte": "^7.0.0",
-    "@unocss/extractor-svelte": "^66.6.6",
-    "svelte": "^5.55.7",
-    "unocss": "^66.6.6",
-    "vite": "^8.0.16"
+    "@sveltejs/vite-plugin-svelte": "^7.2.0",
+    "@types/sortablejs": "^1.15.9",
+    "@unocss/extractor-svelte": "^66.7.5",
+    "sortablejs": "^1.15.7",
+    "svelte": "^5.56.4",
+    "unocss": "^66.7.5",
+    "vite": "^8.1.4"
   }
 }
diff --git a/examples/api/src-tauri/src/lib.rs b/examples/api/src-tauri/src/lib.rs
index b569f25cb550..876978fdaecd 100644
--- a/examples/api/src-tauri/src/lib.rs
+++ b/examples/api/src-tauri/src/lib.rs
@@ -67,6 +67,7 @@ pub fn run_app<R: Runtime, F: FnOnce(&App<R>) + Send + 'static>(
 
       #[allow(unused_mut)]
       let mut window_builder = WebviewWindowBuilder::new(app, "main", WebviewUrl::default())
+        .disable_drag_drop_handler()
         .on_document_title_changed(|_window, title| {
           println!("document title changed: {title}");
         });
diff --git a/examples/api/src-tauri/src/tray.rs b/examples/api/src-tauri/src/tray.rs
index 8e0d4e9541ae..ada914a2e092 100644
--- a/examples/api/src-tauri/src/tray.rs
+++ b/examples/api/src-tauri/src/tray.rs
@@ -42,7 +42,7 @@ pub fn create_tray<R: Runtime>(app: &tauri::AppHandle<R>) -> tauri::Result<()> {
 
   let is_menu1 = AtomicBool::new(true);
 
-  let _ = TrayIconBuilder::with_id("tray-1")
+  let _tray = TrayIconBuilder::with_id("tray-1")
     .tooltip("Tauri")
     .icon(app.default_window_icon().unwrap().clone())
     .menu(&menu1)
@@ -121,7 +121,7 @@ pub fn create_tray<R: Runtime>(app: &tauri::AppHandle<R>) -> tauri::Result<()> {
         }
       }
     })
-    .build(app);
+    .build(app)?;
 
   Ok(())
 }
diff --git a/examples/api/src-tauri/tauri-plugin-sample/android/build.gradle.kts b/examples/api/src-tauri/tauri-plugin-sample/android/build.gradle.kts
index 94f504ede46a..1d34a2e4b3ad 100644
--- a/examples/api/src-tauri/tauri-plugin-sample/android/build.gradle.kts
+++ b/examples/api/src-tauri/tauri-plugin-sample/android/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
@@ -27,8 +29,11 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_1_8
     }
 }
 
diff --git a/examples/api/src/App.svelte b/examples/api/src/App.svelte
index 7d14871a7944..db719567d00f 100644
--- a/examples/api/src/App.svelte
+++ b/examples/api/src/App.svelte
@@ -1,4 +1,10 @@
-<script>
+<script module lang="ts">
+  export type ViewProps = {
+    onMessage: (value: unknown) => void
+  }
+</script>
+
+<script lang="ts">
   import { onMount, tick } from 'svelte'
   import { writable } from 'svelte/store'
   import { invoke } from '@tauri-apps/api/core'
@@ -12,6 +18,8 @@
   import App from './views/App.svelte'
   import Menu from './views/Menu.svelte'
   import Tray from './views/Tray.svelte'
+  import type { Theme } from '@tauri-apps/api/window'
+  import { MediaQuery } from 'svelte/reactivity'
 
   document.addEventListener('keydown', (event) => {
     if (event.ctrlKey && event.key === 'b') {
@@ -70,45 +78,61 @@
   ]
 
   let selected = $state.raw(views[0])
-  function select(view) {
-    selected = view
-  }
 
-  // dark/light
-  let isDark = $state()
-  onMount(() => {
-    isDark = localStorage && localStorage.getItem('theme') == 'dark'
-    applyTheme(isDark)
-  })
-  function applyTheme(isDark) {
-    const html = document.querySelector('html')
-    isDark ? html.classList.add('dark') : html.classList.remove('dark')
-    localStorage && localStorage.setItem('theme', isDark ? 'dark' : '')
+  // dark/light themes
+  const preferDark = new MediaQuery('prefers-color-scheme: dark')
+  let theme = $state<Theme | 'auto'>(
+    (localStorage.getItem('theme') as Theme | null) || 'auto'
+  )
+
+  async function switchTheme() {
+    switch (theme) {
+      case 'dark':
+        theme = 'light'
+        break
+      case 'light':
+        theme = 'auto'
+        break
+      case 'auto':
+        theme = 'dark'
+        break
+    }
+    applyTheme()
   }
-  function toggleDark() {
-    isDark = !isDark
-    applyTheme(isDark)
-    setTheme(isDark ? 'dark' : 'light')
+
+  function applyTheme() {
+    const isDark = theme === 'auto' ? preferDark.current : theme === 'dark'
+    if (isDark) {
+      document.documentElement.classList.add('dark')
+      document.documentElement.classList.remove('light')
+    } else {
+      document.documentElement.classList.remove('dark')
+      document.documentElement.classList.add('light')
+    }
+    setTheme(theme === 'auto' ? null : theme)
+    localStorage.setItem('theme', theme)
   }
 
+  $effect(() => {
+    applyTheme()
+  })
+
   // Console
-  let messages = writable([])
-  let consoleTextEl = $state()
+  const messages = writable<string[]>([])
+  let consoleTextEl: HTMLDivElement
 
   // this function is renders HTML without sanitizing it so it's insecure
   // we only use it with our own input data
-  async function insecureRenderHtml(html) {
+  async function insecureRenderHtml(html: string) {
     messages.update((r) => [
       ...r,
-      {
-        html: `<pre><strong class="text-accent dark:text-darkAccent">[${new Date().toLocaleTimeString()}]:</strong> ${html}</pre>`
-      }
+      `<pre><strong class="text-accent dark:text-darkAccent">[${new Date().toLocaleTimeString()}]:</strong> ${html}</pre>`
     ])
     await tick()
-    if (consoleTextEl) consoleTextEl.scrollTop = consoleTextEl.scrollHeight
+    consoleTextEl.scrollTop = consoleTextEl.scrollHeight
   }
 
-  async function onMessage(value) {
+  async function onMessage(value: unknown) {
     const valueStr =
       typeof value === 'string'
         ? value
@@ -126,22 +150,20 @@
     messages.update(() => [])
   }
 
-  let consoleEl = $state(),
-    consoleH,
-    cStartY
-  let minConsoleHeight = 50
-  function startResizingConsole(e) {
+  let consoleEl: HTMLDivElement
+  let consoleH = 0
+  let cStartY = 0
+  const minConsoleHeight = 50
+  function startResizingConsole(e: MouseEvent) {
     cStartY = e.clientY
 
     const styles = window.getComputedStyle(consoleEl)
     consoleH = parseInt(styles.height, 10)
 
-    const moveHandler = (e) => {
+    const moveHandler = (e: MouseEvent) => {
       const dy = e.clientY - cStartY
       const newH = consoleH - dy
-      consoleEl.style.height = `${
-        newH < minConsoleHeight ? minConsoleHeight : newH
-      }px`
+      consoleEl.style.height = `${newH < minConsoleHeight ? minConsoleHeight : newH}px`
     }
     const upHandler = () => {
       document.removeEventListener('mouseup', upHandler)
@@ -153,14 +175,15 @@
 
   // mobile
   let isSideBarOpen = $state(false)
-  let sidebar
-  let sidebarToggle
+  let sidebar: HTMLElement
+  let sidebarToggle: HTMLElement
   let isDraggingSideBar = false
   let draggingStartPosX = 0
   let draggingEndPosX = 0
-  const clamp = (min, num, max) => Math.min(Math.max(num, min), max)
+  const clamp = (min: number, num: number, max: number) =>
+    Math.min(Math.max(num, min), max)
 
-  function toggleSidebar(sidebar, isSideBarOpen) {
+  function toggleSidebar() {
     sidebar.style.setProperty(
       '--translate-x',
       `${isSideBarOpen ? '0' : '-18.75'}rem`
@@ -168,10 +191,9 @@
   }
 
   onMount(() => {
-    sidebar = document.querySelector('#sidebar')
-    sidebarToggle = document.querySelector('#sidebarToggle')
-
     document.addEventListener('click', (e) => {
+      if (!(e.target instanceof Node)) return
+
       if (sidebarToggle.contains(e.target)) {
         isSideBarOpen = !isSideBarOpen
       } else if (isSideBarOpen && !sidebar.contains(e.target)) {
@@ -180,6 +202,7 @@
     })
 
     document.addEventListener('touchstart', (e) => {
+      if (!(e.target instanceof Node)) return
       if (sidebarToggle.contains(e.target)) return
 
       const x = e.touches[0].clientX
@@ -212,18 +235,16 @@
   })
 
   $effect(() => {
-    const sidebar = document.querySelector('#sidebar')
-    if (sidebar) {
-      toggleSidebar(sidebar, isSideBarOpen)
-    }
+    toggleSidebar()
   })
 </script>
 
 <!-- Sidebar toggle, only visible on small screens -->
 <div
   id="sidebarToggle"
-  class="z-2000 hidden lt-sm:flex justify-center items-center absolute top-2 left-2 w-8 h-8 rd-8
-            bg-accent dark:bg-darkAccent active:bg-accentDark dark:active:bg-darkAccentDark"
+  bind:this={sidebarToggle}
+  class="z-2000 hidden lt-sm:flex justify-center absolute items-center w-8 h-8 rd-8
+            bg-accent dark:bg-darkAccent active:bg-accentDark dark:active:bg-darkAccentDark text-accentText dark:text-darkAccentText"
 >
   {#if isSideBarOpen}
     <span class="i-codicon-close animate-duration-300ms animate-fade-in"></span>
@@ -233,25 +254,29 @@
 </div>
 
 <div
-  class="flex h-screen w-screen overflow-hidden children-pt4 children-pb-2 text-primaryText dark:text-darkPrimaryText"
+  class="flex h-screen w-screen overflow-hidden text-primaryText dark:text-darkPrimaryText"
 >
   <aside
     id="sidebar"
+    bind:this={sidebar}
     class="lt-sm:h-screen lt-sm:shadow-lg lt-sm:shadow lt-sm:transition-transform lt-sm:absolute lt-sm:z-1999
-      bg-darkPrimaryLighter transition-colors-250 overflow-hidden grid grid-rows-[min-content_auto] select-none px-2"
+      bg-darkPrimaryLighter transition-colors-250 overflow-hidden grid grid-rows-[min-content_auto] content-start select-none px-2"
   >
     <img
       class="self-center p-7 cursor-pointer"
       src="tauri_logo.png"
       alt="Tauri logo"
     />
-    <a href="##" class="nv justify-between" onclick={toggleDark}>
-      {#if isDark}
-        Switch to Light mode
-        <div class="i-ph-sun"></div>
-      {:else}
+    <a href="##" class="nv justify-between" onclick={switchTheme}>
+      {#if theme === 'auto'}
         Switch to Dark mode
+        <div class="i-ph-circle-half-fill"></div>
+      {:else if theme === 'dark'}
+        Switch to Light mode
         <div class="i-ph-moon"></div>
+      {:else if theme === 'light'}
+        Switch to Auto mode
+        <div class="i-ph-sun"></div>
       {/if}
     </a>
     <br />
@@ -291,7 +316,7 @@
           href="##"
           class="nv {selected === view ? 'nv_selected' : ''}"
           onclick={() => {
-            select(view)
+            selected = view
             isSideBarOpen = false
           }}
         >
@@ -343,8 +368,8 @@
         bind:this={consoleTextEl}
         class="px-2 overflow-y-auto all:font-mono code-block all:text-xs select-text mr-2"
       >
-        {#each $messages as r}
-          {@html r.html}
+        {#each $messages as messageHtml}
+          {@html messageHtml}
         {/each}
       </div>
     </div>
diff --git a/examples/api/src/app.css b/examples/api/src/app.css
index f2d03802efa6..ea8af2b85202 100644
--- a/examples/api/src/app.css
+++ b/examples/api/src/app.css
@@ -2,6 +2,13 @@
   line-height: 1.5;
 }
 
+:root.dark {
+  color-scheme: dark;
+}
+:root.light {
+  color-scheme: light;
+}
+
 input,
 select {
   min-width: 0;
@@ -42,9 +49,33 @@ code.code-block {
   width: 18.75rem;
 }
 
-@media screen and (max-width: 640px) {
+@media screen and (width < 640px) {
   #sidebar {
     --translate-x: -18.75rem;
+
     transform: translateX(var(--translate-x));
   }
 }
+
+#sidebar,
+main {
+  padding-top: calc(env(safe-area-inset-top) + 1rem);
+}
+
+#sidebar {
+  padding-left: calc(env(safe-area-inset-left) + 0.5rem);
+}
+
+main {
+  padding-right: env(safe-area-inset-right);
+}
+
+#sidebarToggle {
+  margin-top: calc(env(safe-area-inset-top) + 0.5rem);
+  margin-left: calc(env(safe-area-inset-left) + 0.5rem);
+}
+
+#sidebar,
+#console {
+  padding-bottom: calc(env(safe-area-inset-bottom) + 1.5rem);
+}
diff --git a/examples/api/src/components/MenuBuilder.svelte b/examples/api/src/components/MenuBuilder.svelte
index 7e824bb1d712..e0a614328e41 100644
--- a/examples/api/src/components/MenuBuilder.svelte
+++ b/examples/api/src/components/MenuBuilder.svelte
@@ -1,45 +1,293 @@
-<script>
-  import { CheckMenuItem } from '@tauri-apps/api/menu'
-  import MenuItemBuilder from './MenuItemBuilder.svelte'
+<script module lang="ts">
+  import {
+    CheckMenuItem,
+    IconMenuItem,
+    Menu,
+    MenuItem,
+    PredefinedMenuItem,
+    Submenu,
+    type PredefinedMenuItemOptions
+  } from '@tauri-apps/api/menu'
 
-  let { items = $bindable([]), itemClick } = $props()
+  export type MenuOptions = {
+    id: number
+    kind: MenuItemComponentKind
+    text: string | undefined
+    iconPath: string | undefined
+    checked: boolean | undefined
+  }
 
-  function addItem({ item, options }) {
-    items = [...items, { item, options }]
+  export type Item = MenuOptions & {
+    menu?: MenuItems
   }
 
-  function onItemClick(detail) {
-    itemClick(detail)
+  export type MenuItems =
+    | MenuItem
+    | IconMenuItem
+    | CheckMenuItem
+    | PredefinedMenuItem
+
+  export type MenuItemClickDetail = {
+    id: string
+    text: string
   }
+  export type MenuItemClickHandler = (detail: MenuItemClickDetail) => void
 
-  function itemIcon(item) {
-    if (item.options.icon) {
-      return 'i-ph-images-square'
+  export async function reorderMenuItems(
+    menu: Menu | Submenu,
+    reorderItem: Item,
+    toIndex: number
+  ) {
+    if (!reorderItem.menu) {
+      return
     }
-    if (item.item instanceof CheckMenuItem) {
-      return item.options.checked ? 'i-ph-check-duotone' : 'i-ph-square-duotone'
-    }
-    if (item.options.item) {
-      return 'i-ph-globe-stand'
+    await menu.remove(reorderItem.menu)
+    menu.insert(reorderItem.menu, toIndex)
+  }
+</script>
+
+<script lang="ts">
+  import Sortable from 'sortablejs'
+  import { onDestroy, onMount } from 'svelte'
+  import MenuItemComponent, {
+    type MenuItemComponentKind
+  } from './MenuItemComponent.svelte'
+
+  type PredefinedItem = PredefinedMenuItemOptions['item']
+
+  let {
+    items = $bindable(),
+    itemClick,
+    onItemAdded,
+    onItemRemoved,
+    onItemMoved
+  }: {
+    items: Item[]
+    itemClick: MenuItemClickHandler
+    onItemAdded?: (item: Item) => Promise<void>
+    onItemRemoved?: (item: Item) => Promise<void>
+    onItemMoved?: (item: Item, toIndex: number) => void
+  } = $props()
+
+  const predefinedOptions: PredefinedItem[] = [
+    'Separator',
+    'Copy',
+    'Cut',
+    'Paste',
+    'SelectAll',
+    'Undo',
+    'Redo',
+    'Minimize',
+    'Maximize',
+    'Fullscreen',
+    'Hide',
+    'HideOthers',
+    'ShowAll',
+    'CloseWindow',
+    'Quit',
+    'Services',
+    'BringAllToFront'
+  ]
+
+  async function create(options: MenuOptions) {
+    let { kind, text, iconPath, checked } = options
+    text ??= ''
+
+    switch (kind) {
+      case 'Normal': {
+        return await MenuItem.new({
+          text,
+          action: (id) => {
+            const item = items.find((item) => item.id === options.id)
+            itemClick({ id, text: item?.text ?? text })
+          }
+        })
+      }
+      case 'Icon': {
+        return await IconMenuItem.new({
+          text,
+          icon: iconPath,
+          action: (id) => {
+            const item = items.find((item) => item.id === options.id)
+            itemClick({ id, text: item?.text ?? text })
+          }
+        })
+      }
+      case 'Check': {
+        const checkItem = await CheckMenuItem.new({
+          text,
+          checked,
+          action: async (id) => {
+            const item = items.find((item) => item.id === options.id)
+            itemClick({ id, text: item?.text ?? text })
+            if (item) {
+              item.checked = await checkItem.isChecked()
+            }
+          }
+        })
+        return checkItem
+      }
+      default: {
+        return await PredefinedMenuItem.new({
+          item: kind
+        })
+      }
     }
-    return 'i-ph-chat-teardrop-text'
   }
 
-  function itemToString(item) {
-    // icon || check|normal || predefined
-    return item.options.icon || item.options.text || item.options.item
+  let currentId = 0
+
+  let sourceSortableEl1: HTMLElement
+  let sourceSortableEl2: HTMLElement
+  let targetSortableEl: HTMLElement
+
+  function makeSourceSortable(sourceSortableEl: HTMLElement) {
+    return new Sortable(sourceSortableEl, {
+      draggable: 'div.menu-item',
+      group: {
+        name: 'shared',
+        pull: 'clone',
+        put: false
+      },
+      sort: false,
+      delayOnTouchOnly: true,
+      delay: 500
+    })
   }
-</script>
 
-<div class="flex flex-col children:grow gap-2">
-  <MenuItemBuilder newItem={addItem} itemClick={onItemClick} />
+  onMount(() => {
+    const sourceSortable1 = makeSourceSortable(sourceSortableEl1)
+    const sourceSortable2 = makeSourceSortable(sourceSortableEl2)
+    const targetSortable = new Sortable(targetSortableEl, {
+      dataIdAttr: 'data-id',
+      group: {
+        name: 'shared'
+      },
+      async onAdd(event) {
+        const item = event.item
+        const kind = item.dataset.kind as MenuItemComponentKind
+        const text = item.dataset.text
+        const iconPath = item.dataset.iconPath
+        const checked = item.dataset.checked
+
+        const newItem = {
+          id: currentId,
+          kind,
+          text,
+          iconPath,
+          checked: checked !== undefined ? checked === 'true' : checked
+        } as Item
+        currentId += 1
+
+        // HACK: We can't track the element created by Sortable,
+        // just make a new one and delete the one from Sortable
+        item.remove()
+
+        if (event.newIndex !== undefined) {
+          items.splice(event.newIndex, 0, newItem)
+        } else {
+          items.push(newItem)
+        }
 
-  <div>
-    {#each items as item}
-      <div class="flex flex-row gap-1 items-center">
-        <div class={itemIcon(item)}></div>
-        <p>{itemToString(item)}</p>
+        newItem.menu = await create(newItem)
+
+        await onItemAdded?.(newItem)
+      },
+      onUpdate(event) {
+        const [item] = items.splice(event.oldIndex!, 1)
+        // Sortable's DOM manipulation doesn't work with Svelte,
+        // so we recreate all the nodes on order changes...
+        // This must be `toSpliced` to trigger the `#key` block re-render
+        items = items.toSpliced(event.newIndex!, 0, item!)
+
+        onItemMoved?.(item, event.newIndex!)
+      },
+      delayOnTouchOnly: true,
+      delay: 500,
+      animation: 200
+    })
+    return () => {
+      targetSortable.destroy()
+      sourceSortable1.destroy()
+      sourceSortable2.destroy()
+    }
+  })
+
+  onDestroy(() => {
+    for (const item of items) {
+      item.menu?.close()
+    }
+    items = []
+  })
+</script>
+
+<div class="grid gap-4 max-w-5xl">
+  <div class="grid gap-2">
+    <div>
+      <h3>Custom</h3>
+      <div class="flex flex-wrap gap-2" bind:this={sourceSortableEl1}>
+        <MenuItemComponent kind="Normal" text="A menu item" />
+        <MenuItemComponent
+          kind="Icon"
+          text="Menu item with icon"
+          iconPath="../../.icons/icon.png"
+        />
+        <MenuItemComponent kind="Check" text="A check menu" checked={false} />
+      </div>
+    </div>
+    <div>
+      <h3>Predefined</h3>
+      <div class="flex flex-wrap gap-2" bind:this={sourceSortableEl2}>
+        {#each predefinedOptions as predefinedOption}
+          <MenuItemComponent kind={predefinedOption} />
+        {/each}
       </div>
-    {/each}
+    </div>
+  </div>
+  <div class="h-1px bg-neutral/20 m-inline-4"></div>
+  <div
+    bind:this={targetSortableEl}
+    class="p-2 border border-solid border-neutral-300 dark:border-neutral-700 rounded-md min-h-24 grid items-start gap-1"
+  >
+    {#key items}
+      {#each items as item, i (item.id)}
+        <MenuItemComponent
+          kind={item.kind}
+          id={item.id}
+          bind:text={item.text}
+          bind:iconPath={item.iconPath}
+          bind:checked={item.checked}
+          onTextChange={item.text !== undefined
+            ? () => {
+                item.menu?.setText(item.text ?? '')
+              }
+            : undefined}
+          onIconPathChange={item.iconPath !== undefined
+            ? () => {
+                ;(item.menu as IconMenuItem | undefined)?.setIcon(
+                  item.iconPath!
+                )
+              }
+            : undefined}
+          onCheckedChange={item.checked !== undefined
+            ? () => {
+                ;(item.menu as CheckMenuItem | undefined)?.setChecked(
+                  item.checked!
+                )
+              }
+            : undefined}
+          onRemove={async () => {
+            items.splice(i, 1)
+            await onItemRemoved?.(item).finally(() => {
+              item.menu?.close()
+            })
+          }}
+        />
+      {:else}
+        <div class="place-self-center color-secondaryText">
+          Drag and drop the menu items above to start building
+        </div>
+      {/each}
+    {/key}
   </div>
 </div>
diff --git a/examples/api/src/components/MenuItemBuilder.svelte b/examples/api/src/components/MenuItemBuilder.svelte
deleted file mode 100644
index 0f93436978a4..000000000000
--- a/examples/api/src/components/MenuItemBuilder.svelte
+++ /dev/null
@@ -1,150 +0,0 @@
-<script>
-  import {
-    IconMenuItem,
-    CheckMenuItem,
-    PredefinedMenuItem,
-    MenuItem
-  } from '@tauri-apps/api/menu'
-
-  let { newItem, itemClick } = $props()
-
-  let kind = $state('Normal')
-  let text = $state('')
-  let icon = $state('')
-  /** @type {import('@tauri-apps/api/menu').PredefinedMenuItemOptions['item'] | undefined} */
-  let predefinedItem = undefined
-  let checked = $state(true)
-
-  const itemKinds = ['Normal', 'Icon', 'Check', 'Predefined']
-  const predefinedOptions = [
-    'Separator',
-    'Copy',
-    'Cut',
-    'Paste',
-    'SelectAll',
-    'Undo',
-    'Redo',
-    'Minimize',
-    'Maximize',
-    'Fullscreen',
-    'Hide',
-    'HideOthers',
-    'ShowAll',
-    'CloseWindow',
-    'Quit',
-    'Services',
-    'BringAllToFront'
-  ]
-
-  function onKindChange(event) {
-    kind = event.currentTarget.value
-  }
-
-  function onPredefinedChange(event) {
-    predefinedItem = event.currentTarget.value
-  }
-
-  async function create() {
-    let options = null
-    let item = null
-
-    const t = text
-
-    switch (kind) {
-      case 'Normal':
-        options = {
-          text,
-          action: (id) => itemClick({ id, text: t })
-        }
-        item = await MenuItem.new(options)
-        break
-      case 'Icon':
-        options = {
-          text,
-          icon,
-          action: (id) => itemClick({ id, text: t })
-        }
-        item = await IconMenuItem.new(options)
-        break
-      case 'Check':
-        options = {
-          text,
-          checked,
-          action: (id) => itemClick({ id, text: t })
-        }
-        item = await CheckMenuItem.new(options)
-        break
-      case 'Predefined':
-        options = {
-          item: predefinedItem
-        }
-        item = await PredefinedMenuItem.new(options)
-        break
-    }
-    newItem({ item, options })
-
-    text = ''
-    predefinedItem = undefined
-  }
-</script>
-
-<div class="flex flex-row gap-2 flex-grow-0">
-  <div class="flex flex-col">
-    {#each itemKinds as itemKind, i}
-      <div class="flex gap-1">
-        <input
-          id="{itemKind}Input"
-          checked={kind === itemKind}
-          onchange={onKindChange}
-          type="radio"
-          name="kind"
-          value={itemKinds[i]}
-        />
-        <label for="{itemKind}Input">{itemKind}</label>
-      </div>
-    {/each}
-  </div>
-
-  <div class="bg-gray/30 dark:bg-white/5 w-1px flex-shrink-0"></div>
-
-  <div class="flex flex-col gap-2">
-    {#if kind == 'Normal' || kind == 'Icon' || kind == 'Check'}
-      <input class="input" type="text" placeholder="Text" bind:value={text} />
-    {/if}
-    {#if kind == 'Icon'}
-      <input class="input" type="icon" placeholder="Icon" bind:value={icon} />
-    {:else if kind == 'Check'}
-      <div class="flex gap-1">
-        <input
-          id="checkItemCheckedInput"
-          type="checkbox"
-          class="checkbox"
-          bind:checked
-        />
-        <label for="checkItemCheckedInput">Enabled</label>
-      </div>
-    {:else if kind == 'Predefined'}
-      <div class="flex gap-2 flex-wrap">
-        {#each predefinedOptions as predefinedOption, i}
-          <div class="flex gap-1">
-            <input
-              id="{predefinedOption}Input"
-              checked={kind === predefinedOption}
-              onchange={onPredefinedChange}
-              type="radio"
-              name="predefinedKind"
-              value={predefinedOptions[i]}
-            />
-            <label for="{predefinedOption}Input">{predefinedOption}</label>
-          </div>
-        {/each}
-      </div>
-    {/if}
-  </div>
-
-  <div class="grow"></div>
-
-  <div class="flex flex-col">
-    <button class="btn" onclick={create}>Create</button>
-  </div>
-</div>
diff --git a/examples/api/src/components/MenuItemComponent.svelte b/examples/api/src/components/MenuItemComponent.svelte
new file mode 100644
index 000000000000..5b828714a9fb
--- /dev/null
+++ b/examples/api/src/components/MenuItemComponent.svelte
@@ -0,0 +1,79 @@
+<script module lang="ts">
+  import type { PredefinedMenuItemOptions } from '@tauri-apps/api/menu'
+
+  type PredefinedItem = PredefinedMenuItemOptions['item']
+  export type MenuItemComponentKind =
+    | PredefinedItem
+    | 'Normal'
+    | 'Icon'
+    | 'Check'
+</script>
+
+<script lang="ts">
+  let {
+    id,
+    kind,
+    text = $bindable(),
+    iconPath = $bindable(),
+    checked = $bindable(),
+    onTextChange,
+    onIconPathChange,
+    onCheckedChange,
+    onRemove
+  }: {
+    id?: number
+    kind: MenuItemComponentKind
+    text?: string
+    iconPath?: string
+    checked?: boolean
+    onTextChange?: () => void
+    onIconPathChange?: () => void
+    onCheckedChange?: () => void
+    onRemove?: () => void
+  } = $props()
+</script>
+
+<div
+  class="flex items-center gap-2 border border-solid border-neutral-200 dark:border-none bg-neutral-100 dark:bg-neutral-700 p-inline-2 p-block-1 rounded-md select-none menu-item"
+  data-kind={kind}
+  data-text={text}
+  data-icon-path={iconPath}
+  data-checked={checked}
+  data-id={id}
+>
+  {kind}
+  {#if text !== undefined}
+    <input
+      type="text"
+      title="text"
+      placeholder="text"
+      class="border border-solid dark:bg-neutral-800 dark:color-neutral-100 border-neutral-200 dark:border-neutral-700 focus-visible:border-accent outline-none p-inline-2 p-block-1 rounded-1"
+      bind:value={text}
+      onchange={onTextChange}
+    />
+  {/if}
+  {#if iconPath !== undefined}
+    <input
+      type="text"
+      title="icon path"
+      placeholder="icon path"
+      class="border border-solid dark:bg-neutral-800 dark:color-neutral-100 border-neutral-200 dark:border-neutral-700 focus-visible:border-accent outline-none p-inline-2 p-block-1 rounded-1"
+      bind:value={iconPath}
+      onchange={onIconPathChange}
+    />
+  {/if}
+  {#if checked !== undefined}
+    <input
+      type="checkbox"
+      title="checked"
+      bind:checked
+      onchange={onCheckedChange}
+    />
+  {/if}
+
+  {#if onRemove !== undefined}
+    <button onclick={onRemove} title="remove" class="btn m-l-auto">
+      <div class="i-ph-trash"></div>
+    </button>
+  {/if}
+</div>
diff --git a/examples/api/src/main.js b/examples/api/src/main.ts
similarity index 87%
rename from examples/api/src/main.js
rename to examples/api/src/main.ts
index 03e3ef7dd7c4..14633e36eb85 100644
--- a/examples/api/src/main.js
+++ b/examples/api/src/main.ts
@@ -8,7 +8,7 @@ import App from './App.svelte'
 import { mount } from 'svelte'
 
 const app = mount(App, {
-  target: document.querySelector('#app')
+  target: document.querySelector('#app')!
 })
 
 export default app
diff --git a/examples/api/src/views/App.svelte b/examples/api/src/views/App.svelte
index 25604c72a73e..13fe5662b534 100644
--- a/examples/api/src/views/App.svelte
+++ b/examples/api/src/views/App.svelte
@@ -1,9 +1,8 @@
-<script>
-  import { show, hide, setTheme, setDockVisibility } from '@tauri-apps/api/app'
+<script lang="ts">
+  import { show, hide, setDockVisibility } from '@tauri-apps/api/app'
+  import type { ViewProps } from '../App.svelte'
 
-  let { onMessage } = $props()
-  /** @type {import('@tauri-apps/api/window').Theme | 'auto'} */
-  let theme = $state('auto')
+  let { onMessage }: ViewProps = $props()
   let dockVisible = $state(true)
 
   function showApp() {
@@ -24,28 +23,13 @@
       .catch(onMessage)
   }
 
-  async function switchTheme() {
-    switch (theme) {
-      case 'dark':
-        theme = 'light'
-        break
-      case 'light':
-        theme = 'auto'
-        break
-      case 'auto':
-        theme = 'dark'
-        break
-    }
-    setTheme(theme === 'auto' ? null : theme)
-  }
-
   async function toggleDockVisibility() {
     await setDockVisibility(!dockVisible)
     dockVisible = !dockVisible
   }
 </script>
 
-<div>
+<div class="flex gap-2">
   <button
     class="btn"
     id="show"
@@ -53,8 +37,7 @@
     onclick={showApp}>Show</button
   >
   <button class="btn" id="hide" onclick={hideApp}>Hide</button>
-  <button class="btn" id="switch-theme" onclick={switchTheme}
-    >Switch Theme ({theme})</button
+  <button class="btn" id="toggle-dock-visibility" onclick={toggleDockVisibility}
+    >Toggle dock visibility</button
   >
-  <button class="btn" id="toggle-dock-visibility" onclick={toggleDockVisibility}>Toggle dock visibility</button>
 </div>
diff --git a/examples/api/src/views/Communication.svelte b/examples/api/src/views/Communication.svelte
index 5c62d0936b5e..33aaf4a979da 100644
--- a/examples/api/src/views/Communication.svelte
+++ b/examples/api/src/views/Communication.svelte
@@ -1,20 +1,20 @@
-<script>
+<script lang="ts">
   import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow'
   import { Channel, invoke } from '@tauri-apps/api/core'
   import { onMount, onDestroy } from 'svelte'
+  import type { UnlistenFn } from '@tauri-apps/api/event'
+  import type { ViewProps } from '../App.svelte'
 
-  let { onMessage } = $props()
-  let unlisten
+  let { onMessage }: ViewProps = $props()
 
   const webviewWindow = getCurrentWebviewWindow()
 
+  let unlisten: UnlistenFn | undefined
   onMount(async () => {
     unlisten = await webviewWindow.listen('rust-event', onMessage)
   })
   onDestroy(() => {
-    if (unlisten) {
-      unlisten()
-    }
+    unlisten?.()
   })
 
   function log() {
@@ -57,7 +57,7 @@
   }
 </script>
 
-<div>
+<div class="flex gap-2">
   <button class="btn" id="log" onclick={log}>Call Log API</button>
   <button class="btn" id="request" onclick={performRequest}>
     Call Request (async) API
@@ -65,6 +65,6 @@
   <button class="btn" id="event" onclick={emitEvent}>
     Send event to Rust
   </button>
-  <button class="btn" id="request" onclick={echo}> Echo </button>
-  <button class="btn" id="request" onclick={spam}> Spam </button>
+  <button class="btn" id="request" onclick={echo}>Echo</button>
+  <button class="btn" id="request" onclick={spam}>Spam</button>
 </div>
diff --git a/examples/api/src/views/Menu.svelte b/examples/api/src/views/Menu.svelte
index 0c4b719fd7ce..aa9cef7ed69d 100644
--- a/examples/api/src/views/Menu.svelte
+++ b/examples/api/src/views/Menu.svelte
@@ -1,86 +1,126 @@
-<script>
+<script lang="ts">
   import { Menu, Submenu, NativeIcon } from '@tauri-apps/api/menu'
-  import MenuBuilder from '../components/MenuBuilder.svelte'
-  import { defaultWindowIcon } from '@tauri-apps/api/app';
+  import MenuBuilder, {
+    reorderMenuItems,
+    type Item,
+    type MenuItemClickDetail,
+    type MenuItems
+  } from '../components/MenuBuilder.svelte'
+  import { defaultWindowIcon } from '@tauri-apps/api/app'
+  import type { ViewProps } from '../App.svelte'
+  import { onDestroy } from 'svelte'
+  import type { Image } from '@tauri-apps/api/image'
 
-  let { onMessage } = $props()
-  let items = $state([])
-  let menu = null
-  let submenu = null
-  let menuItemCount = 0
+  let { onMessage }: ViewProps = $props()
+  let items = $state<Item[]>([])
+
+  let menu: Menu | undefined
+  let popupMenu: Menu | undefined
+  let submenu: Submenu | undefined
 
   const macOS = navigator.userAgent.includes('Macintosh')
 
-  async function createSubmenu() {
-    submenu = await Submenu.new({
+  async function createSubmenu(): Promise<Submenu> {
+    return await Submenu.new({
       text: 'app',
-      items: items.map((i) => i.item)
+      items: items.map((i) => i.menu).filter(Boolean) as MenuItems[]
     })
   }
 
-  async function createSubmenuWithNativeIcon() {
-    submenu = await Submenu.new({
+  async function createSubmenuWithNativeIcon(): Promise<Submenu> {
+    return await Submenu.new({
       text: 'Submenu with NativeIcon',
       icon: NativeIcon.Folder,
-      items: items.map((i) => i.item)
+      items: items.map((i) => i.menu).filter(Boolean) as MenuItems[]
     })
   }
 
-  async function createSubmenuWithImageIcon() {
-    submenu = await Submenu.new({
-      text: 'Submenu with Image',
-      icon: await defaultWindowIcon(),
-      items: items.map((i) => i.item)
-    });
+  async function createSubmenuWithImageIcon(): Promise<Submenu> {
+    let icon: Image | undefined
+    try {
+      icon = (await defaultWindowIcon())!
+      return await Submenu.new({
+        text: 'Submenu with Image',
+        icon,
+        items: items.map((i) => i.menu).filter(Boolean) as MenuItems[]
+      })
+    } finally {
+      icon?.close()
+    }
   }
 
-  async function create() {
-    await createSubmenu()
-    menuItemCount = items.length
+  async function setMenu(newSubmenu: Submenu) {
+    menu?.close()
+    menu = undefined
+    submenu?.close()
+    submenu = newSubmenu
+
     menu = await Menu.new({
       items: [submenu]
     })
     await (macOS ? menu.setAsAppMenu() : menu.setAsWindowMenu())
   }
 
+  async function create() {
+    await setMenu(await createSubmenu())
+  }
+
   async function createWithNativeIcon() {
-    await createSubmenuWithNativeIcon()
-    menuItemCount = items.length
-    menu = await Menu.new({
-      items: [submenu]
-    })
-    await (macOS ? menu.setAsAppMenu() : menu.setAsWindowMenu())
+    await setMenu(await createSubmenuWithNativeIcon())
   }
 
   async function createWithImageIcon() {
-    await createSubmenuWithImageIcon()
-    menuItemCount = items.length
-    menu = await Menu.new({
-      items: [submenu]
-    })
-    await (macOS ? menu.setAsAppMenu() : menu.setAsWindowMenu())
+    await setMenu(await createSubmenuWithImageIcon())
   }
 
   async function popup() {
-    if (!submenu || menuItemCount !== items.length) {
-      await createSubmenu()
-    }
-    // we can't popup the same menu because it's the app menu (it crashes on macOS)
-    const m = await Menu.new({ items: [submenu] })
-    m.popup()
+    popupMenu?.close()
+    popupMenu = undefined
+    popupMenu = await Menu.new({
+      items: items.map((i) => i.menu).filter(Boolean) as MenuItems[]
+    })
+    await popupMenu.popup()
   }
 
-  function onItemClick(detail) {
+  function onItemClick(detail: MenuItemClickDetail) {
     onMessage(`Item ${detail.text} clicked`)
   }
+
+  onDestroy(() => {
+    menu?.close()
+    submenu?.close()
+    popupMenu?.close()
+  })
 </script>
 
-<div class="grid gap-4">
-  <MenuBuilder bind:items itemClick={onItemClick} />
-  <div>
+<div class="grid gap-8 mb-4">
+  <MenuBuilder
+    bind:items
+    itemClick={onItemClick}
+    onItemAdded={async (item) => {
+      if (item.menu) {
+        await submenu?.append(item.menu)
+      }
+    }}
+    onItemRemoved={async (item) => {
+      if (item.menu) {
+        await submenu?.remove(item.menu)
+      }
+    }}
+    onItemMoved={(item, toIndex) => {
+      if (submenu) {
+        reorderMenuItems(submenu, item, toIndex)
+      }
+    }}
+  />
+  <div class="flex gap-2">
     <button class="btn" onclick={create}>Create menu</button>
+    <button class="btn" onclick={createWithNativeIcon}
+      >Create menu with NativeIcon</button
+    >
+    <button class="btn" onclick={createWithImageIcon}
+      >Create menu with Image icon</button
+    >
     <button class="btn" onclick={popup}>Popup</button>
-    <button class="btn" onclick={createWithNativeIcon}>Create menu with NativeIcon</button>
-    <button class="btn" onclick={createWithImageIcon}>Create menu with Image icon</button>
   </div>
 </div>
diff --git a/examples/api/src/views/Tray.svelte b/examples/api/src/views/Tray.svelte
index 9636f00c6806..4c658f8ca88b 100644
--- a/examples/api/src/views/Tray.svelte
+++ b/examples/api/src/views/Tray.svelte
@@ -1,79 +1,135 @@
-<script>
+<script lang="ts">
   import { TrayIcon } from '@tauri-apps/api/tray'
-  import MenuBuilder from '../components/MenuBuilder.svelte'
+  import MenuBuilder, {
+    reorderMenuItems,
+    type Item,
+    type MenuItemClickDetail,
+    type MenuItems
+  } from '../components/MenuBuilder.svelte'
   import { Menu } from '@tauri-apps/api/menu'
+  import type { ViewProps } from '../App.svelte'
+  import { onDestroy } from 'svelte'
 
-  let { onMessage } = $props()
+  let { onMessage }: ViewProps = $props()
 
-  let icon = $state(null)
-  let tooltip = $state(null)
-  let title = $state(null)
+  let icon = $state<string>('../../.icons/tray_icon.png')
+  let tooltip = $state<string>()
+  let title = $state<string>()
   let iconAsTemplate = $state(false)
   let menuOnLeftClick = $state(true)
-  let menuItems = $state([])
+  let menuItems = $state<Item[]>([])
 
-  function onItemClick(detail) {
+  let menu: Menu | undefined
+  let tray = $state<TrayIcon | undefined>()
+
+  function onItemClick(detail: MenuItemClickDetail) {
     onMessage(`Item ${detail.text} clicked`)
   }
 
+  function remove() {
+    menu?.close()
+    menu = undefined
+    tray?.close()
+    tray = undefined
+  }
+
   async function create() {
-    TrayIcon.new({
-      icon,
-      tooltip,
-      title,
-      iconAsTemplate,
-      menuOnLeftClick,
-      menu: await Menu.new({
-        items: menuItems.map((i) => i.item)
-      }),
-      action: (event) => onMessage(event)
-    }).catch(onMessage)
+    remove()
+    try {
+      menu = await Menu.new({
+        items: menuItems.map((i) => i.menu).filter(Boolean) as MenuItems[]
+      })
+      tray = await TrayIcon.new({
+        icon,
+        tooltip,
+        title,
+        iconAsTemplate,
+        menuOnLeftClick,
+        menu,
+        action: (event) => onMessage(event)
+      })
+    } catch (error) {
+      remove()
+      onMessage(error)
+    }
   }
+
+  onDestroy(() => {
+    remove()
+  })
 </script>
 
-<div class="flex flex-col children:grow gap-2">
-  <div class="flex gap-1">
-    <input
-      class="input grow"
-      type="text"
-      placeholder="Title"
-      bind:value={title}
-    />
+<div class="grid gap-8 mb-4">
+  <MenuBuilder
+    bind:items={menuItems}
+    itemClick={onItemClick}
+    onItemAdded={async (item) => {
+      if (item.menu) {
+        await menu?.append(item.menu)
+      }
+    }}
+    onItemRemoved={async (item) => {
+      if (item.menu) {
+        await menu?.remove(item.menu)
+      }
+    }}
+    onItemMoved={(item, toIndex) => {
+      if (menu) {
+        reorderMenuItems(menu, item, toIndex)
+      }
+    }}
+  />
 
-    <input
-      class="input grow"
-      type="text"
-      placeholder="Tooltip"
-      bind:value={tooltip}
-    />
+  <div class="flex items-center gap-8">
+    <div class="grid gap-2 grid-cols-3 items-center">
+      <input
+        class="input grow"
+        type="text"
+        placeholder="Title"
+        bind:value={title}
+      />
 
-    <label>
-      <input type="checkbox" class="checkbox" bind:checked={menuOnLeftClick} />
-      Menu on left click
-    </label>
-  </div>
+      <input
+        class="input grow"
+        type="text"
+        placeholder="Tooltip"
+        bind:value={tooltip}
+      />
 
-  <div class="flex gap-1">
-    <input
-      class="input grow"
-      type="text"
-      placeholder="Icon path"
-      bind:value={icon}
-    />
+      <label class="flex gap-2">
+        <input
+          type="checkbox"
+          class="checkbox"
+          bind:checked={menuOnLeftClick}
+        />
+        Menu on left click
+      </label>
 
-    <label>
-      <input type="checkbox" class="checkbox" bind:checked={iconAsTemplate} />
-      Icon as template
-    </label>
-  </div>
+      <input
+        class="input col-span-2"
+        type="text"
+        placeholder="Icon path"
+        bind:value={icon}
+      />
 
-  <div class="flex children:grow">
-    <MenuBuilder bind:items={menuItems} itemClick={onItemClick} />
-  </div>
+      <label class="flex gap-2">
+        <input type="checkbox" class="checkbox" bind:checked={iconAsTemplate} />
+        Icon as template
+      </label>
+    </div>
 
-  <div class="flex">
-    <button class="btn" onclick={create} title="Creates the tray icon"
-      >Create tray</button
-    >
+    <div class="flex">
+      {#if tray}
+        <button
+          class="btn"
+          onclick={remove}
+          title="Remove the tray icon">Remove tray</button
+        >
+      {:else}
+        <button class="btn" onclick={create} title="Creates the tray icon"
+          >Create tray</button
+        >
+      {/if}
+    </div>
   </div>
 </div>
diff --git a/examples/api/src/views/WebRTC.svelte b/examples/api/src/views/WebRTC.svelte
index 8dfaa5f16da9..f1be6b1898c7 100644
--- a/examples/api/src/views/WebRTC.svelte
+++ b/examples/api/src/views/WebRTC.svelte
@@ -1,26 +1,43 @@
-<script>
+<script lang="ts">
   import { onMount, onDestroy } from 'svelte'
-  let { onMessage } = $props()
+  import type { ViewProps } from '../App.svelte'
 
-  const constraints = (window.constraints = {
+  let { onMessage }: ViewProps = $props()
+
+  let video: HTMLVideoElement
+  let mediaStream: MediaStream | undefined
+
+  const constraints: MediaStreamConstraints = {
     audio: true,
     video: true
-  })
+  }
 
-  function handleSuccess(stream) {
-    const video = document.querySelector('video')
+  function handleSuccess(stream: MediaStream) {
+    mediaStream = stream
+    const settings = stream.getTracks().map((track) => track.getSettings())
+    onMessage(`Got streams: ${JSON.stringify(settings, null, 2)}`)
     const videoTracks = stream.getVideoTracks()
-    onMessage('Got stream with constraints:', constraints)
-    onMessage(`Using video device: ${videoTracks[0].label}`)
-    window.stream = stream // make variable available to browser console
-    video.srcObject = stream
+    onMessage(`Using video device: ${videoTracks[0]?.label ?? 'Unknown'}`)
+    // @ts-expect-error
+    window.stream = mediaStream // make variable available to browser console
+    if (video) {
+      video.srcObject = mediaStream
+    }
   }
 
-  function handleError(error) {
+  function handleError(error: unknown) {
+    if (!(error instanceof DOMException)) {
+      onMessage(`getUserMedia error: ${error}`)
+      return
+    }
+
     if (error.name === 'ConstraintNotSatisfiedError') {
-      const v = constraints.video
+      // const v = constraints.video
+      // onMessage(
+      //   `The resolution ${v.width.exact}x${v.height.exact} px is not supported by your device.`
+      // )
       onMessage(
-        `The resolution ${v.width.exact}x${v.height.exact} px is not supported by your device.`
+        `The constraints ${JSON.stringify(constraints)} can not be satisfied by your device.`
       )
     } else if (error.name === 'PermissionDeniedError') {
       onMessage(
@@ -29,7 +46,7 @@
           + 'order for the demo to work.'
       )
     }
-    onMessage(`getUserMedia error: ${error.name}`, error)
+    onMessage(`getUserMedia error: ${error}`)
   }
 
   onMount(async () => {
@@ -42,15 +59,15 @@
   })
 
   onDestroy(() => {
-    window.stream?.getTracks().forEach(function (track) {
+    for (const track of mediaStream?.getTracks() ?? []) {
       track.stop()
-    })
+    }
   })
 </script>
 
 <div class="flex flex-col gap-2">
   <div class="note-red grow">Not available for Linux</div>
-  <video id="localVideo" autoplay playsinline>
+  <video id="localVideo" autoplay playsinline bind:this={video}>
     <track kind="captions" />
   </video>
 </div>
diff --git a/examples/api/src/views/Welcome.svelte b/examples/api/src/views/Welcome.svelte
index 72b1f2d49fae..cbe9d31fc7bc 100644
--- a/examples/api/src/views/Welcome.svelte
+++ b/examples/api/src/views/Welcome.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { invoke } from '@tauri-apps/api/core'
   import {
     getName,
@@ -6,8 +6,9 @@
     getTauriVersion,
     getBundleType
   } from '@tauri-apps/api/app'
+  import type { ViewProps } from '../App.svelte'
 
-  let { onMessage } = $props()
+  let { onMessage }: ViewProps = $props()
 
   let version = $state('1.0.0')
   let tauriVersion = $state('1.0.0')
diff --git a/examples/api/src/views/Window.svelte b/examples/api/src/views/Window.svelte
index 98be2b074c8f..f4cd5d66679e 100644
--- a/examples/api/src/views/Window.svelte
+++ b/examples/api/src/views/Window.svelte
@@ -1,5 +1,5 @@
-<script>
-  import { onDestroy } from 'svelte'
+<script lang="ts">
+  import { onDestroy, onMount } from 'svelte'
   import {
     LogicalSize,
     UserAttentionType,
@@ -10,19 +10,23 @@
     ProgressBarStatus
   } from '@tauri-apps/api/window'
   import { WebviewWindow } from '@tauri-apps/api/webviewWindow'
+  import type { CursorIcon, Effects, Theme } from '@tauri-apps/api/window'
+  import type { UnlistenFn } from '@tauri-apps/api/event'
+  import type { ViewProps } from '../App.svelte'
 
-  let { onMessage } = $props()
+  let { onMessage }: ViewProps = $props()
 
   const webview = WebviewWindow.getCurrent()
 
-  let selectedWebview = $state(webview.label)
   const webviewMap = $state({
     [webview.label]: webview
   })
+  let selectedWebviewLabel = $state(webview.label)
+  let selectedWebview = $derived(webviewMap[selectedWebviewLabel])
 
   let focusable = $state(true)
 
-  const cursorIconOptions = [
+  const cursorIconOptions: CursorIcon[] = [
     'default',
     'crosshair',
     'hand',
@@ -64,32 +68,28 @@
     'rowResize'
   ]
 
-  const windowsEffects = [
-    'mica',
-    'blur',
-    'acrylic',
-    'tabbed',
-    'tabbedDark',
-    'tabbedLight'
+  const windowsEffects: Effect[] = [
+    Effect.Mica,
+    Effect.Blur,
+    Effect.Acrylic,
+    Effect.Tabbed,
+    Effect.TabbedDark,
+    Effect.TabbedLight
   ]
   const isWindows = navigator.appVersion.includes('Windows')
   const isMacOS = navigator.appVersion.includes('Macintosh')
-  let effectOptions = isWindows
+  const effectOptions: Effect[] = isWindows
     ? windowsEffects
-    : Object.keys(Effect)
-        .map((effect) => Effect[effect])
-        .filter((e) => !windowsEffects.includes(e))
-  const effectStateOptions = Object.keys(EffectState).map(
-    (state) => EffectState[state]
-  )
+    : (Object.values(Effect) as Effect[]).filter(
+        (e) => !windowsEffects.includes(e)
+      )
+  const effectStateOptions = Object.values(EffectState) as EffectState[]
 
-  const progressBarStatusOptions = Object.keys(ProgressBarStatus).map(
-    (s) => ProgressBarStatus[s]
-  )
+  const progressBarStatusOptions = Object.values(ProgressBarStatus)
 
-  const mainEl = document.querySelector('main')
+  const mainEl = document.querySelector('main')!
 
-  let newWebviewLabel = $state()
+  let newWebviewLabel = $state<string>()
 
   let resizable = $state(true)
   let maximizable = $state(true)
@@ -102,90 +102,89 @@
   let contentProtected = $state(false)
   let fullscreen = $state(false)
   let simpleFullscreen = $state(false)
-  let width = $state(null)
-  let height = $state(null)
-  let minWidth = $state(null)
-  let minHeight = $state(null)
-  let maxWidth = $state(null)
-  let maxHeight = $state(null)
-  let x = $state(null)
-  let y = $state(null)
+  let width = $state(100)
+  let height = $state(100)
+  let minWidth = $state<number | null>(null)
+  let minHeight = $state<number | null>(null)
+  let maxWidth = $state<number | null>(null)
+  let maxHeight = $state<number | null>(null)
+  let x = $state(0)
+  let y = $state(0)
   let scaleFactor = $state(1)
   let innerPosition = $state(new PhysicalPosition(0, 0))
   let outerPosition = $state(new PhysicalPosition(0, 0))
   let innerSize = $state(new PhysicalSize(0, 0))
   let outerSize = $state(new PhysicalSize(0, 0))
-  let resizeEventUnlisten
-  let moveEventUnlisten
+  let resizeEventUnlisten: UnlistenFn | undefined
+  let moveEventUnlisten: UnlistenFn | undefined
   let cursorGrab = $state(false)
   let cursorVisible = $state(true)
-  let cursorX = $state(null)
-  let cursorY = $state(null)
-  /** @type {import('@tauri-apps/api/window').CursorIcon} */
-  let cursorIcon = $state('default')
+  let cursorX = $state<number | null>(null)
+  let cursorY = $state<number | null>(null)
+  let cursorIcon = $state<CursorIcon>('default')
   let cursorIgnoreEvents = $state(false)
   let windowTitle = $state('Awesome Tauri Example!')
 
-  /** @type {import('@tauri-apps/api/window').Theme | 'auto'} */
-  let theme = $state('auto')
+  let theme = $state<Theme | 'auto'>('auto')
 
-  let effects = $state([])
-  let selectedEffect = $state()
-  let effectState = $state()
-  let effectRadius = $state()
-  let effectR = $state(),
-    effectG = $state(),
-    effectB = $state(),
-    effectA = $state()
+  let effects = $state<Effect[]>([])
+  let selectedEffect = $state<Effect>()
+  let effectState = $state<EffectState>()
+  let effectRadius = $state<number>()
+  let effectR = $state<number>(),
+    effectG = $state<number>(),
+    effectB = $state<number>(),
+    effectA = $state<number>()
 
-  /** @type {ProgressBarStatus} */
-  let selectedProgressBarStatus = $state(ProgressBarStatus.None)
+  let selectedProgressBarStatus = $state<ProgressBarStatus>(
+    ProgressBarStatus.None
+  )
   let progress = $state(0)
 
-  let windowIconPath = $state()
+  let windowIconPath = $state('')
 
   function setTitle() {
-    webviewMap[selectedWebview].setTitle(windowTitle)
+    selectedWebview.setTitle(windowTitle)
   }
 
   async function hide() {
-    let visible = await webviewMap[selectedWebview].isVisible()
+    let visible = await selectedWebview.isVisible()
     onMessage('window is ' + (visible ? 'visible' : 'invisible'))
-    await webviewMap[selectedWebview].hide()
+    await selectedWebview.hide()
 
     setTimeout(async () => {
-      visible = await webviewMap[selectedWebview].isVisible()
+      visible = await selectedWebview.isVisible()
       onMessage('window is ' + (visible ? 'visible' : 'invisible'))
 
-      await webviewMap[selectedWebview].show()
-      visible = await webviewMap[selectedWebview].isVisible()
+      await selectedWebview.show()
+      visible = await selectedWebview.isVisible()
       onMessage('window is ' + (visible ? 'visible' : 'invisible'))
     }, 2000)
   }
 
   async function disable() {
-    let enabled = await webviewMap[selectedWebview].isEnabled()
+    let enabled = await selectedWebview.isEnabled()
     onMessage('window is ' + (enabled ? 'enabled' : 'disabled'))
 
-    await webviewMap[selectedWebview].setEnabled(false)
+    await selectedWebview.setEnabled(false)
 
     setTimeout(async () => {
-      enabled = await webviewMap[selectedWebview].isEnabled()
+      enabled = await selectedWebview.isEnabled()
       onMessage('window is ' + (enabled ? 'enabled' : 'disabled'))
 
-      await webviewMap[selectedWebview].setEnabled(true)
-      enabled = await webviewMap[selectedWebview].isEnabled()
+      await selectedWebview.setEnabled(true)
+      enabled = await selectedWebview.isEnabled()
       onMessage('window is ' + (enabled ? 'enabled' : 'disabled'))
     }, 2000)
   }
 
   function minimize() {
-    webviewMap[selectedWebview].minimize()
-    setTimeout(webviewMap[selectedWebview].unminimize, 2000)
+    selectedWebview.minimize()
+    setTimeout(() => selectedWebview.unminimize(), 2000)
   }
 
   function changeIcon() {
-    webviewMap[selectedWebview].setIcon(windowIconPath)
+    selectedWebview.setIcon(windowIconPath)
   }
 
   function createWebviewWindow() {
@@ -203,28 +202,28 @@
   }
 
   function loadWindowSize() {
-    webviewMap[selectedWebview].innerSize().then((response) => {
+    selectedWebview.innerSize().then((response) => {
       innerSize = response
       width = innerSize.width
       height = innerSize.height
     })
-    webviewMap[selectedWebview].outerSize().then((response) => {
+    selectedWebview.outerSize().then((response) => {
       outerSize = response
     })
   }
 
   function loadWindowPosition() {
-    webviewMap[selectedWebview].innerPosition().then((response) => {
+    selectedWebview.innerPosition().then((response) => {
       innerPosition = response
     })
-    webviewMap[selectedWebview].outerPosition().then((response) => {
+    selectedWebview.outerPosition().then((response) => {
       outerPosition = response
       x = outerPosition.x
       y = outerPosition.y
     })
   }
 
-  async function addWindowEventListeners(window) {
+  async function addWindowEventListeners(window: WebviewWindow | undefined) {
     if (!window) return
     resizeEventUnlisten?.()
     moveEventUnlisten?.()
@@ -233,12 +232,10 @@
   }
 
   async function requestUserAttention() {
-    await webviewMap[selectedWebview].minimize()
-    await webviewMap[selectedWebview].requestUserAttention(
-      UserAttentionType.Critical
-    )
+    await selectedWebview.minimize()
+    await selectedWebview.requestUserAttention(UserAttentionType.Critical)
     await new Promise((resolve) => setTimeout(resolve, 3000))
-    await webviewMap[selectedWebview].requestUserAttention(null)
+    await selectedWebview.requestUserAttention(null)
   }
 
   async function switchTheme() {
@@ -253,22 +250,22 @@
         theme = 'dark'
         break
     }
-    await webviewMap[selectedWebview].setTheme(theme === 'auto' ? null : theme)
+    await selectedWebview.setTheme(theme === 'auto' ? null : theme)
   }
 
   async function updateProgressBar() {
-    webviewMap[selectedWebview]?.setProgressBar({
+    selectedWebview.setProgressBar({
       status: selectedProgressBarStatus,
       progress
     })
   }
 
   async function addEffect() {
-    if (!effects.includes(selectedEffect)) {
+    if (selectedEffect && !effects.includes(selectedEffect)) {
       effects = [...effects, selectedEffect]
     }
 
-    const payload = {
+    const payload: Effects = {
       effects,
       state: effectState,
       radius: effectRadius
@@ -279,112 +276,122 @@
       && Number.isInteger(effectB)
       && Number.isInteger(effectA)
     ) {
-      payload.color = [effectR, effectG, effectB, effectA]
+      payload.color = [effectR!, effectG!, effectB!, effectA!]
     }
 
     mainEl.classList.remove('bg-primary')
     mainEl.classList.remove('dark:bg-darkPrimary')
-    await webviewMap[selectedWebview].clearEffects()
-    await webviewMap[selectedWebview].setEffects(payload)
+    await selectedWebview.clearEffects()
+    await selectedWebview.setEffects(payload)
   }
 
   async function clearEffects() {
     effects = []
-    await webviewMap[selectedWebview].clearEffects()
+    await selectedWebview.clearEffects()
     mainEl.classList.add('bg-primary')
     mainEl.classList.add('dark:bg-darkPrimary')
   }
 
   async function updatePosition() {
-    webviewMap[selectedWebview]?.setPosition(new PhysicalPosition(x, y))
+    selectedWebview.setPosition(new PhysicalPosition(x, y))
   }
 
   async function updateSize() {
-    webviewMap[selectedWebview]?.setSize(new PhysicalSize(width, height))
+    if (width && height) {
+      selectedWebview.setSize(new PhysicalSize(width, height))
+    }
   }
 
-  $effect(() => {
-    webviewMap[selectedWebview]
+  function refreshSelectedWebview() {
     loadWindowPosition()
     loadWindowSize()
-  })
-  $effect(() => {
-    webviewMap[selectedWebview]?.setResizable(resizable)
-  })
-  $effect(() => {
-    webviewMap[selectedWebview]?.setMaximizable(maximizable)
-  })
-  $effect(() => {
-    webviewMap[selectedWebview]?.setMinimizable(minimizable)
-  })
-  $effect(() => {
-    webviewMap[selectedWebview]?.setClosable(closable)
-  })
-  $effect(() => {
-    maximized
-      ? webviewMap[selectedWebview]?.maximize()
-      : webviewMap[selectedWebview]?.unmaximize()
-  })
-  $effect(() => {
-    webviewMap[selectedWebview]?.setDecorations(decorations)
-  })
-  $effect(() => {
-    webviewMap[selectedWebview]?.setAlwaysOnTop(alwaysOnTop)
-  })
-  $effect(() => {
-    webviewMap[selectedWebview]?.setAlwaysOnBottom(alwaysOnBottom)
-  })
-  $effect(() => {
-    webviewMap[selectedWebview]?.setContentProtected(contentProtected)
-  })
-  $effect(() => {
-    webviewMap[selectedWebview]?.setFullscreen(fullscreen)
-  })
-  $effect(() => {
-    webviewMap[selectedWebview]?.setSimpleFullscreen(simpleFullscreen)
-  })
+    selectedWebview.scaleFactor().then((factor) => (scaleFactor = factor))
+    addWindowEventListeners(selectedWebview)
+  }
 
-  $effect(() => {
+  function updateResizable() {
+    selectedWebview.setResizable(resizable)
+  }
+
+  function updateMaximizable() {
+    selectedWebview.setMaximizable(maximizable)
+  }
+
+  function updateMinimizable() {
+    selectedWebview.setMinimizable(minimizable)
+  }
+
+  function updateClosable() {
+    selectedWebview.setClosable(closable)
+  }
+
+  function updateMaximized() {
+    maximized ? selectedWebview.maximize() : selectedWebview.unmaximize()
+  }
+
+  function updateDecorations() {
+    selectedWebview.setDecorations(decorations)
+  }
+
+  function updateAlwaysOnTop() {
+    selectedWebview.setAlwaysOnTop(alwaysOnTop)
+  }
+
+  function updateAlwaysOnBottom() {
+    selectedWebview.setAlwaysOnBottom(alwaysOnBottom)
+  }
+
+  function updateContentProtected() {
+    selectedWebview.setContentProtected(contentProtected)
+  }
+
+  function updateFullscreen() {
+    selectedWebview.setFullscreen(fullscreen)
+  }
+
+  function updateSimpleFullscreen() {
+    selectedWebview.setSimpleFullscreen(simpleFullscreen)
+  }
+
+  function updateMinSize() {
     minWidth && minHeight
-      ? webviewMap[selectedWebview]?.setMinSize(
-          new LogicalSize(minWidth, minHeight)
-        )
-      : webviewMap[selectedWebview]?.setMinSize(null)
-  })
-  $effect(() => {
-    maxWidth > 800 && maxHeight > 400
-      ? webviewMap[selectedWebview]?.setMaxSize(
-          new LogicalSize(maxWidth, maxHeight)
-        )
-      : webviewMap[selectedWebview]?.setMaxSize(null)
-  })
-  $effect(() => {
-    webviewMap[selectedWebview]
-      ?.scaleFactor()
-      .then((factor) => (scaleFactor = factor))
-  })
-  $effect(() => {
-    addWindowEventListeners(webviewMap[selectedWebview])
-  })
+      ? selectedWebview.setMinSize(new LogicalSize(minWidth, minHeight))
+      : selectedWebview.setMinSize(null)
+  }
 
-  $effect(() => {
-    webviewMap[selectedWebview]?.setCursorGrab(cursorGrab)
-  })
-  $effect(() => {
-    webviewMap[selectedWebview]?.setCursorVisible(cursorVisible)
-  })
-  $effect(() => {
-    webviewMap[selectedWebview]?.setCursorIcon(cursorIcon)
-  })
-  $effect(() => {
+  function updateMaxSize() {
+    maxWidth && maxHeight && maxWidth > 800 && maxHeight > 400
+      ? selectedWebview.setMaxSize(new LogicalSize(maxWidth, maxHeight))
+      : selectedWebview.setMaxSize(null)
+  }
+
+  function updateCursorGrab() {
+    selectedWebview.setCursorGrab(cursorGrab)
+  }
+
+  function updateCursorVisible() {
+    selectedWebview.setCursorVisible(cursorVisible)
+  }
+
+  function updateCursorIgnoreEvents() {
+    selectedWebview.setIgnoreCursorEvents(cursorIgnoreEvents)
+  }
+
+  function updateCursorIcon() {
+    selectedWebview.setCursorIcon(cursorIcon)
+  }
+
+  function updateCursorPosition() {
     cursorX !== null
       && cursorY !== null
-      && webviewMap[selectedWebview]?.setCursorPosition(
+      && selectedWebview.setCursorPosition(
         new PhysicalPosition(cursorX, cursorY)
       )
-  })
+  }
+
   $effect(() => {
-    webviewMap[selectedWebview]?.setIgnoreCursorEvents(cursorIgnoreEvents)
+    selectedWebview
+    refreshSelectedWebview()
   })
 
   onDestroy(() => {
@@ -393,14 +400,18 @@
   })
 </script>
 
-<div class="flex flex-col children:grow gap-8 mb-4">
+<div class="flex flex-col *:grow gap-8 mb-4">
   <div
     class="flex flex-wrap items-center gap-4 pb-6 border-b-solid border-b-1 border-code"
   >
     {#if Object.keys(webviewMap).length >= 1}
       <div class="grid gap-1">
         <h4 class="my-2">Selected Window</h4>
-        <select class="input" bind:value={selectedWebview}>
+        <select
+          class="input"
+          bind:value={selectedWebviewLabel}
+          onchange={refreshSelectedWebview}
+        >
           <option value="" disabled selected>Choose a window...</option>
           {#each Object.keys(webviewMap) as label}
             <option value={label}>{label}</option>
@@ -427,7 +438,7 @@
       </form>
     </div>
   </div>
-  {#if webviewMap[selectedWebview]}
+  {#if selectedWebview}
     <div class="flex flex-wrap items-center gap-4">
       <div class="grid gap-1 grow">
         <h4 class="my-2">Change Window Icon</h4>
@@ -464,7 +475,7 @@
       <button
         class="btn"
         title="Unminimizes after 2 seconds"
-        onclick={() => webviewMap[selectedWebview].center()}
+        onclick={() => selectedWebview.center()}
       >
         Center
       </button>
@@ -496,39 +507,74 @@
         class="btn"
         onclick={() => {
           focusable = !focusable
-          webviewMap[selectedWebview].setFocusable(!focusable)
+          selectedWebview.setFocusable(!focusable)
         }}
       >
         Set focusable to {!focusable}
       </button>
     </div>
-    <div class="grid cols-[repeat(auto-fill,minmax(180px,1fr))]">
+    <div class="grid cols-[repeat(auto-fill,minmax(180px,1fr))] *:flex *:gap-2">
       <label>
-        <input type="checkbox" class="checkbox" bind:checked={resizable} />
+        <input
+          type="checkbox"
+          class="checkbox"
+          bind:checked={resizable}
+          onchange={updateResizable}
+        />
         Resizable
       </label>
       <label>
-        <input type="checkbox" class="checkbox" bind:checked={maximizable} />
+        <input
+          type="checkbox"
+          class="checkbox"
+          bind:checked={maximizable}
+          onchange={updateMaximizable}
+        />
         Maximizable
       </label>
       <label>
-        <input type="checkbox" class="checkbox" bind:checked={minimizable} />
+        <input
+          type="checkbox"
+          class="checkbox"
+          bind:checked={minimizable}
+          onchange={updateMinimizable}
+        />
         Minimizable
       </label>
       <label>
-        <input type="checkbox" class="checkbox" bind:checked={closable} />
+        <input
+          type="checkbox"
+          class="checkbox"
+          bind:checked={closable}
+          onchange={updateClosable}
+        />
         Closable
       </label>
       <label>
-        <input type="checkbox" class="checkbox" bind:checked={decorations} />
+        <input
+          type="checkbox"
+          class="checkbox"
+          bind:checked={decorations}
+          onchange={updateDecorations}
+        />
         Has decorations
       </label>
       <label>
-        <input type="checkbox" class="checkbox" bind:checked={alwaysOnTop} />
+        <input
+          type="checkbox"
+          class="checkbox"
+          bind:checked={alwaysOnTop}
+          onchange={updateAlwaysOnTop}
+        />
         Always on top
       </label>
       <label>
-        <input type="checkbox" class="checkbox" bind:checked={alwaysOnBottom} />
+        <input
+          type="checkbox"
+          class="checkbox"
+          bind:checked={alwaysOnBottom}
+          onchange={updateAlwaysOnBottom}
+        />
         Always on bottom
       </label>
       <label>
@@ -536,15 +582,26 @@
           type="checkbox"
           class="checkbox"
           bind:checked={contentProtected}
+          onchange={updateContentProtected}
         />
         Content protected
       </label>
       <label>
-        <input type="checkbox" class="checkbox" bind:checked={maximized} />
+        <input
+          type="checkbox"
+          class="checkbox"
+          bind:checked={maximized}
+          onchange={updateMaximized}
+        />
         Maximized
       </label>
       <label>
-        <input type="checkbox" class="checkbox" bind:checked={fullscreen} />
+        <input
+          type="checkbox"
+          class="checkbox"
+          bind:checked={fullscreen}
+          onchange={updateFullscreen}
+        />
         Fullscreen
       </label>
       <label>
@@ -552,12 +609,13 @@
           type="checkbox"
           class="checkbox"
           bind:checked={simpleFullscreen}
+          onchange={updateSimpleFullscreen}
         />
         Simple fullscreen
       </label>
     </div>
-    <div class="flex flex-wrap children:flex-basis-30 gap-2">
-      <div class="grid gap-1 children:grid">
+    <div class="flex flex-wrap *:flex-basis-30 gap-2">
+      <div class="grid gap-1 *:grid">
         <label>
           X
           <input
@@ -579,7 +637,7 @@
           />
         </label>
       </div>
-      <div class="grid gap-1 children:grid">
+      <div class="grid gap-1 *:grid">
         <label>
           Width
           <input
@@ -601,24 +659,46 @@
           />
         </div>
       </div>
-      <div class="grid gap-1 children:grid">
+      <div class="grid gap-1 *:grid">
         <label>
           Min width
-          <input class="input" type="number" bind:value={minWidth} />
+          <input
+            class="input"
+            type="number"
+            bind:value={minWidth}
+            onchange={updateMinSize}
+          />
         </label>
         <label>
           Min height
-          <input class="input" type="number" bind:value={minHeight} />
+          <input
+            class="input"
+            type="number"
+            bind:value={minHeight}
+            onchange={updateMinSize}
+          />
         </label>
       </div>
-      <div class="grid gap-1 children:grid">
+      <div class="grid gap-1 *:grid">
         <label>
           Max width
-          <input class="input" type="number" bind:value={maxWidth} min="800" />
+          <input
+            class="input"
+            type="number"
+            bind:value={maxWidth}
+            onchange={updateMaxSize}
+            min="800"
+          />
         </label>
         <label>
           Max height
-          <input class="input" type="number" bind:value={maxHeight} min="400" />
+          <input
+            class="input"
+            type="number"
+            bind:value={maxHeight}
+            onchange={updateMaxSize}
+            min="400"
+          />
         </label>
       </div>
     </div>
@@ -684,9 +764,14 @@
     </div>
     <div class="grid gap-2">
       <h4 class="my-2">Cursor</h4>
-      <div class="flex gap-2">
+      <div class="flex gap-4 *:flex *:gap-2">
         <label>
-          <input type="checkbox" class="checkbox" bind:checked={cursorGrab} />
+          <input
+            type="checkbox"
+            class="checkbox"
+            bind:checked={cursorGrab}
+            onchange={updateCursorGrab}
+          />
           Grab
         </label>
         <label>
@@ -694,6 +779,7 @@
             type="checkbox"
             class="checkbox"
             bind:checked={cursorVisible}
+            onchange={updateCursorVisible}
           />
           Visible
         </label>
@@ -702,6 +788,7 @@
             type="checkbox"
             class="checkbox"
             bind:checked={cursorIgnoreEvents}
+            onchange={updateCursorIgnoreEvents}
           />
           Ignore events
         </label>
@@ -709,7 +796,11 @@
       <div class="flex gap-2">
         <label>
           Icon
-          <select class="input" bind:value={cursorIcon}>
+          <select
+            class="input"
+            bind:value={cursorIcon}
+            onchange={updateCursorIcon}
+          >
             {#each cursorIconOptions as kind}
               <option value={kind}>{kind}</option>
             {/each}
@@ -717,11 +808,21 @@
         </label>
         <label>
           X position
-          <input class="input" type="number" bind:value={cursorX} />
+          <input
+            class="input"
+            type="number"
+            bind:value={cursorX}
+            onchange={updateCursorPosition}
+          />
         </label>
         <label>
           Y position
-          <input class="input" type="number" bind:value={cursorY} />
+          <input
+            class="input"
+            type="number"
+            bind:value={cursorY}
+            onchange={updateCursorPosition}
+          />
         </label>
       </div>
     </div>
@@ -793,7 +894,7 @@
         <div class="flex">
           <label>
             Color
-            <div class="flex gap-2 children:flex-basis-30">
+            <div class="flex gap-2 *:flex-basis-30">
               <input
                 class="input"
                 type="number"
diff --git a/examples/api/tsconfig.json b/examples/api/tsconfig.json
new file mode 100644
index 000000000000..1dd39c5b4568
--- /dev/null
+++ b/examples/api/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "bundler",
+    "target": "ESNext",
+    "module": "ESNext",
+    "verbatimModuleSyntax": true,
+    "isolatedModules": true,
+    "resolveJsonModule": true,
+    "sourceMap": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "strict": true
+  },
+  "include": ["src/**/*.d.ts", "src/**/*.ts", "src/**/*.svelte"]
+}
diff --git a/package.json b/package.json
index 3dc1a3601a1d..e64c63a2d553 100644
--- a/package.json
+++ b/package.json
@@ -28,5 +28,5 @@
     "prettier": "^3.8.1"
   },
   "minimumReleaseAge": 4320,
-  "packageManager": "pnpm@10.30.3"
+  "packageManager": "pnpm@11.13.0"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d8a5c38769ca..a030abe21393 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,20 +35,26 @@ importers:
         specifier: ^1.2.2
         version: 1.2.2
       '@sveltejs/vite-plugin-svelte':
-        specifier: ^7.0.0
-        version: 7.0.0(svelte@5.55.7(@typescript-eslint/types@8.58.2))(vite@8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))
+        specifier: ^7.2.0
+        version: 7.2.0(svelte@5.56.4(@typescript-eslint/types@8.58.2))(vite@8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))
+      '@types/sortablejs':
+        specifier: ^1.15.9
+        version: 1.15.9
       '@unocss/extractor-svelte':
-        specifier: ^66.6.6
-        version: 66.6.6
+        specifier: ^66.7.5
+        version: 66.7.5
+      sortablejs:
+        specifier: ^1.15.7
+        version: 1.15.7
       svelte:
-        specifier: ^5.55.7
-        version: 5.55.7(@typescript-eslint/types@8.58.2)
+        specifier: ^5.56.4
+        version: 5.56.4(@typescript-eslint/types@8.58.2)
       unocss:
-        specifier: ^66.6.6
-        version: 66.6.6(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)(vite@8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))
+        specifier: ^66.7.5
+        version: 66.7.5(vite@8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))
       vite:
-        specifier: ^8.0.16
-        version: 8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)
+        specifier: ^8.1.4
+        version: 8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)
 
   examples/file-associations: {}
 
@@ -103,7 +109,7 @@ importers:
     devDependencies:
       '@napi-rs/cli':
         specifier: 3.7.2
-        version: 3.7.2(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)(@types/node@24.11.0)
+        version: 3.7.2(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@types/node@24.11.0)
       '@types/node':
         specifier: ^24.11.0
         version: 24.11.0
@@ -112,7 +118,7 @@ importers:
         version: 10.1.0
       vitest:
         specifier: ^4.0.18
-        version: 4.1.0(@types/node@24.11.0)(vite@8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))
+        version: 4.1.0(@types/node@24.11.0)(vite@8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))
 
 packages:
 
@@ -169,6 +175,9 @@ packages:
   '@emnapi/core@1.10.0':
     resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==}
 
+  '@emnapi/core@1.11.1':
+    resolution: {integrity: sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==}
+
   '@emnapi/runtime@1.10.0':
     resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==}
 
@@ -178,6 +187,9 @@ packages:
   '@emnapi/wasi-threads@1.2.1':
     resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==}
 
+  '@emnapi/wasi-threads@1.2.2':
+    resolution: {integrity: sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==}
+
   '@epic-web/invariant@1.0.0':
     resolution: {integrity: sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==}
 
@@ -401,8 +413,8 @@ packages:
   '@iconify/types@2.0.0':
     resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
 
-  '@iconify/utils@3.1.0':
-    resolution: {integrity: sha512-Zlzem1ZXhI1iHeeERabLNzBHdOa4VhQbqAcOQaMKuTuyZCpwKbC2R4Dd0Zo3g9EAc+Y4fiarO8HIHRAth7+skw==}
+  '@iconify/utils@3.1.4':
+    resolution: {integrity: sha512-b1S7B1k9ohZ+iNTi2ATxbRYG9fTrJmUT0rc46bvVnNxqNRGW7dyo/vRREwyniI5IRN2RSJHDcm+s3BjWrSAjHw==}
 
   '@img/colour@1.1.0':
     resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==}
@@ -981,6 +993,12 @@ packages:
       '@emnapi/core': ^1.7.1
       '@emnapi/runtime': ^1.7.1
 
+  '@napi-rs/wasm-runtime@1.1.6':
+    resolution: {integrity: sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==}
+    peerDependencies:
+      '@emnapi/core': ^1.7.1
+      '@emnapi/runtime': ^1.7.1
+
   '@napi-rs/wasm-tools-android-arm-eabi@1.0.1':
     resolution: {integrity: sha512-lr07E/l571Gft5v4aA1dI8koJEmF1F0UigBbsqg9OWNzg80H3lDPO+auv85y3T/NHE3GirDk7x/D3sLO57vayw==}
     engines: {node: '>= 10'}
@@ -1130,138 +1148,138 @@ packages:
   '@octokit/types@16.0.0':
     resolution: {integrity: sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==}
 
-  '@oxc-parser/binding-android-arm-eabi@0.115.0':
-    resolution: {integrity: sha512-VoB2rhgoqgYf64d6Qs5emONQW8ASiTc0xp+aUE4JUhxjX+0pE3gblTYDO0upcN5vt9UlBNmUhAwfSifkfre7nw==}
+  '@oxc-parser/binding-android-arm-eabi@0.131.0':
+    resolution: {integrity: sha512-t2xicr9pfzkSRYx5aPqZqlLaayIwJTqgQ81Jor31Xep2nGyL2Aq3d0K5wOfeR7VevaSdxaS9dzSQP9xDwn8fDg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxc-parser/binding-android-arm64@0.115.0':
-    resolution: {integrity: sha512-lWRX75u+gqfB4TF3pWCHuvhaeneAmRl2b2qNBcl4S6yJ0HtnT4VXOMEZrq747i4Zby1ZTxj6mtOe678Bg8gRLw==}
+  '@oxc-parser/binding-android-arm64@0.131.0':
+    resolution: {integrity: sha512-nlGIod6gw75x1aEDgLS+srj+JRGY0HHm9MI9YgzE/B64l6d6+H3MSP9NOgp0+HTg8tp4vV9rVfgQGgd+TfVZcA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxc-parser/binding-darwin-arm64@0.115.0':
-    resolution: {integrity: sha512-ii/oOZjfGY1aszXTy29Z5DRyCEnBOrAXDVCvfdfXFQsOZlbbOa7NMHD7D+06YFe5qdxfmbWAYv4yn6QJi/0d2g==}
+  '@oxc-parser/binding-darwin-arm64@0.131.0':
+    resolution: {integrity: sha512-jukuV6xe5RbQKFo7QD34NDCLDZp4PSOm8rmckhNdH/60ymG5zXbDzGBEyc+nTkuLQNama2aSGCt+CPfpjNTqyw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxc-parser/binding-darwin-x64@0.115.0':
-    resolution: {integrity: sha512-R/sW/p8l77wglbjpMcF+h/3rWbp9zk1mRP3U14mxTYIC2k3m+aLBpXXgk2zksqf9qKk5mcc4GIYsuCn9l8TgDg==}
+  '@oxc-parser/binding-darwin-x64@0.131.0':
+    resolution: {integrity: sha512-g3JOo4khe9rslHm5WYaVDWb0HS/M1MLR3I9S8560MkKIcC96VQY00QjOlsuRyfSj/JDXj8i9T7ryPO2RidiXVg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxc-parser/binding-freebsd-x64@0.115.0':
-    resolution: {integrity: sha512-CSJ5ldNm9wIGGkhaIJeGmxRMZbgxThRN+X1ufYQQUNi5jZDV/U3C2QDMywpP93fczNBj961hXtcUPO/oVGq4Pw==}
+  '@oxc-parser/binding-freebsd-x64@0.131.0':
+    resolution: {integrity: sha512-1hziITDTxjMePnX+dR9ocVT+EuZkQ8wm4FPAbmbEiKG+Phbo73J1ZnPAA6Y/aGsWF3McOFnQuZIktAFwalkfJQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxc-parser/binding-linux-arm-gnueabihf@0.115.0':
-    resolution: {integrity: sha512-uWFwssE5dHfQ8lH+ktrsD9JA49+Qa0gtxZHUs62z1e91NgGz6O7jefHGI6aygNyKNS45pnnBSDSP/zV977MsOQ==}
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.131.0':
+    resolution: {integrity: sha512-9uRxfXwyKG9+MwmGQBo2ncPNwZH5HTmCETFM2WiuDBNDCW4NC5ttSQkwCAMrTAWgwMzVBH1CP8pM0v7nebCWXQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxc-parser/binding-linux-arm-musleabihf@0.115.0':
-    resolution: {integrity: sha512-fZbqt8y/sKQ+v6bBCuv/mYYFoC0+fZI3mGDDEemmDOhT78+aUs2+4ZMdbd2btlXmnLaScl37r8IRbhnok5Ka9w==}
+  '@oxc-parser/binding-linux-arm-musleabihf@0.131.0':
+    resolution: {integrity: sha512-mgbLvzRShXOLBdWGInf08Af4q+pfj1xD8hSgLClDZ9of/BXkB6+LIhTH7fihiDUipqB3yoSkKBWaZ3Ejlf5Yag==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxc-parser/binding-linux-arm64-gnu@0.115.0':
-    resolution: {integrity: sha512-1ej/MjuTY9tJEunU/hUPIFmgH5PqgMQoRjNOvOkibtJ3Zqlw/+Lc+HGHDNET8sjbgIkWzdhX+p4J96A5CPdbag==}
+  '@oxc-parser/binding-linux-arm64-gnu@0.131.0':
+    resolution: {integrity: sha512-OPT8++4aN6j2GJ8+3IZHS/byXoZP4aSBn+FoG6rgBJ2fKwPKXWF3MqrFMNW7NKHM28FLY579xYLxJSfgobEqPA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-arm64-musl@0.115.0':
-    resolution: {integrity: sha512-HjsZbJPH9mMd4swJRywVMsDZsJX0hyKb1iNHo5ijRl5yhtbO3lj7ImSrrL1oZ1VEg0te4iKmDGGz/6YPLd1G8w==}
+  '@oxc-parser/binding-linux-arm64-musl@0.131.0':
+    resolution: {integrity: sha512-vtPiwmfVTAXzaxDKsOXG+LwgRAA7WEnaeHzhS5z0GE89gAK18KSXnly7Z6saXXq6L3dVMyK44uoTI03zKxrpmw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@oxc-parser/binding-linux-ppc64-gnu@0.115.0':
-    resolution: {integrity: sha512-zhhePoBrd7kQx3oClX/W6NldsuCbuMqaN9rRsY+6/WoorAb4j490PG/FjqgAXscWp2uSW2WV9L+ksn0wHrvsrg==}
+  '@oxc-parser/binding-linux-ppc64-gnu@0.131.0':
+    resolution: {integrity: sha512-8AW8L7w5cGHSdZPcyZX2yR0+GUODsT15rbRjfdD54rv6DMbtuEB19ysLOpKJlRGfH6UNYNpCHaU1uJWgTWf1/w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-riscv64-gnu@0.115.0':
-    resolution: {integrity: sha512-t/IRojvUE9XrKu+/H1b8YINug+7Q6FLls5rsm2lxB5mnS8GN/eYAYrPgHkcg9/1SueRDSzGpDYu3lGWTObk1zw==}
+  '@oxc-parser/binding-linux-riscv64-gnu@0.131.0':
+    resolution: {integrity: sha512-vvpjkjEOUsPcsYf8evE4MO3aGx9+3wodXEBOicGNnOwTuAik8eBONNkgSdhkGsAblQmfVHJyanRnpxglddTXIA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-riscv64-musl@0.115.0':
-    resolution: {integrity: sha512-79jBHSSh/YpQRAmvYoaCfpyToRbJ/HBrdB7hxK2ku2JMehjopTVo+xMJss/RV7/ZYqeezgjvKDQzapJbgcjVZA==}
+  '@oxc-parser/binding-linux-riscv64-musl@0.131.0':
+    resolution: {integrity: sha512-AqmcNC3fClXX+fxQ6VGEN1667xVFiRBkY0CZmDMSiaeFUsv1+UkBPYYi48IUKcA9/ivvoKNRzQl2I4//kT9F/w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@oxc-parser/binding-linux-s390x-gnu@0.115.0':
-    resolution: {integrity: sha512-nA1TpxkhNTIOMMyiSSsa7XIVJVoOU/SsVrHIz3gHvWweB5PHCQfO7w+Lb2EP0lBWokv7HtA/KbF7aLDoXzmuMw==}
+  '@oxc-parser/binding-linux-s390x-gnu@0.131.0':
+    resolution: {integrity: sha512-7d3jOMKy7RSQCcDLIci+ySll2FgsOMl/GiRux4q2JNv0zg4EdhFISa9idvrdN/HEUIQQJNg6dmveUeJl2YErGA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-x64-gnu@0.115.0':
-    resolution: {integrity: sha512-9iVX789DoC3SaOOG+X6NcF/tVChgLp2vcHffzOC2/Z1JTPlz6bMG2ogvcW6/9s0BG2qvhNQImd+gbWYeQbOwVw==}
+  '@oxc-parser/binding-linux-x64-gnu@0.131.0':
+    resolution: {integrity: sha512-JHK/h95qVqVQ+ITER837kcTdwBDFpFaNnOTYGCP0zdUSX/mLKC7tXOoyrTb6vG7iRPwGlcgBil3v2IjYw1FqJA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-x64-musl@0.115.0':
-    resolution: {integrity: sha512-RmQmk+mjCB0nMNfEYhaCxwofLo1Z95ebHw1AGvRiWGCd4zhCNOyskgCbMogIcQzSB3SuEKWgkssyaiQYVAA4hQ==}
+  '@oxc-parser/binding-linux-x64-musl@0.131.0':
+    resolution: {integrity: sha512-b2BO82O8azXAyf7EUgOPKu145nWypbNyk07HbU09fkzhm9lEA5oPvaN/M8Nlo7tOErVTa2WOgS4QbOnxAPXdDQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@oxc-parser/binding-openharmony-arm64@0.115.0':
-    resolution: {integrity: sha512-viigraWWQhhDvX5aGq+wrQq58k00Xq3MHz/0R4AFMxGlZ8ogNonpEfNc73Q5Ly87Z6sU9BvxEdG0dnYTfVnmew==}
+  '@oxc-parser/binding-openharmony-arm64@0.131.0':
+    resolution: {integrity: sha512-GHO9glZaX7LkX/OGfluEPf1yjg+ehiFbUdowbX6uNWOQhmwKWU4m4+nZ9FJkrHNKuxyI1KKertMdGjVKCApKWA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxc-parser/binding-wasm32-wasi@0.115.0':
-    resolution: {integrity: sha512-IzGCrMwXhpb4kTXy/8lnqqqwjI7eOvy+r9AhVw+hsr8t1ecBBEHprcNy0aKatFHN6hsX7UMHHQmBAQjVvL/p1A==}
-    engines: {node: '>=14.0.0'}
+  '@oxc-parser/binding-wasm32-wasi@0.131.0':
+    resolution: {integrity: sha512-3SkikPaEFoih1N83qLVEDLRLeY4nYsf6JT9SnWiMCQ5lGQdKup6bEuKCqkRiG9dD1IIaFeYz9RjlciPmYoFIWA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [wasm32]
 
-  '@oxc-parser/binding-win32-arm64-msvc@0.115.0':
-    resolution: {integrity: sha512-/ym+Absk/TLFvbhh3se9XYuI1D7BrUVHw4RaG/2dmWKgBenrZHaJsgnRb7NJtaOyjEOLIPtULx1wDdVL0SX2eg==}
+  '@oxc-parser/binding-win32-arm64-msvc@0.131.0':
+    resolution: {integrity: sha512-Os5bEhryeA2jkH+ZrnZyAC1EP5gs+X4YB1Fjqml7UPD5kU7ecsK1MPEVMfCrdt/GDNpDbavYXiOXOdyJ5b3OPw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxc-parser/binding-win32-ia32-msvc@0.115.0':
-    resolution: {integrity: sha512-AQSZjIR+b+Te7uaO/hGTMjT8/oxlYrvKrOTi4KTHF/O6osjHEatUQ3y6ZW2+8+lJxy20zIcGz6iQFmFq/qDKkg==}
+  '@oxc-parser/binding-win32-ia32-msvc@0.131.0':
+    resolution: {integrity: sha512-m+jNz9EuF0NXoiptc6B9h5yompZQVW/a5MJeOu5zojfH5yWk82tvF2ccrHkfhgtrS9h9DD5l1Qv8dWlfY7Nz8g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxc-parser/binding-win32-x64-msvc@0.115.0':
-    resolution: {integrity: sha512-oxUl82N+fIO9jIaXPph8SPPHQXrA08BHokBBJW8ct9F/x6o6bZE6eUAhUtWajbtvFhL8UYcCWRMba+kww6MBlA==}
+  '@oxc-parser/binding-win32-x64-msvc@0.131.0':
+    resolution: {integrity: sha512-o14Hk8dAyiEUMFEWEgmAwFZvBt1RzAYLM3xeQ+5315JXgVYhoemivgYcbYVRbsFkS71ShMGlAFE0kPnr460rww==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
 
-  '@oxc-project/types@0.115.0':
-    resolution: {integrity: sha512-4n91DKnebUS4yjUHl2g3/b2T+IUdCfmoZGhmwsovZCDaJSs+QkVAM+0AqqTxHSsHfeiMuueT75cZaZcT/m0pSw==}
+  '@oxc-project/types@0.131.0':
+    resolution: {integrity: sha512-PgnWDfV0h+b16XNKbXU7Daib/BFSt/J2mEzfYIBu6JB/wNdlU+kVYXCkGA1A9fWkTbOgbjh4e6NhPeQOYvFhEA==}
 
-  '@oxc-project/types@0.133.0':
-    resolution: {integrity: sha512-KzkdCd6Uxqnf6l3HOw1xfatAlUURA0g14cvBYFyJ5SaNOQbOUvBr9PKArcPcrNIeRsBdgcUzOGrhKveVpvOIGA==}
+  '@oxc-project/types@0.139.0':
+    resolution: {integrity: sha512-r9gHphtCs+1M7J0pw6Sn/hh/Wpa/iQrOOkrNAlVLF/gHq+/CJmHIWKKUUhdWjcD6CIa8idarspCsASiXCXvFUw==}
 
   '@polka/url@1.0.0-next.29':
     resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}
@@ -1278,97 +1296,97 @@ packages:
   '@quansync/fs@1.0.0':
     resolution: {integrity: sha512-4TJ3DFtlf1L5LDMaM6CanJ/0lckGNtJcMjQ1NAV6zDmA0tEHKZtxNKin8EgPaVX1YzljbxckyT2tJrpQKAtngQ==}
 
-  '@rolldown/binding-android-arm64@1.0.3':
-    resolution: {integrity: sha512-454rs7jHngixp/NMxd5srYD57OnzSlZ/eFTETjORQHLwJG1lRtmNOJcBerZlfu4GjKqeq8aCCIQrMdHyhI51Hw==}
+  '@rolldown/binding-android-arm64@1.1.5':
+    resolution: {integrity: sha512-lZg8fqIv2v7FF237bwMgzGZEJvGL79/s5knJ/i6FmsGF4XXlzccZ4jb+TrFIxtSSxFtIpdsgrPZeMk1I9AFcyQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@rolldown/binding-darwin-arm64@1.0.3':
-    resolution: {integrity: sha512-PcAhP+ynjURNyy8SKGl5DQP94aGuB/7JrXJb/t7P+hanXvQVMWzUvRRhBAcg/lNRadBhoUPqSoP4xw5tR/KBEA==}
+  '@rolldown/binding-darwin-arm64@1.1.5':
+    resolution: {integrity: sha512-51Bnx9pNiMRKSUNtBfySkNJ9vMU9Hh3I1ozDd6gyPPYzaXCfnptUcEZxXGYFn+ul2dtcMUiqGR1Yai2K10uoTw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@rolldown/binding-darwin-x64@1.0.3':
-    resolution: {integrity: sha512-9YpfeUvSE2RS7wysJ81uOZkXJz7f7Q55H2Gvp3VEw/EsahqDtrphrZ0EwDLK5vvKOzaCrBsjF8JmnMLcUt78Gg==}
+  '@rolldown/binding-darwin-x64@1.1.5':
+    resolution: {integrity: sha512-Tm+gbfC0aHu1tBA/JvKQh32S0K6YgCHkiAF4/W6xX0K0RmNuc94VeK419dJoE65R5aRxmo+noZQSWrAMF6yb6g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@rolldown/binding-freebsd-x64@1.0.3':
-    resolution: {integrity: sha512-yB1IlAsSNHncV6SCTL27/MVGR5htvQsoGxIv5KMGXALp+Ll1wYsn+x98M9MW7qa+NdSbvrrY7ANI4wLJ0n1e6g==}
+  '@rolldown/binding-freebsd-x64@1.1.5':
+    resolution: {integrity: sha512-JMzDKCCXq93YccG5gz3hvOs1oXRKAf0XYpfOS88e+wZrC8Iugj6j68867vrYZkvpDDpKn/KoKORThmchMpF6TA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.0.3':
-    resolution: {integrity: sha512-Yi30IVAAfLUCy2MseFjbB1jAMDl1VMCAas5StnYp8da9+CKvMd2H2cbEjWcw5NPaPqzvYkVIaF1nNUG+b7u/sw==}
+  '@rolldown/binding-linux-arm-gnueabihf@1.1.5':
+    resolution: {integrity: sha512-uML21j2K5TfPGutKxub+M+nLjZIrWjXQ5Grx4lCe/nimTj9B4L63zHpjXLl4y0L3mcm2htEQIb06oCG/szerNw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@rolldown/binding-linux-arm64-gnu@1.0.3':
-    resolution: {integrity: sha512-jsO7R8To+AdlYgUmN5sHSCZbfhtMBkO0WUx8iORQnPcMMdgr7qM2DQmMwgabs3GhNztdmoKkMKQFHD6DTMCIQw==}
+  '@rolldown/binding-linux-arm64-gnu@1.1.5':
+    resolution: {integrity: sha512-navSiuTMogvnQoZoM/v+l3ZWo50/NTwSHSzheABx/RCnmUPaKwq9qSo4Br2OYRs21+Fz8uFqITZM3H4opOB0/Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-arm64-musl@1.0.3':
-    resolution: {integrity: sha512-VWkUHwWriDciit80wleYwKILoR/KMvxh/IdwS/paX+ZgpuRpCrKLUdadJbc0NpBEiyhpYawsJ73j9aCvOH+f7Q==}
+  '@rolldown/binding-linux-arm64-musl@1.1.5':
+    resolution: {integrity: sha512-lAryqH7IteztmCXQXk0etKj4wBQ7Gx5S6LjKhsgp9zb8I5bsuvU/2llH1hDQcjsFeqIsovMVN339/8pUDDBXxA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-linux-ppc64-gnu@1.0.3':
-    resolution: {integrity: sha512-5f1laC0SlIR0yDbFCd8acUhvJIag6N3zC5P7oUPN6wX0aOma+uKJ0wBDH5aq7I1PVI2ttTlhJwzwRIBnLiSGEg==}
+  '@rolldown/binding-linux-ppc64-gnu@1.1.5':
+    resolution: {integrity: sha512-fsK/sNBnxzBlL4O1JNrZakVQxPspqpED5dLtNsZS9oOKmtSpdNIzxH2kkol5HYTWJN47sE20ztMJPxfZ89qGOg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-s390x-gnu@1.0.3':
-    resolution: {integrity: sha512-Iq4ko0r4XsgbrF/LunNgHtAGLRRVE2kXonAXQ/MV0mC6jQpMOhW1SvtZja2EhC/kd05++bP78dsqBeIQyYJ6Yg==}
+  '@rolldown/binding-linux-s390x-gnu@1.1.5':
+    resolution: {integrity: sha512-gLYb4BIadlfTOYT5gO503n8zQjXflgzpD0FcyKh0Mzx3rqCZKnHoJWV9xe1KXUJ5lx2JfcSHr/mhzS0PC/McAA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-gnu@1.0.3':
-    resolution: {integrity: sha512-B8m6tD5+/N5FeNQFbKlLA/2yVq9ycQP1SeedyEYYKWBNR3ZQbkvIUcNnDNM03lO1l5F2roiiFJGgvoLLyZXtSg==}
+  '@rolldown/binding-linux-x64-gnu@1.1.5':
+    resolution: {integrity: sha512-FjcpEKUyJygHgs1o50VYNvkt5+7Le/VEdYt0AkRpkL33MnyQfwr8l5mXwMmfmTbyMPr5vJLC+8/Gd9gXnwU1QQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-musl@1.0.3':
-    resolution: {integrity: sha512-pSdpdUJHkuCxun9LE7jvgUB9qsRgaiyNNCX7m/AvHTcq67AiT/Yhoxvw5zPfhrM8k/BfP8ce/hMOpthKDpEUow==}
+  '@rolldown/binding-linux-x64-musl@1.1.5':
+    resolution: {integrity: sha512-Me+PfPI2TMeOQk0gYWfLQZtTktrmzbr8cDboqX83XKc7UrgAi55gF+2dUkWdxd19n55Essp2yeca+O9N5rBxHg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-openharmony-arm64@1.0.3':
-    resolution: {integrity: sha512-OXXS3RKJgX2uLwM+gYyuH5omcH8fL1LJs96pZGgtetVCahON57+d4SJHzTgZiOjxgGkSnpXpOsWuPDGAKAigEg==}
+  '@rolldown/binding-openharmony-arm64@1.1.5':
+    resolution: {integrity: sha512-yc5WrLzXks6zCQfn9Oxr8pORKyl/pF+QjHmW/Qx3qu0oyrrNC+y2JLTU1E2rcWYAmzlnqngWXHQjy51VzW70Vw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rolldown/binding-wasm32-wasi@1.0.3':
-    resolution: {integrity: sha512-JTtb8BWFynicNSoPrehsCzBtOKjZ6jhMiPFEmOiuXg1Fl8dn2KHQob+GuPSGR0dryQa1PQJbzjF3dqO/whhjLg==}
+  '@rolldown/binding-wasm32-wasi@1.1.5':
+    resolution: {integrity: sha512-VbQGPX2b4r48TAMIM2cjgluIM1HYutm4pcTEJsle7iEP7sB1dFqtPLBVbdLAZCxy1txCcPxf4QFf4v8uvltPqA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [wasm32]
 
-  '@rolldown/binding-win32-arm64-msvc@1.0.3':
-    resolution: {integrity: sha512-gEdFFEN70A/jxb2svrWsN3aDL7OUtmvlOy+6fa2jxG8K0wQ1ZbdeLGnidov6Yu5/733dI5ySfzFlQ/cb0bSz1g==}
+  '@rolldown/binding-win32-arm64-msvc@1.1.5':
+    resolution: {integrity: sha512-gHv82k63z4qpV5+Q1y/12KrK0ltWBukVDI8nZcbT7Tt/ZlOIVwppazneq0F93oDxTo3IgAMEDIoQh3E2n6mVsw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@rolldown/binding-win32-x64-msvc@1.0.3':
-    resolution: {integrity: sha512-eXB7CHuaQdqmJcc3koCNtNPmT/bj2gc999kUFgBxG8Ac0NdgXc4rkCHhqrgrhN3zddvvvrgzj1e90SuSfmyIXA==}
+  '@rolldown/binding-win32-x64-msvc@1.1.5':
+    resolution: {integrity: sha512-tTZuDBPw85tEN5PQi1pnEBzDy0Z49HtScLAbD5t6hyeU92A95pRWaSMw1GZZi/RwgSgUIl0xrSlXIT/9QzvYSA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -1555,13 +1573,13 @@ packages:
   '@standard-schema/spec@1.1.0':
     resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
-  '@sveltejs/acorn-typescript@1.0.9':
-    resolution: {integrity: sha512-lVJX6qEgs/4DOcRTpo56tmKzVPtoWAaVbL4hfO7t7NVwl9AAXzQR6cihesW1BmNMPl+bK6dreu2sOKBP2Q9CIA==}
+  '@sveltejs/acorn-typescript@1.0.11':
+    resolution: {integrity: sha512-LFuZUkjJ9iF7JZye/aG5XM0SFcQ5VyL0oVX4WJ9dc0Va3R3s0OauX1BESVCb+YN/ol8TAfqGDDAQsTG627Y5kw==}
     peerDependencies:
       acorn: ^8.9.0
 
-  '@sveltejs/vite-plugin-svelte@7.0.0':
-    resolution: {integrity: sha512-ILXmxC7HAsnkK2eslgPetrqqW1BKSL7LktsFgqzNj83MaivMGZzluWq32m25j2mDOjmSKX7GGWahePhuEs7P/g==}
+  '@sveltejs/vite-plugin-svelte@7.2.0':
+    resolution: {integrity: sha512-1SpkuMSRLfugrVX+IrKfE1RUegzo8AQzKQ6qQPfVzbcWi5IhuTPaKb5ZrLpucleFznkc4/RTeSPoRnGWFxX+EQ==}
     engines: {node: ^20.19 || ^22.12 || >=24}
     peerDependencies:
       svelte: ^5.46.4
@@ -1570,6 +1588,9 @@ packages:
   '@tybys/wasm-util@0.10.2':
     resolution: {integrity: sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==}
 
+  '@tybys/wasm-util@0.10.3':
+    resolution: {integrity: sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==}
+
   '@types/chai@5.2.3':
     resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==}
 
@@ -1591,6 +1612,9 @@ packages:
   '@types/node@24.11.0':
     resolution: {integrity: sha512-fPxQqz4VTgPI/IQ+lj9r0h+fDR66bzoeMGHp8ASee+32OSGIkeASsoZuJixsQoVef1QJbeubcPBxKk22QVoWdw==}
 
+  '@types/sortablejs@1.15.9':
+    resolution: {integrity: sha512-7HP+rZGE2p886PKV9c9OJzLBI6BBJu1O7lJGYnPyG3fS4/duUCcngkNCjsLwIMV+WMqANe3tt4irrXHSIe68OQ==}
+
   '@types/trusted-types@2.0.7':
     resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
 
@@ -1653,77 +1677,74 @@ packages:
     resolution: {integrity: sha512-f1WO2Lx8a9t8DARmcWAUPJbu0G20bJlj8L4z72K00TMeJAoyLr/tHhI/pzYBLrR4dXWkcxO1cWYZEOX8DKHTqA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@unocss/cli@66.6.6':
-    resolution: {integrity: sha512-78SY8j4hAVelK+vP/adsDGaSjEITasYLFECJLHWxUJSzK+G9UIc5wtL/u4jA+zKvwVkHcDvbkcO5K6wwwpAixg==}
-    engines: {node: '>=14'}
+  '@unocss/cli@66.7.5':
+    resolution: {integrity: sha512-fgWkECRn2LGVo9sEpmjk/KJ3NSKUDitaZCNrJcEYM93DG+ELriTHcL+VWBlF4rcZf9fdGlq1nKbbRHUZirFCHQ==}
     hasBin: true
 
-  '@unocss/config@66.6.6':
-    resolution: {integrity: sha512-menlnkqAFX/4wR2aandY8hSqrt01JE+rOzvtQxWaBt8kf1du62b0sS72FE5Z40n6HlEsEbF91N9FCfhnzG6i6g==}
-    engines: {node: '>=14'}
+  '@unocss/config@66.7.5':
+    resolution: {integrity: sha512-dkPl9glhEahJ+Xoja5ZseKKnH+vZaeaKQzg8b0otcKcPPNrHQgu1nu3QgfeOjnXOGrjZIotHwUeVtt4ZA2Skgg==}
 
-  '@unocss/core@66.6.6':
-    resolution: {integrity: sha512-Sbbx0ZQqmV8K2lg8E+z9MJzWb1MgRtJnvqzxDIrNuBjXasKhbcFt5wEMBtEZJOr63Z4ck0xThhZK53HmYT2jmg==}
+  '@unocss/core@66.7.5':
+    resolution: {integrity: sha512-UdJb8MiMywcau8QrWEVgUAz0kvoFHyR+sACwYCgmBh/BpKJGyR/zw/Ys3wvysbm0f+i/20VGBex/QQxYVlzdyQ==}
 
-  '@unocss/extractor-arbitrary-variants@66.6.6':
-    resolution: {integrity: sha512-uMzekF2miZRUwSZGvy3yYQiBAcSAs9LiXK8e3NjldxEw8xcRDWgTErxgStRoBeAD6UyzDcg/Cvwtf2guMbtR+g==}
+  '@unocss/extractor-arbitrary-variants@66.7.5':
+    resolution: {integrity: sha512-5zOkbnLIJc8E749qNjLXfPHl3FdHloop12h706/ojr6idK4ix0KLm43R//uLnphixCehdHJRuHnavnM4C/kQbA==}
 
-  '@unocss/extractor-svelte@66.6.6':
-    resolution: {integrity: sha512-5+Et3jiSFlMqxkoyVLsoT2/Rd8x/Jd65i5KzIyXMtQccDmqN2wSXuyvB2h5sLauHn4bBe/qOWO3PfGjbXBGWOA==}
+  '@unocss/extractor-svelte@66.7.5':
+    resolution: {integrity: sha512-9H6uQ5MvNIEJ6AshxPeCFkbCloDInEETq0OOVusd79vSi4SJKvWvLOnd7Wnnc24JrKt59qTnb9dJi1ZNAgkGUw==}
 
-  '@unocss/inspector@66.6.6':
-    resolution: {integrity: sha512-CpXIsqHwxCXJtUjUz6S29diHCIA+EJ1u5WML/6m2YPI4ObgWAVKrExy09inSg2icS52lFkWWdWQSeqc9kl5W6Q==}
+  '@unocss/inspector@66.7.5':
+    resolution: {integrity: sha512-WmTJMnj8bmRxvw/wGeShmL2eEHr2/L0BdGTXSxhfzwcO8y5XZEbBmVciLcM7pqaTXQ6JY4+KnITrDUf1urjZxQ==}
 
-  '@unocss/preset-attributify@66.6.6':
-    resolution: {integrity: sha512-3H12UI1rBt60PQy+S4IEeFYWu1/WQFuc2yhJ5mu/RCvX5/qwlIGanBpuh+xzTPXU1fWBlZN68yyO9uWOQgTqZQ==}
+  '@unocss/preset-attributify@66.7.5':
+    resolution: {integrity: sha512-1Oi1Cp81pqYJwG3h4+OlP5A0FKyaa07MFBXaXc4Yr3faiTbsI8SKj2TqnZCb+NQvBsEqslEd+jKXGZ3lKzCVOQ==}
 
-  '@unocss/preset-icons@66.6.6':
-    resolution: {integrity: sha512-HfIEEqf3jyKexOB2Sux556n0NkPoUftb2H4+Cf7prJvKHopMkZ/OUkXjwvUlxt1e5UpAEaIa0A2Ir7+ApxXoGA==}
+  '@unocss/preset-icons@66.7.5':
+    resolution: {integrity: sha512-ZsxadWnGGtHdANTikuMnjkQaT1qwUFJHZBF4fzVsPMnUiiKGs8rzXukwM9w3Gi9ontM7nbG2FYi9clWETSlpFg==}
 
-  '@unocss/preset-mini@66.6.6':
-    resolution: {integrity: sha512-k+/95PKMPOK57cJcSmz34VkIFem8BlujRRx6/L0Yusw7vLJMh98k0rPhC5s+NomZ/d9ZPgbNylskLhItJlak3w==}
+  '@unocss/preset-mini@66.7.5':
+    resolution: {integrity: sha512-o37TSl4ecT0dKu+3/TYuTYht75h82SEwDNl476m9ve0KW4Pv1O2tT/9TWd7N5cutEpySr8/YtjMwtWBD+drxBg==}
 
-  '@unocss/preset-tagify@66.6.6':
-    resolution: {integrity: sha512-KgBXYPYS0g4TVC3NLiIB78YIqUlvDLanz1EHIDo34rOTUfMgY8Uf5VuDJAzMu4Sc0LiwwBJbk6nIG9/Zm7ufWg==}
+  '@unocss/preset-tagify@66.7.5':
+    resolution: {integrity: sha512-/8YB1tXVi+WmNKPhsCdtO1xnQKEkshSnWDp6AbvVP3f6qOF7adlMYpAt3kpWCoVUBsfOQ06ZQlnfricMjObyoQ==}
 
-  '@unocss/preset-typography@66.6.6':
-    resolution: {integrity: sha512-SM1km5nqt15z4sTabfOobSC633I5Ol5nnme6JFTra4wiyCUNs+Cg31nJ6jnopWDUT4SEAXqfUH7jKSSoCnI6ZA==}
+  '@unocss/preset-typography@66.7.5':
+    resolution: {integrity: sha512-2dxC8LT9KYa29UZT4muDFl7DbIXvKktTfeSMbUGMdZKbHcuMtKSP2U52wti1PL5I9duqp4v+8G33EeVutGTUaQ==}
 
-  '@unocss/preset-uno@66.6.6':
-    resolution: {integrity: sha512-40PcBDtlhW7QP7e/WOxC684IhN5T1dXvj1dgx9ZzK+8lEDGjcX7bN2noW4aSenzSrHymeSsMrL/0ltL4ED/5Zw==}
+  '@unocss/preset-uno@66.7.5':
+    resolution: {integrity: sha512-zaUlYgNngbt50fZA/LbtsEnmPKojPqeiXCyUUiKQMv2uJQhncR32xhLZXVQ+TJD7hlfZ+6FAqlco1NIiAcub9w==}
 
-  '@unocss/preset-web-fonts@66.6.6':
-    resolution: {integrity: sha512-5ikwgrJB8VPzKd0bqgGNgYUGix90KFnVtKJPjWTP5qsv3+ZtZnea1rRbAFl8i2t52hg35msNBsQo+40IC3xB6A==}
+  '@unocss/preset-web-fonts@66.7.5':
+    resolution: {integrity: sha512-OLLTK7kswdSu51qxEm6O+AehecgCfS08Ivqo+280lKzFW7V1jXr5okeJ1ty+85oHCprJqzcD9iG1khxNRLomcA==}
 
-  '@unocss/preset-wind3@66.6.6':
-    resolution: {integrity: sha512-rk6gPPIQ7z2DVucOqp7XZ4vGpKAuzBV1vtUDvDh5WscxzO/QlqaeTfTALk5YgGpmLaF4+ns6FrTgLjV+wHgHuQ==}
+  '@unocss/preset-wind3@66.7.5':
+    resolution: {integrity: sha512-atFe/7Qein+oMdyZs0hEo+3EjV99Av2LVxDbzpCungxIfbS3TnQt70EIuHXMPNCVWLYwrMV+/P1n9Ntb0E3mow==}
 
-  '@unocss/preset-wind4@66.6.6':
-    resolution: {integrity: sha512-caTDM9rZSlp4tyPWWAnwMvQr2PXq53LsEYwd3N8zj0ou2hcsqptJvF+mFvyhvGF66x26wWJr/FwuUEhh7qycaw==}
+  '@unocss/preset-wind4@66.7.5':
+    resolution: {integrity: sha512-n3jIvQv8x1jXpmWfvNFBIqHNARki4mKZXfxAA31gekpXsRRTg16u1+yC1+PBBJgoEDFEnnmKnG7EZP88S8LVXA==}
 
-  '@unocss/preset-wind@66.6.6':
-    resolution: {integrity: sha512-TMy3lZ35FP/4QqDHOLWZmV+RoOGWUDqnDEOTjOKI1CQARGta0ppUmq+IZMuI1ZJLuOa4OZ9V6SfnwMXwRLgXmw==}
+  '@unocss/preset-wind@66.7.5':
+    resolution: {integrity: sha512-LVKgGr0A9Lc7F85xGXrrb71DDXMlHGA8bcj/Kht8BCsuRdBZadNbLlnv5qnSJiHYhi3/blzcgVoaeRor6L9yNA==}
 
-  '@unocss/rule-utils@66.6.6':
-    resolution: {integrity: sha512-krWtQKGshOaqQMuxeGq1NOA8NL35VdpYlmQEWOe39BY6TACT51bgQFu40MRfsAIMZZtoGS2YYTrnHojgR92omw==}
-    engines: {node: '>=14'}
+  '@unocss/rule-utils@66.7.5':
+    resolution: {integrity: sha512-/AKHBRF6ZOexE3EDDv8ZEYh40P5e2Eha41IYUbE1wjigW7++ssmvimSTdufJzZvU5DGP++E3B3WEsFPprZMjAg==}
 
-  '@unocss/transformer-attributify-jsx@66.6.6':
-    resolution: {integrity: sha512-NnDchmN2EeFLy4lfVqDgNe9j1+w2RLL2L9zKECXs5g6rDVfeeEK6FNgxSq3XnPcKltjNCy1pF4MaDOROG7r8yA==}
+  '@unocss/transformer-attributify-jsx@66.7.5':
+    resolution: {integrity: sha512-r8qDwNSt0eGSwWws3xsuIHb3PZYR2embFdYoE67hD/xlYgLjX1uPy/HUlGCSSh4uLc4vVYjurr0Oq5xF/B8YiA==}
 
-  '@unocss/transformer-compile-class@66.6.6':
-    resolution: {integrity: sha512-KKssJxU8fZ9x84yznIirbtta2sB0LN/3lm0bp+Wl1298HITaNiVeG2n26iStQ3N7r240xRN2RarxncSVCMFwWw==}
+  '@unocss/transformer-compile-class@66.7.5':
+    resolution: {integrity: sha512-KuECgsGF7tGe808vIvKViEjI0UCUgYgneJfK+/TWBkjC7s8dLVaUtJzzcP9/r6OfGlgyn/x1YTdRqTaCENa7Xg==}
 
-  '@unocss/transformer-directives@66.6.6':
-    resolution: {integrity: sha512-CReFTcBfMtKkRvzIqxL20VptWt5C1Om27dwoKzyVFBXv0jzViWysbu0y0AQg3bsgD4cFqndFyAGyeL84j0nbKg==}
+  '@unocss/transformer-directives@66.7.5':
+    resolution: {integrity: sha512-VMJApXXOwlDubkW+cNMmOkfxLefFupJr+yU23gGYUB2NPsuVltc8H5CDM0gfVebpeL5CUW05evxzEAk2wsju+Q==}
 
-  '@unocss/transformer-variant-group@66.6.6':
-    resolution: {integrity: sha512-j4L/0Tw6AdMVB2dDnuBlDbevyL1/0CAk88a77VF/VjgEIBwB9VXsCCUsxz+2Dohcl7N2GMm7+kpaWA6qt2PSaA==}
+  '@unocss/transformer-variant-group@66.7.5':
+    resolution: {integrity: sha512-iDmP3mM8J+IxuQf5Uh33zsi528xnGxTpKRJ0c+LCrqBTTkR2tZr4aCzNmJ0g29Js2yEOsyNXRRc8BNTuvgn0AA==}
 
-  '@unocss/vite@66.6.6':
-    resolution: {integrity: sha512-DgG7KcUUMtoDhPOlFf2l4dR+66xZ23SdZvTYpikk5nZfLCzZd62vedutD7x0bTR6VpK2YRq39B+F+Z6TktNY/w==}
+  '@unocss/vite@66.7.5':
+    resolution: {integrity: sha512-1z1TBCNJCR2WzjPtjzmCHr8rtzXHosMjLdsCNe6Mzsfwiw044gzzLVuiEZO9vIjkI50lvQ+gIOxOiVQG0hGAeA==}
     peerDependencies:
-      vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 || ^6.0.0-0 || ^7.0.0-0 || ^8.0.0-0
+      vite: ^5.0.0-0 || ^6.0.0-0 || ^7.0.0-0 || ^8.0.0-0
 
   '@vitest/expect@4.1.0':
     resolution: {integrity: sha512-EIxG7k4wlWweuCLG9Y5InKFwpMEOyrMb6ZJ1ihYu02LVj/bzUwn2VMU+13PinsjRW75XnITeFrQBMH5+dLvCDA==}
@@ -1803,9 +1824,9 @@ packages:
   buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
-  cac@6.7.14:
-    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
-    engines: {node: '>=8'}
+  cac@7.0.0:
+    resolution: {integrity: sha512-tixWYgm5ZoOD+3g6UTea91eow5z6AAHaho3g0V9CNSNb45gM8SmflpAc+GRd1InC4AqN/07Unrgp56Y94N9hJQ==}
+    engines: {node: '>=20.19.0'}
 
   chai@6.2.2:
     resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==}
@@ -1860,8 +1881,8 @@ packages:
     resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
 
-  css-tree@3.1.0:
-    resolution: {integrity: sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==}
+  css-tree@3.2.1:
+    resolution: {integrity: sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==}
     engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
 
   debug@4.4.3:
@@ -1965,8 +1986,8 @@ packages:
     resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}
     engines: {node: '>=0.10'}
 
-  esrap@2.2.8:
-    resolution: {integrity: sha512-MPweq2EvEGj8jwOI7Hgycw/QIHzqA1EbAM8lG7p+FBfZbZq/hQ6h3AMsqnu/djzisH1KVWNzbb7LSgIVtMlPSg==}
+  esrap@2.2.13:
+    resolution: {integrity: sha512-m8jH5hZgJE2RRUK/jjkGPcJEDAV+dYnZYFkosQaPTcE+Yw4xynXHOo6FUdwaWBtdR3b1MMa7wEDTSHeR2VWsGA==}
     peerDependencies:
       '@typescript-eslint/types': ^8.2.0
     peerDependenciesMeta:
@@ -2091,6 +2112,9 @@ packages:
     resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
     engines: {node: '>= 4'}
 
+  import-meta-resolve@4.2.0:
+    resolution: {integrity: sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==}
+
   imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
     engines: {node: '>=0.8.19'}
@@ -2235,8 +2259,8 @@ packages:
   magic-string@0.30.21:
     resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
 
-  mdn-data@2.12.2:
-    resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
+  mdn-data@2.27.1:
+    resolution: {integrity: sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==}
 
   merge2@1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
@@ -2291,8 +2315,8 @@ packages:
     resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
     engines: {node: '>= 0.8.0'}
 
-  oxc-parser@0.115.0:
-    resolution: {integrity: sha512-2w7Xn3CbS/zwzSY82S5WLemrRu3CT57uF7Lx8llrE/2bul6iMTcJE4Rbls7GDNbLn3ttATI68PfOz2Pt3KZ2cQ==}
+  oxc-parser@0.131.0:
+    resolution: {integrity: sha512-SJ3/7ZPbgie8dr5Z9BI/M51zZbpXba+hRSG0MDzVwMW5CRQg2fjYE0jHGlLX4eeiibGgC/mzoDFKSDHwVZEHRQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
   oxc-walker@0.7.0:
@@ -2342,11 +2366,15 @@ packages:
     resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
     engines: {node: '>=12'}
 
+  picomatch@4.0.5:
+    resolution: {integrity: sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==}
+    engines: {node: '>=12'}
+
   pkg-types@1.3.1:
     resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}
 
-  postcss@8.5.15:
-    resolution: {integrity: sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==}
+  postcss@8.5.16:
+    resolution: {integrity: sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==}
     engines: {node: ^10 || ^12 || >=14}
 
   prelude-ls@1.2.1:
@@ -2385,8 +2413,8 @@ packages:
     resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
-  rolldown@1.0.3:
-    resolution: {integrity: sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g==}
+  rolldown@1.1.5:
+    resolution: {integrity: sha512-t9z29cJjXf/vxQ8dyhCSpt6H6aSwHTk8cT5I3iy6SMXuFpk5mB6PL6XfC8PCwrPTx93udwKUm9HRteAlTGBLiA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
@@ -2440,6 +2468,9 @@ packages:
     resolution: {integrity: sha512-KAkBqZl3c2GvNgNhcoyJae1aKldDW0LO279wF9bk1PnluRTETKBq0WyzRXxEhoQLk56yHaOY4JCBEKDuJIET5g==}
     engines: {node: '>=20.0.0'}
 
+  sortablejs@1.15.7:
+    resolution: {integrity: sha512-Kk8wLQPlS+yi1ZEf48a4+fzHa4yxjC30M/Sr2AnQu+f/MPwvvX9XjZ6OWejiz8crBsLwSq8GHqaxaET7u6ux0A==}
+
   source-map-js@1.2.1:
     resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
     engines: {node: '>=0.10.0'}
@@ -2465,8 +2496,8 @@ packages:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
-  svelte@5.55.7:
-    resolution: {integrity: sha512-ymI5ykLPwIHW839E053FQbI1G+jnRFJEw3Kv5Y4njixVWywQBx+NUFpkkKyk5LIb36Fg9DVXSYpqiGekLD0hyw==}
+  svelte@5.56.4:
+    resolution: {integrity: sha512-/d0QHehmRuJW8gVz395MTkPcPozxzdjBMBE8oEYGz8O3b9KTMzzQ9ZHJQLuFKOHOPQbU6kx/X4iid/EBBzH7iw==}
     engines: {node: '>=18'}
 
   terser@5.46.0:
@@ -2550,13 +2581,12 @@ packages:
   universal-user-agent@7.0.3:
     resolution: {integrity: sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==}
 
-  unocss@66.6.6:
-    resolution: {integrity: sha512-PRKK945e2oZKHV664MA5Z9CDHbvY/V79IvTOUWKZ514jpl3UsJU3sS+skgxmKJSmwrWvXE5OVcmPthJrD/7vxg==}
-    engines: {node: '>=14'}
+  unocss@66.7.5:
+    resolution: {integrity: sha512-nAdmU8TwnQoiLnQjZ6Hm1GmHy9lTexKsAZNEJtZnxN9wyFRc1eLjQgmh9r7UEGxBQMQLD8OZOgmk5HpwObbh0Q==}
     peerDependencies:
-      '@unocss/astro': 66.6.6
-      '@unocss/postcss': 66.6.6
-      '@unocss/webpack': 66.6.6
+      '@unocss/astro': 66.7.5
+      '@unocss/postcss': 66.7.5
+      '@unocss/webpack': 66.7.5
     peerDependenciesMeta:
       '@unocss/astro':
         optional: true
@@ -2576,13 +2606,13 @@ packages:
   uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
 
-  vite@8.0.16:
-    resolution: {integrity: sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==}
+  vite@8.1.4:
+    resolution: {integrity: sha512-bTT9PsdWO+MQMNG9ZXIP/qM9wGh37DFxTV/sPq9cFpHr3w4jkgef032PkAL9jAqhk3Nz8NQw3O8n6/xFkqO4QQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
       '@types/node': ^20.19.0 || >=22.12.0
-      '@vitejs/devtools': ^0.1.18
+      '@vitejs/devtools': ^0.3.0
       esbuild: '>=0.28.1'
       jiti: '>=1.21.0'
       less: ^4.0.0
@@ -2759,6 +2789,12 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
+  '@emnapi/core@1.11.1':
+    dependencies:
+      '@emnapi/wasi-threads': 1.2.2
+      tslib: 2.8.1
+    optional: true
+
   '@emnapi/runtime@1.10.0':
     dependencies:
       tslib: 2.8.1
@@ -2774,6 +2810,11 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
+  '@emnapi/wasi-threads@1.2.2':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   '@epic-web/invariant@1.0.0': {}
 
   '@esbuild/aix-ppc64@0.28.1':
@@ -2909,11 +2950,11 @@ snapshots:
 
   '@iconify/types@2.0.0': {}
 
-  '@iconify/utils@3.1.0':
+  '@iconify/utils@3.1.4':
     dependencies:
       '@antfu/install-pkg': 1.1.0
       '@iconify/types': 2.0.0
-      mlly: 1.8.0
+      import-meta-resolve: 4.2.0
 
   '@img/colour@1.1.0': {}
 
@@ -3159,11 +3200,11 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  '@napi-rs/cli@3.7.2(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)(@types/node@24.11.0)':
+  '@napi-rs/cli@3.7.2(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@types/node@24.11.0)':
     dependencies:
       '@inquirer/prompts': 8.5.2(@types/node@24.11.0)
-      '@napi-rs/cross-toolchain': 1.0.3(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
-      '@napi-rs/wasm-tools': 1.0.1(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
+      '@napi-rs/cross-toolchain': 1.0.3(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
+      '@napi-rs/wasm-tools': 1.0.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
       '@octokit/rest': 22.0.1
       clipanion: 4.0.0-rc.4(typanion@3.14.0)
       colorette: 2.0.20
@@ -3191,10 +3232,10 @@ snapshots:
       - node-addon-api
       - supports-color
 
-  '@napi-rs/cross-toolchain@1.0.3(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)':
+  '@napi-rs/cross-toolchain@1.0.3(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
     dependencies:
-      '@napi-rs/lzma': 1.4.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
-      '@napi-rs/tar': 1.1.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
+      '@napi-rs/lzma': 1.4.5(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
+      '@napi-rs/tar': 1.1.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
       debug: 4.4.3
     transitivePeerDependencies:
       - '@emnapi/core'
@@ -3240,9 +3281,9 @@ snapshots:
   '@napi-rs/lzma-linux-x64-musl@1.4.5':
     optional: true
 
-  '@napi-rs/lzma-wasm32-wasi@1.4.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)':
+  '@napi-rs/lzma-wasm32-wasi@1.4.5(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
     dependencies:
-      '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
+      '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
     transitivePeerDependencies:
       - '@emnapi/core'
       - '@emnapi/runtime'
@@ -3257,7 +3298,7 @@ snapshots:
   '@napi-rs/lzma-win32-x64-msvc@1.4.5':
     optional: true
 
-  '@napi-rs/lzma@1.4.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)':
+  '@napi-rs/lzma@1.4.5(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
     optionalDependencies:
       '@napi-rs/lzma-android-arm-eabi': 1.4.5
       '@napi-rs/lzma-android-arm64': 1.4.5
@@ -3272,7 +3313,7 @@ snapshots:
       '@napi-rs/lzma-linux-s390x-gnu': 1.4.5
       '@napi-rs/lzma-linux-x64-gnu': 1.4.5
       '@napi-rs/lzma-linux-x64-musl': 1.4.5
-      '@napi-rs/lzma-wasm32-wasi': 1.4.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
+      '@napi-rs/lzma-wasm32-wasi': 1.4.5(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
       '@napi-rs/lzma-win32-arm64-msvc': 1.4.5
       '@napi-rs/lzma-win32-ia32-msvc': 1.4.5
       '@napi-rs/lzma-win32-x64-msvc': 1.4.5
@@ -3316,9 +3357,9 @@ snapshots:
   '@napi-rs/tar-linux-x64-musl@1.1.0':
     optional: true
 
-  '@napi-rs/tar-wasm32-wasi@1.1.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)':
+  '@napi-rs/tar-wasm32-wasi@1.1.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
     dependencies:
-      '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
+      '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
     transitivePeerDependencies:
       - '@emnapi/core'
       - '@emnapi/runtime'
@@ -3333,7 +3374,7 @@ snapshots:
   '@napi-rs/tar-win32-x64-msvc@1.1.0':
     optional: true
 
-  '@napi-rs/tar@1.1.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)':
+  '@napi-rs/tar@1.1.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
     optionalDependencies:
       '@napi-rs/tar-android-arm-eabi': 1.1.0
       '@napi-rs/tar-android-arm64': 1.1.0
@@ -3347,7 +3388,7 @@ snapshots:
       '@napi-rs/tar-linux-s390x-gnu': 1.1.0
       '@napi-rs/tar-linux-x64-gnu': 1.1.0
       '@napi-rs/tar-linux-x64-musl': 1.1.0
-      '@napi-rs/tar-wasm32-wasi': 1.1.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
+      '@napi-rs/tar-wasm32-wasi': 1.1.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
       '@napi-rs/tar-win32-arm64-msvc': 1.1.0
       '@napi-rs/tar-win32-ia32-msvc': 1.1.0
       '@napi-rs/tar-win32-x64-msvc': 1.1.0
@@ -3362,13 +3403,20 @@ snapshots:
       '@tybys/wasm-util': 0.10.2
     optional: true
 
-  '@napi-rs/wasm-runtime@1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)':
+  '@napi-rs/wasm-runtime@1.1.5(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
     dependencies:
-      '@emnapi/core': 1.10.0
+      '@emnapi/core': 1.11.1
       '@emnapi/runtime': 1.11.1
       '@tybys/wasm-util': 0.10.2
     optional: true
 
+  '@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
+    dependencies:
+      '@emnapi/core': 1.11.1
+      '@emnapi/runtime': 1.11.1
+      '@tybys/wasm-util': 0.10.3
+    optional: true
+
   '@napi-rs/wasm-tools-android-arm-eabi@1.0.1':
     optional: true
 
@@ -3396,9 +3444,9 @@ snapshots:
   '@napi-rs/wasm-tools-linux-x64-musl@1.0.1':
     optional: true
 
-  '@napi-rs/wasm-tools-wasm32-wasi@1.0.1(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)':
+  '@napi-rs/wasm-tools-wasm32-wasi@1.0.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
     dependencies:
-      '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
+      '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
     transitivePeerDependencies:
       - '@emnapi/core'
       - '@emnapi/runtime'
@@ -3413,7 +3461,7 @@ snapshots:
   '@napi-rs/wasm-tools-win32-x64-msvc@1.0.1':
     optional: true
 
-  '@napi-rs/wasm-tools@1.0.1(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)':
+  '@napi-rs/wasm-tools@1.0.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
     optionalDependencies:
       '@napi-rs/wasm-tools-android-arm-eabi': 1.0.1
       '@napi-rs/wasm-tools-android-arm64': 1.0.1
@@ -3424,7 +3472,7 @@ snapshots:
       '@napi-rs/wasm-tools-linux-arm64-musl': 1.0.1
       '@napi-rs/wasm-tools-linux-x64-gnu': 1.0.1
       '@napi-rs/wasm-tools-linux-x64-musl': 1.0.1
-      '@napi-rs/wasm-tools-wasm32-wasi': 1.0.1(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
+      '@napi-rs/wasm-tools-wasm32-wasi': 1.0.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
       '@napi-rs/wasm-tools-win32-arm64-msvc': 1.0.1
       '@napi-rs/wasm-tools-win32-ia32-msvc': 1.0.1
       '@napi-rs/wasm-tools-win32-x64-msvc': 1.0.1
@@ -3507,74 +3555,73 @@ snapshots:
     dependencies:
       '@octokit/openapi-types': 27.0.0
 
-  '@oxc-parser/binding-android-arm-eabi@0.115.0':
+  '@oxc-parser/binding-android-arm-eabi@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-android-arm64@0.115.0':
+  '@oxc-parser/binding-android-arm64@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-darwin-arm64@0.115.0':
+  '@oxc-parser/binding-darwin-arm64@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-darwin-x64@0.115.0':
+  '@oxc-parser/binding-darwin-x64@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-freebsd-x64@0.115.0':
+  '@oxc-parser/binding-freebsd-x64@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm-gnueabihf@0.115.0':
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm-musleabihf@0.115.0':
+  '@oxc-parser/binding-linux-arm-musleabihf@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm64-gnu@0.115.0':
+  '@oxc-parser/binding-linux-arm64-gnu@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm64-musl@0.115.0':
+  '@oxc-parser/binding-linux-arm64-musl@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-linux-ppc64-gnu@0.115.0':
+  '@oxc-parser/binding-linux-ppc64-gnu@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-linux-riscv64-gnu@0.115.0':
+  '@oxc-parser/binding-linux-riscv64-gnu@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-linux-riscv64-musl@0.115.0':
+  '@oxc-parser/binding-linux-riscv64-musl@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-linux-s390x-gnu@0.115.0':
+  '@oxc-parser/binding-linux-s390x-gnu@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-linux-x64-gnu@0.115.0':
+  '@oxc-parser/binding-linux-x64-gnu@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-linux-x64-musl@0.115.0':
+  '@oxc-parser/binding-linux-x64-musl@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-openharmony-arm64@0.115.0':
+  '@oxc-parser/binding-openharmony-arm64@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-wasm32-wasi@0.115.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)':
+  '@oxc-parser/binding-wasm32-wasi@0.131.0':
     dependencies:
-      '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
-    transitivePeerDependencies:
-      - '@emnapi/core'
-      - '@emnapi/runtime'
+      '@emnapi/core': 1.10.0
+      '@emnapi/runtime': 1.10.0
+      '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
     optional: true
 
-  '@oxc-parser/binding-win32-arm64-msvc@0.115.0':
+  '@oxc-parser/binding-win32-arm64-msvc@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-win32-ia32-msvc@0.115.0':
+  '@oxc-parser/binding-win32-ia32-msvc@0.131.0':
     optional: true
 
-  '@oxc-parser/binding-win32-x64-msvc@0.115.0':
+  '@oxc-parser/binding-win32-x64-msvc@0.131.0':
     optional: true
 
-  '@oxc-project/types@0.115.0': {}
+  '@oxc-project/types@0.131.0': {}
 
-  '@oxc-project/types@0.133.0': {}
+  '@oxc-project/types@0.139.0': {}
 
   '@polka/url@1.0.0-next.29': {}
 
@@ -3594,53 +3641,53 @@ snapshots:
     dependencies:
       quansync: 1.0.0
 
-  '@rolldown/binding-android-arm64@1.0.3':
+  '@rolldown/binding-android-arm64@1.1.5':
     optional: true
 
-  '@rolldown/binding-darwin-arm64@1.0.3':
+  '@rolldown/binding-darwin-arm64@1.1.5':
     optional: true
 
-  '@rolldown/binding-darwin-x64@1.0.3':
+  '@rolldown/binding-darwin-x64@1.1.5':
     optional: true
 
-  '@rolldown/binding-freebsd-x64@1.0.3':
+  '@rolldown/binding-freebsd-x64@1.1.5':
     optional: true
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.0.3':
+  '@rolldown/binding-linux-arm-gnueabihf@1.1.5':
     optional: true
 
-  '@rolldown/binding-linux-arm64-gnu@1.0.3':
+  '@rolldown/binding-linux-arm64-gnu@1.1.5':
     optional: true
 
-  '@rolldown/binding-linux-arm64-musl@1.0.3':
+  '@rolldown/binding-linux-arm64-musl@1.1.5':
     optional: true
 
-  '@rolldown/binding-linux-ppc64-gnu@1.0.3':
+  '@rolldown/binding-linux-ppc64-gnu@1.1.5':
     optional: true
 
-  '@rolldown/binding-linux-s390x-gnu@1.0.3':
+  '@rolldown/binding-linux-s390x-gnu@1.1.5':
     optional: true
 
-  '@rolldown/binding-linux-x64-gnu@1.0.3':
+  '@rolldown/binding-linux-x64-gnu@1.1.5':
     optional: true
 
-  '@rolldown/binding-linux-x64-musl@1.0.3':
+  '@rolldown/binding-linux-x64-musl@1.1.5':
     optional: true
 
-  '@rolldown/binding-openharmony-arm64@1.0.3':
+  '@rolldown/binding-openharmony-arm64@1.1.5':
     optional: true
 
-  '@rolldown/binding-wasm32-wasi@1.0.3':
+  '@rolldown/binding-wasm32-wasi@1.1.5':
     dependencies:
-      '@emnapi/core': 1.10.0
-      '@emnapi/runtime': 1.10.0
-      '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
+      '@emnapi/core': 1.11.1
+      '@emnapi/runtime': 1.11.1
+      '@napi-rs/wasm-runtime': 1.1.6(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
     optional: true
 
-  '@rolldown/binding-win32-arm64-msvc@1.0.3':
+  '@rolldown/binding-win32-arm64-msvc@1.1.5':
     optional: true
 
-  '@rolldown/binding-win32-x64-msvc@1.0.3':
+  '@rolldown/binding-win32-x64-msvc@1.1.5':
     optional: true
 
   '@rolldown/pluginutils@1.0.1': {}
@@ -3751,24 +3798,29 @@ snapshots:
 
   '@standard-schema/spec@1.1.0': {}
 
-  '@sveltejs/acorn-typescript@1.0.9(acorn@8.16.0)':
+  '@sveltejs/acorn-typescript@1.0.11(acorn@8.16.0)':
     dependencies:
       acorn: 8.16.0
 
-  '@sveltejs/vite-plugin-svelte@7.0.0(svelte@5.55.7(@typescript-eslint/types@8.58.2))(vite@8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))':
+  '@sveltejs/vite-plugin-svelte@7.2.0(svelte@5.56.4(@typescript-eslint/types@8.58.2))(vite@8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))':
     dependencies:
       deepmerge: 4.3.1
       magic-string: 0.30.21
       obug: 2.1.3
-      svelte: 5.55.7(@typescript-eslint/types@8.58.2)
-      vite: 8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)
-      vitefu: 1.1.2(vite@8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))
+      svelte: 5.56.4(@typescript-eslint/types@8.58.2)
+      vite: 8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)
+      vitefu: 1.1.2(vite@8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))
 
   '@tybys/wasm-util@0.10.2':
     dependencies:
       tslib: 2.8.1
     optional: true
 
+  '@tybys/wasm-util@0.10.3':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   '@types/chai@5.2.3':
     dependencies:
       '@types/deep-eql': 4.0.2
@@ -3791,6 +3843,8 @@ snapshots:
     dependencies:
       undici-types: 7.16.0
 
+  '@types/sortablejs@1.15.9': {}
+
   '@types/trusted-types@2.0.7': {}
 
   '@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.0.2(jiti@2.6.1))(typescript@6.0.2))(eslint@10.0.2(jiti@2.6.1))(typescript@6.0.2)':
@@ -3884,15 +3938,15 @@ snapshots:
       '@typescript-eslint/types': 8.58.2
       eslint-visitor-keys: 5.0.1
 
-  '@unocss/cli@66.6.6':
+  '@unocss/cli@66.7.5':
     dependencies:
       '@jridgewell/remapping': 2.3.5
-      '@unocss/config': 66.6.6
-      '@unocss/core': 66.6.6
-      '@unocss/preset-wind3': 66.6.6
-      '@unocss/preset-wind4': 66.6.6
-      '@unocss/transformer-directives': 66.6.6
-      cac: 6.7.14
+      '@unocss/config': 66.7.5
+      '@unocss/core': 66.7.5
+      '@unocss/preset-wind3': 66.7.5
+      '@unocss/preset-wind4': 66.7.5
+      '@unocss/transformer-directives': 66.7.5
+      cac: 7.0.0
       chokidar: 5.0.0
       colorette: 2.0.20
       consola: 3.4.2
@@ -3902,121 +3956,118 @@ snapshots:
       tinyglobby: 0.2.17
       unplugin-utils: 0.3.1
 
-  '@unocss/config@66.6.6':
+  '@unocss/config@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
+      '@unocss/core': 66.7.5
       colorette: 2.0.20
       consola: 3.4.2
       unconfig: 7.5.0
 
-  '@unocss/core@66.6.6': {}
+  '@unocss/core@66.7.5': {}
 
-  '@unocss/extractor-arbitrary-variants@66.6.6':
+  '@unocss/extractor-arbitrary-variants@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
+      '@unocss/core': 66.7.5
 
-  '@unocss/extractor-svelte@66.6.6': {}
+  '@unocss/extractor-svelte@66.7.5': {}
 
-  '@unocss/inspector@66.6.6':
+  '@unocss/inspector@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
-      '@unocss/rule-utils': 66.6.6
+      '@unocss/core': 66.7.5
+      '@unocss/rule-utils': 66.7.5
       colorette: 2.0.20
       gzip-size: 6.0.0
       sirv: 3.0.2
 
-  '@unocss/preset-attributify@66.6.6':
+  '@unocss/preset-attributify@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
+      '@unocss/core': 66.7.5
 
-  '@unocss/preset-icons@66.6.6':
+  '@unocss/preset-icons@66.7.5':
     dependencies:
-      '@iconify/utils': 3.1.0
-      '@unocss/core': 66.6.6
+      '@iconify/utils': 3.1.4
+      '@unocss/core': 66.7.5
       ofetch: 1.5.1
 
-  '@unocss/preset-mini@66.6.6':
+  '@unocss/preset-mini@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
-      '@unocss/extractor-arbitrary-variants': 66.6.6
-      '@unocss/rule-utils': 66.6.6
+      '@unocss/core': 66.7.5
+      '@unocss/extractor-arbitrary-variants': 66.7.5
+      '@unocss/rule-utils': 66.7.5
 
-  '@unocss/preset-tagify@66.6.6':
+  '@unocss/preset-tagify@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
+      '@unocss/core': 66.7.5
 
-  '@unocss/preset-typography@66.6.6':
+  '@unocss/preset-typography@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
-      '@unocss/rule-utils': 66.6.6
+      '@unocss/core': 66.7.5
+      '@unocss/rule-utils': 66.7.5
 
-  '@unocss/preset-uno@66.6.6':
+  '@unocss/preset-uno@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
-      '@unocss/preset-wind3': 66.6.6
+      '@unocss/core': 66.7.5
+      '@unocss/preset-wind3': 66.7.5
 
-  '@unocss/preset-web-fonts@66.6.6':
+  '@unocss/preset-web-fonts@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
+      '@unocss/core': 66.7.5
       ofetch: 1.5.1
 
-  '@unocss/preset-wind3@66.6.6':
+  '@unocss/preset-wind3@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
-      '@unocss/preset-mini': 66.6.6
-      '@unocss/rule-utils': 66.6.6
+      '@unocss/core': 66.7.5
+      '@unocss/preset-mini': 66.7.5
+      '@unocss/rule-utils': 66.7.5
 
-  '@unocss/preset-wind4@66.6.6':
+  '@unocss/preset-wind4@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
-      '@unocss/extractor-arbitrary-variants': 66.6.6
-      '@unocss/rule-utils': 66.6.6
+      '@unocss/core': 66.7.5
+      '@unocss/extractor-arbitrary-variants': 66.7.5
+      '@unocss/rule-utils': 66.7.5
 
-  '@unocss/preset-wind@66.6.6':
+  '@unocss/preset-wind@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
-      '@unocss/preset-wind3': 66.6.6
+      '@unocss/core': 66.7.5
+      '@unocss/preset-wind3': 66.7.5
 
-  '@unocss/rule-utils@66.6.6':
+  '@unocss/rule-utils@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
+      '@unocss/core': 66.7.5
       magic-string: 0.30.21
 
-  '@unocss/transformer-attributify-jsx@66.6.6(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)':
+  '@unocss/transformer-attributify-jsx@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
-      oxc-parser: 0.115.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
-      oxc-walker: 0.7.0(oxc-parser@0.115.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1))
-    transitivePeerDependencies:
-      - '@emnapi/core'
-      - '@emnapi/runtime'
+      '@unocss/core': 66.7.5
+      oxc-parser: 0.131.0
+      oxc-walker: 0.7.0(oxc-parser@0.131.0)
 
-  '@unocss/transformer-compile-class@66.6.6':
+  '@unocss/transformer-compile-class@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
+      '@unocss/core': 66.7.5
 
-  '@unocss/transformer-directives@66.6.6':
+  '@unocss/transformer-directives@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
-      '@unocss/rule-utils': 66.6.6
-      css-tree: 3.1.0
+      '@unocss/core': 66.7.5
+      '@unocss/rule-utils': 66.7.5
+      css-tree: 3.2.1
 
-  '@unocss/transformer-variant-group@66.6.6':
+  '@unocss/transformer-variant-group@66.7.5':
     dependencies:
-      '@unocss/core': 66.6.6
+      '@unocss/core': 66.7.5
 
-  '@unocss/vite@66.6.6(vite@8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))':
+  '@unocss/vite@66.7.5(vite@8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))':
     dependencies:
       '@jridgewell/remapping': 2.3.5
-      '@unocss/config': 66.6.6
-      '@unocss/core': 66.6.6
-      '@unocss/inspector': 66.6.6
+      '@unocss/config': 66.7.5
+      '@unocss/core': 66.7.5
+      '@unocss/inspector': 66.7.5
       chokidar: 5.0.0
       magic-string: 0.30.21
       pathe: 2.0.3
       tinyglobby: 0.2.17
       unplugin-utils: 0.3.1
-      vite: 8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)
+      vite: 8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)
 
   '@vitest/expect@4.1.0':
     dependencies:
@@ -4027,13 +4078,13 @@ snapshots:
       chai: 6.2.2
       tinyrainbow: 3.1.0
 
-  '@vitest/mocker@4.1.0(vite@8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))':
+  '@vitest/mocker@4.1.0(vite@8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))':
     dependencies:
       '@vitest/spy': 4.1.0
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)
+      vite: 8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)
 
   '@vitest/pretty-format@4.1.0':
     dependencies:
@@ -4096,7 +4147,7 @@ snapshots:
 
   buffer-from@1.1.2: {}
 
-  cac@6.7.14: {}
+  cac@7.0.0: {}
 
   chai@6.2.2: {}
 
@@ -4137,9 +4188,9 @@ snapshots:
       shebang-command: 2.0.0
       which: 2.0.2
 
-  css-tree@3.1.0:
+  css-tree@3.2.1:
     dependencies:
-      mdn-data: 2.12.2
+      mdn-data: 2.27.1
       source-map-js: 1.2.1
 
   debug@4.4.3:
@@ -4267,7 +4318,7 @@ snapshots:
     dependencies:
       estraverse: 5.3.0
 
-  esrap@2.2.8(@typescript-eslint/types@8.58.2):
+  esrap@2.2.13(@typescript-eslint/types@8.58.2):
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
     optionalDependencies:
@@ -4374,6 +4425,8 @@ snapshots:
 
   ignore@7.0.5: {}
 
+  import-meta-resolve@4.2.0: {}
+
   imurmurhash@0.1.4: {}
 
   is-core-module@2.16.1:
@@ -4488,7 +4541,7 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  mdn-data@2.12.2: {}
+  mdn-data@2.27.1: {}
 
   merge2@1.4.1: {}
 
@@ -4549,38 +4602,35 @@ snapshots:
       type-check: 0.4.0
       word-wrap: 1.2.5
 
-  oxc-parser@0.115.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1):
+  oxc-parser@0.131.0:
     dependencies:
-      '@oxc-project/types': 0.115.0
+      '@oxc-project/types': 0.131.0
     optionalDependencies:
-      '@oxc-parser/binding-android-arm-eabi': 0.115.0
-      '@oxc-parser/binding-android-arm64': 0.115.0
-      '@oxc-parser/binding-darwin-arm64': 0.115.0
-      '@oxc-parser/binding-darwin-x64': 0.115.0
-      '@oxc-parser/binding-freebsd-x64': 0.115.0
-      '@oxc-parser/binding-linux-arm-gnueabihf': 0.115.0
-      '@oxc-parser/binding-linux-arm-musleabihf': 0.115.0
-      '@oxc-parser/binding-linux-arm64-gnu': 0.115.0
-      '@oxc-parser/binding-linux-arm64-musl': 0.115.0
-      '@oxc-parser/binding-linux-ppc64-gnu': 0.115.0
-      '@oxc-parser/binding-linux-riscv64-gnu': 0.115.0
-      '@oxc-parser/binding-linux-riscv64-musl': 0.115.0
-      '@oxc-parser/binding-linux-s390x-gnu': 0.115.0
-      '@oxc-parser/binding-linux-x64-gnu': 0.115.0
-      '@oxc-parser/binding-linux-x64-musl': 0.115.0
-      '@oxc-parser/binding-openharmony-arm64': 0.115.0
-      '@oxc-parser/binding-wasm32-wasi': 0.115.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
-      '@oxc-parser/binding-win32-arm64-msvc': 0.115.0
-      '@oxc-parser/binding-win32-ia32-msvc': 0.115.0
-      '@oxc-parser/binding-win32-x64-msvc': 0.115.0
-    transitivePeerDependencies:
-      - '@emnapi/core'
-      - '@emnapi/runtime'
-
-  oxc-walker@0.7.0(oxc-parser@0.115.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)):
+      '@oxc-parser/binding-android-arm-eabi': 0.131.0
+      '@oxc-parser/binding-android-arm64': 0.131.0
+      '@oxc-parser/binding-darwin-arm64': 0.131.0
+      '@oxc-parser/binding-darwin-x64': 0.131.0
+      '@oxc-parser/binding-freebsd-x64': 0.131.0
+      '@oxc-parser/binding-linux-arm-gnueabihf': 0.131.0
+      '@oxc-parser/binding-linux-arm-musleabihf': 0.131.0
+      '@oxc-parser/binding-linux-arm64-gnu': 0.131.0
+      '@oxc-parser/binding-linux-arm64-musl': 0.131.0
+      '@oxc-parser/binding-linux-ppc64-gnu': 0.131.0
+      '@oxc-parser/binding-linux-riscv64-gnu': 0.131.0
+      '@oxc-parser/binding-linux-riscv64-musl': 0.131.0
+      '@oxc-parser/binding-linux-s390x-gnu': 0.131.0
+      '@oxc-parser/binding-linux-x64-gnu': 0.131.0
+      '@oxc-parser/binding-linux-x64-musl': 0.131.0
+      '@oxc-parser/binding-openharmony-arm64': 0.131.0
+      '@oxc-parser/binding-wasm32-wasi': 0.131.0
+      '@oxc-parser/binding-win32-arm64-msvc': 0.131.0
+      '@oxc-parser/binding-win32-ia32-msvc': 0.131.0
+      '@oxc-parser/binding-win32-x64-msvc': 0.131.0
+
+  oxc-walker@0.7.0(oxc-parser@0.131.0):
     dependencies:
       magic-regexp: 0.10.0
-      oxc-parser: 0.115.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
+      oxc-parser: 0.131.0
 
   p-limit@3.1.0:
     dependencies:
@@ -4610,13 +4660,15 @@ snapshots:
 
   picomatch@4.0.4: {}
 
+  picomatch@4.0.5: {}
+
   pkg-types@1.3.1:
     dependencies:
       confbox: 0.1.8
       mlly: 1.8.0
       pathe: 2.0.3
 
-  postcss@8.5.15:
+  postcss@8.5.16:
     dependencies:
       nanoid: 3.3.12
       picocolors: 1.1.1
@@ -4644,26 +4696,26 @@ snapshots:
 
   reusify@1.1.0: {}
 
-  rolldown@1.0.3:
+  rolldown@1.1.5:
     dependencies:
-      '@oxc-project/types': 0.133.0
+      '@oxc-project/types': 0.139.0
       '@rolldown/pluginutils': 1.0.1
     optionalDependencies:
-      '@rolldown/binding-android-arm64': 1.0.3
-      '@rolldown/binding-darwin-arm64': 1.0.3
-      '@rolldown/binding-darwin-x64': 1.0.3
-      '@rolldown/binding-freebsd-x64': 1.0.3
-      '@rolldown/binding-linux-arm-gnueabihf': 1.0.3
-      '@rolldown/binding-linux-arm64-gnu': 1.0.3
-      '@rolldown/binding-linux-arm64-musl': 1.0.3
-      '@rolldown/binding-linux-ppc64-gnu': 1.0.3
-      '@rolldown/binding-linux-s390x-gnu': 1.0.3
-      '@rolldown/binding-linux-x64-gnu': 1.0.3
-      '@rolldown/binding-linux-x64-musl': 1.0.3
-      '@rolldown/binding-openharmony-arm64': 1.0.3
-      '@rolldown/binding-wasm32-wasi': 1.0.3
-      '@rolldown/binding-win32-arm64-msvc': 1.0.3
-      '@rolldown/binding-win32-x64-msvc': 1.0.3
+      '@rolldown/binding-android-arm64': 1.1.5
+      '@rolldown/binding-darwin-arm64': 1.1.5
+      '@rolldown/binding-darwin-x64': 1.1.5
+      '@rolldown/binding-freebsd-x64': 1.1.5
+      '@rolldown/binding-linux-arm-gnueabihf': 1.1.5
+      '@rolldown/binding-linux-arm64-gnu': 1.1.5
+      '@rolldown/binding-linux-arm64-musl': 1.1.5
+      '@rolldown/binding-linux-ppc64-gnu': 1.1.5
+      '@rolldown/binding-linux-s390x-gnu': 1.1.5
+      '@rolldown/binding-linux-x64-gnu': 1.1.5
+      '@rolldown/binding-linux-x64-musl': 1.1.5
+      '@rolldown/binding-openharmony-arm64': 1.1.5
+      '@rolldown/binding-wasm32-wasi': 1.1.5
+      '@rolldown/binding-win32-arm64-msvc': 1.1.5
+      '@rolldown/binding-win32-x64-msvc': 1.1.5
 
   rollup@4.62.2:
     dependencies:
@@ -4759,6 +4811,8 @@ snapshots:
 
   smob@1.6.1: {}
 
+  sortablejs@1.15.7: {}
+
   source-map-js@1.2.1: {}
 
   source-map-support@0.5.21:
@@ -4776,11 +4830,11 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
-  svelte@5.55.7(@typescript-eslint/types@8.58.2):
+  svelte@5.56.4(@typescript-eslint/types@8.58.2):
     dependencies:
       '@jridgewell/remapping': 2.3.5
       '@jridgewell/sourcemap-codec': 1.5.5
-      '@sveltejs/acorn-typescript': 1.0.9(acorn@8.16.0)
+      '@sveltejs/acorn-typescript': 1.0.11(acorn@8.16.0)
       '@types/estree': 1.0.9
       '@types/trusted-types': 2.0.7
       acorn: 8.16.0
@@ -4789,7 +4843,7 @@ snapshots:
       clsx: 2.1.1
       devalue: 5.8.1
       esm-env: 1.2.2
-      esrap: 2.2.8(@typescript-eslint/types@8.58.2)
+      esrap: 2.2.13(@typescript-eslint/types@8.58.2)
       is-reference: 3.0.3
       locate-character: 3.0.0
       magic-string: 0.30.21
@@ -4873,28 +4927,26 @@ snapshots:
 
   universal-user-agent@7.0.3: {}
 
-  unocss@66.6.6(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)(vite@8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)):
-    dependencies:
-      '@unocss/cli': 66.6.6
-      '@unocss/core': 66.6.6
-      '@unocss/preset-attributify': 66.6.6
-      '@unocss/preset-icons': 66.6.6
-      '@unocss/preset-mini': 66.6.6
-      '@unocss/preset-tagify': 66.6.6
-      '@unocss/preset-typography': 66.6.6
-      '@unocss/preset-uno': 66.6.6
-      '@unocss/preset-web-fonts': 66.6.6
-      '@unocss/preset-wind': 66.6.6
-      '@unocss/preset-wind3': 66.6.6
-      '@unocss/preset-wind4': 66.6.6
-      '@unocss/transformer-attributify-jsx': 66.6.6(@emnapi/core@1.10.0)(@emnapi/runtime@1.11.1)
-      '@unocss/transformer-compile-class': 66.6.6
-      '@unocss/transformer-directives': 66.6.6
-      '@unocss/transformer-variant-group': 66.6.6
-      '@unocss/vite': 66.6.6(vite@8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))
+  unocss@66.7.5(vite@8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)):
+    dependencies:
+      '@unocss/cli': 66.7.5
+      '@unocss/core': 66.7.5
+      '@unocss/preset-attributify': 66.7.5
+      '@unocss/preset-icons': 66.7.5
+      '@unocss/preset-mini': 66.7.5
+      '@unocss/preset-tagify': 66.7.5
+      '@unocss/preset-typography': 66.7.5
+      '@unocss/preset-uno': 66.7.5
+      '@unocss/preset-web-fonts': 66.7.5
+      '@unocss/preset-wind': 66.7.5
+      '@unocss/preset-wind3': 66.7.5
+      '@unocss/preset-wind4': 66.7.5
+      '@unocss/transformer-attributify-jsx': 66.7.5
+      '@unocss/transformer-compile-class': 66.7.5
+      '@unocss/transformer-directives': 66.7.5
+      '@unocss/transformer-variant-group': 66.7.5
+      '@unocss/vite': 66.7.5(vite@8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))
     transitivePeerDependencies:
-      - '@emnapi/core'
-      - '@emnapi/runtime'
       - vite
 
   unplugin-utils@0.3.1:
@@ -4913,12 +4965,12 @@ snapshots:
     dependencies:
       punycode: 2.3.1
 
-  vite@8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0):
+  vite@8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0):
     dependencies:
       lightningcss: 1.32.0
-      picomatch: 4.0.4
-      postcss: 8.5.15
-      rolldown: 1.0.3
+      picomatch: 4.0.5
+      postcss: 8.5.16
+      rolldown: 1.1.5
       tinyglobby: 0.2.17
     optionalDependencies:
       '@types/node': 24.11.0
@@ -4927,14 +4979,14 @@ snapshots:
       jiti: 2.6.1
       terser: 5.46.0
 
-  vitefu@1.1.2(vite@8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)):
+  vitefu@1.1.2(vite@8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)):
     optionalDependencies:
-      vite: 8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)
+      vite: 8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)
 
-  vitest@4.1.0(@types/node@24.11.0)(vite@8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)):
+  vitest@4.1.0(@types/node@24.11.0)(vite@8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)):
     dependencies:
       '@vitest/expect': 4.1.0
-      '@vitest/mocker': 4.1.0(vite@8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))
+      '@vitest/mocker': 4.1.0(vite@8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0))
       '@vitest/pretty-format': 4.1.0
       '@vitest/runner': 4.1.0
       '@vitest/snapshot': 4.1.0
@@ -4951,7 +5003,7 @@ snapshots:
       tinyexec: 1.2.4
       tinyglobby: 0.2.17
       tinyrainbow: 3.1.0
-      vite: 8.0.16(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)
+      vite: 8.1.4(@types/node@24.11.0)(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 24.11.0
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 5f07e0b4acca..dfdf65d52188 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -6,9 +6,10 @@ packages:
   - examples/resources
   - examples/file-associations
 
-onlyBuiltDependencies:
-  - esbuild
-  - workerd
+allowBuilds:
+  esbuild: true
+  sharp: true
+  workerd: true
 
 overrides:
   esbuild@>=0.27.3 <0.28.1: '>=0.28.1'
diff --git a/ports/muda/.changes/config.json b/ports/muda/.changes/config.json
new file mode 100644
index 000000000000..8234fc872d86
--- /dev/null
+++ b/ports/muda/.changes/config.json
@@ -0,0 +1,52 @@
+{
+  "gitSiteUrl": "https://www.github.com/tauri-apps/muda/",
+  "timeout": 3600000,
+  "pkgManagers": {
+    "rust": {
+      "version": true,
+      "getPublishedVersion": "cargo search ${ pkg.pkg } --limit 1 | sed -nE 's/^[^\"]*\"//; s/\".*//1p' -",
+      "prepublish": [
+        "sudo apt-get update",
+        "sudo apt-get install -y libgtk-4-dev libxdo-dev"
+      ],
+      "publish": [
+        {
+          "command": "cargo package --no-verify",
+          "dryRunCommand": true
+        },
+        {
+          "command": "echo '<details>\n<summary><em><h4>Cargo Publish</h4></em></summary>\n\n```'",
+          "dryRunCommand": true,
+          "pipe": true
+        },
+        {
+          "command": "cargo publish",
+          "dryRunCommand": "cargo publish --dry-run",
+          "pipe": true
+        },
+        {
+          "command": "echo '```\n\n</details>\n'",
+          "dryRunCommand": true,
+          "pipe": true
+        }
+      ],
+      "postpublish": [
+        "git tag ${ pkg.pkg }-v${ pkgFile.versionMajor } -f",
+        "git tag ${ pkg.pkg }-v${ pkgFile.versionMajor }.${ pkgFile.versionMinor } -f",
+        "git push --tags -f"
+      ]
+    }
+  },
+  "packages": {
+    "muda": {
+      "path": ".",
+      "manager": "rust",
+      "assets": [
+        {
+          "path": "${ pkg.path }/target/package/muda-${ pkgFile.version }.crate",
+          "name": "${ pkg.pkg }-${ pkgFile.version }.crate"
+        }
+      ]
+    }
+  }
+}
diff --git a/ports/muda/.changes/gtk4.md b/ports/muda/.changes/gtk4.md
new file mode 100644
index 000000000000..939a960d6a22
--- /dev/null
+++ b/ports/muda/.changes/gtk4.md
@@ -0,0 +1,5 @@
+---
+'muda': minor
+---
+
+Port the Linux backend from GTK3 to GTK4 (`gtk4` 0.11, `glib` 0.22). Every public method keeps its name and signature shape; the gtk types in returns and bounds follow the toolkit (`PopoverMenu`/`PopoverMenuBar`, `Widget` bounds), and `ContextMenu::gtk_context_menu` is retained on GTK4. Raises MSRV to 1.92.
diff --git a/ports/muda/.changes/readme.md b/ports/muda/.changes/readme.md
new file mode 100644
index 000000000000..315ca709f948
--- /dev/null
+++ b/ports/muda/.changes/readme.md
@@ -0,0 +1,29 @@
+# Changes
+
+##### via https://github.com/jbolda/covector
+
+As you create PRs and make changes that require a version bump, please add a new markdown file in this folder. You do not note the version _number_, but rather the type of bump that you expect: major, minor, or patch. The filename is not important, as long as it is a `.md`, but we recommend it represents the overall change for our sanity.
+
+When you select the version bump required, you do _not_ need to consider dependencies. Only note the package with the actual change, and any packages that depend on that package will be bumped automatically in the process.
+
+Use the following format:
+
+```md
+---
+'muda': patch
+---
+
+Change summary goes here
+```
+
+Summaries do not have a specific character limit, but are text only. These summaries are used within the (future implementation of) changelogs. They will give context to the change and also point back to the original PR if more details and context are needed.
+
+Changes will be designated as a `major`, `minor` or `patch` as further described in [semver](https://semver.org/).
+
+Given a version number MAJOR.MINOR.PATCH, increment the:
+
+- MAJOR version when you make incompatible API changes,
+- MINOR version when you add functionality in a backwards compatible manner, and
+- PATCH version when you make backwards compatible bug fixes.
+
+Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format, but will be discussed prior to usage (as extra steps will be necessary in consideration of merging and publishing).
diff --git a/ports/muda/.github/workflows/audit.yml b/ports/muda/.github/workflows/audit.yml
new file mode 100644
index 000000000000..564f6924847d
--- /dev/null
+++ b/ports/muda/.github/workflows/audit.yml
@@ -0,0 +1,37 @@
+# Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+# Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: audit
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *'
+  push:
+    branches:
+      - dev
+    paths:
+      - 'Cargo.lock'
+      - 'Cargo.toml'
+  pull_request:
+    paths:
+      - 'Cargo.lock'
+      - 'Cargo.toml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  audit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: rustsec/audit-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/ports/muda/.github/workflows/clippy-fmt.yml b/ports/muda/.github/workflows/clippy-fmt.yml
new file mode 100644
index 000000000000..bf6d302e3cea
--- /dev/null
+++ b/ports/muda/.github/workflows/clippy-fmt.yml
@@ -0,0 +1,52 @@
+# Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+# Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: clippy & fmt
+
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  clippy:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+
+    runs-on: ${{ matrix.platform }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: install system deps
+        if: matrix.platform == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libgtk-4-dev libxdo-dev libwebkit2gtk-4.1-dev
+
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
+
+      - run: cargo clippy --all-targets --all-features -- -D warnings
+
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
+
+      - run: cargo fmt --all -- --check
diff --git a/ports/muda/.github/workflows/covector-status.yml b/ports/muda/.github/workflows/covector-status.yml
new file mode 100644
index 000000000000..e05bc09900d4
--- /dev/null
+++ b/ports/muda/.github/workflows/covector-status.yml
@@ -0,0 +1,24 @@
+# Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+# Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: covector status
+on: [pull_request]
+
+jobs:
+  covector:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: covector status
+        uses: jbolda/covector/packages/action@covector-v0
+        id: covector
+        with:
+          command: 'status'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          comment: true
diff --git a/ports/muda/.github/workflows/covector-version-or-publish.yml b/ports/muda/.github/workflows/covector-version-or-publish.yml
new file mode 100644
index 000000000000..7b894667acc0
--- /dev/null
+++ b/ports/muda/.github/workflows/covector-version-or-publish.yml
@@ -0,0 +1,63 @@
+# Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+# Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: covector version or publish
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  version-or-publish:
+    runs-on: ubuntu-latest
+    timeout-minutes: 65
+    outputs:
+      change: ${{ steps.covector.outputs.change }}
+      commandRan: ${{ steps.covector.outputs.commandRan }}
+      successfulPublish: ${{ steps.covector.outputs.successfulPublish }}
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: cargo login
+        run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN  }}
+
+      - name: git config
+        run: |
+          git config --global user.name "${{ github.event.pusher.name }}"
+          git config --global user.email "${{ github.event.pusher.email }}"
+
+      - name: covector version or publish (publish when no change files present)
+        uses: jbolda/covector/packages/action@covector-v0
+        id: covector
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.ORG_NPM_TOKEN }}
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          command: 'version-or-publish'
+          createRelease: true
+          recognizeContributors: true
+
+      - name: Sync Cargo.lock
+        if: steps.covector.outputs.commandRan == 'version'
+        run: cargo tree --depth 0
+
+      - name: Create Pull Request With Versions Bumped
+        if: steps.covector.outputs.commandRan == 'version'
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # 8.1.1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          title: Apply Version Updates From Current Changes
+          commit-message: 'apply version updates'
+          labels: 'version updates'
+          branch: 'release'
+          body: ${{ steps.covector.outputs.change }}
+          sign-commits: true
diff --git a/ports/muda/.github/workflows/test.yml b/ports/muda/.github/workflows/test.yml
new file mode 100644
index 000000000000..8af1bcf921b4
--- /dev/null
+++ b/ports/muda/.github/workflows/test.yml
@@ -0,0 +1,53 @@
+# Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+# Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: test
+
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+
+env:
+  RUST_BACKTRACE: 1
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: ['windows-latest', 'macos-latest', 'ubuntu-latest']
+
+    runs-on: ${{ matrix.platform }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: install system deps
+        if: matrix.platform == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-4-dev libxdo-dev libwebkitgtk-6.0-dev
+
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: '1.92'
+      - run: cargo build
+
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo test
+
+      - uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: miri
+      - run: cargo +nightly miri test
diff --git a/ports/muda/.gitignore b/ports/muda/.gitignore
new file mode 100644
index 000000000000..9409f7d4ae5f
--- /dev/null
+++ b/ports/muda/.gitignore
@@ -0,0 +1,6 @@
+# Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+/target
+/.vscode
\ No newline at end of file
diff --git a/ports/muda/CHANGELOG.md b/ports/muda/CHANGELOG.md
new file mode 100644
index 000000000000..c7617b28686f
--- /dev/null
+++ b/ports/muda/CHANGELOG.md
@@ -0,0 +1,348 @@
+# Changelog
+
+## \[0.19.3]
+
+- [`73106f5`](https://www.github.com/tauri-apps/muda/commit/73106f5c548a08bfeea35a1627ea533726f5ba2e) ([#363](https://www.github.com/tauri-apps/muda/pull/363) by [@Legend-Master](https://www.github.com/tauri-apps/muda/../../Legend-Master)) On Windows, fixed a `dangling` pointer crash when `Menu::remove_for_hwnd` is called before dropping that `Menu` and then attached a new `Menu`
+
+## \[0.19.2]
+
+- [`597e1bc`](https://www.github.com/tauri-apps/muda/commit/597e1bcb300fce429643725810e63a95333c7046) ([#354](https://www.github.com/tauri-apps/muda/pull/354) by [@kohii](https://www.github.com/tauri-apps/muda/../../kohii)) On macOS, render `Key::Enter` accelerators in menus as ⏎ (Return) instead of ⌤ (numeric-keypad Enter). Activation behavior is unchanged.
+- [`51fde8e`](https://www.github.com/tauri-apps/muda/commit/51fde8e47e4c181fce892b2420d22f3d4e69bead) ([#357](https://www.github.com/tauri-apps/muda/pull/357) by [@mattico](https://www.github.com/tauri-apps/muda/../../mattico)) On Windows, fixed a bug that would truncate menubar items text to ~10 characters in dark-mode.
+
+## \[0.19.1]
+
+- [`b3d108e`](https://www.github.com/tauri-apps/muda/commit/b3d108ea60028acb3faf62d2ab975b4ded1d2e4e) ([#350](https://www.github.com/tauri-apps/muda/pull/350) by [@lucasfernog](https://www.github.com/tauri-apps/muda/../../lucasfernog)) Bump objc2 requirement to 0.6.1.
+
+## \[0.19.0]
+
+- [`521b5ff`](https://www.github.com/tauri-apps/muda/commit/521b5ffdac0dae0bc865434241c401bac483daed) ([#344](https://www.github.com/tauri-apps/muda/pull/344) by [@Legend-Master](https://www.github.com/tauri-apps/muda/../../Legend-Master)) Update png dependency version to 0.18.
+
+  This avoids duplicated dependencies in downstream crates.
+- [`521b5ff`](https://www.github.com/tauri-apps/muda/commit/521b5ffdac0dae0bc865434241c401bac483daed) ([#344](https://www.github.com/tauri-apps/muda/pull/344) by [@Legend-Master](https://www.github.com/tauri-apps/muda/../../Legend-Master)) Update rust version to 1.73.
+- [`820bd54`](https://www.github.com/tauri-apps/muda/commit/820bd54069b3dccba9b5c6e9c6aa7c00f0e6ffb6) ([#347](https://www.github.com/tauri-apps/muda/pull/347) by [@renovate](https://www.github.com/tauri-apps/muda/../../renovate)) Relaxed `windows-sys` dependency to `>=0.60, <=0.61` instead of `0.60`
+
+## \[0.18.0]
+
+- [`b324619`](https://www.github.com/tauri-apps/muda/commit/b324619069e6ebd7b259fa15400fca87586b5dc6) ([#339](https://www.github.com/tauri-apps/muda/pull/339) by [@LeonMatthes](https://www.github.com/tauri-apps/muda/../../LeonMatthes)) Add a new `KeyAccelerator` struct based on `keyboard_types::Key` alongside the existing `Accelerator` (based on `Code`).
+  This enables expressing logical key shortcuts like "Ctrl++", "Ctrl+€" that physical key codes cannot represent (see https://github.com/tauri-apps/muda/issues/333).
+- [`adb9f55`](https://www.github.com/tauri-apps/muda/commit/adb9f5565444f6240c3df25347a25bcfcdc442b2) ([#337](https://www.github.com/tauri-apps/muda/pull/337) by [@npwoods](https://www.github.com/tauri-apps/muda/../../npwoods)) On Windows, fixed a bug that would cause window subclasses to not be cleaned up when menus were dropped
+
+## \[0.17.2]
+
+- [`dca0836`](https://www.github.com/tauri-apps/muda/commit/dca083660d04209109ae854b9a9436a809daf409) ([#321](https://www.github.com/tauri-apps/muda/pull/321)) Fix padding unconditionally added to top-level submenus for icons even when there's no icon on Linux
+- [`372d367`](https://www.github.com/tauri-apps/muda/commit/372d3675e477d698297b0e10864932261d41c66e) ([#335](https://www.github.com/tauri-apps/muda/pull/335)) Fix `Submenu::set_as_help_menu_for_nsapp` and `Submenu::set_as_windows_menu_for_nsapp` not working and macOS wouldn't recognize and add default menu items to them.
+- [`43ba984`](https://www.github.com/tauri-apps/muda/commit/43ba984a89b6b36f2aa87be6206763d96f9c259b) ([#326](https://www.github.com/tauri-apps/muda/pull/326)) Add support for `PredefinedMenuItem::undo` and `PredefinedMenuItem::redo` on Windows.
+
+## \[0.17.1]
+
+- [`0ae81ad`](https://www.github.com/tauri-apps/muda/commit/0ae81ad8b22dd2622e302254ce434d14880087a3) ([#308](https://www.github.com/tauri-apps/muda/pull/308) by [@s00d](https://www.github.com/tauri-apps/muda/../../s00d)) On Windows, fix icon of `Submenu` not visible when added to a root `Menu`
+
+## \[0.17.0]
+
+- [`8e986af`](https://www.github.com/tauri-apps/muda/commit/8e986af3cea96a729413abc75c3702dec3990bd2) ([#289](https://www.github.com/tauri-apps/muda/pull/289) by [@amrbashir](https://www.github.com/tauri-apps/muda/../../amrbashir)) Add helper methods on `ContextMenu` trait to convert it back to a concrete type:
+
+  - `ContextMenu::as_menu`
+  - `ContextMenu::as_menu_unchecked`
+  - `ContextMenu::as_submenu`
+  - `ContextMenu::as_submenu_unchecked`
+- [`8efa5a2`](https://www.github.com/tauri-apps/muda/commit/8efa5a201b6acad72dee4c0c097a4bbda172b353) ([#300](https://www.github.com/tauri-apps/muda/pull/300) by [@dgerhardt](https://www.github.com/tauri-apps/muda/../../dgerhardt)) On Linux, fix `&&` resulting in `&&` when it should be just `&`. Also fix `_` not visible and actually adding a mnemonic. This makes the behavior on Linux match the behavior on Windows.
+- [`e19a6eb`](https://www.github.com/tauri-apps/muda/commit/e19a6eb7417e722ee73fbae8bd97becbf5600142) ([#283](https://www.github.com/tauri-apps/muda/pull/283) by [@ogoffart](https://www.github.com/tauri-apps/muda/../../ogoffart)) Make gtk an optional feature (enabled by default)
+- [`e37d99b`](https://www.github.com/tauri-apps/muda/commit/e37d99b6de01dde0e3206a0f358cdc10a2aa3ddb) ([#277](https://www.github.com/tauri-apps/muda/pull/277) by [@s00d](https://www.github.com/tauri-apps/muda/../../s00d)) Add support for icons on `Submenu` so we added:
+
+  - `Submenu::set_icon`
+  - `Submenu::set_native_icon`
+  - `SubmenuBuilder::icon`
+  - `SubmenuBuilder::native_icon`
+
+## \[0.16.1]
+
+- [`6b3e2e5`](https://www.github.com/tauri-apps/muda/commit/6b3e2e51bb501ffbdf4526e59e4dedcb37c7b29b) ([#278](https://www.github.com/tauri-apps/muda/pull/278) by [@Legend-Master](https://www.github.com/tauri-apps/muda/../../Legend-Master)) Fix the buffer overflow when calling `text` on Windows
+
+## \[0.16.0]
+
+- [`cf9dcfa`](https://www.github.com/tauri-apps/muda/commit/cf9dcfafd000336db4e9f239ed5581539d9168f6) ([#236](https://www.github.com/tauri-apps/muda/pull/236)) Return `bool` in `ContextMenu::show_context_menu_for_hwnd`, `ContextMenu::show_context_menu_for_nsview` and `ContextMenu::show_context_menu_for_gtk_window` to indicate why the context menu was closed.
+- [`99ec648`](https://www.github.com/tauri-apps/muda/commit/99ec648de4dfd3b864540b1e30279c2c7afc1abd) ([#244](https://www.github.com/tauri-apps/muda/pull/244)) Add `Accelerator::modifiers` and `Accelerator::key` getter methods.
+- [`372f8a1`](https://www.github.com/tauri-apps/muda/commit/372f8a1d095edf0c88f3708777484371202ee91c) ([#269](https://www.github.com/tauri-apps/muda/pull/269)) Updated objc2 to 0.6
+- [`e6b68f9`](https://www.github.com/tauri-apps/muda/commit/e6b68f9c4da1d47e612569a60a9da9199b324d81) Change internal `mut static` to use `thread_local!` and `Cell` instead.
+
+## \[0.15.3]
+
+- [`11a1ef8`](https://www.github.com/tauri-apps/muda/commit/11a1ef84fa85cbe2f0bfb0c3a986d7a36d84288f) ([#241](https://www.github.com/tauri-apps/muda/pull/241) by [@amrbashir](https://www.github.com/tauri-apps/muda/../../amrbashir)) On Windows, fix changing state of menu items inside a `muda::Menu` not immediately reflected on the window menu bar.
+
+## \[0.15.2]
+
+- [`3b58a2e`](https://www.github.com/tauri-apps/muda/commit/3b58a2ef973a7fb46ce6b4cfd34942d990929510) ([#237](https://www.github.com/tauri-apps/muda/pull/237) by [@amrbashir](https://www.github.com/tauri-apps/muda/../../amrbashir)) Fix `PredefinedMenuItem::about` sending events where it shouldn't.
+
+## \[0.15.1]
+
+- [`8bf315e`](https://www.github.com/tauri-apps/muda/commit/8bf315ea31f791e44d3c67f5fdb0ac4c47e16aaf) ([#229](https://www.github.com/tauri-apps/muda/pull/229) by [@amrbashir](https://www.github.com/tauri-apps/muda/../../amrbashir)) On Linux, fix `IconMenuItem` overlapping neighbouring items when added to a `Menu`.
+
+## \[0.15.0]
+
+- [`40d06c5`](https://www.github.com/tauri-apps/muda/commit/40d06c5c9712ab4e12a8bc3a9124e5975df595e3) ([#226](https://www.github.com/tauri-apps/muda/pull/226) by [@amrbashir](https://www.github.com/tauri-apps/muda/../../amrbashir)) **Breaking change** Renamed the `acccelerator` method (which has an extra `c`) on `MenuItemBuilder`, `CheckMenuItemBuilder`, and `IconMenuItemBuilder` to `accelerator`.
+- [`0d368bb`](https://www.github.com/tauri-apps/muda/commit/0d368bb32728a104f0d6ad100193b0212495dd64) ([#220](https://www.github.com/tauri-apps/muda/pull/220) by [@madsmtm](https://www.github.com/tauri-apps/muda/../../madsmtm)) **Breaking Change** Changed the type of the pointer passed in `show_context_menu_for_nsview` to `c_void`, and make the method `unsafe`.
+- [`63c9f28`](https://www.github.com/tauri-apps/muda/commit/63c9f2873c7d2f6c1b477e0d5c7f79ccda90ea85) ([#224](https://www.github.com/tauri-apps/muda/pull/224) by [@Legend-Master](https://www.github.com/tauri-apps/muda/../../Legend-Master)) Fix `set_theme_for_hwnd` always resulting in dark on Windows, and doesn't refresh until losing and regaining focus
+- [`f781c0e`](https://www.github.com/tauri-apps/muda/commit/f781c0edd0af7ab166e10f816978ffed2761376b) ([#227](https://www.github.com/tauri-apps/muda/pull/227) by [@amrbashir](https://www.github.com/tauri-apps/muda/../../amrbashir)) **Breaking change** Marked a few methods with `unsafe` to better represent the safety guarantees:
+
+  - `ContextMenu::show_context_menu_for_hwnd`
+  - `ContextMenu::attach_menu_subclass_for_hwnd`
+  - `ContextMenu::detach_menu_subclass_from_hwnd`
+  - `Menu::init_for_hwnd`
+  - `Menu::init_for_hwnd_with_theme`
+  - `Menu::set_theme_for_hwnd`
+  - `Menu::remove_for_hwnd`
+  - `Menu::hide_for_hwnd`
+  - `Menu::show_for_hwnd`
+  - `Menu::is_visible_on_hwnd`
+- [`5c8971a`](https://www.github.com/tauri-apps/muda/commit/5c8971a7c28a48669605236ddc097460ffd3b32f) ([#221](https://www.github.com/tauri-apps/muda/pull/221) by [@madsmtm](https://www.github.com/tauri-apps/muda/../../madsmtm)) Use `objc2` internally, leading to much better memory safety. The crate will panic now if used from a thread that is not the main thread.
+
+## \[0.14.1]
+
+- [`07ca638`](https://www.github.com/tauri-apps/muda/commit/07ca6382bc1ae08984c21034b8033cee3eb147c7) ([#213](https://www.github.com/tauri-apps/muda/pull/213)) Fix handling the separator of `CARGO_PKG_AUTHORS` environment variable value in `from_cargo_metadata` macro.
+- [`bb40d8c`](https://www.github.com/tauri-apps/muda/commit/bb40d8cec3187eccb3bce868befe1d0bf0dbf93c) On Windows, fix crash when showing a context menu but dropping the Menu before the context menu is closed.
+
+## \[0.14.0]
+
+- [`11d8b7a`](https://www.github.com/tauri-apps/muda/commit/11d8b7a6fefa2b47b5bd0a113c0f33f0ccdf6647) ([#208](https://www.github.com/tauri-apps/muda/pull/208) by [@amrbashir](https://www.github.com/tauri-apps/muda/../../amrbashir)) Added `about_metadata` module and `about_metadata::from_cargo_metadata` macro.
+- [`11d8b7a`](https://www.github.com/tauri-apps/muda/commit/11d8b7a6fefa2b47b5bd0a113c0f33f0ccdf6647) ([#208](https://www.github.com/tauri-apps/muda/pull/208) by [@amrbashir](https://www.github.com/tauri-apps/muda/../../amrbashir)) **Breaking Change** Removed `AboutMetadata::from_cargo_metadata` and `AboutMetadataBuilder::with_cargo_metadata` which had incorrect implementation, use the new `about_metadata::from_cargo_metadata` macro instead.
+- [`32bff56`](https://www.github.com/tauri-apps/muda/commit/32bff5610f355de86bfff55605ab3383d40b7d42) ([#210](https://www.github.com/tauri-apps/muda/pull/210) by [@amrbashir](https://www.github.com/tauri-apps/muda/../../amrbashir)) Update `window-sys` crate to `0.59`
+
+## \[0.13.5]
+
+- [`20ea54b`](https://www.github.com/tauri-apps/muda/commit/20ea54b69844b53f09e40e6399bb4ea26af58766)([#200](https://www.github.com/tauri-apps/muda/pull/200)) On macOS, close tray menu before removing it to prevent user click on a released menu item resulting in a crash.
+
+## \[0.13.4]
+
+- [`e758002`](https://www.github.com/tauri-apps/muda/commit/e758002bffe95f2d6f2d106967063ca87eb2f253)([#194](https://www.github.com/tauri-apps/muda/pull/194)) On Windows, fix menubar drawing when using a fixed dark theme while Windows itself in Light theme.
+
+## \[0.13.3]
+
+- [`e758002`](https://www.github.com/tauri-apps/muda/commit/e758002bffe95f2d6f2d106967063ca87eb2f253)([#194](https://www.github.com/tauri-apps/muda/pull/194)) On Windows, add `Menu::init_for_hwnd_with_theme` and `Menu::set_theme_for_hwnd` to control the window menu bar theme.
+
+## \[0.13.2]
+
+- [`1dc9d3f`](https://www.github.com/tauri-apps/muda/commit/1dc9d3f193e698b4a688414cc094ff360cb072a4)([#190](https://www.github.com/tauri-apps/muda/pull/190)) On Linux, fix context menu closing immediately when right click is released.
+
+## \[0.13.1]
+
+- [`2edfbf1`](https://www.github.com/tauri-apps/muda/commit/2edfbf1a3a33199eb963532118d83a40f4d99af2)([#176](https://www.github.com/tauri-apps/muda/pull/176)) On macOS, fix a crash when removing a menu item.
+
+## \[0.13.0]
+
+- [`90926d4`](https://www.github.com/tauri-apps/muda/commit/90926d43f7817ef7061aa8baa8072983a91d6a81)([#174](https://www.github.com/tauri-apps/muda/pull/174)) Moved the following items into `dpi` module which is just an export of `dpi` crate:
+
+  - `Pixel`
+  - `validate_scale_factor`
+  - `LogicalPosition`
+  - `PhysicalPosition`
+  - `Position`
+
+## \[0.12.2]
+
+- [`8960f0d`](https://www.github.com/tauri-apps/muda/commit/8960f0ddb52b74f4bd9d5fed5e91b62c5db09c77)([#171](https://www.github.com/tauri-apps/muda/pull/171)) On Windows, fix using multiple context menus resulted in receiving events only for the last used one.
+
+## \[0.12.1]
+
+- [`cbb9fc0`](https://www.github.com/tauri-apps/muda/commit/cbb9fc0d7b98c362dfbdc09122fb9d0b3b7edabb)([#166](https://www.github.com/tauri-apps/muda/pull/166)) On Windows, fix events not emitted for other menus after using a menu as a context menu.
+- [`a9937ef`](https://www.github.com/tauri-apps/muda/commit/a9937ef98144b3feaf8a16ae95e0e8c55583bd79)([#164](https://www.github.com/tauri-apps/muda/pull/164)) On Windows, fix menubar removed from window when another menu that was used as a conetxt menu is dropped.
+
+## \[0.12.0]
+
+- [`2d7828f`](https://www.github.com/tauri-apps/muda/commit/2d7828fdd9d216d9a245bad7eae8f096b42948c0)([#157](https://www.github.com/tauri-apps/muda/pull/157)) Refactored the errors when parsing accelerator from string:
+
+  - Added `AcceleratorParseError` error enum.
+  - Removed `Error::UnrecognizedAcceleratorCode` enum variant
+  - Removed `Error::EmptyAcceleratorToken` enum variant
+  - Removed `Error::UnexpectedAcceleratorFormat` enum variant
+  - Changed `Error::AcceleratorParseError` inner value from `String` to the newly added `AcceleratorParseError` enum.
+- [`2d7828f`](https://www.github.com/tauri-apps/muda/commit/2d7828fdd9d216d9a245bad7eae8f096b42948c0)([#157](https://www.github.com/tauri-apps/muda/pull/157)) Avoid panicking when parsing an invalid `Accelerator` from a string such as `SHIFT+SHIFT` and return an error instead.
+
+## \[0.11.5]
+
+- [`f64a62f`](https://www.github.com/tauri-apps/muda/commit/f64a62fc89d39e9fe6f3951250addf620ba8ba29)([#153](https://www.github.com/tauri-apps/muda/pull/153)) On Linux, fix a regression where menubar is not added as the first child when using a `gtk::Box` as the container.
+
+## \[0.11.4]
+
+- [`a7e61fb`](https://www.github.com/tauri-apps/muda/commit/a7e61fb939866897d0ed3d32b78a3a7cba8689ca)([#149](https://www.github.com/tauri-apps/muda/pull/149)) On macOS, fix a crash when appending separators.
+
+## \[0.11.3]
+
+- [`20c45a4`](https://www.github.com/tauri-apps/muda/commit/20c45a4ccc24914f5ad7533300e0d1e6d7d91384)([#147](https://www.github.com/tauri-apps/muda/pull/147)) On macOS, fixed a panic when releasing separator menu item.
+
+## \[0.11.2]
+
+- [`afd3e2e`](https://www.github.com/tauri-apps/muda/commit/afd3e2ecd4b40def7c0f458cd1465723392c1be1)([#143](https://www.github.com/tauri-apps/muda/pull/143)) Fixes menu item's `enabled` state not applied for submenus on macOS.
+
+## \[0.11.1]
+
+- [`07b188f`](https://www.github.com/tauri-apps/muda/commit/07b188f386522f42f47670d6de30afa4da1a24a8)([#141](https://www.github.com/tauri-apps/muda/pull/141)) Update `windows-sys` crate to `0.52`
+
+## \[0.11.0]
+
+- [`ae316bf`](https://www.github.com/tauri-apps/muda/commit/ae316bf2dd3dbefce5f866b98165b0336bb3010e)([#139](https://www.github.com/tauri-apps/muda/pull/139)) Changed `ContextMenu::show_context_menu_for_gtk_window` to take `gtk::Window` instead of `gtk::ApplicationWindow` and relaxed generic gtk constraints on the following methods:
+
+  - `MenuBar::init_for_gtk_window`
+  - `MenuBar::remove_for_gtk_window`
+  - `MenuBar::hide_for_gtk_window`
+  - `MenuBar::show_for_gtk_window`
+  - `MenuBar::is_visible_on_gtk_window`
+  - `MenuBar::gtk_menubar_for_gtk_window`
+
+## \[0.10.0]
+
+- [`8d95612`](https://www.github.com/tauri-apps/muda/commit/8d95612c27374637895ac5d28f553143501adeff)([#133](https://www.github.com/tauri-apps/muda/pull/133)) Upgrade `gtk` to 0.18 and bump MSRV to 1.70.0.
+
+## \[0.9.4]
+
+- [`3672a0c`](https://www.github.com/tauri-apps/muda/commit/3672a0c663bb711528d18d1f4abee949f1ca26f2)([#130](https://www.github.com/tauri-apps/muda/pull/130)) Add `PredefinedMenuItem::bring_all_to_front` for 'Bring All to Front' menu item on macOS.
+- [`e34040e`](https://www.github.com/tauri-apps/muda/commit/e34040e75a97e5b17d31c6d0f6df007cce5ddfc6)([#126](https://www.github.com/tauri-apps/muda/pull/126)) On Windows, draw over the white line under the menubar in dark mode.
+
+## \[0.9.3]
+
+- [`bdd0c9a`](https://www.github.com/tauri-apps/muda/commit/bdd0c9aa0d7d4158535796a20a1c1597799840a4)([#122](https://www.github.com/tauri-apps/muda/pull/122)) On macOS, fix menu crash due to a double freeing the underlying NsMenu.
+- [`f7e3030`](https://www.github.com/tauri-apps/muda/commit/f7e3030f3438f92e92dfa724c5f8a6864387de0f)([#125](https://www.github.com/tauri-apps/muda/pull/125)) On Windows, redraw the menubar when adding a new menu item or a submenu.
+
+## \[0.9.2]
+
+- [`45345ad`](https://www.github.com/tauri-apps/muda/commit/45345ad631187190799bdaea6f9f0d0d7e245d5e) On macOS, fixed autorelease from separator twice.
+
+## \[0.9.1]
+
+- [`c1fbde7`](https://www.github.com/tauri-apps/muda/commit/c1fbde72a83fdef579436f2fc7a55de77fa907c2)([#116](https://www.github.com/tauri-apps/muda/pull/116)) Added `AboutMetadata::from_cargo_metadata` and `AboutMetadataBuilder::with_cargo_metadata` to build the application metadata from Cargo package metadata.
+
+## \[0.9.0]
+
+- [`02e537e`](https://www.github.com/tauri-apps/muda/commit/02e537ea06e74dd08c3bdeaf350d8c71e8e04f19)([#112](https://www.github.com/tauri-apps/muda/pull/112)) Added `into_id` method to `MenuItem`, `CheckMenuItem`, `PredefinedMenuItem`, `Submenu`, `MenuItemKind` and `IsMenuItem` trait. It moves the menu item into its id.
+- [`622f30b`](https://www.github.com/tauri-apps/muda/commit/622f30b838a5dee879715ca5da3ff84bcaa48685) Update `keyboard-types` to `0.7`
+- [`bce7540`](https://www.github.com/tauri-apps/muda/commit/bce7540bba0d26ae4e55b3e2d164f1579b58743a)([#113](https://www.github.com/tauri-apps/muda/pull/113)) Add `MenuItemKind::id` convenient method to get access to the inner kind id.
+
+## \[0.8.7]
+
+- [`8d832c0`](https://www.github.com/tauri-apps/muda/commit/8d832c06f4e810278c0da129063231f880c3f918) Wrapped the `id` field of the `Menu` struct in an `Rc` to be consistent with other menu structs and make it cheaper to clone.
+
+## \[0.8.6]
+
+- [`4701bb8`](https://www.github.com/tauri-apps/muda/commit/4701bb836e9d5f5c020c7807616d68bd049679a9)([#105](https://www.github.com/tauri-apps/muda/pull/105)) On Windows, fix menu items inside a context menu not firing events if the context menu was used on a Window that doesn't have a menu bar.
+
+## \[0.8.5]
+
+- [`e046132`](https://www.github.com/tauri-apps/muda/commit/e046132dfba47ab75905ff28c354f83b5b27703d) Changed `IconMenuItem::set_native_icon` to take `&self` instead of `&mut self`.
+
+## \[0.8.4]
+
+- [`47d1808`](https://www.github.com/tauri-apps/muda/commit/47d1808090dc8b064417d5aae192b924fdafaf58) Derive `serde` for more types.
+
+## \[0.8.3]
+
+- [`33168fa`](https://www.github.com/tauri-apps/muda/commit/33168fa0a01e2773d9da4628afd4b147bc603f4d)([#98](https://www.github.com/tauri-apps/muda/pull/98)) On Windows, draw a dark menu bar if the Window supports and has dark-mode enabled.
+- [`1a527e8`](https://www.github.com/tauri-apps/muda/commit/1a527e87086cf8d93e02405b87ca97992c08ad04)([#100](https://www.github.com/tauri-apps/muda/pull/100)) Add `PartialEq<&str> for &MenuId` and `PartialEq<String> for &MenuId` implementations. Also add a blanket `From<T> for MenuId` where `T: ToString` implementation.
+
+## \[0.8.2]
+
+- [`829051a`](https://www.github.com/tauri-apps/muda/commit/829051a30a1fef1e83b9bc0d4c10ff9874589f65) Dereference `&String` and `&&str` in `PartialEq` for `MenuId` type
+
+## \[0.8.1]
+
+- [`32be0c5`](https://www.github.com/tauri-apps/muda/commit/32be0c58841252db4f07c273c894a01f1fa414ff)([#94](https://www.github.com/tauri-apps/muda/pull/94)) On Windows, reduce some unneccassry string cloning.
+- [`32be0c5`](https://www.github.com/tauri-apps/muda/commit/32be0c58841252db4f07c273c894a01f1fa414ff)([#94](https://www.github.com/tauri-apps/muda/pull/94)) Add `MenuId::new` convenience method.
+
+## \[0.8.0]
+
+- [`662e17d`](https://www.github.com/tauri-apps/muda/commit/662e17d0ec75a746a330390ad3818e35bd2be234)([#92](https://www.github.com/tauri-apps/muda/pull/92)) Add `Drop` implementation for the inner types to release memory and OS resources.
+- [`7ca4b11`](https://www.github.com/tauri-apps/muda/commit/7ca4b115646a0ec1c19547267959625b6842b288)([#89](https://www.github.com/tauri-apps/muda/pull/89)) **Breaking Change:** On Linux, `Menu::inti_for_gtk_window` has been changed to require the second parameter to extend `gtk::Box`. This ensures that the menu bar is added at the beginning of the box instead of at the bottom.
+- [`bb92b56`](https://www.github.com/tauri-apps/muda/commit/bb92b5667eb43d39a162b86f0b779d06e36eca52) On macOS, changed `Submenu::set_windows_menu_for_nsapp` and `Submenu::set_help_menu_for_nsapp` to `Submenu::set_as_windows_menu_for_nsapp` and `Submenu::set_as_help_menu_for_nsapp`
+- [`874f345`](https://www.github.com/tauri-apps/muda/commit/874f345f3c719d70065fceeabebed6224d857813) Add `MenuId` struct an changed all `.id()` methods to return `MenuId` instead of a u32.
+- [`043026c`](https://www.github.com/tauri-apps/muda/commit/043026c30d46f81a0fc2975d7e6bea10421ceb47)([#93](https://www.github.com/tauri-apps/muda/pull/93)) Add `Menu/Submenu::remove_at` to remove an item at specified index.
+- [`662e17d`](https://www.github.com/tauri-apps/muda/commit/662e17d0ec75a746a330390ad3818e35bd2be234)([#92](https://www.github.com/tauri-apps/muda/pull/92)) On Windows, fix `.set_text()` sometimes adding gebberish characters after multiple calls.
+
+## \[0.7.3]
+
+- [`22956ec`](https://www.github.com/tauri-apps/muda/commit/22956ec724673d21e1d6a675c536eff060737e02)([#87](https://www.github.com/tauri-apps/muda/pull/87)) Fix `remove_for_nsapp` not working.
+
+## \[0.7.2]
+
+- [`0bad3ac`](https://www.github.com/tauri-apps/muda/commit/0bad3aca9608df04656757064fe85d757ff17513)([#84](https://www.github.com/tauri-apps/muda/pull/84)) Manually retain/release NSMenu reference.
+
+## \[0.7.1]
+
+- [`7a3bc55`](https://www.github.com/tauri-apps/muda/commit/7a3bc5505f60fa16a34aac4fb209dbb4968db9bf)([#81](https://www.github.com/tauri-apps/muda/pull/81)) On Windows, fix `ContextMenu::detach_menu_subclass_from_hwnd` crashing and terminating the thread.
+
+## \[0.7.0]
+
+- [`ee30bf8`](https://www.github.com/tauri-apps/muda/commit/ee30bf8d29895c35d7cda0d67d9d64b71910380a)([#73](https://www.github.com/tauri-apps/muda/pull/73)) Added the `builders` which contains convenient builder types, like `AboutMetadataBuilder`, `MenuItemBuilder`, `SubmenuBuilder` ...etc.
+- [`c7ec320`](https://www.github.com/tauri-apps/muda/commit/c7ec3207388947b5572847e589eb494d0222373d)([#78](https://www.github.com/tauri-apps/muda/pull/78)) **Breaking Change**: `ContextMenu::show_context_menu_for_hwnd`, `ContextMenu::show_context_menu_for_gtk_window` and `ContextMenu::show_context_menu_for_nsview` has been changed to take an optional `Into<Position>` type instead of `x` and `y`. if `None` is provided, it will use the current cursor position.
+- [`98701d0`](https://www.github.com/tauri-apps/muda/commit/98701d0b3277dcb63ee50a8a11f5b008ed432307)([#75](https://www.github.com/tauri-apps/muda/pull/75)) **Breaking Change**: Changed `Menu::init_for_gtk_window` to accept a second argument for a container to which the menu bar should be added, if `None` was provided, it will add it to the window directly. The method will no longer create a `gtk::Box` and append it to the window, instead you should add the box to the window yourself, then pass a reference to it to the method so it can be used as the container for the menu bar.
+- [`20c05ce`](https://www.github.com/tauri-apps/muda/commit/20c05ceae677338b2b9dbf247a86d4049280cc90)([#79](https://www.github.com/tauri-apps/muda/pull/79)) **Breaking Change**: Removed `MenuItemType` enum and replaced with `MenuItemKind` enum. `Menu::items` and `Submenu::items` methods will now return `Vec<MenuItemKind>` instead of `Vec<Box<dyn MenuItemExt>>`
+- [`0000e56`](https://www.github.com/tauri-apps/muda/commit/0000e569746e7cb630a1453a401bf8f6b0568e9d)([#71](https://www.github.com/tauri-apps/muda/pull/71)) **Breaking Change**: Changed `MenuItemExt` trait name to `IsMenuItem`
+- [`ee30bf8`](https://www.github.com/tauri-apps/muda/commit/ee30bf8d29895c35d7cda0d67d9d64b71910380a)([#73](https://www.github.com/tauri-apps/muda/pull/73)) Impl `TryFrom<&str>` and `TryFrom<String>` for `Accelerator`.
+
+## \[0.6.0]
+
+- [`ac14222`](https://www.github.com/tauri-apps/muda/commit/ac142229340c8ded63316fbc1cd1c11bf27e0890)([#69](https://www.github.com/tauri-apps/muda/pull/69)) Add `common-controls-v6` feature flag, disabled by default, which could be used to enable usage of `TaskDialogIndirect` API from `ComCtl32.dll` v6 on Windows for The predefined `About` menu item.
+- [`7af4477`](https://www.github.com/tauri-apps/muda/commit/7af44778962de62bf6d8b05aab08bb2e689295fe)([#67](https://www.github.com/tauri-apps/muda/pull/67)) Add `libxdo` feature flag, enabled by default, to control whether to link `libxdo` on Linux or not.
+- [`fabbbac`](https://www.github.com/tauri-apps/muda/commit/fabbbacb4b8d77c84cd318a21df1951063e7ea14)([#66](https://www.github.com/tauri-apps/muda/pull/66)) Add support for `AboutMetadata` on macOS
+
+## \[0.5.0]
+
+- Add `(MenuItem|CheckMenuItem|IconMenuItem)::set_accelerator` to change or disable the accelerator after creation.
+  - [47ba0b4](https://www.github.com/tauri-apps/muda/commit/47ba0b47ed28a93428c253e8bac397e0b9cb8dec) feat: add `set_accelerator` ([#64](https://www.github.com/tauri-apps/muda/pull/64)) on 2023-05-04
+
+## \[0.4.5]
+
+- On Windows, fix panic when click a menu item while the `PredefinedMenuItem::about` dialog is open.
+  - [f3883ee](https://www.github.com/tauri-apps/muda/commit/f3883ee2d4d8773e6b77e36700edb4ca7cb0988e) fix(windows): run the about dialog in its own thread, closes [#57](https://www.github.com/tauri-apps/muda/pull/57) ([#60](https://www.github.com/tauri-apps/muda/pull/60)) on 2023-03-27
+- On Windows, Fix a panic when adding `CheckMenuItem` to a `Menu`.
+  - [059fceb](https://www.github.com/tauri-apps/muda/commit/059fceb13007760d9e41b65068c91442eda64626) fix(windows): downcast check menu item correctly ([#58](https://www.github.com/tauri-apps/muda/pull/58)) on 2023-03-27
+
+## \[0.4.4]
+
+- On Windows, fix `MenuEvent` not triggered for `IconMenuItem`.
+  - [88d3520](https://www.github.com/tauri-apps/muda/commit/88d352033ba571126a11bc681ee3b346b7579916) fix(Windows): dispatch menu event for icon menu item ([#53](https://www.github.com/tauri-apps/muda/pull/53)) on 2023-03-06
+- On Windows, The `Close` predefined menu item will send `WM_CLOSE` to the window instead of calling `DestroyWindow` to let the developer catch this event and decide whether to close the window or not.
+  - [f322ad4](https://www.github.com/tauri-apps/muda/commit/f322ad454dcd206e2802bb7c65f0a55616a8d002) fix(Windows): send `WM_CLOSE` instead of `DestroyWindow` ([#55](https://www.github.com/tauri-apps/muda/pull/55)) on 2023-03-06
+
+## \[0.4.3]
+
+- Implement `PredefinedMenuItemm::maximize` and `PredefinedMenuItemm::hide` on Windows.
+  - [d2bd85b](https://www.github.com/tauri-apps/muda/commit/d2bd85bf7ec4b0bc974d487adaacb6a99b82fa91) docs: add docs for `PredefinedMenuItem` ([#51](https://www.github.com/tauri-apps/muda/pull/51)) on 2023-02-28
+- Add docs for predefined menu items
+  - [d2bd85b](https://www.github.com/tauri-apps/muda/commit/d2bd85bf7ec4b0bc974d487adaacb6a99b82fa91) docs: add docs for `PredefinedMenuItem` ([#51](https://www.github.com/tauri-apps/muda/pull/51)) on 2023-02-28
+
+## \[0.4.2]
+
+- Fix panic when updating a `CheckMenuItem` right after it was clicked.
+  - [923af09](https://www.github.com/tauri-apps/muda/commit/923af09abfe885995ae0a4ef30f8a304cc4c20d2) fix(linux): fix multiple borrow panic ([#48](https://www.github.com/tauri-apps/muda/pull/48)) on 2023-02-14
+
+## \[0.4.1]
+
+- Update docs
+  - [4b2ebc2](https://www.github.com/tauri-apps/muda/commit/4b2ebc247cfef64bcaab2ab619e30b65db37a72f) docs: update docs on 2023-02-08
+
+## \[0.4.0]
+
+- Bump gtk version: 0.15 -> 0.16
+  - [fb3d0aa](https://www.github.com/tauri-apps/muda/commit/fb3d0aa303a0ee4ffff6d3de97cc363f1ef6d34b) chore(deps): bump gtk version 0.15 -> 0.16 ([#38](https://www.github.com/tauri-apps/muda/pull/38)) on 2023-01-26
+
+## \[0.3.0]
+
+- Add `MenuEvent::set_event_handler` to set a handler for new menu events.
+  - [f871c68](https://www.github.com/tauri-apps/muda/commit/f871c68e81aa10f9541c386615a05a2e455e5a82) refactor: allow changing the menu event sender ([#35](https://www.github.com/tauri-apps/muda/pull/35)) on 2023-01-03
+- **Breaking change** Remove `menu_event_receiver` function, use `MenuEvent::receiver` instead.
+  - [f871c68](https://www.github.com/tauri-apps/muda/commit/f871c68e81aa10f9541c386615a05a2e455e5a82) refactor: allow changing the menu event sender ([#35](https://www.github.com/tauri-apps/muda/pull/35)) on 2023-01-03
+
+## \[0.2.0]
+
+- Add `IconMenuItem`
+  - [7fc1b02](https://www.github.com/tauri-apps/muda/commit/7fc1b02cac65f2524220cb79263643505e286863) feat: add `IconMenuItem`, closes [#30](https://www.github.com/tauri-apps/muda/pull/30) ([#32](https://www.github.com/tauri-apps/muda/pull/32)) on 2022-12-30
+
+## \[0.1.1]
+
+- Derive `Copy` for `Accelerator` type.
+  - [e80c113](https://www.github.com/tauri-apps/muda/commit/e80c113d8c8db8137f97829b071b443772d4805c) feat: derive `Copy` for `Accelerator` on 2022-12-12
+- Fix parsing one letter string as valid accelerator without modifiers.
+  - [0173987](https://www.github.com/tauri-apps/muda/commit/0173987ed5da605ddc20e49fce57ba884ed0d5f4) fix: parse one letter string to valid accelerator ([#28](https://www.github.com/tauri-apps/muda/pull/28)) on 2022-12-20
+
+## \[0.1.0]
+
+- Initial Release.
+  - [0309d10](https://www.github.com/tauri-apps/muda/commit/0309d101b16663ce67b518f8aa1d2c4af0de6dee) chore: prepare for first release on 2022-12-05
diff --git a/ports/muda/Cargo.lock b/ports/muda/Cargo.lock
new file mode 100644
index 000000000000..bca779a0cb68
--- /dev/null
+++ b/ports/muda/Cargo.lock
@@ -0,0 +1,3927 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "ab_glyph"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2"
+dependencies = [
+ "ab_glyph_rasterizer",
+ "owned_ttf_parser",
+]
+
+[[package]]
+name = "ab_glyph_rasterizer"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "getrandom 0.3.4",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "android-activity"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd"
+dependencies = [
+ "android-properties",
+ "bitflags 2.13.0",
+ "cc",
+ "jni 0.22.4",
+ "libc",
+ "log",
+ "ndk",
+ "ndk-context",
+ "ndk-sys",
+ "num_enum",
+ "thiserror 2.0.18",
+]
+
+[[package]]
+name = "android-properties"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
+
+[[package]]
+name = "arc-swap"
+version = "1.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
+
+[[package]]
+name = "as-raw-xcb-connection"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
+
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block2"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
+dependencies = [
+ "objc2 0.5.2",
+]
+
+[[package]]
+name = "block2"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
+dependencies = [
+ "objc2 0.6.4",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
+
+[[package]]
+name = "bytemuck"
+version = "1.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
+
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
+[[package]]
+name = "bytes"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593"
+
+[[package]]
+name = "cairo-rs"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cc8d9aa793480744cd9a0524fef1a2e197d9eaa0f739cde19d16aba530dcb95"
+dependencies = [
+ "bitflags 2.13.0",
+ "cairo-sys-rs",
+ "glib",
+ "libc",
+]
+
+[[package]]
+name = "cairo-sys-rs"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8b4985713047f5faee02b8db6a6ef32bbb50269ff53c1aee716d1d195b76d54"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "calloop"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
+dependencies = [
+ "bitflags 2.13.0",
+ "log",
+ "polling",
+ "rustix 0.38.44",
+ "slab",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "calloop-wayland-source"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
+dependencies = [
+ "calloop",
+ "rustix 0.38.44",
+ "wayland-backend",
+ "wayland-client",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996"
+dependencies = [
+ "find-msvc-tools",
+ "jobserver",
+ "libc",
+ "shlex",
+]
+
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
+[[package]]
+name = "cfg-expr"
+version = "0.20.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb693542bcafa528e198be0ebd9d3632ca5b7c93dbe7237460e199910835997c"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "cookie"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+dependencies = [
+ "time",
+ "version_check",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "core-graphics"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
+dependencies = [
+ "bitflags 1.3.2",
+ "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.0",
+ "core-foundation 0.10.1",
+ "core-graphics-types 0.2.0",
+ "foreign-types",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "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.0",
+ "core-foundation 0.10.1",
+ "libc",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d85363c37faeca707aef026efa9f3b34d077bce547e48f770770625c6013679e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "cssparser"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c9cdaae01d5ed7882b04d795e7f752f46ff52d2fa3b50a20d28c464510bba98"
+dependencies = [
+ "cssparser-macros",
+ "dtoa-short",
+ "itoa",
+ "phf",
+ "smallvec",
+]
+
+[[package]]
+name = "cssparser-macros"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a2a99df6e410a8ff4245aa2006499ea662245f967cc7c0a38c83ef8eb44dbf"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "cursor-icon"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f"
+
+[[package]]
+name = "dbus"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab69f03cc8c4340c9c8e315114e1658e6775a9b16a04357973aa21cec22b32e"
+dependencies = [
+ "libc",
+ "libdbus-sys",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "deranged"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
+
+[[package]]
+name = "derive_more"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "dirs"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "dispatch"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
+
+[[package]]
+name = "dispatch2"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.6.2",
+ "libc",
+ "objc2 0.6.4",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "dlib"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab8ecd87370524b461f8557c119c405552c396ed91fc0a8eec68679eab26f94a"
+dependencies = [
+ "libloading",
+]
+
+[[package]]
+name = "dlopen2"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4"
+dependencies = [
+ "dlopen2_derive",
+ "libc",
+ "once_cell",
+ "winapi",
+]
+
+[[package]]
+name = "dlopen2_derive"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "dom_query"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fac5fca71e65e94cc718a6e2af65d6e0f9c6027751c2aa562fbb5087fda639bc"
+dependencies = [
+ "bit-set",
+ "cssparser",
+ "foldhash",
+ "html5ever",
+ "precomputed-hash",
+ "selectors",
+ "tendril",
+]
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
+[[package]]
+name = "dpi"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "dtoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590"
+
+[[package]]
+name = "dtoa-short"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
+dependencies = [
+ "dtoa",
+]
+
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
+
+[[package]]
+name = "fdeflate"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "field-offset"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
+dependencies = [
+ "memoffset",
+ "rustc_version",
+]
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
+[[package]]
+name = "flate2"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-task"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+
+[[package]]
+name = "futures-util"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+dependencies = [
+ "futures-core",
+ "futures-macro",
+ "futures-task",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "gdk-pixbuf"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25f420376dbee041b2db374ce4573892a36222bb3f6c0c43e24f0d67eae9b646"
+dependencies = [
+ "gdk-pixbuf-sys",
+ "gio",
+ "glib",
+ "libc",
+]
+
+[[package]]
+name = "gdk-pixbuf-sys"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48f31b37b1fc4b48b54f6b91b7ef04c18e00b4585d98359dd7b998774bbd91fb"
+dependencies = [
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gdk4"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d81e2a6c6ecba2aab60633a98df1868b03fa0bfdce8105edc27c1bccf71f0e39"
+dependencies = [
+ "cairo-rs",
+ "gdk-pixbuf",
+ "gdk4-sys",
+ "gio",
+ "glib",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gdk4-sys"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d8f608d8d7d229975c4d0d026f5d3071598c4ddab3c5262b0a31840fec78d13"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pango-sys",
+ "pkg-config",
+ "system-deps",
+]
+
+[[package]]
+name = "gdk4-wayland"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32d95828dadc0357dee236cc6a5712808bd894d3217159982592ce24f2b8aaf7"
+dependencies = [
+ "gdk4",
+ "gdk4-wayland-sys",
+ "gio",
+ "glib",
+ "libc",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+]
+
+[[package]]
+name = "gdk4-wayland-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "653cafb8715f2ac1c56edaf8060d9360ae3acbe3c6fb61b676a2917d42b668cf"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gdk4-x11"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d892b4cf5a07e90e1390e93cd792975746c68b59f790a2de9e96ce77211ea9a"
+dependencies = [
+ "gdk4",
+ "gdk4-x11-sys",
+ "gio",
+ "glib",
+ "libc",
+]
+
+[[package]]
+name = "gdk4-x11-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d41f2e28f62378b081288914325d73bddbb6ccbbadb41aa6392afc71d27002"
+dependencies = [
+ "gdk4-sys",
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "gethostname"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
+dependencies = [
+ "rustix 1.1.4",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 5.3.0",
+ "wasip2",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 6.0.0",
+]
+
+[[package]]
+name = "gio"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b3e1f669909c326b9413bde5a742097b8c90a7d78f45326db13668984769ded"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "gio-sys",
+ "glib",
+ "libc",
+ "pin-project-lite",
+ "smallvec",
+]
+
+[[package]]
+name = "gio-sys"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "353fdc7da7cd16da916104b1e0e4e7de380ec9c8aaa20d4d742d66310ab4b0d5"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "glib"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddbcf514bd1881fc1b960e4e52b4e82873f4da3bceddbd58d42827b508888100"
+dependencies = [
+ "bitflags 2.13.0",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-task",
+ "futures-util",
+ "gio-sys",
+ "glib-macros",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "memchr",
+ "smallvec",
+]
+
+[[package]]
+name = "glib-macros"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "506d23499707c7142898429757e8d9a3871d965239a2cb66dfa05052be6d6f19"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "030967459f9f676851872c6304adea7825c6d462ec9b72554c733cf0c5952233"
+dependencies = [
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gobject-sys"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22a861859b887a79cf461359c192c97a57d8fb0229dd291232e57aa11f6fa72c"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "graphene-rs"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb856b9c558971c3f13ab692358926da710b046932a4e087aedcc35b040d7dff"
+dependencies = [
+ "glib",
+ "graphene-sys",
+]
+
+[[package]]
+name = "graphene-sys"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7ffdfde88f3570d3705e0d8a2433e036d387a1f2930bbf47eafcb5f569fd04"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gsk4"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b867be1c5f14dcb8f552c0eff6e9a9b1da5f8b43943e8efc3a63c889d84952ff"
+dependencies = [
+ "cairo-rs",
+ "gdk4",
+ "glib",
+ "graphene-rs",
+ "gsk4-sys",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gsk4-sys"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b7c7eb2e681ee896646cfb8872b431f24d09f53ba9283289d9b10caa6707088"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk4-sys",
+ "glib-sys",
+ "gobject-sys",
+ "graphene-sys",
+ "libc",
+ "pango-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "gtk4"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98a0a0466484f64b07b5b8184d43fa46be78eb0b8e04ae4e179af31d770b76d9"
+dependencies = [
+ "cairo-rs",
+ "field-offset",
+ "futures-channel",
+ "gdk-pixbuf",
+ "gdk4",
+ "gio",
+ "glib",
+ "graphene-rs",
+ "gsk4",
+ "gtk4-macros",
+ "gtk4-sys",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gtk4-macros"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ac7179400a36a04de039c24206bb841c5596992b907b43b23ee8d5bdc40d00e"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "gtk4-sys"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b8f954786af0b1984425c4446b77f5ff6594346181316be3f850caab1c6f01"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gdk4-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "graphene-sys",
+ "gsk4-sys",
+ "libc",
+ "pango-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "html5ever"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8"
+dependencies = [
+ "log",
+ "markup5ever",
+]
+
+[[package]]
+name = "http"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
+dependencies = [
+ "bytes",
+ "itoa",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "utf8_iter",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
+dependencies = [
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
+
+[[package]]
+name = "icu_properties"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
+dependencies = [
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
+
+[[package]]
+name = "icu_provider"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "image"
+version = "0.25.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "moxcms",
+ "num-traits",
+ "png",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "javascriptcore6"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d8d4f64d976c6dc6068723b6ef7838acf954d56b675f376c826f7e773362ddb"
+dependencies = [
+ "glib",
+ "javascriptcore6-sys",
+ "libc",
+]
+
+[[package]]
+name = "javascriptcore6-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2b9787581c8949a7061c9b8593c4d1faf4b0fe5e5643c6c7793df20dbe39cf6"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+dependencies = [
+ "cesu8",
+ "cfg-if",
+ "combine",
+ "jni-sys 0.3.1",
+ "log",
+ "thiserror 1.0.69",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "jni"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
+dependencies = [
+ "cfg-if",
+ "combine",
+ "jni-macros",
+ "jni-sys 0.4.1",
+ "log",
+ "simd_cesu8",
+ "thiserror 2.0.18",
+ "walkdir",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "jni-macros"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "simd_cesu8",
+ "syn",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3"
+dependencies = [
+ "getrandom 0.4.3",
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "keyboard-types"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
+dependencies = [
+ "bitflags 2.13.0",
+ "serde",
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.186"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+
+[[package]]
+name = "libdbus-sys"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043"
+dependencies = [
+ "pkg-config",
+]
+
+[[package]]
+name = "libloading"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
+dependencies = [
+ "cfg-if",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
+dependencies = [
+ "bitflags 2.13.0",
+ "libc",
+ "plain",
+ "redox_syscall 0.9.0",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+
+[[package]]
+name = "litemap"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
+
+[[package]]
+name = "markup5ever"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7122d987ec5f704ee56f6e5b41a7d93722e9aae27ae07cafa4036c4d3f9757de"
+dependencies = [
+ "log",
+ "tendril",
+ "web_atoms",
+]
+
+[[package]]
+name = "memchr"
+version = "2.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
+
+[[package]]
+name = "memmap2"
+version = "0.9.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
+[[package]]
+name = "moxcms"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
+dependencies = [
+ "num-traits",
+ "pxfm",
+]
+
+[[package]]
+name = "muda"
+version = "0.19.3"
+dependencies = [
+ "arc-swap",
+ "crossbeam-channel",
+ "dpi",
+ "gtk4",
+ "image",
+ "keyboard-types",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "once_cell",
+ "png",
+ "serde",
+ "tao",
+ "thiserror 2.0.18",
+ "windows-sys 0.61.2",
+ "winit",
+ "wry",
+]
+
+[[package]]
+name = "ndk"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
+dependencies = [
+ "bitflags 2.13.0",
+ "jni-sys 0.3.1",
+ "log",
+ "ndk-sys",
+ "num_enum",
+ "raw-window-handle",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "ndk-context"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
+
+[[package]]
+name = "ndk-sys"
+version = "0.6.0+11769913"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
+dependencies = [
+ "jni-sys 0.3.1",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26"
+dependencies = [
+ "num_enum_derive",
+ "rustversion",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "objc-sys"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
+
+[[package]]
+name = "objc2"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
+dependencies = [
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
+dependencies = [
+ "objc2-encode",
+ "objc2-exception-helper",
+]
+
+[[package]]
+name = "objc2-app-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.5.1",
+ "libc",
+ "objc2 0.5.2",
+ "objc2-core-data 0.2.2",
+ "objc2-core-image 0.2.2",
+ "objc2-foundation 0.2.2",
+ "objc2-quartz-core 0.2.2",
+]
+
+[[package]]
+name = "objc2-app-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
+dependencies = [
+ "bitflags 2.13.0",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-cloud-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-core-location 0.2.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-cloud-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
+dependencies = [
+ "bitflags 2.13.0",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-contacts"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
+dependencies = [
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
+dependencies = [
+ "bitflags 2.13.0",
+ "dispatch2",
+ "objc2 0.6.4",
+]
+
+[[package]]
+name = "objc2-core-graphics"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
+dependencies = [
+ "bitflags 2.13.0",
+ "dispatch2",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-io-surface",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+dependencies = [
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
+dependencies = [
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-contacts",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-core-text"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
+dependencies = [
+ "bitflags 2.13.0",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
+
+[[package]]
+name = "objc2-exception-helper"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7a1c5fbb72d7735b076bb47b578523aedc40f3c439bea6dfd595c089d79d98a"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "objc2-foundation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.5.1",
+ "dispatch",
+ "libc",
+ "objc2 0.5.2",
+]
+
+[[package]]
+name = "objc2-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.6.2",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-io-surface"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
+dependencies = [
+ "bitflags 2.13.0",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-link-presentation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
+dependencies = [
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-metal"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
+dependencies = [
+ "bitflags 2.13.0",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-symbols"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
+dependencies = [
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-ui-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-cloud-kit 0.2.2",
+ "objc2-core-data 0.2.2",
+ "objc2-core-image 0.2.2",
+ "objc2-core-location 0.2.2",
+ "objc2-foundation 0.2.2",
+ "objc2-link-presentation",
+ "objc2-quartz-core 0.2.2",
+ "objc2-symbols",
+ "objc2-uniform-type-identifiers",
+ "objc2-user-notifications 0.2.2",
+]
+
+[[package]]
+name = "objc2-ui-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.6.2",
+ "objc2 0.6.4",
+ "objc2-cloud-kit 0.3.2",
+ "objc2-core-data 0.3.2",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-core-image 0.3.2",
+ "objc2-core-location 0.3.2",
+ "objc2-core-text",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core 0.3.2",
+ "objc2-user-notifications 0.3.2",
+]
+
+[[package]]
+name = "objc2-uniform-type-identifiers"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
+dependencies = [
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-core-location 0.2.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-web-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.6.2",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "orbclient"
+version = "0.3.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5df339f526ea9a60e371768d50efc2f2508c7203290731565d1f7a6f71d21747"
+dependencies = [
+ "libc",
+ "libredox",
+]
+
+[[package]]
+name = "owned_ttf_parser"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b"
+dependencies = [
+ "ttf-parser",
+]
+
+[[package]]
+name = "pango"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d800d8d0de2ad5d0fb046f5344dbaba14a003cf3dd27cc21d85893d35ea316c"
+dependencies = [
+ "gio",
+ "glib",
+ "pango-sys",
+]
+
+[[package]]
+name = "pango-sys"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd111a20ca90fedf03e09c59783c679c00900f1d8491cca5399f5e33609d5d6"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.18",
+ "smallvec",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "phf"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+ "serde",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
+dependencies = [
+ "fastrand",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
+
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+
+[[package]]
+name = "png"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
+dependencies = [
+ "bitflags 2.13.0",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "polling"
+version = "3.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix 1.1.4",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pxfm"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea"
+
+[[package]]
+name = "quick-xml"
+version = "0.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
+[[package]]
+name = "raw-window-handle"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags 2.13.0",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5102a6aaa05aa011a238e178e6bca86d2cb56fc9f586d37cb80f5bca6e07759"
+dependencies = [
+ "bitflags 2.13.0",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
+dependencies = [
+ "getrandom 0.2.17",
+ "libredox",
+ "thiserror 2.0.18",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+dependencies = [
+ "bitflags 2.13.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+dependencies = [
+ "bitflags 2.13.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.12.1",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
+name = "scopeguard"
+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 = [
+ "ab_glyph",
+ "log",
+ "memmap2",
+ "smithay-client-toolkit",
+ "tiny-skia",
+]
+
+[[package]]
+name = "selectors"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8adfa1c298912827b8a28b223b3b874357397ae706e6190acd9bf28cee99114d"
+dependencies = [
+ "bitflags 2.13.0",
+ "cssparser",
+ "derive_more",
+ "log",
+ "new_debug_unreachable",
+ "phf",
+ "phf_codegen",
+ "precomputed-hash",
+ "rustc-hash",
+ "servo_arc",
+ "smallvec",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "servo_arc"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "170fb83ab34de17dc69aa7c67482b22218ddb85da56546f9bd6b929e32a05930"
+dependencies = [
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shlex"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+
+[[package]]
+name = "simd_cesu8"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
+dependencies = [
+ "rustc_version",
+ "simdutf8",
+]
+
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
+[[package]]
+name = "siphasher"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
+
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "smallvec"
+version = "1.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
+
+[[package]]
+name = "smithay-client-toolkit"
+version = "0.19.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
+dependencies = [
+ "bitflags 2.13.0",
+ "calloop",
+ "calloop-wayland-source",
+ "cursor-icon",
+ "libc",
+ "log",
+ "memmap2",
+ "rustix 0.38.44",
+ "thiserror 1.0.69",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-csd-frame",
+ "wayland-cursor",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+ "wayland-scanner",
+ "xkeysym",
+]
+
+[[package]]
+name = "smol_str"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "soup3"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92d38b59ff6d302538efd337e15d04d61c5b909ec223c60ae4061d74605a962a"
+dependencies = [
+ "futures-channel",
+ "gio",
+ "glib",
+ "libc",
+ "soup3-sys",
+]
+
+[[package]]
+name = "soup3-sys"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79d5d25225bb06f83b78ff8cc35973b56d45fcdd21af6ed6d2bbd67f5a6f9bea"
+dependencies = [
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "strict-num"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
+
+[[package]]
+name = "string_cache"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901"
+dependencies = [
+ "new_debug_unreachable",
+ "parking_lot",
+ "phf_shared",
+ "precomputed-hash",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "system-deps"
+version = "7.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "396a35feb67335377e0251fcbc1092fc85c484bd4e3a7a54319399da127796e7"
+dependencies = [
+ "cfg-expr",
+ "heck",
+ "pkg-config",
+ "toml",
+ "version-compare",
+]
+
+[[package]]
+name = "tao"
+version = "0.35.3"
+dependencies = [
+ "async-channel",
+ "bitflags 2.13.0",
+ "block2 0.6.2",
+ "core-foundation 0.10.1",
+ "core-graphics 0.25.0",
+ "crossbeam-channel",
+ "dbus",
+ "dispatch2",
+ "dlopen2",
+ "dpi",
+ "gdk4-wayland",
+ "gdk4-x11",
+ "gtk4",
+ "jni 0.21.1",
+ "libc",
+ "log",
+ "ndk",
+ "ndk-sys",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-foundation 0.3.2",
+ "objc2-ui-kit 0.3.2",
+ "once_cell",
+ "parking_lot",
+ "percent-encoding",
+ "raw-window-handle",
+ "tao-macros 0.1.3",
+ "unicode-segmentation",
+ "url",
+ "windows",
+ "windows-core",
+ "windows-version",
+ "x11-dl",
+]
+
+[[package]]
+name = "tao-macros"
+version = "0.1.3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tao-macros"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
+
+[[package]]
+name = "tendril"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fed54709c5b3a53d09bb1c113ea4f5ceafd1e772ddcb0030a82e1d56c087b08"
+dependencies = [
+ "new_debug_unreachable",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+dependencies = [
+ "thiserror-impl 2.0.18",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.3.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50"
+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.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f"
+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",
+]
+
+[[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]]
+name = "tinystr"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "toml"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
+dependencies = [
+ "indexmap",
+ "serde_core",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "1.1.1+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.25.12+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "toml_parser",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
+dependencies = [
+ "winnow",
+]
+
+[[package]]
+name = "toml_writer"
+version = "1.1.1+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
+
+[[package]]
+name = "tracing"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
+
+[[package]]
+name = "ttf-parser"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
+
+[[package]]
+name = "typenum"
+version = "1.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
+
+[[package]]
+name = "url"
+version = "2.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "version-compare"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasip2"
+version = "1.0.4+wasi-0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wayland-backend"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix 1.1.4",
+ "scoped-tls",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
+dependencies = [
+ "bitflags 2.13.0",
+ "rustix 1.1.4",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-csd-frame"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
+dependencies = [
+ "bitflags 2.13.0",
+ "cursor-icon",
+ "wayland-backend",
+]
+
+[[package]]
+name = "wayland-cursor"
+version = "0.31.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a52d18780be9b1314328a3de5f930b73d2200112e3849ca6cb11822793fb34d"
+dependencies = [
+ "rustix 1.1.4",
+ "wayland-client",
+ "xcursor",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.32.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6"
+dependencies = [
+ "bitflags 2.13.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-plasma"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91"
+dependencies = [
+ "bitflags 2.13.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
+dependencies = [
+ "bitflags 2.13.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.10"
+dependencies = [
+ "proc-macro2",
+ "quick-xml",
+ "quote",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
+dependencies = [
+ "dlib",
+ "log",
+ "once_cell",
+ "pkg-config",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web_atoms"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "075474b12bcb3d2e3d4546580e9de478eeeead668a1761e2a8860c836b7ef297"
+dependencies = [
+ "phf",
+ "phf_codegen",
+ "string_cache",
+ "string_cache_codegen",
+]
+
+[[package]]
+name = "webkit6"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4959dd2a92813d4b2ae134e71345a03030bcff189b4f79cd131e9218aba22b70"
+dependencies = [
+ "gdk4",
+ "gio",
+ "glib",
+ "gtk4",
+ "javascriptcore6",
+ "libc",
+ "soup3",
+ "webkit6-sys",
+]
+
+[[package]]
+name = "webkit6-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "236078ce03ff041bf87904c8257e6a9b0e9e0f957267c15f9c1756aadcf02581"
+dependencies = [
+ "gdk4-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "gtk4-sys",
+ "javascriptcore6-sys",
+ "libc",
+ "soup3-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "webview2-com"
+version = "0.38.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
+dependencies = [
+ "webview2-com-macros",
+ "webview2-com-sys",
+ "windows",
+ "windows-core",
+ "windows-implement",
+ "windows-interface",
+]
+
+[[package]]
+name = "webview2-com-macros"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a921c1b6914c367b2b823cd4cde6f96beec77d30a939c8199bb377cf9b9b54"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "webview2-com-sys"
+version = "0.38.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
+dependencies = [
+ "thiserror 2.0.18",
+ "windows",
+ "windows-core",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.61.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
+dependencies = [
+ "windows-collections",
+ "windows-core",
+ "windows-future",
+ "windows-link 0.1.3",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
+dependencies = [
+ "windows-core",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link 0.1.3",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
+dependencies = [
+ "windows-core",
+ "windows-link 0.1.3",
+ "windows-threading",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-numerics"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
+dependencies = [
+ "windows-core",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+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.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+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",
+ "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-threading"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-version"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[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_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[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_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[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_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winit"
+version = "0.30.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6755fa58a9f8350bd1e472d4c3fcc25f824ec358933bba33306d0b63df5978d"
+dependencies = [
+ "ahash",
+ "android-activity",
+ "atomic-waker",
+ "bitflags 2.13.0",
+ "block2 0.5.1",
+ "bytemuck",
+ "calloop",
+ "cfg_aliases",
+ "concurrent-queue",
+ "core-foundation 0.9.4",
+ "core-graphics 0.23.2",
+ "cursor-icon",
+ "dpi",
+ "js-sys",
+ "libc",
+ "memmap2",
+ "ndk",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
+ "objc2-ui-kit 0.2.2",
+ "orbclient",
+ "percent-encoding",
+ "pin-project",
+ "raw-window-handle",
+ "redox_syscall 0.4.1",
+ "rustix 0.38.44",
+ "sctk-adwaita",
+ "smithay-client-toolkit",
+ "smol_str",
+ "tracing",
+ "unicode-segmentation",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-plasma",
+ "web-sys",
+ "web-time",
+ "windows-sys 0.52.0",
+ "x11-dl",
+ "x11rb",
+ "xkbcommon-dl",
+]
+
+[[package]]
+name = "winnow"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
+[[package]]
+name = "writeable"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
+
+[[package]]
+name = "wry"
+version = "0.55.1"
+dependencies = [
+ "base64",
+ "block2 0.6.2",
+ "cookie",
+ "crossbeam-channel",
+ "dirs",
+ "dom_query",
+ "dpi",
+ "dunce",
+ "gtk4",
+ "http",
+ "jni 0.21.1",
+ "libc",
+ "ndk",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-ui-kit 0.3.2",
+ "objc2-web-kit",
+ "once_cell",
+ "percent-encoding",
+ "raw-window-handle",
+ "sha2",
+ "soup3",
+ "tao",
+ "tao-macros 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thiserror 2.0.18",
+ "url",
+ "webkit6",
+ "webview2-com",
+ "windows",
+ "windows-core",
+ "windows-version",
+]
+
+[[package]]
+name = "x11-dl"
+version = "2.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
+dependencies = [
+ "libc",
+ "once_cell",
+ "pkg-config",
+]
+
+[[package]]
+name = "x11rb"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
+dependencies = [
+ "as-raw-xcb-connection",
+ "gethostname",
+ "libc",
+ "libloading",
+ "once_cell",
+ "rustix 1.1.4",
+ "x11rb-protocol",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
+
+[[package]]
+name = "xcursor"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b"
+
+[[package]]
+name = "xkbcommon-dl"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
+dependencies = [
+ "bitflags 2.13.0",
+ "dlib",
+ "log",
+ "once_cell",
+ "xkeysym",
+]
+
+[[package]]
+name = "xkeysym"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
+
+[[package]]
+name = "yoke"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75726053136156d419e285b9b7eddaaea9e3fea6ce32eed44a89901f0bd98de1"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4714fd92cf900833d49538023a9b3915155210801d1c1169eba513b2addefd71"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/ports/muda/Cargo.toml b/ports/muda/Cargo.toml
new file mode 100644
index 000000000000..8902b8fb3671
--- /dev/null
+++ b/ports/muda/Cargo.toml
@@ -0,0 +1,98 @@
+[package]
+name = "muda"
+version = "0.19.3"
+description = "Menu Utilities for Desktop Applications"
+edition = "2021"
+keywords = ["windowing", "menu"]
+license = "Apache-2.0 OR MIT"
+readme = "README.md"
+repository = "https://github.com/tauri-apps/muda"
+documentation = "https://docs.rs/muda"
+categories = ["gui"]
+rust-version = "1.92"
+include = [
+  "README.md",
+  "src/**/*.rs",
+  "Cargo.toml",
+  "LICENSE-APACHE",
+  "LICENSE-MIT",
+  "LICENSE.spdx",
+]
+
+[features]
+default = ["libxdo", "gtk"]
+# No-op on GTK4: libxdo is X11-only. The feature name stays for compatibility.
+libxdo = []
+gtk = ["dep:gtk", "dep:png"]
+linux-ksni = ["gtk", "dep:arc-swap"]
+common-controls-v6 = []
+serde = ["dep:serde", "dpi/serde", "keyboard-types/serde"]
+
+[dependencies]
+arc-swap = { version = "1.7.1", optional = true }
+crossbeam-channel = "0.5"
+keyboard-types = "0.7"
+once_cell = "1"
+thiserror = "2"
+serde = { version = "1", optional = true }
+dpi = "0.1"
+
+[target.'cfg(target_os = "windows")'.dependencies.windows-sys]
+version = ">=0.60, <=0.61"
+features = [
+  "Win32_UI_WindowsAndMessaging",
+  "Win32_Foundation",
+  "Win32_Graphics_Gdi",
+  "Win32_UI_Shell",
+  "Win32_Globalization",
+  "Win32_UI_Input_KeyboardAndMouse",
+  "Win32_System_SystemServices",
+  "Win32_UI_Accessibility",
+  "Win32_UI_HiDpi",
+  "Win32_System_LibraryLoader",
+  "Win32_UI_Controls",
+]
+
+[target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies]
+gtk = { package = "gtk4", version = "0.11", optional = true }
+png = { version = "0.18", optional = true }
+
+[target.'cfg(target_os = "macos")'.dependencies]
+objc2 = "0.6.1"
+objc2-core-foundation = { version = "0.3.0", default-features = false, features = [
+  "std",
+  "CFCGTypes",
+] }
+objc2-foundation = { version = "0.3.0", default-features = false, features = [
+  "std",
+  "NSAttributedString",
+  "NSData",
+  "NSDictionary",
+  "NSGeometry",
+  "NSString",
+  "NSThread",
+] }
+objc2-app-kit = { version = "0.3.0", default-features = false, features = [
+  "std",
+  "objc2-core-foundation",
+  "NSApplication",
+  "NSCell",
+  "NSEvent",
+  "NSImage",
+  "NSMenu",
+  "NSMenuItem",
+  "NSResponder",
+  "NSRunningApplication",
+  "NSView",
+  "NSWindow",
+] }
+png = "0.18"
+
+[dev-dependencies]
+winit = "0.30"
+tao = { path = "../tao" }
+wry = { path = "../wry" }
+image = { version = "0.25", default-features = false, features = ["png"] }
+
+[patch.crates-io]
+wayland-scanner = { path = "../../vendor/wayland-scanner" }
diff --git a/ports/muda/LICENSE-APACHE b/ports/muda/LICENSE-APACHE
new file mode 100644
index 000000000000..16fe87b06e80
--- /dev/null
+++ b/ports/muda/LICENSE-APACHE
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/ports/muda/LICENSE-MIT b/ports/muda/LICENSE-MIT
new file mode 100644
index 000000000000..da5faffb87e7
--- /dev/null
+++ b/ports/muda/LICENSE-MIT
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022-2022 Tauri Programme within The Commons Conservancy
+
+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/ports/muda/LICENSE.spdx b/ports/muda/LICENSE.spdx
new file mode 100644
index 000000000000..987162a83b89
--- /dev/null
+++ b/ports/muda/LICENSE.spdx
@@ -0,0 +1,19 @@
+SPDXVersion: SPDX-2.1
+DataLicense: CC0-1.0
+PackageName: muda
+DataFormat: SPDXRef-1
+PackageSupplier: Organization: The Tauri Programme in the Commons Conservancy
+PackageHomePage: https://tauri.app
+PackageLicenseDeclared: Apache-2.0
+PackageLicenseDeclared: MIT
+PackageCopyrightText: 2020-2022, The Tauri Programme in the Commons Conservancy
+PackageSummary: <text>Menu Utilities for Desktop Applications.
+                </text>
+PackageComment: <text>The package includes the following libraries; see
+Relationship information.
+                </text>
+Created: 2022-12-05T09:00:00Z
+PackageDownloadLocation: git://github.com/tauri-apps/muda
+PackageDownloadLocation: git+https://github.com/tauri-apps/muda.git
+PackageDownloadLocation: git+ssh://github.com/tauri-apps/muda.git
+Creator: Person: Daniel Thompson-Yvetot
\ No newline at end of file
diff --git a/ports/muda/README.md b/ports/muda/README.md
new file mode 100644
index 000000000000..e1b72a80281c
--- /dev/null
+++ b/ports/muda/README.md
@@ -0,0 +1,142 @@
+### muda
+
+Menu Utilities library for Desktop Applications.
+
+[![Documentation](https://img.shields.io/docsrs/muda)](https://docs.rs/muda/latest/muda/)
+
+## Platforms supported:
+
+- Windows
+- macOS
+- Linux (gtk Only)
+- FreeBSD (gtk Only)
+
+## Platform-specific notes:
+
+- On Windows, accelerators don't work unless the win32 message loop calls
+  [`TranslateAcceleratorW`](https://docs.rs/windows-sys/latest/windows_sys/Win32/UI/WindowsAndMessaging/fn.TranslateAcceleratorW.html).
+  See [`Menu::init_for_hwnd`](https://docs.rs/muda/latest/x86_64-pc-windows-msvc/muda/struct.Menu.html#method.init_for_hwnd) for more details
+
+### Cargo Features
+
+- `common-controls-v6`: Use `TaskDialogIndirect` API from `ComCtl32.dll` v6 on Windows for showing the predefined `About` menu item dialog.
+- `libxdo`: Enables linking to `libxdo` on Linux or FreeBSD which is used for the predefined `Copy`, `Cut`, `Paste` and `SelectAll` menu item.
+- `serde`: Enables de/serializing the dpi types.
+- `gtk`: Enables the `gtk` crate dependency on Linux or FreeBSD. This is required for `muda` to function properly on Linux or FreeBSD.
+
+## Dependencies (Linux Only)
+
+`gtk` is used for menus and `libxdo` is used to make the predefined `Copy`, `Cut`, `Paste` and `SelectAll` menu items work. Be sure to install following packages before building:
+
+#### Arch Linux / Manjaro:
+
+```sh
+pacman -S gtk4 xdotool
+```
+
+#### Debian / Ubuntu:
+
+```sh
+sudo apt install libgtk-4-dev libxdo-dev
+```
+
+## Dependencies in FreeBSD
+
+Install these dependencies to compile `muda` using `pkg`:
+
+```sh
+pkg install -y rust glib pkgconf gtk4
+```
+
+## Example
+
+Create the menu and add your items
+
+```rs
+let menu = Menu::new();
+let menu_item2 = MenuItem::new("Menu item #2", false, None);
+let submenu = Submenu::with_items("Submenu Outer", true,&[
+  &MenuItem::new("Menu item #1", true, Some(Accelerator::new(Some(Modifiers::ALT), Code::KeyD))),
+  &PredefinedMenuItem::separator(),
+  &menu_item2,
+  &MenuItem::new("Menu item #3", true, None),
+  &PredefinedMenuItem::separator(),
+  &Submenu::with_items("Submenu Inner", true,&[
+    &MenuItem::new("Submenu item #1", true, None),
+    &PredefinedMenuItem::separator(),
+    &menu_item2,
+  ])
+]);
+
+```
+
+Then add your root menu to a Window on Windows and Linux
+or use it as your global app menu on macOS
+
+```rs
+// --snip--
+#[cfg(target_os = "windows")]
+unsafe { menu.init_for_hwnd(window.hwnd() as isize) };
+#[cfg(target_os = "linux")]
+menu.init_for_gtk_window(&gtk_window, Some(&vertical_gtk_box));
+#[cfg(target_os = "macos")]
+menu.init_for_nsapp();
+```
+
+## Context menus (Popup menus)
+
+You can also use a [`Menu`] or a [`Submenu`] show a context menu.
+
+```rs
+// --snip--
+let position = muda::PhysicalPosition { x: 100., y: 120. };
+#[cfg(target_os = "windows")]
+unsafe { menu.show_context_menu_for_hwnd(window.hwnd() as isize, Some(position.into())) };
+#[cfg(target_os = "linux")]
+menu.show_context_menu_for_gtk_window(&gtk_window, Some(position.into()));
+#[cfg(target_os = "macos")]
+unsafe { menu.show_context_menu_for_nsview(nsview, Some(position.into())) };
+```
+
+## Processing menu events
+
+You can use `MenuEvent::receiver` to get a reference to the `MenuEventReceiver`
+which you can use to listen to events when a menu item is activated
+
+```rs
+if let Ok(event) = MenuEvent::receiver().try_recv() {
+    match event.id {
+        _ if event.id == save_item.id() => {
+            println!("Save menu item activated");
+        },
+        _ => {}
+    }
+}
+```
+
+### Note for [winit] or [tao] users:
+
+You should use [`MenuEvent::set_event_handler`] and forward
+the menu events to the event loop by using [`EventLoopProxy`]
+so that the event loop is awakened on each menu event.
+
+```rust
+enum UserEvent {
+  MenuEvent(muda::MenuEvent)
+}
+
+let event_loop = EventLoop::<UserEvent>::with_user_event().build().unwrap();
+
+let proxy = event_loop.create_proxy();
+muda::MenuEvent::set_event_handler(Some(move |event| {
+    proxy.send_event(UserEvent::MenuEvent(event));
+}));
+```
+
+[`EventLoopProxy`]: https://docs.rs/winit/latest/winit/event_loop/struct.EventLoopProxy.html
+[winit]: https://docs.rs/winit
+[tao]: https://docs.rs/tao
+
+## License
+
+Apache-2.0/MIT
diff --git a/ports/muda/docs/adr/0001-observable-key-accelerator-errors.md b/ports/muda/docs/adr/0001-observable-key-accelerator-errors.md
new file mode 100644
index 000000000000..a013219f3b8e
--- /dev/null
+++ b/ports/muda/docs/adr/0001-observable-key-accelerator-errors.md
@@ -0,0 +1,55 @@
+# ADR 0001: Make key accelerator errors observable without breaking builders
+
+- Status: Accepted
+- Date: 2026-07-20
+- Scope: `MenuItemBuilder`, `CheckMenuItemBuilder`, and `IconMenuItemBuilder`
+
+## Context
+
+The three menu-item builders accept both `Accelerator` and `KeyAccelerator`.
+Conversion and parsing failures are returned while configuring a builder, but
+each infallible `build()` method currently applies the stored key accelerator
+through the fallible `set_key_accelerator()` API and discards its result.
+
+Changing only `IconMenuItemBuilder::build()` to return `Result` would leave the
+builders inconsistent. Changing all three methods would make platform failures
+observable immediately, but it would also be a breaking change to the public
+builder API.
+
+## Decision
+
+Keep the existing `build() -> Item` signatures. Address the discarded-result
+behavior consistently across all three builders in a dedicated Muda change by
+constructing each item with its `KeyAccelerator` already stored, using
+crate-private construction helpers where needed. Platform validation or
+installation failures will then be returned by the existing fallible menu
+attachment operations, such as `Menu::append` and `Menu::insert`.
+
+Do not panic, silently remove the configured accelerator, or change only the
+icon-item builder. If a platform must validate an accelerator before menu
+attachment, introduce an additive `try_build()` API for all three builders and
+reserve any change to the existing `build()` return type for a major release.
+
+## Consequences
+
+- Existing callers keep their current source-compatible builder API.
+- A configured `KeyAccelerator` is retained instead of being silently dropped.
+- Platform-specific failures surface through an existing `Result` boundary,
+  although potentially later when the item is attached to a menu.
+- The implementation and tests must cover all three builders together.
+
+## Rejected alternatives
+
+- Returning `Result` only from `IconMenuItemBuilder::build()`: inconsistent and
+  unnecessarily breaking.
+- Calling `expect` or otherwise panicking from `build()`: turns a recoverable
+  platform error into a process failure.
+- Continuing to discard `set_key_accelerator()` errors: silently loses the
+  caller's configured behavior.
+
+## Validation
+
+The follow-up implementation must verify that each builder retains its key
+accelerator and that unsupported platform accelerators are reported by a
+fallible operation. It must also compile existing `build()` call sites without
+changes.
diff --git a/ports/muda/examples/gtk.rs b/ports/muda/examples/gtk.rs
new file mode 100644
index 000000000000..4265c749568d
--- /dev/null
+++ b/ports/muda/examples/gtk.rs
@@ -0,0 +1,101 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+#[cfg(target_os = "linux")]
+use gtk::prelude::*;
+#[cfg(target_os = "linux")]
+use keyboard_types::{Code, Modifiers};
+#[cfg(target_os = "linux")]
+use muda::{accelerator::Accelerator, MenuEvent};
+
+#[cfg(target_os = "linux")]
+fn main() {
+    // Create a new application
+    let application = gtk::Application::builder()
+        .application_id("com.github.gtk4-rs.examples.menubar")
+        .build();
+    application.connect_startup(on_startup);
+    application.connect_activate(on_activate);
+    application.run();
+}
+
+#[cfg(target_os = "linux")]
+fn on_startup(_: &gtk::Application) {
+    MenuEvent::set_event_handler(Some(|event| {
+        println!("{event:?}");
+    }));
+}
+
+#[cfg(target_os = "linux")]
+fn on_activate(application: &gtk::Application) {
+    use muda::ContextMenu;
+
+    let window = gtk::ApplicationWindow::builder()
+        .application(application)
+        .title("Menubar Example")
+        .default_width(350)
+        .default_height(350)
+        .show_menubar(true)
+        .build();
+
+    window.present();
+
+    let about_menu_item = muda::MenuItem::new("About", true, None);
+
+    let check = muda::CheckMenuItem::new(
+        "Check",
+        true,
+        true,
+        Some(Accelerator::new(Some(Modifiers::empty()), Code::KeyQ)),
+    );
+
+    let path = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/icon.png");
+    let icon = load_icon(std::path::Path::new(path));
+    let icon_menu_item = muda::IconMenuItem::new("Icon", true, Some(icon), None);
+
+    let quit_menu_item = muda::MenuItem::with_id(
+        "quit",
+        "&Quit",
+        true,
+        Some(Accelerator::new(Some(Modifiers::CONTROL), Code::KeyQ)),
+    );
+
+    let file_menu = muda::Submenu::new("&File", true);
+    file_menu.append(&about_menu_item).unwrap();
+    file_menu.append(&check).unwrap();
+    file_menu.append(&icon_menu_item).unwrap();
+    file_menu.append(&quit_menu_item).unwrap();
+
+    let menubar = muda::Menu::new();
+    menubar.append(&file_menu).unwrap();
+
+    let vbox = gtk::Box::new(gtk::Orientation::Vertical, 0);
+    menubar.init_for_gtk_window(&window, Some(&vbox)).unwrap();
+
+    let btn = gtk::Button::with_label("ASdasd");
+    let w = window.clone();
+
+    btn.connect_clicked(move |_| {
+        file_menu.show_context_menu_for_gtk_window(w.dynamic_cast_ref().unwrap(), None);
+    });
+    vbox.append(&btn);
+
+    window.set_child(Some(&vbox));
+}
+
+#[cfg(not(target_os = "linux"))]
+fn main() {}
+
+#[cfg(target_os = "linux")]
+fn load_icon(path: &std::path::Path) -> muda::Icon {
+    let (icon_rgba, icon_width, icon_height) = {
+        let image = image::open(path)
+            .expect("Failed to open icon path")
+            .into_rgba8();
+        let (width, height) = image.dimensions();
+        let rgba = image.into_raw();
+        (rgba, width, height)
+    };
+    muda::Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon")
+}
diff --git a/ports/muda/examples/icon.png b/ports/muda/examples/icon.png
new file mode 100644
index 000000000000..3c3627c36d15
Binary files /dev/null and b/ports/muda/examples/icon.png differ
diff --git a/ports/muda/examples/tao.rs b/ports/muda/examples/tao.rs
new file mode 100644
index 000000000000..5005bded6aee
--- /dev/null
+++ b/ports/muda/examples/tao.rs
@@ -0,0 +1,286 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+#![allow(unused)]
+use muda::{
+    accelerator::{Accelerator, Code, Modifiers},
+    dpi::{PhysicalPosition, Position},
+    AboutMetadata, CheckMenuItem, ContextMenu, IconMenuItem, Menu, MenuEvent, MenuItem,
+    PredefinedMenuItem, Submenu,
+};
+#[cfg(target_os = "macos")]
+use tao::platform::macos::WindowExtMacOS;
+#[cfg(any(
+    target_os = "linux",
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
+use tao::platform::unix::WindowExtUnix;
+#[cfg(target_os = "windows")]
+use tao::platform::windows::{EventLoopBuilderExtWindows, WindowExtWindows};
+use tao::{
+    event::{ElementState, Event, MouseButton, WindowEvent},
+    event_loop::{ControlFlow, EventLoopBuilder},
+    window::{Window, WindowBuilder},
+};
+
+enum UserEvent {
+    MenuEvent(muda::MenuEvent),
+}
+
+fn main() {
+    let mut event_loop_builder = EventLoopBuilder::<UserEvent>::with_user_event();
+
+    let menu_bar = Menu::new();
+
+    // setup accelerator handler on Windows
+    #[cfg(target_os = "windows")]
+    {
+        let menu_bar = menu_bar.clone();
+        event_loop_builder.with_msg_hook(move |msg| {
+            use windows_sys::Win32::UI::WindowsAndMessaging::{TranslateAcceleratorW, MSG};
+            unsafe {
+                let msg = msg as *const MSG;
+                let translated = TranslateAcceleratorW((*msg).hwnd, menu_bar.haccel() as _, msg);
+                translated == 1
+            }
+        });
+    }
+
+    let event_loop = event_loop_builder.build();
+
+    // set a menu event handler that wakes up the event loop
+    let proxy = event_loop.create_proxy();
+    muda::MenuEvent::set_event_handler(Some(move |event| {
+        proxy.send_event(UserEvent::MenuEvent(event));
+    }));
+
+    let window = WindowBuilder::new()
+        .with_title("Window 1")
+        .build(&event_loop)
+        .unwrap();
+    let window2 = WindowBuilder::new()
+        .with_title("Window 2")
+        .build(&event_loop)
+        .unwrap();
+
+    #[cfg(target_os = "macos")]
+    {
+        let app_m = Submenu::new("App", true);
+        menu_bar.append(&app_m);
+        app_m.append_items(&[
+            &PredefinedMenuItem::about(None, None),
+            &PredefinedMenuItem::separator(),
+            &PredefinedMenuItem::services(None),
+            &PredefinedMenuItem::separator(),
+            &PredefinedMenuItem::hide(None),
+            &PredefinedMenuItem::hide_others(None),
+            &PredefinedMenuItem::show_all(None),
+            &PredefinedMenuItem::separator(),
+            &PredefinedMenuItem::quit(None),
+        ]);
+    }
+
+    let path = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/icon.png");
+    let icon = load_icon(std::path::Path::new(path));
+
+    let file_m = Submenu::new("&File", true);
+    let edit_m = Submenu::new("&Edit", true);
+    let window_m = Submenu::new("&Window", true);
+    let help_m = Submenu::new("&Custom Help", true);
+
+    window_m.set_icon(Some(icon.clone()));
+
+    menu_bar.append_items(&[&file_m, &edit_m, &window_m, &help_m]);
+
+    let custom_i_1 = MenuItem::with_id(
+        "custom-i-1",
+        "C&ustom 1",
+        true,
+        Some(Accelerator::new(Some(Modifiers::ALT), Code::KeyC)),
+    );
+
+    let image_item = IconMenuItem::with_id(
+        "image-custom-1",
+        "Image custom 1",
+        true,
+        Some(icon),
+        Some(Accelerator::new(Some(Modifiers::CONTROL), Code::KeyC)),
+    );
+
+    let check_custom_i_1 =
+        CheckMenuItem::with_id("check-custom-1", "Check Custom 1", true, true, None);
+    let check_custom_i_2 =
+        CheckMenuItem::with_id("check-custom-2", "Check Custom 2", false, true, None);
+    let check_custom_i_3 = CheckMenuItem::with_id(
+        "check-custom-3",
+        "Check Custom 3",
+        true,
+        true,
+        Some(Accelerator::new(Some(Modifiers::SHIFT), Code::KeyD)),
+    );
+
+    let copy_i = PredefinedMenuItem::copy(None);
+    let cut_i = PredefinedMenuItem::cut(None);
+    let paste_i = PredefinedMenuItem::paste(None);
+
+    file_m.append_items(&[
+        &custom_i_1,
+        &image_item,
+        &window_m,
+        &PredefinedMenuItem::separator(),
+        &check_custom_i_1,
+        &check_custom_i_2,
+    ]);
+
+    window_m.append_items(&[
+        &PredefinedMenuItem::minimize(None),
+        &PredefinedMenuItem::maximize(None),
+        &PredefinedMenuItem::close_window(Some("Close")),
+        &PredefinedMenuItem::fullscreen(None),
+        &PredefinedMenuItem::bring_all_to_front(None),
+        &PredefinedMenuItem::about(
+            None,
+            Some(AboutMetadata {
+                name: Some("tao".to_string()),
+                version: Some("1.2.3".to_string()),
+                copyright: Some("Copyright tao".to_string()),
+                ..Default::default()
+            }),
+        ),
+        &check_custom_i_3,
+        &image_item,
+        &custom_i_1,
+    ]);
+
+    help_m.append_items(&[&MenuItem::new("Supposed to show search", true, None)]);
+
+    edit_m.append_items(&[&copy_i, &PredefinedMenuItem::separator(), &paste_i]);
+
+    #[cfg(target_os = "windows")]
+    unsafe {
+        menu_bar.init_for_hwnd(window.hwnd() as _);
+        menu_bar.init_for_hwnd(window2.hwnd() as _);
+    }
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    ))]
+    {
+        // Pending a tao release on gtk4; muda's gtk API now takes gtk4 types.
+        // menu_bar.init_for_gtk_window(window.gtk_window(), window.default_vbox());
+        // menu_bar.init_for_gtk_window(window2.gtk_window(), window2.default_vbox());
+        let _ = (&menu_bar, &window, &window2);
+    }
+    #[cfg(target_os = "macos")]
+    {
+        menu_bar.init_for_nsapp();
+        window_m.set_as_windows_menu_for_nsapp();
+        help_m.set_as_help_menu_for_nsapp();
+    }
+
+    let menu_channel = MenuEvent::receiver();
+    let mut window_cursor_position = PhysicalPosition { x: 0., y: 0. };
+    let mut use_window_pos = false;
+
+    event_loop.run(move |event, _, control_flow| {
+        *control_flow = ControlFlow::Wait;
+
+        match event {
+            Event::WindowEvent {
+                event: WindowEvent::CloseRequested,
+                ..
+            } => *control_flow = ControlFlow::Exit,
+            Event::WindowEvent {
+                event: WindowEvent::CursorMoved { position, .. },
+                window_id,
+                ..
+            } => {
+                window_cursor_position.x = position.x;
+                window_cursor_position.y = position.y;
+            }
+            Event::WindowEvent {
+                event:
+                    WindowEvent::MouseInput {
+                        state: ElementState::Released,
+                        button: MouseButton::Right,
+                        ..
+                    },
+                window_id,
+                ..
+            } => {
+                show_context_menu(
+                    if window_id == window.id() {
+                        &window
+                    } else {
+                        &window2
+                    },
+                    &file_m,
+                    if use_window_pos {
+                        Some(window_cursor_position.into())
+                    } else {
+                        None
+                    },
+                );
+                use_window_pos = !use_window_pos;
+            }
+            Event::MainEventsCleared => {
+                window.request_redraw();
+            }
+
+            Event::UserEvent(UserEvent::MenuEvent(event)) => {
+                if event.id == custom_i_1.id() {
+                    file_m.insert(&MenuItem::new("New Menu Item", true, None), 2);
+                }
+                println!("{event:?}");
+            }
+            _ => (),
+        }
+    })
+}
+
+fn show_context_menu(window: &Window, menu: &dyn ContextMenu, position: Option<Position>) {
+    println!("Show context menu at position {position:?}");
+    #[cfg(target_os = "windows")]
+    unsafe {
+        menu.show_context_menu_for_hwnd(window.hwnd() as _, position);
+    }
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    ))]
+    {
+        // Pending a tao release on gtk4; muda's gtk API now takes gtk4 types.
+        // menu.show_context_menu_for_gtk_window(window.gtk_window().as_ref(), position);
+        let _ = (window, menu, position);
+    }
+    #[cfg(target_os = "macos")]
+    unsafe {
+        menu.show_context_menu_for_nsview(window.ns_view() as _, position);
+    }
+}
+
+fn load_icon(path: &std::path::Path) -> muda::Icon {
+    let (icon_rgba, icon_width, icon_height) = {
+        let image = image::open(path)
+            .expect("Failed to open icon path")
+            .into_rgba8();
+        let (width, height) = image.dimensions();
+        let rgba = image.into_raw();
+        (rgba, width, height)
+    };
+    muda::Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon")
+}
diff --git a/ports/muda/examples/windows-common-controls-v6/.gitignore b/ports/muda/examples/windows-common-controls-v6/.gitignore
new file mode 100644
index 000000000000..869df07dae8b
--- /dev/null
+++ b/ports/muda/examples/windows-common-controls-v6/.gitignore
@@ -0,0 +1,2 @@
+/target
+Cargo.lock
\ No newline at end of file
diff --git a/ports/muda/examples/windows-common-controls-v6/Cargo.toml b/ports/muda/examples/windows-common-controls-v6/Cargo.toml
new file mode 100644
index 000000000000..f397c825c6df
--- /dev/null
+++ b/ports/muda/examples/windows-common-controls-v6/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "windows-common-controls-v6"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+muda = { path = "../../", features = ["common-controls-v6"] }
+tao = "0.28"
+image = "0.25"
+
+[target."cfg(target_os = \"windows\")".dependencies.windows-sys]
+version = "0.59"
+features = ["Win32_UI_WindowsAndMessaging", "Win32_Foundation"]
+
+[build-dependencies]
+embed-resource = "2"
diff --git a/ports/muda/examples/windows-common-controls-v6/app.exe.manifest b/ports/muda/examples/windows-common-controls-v6/app.exe.manifest
new file mode 100644
index 000000000000..d4da5bc09b8d
--- /dev/null
+++ b/ports/muda/examples/windows-common-controls-v6/app.exe.manifest
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="*"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
\ No newline at end of file
diff --git a/ports/muda/examples/windows-common-controls-v6/build.rs b/ports/muda/examples/windows-common-controls-v6/build.rs
new file mode 100644
index 000000000000..57bd52722747
--- /dev/null
+++ b/ports/muda/examples/windows-common-controls-v6/build.rs
@@ -0,0 +1,8 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+fn main() {
+    #[cfg(target_os = "windows")]
+    embed_resource::compile("manifest.rc", embed_resource::NONE);
+}
diff --git a/ports/muda/examples/windows-common-controls-v6/manifest.rc b/ports/muda/examples/windows-common-controls-v6/manifest.rc
new file mode 100644
index 000000000000..6dae79430008
--- /dev/null
+++ b/ports/muda/examples/windows-common-controls-v6/manifest.rc
@@ -0,0 +1,2 @@
+#define RT_MANIFEST 24
+1 RT_MANIFEST "app.exe.manifest"
\ No newline at end of file
diff --git a/ports/muda/examples/windows-common-controls-v6/src/main.rs b/ports/muda/examples/windows-common-controls-v6/src/main.rs
new file mode 100644
index 000000000000..fb1b786a120c
--- /dev/null
+++ b/ports/muda/examples/windows-common-controls-v6/src/main.rs
@@ -0,0 +1,247 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+#![allow(unused)]
+use muda::{
+    accelerator::{Accelerator, Code, Modifiers},
+    dpi::{PhysicalPosition, Position},
+    AboutMetadata, CheckMenuItem, ContextMenu, IconMenuItem, Menu, MenuEvent, MenuItem,
+    PredefinedMenuItem, Submenu,
+};
+#[cfg(target_os = "macos")]
+use tao::platform::macos::WindowExtMacOS;
+#[cfg(target_os = "windows")]
+use tao::platform::windows::{EventLoopBuilderExtWindows, WindowExtWindows};
+use tao::{
+    event::{ElementState, Event, MouseButton, WindowEvent},
+    event_loop::{ControlFlow, EventLoopBuilder},
+    window::{Window, WindowBuilder},
+};
+
+fn main() {
+    let mut event_loop_builder = EventLoopBuilder::new();
+
+    let menu_bar = Menu::new();
+
+    #[cfg(target_os = "windows")]
+    {
+        let menu_bar = menu_bar.clone();
+        event_loop_builder.with_msg_hook(move |msg| {
+            use windows_sys::Win32::UI::WindowsAndMessaging::{TranslateAcceleratorW, MSG};
+            unsafe {
+                let msg = msg as *const MSG;
+                let translated = TranslateAcceleratorW((*msg).hwnd, menu_bar.haccel() as _, msg);
+                translated == 1
+            }
+        });
+    }
+
+    let event_loop = event_loop_builder.build();
+
+    let window = WindowBuilder::new()
+        .with_title("Window 1")
+        .build(&event_loop)
+        .unwrap();
+    let window2 = WindowBuilder::new()
+        .with_title("Window 2")
+        .build(&event_loop)
+        .unwrap();
+
+    #[cfg(target_os = "macos")]
+    {
+        let app_m = Submenu::new("App", true);
+        menu_bar.append(&app_m);
+        app_m.append_items(&[
+            &PredefinedMenuItem::about(None, None),
+            &PredefinedMenuItem::separator(),
+            &PredefinedMenuItem::services(None),
+            &PredefinedMenuItem::separator(),
+            &PredefinedMenuItem::hide(None),
+            &PredefinedMenuItem::hide_others(None),
+            &PredefinedMenuItem::show_all(None),
+            &PredefinedMenuItem::separator(),
+            &PredefinedMenuItem::quit(None),
+        ]);
+    }
+
+    let file_m = Submenu::new("&File", true);
+    let edit_m = Submenu::new("&Edit", true);
+    let window_m = Submenu::new("&Window", true);
+
+    menu_bar.append_items(&[&file_m, &edit_m, &window_m]);
+
+    let custom_i_1 = MenuItem::new(
+        "C&ustom 1",
+        true,
+        Some(Accelerator::new(Some(Modifiers::ALT), Code::KeyC)),
+    );
+
+    let path = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/icon.png");
+    let icon = load_icon(std::path::Path::new(path));
+
+    let image_item = IconMenuItem::new("Image Custom 1", true, Some(icon), None);
+
+    let check_custom_i_1 = CheckMenuItem::new("Check Custom 1", true, true, None);
+    let check_custom_i_2 = CheckMenuItem::new("Check Custom 2", false, true, None);
+    let check_custom_i_3 = CheckMenuItem::new(
+        "Check Custom 3",
+        true,
+        true,
+        Some(Accelerator::new(Some(Modifiers::SHIFT), Code::KeyD)),
+    );
+
+    let copy_i = PredefinedMenuItem::copy(None);
+    let cut_i = PredefinedMenuItem::cut(None);
+    let paste_i = PredefinedMenuItem::paste(None);
+
+    file_m.append_items(&[
+        &custom_i_1,
+        &image_item,
+        &window_m,
+        &PredefinedMenuItem::separator(),
+        &check_custom_i_1,
+        &check_custom_i_2,
+    ]);
+
+    window_m.append_items(&[
+        &PredefinedMenuItem::minimize(None),
+        &PredefinedMenuItem::maximize(None),
+        &PredefinedMenuItem::close_window(Some("Close")),
+        &PredefinedMenuItem::fullscreen(None),
+        &PredefinedMenuItem::bring_all_to_front(None),
+        &PredefinedMenuItem::about(
+            None,
+            Some(AboutMetadata {
+                name: Some("tao".to_string()),
+                version: Some("1.2.3".to_string()),
+                copyright: Some("Copyright tao".to_string()),
+                ..Default::default()
+            }),
+        ),
+        &check_custom_i_3,
+        &image_item,
+        &custom_i_1,
+    ]);
+
+    edit_m.append_items(&[&copy_i, &PredefinedMenuItem::separator(), &paste_i]);
+
+    #[cfg(target_os = "windows")]
+    unsafe {
+        use tao::rwh_06::*;
+        if let RawWindowHandle::Win32(handle) = window.window_handle().unwrap().as_raw() {
+            menu_bar.init_for_hwnd(handle.hwnd.get()).unwrap();
+        }
+        if let RawWindowHandle::Win32(handle) = window2.window_handle().unwrap().as_raw() {
+            menu_bar.init_for_hwnd(handle.hwnd.get()).unwrap();
+        }
+    }
+    #[cfg(target_os = "macos")]
+    {
+        menu_bar.init_for_nsapp();
+        window_m.set_as_windows_menu_for_nsapp();
+    }
+
+    let menu_channel = MenuEvent::receiver();
+    let mut window_cursor_position = PhysicalPosition { x: 0., y: 0. };
+    let mut use_window_pos = false;
+
+    event_loop.run(move |event, event_loop, control_flow| {
+        *control_flow = ControlFlow::Wait;
+
+        match event {
+            Event::WindowEvent {
+                event: WindowEvent::CloseRequested,
+                ..
+            } => *control_flow = ControlFlow::Exit,
+            Event::WindowEvent {
+                event: WindowEvent::CursorMoved { position, .. },
+                window_id,
+                ..
+            } => {
+                window_cursor_position.x = position.x;
+                window_cursor_position.y = position.y;
+            }
+            Event::WindowEvent {
+                event:
+                    WindowEvent::MouseInput {
+                        state: ElementState::Pressed,
+                        button: MouseButton::Right,
+                        ..
+                    },
+                window_id,
+                ..
+            } => {
+                show_context_menu(
+                    if window_id == window.id() {
+                        &window
+                    } else {
+                        &window2
+                    },
+                    &file_m,
+                    if use_window_pos {
+                        Some(window_cursor_position.into())
+                    } else {
+                        None
+                    },
+                );
+                use_window_pos = !use_window_pos;
+            }
+            _ => (),
+        }
+
+        if let Ok(event) = menu_channel.try_recv() {
+            if event.id == custom_i_1.id() {
+                file_m.insert(&MenuItem::new("New Menu Item", true, None), 2);
+            }
+            println!("{event:?}");
+        }
+    });
+}
+
+fn show_context_menu(window: &Window, menu: &dyn ContextMenu, position: Option<Position>) {
+    println!("Show context menu at position {position:?}");
+    #[cfg(target_os = "windows")]
+    {
+        use tao::rwh_06::*;
+        if let RawWindowHandle::Win32(handle) = window.window_handle().unwrap().as_raw() {
+            unsafe { menu.show_context_menu_for_hwnd(handle.hwnd.get(), position) };
+        }
+    }
+
+    #[cfg(target_os = "macos")]
+    {
+        use tao::rwh_06::*;
+        if let RawWindowHandle::AppKit(handle) = window.window_handle().unwrap().as_raw() {
+            unsafe { menu.show_context_menu_for_nsview(handle.ns_view.as_ptr() as _, position) };
+        }
+    }
+
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    ))]
+    {
+        let _ = (window, menu, position);
+        // This Windows-focused example does not wire a GTK4 context-menu parent yet.
+    }
+}
+
+fn load_icon(path: &std::path::Path) -> muda::Icon {
+    let (icon_rgba, icon_width, icon_height) = {
+        let image = image::open(path)
+            .expect("Failed to open icon path")
+            .into_rgba8();
+        let (width, height) = image.dimensions();
+        let rgba = image.into_raw();
+        (rgba, width, height)
+    };
+    muda::Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon")
+}
diff --git a/ports/muda/examples/winit.rs b/ports/muda/examples/winit.rs
new file mode 100644
index 000000000000..642cd706d0b5
--- /dev/null
+++ b/ports/muda/examples/winit.rs
@@ -0,0 +1,303 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+#![allow(unused)]
+use std::collections::HashMap;
+
+use muda::{
+    accelerator::{Accelerator, Code, Modifiers},
+    dpi::{PhysicalPosition, Position},
+    AboutMetadata, CheckMenuItem, ContextMenu, IconMenuItem, Menu, MenuEvent, MenuItem,
+    PredefinedMenuItem, Submenu,
+};
+#[cfg(target_os = "macos")]
+use winit::platform::macos::{EventLoopBuilderExtMacOS, WindowExtMacOS};
+#[cfg(target_os = "windows")]
+use winit::platform::windows::{EventLoopBuilderExtWindows, WindowExtWindows};
+#[cfg(any(windows, target_os = "macos"))]
+use winit::raw_window_handle::*;
+use winit::{
+    application::ApplicationHandler,
+    event::{ElementState, Event, MouseButton, StartCause, WindowEvent},
+    event_loop::{ActiveEventLoop, ControlFlow, EventLoop, EventLoopBuilder},
+    window::{Window, WindowAttributes, WindowId},
+};
+
+enum AppEvent {
+    MenuEvent(muda::MenuEvent),
+}
+
+fn main() {
+    let mut event_loop_builder = EventLoop::<AppEvent>::with_user_event();
+
+    let menu_bar = Menu::new();
+
+    // setup accelerator handler on Windows
+    #[cfg(target_os = "windows")]
+    {
+        let menu_bar = menu_bar.clone();
+        event_loop_builder.with_msg_hook(move |msg| {
+            use windows_sys::Win32::UI::WindowsAndMessaging::{TranslateAcceleratorW, MSG};
+            unsafe {
+                let msg = msg as *const MSG;
+                let translated = TranslateAcceleratorW((*msg).hwnd, menu_bar.haccel() as _, msg);
+                translated == 1
+            }
+        });
+    }
+    #[cfg(target_os = "macos")]
+    event_loop_builder.with_default_menu(false);
+
+    let event_loop = event_loop_builder.build().unwrap();
+
+    // set a menu event handler that wakes up the event loop
+    let proxy = event_loop.create_proxy();
+    muda::MenuEvent::set_event_handler(Some(move |event| {
+        proxy.send_event(AppEvent::MenuEvent(event));
+    }));
+
+    let mut app = App {
+        app_menu: AppMenu::new(menu_bar),
+        windows: HashMap::default(),
+        cursor_position: PhysicalPosition::new(0., 0.),
+        use_window_pos: false,
+    };
+
+    event_loop.run_app(&mut app).unwrap()
+}
+
+struct App {
+    app_menu: AppMenu,
+    windows: HashMap<WindowId, Window>,
+    cursor_position: PhysicalPosition<f64>,
+    use_window_pos: bool,
+}
+
+impl ApplicationHandler<AppEvent> for App {
+    fn resumed(&mut self, event_loop: &ActiveEventLoop) {}
+
+    fn new_events(&mut self, event_loop: &ActiveEventLoop, cause: StartCause) {
+        if cause == StartCause::Init {
+            let window_attrs = WindowAttributes::default().with_title("Window 1");
+            let window = event_loop.create_window(window_attrs).unwrap();
+
+            let window_attrs2 = WindowAttributes::default().with_title("Window 2");
+            let window2 = event_loop.create_window(window_attrs2).unwrap();
+
+            #[cfg(target_os = "windows")]
+            {
+                use winit::raw_window_handle::*;
+                if let RawWindowHandle::Win32(handle) = window.window_handle().unwrap().as_raw() {
+                    unsafe { self.app_menu.menu_bar.init_for_hwnd(handle.hwnd.get()) };
+                }
+                if let RawWindowHandle::Win32(handle) = window2.window_handle().unwrap().as_raw() {
+                    unsafe { self.app_menu.menu_bar.init_for_hwnd(handle.hwnd.get()) };
+                }
+            }
+            #[cfg(target_os = "macos")]
+            {
+                self.app_menu.menu_bar.init_for_nsapp();
+                self.app_menu.window_menu.set_as_windows_menu_for_nsapp();
+                self.app_menu.custom_help_menu.set_as_help_menu_for_nsapp();
+            }
+
+            self.windows.insert(window.id(), window);
+            self.windows.insert(window2.id(), window2);
+        }
+    }
+
+    fn window_event(
+        &mut self,
+        event_loop: &ActiveEventLoop,
+        window_id: WindowId,
+        event: WindowEvent,
+    ) {
+        match event {
+            WindowEvent::CloseRequested => {
+                self.windows.remove(&window_id);
+                if self.windows.is_empty() {
+                    event_loop.exit();
+                }
+            }
+
+            WindowEvent::CursorMoved { position, .. } => {
+                self.cursor_position = position;
+            }
+
+            WindowEvent::MouseInput {
+                button: MouseButton::Right,
+                state: ElementState::Pressed,
+                ..
+            } => {
+                show_context_menu(
+                    self.windows.get(&window_id).unwrap(),
+                    &self.app_menu.file_menu,
+                    if self.use_window_pos {
+                        Some(self.cursor_position.into())
+                    } else {
+                        None
+                    },
+                );
+                self.use_window_pos = !self.use_window_pos;
+            }
+
+            _ => {}
+        }
+    }
+
+    fn user_event(&mut self, event_loop: &ActiveEventLoop, event: AppEvent) {
+        match event {
+            AppEvent::MenuEvent(event) => {
+                println!("{event:?}");
+
+                if event.id == self.app_menu.custom_item.id() {
+                    let new_item = MenuItem::new("New Menu Item", true, None);
+                    self.app_menu.file_menu.insert(&new_item, 2);
+                }
+            }
+        }
+    }
+}
+
+struct AppMenu {
+    menu_bar: Menu,
+    file_menu: Submenu,
+    edit_menu: Submenu,
+    window_menu: Submenu,
+    custom_help_menu: Submenu,
+    custom_item: MenuItem,
+}
+
+impl AppMenu {
+    fn new(menu_bar: Menu) -> Self {
+        #[cfg(target_os = "macos")]
+        {
+            let app_menu = Submenu::new("App", true);
+            app_menu.append_items(&[
+                &PredefinedMenuItem::about(None, None),
+                &PredefinedMenuItem::separator(),
+                &PredefinedMenuItem::services(None),
+                &PredefinedMenuItem::separator(),
+                &PredefinedMenuItem::hide(None),
+                &PredefinedMenuItem::hide_others(None),
+                &PredefinedMenuItem::show_all(None),
+                &PredefinedMenuItem::separator(),
+                &PredefinedMenuItem::quit(None),
+            ]);
+            menu_bar.append(&app_menu);
+        }
+
+        let path = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/icon.png");
+        let icon = load_icon(std::path::Path::new(path));
+
+        let file_menu = Submenu::new("&File", true);
+        let edit_menu = Submenu::new("&Edit", true);
+        let window_menu = Submenu::new("&Window", true);
+
+        window_menu.set_icon(Some(icon.clone()));
+
+        menu_bar.append_items(&[&file_menu, &edit_menu, &window_menu]);
+
+        let custom_i_1 = MenuItem::new(
+            "C&ustom 1",
+            true,
+            Some(Accelerator::new(Some(Modifiers::ALT), Code::KeyC)),
+        );
+
+        let image_item = IconMenuItem::new("Image Custom 1", true, Some(icon), None);
+
+        let check_custom_i_1 = CheckMenuItem::new("Check Custom 1", true, true, None);
+        let check_custom_i_2 = CheckMenuItem::new("Check Custom 2", false, true, None);
+        let check_custom_i_3 = CheckMenuItem::new(
+            "Check Custom 3",
+            true,
+            true,
+            Some(Accelerator::new(Some(Modifiers::SHIFT), Code::KeyD)),
+        );
+
+        let copy_i = PredefinedMenuItem::copy(None);
+        let cut_i = PredefinedMenuItem::cut(None);
+        let paste_i = PredefinedMenuItem::paste(None);
+
+        file_menu.append_items(&[
+            &custom_i_1,
+            &image_item,
+            &window_menu,
+            &PredefinedMenuItem::separator(),
+            &check_custom_i_1,
+            &check_custom_i_2,
+        ]);
+
+        window_menu.append_items(&[
+            &PredefinedMenuItem::minimize(None),
+            &PredefinedMenuItem::maximize(None),
+            &PredefinedMenuItem::close_window(Some("Close")),
+            &PredefinedMenuItem::fullscreen(None),
+            &PredefinedMenuItem::bring_all_to_front(None),
+            &PredefinedMenuItem::about(
+                None,
+                Some(AboutMetadata {
+                    name: Some("winit".to_string()),
+                    version: Some("1.2.3".to_string()),
+                    copyright: Some("Copyright winit".to_string()),
+                    ..Default::default()
+                }),
+            ),
+            &check_custom_i_3,
+            &image_item,
+            &custom_i_1,
+        ]);
+
+        edit_menu.append_items(&[&copy_i, &PredefinedMenuItem::separator(), &paste_i]);
+
+        let custom_help_menu = Submenu::new("Help", true);
+        custom_help_menu.append_items(&[&MenuItem::new(
+            "Supposed to show a search bar on macOS",
+            true,
+            None,
+        )]);
+        menu_bar.append(&custom_help_menu);
+
+        Self {
+            menu_bar,
+            file_menu,
+            edit_menu,
+            window_menu,
+            custom_help_menu,
+            custom_item: custom_i_1,
+        }
+    }
+}
+
+fn show_context_menu(window: &Window, menu: &dyn ContextMenu, position: Option<Position>) {
+    println!("Show context menu at position {position:?}");
+    #[cfg(target_os = "windows")]
+    {
+        if let RawWindowHandle::Win32(handle) = window.window_handle().unwrap().as_raw() {
+            unsafe { menu.show_context_menu_for_hwnd(handle.hwnd.get(), position) };
+        }
+    }
+    #[cfg(target_os = "macos")]
+    {
+        if let RawWindowHandle::AppKit(handle) = window.window_handle().unwrap().as_raw() {
+            unsafe { menu.show_context_menu_for_nsview(handle.ns_view.as_ptr() as _, position) };
+        }
+    }
+}
+
+fn load_icon(path: &std::path::Path) -> muda::Icon {
+    let (icon_rgba, icon_width, icon_height) = {
+        let image = image::open(path)
+            .expect("Failed to open icon path")
+            .into_rgba8();
+        let (width, height) = image.dimensions();
+        let rgba = image.into_raw();
+        (rgba, width, height)
+    };
+    muda::Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon")
+}
diff --git a/ports/muda/examples/wry.rs b/ports/muda/examples/wry.rs
new file mode 100644
index 000000000000..045e1790398c
--- /dev/null
+++ b/ports/muda/examples/wry.rs
@@ -0,0 +1,407 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+#![allow(unused)]
+use std::rc::Rc;
+
+use muda::{
+    accelerator::{Accelerator, Code, Key, KeyAccelerator, Modifiers},
+    dpi::Position,
+    AboutMetadata, CheckMenuItem, ContextMenu, IconMenuItem, Menu, MenuEvent, MenuItem,
+    PredefinedMenuItem, Submenu,
+};
+#[cfg(target_os = "macos")]
+use tao::platform::macos::WindowExtMacOS;
+#[cfg(any(
+    target_os = "linux",
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
+use tao::platform::unix::WindowExtUnix;
+#[cfg(target_os = "windows")]
+use tao::platform::windows::{EventLoopBuilderExtWindows, WindowExtWindows};
+use tao::{
+    event::{Event, WindowEvent},
+    event_loop::{ControlFlow, EventLoopBuilder},
+    window::{Window, WindowBuilder, WindowId},
+};
+#[cfg(any(
+    target_os = "linux",
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
+use wry::WebViewBuilderExtUnix;
+use wry::{http::Request, WebViewBuilder};
+
+enum UserEvent {
+    MenuEvent(muda::MenuEvent),
+    ShowContextMenu {
+        window_id: WindowId,
+        position: Option<Position>,
+    },
+}
+
+fn main() -> wry::Result<()> {
+    let mut event_loop_builder = EventLoopBuilder::<UserEvent>::with_user_event();
+
+    let menu_bar = Menu::new();
+
+    // setup accelerator handler on Windows
+    #[cfg(target_os = "windows")]
+    {
+        let menu_bar = menu_bar.clone();
+        event_loop_builder.with_msg_hook(move |msg| {
+            use windows_sys::Win32::UI::WindowsAndMessaging::{TranslateAcceleratorW, MSG};
+            unsafe {
+                let msg = msg as *const MSG;
+                let translated = TranslateAcceleratorW((*msg).hwnd, menu_bar.haccel() as _, msg);
+                translated == 1
+            }
+        });
+    }
+
+    let event_loop = event_loop_builder.build();
+
+    // set a menu event handler that wakes up the event loop
+    let proxy = event_loop.create_proxy();
+    muda::MenuEvent::set_event_handler(Some(move |event| {
+        proxy.send_event(UserEvent::MenuEvent(event));
+    }));
+
+    let window = WindowBuilder::new()
+        .with_title("Window 1")
+        .build(&event_loop)
+        .unwrap();
+
+    let window2 = WindowBuilder::new()
+        .with_title("Window 2")
+        .build(&event_loop)
+        .unwrap();
+
+    #[cfg(target_os = "macos")]
+    {
+        let app_m = Submenu::new("App", true);
+        menu_bar.append(&app_m).unwrap();
+        app_m
+            .append_items(&[
+                &PredefinedMenuItem::about(None, None),
+                &PredefinedMenuItem::separator(),
+                &PredefinedMenuItem::services(None),
+                &PredefinedMenuItem::separator(),
+                &PredefinedMenuItem::hide(None),
+                &PredefinedMenuItem::hide_others(None),
+                &PredefinedMenuItem::show_all(None),
+                &PredefinedMenuItem::separator(),
+                &PredefinedMenuItem::quit(None),
+            ])
+            .unwrap();
+    }
+
+    let path = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/icon.png");
+    let icon = load_icon(std::path::Path::new(path));
+
+    let file_m = Submenu::new("&File", true);
+    let edit_m = Submenu::new("&Edit", true);
+    let window_m = Submenu::new("&Window", true);
+
+    window_m.set_icon(Some(icon.clone()));
+
+    menu_bar
+        .append_items(&[&file_m, &edit_m, &window_m])
+        .unwrap();
+
+    let custom_i_1 = MenuItem::new("C&ustom 1", true, None);
+    custom_i_1.set_key_accelerator(Some(KeyAccelerator::new(
+        Some(Modifiers::CONTROL),
+        Key::Character("+".into()),
+    )));
+
+    let image_item = IconMenuItem::new(
+        "Image custom 1",
+        true,
+        Some(icon),
+        Some(Accelerator::new(Some(Modifiers::CONTROL), Code::KeyC)),
+    );
+
+    let check_custom_i_1 = CheckMenuItem::new("Check Custom 1", true, true, None);
+    let check_custom_i_2 = CheckMenuItem::new("Check Custom 2", false, true, None);
+    let check_custom_i_3 = CheckMenuItem::new(
+        "Check Custom 3",
+        true,
+        true,
+        Some(Accelerator::new(Some(Modifiers::SHIFT), Code::KeyD)),
+    );
+
+    let copy_i = PredefinedMenuItem::copy(None);
+    let cut_i = PredefinedMenuItem::cut(None);
+    let paste_i = PredefinedMenuItem::paste(None);
+
+    file_m
+        .append_items(&[
+            &custom_i_1,
+            &image_item,
+            &window_m,
+            &PredefinedMenuItem::separator(),
+            &check_custom_i_1,
+            &check_custom_i_2,
+        ])
+        .unwrap();
+
+    window_m
+        .append_items(&[
+            &PredefinedMenuItem::minimize(None),
+            &PredefinedMenuItem::maximize(None),
+            &PredefinedMenuItem::close_window(Some("Close")),
+            &PredefinedMenuItem::fullscreen(None),
+            &PredefinedMenuItem::bring_all_to_front(None),
+            &PredefinedMenuItem::about(
+                None,
+                Some(AboutMetadata {
+                    name: Some("tao".to_string()),
+                    version: Some("1.2.3".to_string()),
+                    copyright: Some("Copyright tao".to_string()),
+                    ..Default::default()
+                }),
+            ),
+            &check_custom_i_3,
+            &image_item,
+            &custom_i_1,
+        ])
+        .unwrap();
+
+    edit_m
+        .append_items(&[
+            &copy_i,
+            &PredefinedMenuItem::separator(),
+            &cut_i,
+            &PredefinedMenuItem::separator(),
+            &paste_i,
+        ])
+        .unwrap();
+
+    #[cfg(target_os = "windows")]
+    unsafe {
+        menu_bar.init_for_hwnd(window.hwnd() as _).unwrap();
+        menu_bar.init_for_hwnd(window2.hwnd() as _).unwrap();
+    }
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    ))]
+    {
+        // Pending a tao release on gtk4; muda's gtk API now takes gtk4 types.
+        // menu_bar
+        //     .init_for_gtk_window(window.gtk_window(), window.default_vbox())
+        //     .unwrap();
+        // menu_bar
+        //     .init_for_gtk_window(window2.gtk_window(), window2.default_vbox())
+        //     .unwrap();
+        let _ = (&menu_bar, &window, &window2);
+    }
+    #[cfg(target_os = "macos")]
+    {
+        menu_bar.init_for_nsapp();
+        window_m.set_as_windows_menu_for_nsapp();
+    }
+
+    #[cfg(windows)]
+    let condition = "e.button !== 2";
+    #[cfg(not(windows))]
+    let condition = "e.button == 2 && e.buttons === 0";
+    let html: String = format!(
+        r#"
+    <html>
+    <body>
+        <style>
+            * {{
+                padding: 0;
+                margin: 0;
+                box-sizing: border-box;
+                font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+            }}
+            main {{
+                    width: 100vw;
+                    height: 100vh;
+            }}
+            @media (prefers-color-scheme: dark) {{
+                main {{
+                    color: #fff;
+                    background: #2f2f2f;
+                }}
+            }}
+        </style>
+        <main>
+            <h4> WRYYYYYYYYYYYYYYYYYYYYYY! </h4>
+        </main>
+        <script>
+            window.addEventListener('contextmenu', (e) => {{
+                e.preventDefault();
+                console.log(e)
+                // contextmenu was requested from keyboard
+                if ({condition}) {{
+                    window.ipc.postMessage(`showContextMenuPos:${{e.clientX}},${{e.clientY}}`);
+                }}
+            }})
+            let x = true;
+            window.addEventListener('mouseup', (e) => {{
+                if (e.button === 2) {{
+                    if (x) {{
+                        window.ipc.postMessage(`showContextMenuPos:${{e.clientX}},${{e.clientY}}`);
+                    }} else {{
+                        window.ipc.postMessage(`showContextMenu`);
+                    }}
+                    x = !x;
+                }}
+            }})
+        </script>
+    </body>
+    </html>
+  "#,
+    );
+
+    let window = Rc::new(window);
+    let window2 = Rc::new(window2);
+
+    let ipc_proxy = event_loop.create_proxy();
+    let create_ipc_handler = |window: &Rc<Window>| {
+        let window_id = window.id();
+        let proxy = ipc_proxy.clone();
+        move |req: Request<String>| {
+            let req = req.body();
+            let position = if req == "showContextMenu" {
+                None
+            } else if let Some(rest) = req.strip_prefix("showContextMenuPos:") {
+                let (x, y) = rest
+                    .split_once(',')
+                    .map(|(x, y)| (x.parse::<i32>().unwrap(), y.parse::<i32>().unwrap()))
+                    .unwrap();
+                Some(Position::Logical((x, y).into()))
+            } else {
+                return;
+            };
+
+            let _ = proxy.send_event(UserEvent::ShowContextMenu {
+                window_id,
+                position,
+            });
+        }
+    };
+
+    fn create_webview() -> WebViewBuilder<'static> {
+        WebViewBuilder::new()
+    }
+
+    fn build_webview(builder: WebViewBuilder<'_>, window: &Window) -> wry::Result<wry::WebView> {
+        #[cfg(not(any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        )))]
+        return builder.build(window);
+
+        #[cfg(any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ))]
+        {
+            builder.build_gtk(window.default_vbox().unwrap())
+        }
+    }
+
+    let webview = build_webview(
+        create_webview()
+            .with_html(&html)
+            .with_ipc_handler(create_ipc_handler(&window)),
+        &window,
+    )?;
+    let webview2 = build_webview(
+        create_webview()
+            .with_html(html)
+            .with_ipc_handler(create_ipc_handler(&window2)),
+        &window2,
+    )?;
+
+    let menu_channel = MenuEvent::receiver();
+
+    event_loop.run(move |event, _, control_flow| {
+        *control_flow = ControlFlow::Wait;
+
+        match event {
+            Event::WindowEvent {
+                event: WindowEvent::CloseRequested,
+                ..
+            } => *control_flow = ControlFlow::Exit,
+
+            Event::UserEvent(UserEvent::MenuEvent(event)) => {
+                if event.id == custom_i_1.id() {
+                    file_m.insert(&MenuItem::new("New Menu Item", true, None), 2);
+                }
+                println!("{event:?}");
+            }
+            Event::UserEvent(UserEvent::ShowContextMenu {
+                window_id,
+                position,
+            }) => {
+                if window_id == window.id() {
+                    show_context_menu(&window, &file_m, position);
+                } else if window_id == window2.id() {
+                    show_context_menu(&window2, &file_m, position);
+                }
+            }
+            _ => {}
+        }
+    })
+}
+
+fn show_context_menu(window: &Window, menu: &dyn ContextMenu, position: Option<Position>) {
+    println!("Show context menu at position {position:?}");
+    #[cfg(target_os = "windows")]
+    unsafe {
+        menu.show_context_menu_for_hwnd(window.hwnd() as _, position);
+    }
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    ))]
+    {
+        // Pending a tao release on gtk4; muda's gtk API now takes gtk4 types.
+        // menu.show_context_menu_for_gtk_window(window.gtk_window().as_ref(), position);
+        let _ = (window, menu, position);
+    }
+    #[cfg(target_os = "macos")]
+    unsafe {
+        menu.show_context_menu_for_nsview(window.ns_view() as _, position);
+    }
+}
+
+fn load_icon(path: &std::path::Path) -> muda::Icon {
+    let (icon_rgba, icon_width, icon_height) = {
+        let image = image::open(path)
+            .expect("Failed to open icon path")
+            .into_rgba8();
+        let (width, height) = image.dimensions();
+        let rgba = image.into_raw();
+        (rgba, width, height)
+    };
+    muda::Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon")
+}
diff --git a/ports/muda/renovate.json b/ports/muda/renovate.json
new file mode 100644
index 000000000000..043faf790d0a
--- /dev/null
+++ b/ports/muda/renovate.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:base", ":disableDependencyDashboard"]
+}
diff --git a/ports/muda/rustfmt.toml b/ports/muda/rustfmt.toml
new file mode 100644
index 000000000000..f8e8a75063c9
--- /dev/null
+++ b/ports/muda/rustfmt.toml
@@ -0,0 +1,12 @@
+max_width = 100
+hard_tabs = false
+tab_spaces = 4
+newline_style = "Unix"
+use_small_heuristics = "Default"
+reorder_imports = true
+reorder_modules = true
+edition = "2021"
+merge_derives = true
+use_try_shorthand = false
+use_field_init_shorthand = false
+force_explicit_abi = true
diff --git a/ports/muda/src/about_metadata.rs b/ports/muda/src/about_metadata.rs
new file mode 100644
index 000000000000..2dca5940b3d7
--- /dev/null
+++ b/ports/muda/src/about_metadata.rs
@@ -0,0 +1,262 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+//! Types and functions to create [`AboutMetadata`] for the [`PredefinedMenuItem::about`](crate::PredefinedMenuItem::about) dialog.
+
+use crate::icon::Icon;
+
+/// Application metadata for the [`PredefinedMenuItem::about`](crate::PredefinedMenuItem::about) dialog.
+#[derive(Debug, Clone, Default)]
+pub struct AboutMetadata {
+    /// Sets the application name.
+    pub name: Option<String>,
+    /// The application version.
+    pub version: Option<String>,
+    /// The short version, e.g. "1.0".
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Windows / Linux:** Appended to the end of `version` in parentheses.
+    pub short_version: Option<String>,
+    /// The authors of the application.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **macOS:** Unsupported.
+    pub authors: Option<Vec<String>>,
+    /// Application comments.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **macOS:** Unsupported.
+    pub comments: Option<String>,
+    /// The copyright of the application.
+    pub copyright: Option<String>,
+    /// The license of the application.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **macOS:** Unsupported.
+    pub license: Option<String>,
+    /// The application website.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **macOS:** Unsupported.
+    pub website: Option<String>,
+    /// The website label.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **macOS:** Unsupported.
+    pub website_label: Option<String>,
+    /// The credits.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Windows / Linux:** Unsupported.
+    pub credits: Option<String>,
+    /// The application icon.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Windows:** Unsupported.
+    pub icon: Option<Icon>,
+}
+
+impl AboutMetadata {
+    #[allow(unused)]
+    pub(crate) fn full_version(&self) -> Option<String> {
+        Some(format!(
+            "{}{}",
+            (self.version.as_ref())?,
+            (self.short_version.as_ref())
+                .map(|v| format!(" ({v})"))
+                .unwrap_or_default()
+        ))
+    }
+}
+
+/// Creates [`AboutMetadata`] from [Cargo metadata][cargo]. The following fields are set by this function.
+///
+/// - [`AboutMetadata::name`] (from `CARGO_PKG_NAME`)
+/// - [`AboutMetadata::version`] (from `CARGO_PKG_VERSION`)
+/// - [`AboutMetadata::short_version`] (from `CARGO_PKG_VERSION_MAJOR` and `CARGO_PKG_VERSION_MINOR`)
+/// - [`AboutMetadata::authors`] (from `CARGO_PKG_AUTHORS`)
+/// - [`AboutMetadata::comments`] (from `CARGO_PKG_DESCRIPTION`)
+/// - [`AboutMetadata::license`] (from `CARGO_PKG_LICENSE`)
+/// - [`AboutMetadata::website`] (from `CARGO_PKG_HOMEPAGE`)
+///
+/// [cargo]: https://doc.rust-lang.org/cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-crates
+#[macro_export]
+#[doc(hidden)]
+macro_rules! from_cargo_metadata {
+    () => {{
+        #[allow(unused_mut)]
+        let mut m = $crate::about_metadata::AboutMetadata {
+            name: Some(::std::env!("CARGO_PKG_NAME").into()),
+            version: Some(::std::env!("CARGO_PKG_VERSION").into()),
+            short_version: Some(::std::format!(
+                "{}.{}",
+                env!("CARGO_PKG_VERSION_MAJOR"),
+                env!("CARGO_PKG_VERSION_MINOR"),
+            )),
+            ..::std::default::Default::default()
+        };
+
+        #[cfg(not(target_os = "macos"))]
+        {
+            let authors = env!("CARGO_PKG_AUTHORS")
+                .split(':')
+                .map(|a| a.trim().to_string())
+                .collect::<::std::vec::Vec<_>>();
+
+            m.authors = if !authors.is_empty() {
+                Some(authors)
+            } else {
+                None
+            };
+
+            #[inline]
+            fn non_empty(s: &str) -> Option<String> {
+                if !s.is_empty() {
+                    Some(s.to_string())
+                } else {
+                    None
+                }
+            }
+
+            m.comments = non_empty(::std::env!("CARGO_PKG_DESCRIPTION"));
+            m.license = non_empty(::std::env!("CARGO_PKG_LICENSE"));
+            m.website = non_empty(::std::env!("CARGO_PKG_HOMEPAGE"));
+        }
+
+        m
+    }};
+}
+
+pub use from_cargo_metadata;
+
+/// A builder type for [`AboutMetadata`].
+#[derive(Clone, Debug, Default)]
+pub struct AboutMetadataBuilder(AboutMetadata);
+
+impl AboutMetadataBuilder {
+    pub fn new() -> Self {
+        Default::default()
+    }
+
+    /// Sets the application name.
+    pub fn name<S: Into<String>>(mut self, name: Option<S>) -> Self {
+        self.0.name = name.map(|s| s.into());
+        self
+    }
+    /// Sets the application version.
+    pub fn version<S: Into<String>>(mut self, version: Option<S>) -> Self {
+        self.0.version = version.map(|s| s.into());
+        self
+    }
+    /// Sets the short version, e.g. "1.0".
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Windows / Linux:** Appended to the end of `version` in parentheses.
+    pub fn short_version<S: Into<String>>(mut self, short_version: Option<S>) -> Self {
+        self.0.short_version = short_version.map(|s| s.into());
+        self
+    }
+    /// Sets the authors of the application.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **macOS:** Unsupported.
+    pub fn authors(mut self, authors: Option<Vec<String>>) -> Self {
+        self.0.authors = authors;
+        self
+    }
+    /// Application comments.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **macOS:** Unsupported.
+    pub fn comments<S: Into<String>>(mut self, comments: Option<S>) -> Self {
+        self.0.comments = comments.map(|s| s.into());
+        self
+    }
+    /// Sets the copyright of the application.
+    pub fn copyright<S: Into<String>>(mut self, copyright: Option<S>) -> Self {
+        self.0.copyright = copyright.map(|s| s.into());
+        self
+    }
+    /// Sets the license of the application.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **macOS:** Unsupported.
+    pub fn license<S: Into<String>>(mut self, license: Option<S>) -> Self {
+        self.0.license = license.map(|s| s.into());
+        self
+    }
+    /// Sets the application website.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **macOS:** Unsupported.
+    pub fn website<S: Into<String>>(mut self, website: Option<S>) -> Self {
+        self.0.website = website.map(|s| s.into());
+        self
+    }
+    /// Sets the website label.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **macOS:** Unsupported.
+    pub fn website_label<S: Into<String>>(mut self, website_label: Option<S>) -> Self {
+        self.0.website_label = website_label.map(|s| s.into());
+        self
+    }
+    /// Sets the credits.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Windows / Linux:** Unsupported.
+    pub fn credits<S: Into<String>>(mut self, credits: Option<S>) -> Self {
+        self.0.credits = credits.map(|s| s.into());
+        self
+    }
+    /// Sets the application icon.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Windows:** Unsupported.
+    pub fn icon(mut self, icon: Option<Icon>) -> Self {
+        self.0.icon = icon;
+        self
+    }
+
+    /// Construct the final [`AboutMetadata`]
+    pub fn build(self) -> AboutMetadata {
+        self.0
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    #[test]
+    fn test_build_from_metadata() {
+        let m = from_cargo_metadata!();
+        assert_eq!(m.name, Some("muda".to_string()));
+        assert!(m.version.is_some());
+        assert!(m.short_version.is_some());
+
+        #[cfg(not(target_os = "macos"))]
+        {
+            assert!(matches!(m.authors, Some(a) if !a.is_empty()));
+            assert!(m.comments.is_some());
+            assert!(m.license.is_some());
+            // Note: `m.website` is not tested because this package doesn't have the "website" field
+        }
+    }
+}
diff --git a/ports/muda/src/accelerator.rs b/ports/muda/src/accelerator.rs
new file mode 100644
index 000000000000..35b0c98bd725
--- /dev/null
+++ b/ports/muda/src/accelerator.rs
@@ -0,0 +1,875 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+//! Accelerators describe keyboard shortcuts for menu items.
+//!
+//! [`KeyAccelerator`s](crate::accelerator::KeyAccelerator) are used to define a keyboard
+//! shortcut based on logical keys, which allows expressing shortcuts like `Ctrl++` or `Ctrl+€`
+//! that physical key codes cannot represent.
+//! For this reason, prefer to use [`KeyAccelerator`s](crate::accelerator::KeyAccelerator) over the older [`Accelerator`s](crate::accelerator::Accelerator).
+//!
+//! # Examples
+//! They can be created directly
+//! ```no_run
+//! # use muda::accelerator::*;
+//! let key_accelerator = KeyAccelerator::new(Some(Modifiers::SHIFT), Key::Character("q".to_owned()));
+//! let key_accelerator_without_mods = KeyAccelerator::new(None, Key::Character("q".to_owned()));
+//!
+//! let accelerator = Accelerator::new(Some(Modifiers::SHIFT), Code::KeyQ);
+//! let accelerator_without_mods = Accelerator::new(None, Code::KeyQ);
+//! ```
+//! or from `&str`, note that all modifiers
+//! have to be listed before the non-modifier key, `shift+alt+KeyQ` is legal,
+//! whereas `shift+q+alt` is not.
+//! ```no_run
+//! # use muda::accelerator::*;
+//! let key_accelerator: KeyAccelerator = "shift+alt+KeyQ".parse().unwrap();
+//! // Or alternatively:
+//! let key_accelerator: KeyAccelerator = "shift+alt+q".parse().unwrap();
+//!
+//! // Or to parse Accelerator
+//! let accelerator: Accelerator = "shift+alt+KeyQ".parse().unwrap();
+//! let accelerator: Accelerator = "shift+alt+q".parse().unwrap();
+//! # // This assert exists to ensure a test breaks once the
+//! # // statement above about ordering is no longer valid.
+//! # assert!("shift+KeyQ+alt".parse::<KeyAccelerator>().is_err());
+//! # assert!("shift+KeyQ+alt".parse::<Accelerator>().is_err());
+//! ```
+
+pub use keyboard_types::{Code, Key, Modifiers};
+use std::{borrow::Borrow, hash::Hash, str::FromStr};
+
+#[cfg(target_os = "macos")]
+pub const CMD_OR_CTRL: Modifiers = Modifiers::SUPER;
+#[cfg(not(target_os = "macos"))]
+pub const CMD_OR_CTRL: Modifiers = Modifiers::CONTROL;
+
+#[derive(thiserror::Error, Debug, PartialEq, Eq)]
+pub enum AcceleratorParseError {
+    #[error("Couldn't recognize \"{0}\" as a valid key for accelerator, if you feel like it should be, please report this to https://github.com/tauri-apps/muda")]
+    UnsupportedKey(String),
+    #[error("Found empty token while parsing accelerator: {0}")]
+    EmptyToken(String),
+    #[error("Invalid accelerator format: \"{0}\", an accelerator should have the modifiers first and only one main key, for example: \"Shift + Alt + K\"")]
+    InvalidFormat(String),
+}
+
+/// A keyboard shortcut that consists of an optional combination
+/// of modifier keys (provided by [`Modifiers`] and
+/// one key ([`Code`]).
+///
+/// ## Warning
+///
+/// This struct cannot represent all shortcuts found on non-U.S. keyboard layouts and might
+/// be deprecated in the future.
+/// Please use [`KeyAccelerator`] instead.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct Accelerator {
+    pub(crate) mods: Modifiers,
+    pub(crate) key: Code,
+    id: u32,
+}
+
+impl Accelerator {
+    /// Creates a new accelerator to define keyboard shortcuts throughout your application.
+    /// Only [`Modifiers::ALT`], [`Modifiers::SHIFT`], [`Modifiers::CONTROL`], and [`Modifiers::SUPER`]
+    pub fn new(mods: Option<Modifiers>, key: Code) -> Self {
+        let mut mods = mods.unwrap_or_else(Modifiers::empty);
+        if mods.contains(Modifiers::META) {
+            mods.remove(Modifiers::META);
+            mods.insert(Modifiers::SUPER);
+        }
+
+        let id = Self::generate_hash(mods, key);
+
+        Self { mods, key, id }
+    }
+
+    fn generate_hash(mods: Modifiers, key: Code) -> u32 {
+        KeyAccelerator::generate_hash(mods, &code_to_key(key))
+    }
+
+    /// Returns the id associated with this accelerator
+    /// which is a hash of the string representation of modifiers and key within this accelerator.
+    pub fn id(&self) -> u32 {
+        self.id
+    }
+
+    /// Returns the modifier for this accelerator
+    pub fn modifiers(&self) -> Modifiers {
+        self.mods
+    }
+
+    /// Returns the code for this accelerator
+    pub fn key(&self) -> Code {
+        self.key
+    }
+
+    /// Returns `true` if this [`Code`] and [`Modifiers`] matches this `Accelerator`.
+    pub fn matches(&self, modifiers: impl Borrow<Modifiers>, key: impl Borrow<Code>) -> bool {
+        // Should be a const but const bit_or doesn't work here.
+        let base_mods = Modifiers::SHIFT | Modifiers::CONTROL | Modifiers::ALT | Modifiers::SUPER;
+        let modifiers = modifiers.borrow();
+        let key = key.borrow();
+        self.mods == *modifiers & base_mods && self.key == *key
+    }
+}
+
+impl FromStr for Accelerator {
+    type Err = AcceleratorParseError;
+    fn from_str(accelerator_string: &str) -> Result<Self, Self::Err> {
+        parse_accelerator(accelerator_string)
+    }
+}
+
+impl TryFrom<&str> for Accelerator {
+    type Error = AcceleratorParseError;
+
+    fn try_from(value: &str) -> Result<Self, Self::Error> {
+        parse_accelerator(value)
+    }
+}
+
+impl TryFrom<String> for Accelerator {
+    type Error = AcceleratorParseError;
+
+    fn try_from(value: String) -> Result<Self, Self::Error> {
+        parse_accelerator(&value)
+    }
+}
+
+fn parse_accelerator(accelerator: &str) -> Result<Accelerator, AcceleratorParseError> {
+    let (modifiers_str, code_str) = split_key_and_modifiers(accelerator)?;
+    let modifiers = parse_modifiers(accelerator, modifiers_str)?;
+    let code = parse_code(code_str)?;
+
+    Ok(Accelerator::new(Some(modifiers), code))
+}
+
+fn parse_code(code: &str) -> Result<Code, AcceleratorParseError> {
+    use Code::*;
+    match code.to_uppercase().as_str() {
+        "BACKQUOTE" | "`" => Ok(Backquote),
+        "BACKSLASH" | "\\" => Ok(Backslash),
+        "BRACKETLEFT" | "[" => Ok(BracketLeft),
+        "BRACKETRIGHT" | "]" => Ok(BracketRight),
+        "COMMA" | "," => Ok(Comma),
+        "DIGIT0" | "0" => Ok(Digit0),
+        "DIGIT1" | "1" => Ok(Digit1),
+        "DIGIT2" | "2" => Ok(Digit2),
+        "DIGIT3" | "3" => Ok(Digit3),
+        "DIGIT4" | "4" => Ok(Digit4),
+        "DIGIT5" | "5" => Ok(Digit5),
+        "DIGIT6" | "6" => Ok(Digit6),
+        "DIGIT7" | "7" => Ok(Digit7),
+        "DIGIT8" | "8" => Ok(Digit8),
+        "DIGIT9" | "9" => Ok(Digit9),
+        "EQUAL" | "=" => Ok(Equal),
+        "KEYA" | "A" => Ok(KeyA),
+        "KEYB" | "B" => Ok(KeyB),
+        "KEYC" | "C" => Ok(KeyC),
+        "KEYD" | "D" => Ok(KeyD),
+        "KEYE" | "E" => Ok(KeyE),
+        "KEYF" | "F" => Ok(KeyF),
+        "KEYG" | "G" => Ok(KeyG),
+        "KEYH" | "H" => Ok(KeyH),
+        "KEYI" | "I" => Ok(KeyI),
+        "KEYJ" | "J" => Ok(KeyJ),
+        "KEYK" | "K" => Ok(KeyK),
+        "KEYL" | "L" => Ok(KeyL),
+        "KEYM" | "M" => Ok(KeyM),
+        "KEYN" | "N" => Ok(KeyN),
+        "KEYO" | "O" => Ok(KeyO),
+        "KEYP" | "P" => Ok(KeyP),
+        "KEYQ" | "Q" => Ok(KeyQ),
+        "KEYR" | "R" => Ok(KeyR),
+        "KEYS" | "S" => Ok(KeyS),
+        "KEYT" | "T" => Ok(KeyT),
+        "KEYU" | "U" => Ok(KeyU),
+        "KEYV" | "V" => Ok(KeyV),
+        "KEYW" | "W" => Ok(KeyW),
+        "KEYX" | "X" => Ok(KeyX),
+        "KEYY" | "Y" => Ok(KeyY),
+        "KEYZ" | "Z" => Ok(KeyZ),
+        "MINUS" | "-" => Ok(Minus),
+        "PERIOD" | "." => Ok(Period),
+        "QUOTE" | "'" => Ok(Quote),
+        "SEMICOLON" | ";" => Ok(Semicolon),
+        "SLASH" | "/" => Ok(Slash),
+        "BACKSPACE" => Ok(Backspace),
+        "CAPSLOCK" => Ok(CapsLock),
+        "ENTER" => Ok(Enter),
+        "SPACE" => Ok(Space),
+        "TAB" => Ok(Tab),
+        "DELETE" => Ok(Delete),
+        "END" => Ok(End),
+        "HOME" => Ok(Home),
+        "INSERT" => Ok(Insert),
+        "PAGEDOWN" => Ok(PageDown),
+        "PAGEUP" => Ok(PageUp),
+        "PRINTSCREEN" => Ok(PrintScreen),
+        "SCROLLLOCK" => Ok(ScrollLock),
+        "ARROWDOWN" | "DOWN" => Ok(ArrowDown),
+        "ARROWLEFT" | "LEFT" => Ok(ArrowLeft),
+        "ARROWRIGHT" | "RIGHT" => Ok(ArrowRight),
+        "ARROWUP" | "UP" => Ok(ArrowUp),
+        "NUMLOCK" => Ok(NumLock),
+        "NUMPAD0" | "NUM0" => Ok(Numpad0),
+        "NUMPAD1" | "NUM1" => Ok(Numpad1),
+        "NUMPAD2" | "NUM2" => Ok(Numpad2),
+        "NUMPAD3" | "NUM3" => Ok(Numpad3),
+        "NUMPAD4" | "NUM4" => Ok(Numpad4),
+        "NUMPAD5" | "NUM5" => Ok(Numpad5),
+        "NUMPAD6" | "NUM6" => Ok(Numpad6),
+        "NUMPAD7" | "NUM7" => Ok(Numpad7),
+        "NUMPAD8" | "NUM8" => Ok(Numpad8),
+        "NUMPAD9" | "NUM9" => Ok(Numpad9),
+        "NUMPADADD" | "NUMADD" | "NUMPADPLUS" | "NUMPLUS" => Ok(NumpadAdd),
+        "NUMPADDECIMAL" | "NUMDECIMAL" => Ok(NumpadDecimal),
+        "NUMPADDIVIDE" | "NUMDIVIDE" => Ok(NumpadDivide),
+        "NUMPADENTER" | "NUMENTER" => Ok(NumpadEnter),
+        "NUMPADEQUAL" | "NUMEQUAL" => Ok(NumpadEqual),
+        "NUMPADMULTIPLY" | "NUMMULTIPLY" => Ok(NumpadMultiply),
+        "NUMPADSUBTRACT" | "NUMSUBTRACT" => Ok(NumpadSubtract),
+        "ESCAPE" | "ESC" => Ok(Escape),
+        "F1" => Ok(F1),
+        "F2" => Ok(F2),
+        "F3" => Ok(F3),
+        "F4" => Ok(F4),
+        "F5" => Ok(F5),
+        "F6" => Ok(F6),
+        "F7" => Ok(F7),
+        "F8" => Ok(F8),
+        "F9" => Ok(F9),
+        "F10" => Ok(F10),
+        "F11" => Ok(F11),
+        "F12" => Ok(F12),
+        "AUDIOVOLUMEDOWN" | "VOLUMEDOWN" => Ok(AudioVolumeDown),
+        "AUDIOVOLUMEUP" | "VOLUMEUP" => Ok(AudioVolumeUp),
+        "AUDIOVOLUMEMUTE" | "VOLUMEMUTE" => Ok(AudioVolumeMute),
+        "F13" => Ok(F13),
+        "F14" => Ok(F14),
+        "F15" => Ok(F15),
+        "F16" => Ok(F16),
+        "F17" => Ok(F17),
+        "F18" => Ok(F18),
+        "F19" => Ok(F19),
+        "F20" => Ok(F20),
+        "F21" => Ok(F21),
+        "F22" => Ok(F22),
+        "F23" => Ok(F23),
+        "F24" => Ok(F24),
+
+        _ => Err(AcceleratorParseError::UnsupportedKey(code.to_string())),
+    }
+}
+
+fn code_to_key(code: Code) -> Key {
+    match code {
+        Code::KeyA => Key::Character("a".into()),
+        Code::KeyB => Key::Character("b".into()),
+        Code::KeyC => Key::Character("c".into()),
+        Code::KeyD => Key::Character("d".into()),
+        Code::KeyE => Key::Character("e".into()),
+        Code::KeyF => Key::Character("f".into()),
+        Code::KeyG => Key::Character("g".into()),
+        Code::KeyH => Key::Character("h".into()),
+        Code::KeyI => Key::Character("i".into()),
+        Code::KeyJ => Key::Character("j".into()),
+        Code::KeyK => Key::Character("k".into()),
+        Code::KeyL => Key::Character("l".into()),
+        Code::KeyM => Key::Character("m".into()),
+        Code::KeyN => Key::Character("n".into()),
+        Code::KeyO => Key::Character("o".into()),
+        Code::KeyP => Key::Character("p".into()),
+        Code::KeyQ => Key::Character("q".into()),
+        Code::KeyR => Key::Character("r".into()),
+        Code::KeyS => Key::Character("s".into()),
+        Code::KeyT => Key::Character("t".into()),
+        Code::KeyU => Key::Character("u".into()),
+        Code::KeyV => Key::Character("v".into()),
+        Code::KeyW => Key::Character("w".into()),
+        Code::KeyX => Key::Character("x".into()),
+        Code::KeyY => Key::Character("y".into()),
+        Code::KeyZ => Key::Character("z".into()),
+        Code::Digit0 => Key::Character("0".into()),
+        Code::Digit1 => Key::Character("1".into()),
+        Code::Digit2 => Key::Character("2".into()),
+        Code::Digit3 => Key::Character("3".into()),
+        Code::Digit4 => Key::Character("4".into()),
+        Code::Digit5 => Key::Character("5".into()),
+        Code::Digit6 => Key::Character("6".into()),
+        Code::Digit7 => Key::Character("7".into()),
+        Code::Digit8 => Key::Character("8".into()),
+        Code::Digit9 => Key::Character("9".into()),
+        Code::Comma => Key::Character(",".into()),
+        Code::Minus => Key::Character("-".into()),
+        Code::Period => Key::Character(".".into()),
+        Code::Space => Key::Character(" ".into()),
+        Code::Equal => Key::Character("=".into()),
+        Code::Semicolon => Key::Character(";".into()),
+        Code::Slash => Key::Character("/".into()),
+        Code::Backslash => Key::Character("\\".into()),
+        Code::Quote => Key::Character("'".into()),
+        Code::Backquote => Key::Character("`".into()),
+        Code::BracketLeft => Key::Character("[".into()),
+        Code::BracketRight => Key::Character("]".into()),
+        Code::Numpad0 => Key::Character("0".into()),
+        Code::Numpad1 => Key::Character("1".into()),
+        Code::Numpad2 => Key::Character("2".into()),
+        Code::Numpad3 => Key::Character("3".into()),
+        Code::Numpad4 => Key::Character("4".into()),
+        Code::Numpad5 => Key::Character("5".into()),
+        Code::Numpad6 => Key::Character("6".into()),
+        Code::Numpad7 => Key::Character("7".into()),
+        Code::Numpad8 => Key::Character("8".into()),
+        Code::Numpad9 => Key::Character("9".into()),
+        Code::NumpadAdd => Key::Character("+".into()),
+        Code::NumpadDecimal => Key::Character(".".into()),
+        Code::NumpadDivide => Key::Character("/".into()),
+        Code::NumpadMultiply => Key::Character("*".into()),
+        Code::NumpadSubtract => Key::Character("-".into()),
+        Code::NumpadEqual => Key::Character("=".into()),
+        Code::NumpadEnter => Key::Enter,
+        Code::Backspace => Key::Backspace,
+        Code::Tab => Key::Tab,
+        Code::Enter => Key::Enter,
+        Code::Escape => Key::Escape,
+        Code::Delete => Key::Delete,
+        Code::CapsLock => Key::CapsLock,
+        Code::Home => Key::Home,
+        Code::End => Key::End,
+        Code::PageUp => Key::PageUp,
+        Code::PageDown => Key::PageDown,
+        Code::Insert => Key::Insert,
+        Code::PrintScreen => Key::PrintScreen,
+        Code::ScrollLock => Key::ScrollLock,
+        Code::NumLock => Key::NumLock,
+        Code::Pause => Key::Pause,
+        Code::ContextMenu => Key::ContextMenu,
+        Code::ArrowUp => Key::ArrowUp,
+        Code::ArrowDown => Key::ArrowDown,
+        Code::ArrowLeft => Key::ArrowLeft,
+        Code::ArrowRight => Key::ArrowRight,
+        Code::F1 => Key::F1,
+        Code::F2 => Key::F2,
+        Code::F3 => Key::F3,
+        Code::F4 => Key::F4,
+        Code::F5 => Key::F5,
+        Code::F6 => Key::F6,
+        Code::F7 => Key::F7,
+        Code::F8 => Key::F8,
+        Code::F9 => Key::F9,
+        Code::F10 => Key::F10,
+        Code::F11 => Key::F11,
+        Code::F12 => Key::F12,
+        Code::F13 => Key::F13,
+        Code::F14 => Key::F14,
+        Code::F15 => Key::F15,
+        Code::F16 => Key::F16,
+        Code::F17 => Key::F17,
+        Code::F18 => Key::F18,
+        Code::F19 => Key::F19,
+        Code::F20 => Key::F20,
+        Code::F21 => Key::F21,
+        Code::F22 => Key::F22,
+        Code::F23 => Key::F23,
+        Code::F24 => Key::F24,
+        Code::AudioVolumeDown => Key::AudioVolumeDown,
+        Code::AudioVolumeUp => Key::AudioVolumeUp,
+        Code::AudioVolumeMute => Key::AudioVolumeMute,
+        Code::MediaTrackNext => Key::MediaTrackNext,
+        Code::MediaTrackPrevious => Key::MediaTrackPrevious,
+        Code::MediaStop => Key::MediaStop,
+        Code::MediaPlayPause => Key::MediaPlayPause,
+        Code::LaunchMail => Key::LaunchMail,
+        Code::BrowserBack => Key::BrowserBack,
+        Code::BrowserForward => Key::BrowserForward,
+        Code::BrowserHome => Key::BrowserHome,
+        Code::BrowserSearch => Key::BrowserSearch,
+        Code::BrowserStop => Key::BrowserStop,
+        Code::BrowserFavorites => Key::BrowserFavorites,
+        Code::BrowserRefresh => Key::BrowserRefresh,
+        Code::Convert => Key::Convert,
+        Code::KanaMode => Key::KanaMode,
+        Code::NonConvert => Key::NonConvert,
+        Code::Help => Key::Help,
+        // Code is unfortunately non-exhaustive,
+        // which means we need to manually notice and update this list if new items are added to Code.
+        _ => Key::Unidentified,
+    }
+}
+
+/// A keyboard shortcut based on logical [`Key`] values.
+///
+/// Unlike [`Accelerator`] which uses physical [`Code`] keys,
+/// `KeyAccelerator` uses logical [`Key`] values which can represent
+/// any character including Unicode characters like `+`, `€`, `{`, etc.
+///
+/// # Examples
+///
+/// They can be created directly
+/// ```no_run
+/// # use muda::accelerator::{KeyAccelerator, Modifiers, Key};
+/// let accel = KeyAccelerator::new(Some(Modifiers::CONTROL), Key::Character("+".into()));
+/// ```
+/// or converted from an existing [`Accelerator`]
+/// ```no_run
+/// # use muda::accelerator::{Accelerator, KeyAccelerator, Code, Modifiers};
+/// let old_accel = Accelerator::new(Some(Modifiers::CONTROL), Code::KeyC);
+/// let new_accel: KeyAccelerator = old_accel.into();
+/// ```
+/// or parsed from a string, which supports literal character keys
+/// ```no_run
+/// # use muda::accelerator::KeyAccelerator;
+/// let accel: KeyAccelerator = "Ctrl++".parse().unwrap();
+/// let accel2: KeyAccelerator = "Ctrl+€".parse().unwrap();
+/// ```
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct KeyAccelerator {
+    pub(crate) mods: Modifiers,
+    pub(crate) key: Key,
+    id: u32,
+}
+
+impl KeyAccelerator {
+    /// Creates a new key accelerator to define keyboard shortcuts throughout your application.
+    /// Only [`Modifiers::ALT`], [`Modifiers::SHIFT`], [`Modifiers::CONTROL`], and [`Modifiers::SUPER`]
+    pub fn new(mods: Option<Modifiers>, key: Key) -> Self {
+        let mut mods = mods.unwrap_or_else(Modifiers::empty);
+        if mods.contains(Modifiers::META) {
+            mods.remove(Modifiers::META);
+            mods.insert(Modifiers::SUPER);
+        }
+
+        let id = Self::generate_hash(mods, &key);
+
+        Self { mods, key, id }
+    }
+
+    fn generate_hash(mods: Modifiers, key: &Key) -> u32 {
+        let mut accelerator_str = String::new();
+        if mods.contains(Modifiers::SHIFT) {
+            accelerator_str.push_str("shift+")
+        }
+        if mods.contains(Modifiers::CONTROL) {
+            accelerator_str.push_str("control+")
+        }
+        if mods.contains(Modifiers::ALT) {
+            accelerator_str.push_str("alt+")
+        }
+        if mods.contains(Modifiers::SUPER) {
+            accelerator_str.push_str("super+")
+        }
+        accelerator_str.push_str(&format!("{:?}", key));
+
+        let mut hasher = std::collections::hash_map::DefaultHasher::new();
+        accelerator_str.hash(&mut hasher);
+        std::hash::Hasher::finish(&hasher) as u32
+    }
+
+    /// Returns the id associated with this accelerator
+    /// which is a hash of the string representation of modifiers and key within this accelerator.
+    pub fn id(&self) -> u32 {
+        self.id
+    }
+
+    /// Returns the modifiers for this accelerator.
+    pub fn modifiers(&self) -> Modifiers {
+        self.mods
+    }
+
+    /// Returns the key for this accelerator.
+    pub fn key(&self) -> &Key {
+        &self.key
+    }
+
+    /// Returns `true` if this [`Key`] and [`Modifiers`] matches this `KeyAccelerator`.
+    pub fn matches(&self, modifiers: impl Borrow<Modifiers>, key: impl Borrow<Key>) -> bool {
+        let base_mods = Modifiers::SHIFT | Modifiers::CONTROL | Modifiers::ALT | Modifiers::SUPER;
+        let modifiers = modifiers.borrow();
+        let key = key.borrow();
+        self.mods == *modifiers & base_mods && self.key == *key
+    }
+}
+
+impl From<Accelerator> for KeyAccelerator {
+    fn from(accel: Accelerator) -> Self {
+        KeyAccelerator::new(Some(accel.mods), code_to_key(accel.key))
+    }
+}
+
+impl FromStr for KeyAccelerator {
+    type Err = AcceleratorParseError;
+    fn from_str(accelerator_string: &str) -> Result<Self, Self::Err> {
+        parse_key_accelerator(accelerator_string)
+    }
+}
+
+impl TryFrom<&str> for KeyAccelerator {
+    type Error = AcceleratorParseError;
+
+    fn try_from(value: &str) -> Result<Self, Self::Error> {
+        parse_key_accelerator(value)
+    }
+}
+
+impl TryFrom<String> for KeyAccelerator {
+    type Error = AcceleratorParseError;
+
+    fn try_from(value: String) -> Result<Self, Self::Error> {
+        parse_key_accelerator(&value)
+    }
+}
+
+fn parse_modifier(accelerator: &str, token: &str) -> Result<Modifiers, AcceleratorParseError> {
+    let token = token.trim();
+    if token.is_empty() {
+        return Err(AcceleratorParseError::EmptyToken(accelerator.to_string()));
+    }
+    let modifier = match token.to_uppercase().as_str() {
+        "OPTION" | "ALT" => Modifiers::ALT,
+        "CONTROL" | "CTRL" => Modifiers::CONTROL,
+        "COMMAND" | "CMD" | "SUPER" => Modifiers::META,
+        "SHIFT" => Modifiers::SHIFT,
+        #[cfg(target_os = "macos")]
+        "COMMANDORCONTROL" | "COMMANDORCTRL" | "CMDORCTRL" | "CMDORCONTROL" => Modifiers::SUPER,
+        #[cfg(not(target_os = "macos"))]
+        "COMMANDORCONTROL" | "COMMANDORCTRL" | "CMDORCTRL" | "CMDORCONTROL" => Modifiers::CONTROL,
+        _ => {
+            return Err(AcceleratorParseError::InvalidFormat(
+                accelerator.to_string(),
+            ));
+        }
+    };
+    Ok(modifier)
+}
+
+fn parse_modifiers(
+    accelerator: &str,
+    modifiers_str: &str,
+) -> Result<Modifiers, AcceleratorParseError> {
+    let mut modifiers = Modifiers::empty();
+    if !modifiers_str.is_empty() {
+        for token in modifiers_str.split('+') {
+            modifiers |= parse_modifier(accelerator, token)?;
+        }
+    }
+
+    Ok(modifiers)
+}
+
+// Tries to parse a key string as a [`Code`] first (reusing the existing parser),
+// then falls back to treating it as a literal character [`Key`].
+fn parse_key(key: &str) -> Result<Key, AcceleratorParseError> {
+    if let Ok(code) = parse_code(key) {
+        let key = code_to_key(code);
+        if key != Key::Unidentified {
+            return Ok(key);
+        }
+    }
+
+    let trimmed = key.trim();
+    if trimmed.is_empty() {
+        Err(AcceleratorParseError::UnsupportedKey(key.to_string()))
+    } else if parse_modifier(key, key).is_ok() {
+        // The key must not be modifier
+        Err(AcceleratorParseError::UnsupportedKey(key.into()))
+    } else {
+        Ok(Key::Character(trimmed.into()))
+    }
+}
+
+fn split_key_and_modifiers(accelerator: &str) -> Result<(&str, &str), AcceleratorParseError> {
+    let accelerator = accelerator.trim();
+    if accelerator.is_empty() {
+        return Err(AcceleratorParseError::InvalidFormat(String::new()));
+    }
+
+    // Separate modifier part from key part using rfind('+').
+    // This correctly handles '+' as the key: "Ctrl++" -> rfind gives the last '+',
+    // leaving "Ctrl+" as the modifier part and "" as raw key -> key is '+'.
+    let (modifiers_str, key_str) = match accelerator.rfind('+') {
+        Some(pos) => {
+            let raw_key = &accelerator[pos + 1..];
+            if raw_key.trim().is_empty() {
+                // The key is '+' itself; strip the trailing separator '+' from the modifier part
+                let raw_mods = accelerator[..pos].trim_end_matches('+');
+                (raw_mods, "+")
+            } else {
+                (&accelerator[..pos], raw_key.trim())
+            }
+        }
+        None => ("", accelerator),
+    };
+
+    Ok((modifiers_str, key_str))
+}
+
+fn parse_key_accelerator(accelerator: &str) -> Result<KeyAccelerator, AcceleratorParseError> {
+    let (modifiers_str, key_str) = split_key_and_modifiers(accelerator)?;
+    let mods = parse_modifiers(accelerator, modifiers_str)?;
+    let key = parse_key(key_str)?;
+    Ok(KeyAccelerator::new(Some(mods), key))
+}
+
+#[test]
+fn test_parse_accelerator() {
+    macro_rules! assert_parse_accelerator {
+        ($key:literal, $lrh:expr) => {
+            let r = parse_accelerator($key).unwrap();
+            let l = $lrh;
+            assert_eq!(r.mods, l.mods);
+            assert_eq!(r.key, l.key);
+        };
+    }
+
+    assert_parse_accelerator!(
+        "KeyX",
+        Accelerator {
+            mods: Modifiers::empty(),
+            key: Code::KeyX,
+            id: 0,
+        }
+    );
+
+    assert_parse_accelerator!(
+        "CTRL+KeyX",
+        Accelerator {
+            mods: Modifiers::CONTROL,
+            key: Code::KeyX,
+            id: 0,
+        }
+    );
+
+    assert_parse_accelerator!(
+        "SHIFT+KeyC",
+        Accelerator {
+            mods: Modifiers::SHIFT,
+            key: Code::KeyC,
+            id: 0,
+        }
+    );
+
+    assert_parse_accelerator!(
+        "SHIFT+KeyC",
+        Accelerator {
+            mods: Modifiers::SHIFT,
+            key: Code::KeyC,
+            id: 0,
+        }
+    );
+
+    assert_parse_accelerator!(
+        "super+ctrl+SHIFT+alt+ArrowUp",
+        Accelerator {
+            mods: Modifiers::SUPER | Modifiers::CONTROL | Modifiers::SHIFT | Modifiers::ALT,
+            key: Code::ArrowUp,
+            id: 0,
+        }
+    );
+    assert_parse_accelerator!(
+        "Digit5",
+        Accelerator {
+            mods: Modifiers::empty(),
+            key: Code::Digit5,
+            id: 0,
+        }
+    );
+    assert_parse_accelerator!(
+        "KeyG",
+        Accelerator {
+            mods: Modifiers::empty(),
+            key: Code::KeyG,
+            id: 0,
+        }
+    );
+
+    assert_parse_accelerator!(
+        "SHiFT+F12",
+        Accelerator {
+            mods: Modifiers::SHIFT,
+            key: Code::F12,
+            id: 0,
+        }
+    );
+
+    assert_parse_accelerator!(
+        "CmdOrCtrl+Space",
+        Accelerator {
+            #[cfg(target_os = "macos")]
+            mods: Modifiers::SUPER,
+            #[cfg(not(target_os = "macos"))]
+            mods: Modifiers::CONTROL,
+            key: Code::Space,
+            id: 0,
+        }
+    );
+}
+
+#[test]
+fn test_parse_accelerator_error() {
+    let cases = [
+        (
+            "Ctrl+Shift+C+A",
+            AcceleratorParseError::InvalidFormat("Ctrl+Shift+C+A".into()),
+        ),
+        (
+            "Ctrl+C+Shift",
+            AcceleratorParseError::InvalidFormat("Ctrl+C+Shift".into()),
+        ),
+        ("Alt", AcceleratorParseError::UnsupportedKey("Alt".into())),
+        ("Cmd", AcceleratorParseError::UnsupportedKey("Cmd".into())),
+        ("Ctrl", AcceleratorParseError::UnsupportedKey("Ctrl".into())),
+        (
+            "Super",
+            AcceleratorParseError::UnsupportedKey("Super".into()),
+        ),
+        ("+", AcceleratorParseError::UnsupportedKey("+".into())),
+    ];
+    for (text, err) in cases {
+        let parsed = text.parse::<Accelerator>();
+        assert_eq!(parsed, Err(err), "Expected parsing \"{text}\" to error!");
+    }
+}
+
+#[test]
+fn test_parse_key_accelerator_error() {
+    let cases = [
+        (
+            "Ctrl+Shift+C+A",
+            AcceleratorParseError::InvalidFormat("Ctrl+Shift+C+A".into()),
+        ),
+        (
+            "Ctrl+C+Shift",
+            AcceleratorParseError::InvalidFormat("Ctrl+C+Shift".into()),
+        ),
+        ("Alt", AcceleratorParseError::UnsupportedKey("Alt".into())),
+        ("Cmd", AcceleratorParseError::UnsupportedKey("Cmd".into())),
+        ("Ctrl", AcceleratorParseError::UnsupportedKey("Ctrl".into())),
+        (
+            "Super",
+            AcceleratorParseError::UnsupportedKey("Super".into()),
+        ),
+    ];
+    for (text, err) in cases {
+        let parsed = text.parse::<KeyAccelerator>();
+        assert_eq!(parsed, Err(err), "Expected parsing \"{text}\" to error!");
+    }
+}
+
+#[test]
+fn test_equality() {
+    let h1 = parse_accelerator("Shift+KeyR").unwrap();
+    let h2 = parse_accelerator("Shift+KeyR").unwrap();
+    let h3 = Accelerator::new(Some(Modifiers::SHIFT), Code::KeyR);
+    let h4 = parse_accelerator("Alt+KeyR").unwrap();
+    let h5 = parse_accelerator("Alt+KeyR").unwrap();
+    let h6 = parse_accelerator("KeyR").unwrap();
+
+    assert!(h1 == h2 && h2 == h3 && h3 != h4 && h4 == h5 && h5 != h6);
+    assert!(
+        h1.id() == h2.id()
+            && h2.id() == h3.id()
+            && h3.id() != h4.id()
+            && h4.id() == h5.id()
+            && h5.id() != h6.id()
+    );
+}
+
+#[test]
+fn test_parse_key_accelerator() {
+    // Basic key parsing (reuses Code-based keys)
+    let cases = [
+        ("Ctrl+A", Modifiers::CONTROL, Key::Character("a".into())),
+        ("Ctrl+KeyA", Modifiers::CONTROL, Key::Character("a".into())),
+        ("Shift+F12", Modifiers::SHIFT, Key::F12),
+        // Literal '+' as key
+        ("Ctrl++", Modifiers::CONTROL, Key::Character("+".into())),
+        // Multiple modifiers + '+'
+        (
+            "Ctrl+Shift++",
+            Modifiers::CONTROL | Modifiers::SHIFT,
+            Key::Character("+".into()),
+        ),
+        // Just '+' alone
+        ("+", Modifiers::empty(), Key::Character("+".into())),
+        // Unicode character keys
+        ("Ctrl+€", Modifiers::CONTROL, Key::Character("€".into())),
+        // CmdOrCtrl works
+        #[cfg(target_os = "macos")]
+        (
+            "CmdOrCtrl+Space",
+            Modifiers::SUPER,
+            Key::Character(" ".into()),
+        ),
+        #[cfg(not(target_os = "macos"))]
+        (
+            "CmdOrCtrl+Space",
+            Modifiers::CONTROL,
+            Key::Character(" ".into()),
+        ),
+    ];
+
+    for (string, modifiers, key) in cases {
+        let accelerator: KeyAccelerator = string.parse().expect("Failed to parse KeyAccelerator");
+        assert_eq!(
+            accelerator.mods, modifiers,
+            "Expected \"{string}\" to produce modifiers: {modifiers:?}"
+        );
+        assert_eq!(
+            accelerator.key, key,
+            "Expected \"{string}\" to produce key: {key}"
+        );
+    }
+}
+
+#[test]
+fn test_key_accelerator_from_accelerator() {
+    let cases = [
+        (
+            Accelerator::new(Some(Modifiers::CONTROL), Code::KeyC),
+            Key::Character("c".into()),
+        ),
+        (
+            Accelerator::new(Some(Modifiers::SHIFT), Code::ArrowUp),
+            Key::ArrowUp,
+        ),
+    ];
+
+    for (accelerator, key) in cases {
+        let key_accelerator: KeyAccelerator = accelerator.into();
+        assert_eq!(
+            key_accelerator.mods, accelerator.mods,
+            "Source accelerator: {accelerator:?}"
+        );
+        assert_eq!(
+            key_accelerator.key, key,
+            "Source accelerator: {accelerator:?}"
+        );
+    }
+}
+
+#[test]
+fn test_key_accelerator_equality() {
+    let h1: KeyAccelerator = "Shift+R".parse().unwrap();
+    let h2: KeyAccelerator = "Shift+R".parse().unwrap();
+    let h3 = KeyAccelerator::new(Some(Modifiers::SHIFT), Key::Character("r".into()));
+    let h4: KeyAccelerator = "Alt+R".parse().unwrap();
+
+    assert!(h1 == h2 && h2 == h3 && h3 != h4);
+    assert!(h1.id() == h2.id() && h2.id() == h3.id() && h3.id() != h4.id());
+
+    // Converted from Accelerator should match parsed KeyAccelerator
+    let from_code = Accelerator::new(Some(Modifiers::SHIFT), Code::KeyR);
+    let from_code: KeyAccelerator = from_code.into();
+    assert_eq!(from_code, h1);
+    assert_eq!(from_code.id(), h1.id());
+}
diff --git a/ports/muda/src/builders/check.rs b/ports/muda/src/builders/check.rs
new file mode 100644
index 000000000000..74fadcea6129
--- /dev/null
+++ b/ports/muda/src/builders/check.rs
@@ -0,0 +1,98 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use crate::{
+    accelerator::{Accelerator, KeyAccelerator},
+    CheckMenuItem, MenuId,
+};
+
+/// A builder type for [`CheckMenuItem`]
+#[derive(Clone, Debug, Default)]
+pub struct CheckMenuItemBuilder {
+    text: String,
+    enabled: bool,
+    checked: bool,
+    key_accelerator: Option<KeyAccelerator>,
+    id: Option<MenuId>,
+}
+
+impl CheckMenuItemBuilder {
+    pub fn new() -> Self {
+        Default::default()
+    }
+
+    /// Set the id this check menu item.
+    pub fn id(mut self, id: MenuId) -> Self {
+        self.id.replace(id);
+        self
+    }
+
+    /// Set the text for this check menu item.
+    ///
+    /// See [`CheckMenuItem::set_text`] for more info.
+    pub fn text<S: Into<String>>(mut self, text: S) -> Self {
+        self.text = text.into();
+        self
+    }
+
+    /// Enable or disable this menu item.
+    pub fn enabled(mut self, enabled: bool) -> Self {
+        self.enabled = enabled;
+        self
+    }
+
+    /// Check or uncheck this menu item.
+    pub fn checked(mut self, checked: bool) -> Self {
+        self.checked = checked;
+        self
+    }
+
+    /// Set this check menu item accelerator.
+    ///
+    /// (Note that setting an accelerator will override any existing [.key_accelerator()](Self::key_accelerator))
+    pub fn accelerator<A: TryInto<Accelerator>>(
+        mut self,
+        accelerator: Option<A>,
+    ) -> crate::Result<Self>
+    where
+        crate::Error: From<<A as TryInto<Accelerator>>::Error>,
+    {
+        self.key_accelerator = accelerator
+            .map(|a| a.try_into())
+            .transpose()?
+            .map(KeyAccelerator::from);
+        Ok(self)
+    }
+
+    /// Set this check menu item accelerator using a [`KeyAccelerator`].
+    ///
+    /// (Note that setting a key_accelerator will override any existing [.accelerator()](Self::accelerator))
+    pub fn key_accelerator<A: TryInto<KeyAccelerator>>(
+        mut self,
+        accelerator: Option<A>,
+    ) -> crate::Result<Self>
+    where
+        crate::Error: From<<A as TryInto<KeyAccelerator>>::Error>,
+    {
+        self.key_accelerator = accelerator.map(|a| a.try_into()).transpose()?;
+        Ok(self)
+    }
+
+    /// Build this check menu item.
+    pub fn build(self) -> CheckMenuItem {
+        let item = if let Some(id) = self.id {
+            CheckMenuItem::with_id(id, self.text, self.enabled, self.checked, None)
+        } else {
+            CheckMenuItem::new(self.text, self.enabled, self.checked, None)
+        };
+        if let Some(key_accel) = self.key_accelerator {
+            let _ = item.set_key_accelerator(Some(key_accel));
+        }
+        item
+    }
+}
diff --git a/ports/muda/src/builders/icon.rs b/ports/muda/src/builders/icon.rs
new file mode 100644
index 000000000000..3935133b3bda
--- /dev/null
+++ b/ports/muda/src/builders/icon.rs
@@ -0,0 +1,120 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use crate::{
+    accelerator::{Accelerator, KeyAccelerator},
+    icon::{Icon, NativeIcon},
+    IconMenuItem, MenuId,
+};
+
+/// A builder type for [`IconMenuItem`]
+#[derive(Clone, Debug, Default)]
+pub struct IconMenuItemBuilder {
+    text: String,
+    enabled: bool,
+    id: Option<MenuId>,
+    key_accelerator: Option<KeyAccelerator>,
+    icon: Option<Icon>,
+    native_icon: Option<NativeIcon>,
+}
+
+impl IconMenuItemBuilder {
+    pub fn new() -> Self {
+        Default::default()
+    }
+
+    /// Set the id this icon menu item.
+    pub fn id(mut self, id: MenuId) -> Self {
+        self.id.replace(id);
+        self
+    }
+
+    /// Set the text for this icon menu item.
+    ///
+    /// See [`IconMenuItem::set_text`] for more info.
+    pub fn text<S: Into<String>>(mut self, text: S) -> Self {
+        self.text = text.into();
+        self
+    }
+
+    /// Enable or disable this menu item.
+    pub fn enabled(mut self, enabled: bool) -> Self {
+        self.enabled = enabled;
+        self
+    }
+
+    /// Set this icon menu item icon.
+    pub fn icon(mut self, icon: Option<Icon>) -> Self {
+        self.icon = icon;
+        self.native_icon = None;
+        self
+    }
+
+    /// Set this icon menu item native icon.
+    pub fn native_icon(mut self, icon: Option<NativeIcon>) -> Self {
+        self.native_icon = icon;
+        self.icon = None;
+        self
+    }
+
+    /// Set this icon menu item accelerator.
+    ///
+    /// (Note that setting an accelerator will override any existing [.key_accelerator()](Self::key_accelerator))
+    pub fn accelerator<A: TryInto<Accelerator>>(
+        mut self,
+        accelerator: Option<A>,
+    ) -> crate::Result<Self>
+    where
+        crate::Error: From<<A as TryInto<Accelerator>>::Error>,
+    {
+        self.key_accelerator = accelerator
+            .map(|a| a.try_into())
+            .transpose()?
+            .map(KeyAccelerator::from);
+        Ok(self)
+    }
+
+    /// Set this icon menu item accelerator using a [`KeyAccelerator`].
+    ///
+    /// (Note that setting a key_accelerator will override any existing [.accelerator()](Self::accelerator))
+    pub fn key_accelerator<A: TryInto<KeyAccelerator>>(
+        mut self,
+        accelerator: Option<A>,
+    ) -> crate::Result<Self>
+    where
+        crate::Error: From<<A as TryInto<KeyAccelerator>>::Error>,
+    {
+        self.key_accelerator = accelerator.map(|a| a.try_into()).transpose()?;
+        Ok(self)
+    }
+
+    /// Build this icon menu item.
+    pub fn build(self) -> IconMenuItem {
+        let item = if let Some(id) = self.id {
+            if self.icon.is_some() {
+                IconMenuItem::with_id(id, self.text, self.enabled, self.icon, None)
+            } else {
+                IconMenuItem::with_id_and_native_icon(
+                    id,
+                    self.text,
+                    self.enabled,
+                    self.native_icon,
+                    None,
+                )
+            }
+        } else if self.icon.is_some() {
+            IconMenuItem::new(self.text, self.enabled, self.icon, None)
+        } else {
+            IconMenuItem::with_native_icon(self.text, self.enabled, self.native_icon, None)
+        };
+        if let Some(key_accel) = self.key_accelerator {
+            let _ = item.set_key_accelerator(Some(key_accel));
+        }
+        item
+    }
+}
diff --git a/ports/muda/src/builders/mod.rs b/ports/muda/src/builders/mod.rs
new file mode 100644
index 000000000000..614aacf00ca4
--- /dev/null
+++ b/ports/muda/src/builders/mod.rs
@@ -0,0 +1,20 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+//! A module containing builder types
+
+mod check;
+mod icon;
+mod normal;
+mod submenu;
+
+pub use crate::about_metadata::AboutMetadataBuilder;
+pub use check::*;
+pub use icon::*;
+pub use normal::*;
+pub use submenu::*;
diff --git a/ports/muda/src/builders/normal.rs b/ports/muda/src/builders/normal.rs
new file mode 100644
index 000000000000..694e12a40ed5
--- /dev/null
+++ b/ports/muda/src/builders/normal.rs
@@ -0,0 +1,91 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use crate::{
+    accelerator::{Accelerator, KeyAccelerator},
+    MenuId, MenuItem,
+};
+
+/// A builder type for [`MenuItem`]
+#[derive(Clone, Debug, Default)]
+pub struct MenuItemBuilder {
+    text: String,
+    enabled: bool,
+    id: Option<MenuId>,
+    key_accelerator: Option<KeyAccelerator>,
+}
+
+impl MenuItemBuilder {
+    pub fn new() -> Self {
+        Default::default()
+    }
+
+    /// Set the id this menu item.
+    pub fn id(mut self, id: MenuId) -> Self {
+        self.id.replace(id);
+        self
+    }
+
+    /// Set the text for this menu item.
+    ///
+    /// See [`MenuItem::set_text`] for more info.
+    pub fn text<S: Into<String>>(mut self, text: S) -> Self {
+        self.text = text.into();
+        self
+    }
+
+    /// Enable or disable this menu item.
+    pub fn enabled(mut self, enabled: bool) -> Self {
+        self.enabled = enabled;
+        self
+    }
+
+    /// Set this menu item accelerator.
+    ///
+    /// (Note that setting an accelerator will override any existing [.key_accelerator()](Self::key_accelerator))
+    pub fn accelerator<A: TryInto<Accelerator>>(
+        mut self,
+        accelerator: Option<A>,
+    ) -> crate::Result<Self>
+    where
+        crate::Error: From<<A as TryInto<Accelerator>>::Error>,
+    {
+        self.key_accelerator = accelerator
+            .map(|a| a.try_into())
+            .transpose()?
+            .map(KeyAccelerator::from);
+        Ok(self)
+    }
+
+    /// Set this menu item accelerator using a [`KeyAccelerator`].
+    ///
+    /// (Note that setting a key_accelerator will override any existing [.accelerator()](Self::accelerator))
+    pub fn key_accelerator<A: TryInto<KeyAccelerator>>(
+        mut self,
+        accelerator: Option<A>,
+    ) -> crate::Result<Self>
+    where
+        crate::Error: From<<A as TryInto<KeyAccelerator>>::Error>,
+    {
+        self.key_accelerator = accelerator.map(|a| a.try_into()).transpose()?;
+        Ok(self)
+    }
+
+    /// Build this menu item.
+    pub fn build(self) -> MenuItem {
+        let item = if let Some(id) = self.id {
+            MenuItem::with_id(id, self.text, self.enabled, None)
+        } else {
+            MenuItem::new(self.text, self.enabled, None)
+        };
+        if let Some(key_accel) = self.key_accelerator {
+            let _ = item.set_key_accelerator(Some(key_accel));
+        }
+        item
+    }
+}
diff --git a/ports/muda/src/builders/submenu.rs b/ports/muda/src/builders/submenu.rs
new file mode 100644
index 000000000000..0e77dba6334f
--- /dev/null
+++ b/ports/muda/src/builders/submenu.rs
@@ -0,0 +1,98 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use crate::{Icon, IsMenuItem, MenuId, NativeIcon, Submenu};
+
+/// A builder type for [`Submenu`]
+#[derive(Clone, Default)]
+pub struct SubmenuBuilder<'a> {
+    text: String,
+    enabled: bool,
+    id: Option<MenuId>,
+    items: Vec<&'a dyn IsMenuItem>,
+    icon: Option<Icon>,
+    native_icon: Option<NativeIcon>,
+}
+
+impl std::fmt::Debug for SubmenuBuilder<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("SubmenuBuilder")
+            .field("text", &self.text)
+            .field("enabled", &self.enabled)
+            .finish()
+    }
+}
+
+impl<'a> SubmenuBuilder<'a> {
+    pub fn new() -> Self {
+        Default::default()
+    }
+
+    /// Set the id this submenu.
+    pub fn id(mut self, id: MenuId) -> Self {
+        self.id.replace(id);
+        self
+    }
+
+    /// Set the text for this submenu.
+    ///
+    /// See [`Submenu::set_text`] for more info.
+    pub fn text<S: Into<String>>(mut self, text: S) -> Self {
+        self.text = text.into();
+        self
+    }
+
+    /// Enable or disable this submenu.
+    pub fn enabled(mut self, enabled: bool) -> Self {
+        self.enabled = enabled;
+        self
+    }
+
+    /// Add an item to this submenu.
+    pub fn item(mut self, item: &'a dyn IsMenuItem) -> Self {
+        self.items.push(item);
+        self
+    }
+
+    /// Add these items to this submenu.
+    pub fn items(mut self, items: &[&'a dyn IsMenuItem]) -> Self {
+        self.items.extend_from_slice(items);
+        self
+    }
+
+    /// Set an icon for this submenu.
+    pub fn icon(mut self, icon: Icon) -> Self {
+        self.icon = Some(icon);
+        self
+    }
+
+    /// Set a native icon for this submenu.
+    pub fn native_icon(mut self, icon: NativeIcon) -> Self {
+        self.native_icon = Some(icon);
+        self
+    }
+
+    /// Build this menu item.
+    pub fn build(self) -> crate::Result<Submenu> {
+        let submenu = if let Some(id) = self.id {
+            Submenu::with_id_and_items(id, self.text, self.enabled, &self.items)?
+        } else {
+            Submenu::with_items(self.text, self.enabled, &self.items)?
+        };
+
+        if let Some(icon) = self.icon {
+            submenu.set_icon(Some(icon));
+        }
+
+        if let Some(native_icon) = self.native_icon {
+            submenu.set_native_icon(Some(native_icon));
+        }
+
+        Ok(submenu)
+    }
+}
diff --git a/ports/muda/src/error.rs b/ports/muda/src/error.rs
new file mode 100644
index 000000000000..d2a9557b28c1
--- /dev/null
+++ b/ports/muda/src/error.rs
@@ -0,0 +1,68 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use thiserror::Error;
+
+pub use crate::accelerator::AcceleratorParseError;
+
+/// Errors returned by muda.
+#[non_exhaustive]
+#[derive(Error, Debug)]
+pub enum Error {
+    #[error("This menu item is not a child of this `Menu` or `Submenu`")]
+    NotAChildOfThisMenu,
+    #[cfg(windows)]
+    #[error("This menu has not been initialized for this hwnd`")]
+    NotInitialized,
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    #[error("This menu has not been initialized for this gtk window`")]
+    NotInitialized,
+    #[cfg(windows)]
+    #[error("This menu has already been initialized for this hwnd`")]
+    AlreadyInitialized,
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    #[error("This menu has already been initialized for this gtk window`")]
+    AlreadyInitialized,
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    #[error("Unsupported gtk menu container")]
+    UnsupportedGtkContainer,
+    #[error(transparent)]
+    AcceleratorParseError(#[from] AcceleratorParseError),
+    #[error("Gtk Window doesn't have an application")]
+    GtkWindowWithoutApplication,
+}
+
+/// Convenient type alias of Result type for muda.
+pub type Result<T> = std::result::Result<T, Error>;
diff --git a/ports/muda/src/icon.rs b/ports/muda/src/icon.rs
new file mode 100644
index 000000000000..0757257b5885
--- /dev/null
+++ b/ports/muda/src/icon.rs
@@ -0,0 +1,376 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// taken from https://github.com/rust-windowing/winit/blob/92fdf5ba85f920262a61cee4590f4a11ad5738d1/src/icon.rs
+
+use crate::platform_impl::PlatformIcon;
+use std::{error::Error, fmt, io, mem};
+
+#[repr(C)]
+#[derive(Debug)]
+pub(crate) struct Pixel {
+    pub(crate) r: u8,
+    pub(crate) g: u8,
+    pub(crate) b: u8,
+    pub(crate) a: u8,
+}
+
+pub(crate) const PIXEL_SIZE: usize = mem::size_of::<Pixel>();
+
+#[derive(Debug)]
+/// An error produced when using [`Icon::from_rgba`] with invalid arguments.
+pub enum BadIcon {
+    /// Produced when the length of the `rgba` argument isn't divisible by 4, thus `rgba` can't be
+    /// safely interpreted as 32bpp RGBA pixels.
+    ByteCountNotDivisibleBy4 { byte_count: usize },
+    /// Produced when the number of pixels (`rgba.len() / 4`) isn't equal to `width * height`.
+    /// At least one of your arguments is incorrect.
+    DimensionsVsPixelCount {
+        width: u32,
+        height: u32,
+        width_x_height: usize,
+        pixel_count: usize,
+    },
+    /// Produced when underlying OS functionality failed to create the icon
+    OsError(io::Error),
+    /// Produced when encoding the provided RGBA data as PNG fails
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    PngEncodingError(png::EncodingError),
+}
+
+impl fmt::Display for BadIcon {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            BadIcon::ByteCountNotDivisibleBy4 { byte_count } => write!(f,
+                "The length of the `rgba` argument ({:?}) isn't divisible by 4, making it impossible to interpret as 32bpp RGBA pixels.",
+                byte_count,
+            ),
+            BadIcon::DimensionsVsPixelCount {
+                width,
+                height,
+                width_x_height,
+                pixel_count,
+            } => write!(f,
+                "The specified dimensions ({:?}x{:?}) don't match the number of pixels supplied by the `rgba` argument ({:?}). For those dimensions, the expected pixel count is {:?}.",
+                width, height, pixel_count, width_x_height,
+            ),
+            BadIcon::OsError(e) => write!(f, "OS error when instantiating the icon: {:?}", e),
+            #[cfg(all(
+                any(
+                    target_os = "linux",
+                    target_os = "dragonfly",
+                    target_os = "freebsd",
+                    target_os = "netbsd",
+                    target_os = "openbsd"
+                ),
+                feature = "gtk"
+            ))]
+            BadIcon::PngEncodingError(e) => {
+                write!(f, "PNG encoding error when instantiating the icon: {:?}", e)
+            }
+        }
+    }
+}
+
+impl Error for BadIcon {
+    fn source(&self) -> Option<&(dyn Error + 'static)> {
+        match self {
+            BadIcon::OsError(e) => Some(e),
+            #[cfg(all(
+                any(
+                    target_os = "linux",
+                    target_os = "dragonfly",
+                    target_os = "freebsd",
+                    target_os = "netbsd",
+                    target_os = "openbsd"
+                ),
+                feature = "gtk"
+            ))]
+            BadIcon::PngEncodingError(e) => Some(e),
+            _ => None,
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) struct RgbaIcon {
+    pub(crate) rgba: Vec<u8>,
+    pub(crate) width: u32,
+    pub(crate) height: u32,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn bad_icon_validation_errors_have_no_source() {
+        assert!(BadIcon::ByteCountNotDivisibleBy4 { byte_count: 1 }
+            .source()
+            .is_none());
+        assert!(BadIcon::DimensionsVsPixelCount {
+            width: 2,
+            height: 2,
+            width_x_height: 4,
+            pixel_count: 3,
+        }
+        .source()
+        .is_none());
+    }
+
+    #[test]
+    fn bad_icon_os_error_exposes_inner_source() {
+        let error = BadIcon::OsError(io::Error::new(io::ErrorKind::Other, "icon error"));
+        assert!(error.source().is_some());
+    }
+
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    #[test]
+    fn bad_icon_png_error_exposes_inner_source() {
+        let error = BadIcon::PngEncodingError(png::EncodingError::IoError(io::Error::new(
+            io::ErrorKind::Other,
+            "png error",
+        )));
+        assert!(error.source().is_some());
+    }
+}
+
+/// For platforms which don't have window icons (e.g. web)
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) struct NoIcon;
+
+#[allow(dead_code)] // These are not used on every platform
+mod constructors {
+    use super::*;
+
+    impl RgbaIcon {
+        pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
+            if !rgba.len().is_multiple_of(PIXEL_SIZE) {
+                return Err(BadIcon::ByteCountNotDivisibleBy4 {
+                    byte_count: rgba.len(),
+                });
+            }
+            let pixel_count = rgba.len() / PIXEL_SIZE;
+            if pixel_count != (width * height) as usize {
+                Err(BadIcon::DimensionsVsPixelCount {
+                    width,
+                    height,
+                    width_x_height: (width * height) as usize,
+                    pixel_count,
+                })
+            } else {
+                Ok(RgbaIcon {
+                    rgba,
+                    width,
+                    height,
+                })
+            }
+        }
+    }
+
+    impl NoIcon {
+        pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
+            // Create the rgba icon anyway to validate the input
+            let _ = RgbaIcon::from_rgba(rgba, width, height)?;
+            Ok(NoIcon)
+        }
+    }
+}
+
+/// An icon used for the window titlebar, taskbar, etc.
+#[derive(Clone)]
+pub struct Icon {
+    pub(crate) inner: PlatformIcon,
+}
+
+impl fmt::Debug for Icon {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
+        fmt::Debug::fmt(&self.inner, formatter)
+    }
+}
+
+impl Icon {
+    /// Creates an icon from 32bpp RGBA data.
+    ///
+    /// The length of `rgba` must be divisible by 4, and `width * height` must equal
+    /// `rgba.len() / 4`. Otherwise, this will return a `BadIcon` error.
+    pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
+        Ok(Icon {
+            inner: PlatformIcon::from_rgba(rgba, width, height)?,
+        })
+    }
+
+    /// Create an icon from a file path.
+    ///
+    /// Specify `size` to load a specific icon size from the file, or `None` to load the default
+    /// icon size from the file.
+    ///
+    /// In cases where the specified size does not exist in the file, Windows may perform scaling
+    /// to get an icon of the desired size.
+    #[cfg(windows)]
+    pub fn from_path<P: AsRef<std::path::Path>>(
+        path: P,
+        size: Option<(u32, u32)>,
+    ) -> Result<Self, BadIcon> {
+        let win_icon = PlatformIcon::from_path(path, size)?;
+        Ok(Icon { inner: win_icon })
+    }
+
+    /// Create an icon from a resource embedded in this executable or library.
+    ///
+    /// Specify `size` to load a specific icon size from the file, or `None` to load the default
+    /// icon size from the file.
+    ///
+    /// In cases where the specified size does not exist in the file, Windows may perform scaling
+    /// to get an icon of the desired size.
+    #[cfg(windows)]
+    pub fn from_resource(ordinal: u16, size: Option<(u32, u32)>) -> Result<Self, BadIcon> {
+        let win_icon = PlatformIcon::from_resource(ordinal, size)?;
+        Ok(Icon { inner: win_icon })
+    }
+}
+
+/// A native Icon to be used for the menu item
+///
+/// ## Platform-specific:
+///
+/// - **Windows / Linux**: Unsupported.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub enum NativeIcon {
+    /// An add item template image.
+    Add,
+    /// Advanced preferences toolbar icon for the preferences window.
+    Advanced,
+    /// A Bluetooth template image.
+    Bluetooth,
+    /// Bookmarks image suitable for a template.
+    Bookmarks,
+    /// A caution image.
+    Caution,
+    /// A color panel toolbar icon.
+    ColorPanel,
+    /// A column view mode template image.
+    ColumnView,
+    /// A computer icon.
+    Computer,
+    /// An enter full-screen mode template image.
+    EnterFullScreen,
+    /// Permissions for all users.
+    Everyone,
+    /// An exit full-screen mode template image.
+    ExitFullScreen,
+    /// A cover flow view mode template image.
+    FlowView,
+    /// A folder image.
+    Folder,
+    /// A burnable folder icon.
+    FolderBurnable,
+    /// A smart folder icon.
+    FolderSmart,
+    /// A link template image.
+    FollowLinkFreestanding,
+    /// A font panel toolbar icon.
+    FontPanel,
+    /// A `go back` template image.
+    GoLeft,
+    /// A `go forward` template image.
+    GoRight,
+    /// Home image suitable for a template.
+    Home,
+    /// An iChat Theater template image.
+    IChatTheater,
+    /// An icon view mode template image.
+    IconView,
+    /// An information toolbar icon.
+    Info,
+    /// A template image used to denote invalid data.
+    InvalidDataFreestanding,
+    /// A generic left-facing triangle template image.
+    LeftFacingTriangle,
+    /// A list view mode template image.
+    ListView,
+    /// A locked padlock template image.
+    LockLocked,
+    /// An unlocked padlock template image.
+    LockUnlocked,
+    /// A horizontal dash, for use in menus.
+    MenuMixedState,
+    /// A check mark template image, for use in menus.
+    MenuOnState,
+    /// A MobileMe icon.
+    MobileMe,
+    /// A drag image for multiple items.
+    MultipleDocuments,
+    /// A network icon.
+    Network,
+    /// A path button template image.
+    Path,
+    /// General preferences toolbar icon for the preferences window.
+    PreferencesGeneral,
+    /// A Quick Look template image.
+    QuickLook,
+    /// A refresh template image.
+    RefreshFreestanding,
+    /// A refresh template image.
+    Refresh,
+    /// A remove item template image.
+    Remove,
+    /// A reveal contents template image.
+    RevealFreestanding,
+    /// A generic right-facing triangle template image.
+    RightFacingTriangle,
+    /// A share view template image.
+    Share,
+    /// A slideshow template image.
+    Slideshow,
+    /// A badge for a `smart` item.
+    SmartBadge,
+    /// Small green indicator, similar to iChat’s available image.
+    StatusAvailable,
+    /// Small clear indicator.
+    StatusNone,
+    /// Small yellow indicator, similar to iChat’s idle image.
+    StatusPartiallyAvailable,
+    /// Small red indicator, similar to iChat’s unavailable image.
+    StatusUnavailable,
+    /// A stop progress template image.
+    StopProgressFreestanding,
+    /// A stop progress button template image.
+    StopProgress,
+    /// An image of the empty trash can.
+    TrashEmpty,
+    /// An image of the full trash can.
+    TrashFull,
+    /// Permissions for a single user.
+    User,
+    /// User account toolbar icon for the preferences window.
+    UserAccounts,
+    /// Permissions for a group of users.
+    UserGroup,
+    /// Permissions for guests.
+    UserGuest,
+}
diff --git a/ports/muda/src/items/check.rs b/ports/muda/src/items/check.rs
new file mode 100644
index 000000000000..7d7a3a3fda97
--- /dev/null
+++ b/ports/muda/src/items/check.rs
@@ -0,0 +1,154 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::{cell::RefCell, mem, rc::Rc};
+
+use crate::{
+    accelerator::{Accelerator, KeyAccelerator},
+    sealed::IsMenuItemBase,
+    IsMenuItem, MenuId, MenuItemKind,
+};
+
+/// A check menu item inside a [`Menu`] or [`Submenu`]
+/// and usually contains a text and a check mark or a similar toggle
+/// that corresponds to a checked and unchecked states.
+///
+/// [`Menu`]: crate::Menu
+/// [`Submenu`]: crate::Submenu
+#[derive(Clone)]
+pub struct CheckMenuItem {
+    pub(crate) id: Rc<MenuId>,
+    pub(crate) inner: Rc<RefCell<crate::platform_impl::MenuChild>>,
+}
+
+impl IsMenuItemBase for CheckMenuItem {}
+impl IsMenuItem for CheckMenuItem {
+    fn kind(&self) -> MenuItemKind {
+        MenuItemKind::Check(self.clone())
+    }
+
+    fn id(&self) -> &MenuId {
+        self.id()
+    }
+
+    fn into_id(self) -> MenuId {
+        self.into_id()
+    }
+}
+
+impl CheckMenuItem {
+    /// Create a new check menu item.
+    ///
+    /// - `text` could optionally contain an `&` before a character to assign this character as the mnemonic
+    ///   for this check menu item. To display a `&` without assigning a mnemenonic, use `&&`.
+    pub fn new<S: AsRef<str>>(
+        text: S,
+        enabled: bool,
+        checked: bool,
+        accelerator: Option<Accelerator>,
+    ) -> Self {
+        let item = crate::platform_impl::MenuChild::new_check(
+            text.as_ref(),
+            enabled,
+            checked,
+            accelerator.map(KeyAccelerator::from),
+            None,
+        );
+        Self {
+            id: Rc::new(item.id().clone()),
+            inner: Rc::new(RefCell::new(item)),
+        }
+    }
+
+    /// Create a new check menu item with the specified id.
+    ///
+    /// - `text` could optionally contain an `&` before a character to assign this character as the mnemonic
+    ///   for this check menu item. To display a `&` without assigning a mnemenonic, use `&&`.
+    pub fn with_id<I: Into<MenuId>, S: AsRef<str>>(
+        id: I,
+        text: S,
+        enabled: bool,
+        checked: bool,
+        accelerator: Option<Accelerator>,
+    ) -> Self {
+        let id = id.into();
+        Self {
+            id: Rc::new(id.clone()),
+            inner: Rc::new(RefCell::new(crate::platform_impl::MenuChild::new_check(
+                text.as_ref(),
+                enabled,
+                checked,
+                accelerator.map(KeyAccelerator::from),
+                Some(id),
+            ))),
+        }
+    }
+
+    /// Returns a unique identifier associated with this submenu.
+    pub fn id(&self) -> &MenuId {
+        &self.id
+    }
+
+    /// Get the text for this check menu item.
+    pub fn text(&self) -> String {
+        self.inner.borrow().text()
+    }
+
+    /// Set the text for this check menu item. `text` could optionally contain
+    /// an `&` before a character to assign this character as the mnemonic
+    /// for this check menu item. To display a `&` without assigning a mnemenonic, use `&&`.
+    pub fn set_text<S: AsRef<str>>(&self, text: S) {
+        self.inner.borrow_mut().set_text(text.as_ref())
+    }
+
+    /// Get whether this check menu item is enabled or not.
+    pub fn is_enabled(&self) -> bool {
+        self.inner.borrow().is_enabled()
+    }
+
+    /// Enable or disable this check menu item.
+    pub fn set_enabled(&self, enabled: bool) {
+        self.inner.borrow_mut().set_enabled(enabled)
+    }
+
+    /// Set this check menu item accelerator.
+    ///
+    /// (Note that setting an accelerator will override any existing [.set_key_accelerator()](Self::set_key_accelerator))
+    pub fn set_accelerator(&self, accelerator: Option<Accelerator>) -> crate::Result<()> {
+        self.inner
+            .borrow_mut()
+            .set_key_accelerator(accelerator.map(KeyAccelerator::from))
+    }
+
+    /// Set this check menu item accelerator using a [`KeyAccelerator`].
+    ///
+    /// (Note that setting a key_accelerator will override any existing [.set_accelerator()](Self::set_accelerator))
+    pub fn set_key_accelerator(&self, accelerator: Option<KeyAccelerator>) -> crate::Result<()> {
+        self.inner.borrow_mut().set_key_accelerator(accelerator)
+    }
+
+    /// Get whether this check menu item is checked or not.
+    pub fn is_checked(&self) -> bool {
+        self.inner.borrow().is_checked()
+    }
+
+    /// Check or Uncheck this check menu item.
+    pub fn set_checked(&self, checked: bool) {
+        self.inner.borrow_mut().set_checked(checked)
+    }
+
+    /// Convert this menu item into its menu ID.
+    pub fn into_id(mut self) -> MenuId {
+        // Note: `Rc::into_inner` is available from Rust 1.70
+        if let Some(id) = Rc::get_mut(&mut self.id) {
+            mem::take(id)
+        } else {
+            self.id().clone()
+        }
+    }
+}
diff --git a/ports/muda/src/items/compat.rs b/ports/muda/src/items/compat.rs
new file mode 100644
index 000000000000..3c0ee6db41e5
--- /dev/null
+++ b/ports/muda/src/items/compat.rs
@@ -0,0 +1,67 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::sync::Arc;
+
+use arc_swap::ArcSwap;
+
+use crate::AboutMetadata;
+
+#[derive(Debug, Clone)]
+pub struct CompatStandardItem {
+    pub id: String,
+    pub label: String,
+    pub enabled: bool,
+    pub icon: Option<Vec<u8>>,
+    pub about_metadata: Option<AboutMetadata>,
+}
+
+#[derive(Debug, Clone)]
+pub struct CompatCheckmarkItem {
+    pub id: String,
+    pub label: String,
+    pub enabled: bool,
+    pub checked: bool,
+}
+
+#[derive(Debug, Clone)]
+pub struct CompatSubMenuItem {
+    pub label: String,
+    pub enabled: bool,
+    pub submenu: Vec<Arc<ArcSwap<CompatMenuItem>>>,
+}
+
+#[allow(clippy::large_enum_variant)]
+#[derive(Debug, Clone)]
+pub enum CompatMenuItem {
+    Standard(CompatStandardItem),
+    Checkmark(CompatCheckmarkItem),
+    SubMenu(CompatSubMenuItem),
+    Separator,
+}
+
+impl From<CompatStandardItem> for CompatMenuItem {
+    fn from(item: CompatStandardItem) -> Self {
+        CompatMenuItem::Standard(item)
+    }
+}
+
+impl From<CompatCheckmarkItem> for CompatMenuItem {
+    fn from(item: CompatCheckmarkItem) -> Self {
+        CompatMenuItem::Checkmark(item)
+    }
+}
+
+impl From<CompatSubMenuItem> for CompatMenuItem {
+    fn from(item: CompatSubMenuItem) -> Self {
+        CompatMenuItem::SubMenu(item)
+    }
+}
+
+pub(crate) fn strip_mnemonic(text: impl AsRef<str>) -> String {
+    text.as_ref()
+        .replace("&&", "[~~]")
+        .replace('&', "")
+        .replace("[~~]", "&")
+}
diff --git a/ports/muda/src/items/icon.rs b/ports/muda/src/items/icon.rs
new file mode 100644
index 000000000000..8ce0513fffc0
--- /dev/null
+++ b/ports/muda/src/items/icon.rs
@@ -0,0 +1,214 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::{cell::RefCell, mem, rc::Rc};
+
+use crate::{
+    accelerator::{Accelerator, KeyAccelerator},
+    icon::{Icon, NativeIcon},
+    sealed::IsMenuItemBase,
+    IsMenuItem, MenuId, MenuItemKind,
+};
+
+/// An icon menu item inside a [`Menu`] or [`Submenu`]
+/// and usually contains an icon and a text.
+///
+/// [`Menu`]: crate::Menu
+/// [`Submenu`]: crate::Submenu
+#[derive(Clone)]
+pub struct IconMenuItem {
+    pub(crate) id: Rc<MenuId>,
+    pub(crate) inner: Rc<RefCell<crate::platform_impl::MenuChild>>,
+}
+
+impl IsMenuItemBase for IconMenuItem {}
+impl IsMenuItem for IconMenuItem {
+    fn kind(&self) -> MenuItemKind {
+        MenuItemKind::Icon(self.clone())
+    }
+
+    fn id(&self) -> &MenuId {
+        self.id()
+    }
+
+    fn into_id(self) -> MenuId {
+        self.into_id()
+    }
+}
+
+impl IconMenuItem {
+    /// Create a new icon menu item.
+    ///
+    /// - `text` could optionally contain an `&` before a character to assign this character as the mnemonic
+    ///   for this icon menu item. To display a `&` without assigning a mnemenonic, use `&&`.
+    pub fn new<S: AsRef<str>>(
+        text: S,
+        enabled: bool,
+        icon: Option<Icon>,
+        accelerator: Option<Accelerator>,
+    ) -> Self {
+        let item = crate::platform_impl::MenuChild::new_icon(
+            text.as_ref(),
+            enabled,
+            icon,
+            accelerator.map(KeyAccelerator::from),
+            None,
+        );
+        Self {
+            id: Rc::new(item.id().clone()),
+            inner: Rc::new(RefCell::new(item)),
+        }
+    }
+
+    /// Create a new icon menu item with the specified id.
+    ///
+    /// - `text` could optionally contain an `&` before a character to assign this character as the mnemonic
+    ///   for this icon menu item. To display a `&` without assigning a mnemenonic, use `&&`.
+    pub fn with_id<I: Into<MenuId>, S: AsRef<str>>(
+        id: I,
+        text: S,
+        enabled: bool,
+        icon: Option<Icon>,
+        accelerator: Option<Accelerator>,
+    ) -> Self {
+        let id = id.into();
+        Self {
+            id: Rc::new(id.clone()),
+            inner: Rc::new(RefCell::new(crate::platform_impl::MenuChild::new_icon(
+                text.as_ref(),
+                enabled,
+                icon,
+                accelerator.map(KeyAccelerator::from),
+                Some(id),
+            ))),
+        }
+    }
+
+    /// Create a new icon menu item but with a native icon.
+    ///
+    /// See [`IconMenuItem::new`] for more info.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Windows / Linux**: Unsupported.
+    pub fn with_native_icon<S: AsRef<str>>(
+        text: S,
+        enabled: bool,
+        native_icon: Option<NativeIcon>,
+        accelerator: Option<Accelerator>,
+    ) -> Self {
+        let item = crate::platform_impl::MenuChild::new_native_icon(
+            text.as_ref(),
+            enabled,
+            native_icon,
+            accelerator.map(KeyAccelerator::from),
+            None,
+        );
+        Self {
+            id: Rc::new(item.id().clone()),
+            inner: Rc::new(RefCell::new(item)),
+        }
+    }
+
+    /// Create a new icon menu item but with the specified id and a native icon.
+    ///
+    /// See [`IconMenuItem::new`] for more info.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Windows / Linux**: Unsupported.
+    pub fn with_id_and_native_icon<I: Into<MenuId>, S: AsRef<str>>(
+        id: I,
+        text: S,
+        enabled: bool,
+        native_icon: Option<NativeIcon>,
+        accelerator: Option<Accelerator>,
+    ) -> Self {
+        let id = id.into();
+        Self {
+            id: Rc::new(id.clone()),
+            inner: Rc::new(RefCell::new(
+                crate::platform_impl::MenuChild::new_native_icon(
+                    text.as_ref(),
+                    enabled,
+                    native_icon,
+                    accelerator.map(KeyAccelerator::from),
+                    Some(id),
+                ),
+            )),
+        }
+    }
+
+    /// Returns a unique identifier associated with this submenu.
+    pub fn id(&self) -> &MenuId {
+        &self.id
+    }
+
+    /// Get the text for this check menu item.
+    pub fn text(&self) -> String {
+        self.inner.borrow().text()
+    }
+
+    /// Set the text for this check menu item. `text` could optionally contain
+    /// an `&` before a character to assign this character as the mnemonic
+    /// for this check menu item. To display a `&` without assigning a mnemenonic, use `&&`.
+    pub fn set_text<S: AsRef<str>>(&self, text: S) {
+        self.inner.borrow_mut().set_text(text.as_ref())
+    }
+
+    /// Get whether this check menu item is enabled or not.
+    pub fn is_enabled(&self) -> bool {
+        self.inner.borrow().is_enabled()
+    }
+
+    /// Enable or disable this check menu item.
+    pub fn set_enabled(&self, enabled: bool) {
+        self.inner.borrow_mut().set_enabled(enabled)
+    }
+
+    /// Set this icon menu item accelerator.
+    ///
+    /// (Note that setting an accelerator will override any existing [.set_key_accelerator()](Self::set_key_accelerator))
+    pub fn set_accelerator(&self, accelerator: Option<Accelerator>) -> crate::Result<()> {
+        self.inner
+            .borrow_mut()
+            .set_key_accelerator(accelerator.map(KeyAccelerator::from))
+    }
+
+    /// Set this icon menu item accelerator using a [`KeyAccelerator`].
+    ///
+    /// (Note that setting a key_accelerator will override any existing [.set_accelerator()](Self::set_accelerator))
+    pub fn set_key_accelerator(&self, accelerator: Option<KeyAccelerator>) -> crate::Result<()> {
+        self.inner.borrow_mut().set_key_accelerator(accelerator)
+    }
+
+    /// Change this menu item icon or remove it.
+    pub fn set_icon(&self, icon: Option<Icon>) {
+        self.inner.borrow_mut().set_icon(icon)
+    }
+
+    /// Change this menu item icon to a native image or remove it.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Windows / Linux**: Unsupported.
+    pub fn set_native_icon(&self, _icon: Option<NativeIcon>) {
+        #[cfg(target_os = "macos")]
+        self.inner.borrow_mut().set_native_icon(_icon)
+    }
+
+    /// Convert this menu item into its menu ID.
+    pub fn into_id(mut self) -> MenuId {
+        // Note: `Rc::into_inner` is available from Rust 1.70
+        if let Some(id) = Rc::get_mut(&mut self.id) {
+            mem::take(id)
+        } else {
+            self.id().clone()
+        }
+    }
+}
diff --git a/ports/muda/src/items/mod.rs b/ports/muda/src/items/mod.rs
new file mode 100644
index 000000000000..f600a517f1ad
--- /dev/null
+++ b/ports/muda/src/items/mod.rs
@@ -0,0 +1,94 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+mod check;
+#[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+mod compat;
+mod icon;
+mod normal;
+mod predefined;
+mod submenu;
+
+pub use check::*;
+#[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+pub use compat::*;
+pub use icon::*;
+pub use normal::*;
+pub use predefined::*;
+pub use submenu::*;
+
+#[cfg(test)]
+mod test {
+    use crate::{CheckMenuItem, IconMenuItem, MenuId, MenuItem, PredefinedMenuItem, Submenu};
+
+    #[test]
+    #[cfg_attr(
+        all(
+            miri,
+            not(any(
+                target_os = "linux",
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "netbsd",
+                target_os = "openbsd"
+            ))
+        ),
+        ignore
+    )]
+    fn it_returns_same_id() {
+        let id = MenuId::new("1");
+        assert_eq!(id, MenuItem::with_id(id.clone(), "", true, None).id());
+        assert_eq!(id, Submenu::with_id(id.clone(), "", true).id());
+        assert_eq!(
+            id,
+            CheckMenuItem::with_id(id.clone(), "", true, true, None).id()
+        );
+        assert_eq!(
+            id,
+            IconMenuItem::with_id(id.clone(), "", true, None, None).id()
+        );
+    }
+
+    #[test]
+    #[cfg_attr(
+        all(
+            miri,
+            not(any(
+                target_os = "linux",
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "netbsd",
+                target_os = "openbsd"
+            ))
+        ),
+        ignore
+    )]
+    fn test_convert_from_id_and_into_id() {
+        let id = "TEST ID";
+        let expected = MenuId(id.to_string());
+
+        let item = CheckMenuItem::with_id(id, "test", true, true, None);
+        assert_eq!(item.id(), &expected);
+        assert_eq!(item.into_id(), expected);
+
+        let item = IconMenuItem::with_id(id, "test", true, None, None);
+        assert_eq!(item.id(), &expected);
+        assert_eq!(item.into_id(), expected);
+
+        let item = MenuItem::with_id(id, "test", true, None);
+        assert_eq!(item.id(), &expected);
+        assert_eq!(item.into_id(), expected);
+
+        let item = Submenu::with_id(id, "test", true);
+        assert_eq!(item.id(), &expected);
+        assert_eq!(item.into_id(), expected);
+
+        let item = PredefinedMenuItem::separator();
+        assert_eq!(item.id().clone(), item.into_id());
+    }
+}
diff --git a/ports/muda/src/items/normal.rs b/ports/muda/src/items/normal.rs
new file mode 100644
index 000000000000..8f1ce8b28926
--- /dev/null
+++ b/ports/muda/src/items/normal.rs
@@ -0,0 +1,130 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::{cell::RefCell, mem, rc::Rc};
+
+use crate::{
+    accelerator::{Accelerator, KeyAccelerator},
+    sealed::IsMenuItemBase,
+    IsMenuItem, MenuId, MenuItemKind,
+};
+
+/// A menu item inside a [`Menu`] or [`Submenu`] and contains only text.
+///
+/// [`Menu`]: crate::Menu
+/// [`Submenu`]: crate::Submenu
+#[derive(Clone)]
+pub struct MenuItem {
+    pub(crate) id: Rc<MenuId>,
+    pub(crate) inner: Rc<RefCell<crate::platform_impl::MenuChild>>,
+}
+
+impl IsMenuItemBase for MenuItem {}
+impl IsMenuItem for MenuItem {
+    fn kind(&self) -> MenuItemKind {
+        MenuItemKind::MenuItem(self.clone())
+    }
+
+    fn id(&self) -> &MenuId {
+        self.id()
+    }
+
+    fn into_id(self) -> MenuId {
+        self.into_id()
+    }
+}
+
+impl MenuItem {
+    /// Create a new menu item.
+    ///
+    /// - `text` could optionally contain an `&` before a character to assign this character as the mnemonic
+    ///   for this menu item. To display a `&` without assigning a mnemenonic, use `&&`.
+    pub fn new<S: AsRef<str>>(text: S, enabled: bool, accelerator: Option<Accelerator>) -> Self {
+        let item = crate::platform_impl::MenuChild::new(
+            text.as_ref(),
+            enabled,
+            accelerator.map(KeyAccelerator::from),
+            None,
+        );
+        Self {
+            id: Rc::new(item.id().clone()),
+            inner: Rc::new(RefCell::new(item)),
+        }
+    }
+
+    /// Create a new menu item with the specified id.
+    ///
+    /// - `text` could optionally contain an `&` before a character to assign this character as the mnemonic
+    ///   for this menu item. To display a `&` without assigning a mnemenonic, use `&&`.
+    pub fn with_id<I: Into<MenuId>, S: AsRef<str>>(
+        id: I,
+        text: S,
+        enabled: bool,
+        accelerator: Option<Accelerator>,
+    ) -> Self {
+        let id = id.into();
+        Self {
+            id: Rc::new(id.clone()),
+            inner: Rc::new(RefCell::new(crate::platform_impl::MenuChild::new(
+                text.as_ref(),
+                enabled,
+                accelerator.map(KeyAccelerator::from),
+                Some(id),
+            ))),
+        }
+    }
+
+    /// Returns a unique identifier associated with this menu item.
+    pub fn id(&self) -> &MenuId {
+        &self.id
+    }
+
+    /// Set the text for this menu item.
+    pub fn text(&self) -> String {
+        self.inner.borrow().text()
+    }
+
+    /// Set the text for this menu item. `text` could optionally contain
+    /// an `&` before a character to assign this character as the mnemonic
+    /// for this menu item. To display a `&` without assigning a mnemenonic, use `&&`.
+    pub fn set_text<S: AsRef<str>>(&self, text: S) {
+        self.inner.borrow_mut().set_text(text.as_ref())
+    }
+
+    /// Get whether this menu item is enabled or not.
+    pub fn is_enabled(&self) -> bool {
+        self.inner.borrow().is_enabled()
+    }
+
+    /// Enable or disable this menu item.
+    pub fn set_enabled(&self, enabled: bool) {
+        self.inner.borrow_mut().set_enabled(enabled)
+    }
+
+    /// Set this menu item accelerator.
+    ///
+    /// (Note that setting an accelerator will override any existing [.set_key_accelerator()](Self::set_key_accelerator))
+    pub fn set_accelerator(&self, accelerator: Option<Accelerator>) -> crate::Result<()> {
+        self.inner
+            .borrow_mut()
+            .set_key_accelerator(accelerator.map(KeyAccelerator::from))
+    }
+
+    /// Set this menu item accelerator using a [`KeyAccelerator`].
+    ///
+    /// (Note that setting a key_accelerator will override any existing [.set_accelerator()](Self::set_accelerator))
+    pub fn set_key_accelerator(&self, accelerator: Option<KeyAccelerator>) -> crate::Result<()> {
+        self.inner.borrow_mut().set_key_accelerator(accelerator)
+    }
+
+    /// Convert this menu item into its menu ID.
+    pub fn into_id(mut self) -> MenuId {
+        // Note: `Rc::into_inner` is available from Rust 1.70
+        if let Some(id) = Rc::get_mut(&mut self.id) {
+            mem::take(id)
+        } else {
+            self.id().clone()
+        }
+    }
+}
diff --git a/ports/muda/src/items/predefined.rs b/ports/muda/src/items/predefined.rs
new file mode 100644
index 000000000000..72bf922ed117
--- /dev/null
+++ b/ports/muda/src/items/predefined.rs
@@ -0,0 +1,347 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::{cell::RefCell, mem, rc::Rc};
+
+use crate::{
+    accelerator::{Accelerator, CMD_OR_CTRL},
+    sealed::IsMenuItemBase,
+    AboutMetadata, IsMenuItem, MenuId, MenuItemKind,
+};
+use keyboard_types::{Code, Modifiers};
+
+/// A predefined (native) menu item which has a predefined behavior by the OS or by this crate.
+#[derive(Clone)]
+pub struct PredefinedMenuItem {
+    pub(crate) id: Rc<MenuId>,
+    pub(crate) inner: Rc<RefCell<crate::platform_impl::MenuChild>>,
+}
+
+impl IsMenuItemBase for PredefinedMenuItem {}
+impl IsMenuItem for PredefinedMenuItem {
+    fn kind(&self) -> MenuItemKind {
+        MenuItemKind::Predefined(self.clone())
+    }
+
+    fn id(&self) -> &MenuId {
+        self.id()
+    }
+
+    fn into_id(self) -> MenuId {
+        self.into_id()
+    }
+}
+
+impl PredefinedMenuItem {
+    /// Separator menu item
+    pub fn separator() -> PredefinedMenuItem {
+        PredefinedMenuItem::new::<&str>(PredefinedMenuItemType::Separator, None)
+    }
+
+    /// Copy menu item
+    pub fn copy(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::Copy, text)
+    }
+
+    /// Cut menu item
+    pub fn cut(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::Cut, text)
+    }
+
+    /// Paste menu item
+    pub fn paste(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::Paste, text)
+    }
+
+    /// SelectAll menu item
+    pub fn select_all(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::SelectAll, text)
+    }
+
+    /// Undo menu item
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn undo(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::Undo, text)
+    }
+    /// Redo menu item
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn redo(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::Redo, text)
+    }
+
+    /// Minimize window menu item
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn minimize(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::Minimize, text)
+    }
+
+    /// Maximize window menu item
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn maximize(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::Maximize, text)
+    }
+
+    /// Fullscreen menu item
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Windows / Linux:** Unsupported.
+    pub fn fullscreen(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::Fullscreen, text)
+    }
+
+    /// Hide window menu item
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn hide(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::Hide, text)
+    }
+
+    /// Hide other windows menu item
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn hide_others(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::HideOthers, text)
+    }
+
+    /// Show all app windows menu item
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Windows / Linux:** Unsupported.
+    pub fn show_all(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::ShowAll, text)
+    }
+
+    /// Close window menu item
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn close_window(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::CloseWindow, text)
+    }
+
+    /// Quit app menu item
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn quit(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::Quit, text)
+    }
+
+    /// About app menu item
+    pub fn about(text: Option<&str>, metadata: Option<AboutMetadata>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::About(metadata), text)
+    }
+
+    /// Services menu item
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Windows / Linux:** Unsupported.
+    pub fn services(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::Services, text)
+    }
+
+    /// 'Bring all to front' menu item
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Windows / Linux:** Unsupported.
+    pub fn bring_all_to_front(text: Option<&str>) -> PredefinedMenuItem {
+        PredefinedMenuItem::new(PredefinedMenuItemType::BringAllToFront, text)
+    }
+
+    fn new<S: AsRef<str>>(item: PredefinedMenuItemType, text: Option<S>) -> Self {
+        let item = crate::platform_impl::MenuChild::new_predefined(
+            item,
+            text.map(|t| t.as_ref().to_string()),
+        );
+        Self {
+            id: Rc::new(item.id().clone()),
+            inner: Rc::new(RefCell::new(item)),
+        }
+    }
+
+    /// Returns a unique identifier associated with this predefined menu item.
+    pub fn id(&self) -> &MenuId {
+        &self.id
+    }
+
+    /// Get the text for this predefined menu item.
+    pub fn text(&self) -> String {
+        self.inner.borrow().text()
+    }
+
+    /// Set the text for this predefined menu item.
+    pub fn set_text<S: AsRef<str>>(&self, text: S) {
+        self.inner.borrow_mut().set_text(text.as_ref())
+    }
+
+    /// Convert this menu item into its menu ID.
+    pub fn into_id(mut self) -> MenuId {
+        // Note: `Rc::into_inner` is available from Rust 1.70
+        if let Some(id) = Rc::get_mut(&mut self.id) {
+            mem::take(id)
+        } else {
+            self.id().clone()
+        }
+    }
+}
+
+#[test]
+fn test_about_metadata() {
+    assert_eq!(
+        AboutMetadata {
+            ..Default::default()
+        }
+        .full_version(),
+        None
+    );
+
+    assert_eq!(
+        AboutMetadata {
+            version: Some("Version: 1.0".into()),
+            ..Default::default()
+        }
+        .full_version(),
+        Some("Version: 1.0".into())
+    );
+
+    assert_eq!(
+        AboutMetadata {
+            version: Some("Version: 1.0".into()),
+            short_version: Some("Universal".into()),
+            ..Default::default()
+        }
+        .full_version(),
+        Some("Version: 1.0 (Universal)".into())
+    );
+}
+
+#[derive(Debug, Clone, Default)]
+#[non_exhaustive]
+#[allow(clippy::large_enum_variant)]
+pub(crate) enum PredefinedMenuItemType {
+    Separator,
+    Copy,
+    Cut,
+    Paste,
+    SelectAll,
+    Undo,
+    Redo,
+    Minimize,
+    Maximize,
+    Fullscreen,
+    Hide,
+    HideOthers,
+    ShowAll,
+    CloseWindow,
+    Quit,
+    About(Option<AboutMetadata>),
+    Services,
+    BringAllToFront,
+    #[default]
+    None,
+}
+
+impl PredefinedMenuItemType {
+    pub(crate) fn text(&self) -> &str {
+        match self {
+            PredefinedMenuItemType::Separator => "",
+            PredefinedMenuItemType::Copy => "&Copy",
+            PredefinedMenuItemType::Cut => "Cu&t",
+            PredefinedMenuItemType::Paste => "&Paste",
+            PredefinedMenuItemType::SelectAll => "Select &All",
+            PredefinedMenuItemType::Undo => "Undo",
+            PredefinedMenuItemType::Redo => "Redo",
+            PredefinedMenuItemType::Minimize => "&Minimize",
+            #[cfg(target_os = "macos")]
+            PredefinedMenuItemType::Maximize => "Zoom",
+            #[cfg(not(target_os = "macos"))]
+            PredefinedMenuItemType::Maximize => "Ma&ximize",
+            PredefinedMenuItemType::Fullscreen => "Toggle Full Screen",
+            PredefinedMenuItemType::Hide => "&Hide",
+            PredefinedMenuItemType::HideOthers => "Hide Others",
+            PredefinedMenuItemType::ShowAll => "Show All",
+            #[cfg(windows)]
+            PredefinedMenuItemType::CloseWindow => "Close",
+            #[cfg(not(windows))]
+            PredefinedMenuItemType::CloseWindow => "C&lose Window",
+            #[cfg(windows)]
+            PredefinedMenuItemType::Quit => "&Exit",
+            #[cfg(not(windows))]
+            PredefinedMenuItemType::Quit => "&Quit",
+            PredefinedMenuItemType::About(_) => "&About",
+            PredefinedMenuItemType::Services => "Services",
+            PredefinedMenuItemType::BringAllToFront => "Bring All to Front",
+            PredefinedMenuItemType::None => "",
+        }
+    }
+
+    pub(crate) fn accelerator(&self) -> Option<Accelerator> {
+        match self {
+            PredefinedMenuItemType::Copy => Some(Accelerator::new(Some(CMD_OR_CTRL), Code::KeyC)),
+            PredefinedMenuItemType::Cut => Some(Accelerator::new(Some(CMD_OR_CTRL), Code::KeyX)),
+            PredefinedMenuItemType::Paste => Some(Accelerator::new(Some(CMD_OR_CTRL), Code::KeyV)),
+            PredefinedMenuItemType::Undo => Some(Accelerator::new(Some(CMD_OR_CTRL), Code::KeyZ)),
+            #[cfg(target_os = "macos")]
+            PredefinedMenuItemType::Redo => Some(Accelerator::new(
+                Some(CMD_OR_CTRL | Modifiers::SHIFT),
+                Code::KeyZ,
+            )),
+            #[cfg(not(target_os = "macos"))]
+            PredefinedMenuItemType::Redo => Some(Accelerator::new(Some(CMD_OR_CTRL), Code::KeyY)),
+            PredefinedMenuItemType::SelectAll => {
+                Some(Accelerator::new(Some(CMD_OR_CTRL), Code::KeyA))
+            }
+            PredefinedMenuItemType::Minimize => {
+                Some(Accelerator::new(Some(CMD_OR_CTRL), Code::KeyM))
+            }
+            #[cfg(target_os = "macos")]
+            PredefinedMenuItemType::Fullscreen => Some(Accelerator::new(
+                Some(Modifiers::META | Modifiers::CONTROL),
+                Code::KeyF,
+            )),
+            PredefinedMenuItemType::Hide => Some(Accelerator::new(Some(CMD_OR_CTRL), Code::KeyH)),
+            PredefinedMenuItemType::HideOthers => Some(Accelerator::new(
+                Some(CMD_OR_CTRL | Modifiers::ALT),
+                Code::KeyH,
+            )),
+            #[cfg(target_os = "macos")]
+            PredefinedMenuItemType::CloseWindow => {
+                Some(Accelerator::new(Some(CMD_OR_CTRL), Code::KeyW))
+            }
+            #[cfg(not(target_os = "macos"))]
+            PredefinedMenuItemType::CloseWindow => {
+                Some(Accelerator::new(Some(Modifiers::ALT), Code::F4))
+            }
+            #[cfg(target_os = "macos")]
+            PredefinedMenuItemType::Quit => Some(Accelerator::new(Some(CMD_OR_CTRL), Code::KeyQ)),
+            _ => None,
+        }
+    }
+}
diff --git a/ports/muda/src/items/submenu.rs b/ports/muda/src/items/submenu.rs
new file mode 100644
index 000000000000..b4fef4462118
--- /dev/null
+++ b/ports/muda/src/items/submenu.rs
@@ -0,0 +1,332 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::{cell::RefCell, mem, rc::Rc};
+
+use crate::{
+    dpi::Position, sealed::IsMenuItemBase, util::AddOp, ContextMenu, Icon, IsMenuItem, MenuId,
+    MenuItemKind, NativeIcon,
+};
+
+/// A menu that can be added to a [`Menu`] or another [`Submenu`].
+///
+/// [`Menu`]: crate::Menu
+#[derive(Clone)]
+pub struct Submenu {
+    pub(crate) id: Rc<MenuId>,
+    pub(crate) inner: Rc<RefCell<crate::platform_impl::MenuChild>>,
+}
+
+impl IsMenuItemBase for Submenu {}
+impl IsMenuItem for Submenu {
+    fn kind(&self) -> MenuItemKind {
+        MenuItemKind::Submenu(self.clone())
+    }
+
+    fn id(&self) -> &MenuId {
+        self.id()
+    }
+
+    fn into_id(self) -> MenuId {
+        self.into_id()
+    }
+}
+
+impl Submenu {
+    /// Create a new submenu.
+    ///
+    /// - `text` could optionally contain an `&` before a character to assign this character as the mnemonic
+    ///   for this submenu. To display a `&` without assigning a mnemenonic, use `&&`.
+    pub fn new<S: AsRef<str>>(text: S, enabled: bool) -> Self {
+        let submenu = crate::platform_impl::MenuChild::new_submenu(text.as_ref(), enabled, None);
+        Self {
+            id: Rc::new(submenu.id().clone()),
+            inner: Rc::new(RefCell::new(submenu)),
+        }
+    }
+
+    /// Create a new submenu with the specified id.
+    ///
+    /// - `text` could optionally contain an `&` before a character to assign this character as the mnemonic
+    ///   for this submenu. To display a `&` without assigning a mnemenonic, use `&&`.
+    pub fn with_id<I: Into<MenuId>, S: AsRef<str>>(id: I, text: S, enabled: bool) -> Self {
+        let id = id.into();
+
+        Self {
+            id: Rc::new(id.clone()),
+            inner: Rc::new(RefCell::new(crate::platform_impl::MenuChild::new_submenu(
+                text.as_ref(),
+                enabled,
+                Some(id),
+            ))),
+        }
+    }
+
+    /// Creates a new submenu with given `items`. It calls [`Submenu::new`] and [`Submenu::append_items`] internally.
+    pub fn with_items<S: AsRef<str>>(
+        text: S,
+        enabled: bool,
+        items: &[&dyn IsMenuItem],
+    ) -> crate::Result<Self> {
+        let menu = Self::new(text, enabled);
+        menu.append_items(items)?;
+        Ok(menu)
+    }
+
+    /// Creates a new submenu with the specified id and given `items`. It calls [`Submenu::new`] and [`Submenu::append_items`] internally.
+    pub fn with_id_and_items<I: Into<MenuId>, S: AsRef<str>>(
+        id: I,
+        text: S,
+        enabled: bool,
+        items: &[&dyn IsMenuItem],
+    ) -> crate::Result<Self> {
+        let menu = Self::with_id(id, text, enabled);
+        menu.append_items(items)?;
+        Ok(menu)
+    }
+
+    /// Returns a unique identifier associated with this submenu.
+    pub fn id(&self) -> &MenuId {
+        &self.id
+    }
+
+    /// Add a menu item to the end of this menu.
+    pub fn append(&self, item: &dyn IsMenuItem) -> crate::Result<()> {
+        self.inner.borrow_mut().add_menu_item(item, AddOp::Append)
+    }
+
+    /// Add menu items to the end of this submenu. It calls [`Submenu::append`] in a loop.
+    pub fn append_items(&self, items: &[&dyn IsMenuItem]) -> crate::Result<()> {
+        for item in items {
+            self.append(*item)?
+        }
+
+        Ok(())
+    }
+
+    /// Add a menu item to the beginning of this submenu.
+    pub fn prepend(&self, item: &dyn IsMenuItem) -> crate::Result<()> {
+        self.inner
+            .borrow_mut()
+            .add_menu_item(item, AddOp::Insert(0))
+    }
+
+    /// Add menu items to the beginning of this submenu.
+    /// It calls [`Menu::prepend`](crate::Menu::prepend) on the first element and
+    /// passes the rest to [`Menu::insert_items`](crate::Menu::insert_items) with position of `1`.
+    pub fn prepend_items(&self, items: &[&dyn IsMenuItem]) -> crate::Result<()> {
+        self.insert_items(items, 0)
+    }
+
+    /// Insert a menu item at the specified `position` in the submenu.
+    pub fn insert(&self, item: &dyn IsMenuItem, position: usize) -> crate::Result<()> {
+        self.inner
+            .borrow_mut()
+            .add_menu_item(item, AddOp::Insert(position))
+    }
+
+    /// Insert menu items at the specified `position` in the submenu.
+    pub fn insert_items(&self, items: &[&dyn IsMenuItem], position: usize) -> crate::Result<()> {
+        for (i, item) in items.iter().enumerate() {
+            self.insert(*item, position + i)?
+        }
+
+        Ok(())
+    }
+
+    /// Remove a menu item from this submenu.
+    pub fn remove(&self, item: &dyn IsMenuItem) -> crate::Result<()> {
+        self.inner.borrow_mut().remove(item)
+    }
+
+    /// Remove the menu item at the specified position from this submenu and returns it.
+    pub fn remove_at(&self, position: usize) -> Option<MenuItemKind> {
+        let mut items = self.items();
+        if items.len() > position {
+            let item = items.remove(position);
+            let _ = self.remove(item.as_ref());
+            Some(item)
+        } else {
+            None
+        }
+    }
+
+    /// Returns a list of menu items that has been added to this submenu.
+    pub fn items(&self) -> Vec<MenuItemKind> {
+        self.inner.borrow().items()
+    }
+
+    /// Get the text for this submenu.
+    pub fn text(&self) -> String {
+        self.inner.borrow().text()
+    }
+
+    /// Set the text for this submenu. `text` could optionally contain
+    /// an `&` before a character to assign this character as the mnemonic
+    /// for this submenu. To display a `&` without assigning a mnemenonic, use `&&`.
+    pub fn set_text<S: AsRef<str>>(&self, text: S) {
+        self.inner.borrow_mut().set_text(text.as_ref())
+    }
+
+    /// Get whether this submenu is enabled or not.
+    pub fn is_enabled(&self) -> bool {
+        self.inner.borrow().is_enabled()
+    }
+
+    /// Enable or disable this submenu.
+    pub fn set_enabled(&self, enabled: bool) {
+        self.inner.borrow_mut().set_enabled(enabled)
+    }
+
+    /// Set this submenu as the Window menu for the application on macOS.
+    /// This will cause macOS to automatically add window-switching items and
+    /// certain other items to the menu.
+    ///
+    /// Must be called after adding this submenu to [`Menu`](crate::Menu)
+    /// and after calling [`Menu::init_for_nsapp`](crate::Menu::init_for_nsapp) on that menu.
+    ///
+    ///
+    /// # Note
+    ///
+    /// Because a [`Submenu`] can be added multiple times to the same [`Menu`](crate::Menu)
+    /// this method will set the first instance of this submenu as the Window menu for the application.
+    ///
+    /// It is not recommended to add the same submenu multiple times to the same menu, but if you do, be aware of this behavior.
+    #[cfg(target_os = "macos")]
+    pub fn set_as_windows_menu_for_nsapp(&self) {
+        self.inner.borrow_mut().set_as_windows_menu_for_nsapp()
+    }
+
+    /// Set this submenu as the Help menu for the application on macOS.
+    /// This will cause macOS to automatically add a search box to the menu.
+    ///
+    /// Must be called after adding this submenu to [`Menu`](crate::Menu)
+    /// and after calling [`Menu::init_for_nsapp`](crate::Menu::init_for_nsapp) on that menu.
+    ///
+    /// If no menu is set as the Help menu, macOS will automatically use any menu
+    /// which has a title matching the localized word "Help".
+    ///
+    /// # Note
+    ///
+    /// Because a [`Submenu`] can be added multiple times to the same [`Menu`](crate::Menu)
+    /// this method will set the first instance of this submenu as the Help menu for the application.
+    ///
+    /// It is not recommended to add the same submenu multiple times to the same menu, but if you do, be aware of this behavior.
+    #[cfg(target_os = "macos")]
+    pub fn set_as_help_menu_for_nsapp(&self) {
+        self.inner.borrow_mut().set_as_help_menu_for_nsapp()
+    }
+
+    /// Convert this submenu into its menu ID.
+    pub fn into_id(mut self) -> MenuId {
+        // Note: `Rc::into_inner` is available from Rust 1.70
+        if let Some(id) = Rc::get_mut(&mut self.id) {
+            mem::take(id)
+        } else {
+            self.id().clone()
+        }
+    }
+
+    /// Change this menu item icon or remove it.
+    pub fn set_icon(&self, icon: Option<Icon>) {
+        self.inner.borrow_mut().set_icon(icon)
+    }
+
+    /// Change this menu item icon to a native image or remove it.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Windows / Linux**: Unsupported.
+    pub fn set_native_icon(&self, _icon: Option<NativeIcon>) {
+        #[cfg(target_os = "macos")]
+        self.inner.borrow_mut().set_native_icon(_icon)
+    }
+}
+
+impl ContextMenu for Submenu {
+    #[cfg(target_os = "windows")]
+    fn hpopupmenu(&self) -> isize {
+        self.inner.borrow().hpopupmenu()
+    }
+
+    #[cfg(target_os = "windows")]
+    unsafe fn show_context_menu_for_hwnd(&self, hwnd: isize, position: Option<Position>) -> bool {
+        self.inner
+            .borrow_mut()
+            .show_context_menu_for_hwnd(hwnd, position)
+    }
+
+    #[cfg(target_os = "windows")]
+    unsafe fn attach_menu_subclass_for_hwnd(&self, hwnd: isize) {
+        self.inner.borrow().attach_menu_subclass_for_hwnd(hwnd)
+    }
+
+    #[cfg(target_os = "windows")]
+    unsafe fn detach_menu_subclass_from_hwnd(&self, hwnd: isize) {
+        self.inner.borrow().detach_menu_subclass_from_hwnd(hwnd)
+    }
+
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    fn show_context_menu_for_gtk_window(
+        &self,
+        w: &gtk::Window,
+        position: Option<Position>,
+    ) -> bool {
+        self.inner
+            .borrow_mut()
+            .show_context_menu_for_gtk_window(w, position)
+    }
+
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    fn gtk_context_menu(&self) -> gtk::PopoverMenu {
+        self.inner.borrow_mut().gtk_context_menu()
+    }
+
+    #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+    fn compat_items(&self) -> Vec<std::sync::Arc<arc_swap::ArcSwap<crate::CompatMenuItem>>> {
+        self.inner.borrow().compat_items()
+    }
+
+    #[cfg(target_os = "macos")]
+    unsafe fn show_context_menu_for_nsview(
+        &self,
+        view: *const std::ffi::c_void,
+        position: Option<Position>,
+    ) -> bool {
+        self.inner
+            .borrow_mut()
+            .show_context_menu_for_nsview(view, position)
+    }
+
+    #[cfg(target_os = "macos")]
+    fn ns_menu(&self) -> *mut std::ffi::c_void {
+        self.inner.borrow().ns_menu()
+    }
+
+    fn as_submenu(&self) -> Option<&Submenu> {
+        Some(self)
+    }
+}
diff --git a/ports/muda/src/lib.rs b/ports/muda/src/lib.rs
new file mode 100644
index 000000000000..74a3afe6a008
--- /dev/null
+++ b/ports/muda/src/lib.rs
@@ -0,0 +1,555 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+#![allow(clippy::uninlined_format_args)]
+
+//! muda is a Menu Utilities library for Desktop Applications.
+//!
+//! # Platforms supported:
+//!
+//! - Windows
+//! - macOS
+//! - Linux (gtk Only)
+//!
+//! # Platform-specific notes:
+//!
+//! - On macOS, menus can only be used from the main thread, and most
+//!   functionality will panic if you try to use it from any other thread.
+//!
+//! - On Windows, accelerators don't work unless the win32 message loop calls
+//!   [`TranslateAcceleratorW`](https://docs.rs/windows-sys/latest/windows_sys/Win32/UI/WindowsAndMessaging/fn.TranslateAcceleratorW.html).
+//!   See [`Menu::init_for_hwnd`](https://docs.rs/muda/latest/x86_64-pc-windows-msvc/muda/struct.Menu.html#method.init_for_hwnd) for more details
+//!
+//! # Dependencies (Linux Only)
+//!
+//! `gtk` is used for menus and `libxdo` is used to make the predefined `Copy`, `Cut`, `Paste` and `SelectAll` menu items work. Be sure to install following packages before building:
+//!
+//! #### Arch Linux / Manjaro:
+//!
+//! ```sh
+//! pacman -S gtk4 xdotool
+//! ```
+//!
+//! #### Debian / Ubuntu:
+//!
+//! ```sh
+//! sudo apt install libgtk-4-dev libxdo-dev
+//! ```
+//!
+//! # Example
+//!
+//! Create the menu and add your items
+//!
+//! ```no_run
+//! # use muda::{Menu, Submenu, MenuItem, accelerator::{Code, Modifiers, Accelerator}, PredefinedMenuItem};
+//! let menu = Menu::new();
+//! let menu_item2 = MenuItem::new("Menu item #2", false, None);
+//! let submenu = Submenu::with_items(
+//!     "Submenu Outer",
+//!     true,
+//!     &[
+//!         &MenuItem::new(
+//!             "Menu item #1",
+//!             true,
+//!             Some(Accelerator::new(Some(Modifiers::ALT), Code::KeyD)),
+//!         ),
+//!         &PredefinedMenuItem::separator(),
+//!         &menu_item2,
+//!         &MenuItem::new("Menu item #3", true, None),
+//!         &PredefinedMenuItem::separator(),
+//!         &Submenu::with_items(
+//!             "Submenu Inner",
+//!             true,
+//!             &[
+//!                 &MenuItem::new("Submenu item #1", true, None),
+//!                 &PredefinedMenuItem::separator(),
+//!                 &menu_item2,
+//!             ],
+//!         ).unwrap(),
+//!     ],
+//! );
+//! ```
+//!
+//! Then add your root menu to a Window on Windows and Linux
+//! or use it as your global app menu on macOS
+//!
+//! ```no_run
+//! # let menu = muda::Menu::new();
+//! # let window_hwnd = 0;
+//! # #[cfg(any(
+//!     target_os = "linux",
+//!         target_os = "dragonfly",
+//!         target_os = "freebsd",
+//!         target_os = "netbsd",
+//!         target_os = "openbsd"
+//! ))]
+//! # let gtk_window = gtk::Window::builder().build();
+//! # #[cfg(any(
+//!     target_os = "linux",
+//!     target_os = "dragonfly",
+//!     target_os = "freebsd",
+//!     target_os = "netbsd",
+//!     target_os = "openbsd"
+//! ))]
+//! # let vertical_gtk_box = gtk::Box::new(gtk::Orientation::Vertical, 0);
+//! // --snip--
+//! #[cfg(target_os = "windows")]
+//! unsafe { menu.init_for_hwnd(window_hwnd) };
+//! #[cfg(any(
+//!     target_os = "linux",
+//!     target_os = "dragonfly",
+//!     target_os = "freebsd",
+//!     target_os = "netbsd",
+//!     target_os = "openbsd"
+//! ))]
+//! menu.init_for_gtk_window(&gtk_window, Some(&vertical_gtk_box));
+//! #[cfg(target_os = "macos")]
+//! menu.init_for_nsapp();
+//! ```
+//!
+//! # Context menus (Popup menus)
+//!
+//! You can also use a [`Menu`] or a [`Submenu`] show a context menu.
+//!
+//! ```no_run
+//! use muda::ContextMenu;
+//! # let menu = muda::Menu::new();
+//! # let window_hwnd = 0;
+//! # #[cfg(any(
+//!     target_os = "linux",
+//!     target_os = "dragonfly",
+//!     target_os = "freebsd",
+//!     target_os = "netbsd",
+//!     target_os = "openbsd"
+//! ))]
+//! # let gtk_window = gtk::Window::builder().build();
+//! # #[cfg(target_os = "macos")]
+//! # let nsview = std::ptr::null();
+//! // --snip--
+//! let position = muda::dpi::PhysicalPosition { x: 100., y: 120. };
+//! #[cfg(target_os = "windows")]
+//! unsafe { menu.show_context_menu_for_hwnd(window_hwnd, Some(position.into())) };
+//! #[cfg(any(
+//!     target_os = "linux",
+//!     target_os = "dragonfly",
+//!     target_os = "freebsd",
+//!     target_os = "netbsd",
+//!     target_os = "openbsd"
+//! ))]
+//! menu.show_context_menu_for_gtk_window(&gtk_window, Some(position.into()));
+//! #[cfg(target_os = "macos")]
+//! unsafe { menu.show_context_menu_for_nsview(nsview, Some(position.into())) };
+//! ```
+//! # Processing menu events
+//!
+//! You can use [`MenuEvent::receiver`] to get a reference to the [`MenuEventReceiver`]
+//! which you can use to listen to events when a menu item is activated
+//! ```no_run
+//! # use muda::MenuEvent;
+//! #
+//! # let save_item: muda::MenuItem = unsafe { std::mem::zeroed() };
+//! if let Ok(event) = MenuEvent::receiver().try_recv() {
+//!     match event.id {
+//!         id if id == save_item.id() => {
+//!             println!("Save menu item activated");
+//!         },
+//!         _ => {}
+//!     }
+//! }
+//! ```
+//!
+//! ### Note for [winit] or [tao] users:
+//!
+//! You should use [`MenuEvent::set_event_handler`] and forward
+//! the menu events to the event loop by using [`EventLoopProxy`]
+//! so that the event loop is awakened on each menu event.
+//!
+//! ```no_run
+//! # use tao::event_loop::EventLoopBuilder;
+//! enum UserEvent {
+//!   MenuEvent(muda::MenuEvent)
+//! }
+//!
+//! let event_loop = EventLoopBuilder::<UserEvent>::with_user_event().build();
+//!
+//! let proxy = event_loop.create_proxy();
+//! muda::MenuEvent::set_event_handler(Some(move |event| {
+//!     proxy.send_event(UserEvent::MenuEvent(event));
+//! }));
+//! ```
+//!
+//! [`EventLoopProxy`]: https://docs.rs/winit/latest/winit/event_loop/struct.EventLoopProxy.html
+//! [winit]: https://docs.rs/winit
+//! [tao]: https://docs.rs/tao
+
+use crossbeam_channel::{unbounded, Receiver, Sender};
+use once_cell::sync::{Lazy, OnceCell};
+
+pub mod about_metadata;
+pub mod accelerator;
+mod builders;
+mod error;
+mod icon;
+mod items;
+mod menu;
+mod menu_id;
+mod platform_impl;
+mod util;
+
+pub use about_metadata::AboutMetadata;
+pub use builders::*;
+pub use dpi;
+pub use error::*;
+pub use icon::{BadIcon, Icon, NativeIcon};
+pub use items::*;
+pub use menu::*;
+pub use menu_id::MenuId;
+
+/// An enumeration of all available menu types, useful to match against
+/// the items returned from [`Menu::items`] or [`Submenu::items`]
+#[derive(Clone)]
+pub enum MenuItemKind {
+    MenuItem(MenuItem),
+    Submenu(Submenu),
+    Predefined(PredefinedMenuItem),
+    Check(CheckMenuItem),
+    Icon(IconMenuItem),
+}
+
+impl MenuItemKind {
+    /// Returns a unique identifier associated with this menu item.
+    pub fn id(&self) -> &MenuId {
+        match self {
+            MenuItemKind::MenuItem(i) => i.id(),
+            MenuItemKind::Submenu(i) => i.id(),
+            MenuItemKind::Predefined(i) => i.id(),
+            MenuItemKind::Check(i) => i.id(),
+            MenuItemKind::Icon(i) => i.id(),
+        }
+    }
+
+    /// Casts this item to a [`MenuItem`], and returns `None` if it wasn't.
+    pub fn as_menuitem(&self) -> Option<&MenuItem> {
+        match self {
+            MenuItemKind::MenuItem(i) => Some(i),
+            _ => None,
+        }
+    }
+
+    /// Casts this item to a [`MenuItem`], and panics if it wasn't.
+    pub fn as_menuitem_unchecked(&self) -> &MenuItem {
+        match self {
+            MenuItemKind::MenuItem(i) => i,
+            _ => panic!("Not a MenuItem"),
+        }
+    }
+
+    /// Casts this item to a [`Submenu`], and returns `None` if it wasn't.
+    pub fn as_submenu(&self) -> Option<&Submenu> {
+        match self {
+            MenuItemKind::Submenu(i) => Some(i),
+            _ => None,
+        }
+    }
+
+    /// Casts this item to a [`Submenu`], and panics if it wasn't.
+    pub fn as_submenu_unchecked(&self) -> &Submenu {
+        match self {
+            MenuItemKind::Submenu(i) => i,
+            _ => panic!("Not a Submenu"),
+        }
+    }
+
+    /// Casts this item to a [`PredefinedMenuItem`], and returns `None` if it wasn't.
+    pub fn as_predefined_menuitem(&self) -> Option<&PredefinedMenuItem> {
+        match self {
+            MenuItemKind::Predefined(i) => Some(i),
+            _ => None,
+        }
+    }
+
+    /// Casts this item to a [`PredefinedMenuItem`], and panics if it wasn't.
+    pub fn as_predefined_menuitem_unchecked(&self) -> &PredefinedMenuItem {
+        match self {
+            MenuItemKind::Predefined(i) => i,
+            _ => panic!("Not a PredefinedMenuItem"),
+        }
+    }
+
+    /// Casts this item to a [`CheckMenuItem`], and returns `None` if it wasn't.
+    pub fn as_check_menuitem(&self) -> Option<&CheckMenuItem> {
+        match self {
+            MenuItemKind::Check(i) => Some(i),
+            _ => None,
+        }
+    }
+
+    /// Casts this item to a [`CheckMenuItem`], and panics if it wasn't.
+    pub fn as_check_menuitem_unchecked(&self) -> &CheckMenuItem {
+        match self {
+            MenuItemKind::Check(i) => i,
+            _ => panic!("Not a CheckMenuItem"),
+        }
+    }
+
+    /// Casts this item to a [`IconMenuItem`], and returns `None` if it wasn't.
+    pub fn as_icon_menuitem(&self) -> Option<&IconMenuItem> {
+        match self {
+            MenuItemKind::Icon(i) => Some(i),
+            _ => None,
+        }
+    }
+
+    /// Casts this item to a [`IconMenuItem`], and panics if it wasn't.
+    pub fn as_icon_menuitem_unchecked(&self) -> &IconMenuItem {
+        match self {
+            MenuItemKind::Icon(i) => i,
+            _ => panic!("Not an IconMenuItem"),
+        }
+    }
+
+    /// Convert this item into its menu ID.
+    pub fn into_id(self) -> MenuId {
+        match self {
+            MenuItemKind::MenuItem(i) => i.into_id(),
+            MenuItemKind::Submenu(i) => i.into_id(),
+            MenuItemKind::Predefined(i) => i.into_id(),
+            MenuItemKind::Check(i) => i.into_id(),
+            MenuItemKind::Icon(i) => i.into_id(),
+        }
+    }
+}
+
+/// A trait that defines a generic item in a menu, which may be one of [`MenuItemKind`]
+pub trait IsMenuItem: sealed::IsMenuItemBase {
+    /// Returns a [`MenuItemKind`] associated with this item.
+    fn kind(&self) -> MenuItemKind;
+    /// Returns a unique identifier associated with this menu item.
+    fn id(&self) -> &MenuId;
+    /// Convert this menu item into its menu ID.
+    fn into_id(self) -> MenuId;
+}
+
+mod sealed {
+    pub trait IsMenuItemBase {}
+}
+
+#[derive(Debug, PartialEq, PartialOrd, Clone, Copy, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub(crate) enum MenuItemType {
+    #[default]
+    MenuItem,
+    Submenu,
+    Predefined,
+    Check,
+    Icon,
+}
+
+/// A helper trait with methods to help creating a context menu.
+pub trait ContextMenu {
+    /// Get the popup [`HMENU`] for this menu.
+    ///
+    /// The returned [`HMENU`] is valid as long as the `ContextMenu` is.
+    ///
+    /// [`HMENU`]: windows_sys::Win32::UI::WindowsAndMessaging::HMENU
+    #[cfg(target_os = "windows")]
+    fn hpopupmenu(&self) -> isize;
+
+    /// Shows this menu as a context menu inside a win32 window.
+    ///
+    /// - `position` is relative to the window top-left corner, if `None`, the cursor position is used.
+    ///
+    /// Returns `true` if menu tracking ended because an item was selected, and `false` if menu tracking was cancelled for any reason.
+    ///
+    /// # Safety
+    ///
+    /// The `hwnd` must be a valid window HWND.
+    #[cfg(target_os = "windows")]
+    unsafe fn show_context_menu_for_hwnd(
+        &self,
+        hwnd: isize,
+        position: Option<dpi::Position>,
+    ) -> bool;
+
+    /// Attach the menu subclass handler to the given hwnd
+    /// so you can receive events from that window using [MenuEvent::receiver]
+    ///
+    /// This can be used along with [`ContextMenu::hpopupmenu`] when implementing a tray icon menu.
+    ///
+    /// # Safety
+    ///
+    /// The `hwnd` must be a valid window HWND.
+    #[cfg(target_os = "windows")]
+    unsafe fn attach_menu_subclass_for_hwnd(&self, hwnd: isize);
+
+    /// Remove the menu subclass handler from the given hwnd
+    ///
+    /// The `hwnd` must be a valid window handle.
+    ///
+    /// # Safety
+    ///
+    /// The `hwnd` must be a valid window HWND.
+    #[cfg(target_os = "windows")]
+    unsafe fn detach_menu_subclass_from_hwnd(&self, hwnd: isize);
+
+    /// Shows this menu as a context menu inside a [`gtk::Window`]
+    ///
+    /// - `position` is relative to the window top-left corner, if `None`, the cursor position is used.
+    ///
+    /// Returns `true` if menu tracking ended because an item was selected or clicked outside the menu to dismiss it.
+    ///
+    /// Returns `false` if menu tracking was cancelled for any reason.
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    fn show_context_menu_for_gtk_window(
+        &self,
+        w: &gtk::Window,
+        position: Option<dpi::Position>,
+    ) -> bool;
+
+    /// Get the underlying gtk menu reserved for context menus.
+    ///
+    /// The returned [`gtk::PopoverMenu`] is valid as long as the `ContextMenu` is.
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    fn gtk_context_menu(&self) -> gtk::PopoverMenu;
+
+    /// Shows this menu as a context menu for the specified `NSView`.
+    ///
+    /// - `position` is relative to the window top-left corner, if `None`, the cursor position is used.
+    ///
+    /// Returns `true` if menu tracking ended because an item was selected, and `false` if menu tracking was cancelled for any reason.
+    ///
+    /// # Safety
+    ///
+    /// The view must be a pointer to a valid `NSView`.
+    #[cfg(target_os = "macos")]
+    unsafe fn show_context_menu_for_nsview(
+        &self,
+        view: *const std::ffi::c_void,
+        position: Option<dpi::Position>,
+    ) -> bool;
+
+    /// Get the underlying NSMenu reserved for context menus.
+    ///
+    /// The returned pointer is valid for as long as the `ContextMenu` is. If
+    /// you need it to be alive for longer, retain it.
+    #[cfg(target_os = "macos")]
+    fn ns_menu(&self) -> *mut std::ffi::c_void;
+
+    /// Cast this context menu to a [`Menu`], and returns `None` if it wasn't.
+    fn as_menu(&self) -> Option<&Menu> {
+        None
+    }
+
+    /// Casts this context menu to a [`Menu`], and panics if it wasn't.
+    fn as_menu_unchecked(&self) -> &Menu {
+        self.as_menu().expect("Not a Menu")
+    }
+
+    /// Cast this context menu to a [`Submenu`], and returns `None` if it wasn't.
+    fn as_submenu(&self) -> Option<&Submenu> {
+        None
+    }
+
+    /// Casts this context menu to a [`Submenu`], and panics if it wasn't.
+    fn as_submenu_unchecked(&self) -> &Submenu {
+        self.as_submenu().expect("Not a Submenu")
+    }
+
+    /// Returns a GTK-agnostic menu representation for Linux KSNI tray menus.
+    #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+    fn compat_items(&self) -> Vec<std::sync::Arc<arc_swap::ArcSwap<CompatMenuItem>>>;
+}
+
+/// Describes a menu event emitted when a menu item is activated
+#[derive(Debug, Clone)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct MenuEvent {
+    /// Id of the menu item which triggered this event
+    pub id: MenuId,
+}
+
+/// A receiver that could be used to listen to menu events.
+pub type MenuEventReceiver = Receiver<MenuEvent>;
+type MenuEventHandler = Box<dyn Fn(MenuEvent) + Send + Sync + 'static>;
+
+static MENU_CHANNEL: Lazy<(Sender<MenuEvent>, MenuEventReceiver)> = Lazy::new(unbounded);
+static MENU_EVENT_HANDLER: OnceCell<Option<MenuEventHandler>> = OnceCell::new();
+#[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+static MENU_UPDATE_CHANNEL: Lazy<(Sender<()>, Receiver<()>)> = Lazy::new(unbounded);
+
+impl MenuEvent {
+    /// Returns the id of the menu item which triggered this event
+    pub fn id(&self) -> &MenuId {
+        &self.id
+    }
+
+    /// Gets a reference to the event channel's [`MenuEventReceiver`]
+    /// which can be used to listen for menu events.
+    ///
+    /// ## Note
+    ///
+    /// This will not receive any events if [`MenuEvent::set_event_handler`] has been called with a `Some` value.
+    pub fn receiver<'a>() -> &'a MenuEventReceiver {
+        &MENU_CHANNEL.1
+    }
+
+    /// Set a handler to be called for new events. Useful for implementing custom event sender.
+    ///
+    /// ## Note
+    ///
+    /// Calling this function with a `Some` value,
+    /// will not send new events to the channel associated with [`MenuEvent::receiver`]
+    pub fn set_event_handler<F: Fn(MenuEvent) + Send + Sync + 'static>(f: Option<F>) {
+        if let Some(f) = f {
+            let _ = MENU_EVENT_HANDLER.set(Some(Box::new(f)));
+        } else {
+            let _ = MENU_EVENT_HANDLER.set(None);
+        }
+    }
+
+    pub(crate) fn send(event: MenuEvent) {
+        if let Some(handler) = MENU_EVENT_HANDLER.get_or_init(|| None) {
+            handler(event);
+        } else {
+            let _ = MENU_CHANNEL.0.send(event);
+        }
+    }
+}
+
+#[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+pub fn recv_menu_update() -> std::result::Result<(), crossbeam_channel::RecvError> {
+    MENU_UPDATE_CHANNEL.1.recv()
+}
+
+#[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+pub fn send_menu_update() {
+    let _ = MENU_UPDATE_CHANNEL.0.send(());
+}
+
+#[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+pub fn send_menu_event(event: MenuEvent) {
+    MenuEvent::send(event);
+}
diff --git a/ports/muda/src/menu.rs b/ports/muda/src/menu.rs
new file mode 100644
index 000000000000..44fdeade7934
--- /dev/null
+++ b/ports/muda/src/menu.rs
@@ -0,0 +1,525 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::{cell::RefCell, rc::Rc};
+
+use crate::{dpi::Position, util::AddOp, ContextMenu, IsMenuItem, MenuId, MenuItemKind};
+
+/// A root menu that can be added to a Window on Windows and Linux
+/// and used as the app global menu on macOS.
+#[derive(Clone)]
+pub struct Menu {
+    id: Rc<MenuId>,
+    inner: Rc<RefCell<crate::platform_impl::Menu>>,
+}
+
+impl Default for Menu {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Menu {
+    /// Creates a new menu.
+    pub fn new() -> Self {
+        let menu = crate::platform_impl::Menu::new(None);
+        Self {
+            id: Rc::new(menu.id().clone()),
+            inner: Rc::new(RefCell::new(menu)),
+        }
+    }
+
+    /// Creates a new menu with the specified id.
+    pub fn with_id<I: Into<MenuId>>(id: I) -> Self {
+        let id = id.into();
+        Self {
+            id: Rc::new(id.clone()),
+            inner: Rc::new(RefCell::new(crate::platform_impl::Menu::new(Some(id)))),
+        }
+    }
+
+    /// Creates a new menu with given `items`. It calls [`Menu::new`] and [`Menu::append_items`] internally.
+    pub fn with_items(items: &[&dyn IsMenuItem]) -> crate::Result<Self> {
+        let menu = Self::new();
+        menu.append_items(items)?;
+        Ok(menu)
+    }
+
+    /// Creates a new menu with the specified id and given `items`. It calls [`Menu::new`] and [`Menu::append_items`] internally.
+    pub fn with_id_and_items<I: Into<MenuId>>(
+        id: I,
+        items: &[&dyn IsMenuItem],
+    ) -> crate::Result<Self> {
+        let menu = Self::with_id(id);
+        menu.append_items(items)?;
+        Ok(menu)
+    }
+
+    /// Returns a unique identifier associated with this menu.
+    pub fn id(&self) -> &MenuId {
+        &self.id
+    }
+
+    /// Add a menu item to the end of this menu.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **macOS:** Only [`Submenu`] can be added to the menu
+    ///
+    /// [`Submenu`]: crate::Submenu
+    pub fn append(&self, item: &dyn IsMenuItem) -> crate::Result<()> {
+        self.inner.borrow_mut().add_menu_item(item, AddOp::Append)
+    }
+
+    /// Add menu items to the end of this menu. It calls [`Menu::append`] in a loop internally.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **macOS:** Only [`Submenu`] can be added to the menu
+    ///
+    /// [`Submenu`]: crate::Submenu
+    pub fn append_items(&self, items: &[&dyn IsMenuItem]) -> crate::Result<()> {
+        for item in items {
+            self.append(*item)?
+        }
+
+        Ok(())
+    }
+
+    /// Add a menu item to the beginning of this menu.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **macOS:** Only [`Submenu`] can be added to the menu
+    ///
+    /// [`Submenu`]: crate::Submenu
+    pub fn prepend(&self, item: &dyn IsMenuItem) -> crate::Result<()> {
+        self.inner
+            .borrow_mut()
+            .add_menu_item(item, AddOp::Insert(0))
+    }
+
+    /// Add menu items to the beginning of this menu. It calls [`Menu::insert_items`] with position of `0` internally.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **macOS:** Only [`Submenu`] can be added to the menu
+    ///
+    /// [`Submenu`]: crate::Submenu
+    pub fn prepend_items(&self, items: &[&dyn IsMenuItem]) -> crate::Result<()> {
+        self.insert_items(items, 0)
+    }
+
+    /// Insert a menu item at the specified `position` in the menu.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **macOS:** Only [`Submenu`] can be added to the menu
+    ///
+    /// [`Submenu`]: crate::Submenu
+    pub fn insert(&self, item: &dyn IsMenuItem, position: usize) -> crate::Result<()> {
+        self.inner
+            .borrow_mut()
+            .add_menu_item(item, AddOp::Insert(position))
+    }
+
+    /// Insert menu items at the specified `position` in the menu.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **macOS:** Only [`Submenu`] can be added to the menu
+    ///
+    /// [`Submenu`]: crate::Submenu
+    pub fn insert_items(&self, items: &[&dyn IsMenuItem], position: usize) -> crate::Result<()> {
+        for (i, item) in items.iter().enumerate() {
+            self.insert(*item, position + i)?
+        }
+
+        Ok(())
+    }
+
+    /// Remove a menu item from this menu.
+    pub fn remove(&self, item: &dyn IsMenuItem) -> crate::Result<()> {
+        self.inner.borrow_mut().remove(item)
+    }
+
+    /// Remove the menu item at the specified position from this menu and returns it.
+    pub fn remove_at(&self, position: usize) -> Option<MenuItemKind> {
+        let mut items = self.items();
+        if items.len() > position {
+            let item = items.remove(position);
+            let _ = self.remove(item.as_ref());
+            Some(item)
+        } else {
+            None
+        }
+    }
+
+    /// Returns a list of menu items that has been added to this menu.
+    pub fn items(&self) -> Vec<MenuItemKind> {
+        self.inner.borrow().items()
+    }
+
+    /// Adds this menu to a [`gtk::Window`]
+    ///
+    /// - `container`: this is an optional parameter to specify a container for the [`gtk::MenuBar`],
+    ///   it is highly recommended to pass a container, otherwise the menubar will be added directly to the window,
+    ///   which is usually not the desired behavior.
+    ///   If using a [`gtk::Box`] as a container, it is added using [`Box::pack_start(menubar, false, false, 0)`](gtk::prelude::BoxExt::pack_start) then
+    ///   reordered to be the first child of [`gtk::Box`] using [`Box::reorder_child(menubar, 0)`](gtk::prelude::BoxExt::reorder_child).
+    ///
+    /// ## Example:
+    /// ```no_run
+    /// let window = gtk::Window::builder().build();
+    /// let vbox = gtk::Box::new(gtk::Orientation::Vertical, 0);
+    /// let menu = muda::Menu::new();
+    /// // -- snip, add your menu items --
+    /// menu.init_for_gtk_window(&window, Some(&vbox));
+    /// // then proceed to add your widgets to the `vbox`
+    /// ```
+    ///
+    /// ## Panics:
+    ///
+    /// Panics if the gtk event loop hasn't been initialized on the thread.
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    pub fn init_for_gtk_window<W, C>(&self, window: &W, container: Option<&C>) -> crate::Result<()>
+    where
+        W: gtk::prelude::IsA<gtk::Window>,
+        W: gtk::prelude::IsA<gtk::Widget>,
+        C: gtk::prelude::IsA<gtk::Widget>,
+    {
+        self.inner
+            .borrow_mut()
+            .init_for_gtk_window(window, container)
+    }
+
+    /// Adds this menu to a win32 window.
+    ///
+    /// # Safety
+    ///
+    /// The `hwnd` must be a valid window HWND.
+    ///
+    /// ##  Note about accelerators:
+    ///
+    /// For accelerators to work, the event loop needs to call
+    /// [`TranslateAcceleratorW`](windows_sys::Win32::UI::WindowsAndMessaging::TranslateAcceleratorW)
+    /// with the [`HACCEL`](windows_sys::Win32::UI::WindowsAndMessaging::HACCEL) returned from [`Menu::haccel`]
+    ///
+    /// #### Example:
+    /// ```no_run
+    /// # use muda::Menu;
+    /// # use windows_sys::Win32::UI::WindowsAndMessaging::{MSG, GetMessageW, TranslateMessage, DispatchMessageW, TranslateAcceleratorW};
+    /// let menu = Menu::new();
+    /// unsafe {
+    ///     let mut msg: MSG = std::mem::zeroed();
+    ///     while GetMessageW(&mut msg, std::ptr::null_mut(), 0, 0) == 1 {
+    ///         let translated = TranslateAcceleratorW(msg.hwnd, menu.haccel() as _, &msg as *const _);
+    ///         if translated != 1{
+    ///             TranslateMessage(&msg);
+    ///             DispatchMessageW(&msg);
+    ///         }
+    ///     }
+    /// }
+    /// ```
+    #[cfg(target_os = "windows")]
+    pub unsafe fn init_for_hwnd(&self, hwnd: isize) -> crate::Result<()> {
+        self.inner.borrow_mut().init_for_hwnd(hwnd)
+    }
+
+    /// Adds this menu to a win32 window using the specified theme.
+    ///
+    /// See [Menu::init_for_hwnd] for more info.
+    ///
+    /// Note that the theme only affects the menu bar itself and not submenus or context menu.
+    ///
+    /// # Safety
+    ///
+    /// The `hwnd` must be a valid window HWND.
+    #[cfg(target_os = "windows")]
+    pub unsafe fn init_for_hwnd_with_theme(
+        &self,
+        hwnd: isize,
+        theme: MenuTheme,
+    ) -> crate::Result<()> {
+        self.inner
+            .borrow_mut()
+            .init_for_hwnd_with_theme(hwnd, theme)
+    }
+
+    /// Set a theme for the menu bar on this window.
+    ///
+    /// Note that the theme only affects the menu bar itself and not submenus or context menu.
+    ///
+    /// # Safety
+    ///
+    /// The `hwnd` must be a valid window HWND.
+    #[cfg(target_os = "windows")]
+    pub unsafe fn set_theme_for_hwnd(&self, hwnd: isize, theme: MenuTheme) -> crate::Result<()> {
+        self.inner.borrow().set_theme_for_hwnd(hwnd, theme)
+    }
+
+    /// Returns The [`HACCEL`](windows_sys::Win32::UI::WindowsAndMessaging::HACCEL) associated with this menu
+    /// It can be used with [`TranslateAcceleratorW`](windows_sys::Win32::UI::WindowsAndMessaging::TranslateAcceleratorW)
+    /// in the event loop to enable accelerators
+    ///
+    /// The returned [`HACCEL`](windows_sys::Win32::UI::WindowsAndMessaging::HACCEL) is valid as long as the [Menu] is.
+    #[cfg(target_os = "windows")]
+    pub fn haccel(&self) -> isize {
+        self.inner.borrow_mut().haccel()
+    }
+
+    /// Removes this menu from a [`gtk::Window`]
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    pub fn remove_for_gtk_window<W>(&self, window: &W) -> crate::Result<()>
+    where
+        W: gtk::prelude::IsA<gtk::Window>,
+        W: gtk::prelude::IsA<gtk::Widget>,
+    {
+        self.inner.borrow_mut().remove_for_gtk_window(window)
+    }
+
+    /// Removes this menu from a win32 window
+    ///
+    /// # Safety
+    ///
+    /// The `hwnd` must be a valid window HWND.
+    #[cfg(target_os = "windows")]
+    pub unsafe fn remove_for_hwnd(&self, hwnd: isize) -> crate::Result<()> {
+        self.inner.borrow_mut().remove_for_hwnd(hwnd)
+    }
+
+    /// Hides this menu from a [`gtk::Window`]
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    pub fn hide_for_gtk_window<W>(&self, window: &W) -> crate::Result<()>
+    where
+        W: gtk::prelude::IsA<gtk::Window>,
+        W: gtk::prelude::IsA<gtk::Widget>,
+    {
+        self.inner.borrow_mut().hide_for_gtk_window(window)
+    }
+
+    /// Hides this menu from a win32 window
+    ///
+    /// # Safety
+    ///
+    /// The `hwnd` must be a valid window HWND.
+    #[cfg(target_os = "windows")]
+    pub unsafe fn hide_for_hwnd(&self, hwnd: isize) -> crate::Result<()> {
+        self.inner.borrow().hide_for_hwnd(hwnd)
+    }
+
+    /// Shows this menu on a [`gtk::Window`]
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    pub fn show_for_gtk_window<W>(&self, window: &W) -> crate::Result<()>
+    where
+        W: gtk::prelude::IsA<gtk::Window>,
+        W: gtk::prelude::IsA<gtk::Widget>,
+    {
+        self.inner.borrow_mut().show_for_gtk_window(window)
+    }
+
+    /// Shows this menu on a win32 window
+    ///
+    /// # Safety
+    ///
+    /// The `hwnd` must be a valid window HWND.
+    #[cfg(target_os = "windows")]
+    pub unsafe fn show_for_hwnd(&self, hwnd: isize) -> crate::Result<()> {
+        self.inner.borrow().show_for_hwnd(hwnd)
+    }
+
+    /// Returns whether this menu visible on a [`gtk::Window`]
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    pub fn is_visible_on_gtk_window<W>(&self, window: &W) -> bool
+    where
+        W: gtk::prelude::IsA<gtk::Window>,
+        W: gtk::prelude::IsA<gtk::Widget>,
+    {
+        self.inner.borrow().is_visible_on_gtk_window(window)
+    }
+
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    /// Returns the [`gtk::PopoverMenuBar`] that is associated with this window if it exists.
+    /// This is useful to get information about the menubar for example its height.
+    pub fn gtk_menubar_for_gtk_window<W>(self, window: &W) -> Option<gtk::PopoverMenuBar>
+    where
+        W: gtk::prelude::IsA<gtk::Window>,
+    {
+        self.inner.borrow().gtk_menubar_for_gtk_window(window)
+    }
+
+    /// Returns whether this menu visible on a on a win32 window
+    ///
+    /// # Safety
+    ///
+    /// The `hwnd` must be a valid window HWND.
+    #[cfg(target_os = "windows")]
+    pub unsafe fn is_visible_on_hwnd(&self, hwnd: isize) -> bool {
+        self.inner.borrow().is_visible_on_hwnd(hwnd)
+    }
+
+    /// Adds this menu to an NSApp.
+    #[cfg(target_os = "macos")]
+    pub fn init_for_nsapp(&self) {
+        self.inner.borrow_mut().init_for_nsapp()
+    }
+
+    /// Removes this menu from an NSApp.
+    #[cfg(target_os = "macos")]
+    pub fn remove_for_nsapp(&self) {
+        self.inner.borrow_mut().remove_for_nsapp()
+    }
+}
+
+impl ContextMenu for Menu {
+    #[cfg(target_os = "windows")]
+    fn hpopupmenu(&self) -> isize {
+        self.inner.borrow().hpopupmenu()
+    }
+
+    #[cfg(target_os = "windows")]
+    unsafe fn show_context_menu_for_hwnd(&self, hwnd: isize, position: Option<Position>) -> bool {
+        self.inner
+            .borrow_mut()
+            .show_context_menu_for_hwnd(hwnd, position)
+    }
+
+    #[cfg(target_os = "windows")]
+    unsafe fn attach_menu_subclass_for_hwnd(&self, hwnd: isize) {
+        self.inner.borrow().attach_menu_subclass_for_hwnd(hwnd)
+    }
+
+    #[cfg(target_os = "windows")]
+    unsafe fn detach_menu_subclass_from_hwnd(&self, hwnd: isize) {
+        self.inner.borrow().detach_menu_subclass_from_hwnd(hwnd)
+    }
+
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    fn show_context_menu_for_gtk_window(
+        &self,
+        window: &gtk::Window,
+        position: Option<Position>,
+    ) -> bool {
+        self.inner
+            .borrow_mut()
+            .show_context_menu_for_gtk_window(window, position)
+    }
+
+    #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        feature = "gtk"
+    ))]
+    fn gtk_context_menu(&self) -> gtk::PopoverMenu {
+        self.inner.borrow_mut().gtk_context_menu()
+    }
+
+    #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+    fn compat_items(&self) -> Vec<std::sync::Arc<arc_swap::ArcSwap<crate::CompatMenuItem>>> {
+        self.inner.borrow().compat_items()
+    }
+
+    #[cfg(target_os = "macos")]
+    unsafe fn show_context_menu_for_nsview(
+        &self,
+        view: *const std::ffi::c_void,
+        position: Option<Position>,
+    ) -> bool {
+        self.inner
+            .borrow_mut()
+            .show_context_menu_for_nsview(view, position)
+    }
+
+    #[cfg(target_os = "macos")]
+    fn ns_menu(&self) -> *mut std::ffi::c_void {
+        self.inner.borrow().ns_menu()
+    }
+
+    fn as_menu(&self) -> Option<&Menu> {
+        Some(self)
+    }
+}
+
+/// The window menu bar theme
+#[cfg(windows)]
+#[repr(usize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub enum MenuTheme {
+    Dark = 0,
+    Light = 1,
+    Auto = 2,
+}
diff --git a/ports/muda/src/menu_id.rs b/ports/muda/src/menu_id.rs
new file mode 100644
index 000000000000..03fd2ffe4b23
--- /dev/null
+++ b/ports/muda/src/menu_id.rs
@@ -0,0 +1,89 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::{convert::Infallible, str::FromStr};
+
+/// An unique id that is associated with a menu or a menu item.
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct MenuId(pub String);
+
+impl MenuId {
+    /// Create a new menu id.
+    pub fn new<S: AsRef<str>>(id: S) -> Self {
+        Self(id.as_ref().to_string())
+    }
+}
+
+impl AsRef<str> for MenuId {
+    fn as_ref(&self) -> &str {
+        self.0.as_ref()
+    }
+}
+
+impl<T: ToString> From<T> for MenuId {
+    fn from(value: T) -> Self {
+        Self(value.to_string())
+    }
+}
+
+impl FromStr for MenuId {
+    type Err = Infallible;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        Ok(Self::new(s))
+    }
+}
+
+impl PartialEq<&str> for MenuId {
+    fn eq(&self, other: &&str) -> bool {
+        self.0 == *other
+    }
+}
+
+impl PartialEq<&str> for &MenuId {
+    fn eq(&self, other: &&str) -> bool {
+        self.0 == *other
+    }
+}
+
+impl PartialEq<String> for MenuId {
+    fn eq(&self, other: &String) -> bool {
+        self.0 == *other
+    }
+}
+
+impl PartialEq<String> for &MenuId {
+    fn eq(&self, other: &String) -> bool {
+        self.0 == *other
+    }
+}
+
+impl PartialEq<&String> for MenuId {
+    fn eq(&self, other: &&String) -> bool {
+        self.0 == **other
+    }
+}
+
+impl PartialEq<&MenuId> for MenuId {
+    fn eq(&self, other: &&MenuId) -> bool {
+        other.0 == self.0
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::MenuId;
+
+    #[test]
+    fn is_eq() {
+        assert_eq!(MenuId::new("t"), "t",);
+        assert_eq!(MenuId::new("t"), String::from("t"));
+        assert_eq!(MenuId::new("t"), &String::from("t"));
+        assert_eq!(MenuId::new("t"), MenuId::new("t"));
+        assert_eq!(MenuId::new("t"), &MenuId::new("t"));
+        assert_eq!(&MenuId::new("t"), &MenuId::new("t"));
+        assert_eq!(MenuId::new("t").as_ref(), "t");
+    }
+}
diff --git a/ports/muda/src/platform_impl/gtk/about_dialog.rs b/ports/muda/src/platform_impl/gtk/about_dialog.rs
new file mode 100644
index 000000000000..b08be07902ca
--- /dev/null
+++ b/ports/muda/src/platform_impl/gtk/about_dialog.rs
@@ -0,0 +1,95 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+//! Thread-safe AboutDialog wrapper for ksni tray support.
+//!
+//! This module provides an AboutDialog that can be safely called from
+//! any thread (including ksni's DBus thread) by dispatching to the
+//! GTK main thread.
+
+use gtk4::prelude::GtkWindowExt;
+
+use crate::AboutMetadata;
+
+/// A thread-safe wrapper around the GTK AboutDialog.
+///
+/// This can be safely called from any thread, including the ksni DBus thread.
+/// The `show()` method dispatches to the GTK main thread internally.
+#[derive(Debug, Clone)]
+pub struct AboutDialog {
+    metadata: AboutMetadata,
+}
+
+impl AboutDialog {
+    /// Creates a new AboutDialog with the given metadata.
+    pub fn new(metadata: AboutMetadata) -> Self {
+        Self { metadata }
+    }
+
+    /// Creates a new AboutDialog from compat metadata (for ksni use).
+    ///
+    /// This is useful when you have a `CompatAboutMetadata` from the compat layer.
+
+    /// Shows the about dialog.
+    ///
+    /// This method is safe to call from any thread - it dispatches
+    /// to the GTK main thread internally using `glib::MainContext::default().invoke()`.
+    pub fn show(&self) {
+        let metadata = self.metadata.clone();
+
+        gtk4::glib::MainContext::default().invoke(move || {
+            let dialog = gtk4::AboutDialog::new();
+
+            // Set dialog properties from metadata
+            if let Some(ref name) = metadata.name {
+                dialog.set_program_name(Some(name));
+            }
+
+            if let Some(version) = metadata.full_version() {
+                dialog.set_version(Some(&version));
+            }
+
+            if let Some(ref copyright) = metadata.copyright {
+                dialog.set_copyright(Some(copyright));
+            }
+
+            if let Some(ref comments) = metadata.comments {
+                dialog.set_comments(Some(comments));
+            }
+
+            if let Some(ref license) = metadata.license {
+                dialog.set_license(Some(license));
+            }
+
+            if let Some(ref website) = metadata.website {
+                dialog.set_website(Some(website));
+            }
+
+            if let Some(ref website_label) = metadata.website_label {
+                dialog.set_website_label(website_label);
+            }
+
+            if let Some(ref authors) = metadata.authors {
+                let authors_strs: Vec<&str> = authors.iter().map(|s| s.as_str()).collect();
+                dialog.set_authors(&authors_strs);
+            }
+
+            // Note: credits in muda is Option<String>, not used directly in GTK4
+            // The credits field is primarily for macOS
+            let _ = &metadata.credits;
+
+            // Present the dialog
+            dialog.present();
+        });
+    }
+
+    /// Returns a reference to the metadata.
+    pub fn metadata(&self) -> &AboutMetadata {
+        &self.metadata
+    }
+}
diff --git a/ports/muda/src/platform_impl/gtk/accelerator.rs b/ports/muda/src/platform_impl/gtk/accelerator.rs
new file mode 100644
index 000000000000..338ad304f252
--- /dev/null
+++ b/ports/muda/src/platform_impl/gtk/accelerator.rs
@@ -0,0 +1,62 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use keyboard_types::{Key, Modifiers};
+
+use crate::accelerator::KeyAccelerator;
+
+impl KeyAccelerator {
+    /// Render as a GTK accelerator string, e.g. `<Control><Shift>c`.
+    ///
+    /// The result is parseable by `gtk::accelerator_parse` and accepted by
+    /// `gio::prelude::ActionMapExt::set_accels_for_action`.
+    pub fn to_gtk(&self) -> String {
+        let mut gtk = modifiers_to_gtk(self.modifiers());
+        gtk.push_str(&key_to_gtk(self.key()));
+        gtk
+    }
+}
+
+fn modifiers_to_gtk(mods: Modifiers) -> String {
+    let mut gtk = String::new();
+
+    if mods.contains(Modifiers::SHIFT) {
+        gtk.push_str("<Shift>");
+    }
+    if mods.contains(Modifiers::CONTROL) {
+        gtk.push_str("<Control>");
+    }
+    if mods.contains(Modifiers::ALT) {
+        gtk.push_str("<Alt>");
+    }
+    if mods.contains(Modifiers::META) {
+        gtk.push_str("<Meta>");
+    }
+    gtk
+}
+
+fn key_to_gtk(key: &Key) -> String {
+    match key {
+        // A single character maps straight to its GDK key name, except
+        // space, which GDK names rather than prints.
+        Key::Character(c) if c == " " => "space".to_string(),
+        Key::Character(c) => c.to_lowercase(),
+        // Named keys whose GDK name differs from the W3C name.
+        Key::Enter => "Return".to_string(),
+        Key::ArrowUp => "Up".to_string(),
+        Key::ArrowDown => "Down".to_string(),
+        Key::ArrowLeft => "Left".to_string(),
+        Key::ArrowRight => "Right".to_string(),
+        Key::Backspace => "BackSpace".to_string(),
+        Key::PageUp => "Page_Up".to_string(),
+        Key::PageDown => "Page_Down".to_string(),
+        // Escape, Delete, Tab, Home, End, Insert, F-keys, and space
+        // already match the GDK name that `accelerator_parse` understands.
+        other => other.to_string(),
+    }
+}
diff --git a/ports/muda/src/platform_impl/gtk/icon.rs b/ports/muda/src/platform_impl/gtk/icon.rs
new file mode 100644
index 000000000000..e5217d9db9b0
--- /dev/null
+++ b/ports/muda/src/platform_impl/gtk/icon.rs
@@ -0,0 +1,57 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2014-2021 The winit contributors
+// Copyright 2021-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::icon::BadIcon;
+
+/// An icon used for the window titlebar, taskbar, etc.
+///
+/// Stores raw PNG bytes to be `Send + Sync` safe. The GTK `BytesIcon`
+/// is created lazily when needed on the GTK main thread.
+#[derive(Debug, Clone)]
+pub struct PlatformIcon {
+    png_data: Vec<u8>,
+}
+
+// PlatformIcon is Send + Sync because it only contains Vec<u8>
+// The BytesIcon is created lazily on the GTK main thread when needed
+unsafe impl Send for PlatformIcon {}
+unsafe impl Sync for PlatformIcon {}
+
+impl PlatformIcon {
+    /// Creates an `Icon` from 32bpp RGBA data.
+    ///
+    /// The length of `rgba` must be divisible by 4, and `width * height` must equal
+    /// `rgba.len() / 4`. Otherwise, this will return a `BadIcon` error.
+    pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
+        let mut png_data = Vec::with_capacity(rgba.len());
+
+        let mut encoder = png::Encoder::new(&mut png_data, width, height);
+        encoder.set_color(png::ColorType::Rgba);
+        encoder.set_depth(png::BitDepth::Eight);
+        let mut writer = encoder.write_header().map_err(BadIcon::PngEncodingError)?;
+        writer
+            .write_image_data(&rgba)
+            .map_err(BadIcon::PngEncodingError)?;
+        writer.finish().map_err(BadIcon::PngEncodingError)?;
+
+        Ok(Self { png_data })
+    }
+
+    /// Creates a GTK `BytesIcon` from the stored PNG data.
+    ///
+    /// This should only be called on the GTK main thread.
+    pub fn to_bytes_icon(&self) -> gtk::gio::BytesIcon {
+        let bytes = gtk::glib::Bytes::from(&self.png_data);
+        gtk::gio::BytesIcon::new(&bytes)
+    }
+
+    #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+    pub(crate) fn png_data(&self) -> Vec<u8> {
+        self.png_data.clone()
+    }
+}
diff --git a/ports/muda/src/platform_impl/gtk/mnemonic.rs b/ports/muda/src/platform_impl/gtk/mnemonic.rs
new file mode 100644
index 000000000000..9adff262f6a9
--- /dev/null
+++ b/ports/muda/src/platform_impl/gtk/mnemonic.rs
@@ -0,0 +1,76 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+/// Converts from muda mnemonic to gtk mnemonic
+///
+/// gtk uses underline (_) for mnemonic
+/// and two underlines (__) to escape it into a single underline
+/// while we use (&) and (&&), so we have to do a few conversions
+pub fn to_gtk_mnemonic<S: AsRef<str>>(string: S) -> String {
+    string
+        .as_ref()
+        // escape underlines
+        .replace("_", "__")
+        // perserve &&
+        .replace("&&", "[~~]")
+        // transfrom & -> _
+        .replace('&', "_")
+        // revert back && to unsecaped &
+        .replace("[~~]", "&")
+}
+
+/// Converts from gtk mnemonic to muda mnemonic
+///
+/// gtk uses underline (_) for mnemonic
+/// and two underlines (__) to escape it into a single underline
+/// while we use (&) and (&&), so we have to do a few conversions
+#[cfg(test)]
+pub fn from_gtk_mnemonic<S: AsRef<str>>(string: S) -> String {
+    string
+        .as_ref()
+        // transform escaped & to unescaped &&
+        .replace("&", "&&")
+        // perserve __
+        .replace("__", "[~~]")
+        // transfrom _ -> &
+        .replace('_', "&")
+        // revert back __ to unescaped _
+        .replace("[~~]", "_")
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::platform_impl::platform::mnemonic::{from_gtk_mnemonic, to_gtk_mnemonic};
+
+    #[test]
+    fn it_converts() {
+        assert_eq!(to_gtk_mnemonic("H&ello"), "H_ello");
+        assert_eq!(to_gtk_mnemonic("H&&ello"), "H&ello");
+        assert_eq!(to_gtk_mnemonic("H&&&ello"), "H&_ello");
+        assert_eq!(to_gtk_mnemonic("H_ello"), "H__ello");
+        assert_eq!(to_gtk_mnemonic("H__ello"), "H____ello");
+    }
+
+    #[test]
+    fn it_converts_back() {
+        let str = "H&ello";
+        assert_eq!(from_gtk_mnemonic(to_gtk_mnemonic(str)), str);
+
+        let str = "H&&ello";
+        assert_eq!(from_gtk_mnemonic(to_gtk_mnemonic(str)), str);
+
+        let str = "H&&&ello";
+        assert_eq!(from_gtk_mnemonic(to_gtk_mnemonic(str)), str);
+
+        let str = "H_ello";
+        assert_eq!(from_gtk_mnemonic(to_gtk_mnemonic(str)), str);
+
+        let str = "H__ello";
+        assert_eq!(from_gtk_mnemonic(to_gtk_mnemonic(str)), str);
+    }
+}
diff --git a/ports/muda/src/platform_impl/gtk/mod.rs b/ports/muda/src/platform_impl/gtk/mod.rs
new file mode 100644
index 000000000000..f2556e32b3a3
--- /dev/null
+++ b/ports/muda/src/platform_impl/gtk/mod.rs
@@ -0,0 +1,1544 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+mod accelerator;
+mod icon;
+mod mnemonic;
+
+#[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+use std::sync::Arc;
+use std::{
+    cell::RefCell,
+    collections::{hash_map::Entry, HashMap},
+    rc::Rc,
+};
+
+#[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+use arc_swap::ArcSwap;
+use dpi::Position;
+use gtk::{gdk::Rectangle, gio, prelude::*};
+pub(crate) use icon::PlatformIcon;
+use mnemonic::to_gtk_mnemonic;
+
+use crate::{
+    accelerator::KeyAccelerator,
+    util::{AddOp, Counter},
+    Icon, IsMenuItem, MenuEvent, MenuId, MenuItemKind, MenuItemType, NativeIcon,
+    PredefinedMenuItemType,
+};
+
+static COUNTER: Counter = Counter::new();
+
+const DEFAULT_ACTION_GROUP: &str = "muda";
+const ACTION_GROUP_DATA_KEY: &str = "mudaActionGroup";
+
+#[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+fn compat_placeholder() -> Arc<ArcSwap<crate::CompatMenuItem>> {
+    Arc::new(ArcSwap::from_pointee(crate::CompatMenuItem::Separator))
+}
+
+enum GtkMenuBar {
+    MenuBar {
+        widget: gtk::PopoverMenuBar,
+        menu: gio::Menu,
+        app: gtk::Application,
+    },
+    ContextMenu {
+        widget: gtk::PopoverMenu,
+        menu: gio::Menu,
+        app: gtk::Application,
+    },
+}
+
+impl GtkMenuBar {
+    fn new(app: gtk::Application) -> Self {
+        let menu = gio::Menu::new();
+        let widget = gtk::PopoverMenuBar::from_model(Some(&menu));
+        Self::MenuBar { widget, menu, app }
+    }
+
+    fn new_context(app: gtk::Application) -> Self {
+        let menu = gio::Menu::new();
+        let widget = gtk::PopoverMenu::from_model(Some(&menu));
+        Self::ContextMenu { widget, menu, app }
+    }
+
+    fn application(&self) -> &gtk::Application {
+        match self {
+            GtkMenuBar::MenuBar { app, .. } => app,
+            GtkMenuBar::ContextMenu { app, .. } => app,
+        }
+    }
+
+    fn menu_bar(&self) -> &gtk::PopoverMenuBar {
+        match self {
+            GtkMenuBar::MenuBar { widget, .. } => widget,
+            _ => unreachable!("This is a bug report to https://github.com/tauri-apps/muda"),
+        }
+    }
+
+    fn context_menu(&self) -> &gtk::PopoverMenu {
+        match self {
+            GtkMenuBar::ContextMenu { widget, .. } => widget,
+            _ => unreachable!("This is a bug report to https://github.com/tauri-apps/muda"),
+        }
+    }
+
+    fn menu(&self) -> &gio::Menu {
+        match self {
+            GtkMenuBar::MenuBar { menu, .. } => menu,
+            GtkMenuBar::ContextMenu { menu, .. } => menu,
+        }
+    }
+
+    /// Bind a widget to a `custom` slot in the generated menu.
+    ///
+    /// GTK4's `PopoverMenu` does not render icons set on a `gio::MenuItem`.
+    /// To show one we mark the model item with a `custom` attribute and
+    /// attach the real icon+label widget here; the binding reaches slots in
+    /// nested submenus too, so a single call per item is enough.
+    fn add_custom_child(&self, id: &str, widget: &impl IsA<gtk::Widget>) {
+        match self {
+            GtkMenuBar::MenuBar { widget: w, .. } => {
+                w.add_child(widget, id);
+            }
+            GtkMenuBar::ContextMenu { widget: w, .. } => {
+                w.add_child(widget, id);
+            }
+        }
+    }
+}
+
+/// Build the icon + label row shown in place of a default menu item.
+///
+/// A flat `Button` carrying the model item's action, so activating it fires
+/// the same `MenuEvent` a normal row would and `PopoverMenu` closes on click.
+fn custom_menu_row(icon: &crate::icon::Icon, label: &str, action: &str) -> gtk::Button {
+    let row = gtk::Box::new(gtk::Orientation::Horizontal, 8);
+    let image = gtk::Image::from_gicon(&icon.inner.to_bytes_icon());
+    image.set_pixel_size(16);
+    let label = gtk::Label::new(Some(&strip_mnemonic(label)));
+    label.set_xalign(0.0);
+    label.set_hexpand(true);
+    row.append(&image);
+    row.append(&label);
+
+    let button = gtk::Button::builder()
+        .child(&row)
+        .has_frame(false)
+        .action_name(action)
+        .build();
+    button.add_css_class("model");
+    button
+}
+
+fn strip_mnemonic(text: &str) -> String {
+    text.replace("__", "\u{0}")
+        .replace('_', "")
+        .replace('\u{0}', "_")
+}
+
+pub struct Menu {
+    id: MenuId,
+    instances: HashMap<usize, GtkMenuBar>,
+    ctx_menu_id: usize,
+    children: Vec<Rc<RefCell<MenuChild>>>,
+}
+
+impl Menu {
+    pub fn new(id: Option<MenuId>) -> Self {
+        Self {
+            id: id.unwrap_or_else(|| MenuId(COUNTER.next().to_string())),
+            instances: HashMap::new(),
+            ctx_menu_id: COUNTER.next() as usize,
+            children: Vec::new(),
+        }
+    }
+
+    pub fn id(&self) -> &MenuId {
+        &self.id
+    }
+
+    pub fn add_menu_item(&mut self, item: &dyn IsMenuItem, op: AddOp) -> crate::Result<()> {
+        let child = item.child();
+        match op {
+            AddOp::Append => self.children.push(child.clone()),
+            AddOp::Insert(i) => self.children.insert(i, child.clone()),
+        }
+
+        for (menu_id, menu_bar) in &self.instances {
+            let parent_menu = menu_bar.menu();
+            let gtk_item =
+                item.make_gtk_menu_item(menu_bar.application(), *menu_id, parent_menu)?;
+            match op {
+                AddOp::Append => parent_menu.append_item(&gtk_item),
+                AddOp::Insert(position) => parent_menu.insert_item(position as i32, &gtk_item),
+            }
+
+            if let Some((id, row)) = child.borrow().custom_child() {
+                menu_bar.add_custom_child(&id, &row);
+            }
+        }
+
+        #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+        crate::send_menu_update();
+
+        Ok(())
+    }
+
+    pub fn add_menu_item_with_id(&mut self, item: &dyn IsMenuItem, id: usize) -> crate::Result<()> {
+        for (menu_id, menu_bar) in self.instances.iter().filter(|m| *m.0 == id) {
+            let parent_menu = menu_bar.menu();
+            let gtk_item =
+                item.make_gtk_menu_item(menu_bar.application(), *menu_id, parent_menu)?;
+            parent_menu.append_item(&gtk_item);
+        }
+
+        Ok(())
+    }
+
+    /// Attach the icon+label widgets for every `custom` slot in the tree to
+    /// the given instance. Run after the instance's model is fully built.
+    fn bind_custom_children(&self, menu_bar: &GtkMenuBar) {
+        fn walk(children: &[Rc<RefCell<MenuChild>>], menu_bar: &GtkMenuBar) {
+            for child in children {
+                let child = child.borrow();
+                if let Some((id, row)) = child.custom_child() {
+                    menu_bar.add_custom_child(&id, &row);
+                }
+                walk(&child.children, menu_bar);
+            }
+        }
+        walk(&self.children, menu_bar);
+    }
+
+    pub fn remove(&mut self, item: &dyn IsMenuItem) -> crate::Result<()> {
+        let child = item.child();
+        let child_id = child.borrow().id().clone();
+
+        // Find position of item in children
+        let position = self
+            .children
+            .iter()
+            .position(|c| c.borrow().id() == &child_id);
+
+        let Some(position) = position else {
+            return Err(crate::Error::NotAChildOfThisMenu);
+        };
+
+        // Remove from all GIO menus at the same position
+        for (menu_id, menu_bar) in &self.instances {
+            menu_bar.menu().remove(position as i32);
+            // Clean up the item's instances for this menu
+            item.child().borrow_mut().instances.remove(menu_id);
+        }
+
+        // Remove from children
+        self.children.remove(position);
+
+        #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+        crate::send_menu_update();
+
+        Ok(())
+    }
+
+    pub fn items(&self) -> Vec<MenuItemKind> {
+        self.children
+            .iter()
+            .map(|c| c.borrow().kind(c.clone()))
+            .collect()
+    }
+
+    #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+    pub fn compat_items(&self) -> Vec<Arc<ArcSwap<crate::CompatMenuItem>>> {
+        self.children
+            .iter()
+            .map(|child| child.borrow().compat_child())
+            .collect()
+    }
+
+    pub fn init_for_gtk_window<W, C>(
+        &mut self,
+        window: &W,
+        container: Option<&C>,
+    ) -> crate::Result<()>
+    where
+        W: gtk::prelude::IsA<gtk::Window>,
+        W: gtk::prelude::IsA<gtk::Widget>,
+        C: gtk::prelude::IsA<gtk::Widget>,
+    {
+        let id = window.as_ptr() as usize;
+
+        let Some(app) = window.application() else {
+            return Err(crate::Error::GtkWindowWithoutApplication);
+        };
+
+        // This is the first time this method has been called on this window
+        // so we need to create the menubar
+        if let Entry::Vacant(e) = self.instances.entry(id) {
+            e.insert(GtkMenuBar::new(app.clone()));
+        } else {
+            return Err(crate::Error::AlreadyInitialized);
+        }
+
+        let action_group = action_group_from_app(&app);
+        window.insert_action_group(DEFAULT_ACTION_GROUP, Some(&action_group));
+
+        for item in self.items() {
+            self.add_menu_item_with_id(item.as_ref(), id)?;
+        }
+
+        self.bind_custom_children(&self.instances[&id]);
+
+        let menu_bar = self.instances[&id].menu_bar();
+
+        // add the menubar to the specified widget, otherwise to the window
+        if let Some(container) = container {
+            if container.type_().name() == "GtkBox" {
+                let gtk_box = container.dynamic_cast_ref::<gtk::Box>().unwrap();
+                gtk_box.prepend(menu_bar);
+            } else if container.type_().name() == "GtkFixed" {
+                let gtk_box = container.dynamic_cast_ref::<gtk::Fixed>().unwrap();
+                gtk_box.put(menu_bar, 0., 0.);
+            } else if container.type_().name() == "GtkStack" {
+                let gtk_box = container.dynamic_cast_ref::<gtk::Stack>().unwrap();
+                gtk_box.add_child(menu_bar);
+            } else {
+                return Err(crate::Error::UnsupportedGtkContainer);
+            }
+        } else {
+            window.set_child(Some(menu_bar));
+        }
+
+        // show the menu bar
+        menu_bar.set_visible(true);
+
+        Ok(())
+    }
+
+    pub fn remove_for_gtk_window<W>(&mut self, window: &W) -> crate::Result<()>
+    where
+        W: gtk::prelude::IsA<gtk::Window>,
+        W: gtk::prelude::IsA<gtk::Widget>,
+    {
+        let id = window.as_ptr() as usize;
+
+        let Some(menu_bar) = self.instances.remove(&id) else {
+            return Err(crate::Error::NotInitialized);
+        };
+
+        window.insert_action_group(DEFAULT_ACTION_GROUP, None::<&gio::SimpleActionGroup>);
+
+        // Unparent the menu bar widget to remove it from the window
+        menu_bar.menu_bar().unparent();
+
+        // Clean up children instances for this menu
+        for child in &self.children {
+            child.borrow_mut().instances.remove(&id);
+        }
+
+        Ok(())
+    }
+
+    pub fn hide_for_gtk_window<W>(&self, window: &W) -> crate::Result<()>
+    where
+        W: gtk::prelude::IsA<gtk::Window>,
+    {
+        let id = window.as_ptr() as usize;
+        let Some(menu_bar) = self.instances.get(&id) else {
+            return Err(crate::Error::NotInitialized);
+        };
+        menu_bar.menu_bar().set_visible(false);
+        Ok(())
+    }
+
+    pub fn show_for_gtk_window<W>(&self, window: &W) -> crate::Result<()>
+    where
+        W: gtk::prelude::IsA<gtk::Window>,
+    {
+        let id = window.as_ptr() as usize;
+        let Some(menu_bar) = self.instances.get(&id) else {
+            return Err(crate::Error::NotInitialized);
+        };
+        menu_bar.menu_bar().set_visible(true);
+        Ok(())
+    }
+
+    #[cfg(target_os = "linux")]
+    pub fn is_visible_on_gtk_window<W>(&self, window: &W) -> bool
+    where
+        W: gtk::prelude::IsA<gtk::Window>,
+    {
+        let id = window.as_ptr() as usize;
+        self.instances
+            .get(&id)
+            .map(|m| m.menu_bar().is_visible())
+            .unwrap_or(false)
+    }
+
+    pub fn gtk_menubar_for_gtk_window<W>(&self, window: &W) -> Option<gtk::PopoverMenuBar>
+    where
+        W: gtk::prelude::IsA<gtk::Window>,
+    {
+        let id = window.as_ptr() as usize;
+        self.instances.get(&id).map(|m| m.menu_bar().clone())
+    }
+
+    pub fn gtk_context_menu(&mut self) -> gtk::PopoverMenu {
+        if !self.instances.contains_key(&self.ctx_menu_id) {
+            let app = gio::Application::default()
+                .and_downcast::<gtk::Application>()
+                .expect("`gtk_context_menu` requires a running `gtk::Application`");
+            let menu = GtkMenuBar::new_context(app);
+            self.instances.insert(self.ctx_menu_id, menu);
+            for item in self.items() {
+                let _ = self.add_menu_item_with_id(item.as_ref(), self.ctx_menu_id);
+            }
+            self.bind_custom_children(&self.instances[&self.ctx_menu_id]);
+        }
+        self.instances
+            .get(&self.ctx_menu_id)
+            .unwrap()
+            .context_menu()
+            .clone()
+    }
+
+    pub fn show_context_menu_for_gtk_window(
+        &mut self,
+        window: &gtk::Window,
+        position: Option<Position>,
+    ) -> bool {
+        let Some(app) = window.application() else {
+            return false; // TODO: better error
+        };
+
+        // Rebuild the context instance every time so it reflects the current
+        // labels, icons, and checked state rather than a stale first build.
+        if let Some(old) = self.instances.remove(&self.ctx_menu_id) {
+            let old_context_menu = old.context_menu();
+            if old_context_menu.parent().is_some() {
+                old_context_menu.unparent();
+            }
+        }
+
+        {
+            let action_group = action_group_from_app(&app);
+            window.insert_action_group(DEFAULT_ACTION_GROUP, Some(&action_group));
+
+            let menu = GtkMenuBar::new_context(app);
+
+            self.instances.insert(self.ctx_menu_id, menu);
+
+            for item in self.items() {
+                let _ = self.add_menu_item_with_id(item.as_ref(), self.ctx_menu_id);
+            }
+            self.bind_custom_children(&self.instances[&self.ctx_menu_id]);
+        }
+
+        let (x, y) = match position {
+            Some(p) => p.to_logical::<i32>(window.scale_factor() as _).into(),
+            None => get_cursor_pos(window),
+        };
+
+        // SAFETY: it is guaranteed to exist due to the check above
+        let menu = self.instances.get(&self.ctx_menu_id).unwrap();
+        let context_menu = menu.context_menu();
+
+        if context_menu.parent().is_some() {
+            context_menu.unparent();
+        }
+        context_menu.set_parent(window);
+
+        context_menu.popup();
+        context_menu.set_pointing_to(Some(&Rectangle::new(x, y, 0, 0)));
+
+        true
+    }
+}
+
+#[derive(Clone)]
+enum GtkMenuChild {
+    Item {
+        item: gio::MenuItem,
+        app: gtk::Application,
+        parent_menu: gio::Menu,
+    },
+    Submenu {
+        id: usize,
+        item: gio::MenuItem,
+        menu: gio::Menu,
+        app: gtk::Application,
+        parent_menu: gio::Menu,
+    },
+    ContextMenu {
+        id: usize,
+        widget: gtk::PopoverMenu,
+        menu: gio::Menu,
+        app: gtk::Application,
+    },
+}
+
+impl GtkMenuChild {
+    fn id(&self) -> usize {
+        match self {
+            GtkMenuChild::Submenu { id, .. } => *id,
+            GtkMenuChild::ContextMenu { id, .. } => *id,
+            _ => unreachable!("This is a bug report to https://github.com/tauri-apps/muda"),
+        }
+    }
+
+    fn application(&self) -> &gtk::Application {
+        match self {
+            GtkMenuChild::Submenu { app, .. } => app,
+            GtkMenuChild::ContextMenu { app, .. } => app,
+            GtkMenuChild::Item { app, .. } => app,
+        }
+    }
+
+    fn parent_menu(&self) -> &gio::Menu {
+        match self {
+            GtkMenuChild::Item { parent_menu, .. } => parent_menu,
+            GtkMenuChild::Submenu { parent_menu, .. } => parent_menu,
+            _ => unreachable!("This is a bug report to https://github.com/tauri-apps/muda"),
+        }
+    }
+
+    fn menu(&self) -> &gio::Menu {
+        match self {
+            GtkMenuChild::Submenu { menu, .. } => menu,
+            GtkMenuChild::ContextMenu { menu, .. } => menu,
+            _ => unreachable!("This is a bug report to https://github.com/tauri-apps/muda"),
+        }
+    }
+
+    fn context_menu(&self) -> &gtk::PopoverMenu {
+        match self {
+            GtkMenuChild::ContextMenu { widget, .. } => widget,
+            _ => unreachable!("This is a bug report to https://github.com/tauri-apps/muda"),
+        }
+    }
+
+    fn add_custom_child(&self, id: &str, widget: &impl IsA<gtk::Widget>) {
+        if let GtkMenuChild::ContextMenu { widget: w, .. } = self {
+            w.add_child(widget, id);
+        }
+    }
+}
+
+pub struct MenuChild {
+    id: MenuId,
+    text: String,
+    enabled: bool,
+    key_accelerator: Option<KeyAccelerator>,
+
+    checked: bool,
+
+    icon: Option<Icon>,
+
+    predefined_item_type: Option<PredefinedMenuItemType>,
+
+    type_: MenuItemType,
+
+    instances: HashMap<usize, Vec<GtkMenuChild>>,
+    ctx_menu_id: usize,
+    children: Vec<Rc<RefCell<MenuChild>>>,
+
+    action: Option<gio::SimpleAction>,
+
+    #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+    compat: Arc<ArcSwap<crate::CompatMenuItem>>,
+}
+
+#[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+impl MenuChild {
+    pub(crate) fn compat_child(&self) -> Arc<ArcSwap<crate::CompatMenuItem>> {
+        self.sync_compat();
+        self.compat.clone()
+    }
+
+    pub(crate) fn compat_items(&self) -> Vec<Arc<ArcSwap<crate::CompatMenuItem>>> {
+        self.children
+            .iter()
+            .map(|child| child.borrow().compat_child())
+            .collect()
+    }
+
+    fn sync_compat(&self) {
+        self.compat.store(Arc::new(self.to_compat_item()));
+    }
+
+    fn to_compat_item(&self) -> crate::CompatMenuItem {
+        let label = crate::strip_mnemonic(&self.text);
+        match self.type_ {
+            MenuItemType::Check => crate::CompatCheckmarkItem {
+                id: self.id.0.clone(),
+                label,
+                enabled: self.enabled,
+                checked: self.is_checked(),
+            }
+            .into(),
+            MenuItemType::Submenu => crate::CompatSubMenuItem {
+                label,
+                enabled: self.enabled,
+                submenu: self.compat_items(),
+            }
+            .into(),
+            MenuItemType::Predefined => match self.predefined_item_type.as_ref() {
+                Some(PredefinedMenuItemType::Separator) => crate::CompatMenuItem::Separator,
+                Some(PredefinedMenuItemType::About(metadata)) => crate::CompatStandardItem {
+                    id: self.id.0.clone(),
+                    label,
+                    enabled: self.enabled,
+                    icon: None,
+                    about_metadata: metadata.clone(),
+                }
+                .into(),
+                _ => crate::CompatStandardItem {
+                    id: self.id.0.clone(),
+                    label,
+                    enabled: self.enabled,
+                    icon: None,
+                    about_metadata: None,
+                }
+                .into(),
+            },
+            MenuItemType::Icon | MenuItemType::MenuItem => crate::CompatStandardItem {
+                id: self.id.0.clone(),
+                label,
+                enabled: self.enabled,
+                icon: self.icon.as_ref().map(|icon| icon.inner.png_data()),
+                about_metadata: None,
+            }
+            .into(),
+        }
+    }
+
+    fn notify_compat_changed(&self) {
+        self.sync_compat();
+        crate::send_menu_update();
+    }
+}
+
+impl MenuChild {
+    pub fn new_submenu(text: &str, enabled: bool, id: Option<MenuId>) -> Self {
+        Self {
+            id: id.unwrap_or_else(|| MenuId(COUNTER.next().to_string())),
+            text: text.to_string(),
+            enabled,
+            checked: false,
+            icon: None,
+            key_accelerator: None,
+            predefined_item_type: None,
+            type_: MenuItemType::Submenu,
+            ctx_menu_id: COUNTER.next() as usize,
+            instances: HashMap::new(),
+            children: Vec::new(),
+            action: None,
+            #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+            compat: compat_placeholder(),
+        }
+    }
+
+    fn create_gtk_item_for_submenu(
+        &mut self,
+        app: &gtk::Application,
+        menu_id: usize,
+        parent_menu: &gio::Menu,
+    ) -> crate::Result<gio::MenuItem> {
+        let menu = gio::Menu::new();
+        let item = gio::MenuItem::new_submenu(Some(&to_gtk_mnemonic(&self.text)), &menu);
+        item.set_detailed_action(&self.detailed_action());
+
+        if self.action.is_none() {
+            let action_group = action_group_from_app(app);
+
+            let action = gio::SimpleAction::new(self.id.as_ref(), None);
+            action.connect_activate(|_, _| ());
+            action.set_enabled(self.enabled);
+            action_group.add_action(&action);
+
+            self.action = Some(action);
+        }
+
+        let id = COUNTER.next() as usize;
+        let child = GtkMenuChild::Submenu {
+            item: item.clone(),
+            menu,
+            id,
+            app: app.clone(),
+            parent_menu: parent_menu.clone(),
+        };
+
+        self.instances.entry(menu_id).or_default().push(child);
+
+        for item in self.items() {
+            self.add_menu_item_with_id(item.as_ref(), id)?;
+        }
+
+        Ok(item)
+    }
+
+    pub fn add_menu_item(&mut self, item: &dyn IsMenuItem, op: AddOp) -> crate::Result<()> {
+        let child = item.child();
+        match op {
+            AddOp::Append => self.children.push(child.clone()),
+            AddOp::Insert(i) => self.children.insert(i, child.clone()),
+        }
+
+        #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+        self.notify_compat_changed();
+
+        for menus in self.instances.values() {
+            for gtk_child in menus {
+                let parent_menu = gtk_child.menu();
+                let gtk_item =
+                    item.make_gtk_menu_item(gtk_child.application(), gtk_child.id(), parent_menu)?;
+
+                match op {
+                    AddOp::Append => parent_menu.append_item(&gtk_item),
+                    AddOp::Insert(position) => parent_menu.insert_item(position as i32, &gtk_item),
+                }
+
+                if let Some((id, row)) = child.borrow().custom_child() {
+                    gtk_child.add_custom_child(&id, &row);
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn add_menu_item_with_id(&self, item: &dyn IsMenuItem, id: usize) -> crate::Result<()> {
+        for menus in self.instances.values() {
+            for gtk_child in menus.iter().filter(|m| m.id() == id) {
+                let parent_menu = gtk_child.menu();
+                let gtk_item =
+                    item.make_gtk_menu_item(gtk_child.application(), gtk_child.id(), parent_menu)?;
+                parent_menu.append_item(&gtk_item);
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn remove(&mut self, item: &dyn IsMenuItem) -> crate::Result<()> {
+        let child = item.child();
+        let child_id = child.borrow().id().clone();
+
+        // Find position of item in children
+        let position = self
+            .children
+            .iter()
+            .position(|c| c.borrow().id() == &child_id);
+
+        let Some(position) = position else {
+            return Err(crate::Error::NotAChildOfThisMenu);
+        };
+
+        // Remove from all submenu GIO menus at the same position
+        for menus in self.instances.values() {
+            for gtk_child in menus {
+                // Get the submenu's gio::Menu and remove at position
+                gtk_child.menu().remove(position as i32);
+            }
+        }
+
+        // Clean up the item's instances
+        // For submenus, we need to clear instances that belong to this submenu's children
+        let child_ref = item.child();
+        let mut item_child = child_ref.borrow_mut();
+        for menus in self.instances.values() {
+            for gtk_child in menus {
+                item_child.instances.remove(&gtk_child.id());
+            }
+        }
+
+        // Remove from children
+        self.children.remove(position);
+
+        #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+        self.notify_compat_changed();
+
+        Ok(())
+    }
+
+    pub fn items(&self) -> Vec<MenuItemKind> {
+        self.children
+            .iter()
+            .map(|c| c.borrow().kind(c.clone()))
+            .collect()
+    }
+
+    pub fn gtk_context_menu(&mut self) -> gtk::PopoverMenu {
+        if !self.instances.contains_key(&self.ctx_menu_id) {
+            let app = gio::Application::default()
+                .and_downcast::<gtk::Application>()
+                .expect("`gtk_context_menu` requires a running `gtk::Application`");
+            let menu = gio::Menu::new();
+            let widget = gtk::PopoverMenu::from_model(Some(&menu));
+            let menu = GtkMenuChild::ContextMenu {
+                id: self.ctx_menu_id,
+                widget,
+                menu,
+                app,
+            };
+            self.instances.insert(self.ctx_menu_id, vec![menu]);
+            for item in self.items() {
+                let _ = self.add_menu_item_with_id(item.as_ref(), self.ctx_menu_id);
+            }
+        }
+        self.instances
+            .get(&self.ctx_menu_id)
+            .unwrap()
+            .first()
+            .unwrap()
+            .context_menu()
+            .clone()
+    }
+
+    pub fn show_context_menu_for_gtk_window(
+        &mut self,
+        window: &gtk::Window,
+        position: Option<Position>,
+    ) -> bool {
+        let Some(app) = window.application() else {
+            return false; // TODO: better error
+        };
+
+        if let Some(old) = self.instances.remove(&self.ctx_menu_id) {
+            if let Some(old) = old.first() {
+                let old_context_menu = old.context_menu();
+                if old_context_menu.parent().is_some() {
+                    old_context_menu.unparent();
+                }
+            }
+        }
+
+        let menu = gio::Menu::new();
+        let widget = gtk::PopoverMenu::from_model(Some(&menu));
+
+        let action_group = action_group_from_app(&app);
+        window.insert_action_group(DEFAULT_ACTION_GROUP, Some(&action_group));
+
+        let menu = GtkMenuChild::ContextMenu {
+            id: self.ctx_menu_id,
+            widget,
+            menu,
+            app,
+        };
+
+        self.instances.insert(self.ctx_menu_id, vec![menu]);
+
+        for item in self.items() {
+            let _ = self.add_menu_item_with_id(item.as_ref(), self.ctx_menu_id);
+        }
+        if let Some(menus) = self.instances.get(&self.ctx_menu_id) {
+            if let Some(menu) = menus.first() {
+                self.bind_custom_children(menu);
+            }
+        }
+
+        // SAFETY: it is guaranteed to exist due to the check above
+        let menus = self.instances.get(&self.ctx_menu_id).unwrap();
+        let menu = menus.first().unwrap();
+
+        let (x, y) = match position {
+            Some(p) => p.to_logical::<i32>(window.scale_factor() as _).into(),
+            None => get_cursor_pos(window),
+        };
+
+        let context_menu = menu.context_menu();
+
+        if context_menu.parent().is_some() {
+            context_menu.unparent();
+        }
+        context_menu.set_parent(window);
+
+        context_menu.popup();
+        context_menu.set_pointing_to(Some(&Rectangle::new(x, y, 0, 0)));
+
+        true
+    }
+}
+
+impl MenuChild {
+    fn bind_custom_children(&self, menu: &GtkMenuChild) {
+        fn walk(children: &[Rc<RefCell<MenuChild>>], menu: &GtkMenuChild) {
+            for child in children {
+                let child = child.borrow();
+                if let Some((id, row)) = child.custom_child() {
+                    menu.add_custom_child(&id, &row);
+                }
+                walk(&child.children, menu);
+            }
+        }
+        walk(&self.children, menu);
+    }
+
+    pub fn new(
+        text: &str,
+        enabled: bool,
+        key_accelerator: Option<KeyAccelerator>,
+        id: Option<MenuId>,
+    ) -> Self {
+        Self {
+            id: id.unwrap_or_else(|| MenuId(COUNTER.next().to_string())),
+            text: text.to_string(),
+            enabled,
+            key_accelerator,
+            icon: None,
+            checked: false,
+            predefined_item_type: None,
+            type_: MenuItemType::MenuItem,
+            ctx_menu_id: 0,
+            instances: HashMap::new(),
+            children: Vec::new(),
+            action: None,
+            #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+            compat: compat_placeholder(),
+        }
+    }
+
+    fn create_gtk_item_for_menu_item(
+        &mut self,
+        app: &gtk::Application,
+        menu_id: usize,
+        parent_menu: &gio::Menu,
+    ) -> crate::Result<gio::MenuItem> {
+        let detailed_action = self.detailed_action();
+        let item = gio::MenuItem::new(Some(&to_gtk_mnemonic(&self.text)), Some(&detailed_action));
+
+        if let Some(accelerator) = &self.key_accelerator {
+            app.set_accels_for_action(&detailed_action, &[&accelerator.to_gtk()]);
+        }
+
+        if self.action.is_none() {
+            let action_group = action_group_from_app(app);
+
+            let action = gio::SimpleAction::new(self.id.as_ref(), None);
+            let id = self.id.clone();
+            action.connect_activate(move |_, _| MenuEvent::send(MenuEvent { id: id.clone() }));
+            action.set_enabled(self.enabled);
+            action_group.add_action(&action);
+
+            self.action = Some(action);
+        }
+
+        let child = GtkMenuChild::Item {
+            item: item.clone(),
+            app: app.clone(),
+            parent_menu: parent_menu.clone(),
+        };
+        self.instances.entry(menu_id).or_default().push(child);
+
+        Ok(item)
+    }
+
+    pub fn id(&self) -> &MenuId {
+        &self.id
+    }
+
+    fn detailed_action(&self) -> String {
+        format!("{DEFAULT_ACTION_GROUP}.{}", self.id.as_ref())
+    }
+
+    pub fn item_type(&self) -> &MenuItemType {
+        &self.type_
+    }
+
+    pub fn text(&self) -> String {
+        self.text.clone()
+    }
+
+    pub fn set_text(&mut self, text: &str) {
+        self.text = text.to_string();
+
+        // GIO MenuItems are immutable after insertion, so we need to remove and reinsert
+        let detailed_action = self.detailed_action();
+        let custom_child_id = self.icon.as_ref().map(|_| self.id.as_ref().to_string());
+        let custom_child_icon = self.icon.clone();
+        let custom_child_text = self.text.clone();
+
+        for children in self.instances.values_mut() {
+            for child in children.iter_mut() {
+                let parent_menu = child.parent_menu();
+
+                // Find position of this item in parent menu by matching action name
+                let mut position = None;
+                for i in 0..parent_menu.n_items() {
+                    if let Some(action) = parent_menu.item_attribute_value(i, "action", None) {
+                        if let Some(action_str) = action.str() {
+                            if action_str == detailed_action {
+                                position = Some(i);
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if let Some(pos) = position {
+                    // Remove old item
+                    parent_menu.remove(pos);
+
+                    // Create new item with updated text
+                    let new_item = gio::MenuItem::new(
+                        Some(&to_gtk_mnemonic(&self.text)),
+                        Some(&detailed_action),
+                    );
+
+                    // Copy icon if present
+                    if let (Some(id), Some(icon)) = (&custom_child_id, &custom_child_icon) {
+                        new_item.set_icon(&icon.inner.to_bytes_icon());
+                        new_item.set_attribute_value("custom", Some(&id.to_variant()));
+                    }
+
+                    // Insert at same position
+                    parent_menu.insert_item(pos, &new_item);
+
+                    // Update stored reference
+                    match child {
+                        GtkMenuChild::Item { item, .. } => *item = new_item,
+                        GtkMenuChild::Submenu { item, .. } => *item = new_item,
+                        _ => {}
+                    }
+
+                    if let (Some(id), Some(icon)) = (&custom_child_id, &custom_child_icon) {
+                        let row = custom_menu_row(icon, &custom_child_text, &detailed_action);
+                        child.add_custom_child(id, &row);
+                    }
+                }
+            }
+        }
+
+        #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+        self.notify_compat_changed();
+    }
+
+    pub fn is_enabled(&self) -> bool {
+        self.enabled
+    }
+
+    pub fn set_enabled(&mut self, enabled: bool) {
+        self.enabled = enabled;
+
+        if let Some(action) = self.action.as_ref() {
+            action.set_enabled(enabled);
+        }
+
+        #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+        self.notify_compat_changed();
+    }
+
+    pub fn set_key_accelerator(
+        &mut self,
+        accelerator: Option<KeyAccelerator>,
+    ) -> crate::Result<()> {
+        self.key_accelerator = accelerator.clone();
+
+        let detailed_action = self.detailed_action();
+        let accelerator = accelerator.map(|a| a.to_gtk());
+        let accelerator = accelerator.as_deref().map(|a| [a]).unwrap_or_default();
+        for item in self.instances.values().flat_map(|v| v.iter()) {
+            let app = item.application();
+            app.set_accels_for_action(&detailed_action, accelerator.as_slice());
+        }
+
+        Ok(())
+    }
+}
+
+impl MenuChild {
+    pub fn new_predefined(item_type: PredefinedMenuItemType, text: Option<String>) -> Self {
+        Self {
+            id: MenuId(COUNTER.next().to_string()),
+            text: text.unwrap_or_else(|| item_type.text().to_string()),
+            enabled: true,
+            key_accelerator: item_type.accelerator().map(KeyAccelerator::from),
+            icon: None,
+            checked: false,
+            predefined_item_type: Some(item_type),
+            type_: MenuItemType::Predefined,
+            ctx_menu_id: 0,
+            instances: HashMap::new(),
+            children: Vec::new(),
+            action: None,
+            #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+            compat: compat_placeholder(),
+        }
+    }
+}
+
+impl MenuChild {
+    pub fn new_check(
+        text: &str,
+        enabled: bool,
+        checked: bool,
+        key_accelerator: Option<KeyAccelerator>,
+        id: Option<MenuId>,
+    ) -> Self {
+        Self {
+            id: id.unwrap_or_else(|| MenuId(COUNTER.next().to_string())),
+            text: text.to_string(),
+            enabled,
+            key_accelerator,
+            icon: None,
+            checked,
+            predefined_item_type: None,
+            type_: MenuItemType::Check,
+            ctx_menu_id: 0,
+            instances: HashMap::new(),
+            children: Vec::new(),
+            action: None,
+            #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+            compat: compat_placeholder(),
+        }
+    }
+
+    fn create_gtk_item_for_check_menu_item(
+        &mut self,
+        app: &gtk::Application,
+        menu_id: usize,
+        parent_menu: &gio::Menu,
+    ) -> crate::Result<gio::MenuItem> {
+        let detailed_action = self.detailed_action();
+        let item = gio::MenuItem::new(Some(&to_gtk_mnemonic(&self.text)), Some(&detailed_action));
+
+        if let Some(accelerator) = &self.key_accelerator {
+            app.set_accels_for_action(&detailed_action, &[&accelerator.to_gtk()]);
+        }
+
+        if self.action.is_none() {
+            let action_group = action_group_from_app(app);
+
+            let state = &self.checked.to_variant();
+            let action = gio::SimpleAction::new_stateful(self.id.as_ref(), None, state);
+            let id = self.id.clone();
+            action.connect_state_notify(move |_| MenuEvent::send(MenuEvent { id: id.clone() }));
+            action.set_enabled(self.enabled);
+            action_group.add_action(&action);
+
+            self.action = Some(action);
+        }
+
+        let child = GtkMenuChild::Item {
+            item: item.clone(),
+            app: app.clone(),
+            parent_menu: parent_menu.clone(),
+        };
+        self.instances.entry(menu_id).or_default().push(child);
+
+        Ok(item)
+    }
+
+    pub fn is_checked(&self) -> bool {
+        self.action
+            .as_ref()
+            .and_then(|action| action.state())
+            .and_then(|s| s.get())
+            .unwrap_or(self.checked)
+    }
+
+    pub fn set_checked(&mut self, checked: bool) {
+        self.checked = checked;
+
+        if let Some(action) = self.action.as_ref() {
+            action.set_state(&checked.to_variant());
+        }
+
+        #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+        self.notify_compat_changed();
+    }
+}
+
+impl MenuChild {
+    pub fn new_icon(
+        text: &str,
+        enabled: bool,
+        icon: Option<Icon>,
+        key_accelerator: Option<KeyAccelerator>,
+        id: Option<MenuId>,
+    ) -> Self {
+        Self {
+            id: id.unwrap_or_else(|| MenuId(COUNTER.next().to_string())),
+            text: text.to_string(),
+            enabled,
+            key_accelerator,
+            icon,
+            checked: false,
+            predefined_item_type: None,
+            type_: MenuItemType::Icon,
+            ctx_menu_id: 0,
+            instances: HashMap::new(),
+            children: Vec::new(),
+            action: None,
+            #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+            compat: compat_placeholder(),
+        }
+    }
+
+    pub fn new_native_icon(
+        text: &str,
+        enabled: bool,
+        _icon: Option<NativeIcon>,
+        key_accelerator: Option<KeyAccelerator>,
+        id: Option<MenuId>,
+    ) -> Self {
+        Self {
+            id: id.unwrap_or_else(|| MenuId(COUNTER.next().to_string())),
+            text: text.to_string(),
+            enabled,
+            key_accelerator,
+            icon: None,
+            checked: false,
+            predefined_item_type: None,
+            type_: MenuItemType::Icon,
+            ctx_menu_id: 0,
+            instances: HashMap::new(),
+            children: Vec::new(),
+            action: None,
+            #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+            compat: compat_placeholder(),
+        }
+    }
+
+    fn create_gtk_item_for_icon_menu_item(
+        &mut self,
+        app: &gtk::Application,
+        menu_id: usize,
+        parent_menu: &gio::Menu,
+    ) -> crate::Result<gio::MenuItem> {
+        let detailed_action = self.detailed_action();
+        let item = gio::MenuItem::new(Some(&to_gtk_mnemonic(&self.text)), Some(&detailed_action));
+
+        if let Some(accelerator) = &self.key_accelerator {
+            app.set_accels_for_action(&detailed_action, &[&accelerator.to_gtk()]);
+        }
+
+        // GTK4's PopoverMenu ignores icons set on the model item, so mark
+        // this row as custom and render the icon ourselves via `add_child`.
+        if self.icon.is_some() {
+            item.set_attribute_value("custom", Some(&self.id.as_ref().to_variant()));
+        }
+
+        if self.action.is_none() {
+            let action_group = action_group_from_app(app);
+
+            let action = gio::SimpleAction::new(self.id.as_ref(), None);
+            let id = self.id.clone();
+            action.connect_activate(move |_, _| MenuEvent::send(MenuEvent { id: id.clone() }));
+            action.set_enabled(self.enabled);
+            action_group.add_action(&action);
+
+            self.action = Some(action);
+        }
+
+        let child = GtkMenuChild::Item {
+            item: item.clone(),
+            app: app.clone(),
+            parent_menu: parent_menu.clone(),
+        };
+        self.instances.entry(menu_id).or_default().push(child);
+
+        Ok(item)
+    }
+
+    /// The `custom` slot id and rendered row for an icon item, if any.
+    fn custom_child(&self) -> Option<(String, gtk::Button)> {
+        let icon = self.icon.as_ref()?;
+        Some((
+            self.id.as_ref().to_string(),
+            custom_menu_row(icon, &self.text, &self.detailed_action()),
+        ))
+    }
+
+    fn create_gtk_item_for_predefined_menu_item(
+        &mut self,
+        app: &gtk::Application,
+        menu_id: usize,
+        parent_menu: &gio::Menu,
+    ) -> crate::Result<gio::MenuItem> {
+        let predefined_item_type = self.predefined_item_type.clone().unwrap();
+
+        let (label, action_name) = match &predefined_item_type {
+            // Separator - create an empty section label (GIO way of doing separators)
+            PredefinedMenuItemType::Separator => {
+                // For separators, we return an item with no action that acts as a visual break
+                // In GIO menus, true separators are done via sections, but this provides a fallback
+                let item = gio::MenuItem::new(None, None);
+                let child = GtkMenuChild::Item {
+                    item: item.clone(),
+                    app: app.clone(),
+                    parent_menu: parent_menu.clone(),
+                };
+                self.instances.entry(menu_id).or_default().push(child);
+                return Ok(item);
+            }
+
+            // Clipboard actions (widget-scoped, work on focused text widgets)
+            PredefinedMenuItemType::Copy => (self.text.clone(), "clipboard.copy"),
+            PredefinedMenuItemType::Cut => (self.text.clone(), "clipboard.cut"),
+            PredefinedMenuItemType::Paste => (self.text.clone(), "clipboard.paste"),
+            PredefinedMenuItemType::SelectAll => (self.text.clone(), "selection.select-all"),
+
+            // Text actions (widget-scoped, work on focused text widgets)
+            PredefinedMenuItemType::Undo => (self.text.clone(), "text.undo"),
+            PredefinedMenuItemType::Redo => (self.text.clone(), "text.redo"),
+
+            // Window actions (built-in on GtkWindow)
+            PredefinedMenuItemType::Minimize => (self.text.clone(), "window.minimize"),
+            PredefinedMenuItemType::Maximize => (self.text.clone(), "window.toggle-maximized"),
+            PredefinedMenuItemType::CloseWindow => (self.text.clone(), "window.close"),
+
+            // Fullscreen - no built-in GAction, need custom action
+            PredefinedMenuItemType::Fullscreen => {
+                let action_name = format!("{DEFAULT_ACTION_GROUP}.{}_fullscreen", self.id.as_ref());
+
+                if self.action.is_none() {
+                    let action_group = action_group_from_app(app);
+                    let action =
+                        gio::SimpleAction::new(&format!("{}_fullscreen", self.id.as_ref()), None);
+                    action.connect_activate(|_, _| {
+                        // Get the focused window and toggle fullscreen
+                        if let Some(app) = gio::Application::default() {
+                            if let Some(app) = app.downcast_ref::<gtk::Application>() {
+                                if let Some(window) = app.active_window() {
+                                    if window.is_fullscreen() {
+                                        window.unfullscreen();
+                                    } else {
+                                        window.fullscreen();
+                                    }
+                                }
+                            }
+                        }
+                    });
+                    action_group.add_action(&action);
+                    self.action = Some(action);
+                }
+
+                let item =
+                    gio::MenuItem::new(Some(&to_gtk_mnemonic(&self.text)), Some(&action_name));
+                let child = GtkMenuChild::Item {
+                    item: item.clone(),
+                    app: app.clone(),
+                    parent_menu: parent_menu.clone(),
+                };
+                self.instances.entry(menu_id).or_default().push(child);
+                return Ok(item);
+            }
+
+            // About - custom action showing AboutDialog
+            PredefinedMenuItemType::About(metadata) => {
+                let action_name = format!("{DEFAULT_ACTION_GROUP}.{}_about", self.id.as_ref());
+
+                if self.action.is_none() {
+                    let action_group = action_group_from_app(app);
+                    let metadata = metadata.clone();
+                    let action =
+                        gio::SimpleAction::new(&format!("{}_about", self.id.as_ref()), None);
+                    action.connect_activate(move |_, _| {
+                        if let Some(metadata) = &metadata {
+                            let dialog = gtk::AboutDialog::new();
+                            dialog.set_modal(true);
+
+                            if let Some(name) = &metadata.name {
+                                dialog.set_program_name(Some(name.as_str()));
+                            }
+                            if let Some(version) = &metadata.full_version() {
+                                dialog.set_version(Some(version.as_str()));
+                            }
+                            if let Some(authors) = &metadata.authors {
+                                let authors_refs: Vec<&str> =
+                                    authors.iter().map(|s| s.as_str()).collect();
+                                dialog.set_authors(&authors_refs);
+                            }
+                            if let Some(comments) = &metadata.comments {
+                                dialog.set_comments(Some(comments));
+                            }
+                            if let Some(copyright) = &metadata.copyright {
+                                dialog.set_copyright(Some(copyright));
+                            }
+                            if let Some(license) = &metadata.license {
+                                dialog.set_license(Some(license));
+                            }
+                            if let Some(website) = &metadata.website {
+                                dialog.set_website(Some(website));
+                            }
+                            if let Some(website_label) = &metadata.website_label {
+                                dialog.set_website_label(website_label);
+                            }
+
+                            // Set transient parent if possible
+                            if let Some(app) = gio::Application::default() {
+                                if let Some(app) = app.downcast_ref::<gtk::Application>() {
+                                    if let Some(window) = app.active_window() {
+                                        dialog.set_transient_for(Some(&window));
+                                    }
+                                }
+                            }
+
+                            dialog.present();
+                        }
+                    });
+                    action_group.add_action(&action);
+                    self.action = Some(action);
+                }
+
+                let item =
+                    gio::MenuItem::new(Some(&to_gtk_mnemonic(&self.text)), Some(&action_name));
+                let child = GtkMenuChild::Item {
+                    item: item.clone(),
+                    app: app.clone(),
+                    parent_menu: parent_menu.clone(),
+                };
+                self.instances.entry(menu_id).or_default().push(child);
+                return Ok(item);
+            }
+
+            // Unsupported on Linux (matches GTK3 behavior)
+            PredefinedMenuItemType::Quit
+            | PredefinedMenuItemType::Hide
+            | PredefinedMenuItemType::HideOthers
+            | PredefinedMenuItemType::ShowAll
+            | PredefinedMenuItemType::Services
+            | PredefinedMenuItemType::BringAllToFront
+            | PredefinedMenuItemType::None => {
+                unreachable!("Predefined menu item type not supported on Linux")
+            }
+        };
+
+        // Create menu item pointing to the action
+        let item = gio::MenuItem::new(Some(&to_gtk_mnemonic(&label)), Some(action_name));
+
+        let child = GtkMenuChild::Item {
+            item: item.clone(),
+            app: app.clone(),
+            parent_menu: parent_menu.clone(),
+        };
+        self.instances.entry(menu_id).or_default().push(child);
+
+        Ok(item)
+    }
+
+    pub fn set_icon(&mut self, icon: Option<Icon>) {
+        self.icon = icon;
+
+        // GIO MenuItems are immutable after insertion, so we need to remove and reinsert
+        let detailed_action = self.detailed_action();
+        let custom_child_id = self.id.as_ref().to_string();
+        let custom_child_icon = self.icon.clone();
+        let custom_child_text = self.text.clone();
+
+        for children in self.instances.values_mut() {
+            for child in children.iter_mut() {
+                let parent_menu = child.parent_menu();
+
+                // Find position of this item in parent menu by matching action name
+                let mut position = None;
+                for i in 0..parent_menu.n_items() {
+                    if let Some(action) = parent_menu.item_attribute_value(i, "action", None) {
+                        if let Some(action_str) = action.str() {
+                            if action_str == detailed_action {
+                                position = Some(i);
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if let Some(pos) = position {
+                    // Remove old item
+                    parent_menu.remove(pos);
+
+                    // Create new item with updated icon
+                    let new_item = gio::MenuItem::new(
+                        Some(&to_gtk_mnemonic(&self.text)),
+                        Some(&detailed_action),
+                    );
+
+                    // Set icon if present
+                    if let Some(icon) = &custom_child_icon {
+                        new_item.set_icon(&icon.inner.to_bytes_icon());
+                        new_item
+                            .set_attribute_value("custom", Some(&custom_child_id.to_variant()));
+                    }
+
+                    // Insert at same position
+                    parent_menu.insert_item(pos, &new_item);
+
+                    // Update stored reference
+                    match child {
+                        GtkMenuChild::Item { item, .. } => *item = new_item,
+                        GtkMenuChild::Submenu { item, .. } => *item = new_item,
+                        _ => {}
+                    }
+
+                    if let Some(icon) = &custom_child_icon {
+                        let row = custom_menu_row(icon, &custom_child_text, &detailed_action);
+                        child.add_custom_child(&custom_child_id, &row);
+                    }
+                }
+            }
+        }
+
+        #[cfg(all(feature = "linux-ksni", target_os = "linux"))]
+        self.notify_compat_changed();
+    }
+}
+
+impl dyn IsMenuItem + '_ {
+    fn make_gtk_menu_item(
+        &self,
+        app: &gtk::Application,
+        menu_id: usize,
+        parent_menu: &gio::Menu,
+    ) -> crate::Result<gio::MenuItem> {
+        let kind = self.kind();
+        let mut child = kind.child_mut();
+        match child.item_type() {
+            MenuItemType::Submenu => child.create_gtk_item_for_submenu(app, menu_id, parent_menu),
+            MenuItemType::MenuItem => {
+                child.create_gtk_item_for_menu_item(app, menu_id, parent_menu)
+            }
+            MenuItemType::Check => {
+                child.create_gtk_item_for_check_menu_item(app, menu_id, parent_menu)
+            }
+            MenuItemType::Icon => {
+                child.create_gtk_item_for_icon_menu_item(app, menu_id, parent_menu)
+            }
+            MenuItemType::Predefined => {
+                child.create_gtk_item_for_predefined_menu_item(app, menu_id, parent_menu)
+            }
+        }
+    }
+}
+
+/// Returns and creates the action group on this application if necessary.
+fn action_group_from_app(app: &gtk::Application) -> gio::SimpleActionGroup {
+    let action_group = unsafe { app.data::<gio::SimpleActionGroup>(ACTION_GROUP_DATA_KEY) };
+
+    let action_group = if let Some(action_group) = action_group {
+        unsafe { action_group.as_ref() }.clone()
+    } else {
+        let action_group = gio::SimpleActionGroup::new();
+        unsafe { app.set_data(ACTION_GROUP_DATA_KEY, action_group.clone()) };
+        action_group
+    };
+
+    action_group
+}
+
+fn get_cursor_pos(window: &gtk::Window) -> (i32, i32) {
+    WidgetExt::display(window)
+        .default_seat()
+        .and_then(|s| s.pointer())
+        .map(|p| {
+            let (_, x, y) = p.surface_at_position();
+            (x as _, y as _)
+        })
+        .unwrap_or_default()
+}
diff --git a/ports/muda/src/platform_impl/macos/accelerator.rs b/ports/muda/src/platform_impl/macos/accelerator.rs
new file mode 100644
index 000000000000..72c2164c2590
--- /dev/null
+++ b/ports/muda/src/platform_impl/macos/accelerator.rs
@@ -0,0 +1,80 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use keyboard_types::{Key, Modifiers};
+use objc2_app_kit::NSEventModifierFlags;
+
+use crate::accelerator::{AcceleratorParseError, KeyAccelerator};
+
+impl KeyAccelerator {
+    /// Return the string value of this hotkey, without modifiers.
+    pub(crate) fn key_equivalent(&self) -> Result<String, AcceleratorParseError> {
+        Ok(match &self.key {
+            Key::Character(s) => s.clone(),
+            Key::Tab => "⇥".into(),
+            Key::Escape => "\u{001b}".into(),
+            Key::Enter => "\u{000d}".into(),
+            Key::Backspace => "\u{0008}".into(),
+            Key::Delete => "\u{007f}".into(),
+            Key::Insert => "\u{F727}".into(),
+            Key::Home => "\u{F729}".into(),
+            Key::End => "\u{F72B}".into(),
+            Key::PageUp => "\u{F72C}".into(),
+            Key::PageDown => "\u{F72D}".into(),
+            Key::PrintScreen => "\u{F72E}".into(),
+            Key::ScrollLock => "\u{F72F}".into(),
+            Key::ArrowUp => "\u{F700}".into(),
+            Key::ArrowDown => "\u{F701}".into(),
+            Key::ArrowLeft => "\u{F702}".into(),
+            Key::ArrowRight => "\u{F703}".into(),
+            Key::F1 => "\u{F704}".into(),
+            Key::F2 => "\u{F705}".into(),
+            Key::F3 => "\u{F706}".into(),
+            Key::F4 => "\u{F707}".into(),
+            Key::F5 => "\u{F708}".into(),
+            Key::F6 => "\u{F709}".into(),
+            Key::F7 => "\u{F70A}".into(),
+            Key::F8 => "\u{F70B}".into(),
+            Key::F9 => "\u{F70C}".into(),
+            Key::F10 => "\u{F70D}".into(),
+            Key::F11 => "\u{F70E}".into(),
+            Key::F12 => "\u{F70F}".into(),
+            Key::F13 => "\u{F710}".into(),
+            Key::F14 => "\u{F711}".into(),
+            Key::F15 => "\u{F712}".into(),
+            Key::F16 => "\u{F713}".into(),
+            Key::F17 => "\u{F714}".into(),
+            Key::F18 => "\u{F715}".into(),
+            Key::F19 => "\u{F716}".into(),
+            Key::F20 => "\u{F717}".into(),
+            Key::F21 => "\u{F718}".into(),
+            Key::F22 => "\u{F719}".into(),
+            Key::F23 => "\u{F71A}".into(),
+            Key::F24 => "\u{F71B}".into(),
+            key => return Err(AcceleratorParseError::UnsupportedKey(format!("{:?}", key))),
+        })
+    }
+
+    /// Return the modifiers of this hotkey, as an NSEventModifierFlags bitflag.
+    pub(crate) fn modifier_mask(&self) -> NSEventModifierFlags {
+        let mut flags = NSEventModifierFlags::empty();
+        if self.mods.contains(Modifiers::SHIFT) {
+            flags.insert(NSEventModifierFlags::Shift);
+        }
+        if self.mods.contains(Modifiers::SUPER) {
+            flags.insert(NSEventModifierFlags::Command);
+        }
+        if self.mods.contains(Modifiers::ALT) {
+            flags.insert(NSEventModifierFlags::Option);
+        }
+        if self.mods.contains(Modifiers::CONTROL) {
+            flags.insert(NSEventModifierFlags::Control);
+        }
+        flags
+    }
+}
diff --git a/ports/muda/src/platform_impl/macos/icon.rs b/ports/muda/src/platform_impl/macos/icon.rs
new file mode 100644
index 000000000000..3ba0bfb1cb99
--- /dev/null
+++ b/ports/muda/src/platform_impl/macos/icon.rs
@@ -0,0 +1,68 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use objc2::{rc::Retained, AllocAnyThread};
+use objc2_app_kit::NSImage;
+use objc2_core_foundation::CGFloat;
+use objc2_foundation::{NSData, NSSize};
+
+use crate::icon::{BadIcon, RgbaIcon};
+use std::io::Cursor;
+
+#[derive(Debug, Clone)]
+pub struct PlatformIcon(RgbaIcon);
+
+impl PlatformIcon {
+    pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
+        Ok(PlatformIcon(RgbaIcon::from_rgba(rgba, width, height)?))
+    }
+
+    pub fn get_size(&self) -> (u32, u32) {
+        (self.0.width, self.0.height)
+    }
+
+    pub fn to_png(&self) -> Vec<u8> {
+        let mut png = Vec::new();
+
+        {
+            let mut encoder =
+                png::Encoder::new(Cursor::new(&mut png), self.0.width as _, self.0.height as _);
+            encoder.set_color(png::ColorType::Rgba);
+            encoder.set_depth(png::BitDepth::Eight);
+
+            let mut writer = encoder.write_header().unwrap();
+            writer.write_image_data(&self.0.rgba).unwrap();
+        }
+
+        png
+    }
+
+    pub fn to_nsimage(&self, fixed_height: Option<f64>) -> Retained<NSImage> {
+        let (width, height) = self.get_size();
+        let icon = self.to_png();
+
+        let (icon_width, icon_height) = match fixed_height {
+            Some(fixed_height) => {
+                let icon_height: CGFloat = fixed_height as CGFloat;
+                let icon_width: CGFloat = (width as CGFloat) / (height as CGFloat / icon_height);
+
+                (icon_width, icon_height)
+            }
+
+            None => (width as CGFloat, height as CGFloat),
+        };
+
+        let nsdata = NSData::with_bytes(&icon);
+
+        let nsimage = NSImage::initWithData(NSImage::alloc(), &nsdata).unwrap();
+        let new_size = NSSize::new(icon_width, icon_height);
+        unsafe { nsimage.setSize(new_size) };
+
+        nsimage
+    }
+}
diff --git a/ports/muda/src/platform_impl/macos/mod.rs b/ports/muda/src/platform_impl/macos/mod.rs
new file mode 100644
index 000000000000..d40204fc5af7
--- /dev/null
+++ b/ports/muda/src/platform_impl/macos/mod.rs
@@ -0,0 +1,1287 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+mod accelerator;
+mod icon;
+mod util;
+
+pub(crate) use icon::PlatformIcon;
+
+use std::{
+    cell::{Cell, RefCell},
+    collections::HashMap,
+    ffi::c_void,
+    ptr,
+    rc::Rc,
+};
+
+use objc2::{
+    define_class, msg_send,
+    rc::Retained,
+    runtime::{AnyObject, NSObjectProtocol, ProtocolObject, Sel},
+    sel, DeclaredClass, MainThreadOnly, Message,
+};
+use objc2_app_kit::{
+    NSAboutPanelOptionApplicationIcon, NSAboutPanelOptionApplicationName,
+    NSAboutPanelOptionApplicationVersion, NSAboutPanelOptionCredits, NSAboutPanelOptionVersion,
+    NSApplication, NSControlStateValueOff, NSControlStateValueOn, NSEvent, NSEventModifierFlags,
+    NSImage, NSImageName, NSMenu, NSMenuDelegate, NSMenuItem, NSRunningApplication, NSView,
+};
+use objc2_foundation::{
+    ns_string, MainThreadMarker, NSAttributedString, NSDictionary, NSInteger, NSObject, NSPoint,
+    NSSize, NSString,
+};
+
+use self::util::strip_mnemonic;
+use crate::{
+    accelerator::KeyAccelerator,
+    dpi::{LogicalPosition, Position},
+    icon::{Icon, NativeIcon},
+    items::*,
+    util::{AddOp, Counter},
+    IsMenuItem, MenuEvent, MenuId, MenuItemKind, MenuItemType,
+};
+
+static COUNTER: Counter = Counter::new();
+
+/// https://developer.apple.com/documentation/appkit/nsapplication/1428479-orderfrontstandardaboutpanelwith#discussion
+#[allow(non_upper_case_globals)]
+const NSAboutPanelOptionCopyright: &str = "Copyright";
+
+define_class!(
+    /// A delegate for NSMenu that stores the menu id as an instance variable,
+    /// so that we can identify it later. Like when calling `set_as_windows_menu_for_nsapp`.
+    #[unsafe(super(NSObject))]
+    #[name = "MudaMenuDelegate"]
+    #[thread_kind = MainThreadOnly]
+    #[ivars = u32]
+    struct MudaMenuDelegate;
+
+    unsafe impl NSObjectProtocol for MudaMenuDelegate {}
+    unsafe impl NSMenuDelegate for MudaMenuDelegate {}
+);
+
+impl MudaMenuDelegate {
+    fn new(mtm: MainThreadMarker, menu_id: u32) -> Retained<Self> {
+        let this = mtm.alloc().set_ivars(menu_id);
+        unsafe { msg_send![super(this), init] }
+    }
+
+    fn menu_id(&self) -> u32 {
+        *self.ivars()
+    }
+}
+
+#[derive(Clone)]
+struct NsMenuRef(
+    u32,
+    Retained<NSMenu>,
+    /// Prevent deallocation — NSMenu's delegate is a weak reference.
+    #[allow(dead_code)]
+    Retained<MudaMenuDelegate>,
+);
+
+impl NsMenuRef {
+    fn new(mtm: MainThreadMarker, id: u32, ns_menu: Retained<NSMenu>) -> Self {
+        let delegate = MudaMenuDelegate::new(mtm, id);
+        unsafe {
+            ns_menu.setDelegate(Some(ProtocolObject::from_ref(&*delegate)));
+        }
+        Self(id, ns_menu, delegate)
+    }
+}
+
+impl std::fmt::Debug for NsMenuRef {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_tuple("NsMenuRef")
+            .field(&self.0)
+            .field(&self.1)
+            .finish()
+    }
+}
+
+impl Drop for NsMenuRef {
+    fn drop(&mut self) {
+        unsafe { self.1.cancelTrackingWithoutAnimation() };
+    }
+}
+
+#[derive(Debug)]
+pub struct Menu {
+    id: MenuId,
+    ns_menu: NsMenuRef,
+    children: Vec<Rc<RefCell<MenuChild>>>,
+}
+
+impl Drop for Menu {
+    fn drop(&mut self) {
+        for child in &self.children {
+            let mut child_ = child.borrow_mut();
+            child_.ns_menu_items.remove(&self.ns_menu.0);
+            if child_.item_type == MenuItemType::Submenu {
+                child_.ns_menus.as_mut().unwrap().remove(&self.ns_menu.0);
+            }
+        }
+    }
+}
+
+impl Menu {
+    pub fn new(id: Option<MenuId>) -> Self {
+        let mtm =
+            MainThreadMarker::new().expect("`muda::Menu` can only be created on the main thread");
+        let ns_menu = NSMenu::new(mtm);
+        unsafe { ns_menu.setAutoenablesItems(false) };
+        Self {
+            id: id.unwrap_or_else(|| MenuId(COUNTER.next().to_string())),
+            ns_menu: NsMenuRef::new(mtm, COUNTER.next(), ns_menu),
+            children: Vec::new(),
+        }
+    }
+
+    pub fn id(&self) -> &MenuId {
+        &self.id
+    }
+
+    pub fn add_menu_item(&mut self, item: &dyn crate::IsMenuItem, op: AddOp) -> crate::Result<()> {
+        let ns_menu_item = item.make_ns_item_for_menu(self.ns_menu.0)?;
+        let child = item.child();
+
+        unsafe {
+            match op {
+                AddOp::Append => {
+                    self.ns_menu.1.addItem(&ns_menu_item);
+                    self.children.push(child);
+                }
+                AddOp::Insert(position) => {
+                    self.ns_menu
+                        .1
+                        .insertItem_atIndex(&ns_menu_item, position as NSInteger);
+                    self.children.insert(position, child);
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn remove(&mut self, item: &dyn crate::IsMenuItem) -> crate::Result<()> {
+        // get child
+        let child = {
+            let index = self
+                .children
+                .iter()
+                .position(|e| e.borrow().id == item.id())
+                .ok_or(crate::Error::NotAChildOfThisMenu)?;
+            self.children.remove(index)
+        };
+
+        let mut child_ = child.borrow_mut();
+
+        if child_.item_type == MenuItemType::Submenu {
+            let menu_id = &self.ns_menu.0;
+            let menus = child_.ns_menus.as_ref().unwrap().get(menu_id).cloned();
+            if let Some(menus) = menus {
+                for menu in menus {
+                    for item in child_.items() {
+                        child_.remove_inner(item.as_ref(), false, Some(menu.0))?;
+                    }
+                }
+            }
+            child_.ns_menus.as_mut().unwrap().remove(menu_id);
+        }
+
+        // remove each NSMenuItem from the NSMenu
+        if let Some(ns_menu_items) = child_.ns_menu_items.remove(&self.ns_menu.0) {
+            for item in ns_menu_items {
+                unsafe { self.ns_menu.1.removeItem(&item) };
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn items(&self) -> Vec<MenuItemKind> {
+        self.children
+            .iter()
+            .map(|c| c.borrow().kind(c.clone()))
+            .collect()
+    }
+
+    pub fn init_for_nsapp(&self) {
+        let mtm = MainThreadMarker::from(&*self.ns_menu.1);
+        let app = NSApplication::sharedApplication(mtm);
+        app.setMainMenu(Some(&self.ns_menu.1));
+    }
+
+    pub fn remove_for_nsapp(&self) {
+        let mtm = MainThreadMarker::from(&*self.ns_menu.1);
+        let app = NSApplication::sharedApplication(mtm);
+        app.setMainMenu(None);
+    }
+
+    pub unsafe fn show_context_menu_for_nsview(
+        &self,
+        view: *const c_void,
+        position: Option<Position>,
+    ) -> bool {
+        // SAFETY: Upheld by caller
+        show_context_menu(&self.ns_menu.1, view, position)
+    }
+
+    pub fn ns_menu(&self) -> *mut std::ffi::c_void {
+        Retained::as_ptr(&self.ns_menu.1) as _
+    }
+}
+
+/// A generic child in a menu
+#[derive(Debug, Default)]
+pub struct MenuChild {
+    // shared fields between submenus and menu items
+    item_type: MenuItemType,
+    id: MenuId,
+    text: String,
+    enabled: bool,
+
+    ns_menu_items: HashMap<u32, Vec<Retained<NSMenuItem>>>,
+
+    // menu item fields
+    key_accelerator: Option<KeyAccelerator>,
+
+    // predefined menu item fields
+    predefined_item_type: Option<PredefinedMenuItemType>,
+
+    // check menu item fields
+    checked: Cell<bool>,
+
+    // icon menu item fields
+    icon: Option<Icon>,
+    native_icon: Option<NativeIcon>,
+
+    // submenu fields
+    pub children: Option<Vec<Rc<RefCell<MenuChild>>>>,
+    ns_menus: Option<HashMap<u32, Vec<NsMenuRef>>>,
+    ns_menu: Option<NsMenuRef>,
+}
+
+impl Drop for MenuChild {
+    fn drop(&mut self) {
+        fn drop_children(id: u32, children: &Vec<Rc<RefCell<MenuChild>>>) {
+            for child in children {
+                let mut child_ = child.borrow_mut();
+                child_.ns_menu_items.remove(&id);
+
+                if child_.item_type == MenuItemType::Submenu {
+                    if let Some(menus) = child_.ns_menus.as_mut().unwrap().remove(&id) {
+                        for menu in menus {
+                            drop_children(menu.0, child_.children.as_ref().unwrap());
+                        }
+                    }
+                }
+            }
+        }
+
+        if self.item_type == MenuItemType::Submenu {
+            for menus in self.ns_menus.as_ref().unwrap().values() {
+                for menu in menus {
+                    drop_children(menu.0, self.children.as_ref().unwrap())
+                }
+            }
+
+            if let Some(menu) = &self.ns_menu {
+                drop_children(menu.0, self.children.as_ref().unwrap());
+            }
+        }
+    }
+}
+
+/// Constructors
+impl MenuChild {
+    pub fn new(
+        text: &str,
+        enabled: bool,
+        key_accelerator: Option<KeyAccelerator>,
+        id: Option<MenuId>,
+    ) -> Self {
+        Self {
+            item_type: MenuItemType::MenuItem,
+            text: strip_mnemonic(text),
+            enabled,
+            id: id.unwrap_or_else(|| MenuId(COUNTER.next().to_string())),
+            key_accelerator,
+            checked: Cell::new(false),
+            children: None,
+            icon: None,
+            native_icon: None,
+            ns_menu: None,
+            ns_menu_items: HashMap::new(),
+            ns_menus: None,
+            predefined_item_type: None,
+        }
+    }
+
+    pub fn new_submenu(text: &str, enabled: bool, id: Option<MenuId>) -> Self {
+        let mtm = if cfg!(test) {
+            unsafe { MainThreadMarker::new_unchecked() }
+        } else {
+            MainThreadMarker::new()
+                .expect("`muda::MenuChild` can only be created on the main thread")
+        };
+        Self {
+            item_type: MenuItemType::Submenu,
+            text: strip_mnemonic(text),
+            id: id.unwrap_or_else(|| MenuId(COUNTER.next().to_string())),
+            enabled,
+            children: Some(Vec::new()),
+            ns_menu: Some({
+                let menu = NSMenu::new(mtm);
+                unsafe { menu.setAutoenablesItems(false) };
+                NsMenuRef::new(mtm, COUNTER.next(), menu)
+            }),
+            key_accelerator: None,
+            checked: Cell::new(false),
+            icon: None,
+            native_icon: None,
+            ns_menu_items: HashMap::new(),
+            ns_menus: Some(HashMap::new()),
+            predefined_item_type: None,
+        }
+    }
+
+    pub(crate) fn new_predefined(item_type: PredefinedMenuItemType, text: Option<String>) -> Self {
+        let text = strip_mnemonic(text.unwrap_or_else(|| {
+            // Gets the app's name from `NSRunningApplication::localizedName`.
+            let app_name = || unsafe {
+                let app = NSRunningApplication::currentApplication();
+                app.localizedName().unwrap_or_default()
+            };
+
+            match item_type {
+                PredefinedMenuItemType::About(_) => {
+                    format!("About {}", app_name()).trim().to_string()
+                }
+                PredefinedMenuItemType::Hide => format!("Hide {}", app_name()).trim().to_string(),
+                PredefinedMenuItemType::Quit => format!("Quit {}", app_name()).trim().to_string(),
+                _ => item_type.text().to_string(),
+            }
+        }));
+
+        Self {
+            item_type: MenuItemType::Predefined,
+            text,
+            enabled: true,
+            id: MenuId(COUNTER.next().to_string()),
+            key_accelerator: item_type.accelerator().map(KeyAccelerator::from),
+            predefined_item_type: Some(item_type),
+            checked: Cell::new(false),
+            children: None,
+            icon: None,
+            native_icon: None,
+            ns_menu: None,
+            ns_menu_items: HashMap::new(),
+            ns_menus: None,
+        }
+    }
+
+    pub fn new_check(
+        text: &str,
+        enabled: bool,
+        checked: bool,
+        key_accelerator: Option<KeyAccelerator>,
+        id: Option<MenuId>,
+    ) -> Self {
+        Self {
+            item_type: MenuItemType::Check,
+            text: text.to_string(),
+            enabled,
+            id: id.unwrap_or_else(|| MenuId(COUNTER.next().to_string())),
+            key_accelerator,
+            checked: Cell::new(checked),
+            children: None,
+            icon: None,
+            native_icon: None,
+            ns_menu: None,
+            ns_menu_items: HashMap::new(),
+            ns_menus: None,
+            predefined_item_type: None,
+        }
+    }
+
+    pub fn new_icon(
+        text: &str,
+        enabled: bool,
+        icon: Option<Icon>,
+        key_accelerator: Option<KeyAccelerator>,
+        id: Option<MenuId>,
+    ) -> Self {
+        Self {
+            item_type: MenuItemType::Icon,
+            text: text.to_string(),
+            enabled,
+            id: id.unwrap_or_else(|| MenuId(COUNTER.next().to_string())),
+            icon,
+            key_accelerator,
+            checked: Cell::new(false),
+            children: None,
+            native_icon: None,
+            ns_menu: None,
+            ns_menu_items: HashMap::new(),
+            ns_menus: None,
+            predefined_item_type: None,
+        }
+    }
+
+    pub fn new_native_icon(
+        text: &str,
+        enabled: bool,
+        native_icon: Option<NativeIcon>,
+        key_accelerator: Option<KeyAccelerator>,
+        id: Option<MenuId>,
+    ) -> Self {
+        Self {
+            item_type: MenuItemType::Icon,
+            text: text.to_string(),
+            enabled,
+            id: id.unwrap_or_else(|| MenuId(COUNTER.next().to_string())),
+            native_icon,
+            key_accelerator,
+            checked: Cell::new(false),
+            children: None,
+            icon: None,
+            ns_menu: None,
+            ns_menu_items: HashMap::new(),
+            ns_menus: None,
+            predefined_item_type: None,
+        }
+    }
+}
+
+/// Shared methods
+impl MenuChild {
+    pub(crate) fn item_type(&self) -> MenuItemType {
+        self.item_type
+    }
+
+    pub fn id(&self) -> &MenuId {
+        &self.id
+    }
+
+    pub fn text(&self) -> String {
+        self.text.clone()
+    }
+
+    pub fn set_text(&mut self, text: &str) {
+        self.text = strip_mnemonic(text);
+        unsafe {
+            let title = NSString::from_str(&self.text);
+            for ns_items in self.ns_menu_items.values() {
+                for ns_item in ns_items {
+                    ns_item.setTitle(&title);
+                    if let Some(submenu) = ns_item.submenu() {
+                        submenu.setTitle(&title);
+                    }
+                }
+            }
+        }
+    }
+
+    pub fn is_enabled(&self) -> bool {
+        self.enabled
+    }
+
+    pub fn set_enabled(&mut self, enabled: bool) {
+        self.enabled = enabled;
+        for ns_items in self.ns_menu_items.values() {
+            for ns_item in ns_items {
+                unsafe { ns_item.setEnabled(enabled) };
+            }
+        }
+    }
+
+    pub fn set_key_accelerator(
+        &mut self,
+        key_accelerator: Option<KeyAccelerator>,
+    ) -> crate::Result<()> {
+        let key_equivalent = key_accelerator
+            .as_ref()
+            .map(KeyAccelerator::key_equivalent)
+            .transpose()?;
+
+        if let Some(key_equivalent) = key_equivalent {
+            let key_equivalent = NSString::from_str(key_equivalent.as_str());
+
+            let modifier_mask = key_accelerator
+                .as_ref()
+                .map(KeyAccelerator::modifier_mask)
+                .unwrap_or_else(NSEventModifierFlags::empty);
+
+            for ns_items in self.ns_menu_items.values() {
+                for ns_item in ns_items {
+                    unsafe {
+                        ns_item.setKeyEquivalent(&key_equivalent);
+                        ns_item.setKeyEquivalentModifierMask(modifier_mask);
+                    }
+                }
+            }
+        }
+
+        self.key_accelerator = key_accelerator;
+
+        Ok(())
+    }
+}
+
+/// CheckMenuItem methods
+impl MenuChild {
+    pub fn is_checked(&self) -> bool {
+        self.checked.get()
+    }
+
+    pub fn set_checked(&self, checked: bool) {
+        self.checked.set(checked);
+        let state = if checked {
+            NSControlStateValueOn
+        } else {
+            NSControlStateValueOff
+        };
+        for ns_items in self.ns_menu_items.values() {
+            for ns_item in ns_items {
+                unsafe {
+                    ns_item.setState(state);
+                }
+            }
+        }
+    }
+}
+
+/// IconMenuItem methods
+impl MenuChild {
+    pub fn set_icon(&mut self, icon: Option<Icon>) {
+        self.icon.clone_from(&icon);
+        self.native_icon = None;
+        for ns_items in self.ns_menu_items.values() {
+            for ns_item in ns_items {
+                menuitem_set_icon(ns_item, icon.as_ref());
+            }
+        }
+    }
+
+    pub fn set_native_icon(&mut self, icon: Option<NativeIcon>) {
+        self.native_icon = icon;
+        self.icon = None;
+        for ns_items in self.ns_menu_items.values() {
+            for ns_item in ns_items {
+                menuitem_set_native_icon(ns_item, icon);
+            }
+        }
+    }
+}
+
+/// Submenu methods
+impl MenuChild {
+    pub fn add_menu_item(&mut self, item: &dyn crate::IsMenuItem, op: AddOp) -> crate::Result<()> {
+        let child = item.child();
+
+        unsafe {
+            match op {
+                AddOp::Append => {
+                    for menus in self.ns_menus.as_ref().unwrap().values() {
+                        for ns_menu in menus {
+                            let ns_menu_item = item.make_ns_item_for_menu(ns_menu.0)?;
+                            ns_menu.1.addItem(&ns_menu_item);
+                        }
+                    }
+
+                    let ns_menu_item =
+                        item.make_ns_item_for_menu(self.ns_menu.as_ref().unwrap().0)?;
+                    self.ns_menu.as_ref().unwrap().1.addItem(&ns_menu_item);
+
+                    self.children.as_mut().unwrap().push(child);
+                }
+                AddOp::Insert(position) => {
+                    for menus in self.ns_menus.as_ref().unwrap().values() {
+                        for ns_menu in menus {
+                            let ns_menu_item = item.make_ns_item_for_menu(ns_menu.0)?;
+                            ns_menu
+                                .1
+                                .insertItem_atIndex(&ns_menu_item, position as NSInteger);
+                        }
+                    }
+
+                    let ns_menu_item =
+                        item.make_ns_item_for_menu(self.ns_menu.as_ref().unwrap().0)?;
+                    self.ns_menu
+                        .as_ref()
+                        .unwrap()
+                        .1
+                        .insertItem_atIndex(&ns_menu_item, position as NSInteger);
+
+                    self.children.as_mut().unwrap().insert(position, child);
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn remove(&mut self, item: &dyn crate::IsMenuItem) -> crate::Result<()> {
+        self.remove_inner(item, true, None)
+    }
+    pub fn remove_inner(
+        &mut self,
+        item: &dyn crate::IsMenuItem,
+        remove_from_cache: bool,
+        id: Option<u32>,
+    ) -> crate::Result<()> {
+        // get child
+        let child = {
+            let index = self
+                .children
+                .as_ref()
+                .unwrap()
+                .iter()
+                .position(|e| e.borrow().id == item.id())
+                .ok_or(crate::Error::NotAChildOfThisMenu)?;
+            if remove_from_cache {
+                self.children.as_mut().unwrap().remove(index)
+            } else {
+                self.children.as_ref().unwrap().get(index).cloned().unwrap()
+            }
+        };
+
+        for menus in self.ns_menus.as_ref().unwrap().values() {
+            for menu in menus {
+                // check if we are removing this item from all ns_menus
+                //      which is usually when this is the item the user is actually removing
+                // or if we are removing from a specific menu (id)
+                //      which is when the actual item being removed is a submenu
+                //      and we are iterating through its children and removing
+                //      each child ns menu item that are related to this submenu.
+                if id.map(|i| i == menu.0).unwrap_or(true) {
+                    let mut child_ = child.borrow_mut();
+
+                    if child_.item_type == MenuItemType::Submenu {
+                        let menus = child_.ns_menus.as_ref().unwrap().get(&menu.0).cloned();
+                        if let Some(menus) = menus {
+                            for menu in menus {
+                                // iterate through children and only remove the ns menu items
+                                // related to this submenu
+                                for item in child_.items() {
+                                    child_.remove_inner(item.as_ref(), false, Some(menu.0))?;
+                                }
+                            }
+                        }
+                        child_.ns_menus.as_mut().unwrap().remove(&menu.0);
+                    }
+
+                    if let Some(items) = child_.ns_menu_items.remove(&menu.0) {
+                        for item in items {
+                            unsafe { menu.1.removeItem(&item) };
+                        }
+                    }
+                }
+            }
+        }
+
+        if remove_from_cache {
+            if let Some(ns_menu_items) = child
+                .borrow_mut()
+                .ns_menu_items
+                .remove(&self.ns_menu.as_ref().unwrap().0)
+            {
+                for item in ns_menu_items {
+                    unsafe { self.ns_menu.as_ref().unwrap().1.removeItem(&item) };
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn items(&self) -> Vec<MenuItemKind> {
+        self.children
+            .as_ref()
+            .unwrap()
+            .iter()
+            .map(|c| c.borrow().kind(c.clone()))
+            .collect()
+    }
+
+    pub unsafe fn show_context_menu_for_nsview(
+        &self,
+        view: *const c_void,
+        position: Option<Position>,
+    ) -> bool {
+        show_context_menu(&self.ns_menu.as_ref().unwrap().1, view, position)
+    }
+
+    pub fn set_as_windows_menu_for_nsapp(&self) {
+        let Some(menu) = self.resolve_ns_menu_for_nsapp() else {
+            return;
+        };
+
+        let mtm = MainThreadMarker::from(&*menu);
+        let app = NSApplication::sharedApplication(mtm);
+        unsafe { app.setWindowsMenu(Some(&menu)) }
+    }
+
+    pub fn set_as_help_menu_for_nsapp(&self) {
+        let Some(menu) = self.resolve_ns_menu_for_nsapp() else {
+            return;
+        };
+
+        let mtm = MainThreadMarker::from(&*menu);
+        let app = NSApplication::sharedApplication(mtm);
+        unsafe { app.setHelpMenu(Some(&menu)) }
+    }
+
+    /// Finds the NSMenu instance for this submenu that is attached to the
+    /// current NSApp main menu, by reading the menu id stored in the
+    /// main menu's delegate.
+    fn resolve_ns_menu_for_nsapp(&self) -> Option<Retained<NSMenu>> {
+        let ns_menu = &self.ns_menu.as_ref().unwrap().1;
+        let mtm = MainThreadMarker::from(&**ns_menu);
+        let app = NSApplication::sharedApplication(mtm);
+        let main_menu = unsafe { app.mainMenu()? };
+        let delegate = unsafe { main_menu.delegate()? };
+
+        // Downcast the delegate to our MudaMenuDelegate to get the menu id
+        let delegate_obj: &AnyObject = ProtocolObject::as_ref(&*delegate);
+        let muda_delegate: &MudaMenuDelegate = delegate_obj.downcast_ref()?;
+        let parent_id = muda_delegate.menu_id();
+
+        // Look up the NSMenu in ns_menus for this parent id
+        self.ns_menus
+            .as_ref()
+            .unwrap()
+            .get(&parent_id)
+            // A submenu can be added multiple times to the same parent menu
+            // lets just take the first one we find
+            .and_then(|menus| menus.first())
+            .map(|menu_ref| menu_ref.1.clone())
+    }
+
+    pub fn ns_menu(&self) -> *mut std::ffi::c_void {
+        Retained::as_ptr(&self.ns_menu.as_ref().unwrap().1) as *mut _
+    }
+}
+
+/// NSMenuItem item creation methods
+impl MenuChild {
+    pub fn create_ns_item_for_submenu(
+        &mut self,
+        menu_id: u32,
+    ) -> crate::Result<Retained<NSMenuItem>> {
+        let mtm = MainThreadMarker::new().expect("can only create menu item on the main thread");
+        let ns_menu_item;
+        let ns_submenu;
+
+        let title = NSString::from_str(&self.text);
+        unsafe {
+            ns_menu_item = NSMenuItem::initWithTitle_action_keyEquivalent(
+                mtm.alloc(),
+                &title,
+                None,
+                &NSString::new(),
+            );
+            ns_submenu = NSMenu::new(mtm);
+            ns_submenu.setTitle(&title);
+
+            ns_menu_item.setSubmenu(Some(&ns_submenu));
+            ns_submenu.setAutoenablesItems(false);
+
+            ns_menu_item.setEnabled(self.enabled);
+
+            if let Some(native_icon) = self.native_icon {
+                menuitem_set_native_icon(&ns_menu_item, Some(native_icon));
+            }
+
+            if let Some(icon) = self.icon.as_ref() {
+                menuitem_set_icon(&ns_menu_item, Some(icon));
+            }
+        }
+
+        let id = COUNTER.next();
+
+        for item in self.children.as_ref().unwrap() {
+            let ns_item = item.borrow_mut().make_ns_item_for_menu(id)?;
+            ns_submenu.addItem(&ns_item);
+        }
+
+        self.ns_menus
+            .as_mut()
+            .unwrap()
+            .entry(menu_id)
+            .or_default()
+            .push(NsMenuRef::new(mtm, id, ns_submenu));
+
+        self.ns_menu_items
+            .entry(menu_id)
+            .or_default()
+            .push(ns_menu_item.retain());
+
+        Ok(ns_menu_item)
+    }
+
+    pub fn create_ns_item_for_menu_item(
+        &mut self,
+        menu_id: u32,
+    ) -> crate::Result<Retained<NSMenuItem>> {
+        let mtm = MainThreadMarker::new().expect("can only create menu item on the main thread");
+        let ns_menu_item = MenuItem::create(
+            mtm,
+            &self.text,
+            Some(sel!(fireMenuItemAction:)),
+            &self.key_accelerator,
+        )?;
+
+        unsafe {
+            ns_menu_item.setTarget(Some(&ns_menu_item));
+
+            // Store a raw pointer to the `MenuChild` as an instance variable on the native menu item
+            ns_menu_item.ivars().set(&*self);
+
+            ns_menu_item.setEnabled(self.enabled);
+        }
+
+        self.ns_menu_items
+            .entry(menu_id)
+            .or_default()
+            .push(Retained::into_super(ns_menu_item.retain()));
+
+        Ok(Retained::into_super(ns_menu_item))
+    }
+
+    pub fn create_ns_item_for_predefined_menu_item(
+        &mut self,
+        menu_id: u32,
+    ) -> crate::Result<Retained<NSMenuItem>> {
+        let mtm = MainThreadMarker::new().expect("can only create menu item on the main thread");
+        let item_type = self.predefined_item_type.as_ref().unwrap();
+        let ns_menu_item = match item_type {
+            PredefinedMenuItemType::Separator => NSMenuItem::separatorItem(mtm),
+            _ => {
+                let ns_menu_item =
+                    MenuItem::create(mtm, &self.text, item_type.selector(), &self.key_accelerator)?;
+
+                if let PredefinedMenuItemType::About(_) = item_type {
+                    unsafe {
+                        ns_menu_item.setTarget(Some(&ns_menu_item));
+
+                        // Store a raw pointer to the `MenuChild` as an instance variable on the native menu item
+                        ns_menu_item.ivars().set(&*self);
+                    }
+                }
+
+                Retained::into_super(ns_menu_item)
+            }
+        };
+
+        unsafe {
+            ns_menu_item.setEnabled(self.enabled);
+
+            if let PredefinedMenuItemType::Services = item_type {
+                // we have to assign an empty menu as the app's services menu, and macOS will populate it
+                let services_menu = NSMenu::new(mtm);
+                NSApplication::sharedApplication(mtm).setServicesMenu(Some(&services_menu));
+                ns_menu_item.setSubmenu(Some(&services_menu));
+            }
+        }
+
+        self.ns_menu_items
+            .entry(menu_id)
+            .or_default()
+            .push(ns_menu_item.retain());
+
+        Ok(ns_menu_item)
+    }
+
+    pub fn create_ns_item_for_check_menu_item(
+        &mut self,
+        menu_id: u32,
+    ) -> crate::Result<Retained<NSMenuItem>> {
+        let mtm = MainThreadMarker::new().expect("can only create menu item on the main thread");
+        let ns_menu_item = MenuItem::create(
+            mtm,
+            &self.text,
+            Some(sel!(fireMenuItemAction:)),
+            &self.key_accelerator,
+        )?;
+
+        unsafe {
+            ns_menu_item.setTarget(Some(&ns_menu_item));
+
+            // Store a raw pointer to the `MenuChild` as an instance variable on the native menu item
+            ns_menu_item.ivars().set(&*self);
+
+            ns_menu_item.setEnabled(self.enabled);
+            if self.checked.get() {
+                ns_menu_item.setState(NSControlStateValueOn);
+            }
+        }
+
+        self.ns_menu_items
+            .entry(menu_id)
+            .or_default()
+            .push(Retained::into_super(ns_menu_item.retain()));
+
+        Ok(Retained::into_super(ns_menu_item))
+    }
+
+    pub fn create_ns_item_for_icon_menu_item(
+        &mut self,
+        menu_id: u32,
+    ) -> crate::Result<Retained<NSMenuItem>> {
+        let mtm = MainThreadMarker::new().expect("can only create menu item on the main thread");
+        let ns_menu_item = MenuItem::create(
+            mtm,
+            &self.text,
+            Some(sel!(fireMenuItemAction:)),
+            &self.key_accelerator,
+        )?;
+
+        unsafe {
+            ns_menu_item.setTarget(Some(&ns_menu_item));
+
+            // Store a raw pointer to the `MenuChild` as an instance variable on the native menu item
+            ns_menu_item.ivars().set(&*self);
+
+            ns_menu_item.setEnabled(self.enabled);
+
+            if self.icon.is_some() {
+                menuitem_set_icon(&ns_menu_item, self.icon.as_ref());
+            } else if self.native_icon.is_some() {
+                menuitem_set_native_icon(&ns_menu_item, self.native_icon);
+            }
+        }
+
+        self.ns_menu_items
+            .entry(menu_id)
+            .or_default()
+            .push(Retained::into_super(ns_menu_item.retain()));
+
+        Ok(Retained::into_super(ns_menu_item))
+    }
+
+    fn make_ns_item_for_menu(&mut self, menu_id: u32) -> crate::Result<Retained<NSMenuItem>> {
+        match self.item_type {
+            MenuItemType::Submenu => self.create_ns_item_for_submenu(menu_id),
+            MenuItemType::MenuItem => self.create_ns_item_for_menu_item(menu_id),
+            MenuItemType::Predefined => self.create_ns_item_for_predefined_menu_item(menu_id),
+            MenuItemType::Check => self.create_ns_item_for_check_menu_item(menu_id),
+            MenuItemType::Icon => self.create_ns_item_for_icon_menu_item(menu_id),
+        }
+    }
+}
+
+impl PredefinedMenuItemType {
+    pub(crate) fn selector(&self) -> Option<Sel> {
+        match self {
+            PredefinedMenuItemType::Separator => None,
+            PredefinedMenuItemType::Copy => Some(sel!(copy:)),
+            PredefinedMenuItemType::Cut => Some(sel!(cut:)),
+            PredefinedMenuItemType::Paste => Some(sel!(paste:)),
+            PredefinedMenuItemType::SelectAll => Some(sel!(selectAll:)),
+            PredefinedMenuItemType::Undo => Some(sel!(undo:)),
+            PredefinedMenuItemType::Redo => Some(sel!(redo:)),
+            PredefinedMenuItemType::Minimize => Some(sel!(performMiniaturize:)),
+            PredefinedMenuItemType::Maximize => Some(sel!(performZoom:)),
+            PredefinedMenuItemType::Fullscreen => Some(sel!(toggleFullScreen:)),
+            PredefinedMenuItemType::Hide => Some(sel!(hide:)),
+            PredefinedMenuItemType::HideOthers => Some(sel!(hideOtherApplications:)),
+            PredefinedMenuItemType::ShowAll => Some(sel!(unhideAllApplications:)),
+            PredefinedMenuItemType::CloseWindow => Some(sel!(performClose:)),
+            PredefinedMenuItemType::Quit => Some(sel!(terminate:)),
+            // manual implementation in `fire_menu_item_click`
+            PredefinedMenuItemType::About(_) => Some(sel!(fireMenuItemAction:)),
+            PredefinedMenuItemType::Services => None,
+            PredefinedMenuItemType::BringAllToFront => Some(sel!(arrangeInFront:)),
+            PredefinedMenuItemType::None => None,
+        }
+    }
+}
+
+impl dyn IsMenuItem + '_ {
+    fn make_ns_item_for_menu(&self, menu_id: u32) -> crate::Result<Retained<NSMenuItem>> {
+        match self.kind() {
+            MenuItemKind::Submenu(i) => i.inner.borrow_mut().create_ns_item_for_submenu(menu_id),
+            MenuItemKind::MenuItem(i) => i.inner.borrow_mut().create_ns_item_for_menu_item(menu_id),
+            MenuItemKind::Predefined(i) => i
+                .inner
+                .borrow_mut()
+                .create_ns_item_for_predefined_menu_item(menu_id),
+            MenuItemKind::Check(i) => i
+                .inner
+                .borrow_mut()
+                .create_ns_item_for_check_menu_item(menu_id),
+            MenuItemKind::Icon(i) => i
+                .inner
+                .borrow_mut()
+                .create_ns_item_for_icon_menu_item(menu_id),
+        }
+    }
+}
+
+define_class!(
+    #[unsafe(super(NSMenuItem))]
+    #[name = "MudaMenuItem"]
+    #[thread_kind = MainThreadOnly]
+    // FIXME: Use `Rc` or something else to access the MenuChild.
+    #[ivars = Cell<*const MenuChild>]
+    struct MenuItem;
+
+    impl MenuItem {
+        #[unsafe(method(fireMenuItemAction:))]
+        fn fire_menu_item_action(&self, _sender: Option<&AnyObject>) {
+            self.fire_menu_item_click();
+        }
+    }
+);
+
+impl MenuItem {
+    fn new(
+        mtm: MainThreadMarker,
+        title: &NSString,
+        action: Option<Sel>,
+        key_equivalent: &NSString,
+    ) -> Retained<Self> {
+        let this = mtm.alloc().set_ivars(Cell::new(ptr::null()));
+        unsafe {
+            msg_send![super(this), initWithTitle: title, action: action, keyEquivalent: key_equivalent]
+        }
+    }
+
+    fn fire_menu_item_click(&self) {
+        let mtm = MainThreadMarker::from(self);
+        // Create a reference to the `MenuChild` from the raw pointer
+        // stored as an instance variable on the native menu item
+        let item =
+            unsafe { self.ivars().get().as_ref() }.expect("MenuItem's MenuChild pointer was unset");
+
+        if let Some(PredefinedMenuItemType::About(about_meta)) = &item.predefined_item_type {
+            match about_meta {
+                Some(about_meta) => {
+                    let mut keys: Vec<&NSString> = Default::default();
+                    let mut objects: Vec<Retained<AnyObject>> = Default::default();
+
+                    if let Some(name) = &about_meta.name {
+                        keys.push(unsafe { NSAboutPanelOptionApplicationName });
+                        objects.push(Retained::into_super(Retained::into_super(
+                            NSString::from_str(name),
+                        )));
+                    }
+
+                    if let Some(version) = &about_meta.version {
+                        keys.push(unsafe { NSAboutPanelOptionApplicationVersion });
+                        objects.push(Retained::into_super(Retained::into_super(
+                            NSString::from_str(version),
+                        )));
+                    }
+
+                    if let Some(short_version) = &about_meta.short_version {
+                        keys.push(unsafe { NSAboutPanelOptionVersion });
+                        objects.push(Retained::into_super(Retained::into_super(
+                            NSString::from_str(short_version),
+                        )));
+                    }
+
+                    if let Some(copyright) = &about_meta.copyright {
+                        keys.push(ns_string!(NSAboutPanelOptionCopyright));
+                        objects.push(Retained::into_super(Retained::into_super(
+                            NSString::from_str(copyright),
+                        )));
+                    }
+
+                    if let Some(icon) = &about_meta.icon {
+                        keys.push(unsafe { NSAboutPanelOptionApplicationIcon });
+                        objects.push(Retained::into_super(Retained::into_super(
+                            icon.inner.to_nsimage(None),
+                        )));
+                    }
+
+                    if let Some(credits) = &about_meta.credits {
+                        keys.push(unsafe { NSAboutPanelOptionCredits });
+                        objects.push(Retained::into_super(Retained::into_super(
+                            NSAttributedString::from_nsstring(&NSString::from_str(credits)),
+                        )));
+                    }
+
+                    let dict = NSDictionary::from_retained_objects(&keys, &objects);
+
+                    unsafe {
+                        NSApplication::sharedApplication(mtm)
+                            .orderFrontStandardAboutPanelWithOptions(&dict)
+                    };
+                }
+
+                None => {
+                    unsafe {
+                        NSApplication::sharedApplication(mtm)
+                            .orderFrontStandardAboutPanel(Some(self))
+                    };
+                }
+            }
+        } else {
+            if item.item_type == MenuItemType::Check {
+                item.set_checked(!item.is_checked());
+            }
+
+            let id = (*item).id().clone();
+            MenuEvent::send(crate::MenuEvent { id });
+        }
+    }
+
+    fn create(
+        mtm: MainThreadMarker,
+        title: &str,
+        selector: Option<Sel>,
+        key_accelerator: &Option<KeyAccelerator>,
+    ) -> crate::Result<Retained<MenuItem>> {
+        let title = NSString::from_str(title);
+
+        let key_equivalent = key_accelerator
+            .as_ref()
+            .map(|accel| accel.key_equivalent())
+            .transpose()?
+            .unwrap_or_default();
+        let key_equivalent = NSString::from_str(&key_equivalent);
+
+        let modifier_mask = key_accelerator
+            .as_ref()
+            .map(KeyAccelerator::modifier_mask)
+            .unwrap_or_else(NSEventModifierFlags::empty);
+
+        let item = MenuItem::new(mtm, &title, selector, &key_equivalent);
+        item.setKeyEquivalentModifierMask(modifier_mask);
+
+        Ok(item)
+    }
+}
+
+fn menuitem_set_icon(menuitem: &NSMenuItem, icon: Option<&Icon>) {
+    if let Some(icon) = icon {
+        unsafe {
+            let nsimage = icon.inner.to_nsimage(Some(18.));
+            menuitem.setImage(Some(&nsimage));
+        }
+    } else {
+        unsafe {
+            menuitem.setImage(None);
+        }
+    }
+}
+
+fn menuitem_set_native_icon(menuitem: &NSMenuItem, icon: Option<NativeIcon>) {
+    if let Some(icon) = icon {
+        unsafe {
+            let named_img = icon.named_img();
+            let nsimage = NSImage::imageNamed(named_img).unwrap();
+            let size = NSSize::new(18.0, 18.0);
+            nsimage.setSize(size);
+            menuitem.setImage(Some(&nsimage));
+        }
+    } else {
+        unsafe {
+            menuitem.setImage(None);
+        }
+    }
+}
+
+unsafe fn show_context_menu(
+    ns_menu: &NSMenu,
+    view: *const c_void,
+    position: Option<Position>,
+) -> bool {
+    // SAFETY: Caller verifies that the view is valid.
+    let view: &NSView = unsafe { &*view.cast() };
+
+    let window = view.window().expect("view must be installed in a window");
+    let scale_factor = window.backingScaleFactor();
+    let (location, in_view) = if let Some(pos) = position.map(|p| p.to_logical(scale_factor)) {
+        let view_rect = view.frame();
+        let location = NSPoint::new(pos.x, view_rect.size.height - pos.y);
+        (location, Some(view))
+    } else {
+        let mouse_location = unsafe { NSEvent::mouseLocation() };
+        let pos = LogicalPosition {
+            x: mouse_location.x,
+            y: mouse_location.y,
+        };
+        let location = NSPoint::new(pos.x, pos.y);
+        (location, None)
+    };
+
+    unsafe { ns_menu.popUpMenuPositioningItem_atLocation_inView(None, location, in_view) }
+}
+
+impl NativeIcon {
+    unsafe fn named_img(self) -> &'static NSImageName {
+        use objc2_app_kit as appkit;
+        match self {
+            NativeIcon::Add => appkit::NSImageNameAddTemplate,
+            NativeIcon::StatusAvailable => appkit::NSImageNameStatusAvailable,
+            NativeIcon::StatusUnavailable => appkit::NSImageNameStatusUnavailable,
+            NativeIcon::StatusPartiallyAvailable => appkit::NSImageNameStatusPartiallyAvailable,
+            NativeIcon::Advanced => appkit::NSImageNameAdvanced,
+            NativeIcon::Bluetooth => appkit::NSImageNameBluetoothTemplate,
+            NativeIcon::Bookmarks => appkit::NSImageNameBookmarksTemplate,
+            NativeIcon::Caution => appkit::NSImageNameCaution,
+            NativeIcon::ColorPanel => appkit::NSImageNameColorPanel,
+            NativeIcon::ColumnView => appkit::NSImageNameColumnViewTemplate,
+            NativeIcon::Computer => appkit::NSImageNameComputer,
+            NativeIcon::EnterFullScreen => appkit::NSImageNameEnterFullScreenTemplate,
+            NativeIcon::Everyone => appkit::NSImageNameEveryone,
+            NativeIcon::ExitFullScreen => appkit::NSImageNameExitFullScreenTemplate,
+            NativeIcon::FlowView => appkit::NSImageNameFlowViewTemplate,
+            NativeIcon::Folder => appkit::NSImageNameFolder,
+            NativeIcon::FolderBurnable => appkit::NSImageNameFolderBurnable,
+            NativeIcon::FolderSmart => appkit::NSImageNameFolderSmart,
+            NativeIcon::FollowLinkFreestanding => appkit::NSImageNameFollowLinkFreestandingTemplate,
+            NativeIcon::FontPanel => appkit::NSImageNameFontPanel,
+            NativeIcon::GoLeft => appkit::NSImageNameGoLeftTemplate,
+            NativeIcon::GoRight => appkit::NSImageNameGoRightTemplate,
+            NativeIcon::Home => appkit::NSImageNameHomeTemplate,
+            NativeIcon::IChatTheater => appkit::NSImageNameIChatTheaterTemplate,
+            NativeIcon::IconView => appkit::NSImageNameIconViewTemplate,
+            NativeIcon::Info => appkit::NSImageNameInfo,
+            NativeIcon::InvalidDataFreestanding => {
+                appkit::NSImageNameInvalidDataFreestandingTemplate
+            }
+            NativeIcon::LeftFacingTriangle => appkit::NSImageNameLeftFacingTriangleTemplate,
+            NativeIcon::ListView => appkit::NSImageNameListViewTemplate,
+            NativeIcon::LockLocked => appkit::NSImageNameLockLockedTemplate,
+            NativeIcon::LockUnlocked => appkit::NSImageNameLockUnlockedTemplate,
+            NativeIcon::MenuMixedState => appkit::NSImageNameMenuMixedStateTemplate,
+            NativeIcon::MenuOnState => appkit::NSImageNameMenuOnStateTemplate,
+            NativeIcon::MobileMe => appkit::NSImageNameMobileMe,
+            NativeIcon::MultipleDocuments => appkit::NSImageNameMultipleDocuments,
+            NativeIcon::Network => appkit::NSImageNameNetwork,
+            NativeIcon::Path => appkit::NSImageNamePathTemplate,
+            NativeIcon::PreferencesGeneral => appkit::NSImageNamePreferencesGeneral,
+            NativeIcon::QuickLook => appkit::NSImageNameQuickLookTemplate,
+            NativeIcon::RefreshFreestanding => appkit::NSImageNameRefreshFreestandingTemplate,
+            NativeIcon::Refresh => appkit::NSImageNameRefreshTemplate,
+            NativeIcon::Remove => appkit::NSImageNameRemoveTemplate,
+            NativeIcon::RevealFreestanding => appkit::NSImageNameRevealFreestandingTemplate,
+            NativeIcon::RightFacingTriangle => appkit::NSImageNameRightFacingTriangleTemplate,
+            NativeIcon::Share => appkit::NSImageNameShareTemplate,
+            NativeIcon::Slideshow => appkit::NSImageNameSlideshowTemplate,
+            NativeIcon::SmartBadge => appkit::NSImageNameSmartBadgeTemplate,
+            NativeIcon::StatusNone => appkit::NSImageNameStatusNone,
+            NativeIcon::StopProgressFreestanding => {
+                appkit::NSImageNameStopProgressFreestandingTemplate
+            }
+            NativeIcon::StopProgress => appkit::NSImageNameStopProgressTemplate,
+            NativeIcon::TrashEmpty => appkit::NSImageNameTrashEmpty,
+            NativeIcon::TrashFull => appkit::NSImageNameTrashFull,
+            NativeIcon::User => appkit::NSImageNameUser,
+            NativeIcon::UserAccounts => appkit::NSImageNameUserAccounts,
+            NativeIcon::UserGroup => appkit::NSImageNameUserGroup,
+            NativeIcon::UserGuest => appkit::NSImageNameUserGuest,
+        }
+    }
+}
diff --git a/ports/muda/src/platform_impl/macos/util.rs b/ports/muda/src/platform_impl/macos/util.rs
new file mode 100644
index 000000000000..b4a94f8f81aa
--- /dev/null
+++ b/ports/muda/src/platform_impl/macos/util.rs
@@ -0,0 +1,39 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::str;
+
+/// Strips single `&` characters from the string.
+///
+/// `&` can be escaped as `&&` to prevent stripping, in which case a single `&` will be output.
+pub fn strip_mnemonic<S: AsRef<str>>(string: S) -> String {
+    let string = string.as_ref();
+    let mut result = String::with_capacity(string.len());
+    let mut chars = string.chars().peekable();
+
+    while let Some(c) = chars.next() {
+        if c == '&' && chars.peek() == Some(&'&') {
+            result.push('&');
+            chars.next();
+        } else if c != '&' {
+            result.push(c);
+        }
+    }
+
+    result
+}
+
+#[cfg(test)]
+mod tests {
+    use super::strip_mnemonic;
+
+    #[test]
+    fn strips_mnemonics_without_placeholder_collisions() {
+        assert_eq!(strip_mnemonic("&File && Edit [~~]"), "File & Edit [~~]");
+    }
+}
diff --git a/ports/muda/src/platform_impl/mod.rs b/ports/muda/src/platform_impl/mod.rs
new file mode 100644
index 000000000000..8c5700c0b382
--- /dev/null
+++ b/ports/muda/src/platform_impl/mod.rs
@@ -0,0 +1,123 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+#[cfg(target_os = "windows")]
+#[path = "windows/mod.rs"]
+mod platform;
+#[cfg(all(
+    any(
+        target_os = "linux",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    ),
+    feature = "gtk"
+))]
+#[path = "gtk/mod.rs"]
+mod platform;
+#[cfg(target_os = "macos")]
+#[path = "macos/mod.rs"]
+mod platform;
+
+use std::{
+    cell::{Ref, RefCell, RefMut},
+    rc::Rc,
+};
+
+use crate::{items::*, IsMenuItem, MenuItemKind, MenuItemType};
+
+pub(crate) use self::platform::*;
+
+impl dyn IsMenuItem + '_ {
+    fn child(&self) -> Rc<RefCell<MenuChild>> {
+        match self.kind() {
+            MenuItemKind::MenuItem(i) => i.inner,
+            MenuItemKind::Submenu(i) => i.inner,
+            MenuItemKind::Predefined(i) => i.inner,
+            MenuItemKind::Check(i) => i.inner,
+            MenuItemKind::Icon(i) => i.inner,
+        }
+    }
+}
+
+/// Internal utilities
+impl MenuChild {
+    fn kind(&self, c: Rc<RefCell<MenuChild>>) -> MenuItemKind {
+        match self.item_type() {
+            MenuItemType::Submenu => {
+                let id = c.borrow().id().clone();
+                MenuItemKind::Submenu(Submenu {
+                    id: Rc::new(id),
+                    inner: c,
+                })
+            }
+            MenuItemType::MenuItem => {
+                let id = c.borrow().id().clone();
+                MenuItemKind::MenuItem(MenuItem {
+                    id: Rc::new(id),
+                    inner: c,
+                })
+            }
+            MenuItemType::Predefined => {
+                let id = c.borrow().id().clone();
+                MenuItemKind::Predefined(PredefinedMenuItem {
+                    id: Rc::new(id),
+                    inner: c,
+                })
+            }
+            MenuItemType::Check => {
+                let id = c.borrow().id().clone();
+                MenuItemKind::Check(CheckMenuItem {
+                    id: Rc::new(id),
+                    inner: c,
+                })
+            }
+            MenuItemType::Icon => {
+                let id = c.borrow().id().clone();
+                MenuItemKind::Icon(IconMenuItem {
+                    id: Rc::new(id),
+                    inner: c,
+                })
+            }
+        }
+    }
+}
+
+#[allow(unused)]
+impl MenuItemKind {
+    pub(crate) fn as_ref(&self) -> &dyn IsMenuItem {
+        match self {
+            MenuItemKind::MenuItem(i) => i,
+            MenuItemKind::Submenu(i) => i,
+            MenuItemKind::Predefined(i) => i,
+            MenuItemKind::Check(i) => i,
+            MenuItemKind::Icon(i) => i,
+        }
+    }
+
+    pub(crate) fn child(&self) -> Ref<'_, MenuChild> {
+        match self {
+            MenuItemKind::MenuItem(i) => i.inner.borrow(),
+            MenuItemKind::Submenu(i) => i.inner.borrow(),
+            MenuItemKind::Predefined(i) => i.inner.borrow(),
+            MenuItemKind::Check(i) => i.inner.borrow(),
+            MenuItemKind::Icon(i) => i.inner.borrow(),
+        }
+    }
+
+    pub(crate) fn child_mut(&self) -> RefMut<'_, MenuChild> {
+        match self {
+            MenuItemKind::MenuItem(i) => i.inner.borrow_mut(),
+            MenuItemKind::Submenu(i) => i.inner.borrow_mut(),
+            MenuItemKind::Predefined(i) => i.inner.borrow_mut(),
+            MenuItemKind::Check(i) => i.inner.borrow_mut(),
+            MenuItemKind::Icon(i) => i.inner.borrow_mut(),
+        }
+    }
+}
diff --git a/ports/muda/src/platform_impl/windows/accelerator.rs b/ports/muda/src/platform_impl/windows/accelerator.rs
new file mode 100644
index 000000000000..3fb7a99b36ff
--- /dev/null
+++ b/ports/muda/src/platform_impl/windows/accelerator.rs
@@ -0,0 +1,225 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::fmt;
+
+use keyboard_types::{Key, Modifiers};
+use windows_sys::Win32::UI::{
+    Input::KeyboardAndMouse::*,
+    WindowsAndMessaging::{ACCEL, FALT, FCONTROL, FSHIFT, FVIRTKEY},
+};
+
+use crate::accelerator::{Accelerator, AcceleratorParseError, KeyAccelerator};
+
+impl KeyAccelerator {
+    pub fn to_accel(&self, menu_id: u16) -> crate::Result<ACCEL> {
+        let mut virt_key = FVIRTKEY;
+        let key_mods: Modifiers = self.mods;
+        if key_mods.contains(Modifiers::CONTROL) {
+            virt_key |= FCONTROL;
+        }
+        if key_mods.contains(Modifiers::ALT) {
+            virt_key |= FALT;
+        }
+        if key_mods.contains(Modifiers::SHIFT) {
+            virt_key |= FSHIFT;
+        }
+
+        let vk_code = key_to_vk(&self.key)?;
+        let mod_code = vk_code >> 8;
+        if mod_code & 0x1 != 0 {
+            virt_key |= FSHIFT;
+        }
+        if mod_code & 0x02 != 0 {
+            virt_key |= FCONTROL;
+        }
+        if mod_code & 0x04 != 0 {
+            virt_key |= FALT;
+        }
+        let raw_key = vk_code & 0x00ff;
+
+        Ok(ACCEL {
+            fVirt: virt_key,
+            key: raw_key,
+            cmd: menu_id,
+        })
+    }
+}
+
+// used to build accelerators table from Key
+fn key_to_vk(key: &Key) -> Result<VIRTUAL_KEY, AcceleratorParseError> {
+    Ok(match key {
+        Key::Character(s) => match s.as_str() {
+            "a" | "A" => VK_A,
+            "b" | "B" => VK_B,
+            "c" | "C" => VK_C,
+            "d" | "D" => VK_D,
+            "e" | "E" => VK_E,
+            "f" | "F" => VK_F,
+            "g" | "G" => VK_G,
+            "h" | "H" => VK_H,
+            "i" | "I" => VK_I,
+            "j" | "J" => VK_J,
+            "k" | "K" => VK_K,
+            "l" | "L" => VK_L,
+            "m" | "M" => VK_M,
+            "n" | "N" => VK_N,
+            "o" | "O" => VK_O,
+            "p" | "P" => VK_P,
+            "q" | "Q" => VK_Q,
+            "r" | "R" => VK_R,
+            "s" | "S" => VK_S,
+            "t" | "T" => VK_T,
+            "u" | "U" => VK_U,
+            "v" | "V" => VK_V,
+            "w" | "W" => VK_W,
+            "x" | "X" => VK_X,
+            "y" | "Y" => VK_Y,
+            "z" | "Z" => VK_Z,
+            "0" => VK_0,
+            "1" => VK_1,
+            "2" => VK_2,
+            "3" => VK_3,
+            "4" => VK_4,
+            "5" => VK_5,
+            "6" => VK_6,
+            "7" => VK_7,
+            "8" => VK_8,
+            "9" => VK_9,
+            "=" | "+" => VK_OEM_PLUS,
+            "," => VK_OEM_COMMA,
+            "-" => VK_OEM_MINUS,
+            "." => VK_OEM_PERIOD,
+            ";" => VK_OEM_1,
+            "/" => VK_OEM_2,
+            "`" => VK_OEM_3,
+            "[" => VK_OEM_4,
+            "\\" => VK_OEM_5,
+            "]" => VK_OEM_6,
+            "'" => VK_OEM_7,
+            " " => VK_SPACE,
+            other => {
+                // Try VkKeyScanW for characters reachable on the current keyboard layout
+                let c = other
+                    .chars()
+                    .next()
+                    .ok_or_else(|| AcceleratorParseError::UnsupportedKey(other.to_string()))?;
+                let result = unsafe { VkKeyScanW(c as u16) };
+                if result as i16 == -1 {
+                    return Err(AcceleratorParseError::UnsupportedKey(other.to_string()));
+                }
+                result as VIRTUAL_KEY
+            }
+        },
+        Key::Backspace => VK_BACK,
+        Key::Tab => VK_TAB,
+        Key::Enter => VK_RETURN,
+        Key::Pause => VK_PAUSE,
+        Key::CapsLock => VK_CAPITAL,
+        Key::KanaMode => VK_KANA,
+        Key::Escape => VK_ESCAPE,
+        Key::NonConvert => VK_NONCONVERT,
+        Key::PageUp => VK_PRIOR,
+        Key::PageDown => VK_NEXT,
+        Key::End => VK_END,
+        Key::Home => VK_HOME,
+        Key::ArrowLeft => VK_LEFT,
+        Key::ArrowUp => VK_UP,
+        Key::ArrowRight => VK_RIGHT,
+        Key::ArrowDown => VK_DOWN,
+        Key::PrintScreen => VK_SNAPSHOT,
+        Key::Insert => VK_INSERT,
+        Key::Delete => VK_DELETE,
+        Key::Help => VK_HELP,
+        Key::ContextMenu => VK_APPS,
+        Key::F1 => VK_F1,
+        Key::F2 => VK_F2,
+        Key::F3 => VK_F3,
+        Key::F4 => VK_F4,
+        Key::F5 => VK_F5,
+        Key::F6 => VK_F6,
+        Key::F7 => VK_F7,
+        Key::F8 => VK_F8,
+        Key::F9 => VK_F9,
+        Key::F10 => VK_F10,
+        Key::F11 => VK_F11,
+        Key::F12 => VK_F12,
+        Key::F13 => VK_F13,
+        Key::F14 => VK_F14,
+        Key::F15 => VK_F15,
+        Key::F16 => VK_F16,
+        Key::F17 => VK_F17,
+        Key::F18 => VK_F18,
+        Key::F19 => VK_F19,
+        Key::F20 => VK_F20,
+        Key::F21 => VK_F21,
+        Key::F22 => VK_F22,
+        Key::F23 => VK_F23,
+        Key::F24 => VK_F24,
+        Key::NumLock => VK_NUMLOCK,
+        Key::ScrollLock => VK_SCROLL,
+        Key::BrowserBack => VK_BROWSER_BACK,
+        Key::BrowserForward => VK_BROWSER_FORWARD,
+        Key::BrowserRefresh => VK_BROWSER_REFRESH,
+        Key::BrowserStop => VK_BROWSER_STOP,
+        Key::BrowserSearch => VK_BROWSER_SEARCH,
+        Key::BrowserFavorites => VK_BROWSER_FAVORITES,
+        Key::BrowserHome => VK_BROWSER_HOME,
+        Key::AudioVolumeMute => VK_VOLUME_MUTE,
+        Key::AudioVolumeDown => VK_VOLUME_DOWN,
+        Key::AudioVolumeUp => VK_VOLUME_UP,
+        Key::MediaTrackNext => VK_MEDIA_NEXT_TRACK,
+        Key::MediaTrackPrevious => VK_MEDIA_PREV_TRACK,
+        Key::MediaStop => VK_MEDIA_STOP,
+        Key::MediaPlayPause => VK_MEDIA_PLAY_PAUSE,
+        Key::LaunchMail => VK_LAUNCH_MAIL,
+        Key::Convert => VK_CONVERT,
+        key => return Err(AcceleratorParseError::UnsupportedKey(format!("{:?}", key))),
+    })
+}
+
+impl fmt::Display for Accelerator {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", KeyAccelerator::from(*self))
+    }
+}
+
+impl fmt::Display for KeyAccelerator {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let key_mods: Modifiers = self.mods;
+        if key_mods.contains(Modifiers::CONTROL) {
+            write!(f, "Ctrl+")?;
+        }
+        if key_mods.contains(Modifiers::SHIFT) {
+            write!(f, "Shift+")?;
+        }
+        if key_mods.contains(Modifiers::ALT) {
+            write!(f, "Alt+")?;
+        }
+        if key_mods.contains(Modifiers::SUPER) {
+            write!(f, "Windows+")?;
+        }
+        match &self.key {
+            Key::Character(s) => match s.as_str() {
+                " " => write!(f, "Space"),
+                c => write!(f, "{}", c.to_uppercase()),
+            },
+            Key::Tab => write!(f, "Tab"),
+            Key::Escape => write!(f, "Esc"),
+            Key::Delete => write!(f, "Del"),
+            Key::Insert => write!(f, "Ins"),
+            Key::PageUp => write!(f, "PgUp"),
+            Key::PageDown => write!(f, "PgDn"),
+            Key::ArrowLeft => write!(f, "Left"),
+            Key::ArrowRight => write!(f, "Right"),
+            Key::ArrowUp => write!(f, "Up"),
+            Key::ArrowDown => write!(f, "Down"),
+            key => write!(f, "{:?}", key),
+        }
+    }
+}
diff --git a/ports/muda/src/platform_impl/windows/dark_menu_bar.rs b/ports/muda/src/platform_impl/windows/dark_menu_bar.rs
new file mode 100644
index 000000000000..021cc88e44e6
--- /dev/null
+++ b/ports/muda/src/platform_impl/windows/dark_menu_bar.rs
@@ -0,0 +1,350 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// this is a port of combination of https://github.com/hrydgard/ppsspp/blob/master/Windows/W32Util/UAHMenuBar.cpp and https://github.com/ysc3839/win32-darkmode/blob/master/win32-darkmode/DarkMode.h
+
+#![allow(non_snake_case, clippy::upper_case_acronyms)]
+
+use std::cell::Cell;
+
+use once_cell::sync::Lazy;
+use windows_sys::{
+    s,
+    Win32::{
+        Foundation::{HWND, LPARAM, RECT, WPARAM},
+        Graphics::Gdi::*,
+        System::LibraryLoader::{GetProcAddress, LoadLibraryA},
+        UI::{
+            Accessibility::HIGHCONTRASTA,
+            Controls::*,
+            WindowsAndMessaging::{
+                GetClientRect, GetMenuBarInfo, GetMenuItemInfoW, GetWindowRect,
+                SystemParametersInfoA, HMENU, MENUBARINFO, MENUITEMINFOW, MIIM_STRING, OBJID_MENU,
+                SPI_GETHIGHCONTRAST, WM_NCACTIVATE, WM_NCPAINT,
+            },
+        },
+    },
+};
+
+pub const WM_UAHDRAWMENU: u32 = 0x0091;
+pub const WM_UAHDRAWMENUITEM: u32 = 0x0092;
+
+#[repr(C)]
+struct UAHMENUITEMMETRICS0 {
+    cx: u32,
+    cy: u32,
+}
+
+#[repr(C)]
+struct UAHMENUITEMMETRICS {
+    rgsizeBar: [UAHMENUITEMMETRICS0; 2],
+    rgsizePopup: [UAHMENUITEMMETRICS0; 4],
+}
+
+#[repr(C)]
+struct UAHMENUPOPUPMETRICS {
+    rgcx: [u32; 4],
+    fUpdateMaxWidths: u32,
+}
+
+#[repr(C)]
+struct UAHMENU {
+    hmenu: HMENU,
+    hdc: HDC,
+    dwFlags: u32,
+}
+#[repr(C)]
+struct UAHMENUITEM {
+    iPosition: u32,
+    umim: UAHMENUITEMMETRICS,
+    umpm: UAHMENUPOPUPMETRICS,
+}
+#[repr(C)]
+struct UAHDRAWMENUITEM {
+    dis: DRAWITEMSTRUCT,
+    um: UAHMENU,
+    umi: UAHMENUITEM,
+}
+
+#[derive(Debug)]
+struct Win32Brush(Cell<HBRUSH>);
+
+impl Win32Brush {
+    const fn null() -> Win32Brush {
+        Self(Cell::new(0 as _))
+    }
+
+    fn get_or_set(&self, color: u32) -> HBRUSH {
+        if self.0.get().is_null() {
+            self.0.set(unsafe { CreateSolidBrush(color) });
+        }
+        self.0.get()
+    }
+}
+
+impl Drop for Win32Brush {
+    fn drop(&mut self) {
+        unsafe { DeleteObject(self.0.get()) };
+    }
+}
+
+fn background_brush() -> HBRUSH {
+    thread_local! {
+        static BACKGROUND_BRUSH: Win32Brush = const { Win32Brush::null() };
+    }
+    const BACKGROUND_COLOR: u32 = 2829099;
+    BACKGROUND_BRUSH.with(|brush| brush.get_or_set(BACKGROUND_COLOR))
+}
+
+fn selected_background_brush() -> HBRUSH {
+    thread_local! {
+        static SELECTED_BACKGROUND_BRUSH: Win32Brush = const { Win32Brush::null() };
+    }
+    const SELECTED_BACKGROUND_COLOR: u32 = 4276545;
+    SELECTED_BACKGROUND_BRUSH.with(|brush| brush.get_or_set(SELECTED_BACKGROUND_COLOR))
+}
+
+/// Draws a dark menu bar if needed and returns whether it draws it or not
+pub fn draw(hwnd: super::Hwnd, msg: u32, _wparam: WPARAM, lparam: LPARAM) {
+    match msg {
+        // draw over the annoying white line blow menubar
+        // ref: https://github.com/notepad-plus-plus/notepad-plus-plus/pull/9985
+        WM_NCACTIVATE | WM_NCPAINT => {
+            let mut mbi = MENUBARINFO {
+                cbSize: std::mem::size_of::<MENUBARINFO>() as _,
+                ..unsafe { std::mem::zeroed() }
+            };
+            unsafe { GetMenuBarInfo(hwnd as _, OBJID_MENU, 0, &mut mbi) };
+
+            let mut client_rc: RECT = unsafe { std::mem::zeroed() };
+            unsafe {
+                GetClientRect(hwnd as _, &mut client_rc);
+                MapWindowPoints(
+                    hwnd as _,
+                    std::ptr::null_mut(),
+                    &mut client_rc as *mut _ as *mut _,
+                    2,
+                );
+            };
+
+            let mut window_rc: RECT = unsafe { std::mem::zeroed() };
+            unsafe { GetWindowRect(hwnd as _, &mut window_rc) };
+
+            unsafe { OffsetRect(&mut client_rc, -window_rc.left, -window_rc.top) };
+
+            let mut annoying_rc = client_rc;
+            annoying_rc.bottom = annoying_rc.top;
+            annoying_rc.top -= 1;
+
+            unsafe {
+                let hdc = GetWindowDC(hwnd as _);
+                FillRect(hdc, &annoying_rc, background_brush());
+                ReleaseDC(hwnd as _, hdc);
+            }
+        }
+
+        // draw menu bar background
+        WM_UAHDRAWMENU => {
+            let pudm = lparam as *const UAHMENU;
+
+            // get the menubar rect
+            let rc = {
+                let mut mbi = MENUBARINFO {
+                    cbSize: std::mem::size_of::<MENUBARINFO>() as _,
+                    ..unsafe { std::mem::zeroed() }
+                };
+                unsafe { GetMenuBarInfo(hwnd as _, OBJID_MENU, 0, &mut mbi) };
+
+                let mut window_rc: RECT = unsafe { std::mem::zeroed() };
+                unsafe { GetWindowRect(hwnd as _, &mut window_rc) };
+
+                let mut rc = mbi.rcBar;
+                // the rcBar is offset by the window rect
+                unsafe { OffsetRect(&mut rc, -window_rc.left, -window_rc.top) };
+                rc.top -= 1;
+                rc
+            };
+
+            unsafe { FillRect((*pudm).hdc, &rc, background_brush()) };
+        }
+
+        // draw menu bar items
+        WM_UAHDRAWMENUITEM => {
+            let pudmi = lparam as *mut UAHDRAWMENUITEM;
+
+            // get the menu item string
+            let (label, cch) = {
+                let mut info: MENUITEMINFOW = unsafe { std::mem::zeroed() };
+                info.cbSize = std::mem::size_of::<MENUITEMINFOW>() as _;
+                info.fMask = MIIM_STRING;
+                let ok = unsafe {
+                    GetMenuItemInfoW(
+                        (*pudmi).um.hmenu,
+                        (*pudmi).umi.iPosition,
+                        true.into(),
+                        &mut info,
+                    )
+                };
+                if ok == 0 {
+                    return;
+                }
+
+                info.cch += 1; // add 1 for null terminator
+                let mut label = vec![0u16; info.cch as usize];
+                info.dwTypeData = label.as_mut_ptr();
+
+                let ok = unsafe {
+                    GetMenuItemInfoW(
+                        (*pudmi).um.hmenu,
+                        (*pudmi).umi.iPosition,
+                        true.into(),
+                        &mut info,
+                    )
+                };
+                if ok == 0 {
+                    return;
+                }
+
+                (label, info.cch)
+            };
+
+            // get the item state for drawing
+            let mut dw_flags = DT_CENTER | DT_SINGLELINE | DT_VCENTER;
+            let mut i_text_state_id = 0;
+            let mut i_background_state_id = 0;
+
+            unsafe {
+                if (((*pudmi).dis.itemState & ODS_INACTIVE)
+                    | ((*pudmi).dis.itemState & ODS_DEFAULT))
+                    != 0
+                {
+                    // normal display
+                    i_text_state_id = MPI_NORMAL;
+                    i_background_state_id = MPI_NORMAL;
+                }
+                if (*pudmi).dis.itemState & ODS_HOTLIGHT != 0 {
+                    // hot tracking
+                    i_text_state_id = MPI_HOT;
+                    i_background_state_id = MPI_HOT;
+                }
+                if (*pudmi).dis.itemState & ODS_SELECTED != 0 {
+                    // clicked -- MENU_POPUPITEM has no state for this, though MENU_BARITEM does
+                    i_text_state_id = MPI_HOT;
+                    i_background_state_id = MPI_HOT;
+                }
+                if ((*pudmi).dis.itemState & ODS_GRAYED) != 0
+                    || ((*pudmi).dis.itemState & ODS_DISABLED) != 0
+                {
+                    // disabled / grey text
+                    i_text_state_id = MPI_DISABLED;
+                    i_background_state_id = MPI_DISABLED;
+                }
+                if ((*pudmi).dis.itemState & ODS_NOACCEL) != 0 {
+                    dw_flags |= DT_HIDEPREFIX;
+                }
+
+                let bg_brush = match i_background_state_id {
+                    MPI_HOT => selected_background_brush(),
+                    _ => background_brush(),
+                };
+
+                FillRect((*pudmi).um.hdc, &(*pudmi).dis.rcItem, bg_brush);
+
+                const TEXT_COLOR: u32 = 16777215;
+                const DISABLED_TEXT_COLOR: u32 = 7171437;
+
+                let text_brush = match i_text_state_id {
+                    MPI_DISABLED => DISABLED_TEXT_COLOR,
+                    _ => TEXT_COLOR,
+                };
+
+                SetBkMode((*pudmi).um.hdc, 0);
+                SetTextColor((*pudmi).um.hdc, text_brush);
+                DrawTextW(
+                    (*pudmi).um.hdc,
+                    label.as_ptr(),
+                    cch as _,
+                    &mut (*pudmi).dis.rcItem,
+                    dw_flags,
+                );
+            }
+        }
+
+        _ => {}
+    };
+}
+
+pub fn should_use_dark_mode(hwnd: super::Hwnd) -> bool {
+    should_apps_use_dark_mode() && !is_high_contrast() && is_dark_mode_allowed_for_window(hwnd as _)
+}
+
+static HUXTHEME: Lazy<isize> = Lazy::new(|| unsafe { LoadLibraryA(s!("uxtheme.dll")) as _ });
+
+fn should_apps_use_dark_mode() -> bool {
+    const UXTHEME_SHOULDAPPSUSEDARKMODE_ORDINAL: u16 = 132;
+    type ShouldAppsUseDarkMode = unsafe extern "system" fn() -> bool;
+    static SHOULD_APPS_USE_DARK_MODE: Lazy<Option<ShouldAppsUseDarkMode>> = Lazy::new(|| unsafe {
+        if *HUXTHEME == 0 {
+            return None;
+        }
+
+        GetProcAddress(
+            (*HUXTHEME) as *mut _,
+            UXTHEME_SHOULDAPPSUSEDARKMODE_ORDINAL as usize as *mut _,
+        )
+        .map(|handle| std::mem::transmute(handle))
+    });
+
+    SHOULD_APPS_USE_DARK_MODE
+        .map(|should_apps_use_dark_mode| unsafe { (should_apps_use_dark_mode)() })
+        .unwrap_or(false)
+}
+
+fn is_dark_mode_allowed_for_window(hwnd: HWND) -> bool {
+    const UXTHEME_ISDARKMODEALLOWEDFORWINDOW_ORDINAL: u16 = 137;
+    type IsDarkModeAllowedForWindow = unsafe extern "system" fn(HWND) -> bool;
+    static IS_DARK_MODE_ALLOWED_FOR_WINDOW: Lazy<Option<IsDarkModeAllowedForWindow>> =
+        Lazy::new(|| unsafe {
+            if *HUXTHEME == 0 {
+                return None;
+            }
+
+            GetProcAddress(
+                (*HUXTHEME) as *mut _,
+                UXTHEME_ISDARKMODEALLOWEDFORWINDOW_ORDINAL as usize as *mut _,
+            )
+            .map(|handle| std::mem::transmute(handle))
+        });
+
+    if let Some(_is_dark_mode_allowed_for_window) = *IS_DARK_MODE_ALLOWED_FOR_WINDOW {
+        unsafe { _is_dark_mode_allowed_for_window(hwnd) }
+    } else {
+        false
+    }
+}
+
+fn is_high_contrast() -> bool {
+    const HCF_HIGHCONTRASTON: u32 = 1;
+
+    let mut hc = HIGHCONTRASTA {
+        cbSize: std::mem::size_of::<HIGHCONTRASTA>() as _,
+        dwFlags: Default::default(),
+        lpszDefaultScheme: std::ptr::null_mut(),
+    };
+
+    let ok = unsafe {
+        SystemParametersInfoA(
+            SPI_GETHIGHCONTRAST,
+            std::mem::size_of_val(&hc) as _,
+            &mut hc as *mut _ as _,
+            Default::default(),
+        )
+    };
+
+    ok != 0 && (HCF_HIGHCONTRASTON & hc.dwFlags) != 0
+}
diff --git a/ports/muda/src/platform_impl/windows/icon.rs b/ports/muda/src/platform_impl/windows/icon.rs
new file mode 100644
index 000000000000..94683349c2ff
--- /dev/null
+++ b/ports/muda/src/platform_impl/windows/icon.rs
@@ -0,0 +1,205 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// taken from https://github.com/rust-windowing/winit/blob/92fdf5ba85f920262a61cee4590f4a11ad5738d1/src/platform_impl/windows/icon.rs
+
+use std::{fmt, io, mem, path::Path, sync::Arc};
+
+use windows_sys::{
+    core::PCWSTR,
+    Win32::{
+        Foundation::RECT,
+        Graphics::Gdi::{
+            CreateCompatibleDC, CreateDIBSection, DeleteDC, GetDC, ReleaseDC, SelectObject,
+            BITMAPINFO, BITMAPINFOHEADER, BI_RGB, DIB_RGB_COLORS, HBITMAP,
+        },
+        UI::WindowsAndMessaging::{
+            CreateIcon, DestroyIcon, DrawIconEx, LoadImageW, DI_NORMAL, HICON, IMAGE_ICON,
+            LR_DEFAULTSIZE, LR_LOADFROMFILE,
+        },
+    },
+};
+
+use crate::icon::*;
+
+use super::util;
+
+impl Pixel {
+    fn convert_to_bgra(&mut self) {
+        mem::swap(&mut self.r, &mut self.b);
+    }
+}
+
+impl RgbaIcon {
+    fn into_windows_icon(self) -> Result<WinIcon, BadIcon> {
+        let rgba = self.rgba;
+        let pixel_count = rgba.len() / PIXEL_SIZE;
+        let mut and_mask = Vec::with_capacity(pixel_count);
+        let pixels =
+            unsafe { std::slice::from_raw_parts_mut(rgba.as_ptr() as *mut Pixel, pixel_count) };
+        for pixel in pixels {
+            and_mask.push(pixel.a.wrapping_sub(u8::MAX)); // invert alpha channel
+            pixel.convert_to_bgra();
+        }
+        assert_eq!(and_mask.len(), pixel_count);
+        let handle = unsafe {
+            CreateIcon(
+                std::ptr::null_mut(),
+                self.width as i32,
+                self.height as i32,
+                1,
+                (PIXEL_SIZE * 8) as u8,
+                and_mask.as_ptr(),
+                rgba.as_ptr(),
+            )
+        };
+        if !handle.is_null() {
+            Ok(WinIcon::from_handle(handle))
+        } else {
+            Err(BadIcon::OsError(io::Error::last_os_error()))
+        }
+    }
+}
+
+#[derive(Debug)]
+struct RaiiIcon {
+    handle: HICON,
+}
+
+#[derive(Clone)]
+pub(crate) struct WinIcon {
+    inner: Arc<RaiiIcon>,
+}
+
+unsafe impl Send for WinIcon {}
+
+impl WinIcon {
+    pub unsafe fn to_hbitmap(&self) -> HBITMAP {
+        let hdc = CreateCompatibleDC(std::ptr::null_mut());
+
+        let rc = RECT {
+            left: 0,
+            top: 0,
+            right: 16,
+            bottom: 16,
+        };
+
+        let mut bitmap_info: BITMAPINFO = std::mem::zeroed();
+        bitmap_info.bmiHeader.biSize = std::mem::size_of::<BITMAPINFOHEADER>() as _;
+        bitmap_info.bmiHeader.biWidth = rc.right;
+        bitmap_info.bmiHeader.biHeight = rc.bottom;
+        bitmap_info.bmiHeader.biPlanes = 1;
+        bitmap_info.bmiHeader.biBitCount = 32;
+        bitmap_info.bmiHeader.biCompression = BI_RGB as _;
+
+        let h_dc_bitmap = GetDC(std::ptr::null_mut());
+
+        let hbitmap = CreateDIBSection(
+            h_dc_bitmap,
+            &bitmap_info,
+            DIB_RGB_COLORS,
+            0 as _,
+            std::ptr::null_mut(),
+            0,
+        );
+
+        ReleaseDC(std::ptr::null_mut(), h_dc_bitmap);
+
+        let h_bitmap_old = SelectObject(hdc, hbitmap);
+
+        DrawIconEx(
+            hdc,
+            0,
+            0,
+            self.inner.handle,
+            rc.right,
+            rc.bottom,
+            0,
+            std::ptr::null_mut(),
+            DI_NORMAL,
+        );
+
+        SelectObject(hdc, h_bitmap_old);
+        DeleteDC(hdc);
+
+        hbitmap
+    }
+
+    pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
+        let rgba_icon = RgbaIcon::from_rgba(rgba, width, height)?;
+        rgba_icon.into_windows_icon()
+    }
+
+    fn from_handle(handle: HICON) -> Self {
+        Self {
+            #[allow(clippy::arc_with_non_send_sync)]
+            inner: Arc::new(RaiiIcon { handle }),
+        }
+    }
+
+    pub(crate) fn from_path<P: AsRef<Path>>(
+        path: P,
+        size: Option<(u32, u32)>,
+    ) -> Result<Self, BadIcon> {
+        // width / height of 0 along with LR_DEFAULTSIZE tells windows to load the default icon size
+        let (width, height) = size.unwrap_or((0, 0));
+
+        let wide_path = util::encode_wide(path.as_ref());
+
+        let handle = unsafe {
+            LoadImageW(
+                std::ptr::null_mut(),
+                wide_path.as_ptr(),
+                IMAGE_ICON,
+                width as i32,
+                height as i32,
+                LR_DEFAULTSIZE | LR_LOADFROMFILE,
+            )
+        };
+        if !handle.is_null() {
+            Ok(WinIcon::from_handle(handle as HICON))
+        } else {
+            Err(BadIcon::OsError(io::Error::last_os_error()))
+        }
+    }
+
+    pub(crate) fn from_resource(
+        resource_id: u16,
+        size: Option<(u32, u32)>,
+    ) -> Result<Self, BadIcon> {
+        // width / height of 0 along with LR_DEFAULTSIZE tells windows to load the default icon size
+        let (width, height) = size.unwrap_or((0, 0));
+        let handle = unsafe {
+            LoadImageW(
+                util::get_instance_handle(),
+                resource_id as PCWSTR,
+                IMAGE_ICON,
+                width as i32,
+                height as i32,
+                LR_DEFAULTSIZE,
+            )
+        };
+        if !handle.is_null() {
+            Ok(WinIcon::from_handle(handle as HICON))
+        } else {
+            Err(BadIcon::OsError(io::Error::last_os_error()))
+        }
+    }
+}
+
+impl Drop for RaiiIcon {
+    fn drop(&mut self) {
+        unsafe { DestroyIcon(self.handle) };
+    }
+}
+
+impl fmt::Debug for WinIcon {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
+        (*self.inner).fmt(formatter)
+    }
+}
diff --git a/ports/muda/src/platform_impl/windows/mod.rs b/ports/muda/src/platform_impl/windows/mod.rs
new file mode 100644
index 000000000000..35584de244f4
--- /dev/null
+++ b/ports/muda/src/platform_impl/windows/mod.rs
@@ -0,0 +1,1403 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+mod accelerator;
+mod dark_menu_bar;
+mod icon;
+mod util;
+
+use self::dark_menu_bar::{WM_UAHDRAWMENU, WM_UAHDRAWMENUITEM};
+pub(crate) use self::icon::WinIcon as PlatformIcon;
+
+use crate::{
+    accelerator::KeyAccelerator,
+    dpi::Position,
+    icon::{Icon, NativeIcon},
+    items::PredefinedMenuItemType,
+    util::{AddOp, Counter},
+    AboutMetadata, IsMenuItem, MenuEvent, MenuId, MenuItemKind, MenuItemType, MenuTheme,
+};
+use std::{
+    cell::{RefCell, RefMut},
+    collections::HashMap,
+    fmt::Debug,
+    rc::Rc,
+};
+use util::{decode_wide, encode_wide, Accel};
+use windows_sys::Win32::{
+    Foundation::{FALSE, LPARAM, LRESULT, POINT, WPARAM},
+    Graphics::Gdi::{ClientToScreen, HBITMAP},
+    UI::{
+        Input::KeyboardAndMouse::{
+            GetActiveWindow, SendInput, INPUT, INPUT_KEYBOARD, KEYEVENTF_KEYUP, VK_CONTROL,
+        },
+        Shell::{DefSubclassProc, RemoveWindowSubclass, SetWindowSubclass},
+        WindowsAndMessaging::{
+            AppendMenuW, CreateAcceleratorTableW, CreateMenu, CreatePopupMenu,
+            DestroyAcceleratorTable, DestroyMenu, DrawMenuBar, EnableMenuItem, GetCursorPos,
+            GetMenu, GetMenuItemInfoW, InsertMenuW, PostMessageW, PostQuitMessage, RemoveMenu,
+            SendMessageW, SetForegroundWindow, SetMenu, SetMenuItemInfoW, ShowWindow,
+            TrackPopupMenu, HACCEL, HMENU, MENUITEMINFOW, MFS_CHECKED, MFS_DISABLED, MF_BYCOMMAND,
+            MF_BYPOSITION, MF_CHECKED, MF_DISABLED, MF_ENABLED, MF_GRAYED, MF_POPUP, MF_SEPARATOR,
+            MF_STRING, MF_UNCHECKED, MIIM_BITMAP, MIIM_STATE, MIIM_STRING, SW_HIDE, SW_MAXIMIZE,
+            SW_MINIMIZE, TPM_LEFTALIGN, TPM_RETURNCMD, WM_CLOSE, WM_COMMAND, WM_NCACTIVATE,
+            WM_NCPAINT,
+        },
+    },
+};
+
+type Hwnd = isize;
+
+static COUNTER: Counter = Counter::new_with_start(1000);
+
+macro_rules! inner_menu_child_and_flags {
+    ($item:ident) => {{
+        let mut flags = 0;
+        let child = match $item.kind() {
+            MenuItemKind::Submenu(i) => {
+                flags |= MF_POPUP;
+                i.inner
+            }
+            MenuItemKind::MenuItem(i) => {
+                flags |= MF_STRING;
+                i.inner
+            }
+
+            MenuItemKind::Predefined(i) => {
+                let child = i.inner;
+                let child_ = child.borrow();
+                match child_.predefined_item_type.as_ref().unwrap() {
+                    PredefinedMenuItemType::None => return Ok(()),
+                    PredefinedMenuItemType::Separator => {
+                        flags |= MF_SEPARATOR;
+                    }
+                    _ => {
+                        flags |= MF_STRING;
+                    }
+                }
+                drop(child_);
+                child
+            }
+            MenuItemKind::Check(i) => {
+                let child = i.inner;
+                flags |= MF_STRING;
+                if child.borrow().checked {
+                    flags |= MF_CHECKED;
+                }
+                child
+            }
+            MenuItemKind::Icon(i) => {
+                flags |= MF_STRING;
+                i.inner
+            }
+        };
+
+        (child, flags)
+    }};
+}
+
+type AccelWrapper = (HACCEL, HashMap<u32, Accel>);
+
+#[derive(Debug)]
+pub(crate) struct Menu {
+    id: MenuId,
+    internal_id: u32,
+    hmenu: HMENU,
+    hpopupmenu: HMENU,
+    hwnds: Rc<RefCell<HashMap<Hwnd, MenuTheme>>>,
+    haccel_store: Rc<RefCell<AccelWrapper>>,
+    children: Vec<Rc<RefCell<MenuChild>>>,
+}
+
+impl Drop for Menu {
+    fn drop(&mut self) {
+        for (hwnd, _) in self.hwnds.borrow_mut().drain() {
+            unsafe { Self::remove_from_hwnd(hwnd) };
+        }
+
+        fn remove_from_children_stores(internal_id: u32, children: &Vec<Rc<RefCell<MenuChild>>>) {
+            for child in children {
+                let mut child_ = child.borrow_mut();
+                child_.root_menu_haccel_stores.remove(&internal_id);
+                if child_.item_type == MenuItemType::Submenu {
+                    remove_from_children_stores(internal_id, child_.children.as_ref().unwrap());
+                }
+            }
+        }
+
+        remove_from_children_stores(self.internal_id, &self.children);
+
+        for child in &self.children {
+            let child_ = child.borrow();
+            let id = if child_.item_type == MenuItemType::Submenu {
+                child_.hmenu as _
+            } else {
+                child_.internal_id
+            };
+            unsafe {
+                RemoveMenu(self.hpopupmenu, id, MF_BYCOMMAND);
+                RemoveMenu(self.hmenu, id, MF_BYCOMMAND);
+            }
+        }
+
+        unsafe {
+            DestroyMenu(self.hmenu);
+            DestroyMenu(self.hpopupmenu);
+        }
+    }
+}
+
+impl Menu {
+    pub fn new(id: Option<MenuId>) -> Self {
+        let internal_id = COUNTER.next();
+        Self {
+            id: id.unwrap_or_else(|| MenuId::new(internal_id.to_string())),
+            internal_id,
+            hmenu: unsafe { CreateMenu() },
+            hpopupmenu: unsafe { CreatePopupMenu() },
+            haccel_store: Rc::new(RefCell::new((std::ptr::null_mut(), HashMap::new()))),
+            children: Vec::new(),
+            hwnds: Rc::new(RefCell::new(HashMap::new())),
+        }
+    }
+
+    pub fn id(&self) -> &MenuId {
+        &self.id
+    }
+
+    pub fn add_menu_item(&mut self, item: &dyn IsMenuItem, op: AddOp) -> crate::Result<()> {
+        let (child, mut flags) = inner_menu_child_and_flags!(item);
+
+        {
+            child
+                .borrow_mut()
+                .root_menu_haccel_stores
+                .insert(self.internal_id, self.haccel_store.clone());
+        }
+
+        {
+            let child_ = child.borrow();
+            if !child_.enabled {
+                flags |= MF_GRAYED;
+            }
+
+            let mut text = child_.text.clone();
+
+            if let Some(accelerator) = &child_.accelerator {
+                let accel_str = accelerator.to_string();
+
+                text.push('\t');
+                text.push_str(&accel_str);
+
+                AccelAction::add(
+                    &mut self.haccel_store.borrow_mut(),
+                    child_.internal_id(),
+                    accelerator,
+                )?;
+            }
+
+            let id = child_.internal_id() as usize;
+
+            let text = encode_wide(text);
+            unsafe {
+                match op {
+                    AddOp::Append => {
+                        AppendMenuW(self.hmenu, flags, id, text.as_ptr());
+                        AppendMenuW(self.hpopupmenu, flags, id, text.as_ptr());
+                    }
+                    AddOp::Insert(position) => {
+                        InsertMenuW(
+                            self.hmenu,
+                            position as _,
+                            flags | MF_BYPOSITION,
+                            id,
+                            text.as_ptr(),
+                        );
+                        InsertMenuW(
+                            self.hpopupmenu,
+                            position as _,
+                            flags | MF_BYPOSITION,
+                            id,
+                            text.as_ptr(),
+                        );
+                    }
+                }
+            }
+        }
+
+        {
+            let child_ = child.borrow();
+            let item_type = child_.item_type();
+
+            // Set icons for both regular menu items and submenus
+            if matches!(item_type, MenuItemType::Icon | MenuItemType::Submenu) {
+                let hbitmap = child_
+                    .icon
+                    .as_ref()
+                    .map(|i| unsafe { i.inner.to_hbitmap() })
+                    .unwrap_or(std::ptr::null_mut());
+
+                let info = create_icon_item_info(hbitmap);
+
+                unsafe {
+                    SetMenuItemInfoW(self.hmenu, child_.internal_id(), FALSE, &info);
+                    SetMenuItemInfoW(self.hpopupmenu, child_.internal_id(), FALSE, &info);
+                };
+            }
+        }
+
+        // redraw the menu bar
+        for hwnd in self.hwnds.borrow().keys() {
+            unsafe { DrawMenuBar(*hwnd as _) };
+        }
+
+        {
+            let mut child_ = child.borrow_mut();
+            child_
+                .parents_hemnu
+                .push((self.hmenu, Some(self.hwnds.clone())));
+            child_.parents_hemnu.push((self.hpopupmenu, None));
+        }
+
+        {
+            match op {
+                AddOp::Append => self.children.push(child),
+                AddOp::Insert(position) => self.children.insert(position, child),
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn remove(&mut self, item: &dyn IsMenuItem) -> crate::Result<()> {
+        let id = item.child().borrow().internal_id();
+        unsafe {
+            RemoveMenu(self.hmenu, id, MF_BYCOMMAND);
+            RemoveMenu(self.hpopupmenu, id, MF_BYCOMMAND);
+
+            // redraw the menu bar
+            for hwnd in self.hwnds.borrow().keys() {
+                DrawMenuBar(*hwnd as _);
+            }
+        }
+
+        let child = item.child();
+
+        {
+            let mut child = child.borrow_mut();
+            let index = child
+                .parents_hemnu
+                .iter()
+                .position(|&(h, _)| h == self.hmenu)
+                .ok_or(crate::Error::NotAChildOfThisMenu)?;
+            child.parents_hemnu.remove(index);
+            let index = child
+                .parents_hemnu
+                .iter()
+                .position(|&(h, _)| h == self.hpopupmenu)
+                .ok_or(crate::Error::NotAChildOfThisMenu)?;
+            child.parents_hemnu.remove(index);
+        }
+
+        let index = self
+            .children
+            .iter()
+            .position(|e| e.borrow().internal_id() == id)
+            .ok_or(crate::Error::NotAChildOfThisMenu)?;
+        self.children.remove(index);
+
+        Ok(())
+    }
+
+    pub fn items(&self) -> Vec<MenuItemKind> {
+        self.children
+            .iter()
+            .map(|c| c.borrow().kind(c.clone()))
+            .collect()
+    }
+
+    fn find_by_id(&self, id: u32) -> Option<Rc<RefCell<MenuChild>>> {
+        find_by_id(id, &self.children)
+    }
+
+    pub fn haccel(&self) -> isize {
+        self.haccel_store.borrow().0 as _
+    }
+
+    pub fn hpopupmenu(&self) -> isize {
+        self.hpopupmenu as _
+    }
+
+    pub unsafe fn init_for_hwnd_with_theme(
+        &mut self,
+        hwnd: isize,
+        theme: MenuTheme,
+    ) -> crate::Result<()> {
+        if self.hwnds.borrow().contains_key(&hwnd) {
+            return Err(crate::Error::AlreadyInitialized);
+        }
+
+        self.hwnds.borrow_mut().insert(hwnd, theme);
+
+        // SAFETY: HWND validity is upheld by caller
+        SetWindowSubclass(
+            hwnd as _,
+            Some(menu_subclass_proc),
+            MENU_SUBCLASS_ID,
+            dwrefdata_from_obj(self),
+        );
+        SetMenu(hwnd as _, self.hmenu);
+        DrawMenuBar(hwnd as _);
+
+        Ok(())
+    }
+
+    pub unsafe fn init_for_hwnd(&mut self, hwnd: isize) -> crate::Result<()> {
+        self.init_for_hwnd_with_theme(hwnd, MenuTheme::Auto)
+    }
+
+    pub unsafe fn remove_for_hwnd(&mut self, hwnd: isize) -> crate::Result<()> {
+        self.hwnds
+            .borrow_mut()
+            .remove(&hwnd)
+            .ok_or(crate::Error::NotInitialized)?;
+        Self::remove_from_hwnd(hwnd);
+        Ok(())
+    }
+
+    unsafe fn remove_from_hwnd(hwnd: isize) {
+        let hwnd = hwnd as windows_sys::Win32::Foundation::HWND;
+        // SAFETY: HWND validity is upheld by caller
+        RemoveWindowSubclass(hwnd, Some(menu_subclass_proc), MENU_SUBCLASS_ID);
+        SetMenu(hwnd, std::ptr::null_mut());
+        DrawMenuBar(hwnd);
+    }
+
+    pub unsafe fn attach_menu_subclass_for_hwnd(&self, hwnd: isize) {
+        // SAFETY: HWND validity is upheld by caller
+        SetWindowSubclass(
+            hwnd as _,
+            Some(menu_subclass_proc),
+            MENU_SUBCLASS_ID,
+            dwrefdata_from_obj(self),
+        );
+    }
+
+    pub unsafe fn detach_menu_subclass_from_hwnd(&self, hwnd: isize) {
+        // SAFETY: HWND validity is upheld by caller
+        RemoveWindowSubclass(hwnd as _, Some(menu_subclass_proc), MENU_SUBCLASS_ID);
+    }
+
+    pub unsafe fn hide_for_hwnd(&self, hwnd: isize) -> crate::Result<()> {
+        if !self.hwnds.borrow().contains_key(&hwnd) {
+            return Err(crate::Error::NotInitialized);
+        }
+
+        // SAFETY: HWND validity is upheld by caller
+        SetMenu(hwnd as _, std::ptr::null_mut());
+        DrawMenuBar(hwnd as _);
+
+        Ok(())
+    }
+
+    pub unsafe fn show_for_hwnd(&self, hwnd: isize) -> crate::Result<()> {
+        if !self.hwnds.borrow().contains_key(&hwnd) {
+            return Err(crate::Error::NotInitialized);
+        }
+
+        // SAFETY: HWND validity is upheld by caller
+        SetMenu(hwnd as _, self.hmenu);
+        DrawMenuBar(hwnd as _);
+
+        Ok(())
+    }
+
+    pub unsafe fn is_visible_on_hwnd(&self, hwnd: isize) -> bool {
+        self.hwnds
+            .borrow()
+            .get(&hwnd)
+            // SAFETY: HWND validity is upheld by caller
+            .map(|_| !unsafe { GetMenu(hwnd as _) }.is_null())
+            .unwrap_or(false)
+    }
+
+    pub unsafe fn show_context_menu_for_hwnd(
+        &mut self,
+        hwnd: isize,
+        position: Option<Position>,
+    ) -> bool {
+        let rc = show_context_menu(hwnd as _, self.hpopupmenu, position);
+        if let Some(item) = rc.and_then(|rc| self.find_by_id(rc)) {
+            unsafe {
+                menu_selected(hwnd as _, &mut item.borrow_mut());
+            }
+            return true;
+        }
+        false
+    }
+
+    pub unsafe fn set_theme_for_hwnd(&self, hwnd: isize, theme: MenuTheme) -> crate::Result<()> {
+        if !self.hwnds.borrow().contains_key(&hwnd) {
+            return Err(crate::Error::NotInitialized);
+        }
+
+        // SAFETY: HWND validity is upheld by caller
+        SendMessageW(hwnd as _, MENU_UPDATE_THEME, 0, theme as _);
+
+        Ok(())
+    }
+}
+
+type ParentMenu = (HMENU, Option<Rc<RefCell<HashMap<Hwnd, MenuTheme>>>>);
+
+/// A generic child in a menu
+#[derive(Debug)]
+pub(crate) struct MenuChild {
+    // shared fields between submenus and menu items
+    item_type: MenuItemType,
+    text: String,
+    enabled: bool,
+    parents_hemnu: Vec<ParentMenu>,
+    root_menu_haccel_stores: HashMap<u32, Rc<RefCell<AccelWrapper>>>,
+
+    // menu item fields
+    internal_id: u32,
+    id: MenuId,
+    accelerator: Option<KeyAccelerator>,
+
+    // predefined menu item fields
+    predefined_item_type: Option<PredefinedMenuItemType>,
+
+    // check menu item fields
+    checked: bool,
+
+    // icon menu item fields
+    icon: Option<Icon>,
+
+    // submenu fields
+    hmenu: HMENU,
+    hpopupmenu: HMENU,
+    pub children: Option<Vec<Rc<RefCell<MenuChild>>>>,
+}
+
+impl Drop for MenuChild {
+    fn drop(&mut self) {
+        if self.item_type == MenuItemType::Submenu {
+            unsafe {
+                DestroyMenu(self.hmenu);
+                DestroyMenu(self.hpopupmenu);
+            }
+        }
+
+        if self.accelerator.is_some() {
+            for store in self.root_menu_haccel_stores.values() {
+                AccelAction::remove(&mut store.borrow_mut(), self.internal_id)
+            }
+        }
+    }
+}
+
+/// Constructors
+impl MenuChild {
+    pub fn new(
+        text: &str,
+        enabled: bool,
+        key_accelerator: Option<KeyAccelerator>,
+        id: Option<MenuId>,
+    ) -> Self {
+        let internal_id = COUNTER.next();
+        Self {
+            item_type: MenuItemType::MenuItem,
+            text: text.to_string(),
+            enabled,
+            parents_hemnu: Vec::new(),
+            internal_id,
+            id: id.unwrap_or_else(|| MenuId::new(internal_id.to_string())),
+            accelerator: key_accelerator,
+            root_menu_haccel_stores: HashMap::new(),
+            predefined_item_type: None,
+            icon: None,
+            checked: false,
+            children: None,
+            hmenu: std::ptr::null_mut(),
+            hpopupmenu: std::ptr::null_mut(),
+        }
+    }
+
+    pub fn new_submenu(text: &str, enabled: bool, id: Option<MenuId>) -> Self {
+        let internal_id = COUNTER.next();
+        Self {
+            item_type: MenuItemType::Submenu,
+            text: text.to_string(),
+            enabled,
+            parents_hemnu: Vec::new(),
+            children: Some(Vec::new()),
+            hmenu: unsafe { CreateMenu() },
+            internal_id,
+            id: id.unwrap_or_else(|| MenuId::new(internal_id.to_string())),
+            hpopupmenu: unsafe { CreatePopupMenu() },
+            root_menu_haccel_stores: HashMap::new(),
+            predefined_item_type: None,
+            icon: None,
+            checked: false,
+            accelerator: None,
+        }
+    }
+
+    pub fn new_predefined(item_type: PredefinedMenuItemType, text: Option<String>) -> Self {
+        let internal_id = COUNTER.next();
+        Self {
+            item_type: MenuItemType::Predefined,
+            text: text.unwrap_or_else(|| item_type.text().to_string()),
+            enabled: true,
+            parents_hemnu: Vec::new(),
+            internal_id,
+            id: MenuId::new(internal_id.to_string()),
+            accelerator: item_type.accelerator().map(Into::into),
+            predefined_item_type: Some(item_type),
+            root_menu_haccel_stores: HashMap::new(),
+            icon: None,
+            checked: false,
+            children: None,
+            hmenu: std::ptr::null_mut(),
+            hpopupmenu: std::ptr::null_mut(),
+        }
+    }
+
+    pub fn new_check(
+        text: &str,
+        enabled: bool,
+        checked: bool,
+        key_accelerator: Option<KeyAccelerator>,
+        id: Option<MenuId>,
+    ) -> Self {
+        let internal_id = COUNTER.next();
+        Self {
+            item_type: MenuItemType::Check,
+            text: text.to_string(),
+            enabled,
+            parents_hemnu: Vec::new(),
+            internal_id,
+            id: id.unwrap_or_else(|| MenuId::new(internal_id.to_string())),
+            accelerator: key_accelerator,
+            checked,
+            root_menu_haccel_stores: HashMap::new(),
+            predefined_item_type: None,
+            icon: None,
+            children: None,
+            hmenu: std::ptr::null_mut(),
+            hpopupmenu: std::ptr::null_mut(),
+        }
+    }
+
+    pub fn new_icon(
+        text: &str,
+        enabled: bool,
+        icon: Option<Icon>,
+        key_accelerator: Option<KeyAccelerator>,
+        id: Option<MenuId>,
+    ) -> Self {
+        let internal_id = COUNTER.next();
+        Self {
+            item_type: MenuItemType::Icon,
+            text: text.to_string(),
+            enabled,
+            parents_hemnu: Vec::new(),
+            internal_id,
+            id: id.unwrap_or_else(|| MenuId::new(internal_id.to_string())),
+            accelerator: key_accelerator,
+            icon,
+            root_menu_haccel_stores: HashMap::new(),
+            predefined_item_type: None,
+            checked: false,
+            children: None,
+            hmenu: std::ptr::null_mut(),
+            hpopupmenu: std::ptr::null_mut(),
+        }
+    }
+
+    pub fn new_native_icon(
+        text: &str,
+        enabled: bool,
+        _native_icon: Option<NativeIcon>,
+        key_accelerator: Option<KeyAccelerator>,
+        id: Option<MenuId>,
+    ) -> Self {
+        let internal_id = COUNTER.next();
+        Self {
+            item_type: MenuItemType::Icon,
+            text: text.to_string(),
+            enabled,
+            parents_hemnu: Vec::new(),
+            internal_id,
+            id: id.unwrap_or_else(|| MenuId::new(internal_id.to_string())),
+            accelerator: key_accelerator,
+            root_menu_haccel_stores: HashMap::new(),
+            predefined_item_type: None,
+            icon: None,
+            checked: false,
+            children: None,
+            hmenu: std::ptr::null_mut(),
+            hpopupmenu: std::ptr::null_mut(),
+        }
+    }
+}
+
+/// Shared methods
+impl MenuChild {
+    pub fn item_type(&self) -> MenuItemType {
+        self.item_type
+    }
+
+    pub fn id(&self) -> &MenuId {
+        &self.id
+    }
+
+    pub fn internal_id(&self) -> u32 {
+        match self.item_type() {
+            MenuItemType::Submenu => self.hmenu as u32,
+            _ => self.internal_id,
+        }
+    }
+
+    pub fn text(&self) -> String {
+        self.parents_hemnu
+            .first()
+            .map(|(hmenu, _)| {
+                let id = self.internal_id();
+                let mut info: MENUITEMINFOW = unsafe { std::mem::zeroed() };
+                info.cbSize = std::mem::size_of::<MENUITEMINFOW>() as _;
+                info.fMask = MIIM_STRING;
+
+                unsafe { GetMenuItemInfoW(*hmenu, id, FALSE, &mut info) };
+
+                info.cch += 1;
+                let mut dw_type_data = Vec::with_capacity(info.cch as usize);
+                info.dwTypeData = dw_type_data.as_mut_ptr();
+
+                unsafe { GetMenuItemInfoW(*hmenu, id, FALSE, &mut info) };
+
+                let text = decode_wide(info.dwTypeData);
+                text.split('\t').next().unwrap().to_string()
+            })
+            .unwrap_or_else(|| self.text.clone())
+    }
+
+    pub fn set_text(&mut self, text: &str) {
+        self.text = text.to_string();
+        let mut text = if let Some(accelerator) = &self.accelerator {
+            encode_wide(format!("{text}\t{}", accelerator))
+        } else {
+            encode_wide(text)
+        };
+
+        for (parent, menu_bars) in &self.parents_hemnu {
+            let mut info: MENUITEMINFOW = unsafe { std::mem::zeroed() };
+            info.cbSize = std::mem::size_of::<MENUITEMINFOW>() as _;
+            info.fMask = MIIM_STRING;
+            info.dwTypeData = text.as_mut_ptr();
+
+            unsafe { SetMenuItemInfoW(*parent, self.internal_id(), FALSE, &info) };
+
+            if let Some(menu_bars) = menu_bars {
+                for hwnd in menu_bars.borrow().keys() {
+                    unsafe { DrawMenuBar(*hwnd as _) };
+                }
+            }
+        }
+    }
+
+    pub fn is_enabled(&self) -> bool {
+        self.parents_hemnu
+            .first()
+            .map(|(hmenu, _)| {
+                let mut info: MENUITEMINFOW = unsafe { std::mem::zeroed() };
+                info.cbSize = std::mem::size_of::<MENUITEMINFOW>() as _;
+                info.fMask = MIIM_STATE;
+
+                unsafe { GetMenuItemInfoW(*hmenu, self.internal_id(), FALSE, &mut info) };
+
+                (info.fState & MFS_DISABLED) == 0
+            })
+            .unwrap_or(self.enabled)
+    }
+
+    pub fn set_enabled(&mut self, enabled: bool) {
+        self.enabled = enabled;
+        for (parent, menu_bars) in &self.parents_hemnu {
+            let flag = if enabled { MF_ENABLED } else { MF_DISABLED };
+            unsafe { EnableMenuItem(*parent, self.internal_id(), flag) };
+
+            if let Some(menu_bars) = menu_bars {
+                for hwnd in menu_bars.borrow().keys() {
+                    unsafe { DrawMenuBar(*hwnd as _) };
+                }
+            };
+        }
+    }
+
+    pub fn set_key_accelerator(
+        &mut self,
+        accelerator: Option<KeyAccelerator>,
+    ) -> crate::Result<()> {
+        self.accelerator = accelerator;
+        self.set_text(&self.text.clone());
+
+        for store in self.root_menu_haccel_stores.values() {
+            let mut store = store.borrow_mut();
+            if let Some(accelerator) = &self.accelerator {
+                AccelAction::add(&mut store, self.internal_id, accelerator)?
+            } else {
+                AccelAction::remove(&mut store, self.internal_id)
+            }
+        }
+
+        Ok(())
+    }
+}
+
+/// CheckMenuItem methods
+impl MenuChild {
+    pub fn is_checked(&self) -> bool {
+        self.parents_hemnu
+            .first()
+            .map(|(hmenu, _)| {
+                let mut info: MENUITEMINFOW = unsafe { std::mem::zeroed() };
+                info.cbSize = std::mem::size_of::<MENUITEMINFOW>() as _;
+                info.fMask = MIIM_STATE;
+
+                unsafe { GetMenuItemInfoW(*hmenu, self.internal_id(), FALSE, &mut info) };
+
+                (info.fState & MFS_CHECKED) != 0
+            })
+            .unwrap_or(self.enabled)
+    }
+
+    pub fn set_checked(&mut self, checked: bool) {
+        use windows_sys::Win32::UI::WindowsAndMessaging;
+
+        self.checked = checked;
+        for (parent, menu_bars) in &self.parents_hemnu {
+            let flag = if checked { MF_CHECKED } else { MF_UNCHECKED };
+            unsafe { WindowsAndMessaging::CheckMenuItem(*parent, self.internal_id(), flag) };
+
+            if let Some(menu_bars) = menu_bars {
+                for hwnd in menu_bars.borrow().keys() {
+                    unsafe { DrawMenuBar(*hwnd as _) };
+                }
+            };
+        }
+    }
+}
+
+/// IconMenuItem methods
+impl MenuChild {
+    pub fn set_icon(&mut self, icon: Option<Icon>) {
+        self.icon.clone_from(&icon);
+
+        let hbitmap = icon
+            .map(|i| unsafe { i.inner.to_hbitmap() })
+            .unwrap_or(std::ptr::null_mut());
+
+        let info = create_icon_item_info(hbitmap);
+
+        for (parent, menu_bars) in &self.parents_hemnu {
+            unsafe { SetMenuItemInfoW(*parent, self.internal_id(), FALSE, &info) };
+
+            if let Some(menu_bars) = menu_bars {
+                for hwnd in menu_bars.borrow().keys() {
+                    unsafe { DrawMenuBar(*hwnd as _) };
+                }
+            };
+        }
+    }
+}
+
+/// Submenu methods
+impl MenuChild {
+    pub fn hpopupmenu(&self) -> isize {
+        self.hpopupmenu as _
+    }
+
+    pub fn add_menu_item(&mut self, item: &dyn IsMenuItem, op: AddOp) -> crate::Result<()> {
+        let (child, mut flags) = inner_menu_child_and_flags!(item);
+
+        {
+            child
+                .borrow_mut()
+                .root_menu_haccel_stores
+                .extend(self.root_menu_haccel_stores.clone());
+        }
+
+        {
+            let child_ = child.borrow();
+            if !child_.enabled {
+                flags |= MF_GRAYED;
+            }
+
+            let mut text = child_.text.clone();
+
+            if let Some(accelerator) = &child_.accelerator {
+                let accel_str = accelerator.to_string();
+
+                text.push('\t');
+                text.push_str(&accel_str);
+
+                for root_menu in self.root_menu_haccel_stores.values() {
+                    let mut haccel = root_menu.borrow_mut();
+                    AccelAction::add(&mut haccel, child_.internal_id(), accelerator)?;
+                }
+            }
+
+            let id = child_.internal_id() as usize;
+            let text = encode_wide(text);
+            unsafe {
+                match op {
+                    AddOp::Append => {
+                        AppendMenuW(self.hmenu, flags, id, text.as_ptr());
+                        AppendMenuW(self.hpopupmenu, flags, id, text.as_ptr());
+                    }
+                    AddOp::Insert(position) => {
+                        InsertMenuW(
+                            self.hmenu,
+                            position as _,
+                            flags | MF_BYPOSITION,
+                            id,
+                            text.as_ptr(),
+                        );
+                        InsertMenuW(
+                            self.hpopupmenu,
+                            position as _,
+                            flags | MF_BYPOSITION,
+                            id,
+                            text.as_ptr(),
+                        );
+                    }
+                }
+            }
+        }
+
+        {
+            let child_ = child.borrow();
+            let item_type = child_.item_type();
+
+            if matches!(item_type, MenuItemType::Icon | MenuItemType::Submenu) {
+                let hbitmap = child_
+                    .icon
+                    .as_ref()
+                    .map(|i| unsafe { i.inner.to_hbitmap() })
+                    .unwrap_or(std::ptr::null_mut());
+                let info = create_icon_item_info(hbitmap);
+                unsafe {
+                    SetMenuItemInfoW(self.hmenu, child_.internal_id(), FALSE, &info);
+                    SetMenuItemInfoW(self.hpopupmenu, child_.internal_id(), FALSE, &info);
+                };
+            }
+        }
+
+        {
+            let mut child_ = child.borrow_mut();
+            child_.parents_hemnu.push((self.hmenu, None));
+            child_.parents_hemnu.push((self.hpopupmenu, None));
+        }
+
+        {
+            let children = self.children.as_mut().unwrap();
+            match op {
+                AddOp::Append => children.push(child),
+                AddOp::Insert(position) => children.insert(position, child),
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn remove(&mut self, item: &dyn IsMenuItem) -> crate::Result<()> {
+        let id = item.child().borrow().internal_id();
+        unsafe {
+            RemoveMenu(self.hmenu, id, MF_BYCOMMAND);
+            RemoveMenu(self.hpopupmenu, id, MF_BYCOMMAND);
+        }
+
+        let child = item.child();
+
+        {
+            let mut child = child.borrow_mut();
+            let index = child
+                .parents_hemnu
+                .iter()
+                .position(|&(h, _)| h == self.hmenu)
+                .ok_or(crate::Error::NotAChildOfThisMenu)?;
+            child.parents_hemnu.remove(index);
+            let index = child
+                .parents_hemnu
+                .iter()
+                .position(|&(h, _)| h == self.hpopupmenu)
+                .ok_or(crate::Error::NotAChildOfThisMenu)?;
+            child.parents_hemnu.remove(index);
+        }
+
+        let children = self.children.as_mut().unwrap();
+        let index = children
+            .iter()
+            .position(|e| e.borrow().internal_id() == id)
+            .ok_or(crate::Error::NotAChildOfThisMenu)?;
+        children.remove(index);
+
+        Ok(())
+    }
+
+    pub fn items(&self) -> Vec<MenuItemKind> {
+        self.children
+            .as_ref()
+            .unwrap()
+            .iter()
+            .map(|c| c.borrow().kind(c.clone()))
+            .collect()
+    }
+
+    pub unsafe fn show_context_menu_for_hwnd(
+        &mut self,
+        hwnd: isize,
+        position: Option<Position>,
+    ) -> bool {
+        let rc = show_context_menu(hwnd as _, self.hpopupmenu, position);
+        if let Some(item) = rc.and_then(|rc| self.find_by_id(rc)) {
+            unsafe {
+                menu_selected(hwnd as _, &mut item.borrow_mut());
+            }
+            return true;
+        }
+        false
+    }
+
+    pub unsafe fn attach_menu_subclass_for_hwnd(&self, hwnd: isize) {
+        // SAFETY: HWND validity is upheld by caller
+        SetWindowSubclass(
+            hwnd as _,
+            Some(menu_subclass_proc),
+            SUBMENU_SUBCLASS_ID,
+            dwrefdata_from_obj(self),
+        );
+    }
+
+    pub unsafe fn detach_menu_subclass_from_hwnd(&self, hwnd: isize) {
+        // SAFETY: HWND validity is upheld by caller
+        RemoveWindowSubclass(hwnd as _, Some(menu_subclass_proc), SUBMENU_SUBCLASS_ID);
+    }
+}
+
+/// Internal Utilities
+impl MenuChild {
+    fn find_by_id(&self, id: u32) -> Option<Rc<RefCell<MenuChild>>> {
+        let children = self.children.as_ref().unwrap();
+        find_by_id(id, children)
+    }
+}
+
+fn find_by_id(id: u32, children: &Vec<Rc<RefCell<MenuChild>>>) -> Option<Rc<RefCell<MenuChild>>> {
+    for i in children {
+        let item = i.borrow();
+        if item.internal_id() == id {
+            return Some(i.clone());
+        }
+
+        if item.item_type() == MenuItemType::Submenu {
+            if let Some(child) = item.find_by_id(id) {
+                return Some(child);
+            }
+        }
+    }
+    None
+}
+
+// SAFETY:
+// HWND validity is upheld by caller
+unsafe fn show_context_menu(
+    hwnd: windows_sys::Win32::Foundation::HWND,
+    hmenu: HMENU,
+    position: Option<Position>,
+) -> Option<u32> {
+    let result = unsafe {
+        let pt = if let Some(pos) = position {
+            let dpi = util::hwnd_dpi(hwnd);
+            let scale_factor = util::dpi_to_scale_factor(dpi);
+            let pos = pos.to_physical::<i32>(scale_factor);
+            let mut pt = POINT {
+                x: pos.x as _,
+                y: pos.y as _,
+            };
+            ClientToScreen(hwnd, &mut pt);
+            pt
+        } else {
+            let mut pt = POINT { x: 0, y: 0 };
+            GetCursorPos(&mut pt);
+            pt
+        };
+        SetForegroundWindow(hwnd);
+        TrackPopupMenu(
+            hmenu,
+            TPM_LEFTALIGN | TPM_RETURNCMD,
+            pt.x,
+            pt.y,
+            0,
+            hwnd,
+            std::ptr::null(),
+        )
+    };
+    (result > 0).then_some(result.try_into().ok()).flatten()
+}
+
+struct AccelAction;
+
+impl AccelAction {
+    fn add(
+        haccel_store: &mut RefMut<AccelWrapper>,
+        id: u32,
+        accelerator: &KeyAccelerator,
+    ) -> crate::Result<()> {
+        let accel = accelerator.to_accel(id as _)?;
+        haccel_store.1.insert(id, Accel(accel));
+        Self::update_store(haccel_store);
+        Ok(())
+    }
+
+    fn remove(haccel_store: &mut RefMut<AccelWrapper>, id: u32) {
+        haccel_store.1.remove(&id);
+        Self::update_store(haccel_store)
+    }
+
+    fn update_store(haccel_store: &mut RefMut<AccelWrapper>) {
+        unsafe {
+            DestroyAcceleratorTable(haccel_store.0);
+            let len = haccel_store.1.len();
+            let accels = haccel_store.1.values().map(|i| i.0).collect::<Vec<_>>();
+            haccel_store.0 = CreateAcceleratorTableW(accels.as_ptr(), len as _);
+        }
+    }
+}
+
+fn create_icon_item_info(hbitmap: HBITMAP) -> MENUITEMINFOW {
+    let mut info: MENUITEMINFOW = unsafe { std::mem::zeroed() };
+    info.cbSize = std::mem::size_of::<MENUITEMINFOW>() as _;
+    info.fMask = MIIM_BITMAP;
+    info.hbmpItem = hbitmap;
+    info
+}
+
+fn dwrefdata_from_obj<T>(obj: &T) -> usize {
+    (obj as *const T) as usize
+}
+
+unsafe fn obj_from_dwrefdata<T>(dwrefdata: usize) -> &'static mut T {
+    unsafe { (dwrefdata as *mut T).as_mut().unwrap() }
+}
+
+const MENU_SUBCLASS_ID: usize = 200;
+const MENU_UPDATE_THEME: u32 = 201;
+const SUBMENU_SUBCLASS_ID: usize = 202;
+
+unsafe extern "system" fn menu_subclass_proc(
+    hwnd: windows_sys::Win32::Foundation::HWND,
+    msg: u32,
+    wparam: WPARAM,
+    lparam: LPARAM,
+    uidsubclass: usize,
+    dwrefdata: usize,
+) -> LRESULT {
+    match msg {
+        MENU_UPDATE_THEME if uidsubclass == MENU_SUBCLASS_ID => {
+            let menu = obj_from_dwrefdata::<Menu>(dwrefdata);
+            let theme: MenuTheme = std::mem::transmute(lparam);
+            menu.hwnds.borrow_mut().insert(hwnd as _, theme);
+            if GetActiveWindow() == hwnd {
+                PostMessageW(hwnd, WM_NCACTIVATE, 0, 0);
+                PostMessageW(hwnd, WM_NCACTIVATE, true.into(), 0);
+            } else {
+                PostMessageW(hwnd, WM_NCACTIVATE, true.into(), 0);
+                PostMessageW(hwnd, WM_NCACTIVATE, 0, 0);
+            }
+            0
+        }
+
+        WM_COMMAND => {
+            let id = util::LOWORD(wparam as _) as u32;
+
+            let item = match uidsubclass {
+                MENU_SUBCLASS_ID => {
+                    let menu = obj_from_dwrefdata::<Menu>(dwrefdata);
+                    menu.find_by_id(id)
+                }
+                SUBMENU_SUBCLASS_ID => {
+                    let menu = obj_from_dwrefdata::<MenuChild>(dwrefdata);
+                    menu.find_by_id(id)
+                }
+                _ => unreachable!(),
+            };
+
+            if let Some(item) = item {
+                menu_selected(hwnd, &mut item.borrow_mut());
+                0
+            } else {
+                DefSubclassProc(hwnd as _, msg, wparam, lparam)
+            }
+        }
+
+        WM_UAHDRAWMENUITEM | WM_UAHDRAWMENU if uidsubclass == MENU_SUBCLASS_ID => {
+            let menu = obj_from_dwrefdata::<Menu>(dwrefdata);
+            let theme = menu
+                .hwnds
+                .borrow()
+                .get(&(hwnd as _))
+                .copied()
+                .unwrap_or(MenuTheme::Auto);
+            if theme.should_use_dark(hwnd as _) {
+                dark_menu_bar::draw(hwnd as _, msg, wparam, lparam);
+                0
+            } else {
+                DefSubclassProc(hwnd as _, msg, wparam, lparam)
+            }
+        }
+        WM_NCACTIVATE | WM_NCPAINT => {
+            // DefSubclassProc needs to be called before calling the
+            // custom dark menu redraw
+            let res = DefSubclassProc(hwnd as _, msg, wparam, lparam);
+
+            let menu = obj_from_dwrefdata::<Menu>(dwrefdata);
+            let theme = menu
+                .hwnds
+                .borrow()
+                .get(&(hwnd as _))
+                .copied()
+                .unwrap_or(MenuTheme::Auto);
+            if theme.should_use_dark(hwnd as _) {
+                dark_menu_bar::draw(hwnd as _, msg, wparam, lparam);
+            }
+
+            res
+        }
+        _ => DefSubclassProc(hwnd as _, msg, wparam, lparam),
+    }
+}
+
+unsafe fn menu_selected(hwnd: windows_sys::Win32::Foundation::HWND, item: &mut MenuChild) {
+    let (mut dispatch, mut menu_id) = (true, None);
+
+    {
+        if item.item_type() == MenuItemType::Predefined {
+            dispatch = false;
+        } else {
+            menu_id.replace(item.id.clone());
+        }
+
+        match item.item_type() {
+            MenuItemType::Check => {
+                let checked = !item.checked;
+                item.set_checked(checked);
+            }
+            MenuItemType::Predefined => {
+                if let Some(predefined_item_type) = &item.predefined_item_type {
+                    match predefined_item_type {
+                        PredefinedMenuItemType::Copy => execute_edit_command(EditCommand::Copy),
+                        PredefinedMenuItemType::Cut => execute_edit_command(EditCommand::Cut),
+                        PredefinedMenuItemType::Paste => execute_edit_command(EditCommand::Paste),
+                        PredefinedMenuItemType::SelectAll => {
+                            execute_edit_command(EditCommand::SelectAll)
+                        }
+                        PredefinedMenuItemType::Undo => execute_edit_command(EditCommand::Undo),
+                        PredefinedMenuItemType::Redo => execute_edit_command(EditCommand::Redo),
+                        PredefinedMenuItemType::Separator => {}
+                        PredefinedMenuItemType::Minimize => {
+                            ShowWindow(hwnd, SW_MINIMIZE);
+                        }
+                        PredefinedMenuItemType::Maximize => {
+                            ShowWindow(hwnd, SW_MAXIMIZE);
+                        }
+                        PredefinedMenuItemType::Hide => {
+                            ShowWindow(hwnd, SW_HIDE);
+                        }
+                        PredefinedMenuItemType::CloseWindow => {
+                            SendMessageW(hwnd, WM_CLOSE, 0, 0);
+                        }
+                        PredefinedMenuItemType::Quit => {
+                            PostQuitMessage(0);
+                        }
+                        PredefinedMenuItemType::About(Some(ref metadata)) => {
+                            show_about_dialog(hwnd as _, metadata)
+                        }
+
+                        _ => {}
+                    }
+                }
+            }
+            _ => {}
+        }
+    }
+
+    if dispatch {
+        MenuEvent::send(MenuEvent {
+            id: menu_id.unwrap(),
+        });
+    }
+}
+
+impl MenuTheme {
+    fn should_use_dark(&self, hwnd: isize) -> bool {
+        match self {
+            MenuTheme::Dark => true,
+            MenuTheme::Auto if dark_menu_bar::should_use_dark_mode(hwnd as _) => true,
+            _ => false,
+        }
+    }
+}
+
+enum EditCommand {
+    Copy,
+    Cut,
+    Paste,
+    SelectAll,
+    Undo,
+    Redo,
+}
+
+fn execute_edit_command(command: EditCommand) {
+    let key = match command {
+        EditCommand::Copy => 0x43,      // c
+        EditCommand::Cut => 0x58,       // x
+        EditCommand::Paste => 0x56,     // v
+        EditCommand::SelectAll => 0x41, // a
+        EditCommand::Undo => 0x5A,      // z
+        EditCommand::Redo => 0x59,      // y
+    };
+
+    unsafe {
+        let mut inputs: [INPUT; 4] = std::mem::zeroed();
+        inputs[0].r#type = INPUT_KEYBOARD;
+        inputs[0].Anonymous.ki.wVk = VK_CONTROL;
+        inputs[0].Anonymous.ki.dwFlags = 0;
+
+        inputs[1].r#type = INPUT_KEYBOARD;
+        inputs[1].Anonymous.ki.wVk = key;
+        inputs[1].Anonymous.ki.dwFlags = 0;
+
+        inputs[2].r#type = INPUT_KEYBOARD;
+        inputs[2].Anonymous.ki.wVk = key;
+        inputs[2].Anonymous.ki.dwFlags = KEYEVENTF_KEYUP;
+
+        inputs[3].r#type = INPUT_KEYBOARD;
+        inputs[3].Anonymous.ki.wVk = VK_CONTROL;
+        inputs[3].Anonymous.ki.dwFlags = KEYEVENTF_KEYUP;
+
+        SendInput(4, &inputs as *const _, std::mem::size_of::<INPUT>() as _);
+    }
+}
+
+fn show_about_dialog(hwnd: Hwnd, metadata: &AboutMetadata) {
+    use std::fmt::Write;
+
+    let mut message = String::new();
+    if let Some(name) = &metadata.name {
+        let _ = writeln!(&mut message, "Name: {}", name);
+    }
+    if let Some(version) = &metadata.full_version() {
+        let _ = writeln!(&mut message, "Version: {}", version);
+    }
+    if let Some(authors) = &metadata.authors {
+        let _ = writeln!(&mut message, "Authors: {}", authors.join(", "));
+    }
+    if let Some(license) = &metadata.license {
+        let _ = writeln!(&mut message, "License: {}", license);
+    }
+    match (&metadata.website_label, &metadata.website) {
+        (Some(label), None) => {
+            let _ = writeln!(&mut message, "Website: {}", label);
+        }
+        (None, Some(url)) => {
+            let _ = writeln!(&mut message, "Website: {}", url);
+        }
+        (Some(label), Some(url)) => {
+            let _ = writeln!(&mut message, "Website: {} {}", label, url);
+        }
+        _ => {}
+    }
+    if let Some(comments) = &metadata.comments {
+        let _ = writeln!(&mut message, "\n{}", comments);
+    }
+    if let Some(copyright) = &metadata.copyright {
+        let _ = writeln!(&mut message, "\n{}", copyright);
+    }
+
+    let message = encode_wide(message);
+    let title = encode_wide(format!(
+        "About {}",
+        metadata.name.as_deref().unwrap_or_default()
+    ));
+
+    #[cfg(not(feature = "common-controls-v6"))]
+    std::thread::spawn(move || unsafe {
+        use windows_sys::Win32::UI::WindowsAndMessaging::{MessageBoxW, MB_ICONINFORMATION};
+        MessageBoxW(
+            hwnd as _,
+            message.as_ptr(),
+            title.as_ptr(),
+            MB_ICONINFORMATION,
+        );
+    });
+
+    #[cfg(feature = "common-controls-v6")]
+    {
+        use windows_sys::Win32::UI::Controls::{
+            TaskDialogIndirect, TASKDIALOGCONFIG, TASKDIALOGCONFIG_0, TASKDIALOGCONFIG_1,
+            TDCBF_OK_BUTTON, TDF_ALLOW_DIALOG_CANCELLATION, TD_INFORMATION_ICON,
+        };
+
+        std::thread::spawn(move || unsafe {
+            let task_dialog_config = TASKDIALOGCONFIG {
+                cbSize: core::mem::size_of::<TASKDIALOGCONFIG>() as u32,
+                hwndParent: hwnd as _,
+                dwFlags: TDF_ALLOW_DIALOG_CANCELLATION,
+                pszWindowTitle: title.as_ptr(),
+                pszContent: message.as_ptr(),
+                Anonymous1: TASKDIALOGCONFIG_0 {
+                    pszMainIcon: TD_INFORMATION_ICON,
+                },
+                Anonymous2: TASKDIALOGCONFIG_1 {
+                    pszFooterIcon: std::ptr::null(),
+                },
+                dwCommonButtons: TDCBF_OK_BUTTON,
+                pButtons: std::ptr::null(),
+                cButtons: 0,
+                pRadioButtons: std::ptr::null(),
+                cRadioButtons: 0,
+                cxWidth: 0,
+                hInstance: std::ptr::null_mut(),
+                pfCallback: None,
+                lpCallbackData: 0,
+                nDefaultButton: 0,
+                nDefaultRadioButton: 0,
+                pszCollapsedControlText: std::ptr::null(),
+                pszExpandedControlText: std::ptr::null(),
+                pszExpandedInformation: std::ptr::null(),
+                pszMainInstruction: std::ptr::null(),
+                pszVerificationText: std::ptr::null(),
+                pszFooter: std::ptr::null(),
+            };
+
+            let mut pf_verification_flag_checked = 0;
+            let mut pn_button = 0;
+            let mut pn_radio_button = 0;
+
+            TaskDialogIndirect(
+                &task_dialog_config,
+                &mut pn_button,
+                &mut pn_radio_button,
+                &mut pf_verification_flag_checked,
+            )
+        });
+    }
+}
diff --git a/ports/muda/src/platform_impl/windows/util.rs b/ports/muda/src/platform_impl/windows/util.rs
new file mode 100644
index 000000000000..fdbfb82ef07a
--- /dev/null
+++ b/ports/muda/src/platform_impl/windows/util.rs
@@ -0,0 +1,173 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::ops::{Deref, DerefMut};
+
+use once_cell::sync::Lazy;
+use windows_sys::{
+    core::HRESULT,
+    Win32::{
+        Foundation::{FARPROC, HWND, S_OK},
+        Graphics::Gdi::{
+            GetDC, GetDeviceCaps, MonitorFromWindow, HMONITOR, LOGPIXELSX, MONITOR_DEFAULTTONEAREST,
+        },
+        System::LibraryLoader::{GetProcAddress, LoadLibraryW},
+        UI::{
+            HiDpi::{MDT_EFFECTIVE_DPI, MONITOR_DPI_TYPE},
+            WindowsAndMessaging::{IsProcessDPIAware, ACCEL},
+        },
+    },
+};
+
+pub fn encode_wide<S: AsRef<std::ffi::OsStr>>(string: S) -> Vec<u16> {
+    std::os::windows::prelude::OsStrExt::encode_wide(string.as_ref())
+        .chain(std::iter::once(0))
+        .collect()
+}
+
+#[allow(non_snake_case)]
+pub fn LOWORD(dword: u32) -> u16 {
+    (dword & 0xFFFF) as u16
+}
+
+pub fn decode_wide(w_str: *mut u16) -> String {
+    let len = unsafe { windows_sys::Win32::Globalization::lstrlenW(w_str) } as usize;
+    let w_str_slice = unsafe { std::slice::from_raw_parts(w_str, len) };
+    String::from_utf16_lossy(w_str_slice)
+}
+
+/// ACCEL wrapper to implement Debug
+#[derive(Clone)]
+#[repr(transparent)]
+pub struct Accel(pub ACCEL);
+
+impl std::fmt::Debug for Accel {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("ACCEL")
+            .field("key", &self.0.key)
+            .field("cmd", &self.0.cmd)
+            .field("fVirt", &self.0.fVirt)
+            .finish()
+    }
+}
+
+impl Deref for Accel {
+    type Target = ACCEL;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl DerefMut for Accel {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+// taken from winit's code base
+// https://github.com/rust-windowing/winit/blob/ee88e38f13fbc86a7aafae1d17ad3cd4a1e761df/src/platform_impl/windows/util.rs#L138
+pub fn get_instance_handle() -> windows_sys::Win32::Foundation::HMODULE {
+    // Gets the instance handle by taking the address of the
+    // pseudo-variable created by the microsoft linker:
+    // https://devblogs.microsoft.com/oldnewthing/20041025-00/?p=37483
+
+    // This is preferred over GetModuleHandle(NULL) because it also works in DLLs:
+    // https://stackoverflow.com/questions/21718027/getmodulehandlenull-vs-hinstance
+
+    extern "C" {
+        static __ImageBase: windows_sys::Win32::System::SystemServices::IMAGE_DOS_HEADER;
+    }
+
+    unsafe { &__ImageBase as *const _ as _ }
+}
+
+fn get_function_impl(library: &str, function: &str) -> FARPROC {
+    let library = encode_wide(library);
+    assert_eq!(function.chars().last(), Some('\0'));
+
+    // Library names we will use are ASCII so we can use the A version to avoid string conversion.
+    let module = unsafe { LoadLibraryW(library.as_ptr()) };
+    if module.is_null() {
+        return None;
+    }
+
+    unsafe { GetProcAddress(module, function.as_ptr()) }
+}
+
+macro_rules! get_function {
+    ($lib:expr, $func:ident) => {
+        crate::platform_impl::platform::util::get_function_impl(
+            $lib,
+            concat!(stringify!($func), '\0'),
+        )
+        .map(|f| unsafe { std::mem::transmute::<_, $func>(f) })
+    };
+}
+
+pub type GetDpiForWindow = unsafe extern "system" fn(hwnd: HWND) -> u32;
+pub type GetDpiForMonitor = unsafe extern "system" fn(
+    hmonitor: HMONITOR,
+    dpi_type: MONITOR_DPI_TYPE,
+    dpi_x: *mut u32,
+    dpi_y: *mut u32,
+) -> HRESULT;
+
+static GET_DPI_FOR_WINDOW: Lazy<Option<GetDpiForWindow>> =
+    Lazy::new(|| get_function!("user32.dll", GetDpiForWindow));
+static GET_DPI_FOR_MONITOR: Lazy<Option<GetDpiForMonitor>> =
+    Lazy::new(|| get_function!("shcore.dll", GetDpiForMonitor));
+
+pub const BASE_DPI: u32 = 96;
+pub fn dpi_to_scale_factor(dpi: u32) -> f64 {
+    dpi as f64 / BASE_DPI as f64
+}
+
+#[allow(non_snake_case)]
+pub unsafe fn hwnd_dpi(hwnd: HWND) -> u32 {
+    if let Some(GetDpiForWindow) = *GET_DPI_FOR_WINDOW {
+        // We are on Windows 10 Anniversary Update (1607) or later.
+        match GetDpiForWindow(hwnd) {
+            0 => BASE_DPI, // 0 is returned if hwnd is invalid
+            #[allow(clippy::unnecessary_cast)]
+            dpi => dpi as u32,
+        }
+    } else if let Some(GetDpiForMonitor) = *GET_DPI_FOR_MONITOR {
+        // We are on Windows 8.1 or later.
+        let monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
+        if monitor.is_null() {
+            return BASE_DPI;
+        }
+
+        let mut dpi_x = 0;
+        let mut dpi_y = 0;
+        #[allow(clippy::unnecessary_cast)]
+        if GetDpiForMonitor(monitor, MDT_EFFECTIVE_DPI, &mut dpi_x, &mut dpi_y) == S_OK {
+            dpi_x as u32
+        } else {
+            BASE_DPI
+        }
+    } else {
+        let hdc = GetDC(hwnd);
+        if hdc.is_null() {
+            return BASE_DPI;
+        }
+
+        // We are on Vista or later.
+        if IsProcessDPIAware() == 1 {
+            // If the process is DPI aware, then scaling must be handled by the application using
+            // this DPI value.
+            GetDeviceCaps(hdc, LOGPIXELSX as _) as u32
+        } else {
+            // If the process is DPI unaware, then scaling is performed by the OS; we thus return
+            // 96 (scale factor 1.0) to prevent the window from being re-scaled by both the
+            // application and the WM.
+            BASE_DPI
+        }
+    }
+}
diff --git a/ports/muda/src/util.rs b/ports/muda/src/util.rs
new file mode 100644
index 000000000000..d996f14eb911
--- /dev/null
+++ b/ports/muda/src/util.rs
@@ -0,0 +1,33 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::sync::atomic::{AtomicU32, Ordering};
+
+#[derive(Clone, Copy, Debug)]
+pub enum AddOp {
+    Append,
+    Insert(usize),
+}
+
+pub struct Counter(AtomicU32);
+
+impl Counter {
+    #[allow(unused)]
+    pub const fn new() -> Self {
+        Self(AtomicU32::new(1))
+    }
+
+    #[allow(unused)]
+    pub const fn new_with_start(start: u32) -> Self {
+        Self(AtomicU32::new(start))
+    }
+
+    pub fn next(&self) -> u32 {
+        self.0.fetch_add(1, Ordering::Relaxed)
+    }
+}
diff --git a/ports/tao/.changes/taskbar-created-lock.md b/ports/tao/.changes/taskbar-created-lock.md
new file mode 100644
index 000000000000..688af74ed77b
--- /dev/null
+++ b/ports/tao/.changes/taskbar-created-lock.md
@@ -0,0 +1,5 @@
+---
+'tao': patch
+---
+
+Release the window state lock before updating taskbar visibility on Windows to avoid a reentrant `TaskbarCreated` deadlock.
diff --git a/ports/tao/Cargo.lock b/ports/tao/Cargo.lock
index 618c4e71362d..c9a8ddbc2215 100644
--- a/ports/tao/Cargo.lock
+++ b/ports/tao/Cargo.lock
@@ -427,9 +427,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.18"
+version = "0.9.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -2090,9 +2090,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quick-xml"
-version = "0.39.2"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d"
+checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
 dependencies = [
  "memchr",
 ]
@@ -2852,9 +2852,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa75f400b7f719bcd68b3f47cd939ba654cedeef690f486db71331eec4c6a406"
+checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
 dependencies = [
  "cc",
  "downcast-rs",
@@ -2866,9 +2866,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.13"
+version = "0.31.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab51d9f7c071abeee76007e2b742499e535148035bb835f97aaed1338cf516c3"
+checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
 dependencies = [
  "bitflags 2.13.0",
  "rustix 1.0.7",
@@ -2878,9 +2878,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.11"
+version = "0.32.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b23b5df31ceff1328f06ac607591d5ba360cf58f90c8fad4ac8d3a55a3c4aec7"
+checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6"
 dependencies = [
  "bitflags 2.13.0",
  "wayland-backend",
@@ -2890,9 +2890,7 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c86287151a309799b821ca709b7345a048a2956af05957c89cb824ab919fa4e3"
+version = "0.31.10"
 dependencies = [
  "proc-macro2",
  "quick-xml",
@@ -2901,9 +2899,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.10"
+version = "0.31.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374f6b70e8e0d6bf9461a32988fd553b59ff630964924dad6e4a4eb6bd538d17"
+checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
 dependencies = [
  "dlib",
  "log",
diff --git a/ports/tao/Cargo.toml b/ports/tao/Cargo.toml
index 045361c9f617..4ebf655ed5fd 100644
--- a/ports/tao/Cargo.toml
+++ b/ports/tao/Cargo.toml
@@ -175,3 +175,6 @@ parking_lot = "0.12"
 dlopen2 = "0.8.0"
 dbus = { version = "0.9", optional = true }
 libadwaita = { version = "0.9", optional = true }
+
+[patch.crates-io]
+wayland-scanner = { path = "../../vendor/wayland-scanner" }
diff --git a/ports/tao/src/platform/unix.rs b/ports/tao/src/platform/unix.rs
index fd1d2525733d..4108753f3ab3 100644
--- a/ports/tao/src/platform/unix.rs
+++ b/ports/tao/src/platform/unix.rs
@@ -94,11 +94,11 @@ pub trait WindowExtUnix {
 
 impl WindowExtUnix for Window {
   fn gtk_window(&self) -> &ApplicationWindow {
-    &self.window.window
+    self.window.gtk_window()
   }
 
   fn default_vbox(&self) -> Option<&gtk4::Box> {
-    self.window.default_vbox.as_ref()
+    self.window.default_vbox()
   }
 
   fn set_skip_taskbar(&self, skip: bool) -> Result<(), ExternalError> {
diff --git a/ports/tao/src/platform_impl/android/mod.rs b/ports/tao/src/platform_impl/android/mod.rs
index b4d44e329baa..82f0a599dd8b 100644
--- a/ports/tao/src/platform_impl/android/mod.rs
+++ b/ports/tao/src/platform_impl/android/mod.rs
@@ -180,16 +180,6 @@ pub struct EventLoop<T: 'static> {
 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub(crate) struct PlatformSpecificEventLoopAttributes {}
 
-macro_rules! call_event_handler {
-  ( $event_handler:expr, $window_target:expr, $cf:expr, $event:expr ) => {{
-    if let ControlFlow::ExitWithCode(code) = $cf {
-      $event_handler($event, $window_target, &mut ControlFlow::ExitWithCode(code));
-    } else {
-      $event_handler($event, $window_target, &mut $cf);
-    }
-  }};
-}
-
 impl<T: 'static> EventLoop<T> {
   pub(crate) fn new(_: &PlatformSpecificEventLoopAttributes) -> Self {
     let (sender, receiver) = crossbeam_channel::unbounded();
@@ -223,14 +213,14 @@ impl<T: 'static> EventLoop<T> {
   where
     F: FnMut(event::Event<'_, T>, &event_loop::EventLoopWindowTarget<T>, &mut ControlFlow),
   {
-    let mut control_flow = ControlFlow::default();
+    let event_handler = &mut event_handler;
+    let control_flow = &mut ControlFlow::default();
 
-    'event_loop: loop {
-      call_event_handler!(
+    loop {
+      self.call_event_handler(
         event_handler,
-        self.window_target(),
         control_flow,
-        event::Event::NewEvents(self.start_cause)
+        event::Event::NewEvents(self.start_cause),
       );
 
       let mut redraw_window_id = None;
@@ -239,12 +229,7 @@ impl<T: 'static> EventLoop<T> {
       match self.first_event.take() {
         Some(EventSource::Callback) => match ndk_glue::poll_events().unwrap() {
           Event::Resume => {
-            call_event_handler!(
-              event_handler,
-              self.window_target(),
-              control_flow,
-              event::Event::Resumed
-            );
+            self.call_event_handler(event_handler, control_flow, event::Event::Resumed);
           }
           Event::WindowEvent {
             id: window_id,
@@ -253,48 +238,36 @@ impl<T: 'static> EventLoop<T> {
             WindowEvent::Resized => resized_window_id = Some(window_id),
             WindowEvent::RedrawNeeded => redraw_window_id = Some(window_id),
             WindowEvent::Focused(focused) => {
-              call_event_handler!(
+              self.call_event_handler(
                 event_handler,
-                self.window_target(),
                 control_flow,
                 event::Event::WindowEvent {
                   window_id,
-                  event: event::WindowEvent::Focused(focused)
-                }
+                  event: event::WindowEvent::Focused(focused),
+                },
               );
             }
             WindowEvent::Destroyed => {
-              call_event_handler!(
+              self.call_event_handler(
                 event_handler,
-                self.window_target(),
                 control_flow,
                 event::Event::WindowEvent {
                   window_id,
                   event: event::WindowEvent::Destroyed,
-                }
+                },
               );
             }
             _ => {}
           },
           Event::Pause => {
-            call_event_handler!(
-              event_handler,
-              self.window_target(),
-              control_flow,
-              event::Event::Suspended
-            );
+            self.call_event_handler(event_handler, control_flow, event::Event::Suspended);
           }
           Event::Stop => self.running = false,
           Event::Start => self.running = true,
           Event::Opened => {
             let urls = ndk_glue::take_intent_urls();
             if !urls.is_empty() {
-              call_event_handler!(
-                event_handler,
-                self.window_target(),
-                control_flow,
-                event::Event::Opened { urls }
-              );
+              self.call_event_handler(event_handler, control_flow, event::Event::Opened { urls });
             }
           }
           //Event::ConfigChanged => {
@@ -313,7 +286,7 @@ impl<T: 'static> EventLoop<T> {
           //       scale_factor,
           //     },
           //   };
-          //   call_event_handler!(event_handler, self.window_target(), control_flow, event);
+          //   self.call_event_handler(event_handler, control_flow, event);
           // }
           //}
           _ => {}
@@ -369,9 +342,8 @@ impl<T: 'static> EventLoop<T> {
                               force: None,
                             }),
                           };
-                          call_event_handler!(
+                          self.call_event_handler(
                             event_handler,
-                            self.window_target(),
                             control_flow,
                             event
                           );
@@ -407,7 +379,11 @@ impl<T: 'static> EventLoop<T> {
                           is_synthetic: false,
                         },
                       };
-                      call_event_handler!(event_handler, self.window_target(), control_flow, event);
+                      self.call_event_handler(
+                        event_handler,
+                        control_flow,
+                        event,
+                      );
                     }
                     _ => {}
                   };
@@ -419,23 +395,13 @@ impl<T: 'static> EventLoop<T> {
         }
         Some(EventSource::User) => {
           while let Ok(event) = self.receiver.try_recv() {
-            call_event_handler!(
-              event_handler,
-              self.window_target(),
-              control_flow,
-              event::Event::UserEvent(event)
-            );
+            self.call_event_handler(event_handler, control_flow, event::Event::UserEvent(event));
           }
         }
         None => {}
       }
 
-      call_event_handler!(
-        event_handler,
-        self.window_target(),
-        control_flow,
-        event::Event::MainEventsCleared
-      );
+      self.call_event_handler(event_handler, control_flow, event::Event::MainEventsCleared);
 
       if let Some(window_id) = resized_window_id {
         if self.running {
@@ -444,53 +410,37 @@ impl<T: 'static> EventLoop<T> {
             window_id,
             event: event::WindowEvent::Resized(size),
           };
-          call_event_handler!(event_handler, self.window_target(), control_flow, event);
+          self.call_event_handler(event_handler, control_flow, event);
         }
       }
 
       if let Some(window_id) = redraw_window_id {
         if self.running {
           let event = event::Event::RedrawRequested(window_id);
-          call_event_handler!(event_handler, self.window_target(), control_flow, event);
+          self.call_event_handler(event_handler, control_flow, event);
         }
       }
 
-      call_event_handler!(
+      self.call_event_handler(
         event_handler,
-        self.window_target(),
         control_flow,
-        event::Event::RedrawEventsCleared
+        event::Event::RedrawEventsCleared,
       );
 
-      match control_flow {
+      match *control_flow {
         ControlFlow::ExitWithCode(code) => {
-          self.first_event = poll(
-            self
-              .looper
-              .poll_once_timeout(Duration::from_millis(0))
-              .unwrap(),
-          );
+          self.first_event = poll(self.looper.poll_once_timeout(Duration::ZERO).unwrap());
           self.start_cause = event::StartCause::WaitCancelled {
             start: Instant::now(),
             requested_resume: None,
           };
 
-          call_event_handler!(
-            event_handler,
-            self.window_target(),
-            control_flow,
-            event::Event::LoopDestroyed
-          );
+          self.call_event_handler(event_handler, control_flow, event::Event::LoopDestroyed);
 
-          break 'event_loop code;
+          return code;
         }
         ControlFlow::Poll => {
-          self.first_event = poll(
-            self
-              .looper
-              .poll_all_timeout(Duration::from_millis(0))
-              .unwrap(),
-          );
+          self.first_event = poll(self.looper.poll_all_timeout(Duration::ZERO).unwrap());
           self.start_cause = event::StartCause::Poll;
         }
         ControlFlow::Wait => {
@@ -524,6 +474,25 @@ impl<T: 'static> EventLoop<T> {
     }
   }
 
+  fn call_event_handler<F>(
+    &self,
+    event_handler: &mut F,
+    control_flow: &mut ControlFlow,
+    event: event::Event<'_, T>,
+  ) where
+    F: FnMut(event::Event<'_, T>, &event_loop::EventLoopWindowTarget<T>, &mut ControlFlow),
+  {
+    if let ControlFlow::ExitWithCode(code) = *control_flow {
+      event_handler(
+        event,
+        self.window_target(),
+        &mut ControlFlow::ExitWithCode(code),
+      );
+    } else {
+      event_handler(event, self.window_target(), control_flow);
+    }
+  }
+
   pub fn window_target(&self) -> &event_loop::EventLoopWindowTarget<T> {
     &self.window_target
   }
diff --git a/ports/tao/src/platform_impl/linux/event_loop.rs b/ports/tao/src/platform_impl/linux/event_loop.rs
index 84042ce74c47..9e0d37fb1ce7 100644
--- a/ports/tao/src/platform_impl/linux/event_loop.rs
+++ b/ports/tao/src/platform_impl/linux/event_loop.rs
@@ -334,7 +334,9 @@ impl<T: 'static> EventLoop<T> {
               window.set_visible(visible);
             }
             WindowRequest::Focus => {
-              window.present();
+              if window.is_visible() {
+                window.present();
+              }
             }
             WindowRequest::Resizable(resizable) => window.set_resizable(resizable),
             WindowRequest::Closable(closable) => window.set_deletable(closable),
@@ -418,9 +420,13 @@ impl<T: 'static> EventLoop<T> {
                 }
               }
             }
-            WindowRequest::BackgroundColor(css_provider, color) => {
+            WindowRequest::BackgroundColor(color) => {
               let display = RootExt::display(&window);
-              gtk4::style_context_remove_provider_for_display(&display, &css_provider);
+              let css_provider = window
+                .downcast_ref::<ApplicationWindow>()
+                .expect("Tao windows use the ApplicationWindow subclass")
+                .css_provider();
+              gtk4::style_context_remove_provider_for_display(&display, css_provider);
 
               if let Some(color) = color {
                 let theme = format!(
@@ -439,12 +445,16 @@ impl<T: 'static> EventLoop<T> {
 
                 gtk4::style_context_add_provider_for_display(
                   &display,
-                  &css_provider,
+                  css_provider,
                   gtk4::STYLE_PROVIDER_PRIORITY_APPLICATION,
                 );
               }
             }
-            WindowRequest::Destroy => window.destroy(),
+            WindowRequest::RunOnMainThread(callback) => callback(&window),
+            WindowRequest::Destroy(gtk) => {
+              gtk.window.destroy();
+              drop(gtk);
+            }
             WindowRequest::CursorIcon(cursor) => match cursor {
               Some(cr) => window.set_cursor(Cursor::from_name(cr.to_str(), None).as_ref()),
               None => window.set_cursor(Cursor::from_name("none", None).as_ref()),
diff --git a/ports/tao/src/platform_impl/linux/gtk_window/imp.rs b/ports/tao/src/platform_impl/linux/gtk_window/imp.rs
index d40b58f46cea..a38d3c1cfbe2 100644
--- a/ports/tao/src/platform_impl/linux/gtk_window/imp.rs
+++ b/ports/tao/src/platform_impl/linux/gtk_window/imp.rs
@@ -2,12 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use std::{
-  rc::Rc,
-  sync::{
-    atomic::{AtomicI32, Ordering},
-    OnceLock,
-  },
+use std::sync::{
+  atomic::{AtomicI32, Ordering},
+  Arc, OnceLock,
 };
 
 use gtk4::{
@@ -24,8 +21,9 @@ use libadwaita::subclass::application_window::AdwApplicationWindowImpl;
 // By implementing Default we don't have to provide a `new` fn in our
 // ObjectSubclass impl.
 pub struct ApplicationWindow {
-  pub outer_size: Rc<(AtomicI32, AtomicI32)>,
-  pub inner_size: Rc<(AtomicI32, AtomicI32)>,
+  pub outer_size: Arc<(AtomicI32, AtomicI32)>,
+  pub inner_size: Arc<(AtomicI32, AtomicI32)>,
+  pub css_provider: gtk4::CssProvider,
 }
 
 #[glib::object_subclass]
diff --git a/ports/tao/src/platform_impl/linux/gtk_window/mod.rs b/ports/tao/src/platform_impl/linux/gtk_window/mod.rs
index 79fd5f1427d2..e66eefb7bc9f 100644
--- a/ports/tao/src/platform_impl/linux/gtk_window/mod.rs
+++ b/ports/tao/src/platform_impl/linux/gtk_window/mod.rs
@@ -4,7 +4,7 @@
 
 mod imp;
 
-use std::{rc::Rc, sync::atomic::AtomicI32};
+use std::sync::{atomic::AtomicI32, Arc};
 
 use gtk4::{
   gio,
@@ -63,12 +63,15 @@ impl ApplicationWindow {
     window_builder.build()
   }
 
-  pub fn inner_size(&self) -> &Rc<(AtomicI32, AtomicI32)> {
+  pub fn inner_size(&self) -> &Arc<(AtomicI32, AtomicI32)> {
     &self.imp().inner_size
   }
-  pub fn outer_size(&self) -> &Rc<(AtomicI32, AtomicI32)> {
+  pub fn outer_size(&self) -> &Arc<(AtomicI32, AtomicI32)> {
     &self.imp().outer_size
   }
+  pub fn css_provider(&self) -> &gtk4::CssProvider {
+    &self.imp().css_provider
+  }
 
   pub fn connect_resized(&self, f: RustClosure) -> SignalHandlerId {
     self.connect_closure("resized", false, f)
diff --git a/ports/tao/src/platform_impl/linux/icon.rs b/ports/tao/src/platform_impl/linux/icon.rs
index e7c7581a7611..eb40129b2e2b 100644
--- a/ports/tao/src/platform_impl/linux/icon.rs
+++ b/ports/tao/src/platform_impl/linux/icon.rs
@@ -40,17 +40,27 @@ impl PlatformIcon {
   /// `rgba.len() / 4`. Otherwise, this will return a `BadIcon` error.
   pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
     let icon = RgbaIcon::from_rgba(rgba, width, height)?;
-    let row_stride = Pixbuf::calculate_rowstride(
-      Colorspace::Rgb,
-      true,
-      8,
-      icon.width as i32,
-      icon.height as i32,
-    );
+    let width = i32::try_from(icon.width)
+      .map_err(|_| BadIcon::DimensionsMultiplyOverflow { width, height })?;
+    let height = i32::try_from(icon.height).map_err(|_| BadIcon::DimensionsMultiplyOverflow {
+      width: icon.width,
+      height,
+    })?;
+    let row_stride = i32::try_from(icon.width.checked_mul(4).ok_or(
+      BadIcon::DimensionsMultiplyOverflow {
+        width: icon.width,
+        height: icon.height,
+      },
+    )?)
+    .map_err(|_| BadIcon::DimensionsMultiplyOverflow {
+      width: icon.width,
+      height: icon.height,
+    })?;
+
     Ok(Self {
       raw: icon.rgba,
-      width: icon.width as i32,
-      height: icon.height as i32,
+      width,
+      height,
       row_stride,
     })
   }
diff --git a/ports/tao/src/platform_impl/linux/window.rs b/ports/tao/src/platform_impl/linux/window.rs
index 334507fcd633..54b445515c8c 100644
--- a/ports/tao/src/platform_impl/linux/window.rs
+++ b/ports/tao/src/platform_impl/linux/window.rs
@@ -8,14 +8,15 @@
 
 use std::{
   collections::VecDeque,
-  rc::Rc,
+  mem::{self, ManuallyDrop},
   sync::{
     atomic::{AtomicBool, AtomicI32, Ordering},
-    RwLock,
+    mpsc, Arc, RwLock,
   },
+  thread::{self, ThreadId},
 };
 
-use gtk4::{gdk, glib, prelude::*, CssProvider, Settings};
+use gtk4::{gdk, glib, prelude::*, Settings};
 
 #[cfg(feature = "libadwaita")]
 use libadwaita::prelude::AdwApplicationWindowExt;
@@ -47,17 +48,78 @@ impl WindowId {
   }
 }
 
+struct MainThreadGtk {
+  window: ManuallyDrop<ApplicationWindow>,
+  default_vbox: ManuallyDrop<Option<gtk4::Box>>,
+  thread_id: ThreadId,
+}
+
+impl MainThreadGtk {
+  fn new(window: ApplicationWindow, default_vbox: Option<gtk4::Box>) -> Self {
+    Self {
+      window: ManuallyDrop::new(window),
+      default_vbox: ManuallyDrop::new(default_vbox),
+      thread_id: thread::current().id(),
+    }
+  }
+
+  fn is_current_thread(&self) -> bool {
+    thread::current().id() == self.thread_id
+  }
+
+  fn window(&self) -> &ApplicationWindow {
+    assert!(
+      self.is_current_thread(),
+      "GTK window access is only allowed on the event-loop thread"
+    );
+    &self.window
+  }
+
+  fn default_vbox(&self) -> Option<&gtk4::Box> {
+    assert!(
+      self.is_current_thread(),
+      "GTK widget access is only allowed on the event-loop thread"
+    );
+    self.default_vbox.as_ref()
+  }
+
+  // SAFETY: The returned values must be dropped on `self.thread_id`.
+  unsafe fn take(&mut self) -> MainThreadGtkDrop {
+    MainThreadGtkDrop {
+      // SAFETY: `Window::drop` calls this exactly once.
+      window: unsafe { ManuallyDrop::take(&mut self.window) },
+      // SAFETY: `Window::drop` calls this exactly once.
+      _default_vbox: unsafe { ManuallyDrop::take(&mut self.default_vbox) },
+    }
+  }
+}
+
+// SAFETY: GTK values can only be accessed through the thread-checked methods above. Their final
+// references are transferred back to the event-loop thread by `Window::drop`.
+unsafe impl Send for MainThreadGtk {}
+unsafe impl Sync for MainThreadGtk {}
+
+pub(crate) struct MainThreadGtkDrop {
+  pub(super) window: ApplicationWindow,
+  _default_vbox: Option<gtk4::Box>,
+}
+
+// SAFETY: This value is only used as an event-loop request payload and is dropped by that loop.
+unsafe impl Send for MainThreadGtkDrop {}
+
 pub struct Window {
   /// Window id.
   pub(crate) window_id: WindowId,
-  /// Gtk application window.
-  pub(crate) window: ApplicationWindow,
-  pub(crate) default_vbox: Option<gtk4::Box>,
+  gtk: MainThreadGtk,
+  #[cfg(any(feature = "rwh_04", feature = "rwh_05"))]
+  is_wayland: bool,
   /// Window requests sender
   pub(crate) window_requests_tx: async_channel::Sender<(WindowId, WindowRequest)>,
-  scale_factor: Rc<AtomicI32>,
-  maximized: Rc<AtomicBool>,
-  minimized: Rc<AtomicBool>,
+  scale_factor: Arc<AtomicI32>,
+  inner_size: Arc<(AtomicI32, AtomicI32)>,
+  outer_size: Arc<(AtomicI32, AtomicI32)>,
+  maximized: Arc<AtomicBool>,
+  minimized: Arc<AtomicBool>,
   // `Window` is `Send` and `Sync`, need a `RwLock` not a `RefCell`
   // otherwise unsynchronized &RefCell from multiple threads
   fullscreen: RwLock<Option<Fullscreen>>,
@@ -69,7 +131,6 @@ pub struct Window {
   // `Window` is `Send` and `Sync`, need a `RwLock` not a `RefCell`
   // otherwise unsynchronized &RefCell from multiple threads
   preferred_theme: RwLock<Option<Theme>>,
-  css_provider: CssProvider,
 }
 
 impl Window {
@@ -169,20 +230,26 @@ impl Window {
     }
 
     let (scale_factor, maximized, minimized) = Self::setup_signals(&window);
+    let inner_size = Arc::clone(window.inner_size());
+    let outer_size = Arc::clone(window.outer_size());
+    #[cfg(any(feature = "rwh_04", feature = "rwh_05"))]
+    let is_wayland = is_wayland(window.upcast_ref());
 
     let win = Self {
       window_id,
-      window,
-      default_vbox,
+      gtk: MainThreadGtk::new(window, default_vbox),
+      #[cfg(any(feature = "rwh_04", feature = "rwh_05"))]
+      is_wayland,
       window_requests_tx,
       draw_tx,
       scale_factor,
+      inner_size,
+      outer_size,
       maximized,
       minimized,
       fullscreen: RwLock::new(attributes.fullscreen),
       inner_size_constraints: RwLock::new(attributes.inner_size_constraints),
       preferred_theme: RwLock::new(preferred_theme),
-      css_provider: CssProvider::new(),
     };
 
     win.set_background_color(attributes.background_color);
@@ -190,12 +257,14 @@ impl Window {
     Ok(win)
   }
 
-  fn setup_signals(window: &ApplicationWindow) -> (Rc<AtomicI32>, Rc<AtomicBool>, Rc<AtomicBool>) {
+  fn setup_signals(
+    window: &ApplicationWindow,
+  ) -> (Arc<AtomicI32>, Arc<AtomicBool>, Arc<AtomicBool>) {
     let win_scale_factor = window.scale_factor();
 
     let w_max = window.is_maximized();
-    let maximized: Rc<AtomicBool> = Rc::new(w_max.into());
-    let minimized = Rc::new(AtomicBool::new(false));
+    let maximized: Arc<AtomicBool> = Arc::new(w_max.into());
+    let minimized = Arc::new(AtomicBool::new(false));
     let max_clone = maximized.clone();
     let minimized_clone = minimized.clone();
 
@@ -221,7 +290,7 @@ impl Window {
       });
     });
 
-    let scale_factor: Rc<AtomicI32> = Rc::new(win_scale_factor.into());
+    let scale_factor: Arc<AtomicI32> = Arc::new(win_scale_factor.into());
     let scale_factor_clone = scale_factor.clone();
     window.connect_scale_factor_notify(move |window| {
       scale_factor_clone.store(window.scale_factor(), Ordering::Release);
@@ -244,25 +313,62 @@ impl Window {
       .insert(window_id);
 
     let (scale_factor, maximized, minimized) = Self::setup_signals(&window);
+    let inner_size = Arc::clone(window.inner_size());
+    let outer_size = Arc::clone(window.outer_size());
+    #[cfg(any(feature = "rwh_04", feature = "rwh_05"))]
+    let is_wayland = is_wayland(window.upcast_ref());
 
     let win = Self {
       window_id,
-      window,
-      default_vbox: None,
+      gtk: MainThreadGtk::new(window, None),
+      #[cfg(any(feature = "rwh_04", feature = "rwh_05"))]
+      is_wayland,
       window_requests_tx,
       draw_tx,
       scale_factor,
+      inner_size,
+      outer_size,
       maximized,
       minimized,
       fullscreen: RwLock::new(None),
       inner_size_constraints: RwLock::new(WindowSizeConstraints::default()),
       preferred_theme: RwLock::new(None),
-      css_provider: CssProvider::new(),
     };
 
     Ok(win)
   }
 
+  pub(crate) fn gtk_window(&self) -> &ApplicationWindow {
+    self.gtk.window()
+  }
+
+  pub(crate) fn default_vbox(&self) -> Option<&gtk4::Box> {
+    self.gtk.default_vbox()
+  }
+
+  fn run_on_main_thread<R, F>(&self, f: F) -> Option<R>
+  where
+    R: Send + 'static,
+    F: FnOnce(&gtk4::Window) -> R + Send + 'static,
+  {
+    if self.gtk.is_current_thread() {
+      return Some(f(self.gtk.window().upcast_ref()));
+    }
+
+    let (response_tx, response_rx) = mpsc::sync_channel(1);
+    let request = WindowRequest::RunOnMainThread(Box::new(move |window| {
+      let _ = response_tx.send(f(window));
+    }));
+    if self
+      .window_requests_tx
+      .send_blocking((self.window_id, request))
+      .is_err()
+    {
+      return None;
+    }
+    response_rx.recv().ok()
+  }
+
   pub fn id(&self) -> WindowId {
     self.window_id
   }
@@ -288,16 +394,16 @@ impl Window {
   pub fn set_outer_position<P: Into<Position>>(&self, _: P) {}
 
   pub fn set_background_color(&self, color: Option<RGBA>) {
-    if let Err(e) = self.window_requests_tx.send_blocking((
-      self.window_id,
-      WindowRequest::BackgroundColor(self.css_provider.clone(), color),
-    )) {
+    if let Err(e) = self
+      .window_requests_tx
+      .send_blocking((self.window_id, WindowRequest::BackgroundColor(color)))
+    {
       log::warn!("Fail to send size request: {}", e);
     }
   }
 
   pub fn inner_size(&self) -> PhysicalSize<u32> {
-    let (width, height) = &**self.window.inner_size();
+    let (width, height) = &*self.inner_size;
 
     LogicalSize::new(
       width.load(Ordering::Acquire) as u32,
@@ -318,7 +424,7 @@ impl Window {
   }
 
   pub fn outer_size(&self) -> PhysicalSize<u32> {
-    let (width, height) = &**self.window.outer_size();
+    let (width, height) = &*self.outer_size;
 
     LogicalSize::new(
       width.load(Ordering::Acquire) as u32,
@@ -367,11 +473,13 @@ impl Window {
   }
 
   pub fn title(&self) -> String {
-    self
-      .window
-      .title()
-      .map(|t| t.as_str().to_string())
-      .unwrap_or_default()
+    self.run_on_main_thread(|window| {
+      window
+        .title()
+        .map(|title| title.as_str().to_string())
+        .unwrap_or_default()
+    })
+    .unwrap_or_default()
   }
 
   pub fn set_visible(&self, visible: bool) {
@@ -384,7 +492,7 @@ impl Window {
   }
 
   pub fn set_focus(&self) {
-    if !self.minimized.load(Ordering::Acquire) && self.window.get_visible() {
+    if !self.minimized.load(Ordering::Acquire) {
       if let Err(e) = self
         .window_requests_tx
         .send_blocking((self.window_id, WindowRequest::Focus))
@@ -395,11 +503,13 @@ impl Window {
   }
 
   pub fn set_focusable(&self, focusable: bool) {
-    self.window.set_can_focus(focusable);
+    let _ = self.run_on_main_thread(move |window| window.set_can_focus(focusable));
   }
 
   pub fn is_focused(&self) -> bool {
-    self.window.is_active()
+    self
+      .run_on_main_thread(|window| window.is_active())
+      .unwrap_or(false)
   }
 
   pub fn set_resizable(&self, resizable: bool) {
@@ -457,7 +567,9 @@ impl Window {
   }
 
   pub fn is_resizable(&self) -> bool {
-    self.window.is_resizable()
+    self
+      .run_on_main_thread(|window| window.is_resizable())
+      .unwrap_or(false)
   }
 
   pub fn is_minimizable(&self) -> bool {
@@ -468,16 +580,22 @@ impl Window {
     true
   }
   pub fn is_closable(&self) -> bool {
-    self.window.is_deletable()
+    self
+      .run_on_main_thread(|window| window.is_deletable())
+      .unwrap_or(false)
   }
 
   pub fn is_decorated(&self) -> bool {
-    self.window.is_decorated()
+    self
+      .run_on_main_thread(|window| window.is_decorated())
+      .unwrap_or(false)
   }
 
   #[inline]
   pub fn is_visible(&self) -> bool {
-    self.window.is_visible()
+    self
+      .run_on_main_thread(|window| window.is_visible())
+      .unwrap_or(false)
   }
 
   pub fn drag_window(&self) -> Result<(), ExternalError> {
@@ -586,22 +704,30 @@ impl Window {
 
   #[inline]
   pub fn cursor_position(&self) -> Result<PhysicalPosition<f64>, ExternalError> {
-    util::cursor_position(&self.window)
+    self
+      .run_on_main_thread(util::cursor_position)
+      .unwrap_or_else(|| Err(ExternalError::NotSupported(NotSupportedError::new())))
   }
 
   #[inline]
   pub fn current_monitor(&self) -> Option<RootMonitorHandle> {
-    monitor::current_monitor(&self.window)
+    self
+      .run_on_main_thread(monitor::current_monitor)
+      .flatten()
   }
 
   #[inline]
   pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
-    monitor::available_monitors(&self.display())
+    self
+      .run_on_main_thread(|window| monitor::available_monitors(&RootExt::display(window)))
+      .unwrap_or_default()
   }
 
   #[inline]
   pub fn primary_monitor(&self) -> Option<RootMonitorHandle> {
-    monitor::primary_monitor(&self.display())
+    self
+      .run_on_main_thread(|window| monitor::primary_monitor(&RootExt::display(window)))
+      .flatten()
   }
 
   #[inline]
@@ -609,179 +735,101 @@ impl Window {
     None
   }
 
-  #[inline]
-  fn display(&self) -> gdk::Display {
-    RootExt::display(&self.window)
-  }
-
-  fn is_wayland(&self) -> bool {
-    self.display().backend().is_wayland()
-  }
-
   #[cfg(feature = "rwh_04")]
   #[inline]
   pub fn raw_window_handle_rwh_04(&self) -> rwh_04::RawWindowHandle {
-    if self.is_wayland() {
-      use gdk4_wayland::{prelude::WaylandSurfaceExtManual, wayland_client::Proxy};
-
-      let mut window_handle = rwh_04::WaylandHandle::empty();
-      if let Some(surface) = self.window.surface() {
-        let ptr = surface
-          .downcast::<gdk4_wayland::WaylandSurface>()
-          .unwrap()
-          .wl_surface()
-          .unwrap()
-          .id()
-          .as_ptr();
-        window_handle.surface = ptr as *mut _;
+    match self
+      .run_on_main_thread(raw_window_handle_legacy)
+      .unwrap_or_else(|| RawWindowHandleLegacy::empty(self.is_wayland))
+    {
+      RawWindowHandleLegacy::Wayland(surface) => {
+        let mut handle = rwh_04::WaylandHandle::empty();
+        handle.surface = surface as *mut _;
+        rwh_04::RawWindowHandle::Wayland(handle)
       }
-
-      rwh_04::RawWindowHandle::Wayland(window_handle)
-    } else {
-      let mut window_handle = rwh_04::XlibHandle::empty();
-      if let Some(surface) = self.window.surface() {
-        window_handle.window = surface.downcast::<gdk4_x11::X11Surface>().unwrap().xid();
+      RawWindowHandleLegacy::Xlib(window) => {
+        let mut handle = rwh_04::XlibHandle::empty();
+        handle.window = window;
+        rwh_04::RawWindowHandle::Xlib(handle)
       }
-
-      rwh_04::RawWindowHandle::Xlib(window_handle)
     }
   }
 
   #[cfg(feature = "rwh_05")]
   #[inline]
   pub fn raw_window_handle_rwh_05(&self) -> rwh_05::RawWindowHandle {
-    if self.is_wayland() {
-      use gdk4_wayland::{prelude::WaylandSurfaceExtManual, wayland_client::Proxy};
-
-      let mut window_handle = rwh_05::WaylandWindowHandle::empty();
-      if let Some(surface) = self.window.surface() {
-        let ptr = surface
-          .downcast::<gdk4_wayland::WaylandSurface>()
-          .unwrap()
-          .wl_surface()
-          .unwrap()
-          .id()
-          .as_ptr();
-        window_handle.surface = ptr as *mut _;
+    match self
+      .run_on_main_thread(raw_window_handle_legacy)
+      .unwrap_or_else(|| RawWindowHandleLegacy::empty(self.is_wayland))
+    {
+      RawWindowHandleLegacy::Wayland(surface) => {
+        let mut handle = rwh_05::WaylandWindowHandle::empty();
+        handle.surface = surface as *mut _;
+        handle.into()
       }
-
-      window_handle.into()
-    } else {
-      let mut window_handle = rwh_05::XlibWindowHandle::empty();
-      if let Some(surface) = self.window.surface() {
-        window_handle.window = surface.downcast::<gdk4_x11::X11Surface>().unwrap().xid();
+      RawWindowHandleLegacy::Xlib(window) => {
+        let mut handle = rwh_05::XlibWindowHandle::empty();
+        handle.window = window;
+        handle.into()
       }
-      window_handle.into()
     }
   }
 
   #[cfg(feature = "rwh_05")]
   #[inline]
   pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
-    let display = self.display();
-    if self.is_wayland() {
-      use gdk4_wayland::wayland_client::Proxy;
-      let display = display
-        .downcast::<gdk4_wayland::WaylandDisplay>()
-        .unwrap()
-        .wl_display()
-        .unwrap()
-        .id()
-        .as_ptr();
-
-      let mut display_handle = rwh_05::WaylandDisplayHandle::empty();
-      display_handle.display = display as *mut _;
-      display_handle.into()
-    } else {
-      let display = display.downcast::<gdk4_x11::X11Display>().unwrap();
-
-      let mut display_handle = rwh_05::XlibDisplayHandle::empty();
-      display_handle.display =
-        unsafe { gdk4_x11::ffi::gdk_x11_display_get_xdisplay(display.as_ptr() as *mut _) };
-      display_handle.screen = display.screen().screen_number();
-      display_handle.into()
+    match self
+      .run_on_main_thread(raw_display_handle_legacy)
+      .unwrap_or_else(|| RawDisplayHandleLegacy::empty(self.is_wayland))
+    {
+      RawDisplayHandleLegacy::Wayland(display) => {
+        let mut handle = rwh_05::WaylandDisplayHandle::empty();
+        handle.display = display as *mut _;
+        handle.into()
+      }
+      RawDisplayHandleLegacy::Xlib { display, screen } => {
+        let mut handle = rwh_05::XlibDisplayHandle::empty();
+        handle.display = display as *mut _;
+        handle.screen = screen;
+        handle.into()
+      }
     }
   }
 
   #[cfg(feature = "rwh_06")]
   #[inline]
   pub fn raw_window_handle_rwh_06(&self) -> Result<rwh_06::RawWindowHandle, rwh_06::HandleError> {
-    if let Some(surface) = self.window.surface() {
-      if self.is_wayland() {
-        use gdk4_wayland::{prelude::WaylandSurfaceExtManual, wayland_client::Proxy};
-
-        Ok(
-          rwh_06::WaylandWindowHandle::new({
-            let ptr = surface
-              .downcast::<gdk4_wayland::WaylandSurface>()
-              .unwrap()
-              .wl_surface()
-              .unwrap()
-              .id()
-              .as_ptr();
-            std::ptr::NonNull::new(ptr as *mut _).expect("wl_surface will never be null")
-          })
-          .into(),
+    self
+      .run_on_main_thread(raw_window_handle_rwh_06)
+      .unwrap_or(Err(rwh_06::HandleError::Unavailable))
+      .map(|handle| match handle {
+        RawWindowHandleRwh06::Wayland(surface) => rwh_06::WaylandWindowHandle::new(
+          std::ptr::NonNull::new(surface as *mut _).expect("wl_surface will never be null"),
         )
-      } else {
-        #[cfg(feature = "x11")]
-        {
-          Ok(
-            rwh_06::XlibWindowHandle::new(
-              surface.downcast::<gdk4_x11::X11Surface>().unwrap().xid(),
-            )
-            .into(),
-          )
-        }
-        #[cfg(not(feature = "x11"))]
-        Err(rwh_06::HandleError::NotSupported)
-      }
-    } else {
-      Err(rwh_06::HandleError::Unavailable)
-    }
+        .into(),
+        RawWindowHandleRwh06::Xlib(window) => rwh_06::XlibWindowHandle::new(window).into(),
+      })
   }
 
   #[cfg(feature = "rwh_06")]
   #[inline]
   pub fn raw_display_handle_rwh_06(&self) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
-    let display = self.display();
-    if self.is_wayland() {
-      use gdk4_wayland::wayland_client::Proxy;
-
-      Ok(
-        rwh_06::WaylandDisplayHandle::new({
-          let ptr = display
-            .downcast::<gdk4_wayland::WaylandDisplay>()
-            .unwrap()
-            .wl_display()
-            .unwrap()
-            .id()
-            .as_ptr();
-          std::ptr::NonNull::new(ptr as *mut _).expect("wl_display will never be null")
-        })
+    self
+      .run_on_main_thread(raw_display_handle_rwh_06)
+      .unwrap_or(Err(rwh_06::HandleError::Unavailable))
+      .map(|handle| match handle {
+        RawDisplayHandleRwh06::Wayland(display) => rwh_06::WaylandDisplayHandle::new(
+          std::ptr::NonNull::new(display as *mut _).expect("wl_display will never be null"),
+        )
         .into(),
-      )
-    } else {
-      #[cfg(feature = "x11")]
-      {
-        let display = display.downcast::<gdk4_x11::X11Display>().unwrap();
-
-        Ok(
-          rwh_06::XlibDisplayHandle::new(
-            Some(
-              std::ptr::NonNull::new(unsafe {
-                gdk4_x11::ffi::gdk_x11_display_get_xdisplay(display.as_ptr() as *mut _)
-              })
-              .expect("X11 display should never be null"),
-            ),
-            display.screen().screen_number(),
-          )
-          .into(),
+        RawDisplayHandleRwh06::Xlib { display, screen } => rwh_06::XlibDisplayHandle::new(
+          Some(
+            std::ptr::NonNull::new(display as *mut _).expect("X11 display should never be null"),
+          ),
+          screen,
         )
-      }
-      #[cfg(not(feature = "x11"))]
-      Err(rwh_06::HandleError::NotSupported)
-    }
+        .into(),
+      })
   }
 
   pub fn set_skip_taskbar(&self, _: bool) -> Result<(), ExternalError> {
@@ -816,8 +864,11 @@ impl Window {
       return portal_theme;
     }
 
-    if let Some(prefers_dark) =
-      Settings::default().map(|s| s.is_gtk_application_prefer_dark_theme())
+    if let Some(prefers_dark) = self
+      .run_on_main_thread(|_| {
+        Settings::default().map(|settings| settings.is_gtk_application_prefer_dark_theme())
+      })
+      .flatten()
     {
       if prefers_dark {
         return Theme::Dark;
@@ -838,6 +889,174 @@ impl Window {
   }
 }
 
+fn is_wayland(window: &gtk4::Window) -> bool {
+  RootExt::display(window).backend().is_wayland()
+}
+
+#[cfg(any(feature = "rwh_04", feature = "rwh_05"))]
+enum RawWindowHandleLegacy {
+  Wayland(usize),
+  Xlib(u64),
+}
+
+#[cfg(any(feature = "rwh_04", feature = "rwh_05"))]
+impl RawWindowHandleLegacy {
+  fn empty(is_wayland: bool) -> Self {
+    if is_wayland {
+      Self::Wayland(0)
+    } else {
+      Self::Xlib(0)
+    }
+  }
+}
+
+#[cfg(any(feature = "rwh_04", feature = "rwh_05"))]
+fn raw_window_handle_legacy(window: &gtk4::Window) -> RawWindowHandleLegacy {
+  if is_wayland(window) {
+    use gdk4_wayland::{prelude::WaylandSurfaceExtManual, wayland_client::Proxy};
+
+    let surface = window
+      .surface()
+      .map(|surface| {
+        surface
+          .downcast::<gdk4_wayland::WaylandSurface>()
+          .unwrap()
+          .wl_surface()
+          .unwrap()
+          .id()
+          .as_ptr() as usize
+      })
+      .unwrap_or_default();
+    RawWindowHandleLegacy::Wayland(surface)
+  } else {
+    let window = window
+      .surface()
+      .map(|surface| surface.downcast::<gdk4_x11::X11Surface>().unwrap().xid())
+      .unwrap_or_default();
+    RawWindowHandleLegacy::Xlib(window)
+  }
+}
+
+#[cfg(feature = "rwh_05")]
+enum RawDisplayHandleLegacy {
+  Wayland(usize),
+  Xlib { display: usize, screen: i32 },
+}
+
+#[cfg(feature = "rwh_05")]
+impl RawDisplayHandleLegacy {
+  fn empty(is_wayland: bool) -> Self {
+    if is_wayland {
+      Self::Wayland(0)
+    } else {
+      Self::Xlib {
+        display: 0,
+        screen: 0,
+      }
+    }
+  }
+}
+
+#[cfg(feature = "rwh_05")]
+fn raw_display_handle_legacy(window: &gtk4::Window) -> RawDisplayHandleLegacy {
+  let display = RootExt::display(window);
+  if is_wayland(window) {
+    use gdk4_wayland::wayland_client::Proxy;
+    let display = display
+      .downcast::<gdk4_wayland::WaylandDisplay>()
+      .unwrap()
+      .wl_display()
+      .unwrap()
+      .id()
+      .as_ptr() as usize;
+    RawDisplayHandleLegacy::Wayland(display)
+  } else {
+    let display = display.downcast::<gdk4_x11::X11Display>().unwrap();
+    RawDisplayHandleLegacy::Xlib {
+      display: unsafe {
+        gdk4_x11::ffi::gdk_x11_display_get_xdisplay(display.as_ptr() as *mut _) as usize
+      },
+      screen: display.screen().screen_number(),
+    }
+  }
+}
+
+#[cfg(feature = "rwh_06")]
+enum RawWindowHandleRwh06 {
+  Wayland(usize),
+  Xlib(u64),
+}
+
+#[cfg(feature = "rwh_06")]
+fn raw_window_handle_rwh_06(
+  window: &gtk4::Window,
+) -> Result<RawWindowHandleRwh06, rwh_06::HandleError> {
+  if let Some(surface) = window.surface() {
+    if is_wayland(window) {
+      use gdk4_wayland::{prelude::WaylandSurfaceExtManual, wayland_client::Proxy};
+
+      let surface = surface
+        .downcast::<gdk4_wayland::WaylandSurface>()
+        .unwrap()
+        .wl_surface()
+        .unwrap()
+        .id()
+        .as_ptr() as usize;
+      Ok(RawWindowHandleRwh06::Wayland(surface))
+    } else {
+      #[cfg(feature = "x11")]
+      {
+        Ok(RawWindowHandleRwh06::Xlib(
+          surface.downcast::<gdk4_x11::X11Surface>().unwrap().xid(),
+        ))
+      }
+      #[cfg(not(feature = "x11"))]
+      Err(rwh_06::HandleError::NotSupported)
+    }
+  } else {
+    Err(rwh_06::HandleError::Unavailable)
+  }
+}
+
+#[cfg(feature = "rwh_06")]
+enum RawDisplayHandleRwh06 {
+  Wayland(usize),
+  Xlib { display: usize, screen: i32 },
+}
+
+#[cfg(feature = "rwh_06")]
+fn raw_display_handle_rwh_06(
+  window: &gtk4::Window,
+) -> Result<RawDisplayHandleRwh06, rwh_06::HandleError> {
+  let display = RootExt::display(window);
+  if is_wayland(window) {
+    use gdk4_wayland::wayland_client::Proxy;
+
+    let display = display
+      .downcast::<gdk4_wayland::WaylandDisplay>()
+      .unwrap()
+      .wl_display()
+      .unwrap()
+      .id()
+      .as_ptr() as usize;
+    Ok(RawDisplayHandleRwh06::Wayland(display))
+  } else {
+    #[cfg(feature = "x11")]
+    {
+      let display = display.downcast::<gdk4_x11::X11Display>().unwrap();
+
+      Ok(RawDisplayHandleRwh06::Xlib {
+        display: unsafe {
+          gdk4_x11::ffi::gdk_x11_display_get_xdisplay(display.as_ptr() as *mut _) as usize
+        },
+        screen: display.screen().screen_number(),
+      })
+    }
+    #[cfg(not(feature = "x11"))]
+    Err(rwh_06::HandleError::NotSupported)
+  }
+}
+
 #[non_exhaustive]
 pub enum WindowRequest {
   Title(String),
@@ -864,17 +1083,31 @@ pub enum WindowRequest {
   ProgressBarState(ProgressBarState),
   BadgeCount(Option<i64>, Option<String>),
   SetTheme(Option<Theme>),
-  BackgroundColor(CssProvider, Option<RGBA>),
-  Destroy,
+  BackgroundColor(Option<RGBA>),
+  RunOnMainThread(Box<dyn FnOnce(&gtk4::Window) + Send>),
+  Destroy(MainThreadGtkDrop),
 }
 
 impl Drop for Window {
   fn drop(&mut self) {
-    if let Err(e) = self
+    let is_main_thread = self.gtk.is_current_thread();
+    // SAFETY: This is the only place the manually dropped GTK values are taken.
+    let gtk = unsafe { self.gtk.take() };
+    if let Err(error) = self
       .window_requests_tx
-      .send_blocking((self.window_id, WindowRequest::Destroy))
+      .send_blocking((self.window_id, WindowRequest::Destroy(gtk)))
     {
-      log::warn!("Fail to send destroy request: {e}");
+      log::warn!("Fail to send destroy request: {error}");
+      let (_, WindowRequest::Destroy(gtk)) = error.0 else {
+        unreachable!()
+      };
+      if is_main_thread {
+        gtk.window.destroy();
+        drop(gtk);
+      } else {
+        // Dropping GTK's final reference on this worker thread would be unsound.
+        mem::forget(gtk);
+      }
     }
   }
 }
diff --git a/ports/tao/src/platform_impl/windows/event_loop.rs b/ports/tao/src/platform_impl/windows/event_loop.rs
index 721c6aee4892..3b02b1555ef9 100644
--- a/ports/tao/src/platform_impl/windows/event_loop.rs
+++ b/ports/tao/src/platform_impl/windows/event_loop.rs
@@ -2188,8 +2188,8 @@ unsafe fn public_window_callback_inner<T: 'static>(
         update_theme(userdata, window, false);
         result = ProcResult::Value(LRESULT(0));
       } else if msg == *S_U_TASKBAR_RESTART {
-        let window_state = userdata.window_state.lock();
-        let _ = set_skip_taskbar(window, window_state.skip_taskbar);
+        let skip_taskbar = userdata.window_state.lock().skip_taskbar;
+        let _ = set_skip_taskbar(window, skip_taskbar);
       }
     }
   };
diff --git a/ports/tao/tests/send_objects.rs b/ports/tao/tests/send_objects.rs
index 78487ff4fd29..414a48d0386c 100644
--- a/ports/tao/tests/send_objects.rs
+++ b/ports/tao/tests/send_objects.rs
@@ -9,6 +9,9 @@
 #[allow(dead_code)]
 fn needs_send<T: Send>() {}
 
+#[allow(dead_code)]
+fn needs_sync<T: Sync>() {}
+
 #[test]
 fn event_loop_proxy_send() {
   #[allow(dead_code)]
@@ -21,8 +24,9 @@ fn event_loop_proxy_send() {
 
 #[test]
 fn window_send() {
-  // ensures that `Window` implements `Send`
+  // ensures that `Window` implements `Send` and `Sync`
   needs_send::<tao::window::Window>();
+  needs_sync::<tao::window::Window>();
 }
 
 #[test]
diff --git a/ports/tray-icon/.changes/config.json b/ports/tray-icon/.changes/config.json
new file mode 100644
index 000000000000..aad42111a33d
--- /dev/null
+++ b/ports/tray-icon/.changes/config.json
@@ -0,0 +1,52 @@
+{
+  "gitSiteUrl": "https://www.github.com/tauri-apps/tray-icon",
+  "timeout": 3600000,
+  "pkgManagers": {
+    "rust": {
+      "version": true,
+      "getPublishedVersion": "cargo search ${ pkg.pkg } --limit 1 | sed -nE 's/^[^\"]*\"//; s/\".*//1p' -",
+      "prepublish": [
+        "sudo apt-get update",
+        "sudo apt-get install -y libgtk-4-dev libxdo-dev libayatana-appindicator3-dev"
+      ],
+      "publish": [
+        {
+          "command": "cargo package --no-verify",
+          "dryRunCommand": true
+        },
+        {
+          "command": "echo '<details>\n<summary><em><h4>Cargo Publish</h4></em></summary>\n\n```'",
+          "dryRunCommand": true,
+          "pipe": true
+        },
+        {
+          "command": "cargo publish",
+          "dryRunCommand": "cargo publish --dry-run",
+          "pipe": true
+        },
+        {
+          "command": "echo '```\n\n</details>\n'",
+          "dryRunCommand": true,
+          "pipe": true
+        }
+      ],
+      "postpublish": [
+        "git tag ${ pkg.pkg }-v${ pkgFile.versionMajor } -f",
+        "git tag ${ pkg.pkg }-v${ pkgFile.versionMajor }.${ pkgFile.versionMinor } -f",
+        "git push --tags -f"
+      ]
+    }
+  },
+  "packages": {
+    "tray-icon": {
+      "path": ".",
+      "manager": "rust",
+      "assets": [
+        {
+          "path": "${ pkg.path }/target/package/tray-icon-${ pkgFile.version }.crate",
+          "name": "${ pkg.pkg }-${ pkgFile.version }.crate"
+        }
+      ]
+    }
+  }
+}
diff --git a/ports/tray-icon/.changes/nis-hidden.md b/ports/tray-icon/.changes/nis-hidden.md
new file mode 100644
index 000000000000..cfb8d1e77590
--- /dev/null
+++ b/ports/tray-icon/.changes/nis-hidden.md
@@ -0,0 +1,5 @@
+---
+tray-icon: patch
+---
+
+Migrated to use `NIS_HIDDEN` to change visible states on Windows
diff --git a/ports/tray-icon/.changes/perf-macos-avoid-allocating.md b/ports/tray-icon/.changes/perf-macos-avoid-allocating.md
new file mode 100644
index 000000000000..fca107ea7ff0
--- /dev/null
+++ b/ports/tray-icon/.changes/perf-macos-avoid-allocating.md
@@ -0,0 +1,5 @@
+---
+'tray-icon': patch
+---
+
+Avoid unnecessary cloning when applying tray icons, titles, and tooltips on macOS.
diff --git a/ports/tray-icon/.changes/readme.md b/ports/tray-icon/.changes/readme.md
new file mode 100644
index 000000000000..aedf1384b494
--- /dev/null
+++ b/ports/tray-icon/.changes/readme.md
@@ -0,0 +1,29 @@
+# Changes
+
+##### via https://github.com/jbolda/covector
+
+As you create PRs and make changes that require a version bump, please add a new markdown file in this folder. You do not note the version _number_, but rather the type of bump that you expect: major, minor, or patch. The filename is not important, as long as it is a `.md`, but we recommend it represents the overall change for our sanity.
+
+When you select the version bump required, you do _not_ need to consider dependencies. Only note the package with the actual change, and any packages that depend on that package will be bumped automatically in the process.
+
+Use the following format:
+
+```md
+---
+'tray-icon': patch
+---
+
+Change summary goes here
+```
+
+Summaries do not have a specific character limit, but are text only. These summaries are used within the (future implementation of) changelogs. They will give context to the change and also point back to the original PR if more details and context are needed.
+
+Changes will be designated as a `major`, `minor` or `patch` as further described in [semver](https://semver.org/).
+
+Given a version number MAJOR.MINOR.PATCH, increment the:
+
+- MAJOR version when you make incompatible API changes,
+- MINOR version when you add functionality in a backwards compatible manner, and
+- PATCH version when you make backwards compatible bug fixes.
+
+Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format, but will be discussed prior to usage (as extra steps will be necessary in consideration of merging and publishing).
diff --git a/ports/tray-icon/.changes/set-cb-size.md b/ports/tray-icon/.changes/set-cb-size.md
new file mode 100644
index 000000000000..125384c3f4c2
--- /dev/null
+++ b/ports/tray-icon/.changes/set-cb-size.md
@@ -0,0 +1,5 @@
+---
+tray-icon: patch
+---
+
+Set `NOTIFYICONDATAW.cbSize` to `size_of::<NOTIFYICONDATAW>()`, this increased the max tooltip length from 64 to 128 characters.
diff --git a/ports/tray-icon/.github/workflows/audit.yml b/ports/tray-icon/.github/workflows/audit.yml
new file mode 100644
index 000000000000..564f6924847d
--- /dev/null
+++ b/ports/tray-icon/.github/workflows/audit.yml
@@ -0,0 +1,37 @@
+# Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+# Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: audit
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *'
+  push:
+    branches:
+      - dev
+    paths:
+      - 'Cargo.lock'
+      - 'Cargo.toml'
+  pull_request:
+    paths:
+      - 'Cargo.lock'
+      - 'Cargo.toml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  audit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: rustsec/audit-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/ports/tray-icon/.github/workflows/clippy-fmt.yml b/ports/tray-icon/.github/workflows/clippy-fmt.yml
new file mode 100644
index 000000000000..7a3c8fd5aa3a
--- /dev/null
+++ b/ports/tray-icon/.github/workflows/clippy-fmt.yml
@@ -0,0 +1,52 @@
+# Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+# Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: clippy & fmt
+
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  clippy:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+
+    runs-on: ${{ matrix.platform }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: install system deps
+        if: matrix.platform == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libgtk-4-dev libxdo-dev libayatana-appindicator3-dev
+
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
+
+      - run: cargo clippy --all-targets --all-features -- -D warnings
+
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
+
+      - run: cargo fmt --all -- --check
diff --git a/ports/tray-icon/.github/workflows/covector-status.yml b/ports/tray-icon/.github/workflows/covector-status.yml
new file mode 100644
index 000000000000..e05bc09900d4
--- /dev/null
+++ b/ports/tray-icon/.github/workflows/covector-status.yml
@@ -0,0 +1,24 @@
+# Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+# Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: covector status
+on: [pull_request]
+
+jobs:
+  covector:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: covector status
+        uses: jbolda/covector/packages/action@covector-v0
+        id: covector
+        with:
+          command: 'status'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          comment: true
diff --git a/ports/tray-icon/.github/workflows/covector-version-or-publish.yml b/ports/tray-icon/.github/workflows/covector-version-or-publish.yml
new file mode 100644
index 000000000000..0ae05c135c8e
--- /dev/null
+++ b/ports/tray-icon/.github/workflows/covector-version-or-publish.yml
@@ -0,0 +1,62 @@
+# Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+# Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: covector version or publish
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  version-or-publish:
+    runs-on: ubuntu-latest
+    timeout-minutes: 65
+    outputs:
+      change: ${{ steps.covector.outputs.change }}
+      commandRan: ${{ steps.covector.outputs.commandRan }}
+      successfulPublish: ${{ steps.covector.outputs.successfulPublish }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: cargo login
+        run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN  }}
+
+      - name: git config
+        run: |
+          git config --global user.name "${{ github.event.pusher.name }}"
+          git config --global user.email "${{ github.event.pusher.email }}"
+
+      - name: covector version or publish (publish when no change files present)
+        uses: jbolda/covector/packages/action@covector-v0
+        id: covector
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.ORG_NPM_TOKEN }}
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          command: 'version-or-publish'
+          createRelease: true
+          recognizeContributors: true
+
+      - name: Sync Cargo.lock
+        if: steps.covector.outputs.commandRan == 'version'
+        run: cargo tree --depth 0
+
+      - name: Create Pull Request With Versions Bumped
+        if: steps.covector.outputs.commandRan == 'version'
+        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # 7.0.6
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          title: Apply Version Updates From Current Changes
+          commit-message: 'apply version updates'
+          labels: 'version updates'
+          branch: 'release'
+          body: ${{ steps.covector.outputs.change }}
+          sign-commits: true
diff --git a/ports/tray-icon/.github/workflows/test.yml b/ports/tray-icon/.github/workflows/test.yml
new file mode 100644
index 000000000000..c80bb1301ba7
--- /dev/null
+++ b/ports/tray-icon/.github/workflows/test.yml
@@ -0,0 +1,46 @@
+# Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+# Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: test
+
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+
+env:
+  RUST_BACKTRACE: 1
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: ['windows-latest', 'macos-latest', 'ubuntu-latest']
+
+    runs-on: ${{ matrix.platform }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: install system deps
+        if: matrix.platform == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-4-dev libxdo-dev libayatana-appindicator3-dev
+
+      - uses: dtolnay/rust-toolchain@1.73
+      - run: cargo build
+
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo test
diff --git a/ports/tray-icon/.gitignore b/ports/tray-icon/.gitignore
new file mode 100644
index 000000000000..b8a245393b2d
--- /dev/null
+++ b/ports/tray-icon/.gitignore
@@ -0,0 +1,6 @@
+# Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+/target
+.vscode/
\ No newline at end of file
diff --git a/ports/tray-icon/CHANGELOG.md b/ports/tray-icon/CHANGELOG.md
new file mode 100644
index 000000000000..a7711a109407
--- /dev/null
+++ b/ports/tray-icon/CHANGELOG.md
@@ -0,0 +1,340 @@
+# Changelog
+
+## \[0.24.1]
+
+- [`7adc007`](https://www.github.com/tauri-apps/tray-icon/commit/7adc007bb54a91e7e6de4baac87ae534e1aa0550) ([#325](https://www.github.com/tauri-apps/tray-icon/pull/325) by [@Y-ASLant](https://www.github.com/tauri-apps/tray-icon/../../Y-ASLant)) On Windows, preserve tray icon visibility on Explorer restart so a hidden tray icon won't become visible.
+
+## \[0.24.0]
+
+- [`19bcab3`](https://www.github.com/tauri-apps/tray-icon/commit/19bcab382753cbbb883b7d6ae96d07111fc73e67) ([#305](https://www.github.com/tauri-apps/tray-icon/pull/305) by [@expenses](https://www.github.com/tauri-apps/tray-icon/../../expenses)) Make gtk an optional feature (enabled by default)
+
+## \[0.23.1]
+
+- [`7e5953c`](https://www.github.com/tauri-apps/tray-icon/commit/7e5953c227065f92dc3113268c86d6d0f05739a4) ([#311](https://www.github.com/tauri-apps/tray-icon/pull/311) by [@Fullzoon](https://www.github.com/tauri-apps/tray-icon/../../Fullzoon)) Fixed a Windows tray menu issue reported in #303 where the context menu could appear behind the taskbar after launching from the Start Menu by aligning the tray menu handling with the expected shell behavior, including showing the right-click menu on button release and posting `WM_NULL` after `TrackPopupMenu`.
+
+## \[0.23.0]
+
+- [`b74676a`](https://www.github.com/tauri-apps/tray-icon/commit/b74676a487cd74d1cf12b2d355a91473ac476369) ([#312](https://www.github.com/tauri-apps/tray-icon/pull/312) by [@lucasfernog](https://www.github.com/tauri-apps/tray-icon/../../lucasfernog)) Updated `muda` to 0.19.
+
+## \[0.22.2]
+
+- [`215e972`](https://www.github.com/tauri-apps/tray-icon/commit/215e97221e3a9e9cbc71b29c10bcfb234e1cc022) ([#262](https://www.github.com/tauri-apps/tray-icon/pull/262) by [@renovate](https://www.github.com/tauri-apps/tray-icon/../../renovate)) Relaxed `windows-sys` dependency to `>=0.60, <=0.61` instead of `0.60`
+
+## \[0.22.1]
+
+- [`eabe0f4`](https://www.github.com/tauri-apps/tray-icon/commit/eabe0f48f89c3df1cde48e8111d46bd9fec1ca30) ([#306](https://www.github.com/tauri-apps/tray-icon/pull/306) by [@Legend-Master](https://www.github.com/tauri-apps/tray-icon/../../Legend-Master)) Fix tray icon gets blurry after changing dpi on Windows
+
+## \[0.22.0]
+
+- [`f912921`](https://www.github.com/tauri-apps/tray-icon/commit/f912921a56584251dc0b5670b5281cbf7e4106b0) ([#294](https://www.github.com/tauri-apps/tray-icon/pull/294) by [@felipecrs](https://www.github.com/tauri-apps/tray-icon/../../felipecrs)) Added `with_menu_on_right_click` builder method, `set_show_menu_on_right_click` to control whether the context menu is shown on right click (analogous to the existing left click option), and `show_menu()` to programmatically display the tray menu.
+
+  Together these enable dynamic menu workflows where the menu content is updated before being shown, for example by disabling automatic right-click menu, listening for the click event, updating items, and then calling `show_menu()`.
+- [`0a5835b`](https://www.github.com/tauri-apps/tray-icon/commit/0a5835b0e6828e37a1f781de9c2d671ae7a939e6) ([#295](https://www.github.com/tauri-apps/tray-icon/pull/295) by [@thief-sty](https://www.github.com/tauri-apps/tray-icon/../../thief-sty)) Update png dependency version to 0.18.
+
+  This avoids duplicated dependencies in downstream crates.
+- [`0a5835b`](https://www.github.com/tauri-apps/tray-icon/commit/0a5835b0e6828e37a1f781de9c2d671ae7a939e6) ([#295](https://www.github.com/tauri-apps/tray-icon/pull/295) by [@thief-sty](https://www.github.com/tauri-apps/tray-icon/../../thief-sty)) Update rust version to 1.73.
+
+## \[0.21.3]
+
+- [`d3c2468`](https://www.github.com/tauri-apps/tray-icon/commit/d3c24683fd63d197fa064bfbf205ad2fb464e338) ([#293](https://www.github.com/tauri-apps/tray-icon/pull/293) by [@Slinetrac](https://www.github.com/tauri-apps/tray-icon/../../Slinetrac)) Handle Windows tray icon creation when the taskbar is not ready by keeping the message window alive and re-registering on TaskbarCreated.
+- [`cb22cd5`](https://www.github.com/tauri-apps/tray-icon/commit/cb22cd5df6b0938aaeebd6c302ec50bc696d8b1a) ([#290](https://www.github.com/tauri-apps/tray-icon/pull/290) by [@FabianLars](https://www.github.com/tauri-apps/tray-icon/../../FabianLars)) The default `id` is now derived from the process id to prevent issues when multiple open apps use the `tray-icon` crate on Linux.
+
+## \[0.21.2]
+
+- [`c9f0d21`](https://www.github.com/tauri-apps/tray-icon/commit/c9f0d2108202b3743efb7696a334759b403b9856) ([#278](https://www.github.com/tauri-apps/tray-icon/pull/278) by [@aarol](https://www.github.com/tauri-apps/tray-icon/../../aarol)) Fix infinite loops when printing the full error chain (for example "{err:?}" with anyhow) for `BadIcon`
+- [`4bbabba`](https://www.github.com/tauri-apps/tray-icon/commit/4bbabba49cd82e7eb8b5f58cfdfe2b00812517af) ([#277](https://www.github.com/tauri-apps/tray-icon/pull/277) by [@ancwrd1](https://www.github.com/tauri-apps/tray-icon/../../ancwrd1)) Fix a problem on Windows platform where the created window was not destroyed correctly in case the tray icon creation fails.
+- [`343599f`](https://www.github.com/tauri-apps/tray-icon/commit/343599f27fb59bf393793140a09511f1331aeda6) ([#284](https://www.github.com/tauri-apps/tray-icon/pull/284) by [@FabianLars](https://www.github.com/tauri-apps/tray-icon/../../FabianLars)) This hotfix reverts https://github.com/tauri-apps/tray-icon/pull/268 because it caused `assertion failed: flush_paint_messages` panics.
+
+## \[0.21.1]
+
+- [`1470763`](https://www.github.com/tauri-apps/tray-icon/commit/147076368596bac8626f51d70563ce3a1b048cfb) ([#272](https://www.github.com/tauri-apps/tray-icon/pull/272) by [@ahonn](https://www.github.com/tauri-apps/tray-icon/../../ahonn)) Add platform specific methods to access the underlying native handles of the tray (similar to `TrayIcon::window_handle`):
+
+  - `TrayIcon::ns_status_item` for macOS
+  - `TrayIcon::app_indicator` for Linux.
+- [`2a6a19b`](https://www.github.com/tauri-apps/tray-icon/commit/2a6a19bbac9848d3887b12599b2860ba6653c8f7) ([#268](https://www.github.com/tauri-apps/tray-icon/pull/268) by [@iKineticate](https://www.github.com/tauri-apps/tray-icon/../../iKineticate)) On Windows, fix tray menu freeze on device change events
+
+## \[0.21.0]
+
+- [`986007b`](https://www.github.com/tauri-apps/tray-icon/commit/986007b4113f3050d65b6fd1bb43d2bd4b97dcc1) ([#263](https://www.github.com/tauri-apps/tray-icon/pull/263) by [@renovate](https://www.github.com/tauri-apps/tray-icon/../../renovate)) Updated `muda` to `0.17`.
+
+## \[0.20.1]
+
+- [`47fc3f3`](https://www.github.com/tauri-apps/tray-icon/commit/47fc3f3ef8ad9a60476d6cf7b5eaa87c621c380a) ([#248](https://www.github.com/tauri-apps/tray-icon/pull/248) by [@aschey](https://www.github.com/tauri-apps/tray-icon/../../aschey)) Add `window_handle` method to retrieve the underlying `hwnd` on Windows
+- [`1f28d6f`](https://www.github.com/tauri-apps/tray-icon/commit/1f28d6fc6bc52dfcea0358bae17d9119ec99c4b6) ([#241](https://www.github.com/tauri-apps/tray-icon/pull/241) by [@Legend-Master](https://www.github.com/tauri-apps/tray-icon/../../Legend-Master)) Correct `with_menu_on_left_click`'s docs to include window support
+
+## \[0.20.0]
+
+- [`e94976b`](https://www.github.com/tauri-apps/tray-icon/commit/e94976bb48bbe97ac5ab215c6da7c7ca746a5c8a) ([#237](https://www.github.com/tauri-apps/tray-icon/pull/237) by [@renovate](https://www.github.com/tauri-apps/tray-icon/../../renovate)) Updated `muda` to 0.16.0
+
+## \[0.19.3]
+
+- [`d6fee6f`](https://www.github.com/tauri-apps/tray-icon/commit/d6fee6ff627e6ff08bf8bf9a2880197d0f07271e) ([#226](https://www.github.com/tauri-apps/tray-icon/pull/226) by [@madsmtm](https://www.github.com/tauri-apps/tray-icon/../../madsmtm)) Update `objc2` to v0.6.
+
+## \[0.19.2]
+
+- [`1f0e1f8`](https://www.github.com/tauri-apps/tray-icon/commit/1f0e1f8f0d0ad65cd0ab549655fac26c0f524de6) ([#204](https://www.github.com/tauri-apps/tray-icon/pull/204) by [@mrexox](https://www.github.com/tauri-apps/tray-icon/../../mrexox)) Add `set_icon_with_as_template` method to update icon and `is_template` property, preventing glitchy effects during icon animation on macOS.
+
+## \[0.19.1]
+
+- [`19e67de`](https://www.github.com/tauri-apps/tray-icon/commit/19e67de6ff0b66241fddde507eb82e96781b6c36) ([#199](https://www.github.com/tauri-apps/tray-icon/pull/199) by [@Klemen2](https://www.github.com/tauri-apps/tray-icon/../../Klemen2)) Implemented `TrayIcon::set_show_menu_on_left_click` on windows
+
+## \[0.19.0]
+
+- [`bf5cec4`](https://www.github.com/tauri-apps/tray-icon/commit/bf5cec4c3242534cb068978bb27e37551bcb63f9) ([#196](https://www.github.com/tauri-apps/tray-icon/pull/196) by [@amrbashir](https://www.github.com/tauri-apps/tray-icon/../../amrbashir)) **Breaking change** Changed `serde` derive implementation for `TrayIconEvent` to use `serde(tag = "type")` and `rename_all = "camelCase"` on variants so the expected JSON serialization would look like this
+
+  ```json
+  {
+    "type": "Click",
+    "button": "Left",
+    "buttonState": "Down",
+    "id": "some id",
+    "position": {
+      "x": 0,
+      "y": 0
+    },
+    "rect": {
+      "size": {
+        "width": 0,
+        "height": 0
+      },
+      "position": {
+        "x": 0,
+        "y": 0
+      }
+    }
+  }
+  ```
+
+## \[0.18.0]
+
+- [`c63733c`](https://www.github.com/tauri-apps/tray-icon/commit/c63733c45f5fd34bc16c9310cb4f1a063e5e21c7) ([#193](https://www.github.com/tauri-apps/tray-icon/pull/193) by [@amrbashir](https://www.github.com/tauri-apps/tray-icon/../../amrbashir)) Update `muda` crate to `0.15`
+
+## \[0.17.0]
+
+- [`e711c1f`](https://www.github.com/tauri-apps/tray-icon/commit/e711c1f5e6aef3052694ee8da33b2de624093ec8) ([#189](https://www.github.com/tauri-apps/tray-icon/pull/189) by [@htngr](https://www.github.com/tauri-apps/tray-icon/../../htngr)) Implemented `TrayIcon::with_menu_on_left_click` on windows
+
+## \[0.16.0]
+
+- [`20819e4`](https://www.github.com/tauri-apps/tray-icon/commit/20819e445e23f1d3749d03534eba9641404a8db6) ([#187](https://www.github.com/tauri-apps/tray-icon/pull/187) by [@amrbashir](https://www.github.com/tauri-apps/tray-icon/../../amrbashir)) Removed `button_state` field in `TrayIconEvent::DoubleClick` variant.
+
+## \[0.15.2]
+
+- [`a1303c3`](https://www.github.com/tauri-apps/tray-icon/commit/a1303c39020befc977d818d7cce1a039d416ccd2) ([#185](https://www.github.com/tauri-apps/tray-icon/pull/185) by [@amrbashir](https://www.github.com/tauri-apps/tray-icon/../../amrbashir)) On Windows, Add and emit `DoubleClick` variant for `TrayIconEvent`.
+
+## \[0.15.1]
+
+- [`5a381ff`](https://www.github.com/tauri-apps/tray-icon/commit/5a381ffd3d0f8ab8b1a88a95e557c5837c17a1b7) Update `core-foundation` crate to `0.10` and `core-graphics` to `0.24`
+
+## \[0.15.0]
+
+- [`d407869`](https://www.github.com/tauri-apps/tray-icon/commit/d4078696edba67b0ab42cef67e6a421a0332c96f) ([#172](https://www.github.com/tauri-apps/tray-icon/pull/172)) Added a new variant `NotMainThread` to the `Error` enum, which is emitted on macOS when trying to create tray icons from a thread that is not the main thread.
+- [`8857b7d`](https://www.github.com/tauri-apps/tray-icon/commit/8857b7dd12ba523532ac7a58bf08302316af13c8) Updated `muda` crate to `0.14`
+- [`d407869`](https://www.github.com/tauri-apps/tray-icon/commit/d4078696edba67b0ab42cef67e6a421a0332c96f) ([#172](https://www.github.com/tauri-apps/tray-icon/pull/172)) Rewrite the internals of the crate to use `objc2` instead of `objc`.
+
+  This should have no user-facing changes, other than improved memory safety, and less leaking.
+
+## \[0.14.3]
+
+- [`e257d6b`](https://www.github.com/tauri-apps/tray-icon/commit/e257d6bf510b34707d48964a2914ee5c91b13570) ([#169](https://www.github.com/tauri-apps/tray-icon/pull/169)) On Windows, fix `Enter` event emitted only once and never emitted again.
+
+## \[0.14.2]
+
+- [`f1f3adb`](https://www.github.com/tauri-apps/tray-icon/commit/f1f3adb5ec726335226ab8ec1d8c6c41012cb9c5)([#166](https://www.github.com/tauri-apps/tray-icon/pull/166)) Switch from `dirs_next` to `dirs` as `dirs_next` is now unmaintained while `dirs` is
+
+## \[0.14.1]
+
+- [`b491c98`](https://www.github.com/tauri-apps/tray-icon/commit/b491c9886619d3a26876476b078d99a0ae788918)([#164](https://www.github.com/tauri-apps/tray-icon/pull/164)) Fix tray icon rect scaled by dpi on Windows
+
+## \[0.14.0]
+
+- [`587292b`](https://www.github.com/tauri-apps/tray-icon/commit/587292b2e7bfbebdd2677c51b34c6362730d5111)([#161](https://www.github.com/tauri-apps/tray-icon/pull/161)) This release contains **breaking change** to the event structs in order to be able to add new `Enter`, `Move` and `Leave` events:
+
+  - Changed `TrayIconEvent` to be an enum instead of a struct.
+  - Added new events for when the mouse enters, moves or leaves the tray icon region.
+  - Removed `ClickType` enum and replaced it with `MouseButton` enum.
+  - Added `MouseButtonState` enum.
+
+## \[0.13.5]
+
+- [`a1cd50e`](https://www.github.com/tauri-apps/tray-icon/commit/a1cd50e53021474ad87cdf2e269acfb56d36cc14)([#145](https://www.github.com/tauri-apps/tray-icon/pull/145)) Fix tray icon gets blurry after changing dpi on Windows
+- [`ad317c7`](https://www.github.com/tauri-apps/tray-icon/commit/ad317c7dab271145c641f0c4c22e283bb2aa0c91)([#150](https://www.github.com/tauri-apps/tray-icon/pull/150)) On macOS, fix tray event position not scaled properly.
+- [`6d099ee`](https://www.github.com/tauri-apps/tray-icon/commit/6d099ee2a4c455561f4c6f86ea995df267469eca)([#149](https://www.github.com/tauri-apps/tray-icon/pull/149)) On macOS, fix the `y` position of the tray icon to be top-left not bottom-left of the icon.
+- [`599bb8f`](https://www.github.com/tauri-apps/tray-icon/commit/599bb8f55546d674892a80051766d36656975e86)([#147](https://www.github.com/tauri-apps/tray-icon/pull/147)) Add `TrayIcon::rect` method to retrieve the tray icon rectangle on Windows and macOS.
+
+## \[0.13.4]
+
+- [`6b09b8e`](https://www.github.com/tauri-apps/tray-icon/commit/6b09b8e920e79d7768c3a55324431cbd0acadb27)([#136](https://www.github.com/tauri-apps/tray-icon/pull/136)) Add `Icon::from_resource_name` to support icon resource without a ordinal id on Windows
+
+## \[0.13.3]
+
+- [`646f56c`](https://www.github.com/tauri-apps/tray-icon/commit/646f56cb6786377b8dbae1e742bb94e7b6f1bb09)([#138](https://www.github.com/tauri-apps/tray-icon/pull/138)) Fix unexpected crashes on I/O or Png encoding errors on macOS and Linux.
+
+## \[0.13.2]
+
+- [`c368bbc`](https://www.github.com/tauri-apps/tray-icon/commit/c368bbc6a24b24767c902508651d856413039108)([#134](https://www.github.com/tauri-apps/tray-icon/pull/134)) Fix incorrect icon size reported in events on macOS
+
+## \[0.13.1]
+
+- [`784e01e`](https://www.github.com/tauri-apps/tray-icon/commit/784e01e5b4392a39fbec47f17cdcbee7f27af2bc)([#130](https://www.github.com/tauri-apps/tray-icon/pull/130)) On macOS, reset the tray icon when using `setIconAsTemplate` to avoid artifacts.
+
+## \[0.13.0]
+
+- [`63abc69`](https://www.github.com/tauri-apps/tray-icon/commit/63abc69affffdd2849d3d42178d76b9bf1ea994a)([#127](https://www.github.com/tauri-apps/tray-icon/pull/127)) Update `muda` dependency to `0.13`
+- [`63abc69`](https://www.github.com/tauri-apps/tray-icon/commit/63abc69affffdd2849d3d42178d76b9bf1ea994a)([#127](https://www.github.com/tauri-apps/tray-icon/pull/127)) Added `dpi` module and changed position and sizes in `TrayIconEvent` to use the new `dpi` module:
+
+  - Removed `TrayIconEvent.x` and `TrayIconEvent.y` and replaced with `TrayIconEvent.position`
+  - Replaced `Rectangle` type with `Rect` which has just two fields `position` and `size`.
+
+## \[0.12.0]
+
+- [`91a5bf6`](https://www.github.com/tauri-apps/tray-icon/commit/91a5bf65d7e3895e9f2eedf4e7ffaf7cc9d082ad)([#119](https://www.github.com/tauri-apps/tray-icon/pull/119)) Updated `muda` dependency to `0.12`
+
+## \[0.11.3]
+
+- [`5407f14`](https://www.github.com/tauri-apps/tray-icon/commit/5407f140e12aa83984f6a5402ab99e70a4d4f82c)([#114](https://www.github.com/tauri-apps/tray-icon/pull/114)) On Linux, fix `TrayIcon::set_visible` incorrect inverted behavior.
+
+## \[0.11.2]
+
+- [`ca3bed5`](https://www.github.com/tauri-apps/tray-icon/commit/ca3bed51b5d6e8b7e04429f8f90a2d514393b034)([#109](https://www.github.com/tauri-apps/tray-icon/pull/109)) On Windows, add `Icon::from_handle`
+
+## \[0.11.1]
+
+- [`6382ea5`](https://www.github.com/tauri-apps/tray-icon/commit/6382ea5b47813ce1546dff6e8a69ca053dc6f145)([#103](https://www.github.com/tauri-apps/tray-icon/pull/103)) On Linux, fix tray menu failing to show.
+
+## \[0.11.0]
+
+- [`6e8374a`](https://www.github.com/tauri-apps/tray-icon/commit/6e8374a81a2e84bf38c8678085986e569e517e76) Update `muda` crate to `0.11`
+
+## \[0.10.0]
+
+- [`8463328`](https://www.github.com/tauri-apps/tray-icon/commit/84633285a0b465fe4c261ff0c7be035ce7615715)([#92](https://www.github.com/tauri-apps/tray-icon/pull/92)) Upgraded `gtk` to 0.18 and bumped MSRV to 1.70.0.
+
+## \[0.9.0]
+
+- [`32b3523`](https://www.github.com/tauri-apps/tray-icon/commit/32b352371b6da730abbb024730015492f87205c0) Update `muda` crate to `0.9`
+
+## \[0.8.3]
+
+- [`75fed4a`](https://www.github.com/tauri-apps/tray-icon/commit/75fed4aeca82c5614777865a9f6fa2d4457f47a1) Derive `serde` for more types.
+
+## \[0.8.2]
+
+- [`cd6fb13`](https://www.github.com/tauri-apps/tray-icon/commit/cd6fb1300e2b2bf78781777de45302c98cfcabd4)([#80](https://www.github.com/tauri-apps/tray-icon/pull/80)) Add `PartialEq<&str> for &TrayIconId` and `PartialEq<String> for &TrayIconId` implementations. Also add a blanket `From<T> for TrayIconId` where `T: ToString` implementation.
+
+## \[0.8.1]
+
+- [`0cf36ad`](https://www.github.com/tauri-apps/tray-icon/commit/0cf36ad6afd1ddd93b7087e8eb4475410fb9be8a)([#77](https://www.github.com/tauri-apps/tray-icon/pull/77)) Add `TrayIconId::new` convenience method.
+
+## \[0.8.0]
+
+- [`95c1be8`](https://www.github.com/tauri-apps/tray-icon/commit/95c1be8a459f2ef146ccaccfe858c427678613af)([#75](https://www.github.com/tauri-apps/tray-icon/pull/75)) Th `icon` module has been removed and instead its types are exported from crate root.
+- [`95c1be8`](https://www.github.com/tauri-apps/tray-icon/commit/95c1be8a459f2ef146ccaccfe858c427678613af)([#75](https://www.github.com/tauri-apps/tray-icon/pull/75)) Update to `muda@0.8`
+- [`f93b57d`](https://www.github.com/tauri-apps/tray-icon/commit/f93b57d08a84a8c7ff7f9035f8cc73a3e48e90b9) Add `TrayIconId` struct an changed all `.id()` methods to return `TrayIconId` instead of a u32.
+- [`95c1be8`](https://www.github.com/tauri-apps/tray-icon/commit/95c1be8a459f2ef146ccaccfe858c427678613af)([#75](https://www.github.com/tauri-apps/tray-icon/pull/75)) Changed the order of arguments for `TrayIcon::with_id` function to take the `id` as the first argument instead of the second.
+
+## \[0.7.7]
+
+- [`197f431`](https://www.github.com/tauri-apps/tray-icon/commit/197f43161cd1806fcae15b19b4f8335d9b3492b6)([#73](https://www.github.com/tauri-apps/tray-icon/pull/73)) Always highlight tray icon on click on macOS.
+
+## \[0.7.6]
+
+- [`a458317`](https://www.github.com/tauri-apps/tray-icon/commit/a458317ad1d85ac9477a019f86580a14d4082c7f)([#71](https://www.github.com/tauri-apps/tray-icon/pull/71)) Fixes a crash on mouse events on macOS.
+
+## \[0.7.5]
+
+- [`54fc7de`](https://www.github.com/tauri-apps/tray-icon/commit/54fc7de37c3568312b27c30bdd22e830b1f15a3b)([#69](https://www.github.com/tauri-apps/tray-icon/pull/69)) Refactor macOS implementation to fix missing click issues.
+
+## \[0.7.4]
+
+- [`71d25a1`](https://www.github.com/tauri-apps/tray-icon/commit/71d25a14ecd2bf0996223127b2fa01ec7f915fce)([#66](https://www.github.com/tauri-apps/tray-icon/pull/66)) On Linux, fix the issue that gtk caches the icon if you use `TrayIcon::set_icon` repeatedly.
+
+## \[0.7.3]
+
+- [`c0d16c5`](https://www.github.com/tauri-apps/tray-icon/commit/c0d16c5f90c3e3b4acadee9c5c83bd5e9a3671f6)([#63](https://www.github.com/tauri-apps/tray-icon/pull/63)) Fixes multiple `set_menu` calls not updating the tray menu on macOS.
+
+## \[0.7.2]
+
+- [`d0a25b0`](https://www.github.com/tauri-apps/tray-icon/commit/d0a25b0e980d01306344dd4903c1e2e8ef4519ac)([#61](https://www.github.com/tauri-apps/tray-icon/pull/61)) On Windows, fix dropping tray icon caused the whole process to close.
+- [`d0a25b0`](https://www.github.com/tauri-apps/tray-icon/commit/d0a25b0e980d01306344dd4903c1e2e8ef4519ac)([#61](https://www.github.com/tauri-apps/tray-icon/pull/61)) On Windows, fix `TrayIcon::set_menu` not firing events for the new menu.
+
+## \[0.7.1]
+
+- [`04ed58f`](https://www.github.com/tauri-apps/tray-icon/commit/04ed58f954b113e1f4d52c161231d52c9f5c3546) Remove accidental impl of `Sync` and `Send` for `TrayIcon` where it is not.
+
+## \[0.7.0]
+
+- [`d8d6082`](https://www.github.com/tauri-apps/tray-icon/commit/d8d6082c73b1fa6047ead13d228cf7de1ad0d71c)([#57](https://www.github.com/tauri-apps/tray-icon/pull/57)) Add `TrayIconBuilder::id` to access the unique id that will be assigend to the tray icon upon creation.
+- [`dd63ef3`](https://www.github.com/tauri-apps/tray-icon/commit/dd63ef3b68c35fc8b8fbc1d59975d8826420ae51) Add `TrayIconEvent::id` method.
+- [`3901519`](https://www.github.com/tauri-apps/tray-icon/commit/3901519a48f76b57174b36ce36c7f803dbfb5536) Update to `muda@0.7`
+- [`13d448a`](https://www.github.com/tauri-apps/tray-icon/commit/13d448a9ee7c013f0cc13391ea498da93e806551)([#55](https://www.github.com/tauri-apps/tray-icon/pull/55)) Implement `Clone` for `TrayIcon`.
+- [`13d448a`](https://www.github.com/tauri-apps/tray-icon/commit/13d448a9ee7c013f0cc13391ea498da93e806551)([#55](https://www.github.com/tauri-apps/tray-icon/pull/55)) - **Breaking change**: `TrayEvent` has been renamed to `TrayIconEvent` for consistency with other struct names.
+  - **Breaking change**: `ClickEvent` enum has been renamed to `ClickType` and `TrayEvent`'s `event` field has been renamed to `click_type`
+- [`d8d6082`](https://www.github.com/tauri-apps/tray-icon/commit/d8d6082c73b1fa6047ead13d228cf7de1ad0d71c)([#57](https://www.github.com/tauri-apps/tray-icon/pull/57)) Add `TrayIcon::with_id` and `TrayIconBuilder::with_id` to create the tray icon with specified id.
+
+## \[0.6.0]
+
+- [`934b927`](https://www.github.com/tauri-apps/tray-icon/commit/934b927e552641c3d319981cdeae84ca901ae399)([#49](https://www.github.com/tauri-apps/tray-icon/pull/49)) Expose `muda` crate feature flags.
+
+## \[0.5.2]
+
+- [`9409f36`](https://www.github.com/tauri-apps/tray-icon/commit/9409f36c5293e7fb0c8dd7d0fd74a59472aedfcb)([#46](https://www.github.com/tauri-apps/tray-icon/pull/46)) Fix compiling on `i686-pc-windows-msvc` target
+
+## \[0.5.1]
+
+- [`ff7f7bc`](https://www.github.com/tauri-apps/tray-icon/commit/ff7f7bc4400a6f7aa0b5c025c85ab6c4f89e9109)([#40](https://www.github.com/tauri-apps/tray-icon/pull/40)) Fix building for `i686-pc-windows-msvc` target.
+
+## \[0.5.0]
+
+- On macOS, fix `set_visible(false)` still occupying space on the system menu bar.
+  - [71f9d29](https://www.github.com/tauri-apps/tray-icon/commit/71f9d292dd69b498e57fcebeb76ad6a1365144cd) fix(macos): remove tray icon when `set_visible(false)` ([#37](https://www.github.com/tauri-apps/tray-icon/pull/37)) on 2023-04-18
+
+## \[0.4.4]
+
+- Make Rectangle's point fields public.
+  - [12a0daf](https://www.github.com/tauri-apps/tray-icon/commit/12a0daf92352fbecddd7b0afdfc0c633232fb15c) Make Rectangle's point fields public. ([#33](https://www.github.com/tauri-apps/tray-icon/pull/33)) on 2023-03-23
+
+## \[0.4.3]
+
+- Update documentation.
+  - [258b49a](https://www.github.com/tauri-apps/tray-icon/commit/258b49aaebd81b6e4327cca1a1a0a2d9bb64188a) docs: update docs on 2023-02-08
+  - [3293885](https://www.github.com/tauri-apps/tray-icon/commit/3293885ae5ef19e14f2fe1baaf4d35719f3b3344) Apply Version Updates From Current Changes ([#22](https://www.github.com/tauri-apps/tray-icon/pull/22)) on 2023-02-08
+  - [e58a6ce](https://www.github.com/tauri-apps/tray-icon/commit/e58a6cecfffa63096d459429c5d31ec5b3475a9b) docs: document menu and icon relation on Linux on 2023-02-12
+
+## \[0.4.2]
+
+- Update docs.
+  - [258b49a](https://www.github.com/tauri-apps/tray-icon/commit/258b49aaebd81b6e4327cca1a1a0a2d9bb64188a) docs: update docs on 2023-02-08
+
+## \[0.4.1]
+
+- Bump `muda` to `0.4` and `libappindicator` to `0.8`
+  - [d92dd6d](https://www.github.com/tauri-apps/tray-icon/commit/d92dd6dc25d268befe9c14cfe193e1de10bc5717) chore(deps): update deps ([#17](https://www.github.com/tauri-apps/tray-icon/pull/17)) on 2023-01-26
+
+## \[0.4.0]
+
+- On macOS and Linux, add `TrayIconBuilder::with_title` and `TrayIcon::set_title` to optionally add a text next to the icon.
+  - [6df6fc7](https://www.github.com/tauri-apps/tray-icon/commit/6df6fc78885204be5189b41527a39324851c9671) feat: add `with_title` and `set_title` ([#11](https://www.github.com/tauri-apps/tray-icon/pull/11)) on 2023-01-10
+  - [b83f14e](https://www.github.com/tauri-apps/tray-icon/commit/b83f14ee66f9d3801535697c30f54bccc433cce1) chore: adjust change bumps on 2023-01-12
+- Add `TrayIcon::set_visible`.
+  - [ba4580e](https://www.github.com/tauri-apps/tray-icon/commit/ba4580ec8bd061a76575859b5ead8ec16e3b7817) feat: add `set_visible` ([#14](https://www.github.com/tauri-apps/tray-icon/pull/14)) on 2023-01-12
+  - [b83f14e](https://www.github.com/tauri-apps/tray-icon/commit/b83f14ee66f9d3801535697c30f54bccc433cce1) chore: adjust change bumps on 2023-01-12
+
+## \[0.3.0]
+
+- Add `TrayEvent::set_event_handler` to set a handler for new tray events.
+  - [9247abb](https://www.github.com/tauri-apps/tray-icon/commit/9247abb69ce297096b2c388d67b250509fe44efa) refactor: allow changing the menu event sender ([#8](https://www.github.com/tauri-apps/tray-icon/pull/8)) on 2023-01-03
+- Update `muda` to `0.3`.
+  - [9247abb](https://www.github.com/tauri-apps/tray-icon/commit/9247abb69ce297096b2c388d67b250509fe44efa) refactor: allow changing the menu event sender ([#8](https://www.github.com/tauri-apps/tray-icon/pull/8)) on 2023-01-03
+  - [b64b57e](https://www.github.com/tauri-apps/tray-icon/commit/b64b57ec565dada4bc06201f5b4529725bb0009f) chore: update changefile on 2023-01-03
+- **Breaking change** Remove `tray_event_receiver` function, use `TrayEvent::receiver` instead.
+  - [9247abb](https://www.github.com/tauri-apps/tray-icon/commit/9247abb69ce297096b2c388d67b250509fe44efa) refactor: allow changing the menu event sender ([#8](https://www.github.com/tauri-apps/tray-icon/pull/8)) on 2023-01-03
+
+## \[0.2.0]
+
+- Update `muda` dependency to `0.2`.
+  - [aa3aa1e](https://www.github.com/tauri-apps/tray-icon/commit/aa3aa1ec0bdcb48ecf9d17204809802c4e6559fc) chore: add change file on 2022-12-30
+
+## \[0.1.1]
+
+- Initial Release.
+  - [0651773](https://www.github.com/tauri-apps/tray-icon/commit/0651773ad248d34141fbefc1c65a8889a90a8c9b) chore: prepare for initial release on 2022-12-05
diff --git a/ports/tray-icon/Cargo.lock b/ports/tray-icon/Cargo.lock
new file mode 100644
index 000000000000..880f77bb534f
--- /dev/null
+++ b/ports/tray-icon/Cargo.lock
@@ -0,0 +1,4971 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ab_glyph"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2"
+dependencies = [
+ "ab_glyph_rasterizer",
+ "owned_ttf_parser",
+]
+
+[[package]]
+name = "ab_glyph_rasterizer"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "getrandom 0.3.4",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "android-activity"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd"
+dependencies = [
+ "android-properties",
+ "bitflags 2.13.1",
+ "cc",
+ "jni 0.22.4",
+ "libc",
+ "log",
+ "ndk",
+ "ndk-context",
+ "ndk-sys 0.6.0+11769913",
+ "num_enum",
+ "thiserror 2.0.19",
+]
+
+[[package]]
+name = "android-properties"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "arboard"
+version = "3.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf"
+dependencies = [
+ "clipboard-win",
+ "image",
+ "log",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation 0.3.2",
+ "parking_lot",
+ "percent-encoding",
+ "windows-sys 0.60.2",
+ "x11rb",
+]
+
+[[package]]
+name = "arc-swap"
+version = "1.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
+
+[[package]]
+name = "as-raw-xcb-connection"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
+
+[[package]]
+name = "ash"
+version = "0.38.0+1.3.281"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f"
+dependencies = [
+ "libloading 0.8.9",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "atk"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b"
+dependencies = [
+ "atk-sys",
+ "glib 0.18.5",
+ "libc",
+]
+
+[[package]]
+name = "atk-sys"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086"
+dependencies = [
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
+ "libc",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi 0.1.19",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
+
+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
+[[package]]
+name = "block2"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
+dependencies = [
+ "objc2 0.5.2",
+]
+
+[[package]]
+name = "block2"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
+dependencies = [
+ "objc2 0.6.4",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
+
+[[package]]
+name = "bytemuck"
+version = "1.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6aedf8ae72766347502cf3cb4f41cf5e9cc37d28bee90f1fdaaae15f9cf9424"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f65693059b6b9c588b9f62fed1cedbf0a8b805631457ea162d68f0de186f3de5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
+[[package]]
+name = "bytes"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
+
+[[package]]
+name = "cairo-rs"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
+dependencies = [
+ "bitflags 2.13.1",
+ "cairo-sys-rs 0.18.2",
+ "glib 0.18.5",
+ "libc",
+ "once_cell",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "cairo-rs"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cc8d9aa793480744cd9a0524fef1a2e197d9eaa0f739cde19d16aba530dcb95"
+dependencies = [
+ "bitflags 2.13.1",
+ "cairo-sys-rs 0.22.0",
+ "glib 0.22.8",
+ "libc",
+]
+
+[[package]]
+name = "cairo-sys-rs"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
+dependencies = [
+ "glib-sys 0.18.1",
+ "libc",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "cairo-sys-rs"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8b4985713047f5faee02b8db6a6ef32bbb50269ff53c1aee716d1d195b76d54"
+dependencies = [
+ "glib-sys 0.22.8",
+ "libc",
+ "system-deps 7.0.8",
+]
+
+[[package]]
+name = "calloop"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
+dependencies = [
+ "bitflags 2.13.1",
+ "log",
+ "polling",
+ "rustix 0.38.44",
+ "slab",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "calloop"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7"
+dependencies = [
+ "bitflags 2.13.1",
+ "polling",
+ "rustix 1.1.4",
+ "slab",
+ "tracing",
+]
+
+[[package]]
+name = "calloop-wayland-source"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
+dependencies = [
+ "calloop 0.13.0",
+ "rustix 0.38.44",
+ "wayland-backend",
+ "wayland-client",
+]
+
+[[package]]
+name = "calloop-wayland-source"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa"
+dependencies = [
+ "calloop 0.14.4",
+ "rustix 1.1.4",
+ "wayland-backend",
+ "wayland-client",
+]
+
+[[package]]
+name = "cc"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c89588d05638b5b4594a3348a2d6c20277e43a7f5c5202b05cc56888475a47b8"
+dependencies = [
+ "find-msvc-tools",
+ "jobserver",
+ "libc",
+ "shlex",
+]
+
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
+[[package]]
+name = "cfg-expr"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+dependencies = [
+ "smallvec",
+ "target-lexicon 0.12.16",
+]
+
+[[package]]
+name = "cfg-expr"
+version = "0.20.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb693542bcafa528e198be0ebd9d3632ca5b7c93dbe7237460e199910835997c"
+dependencies = [
+ "smallvec",
+ "target-lexicon 0.13.5",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527"
+
+[[package]]
+name = "cgl"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags 1.3.2",
+ "strsim",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "clipboard-win"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4"
+dependencies = [
+ "error-code",
+]
+
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "core-graphics"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
+dependencies = [
+ "bitflags 1.3.2",
+ "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.1",
+ "core-foundation 0.10.1",
+ "core-graphics-types 0.2.0",
+ "foreign-types",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "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.1",
+ "core-foundation 0.10.1",
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d85363c37faeca707aef026efa9f3b34d077bce547e48f770770625c6013679e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
+
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
+[[package]]
+name = "cursor-icon"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f"
+
+[[package]]
+name = "dbus"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab69f03cc8c4340c9c8e315114e1658e6775a9b16a04357973aa21cec22b32e"
+dependencies = [
+ "libc",
+ "libdbus-sys",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "dbus-codegen"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a49da9fdfbe872d4841d56605dc42efa5e6ca3291299b87f44e1cde91a28617c"
+dependencies = [
+ "clap",
+ "dbus",
+ "xml-rs",
+]
+
+[[package]]
+name = "dbus-tree"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f456e698ae8e54575e19ddb1f9b7bce2298568524f215496b248eb9498b4f508"
+dependencies = [
+ "dbus",
+]
+
+[[package]]
+name = "dirs"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "dispatch"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
+
+[[package]]
+name = "dispatch2"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.6.2",
+ "libc",
+ "objc2 0.6.4",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "dlib"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab8ecd87370524b461f8557c119c405552c396ed91fc0a8eec68679eab26f94a"
+dependencies = [
+ "libloading 0.8.9",
+]
+
+[[package]]
+name = "dlopen2"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4"
+dependencies = [
+ "dlopen2_derive",
+ "libc",
+ "once_cell",
+ "winapi",
+]
+
+[[package]]
+name = "dlopen2_derive"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "document-features"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
+dependencies = [
+ "litrs",
+]
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
+[[package]]
+name = "dpi"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "ecolor"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc4feb366740ded31a004a0e4452fbf84e80ef432ecf8314c485210229672fd1"
+dependencies = [
+ "bytemuck",
+ "emath",
+]
+
+[[package]]
+name = "eframe"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0dfe0859f3fb1bc6424c57d41e10e9093fe938f426b691e42272c2f336d915c"
+dependencies = [
+ "ahash",
+ "bytemuck",
+ "document-features",
+ "egui",
+ "egui-wgpu",
+ "egui-winit",
+ "egui_glow",
+ "glow",
+ "glutin",
+ "glutin-winit",
+ "image",
+ "js-sys",
+ "log",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
+ "parking_lot",
+ "percent-encoding",
+ "profiling",
+ "raw-window-handle",
+ "static_assertions",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "web-time",
+ "winapi",
+ "windows-sys 0.59.0",
+ "winit",
+]
+
+[[package]]
+name = "egui"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25dd34cec49ab55d85ebf70139cb1ccd29c977ef6b6ba4fe85489d6877ee9ef3"
+dependencies = [
+ "ahash",
+ "bitflags 2.13.1",
+ "emath",
+ "epaint",
+ "log",
+ "nohash-hasher",
+ "profiling",
+]
+
+[[package]]
+name = "egui-wgpu"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d319dfef570f699b6e9114e235e862a2ddcf75f0d1a061de9e1328d92146d820"
+dependencies = [
+ "ahash",
+ "bytemuck",
+ "document-features",
+ "egui",
+ "epaint",
+ "log",
+ "profiling",
+ "thiserror 1.0.69",
+ "type-map",
+ "web-time",
+ "wgpu",
+ "winit",
+]
+
+[[package]]
+name = "egui-winit"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d9dfbb78fe4eb9c3a39ad528b90ee5915c252e77bbab9d4ebc576541ab67e13"
+dependencies = [
+ "ahash",
+ "arboard",
+ "bytemuck",
+ "egui",
+ "log",
+ "profiling",
+ "raw-window-handle",
+ "smithay-clipboard",
+ "web-time",
+ "webbrowser",
+ "winit",
+]
+
+[[package]]
+name = "egui_glow"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "910906e3f042ea6d2378ec12a6fd07698e14ddae68aed2d819ffe944a73aab9e"
+dependencies = [
+ "ahash",
+ "bytemuck",
+ "egui",
+ "glow",
+ "log",
+ "memoffset",
+ "profiling",
+ "wasm-bindgen",
+ "web-sys",
+ "winit",
+]
+
+[[package]]
+name = "emath"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e4cadcff7a5353ba72b7fea76bf2122b5ebdbc68e8155aa56dfdea90083fe1b"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "epaint"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fcc0f5a7c613afd2dee5e4b30c3e6acafb8ad6f0edb06068811f708a67c562"
+dependencies = [
+ "ab_glyph",
+ "ahash",
+ "bytemuck",
+ "ecolor",
+ "emath",
+ "epaint_default_fonts",
+ "log",
+ "nohash-hasher",
+ "parking_lot",
+ "profiling",
+]
+
+[[package]]
+name = "epaint_default_fonts"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7e7a64c02cf7a5b51e745a9e45f60660a286f151c238b9d397b3e923f5082f"
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "error-code"
+version = "3.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fax"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caf1079563223d5d59d83c85886a56e586cfd5c1a26292e971a0fa266531ac5a"
+
+[[package]]
+name = "fdeflate"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "field-offset"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
+dependencies = [
+ "memoffset",
+ "rustc_version",
+]
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
+[[package]]
+name = "flate2"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "262590f4fe6afeb0bc83be1daa64e52657fe185690a958af7f3ad0e92085c5ae"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6754879cc9f2c66f88c6e5c35344bb0bdb0708b0352b1201815667c7eabc7458"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4577ecaa3c4f96589d473f679a71b596316f6641bc350038b962a5daf0085d7a"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d6d3cde68c518367be28956066ddfef33813991b77a55005a69dae04bf3b10b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "futures-task"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109"
+
+[[package]]
+name = "futures-util"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa"
+dependencies = [
+ "futures-core",
+ "futures-macro",
+ "futures-task",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "gdk"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691"
+dependencies = [
+ "cairo-rs 0.18.5",
+ "gdk-pixbuf 0.18.5",
+ "gdk-sys",
+ "gio 0.18.4",
+ "glib 0.18.5",
+ "libc",
+ "pango 0.18.3",
+]
+
+[[package]]
+name = "gdk-pixbuf"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec"
+dependencies = [
+ "gdk-pixbuf-sys 0.18.0",
+ "gio 0.18.4",
+ "glib 0.18.5",
+ "libc",
+ "once_cell",
+]
+
+[[package]]
+name = "gdk-pixbuf"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25f420376dbee041b2db374ce4573892a36222bb3f6c0c43e24f0d67eae9b646"
+dependencies = [
+ "gdk-pixbuf-sys 0.22.0",
+ "gio 0.22.8",
+ "glib 0.22.8",
+ "libc",
+]
+
+[[package]]
+name = "gdk-pixbuf-sys"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
+dependencies = [
+ "gio-sys 0.18.1",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
+ "libc",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "gdk-pixbuf-sys"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48f31b37b1fc4b48b54f6b91b7ef04c18e00b4585d98359dd7b998774bbd91fb"
+dependencies = [
+ "gio-sys 0.22.8",
+ "glib-sys 0.22.8",
+ "gobject-sys 0.22.6",
+ "libc",
+ "system-deps 7.0.8",
+]
+
+[[package]]
+name = "gdk-sys"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7"
+dependencies = [
+ "cairo-sys-rs 0.18.2",
+ "gdk-pixbuf-sys 0.18.0",
+ "gio-sys 0.18.1",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
+ "libc",
+ "pango-sys 0.18.0",
+ "pkg-config",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "gdk4"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d81e2a6c6ecba2aab60633a98df1868b03fa0bfdce8105edc27c1bccf71f0e39"
+dependencies = [
+ "cairo-rs 0.22.0",
+ "gdk-pixbuf 0.22.0",
+ "gdk4-sys",
+ "gio 0.22.8",
+ "glib 0.22.8",
+ "libc",
+ "pango 0.22.8",
+]
+
+[[package]]
+name = "gdk4-sys"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d8f608d8d7d229975c4d0d026f5d3071598c4ddab3c5262b0a31840fec78d13"
+dependencies = [
+ "cairo-sys-rs 0.22.0",
+ "gdk-pixbuf-sys 0.22.0",
+ "gio-sys 0.22.8",
+ "glib-sys 0.22.8",
+ "gobject-sys 0.22.6",
+ "libc",
+ "pango-sys 0.22.0",
+ "pkg-config",
+ "system-deps 7.0.8",
+]
+
+[[package]]
+name = "gdk4-wayland"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32d95828dadc0357dee236cc6a5712808bd894d3217159982592ce24f2b8aaf7"
+dependencies = [
+ "gdk4",
+ "gdk4-wayland-sys",
+ "gio 0.22.8",
+ "glib 0.22.8",
+ "libc",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+]
+
+[[package]]
+name = "gdk4-wayland-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "653cafb8715f2ac1c56edaf8060d9360ae3acbe3c6fb61b676a2917d42b668cf"
+dependencies = [
+ "glib-sys 0.22.8",
+ "libc",
+ "system-deps 7.0.8",
+]
+
+[[package]]
+name = "gdk4-x11"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d892b4cf5a07e90e1390e93cd792975746c68b59f790a2de9e96ce77211ea9a"
+dependencies = [
+ "gdk4",
+ "gdk4-x11-sys",
+ "gio 0.22.8",
+ "glib 0.22.8",
+ "libc",
+]
+
+[[package]]
+name = "gdk4-x11-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d41f2e28f62378b081288914325d73bddbb6ccbbadb41aa6392afc71d27002"
+dependencies = [
+ "gdk4-sys",
+ "glib-sys 0.22.8",
+ "libc",
+ "system-deps 7.0.8",
+]
+
+[[package]]
+name = "gethostname"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
+dependencies = [
+ "rustix 1.1.4",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 5.3.0",
+ "wasip2",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 6.0.0",
+]
+
+[[package]]
+name = "gio"
+version = "0.18.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "gio-sys 0.18.1",
+ "glib 0.18.5",
+ "libc",
+ "once_cell",
+ "pin-project-lite",
+ "smallvec",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "gio"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b3e1f669909c326b9413bde5a742097b8c90a7d78f45326db13668984769ded"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "gio-sys 0.22.8",
+ "glib 0.22.8",
+ "libc",
+ "pin-project-lite",
+ "smallvec",
+]
+
+[[package]]
+name = "gio-sys"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
+dependencies = [
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
+ "libc",
+ "system-deps 6.2.2",
+ "winapi",
+]
+
+[[package]]
+name = "gio-sys"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "353fdc7da7cd16da916104b1e0e4e7de380ec9c8aaa20d4d742d66310ab4b0d5"
+dependencies = [
+ "glib-sys 0.22.8",
+ "gobject-sys 0.22.6",
+ "libc",
+ "system-deps 7.0.8",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "gl_generator"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
+dependencies = [
+ "khronos_api",
+ "log",
+ "xml-rs",
+]
+
+[[package]]
+name = "glib"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
+dependencies = [
+ "bitflags 2.13.1",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-task",
+ "futures-util",
+ "gio-sys 0.18.1",
+ "glib-macros 0.18.5",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
+ "libc",
+ "memchr",
+ "once_cell",
+ "smallvec",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "glib"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddbcf514bd1881fc1b960e4e52b4e82873f4da3bceddbd58d42827b508888100"
+dependencies = [
+ "bitflags 2.13.1",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-task",
+ "futures-util",
+ "gio-sys 0.22.8",
+ "glib-macros 0.22.6",
+ "glib-sys 0.22.8",
+ "gobject-sys 0.22.6",
+ "libc",
+ "memchr",
+ "smallvec",
+]
+
+[[package]]
+name = "glib-macros"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-crate 2.0.2",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "glib-macros"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "506d23499707c7142898429757e8d9a3871d965239a2cb66dfa05052be6d6f19"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
+dependencies = [
+ "libc",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "030967459f9f676851872c6304adea7825c6d462ec9b72554c733cf0c5952233"
+dependencies = [
+ "libc",
+ "system-deps 7.0.8",
+]
+
+[[package]]
+name = "glow"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08"
+dependencies = [
+ "js-sys",
+ "slotmap",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "glutin"
+version = "0.32.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12124de845cacfebedff80e877bb37b5b75c34c5a4c89e47e1cdd67fb6041325"
+dependencies = [
+ "bitflags 2.13.1",
+ "cfg_aliases",
+ "cgl",
+ "dispatch2",
+ "glutin_egl_sys",
+ "glutin_glx_sys",
+ "glutin_wgl_sys",
+ "libloading 0.8.9",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "once_cell",
+ "raw-window-handle",
+ "wayland-sys",
+ "windows-sys 0.52.0",
+ "x11-dl",
+]
+
+[[package]]
+name = "glutin-winit"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85edca7075f8fc728f28cb8fbb111a96c3b89e930574369e3e9c27eb75d3788f"
+dependencies = [
+ "cfg_aliases",
+ "glutin",
+ "raw-window-handle",
+ "winit",
+]
+
+[[package]]
+name = "glutin_egl_sys"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c4680ba6195f424febdc3ba46e7a42a0e58743f2edb115297b86d7f8ecc02d2"
+dependencies = [
+ "gl_generator",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "glutin_glx_sys"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7bb2938045a88b612499fbcba375a77198e01306f52272e692f8c1f3751185"
+dependencies = [
+ "gl_generator",
+ "x11-dl",
+]
+
+[[package]]
+name = "glutin_wgl_sys"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c4ee00b289aba7a9e5306d57c2d05499b2e5dc427f84ac708bd2c090212cf3e"
+dependencies = [
+ "gl_generator",
+]
+
+[[package]]
+name = "gobject-sys"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
+dependencies = [
+ "glib-sys 0.18.1",
+ "libc",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "gobject-sys"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22a861859b887a79cf461359c192c97a57d8fb0229dd291232e57aa11f6fa72c"
+dependencies = [
+ "glib-sys 0.22.8",
+ "libc",
+ "system-deps 7.0.8",
+]
+
+[[package]]
+name = "gpu-alloc"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45cf04b2726f02df5508c6de726acdc90cdf97ac771a9a0ffd8ba10a6e696bf9"
+dependencies = [
+ "bitflags 2.13.1",
+ "gpu-alloc-types",
+]
+
+[[package]]
+name = "gpu-alloc-types"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2bbed164dd10ed526c2e4fe3e721ca4a71c61730e5aafac6844b417b3227058"
+dependencies = [
+ "bitflags 2.13.1",
+]
+
+[[package]]
+name = "gpu-descriptor"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
+dependencies = [
+ "bitflags 2.13.1",
+ "gpu-descriptor-types",
+ "hashbrown 0.15.5",
+]
+
+[[package]]
+name = "gpu-descriptor-types"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
+dependencies = [
+ "bitflags 2.13.1",
+]
+
+[[package]]
+name = "graphene-rs"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb856b9c558971c3f13ab692358926da710b046932a4e087aedcc35b040d7dff"
+dependencies = [
+ "glib 0.22.8",
+ "graphene-sys",
+]
+
+[[package]]
+name = "graphene-sys"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7ffdfde88f3570d3705e0d8a2433e036d387a1f2930bbf47eafcb5f569fd04"
+dependencies = [
+ "glib-sys 0.22.8",
+ "libc",
+ "system-deps 7.0.8",
+]
+
+[[package]]
+name = "gsk4"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b867be1c5f14dcb8f552c0eff6e9a9b1da5f8b43943e8efc3a63c889d84952ff"
+dependencies = [
+ "cairo-rs 0.22.0",
+ "gdk4",
+ "glib 0.22.8",
+ "graphene-rs",
+ "gsk4-sys",
+ "libc",
+ "pango 0.22.8",
+]
+
+[[package]]
+name = "gsk4-sys"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b7c7eb2e681ee896646cfb8872b431f24d09f53ba9283289d9b10caa6707088"
+dependencies = [
+ "cairo-sys-rs 0.22.0",
+ "gdk4-sys",
+ "glib-sys 0.22.8",
+ "gobject-sys 0.22.6",
+ "graphene-sys",
+ "libc",
+ "pango-sys 0.22.0",
+ "system-deps 7.0.8",
+]
+
+[[package]]
+name = "gtk"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a"
+dependencies = [
+ "atk",
+ "cairo-rs 0.18.5",
+ "field-offset",
+ "futures-channel",
+ "gdk",
+ "gdk-pixbuf 0.18.5",
+ "gio 0.18.4",
+ "glib 0.18.5",
+ "gtk-sys",
+ "gtk3-macros",
+ "libc",
+ "pango 0.18.3",
+ "pkg-config",
+]
+
+[[package]]
+name = "gtk-sys"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414"
+dependencies = [
+ "atk-sys",
+ "cairo-sys-rs 0.18.2",
+ "gdk-pixbuf-sys 0.18.0",
+ "gdk-sys",
+ "gio-sys 0.18.1",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
+ "libc",
+ "pango-sys 0.18.0",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "gtk3-macros"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "gtk4"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98a0a0466484f64b07b5b8184d43fa46be78eb0b8e04ae4e179af31d770b76d9"
+dependencies = [
+ "cairo-rs 0.22.0",
+ "field-offset",
+ "futures-channel",
+ "gdk-pixbuf 0.22.0",
+ "gdk4",
+ "gio 0.22.8",
+ "glib 0.22.8",
+ "graphene-rs",
+ "gsk4",
+ "gtk4-macros",
+ "gtk4-sys",
+ "libc",
+ "pango 0.22.8",
+]
+
+[[package]]
+name = "gtk4-macros"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ac7179400a36a04de039c24206bb841c5596992b907b43b23ee8d5bdc40d00e"
+dependencies = [
+ "proc-macro-crate 3.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "gtk4-sys"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b8f954786af0b1984425c4446b77f5ff6594346181316be3f850caab1c6f01"
+dependencies = [
+ "cairo-sys-rs 0.22.0",
+ "gdk-pixbuf-sys 0.22.0",
+ "gdk4-sys",
+ "gio-sys 0.22.8",
+ "glib-sys 0.22.8",
+ "gobject-sys 0.22.6",
+ "graphene-sys",
+ "gsk4-sys",
+ "libc",
+ "pango-sys 0.22.0",
+ "system-deps 7.0.8",
+]
+
+[[package]]
+name = "half"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+ "zerocopy",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "foldhash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "hexf-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
+
+[[package]]
+name = "icu_collections"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "utf8_iter",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
+dependencies = [
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
+
+[[package]]
+name = "icu_properties"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
+dependencies = [
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
+
+[[package]]
+name = "icu_provider"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "image"
+version = "0.25.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "moxcms",
+ "num-traits",
+ "png",
+ "tiff",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.17.1",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+dependencies = [
+ "cesu8",
+ "cfg-if",
+ "combine",
+ "jni-sys 0.3.1",
+ "log",
+ "thiserror 1.0.69",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "jni"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
+dependencies = [
+ "cfg-if",
+ "combine",
+ "jni-macros",
+ "jni-sys 0.4.1",
+ "log",
+ "simd_cesu8",
+ "thiserror 2.0.19",
+ "walkdir",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "jni-macros"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "simd_cesu8",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3"
+dependencies = [
+ "getrandom 0.4.3",
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "keyboard-types"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
+dependencies = [
+ "bitflags 2.13.1",
+ "serde",
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "khronos-egl"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
+dependencies = [
+ "libc",
+ "libloading 0.8.9",
+ "pkg-config",
+]
+
+[[package]]
+name = "khronos_api"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
+
+[[package]]
+name = "ksni"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4934310bdd016e55725482b8d35ac0c16fd058c1b955d8959aa2d953b918c85b"
+dependencies = [
+ "dbus",
+ "dbus-codegen",
+ "dbus-tree",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "libappindicator"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a"
+dependencies = [
+ "glib 0.18.5",
+ "gtk",
+ "gtk-sys",
+ "libappindicator-sys",
+ "log",
+]
+
+[[package]]
+name = "libappindicator-sys"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
+dependencies = [
+ "gtk-sys",
+ "libloading 0.7.4",
+ "once_cell",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.186"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+
+[[package]]
+name = "libdbus-sys"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043"
+dependencies = [
+ "pkg-config",
+]
+
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
+[[package]]
+name = "libloading"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
+dependencies = [
+ "cfg-if",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
+dependencies = [
+ "bitflags 2.13.1",
+ "libc",
+ "plain",
+ "redox_syscall 0.9.0",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+
+[[package]]
+name = "litemap"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
+
+[[package]]
+name = "litrs"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
+
+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memchr"
+version = "2.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
+
+[[package]]
+name = "memmap2"
+version = "0.9.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "metal"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e"
+dependencies = [
+ "bitflags 2.13.1",
+ "block",
+ "core-graphics-types 0.1.3",
+ "foreign-types",
+ "log",
+ "objc",
+ "paste",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
+[[package]]
+name = "moxcms"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
+dependencies = [
+ "num-traits",
+ "pxfm",
+]
+
+[[package]]
+name = "muda"
+version = "0.19.3"
+dependencies = [
+ "arc-swap",
+ "crossbeam-channel",
+ "dpi",
+ "gtk4",
+ "keyboard-types",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "once_cell",
+ "png",
+ "serde",
+ "thiserror 2.0.19",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "naga"
+version = "24.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e380993072e52eef724eddfcde0ed013b0c023c3f0417336ed041aa9f076994e"
+dependencies = [
+ "arrayvec",
+ "bit-set",
+ "bitflags 2.13.1",
+ "cfg_aliases",
+ "codespan-reporting",
+ "hexf-parse",
+ "indexmap",
+ "log",
+ "rustc-hash 1.1.0",
+ "spirv",
+ "strum",
+ "termcolor",
+ "thiserror 2.0.19",
+ "unicode-xid",
+]
+
+[[package]]
+name = "ndk"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
+dependencies = [
+ "bitflags 2.13.1",
+ "jni-sys 0.3.1",
+ "log",
+ "ndk-sys 0.6.0+11769913",
+ "num_enum",
+ "raw-window-handle",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "ndk-context"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
+
+[[package]]
+name = "ndk-sys"
+version = "0.5.0+25.2.9519653"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
+dependencies = [
+ "jni-sys 0.3.1",
+]
+
+[[package]]
+name = "ndk-sys"
+version = "0.6.0+11769913"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
+dependencies = [
+ "jni-sys 0.3.1",
+]
+
+[[package]]
+name = "nohash-hasher"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26"
+dependencies = [
+ "num_enum_derive",
+ "rustversion",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8"
+dependencies = [
+ "proc-macro-crate 3.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+]
+
+[[package]]
+name = "objc-sys"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
+
+[[package]]
+name = "objc2"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
+dependencies = [
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
+dependencies = [
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-app-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "libc",
+ "objc2 0.5.2",
+ "objc2-core-data 0.2.2",
+ "objc2-core-image 0.2.2",
+ "objc2-foundation 0.2.2",
+ "objc2-quartz-core 0.2.2",
+]
+
+[[package]]
+name = "objc2-app-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
+dependencies = [
+ "bitflags 2.13.1",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-cloud-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-core-location 0.2.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-cloud-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
+dependencies = [
+ "bitflags 2.13.1",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-contacts"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
+dependencies = [
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
+dependencies = [
+ "bitflags 2.13.1",
+ "dispatch2",
+ "objc2 0.6.4",
+]
+
+[[package]]
+name = "objc2-core-graphics"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
+dependencies = [
+ "bitflags 2.13.1",
+ "dispatch2",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-io-surface",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+dependencies = [
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
+dependencies = [
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-contacts",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-core-text"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
+dependencies = [
+ "bitflags 2.13.1",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
+
+[[package]]
+name = "objc2-foundation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "dispatch",
+ "libc",
+ "objc2 0.5.2",
+]
+
+[[package]]
+name = "objc2-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.6.2",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-io-surface"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
+dependencies = [
+ "bitflags 2.13.1",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-link-presentation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
+dependencies = [
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-metal"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
+dependencies = [
+ "bitflags 2.13.1",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-symbols"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
+dependencies = [
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-ui-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-cloud-kit 0.2.2",
+ "objc2-core-data 0.2.2",
+ "objc2-core-image 0.2.2",
+ "objc2-core-location 0.2.2",
+ "objc2-foundation 0.2.2",
+ "objc2-link-presentation",
+ "objc2-quartz-core 0.2.2",
+ "objc2-symbols",
+ "objc2-uniform-type-identifiers",
+ "objc2-user-notifications 0.2.2",
+]
+
+[[package]]
+name = "objc2-ui-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.6.2",
+ "objc2 0.6.4",
+ "objc2-cloud-kit 0.3.2",
+ "objc2-core-data 0.3.2",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-core-image 0.3.2",
+ "objc2-core-location 0.3.2",
+ "objc2-core-text",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core 0.3.2",
+ "objc2-user-notifications 0.3.2",
+]
+
+[[package]]
+name = "objc2-uniform-type-identifiers"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
+dependencies = [
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-core-location 0.2.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "orbclient"
+version = "0.3.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5df339f526ea9a60e371768d50efc2f2508c7203290731565d1f7a6f71d21747"
+dependencies = [
+ "libc",
+ "libredox",
+]
+
+[[package]]
+name = "ordered-float"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "owned_ttf_parser"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b"
+dependencies = [
+ "ttf-parser",
+]
+
+[[package]]
+name = "pango"
+version = "0.18.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4"
+dependencies = [
+ "gio 0.18.4",
+ "glib 0.18.5",
+ "libc",
+ "once_cell",
+ "pango-sys 0.18.0",
+]
+
+[[package]]
+name = "pango"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d800d8d0de2ad5d0fb046f5344dbaba14a003cf3dd27cc21d85893d35ea316c"
+dependencies = [
+ "gio 0.22.8",
+ "glib 0.22.8",
+ "pango-sys 0.22.0",
+]
+
+[[package]]
+name = "pango-sys"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
+dependencies = [
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
+ "libc",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "pango-sys"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd111a20ca90fedf03e09c59783c679c00900f1d8491cca5399f5e33609d5d6"
+dependencies = [
+ "glib-sys 0.22.8",
+ "gobject-sys 0.22.6",
+ "libc",
+ "system-deps 7.0.8",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.18",
+ "smallvec",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "pin-project"
+version = "1.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
+
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+
+[[package]]
+name = "png"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
+dependencies = [
+ "bitflags 2.13.1",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "polling"
+version = "3.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi 0.5.2",
+ "pin-project-lite",
+ "rustix 1.1.4",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
+dependencies = [
+ "toml_datetime 0.6.3",
+ "toml_edit 0.20.2",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
+dependencies = [
+ "toml_edit 0.25.13+spec-1.1.0",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "profiling"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"
+
+[[package]]
+name = "pxfm"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea"
+
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
+[[package]]
+name = "quick-xml"
+version = "0.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
+[[package]]
+name = "raw-window-handle"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags 2.13.1",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5102a6aaa05aa011a238e178e6bca86d2cb56fc9f586d37cb80f5bca6e07759"
+dependencies = [
+ "bitflags 2.13.1",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
+dependencies = [
+ "getrandom 0.2.17",
+ "libredox",
+ "thiserror 2.0.19",
+]
+
+[[package]]
+name = "renderdoc-sys"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+dependencies = [
+ "bitflags 2.13.1",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+dependencies = [
+ "bitflags 2.13.1",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.12.1",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
+name = "scopeguard"
+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 = [
+ "ab_glyph",
+ "log",
+ "memmap2",
+ "smithay-client-toolkit 0.19.2",
+ "tiny-skia",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+
+[[package]]
+name = "serde"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.0",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.150"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "shlex"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"
+
+[[package]]
+name = "simd_cesu8"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520"
+dependencies = [
+ "rustc_version",
+ "simdutf8",
+]
+
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "slotmap"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
+
+[[package]]
+name = "smithay-client-toolkit"
+version = "0.19.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
+dependencies = [
+ "bitflags 2.13.1",
+ "calloop 0.13.0",
+ "calloop-wayland-source 0.3.0",
+ "cursor-icon",
+ "libc",
+ "log",
+ "memmap2",
+ "rustix 0.38.44",
+ "thiserror 1.0.69",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-csd-frame",
+ "wayland-cursor",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+ "wayland-scanner",
+ "xkeysym",
+]
+
+[[package]]
+name = "smithay-client-toolkit"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0"
+dependencies = [
+ "bitflags 2.13.1",
+ "calloop 0.14.4",
+ "calloop-wayland-source 0.4.1",
+ "cursor-icon",
+ "libc",
+ "log",
+ "memmap2",
+ "rustix 1.1.4",
+ "thiserror 2.0.19",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-csd-frame",
+ "wayland-cursor",
+ "wayland-protocols",
+ "wayland-protocols-experimental",
+ "wayland-protocols-misc",
+ "wayland-protocols-wlr",
+ "wayland-scanner",
+ "xkeysym",
+]
+
+[[package]]
+name = "smithay-clipboard"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71704c03f739f7745053bde45fa203a46c58d25bc5c4efba1d9a60e9dba81226"
+dependencies = [
+ "libc",
+ "smithay-client-toolkit 0.20.0",
+ "wayland-backend",
+]
+
+[[package]]
+name = "smol_str"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "spirv"
+version = "0.3.0+sdk-1.3.268.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
+dependencies = [
+ "bitflags 2.13.1",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strict-num"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "strum"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.119"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2fac314a64dc9a36e61a9eb4261a5e9bbfbc922b27e518af97bc32b926cf967"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "system-deps"
+version = "6.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+dependencies = [
+ "cfg-expr 0.15.8",
+ "heck 0.5.0",
+ "pkg-config",
+ "toml 0.8.2",
+ "version-compare",
+]
+
+[[package]]
+name = "system-deps"
+version = "7.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "396a35feb67335377e0251fcbc1092fc85c484bd4e3a7a54319399da127796e7"
+dependencies = [
+ "cfg-expr 0.20.8",
+ "heck 0.5.0",
+ "pkg-config",
+ "toml 1.1.3+spec-1.1.0",
+ "version-compare",
+]
+
+[[package]]
+name = "tao"
+version = "0.35.3"
+dependencies = [
+ "async-channel",
+ "bitflags 2.13.1",
+ "block2 0.6.2",
+ "core-foundation 0.10.1",
+ "core-graphics 0.25.0",
+ "crossbeam-channel",
+ "dbus",
+ "dispatch2",
+ "dlopen2",
+ "dpi",
+ "gdk4-wayland",
+ "gdk4-x11",
+ "gtk4",
+ "jni 0.21.1",
+ "libc",
+ "log",
+ "ndk",
+ "ndk-sys 0.6.0+11769913",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-foundation 0.3.2",
+ "objc2-ui-kit 0.3.2",
+ "once_cell",
+ "parking_lot",
+ "percent-encoding",
+ "raw-window-handle",
+ "tao-macros",
+ "unicode-segmentation",
+ "url",
+ "windows 0.61.3",
+ "windows-core 0.61.2",
+ "windows-version",
+ "x11-dl",
+]
+
+[[package]]
+name = "tao-macros"
+version = "0.1.3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+
+[[package]]
+name = "target-lexicon"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9"
+dependencies = [
+ "thiserror-impl 2.0.19",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.0",
+]
+
+[[package]]
+name = "tiff"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b63feaf3343d35b6ca4d50483f94843803b0f51634937cc2ec519fc32232bc52"
+dependencies = [
+ "fax",
+ "flate2",
+ "half",
+ "quick-error",
+ "weezl",
+ "zune-jpeg",
+]
+
+[[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",
+]
+
+[[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]]
+name = "tinystr"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+dependencies = [
+ "serde",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.3",
+ "toml_edit 0.20.2",
+]
+
+[[package]]
+name = "toml"
+version = "1.1.3+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53c96ecdfa941c8fc4fcaed14f99ada8ebed502eef533015095a07e3301d4c3c"
+dependencies = [
+ "indexmap",
+ "serde_core",
+ "serde_spanned 1.1.1",
+ "toml_datetime 1.1.1+spec-1.1.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow 1.0.4",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "1.1.1+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime 0.6.3",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.3",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.25.13+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b"
+dependencies = [
+ "indexmap",
+ "toml_datetime 1.1.1+spec-1.1.0",
+ "toml_parser",
+ "winnow 1.0.4",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
+dependencies = [
+ "winnow 1.0.4",
+]
+
+[[package]]
+name = "toml_writer"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
+
+[[package]]
+name = "tracing"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
+dependencies = [
+ "log",
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
+
+[[package]]
+name = "tray-icon"
+version = "0.24.1"
+dependencies = [
+ "arc-swap",
+ "crossbeam-channel",
+ "dirs",
+ "eframe",
+ "gtk4",
+ "image",
+ "ksni",
+ "libappindicator",
+ "muda",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation 0.3.2",
+ "once_cell",
+ "png",
+ "serde",
+ "serde_json",
+ "tao",
+ "thiserror 2.0.19",
+ "windows-sys 0.60.2",
+ "winit",
+]
+
+[[package]]
+name = "ttf-parser"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
+
+[[package]]
+name = "type-map"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90"
+dependencies = [
+ "rustc-hash 2.1.3",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "url"
+version = "2.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "version-compare"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasip2"
+version = "1.0.4+wasi-0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wayland-backend"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix 1.1.4",
+ "scoped-tls",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
+dependencies = [
+ "bitflags 2.13.1",
+ "rustix 1.1.4",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-csd-frame"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
+dependencies = [
+ "bitflags 2.13.1",
+ "cursor-icon",
+ "wayland-backend",
+]
+
+[[package]]
+name = "wayland-cursor"
+version = "0.31.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a52d18780be9b1314328a3de5f930b73d2200112e3849ca6cb11822793fb34d"
+dependencies = [
+ "rustix 1.1.4",
+ "wayland-client",
+ "xcursor",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.32.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6"
+dependencies = [
+ "bitflags 2.13.1",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-experimental"
+version = "20250721.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1"
+dependencies = [
+ "bitflags 2.13.1",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-misc"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8"
+dependencies = [
+ "bitflags 2.13.1",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-plasma"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91"
+dependencies = [
+ "bitflags 2.13.1",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
+dependencies = [
+ "bitflags 2.13.1",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.10"
+dependencies = [
+ "proc-macro2",
+ "quick-xml",
+ "quote",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
+dependencies = [
+ "dlib",
+ "log",
+ "once_cell",
+ "pkg-config",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webbrowser"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc95580916af1e68ff6a7be07446fc5db73ebf71cf092de939bbf5f7e189f72"
+dependencies = [
+ "core-foundation 0.10.1",
+ "jni 0.22.4",
+ "log",
+ "ndk-context",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+ "url",
+ "web-sys",
+]
+
+[[package]]
+name = "weezl"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
+
+[[package]]
+name = "wgpu"
+version = "24.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b0b3436f0729f6cdf2e6e9201f3d39dc95813fad61d826c1ed07918b4539353"
+dependencies = [
+ "arrayvec",
+ "bitflags 2.13.1",
+ "cfg_aliases",
+ "document-features",
+ "js-sys",
+ "log",
+ "parking_lot",
+ "profiling",
+ "raw-window-handle",
+ "smallvec",
+ "static_assertions",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "wgpu-core",
+ "wgpu-hal",
+ "wgpu-types",
+]
+
+[[package]]
+name = "wgpu-core"
+version = "24.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f0aa306497a238d169b9dc70659105b4a096859a34894544ca81719242e1499"
+dependencies = [
+ "arrayvec",
+ "bit-vec",
+ "bitflags 2.13.1",
+ "cfg_aliases",
+ "document-features",
+ "indexmap",
+ "log",
+ "naga",
+ "once_cell",
+ "parking_lot",
+ "profiling",
+ "raw-window-handle",
+ "rustc-hash 1.1.0",
+ "smallvec",
+ "thiserror 2.0.19",
+ "wgpu-hal",
+ "wgpu-types",
+]
+
+[[package]]
+name = "wgpu-hal"
+version = "24.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f112f464674ca69f3533248508ee30cb84c67cf06c25ff6800685f5e0294e259"
+dependencies = [
+ "android_system_properties",
+ "arrayvec",
+ "ash",
+ "bitflags 2.13.1",
+ "bytemuck",
+ "cfg_aliases",
+ "core-graphics-types 0.1.3",
+ "glow",
+ "glutin_wgl_sys",
+ "gpu-alloc",
+ "gpu-descriptor",
+ "js-sys",
+ "khronos-egl",
+ "libc",
+ "libloading 0.8.9",
+ "log",
+ "metal",
+ "naga",
+ "ndk-sys 0.5.0+25.2.9519653",
+ "objc",
+ "once_cell",
+ "ordered-float",
+ "parking_lot",
+ "profiling",
+ "raw-window-handle",
+ "renderdoc-sys",
+ "rustc-hash 1.1.0",
+ "smallvec",
+ "thiserror 2.0.19",
+ "wasm-bindgen",
+ "web-sys",
+ "wgpu-types",
+ "windows 0.58.0",
+]
+
+[[package]]
+name = "wgpu-types"
+version = "24.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50ac044c0e76c03a0378e7786ac505d010a873665e2d51383dcff8dd227dc69c"
+dependencies = [
+ "bitflags 2.13.1",
+ "js-sys",
+ "log",
+ "web-sys",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+dependencies = [
+ "windows-core 0.58.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows"
+version = "0.61.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
+dependencies = [
+ "windows-collections",
+ "windows-core 0.61.2",
+ "windows-future",
+ "windows-link 0.1.3",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
+dependencies = [
+ "windows-core 0.61.2",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+dependencies = [
+ "windows-implement 0.58.0",
+ "windows-interface 0.58.0",
+ "windows-result 0.2.0",
+ "windows-strings 0.1.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+dependencies = [
+ "windows-implement 0.60.2",
+ "windows-interface 0.59.3",
+ "windows-link 0.1.3",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
+dependencies = [
+ "windows-core 0.61.2",
+ "windows-link 0.1.3",
+ "windows-threading",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-numerics"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
+dependencies = [
+ "windows-core 0.61.2",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result 0.2.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+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",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+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 0.2.1",
+ "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",
+]
+
+[[package]]
+name = "windows-threading"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-version"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+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.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[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.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[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.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[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.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[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.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[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.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[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"
+dependencies = [
+ "ahash",
+ "android-activity",
+ "atomic-waker",
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "bytemuck",
+ "calloop 0.13.0",
+ "cfg_aliases",
+ "concurrent-queue",
+ "core-foundation 0.9.4",
+ "core-graphics 0.23.2",
+ "cursor-icon",
+ "dpi",
+ "js-sys",
+ "libc",
+ "memmap2",
+ "ndk",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
+ "objc2-ui-kit 0.2.2",
+ "orbclient",
+ "percent-encoding",
+ "pin-project",
+ "raw-window-handle",
+ "redox_syscall 0.4.1",
+ "rustix 0.38.44",
+ "sctk-adwaita",
+ "smithay-client-toolkit 0.19.2",
+ "smol_str",
+ "tracing",
+ "unicode-segmentation",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-plasma",
+ "web-sys",
+ "web-time",
+ "windows-sys 0.52.0",
+ "x11-dl",
+ "x11rb",
+ "xkbcommon-dl",
+]
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
+[[package]]
+name = "writeable"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
+
+[[package]]
+name = "x11-dl"
+version = "2.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
+dependencies = [
+ "libc",
+ "once_cell",
+ "pkg-config",
+]
+
+[[package]]
+name = "x11rb"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
+dependencies = [
+ "as-raw-xcb-connection",
+ "gethostname",
+ "libc",
+ "libloading 0.8.9",
+ "once_cell",
+ "rustix 1.1.4",
+ "x11rb-protocol",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
+
+[[package]]
+name = "xcursor"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b"
+
+[[package]]
+name = "xkbcommon-dl"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
+dependencies = [
+ "bitflags 2.13.1",
+ "dlib",
+ "log",
+ "once_cell",
+ "xkeysym",
+]
+
+[[package]]
+name = "xkeysym"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
+
+[[package]]
+name = "xml-rs"
+version = "0.8.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
+
+[[package]]
+name = "yoke"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7cbbc0a705a0fd05cc3676525980d2bf5a9bc4adac6d6475209a7887cf59d19"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2e817b7b52d0c7358d3246da9d69935ebb18116b2b102b4230dac079b4862f5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "synstructure",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
+
+[[package]]
+name = "zune-core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9"
+
+[[package]]
+name = "zune-jpeg"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
+dependencies = [
+ "zune-core",
+]
diff --git a/ports/tray-icon/Cargo.toml b/ports/tray-icon/Cargo.toml
new file mode 100644
index 000000000000..e8e9fe40ec2b
--- /dev/null
+++ b/ports/tray-icon/Cargo.toml
@@ -0,0 +1,110 @@
+[package]
+name = "tray-icon"
+version = "0.24.1"
+edition = "2021"
+description = "Create tray icons for desktop applications"
+homepage = "https://github.com/tauri-apps/tray-icon"
+repository = "https://github.com/tauri-apps/tray-icon"
+license = "MIT OR Apache-2.0"
+categories = ["gui"]
+rust-version = "1.73"
+include = [
+  "README.md",
+  "src/**/*.rs",
+  "Cargo.toml",
+  "LICENSE-APACHE",
+  "LICENSE-MIT",
+  "LICENSE.spdx",
+]
+
+[features]
+default = ["libxdo", "gtk"]
+libxdo = ["muda/libxdo"]
+serde = ["muda/serde", "dep:serde"]
+common-controls-v6 = ["muda/common-controls-v6"]
+gtk = ["muda/gtk", "dep:libappindicator"]
+linux-ksni = ["dep:arc-swap", "dep:ksni", "muda/linux-ksni"]
+
+[dependencies]
+muda = { path = "../muda", default-features = false }
+crossbeam-channel = "0.5"
+once_cell = "1"
+thiserror = "2"
+serde = { version = "1", optional = true }
+
+[target."cfg(target_os = \"windows\")".dependencies.windows-sys]
+version = ">=0.60, <=0.61"
+features = [
+  "Win32_UI_WindowsAndMessaging",
+  "Win32_Foundation",
+  "Win32_System_SystemServices",
+  "Win32_Graphics_Gdi",
+  "Win32_UI_Shell",
+]
+
+[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"netbsd\", target_os = \"openbsd\"))".dependencies]
+libappindicator = { version = "0.9", optional = true }
+arc-swap = { version = "1.7.1", optional = true }
+ksni = { version = "0.2.2", optional = true }
+dirs = "6"
+
+[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"netbsd\", target_os = \"openbsd\"))".dev-dependencies]
+gtk = { package = "gtk4", version = "0.11" }
+
+[target."cfg(target_os = \"macos\")".dependencies]
+objc2 = "0.6"
+objc2-core-graphics = { version = "0.3", default-features = false, features = [
+  "std",
+  "CGDirectDisplay",
+] }
+objc2-core-foundation = { version = "0.3", default-features = false, features = [
+  "std",
+  "CFCGTypes",
+  "CFRunLoop",
+] }
+objc2-foundation = { version = "0.3", default-features = false, features = [
+  "std",
+  "block2",
+  "objc2-core-foundation",
+  "NSArray",
+  "NSData",
+  "NSEnumerator",
+  "NSGeometry",
+  "NSString",
+  "NSThread",
+] }
+objc2-app-kit = { version = "0.3", default-features = false, features = [
+  "std",
+  "objc2-core-foundation",
+  "NSButton",
+  "NSCell",
+  "NSControl",
+  "NSEvent",
+  "NSImage",
+  "NSMenu",
+  "NSResponder",
+  "NSStatusBar",
+  "NSStatusBarButton",
+  "NSStatusItem",
+  "NSTrackingArea",
+  "NSView",
+  "NSWindow",
+] }
+
+[target."cfg(any(target_os = \"linux\", target_os = \"macos\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"netbsd\", target_os = \"openbsd\"))".dependencies]
+png = "0.18"
+
+[dev-dependencies]
+winit = "0.30"
+tao = { path = "../tao" }
+eframe = { version = "0.31", default-features = false, features = [
+  "default_fonts",
+  "glow",
+  "wayland",
+  "x11",
+] }
+image = { version = "0.25", default-features = false, features = ["png"] }
+serde_json = "1"
+
+[patch.crates-io]
+wayland-scanner = { path = "../../vendor/wayland-scanner" }
diff --git a/ports/tray-icon/LICENSE-APACHE b/ports/tray-icon/LICENSE-APACHE
new file mode 100644
index 000000000000..16fe87b06e80
--- /dev/null
+++ b/ports/tray-icon/LICENSE-APACHE
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/ports/tray-icon/LICENSE-MIT b/ports/tray-icon/LICENSE-MIT
new file mode 100644
index 000000000000..da5faffb87e7
--- /dev/null
+++ b/ports/tray-icon/LICENSE-MIT
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022-2022 Tauri Programme within The Commons Conservancy
+
+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/ports/tray-icon/LICENSE.spdx b/ports/tray-icon/LICENSE.spdx
new file mode 100644
index 000000000000..4708994c5d25
--- /dev/null
+++ b/ports/tray-icon/LICENSE.spdx
@@ -0,0 +1,18 @@
+SPDXVersion: SPDX-2.1
+DataLicense: CC0-1.0
+PackageName: tray-icon
+SPDXID: SPDXRef-1
+PackageSupplier: Organization: The Tauri Programme in the Commons Conservancy
+PackageHomePage: https://tauri.app
+PackageLicenseDeclared: Apache-2.0 OR MIT
+PackageCopyrightText: 2020-2022, The Tauri Programme in the Commons Conservancy
+PackageSummary: <text>Create tray icons for desktop applications.
+                </text>
+PackageComment: <text>The package includes the following libraries; see
+Relationship information.
+                </text>
+Created: 2022-12-05T09:00:00Z
+PackageDownloadLocation: git://github.com/tauri-apps/tray-icon
+PackageDownloadLocation: git+https://github.com/tauri-apps/tray-icon.git
+PackageDownloadLocation: git+ssh://github.com/tauri-apps/tray-icon.git
+Creator: Person: Daniel Thompson-Yvetot
diff --git a/ports/tray-icon/README.md b/ports/tray-icon/README.md
new file mode 100644
index 000000000000..41101261d9b8
--- /dev/null
+++ b/ports/tray-icon/README.md
@@ -0,0 +1,133 @@
+tray-icon lets you create tray icons for desktop applications.
+
+## Platforms supported:
+
+- Windows
+- macOS
+- Linux (`linux-ksni` or legacy `gtk` backend)
+- FreeBSD (legacy `gtk` backend)
+
+## Platform-specific notes:
+
+- On Windows and Linux or FreeBSD, an event loop must be running on the thread. On Windows, this is a win32 event loop. On Linux with the legacy `gtk` backend or on FreeBSD, this is a gtk event loop. It doesn't need to be the main thread but you have to create the tray icon on the same thread as the event loop.
+- On macOS, an event loop must be running on the main thread so you also need to create the tray icon on the main thread.
+
+### Cargo Features
+
+- `common-controls-v6`: Use `TaskDialogIndirect` API from `ComCtl32.dll` v6 on Windows for showing the predefined `About` menu item dialog.
+- `linux-ksni`: Uses StatusNotifierItem over D-Bus through `ksni` for Linux tray icons, avoiding `libappindicator`.
+- `libxdo`: Enables linking to `libxdo` which is used for the predefined `Copy`, `Cut`, `Paste` and `SelectAll` menu item, see https://github.com/tauri-apps/muda#cargo-features
+- `serde`: Enables de/serializing derives.
+
+## Dependencies (Linux Only)
+
+On Linux, the `linux-ksni` feature uses StatusNotifierItem over D-Bus through `ksni` and does not depend on `libappindicator`. The legacy `gtk` feature keeps the appindicator backend available for compatibility. `libxdo` is used by predefined `Copy`, `Cut`, `Paste`, and `SelectAll` menu items.
+
+### Arch Linux / Manjaro:
+
+```sh
+pacman -S gtk4 xdotool dbus
+```
+
+### Debian / Ubuntu:
+
+```sh
+sudo apt install libgtk-4-dev libxdo-dev libdbus-1-dev
+```
+
+## Dependencies in FreeBSD
+
+Install this dependencies in order to compile `tray-icon`. Instructions using `pkg`:
+
+```sh
+pkg install -y rust glib pkgconf gtk4
+```
+
+## Examples
+
+#### Create a tray icon without a menu.
+
+```rs
+use tray_icon::TrayIconBuilder;
+
+let tray_icon = TrayIconBuilder::new()
+    .with_tooltip("system-tray - tray icon library!")
+    .with_icon(icon)
+    .build()
+    .unwrap();
+```
+
+#### Create a tray icon with a menu.
+
+```rs
+use tray_icon::{TrayIconBuilder, menu::Menu};
+
+let tray_menu = Menu::new();
+let tray_icon = TrayIconBuilder::new()
+    .with_menu(Box::new(tray_menu))
+    .with_tooltip("system-tray - tray icon library!")
+    .with_icon(icon)
+    .build()
+    .unwrap();
+```
+
+## Processing tray events
+
+You can use `TrayIconEvent::receiver` to get a reference to the `TrayIconEventReceiver`
+which you can use to listen to events when a click happens on the tray icon
+
+```rs
+use tray_icon::TrayIconEvent;
+
+if let Ok(event) = TrayIconEvent::receiver().try_recv() {
+    println!("{:?}", event);
+}
+```
+
+You can also listen for the menu events using `MenuEvent::receiver` to get events for the tray context menu.
+
+```rs
+use tray_icon::{TrayIconEvent, menu::{MenuEvent}};
+
+if let Ok(event) = TrayIconEvent::receiver().try_recv() {
+    println!("tray event: {:?}", event);
+}
+
+if let Ok(event) = MenuEvent::receiver().try_recv() {
+    println!("menu event: {:?}", event);
+}
+```
+
+### Note for [winit] or [tao] users:
+
+You should use [`TrayIconEvent::set_event_handler`] and forward
+the tray icon events to the event loop by using [`EventLoopProxy`]
+so that the event loop is awakened on each tray icon event.
+Same can be done for menu events using [`MenuEvent::set_event_handler`].
+
+```rust
+enum UserEvent {
+  TrayIconEvent(tray_icon::TrayIconEvent)
+  MenuEvent(tray_icon::menu::MenuEvent)
+}
+
+let event_loop = EventLoop::<UserEvent>::with_user_event().build().unwrap();
+
+let proxy = event_loop.create_proxy();
+tray_icon::TrayIconEvent::set_event_handler(Some(move |event| {
+    proxy.send_event(UserEvent::TrayIconEvent(event));
+}));
+
+let proxy = event_loop.create_proxy();
+tray_icon::menu::MenuEvent::set_event_handler(Some(move |event| {
+    proxy.send_event(UserEvent::MenuEvent(event));
+}));
+```
+
+[`EventLoopProxy`]: https://docs.rs/winit/latest/winit/event_loop/struct.EventLoopProxy.html
+[winit]: https://docs.rs/winit
+[tao]: https://docs.rs/tao
+
+## License
+
+Apache-2.0/MIT
diff --git a/ports/tray-icon/examples/egui.rs b/ports/tray-icon/examples/egui.rs
new file mode 100644
index 000000000000..733485b38693
--- /dev/null
+++ b/ports/tray-icon/examples/egui.rs
@@ -0,0 +1,142 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
+
+#[cfg(not(any(
+    target_os = "linux",
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "openbsd"
+)))]
+use std::{cell::RefCell, rc::Rc};
+
+use eframe::egui;
+use tray_icon::TrayIconBuilder;
+
+fn main() -> Result<(), eframe::Error> {
+    let path = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/icon.png");
+    let icon = load_icon(std::path::Path::new(path));
+
+    // Since egui uses winit under the hood and doesn't use gtk on Linux, and we need gtk for
+    // the tray icon to show up, we need to spawn a thread
+    // where we initialize gtk and create the tray_icon
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    ))]
+    std::thread::spawn(move || {
+        use gtk::prelude::{ApplicationExt, ApplicationExtManual};
+        use std::{cell::RefCell, rc::Rc};
+        use tray_icon::menu::Menu;
+
+        let gtk_app = gtk::Application::builder()
+            .application_id("com.tauri.tray-icon.egui")
+            .build();
+        let tray_icon = Rc::new(RefCell::new(None));
+        let tray_icon_ = tray_icon.clone();
+        gtk_app.connect_activate(move |_| {
+            tray_icon_.borrow_mut().get_or_insert_with(|| {
+                TrayIconBuilder::new()
+                    .with_menu(Box::new(Menu::new()))
+                    .with_icon(icon.clone())
+                    .build()
+                    .unwrap()
+            });
+        });
+        let _hold = gtk_app.hold();
+        gtk_app.run();
+    });
+
+    #[cfg(not(any(
+        target_os = "linux",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    )))]
+    let mut _tray_icon = Rc::new(RefCell::new(None));
+    #[cfg(not(any(
+        target_os = "linux",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    )))]
+    let tray_c = _tray_icon.clone();
+
+    eframe::run_native(
+        "My egui App",
+        eframe::NativeOptions::default(),
+        Box::new(move |_cc| {
+            #[cfg(not(any(
+                target_os = "linux",
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "netbsd",
+                target_os = "openbsd"
+            )))]
+            {
+                tray_c
+                    .borrow_mut()
+                    .replace(TrayIconBuilder::new().with_icon(icon).build().unwrap());
+            }
+            Ok(Box::<MyApp>::default())
+        }),
+    )
+}
+
+struct MyApp {
+    name: String,
+    age: u32,
+}
+
+impl Default for MyApp {
+    fn default() -> Self {
+        Self {
+            name: "Arthur".to_owned(),
+            age: 42,
+        }
+    }
+}
+
+impl eframe::App for MyApp {
+    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
+        use tray_icon::TrayIconEvent;
+
+        if let Ok(event) = TrayIconEvent::receiver().try_recv() {
+            println!("tray event: {event:?}");
+        }
+
+        egui::CentralPanel::default().show(ctx, |ui| {
+            ui.heading("My egui Application");
+            ui.horizontal(|ui| {
+                let name_label = ui.label("Your name: ");
+                ui.text_edit_singleline(&mut self.name)
+                    .labelled_by(name_label.id);
+            });
+            ui.add(egui::Slider::new(&mut self.age, 0..=120).text("age"));
+            if ui.button("Click each year").clicked() {
+                self.age += 1;
+            }
+            ui.label(format!("Hello '{}', age {}", self.name, self.age));
+        });
+    }
+}
+
+fn load_icon(path: &std::path::Path) -> tray_icon::Icon {
+    let (icon_rgba, icon_width, icon_height) = {
+        let image = image::open(path)
+            .expect("Failed to open icon path")
+            .into_rgba8();
+        let (width, height) = image.dimensions();
+        let rgba = image.into_raw();
+        (rgba, width, height)
+    };
+    tray_icon::Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon")
+}
diff --git a/ports/tray-icon/examples/icon.png b/ports/tray-icon/examples/icon.png
new file mode 100644
index 000000000000..3c3627c36d15
Binary files /dev/null and b/ports/tray-icon/examples/icon.png differ
diff --git a/ports/tray-icon/examples/tao.rs b/ports/tray-icon/examples/tao.rs
new file mode 100644
index 000000000000..784d685c232c
--- /dev/null
+++ b/ports/tray-icon/examples/tao.rs
@@ -0,0 +1,120 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+#![allow(unused)]
+
+use tao::{
+    event::Event,
+    event_loop::{ControlFlow, EventLoopBuilder},
+};
+use tray_icon::{
+    menu::{AboutMetadata, Menu, MenuEvent, MenuItem, PredefinedMenuItem},
+    TrayIconBuilder, TrayIconEvent,
+};
+
+enum UserEvent {
+    TrayIconEvent(tray_icon::TrayIconEvent),
+    MenuEvent(tray_icon::menu::MenuEvent),
+}
+
+fn main() {
+    let path = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/icon.png");
+
+    let event_loop = EventLoopBuilder::<UserEvent>::with_user_event().build();
+
+    // set a tray event handler that forwards the event and wakes up the event loop
+    let proxy = event_loop.create_proxy();
+    TrayIconEvent::set_event_handler(Some(move |event| {
+        proxy.send_event(UserEvent::TrayIconEvent(event));
+    }));
+
+    // set a menu event handler that forwards the event and wakes up the event loop
+    let proxy = event_loop.create_proxy();
+    MenuEvent::set_event_handler(Some(move |event| {
+        proxy.send_event(UserEvent::MenuEvent(event));
+    }));
+
+    let tray_menu = Menu::new();
+
+    let quit_i = MenuItem::new("Quit", true, None);
+    tray_menu.append_items(&[
+        &PredefinedMenuItem::about(
+            None,
+            Some(AboutMetadata {
+                name: Some("tao".to_string()),
+                copyright: Some("Copyright tao".to_string()),
+                ..Default::default()
+            }),
+        ),
+        &PredefinedMenuItem::separator(),
+        &quit_i,
+    ]);
+
+    let mut tray_icon = None;
+
+    let menu_channel = MenuEvent::receiver();
+    let tray_channel = TrayIconEvent::receiver();
+
+    event_loop.run(move |event, _, control_flow| {
+        *control_flow = ControlFlow::Wait;
+
+        match event {
+            Event::NewEvents(tao::event::StartCause::Init) => {
+                let icon = load_icon(std::path::Path::new(path));
+
+                // We create the icon once the event loop is actually running
+                // to prevent issues like https://github.com/tauri-apps/tray-icon/issues/90
+                tray_icon = Some(
+                    TrayIconBuilder::new()
+                        .with_menu(Box::new(tray_menu.clone()))
+                        .with_tooltip("tao - awesome windowing lib")
+                        .with_icon(icon)
+                        .build()
+                        .unwrap(),
+                );
+
+                // We have to request a redraw here to have the icon actually show up.
+                // Tao only exposes a redraw method on the Window so we use core-foundation directly.
+                #[cfg(target_os = "macos")]
+                unsafe {
+                    use objc2_core_foundation::{CFRunLoopGetMain, CFRunLoopWakeUp};
+
+                    let rl = CFRunLoopGetMain().unwrap();
+                    CFRunLoopWakeUp(&rl);
+                }
+            }
+
+            Event::UserEvent(UserEvent::TrayIconEvent(event)) => {
+                println!("{event:?}");
+            }
+
+            Event::UserEvent(UserEvent::MenuEvent(event)) => {
+                println!("{event:?}");
+
+                if event.id == quit_i.id() {
+                    tray_icon.take();
+                    *control_flow = ControlFlow::Exit;
+                }
+            }
+
+            _ => {}
+        }
+    })
+}
+
+fn load_icon(path: &std::path::Path) -> tray_icon::Icon {
+    let (icon_rgba, icon_width, icon_height) = {
+        let image = image::open(path)
+            .expect("Failed to open icon path")
+            .into_rgba8();
+        let (width, height) = image.dimensions();
+        let rgba = image.into_raw();
+        (rgba, width, height)
+    };
+    tray_icon::Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon")
+}
diff --git a/ports/tray-icon/examples/winit.rs b/ports/tray-icon/examples/winit.rs
new file mode 100644
index 000000000000..c26317f8ee32
--- /dev/null
+++ b/ports/tray-icon/examples/winit.rs
@@ -0,0 +1,167 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+#![allow(unused)]
+
+use tray_icon::{
+    menu::{AboutMetadata, Menu, MenuEvent, MenuItem, PredefinedMenuItem},
+    TrayIcon, TrayIconBuilder, TrayIconEvent, TrayIconEventReceiver,
+};
+use winit::{
+    application::ApplicationHandler,
+    event::Event,
+    event_loop::{ControlFlow, EventLoop, EventLoopBuilder},
+};
+
+#[derive(Debug)]
+enum UserEvent {
+    TrayIconEvent(tray_icon::TrayIconEvent),
+    MenuEvent(tray_icon::menu::MenuEvent),
+}
+
+struct Application {
+    tray_icon: Option<TrayIcon>,
+}
+
+impl Application {
+    fn new() -> Application {
+        Application { tray_icon: None }
+    }
+
+    fn new_tray_icon() -> TrayIcon {
+        let path = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/icon.png");
+        let icon = load_icon(std::path::Path::new(path));
+
+        TrayIconBuilder::new()
+            .with_menu(Box::new(Self::new_tray_menu()))
+            .with_tooltip("winit - awesome windowing lib")
+            .with_icon(icon)
+            .with_title("x")
+            .build()
+            .unwrap()
+    }
+
+    fn new_tray_menu() -> Menu {
+        let menu = Menu::new();
+        let item1 = MenuItem::new("item1", true, None);
+        if let Err(err) = menu.append(&item1) {
+            println!("{err:?}");
+        }
+        menu
+    }
+}
+
+impl ApplicationHandler<UserEvent> for Application {
+    fn resumed(&mut self, _event_loop: &winit::event_loop::ActiveEventLoop) {}
+
+    fn window_event(
+        &mut self,
+        _event_loop: &winit::event_loop::ActiveEventLoop,
+        _window_id: winit::window::WindowId,
+        _event: winit::event::WindowEvent,
+    ) {
+    }
+
+    fn new_events(
+        &mut self,
+        _event_loop: &winit::event_loop::ActiveEventLoop,
+        cause: winit::event::StartCause,
+    ) {
+        // We create the icon once the event loop is actually running
+        // to prevent issues like https://github.com/tauri-apps/tray-icon/issues/90
+        if winit::event::StartCause::Init == cause {
+            #[cfg(not(any(
+                target_os = "linux",
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "netbsd",
+                target_os = "openbsd"
+            )))]
+            {
+                self.tray_icon = Some(Self::new_tray_icon());
+            }
+
+            // We have to request a redraw here to have the icon actually show up.
+            // Winit only exposes a redraw method on the Window so we use core-foundation directly.
+            #[cfg(target_os = "macos")]
+            unsafe {
+                use objc2_core_foundation::{CFRunLoopGetMain, CFRunLoopWakeUp};
+
+                let rl = CFRunLoopGetMain().unwrap();
+                CFRunLoopWakeUp(&rl);
+            }
+        }
+    }
+
+    fn user_event(&mut self, _event_loop: &winit::event_loop::ActiveEventLoop, event: UserEvent) {
+        println!("{event:?}");
+    }
+}
+
+fn main() {
+    let event_loop = EventLoop::<UserEvent>::with_user_event().build().unwrap();
+
+    // set a tray event handler that forwards the event and wakes up the event loop
+    let proxy = event_loop.create_proxy();
+    TrayIconEvent::set_event_handler(Some(move |event| {
+        proxy.send_event(UserEvent::TrayIconEvent(event));
+    }));
+    let proxy = event_loop.create_proxy();
+    MenuEvent::set_event_handler(Some(move |event| {
+        proxy.send_event(UserEvent::MenuEvent(event));
+    }));
+
+    let mut app = Application::new();
+
+    let menu_channel = MenuEvent::receiver();
+    let tray_channel = TrayIconEvent::receiver();
+
+    // Since winit doesn't use gtk on Linux, and we need gtk for
+    // the tray icon to show up, we need to spawn a thread
+    // where we initialize gtk and create the tray_icon
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    ))]
+    std::thread::spawn(|| {
+        use gtk::prelude::{ApplicationExt, ApplicationExtManual};
+        use std::{cell::RefCell, rc::Rc};
+
+        let gtk_app = gtk::Application::builder()
+            .application_id("com.tauri.tray-icon.winit")
+            .build();
+        let tray_icon = Rc::new(RefCell::new(None));
+        let tray_icon_ = tray_icon.clone();
+        gtk_app.connect_activate(move |_| {
+            tray_icon_
+                .borrow_mut()
+                .get_or_insert_with(Application::new_tray_icon);
+        });
+        let _hold = gtk_app.hold();
+        gtk_app.run();
+    });
+
+    if let Err(err) = event_loop.run_app(&mut app) {
+        println!("Error: {:?}", err);
+    }
+}
+
+fn load_icon(path: &std::path::Path) -> tray_icon::Icon {
+    let (icon_rgba, icon_width, icon_height) = {
+        let image = image::open(path)
+            .expect("Failed to open icon path")
+            .into_rgba8();
+        let (width, height) = image.dimensions();
+        let rgba = image.into_raw();
+        (rgba, width, height)
+    };
+    tray_icon::Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon")
+}
diff --git a/ports/tray-icon/renovate.json b/ports/tray-icon/renovate.json
new file mode 100644
index 000000000000..e0493a29a7fd
--- /dev/null
+++ b/ports/tray-icon/renovate.json
@@ -0,0 +1,10 @@
+{
+  "extends": ["config:recommended"],
+  "rangeStrategy": "replace",
+  "packageRules": [
+    {
+      "semanticCommitType": "chore",
+      "matchPackageNames": ["*"]
+    }
+  ]
+}
diff --git a/ports/tray-icon/rustfmt.toml b/ports/tray-icon/rustfmt.toml
new file mode 100644
index 000000000000..f8e8a75063c9
--- /dev/null
+++ b/ports/tray-icon/rustfmt.toml
@@ -0,0 +1,12 @@
+max_width = 100
+hard_tabs = false
+tab_spaces = 4
+newline_style = "Unix"
+use_small_heuristics = "Default"
+reorder_imports = true
+reorder_modules = true
+edition = "2021"
+merge_derives = true
+use_try_shorthand = false
+use_field_init_shorthand = false
+force_explicit_abi = true
diff --git a/ports/tray-icon/src/counter.rs b/ports/tray-icon/src/counter.rs
new file mode 100644
index 000000000000..8a49fbe42a48
--- /dev/null
+++ b/ports/tray-icon/src/counter.rs
@@ -0,0 +1,21 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::sync::atomic::{AtomicU32, Ordering};
+
+pub struct Counter(AtomicU32);
+
+impl Counter {
+    pub const fn new() -> Self {
+        Self(AtomicU32::new(1))
+    }
+
+    pub fn next(&self) -> u32 {
+        self.0.fetch_add(1, Ordering::Relaxed)
+    }
+}
diff --git a/ports/tray-icon/src/error.rs b/ports/tray-icon/src/error.rs
new file mode 100644
index 000000000000..d0fd2847df92
--- /dev/null
+++ b/ports/tray-icon/src/error.rs
@@ -0,0 +1,34 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use thiserror::Error;
+
+/// Errors returned by tray-icon.
+#[non_exhaustive]
+#[derive(Error, Debug)]
+pub enum Error {
+    #[error(transparent)]
+    OsError(#[from] std::io::Error),
+    #[cfg(any(
+        any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ),
+        target_os = "macos"
+    ))]
+    #[error(transparent)]
+    PngEncodingError(#[from] png::EncodingError),
+    #[error("not on the main thread")]
+    NotMainThread,
+}
+
+/// Convenient type alias of Result type for tray-icon.
+pub type Result<T> = std::result::Result<T, Error>;
diff --git a/ports/tray-icon/src/icon.rs b/ports/tray-icon/src/icon.rs
new file mode 100644
index 000000000000..3a92f0827ba0
--- /dev/null
+++ b/ports/tray-icon/src/icon.rs
@@ -0,0 +1,191 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// taken from https://github.com/rust-windowing/winit/blob/92fdf5ba85f920262a61cee4590f4a11ad5738d1/src/icon.rs
+
+use crate::platform_impl::PlatformIcon;
+use std::{error::Error, fmt, io, mem};
+
+#[repr(C)]
+#[derive(Debug)]
+pub(crate) struct Pixel {
+    pub(crate) r: u8,
+    pub(crate) g: u8,
+    pub(crate) b: u8,
+    pub(crate) a: u8,
+}
+
+pub(crate) const PIXEL_SIZE: usize = mem::size_of::<Pixel>();
+
+#[derive(Debug)]
+/// An error produced when using [`Icon::from_rgba`] with invalid arguments.
+pub enum BadIcon {
+    /// Produced when the length of the `rgba` argument isn't divisible by 4, thus `rgba` can't be
+    /// safely interpreted as 32bpp RGBA pixels.
+    ByteCountNotDivisibleBy4 { byte_count: usize },
+    /// Produced when the number of pixels (`rgba.len() / 4`) isn't equal to `width * height`.
+    /// At least one of your arguments is incorrect.
+    DimensionsVsPixelCount {
+        width: u32,
+        height: u32,
+        width_x_height: usize,
+        pixel_count: usize,
+    },
+    /// Produced when underlying OS functionality failed to create the icon
+    OsError(io::Error),
+}
+
+impl fmt::Display for BadIcon {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            BadIcon::ByteCountNotDivisibleBy4 { byte_count } => write!(f,
+                "The length of the `rgba` argument ({:?}) isn't divisible by 4, making it impossible to interpret as 32bpp RGBA pixels.",
+                byte_count,
+            ),
+            BadIcon::DimensionsVsPixelCount {
+                width,
+                height,
+                width_x_height,
+                pixel_count,
+            } => write!(f,
+                "The specified dimensions ({:?}x{:?}) don't match the number of pixels supplied by the `rgba` argument ({:?}). For those dimensions, the expected pixel count is {:?}.",
+                width, height, pixel_count, width_x_height,
+            ),
+            BadIcon::OsError(e) => write!(f, "OS error when instantiating the icon: {:?}", e),
+        }
+    }
+}
+
+impl Error for BadIcon {
+    fn source(&self) -> Option<&(dyn Error + 'static)> {
+        match self {
+            BadIcon::OsError(e) => Some(e),
+            _ => None,
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) struct RgbaIcon {
+    pub(crate) rgba: Vec<u8>,
+    pub(crate) width: u32,
+    pub(crate) height: u32,
+}
+
+/// For platforms which don't have window icons (e.g. web)
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) struct NoIcon;
+
+#[allow(dead_code)] // These are not used on every platform
+mod constructors {
+    use super::*;
+
+    impl RgbaIcon {
+        pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
+            if rgba.len() % PIXEL_SIZE != 0 {
+                return Err(BadIcon::ByteCountNotDivisibleBy4 {
+                    byte_count: rgba.len(),
+                });
+            }
+            let pixel_count = rgba.len() / PIXEL_SIZE;
+            if pixel_count != (width * height) as usize {
+                Err(BadIcon::DimensionsVsPixelCount {
+                    width,
+                    height,
+                    width_x_height: (width * height) as usize,
+                    pixel_count,
+                })
+            } else {
+                Ok(RgbaIcon {
+                    rgba,
+                    width,
+                    height,
+                })
+            }
+        }
+    }
+
+    impl NoIcon {
+        pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
+            // Create the rgba icon anyway to validate the input
+            let _ = RgbaIcon::from_rgba(rgba, width, height)?;
+            Ok(NoIcon)
+        }
+    }
+}
+
+/// An icon used for the window titlebar, taskbar, etc.
+#[derive(Clone)]
+pub struct Icon {
+    pub(crate) inner: PlatformIcon,
+}
+
+impl fmt::Debug for Icon {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
+        fmt::Debug::fmt(&self.inner, formatter)
+    }
+}
+
+impl Icon {
+    /// Creates an icon from 32bpp RGBA data.
+    ///
+    /// The length of `rgba` must be divisible by 4, and `width * height` must equal
+    /// `rgba.len() / 4`. Otherwise, this will return a `BadIcon` error.
+    pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
+        Ok(Icon {
+            inner: PlatformIcon::from_rgba(rgba, width, height)?,
+        })
+    }
+
+    /// Create an icon from a file path.
+    ///
+    /// Specify `size` to load a specific icon size from the file, or `None` to load the default
+    /// icon size from the file.
+    ///
+    /// In cases where the specified size does not exist in the file, Windows may perform scaling
+    /// to get an icon of the desired size.
+    #[cfg(windows)]
+    pub fn from_path<P: AsRef<std::path::Path>>(
+        path: P,
+        size: Option<(u32, u32)>,
+    ) -> Result<Self, BadIcon> {
+        let win_icon = PlatformIcon::from_path(path, size)?;
+        Ok(Icon { inner: win_icon })
+    }
+
+    /// Create an icon from a resource embedded in this executable or library.
+    ///
+    /// Specify `size` to load a specific icon size from the file, or `None` to load the default
+    /// icon size from the file.
+    ///
+    /// In cases where the specified size does not exist in the file, Windows may perform scaling
+    /// to get an icon of the desired size.
+    #[cfg(windows)]
+    pub fn from_resource(ordinal: u16, size: Option<(u32, u32)>) -> Result<Self, BadIcon> {
+        let win_icon = PlatformIcon::from_resource(ordinal, size)?;
+        Ok(Icon { inner: win_icon })
+    }
+
+    /// This is basically the same as from_resource, but takes a resource name
+    /// rather than oridinal id.
+    #[cfg(windows)]
+    pub fn from_resource_name(
+        resource_name: &str,
+        size: Option<(u32, u32)>,
+    ) -> Result<Self, BadIcon> {
+        let win_icon = PlatformIcon::from_resource_name(resource_name, size)?;
+        Ok(Icon { inner: win_icon })
+    }
+
+    /// Create an icon from an HICON
+    #[cfg(windows)]
+    pub fn from_handle(handle: isize) -> Self {
+        let win_icon = PlatformIcon::from_handle(handle as _);
+        Icon { inner: win_icon }
+    }
+}
diff --git a/ports/tray-icon/src/lib.rs b/ports/tray-icon/src/lib.rs
new file mode 100644
index 000000000000..9873a624d8d7
--- /dev/null
+++ b/ports/tray-icon/src/lib.rs
@@ -0,0 +1,765 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+#![allow(clippy::uninlined_format_args)]
+
+//! tray-icon lets you create tray icons for desktop applications.
+//!
+//! # Platforms supported:
+//!
+//! - Windows
+//! - macOS
+//! - Linux (`linux-ksni` or legacy `gtk` backend)
+//! - FreeBSD / DragonFly BSD / NetBSD / OpenBSD (legacy `gtk` backend)
+//!
+//! # Platform-specific notes:
+//!
+//! - On Windows, Linux, and BSD, an event loop must be running on the thread. On Windows, this is a win32 event loop. On Linux with the legacy `gtk` backend or on BSD, this is a gtk event loop. It doesn't need to be the main thread but you have to create the tray icon on the same thread as the event loop.
+//! - On macOS, an event loop must be running on the main thread so you also need to create the tray icon on the main thread. You must make sure that the event loop is already running and not just created before creating a TrayIcon to prevent issues with fullscreen apps. In Winit for example the earliest you can create icons is on [`StartCause::Init`](https://docs.rs/winit/latest/winit/event/enum.StartCause.html#variant.Init).
+//!
+//! # Dependencies (Linux Only)
+//!
+//! On Linux, the `linux-ksni` feature uses StatusNotifierItem over D-Bus through
+//! `ksni` and does not depend on `libappindicator`. The legacy `gtk` feature
+//! keeps the appindicator backend available for compatibility. `libxdo` is used
+//! by predefined `Copy`, `Cut`, `Paste`, and `SelectAll` menu items.
+//!
+//! #### Arch Linux / Manjaro:
+//!
+//! ```sh
+//! pacman -S gtk4 xdotool dbus
+//! ```
+//!
+//! #### Debian / Ubuntu:
+//!
+//! ```sh
+//! sudo apt install libgtk-4-dev libxdo-dev libdbus-1-dev
+//! ```
+//!
+//! # Examples
+//!
+//! #### Create a tray icon without a menu.
+//!
+//! ```no_run
+//! use tray_icon::{TrayIconBuilder, Icon};
+//!
+//! # let icon = Icon::from_rgba(Vec::new(), 0, 0).unwrap();
+//! let tray_icon = TrayIconBuilder::new()
+//!     .with_tooltip("system-tray - tray icon library!")
+//!     .with_icon(icon)
+//!     .build()
+//!     .unwrap();
+//! ```
+//!
+//! #### Create a tray icon with a menu.
+//!
+//! ```no_run
+//! use tray_icon::{TrayIconBuilder, menu::Menu,Icon};
+//!
+//! # let icon = Icon::from_rgba(Vec::new(), 0, 0).unwrap();
+//! let tray_menu = Menu::new();
+//! let tray_icon = TrayIconBuilder::new()
+//!     .with_menu(Box::new(tray_menu))
+//!     .with_tooltip("system-tray - tray icon library!")
+//!     .with_icon(icon)
+//!     .build()
+//!     .unwrap();
+//! ```
+//!
+//! # Processing tray events
+//!
+//! You can use [`TrayIconEvent::receiver`] to get a reference to the [`TrayIconEventReceiver`]
+//! which you can use to listen to events when a click happens on the tray icon
+//! ```no_run
+//! use tray_icon::TrayIconEvent;
+//!
+//! if let Ok(event) = TrayIconEvent::receiver().try_recv() {
+//!     println!("{:?}", event);
+//! }
+//! ```
+//!
+//! You can also listen for the menu events using [`MenuEvent::receiver`](crate::menu::MenuEvent::receiver) to get events for the tray context menu.
+//!
+//! ```no_run
+//! use tray_icon::{TrayIconEvent, menu::MenuEvent};
+//!
+//! if let Ok(event) = TrayIconEvent::receiver().try_recv() {
+//!     println!("tray event: {:?}", event);
+//! }
+//!
+//! if let Ok(event) = MenuEvent::receiver().try_recv() {
+//!     println!("menu event: {:?}", event);
+//! }
+//! ```
+//!
+//! ### Note for [winit] or [tao] users:
+//!
+//! You should use [`TrayIconEvent::set_event_handler`] and forward
+//! the tray icon events to the event loop by using [`EventLoopProxy`]
+//! so that the event loop is awakened on each tray icon event.
+//! Same can be done for menu events using [`MenuEvent::set_event_handler`].
+//!
+//! ```no_run
+//! # use winit::event_loop::EventLoop;
+//! enum UserEvent {
+//!   TrayIconEvent(tray_icon::TrayIconEvent),
+//!   MenuEvent(tray_icon::menu::MenuEvent)
+//! }
+//!
+//! let event_loop = EventLoop::<UserEvent>::with_user_event().build().unwrap();
+//!
+//! let proxy = event_loop.create_proxy();
+//! tray_icon::TrayIconEvent::set_event_handler(Some(move |event| {
+//!     proxy.send_event(UserEvent::TrayIconEvent(event));
+//! }));
+//!
+//! let proxy = event_loop.create_proxy();
+//! tray_icon::menu::MenuEvent::set_event_handler(Some(move |event| {
+//!     proxy.send_event(UserEvent::MenuEvent(event));
+//! }));
+//! ```
+//!
+//! [`EventLoopProxy`]: https://docs.rs/winit/latest/winit/event_loop/struct.EventLoopProxy.html
+//! [winit]: https://docs.rs/winit
+//! [tao]: https://docs.rs/tao
+
+use std::{
+    cell::RefCell,
+    path::{Path, PathBuf},
+    rc::Rc,
+};
+
+use counter::Counter;
+use crossbeam_channel::{unbounded, Receiver, Sender};
+use once_cell::sync::{Lazy, OnceCell};
+
+mod counter;
+mod error;
+mod icon;
+mod platform_impl;
+mod tray_icon_id;
+
+pub use self::error::*;
+pub use self::icon::{BadIcon, Icon};
+pub use self::tray_icon_id::TrayIconId;
+
+/// Re-export of [muda](::muda) crate and used for tray context menu.
+pub mod menu {
+    pub use muda::*;
+}
+pub use muda::dpi;
+
+static COUNTER: Counter = Counter::new();
+
+/// Attributes to use when creating a tray icon.
+pub struct TrayIconAttributes {
+    /// Tray icon tooltip
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub tooltip: Option<String>,
+
+    /// Tray menu
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux**: once a menu is set, it cannot be removed.
+    pub menu: Option<Box<dyn menu::ContextMenu>>,
+
+    /// Tray icon
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Sometimes the icon won't be visible unless a menu is set.
+    ///   Setting an empty [`Menu`](crate::menu::Menu) is enough.
+    pub icon: Option<Icon>,
+
+    /// Tray icon temp dir path. **Linux only**.
+    pub temp_dir_path: Option<PathBuf>,
+
+    /// Use the icon as a [template](https://developer.apple.com/documentation/appkit/nsimage/1520017-template?language=objc). **macOS only**.
+    pub icon_is_template: bool,
+
+    /// Whether to show the tray menu on left click or not, default is `true`.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub menu_on_left_click: bool,
+
+    /// Whether to show the tray menu on right click or not, default is `true`.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub menu_on_right_click: bool,
+
+    /// Tray icon title.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Linux:** The title will not be shown unless there is an icon
+    ///   as well.  The title is useful for numerical and other frequently
+    ///   updated information.  In general, it shouldn't be shown unless a
+    ///   user requests it as it can take up a significant amount of space
+    ///   on the user's panel.  This may not be shown in all visualizations.
+    /// - **Windows:** Unsupported.
+    pub title: Option<String>,
+}
+
+impl Default for TrayIconAttributes {
+    fn default() -> Self {
+        Self {
+            tooltip: None,
+            menu: None,
+            icon: None,
+            temp_dir_path: None,
+            icon_is_template: false,
+            menu_on_left_click: true,
+            menu_on_right_click: true,
+            title: None,
+        }
+    }
+}
+
+/// [`TrayIcon`] builder struct and associated methods.
+pub struct TrayIconBuilder {
+    id: TrayIconId,
+    attrs: TrayIconAttributes,
+}
+
+impl Default for TrayIconBuilder {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl TrayIconBuilder {
+    /// Creates a new [`TrayIconBuilder`] with default [`TrayIconAttributes`].
+    ///
+    /// See [`TrayIcon::new`] for more info.
+    pub fn new() -> Self {
+        Self {
+            id: TrayIconId::new_unique(),
+            attrs: TrayIconAttributes::default(),
+        }
+    }
+
+    /// Sets the unique id to build the tray icon with.
+    pub fn with_id<I: Into<TrayIconId>>(mut self, id: I) -> Self {
+        self.id = id.into();
+        self
+    }
+
+    /// Set the a menu for this tray icon.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux**: once a menu is set, it cannot be removed or replaced but you can change its content.
+    pub fn with_menu(mut self, menu: Box<dyn menu::ContextMenu>) -> Self {
+        self.attrs.menu = Some(menu);
+        self
+    }
+
+    /// Set an icon for this tray icon.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Sometimes the icon won't be visible unless a menu is set.
+    ///   Setting an empty [`Menu`](crate::menu::Menu) is enough.
+    pub fn with_icon(mut self, icon: Icon) -> Self {
+        self.attrs.icon = Some(icon);
+        self
+    }
+
+    /// Set a tooltip for this tray icon.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn with_tooltip<S: AsRef<str>>(mut self, s: S) -> Self {
+        self.attrs.tooltip = Some(s.as_ref().to_string());
+        self
+    }
+
+    /// Set the tray icon title.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Linux:** The title will not be shown unless there is an icon
+    ///   as well.  The title is useful for numerical and other frequently
+    ///   updated information.  In general, it shouldn't be shown unless a
+    ///   user requests it as it can take up a significant amount of space
+    ///   on the user's panel.  This may not be shown in all visualizations.
+    /// - **Windows:** Unsupported.
+    pub fn with_title<S: AsRef<str>>(mut self, title: S) -> Self {
+        self.attrs.title.replace(title.as_ref().to_string());
+        self
+    }
+
+    /// Set tray icon temp dir path. **Linux only**.
+    ///
+    /// On Linux, we need to write the icon to the disk and usually it will
+    /// be `$XDG_RUNTIME_DIR/tray-icon` or `$TEMP/tray-icon`.
+    pub fn with_temp_dir_path<P: AsRef<Path>>(mut self, s: P) -> Self {
+        self.attrs.temp_dir_path = Some(s.as_ref().to_path_buf());
+        self
+    }
+
+    /// Use the icon as a [template](https://developer.apple.com/documentation/appkit/nsimage/1520017-template?language=objc). **macOS only**.
+    pub fn with_icon_as_template(mut self, is_template: bool) -> Self {
+        self.attrs.icon_is_template = is_template;
+        self
+    }
+
+    /// Whether to show the tray menu on left click or not, default is `true`.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn with_menu_on_left_click(mut self, enable: bool) -> Self {
+        self.attrs.menu_on_left_click = enable;
+        self
+    }
+
+    /// Whether to show the tray menu on right click or not, default is `true`.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn with_menu_on_right_click(mut self, enable: bool) -> Self {
+        self.attrs.menu_on_right_click = enable;
+        self
+    }
+
+    /// Access the unique id that will be assigned to the tray icon
+    /// this builder will create.
+    pub fn id(&self) -> &TrayIconId {
+        &self.id
+    }
+
+    /// Builds and adds a new [`TrayIcon`] to the system tray.
+    pub fn build(self) -> Result<TrayIcon> {
+        TrayIcon::with_id(self.id, self.attrs)
+    }
+}
+
+/// Tray icon struct and associated methods.
+///
+/// This type is reference-counted and the icon is removed when the last instance is dropped.
+#[derive(Clone)]
+pub struct TrayIcon {
+    id: TrayIconId,
+    tray: Rc<RefCell<platform_impl::TrayIcon>>,
+}
+
+impl TrayIcon {
+    /// Builds and adds a new tray icon to the system tray.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Sometimes the icon won't be visible unless a menu is set.
+    ///   Setting an empty [`Menu`](crate::menu::Menu) is enough.
+    pub fn new(attrs: TrayIconAttributes) -> Result<Self> {
+        let id = TrayIconId::new_unique();
+        Ok(Self {
+            tray: Rc::new(RefCell::new(platform_impl::TrayIcon::new(
+                id.clone(),
+                attrs,
+            )?)),
+            id,
+        })
+    }
+
+    /// Builds and adds a new tray icon to the system tray with the specified Id.
+    ///
+    /// See [`TrayIcon::new`] for more info.
+    pub fn with_id<I: Into<TrayIconId>>(id: I, attrs: TrayIconAttributes) -> Result<Self> {
+        let id = id.into();
+        Ok(Self {
+            tray: Rc::new(RefCell::new(platform_impl::TrayIcon::new(
+                id.clone(),
+                attrs,
+            )?)),
+            id,
+        })
+    }
+
+    /// Returns the id associated with this tray icon.
+    pub fn id(&self) -> &TrayIconId {
+        &self.id
+    }
+
+    /// Set new tray icon. If `None` is provided, it will remove the icon.
+    pub fn set_icon(&self, icon: Option<Icon>) -> Result<()> {
+        self.tray.borrow_mut().set_icon(icon)
+    }
+
+    /// Set new tray menu.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux**: once a menu is set it cannot be removed so `None` has no effect
+    pub fn set_menu(&self, menu: Option<Box<dyn menu::ContextMenu>>) {
+        self.tray.borrow_mut().set_menu(menu)
+    }
+
+    /// Sets the tooltip for this tray icon.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported
+    pub fn set_tooltip<S: AsRef<str>>(&self, tooltip: Option<S>) -> Result<()> {
+        self.tray.borrow_mut().set_tooltip(tooltip)
+    }
+
+    /// Sets the tooltip for this tray icon.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** The title will not be shown unless there is an icon
+    ///   as well.  The title is useful for numerical and other frequently
+    ///   updated information.  In general, it shouldn't be shown unless a
+    ///   user requests it as it can take up a significant amount of space
+    ///   on the user's panel.  This may not be shown in all visualizations.
+    /// - **Windows:** Unsupported
+    pub fn set_title<S: AsRef<str>>(&self, title: Option<S>) {
+        self.tray.borrow_mut().set_title(title)
+    }
+
+    /// Show or hide this tray icon
+    pub fn set_visible(&self, visible: bool) -> Result<()> {
+        self.tray.borrow_mut().set_visible(visible)
+    }
+
+    /// Sets the tray icon temp dir path. **Linux only**.
+    ///
+    /// On Linux, we need to write the icon to the disk and usually it will
+    /// be `$XDG_RUNTIME_DIR/tray-icon` or `$TEMP/tray-icon`.
+    pub fn set_temp_dir_path<P: AsRef<Path>>(&self, path: Option<P>) {
+        #[cfg(any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ))]
+        self.tray.borrow_mut().set_temp_dir_path(path);
+        #[cfg(not(any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        )))]
+        let _ = path;
+    }
+
+    /// Set the current icon as a [template](https://developer.apple.com/documentation/appkit/nsimage/1520017-template?language=objc). **macOS only**.
+    pub fn set_icon_as_template(&self, is_template: bool) {
+        #[cfg(target_os = "macos")]
+        self.tray.borrow_mut().set_icon_as_template(is_template);
+        #[cfg(not(target_os = "macos"))]
+        let _ = is_template;
+    }
+
+    pub fn set_icon_with_as_template(&self, icon: Option<Icon>, is_template: bool) -> Result<()> {
+        #[cfg(target_os = "macos")]
+        return self
+            .tray
+            .borrow_mut()
+            .set_icon_with_as_template(icon, is_template);
+        #[cfg(not(target_os = "macos"))]
+        {
+            let _ = icon;
+            let _ = is_template;
+            Ok(())
+        }
+    }
+
+    /// Disable or enable showing the tray menu on left click.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn set_show_menu_on_left_click(&self, enable: bool) {
+        #[cfg(any(target_os = "macos", target_os = "windows"))]
+        self.tray.borrow_mut().set_show_menu_on_left_click(enable);
+        #[cfg(not(any(target_os = "macos", target_os = "windows")))]
+        let _ = enable;
+    }
+
+    /// Disable or enable showing the tray menu on right click.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn set_show_menu_on_right_click(&self, enable: bool) {
+        #[cfg(any(target_os = "macos", target_os = "windows"))]
+        self.tray.borrow_mut().set_show_menu_on_right_click(enable);
+        #[cfg(not(any(target_os = "macos", target_os = "windows")))]
+        let _ = enable;
+    }
+
+    /// Manually show the tray menu at the current cursor position.
+    ///
+    /// This is useful when you want to control when the menu is displayed,
+    /// for example after updating menu items dynamically.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux:** Unsupported.
+    pub fn show_menu(&self) {
+        #[cfg(any(target_os = "macos", target_os = "windows"))]
+        self.tray.borrow().show_menu();
+    }
+
+    /// Get tray icon rect.
+    ///
+    /// ## Platform-specific:
+    ///
+    /// - **Linux**: Unsupported.
+    pub fn rect(&self) -> Option<Rect> {
+        self.tray.borrow().rect()
+    }
+
+    /// Get the tray icon's underlying [window handle](windows_sys::Win32::Foundation::HWND) **Windows only**.
+    ///
+    /// This window handle is valid as long as the tray icon.
+    #[cfg(windows)]
+    pub fn window_handle(&self) -> windows_sys::Win32::Foundation::HWND {
+        self.tray.borrow().hwnd()
+    }
+
+    /// Get the tray icon's underlying [NSStatusItem](objc2_app_kit::NSStatusItem) **macOS only**.
+    ///
+    /// Returns `None` if the status item is not available.
+    #[cfg(target_os = "macos")]
+    pub fn ns_status_item(&self) -> Option<objc2::rc::Retained<objc2_app_kit::NSStatusItem>> {
+        self.tray.borrow().ns_status_item().cloned()
+    }
+
+    /// Get the tray icon's underlying [AppIndicator](libappindicator::AppIndicator) **Linux only**.
+    ///
+    /// # Safety
+    ///
+    /// The returned pointer is valid as long as the `TrayIcon` is.
+    #[cfg(all(unix, not(target_os = "macos"), not(feature = "linux-ksni")))]
+    pub unsafe fn app_indicator(&self) -> *const libappindicator::AppIndicator {
+        self.tray.borrow().app_indicator() as *const _
+    }
+}
+
+/// Describes a tray icon event.
+///
+/// ## Platform-specific:
+///
+/// - **Linux**: Unsupported. The event is not emitted even though the icon is shown
+///   and will still show a context menu on right click.
+#[derive(Debug, Clone)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", serde(tag = "type"))]
+#[non_exhaustive]
+pub enum TrayIconEvent {
+    /// A click happened on the tray icon.
+    #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
+    Click {
+        /// Id of the tray icon which triggered this event.
+        id: TrayIconId,
+        /// Physical Position of this event.
+        position: dpi::PhysicalPosition<f64>,
+        /// Position and size of the tray icon.
+        rect: Rect,
+        /// Mouse button that triggered this event.
+        button: MouseButton,
+        /// Mouse button state when this event was triggered.
+        button_state: MouseButtonState,
+    },
+    /// A double click happened on the tray icon. **Windows Only**
+    DoubleClick {
+        /// Id of the tray icon which triggered this event.
+        id: TrayIconId,
+        /// Physical Position of this event.
+        position: dpi::PhysicalPosition<f64>,
+        /// Position and size of the tray icon.
+        rect: Rect,
+        /// Mouse button that triggered this event.
+        button: MouseButton,
+    },
+    /// The mouse entered the tray icon region.
+    Enter {
+        /// Id of the tray icon which triggered this event.
+        id: TrayIconId,
+        /// Physical Position of this event.
+        position: dpi::PhysicalPosition<f64>,
+        /// Position and size of the tray icon.
+        rect: Rect,
+    },
+    /// The mouse moved over the tray icon region.
+    Move {
+        /// Id of the tray icon which triggered this event.
+        id: TrayIconId,
+        /// Physical Position of this event.
+        position: dpi::PhysicalPosition<f64>,
+        /// Position and size of the tray icon.
+        rect: Rect,
+    },
+    /// The mouse left the tray icon region.
+    Leave {
+        /// Id of the tray icon which triggered this event.
+        id: TrayIconId,
+        /// Physical Position of this event.
+        position: dpi::PhysicalPosition<f64>,
+        /// Position and size of the tray icon.
+        rect: Rect,
+    },
+}
+
+/// Describes the mouse button state.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Default)]
+pub enum MouseButtonState {
+    #[default]
+    Up,
+    Down,
+}
+
+/// Describes which mouse button triggered the event..
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Default)]
+pub enum MouseButton {
+    #[default]
+    Left,
+    Right,
+    Middle,
+}
+
+/// Describes a rectangle including position (x - y axis) and size.
+#[derive(Debug, PartialEq, Clone, Copy)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct Rect {
+    pub size: dpi::PhysicalSize<u32>,
+    pub position: dpi::PhysicalPosition<f64>,
+}
+
+impl Default for Rect {
+    fn default() -> Self {
+        Self {
+            size: dpi::PhysicalSize::new(0, 0),
+            position: dpi::PhysicalPosition::new(0., 0.),
+        }
+    }
+}
+
+/// A reciever that could be used to listen to tray events.
+pub type TrayIconEventReceiver = Receiver<TrayIconEvent>;
+type TrayIconEventHandler = Box<dyn Fn(TrayIconEvent) + Send + Sync + 'static>;
+
+static TRAY_CHANNEL: Lazy<(Sender<TrayIconEvent>, TrayIconEventReceiver)> = Lazy::new(unbounded);
+static TRAY_EVENT_HANDLER: OnceCell<Option<TrayIconEventHandler>> = OnceCell::new();
+
+impl TrayIconEvent {
+    /// Returns the id of the tray icon which triggered this event.
+    pub fn id(&self) -> &TrayIconId {
+        match self {
+            TrayIconEvent::Click { id, .. } => id,
+            TrayIconEvent::DoubleClick { id, .. } => id,
+            TrayIconEvent::Enter { id, .. } => id,
+            TrayIconEvent::Move { id, .. } => id,
+            TrayIconEvent::Leave { id, .. } => id,
+        }
+    }
+
+    /// Gets a reference to the event channel's [`TrayIconEventReceiver`]
+    /// which can be used to listen for tray events.
+    ///
+    /// ## Note
+    ///
+    /// This will not receive any events if [`TrayIconEvent::set_event_handler`] has been called with a `Some` value.
+    pub fn receiver<'a>() -> &'a TrayIconEventReceiver {
+        &TRAY_CHANNEL.1
+    }
+
+    /// Set a handler to be called for new events. Useful for implementing custom event sender.
+    ///
+    /// ## Note
+    ///
+    /// Calling this function with a `Some` value,
+    /// will not send new events to the channel associated with [`TrayIconEvent::receiver`]
+    pub fn set_event_handler<F: Fn(TrayIconEvent) + Send + Sync + 'static>(f: Option<F>) {
+        if let Some(f) = f {
+            let _ = TRAY_EVENT_HANDLER.set(Some(Box::new(f)));
+        } else {
+            let _ = TRAY_EVENT_HANDLER.set(None);
+        }
+    }
+
+    #[allow(unused)]
+    pub(crate) fn send(event: TrayIconEvent) {
+        if let Some(handler) = TRAY_EVENT_HANDLER.get_or_init(|| None) {
+            handler(event);
+        } else {
+            let _ = TRAY_CHANNEL.0.send(event);
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn default_builder_uses_unique_id() {
+        let first = TrayIconBuilder::default();
+        let second = TrayIconBuilder::default();
+
+        assert!(!first.id.as_ref().is_empty());
+        assert_ne!(first.id, second.id);
+    }
+
+    #[cfg(feature = "serde")]
+    #[test]
+    fn it_serializes() {
+        use super::*;
+        let event = TrayIconEvent::Click {
+            button: MouseButton::Left,
+            button_state: MouseButtonState::Down,
+            id: TrayIconId::new("id"),
+            position: dpi::PhysicalPosition::default(),
+            rect: Rect::default(),
+        };
+
+        let value = serde_json::to_value(&event).unwrap();
+        assert_eq!(
+            value,
+            serde_json::json!({
+                "type": "Click",
+                "button": "Left",
+                "buttonState": "Down",
+                "id": "id",
+                "position": {
+                    "x": 0.0,
+                    "y": 0.0,
+                },
+                "rect": {
+                    "size": {
+                        "width": 0,
+                        "height": 0,
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 0.0,
+                    },
+                }
+            })
+        )
+    }
+}
diff --git a/ports/tray-icon/src/platform_impl/gtk/icon.rs b/ports/tray-icon/src/platform_impl/gtk/icon.rs
new file mode 100644
index 000000000000..44b9713b7a5b
--- /dev/null
+++ b/ports/tray-icon/src/platform_impl/gtk/icon.rs
@@ -0,0 +1,91 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::{
+    fs::File,
+    io::{BufWriter, Write},
+    path::Path,
+};
+
+use crate::icon::{BadIcon, PIXEL_SIZE};
+
+#[derive(Debug, Clone)]
+pub struct PlatformIcon {
+    rgba: Vec<u8>,
+    width: i32,
+    height: i32,
+}
+
+impl PlatformIcon {
+    pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
+        if rgba.len() % PIXEL_SIZE != 0 {
+            return Err(BadIcon::ByteCountNotDivisibleBy4 {
+                byte_count: rgba.len(),
+            });
+        }
+
+        let pixel_count = rgba.len() / PIXEL_SIZE;
+        let width_x_height = width as usize * height as usize;
+        if pixel_count != width_x_height {
+            return Err(BadIcon::DimensionsVsPixelCount {
+                width,
+                height,
+                width_x_height,
+                pixel_count,
+            });
+        }
+
+        Ok(Self {
+            rgba,
+            width: width as i32,
+            height: height as i32,
+        })
+    }
+
+    pub fn write_to_png(&self, path: impl AsRef<Path>) -> crate::Result<()> {
+        let png = File::create(path)?;
+        let mut output = BufWriter::new(png);
+
+        let mut encoder = png::Encoder::new(&mut output, self.width as _, self.height as _);
+        encoder.set_color(png::ColorType::Rgba);
+        encoder.set_depth(png::BitDepth::Eight);
+
+        let mut writer = encoder.write_header()?;
+        writer.write_image_data(&self.rgba)?;
+        drop(writer);
+        output.flush()?;
+
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn from_rgba_rejects_invalid_byte_count() {
+        assert!(matches!(
+            PlatformIcon::from_rgba(vec![0, 0, 0], 1, 1),
+            Err(BadIcon::ByteCountNotDivisibleBy4 { byte_count: 3 })
+        ));
+    }
+
+    #[test]
+    fn from_rgba_rejects_dimension_mismatch() {
+        assert!(matches!(
+            PlatformIcon::from_rgba(vec![0, 0, 0, 0], 2, 1),
+            Err(BadIcon::DimensionsVsPixelCount {
+                width: 2,
+                height: 1,
+                width_x_height: 2,
+                pixel_count: 1,
+            })
+        ));
+    }
+}
diff --git a/ports/tray-icon/src/platform_impl/gtk/mod.rs b/ports/tray-icon/src/platform_impl/gtk/mod.rs
new file mode 100644
index 000000000000..06730965bbae
--- /dev/null
+++ b/ports/tray-icon/src/platform_impl/gtk/mod.rs
@@ -0,0 +1,163 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+mod icon;
+use std::path::{Path, PathBuf};
+
+use crate::icon::Icon;
+pub(crate) use icon::PlatformIcon;
+
+use crate::{TrayIconAttributes, TrayIconId};
+use libappindicator::{AppIndicator, AppIndicatorStatus};
+
+pub struct TrayIcon {
+    id: TrayIconId,
+    indicator: AppIndicator,
+    temp_dir_path: Option<PathBuf>,
+    path: PathBuf,
+    counter: u32,
+    menu: Option<Box<dyn muda::ContextMenu>>,
+}
+
+impl TrayIcon {
+    pub fn new(id: TrayIconId, attrs: TrayIconAttributes) -> crate::Result<Self> {
+        let mut indicator = AppIndicator::new(&format!("tray-icon tray app {}", id.as_ref()), "");
+        indicator.set_status(AppIndicatorStatus::Active);
+
+        let (parent_path, icon_path) = temp_icon_path(attrs.temp_dir_path.as_ref(), &id, 0)?;
+
+        if let Some(icon) = attrs.icon {
+            icon.inner.write_to_png(&icon_path)?;
+        }
+
+        indicator.set_icon_theme_path(&parent_path.to_string_lossy());
+        indicator.set_icon_full(&icon_path.to_string_lossy(), "icon");
+
+        if let Some(menu) = &attrs.menu {
+            indicator.set_menu(&mut menu.gtk_context_menu());
+        }
+
+        if let Some(title) = attrs.title {
+            indicator.set_label(title.as_str(), "");
+        }
+
+        Ok(Self {
+            id,
+            indicator,
+            path: icon_path,
+            temp_dir_path: attrs.temp_dir_path,
+            counter: 0,
+            menu: attrs.menu,
+        })
+    }
+    pub fn set_icon(&mut self, icon: Option<Icon>) -> crate::Result<()> {
+        let _ = std::fs::remove_file(&self.path);
+
+        self.counter += 1;
+
+        let (parent_path, icon_path) =
+            temp_icon_path(self.temp_dir_path.as_ref(), &self.id, self.counter)?;
+
+        if let Some(icon) = icon {
+            icon.inner.write_to_png(&icon_path)?;
+        }
+
+        self.indicator
+            .set_icon_theme_path(&parent_path.to_string_lossy());
+        self.indicator
+            .set_icon_full(&icon_path.to_string_lossy(), "tray icon");
+        self.path = icon_path;
+
+        Ok(())
+    }
+
+    pub fn set_menu(&mut self, menu: Option<Box<dyn crate::menu::ContextMenu>>) {
+        if let Some(menu) = &menu {
+            self.indicator.set_menu(&mut menu.gtk_context_menu());
+        }
+        self.menu = menu;
+    }
+
+    pub fn set_tooltip<S: AsRef<str>>(&mut self, _tooltip: Option<S>) -> crate::Result<()> {
+        Ok(())
+    }
+
+    pub fn set_title<S: AsRef<str>>(&mut self, title: Option<S>) {
+        self.indicator
+            .set_label(title.as_ref().map(|t| t.as_ref()).unwrap_or(""), "");
+    }
+
+    pub fn set_visible(&mut self, visible: bool) -> crate::Result<()> {
+        if visible {
+            self.indicator.set_status(AppIndicatorStatus::Active);
+        } else {
+            self.indicator.set_status(AppIndicatorStatus::Passive);
+        }
+
+        Ok(())
+    }
+
+    pub fn set_temp_dir_path<P: AsRef<Path>>(&mut self, path: Option<P>) {
+        self.temp_dir_path = path.map(|p| p.as_ref().to_path_buf());
+    }
+
+    pub fn rect(&self) -> Option<crate::Rect> {
+        None
+    }
+
+    pub fn app_indicator(&self) -> &AppIndicator {
+        &self.indicator
+    }
+}
+
+impl Drop for TrayIcon {
+    fn drop(&mut self) {
+        self.indicator.set_status(AppIndicatorStatus::Passive);
+        let _ = std::fs::remove_file(&self.path);
+    }
+}
+
+/// Generates an icon path in one of the following dirs:
+/// 1. If `temp_icon_dir` is `Some` use that.
+/// 2. `$XDG_RUNTIME_DIR/tray-icon`
+/// 3. `/tmp/tray-icon`
+fn temp_icon_path(
+    temp_icon_dir: Option<&PathBuf>,
+    id: &TrayIconId,
+    counter: u32,
+) -> std::io::Result<(PathBuf, PathBuf)> {
+    let parent_path = match temp_icon_dir.as_ref() {
+        Some(path) => path.to_path_buf(),
+        None => dirs::runtime_dir()
+            .unwrap_or_else(std::env::temp_dir)
+            .join("tray-icon"),
+    };
+
+    std::fs::create_dir_all(&parent_path)?;
+    let icon_path = parent_path.join(format!("tray-icon-{}-{}.png", id.as_ref(), counter));
+    Ok((parent_path, icon_path))
+}
+
+#[test]
+fn temp_icon_path_preference_order() {
+    let runtime_dir = option_env!("XDG_RUNTIME_DIR");
+    let override_dir = PathBuf::from("/tmp/tao-tests");
+
+    let (dir1, _file1) = temp_icon_path(Some(&override_dir), &"00".into(), 00).unwrap();
+    let (dir2, _file1) = temp_icon_path(None, &"00".into(), 00).unwrap();
+    std::env::remove_var("XDG_RUNTIME_DIR");
+    let (dir3, _file2) = temp_icon_path(None, &"00".into(), 00).unwrap();
+
+    assert_eq!(dir1, override_dir);
+    if let Some(runtime_dir) = runtime_dir {
+        std::env::set_var("XDG_RUNTIME_DIR", runtime_dir);
+        assert_eq!(dir2, PathBuf::from(format!("{}/tray-icon", runtime_dir)));
+    }
+
+    assert_eq!(dir3, std::env::temp_dir().join("tray-icon"));
+}
diff --git a/ports/tray-icon/src/platform_impl/linux/icon.rs b/ports/tray-icon/src/platform_impl/linux/icon.rs
new file mode 100644
index 000000000000..46e3919438b6
--- /dev/null
+++ b/ports/tray-icon/src/platform_impl/linux/icon.rs
@@ -0,0 +1,66 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use crate::icon::BadIcon;
+
+#[derive(Debug, Clone)]
+pub struct PlatformIcon {
+    argb: Vec<u8>,
+    width: i32,
+    height: i32,
+}
+
+impl PlatformIcon {
+    pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
+        if rgba.len() % 4 != 0 {
+            return Err(BadIcon::ByteCountNotDivisibleBy4 {
+                byte_count: rgba.len(),
+            });
+        }
+
+        let mut bytes = rgba;
+        for i in 0..(bytes.len() / 4) {
+            let j = i * 4;
+            let a = bytes[j + 3];
+            bytes[j + 3] = bytes[j + 2];
+            bytes[j + 2] = bytes[j + 1];
+            bytes[j + 1] = bytes[j];
+            bytes[j] = a;
+        }
+
+        Ok(Self {
+            argb: bytes,
+            width: width as i32,
+            height: height as i32,
+        })
+    }
+
+    pub fn into_rgba(self) -> (Vec<u8>, u32, u32) {
+        let mut bytes = self.argb;
+        for i in 0..(bytes.len() / 4) {
+            let j = i * 4;
+            let a = bytes[j];
+            bytes[j] = bytes[j + 1];
+            bytes[j + 1] = bytes[j + 2];
+            bytes[j + 2] = bytes[j + 3];
+            bytes[j + 3] = a;
+        }
+
+        (bytes, self.width as u32, self.height as u32)
+    }
+}
+
+impl From<PlatformIcon> for ksni::Icon {
+    fn from(icon: PlatformIcon) -> Self {
+        ksni::Icon {
+            width: icon.width,
+            height: icon.height,
+            data: icon.argb,
+        }
+    }
+}
diff --git a/ports/tray-icon/src/platform_impl/linux/menu.rs b/ports/tray-icon/src/platform_impl/linux/menu.rs
new file mode 100644
index 000000000000..bd53cd90275e
--- /dev/null
+++ b/ports/tray-icon/src/platform_impl/linux/menu.rs
@@ -0,0 +1,57 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::sync::Arc;
+
+use arc_swap::ArcSwap;
+
+use super::tray::Tray;
+
+pub fn muda_to_ksni_menu_item(
+    item: Arc<ArcSwap<muda::CompatMenuItem>>,
+) -> ksni::menu::MenuItem<Tray> {
+    match &**item.load() {
+        muda::CompatMenuItem::Standard(menu_item) => {
+            let id = menu_item.id.clone();
+            ksni::menu::StandardItem {
+                label: menu_item.label.clone(),
+                enabled: menu_item.enabled,
+                icon_data: menu_item.icon.clone().unwrap_or_default(),
+                activate: Box::new(move |_| send_menu_event(&id)),
+                ..Default::default()
+            }
+            .into()
+        }
+        muda::CompatMenuItem::Checkmark(check_menu_item) => {
+            let id = check_menu_item.id.clone();
+            ksni::menu::CheckmarkItem {
+                label: check_menu_item.label.clone(),
+                enabled: check_menu_item.enabled,
+                checked: check_menu_item.checked,
+                activate: Box::new(move |_| send_menu_event(&id)),
+                ..Default::default()
+            }
+            .into()
+        }
+        muda::CompatMenuItem::SubMenu(submenu) => ksni::menu::SubMenu {
+            label: submenu.label.clone(),
+            enabled: submenu.enabled,
+            submenu: submenu
+                .submenu
+                .iter()
+                .cloned()
+                .map(muda_to_ksni_menu_item)
+                .collect(),
+            ..Default::default()
+        }
+        .into(),
+        muda::CompatMenuItem::Separator => ksni::menu::MenuItem::Separator,
+    }
+}
+
+fn send_menu_event(id: &str) {
+    muda::send_menu_event(muda::MenuEvent {
+        id: muda::MenuId(id.to_string()),
+    })
+}
diff --git a/ports/tray-icon/src/platform_impl/linux/mod.rs b/ports/tray-icon/src/platform_impl/linux/mod.rs
new file mode 100644
index 000000000000..11940bdbb544
--- /dev/null
+++ b/ports/tray-icon/src/platform_impl/linux/mod.rs
@@ -0,0 +1,155 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+mod icon;
+mod menu;
+mod tray;
+
+use std::{
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc, Mutex,
+    },
+    thread,
+};
+
+use crossbeam_channel::{unbounded, Sender};
+use once_cell::sync::Lazy;
+
+pub(crate) use icon::PlatformIcon;
+use tray::Tray;
+
+use crate::{icon::Icon, TrayIconAttributes, TrayIconId};
+
+pub struct TrayIcon {
+    tray_handle: ksni::Handle<Tray>,
+    shutdown: Arc<AtomicBool>,
+}
+
+static MENU_UPDATE_SUBSCRIBERS: Lazy<Mutex<Vec<Sender<()>>>> =
+    Lazy::new(|| Mutex::new(Vec::new()));
+static MENU_UPDATE_DISPATCHER: Lazy<()> = Lazy::new(|| {
+    thread::spawn(|| {
+        while muda::recv_menu_update().is_ok() {
+            let Ok(mut subscribers) = MENU_UPDATE_SUBSCRIBERS.lock() else {
+                continue;
+            };
+            subscribers.retain(|subscriber| subscriber.send(()).is_ok());
+        }
+    });
+});
+
+fn subscribe_menu_updates() -> crossbeam_channel::Receiver<()> {
+    Lazy::force(&MENU_UPDATE_DISPATCHER);
+
+    let (sender, receiver) = unbounded();
+    if let Ok(mut subscribers) = MENU_UPDATE_SUBSCRIBERS.lock() {
+        subscribers.push(sender);
+    }
+    receiver
+}
+
+impl TrayIcon {
+    pub fn new(id: TrayIconId, attrs: TrayIconAttributes) -> crate::Result<Self> {
+        let icon = attrs.icon.map(|icon| icon.inner.into());
+        let title = attrs.title.unwrap_or_default();
+        let tooltip = attrs.tooltip.unwrap_or_default();
+        let menu = attrs
+            .menu
+            .as_ref()
+            .map(|menu| menu.compat_items())
+            .unwrap_or_default();
+
+        let shutdown = Arc::new(AtomicBool::new(false));
+        let tray_service = ksni::TrayService::new(Tray::new(id, icon, title, tooltip, menu));
+        let tray_handle = tray_service.handle();
+        tray_service.spawn();
+
+        let update_tray_handle = tray_handle.clone();
+        let update_shutdown = shutdown.clone();
+        let update_receiver = subscribe_menu_updates();
+        thread::spawn(move || {
+            while update_receiver.recv().is_ok() {
+                if update_shutdown.load(Ordering::Relaxed) {
+                    break;
+                }
+                update_tray_handle.update(|_| {});
+            }
+        });
+
+        Ok(Self {
+            tray_handle,
+            shutdown,
+        })
+    }
+
+    pub fn set_icon(&mut self, icon: Option<Icon>) -> crate::Result<()> {
+        let icon = icon.map(|icon| icon.inner.into());
+        self.tray_handle.update(|tray| {
+            tray.set_icon(icon);
+        });
+        Ok(())
+    }
+
+    pub fn set_menu(&mut self, menu: Option<Box<dyn crate::menu::ContextMenu>>) {
+        let menu = menu
+            .as_ref()
+            .map(|menu| menu.compat_items())
+            .unwrap_or_default();
+        self.tray_handle.update(|tray| {
+            tray.set_menu(menu);
+        });
+    }
+
+    pub fn set_tooltip<S: AsRef<str>>(&mut self, tooltip: Option<S>) -> crate::Result<()> {
+        let tooltip = tooltip
+            .as_ref()
+            .map(AsRef::as_ref)
+            .unwrap_or_default()
+            .to_string();
+        self.tray_handle.update(|tray| {
+            tray.set_tooltip(tooltip);
+        });
+        Ok(())
+    }
+
+    pub fn set_title<S: AsRef<str>>(&mut self, title: Option<S>) {
+        let title = title
+            .as_ref()
+            .map(AsRef::as_ref)
+            .unwrap_or_default()
+            .to_string();
+        self.tray_handle.update(|tray| {
+            tray.set_title(title);
+        });
+    }
+
+    pub fn set_visible(&mut self, visible: bool) -> crate::Result<()> {
+        self.tray_handle.update(|tray| {
+            if visible {
+                tray.set_status(ksni::Status::Active);
+            } else {
+                tray.set_status(ksni::Status::Passive);
+            }
+        });
+        Ok(())
+    }
+
+    pub fn set_temp_dir_path<P: AsRef<std::path::Path>>(&mut self, _path: Option<P>) {}
+
+    pub fn rect(&self) -> Option<crate::Rect> {
+        None
+    }
+}
+
+impl Drop for TrayIcon {
+    fn drop(&mut self) {
+        self.shutdown.store(true, Ordering::Relaxed);
+        muda::send_menu_update();
+    }
+}
diff --git a/ports/tray-icon/src/platform_impl/linux/tray.rs b/ports/tray-icon/src/platform_impl/linux/tray.rs
new file mode 100644
index 000000000000..da656b162307
--- /dev/null
+++ b/ports/tray-icon/src/platform_impl/linux/tray.rs
@@ -0,0 +1,116 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::sync::Arc;
+
+use arc_swap::ArcSwap;
+
+use crate::{MouseButton, MouseButtonState, TrayIconEvent, TrayIconId};
+
+use super::menu::muda_to_ksni_menu_item;
+
+pub struct Tray {
+    id: TrayIconId,
+    icon: Vec<ksni::Icon>,
+    title: String,
+    status: ksni::Status,
+    tooltip: String,
+    menu: Vec<Arc<ArcSwap<muda::CompatMenuItem>>>,
+}
+
+impl Tray {
+    pub fn new(
+        id: TrayIconId,
+        icon: Option<ksni::Icon>,
+        title: String,
+        tooltip: String,
+        menu: Vec<Arc<ArcSwap<muda::CompatMenuItem>>>,
+    ) -> Self {
+        Self {
+            id,
+            icon: icon.into_iter().collect(),
+            title,
+            status: ksni::Status::Active,
+            tooltip,
+            menu,
+        }
+    }
+
+    pub fn set_icon(&mut self, icon: Option<ksni::Icon>) {
+        self.icon = icon.into_iter().collect();
+    }
+
+    pub fn set_title(&mut self, title: String) {
+        self.title = title;
+    }
+
+    pub fn set_status(&mut self, status: ksni::Status) {
+        self.status = status;
+    }
+
+    pub fn set_tooltip(&mut self, tooltip: String) {
+        self.tooltip = tooltip;
+    }
+
+    pub fn set_menu(&mut self, menu: Vec<Arc<ArcSwap<muda::CompatMenuItem>>>) {
+        self.menu = menu;
+    }
+}
+
+impl ksni::Tray for Tray {
+    fn id(&self) -> String {
+        self.id.0.clone()
+    }
+
+    fn status(&self) -> ksni::Status {
+        self.status
+    }
+
+    fn icon_pixmap(&self) -> Vec<ksni::Icon> {
+        self.icon.clone()
+    }
+
+    fn title(&self) -> String {
+        self.title.clone()
+    }
+
+    fn tool_tip(&self) -> ksni::ToolTip {
+        ksni::ToolTip {
+            icon_pixmap: self.icon.clone(),
+            title: self.title.clone(),
+            description: self.tooltip.clone(),
+            ..Default::default()
+        }
+    }
+
+    fn menu(&self) -> Vec<ksni::MenuItem<Self>> {
+        self.menu
+            .iter()
+            .cloned()
+            .map(muda_to_ksni_menu_item)
+            .collect()
+    }
+
+    fn activate(&mut self, x: i32, y: i32) {
+        let event = TrayIconEvent::Click {
+            id: self.id.clone(),
+            position: muda::dpi::PhysicalPosition::new(x as f64, y as f64),
+            rect: Default::default(),
+            button: MouseButton::Left,
+            button_state: MouseButtonState::Up,
+        };
+        TrayIconEvent::send(event);
+    }
+
+    fn secondary_activate(&mut self, x: i32, y: i32) {
+        let event = TrayIconEvent::Click {
+            id: self.id.clone(),
+            position: muda::dpi::PhysicalPosition::new(x as f64, y as f64),
+            rect: Default::default(),
+            button: MouseButton::Middle,
+            button_state: MouseButtonState::Up,
+        };
+        TrayIconEvent::send(event);
+    }
+}
diff --git a/ports/tray-icon/src/platform_impl/macos/icon.rs b/ports/tray-icon/src/platform_impl/macos/icon.rs
new file mode 100644
index 000000000000..76c8be7c8871
--- /dev/null
+++ b/ports/tray-icon/src/platform_impl/macos/icon.rs
@@ -0,0 +1,39 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use crate::icon::{BadIcon, RgbaIcon};
+use std::io::Cursor;
+
+#[derive(Debug, Clone)]
+pub struct PlatformIcon(RgbaIcon);
+
+impl PlatformIcon {
+    pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
+        Ok(PlatformIcon(RgbaIcon::from_rgba(rgba, width, height)?))
+    }
+
+    pub fn get_size(&self) -> (u32, u32) {
+        (self.0.width, self.0.height)
+    }
+
+    pub fn to_png(&self) -> crate::Result<Vec<u8>> {
+        let mut png = Vec::new();
+
+        {
+            let mut encoder =
+                png::Encoder::new(Cursor::new(&mut png), self.0.width as _, self.0.height as _);
+            encoder.set_color(png::ColorType::Rgba);
+            encoder.set_depth(png::BitDepth::Eight);
+
+            let mut writer = encoder.write_header()?;
+            writer.write_image_data(&self.0.rgba)?;
+        }
+
+        Ok(png)
+    }
+}
diff --git a/ports/tray-icon/src/platform_impl/macos/mod.rs b/ports/tray-icon/src/platform_impl/macos/mod.rs
new file mode 100644
index 000000000000..9658307cb06e
--- /dev/null
+++ b/ports/tray-icon/src/platform_impl/macos/mod.rs
@@ -0,0 +1,616 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+mod icon;
+use std::cell::{Cell, RefCell};
+
+use objc2::rc::Retained;
+use objc2::{define_class, msg_send, AllocAnyThread, DeclaredClass, Message};
+use objc2_app_kit::{
+    NSCellImagePosition, NSEvent, NSImage, NSMenu, NSStatusBar, NSStatusItem, NSTrackingArea,
+    NSTrackingAreaOptions, NSVariableStatusItemLength, NSView, NSWindow,
+};
+use objc2_core_foundation::{CGPoint, CGRect, CGSize};
+use objc2_core_graphics::{CGDisplayPixelsHigh, CGMainDisplayID};
+use objc2_foundation::{MainThreadMarker, NSData, NSSize, NSString};
+
+pub(crate) use self::icon::PlatformIcon;
+use crate::Error;
+use crate::{
+    icon::Icon, menu, MouseButton, MouseButtonState, Rect, TrayIconAttributes, TrayIconEvent,
+    TrayIconId,
+};
+
+pub struct TrayIcon {
+    ns_status_item: Option<Retained<NSStatusItem>>,
+    tray_target: Option<Retained<TrayTarget>>,
+    id: TrayIconId,
+    attrs: TrayIconAttributes,
+    mtm: MainThreadMarker,
+}
+
+impl TrayIcon {
+    pub fn new(id: TrayIconId, attrs: TrayIconAttributes) -> crate::Result<Self> {
+        let mtm = MainThreadMarker::new().ok_or(Error::NotMainThread)?;
+        let (ns_status_item, tray_target) = Self::create(&id, &attrs, mtm)?;
+
+        let tray_icon = Self {
+            ns_status_item: Some(ns_status_item),
+            tray_target: Some(tray_target),
+            id,
+            attrs,
+            mtm,
+        };
+
+        Ok(tray_icon)
+    }
+
+    fn create(
+        id: &TrayIconId,
+        attrs: &TrayIconAttributes,
+        mtm: MainThreadMarker,
+    ) -> crate::Result<(Retained<NSStatusItem>, Retained<TrayTarget>)> {
+        let ns_status_item = unsafe {
+            NSStatusBar::systemStatusBar().statusItemWithLength(NSVariableStatusItemLength)
+        };
+
+        set_icon_for_ns_status_item_button(
+            &ns_status_item,
+            attrs.icon.as_ref(),
+            attrs.icon_is_template,
+            mtm,
+        )?;
+
+        if let Some(menu) = &attrs.menu {
+            unsafe {
+                ns_status_item.setMenu((menu.ns_menu() as *const NSMenu).as_ref());
+            }
+        }
+
+        Self::set_tooltip_inner(&ns_status_item, attrs.tooltip.as_deref(), mtm)?;
+        Self::set_title_inner(&ns_status_item, attrs.title.as_deref(), mtm);
+
+        let tray_target = unsafe {
+            let button = ns_status_item.button(mtm).unwrap();
+
+            let frame = button.frame();
+
+            let target = mtm.alloc().set_ivars(TrayTargetIvars {
+                id: NSString::from_str(&id.0),
+                menu: RefCell::new(
+                    attrs
+                        .menu
+                        .as_deref()
+                        .and_then(|menu| Retained::retain(menu.ns_menu().cast::<NSMenu>())),
+                ),
+                status_item: ns_status_item.retain(),
+                menu_on_left_click: Cell::new(attrs.menu_on_left_click),
+                menu_on_right_click: Cell::new(attrs.menu_on_right_click),
+            });
+            let tray_target: Retained<TrayTarget> = msg_send![super(target), initWithFrame: frame];
+            tray_target.setWantsLayer(true);
+
+            button.addSubview(&tray_target);
+
+            tray_target
+        };
+
+        Ok((ns_status_item, tray_target))
+    }
+
+    fn remove(&mut self) {
+        if let (Some(ns_status_item), Some(tray_target)) = (&self.ns_status_item, &self.tray_target)
+        {
+            unsafe {
+                NSStatusBar::systemStatusBar().removeStatusItem(ns_status_item);
+                tray_target.removeFromSuperview();
+            }
+        }
+
+        self.ns_status_item = None;
+        self.tray_target = None;
+    }
+
+    pub fn set_icon(&mut self, icon: Option<Icon>) -> crate::Result<()> {
+        if let (Some(ns_status_item), Some(tray_target)) = (&self.ns_status_item, &self.tray_target)
+        {
+            set_icon_for_ns_status_item_button(ns_status_item, icon.as_ref(), false, self.mtm)?;
+            tray_target.update_dimensions();
+        }
+        self.attrs.icon = icon;
+        Ok(())
+    }
+
+    pub fn set_menu(&mut self, menu: Option<Box<dyn menu::ContextMenu>>) {
+        if let (Some(ns_status_item), Some(tray_target)) = (&self.ns_status_item, &self.tray_target)
+        {
+            unsafe {
+                let menu = menu
+                    .as_ref()
+                    .and_then(|m| m.ns_menu().cast::<NSMenu>().as_ref())
+                    .map(|menu| menu.retain());
+                ns_status_item.setMenu(menu.as_deref());
+                if let Some(menu) = &menu {
+                    let () = msg_send![menu, setDelegate: &**ns_status_item];
+                }
+
+                *tray_target.ivars().menu.borrow_mut() = menu;
+            }
+        }
+        self.attrs.menu = menu;
+    }
+
+    pub fn set_tooltip<S: AsRef<str>>(&mut self, tooltip: Option<S>) -> crate::Result<()> {
+        let tooltip = tooltip.map(|s| s.as_ref().to_string());
+        if let (Some(ns_status_item), Some(tray_target)) = (&self.ns_status_item, &self.tray_target)
+        {
+            Self::set_tooltip_inner(ns_status_item, tooltip.as_deref(), self.mtm)?;
+            tray_target.update_dimensions();
+        }
+        self.attrs.tooltip = tooltip;
+        Ok(())
+    }
+
+    fn set_tooltip_inner<S: AsRef<str>>(
+        ns_status_item: &NSStatusItem,
+        tooltip: Option<S>,
+        mtm: MainThreadMarker,
+    ) -> crate::Result<()> {
+        unsafe {
+            let tooltip = tooltip.map(|tooltip| NSString::from_str(tooltip.as_ref()));
+            if let Some(button) = ns_status_item.button(mtm) {
+                button.setToolTip(tooltip.as_deref());
+            }
+        }
+        Ok(())
+    }
+
+    pub fn set_title<S: AsRef<str>>(&mut self, title: Option<S>) {
+        let title = title.map(|s| s.as_ref().to_string());
+        if let (Some(ns_status_item), Some(tray_target)) = (&self.ns_status_item, &self.tray_target)
+        {
+            Self::set_title_inner(ns_status_item, title.as_deref(), self.mtm);
+            tray_target.update_dimensions();
+        }
+        self.attrs.title = title;
+    }
+
+    fn set_title_inner<S: AsRef<str>>(
+        ns_status_item: &NSStatusItem,
+        title: Option<S>,
+        mtm: MainThreadMarker,
+    ) {
+        if let Some(title) = title {
+            unsafe {
+                if let Some(button) = ns_status_item.button(mtm) {
+                    button.setTitle(&NSString::from_str(title.as_ref()));
+                }
+            }
+        }
+    }
+
+    pub fn set_visible(&mut self, visible: bool) -> crate::Result<()> {
+        if visible {
+            if self.ns_status_item.is_none() {
+                let (ns_status_item, tray_target) = Self::create(&self.id, &self.attrs, self.mtm)?;
+                self.ns_status_item = Some(ns_status_item);
+                self.tray_target = Some(tray_target);
+            }
+        } else {
+            self.remove();
+        }
+
+        Ok(())
+    }
+
+    pub fn set_icon_as_template(&mut self, is_template: bool) {
+        if let Some(ns_status_item) = &self.ns_status_item {
+            unsafe {
+                let button = ns_status_item.button(self.mtm).unwrap();
+                if let Some(nsimage) = button.image() {
+                    nsimage.setTemplate(is_template);
+                    button.setImage(Some(&nsimage));
+                }
+            }
+        }
+        self.attrs.icon_is_template = is_template;
+    }
+
+    pub fn set_icon_with_as_template(
+        &mut self,
+        icon: Option<Icon>,
+        is_template: bool,
+    ) -> crate::Result<()> {
+        if let (Some(ns_status_item), Some(tray_target)) = (&self.ns_status_item, &self.tray_target)
+        {
+            set_icon_for_ns_status_item_button(
+                ns_status_item,
+                icon.as_ref(),
+                is_template,
+                self.mtm,
+            )?;
+            tray_target.update_dimensions();
+        }
+        self.attrs.icon = icon;
+        self.attrs.icon_is_template = is_template;
+        Ok(())
+    }
+
+    pub fn set_show_menu_on_left_click(&mut self, enable: bool) {
+        if let Some(tray_target) = &self.tray_target {
+            tray_target.ivars().menu_on_left_click.set(enable);
+        }
+        self.attrs.menu_on_left_click = enable;
+    }
+
+    pub fn set_show_menu_on_right_click(&mut self, enable: bool) {
+        if let Some(tray_target) = &self.tray_target {
+            tray_target.ivars().menu_on_right_click.set(enable);
+        }
+        self.attrs.menu_on_right_click = enable;
+    }
+
+    pub fn show_menu(&self) {
+        if let Some(ns_status_item) = &self.ns_status_item {
+            unsafe {
+                let button = ns_status_item.button(self.mtm).unwrap();
+                button.performClick(None);
+            }
+        }
+    }
+
+    pub fn rect(&self) -> Option<Rect> {
+        let ns_status_item = self.ns_status_item.as_deref()?;
+        unsafe {
+            let button = ns_status_item.button(self.mtm).unwrap();
+            let window = button.window();
+            window.map(|window| get_tray_rect(&window))
+        }
+    }
+
+    pub fn ns_status_item(&self) -> Option<&Retained<NSStatusItem>> {
+        self.ns_status_item.as_ref()
+    }
+}
+
+impl Drop for TrayIcon {
+    fn drop(&mut self) {
+        self.remove()
+    }
+}
+
+fn set_icon_for_ns_status_item_button(
+    ns_status_item: &NSStatusItem,
+    icon: Option<&Icon>,
+    icon_is_template: bool,
+    mtm: MainThreadMarker,
+) -> crate::Result<()> {
+    let button = unsafe { ns_status_item.button(mtm).unwrap() };
+
+    if let Some(icon) = icon {
+        let png_icon = icon.inner.to_png()?;
+
+        let (width, height) = icon.inner.get_size();
+
+        let icon_height: f64 = 18.0;
+        let icon_width: f64 = (width as f64) / (height as f64 / icon_height);
+
+        unsafe {
+            // build our icon
+            let nsdata = NSData::from_vec(png_icon);
+
+            let nsimage = NSImage::initWithData(NSImage::alloc(), &nsdata).unwrap();
+            let new_size = NSSize::new(icon_width, icon_height);
+
+            button.setImage(Some(&nsimage));
+            nsimage.setSize(new_size);
+            // The image is to the right of the title
+            button.setImagePosition(NSCellImagePosition::ImageLeft);
+            nsimage.setTemplate(icon_is_template);
+        }
+    } else {
+        unsafe { button.setImage(None) };
+    }
+
+    Ok(())
+}
+
+#[derive(Debug)]
+struct TrayTargetIvars {
+    id: Retained<NSString>,
+    menu: RefCell<Option<Retained<NSMenu>>>,
+    status_item: Retained<NSStatusItem>,
+    menu_on_left_click: Cell<bool>,
+    menu_on_right_click: Cell<bool>,
+}
+
+define_class!(
+    #[unsafe(super(NSView))]
+    #[name = "TaoTrayTarget"]
+    #[ivars = TrayTargetIvars]
+    struct TrayTarget;
+
+    /// Mouse events on NSResponder
+    impl TrayTarget {
+        #[unsafe(method(mouseDown:))]
+        fn on_mouse_down(&self, event: &NSEvent) {
+            send_mouse_event(
+                self,
+                event,
+                MouseEventType::Click,
+                Some(MouseClickEvent {
+                    button: MouseButton::Left,
+                    state: MouseButtonState::Down,
+                }),
+            );
+            on_tray_click(self, MouseButton::Left);
+        }
+
+        #[unsafe(method(mouseUp:))]
+        fn on_mouse_up(&self, event: &NSEvent) {
+            let mtm = MainThreadMarker::from(self);
+            unsafe {
+                let button = self.ivars().status_item.button(mtm).unwrap();
+                button.highlight(false);
+            }
+            send_mouse_event(
+                self,
+                event,
+                MouseEventType::Click,
+                Some(MouseClickEvent {
+                    button: MouseButton::Left,
+                    state: MouseButtonState::Up,
+                }),
+            );
+        }
+
+        #[unsafe(method(rightMouseDown:))]
+        fn on_right_mouse_down(&self, event: &NSEvent) {
+            send_mouse_event(
+                self,
+                event,
+                MouseEventType::Click,
+                Some(MouseClickEvent {
+                    button: MouseButton::Right,
+                    state: MouseButtonState::Down,
+                }),
+            );
+            on_tray_click(self, MouseButton::Right);
+        }
+
+        #[unsafe(method(rightMouseUp:))]
+        fn on_right_mouse_up(&self, event: &NSEvent) {
+            send_mouse_event(
+                self,
+                event,
+                MouseEventType::Click,
+                Some(MouseClickEvent {
+                    button: MouseButton::Right,
+                    state: MouseButtonState::Up,
+                }),
+            );
+        }
+
+        #[unsafe(method(otherMouseDown:))]
+        fn on_other_mouse_down(&self, event: &NSEvent) {
+            let button_number = unsafe { event.buttonNumber() };
+            if button_number == 2 {
+                send_mouse_event(
+                    self,
+                    event,
+                    MouseEventType::Click,
+                    Some(MouseClickEvent {
+                        button: MouseButton::Middle,
+                        state: MouseButtonState::Down,
+                    }),
+                );
+            }
+        }
+
+        #[unsafe(method(otherMouseUp:))]
+        fn on_other_mouse_up(&self, event: &NSEvent) {
+            let button_number = unsafe { event.buttonNumber() };
+            if button_number == 2 {
+                send_mouse_event(
+                    self,
+                    event,
+                    MouseEventType::Click,
+                    Some(MouseClickEvent {
+                        button: MouseButton::Middle,
+                        state: MouseButtonState::Up,
+                    }),
+                );
+            }
+        }
+
+        #[unsafe(method(mouseEntered:))]
+        fn on_mouse_entered(&self, event: &NSEvent) {
+            send_mouse_event(self, event, MouseEventType::Enter, None);
+        }
+
+        #[unsafe(method(mouseExited:))]
+        fn on_mouse_exited(&self, event: &NSEvent) {
+            send_mouse_event(self, event, MouseEventType::Leave, None);
+        }
+
+        #[unsafe(method(mouseMoved:))]
+        fn on_mouse_moved(&self, event: &NSEvent) {
+            send_mouse_event(self, event, MouseEventType::Move, None);
+        }
+    }
+
+    /// Tracking mouse enter/exit/move events
+    impl TrayTarget {
+        #[unsafe(method(updateTrackingAreas))]
+        fn update_tracking_areas(&self) {
+            unsafe {
+                let areas = self.trackingAreas();
+                for area in areas {
+                    self.removeTrackingArea(&area);
+                }
+
+                let _: () = msg_send![super(self), updateTrackingAreas];
+
+                let options = NSTrackingAreaOptions::MouseEnteredAndExited
+                    | NSTrackingAreaOptions::MouseMoved
+                    | NSTrackingAreaOptions::ActiveAlways
+                    | NSTrackingAreaOptions::InVisibleRect;
+                let rect = CGRect {
+                    origin: CGPoint { x: 0.0, y: 0.0 },
+                    size: CGSize {
+                        width: 0.0,
+                        height: 0.0,
+                    },
+                };
+                let area = NSTrackingArea::initWithRect_options_owner_userInfo(
+                    NSTrackingArea::alloc(),
+                    rect,
+                    options,
+                    Some(self),
+                    None,
+                );
+                self.addTrackingArea(&area);
+            }
+        }
+    }
+);
+
+impl TrayTarget {
+    fn update_dimensions(&self) {
+        let mtm = MainThreadMarker::from(self);
+        unsafe {
+            let button = self.ivars().status_item.button(mtm).unwrap();
+            self.setFrame(button.frame());
+        }
+    }
+}
+
+fn on_tray_click(this: &TrayTarget, button: MouseButton) {
+    let mtm = MainThreadMarker::from(this);
+    unsafe {
+        let ns_button = this.ivars().status_item.button(mtm).unwrap();
+
+        let menu_on_left_click = this.ivars().menu_on_left_click.get();
+        let menu_on_right_click = this.ivars().menu_on_right_click.get();
+        if (menu_on_right_click && button == MouseButton::Right)
+            || (menu_on_left_click && button == MouseButton::Left)
+        {
+            let has_items = if let Some(menu) = &*this.ivars().menu.borrow() {
+                menu.numberOfItems() > 0
+            } else {
+                false
+            };
+            if has_items {
+                ns_button.performClick(None);
+            } else {
+                ns_button.highlight(true);
+            }
+        } else {
+            ns_button.highlight(true);
+        }
+    }
+}
+
+fn get_tray_rect(window: &NSWindow) -> Rect {
+    let frame = window.frame();
+    let scale_factor = window.backingScaleFactor();
+
+    Rect {
+        size: crate::dpi::LogicalSize::new(frame.size.width, frame.size.height)
+            .to_physical(scale_factor),
+        position: crate::dpi::LogicalPosition::new(
+            frame.origin.x,
+            flip_window_screen_coordinates(frame.origin.y) - frame.size.height,
+        )
+        .to_physical(scale_factor),
+    }
+}
+
+fn send_mouse_event(
+    this: &TrayTarget,
+    event: &NSEvent,
+    mouse_event_type: MouseEventType,
+    click_event: Option<MouseClickEvent>,
+) {
+    let mtm = MainThreadMarker::from(this);
+    unsafe {
+        let tray_id = TrayIconId(this.ivars().id.to_string());
+
+        // icon position & size
+        let window = event.window(mtm).unwrap();
+        let icon_rect = get_tray_rect(&window);
+
+        // cursor position
+        let mouse_location = NSEvent::mouseLocation();
+        let scale_factor = window.backingScaleFactor();
+        let cursor_position = crate::dpi::LogicalPosition::new(
+            mouse_location.x,
+            flip_window_screen_coordinates(mouse_location.y),
+        )
+        .to_physical(scale_factor);
+
+        let event = match mouse_event_type {
+            MouseEventType::Click => {
+                let click_event = click_event.unwrap();
+                TrayIconEvent::Click {
+                    id: tray_id,
+                    position: cursor_position,
+                    rect: icon_rect,
+                    button: click_event.button,
+                    button_state: click_event.state,
+                }
+            }
+            MouseEventType::Enter => TrayIconEvent::Enter {
+                id: tray_id,
+                position: cursor_position,
+                rect: icon_rect,
+            },
+            MouseEventType::Leave => TrayIconEvent::Leave {
+                id: tray_id,
+                position: cursor_position,
+                rect: icon_rect,
+            },
+            MouseEventType::Move => TrayIconEvent::Move {
+                id: tray_id,
+                position: cursor_position,
+                rect: icon_rect,
+            },
+        };
+
+        TrayIconEvent::send(event);
+    }
+}
+
+#[derive(Debug)]
+enum MouseEventType {
+    Click,
+    Enter,
+    Leave,
+    Move,
+}
+
+#[derive(Debug)]
+struct MouseClickEvent {
+    button: MouseButton,
+    state: MouseButtonState,
+}
+
+/// Core graphics screen coordinates are relative to the top-left corner of
+/// the so-called "main" display, with y increasing downwards - which is
+/// exactly what we want in Winit.
+///
+/// However, `NSWindow` and `NSScreen` changes these coordinates to:
+/// 1. Be relative to the bottom-left corner of the "main" screen.
+/// 2. Be relative to the bottom-left corner of the window/screen itself.
+/// 3. Have y increasing upwards.
+///
+/// This conversion happens to be symmetric, so we only need this one function
+/// to convert between the two coordinate systems.
+fn flip_window_screen_coordinates(y: f64) -> f64 {
+    unsafe { CGDisplayPixelsHigh(CGMainDisplayID()) as f64 - y }
+}
diff --git a/ports/tray-icon/src/platform_impl/mod.rs b/ports/tray-icon/src/platform_impl/mod.rs
new file mode 100644
index 000000000000..f0c115de65d4
--- /dev/null
+++ b/ports/tray-icon/src/platform_impl/mod.rs
@@ -0,0 +1,30 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+#[cfg(target_os = "windows")]
+#[path = "windows/mod.rs"]
+mod platform;
+#[cfg(any(
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
+#[path = "gtk/mod.rs"]
+mod platform;
+#[cfg(all(target_os = "linux", not(feature = "linux-ksni")))]
+#[path = "gtk/mod.rs"]
+mod platform;
+#[cfg(all(target_os = "linux", feature = "linux-ksni"))]
+#[path = "linux/mod.rs"]
+mod platform;
+#[cfg(target_os = "macos")]
+#[path = "macos/mod.rs"]
+mod platform;
+
+pub(crate) use self::platform::*;
diff --git a/ports/tray-icon/src/platform_impl/windows/icon.rs b/ports/tray-icon/src/platform_impl/windows/icon.rs
new file mode 100644
index 000000000000..c04b6cd3f651
--- /dev/null
+++ b/ports/tray-icon/src/platform_impl/windows/icon.rs
@@ -0,0 +1,162 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// taken from https://github.com/rust-windowing/winit/blob/92fdf5ba85f920262a61cee4590f4a11ad5738d1/src/platform_impl/windows/icon.rs
+
+use std::{fmt, io, mem, path::Path, sync::Arc};
+
+use windows_sys::{
+    core::PCWSTR,
+    Win32::UI::WindowsAndMessaging::{
+        CreateIcon, DestroyIcon, LoadImageW, HICON, IMAGE_ICON, LR_DEFAULTSIZE, LR_LOADFROMFILE,
+    },
+};
+
+use crate::icon::*;
+
+use super::util;
+
+impl Pixel {
+    fn convert_to_bgra(&mut self) {
+        mem::swap(&mut self.r, &mut self.b);
+    }
+}
+
+impl RgbaIcon {
+    fn into_windows_icon(self) -> Result<WinIcon, BadIcon> {
+        let rgba = self.rgba;
+        let pixel_count = rgba.len() / PIXEL_SIZE;
+        let mut and_mask = Vec::with_capacity(pixel_count);
+        let pixels =
+            unsafe { std::slice::from_raw_parts_mut(rgba.as_ptr() as *mut Pixel, pixel_count) };
+        for pixel in pixels {
+            and_mask.push(pixel.a.wrapping_sub(u8::MAX)); // invert alpha channel
+            pixel.convert_to_bgra();
+        }
+        assert_eq!(and_mask.len(), pixel_count);
+        let handle = unsafe {
+            CreateIcon(
+                std::ptr::null_mut(),
+                self.width as i32,
+                self.height as i32,
+                1,
+                (PIXEL_SIZE * 8) as u8,
+                and_mask.as_ptr(),
+                rgba.as_ptr(),
+            )
+        };
+        if !handle.is_null() {
+            Ok(WinIcon::from_handle(handle))
+        } else {
+            Err(BadIcon::OsError(io::Error::last_os_error()))
+        }
+    }
+}
+
+#[derive(Debug)]
+struct RaiiIcon {
+    handle: HICON,
+}
+
+#[derive(Clone)]
+pub(crate) struct WinIcon {
+    inner: Arc<RaiiIcon>,
+}
+
+unsafe impl Send for WinIcon {}
+
+impl WinIcon {
+    pub fn as_raw_handle(&self) -> HICON {
+        self.inner.handle
+    }
+
+    pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
+        let rgba_icon = RgbaIcon::from_rgba(rgba, width, height)?;
+        rgba_icon.into_windows_icon()
+    }
+
+    pub(crate) fn from_handle(handle: HICON) -> Self {
+        Self {
+            #[allow(clippy::arc_with_non_send_sync)]
+            inner: Arc::new(RaiiIcon { handle }),
+        }
+    }
+
+    pub(crate) fn from_path<P: AsRef<Path>>(
+        path: P,
+        size: Option<(u32, u32)>,
+    ) -> Result<Self, BadIcon> {
+        // width / height of 0 along with LR_DEFAULTSIZE tells windows to load the default icon size
+        let (width, height) = size.unwrap_or((0, 0));
+
+        let wide_path = util::encode_wide(path.as_ref());
+
+        let handle = unsafe {
+            LoadImageW(
+                std::ptr::null_mut(),
+                wide_path.as_ptr(),
+                IMAGE_ICON,
+                width as i32,
+                height as i32,
+                LR_DEFAULTSIZE | LR_LOADFROMFILE,
+            )
+        };
+        if !handle.is_null() {
+            Ok(WinIcon::from_handle(handle as HICON))
+        } else {
+            Err(BadIcon::OsError(io::Error::last_os_error()))
+        }
+    }
+
+    fn from_resource_inner_name(name: PCWSTR, size: Option<(u32, u32)>) -> Result<Self, BadIcon> {
+        // width / height of 0 along with LR_DEFAULTSIZE tells windows to load the default icon size
+        let (width, height) = size.unwrap_or((0, 0));
+        let handle = unsafe {
+            LoadImageW(
+                util::get_instance_handle(),
+                name,
+                IMAGE_ICON,
+                width as i32,
+                height as i32,
+                LR_DEFAULTSIZE,
+            )
+        };
+        if !handle.is_null() {
+            Ok(WinIcon::from_handle(handle as HICON))
+        } else {
+            Err(BadIcon::OsError(io::Error::last_os_error()))
+        }
+    }
+
+    pub(crate) fn from_resource(
+        resource_id: u16,
+        size: Option<(u32, u32)>,
+    ) -> Result<Self, BadIcon> {
+        Self::from_resource_inner_name(resource_id as PCWSTR, size)
+    }
+
+    pub(crate) fn from_resource_name(
+        resource_name: &str,
+        size: Option<(u32, u32)>,
+    ) -> Result<Self, BadIcon> {
+        let wide_name = util::encode_wide(resource_name);
+        Self::from_resource_inner_name(wide_name.as_ptr(), size)
+    }
+}
+
+impl Drop for RaiiIcon {
+    fn drop(&mut self) {
+        unsafe { DestroyIcon(self.handle) };
+    }
+}
+
+impl fmt::Debug for WinIcon {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
+        (*self.inner).fmt(formatter)
+    }
+}
diff --git a/ports/tray-icon/src/platform_impl/windows/mod.rs b/ports/tray-icon/src/platform_impl/windows/mod.rs
new file mode 100644
index 000000000000..56fc5a0b3e26
--- /dev/null
+++ b/ports/tray-icon/src/platform_impl/windows/mod.rs
@@ -0,0 +1,674 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+mod icon;
+mod util;
+use std::{mem::size_of, ptr};
+
+use once_cell::sync::Lazy;
+use windows_sys::{
+    s,
+    Win32::{
+        Foundation::{FALSE, HWND, LPARAM, LRESULT, POINT, RECT, S_OK, TRUE, WPARAM},
+        UI::{
+            Shell::{
+                Shell_NotifyIconGetRect, Shell_NotifyIconW, NIF_ICON, NIF_MESSAGE, NIF_STATE,
+                NIF_TIP, NIM_ADD, NIM_DELETE, NIM_MODIFY, NIS_HIDDEN, NOTIFYICONDATAW,
+                NOTIFYICONIDENTIFIER,
+            },
+            WindowsAndMessaging::{
+                ChangeWindowMessageFilterEx, CreateWindowExW, DefWindowProcW, DestroyWindow,
+                GetCursorPos, KillTimer, PostMessageW, RegisterClassW, RegisterWindowMessageA,
+                SendMessageW, SetForegroundWindow, SetTimer, TrackPopupMenu, CREATESTRUCTW,
+                CW_USEDEFAULT, GWL_USERDATA, HICON, HMENU, MSGFLT_ALLOW, TPM_BOTTOMALIGN,
+                TPM_LEFTALIGN, WM_CREATE, WM_DESTROY, WM_LBUTTONDBLCLK, WM_LBUTTONDOWN,
+                WM_LBUTTONUP, WM_MBUTTONDBLCLK, WM_MBUTTONDOWN, WM_MBUTTONUP, WM_MOUSEMOVE,
+                WM_NCCREATE, WM_NULL, WM_RBUTTONDBLCLK, WM_RBUTTONDOWN, WM_RBUTTONUP, WM_TIMER,
+                WNDCLASSW, WS_EX_LAYERED, WS_EX_NOACTIVATE, WS_EX_TOOLWINDOW, WS_EX_TRANSPARENT,
+                WS_OVERLAPPED,
+            },
+        },
+    },
+};
+
+use crate::{
+    dpi::PhysicalPosition, icon::Icon, menu, MouseButton, MouseButtonState, Rect,
+    TrayIconAttributes, TrayIconEvent, TrayIconId, COUNTER,
+};
+
+pub(crate) use self::icon::WinIcon as PlatformIcon;
+
+const WM_USER_TRAYICON: u32 = 6002;
+const WM_USER_UPDATE_TRAYMENU: u32 = 6003;
+const WM_USER_UPDATE_TRAYICON: u32 = 6004;
+const WM_USER_SHOW_TRAYICON: u32 = 6005;
+const WM_USER_UPDATE_TRAYTOOLTIP: u32 = 6006;
+const WM_USER_LEAVE_TIMER_ID: u32 = 6007;
+const WM_USER_SHOW_MENU_ON_LEFT_CLICK: u32 = 6008;
+const WM_USER_SHOW_MENU_ON_RIGHT_CLICK: u32 = 6009;
+/// When the taskbar is created, it registers a message with the "TaskbarCreated" string and then broadcasts this message to all top-level windows
+/// When the application receives this message, it should assume that any taskbar icons it added have been removed and add them again.
+static S_U_TASKBAR_RESTART: Lazy<u32> =
+    Lazy::new(|| unsafe { RegisterWindowMessageA(s!("TaskbarCreated")) });
+
+struct TrayUserData {
+    internal_id: u32,
+    id: TrayIconId,
+    hwnd: HWND,
+    hpopupmenu: Option<HMENU>,
+    icon: Option<Icon>,
+    tooltip: Option<String>,
+    entered: bool,
+    last_position: Option<PhysicalPosition<f64>>,
+    menu_on_left_click: bool,
+    menu_on_right_click: bool,
+    visible: bool,
+}
+
+impl TrayUserData {
+    fn set_tray_visible(&mut self, visible: bool) {
+        self.visible = visible;
+        let nid = NOTIFYICONDATAW {
+            uFlags: NIF_STATE,
+            hWnd: self.hwnd,
+            uID: self.internal_id,
+            dwState: if visible { 0 } else { NIS_HIDDEN },
+            dwStateMask: NIS_HIDDEN,
+            cbSize: size_of::<NOTIFYICONDATAW>() as u32,
+            ..Default::default()
+        };
+        unsafe { Shell_NotifyIconW(NIM_MODIFY, &nid) };
+    }
+}
+
+pub struct TrayIcon {
+    hwnd: HWND,
+    menu: Option<Box<dyn menu::ContextMenu>>,
+    internal_id: u32,
+}
+
+impl TrayIcon {
+    pub fn new(id: TrayIconId, attrs: TrayIconAttributes) -> crate::Result<Self> {
+        let internal_id = COUNTER.next();
+
+        let class_name = util::encode_wide("tray_icon_app");
+        unsafe {
+            let hinstance = util::get_instance_handle();
+
+            let wnd_class = WNDCLASSW {
+                lpfnWndProc: Some(tray_proc),
+                lpszClassName: class_name.as_ptr(),
+                hInstance: hinstance,
+                ..std::mem::zeroed()
+            };
+
+            RegisterClassW(&wnd_class);
+
+            let traydata = TrayUserData {
+                id,
+                internal_id,
+                hwnd: std::ptr::null_mut(),
+                hpopupmenu: attrs.menu.as_ref().map(|m| m.hpopupmenu() as _),
+                icon: attrs.icon.clone(),
+                tooltip: attrs.tooltip.clone(),
+                entered: false,
+                last_position: None,
+                menu_on_left_click: attrs.menu_on_left_click,
+                menu_on_right_click: attrs.menu_on_right_click,
+                visible: true,
+            };
+
+            let hwnd = CreateWindowExW(
+                WS_EX_NOACTIVATE | WS_EX_TRANSPARENT | WS_EX_LAYERED |
+            // WS_EX_TOOLWINDOW prevents this window from ever showing up in the taskbar, which
+            // we want to avoid. If you remove this style, this window won't show up in the
+            // taskbar *initially*, but it can show up at some later point. This can sometimes
+            // happen on its own after several hours have passed, although this has proven
+            // difficult to reproduce. Alternatively, it can be manually triggered by killing
+            // `explorer.exe` and then starting the process back up.
+            // It is unclear why the bug is triggered by waiting for several hours.
+            WS_EX_TOOLWINDOW,
+                class_name.as_ptr(),
+                ptr::null(),
+                WS_OVERLAPPED,
+                CW_USEDEFAULT,
+                0,
+                CW_USEDEFAULT,
+                0,
+                std::ptr::null_mut(),
+                std::ptr::null_mut(),
+                hinstance,
+                Box::into_raw(Box::new(traydata)) as _,
+            );
+            if hwnd.is_null() {
+                return Err(crate::Error::OsError(std::io::Error::last_os_error()));
+            }
+
+            // Allow "TaskbarCreated" through UIPI so elevated apps can re-register on explorer restart.
+            ChangeWindowMessageFilterEx(hwnd, *S_U_TASKBAR_RESTART, MSGFLT_ALLOW, ptr::null_mut());
+
+            let hicon = attrs.icon.as_ref().map(|i| i.inner.as_raw_handle());
+
+            if !register_tray_icon(hwnd, internal_id, &hicon, &attrs.tooltip, true) {
+                // Explorer/taskbar may not be ready yet (e.g., app starts before explorer.exe).
+                // Keep the window alive and wait for TaskbarCreated to re-register.
+            }
+
+            if let Some(menu) = &attrs.menu {
+                menu.attach_menu_subclass_for_hwnd(hwnd as _);
+            }
+
+            Ok(Self {
+                hwnd,
+                internal_id,
+                menu: attrs.menu,
+            })
+        }
+    }
+
+    pub fn set_icon(&mut self, icon: Option<Icon>) -> crate::Result<()> {
+        unsafe {
+            let mut nid = NOTIFYICONDATAW {
+                uFlags: NIF_ICON,
+                hWnd: self.hwnd,
+                uID: self.internal_id,
+                cbSize: size_of::<NOTIFYICONDATAW>() as u32,
+                ..std::mem::zeroed()
+            };
+
+            if let Some(hicon) = icon.as_ref().map(|i| i.inner.as_raw_handle()) {
+                nid.hIcon = hicon;
+            }
+
+            if Shell_NotifyIconW(NIM_MODIFY, &nid) == 0 {
+                return Err(crate::Error::OsError(std::io::Error::last_os_error()));
+            }
+
+            // send the new icon to the subclass proc to store it in the tray data
+            SendMessageW(
+                self.hwnd,
+                WM_USER_UPDATE_TRAYICON,
+                Box::into_raw(Box::new(icon)) as _,
+                0,
+            );
+        }
+
+        Ok(())
+    }
+
+    pub fn set_menu(&mut self, menu: Option<Box<dyn menu::ContextMenu>>) {
+        // Safety: self.hwnd is valid as long as as the TrayIcon is
+        if let Some(menu) = &self.menu {
+            unsafe { menu.detach_menu_subclass_from_hwnd(self.hwnd as _) };
+        }
+        if let Some(menu) = &menu {
+            unsafe { menu.attach_menu_subclass_for_hwnd(self.hwnd as _) };
+        }
+
+        unsafe {
+            // send the new menu to the subclass proc where we will update there
+            SendMessageW(
+                self.hwnd,
+                WM_USER_UPDATE_TRAYMENU,
+                Box::into_raw(Box::new(menu.as_ref().map(|m| m.hpopupmenu()))) as _,
+                0,
+            );
+        }
+
+        self.menu = menu;
+    }
+
+    pub fn set_tooltip<S: AsRef<str>>(&mut self, tooltip: Option<S>) -> crate::Result<()> {
+        unsafe {
+            let mut nid = NOTIFYICONDATAW {
+                uFlags: NIF_TIP,
+                hWnd: self.hwnd,
+                uID: self.internal_id,
+                cbSize: size_of::<NOTIFYICONDATAW>() as u32,
+                ..std::mem::zeroed()
+            };
+            if let Some(tooltip) = &tooltip {
+                copy_tooltip_to_buffer(tooltip.as_ref(), &mut nid.szTip);
+            }
+
+            if Shell_NotifyIconW(NIM_MODIFY, &nid) == 0 {
+                return Err(crate::Error::OsError(std::io::Error::last_os_error()));
+            }
+
+            // send the new tooltip to the subclass proc to store it in the tray data
+            SendMessageW(
+                self.hwnd,
+                WM_USER_UPDATE_TRAYTOOLTIP,
+                Box::into_raw(Box::new(tooltip.map(|t| t.as_ref().to_string()))) as _,
+                0,
+            );
+        }
+
+        Ok(())
+    }
+
+    pub fn set_show_menu_on_left_click(&mut self, enable: bool) {
+        unsafe {
+            SendMessageW(
+                self.hwnd,
+                WM_USER_SHOW_MENU_ON_LEFT_CLICK,
+                enable as usize,
+                0,
+            );
+        }
+    }
+
+    pub fn set_show_menu_on_right_click(&mut self, enable: bool) {
+        unsafe {
+            SendMessageW(
+                self.hwnd,
+                WM_USER_SHOW_MENU_ON_RIGHT_CLICK,
+                enable as usize,
+                0,
+            );
+        }
+    }
+
+    pub fn show_menu(&self) {
+        if let Some(menu) = &self.menu {
+            unsafe {
+                if let Some(rect) = get_tray_rect(self.internal_id, self.hwnd) {
+                    show_tray_menu(self.hwnd, menu.hpopupmenu() as _, rect.left, rect.top);
+                }
+            }
+        }
+    }
+
+    pub fn set_title<S: AsRef<str>>(&mut self, _title: Option<S>) {}
+
+    pub fn set_visible(&mut self, visible: bool) -> crate::Result<()> {
+        unsafe {
+            SendMessageW(self.hwnd, WM_USER_SHOW_TRAYICON, visible as usize, 0);
+        }
+        Ok(())
+    }
+
+    pub fn rect(&self) -> Option<Rect> {
+        get_tray_rect(self.internal_id, self.hwnd).map(Into::into)
+    }
+
+    pub fn hwnd(&self) -> HWND {
+        self.hwnd
+    }
+}
+
+impl Drop for TrayIcon {
+    fn drop(&mut self) {
+        unsafe {
+            remove_tray_icon(self.hwnd, self.internal_id);
+
+            if let Some(menu) = &self.menu {
+                menu.detach_menu_subclass_from_hwnd(self.hwnd as _);
+            }
+
+            // destroy the hidden window used by the tray
+            DestroyWindow(self.hwnd);
+        }
+    }
+}
+
+unsafe extern "system" fn tray_proc(
+    hwnd: HWND,
+    msg: u32,
+    wparam: WPARAM,
+    lparam: LPARAM,
+) -> LRESULT {
+    let userdata_ptr = unsafe { util::get_window_long(hwnd, GWL_USERDATA) };
+    let userdata_ptr = match (userdata_ptr, msg) {
+        (0, WM_NCCREATE) => {
+            let createstruct = unsafe { &mut *(lparam as *mut CREATESTRUCTW) };
+            let userdata = unsafe { &mut *(createstruct.lpCreateParams as *mut TrayUserData) };
+            userdata.hwnd = hwnd;
+            util::set_window_long(hwnd, GWL_USERDATA, createstruct.lpCreateParams as _);
+            return DefWindowProcW(hwnd, msg, wparam, lparam);
+        }
+        // Getting here should quite frankly be impossible,
+        // but we'll make window creation fail here just in case.
+        (0, WM_CREATE) => return -1,
+        (_, WM_CREATE) => return DefWindowProcW(hwnd, msg, wparam, lparam),
+        (0, _) => return DefWindowProcW(hwnd, msg, wparam, lparam),
+        _ => userdata_ptr as *mut TrayUserData,
+    };
+
+    let userdata = &mut *(userdata_ptr);
+
+    match msg {
+        WM_DESTROY => {
+            drop(Box::from_raw(userdata_ptr));
+            return 0;
+        }
+        WM_USER_UPDATE_TRAYMENU => {
+            let hpopupmenu = Box::from_raw(wparam as *mut Option<isize>);
+            userdata.hpopupmenu = (*hpopupmenu).map(|h| h as *mut _);
+        }
+        WM_USER_UPDATE_TRAYICON => {
+            let icon = Box::from_raw(wparam as *mut Option<Icon>);
+            userdata.icon = *icon;
+        }
+        WM_USER_SHOW_TRAYICON => userdata.set_tray_visible(wparam as i32 == TRUE),
+        WM_USER_UPDATE_TRAYTOOLTIP => {
+            let tooltip = Box::from_raw(wparam as *mut Option<String>);
+            userdata.tooltip = *tooltip;
+        }
+        _ if msg == *S_U_TASKBAR_RESTART => {
+            remove_tray_icon(userdata.hwnd, userdata.internal_id);
+            register_tray_icon(
+                userdata.hwnd,
+                userdata.internal_id,
+                &userdata.icon.as_ref().map(|i| i.inner.as_raw_handle()),
+                &userdata.tooltip,
+                userdata.visible,
+            );
+        }
+        WM_USER_SHOW_MENU_ON_LEFT_CLICK => {
+            userdata.menu_on_left_click = wparam != 0;
+        }
+        WM_USER_SHOW_MENU_ON_RIGHT_CLICK => {
+            userdata.menu_on_right_click = wparam != 0;
+        }
+
+        WM_USER_TRAYICON
+            if matches!(
+                lparam as u32,
+                WM_LBUTTONDOWN
+                    | WM_RBUTTONDOWN
+                    | WM_MBUTTONDOWN
+                    | WM_LBUTTONUP
+                    | WM_RBUTTONUP
+                    | WM_MBUTTONUP
+                    | WM_LBUTTONDBLCLK
+                    | WM_RBUTTONDBLCLK
+                    | WM_MBUTTONDBLCLK
+                    | WM_MOUSEMOVE
+            ) =>
+        {
+            let mut cursor = POINT { x: 0, y: 0 };
+            if GetCursorPos(&mut cursor as _) == 0 {
+                return 0;
+            }
+
+            let id = userdata.id.clone();
+            let position = PhysicalPosition::new(cursor.x as f64, cursor.y as f64);
+
+            let rect = match get_tray_rect(userdata.internal_id, hwnd) {
+                Some(rect) => Rect::from(rect),
+                None => return 0,
+            };
+
+            let event = match lparam as u32 {
+                WM_LBUTTONDOWN => TrayIconEvent::Click {
+                    id,
+                    rect,
+                    position,
+                    button: MouseButton::Left,
+                    button_state: MouseButtonState::Down,
+                },
+                WM_RBUTTONDOWN => TrayIconEvent::Click {
+                    id,
+                    rect,
+                    position,
+                    button: MouseButton::Right,
+                    button_state: MouseButtonState::Down,
+                },
+                WM_MBUTTONDOWN => TrayIconEvent::Click {
+                    id,
+                    rect,
+                    position,
+                    button: MouseButton::Middle,
+                    button_state: MouseButtonState::Down,
+                },
+                WM_LBUTTONUP => TrayIconEvent::Click {
+                    id,
+                    rect,
+                    position,
+                    button: MouseButton::Left,
+                    button_state: MouseButtonState::Up,
+                },
+                WM_RBUTTONUP => TrayIconEvent::Click {
+                    id,
+                    rect,
+                    position,
+                    button: MouseButton::Right,
+                    button_state: MouseButtonState::Up,
+                },
+                WM_MBUTTONUP => TrayIconEvent::Click {
+                    id,
+                    rect,
+                    position,
+                    button: MouseButton::Middle,
+                    button_state: MouseButtonState::Up,
+                },
+                WM_LBUTTONDBLCLK => TrayIconEvent::DoubleClick {
+                    id,
+                    rect,
+                    position,
+                    button: MouseButton::Left,
+                },
+                WM_RBUTTONDBLCLK => TrayIconEvent::DoubleClick {
+                    id,
+                    rect,
+                    position,
+                    button: MouseButton::Right,
+                },
+                WM_MBUTTONDBLCLK => TrayIconEvent::DoubleClick {
+                    id,
+                    rect,
+                    position,
+                    button: MouseButton::Middle,
+                },
+                WM_MOUSEMOVE if !userdata.entered => {
+                    userdata.entered = true;
+                    TrayIconEvent::Enter { id, rect, position }
+                }
+                WM_MOUSEMOVE if userdata.entered => {
+                    // handle extra WM_MOUSEMOVE events, ignore if position hasn't changed
+                    let cursor_moved = userdata.last_position != Some(position);
+                    userdata.last_position = Some(position);
+                    if cursor_moved {
+                        // Set or update existing timer, where we check if cursor left
+                        SetTimer(hwnd, WM_USER_LEAVE_TIMER_ID as _, 15, Some(tray_timer_proc));
+
+                        TrayIconEvent::Move { id, rect, position }
+                    } else {
+                        return 0;
+                    }
+                }
+
+                _ => unreachable!(),
+            };
+
+            TrayIconEvent::send(event);
+
+            if (userdata.menu_on_right_click && lparam as u32 == WM_RBUTTONUP)
+                || (userdata.menu_on_left_click && lparam as u32 == WM_LBUTTONUP)
+            {
+                if let Some(menu) = userdata.hpopupmenu {
+                    show_tray_menu(hwnd, menu, cursor.x, cursor.y);
+                }
+            }
+        }
+
+        WM_TIMER if wparam as u32 == WM_USER_LEAVE_TIMER_ID => {
+            if let Some(position) = userdata.last_position.take() {
+                let mut cursor = POINT { x: 0, y: 0 };
+                if GetCursorPos(&mut cursor as _) == 0 {
+                    return 0;
+                }
+
+                let rect = match get_tray_rect(userdata.internal_id, hwnd) {
+                    Some(r) => r,
+                    None => return 0,
+                };
+
+                let in_x = (rect.left..rect.right).contains(&cursor.x);
+                let in_y = (rect.top..rect.bottom).contains(&cursor.y);
+
+                if !in_x || !in_y {
+                    KillTimer(hwnd, WM_USER_LEAVE_TIMER_ID as _);
+                    userdata.entered = false;
+
+                    TrayIconEvent::send(TrayIconEvent::Leave {
+                        id: userdata.id.clone(),
+                        rect: rect.into(),
+                        position,
+                    });
+                }
+            }
+
+            return 0;
+        }
+
+        _ => {}
+    }
+
+    DefWindowProcW(hwnd, msg, wparam, lparam)
+}
+
+unsafe extern "system" fn tray_timer_proc(hwnd: HWND, msg: u32, wparam: WPARAM, lparam: u32) {
+    tray_proc(hwnd, msg, wparam, lparam as _);
+}
+
+#[inline]
+unsafe fn show_tray_menu(hwnd: HWND, menu: HMENU, x: i32, y: i32) {
+    // bring the hidden window to the foreground so the pop up menu
+    // would automatically hide on click outside
+    SetForegroundWindow(hwnd);
+    TrackPopupMenu(
+        menu,
+        // align bottom / right, maybe we could expose this later..
+        TPM_BOTTOMALIGN | TPM_LEFTALIGN,
+        x,
+        y,
+        0,
+        hwnd,
+        std::ptr::null_mut(),
+    );
+    // The shell docs recommend posting a benign message after TrackPopupMenu
+    // for notification area menus so the task switch is finalized correctly.
+    PostMessageW(hwnd, WM_NULL, 0, 0);
+}
+
+#[inline]
+unsafe fn register_tray_icon(
+    hwnd: HWND,
+    tray_id: u32,
+    hicon: &Option<HICON>,
+    tooltip: &Option<String>,
+    visible: bool,
+) -> bool {
+    let mut h_icon = std::ptr::null_mut();
+    let mut flags = NIF_MESSAGE;
+    let mut sz_tip: [u16; 128] = [0; 128];
+
+    if let Some(hicon) = hicon {
+        flags |= NIF_ICON;
+        h_icon = *hicon;
+    }
+
+    if let Some(tooltip) = tooltip {
+        flags |= NIF_TIP;
+        copy_tooltip_to_buffer(tooltip, &mut sz_tip);
+    }
+
+    #[allow(non_snake_case)]
+    let dwState = if !visible {
+        flags |= NIF_STATE;
+        NIS_HIDDEN
+    } else {
+        0
+    };
+
+    let mut nid = NOTIFYICONDATAW {
+        uFlags: flags,
+        hWnd: hwnd,
+        uID: tray_id,
+        uCallbackMessage: WM_USER_TRAYICON,
+        hIcon: h_icon,
+        szTip: sz_tip,
+        dwState,
+        dwStateMask: dwState,
+        cbSize: size_of::<NOTIFYICONDATAW>() as u32,
+        ..std::mem::zeroed()
+    };
+
+    Shell_NotifyIconW(NIM_ADD, &mut nid as _) == TRUE
+}
+
+fn copy_tooltip_to_buffer(tooltip: &str, buffer: &mut [u16; 128]) {
+    let tip = util::encode_wide(tooltip);
+    let len = tip.len().min(buffer.len() - 1);
+    buffer[..len].copy_from_slice(&tip[..len]);
+    buffer[len] = 0;
+}
+
+#[cfg(test)]
+mod tests {
+    use super::copy_tooltip_to_buffer;
+
+    #[test]
+    fn tooltip_buffer_is_always_null_terminated() {
+        let mut buffer = [1; 128];
+        copy_tooltip_to_buffer(&"a".repeat(128), &mut buffer);
+
+        assert_eq!(buffer[127], 0);
+    }
+}
+
+#[inline]
+unsafe fn remove_tray_icon(hwnd: HWND, id: u32) {
+    let nid = NOTIFYICONDATAW {
+        uFlags: NIF_ICON,
+        hWnd: hwnd,
+        uID: id,
+        cbSize: size_of::<NOTIFYICONDATAW>() as u32,
+        ..std::mem::zeroed()
+    };
+
+    if Shell_NotifyIconW(NIM_DELETE, &nid) == FALSE {
+        eprintln!("Error removing system tray icon");
+    }
+}
+
+#[inline]
+fn get_tray_rect(id: u32, hwnd: HWND) -> Option<RECT> {
+    let nid = NOTIFYICONIDENTIFIER {
+        hWnd: hwnd,
+        cbSize: size_of::<NOTIFYICONIDENTIFIER>() as _,
+        uID: id,
+        ..unsafe { std::mem::zeroed() }
+    };
+
+    let mut rect = RECT {
+        left: 0,
+        bottom: 0,
+        right: 0,
+        top: 0,
+    };
+    if unsafe { Shell_NotifyIconGetRect(&nid, &mut rect) } == S_OK {
+        Some(rect)
+    } else {
+        None
+    }
+}
+
+impl From<RECT> for Rect {
+    fn from(rect: RECT) -> Self {
+        Self {
+            position: crate::dpi::PhysicalPosition::new(rect.left.into(), rect.top.into()),
+            size: crate::dpi::PhysicalSize::new(
+                rect.right.saturating_sub(rect.left) as u32,
+                rect.bottom.saturating_sub(rect.top) as u32,
+            ),
+        }
+    }
+}
diff --git a/ports/tray-icon/src/platform_impl/windows/util.rs b/ports/tray-icon/src/platform_impl/windows/util.rs
new file mode 100644
index 000000000000..cdeed1ba23c6
--- /dev/null
+++ b/ports/tray-icon/src/platform_impl/windows/util.rs
@@ -0,0 +1,59 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+// Copyright 2022-2022 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use windows_sys::Win32::{Foundation::HWND, UI::WindowsAndMessaging::WINDOW_LONG_PTR_INDEX};
+
+pub fn encode_wide<S: AsRef<std::ffi::OsStr>>(string: S) -> Vec<u16> {
+    std::os::windows::prelude::OsStrExt::encode_wide(string.as_ref())
+        .chain(std::iter::once(0))
+        .collect()
+}
+
+// taken from winit's code base
+// https://github.com/rust-windowing/winit/blob/ee88e38f13fbc86a7aafae1d17ad3cd4a1e761df/src/platform_impl/windows/util.rs#L138
+pub fn get_instance_handle() -> windows_sys::Win32::Foundation::HMODULE {
+    // Gets the instance handle by taking the address of the
+    // pseudo-variable created by the microsoft linker:
+    // https://devblogs.microsoft.com/oldnewthing/20041025-00/?p=37483
+
+    // This is preferred over GetModuleHandle(NULL) because it also works in DLLs:
+    // https://stackoverflow.com/questions/21718027/getmodulehandlenull-vs-hinstance
+
+    extern "C" {
+        static __ImageBase: windows_sys::Win32::System::SystemServices::IMAGE_DOS_HEADER;
+    }
+
+    unsafe { &__ImageBase as *const _ as _ }
+}
+
+#[inline(always)]
+pub unsafe fn get_window_long(hwnd: HWND, nindex: WINDOW_LONG_PTR_INDEX) -> isize {
+    #[cfg(target_pointer_width = "64")]
+    return unsafe { windows_sys::Win32::UI::WindowsAndMessaging::GetWindowLongPtrW(hwnd, nindex) };
+    #[cfg(target_pointer_width = "32")]
+    return unsafe {
+        windows_sys::Win32::UI::WindowsAndMessaging::GetWindowLongW(hwnd, nindex) as isize
+    };
+}
+
+#[inline(always)]
+pub unsafe fn set_window_long(
+    hwnd: HWND,
+    nindex: WINDOW_LONG_PTR_INDEX,
+    dwnewlong: isize,
+) -> isize {
+    #[cfg(target_pointer_width = "64")]
+    return unsafe {
+        windows_sys::Win32::UI::WindowsAndMessaging::SetWindowLongPtrW(hwnd, nindex, dwnewlong)
+    };
+    #[cfg(target_pointer_width = "32")]
+    return unsafe {
+        windows_sys::Win32::UI::WindowsAndMessaging::SetWindowLongW(hwnd, nindex, dwnewlong as i32)
+            as isize
+    };
+}
diff --git a/ports/tray-icon/src/tray_icon_id.rs b/ports/tray-icon/src/tray_icon_id.rs
new file mode 100644
index 000000000000..0d70d6c14eed
--- /dev/null
+++ b/ports/tray-icon/src/tray_icon_id.rs
@@ -0,0 +1,96 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::{convert::Infallible, str::FromStr};
+
+use crate::COUNTER;
+
+/// An unique id that is associated with a tray icon.
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct TrayIconId(pub String);
+
+impl TrayIconId {
+    /// Create a new tray icon id.
+    pub fn new<S: AsRef<str>>(id: S) -> Self {
+        Self(id.as_ref().to_string())
+    }
+
+    /// Generate id based on process id for internal use
+    pub(crate) fn new_unique() -> Self {
+        Self(format!("{}-{}", std::process::id(), COUNTER.next()))
+    }
+}
+
+impl AsRef<str> for TrayIconId {
+    fn as_ref(&self) -> &str {
+        self.0.as_ref()
+    }
+}
+
+impl<T: ToString> From<T> for TrayIconId {
+    fn from(value: T) -> Self {
+        Self::new(value.to_string())
+    }
+}
+
+impl FromStr for TrayIconId {
+    type Err = Infallible;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        Ok(Self::new(s))
+    }
+}
+
+impl PartialEq<&str> for TrayIconId {
+    fn eq(&self, other: &&str) -> bool {
+        self.0 == *other
+    }
+}
+
+impl PartialEq<&str> for &TrayIconId {
+    fn eq(&self, other: &&str) -> bool {
+        self.0 == *other
+    }
+}
+
+impl PartialEq<String> for TrayIconId {
+    fn eq(&self, other: &String) -> bool {
+        self.0 == *other
+    }
+}
+
+impl PartialEq<String> for &TrayIconId {
+    fn eq(&self, other: &String) -> bool {
+        self.0 == *other
+    }
+}
+
+impl PartialEq<&String> for TrayIconId {
+    fn eq(&self, other: &&String) -> bool {
+        self.0 == **other
+    }
+}
+
+impl PartialEq<&TrayIconId> for TrayIconId {
+    fn eq(&self, other: &&TrayIconId) -> bool {
+        other.0 == self.0
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::TrayIconId;
+
+    #[test]
+    fn is_eq() {
+        assert_eq!(TrayIconId::new("t"), "t",);
+        assert_eq!(TrayIconId::new("t"), String::from("t"));
+        assert_eq!(TrayIconId::new("t"), &String::from("t"));
+        assert_eq!(TrayIconId::new("t"), TrayIconId::new("t"));
+        assert_eq!(TrayIconId::new("t"), &TrayIconId::new("t"));
+        assert_eq!(&TrayIconId::new("t"), &TrayIconId::new("t"));
+        assert_eq!(TrayIconId::new("t").as_ref(), "t");
+    }
+}
diff --git a/ports/wry/.cargo/audit.toml b/ports/wry/.cargo/audit.toml
new file mode 100644
index 000000000000..a409af97cb14
--- /dev/null
+++ b/ports/wry/.cargo/audit.toml
@@ -0,0 +1,2 @@
+[advisories]
+ignore = []
diff --git a/ports/wry/.github/workflows/audit.yml b/ports/wry/.github/workflows/audit.yml
index 564f6924847d..bd800ebb4770 100644
--- a/ports/wry/.github/workflows/audit.yml
+++ b/ports/wry/.github/workflows/audit.yml
@@ -31,7 +31,7 @@ jobs:
   audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: rustsec/audit-check@v1
+      - uses: actions/checkout@v7
+      - uses: rustsec/audit-check@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/ports/wry/Cargo.lock b/ports/wry/Cargo.lock
index b212e92ab8d5..fea8a67c43d2 100644
--- a/ports/wry/Cargo.lock
+++ b/ports/wry/Cargo.lock
@@ -537,7 +537,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -674,7 +674,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1020,7 +1020,7 @@ dependencies = [
  "gobject-sys",
  "libc",
  "system-deps",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2420,9 +2420,9 @@ dependencies = [
 
 [[package]]
 name = "pollster"
-version = "0.4.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
+checksum = "bc6355899e1c9462875b6757c79f3caa011a1fdae12bbb1a2e72dd1f234f8336"
 
 [[package]]
 name = "potential_utf"
@@ -2477,9 +2477,9 @@ checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"
 
 [[package]]
 name = "quick-xml"
-version = "0.39.4"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e"
+checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
 dependencies = [
  "memchr",
 ]
@@ -2605,7 +2605,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3432,8 +3432,6 @@ dependencies = [
 [[package]]
 name = "wayland-scanner"
 version = "0.31.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a"
 dependencies = [
  "proc-macro2",
  "quick-xml",
@@ -3681,7 +3679,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.59.0",
 ]
 
 [[package]]
@@ -4155,6 +4153,7 @@ dependencies = [
  "windows-core 0.61.2",
  "windows-version",
  "winit",
+ "x11-dl",
 ]
 
 [[package]]
diff --git a/ports/wry/Cargo.toml b/ports/wry/Cargo.toml
index c9f6235b5d25..49f7fb288208 100644
--- a/ports/wry/Cargo.toml
+++ b/ports/wry/Cargo.toml
@@ -56,6 +56,9 @@ soup3 = { version = "0.9", optional = true }
 percent-encoding = "2.3"
 dirs = "6"
 
+[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dev-dependencies]
+x11-dl = "2.21"
+
 [target."cfg(target_os = \"windows\")".dependencies]
 webview2-com = "0.38"
 windows-version = "0.1"
@@ -189,11 +192,12 @@ base64 = "0.22"
 jni = "0.21"
 ndk = "0.9"
 tao-macros = "0.1"
+tao = { path = "../tao" }
 libc = "0.2"
 dom_query = { version = "0.28.0", default-features = false }
 
 [dev-dependencies]
-pollster = "0.4.0"
+pollster = "1.0.0"
 tao = { path = "../tao" }
 wgpu = "23"
 winit = "0.30"
@@ -210,3 +214,6 @@ dom_query = { version = "0.28.0", default-features = false }
 [lints.rust.unexpected_cfgs]
 level = "warn"
 check-cfg = ["cfg(linux)", "cfg(gtk)"]
+
+[patch.crates-io]
+wayland-scanner = { path = "../../vendor/wayland-scanner" }
diff --git a/ports/wry/src/android/main_pipe.rs b/ports/wry/src/android/main_pipe.rs
index 72241d2c7457..8f83ecc9ce67 100644
--- a/ports/wry/src/android/main_pipe.rs
+++ b/ports/wry/src/android/main_pipe.rs
@@ -90,26 +90,6 @@ pub fn register_activity_proxy(
   }
 }
 
-pub fn activity_id_for_window_manager(window_manager: JObject) -> Option<ActivityId> {
-  for (activity_id, proxy) in ACTIVITY_PROXY.lock().unwrap().iter() {
-    let vm = unsafe { JavaVM::from_raw(proxy.java_vm.cast()) }.unwrap();
-    let mut env = vm.attach_current_thread_as_daemon().unwrap();
-    let equals = env
-      .call_method(
-        proxy.window_manager.as_obj(),
-        "equals",
-        "(Ljava/lang/Object;)Z",
-        &[(&window_manager).into()],
-      )
-      .and_then(|v| v.z())
-      .unwrap_or_default();
-    if equals {
-      return Some(*activity_id);
-    }
-  }
-  None
-}
-
 pub fn first_activity_id() -> Option<ActivityId> {
   ACTIVITY_PROXY.lock().unwrap().keys().next().cloned()
 }
diff --git a/ports/wry/src/android/mod.rs b/ports/wry/src/android/mod.rs
index 5a1e97a38df3..bd539df0db5e 100644
--- a/ports/wry/src/android/mod.rs
+++ b/ports/wry/src/android/mod.rs
@@ -8,7 +8,7 @@
 
 use super::{PageLoadEvent, WebViewAttributes, RGBA};
 use crate::{
-  custom_protocol_workaround, inject_initialization_scripts::inject_scripts_into_html, Error,
+  custom_protocol_workaround, inject_initialization_scripts::inject_scripts_into_html,
   PermissionKind, PermissionResponse, RequestAsyncResponder, Result,
 };
 use crossbeam_channel::*;
@@ -28,12 +28,13 @@ use std::{
   sync::{mpsc::channel, Arc, Mutex},
   time::Duration,
 };
+use tao::platform::android::WindowExtAndroid;
 
 pub(crate) mod binding;
 mod main_pipe;
 use main_pipe::{
-  activity_id_for_window_manager, first_activity_id, register_activity_proxy, ActivityId,
-  CreateWebViewAttributes, MainPipe, WebViewMessage,
+  first_activity_id, register_activity_proxy, ActivityId, CreateWebViewAttributes, MainPipe,
+  WebViewMessage,
 };
 
 use crate::util::Counter;
@@ -153,7 +154,7 @@ pub(crate) struct InnerWebView {
 
 impl InnerWebView {
   pub fn new_as_child(
-    window: &impl HasWindowHandle,
+    window: &(impl HasWindowHandle + WindowExtAndroid),
     attributes: WebViewAttributes,
     pl_attrs: super::PlatformSpecificWebViewAttributes,
   ) -> Result<Self> {
@@ -161,19 +162,11 @@ impl InnerWebView {
   }
 
   pub fn new(
-    window: &impl HasWindowHandle,
+    window: &(impl HasWindowHandle + WindowExtAndroid),
     attributes: WebViewAttributes,
     pl_attrs: super::PlatformSpecificWebViewAttributes,
   ) -> Result<Self> {
-    let window_manager = match window.window_handle()?.as_raw() {
-      raw_window_handle::RawWindowHandle::AndroidNdk(window_manager) => {
-        window_manager.a_native_window
-      }
-      _ => return Err(Error::UnsupportedWindowHandle),
-    };
-    let window_manager = unsafe { JObject::from_raw(window_manager.as_ptr().cast()) };
-    let activity_id =
-      activity_id_for_window_manager(window_manager).expect("no available activity");
+    let activity_id = window.activity_id();
     let WebViewAttributes {
       url,
       html,
diff --git a/ports/wry/src/lib.rs b/ports/wry/src/lib.rs
index 0ef22f1d22b7..b0ac97c2c31c 100644
--- a/ports/wry/src/lib.rs
+++ b/ports/wry/src/lib.rs
@@ -304,8 +304,6 @@
 //!   for the crate to work. This feature was added in preparation of other ports like cef and servo.
 //! - `protocol` (default): Enables [`WebViewBuilder::with_custom_protocol`] to define custom URL scheme for handling tasks like
 //!   loading assets.
-//! - `drag-drop` (default): Enables [`WebViewBuilder::with_drag_drop_handler`] to control the behavior when there are files
-//!   interacting with the window.
 //! - `devtools`: Enables devtools on release builds. Devtools are always enabled in debug builds.
 //!   On **macOS**, enabling devtools, requires calling private APIs so you should not enable this flag in release
 //!   build if your app needs to publish to App Store.
@@ -657,11 +655,19 @@ struct WebViewAttributes<'a> {
 
   /// A handler closure to process incoming [`DragDropEvent`] of the webview.
   ///
-  /// # Blocking OS Default Behavior
+  /// ## Blocking OS Default Behavior
+  ///
   /// Return `true` in the callback to block the OS' default behavior.
   ///
   /// Note, that if you do block this behavior, it won't be possible to drop files on `<input type="file">` forms.
   /// Also note, that it's not possible to manually set the value of a `<input type="file">` via JavaScript for security reasons.
+  ///
+  /// ## Platform-specific:
+  ///
+  /// - **Windows:** This will disable the HTML Drag and Drop APIs like `draggable="true"`,
+  ///   since we replace the drag drop handler of WebView 2 on Windows.
+  ///   `handler`'s return value is ignored on Windows.
+  /// - **Android / iOS:** Unsupported.
   pub drag_drop_handler: Option<Box<dyn Fn(DragDropEvent) -> bool>>,
 
   /// A navigation handler to decide if incoming url is allowed to navigate.
@@ -1182,13 +1188,21 @@ impl<'a> WebViewBuilder<'a> {
     self
   }
 
-  /// Set a handler closure to process incoming [`DragDropEvent`] of the webview.
+  /// A handler closure to process incoming [`DragDropEvent`] of the webview.
+  ///
+  /// ## Blocking OS Default Behavior
   ///
-  /// # Blocking OS Default Behavior
   /// Return `true` in the callback to block the OS' default behavior.
   ///
   /// Note, that if you do block this behavior, it won't be possible to drop files on `<input type="file">` forms.
   /// Also note, that it's not possible to manually set the value of a `<input type="file">` via JavaScript for security reasons.
+  ///
+  /// ## Platform-specific:
+  ///
+  /// - **Windows:** This will disable the HTML Drag and Drop APIs like `draggable="true"`,
+  ///   since we replace the drag drop handler of WebView 2 on Windows.
+  ///   `handler`'s return value is ignored on Windows.
+  /// - **Android / iOS:** Unsupported.
   pub fn with_drag_drop_handler<F>(mut self, handler: F) -> Self
   where
     F: Fn(DragDropEvent) -> bool + 'static,
@@ -1537,12 +1551,23 @@ impl<'a> WebViewBuilder<'a> {
   ///
   /// - Panics if the provided handle was not supported or invalid.
   /// - Panics on Linux, if [`gtk::init`] was not called in this thread.
+  #[cfg(not(target_os = "android"))]
   pub fn build<W: HasWindowHandle>(self, window: &'a W) -> Result<WebView> {
     self.error?;
 
     InnerWebView::new(window, self.attrs, self.platform_specific).map(|webview| WebView { webview })
   }
 
+  #[cfg(target_os = "android")]
+  pub fn build<W>(self, window: &'a W) -> Result<WebView>
+  where
+    W: HasWindowHandle + tao::platform::android::WindowExtAndroid,
+  {
+    self.error?;
+
+    InnerWebView::new(window, self.attrs, self.platform_specific).map(|webview| WebView { webview })
+  }
+
   /// Consume the builder and create the [`WebView`] as a child window inside the provided [`HasWindowHandle`].
   ///
   /// ## Platform-specific
@@ -1565,12 +1590,24 @@ impl<'a> WebViewBuilder<'a> {
   ///
   /// - Panics if the provided handle was not support or invalid.
   /// - Panics on Linux, if [`gtk::init`] was not called in this thread.
+  #[cfg(not(target_os = "android"))]
   pub fn build_as_child<W: HasWindowHandle>(self, window: &'a W) -> Result<WebView> {
     self.error?;
 
     InnerWebView::new_as_child(window, self.attrs, self.platform_specific)
       .map(|webview| WebView { webview })
   }
+
+  #[cfg(target_os = "android")]
+  pub fn build_as_child<W>(self, window: &'a W) -> Result<WebView>
+  where
+    W: HasWindowHandle + tao::platform::android::WindowExtAndroid,
+  {
+    self.error?;
+
+    InnerWebView::new_as_child(window, self.attrs, self.platform_specific)
+      .map(|webview| WebView { webview })
+  }
 }
 
 #[cfg(any(target_os = "macos", target_os = "ios"))]
diff --git a/ports/wry/src/wkwebview/class/wry_navigation_delegate.rs b/ports/wry/src/wkwebview/class/wry_navigation_delegate.rs
index 325a40a61735..ea7664b1a087 100644
--- a/ports/wry/src/wkwebview/class/wry_navigation_delegate.rs
+++ b/ports/wry/src/wkwebview/class/wry_navigation_delegate.rs
@@ -115,9 +115,9 @@ impl WryNavigationDelegate {
     webview: Retained<WryWebView>,
     pending_scripts: Arc<Mutex<Option<Vec<String>>>>,
     has_download_handler: bool,
-    navigation_handler: Option<Box<dyn Fn(String) -> bool>>,
+    navigation_handler: Option<Box<dyn Fn(String) -> bool + Send + Sync>>,
     download_delegate: Option<Retained<WryDownloadDelegate>>,
-    on_page_load_handler: Option<Box<dyn Fn(PageLoadEvent, String)>>,
+    on_page_load_handler: Option<Box<dyn Fn(PageLoadEvent, String) + Send + Sync>>,
     on_web_content_process_terminate_handler: Option<Box<dyn Fn()>>,
     mtm: MainThreadMarker,
   ) -> Retained<Self> {
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
index ef23ca62e600..b3617d1a853f 100644
--- a/supply-chain/config.toml
+++ b/supply-chain/config.toml
@@ -28,12 +28,24 @@ audit-as-crates-io = true
 [policy.tauri-build]
 audit-as-crates-io = true
 
+[policy.tauri-bundler]
+audit-as-crates-io = true
+
 [policy.tauri-codegen]
 audit-as-crates-io = true
 
+[policy.tauri-cli]
+audit-as-crates-io = true
+
+[policy.tauri-driver]
+audit-as-crates-io = true
+
 [policy.tauri-macros]
 audit-as-crates-io = true
 
+[policy.tauri-macos-sign]
+audit-as-crates-io = true
+
 [policy.tauri-plugin]
 audit-as-crates-io = true
 
@@ -46,6 +58,21 @@ audit-as-crates-io = true
 [policy.tauri-utils]
 audit-as-crates-io = true
 
+[policy.muda]
+audit-as-crates-io = true
+
+[policy.tao]
+audit-as-crates-io = true
+
+[policy.tao-macros]
+audit-as-crates-io = true
+
+[policy.tray-icon]
+audit-as-crates-io = true
+
+[policy.wry]
+audit-as-crates-io = true
+
 [[exemptions.addr2line]]
 version = "0.21.0"
 criteria = "safe-to-deploy"
diff --git a/vendor/wayland-scanner/Cargo.toml b/vendor/wayland-scanner/Cargo.toml
new file mode 100644
index 000000000000..aa5f02370645
--- /dev/null
+++ b/vendor/wayland-scanner/Cargo.toml
@@ -0,0 +1,33 @@
+# Vendored from crates.io wayland-scanner 0.31.10.
+# Security delta: Smithay's parser adapter and quick-xml 0.41 security bump
+# from commits ec2d9328 and d07c4f91.
+[package]
+name = "wayland-scanner"
+version = "0.31.10"
+authors = ["Elinor Berger <elinor@safaradeg.net>"]
+repository = "https://github.com/smithay/wayland-rs"
+documentation = "https://docs.rs/wayland-scanner/"
+description = "Wayland Scanner for generating rust APIs from XML wayland protocol files."
+license = "MIT"
+categories = ["gui", "api-bindings"]
+keywords = ["wayland", "codegen"]
+edition = "2021"
+rust-version = "1.71"
+readme = "README.md"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro2 = "1.0.11"
+quote = "1.0"
+quick-xml = "0.41"
+
+[dev-dependencies]
+similar = "2"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[workspace]
diff --git a/vendor/wayland-scanner/LICENSE.txt b/vendor/wayland-scanner/LICENSE.txt
new file mode 100644
index 000000000000..e70016715044
--- /dev/null
+++ b/vendor/wayland-scanner/LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2015 Elinor Berger
+
+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/vendor/wayland-scanner/README.md b/vendor/wayland-scanner/README.md
new file mode 100644
index 000000000000..7b11a5444380
--- /dev/null
+++ b/vendor/wayland-scanner/README.md
@@ -0,0 +1,14 @@
+[![crates.io](https://img.shields.io/crates/v/wayland-scanner.svg)](https://crates.io/crates/wayland-scanner)
+[![docs.rs](https://docs.rs/wayland-scanner/badge.svg)](https://docs.rs/wayland-scanner)
+[![Continuous Integration](https://github.com/Smithay/wayland-rs/workflows/Continuous%20Integration/badge.svg)](https://github.com/Smithay/wayland-rs/actions?query=workflow%3A%22Continuous+Integration%22)
+[![codecov](https://codecov.io/gh/Smithay/wayland-rs/branch/master/graph/badge.svg)](https://codecov.io/gh/Smithay/wayland-rs)
+
+# wayland-scanner
+
+This crate provides procedural macros for generating the rust code associated with a
+Wayland XML protocol specification, for use with the `wayland-client`, `wayland-server`
+and `wayland-backend` crates.
+
+Before trying to use this crate, you may check if the protocol extension you want to use
+is not already exposed in the `wayland-protocols` crate.
+
diff --git a/vendor/wayland-scanner/src/c_interfaces.rs b/vendor/wayland-scanner/src/c_interfaces.rs
new file mode 100644
index 000000000000..d714a741ad57
--- /dev/null
+++ b/vendor/wayland-scanner/src/c_interfaces.rs
@@ -0,0 +1,173 @@
+use std::cmp;
+
+use proc_macro2::{Literal, TokenStream};
+use quote::{format_ident, quote};
+
+use crate::protocol::{Interface, Message, Protocol, Type};
+
+pub(crate) fn generate_interfaces_prefix(protocol: &Protocol) -> TokenStream {
+    let longest_nulls = protocol.interfaces.iter().fold(0, |max, interface| {
+        let request_longest_null = interface.requests.iter().fold(0, |max, request| {
+            if request.all_null() {
+                cmp::max(request.args.len(), max)
+            } else {
+                max
+            }
+        });
+        let events_longest_null = interface.events.iter().fold(0, |max, event| {
+            if event.all_null() {
+                cmp::max(event.args.len(), max)
+            } else {
+                max
+            }
+        });
+        cmp::max(max, cmp::max(request_longest_null, events_longest_null))
+    });
+
+    let types_null_len = Literal::usize_unsuffixed(longest_nulls);
+
+    quote! {
+        use std::ptr::null;
+        struct SyncWrapper<T>(T);
+        unsafe impl<T> Sync for SyncWrapper<T> {}
+        static types_null: SyncWrapper<[*const wayland_backend::protocol::wl_interface; #types_null_len]> = SyncWrapper([
+            null::<wayland_backend::protocol::wl_interface>(); #types_null_len
+        ]);
+    }
+}
+
+pub(crate) fn generate_interface(interface: &Interface) -> TokenStream {
+    let requests = gen_messages(interface, &interface.requests, "requests");
+    let events = gen_messages(interface, &interface.events, "events");
+
+    let interface_ident = format_ident!("{}_interface", interface.name);
+    let name_value = null_terminated_byte_string_literal(&interface.name);
+    let version_value = Literal::i32_unsuffixed(interface.version as i32);
+    let request_count_value = Literal::i32_unsuffixed(interface.requests.len() as i32);
+    let requests_value = if interface.requests.is_empty() {
+        quote! { null::<wayland_backend::protocol::wl_message>() }
+    } else {
+        let requests_ident = format_ident!("{}_requests", interface.name);
+        quote! { #requests_ident.0.as_ptr() }
+    };
+    let event_count_value = Literal::i32_unsuffixed(interface.events.len() as i32);
+    let events_value = if interface.events.is_empty() {
+        quote! { null::<wayland_backend::protocol::wl_message>() }
+    } else {
+        let events_ident = format_ident!("{}_events", interface.name);
+        quote! { #events_ident.0.as_ptr() }
+    };
+
+    quote! {
+        #requests
+        #events
+
+        pub static #interface_ident: wayland_backend::protocol::wl_interface = wayland_backend::protocol::wl_interface {
+            name: #name_value as *const u8 as *const std::os::raw::c_char,
+            version: #version_value,
+            request_count: #request_count_value,
+            requests: #requests_value,
+            event_count: #event_count_value,
+            events: #events_value,
+        };
+    }
+}
+
+fn gen_messages(interface: &Interface, messages: &[Message], which: &str) -> TokenStream {
+    if messages.is_empty() {
+        return TokenStream::new();
+    }
+
+    let types_arrays = messages.iter().filter_map(|msg| {
+        if msg.all_null() {
+            None
+        } else {
+            let array_ident = format_ident!("{}_{}_{}_types", interface.name, which, msg.name);
+            let array_len = Literal::usize_unsuffixed(msg.args.len());
+            let array_values = msg.args.iter().map(|arg| match (arg.typ, &arg.interface) {
+                (Type::Object, &Some(ref inter)) | (Type::NewId, &Some(ref inter)) => {
+                    let interface_ident =format_ident!("{}_interface", inter);
+                    quote! { &#interface_ident as *const wayland_backend::protocol::wl_interface }
+                }
+                _ => quote! { null::<wayland_backend::protocol::wl_interface>() },
+            });
+
+            Some(quote! {
+                static #array_ident: SyncWrapper<[*const wayland_backend::protocol::wl_interface; #array_len]> = SyncWrapper([
+                    #(#array_values,)*
+                ]);
+            })
+        }
+    });
+
+    let message_array_ident = format_ident!("{}_{}", interface.name, which);
+    let message_array_len = Literal::usize_unsuffixed(messages.len());
+    let message_array_values = messages.iter().map(|msg| {
+        let name_value = null_terminated_byte_string_literal(&msg.name);
+        let signature_value = Literal::byte_string(&message_signature(msg));
+
+        let types_ident = if msg.all_null() {
+            format_ident!("types_null")
+        } else {
+            format_ident!("{}_{}_{}_types", interface.name, which, msg.name)
+        };
+
+        quote! {
+            wayland_backend::protocol::wl_message {
+                name: #name_value as *const u8 as *const std::os::raw::c_char,
+                signature: #signature_value as *const u8 as *const std::os::raw::c_char,
+                types: #types_ident.0.as_ptr(),
+            }
+        }
+    });
+
+    quote! {
+        #(#types_arrays)*
+
+        static #message_array_ident: SyncWrapper<[wayland_backend::protocol::wl_message; #message_array_len]> = SyncWrapper([
+            #(#message_array_values,)*
+        ]);
+    }
+}
+
+fn message_signature(msg: &Message) -> Vec<u8> {
+    let mut res = Vec::new();
+
+    if msg.since > 1 {
+        res.extend_from_slice(msg.since.to_string().as_bytes());
+    }
+
+    for arg in &msg.args {
+        if arg.typ.nullable() && arg.allow_null {
+            res.push(b'?');
+        }
+        match arg.typ {
+            Type::NewId => {
+                if arg.interface.is_none() {
+                    res.extend_from_slice(b"su");
+                }
+                res.push(b'n');
+            }
+            Type::Uint => res.push(b'u'),
+            Type::Fixed => res.push(b'f'),
+            Type::String => res.push(b's'),
+            Type::Object => res.push(b'o'),
+            Type::Array => res.push(b'a'),
+            Type::Fd => res.push(b'h'),
+            Type::Int => res.push(b'i'),
+            _ => {}
+        }
+    }
+
+    res.push(0);
+    res
+}
+
+pub fn null_terminated_byte_string_literal(string: &str) -> Literal {
+    let mut val = Vec::with_capacity(string.len() + 1);
+    val.extend_from_slice(string.as_bytes());
+    val.push(0);
+
+    Literal::byte_string(&val)
+}
+
diff --git a/vendor/wayland-scanner/src/client_gen.rs b/vendor/wayland-scanner/src/client_gen.rs
new file mode 100644
index 000000000000..5e359fe2921e
--- /dev/null
+++ b/vendor/wayland-scanner/src/client_gen.rs
@@ -0,0 +1,338 @@
+use proc_macro2::{Ident, Span, TokenStream};
+
+use quote::{format_ident, quote};
+
+use crate::{
+    protocol::{Interface, Protocol, Type},
+    util::{description_to_doc_attr, dotted_to_relname, is_keyword, snake_to_camel, to_doc_attr},
+    Side,
+};
+
+pub fn generate_client_objects(protocol: &Protocol) -> TokenStream {
+    protocol.interfaces.iter().map(generate_objects_for).collect()
+}
+
+fn generate_objects_for(interface: &Interface) -> TokenStream {
+    let mod_name = Ident::new(&interface.name, Span::call_site());
+    let mod_doc = interface.description.as_ref().map(description_to_doc_attr);
+    let iface_name = Ident::new(&snake_to_camel(&interface.name), Span::call_site());
+    let iface_const_name = format_ident!("{}_INTERFACE", interface.name.to_ascii_uppercase());
+
+    let enums = crate::common::generate_enums_for(interface);
+    let sinces = crate::common::gen_msg_constants(&interface.requests, &interface.events);
+
+    let requests = crate::common::gen_message_enum(
+        &format_ident!("Request"),
+        Side::Client,
+        false,
+        &interface.requests,
+    );
+    let events = crate::common::gen_message_enum(
+        &format_ident!("Event"),
+        Side::Client,
+        true,
+        &interface.events,
+    );
+
+    let parse_body = crate::common::gen_parse_body(interface, Side::Client);
+    let write_body = crate::common::gen_write_body(interface, Side::Client);
+    let methods = gen_methods(interface);
+
+    let event_ref = if interface.events.is_empty() {
+        "This interface has no events."
+    } else {
+        "See also the [Event] enum for this interface."
+    };
+    let docs = match &interface.description {
+        Some((short, long)) => format!("{short}\n\n{long}\n\n{event_ref}"),
+        None => format!("{}\n\n{}", interface.name, event_ref),
+    };
+    let doc_attr = to_doc_attr(&docs);
+
+    quote! {
+        #mod_doc
+        pub mod #mod_name {
+            use std::sync::Arc;
+            use std::os::unix::io::OwnedFd;
+
+            use super::wayland_client::{
+                backend::{
+                    Backend, WeakBackend, smallvec, ObjectData, ObjectId, InvalidId,
+                    protocol::{WEnum, Argument, Message, Interface, same_interface}
+                },
+                QueueProxyData, Proxy, Connection, Dispatch, QueueHandle, DispatchError, Weak,
+            };
+
+            #enums
+            #sinces
+            #requests
+            #events
+
+            #doc_attr
+            #[derive(Debug, Clone)]
+            pub struct #iface_name {
+                id: ObjectId,
+                version: u32,
+                data: Option<Arc<dyn ObjectData>>,
+                backend: WeakBackend,
+            }
+
+            impl std::cmp::PartialEq for #iface_name {
+                fn eq(&self, other: &#iface_name) -> bool {
+                    self.id == other.id
+                }
+            }
+
+            impl std::cmp::Eq for #iface_name {}
+
+            impl PartialEq<Weak<#iface_name>> for #iface_name {
+                fn eq(&self, other: &Weak<#iface_name>) -> bool {
+                    self.id == other.id()
+                }
+            }
+
+            impl std::borrow::Borrow<ObjectId> for #iface_name {
+                fn borrow(&self) -> &ObjectId {
+                    &self.id
+                }
+            }
+
+            impl std::hash::Hash for #iface_name {
+                fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+                    self.id.hash(state)
+                }
+            }
+
+            impl super::wayland_client::Proxy for #iface_name {
+                type Request<'request> = Request<'request>;
+                type Event = Event;
+
+                #[inline]
+                fn interface() -> &'static Interface{
+                    &super::#iface_const_name
+                }
+
+                #[inline]
+                fn id(&self) -> ObjectId {
+                    self.id.clone()
+                }
+
+                #[inline]
+                fn version(&self) -> u32 {
+                    self.version
+                }
+
+                #[inline]
+                fn data<U: Send + Sync + 'static>(&self) -> Option<&U> {
+                    self.data.as_ref().and_then(|arc| arc.data_as_any().downcast_ref::<U>())
+                }
+
+                fn object_data(&self) -> Option<&Arc<dyn ObjectData>> {
+                    self.data.as_ref()
+                }
+
+                fn backend(&self) -> &WeakBackend {
+                    &self.backend
+                }
+
+                fn send_request(&self, req: Self::Request<'_>) -> Result<(), InvalidId> {
+                    let conn = Connection::from_backend(self.backend.upgrade().ok_or(InvalidId)?);
+                    let id = conn.send_request(self, req, None)?;
+                    debug_assert!(id.is_null());
+                    Ok(())
+                }
+
+                fn send_constructor<I: Proxy>(&self, req: Self::Request<'_>, data: Arc<dyn ObjectData>) -> Result<I, InvalidId> {
+                    let conn = Connection::from_backend(self.backend.upgrade().ok_or(InvalidId)?);
+                    let id = conn.send_request(self, req, Some(data))?;
+                    Proxy::from_id(&conn, id)
+                }
+
+                #[inline]
+                fn from_id(conn: &Connection, id: ObjectId) -> Result<Self, InvalidId> {
+                    if !same_interface(id.interface(), Self::interface()) && !id.is_null() {
+                        return Err(InvalidId);
+                    }
+                    let version = conn.object_info(id.clone()).map(|info| info.version).unwrap_or(0);
+                    let data = conn.get_object_data(id.clone()).ok();
+                    let backend = conn.backend().downgrade();
+                    Ok(#iface_name { id, data, version, backend })
+                }
+
+                #[inline]
+                fn inert(backend: WeakBackend) -> Self {
+                    #iface_name { id: ObjectId::null(), data: None, version: 0, backend }
+                }
+
+                fn parse_event(conn: &Connection, msg: Message<ObjectId, OwnedFd>) -> Result<(Self, Self::Event), DispatchError> {
+                    #parse_body
+                }
+
+                fn write_request<'a>(&self, conn: &Connection, msg: Self::Request<'a>) -> Result<(Message<ObjectId, std::os::unix::io::BorrowedFd<'a>>, Option<(&'static Interface, u32)>), InvalidId> {
+                    #write_body
+                }
+            }
+
+            impl #iface_name {
+                #methods
+            }
+        }
+    }
+}
+
+fn gen_methods(interface: &Interface) -> TokenStream {
+    interface.requests.iter().map(|request| {
+        let created_interface = request.args.iter().find(|arg| arg.typ == Type::NewId).map(|arg| &arg.interface);
+
+        let method_name = format_ident!("{}{}", if is_keyword(&request.name) { "_" } else { "" }, request.name);
+        let enum_variant = Ident::new(&snake_to_camel(&request.name), Span::call_site());
+
+        let fn_args = request.args.iter().flat_map(|arg| {
+            if arg.typ == Type::NewId {
+                if arg.interface.is_none() {
+                    // the new_id argument of a bind-like method
+                    // it shoudl expand as a (interface, type) tuple, but the type is already handled by
+                    // the prototype type parameter, so just put a version here
+                    return Some(quote! { version: u32 });
+                } else {
+                    // this is a regular new_id, skip it
+                    return None;
+                }
+            }
+
+            let arg_name = format_ident!("{}{}", if is_keyword(&arg.name) { "_" } else { "" }, arg.name);
+
+            let arg_type =  if let Some(ref enu) = arg.enum_ {
+                let enum_type = dotted_to_relname(enu);
+                quote! { #enum_type }
+            } else {
+                match arg.typ {
+                    Type::Uint => quote! { u32 },
+                    Type::Int => quote! { i32 },
+                    Type::Fixed => quote! { f64 },
+                    Type::String => if arg.allow_null { quote!{ Option<String> } } else { quote!{ String } },
+                    Type::Array => if arg.allow_null { quote!{ Option<Vec<u8>> } } else { quote!{ Vec<u8> } },
+                    Type::Fd => quote! { ::std::os::unix::io::BorrowedFd<'_> },
+                    Type::Object => {
+                        let iface = arg.interface.as_ref().unwrap();
+                        let iface_mod = Ident::new(iface, Span::call_site());
+                        let iface_type =
+                            Ident::new(&snake_to_camel(iface), Span::call_site());
+                        if arg.allow_null { quote! { Option<&super::#iface_mod::#iface_type> } } else { quote! { &super::#iface_mod::#iface_type } }
+                    },
+                    Type::NewId => unreachable!(),
+                    Type::Destructor => panic!("An argument cannot have type \"destructor\"."),
+                }
+            };
+
+            Some(quote! {
+                #arg_name: #arg_type
+            })
+        });
+
+        let enum_args = request.args.iter().flat_map(|arg| {
+            let arg_name = format_ident!("{}{}", if is_keyword(&arg.name) { "_" } else { "" }, arg.name);
+            if arg.enum_.is_some() {
+                Some(quote! { #arg_name: WEnum::Value(#arg_name) })
+            } else if arg.typ == Type::NewId {
+                if arg.interface.is_none() {
+                    Some(quote! { #arg_name: (I::interface(), version) })
+                } else {
+                    None
+                }
+            } else if arg.typ == Type::Object {
+                if arg.allow_null {
+                    Some(quote! { #arg_name: #arg_name.cloned() })
+                } else {
+                    Some(quote! { #arg_name: #arg_name.clone() })
+                }
+            } else {
+                Some(quote! { #arg_name })
+            }
+        });
+
+        let doc_attr = request
+            .description
+            .as_ref()
+            .map(description_to_doc_attr);
+
+        match created_interface {
+            Some(Some(ref created_interface)) => {
+                // a regular creating request
+                let created_iface_mod = Ident::new(created_interface, Span::call_site());
+                let created_iface_type = Ident::new(&snake_to_camel(created_interface), Span::call_site());
+                quote! {
+                    #doc_attr
+                    #[allow(clippy::too_many_arguments)]
+                    pub fn #method_name<U: Send + Sync + 'static, D: Dispatch<super::#created_iface_mod::#created_iface_type, U> + 'static>(&self, #(#fn_args,)* qh: &QueueHandle<D>, udata: U) -> super::#created_iface_mod::#created_iface_type {
+                        self.send_constructor(
+                            Request::#enum_variant {
+                                #(#enum_args),*
+                            },
+                            qh.make_data::<super::#created_iface_mod::#created_iface_type, U>(udata),
+                        ).unwrap_or_else(|_| Proxy::inert(self.backend.clone()))
+                    }
+                }
+            },
+            Some(None) => {
+                // a bind-like request
+                quote! {
+                    #doc_attr
+                    #[allow(clippy::too_many_arguments)]
+                    pub fn #method_name<I: Proxy + 'static, U: Send + Sync + 'static, D: Dispatch<I, U> + 'static>(&self, #(#fn_args,)* qh: &QueueHandle<D>, udata: U) -> I {
+                        self.send_constructor(
+                            Request::#enum_variant {
+                                #(#enum_args),*
+                            },
+                            qh.make_data::<I, U>(udata),
+                        ).unwrap_or_else(|_| Proxy::inert(self.backend.clone()))
+                    }
+                }
+            },
+            None => {
+                // a non-creating request
+                quote! {
+                    #doc_attr
+                    #[allow(clippy::too_many_arguments)]
+                    pub fn #method_name(&self, #(#fn_args),*) {
+                        let backend = match self.backend.upgrade() {
+                            Some(b) => b,
+                            None => return,
+                        };
+                        let conn = Connection::from_backend(backend);
+                        let _ = conn.send_request(
+                            self,
+                            Request::#enum_variant {
+                                #(#enum_args),*
+                            },
+                            None
+                        );
+                    }
+                }
+            }
+        }
+    }).collect()
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn client_gen() {
+        let protocol_file =
+            std::fs::File::open("./tests/scanner_assets/test-protocol.xml").unwrap();
+        let protocol_parsed = crate::parse::parse(protocol_file);
+        let generated: String = super::generate_client_objects(&protocol_parsed).to_string();
+        let generated = crate::format_rust_code(&generated);
+
+        let reference =
+            std::fs::read_to_string("./tests/scanner_assets/test-client-code.rs").unwrap();
+        let reference = crate::format_rust_code(&reference);
+
+        if reference != generated {
+            let diff = similar::TextDiff::from_lines(&reference, &generated);
+            print!("{}", diff.unified_diff().context_radius(10).header("reference", "generated"));
+            panic!("Generated does not match reference!")
+        }
+    }
+}
+
diff --git a/vendor/wayland-scanner/src/common.rs b/vendor/wayland-scanner/src/common.rs
new file mode 100644
index 000000000000..7d64730c1dc9
--- /dev/null
+++ b/vendor/wayland-scanner/src/common.rs
@@ -0,0 +1,632 @@
+use std::fmt::Write;
+
+use proc_macro2::{Ident, Literal, Span, TokenStream};
+
+use quote::{format_ident, quote, ToTokens};
+
+use crate::{protocol::*, util::*, Side};
+
+pub(crate) fn generate_enums_for(interface: &Interface) -> TokenStream {
+    interface.enums.iter().map(ToTokens::into_token_stream).collect()
+}
+
+impl ToTokens for Enum {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        let enum_decl;
+        let enum_impl;
+
+        let doc_attr = self.description.as_ref().map(description_to_doc_attr);
+        let ident = Ident::new(&snake_to_camel(&self.name), Span::call_site());
+
+        if self.bitfield {
+            let entries = self.entries.iter().map(|entry| {
+                let doc_attr = entry
+                    .description
+                    .as_ref()
+                    .map(description_to_doc_attr)
+                    .or_else(|| entry.summary.as_ref().map(|s| to_doc_attr(s)));
+
+                let prefix = if entry.name.chars().next().unwrap().is_numeric() { "_" } else { "" };
+                let ident = format_ident!("{}{}", prefix, snake_to_camel(&entry.name));
+
+                let value = Literal::u32_unsuffixed(entry.value);
+
+                quote! {
+                    #doc_attr
+                    const #ident = #value;
+                }
+            });
+
+            enum_decl = quote! {
+                bitflags::bitflags! {
+                    #doc_attr
+                    #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+                    pub struct #ident: u32 {
+                        #(#entries)*
+                    }
+                }
+            };
+            enum_impl = quote! {
+                impl std::convert::TryFrom<u32> for #ident {
+                    type Error = ();
+                    fn try_from(val: u32) -> Result<#ident, ()> {
+                        #ident::from_bits(val).ok_or(())
+                    }
+                }
+                impl std::convert::From<#ident> for u32 {
+                    fn from(val: #ident) -> u32 {
+                        val.bits()
+                    }
+                }
+            };
+        } else {
+            let variants = self.entries.iter().map(|entry| {
+                let doc_attr = entry
+                    .description
+                    .as_ref()
+                    .map(description_to_doc_attr)
+                    .or_else(|| entry.summary.as_ref().map(|s| to_doc_attr(s)));
+
+                let prefix = if entry.name.chars().next().unwrap().is_numeric() { "_" } else { "" };
+                let variant = format_ident!("{}{}", prefix, snake_to_camel(&entry.name));
+
+                let value = Literal::u32_unsuffixed(entry.value);
+
+                quote! {
+                    #doc_attr
+                    #variant = #value
+                }
+            });
+
+            enum_decl = quote! {
+                #doc_attr
+                #[repr(u32)]
+                #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+                #[non_exhaustive]
+                pub enum #ident {
+                    #(#variants,)*
+                }
+            };
+
+            let match_arms = self.entries.iter().map(|entry| {
+                let value = Literal::u32_unsuffixed(entry.value);
+
+                let prefix = if entry.name.chars().next().unwrap().is_numeric() { "_" } else { "" };
+                let variant = format_ident!("{}{}", prefix, snake_to_camel(&entry.name));
+
+                quote! {
+                    #value => Ok(#ident::#variant)
+                }
+            });
+
+            enum_impl = quote! {
+                impl std::convert::TryFrom<u32> for #ident {
+                    type Error = ();
+                    fn try_from(val: u32) -> Result<#ident, ()> {
+                        match val {
+                            #(#match_arms,)*
+                            _ => Err(())
+                        }
+                    }
+                }
+                impl std::convert::From<#ident> for u32 {
+                    fn from(val: #ident) -> u32 {
+                        val as u32
+                    }
+                }
+            };
+        }
+
+        enum_decl.to_tokens(tokens);
+        enum_impl.to_tokens(tokens);
+    }
+}
+
+pub(crate) fn gen_msg_constants(requests: &[Message], events: &[Message]) -> TokenStream {
+    let req_constants = requests.iter().enumerate().map(|(opcode, msg)| {
+        let since_cstname = format_ident!("REQ_{}_SINCE", msg.name.to_ascii_uppercase());
+        let opcode_cstname = format_ident!("REQ_{}_OPCODE", msg.name.to_ascii_uppercase());
+        let since = msg.since;
+        let opcode = opcode as u16;
+        quote! {
+            /// The minimal object version supporting this request
+            pub const #since_cstname: u32 = #since;
+            /// The wire opcode for this request
+            pub const #opcode_cstname: u16 = #opcode;
+        }
+    });
+    let evt_constants = events.iter().enumerate().map(|(opcode, msg)| {
+        let since_cstname = format_ident!("EVT_{}_SINCE", msg.name.to_ascii_uppercase());
+        let opcode_cstname = format_ident!("EVT_{}_OPCODE", msg.name.to_ascii_uppercase());
+        let since = msg.since;
+        let opcode = opcode as u16;
+        quote! {
+            /// The minimal object version supporting this event
+            pub const #since_cstname: u32 = #since;
+            /// The wire opcode for this event
+            pub const #opcode_cstname: u16 = #opcode;
+        }
+    });
+
+    quote! {
+        #(#req_constants)*
+        #(#evt_constants)*
+    }
+}
+
+pub(crate) fn gen_message_enum(
+    name: &Ident,
+    side: Side,
+    receiver: bool,
+    messages: &[Message],
+) -> TokenStream {
+    let variants = messages
+        .iter()
+        .map(|msg| {
+            let mut docs = String::new();
+            if let Some((ref short, ref long)) = msg.description {
+                write!(docs, "{}\n\n{}\n", short, long.trim()).unwrap();
+            }
+            if let Some(Type::Destructor) = msg.typ {
+                write!(
+                    docs,
+                    "\nThis is a destructor, once {} this object cannot be used any longer.",
+                    if receiver { "received" } else { "sent" },
+                )
+                .unwrap()
+            }
+            if msg.since > 1 {
+                write!(docs, "\nOnly available since version {} of the interface", msg.since)
+                    .unwrap();
+            }
+
+            let doc_attr = to_doc_attr(&docs);
+            let msg_name = Ident::new(&snake_to_camel(&msg.name), Span::call_site());
+            let msg_variant_decl =
+                if msg.args.is_empty() {
+                    msg_name.into_token_stream()
+                } else {
+                    let fields = msg.args.iter().flat_map(|arg| {
+                let field_name =
+                    format_ident!("{}{}", if is_keyword(&arg.name) { "_" } else { "" }, arg.name);
+                let field_type_inner = if let Some(ref enu) = arg.enum_ {
+                    let enum_type = dotted_to_relname(enu);
+                    quote! { WEnum<#enum_type> }
+                } else {
+                    match arg.typ {
+                        Type::Uint => quote! { u32 },
+                        Type::Int => quote! { i32 },
+                        Type::Fixed => quote! { f64 },
+                        Type::String => quote! { String },
+                        Type::Array => quote! { Vec<u8> },
+                        Type::Fd => {
+                            if receiver {
+                                quote! { OwnedFd }
+                            } else {
+                                quote! { std::os::unix::io::BorrowedFd<'a> }
+                            }
+                        }
+                        Type::Object => {
+                            if let Some(ref iface) = arg.interface {
+                                let iface_mod = Ident::new(iface, Span::call_site());
+                                let iface_type =
+                                    Ident::new(&snake_to_camel(iface), Span::call_site());
+                                quote! { super::#iface_mod::#iface_type }
+                            } else if side == Side::Client {
+                                quote! { super::wayland_client::ObjectId }
+                            } else {
+                                quote! { super::wayland_server::ObjectId }
+                            }
+                        }
+                        Type::NewId if !receiver && side == Side::Client => {
+                            // Client-side sending does not have a pre-existing object
+                            // so skip serializing it
+                            if arg.interface.is_some() {
+                                return None;
+                            } else {
+                                quote! { (&'static Interface, u32) }
+                            }
+                        }
+                        Type::NewId => {
+                            if let Some(ref iface) = arg.interface {
+                                let iface_mod = Ident::new(iface, Span::call_site());
+                                let iface_type =
+                                    Ident::new(&snake_to_camel(iface), Span::call_site());
+                                if receiver && side == Side::Server {
+                                    quote! { New<super::#iface_mod::#iface_type> }
+                                } else {
+                                    quote! { super::#iface_mod::#iface_type }
+                                }
+                            } else {
+                                // bind-like function
+                                if side == Side::Client {
+                                    quote! { (String, u32, super::wayland_client::ObjectId) }
+                                } else {
+                                    quote! { (String, u32, super::wayland_server::ObjectId) }
+                                }
+                            }
+                        }
+                        Type::Destructor => panic!("An argument cannot have type \"destructor\"."),
+                    }
+                };
+
+                let field_type = if arg.allow_null {
+                    quote! { Option<#field_type_inner> }
+                } else {
+                    field_type_inner.into_token_stream()
+                };
+
+                let doc_attr = arg
+                    .description
+                    .as_ref()
+                    .map(description_to_doc_attr)
+                    .or_else(|| arg.summary.as_ref().map(|s| to_doc_attr(s)));
+
+                Some(quote! {
+                    #doc_attr
+                    #field_name: #field_type
+                })
+            });
+
+                    quote! {
+                        #msg_name {
+                            #(#fields,)*
+                        }
+                    }
+                };
+
+            quote! {
+                #doc_attr
+                #msg_variant_decl
+            }
+        })
+        .collect::<Vec<_>>();
+
+    let opcodes = messages.iter().enumerate().map(|(opcode, msg)| {
+        let msg_name = Ident::new(&snake_to_camel(&msg.name), Span::call_site());
+        let opcode = opcode as u16;
+        if msg.args.is_empty() {
+            quote! {
+                #name::#msg_name => #opcode
+            }
+        } else {
+            quote! {
+                #name::#msg_name { .. } => #opcode
+            }
+        }
+    });
+
+    // Placeholder to allow generic argument to be added later, without ABI
+    // break.
+    // TODO Use never type.
+    let (generic, phantom_variant, phantom_case) = if !receiver {
+        (
+            quote! { 'a },
+            quote! { #[doc(hidden)] __phantom_lifetime { phantom: std::marker::PhantomData<&'a ()>, never: std::convert::Infallible } },
+            quote! { #name::__phantom_lifetime { never, .. } => match never {} },
+        )
+    } else {
+        (quote! {}, quote! {}, quote! {})
+    };
+
+    quote! {
+        #[derive(Debug)]
+        #[non_exhaustive]
+        pub enum #name<#generic> {
+            #(#variants,)*
+            #phantom_variant
+        }
+
+        impl<#generic> #name<#generic> {
+            #[doc="Get the opcode number of this message"]
+            pub fn opcode(&self) -> u16 {
+                match *self {
+                    #(#opcodes,)*
+                    #phantom_case
+                }
+            }
+        }
+    }
+}
+
+pub(crate) fn gen_parse_body(interface: &Interface, side: Side) -> TokenStream {
+    let msgs = match side {
+        Side::Client => &interface.events,
+        Side::Server => &interface.requests,
+    };
+    let object_type = Ident::new(
+        match side {
+            Side::Client => "Proxy",
+            Side::Server => "Resource",
+        },
+        Span::call_site(),
+    );
+    let msg_type = Ident::new(
+        match side {
+            Side::Client => "Event",
+            Side::Server => "Request",
+        },
+        Span::call_site(),
+    );
+
+    let match_arms = msgs.iter().enumerate().map(|(opcode, msg)| {
+        let opcode = opcode as u16;
+        let msg_name = Ident::new(&snake_to_camel(&msg.name), Span::call_site());
+        let args_pat = msg.args.iter().map(|arg| {
+            let arg_name = Ident::new(
+                &format!("{}{}", if is_keyword(&arg.name) { "_" } else { "" }, arg.name),
+                Span::call_site(),
+            );
+            match arg.typ {
+                Type::Uint => quote!{ Some(Argument::Uint(#arg_name)) },
+                Type::Int => quote!{ Some(Argument::Int(#arg_name)) },
+                Type::String => quote!{ Some(Argument::Str(#arg_name)) },
+                Type::Fixed => quote!{ Some(Argument::Fixed(#arg_name)) },
+                Type::Array => quote!{ Some(Argument::Array(#arg_name)) },
+                Type::Object => quote!{ Some(Argument::Object(#arg_name)) },
+                Type::NewId => quote!{ Some(Argument::NewId(#arg_name)) },
+                Type::Fd => quote!{ Some(Argument::Fd(#arg_name)) },
+                Type::Destructor => panic!("Argument {}.{}.{} has type destructor ?!", interface.name, msg.name, arg.name),
+            }
+        });
+
+        let args_iter = msg.args.iter().map(|_| quote!{ arg_iter.next() });
+
+        let arg_names = msg.args.iter().map(|arg| {
+            let arg_name = format_ident!("{}{}", if is_keyword(&arg.name) { "_" } else { "" }, arg.name);
+            if arg.enum_.is_some() {
+                quote! { #arg_name: From::from(#arg_name as u32) }
+            } else {
+                match arg.typ {
+                    Type::Uint | Type::Int | Type::Fd => quote!{ #arg_name },
+                    Type::Fixed => quote!{ #arg_name: (#arg_name as f64) / 256.},
+                    Type::String => {
+                        if arg.allow_null {
+                            quote! {
+                                #arg_name: #arg_name.as_ref().map(|s| String::from_utf8_lossy(s.as_bytes()).into_owned())
+                            }
+                        } else {
+                            quote! {
+                                #arg_name: String::from_utf8_lossy(#arg_name.as_ref().unwrap().as_bytes()).into_owned()
+                            }
+                        }
+                    },
+                    Type::Object => {
+                        let create_proxy = if let Some(ref created_interface) = arg.interface {
+                            let created_iface_mod = Ident::new(created_interface, Span::call_site());
+                            let created_iface_type = Ident::new(&snake_to_camel(created_interface), Span::call_site());
+                            quote! {
+                                match <super::#created_iface_mod::#created_iface_type as #object_type>::from_id(conn, #arg_name.clone()) {
+                                    Ok(p) => p,
+                                    Err(_) => return Err(DispatchError::BadMessage {
+                                        sender_id: msg.sender_id,
+                                        interface: Self::interface().name,
+                                        opcode: msg.opcode
+                                    }),
+                                }
+                            }
+                        } else {
+                            quote! { #arg_name.clone() }
+                        };
+                        if arg.allow_null {
+                            quote! {
+                                #arg_name: if #arg_name.is_null() { None } else { Some(#create_proxy) }
+                            }
+                        } else {
+                            quote! {
+                                #arg_name: #create_proxy
+                            }
+                        }
+                    },
+                    Type::NewId => {
+                        let create_proxy = if let Some(ref created_interface) = arg.interface {
+                            let created_iface_mod = Ident::new(created_interface, Span::call_site());
+                            let created_iface_type = Ident::new(&snake_to_camel(created_interface), Span::call_site());
+                            quote! {
+                                match <super::#created_iface_mod::#created_iface_type as #object_type>::from_id(conn, #arg_name.clone()) {
+                                    Ok(p) => p,
+                                    Err(_) => return Err(DispatchError::BadMessage {
+                                        sender_id: msg.sender_id,
+                                        interface: Self::interface().name,
+                                        opcode: msg.opcode,
+                                    }),
+                                }
+                            }
+                        } else if side == Side::Server {
+                            quote! { New::wrap(#arg_name.clone()) }
+                        } else {
+                            quote! { #arg_name.clone() }
+                        };
+                        if arg.allow_null {
+                            if side == Side::Server {
+                                quote! {
+                                    #arg_name: if #arg_name.is_null() { None } else { Some(New::wrap(#create_proxy)) }
+                                }
+                            } else {
+                                quote! {
+                                    #arg_name: if #arg_name.is_null() { None } else { Some(#create_proxy) }
+                                }
+                            }
+                        } else if side == Side::Server {
+                            quote! {
+                                #arg_name: New::wrap(#create_proxy)
+                            }
+                        } else  {
+                            quote! {
+                                #arg_name: #create_proxy
+                            }
+                        }
+                    },
+                    Type::Array => {
+                        if arg.allow_null {
+                            quote! { if #arg_name.len() == 0 { None } else { Some(*#arg_name) } }
+                        } else {
+                            quote! { #arg_name: *#arg_name }
+                        }
+                    },
+                    Type::Destructor => unreachable!(),
+                }
+            }
+        });
+
+        quote! {
+            #opcode => {
+                if let (#(#args_pat),*) = (#(#args_iter),*) {
+                    Ok((me, #msg_type::#msg_name { #(#arg_names),* }))
+                } else {
+                    Err(DispatchError::BadMessage { sender_id: msg.sender_id, interface: Self::interface().name, opcode: msg.opcode })
+                }
+            }
+        }
+    });
+
+    quote! {
+        let me = Self::from_id(conn, msg.sender_id.clone()).unwrap();
+        let mut arg_iter = msg.args.into_iter();
+        match msg.opcode {
+            #(#match_arms),*
+            _ => Err(DispatchError::BadMessage { sender_id: msg.sender_id, interface: Self::interface().name, opcode: msg.opcode }),
+        }
+    }
+}
+
+pub(crate) fn gen_write_body(interface: &Interface, side: Side) -> TokenStream {
+    let msgs = match side {
+        Side::Client => &interface.requests,
+        Side::Server => &interface.events,
+    };
+    let msg_type = Ident::new(
+        match side {
+            Side::Client => "Request",
+            Side::Server => "Event",
+        },
+        Span::call_site(),
+    );
+    let arms = msgs.iter().enumerate().map(|(opcode, msg)| {
+        let msg_name = Ident::new(&snake_to_camel(&msg.name), Span::call_site());
+        let opcode = opcode as u16;
+        let arg_names = msg.args.iter().flat_map(|arg| {
+            if arg.typ == Type::NewId && arg.interface.is_some() && side == Side::Client {
+                None
+            } else {
+                Some(format_ident!("{}{}", if is_keyword(&arg.name) { "_" } else { "" }, arg.name))
+            }
+        });
+        let mut child_spec = None;
+        let args = msg.args.iter().flat_map(|arg| {
+            let arg_name = format_ident!("{}{}", if is_keyword(&arg.name) { "_" } else { "" }, arg.name);
+
+            match arg.typ {
+                Type::Int => vec![if arg.enum_.is_some() { quote!{ Argument::Int(Into::<u32>::into(#arg_name) as i32) } } else { quote!{ Argument::Int(#arg_name) } }],
+                Type::Uint => vec![if arg.enum_.is_some() { quote!{ Argument::Uint(#arg_name.into()) } } else { quote!{ Argument::Uint(#arg_name) } }],
+                Type::Fd => vec![quote!{ Argument::Fd(#arg_name) }],
+                Type::Fixed => vec![quote! { Argument::Fixed((#arg_name * 256.) as i32) }],
+                Type::Object => if arg.allow_null {
+                    if side == Side::Server {
+                        vec![quote! { if let Some(obj) = #arg_name { Argument::Object(Resource::id(&obj)) } else { Argument::Object(ObjectId::null()) } }]
+                    } else {
+                        vec![quote! { if let Some(obj) = #arg_name { Argument::Object(Proxy::id(&obj)) } else { Argument::Object(ObjectId::null()) } }]
+                    }
+                } else if side == Side::Server {
+                    vec![quote!{ Argument::Object(Resource::id(&#arg_name)) }]
+                } else {
+                    vec![quote!{ Argument::Object(Proxy::id(&#arg_name)) }]
+                },
+                Type::Array => if arg.allow_null {
+                    vec![quote! { if let Some(array) = #arg_name { Argument::Array(Box::new(array)) } else { Argument::Array(Box::new(Vec::new()))}}]
+                } else {
+                    vec![quote! { Argument::Array(Box::new(#arg_name)) }]
+                },
+                Type::String => if arg.allow_null {
+                    vec![quote! { Argument::Str(#arg_name.map(|s| Box::new(std::ffi::CString::new(s).unwrap()))) }]
+                } else {
+                    vec![quote! { Argument::Str(Some(Box::new(std::ffi::CString::new(#arg_name).unwrap()))) }]
+                },
+                Type::NewId => if side == Side::Client {
+                    if let Some(ref created_interface) = arg.interface {
+                        let created_iface_mod = Ident::new(created_interface, Span::call_site());
+                        let created_iface_type = Ident::new(&snake_to_camel(created_interface), Span::call_site());
+                        assert!(child_spec.is_none());
+                        child_spec = Some(quote! { {
+                            let my_info = conn.object_info(self.id())?;
+                            Some((super::#created_iface_mod::#created_iface_type::interface(), my_info.version))
+                        } });
+                        vec![quote! { Argument::NewId(ObjectId::null()) }]
+                    } else {
+                        assert!(child_spec.is_none());
+                        child_spec = Some(quote! {
+                            Some((#arg_name.0, #arg_name.1))
+                        });
+                        vec![
+                            quote! {
+                                Argument::Str(Some(Box::new(std::ffi::CString::new(#arg_name.0.name).unwrap())))
+                            },
+                            quote! {
+                                Argument::Uint(#arg_name.1)
+                            },
+                            quote! {
+                                Argument::NewId(ObjectId::null())
+                            },
+                        ]
+                    }
+                } else {
+                    // server-side NewId is the same as Object
+                    if arg.allow_null {
+                        vec![quote! { if let Some(obj) = #arg_name { Argument::NewId(Resource::id(&obj)) } else { Argument::NewId(ObjectId::null()) } }]
+                    } else {
+                        vec![quote!{ Argument::NewId(Resource::id(&#arg_name)) }]
+                    }
+                },
+                Type::Destructor => panic!("Argument {}.{}.{} has type destructor ?!", interface.name, msg.name, arg.name),
+            }
+        });
+        let args = if msg.args.is_empty() {
+            quote! {
+                smallvec::SmallVec::new()
+            }
+        } else if msg.args.len() <= 4 {
+            // Note: Keep in sync with `wayland_backend::protocol::INLINE_ARGS`.
+            // Fits in SmallVec inline capacity
+            quote! { {
+                let mut vec = smallvec::SmallVec::new();
+                #(
+                    vec.push(#args);
+                )*
+                vec
+            } }
+        } else {
+            quote! {
+                smallvec::SmallVec::from_vec(vec![#(#args),*])
+            }
+        };
+        if side == Side::Client {
+            let child_spec = child_spec.unwrap_or_else(|| quote! { None });
+            quote! {
+                #msg_type::#msg_name { #(#arg_names),* } => {
+                    let child_spec = #child_spec;
+                    let args = #args;
+                    Ok((Message {
+                        sender_id: self.id.clone(),
+                        opcode: #opcode,
+                        args
+                    }, child_spec))
+                }
+            }
+        } else {
+            quote! {
+                #msg_type::#msg_name { #(#arg_names),* } => Ok(Message {
+                    sender_id: self.id.clone(),
+                    opcode: #opcode,
+                    args: #args,
+                })
+            }
+        }
+    });
+    quote! {
+        match msg {
+            #(#arms,)*
+            #msg_type::__phantom_lifetime { never, .. } => match never {}
+        }
+    }
+}
+
diff --git a/vendor/wayland-scanner/src/interfaces.rs b/vendor/wayland-scanner/src/interfaces.rs
new file mode 100644
index 000000000000..cb458c5abe67
--- /dev/null
+++ b/vendor/wayland-scanner/src/interfaces.rs
@@ -0,0 +1,143 @@
+use proc_macro2::TokenStream;
+
+use crate::protocol::{Interface, Message, Protocol, Type};
+
+use quote::{format_ident, quote};
+
+pub fn generate(protocol: &Protocol, with_c_interfaces: bool) -> TokenStream {
+    let interfaces =
+        protocol.interfaces.iter().map(|iface| generate_interface(iface, with_c_interfaces));
+    if with_c_interfaces {
+        let prefix = super::c_interfaces::generate_interfaces_prefix(protocol);
+        quote! {
+            #prefix
+            #(#interfaces)*
+        }
+    } else {
+        interfaces.collect()
+    }
+}
+
+pub(crate) fn generate_interface(interface: &Interface, with_c: bool) -> TokenStream {
+    let const_name = format_ident!("{}_INTERFACE", interface.name.to_ascii_uppercase());
+    let iface_name = &interface.name;
+    let iface_version = interface.version;
+    let requests = build_messagedesc_list(&interface.requests);
+    let events = build_messagedesc_list(&interface.events);
+
+    let c_name = format_ident!("{}_interface", interface.name);
+
+    if with_c {
+        let c_iface = super::c_interfaces::generate_interface(interface);
+        quote! {
+            pub static #const_name: wayland_backend::protocol::Interface = wayland_backend::protocol::Interface {
+                name: #iface_name,
+                version: #iface_version,
+                requests: #requests,
+                events: #events,
+                c_ptr: Some(unsafe { & #c_name }),
+            };
+
+            #c_iface
+        }
+    } else {
+        quote! {
+            pub static #const_name: wayland_backend::protocol::Interface = wayland_backend::protocol::Interface {
+                name: #iface_name,
+                version: #iface_version,
+                requests: #requests,
+                events: #events,
+                c_ptr: None,
+            };
+        }
+    }
+}
+
+fn build_messagedesc_list(list: &[Message]) -> TokenStream {
+    let desc_list = list.iter().map(|message| {
+        let name = &message.name;
+        let since = message.since;
+        let is_destructor = message.typ == Some(Type::Destructor);
+        let signature = message.args.iter().map(|arg| {
+            if arg.typ == Type::NewId && arg.interface.is_none() {
+                // this is a special generic message, it expands to multiple arguments
+                quote! {
+                    wayland_backend::protocol::ArgumentType::Str(wayland_backend::protocol::AllowNull::No),
+                    wayland_backend::protocol::ArgumentType::Uint,
+                    wayland_backend::protocol::ArgumentType::NewId
+                }
+            } else {
+                let typ = arg.typ.common_type();
+                if arg.typ.nullable() {
+                    if arg.allow_null {
+                        quote! { wayland_backend::protocol::ArgumentType::#typ(wayland_backend::protocol::AllowNull::Yes) }
+                    } else {
+                        quote! { wayland_backend::protocol::ArgumentType::#typ(wayland_backend::protocol::AllowNull::No) }
+                    }
+                } else {
+                    quote! { wayland_backend::protocol::ArgumentType::#typ }
+                }
+            }
+        });
+        let child_interface = match message
+            .args
+            .iter()
+            .find(|arg| arg.typ == Type::NewId)
+            .and_then(|arg| arg.interface.as_ref())
+        {
+            Some(name) => {
+                let target_iface = format_ident!("{}_INTERFACE", name.to_ascii_uppercase());
+                quote! { Some(&#target_iface) }
+            }
+            None => quote! { None },
+        };
+        let arg_interfaces = message.args.iter().filter(|arg| arg.typ == Type::Object).map(|arg| {
+            match arg.interface {
+                Some(ref name) => {
+                    let target_iface = format_ident!("{}_INTERFACE", name.to_ascii_uppercase());
+                    quote! { &#target_iface }
+                }
+                None => {
+                    quote! { &wayland_backend::protocol::ANONYMOUS_INTERFACE }
+                }
+            }
+        });
+        quote! {
+            wayland_backend::protocol::MessageDesc {
+                name: #name,
+                signature: &[ #(#signature),* ],
+                since: #since,
+                is_destructor: #is_destructor,
+                child_interface: #child_interface,
+                arg_interfaces: &[ #(#arg_interfaces),* ],
+            }
+        }
+    });
+
+    quote!(
+        &[ #(#desc_list),* ]
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn interface_gen() {
+        let protocol_file =
+            std::fs::File::open("./tests/scanner_assets/test-protocol.xml").unwrap();
+        let protocol_parsed = crate::parse::parse(protocol_file);
+        let generated: String = super::generate(&protocol_parsed, true).to_string();
+        let generated = crate::format_rust_code(&generated);
+
+        let reference =
+            std::fs::read_to_string("./tests/scanner_assets/test-interfaces.rs").unwrap();
+        let reference = crate::format_rust_code(&reference);
+
+        if reference != generated {
+            let diff = similar::TextDiff::from_lines(&reference, &generated);
+            print!("{}", diff.unified_diff().context_radius(10).header("reference", "generated"));
+            panic!("Generated does not match reference!")
+        }
+    }
+}
+
diff --git a/vendor/wayland-scanner/src/lib.rs b/vendor/wayland-scanner/src/lib.rs
new file mode 100644
index 000000000000..858bc80e0b72
--- /dev/null
+++ b/vendor/wayland-scanner/src/lib.rs
@@ -0,0 +1,142 @@
+//! Wayland protocol code-generation machinnery
+//!
+//! This crate provides procedural macros for generating the rust code associated with a
+//! Wayland XML protocol specification, for use with the `wayland-client`, `wayland-server`
+//! and `wayland-backend` crates.
+//!
+//! Before trying to use this crate, you may check if the protocol extension you want to use
+//! is not already exposed in the `wayland-protocols` crate.
+//!
+//! ## Example usage
+//!
+//! Below is a template for generating the code for a custom protocol client-side. Server-side
+//! is identical, just replacing `client` by `server`. The path to the XML file is relative to the
+//! crate root.
+//!
+//! ```rust,ignore
+//! // Generate the bindings in their own module
+//! pub mod my_protocol {
+//!     use wayland_client;
+//!     // import objects from the core protocol if needed
+//!     use wayland_client::protocol::*;
+//!
+//!     // This module hosts a low-level representation of the protocol objects
+//!     // you will not need to interact with it yourself, but the code generated
+//!     // by the generate_client_code! macro will use it
+//!     pub mod __interfaces {
+//!         // import the interfaces from the core protocol if needed
+//!         use wayland_client::protocol::__interfaces::*;
+//!         wayland_scanner::generate_interfaces!("./path/to/the/protocol.xml");
+//!     }
+//!     use self::__interfaces::*;
+//!
+//!     // This macro generates the actual types that represent the wayland objects of
+//!     // your custom protocol
+//!     wayland_scanner::generate_client_code!("./path/to/the/protocol.xml");
+//! }
+//! ```
+
+use std::{ffi::OsString, path::PathBuf};
+
+mod c_interfaces;
+mod client_gen;
+mod common;
+mod interfaces;
+mod parse;
+mod protocol;
+mod server_gen;
+mod token;
+mod util;
+
+/// Proc-macro for generating low-level interfaces associated with an XML specification
+#[proc_macro]
+pub fn generate_interfaces(stream: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let path: OsString = token::parse_lit_str_token(stream).into();
+    let path = if let Some(manifest_dir) = std::env::var_os("CARGO_MANIFEST_DIR") {
+        let mut buf = PathBuf::from(manifest_dir);
+        buf.push(path);
+        buf
+    } else {
+        path.into()
+    };
+    let file = match std::fs::File::open(&path) {
+        Ok(file) => file,
+        Err(e) => panic!("Failed to open protocol file {}: {}", path.display(), e),
+    };
+    let protocol = parse::parse(file);
+    interfaces::generate(&protocol, true).into()
+}
+
+/// Proc-macro for generating client-side API associated with an XML specification
+#[proc_macro]
+pub fn generate_client_code(stream: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let path: OsString = token::parse_lit_str_token(stream).into();
+    let path = if let Some(manifest_dir) = std::env::var_os("CARGO_MANIFEST_DIR") {
+        let mut buf = PathBuf::from(manifest_dir);
+        buf.push(path);
+        buf
+    } else {
+        path.into()
+    };
+    let file = match std::fs::File::open(&path) {
+        Ok(file) => file,
+        Err(e) => panic!("Failed to open protocol file {}: {}", path.display(), e),
+    };
+    let protocol = parse::parse(file);
+    client_gen::generate_client_objects(&protocol).into()
+}
+
+/// Proc-macro for generating server-side API associated with an XML specification
+#[proc_macro]
+pub fn generate_server_code(stream: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let path: OsString = token::parse_lit_str_token(stream).into();
+    let path = if let Some(manifest_dir) = std::env::var_os("CARGO_MANIFEST_DIR") {
+        let mut buf = PathBuf::from(manifest_dir);
+        buf.push(path);
+        buf
+    } else {
+        path.into()
+    };
+    let file = match std::fs::File::open(&path) {
+        Ok(file) => file,
+        Err(e) => panic!("Failed to open protocol file {}: {}", path.display(), e),
+    };
+    let protocol = parse::parse(file);
+    server_gen::generate_server_objects(&protocol).into()
+}
+
+#[cfg(test)]
+fn format_rust_code(code: &str) -> String {
+    use std::{
+        io::Write,
+        process::{Command, Stdio},
+    };
+    if let Ok(mut proc) = Command::new("rustfmt")
+        .arg("--emit=stdout")
+        .arg("--edition=2018")
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        //.stderr(Stdio::null())
+        .spawn()
+    {
+        {
+            let stdin = proc.stdin.as_mut().unwrap();
+            stdin.write_all(code.as_bytes()).unwrap();
+        }
+        if let Ok(output) = proc.wait_with_output() {
+            if output.status.success() {
+                return std::str::from_utf8(&output.stdout).unwrap().to_owned();
+            }
+        }
+    }
+    panic!("Rustfmt failed!");
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
+enum Side {
+    /// wayland client applications
+    Client,
+    /// wayland compositors
+    Server,
+}
+
diff --git a/vendor/wayland-scanner/src/parse.rs b/vendor/wayland-scanner/src/parse.rs
new file mode 100644
index 000000000000..47bb897703f4
--- /dev/null
+++ b/vendor/wayland-scanner/src/parse.rs
@@ -0,0 +1,411 @@
+use super::protocol::*;
+use std::{
+    io::{BufRead, BufReader, Read},
+    str::FromStr,
+};
+
+use quick_xml::{
+    events::{attributes::Attributes, Event},
+    Reader,
+};
+
+pub fn parse<S: Read>(stream: S) -> Protocol {
+    let mut reader = Reader::from_reader(BufReader::new(stream));
+    let reader_config = reader.config_mut();
+    reader_config.trim_text(true);
+    reader_config.expand_empty_elements = true;
+    parse_protocol(reader)
+}
+
+fn decode_utf8_or_panic(txt: Vec<u8>) -> String {
+    match String::from_utf8(txt) {
+        Ok(txt) => txt,
+        Err(e) => panic!("Invalid UTF8: '{}'", String::from_utf8_lossy(&e.into_bytes())),
+    }
+}
+
+fn parse_or_panic<T: FromStr>(txt: &[u8]) -> T {
+    match std::str::from_utf8(txt).ok().and_then(|val| val.parse().ok()) {
+        Some(version) => version,
+        None => panic!(
+            "Invalid value '{}' for parsing type '{}'",
+            String::from_utf8_lossy(txt),
+            std::any::type_name::<T>()
+        ),
+    }
+}
+
+fn init_protocol<R: BufRead>(reader: &mut Reader<R>) -> Protocol {
+    // Check two firsts lines for protocol tag
+    for _ in 0..3 {
+        match reader.read_event_into(&mut Vec::new()) {
+            Ok(Event::Decl(_) | Event::DocType(_) | Event::Comment(_)) => {
+                continue;
+            }
+            Ok(Event::Start(bytes)) => {
+                assert!(bytes.name().into_inner() == b"protocol", "Missing protocol toplevel tag");
+                if let Some(attr) = bytes
+                    .attributes()
+                    .filter_map(|res| res.ok())
+                    .find(|attr| attr.key.into_inner() == b"name")
+                {
+                    return Protocol::new(decode_utf8_or_panic(attr.value.into_owned()));
+                } else {
+                    panic!("Protocol must have a name");
+                }
+            }
+            _ => panic!("Ill-formed protocol file"),
+        }
+    }
+    panic!("Ill-formed protocol file");
+}
+
+fn parse_protocol<R: BufRead>(mut reader: Reader<R>) -> Protocol {
+    let mut protocol = init_protocol(&mut reader);
+
+    loop {
+        match reader.read_event_into(&mut Vec::new()) {
+            Ok(Event::Start(bytes)) => {
+                match bytes.name().into_inner() {
+                    b"copyright" => {
+                        // parse the copyright
+                        let mut copyright = String::new();
+                        loop {
+                            match reader.read_event_into(&mut Vec::new()) {
+                                Ok(Event::Text(text)) => {
+                                    if let Ok(text) = text.decode() {
+                                        copyright.push_str(&text);
+                                    }
+                                }
+                                Ok(Event::CData(cdata)) => {
+                                    if let Ok(cdata) = String::from_utf8(cdata.into_inner().into())
+                                    {
+                                        copyright.push_str(&cdata);
+                                    }
+                                }
+                                Ok(Event::GeneralRef(byte_ref)) => {
+                                    if let Ok(Some(c)) = byte_ref.resolve_char_ref() {
+                                        copyright.push(c);
+                                    } else if let Ok(content) = byte_ref.xml10_content() {
+                                        if let Some(s) =
+                                            quick_xml::escape::resolve_xml_entity(&content)
+                                        {
+                                            copyright.push_str(s);
+                                        }
+                                    }
+                                }
+                                Ok(Event::End(bytes)) => {
+                                    assert!(
+                                        bytes.name().into_inner() == "copyright".as_bytes(),
+                                        "Ill-formed protocol file"
+                                    );
+                                    break;
+                                }
+                                e => {
+                                    panic!("Ill-formed protocol file: {e:?}");
+                                }
+                            }
+                        }
+
+                        protocol.copyright = Some(copyright)
+                    }
+                    b"interface" => {
+                        protocol.interfaces.push(parse_interface(&mut reader, bytes.attributes()));
+                    }
+                    b"description" => {
+                        protocol.description =
+                            Some(parse_description(&mut reader, bytes.attributes()));
+                    }
+                    name => panic!(
+                        "Ill-formed protocol file: unexpected token `{}` in protocol {}",
+                        String::from_utf8_lossy(name),
+                        protocol.name
+                    ),
+                }
+            }
+            Ok(Event::End(bytes)) => {
+                let name = bytes.name().into_inner();
+                assert!(
+                    name == b"protocol",
+                    "Unexpected closing token `{}`",
+                    String::from_utf8_lossy(name)
+                );
+                break;
+            }
+            // ignore comments
+            Ok(Event::Comment(_)) => {}
+            e => panic!("Ill-formed protocol file: unexpected token {e:?}"),
+        }
+    }
+
+    protocol
+}
+
+fn parse_interface<R: BufRead>(reader: &mut Reader<R>, attrs: Attributes) -> Interface {
+    let mut interface = Interface::new();
+    for attr in attrs.filter_map(|res| res.ok()) {
+        match attr.key.into_inner() {
+            b"name" => interface.name = decode_utf8_or_panic(attr.value.into_owned()),
+            b"version" => interface.version = parse_or_panic(&attr.value),
+            _ => {}
+        }
+    }
+
+    loop {
+        match reader.read_event_into(&mut Vec::new()) {
+            Ok(Event::Start(bytes)) => match bytes.name().into_inner() {
+                b"description" => {
+                    interface.description = Some(parse_description(reader, bytes.attributes()))
+                }
+                b"request" => interface.requests.push(parse_request(reader, bytes.attributes())),
+                b"event" => interface.events.push(parse_event(reader, bytes.attributes())),
+                b"enum" => interface.enums.push(parse_enum(reader, bytes.attributes())),
+                name => panic!("Unexpected token: `{}`", String::from_utf8_lossy(name)),
+            },
+            Ok(Event::End(bytes)) if bytes.name().into_inner() == b"interface" => break,
+            _ => {}
+        }
+    }
+
+    interface
+}
+
+fn parse_description<R: BufRead>(reader: &mut Reader<R>, attrs: Attributes) -> (String, String) {
+    let mut summary = String::new();
+    for attr in attrs.filter_map(|res| res.ok()) {
+        if attr.key.into_inner() == b"summary" {
+            summary = String::from_utf8_lossy(&attr.value)
+                .split_whitespace()
+                .collect::<Vec<_>>()
+                .join(" ");
+        }
+    }
+
+    let mut description = String::new();
+    // Some protocols have comments inside their descriptions, so we need to parse them in a loop and
+    // concatenate the parts into a single block of text
+    loop {
+        match reader.read_event_into(&mut Vec::new()) {
+            Ok(Event::Text(bytes)) => {
+                if !description.is_empty() {
+                    description.push_str("\n\n");
+                }
+                description.push_str(&bytes.decode().unwrap_or_default())
+            }
+            Ok(Event::End(bytes)) if bytes.name().into_inner() == b"description" => break,
+            Ok(Event::Comment(_)) => {}
+            e => panic!("Ill-formed protocol file: {e:?}"),
+        }
+    }
+
+    (summary, description)
+}
+
+fn parse_request<R: BufRead>(reader: &mut Reader<R>, attrs: Attributes) -> Message {
+    let mut request = Message::new();
+    for attr in attrs.filter_map(|res| res.ok()) {
+        match attr.key.into_inner() {
+            b"name" => request.name = decode_utf8_or_panic(attr.value.into_owned()),
+            b"type" => request.typ = Some(parse_type(&attr.value)),
+            b"since" => request.since = parse_or_panic(&attr.value),
+            _ => {}
+        }
+    }
+
+    loop {
+        match reader.read_event_into(&mut Vec::new()) {
+            Ok(Event::Start(bytes)) => match bytes.name().into_inner() {
+                b"description" => {
+                    request.description = Some(parse_description(reader, bytes.attributes()))
+                }
+                b"arg" => request.args.push(parse_arg(reader, bytes.attributes())),
+                name => panic!("Unexpected token: `{}`", String::from_utf8_lossy(name)),
+            },
+            Ok(Event::End(bytes)) if bytes.name().into_inner() == b"request" => break,
+            _ => {}
+        }
+    }
+
+    request
+}
+
+fn parse_enum<R: BufRead>(reader: &mut Reader<R>, attrs: Attributes) -> Enum {
+    let mut enu = Enum::new();
+    for attr in attrs.filter_map(|res| res.ok()) {
+        match attr.key.into_inner() {
+            b"name" => enu.name = decode_utf8_or_panic(attr.value.into_owned()),
+            b"since" => enu.since = parse_or_panic(&attr.value),
+            b"bitfield" => {
+                if &attr.value[..] == b"true" {
+                    enu.bitfield = true
+                }
+            }
+            _ => {}
+        }
+    }
+
+    loop {
+        match reader.read_event_into(&mut Vec::new()) {
+            Ok(Event::Start(bytes)) => match bytes.name().into_inner() {
+                b"description" => {
+                    enu.description = Some(parse_description(reader, bytes.attributes()))
+                }
+                b"entry" => enu.entries.push(parse_entry(reader, bytes.attributes())),
+                name => panic!("Unexpected token: `{}`", String::from_utf8_lossy(name)),
+            },
+            Ok(Event::End(bytes)) if bytes.name().into_inner() == b"enum" => break,
+            _ => {}
+        }
+    }
+
+    enu
+}
+
+fn parse_event<R: BufRead>(reader: &mut Reader<R>, attrs: Attributes) -> Message {
+    let mut event = Message::new();
+    for attr in attrs.filter_map(|res| res.ok()) {
+        match attr.key.into_inner() {
+            b"name" => event.name = decode_utf8_or_panic(attr.value.into_owned()),
+            b"type" => event.typ = Some(parse_type(&attr.value)),
+            b"since" => event.since = parse_or_panic(&attr.value),
+            _ => {}
+        }
+    }
+
+    loop {
+        match reader.read_event_into(&mut Vec::new()) {
+            Ok(Event::Start(bytes)) => match bytes.name().into_inner() {
+                b"description" => {
+                    event.description = Some(parse_description(reader, bytes.attributes()))
+                }
+                b"arg" => event.args.push(parse_arg(reader, bytes.attributes())),
+                name => panic!("Unexpected token: `{}`", String::from_utf8_lossy(name)),
+            },
+            Ok(Event::End(bytes)) if bytes.name().into_inner() == b"event" => break,
+            _ => {}
+        }
+    }
+
+    event
+}
+
+fn parse_arg<R: BufRead>(reader: &mut Reader<R>, attrs: Attributes) -> Arg {
+    let mut arg = Arg::new();
+    for attr in attrs.filter_map(|res| res.ok()) {
+        match attr.key.into_inner() {
+            b"name" => arg.name = decode_utf8_or_panic(attr.value.into_owned()),
+            b"type" => arg.typ = parse_type(&attr.value),
+            b"summary" => {
+                arg.summary = Some(
+                    String::from_utf8_lossy(&attr.value)
+                        .split_whitespace()
+                        .collect::<Vec<_>>()
+                        .join(" "),
+                )
+            }
+            b"interface" => arg.interface = Some(parse_or_panic(&attr.value)),
+            b"allow-null" => {
+                if &*attr.value == b"true" {
+                    arg.allow_null = true
+                }
+            }
+            b"enum" => arg.enum_ = Some(decode_utf8_or_panic(attr.value.into_owned())),
+            _ => {}
+        }
+    }
+
+    loop {
+        match reader.read_event_into(&mut Vec::new()) {
+            Ok(Event::Start(bytes)) => match bytes.name().into_inner() {
+                b"description" => {
+                    arg.description = Some(parse_description(reader, bytes.attributes()))
+                }
+                name => panic!("Unexpected token: `{}`", String::from_utf8_lossy(name)),
+            },
+            Ok(Event::End(bytes)) if bytes.name().into_inner() == b"arg" => break,
+            _ => {}
+        }
+    }
+
+    arg
+}
+
+fn parse_type(txt: &[u8]) -> Type {
+    match txt {
+        b"int" => Type::Int,
+        b"uint" => Type::Uint,
+        b"fixed" => Type::Fixed,
+        b"string" => Type::String,
+        b"object" => Type::Object,
+        b"new_id" => Type::NewId,
+        b"array" => Type::Array,
+        b"fd" => Type::Fd,
+        b"destructor" => Type::Destructor,
+        e => panic!("Unexpected type: {}", String::from_utf8_lossy(e)),
+    }
+}
+
+fn parse_entry<R: BufRead>(reader: &mut Reader<R>, attrs: Attributes) -> Entry {
+    let mut entry = Entry::new();
+    for attr in attrs.filter_map(|res| res.ok()) {
+        match attr.key.into_inner() {
+            b"name" => entry.name = decode_utf8_or_panic(attr.value.into_owned()),
+            b"value" => {
+                entry.value = if attr.value.starts_with(b"0x") {
+                    if let Some(val) = std::str::from_utf8(&attr.value[2..])
+                        .ok()
+                        .and_then(|s| u32::from_str_radix(s, 16).ok())
+                    {
+                        val
+                    } else {
+                        panic!("Invalid number: {}", String::from_utf8_lossy(&attr.value))
+                    }
+                } else {
+                    parse_or_panic(&attr.value)
+                };
+            }
+            b"since" => entry.since = parse_or_panic(&attr.value),
+            b"summary" => {
+                entry.summary = Some(
+                    String::from_utf8_lossy(&attr.value)
+                        .split_whitespace()
+                        .collect::<Vec<_>>()
+                        .join(" "),
+                )
+            }
+            _ => {}
+        }
+    }
+
+    loop {
+        match reader.read_event_into(&mut Vec::new()) {
+            Ok(Event::Start(bytes)) => match bytes.name().into_inner() {
+                b"description" => {
+                    entry.description = Some(parse_description(reader, bytes.attributes()))
+                }
+                name => panic!("Unexpected token: `{}`", String::from_utf8_lossy(name)),
+            },
+            Ok(Event::End(bytes)) if bytes.name().into_inner() == b"entry" => break,
+            _ => {}
+        }
+    }
+
+    entry
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn xml_parse() {
+        let protocol_file =
+            std::fs::File::open("./tests/scanner_assets/test-protocol.xml").unwrap();
+        let _ = crate::parse::parse(protocol_file);
+    }
+
+    #[test]
+    fn headerless_xml_parse() {
+        let protocol_file =
+            std::fs::File::open("./tests/scanner_assets/test-headerless-protocol.xml").unwrap();
+        let _ = crate::parse::parse(protocol_file);
+    }
+}
diff --git a/vendor/wayland-scanner/src/protocol.rs b/vendor/wayland-scanner/src/protocol.rs
new file mode 100644
index 000000000000..f9b8966cbf7a
--- /dev/null
+++ b/vendor/wayland-scanner/src/protocol.rs
@@ -0,0 +1,155 @@
+use proc_macro2::TokenStream;
+use quote::quote;
+
+#[derive(Clone, Debug)]
+pub struct Protocol {
+    pub name: String,
+    pub copyright: Option<String>,
+    pub description: Option<(String, String)>,
+    pub interfaces: Vec<Interface>,
+}
+
+impl Protocol {
+    pub fn new(name: String) -> Protocol {
+        Protocol { name, copyright: None, description: None, interfaces: Vec::new() }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct Interface {
+    pub name: String,
+    pub version: u32,
+    pub description: Option<(String, String)>,
+    pub requests: Vec<Message>,
+    pub events: Vec<Message>,
+    pub enums: Vec<Enum>,
+}
+
+impl Interface {
+    pub fn new() -> Interface {
+        Interface {
+            name: String::new(),
+            version: 1,
+            description: None,
+            requests: Vec::new(),
+            events: Vec::new(),
+            enums: Vec::new(),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct Message {
+    pub name: String,
+    pub typ: Option<Type>,
+    pub since: u32,
+    pub description: Option<(String, String)>,
+    pub args: Vec<Arg>,
+}
+
+impl Message {
+    pub fn new() -> Message {
+        Message { name: String::new(), typ: None, since: 1, description: None, args: Vec::new() }
+    }
+
+    pub fn all_null(&self) -> bool {
+        self.args
+            .iter()
+            .all(|a| !((a.typ == Type::Object || a.typ == Type::NewId) && a.interface.is_some()))
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct Arg {
+    pub name: String,
+    pub typ: Type,
+    pub interface: Option<String>,
+    pub summary: Option<String>,
+    pub description: Option<(String, String)>,
+    pub allow_null: bool,
+    pub enum_: Option<String>,
+}
+
+impl Arg {
+    pub fn new() -> Arg {
+        Arg {
+            name: String::new(),
+            typ: Type::Object,
+            interface: None,
+            summary: None,
+            description: None,
+            allow_null: false,
+            enum_: None,
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct Enum {
+    pub name: String,
+    pub since: u16,
+    pub description: Option<(String, String)>,
+    pub entries: Vec<Entry>,
+    pub bitfield: bool,
+}
+
+impl Enum {
+    pub fn new() -> Enum {
+        Enum {
+            name: String::new(),
+            since: 1,
+            description: None,
+            entries: Vec::new(),
+            bitfield: false,
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct Entry {
+    pub name: String,
+    pub value: u32,
+    pub since: u16,
+    pub description: Option<(String, String)>,
+    pub summary: Option<String>,
+}
+
+impl Entry {
+    pub fn new() -> Entry {
+        Entry { name: String::new(), value: 0, since: 1, description: None, summary: None }
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
+pub enum Type {
+    Int,
+    Uint,
+    Fixed,
+    String,
+    Object,
+    NewId,
+    Array,
+    Fd,
+    Destructor,
+}
+
+impl Type {
+    pub fn nullable(self) -> bool {
+        matches!(self, Type::String | Type::Object)
+    }
+
+    pub fn common_type(self) -> TokenStream {
+        match self {
+            Type::Int => quote!(Int),
+            Type::Uint => quote!(Uint),
+            Type::Fixed => quote!(Fixed),
+            Type::Array => quote!(Array),
+            Type::Fd => quote!(Fd),
+            Type::String => quote!(Str),
+            Type::Object => quote!(Object),
+            Type::NewId => quote!(NewId),
+            Type::Destructor => panic!("Destructor is not a valid argument type."),
+        }
+    }
+}
+
diff --git a/vendor/wayland-scanner/src/server_gen.rs b/vendor/wayland-scanner/src/server_gen.rs
new file mode 100644
index 000000000000..11d473cf23ca
--- /dev/null
+++ b/vendor/wayland-scanner/src/server_gen.rs
@@ -0,0 +1,299 @@
+use proc_macro2::{Ident, Span, TokenStream};
+
+use quote::{format_ident, quote};
+
+use crate::{
+    protocol::{Interface, Protocol, Type},
+    util::{description_to_doc_attr, dotted_to_relname, is_keyword, snake_to_camel, to_doc_attr},
+    Side,
+};
+
+pub fn generate_server_objects(protocol: &Protocol) -> TokenStream {
+    protocol
+        .interfaces
+        .iter()
+        .filter(|iface| iface.name != "wl_display")
+        .map(generate_objects_for)
+        .collect()
+}
+
+fn generate_objects_for(interface: &Interface) -> TokenStream {
+    let mod_name = Ident::new(&interface.name, Span::call_site());
+    let mod_doc = interface.description.as_ref().map(description_to_doc_attr);
+    let iface_name = Ident::new(&snake_to_camel(&interface.name), Span::call_site());
+    let iface_const_name = format_ident!("{}_INTERFACE", interface.name.to_ascii_uppercase());
+
+    let enums = crate::common::generate_enums_for(interface);
+    let msg_constants = crate::common::gen_msg_constants(&interface.requests, &interface.events);
+
+    let requests = crate::common::gen_message_enum(
+        &format_ident!("Request"),
+        Side::Server,
+        true,
+        &interface.requests,
+    );
+    let events = crate::common::gen_message_enum(
+        &format_ident!("Event"),
+        Side::Server,
+        false,
+        &interface.events,
+    );
+
+    let parse_body = if interface.name == "wl_registry" {
+        quote! { unimplemented!("`wl_registry` is implemented internally in `wayland-server`") }
+    } else {
+        crate::common::gen_parse_body(interface, Side::Server)
+    };
+    let write_body = crate::common::gen_write_body(interface, Side::Server);
+    let methods = gen_methods(interface);
+
+    let event_ref = if interface.requests.is_empty() {
+        "This interface has no requests."
+    } else {
+        "See also the [Request] enum for this interface."
+    };
+    let docs = match &interface.description {
+        Some((short, long)) => format!("{short}\n\n{long}\n\n{event_ref}"),
+        None => format!("{}\n\n{}", interface.name, event_ref),
+    };
+    let doc_attr = to_doc_attr(&docs);
+
+    quote! {
+        #mod_doc
+        pub mod #mod_name {
+            use std::sync::Arc;
+            use std::os::unix::io::OwnedFd;
+
+            use super::wayland_server::{
+                backend::{
+                    smallvec, ObjectData, ObjectId, InvalidId, WeakHandle,
+                    protocol::{WEnum, Argument, Message, Interface, same_interface}
+                },
+                Resource, Dispatch, DisplayHandle, DispatchError, ResourceData, New, Weak,
+            };
+
+            #enums
+            #msg_constants
+            #requests
+            #events
+
+            #doc_attr
+            #[derive(Debug, Clone)]
+            pub struct #iface_name {
+                id: ObjectId,
+                version: u32,
+                data: Option<Arc<dyn std::any::Any + Send + Sync + 'static>>,
+                handle: WeakHandle,
+            }
+
+            impl std::cmp::PartialEq for #iface_name {
+                #[inline]
+                fn eq(&self, other: &#iface_name) -> bool {
+                    self.id == other.id
+                }
+            }
+
+            impl std::cmp::Eq for #iface_name {}
+
+            impl PartialEq<Weak<#iface_name>> for #iface_name {
+                #[inline]
+                fn eq(&self, other: &Weak<#iface_name>) -> bool {
+                    self.id == other.id()
+                }
+            }
+
+            impl std::borrow::Borrow<ObjectId> for #iface_name {
+                #[inline]
+                fn borrow(&self) -> &ObjectId {
+                    &self.id
+                }
+            }
+
+            impl std::hash::Hash for #iface_name {
+                #[inline]
+                fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+                    self.id.hash(state)
+                }
+            }
+
+            impl super::wayland_server::Resource for #iface_name {
+                type Request = Request;
+                type Event<'event> = Event<'event>;
+
+                #[inline]
+                fn interface() -> &'static Interface{
+                    &super::#iface_const_name
+                }
+
+                #[inline]
+                fn id(&self) -> ObjectId {
+                    self.id.clone()
+                }
+
+                #[inline]
+                fn version(&self) -> u32 {
+                    self.version
+                }
+
+                #[inline]
+                fn data<U: 'static>(&self) -> Option<&U> {
+                    self.data.as_ref().and_then(|arc| (&**arc).downcast_ref::<ResourceData<Self, U>>()).map(|data| &data.udata)
+                }
+
+                #[inline]
+                fn object_data(&self) -> Option<&Arc<dyn std::any::Any + Send + Sync>> {
+                    self.data.as_ref()
+                }
+
+                fn handle(&self) -> &WeakHandle {
+                    &self.handle
+                }
+
+                #[inline]
+                fn from_id(conn: &DisplayHandle, id: ObjectId) -> Result<Self, InvalidId> {
+                    if !same_interface(id.interface(), Self::interface()) && !id.is_null(){
+                        return Err(InvalidId)
+                    }
+                    let version = conn.object_info(id.clone()).map(|info| info.version).unwrap_or(0);
+                    let data = conn.get_object_data(id.clone()).ok();
+                    Ok(#iface_name { id, data, version, handle: conn.backend_handle().downgrade() })
+                }
+
+                fn send_event(&self, evt: Self::Event<'_>) -> Result<(), InvalidId> {
+                    let handle = DisplayHandle::from(self.handle.upgrade().ok_or(InvalidId)?);
+                    handle.send_event(self, evt)
+                }
+
+                fn parse_request(conn: &DisplayHandle, msg: Message<ObjectId, OwnedFd>) -> Result<(Self, Self::Request), DispatchError> {
+                    #parse_body
+                }
+
+                fn write_event<'a>(&self, conn: &DisplayHandle, msg: Self::Event<'a>) -> Result<Message<ObjectId, std::os::unix::io::BorrowedFd<'a>>, InvalidId> {
+                    #write_body
+                }
+
+                fn __set_object_data(&mut self, odata: std::sync::Arc<dyn std::any::Any + Send + Sync + 'static>) {
+                    self.data = Some(odata);
+                }
+            }
+
+            impl #iface_name {
+                #methods
+            }
+        }
+    }
+}
+
+fn gen_methods(interface: &Interface) -> TokenStream {
+    interface
+        .events
+        .iter()
+        .map(|request| {
+            let method_name = format_ident!(
+                "{}{}",
+                if is_keyword(&request.name) { "_" } else { "" },
+                request.name
+            );
+            let enum_variant = Ident::new(&snake_to_camel(&request.name), Span::call_site());
+
+            let fn_args = request.args.iter().flat_map(|arg| {
+                let arg_name =
+                    format_ident!("{}{}", if is_keyword(&arg.name) { "_" } else { "" }, arg.name);
+
+                let arg_type = if let Some(ref enu) = arg.enum_ {
+                    let enum_type = dotted_to_relname(enu);
+                    quote! { #enum_type }
+                } else {
+                    match arg.typ {
+                        Type::Uint => quote! { u32 },
+                        Type::Int => quote! { i32 },
+                        Type::Fixed => quote! { f64 },
+                        Type::String => {
+                            if arg.allow_null {
+                                quote! { Option<String> }
+                            } else {
+                                quote! { String }
+                            }
+                        }
+                        Type::Array => {
+                            if arg.allow_null {
+                                quote! { Option<Vec<u8>> }
+                            } else {
+                                quote! { Vec<u8> }
+                            }
+                        }
+                        Type::Fd => quote! { ::std::os::unix::io::BorrowedFd<'_> },
+                        Type::Object | Type::NewId => {
+                            let iface = arg.interface.as_ref().unwrap();
+                            let iface_mod = Ident::new(iface, Span::call_site());
+                            let iface_type = Ident::new(&snake_to_camel(iface), Span::call_site());
+                            if arg.allow_null {
+                                quote! { Option<&super::#iface_mod::#iface_type> }
+                            } else {
+                                quote! { &super::#iface_mod::#iface_type }
+                            }
+                        }
+                        Type::Destructor => panic!("An argument cannot have type \"destructor\"."),
+                    }
+                };
+
+                Some(quote! {
+                    #arg_name: #arg_type
+                })
+            });
+
+            let enum_args = request.args.iter().flat_map(|arg| {
+                let arg_name =
+                    format_ident!("{}{}", if is_keyword(&arg.name) { "_" } else { "" }, arg.name);
+                if arg.enum_.is_some() {
+                    Some(quote! { #arg_name: WEnum::Value(#arg_name) })
+                } else if arg.typ == Type::Object || arg.typ == Type::NewId {
+                    if arg.allow_null {
+                        Some(quote! { #arg_name: #arg_name.cloned() })
+                    } else {
+                        Some(quote! { #arg_name: #arg_name.clone() })
+                    }
+                } else {
+                    Some(quote! { #arg_name })
+                }
+            });
+
+            let doc_attr = request.description.as_ref().map(description_to_doc_attr);
+
+            quote! {
+                #doc_attr
+                #[allow(clippy::too_many_arguments)]
+                pub fn #method_name(&self, #(#fn_args),*) {
+                    let _ = self.send_event(
+                        Event::#enum_variant {
+                            #(#enum_args),*
+                        }
+                    );
+                }
+            }
+        })
+        .collect()
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn server_gen() {
+        let protocol_file =
+            std::fs::File::open("./tests/scanner_assets/test-protocol.xml").unwrap();
+        let protocol_parsed = crate::parse::parse(protocol_file);
+        let generated: String = super::generate_server_objects(&protocol_parsed).to_string();
+        let generated = crate::format_rust_code(&generated);
+
+        let reference =
+            std::fs::read_to_string("./tests/scanner_assets/test-server-code.rs").unwrap();
+        let reference = crate::format_rust_code(&reference);
+
+        if reference != generated {
+            let diff = similar::TextDiff::from_lines(&reference, &generated);
+            print!("{}", diff.unified_diff().context_radius(10).header("reference", "generated"));
+            panic!("Generated does not match reference!")
+        }
+    }
+}
+
diff --git a/vendor/wayland-scanner/src/token.rs b/vendor/wayland-scanner/src/token.rs
new file mode 100644
index 000000000000..265141298cdf
--- /dev/null
+++ b/vendor/wayland-scanner/src/token.rs
@@ -0,0 +1,187 @@
+// `bytes`, `next_chr`, `parse_lit_str`, `parse_lit_str_cooked` and `parse_lit_str_raw` are adapted
+// from syn:
+// https://github.com/dtolnay/syn/blob/362ee2d02df3f1b2e74c7b7a4cf2ed3c106404c9/src/lit.rs#L1062-L1167
+// and
+// https://github.com/dtolnay/syn/blob/362ee2d02df3f1b2e74c7b7a4cf2ed3c106404c9/src/lit.rs#L1327-L1388
+
+/// Get the byte at offset idx, or a default of `b'\0'` if we're looking
+/// past the end of the input buffer.
+fn byte(s: &str, idx: usize) -> u8 {
+    if idx < s.len() {
+        s.as_bytes()[idx]
+    } else {
+        0
+    }
+}
+
+fn next_chr(s: &str) -> char {
+    s.chars().next().unwrap_or('\0')
+}
+
+// Returns (content, suffix).
+fn parse_lit_str(s: &str) -> String {
+    match byte(s, 0) {
+        b'"' => parse_lit_str_cooked(s),
+        b'r' => parse_lit_str_raw(s),
+        _ => unreachable!(),
+    }
+}
+
+// Clippy false positive
+// https://github.com/rust-lang-nursery/rust-clippy/issues/2329
+#[allow(clippy::needless_continue)]
+fn parse_lit_str_cooked(mut s: &str) -> String {
+    assert_eq!(byte(s, 0), b'"');
+    s = &s[1..];
+
+    let mut content = String::new();
+    'outer: loop {
+        let ch = match byte(s, 0) {
+            b'"' => break,
+            b'\\' => {
+                let b = byte(s, 1);
+                s = &s[2..];
+                match b {
+                    b'x' => {
+                        let (byte, rest) = backslash_x(s);
+                        s = rest;
+                        assert!(byte <= 0x80, "Invalid \\x byte in string literal");
+                        char::from_u32(u32::from(byte)).unwrap()
+                    }
+                    b'u' => {
+                        let (chr, rest) = backslash_u(s);
+                        s = rest;
+                        chr
+                    }
+                    b'n' => '\n',
+                    b'r' => '\r',
+                    b't' => '\t',
+                    b'\\' => '\\',
+                    b'0' => '\0',
+                    b'\'' => '\'',
+                    b'"' => '"',
+                    b'\r' | b'\n' => loop {
+                        let ch = next_chr(s);
+                        if ch.is_whitespace() {
+                            s = &s[ch.len_utf8()..];
+                        } else {
+                            continue 'outer;
+                        }
+                    },
+                    b => panic!("unexpected byte {b:?} after \\ character in byte literal"),
+                }
+            }
+            b'\r' => {
+                assert_eq!(byte(s, 1), b'\n', "Bare CR not allowed in string");
+                s = &s[2..];
+                '\n'
+            }
+            _ => {
+                let ch = next_chr(s);
+                s = &s[ch.len_utf8()..];
+                ch
+            }
+        };
+        content.push(ch);
+    }
+
+    assert!(s.starts_with('"'));
+    content
+}
+
+fn parse_lit_str_raw(mut s: &str) -> String {
+    assert_eq!(byte(s, 0), b'r');
+    s = &s[1..];
+
+    let mut pounds = 0;
+    while byte(s, pounds) == b'#' {
+        pounds += 1;
+    }
+    assert_eq!(byte(s, pounds), b'"');
+    let close = s.rfind('"').unwrap();
+    for end in s[close + 1..close + 1 + pounds].bytes() {
+        assert_eq!(end, b'#');
+    }
+
+    s[pounds + 1..close].to_owned()
+}
+
+fn backslash_x(s: &str) -> (u8, &str) {
+    let mut ch = 0;
+    let b0 = byte(s, 0);
+    let b1 = byte(s, 1);
+    ch += 0x10
+        * match b0 {
+            b'0'..=b'9' => b0 - b'0',
+            b'a'..=b'f' => 10 + (b0 - b'a'),
+            b'A'..=b'F' => 10 + (b0 - b'A'),
+            _ => panic!("unexpected non-hex character after \\x"),
+        };
+    ch += match b1 {
+        b'0'..=b'9' => b1 - b'0',
+        b'a'..=b'f' => 10 + (b1 - b'a'),
+        b'A'..=b'F' => 10 + (b1 - b'A'),
+        _ => panic!("unexpected non-hex character after \\x"),
+    };
+    (ch, &s[2..])
+}
+
+fn backslash_u(mut s: &str) -> (char, &str) {
+    if byte(s, 0) != b'{' {
+        panic!("{}", "expected { after \\u");
+    }
+    s = &s[1..];
+
+    let mut ch = 0;
+    let mut digits = 0;
+    loop {
+        let b = byte(s, 0);
+        let digit = match b {
+            b'0'..=b'9' => b - b'0',
+            b'a'..=b'f' => 10 + b - b'a',
+            b'A'..=b'F' => 10 + b - b'A',
+            b'_' if digits > 0 => {
+                s = &s[1..];
+                continue;
+            }
+            b'}' if digits == 0 => panic!("invalid empty unicode escape"),
+            b'}' => break,
+            _ => panic!("unexpected non-hex character after \\u"),
+        };
+        if digits == 6 {
+            panic!("overlong unicode escape (must have at most 6 hex digits)");
+        }
+        ch *= 0x10;
+        ch += u32::from(digit);
+        digits += 1;
+        s = &s[1..];
+    }
+    assert!(byte(s, 0) == b'}');
+    s = &s[1..];
+
+    if let Some(ch) = char::from_u32(ch) {
+        (ch, s)
+    } else {
+        panic!("character code {ch:x} is not a valid unicode character");
+    }
+}
+
+// End of code adapted from syn
+
+pub fn parse_lit_str_token(mut stream: proc_macro::TokenStream) -> String {
+    loop {
+        let mut iter = stream.into_iter();
+        let token = iter.next().expect("expected string argument");
+        assert!(iter.next().is_none(), "unexpected trailing token");
+        let literal = match token {
+            proc_macro::TokenTree::Literal(literal) => literal,
+            proc_macro::TokenTree::Group(group) => {
+                stream = group.stream();
+                continue;
+            }
+            _ => panic!("expected string argument found `{token:?}`"),
+        };
+        return parse_lit_str(&literal.to_string());
+    }
+}
+
diff --git a/vendor/wayland-scanner/src/util.rs b/vendor/wayland-scanner/src/util.rs
new file mode 100644
index 000000000000..692d849193d9
--- /dev/null
+++ b/vendor/wayland-scanner/src/util.rs
@@ -0,0 +1,116 @@
+use proc_macro2::{Ident, Span, TokenStream};
+use quote::{quote, ToTokens};
+
+pub(crate) fn to_doc_attr(text: &str) -> TokenStream {
+    let text = text.lines().map(str::trim).collect::<Vec<_>>().join("\n");
+    let text = text.trim();
+
+    quote!(#[doc = #text])
+}
+
+pub(crate) fn description_to_doc_attr((short, long): &(String, String)) -> TokenStream {
+    to_doc_attr(&format!("{short}\n\n{long}"))
+}
+
+pub fn is_keyword(txt: &str) -> bool {
+    matches!(
+        txt,
+        "abstract"
+            | "alignof"
+            | "as"
+            | "become"
+            | "box"
+            | "break"
+            | "const"
+            | "continue"
+            | "crate"
+            | "do"
+            | "else"
+            | "enum"
+            | "extern"
+            | "false"
+            | "final"
+            | "fn"
+            | "for"
+            | "if"
+            | "impl"
+            | "in"
+            | "let"
+            | "loop"
+            | "macro"
+            | "match"
+            | "mod"
+            | "move"
+            | "mut"
+            | "offsetof"
+            | "override"
+            | "priv"
+            | "proc"
+            | "pub"
+            | "pure"
+            | "ref"
+            | "return"
+            | "Self"
+            | "self"
+            | "sizeof"
+            | "static"
+            | "struct"
+            | "super"
+            | "trait"
+            | "true"
+            | "type"
+            | "typeof"
+            | "unsafe"
+            | "unsized"
+            | "use"
+            | "virtual"
+            | "where"
+            | "while"
+            | "yield"
+            | "__handler"
+            | "__object"
+    )
+}
+
+pub fn is_camel_keyword(txt: &str) -> bool {
+    matches!(txt, "Self")
+}
+
+pub fn snake_to_camel(input: &str) -> String {
+    let result = input
+        .split('_')
+        .flat_map(|s| {
+            let mut first = true;
+            s.chars().map(move |c| {
+                if first {
+                    first = false;
+                    c.to_ascii_uppercase()
+                } else {
+                    c
+                }
+            })
+        })
+        .collect::<String>();
+
+    if is_camel_keyword(&result) {
+        format!("_{}", &result)
+    } else {
+        result
+    }
+}
+
+pub fn dotted_to_relname(input: &str) -> TokenStream {
+    let mut it = input.split('.');
+    match (it.next(), it.next()) {
+        (Some(module), Some(name)) => {
+            let module = Ident::new(module, Span::call_site());
+            let ident = Ident::new(&snake_to_camel(name), Span::call_site());
+            quote::quote!(super::#module::#ident)
+        }
+        (Some(name), None) => {
+            Ident::new(&snake_to_camel(name), Span::call_site()).into_token_stream()
+        }
+        _ => unreachable!(),
+    }
+}
+