diff --git a/.changes/change-pr-1963.md b/.changes/change-pr-1963.md
new file mode 100644
index 00000000..ce68f4e2
--- /dev/null
+++ b/.changes/change-pr-1963.md
@@ -0,0 +1,5 @@
+---
+"sql-js": patch
+---
+
+Fixed incorrect documentation of the select method in the Database class.
diff --git a/.changes/fix-1985.md b/.changes/fix-1985.md
new file mode 100644
index 00000000..6f0c3999
--- /dev/null
+++ b/.changes/fix-1985.md
@@ -0,0 +1,5 @@
+---
+"clipboard-manager": patch
+---
+
+Fix that `read_image` wrongly set the image rgba data with binary PNG data.
diff --git a/.changes/fix-sql-blocking.md b/.changes/fix-sql-blocking.md
new file mode 100644
index 00000000..518f02a5
--- /dev/null
+++ b/.changes/fix-sql-blocking.md
@@ -0,0 +1,5 @@
+---
+sql: patch
+---
+
+Replace `Mutex` with `RwLock` to enable concurrent SQL execution.
\ No newline at end of file
diff --git a/.changes/fs-writeTextFile-utf8-path.md b/.changes/fs-writeTextFile-utf8-path.md
new file mode 100644
index 00000000..561e83e3
--- /dev/null
+++ b/.changes/fs-writeTextFile-utf8-path.md
@@ -0,0 +1,5 @@
+---
+"fs-js": "patch"
+---
+
+Fix `writeTextFile` converting UTF-8 characters (for example `äöü`) in the given path into replacement character (`�`)
\ No newline at end of file
diff --git a/.github/workflows/lint-rust.yml b/.github/workflows/lint-rust.yml
index 39cc37fe..d9e0c50c 100644
--- a/.github/workflows/lint-rust.yml
+++ b/.github/workflows/lint-rust.yml
@@ -126,7 +126,7 @@ jobs:
   clippy:
     needs: changes
     if: ${{ needs.changes.outputs.packages != '[]' && needs.changes.outputs.packages != '' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/test-rust.yml b/.github/workflows/test-rust.yml
index 016e3673..3793160d 100644
--- a/.github/workflows/test-rust.yml
+++ b/.github/workflows/test-rust.yml
@@ -168,7 +168,7 @@ jobs:
             }
           - {
               target: x86_64-unknown-linux-gnu,
-              os: ubuntu-latest,
+              os: ubuntu-22.04,
               runner: 'cargo',
               command: 'test'
             }
diff --git a/Cargo.lock b/Cargo.lock
index 2044a052..2522f63d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
 
 [[package]]
 name = "addr2line"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
@@ -218,7 +218,7 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 
 [[package]]
 name = "api"
-version = "2.0.2"
+version = "2.0.4"
 dependencies = [
  "log",
  "serde",
@@ -341,9 +341,9 @@ checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
 
 [[package]]
 name = "ashpd"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a"
+checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9"
 dependencies = [
  "enumflags2",
  "futures-channel",
@@ -396,11 +396,11 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.12"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
+checksum = "103db485efc3e41214fe4fda9f3dbeae2eb9082f48fd236e6095627a9422066e"
 dependencies = [
- "brotli",
+ "brotli 7.0.0",
  "flate2",
  "futures-core",
  "memchr",
@@ -598,9 +598,9 @@ dependencies = [
 
 [[package]]
 name = "avif-serialize"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2"
+checksum = "e335041290c43101ca215eed6f43ec437eb5a42125573f600fc3fa42b9bddd62"
 dependencies = [
  "arrayvec",
 ]
@@ -682,9 +682,9 @@ dependencies = [
 
 [[package]]
 name = "bitstream-io"
-version = "2.3.0"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e"
+checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452"
 
 [[package]]
 name = "bitvec"
@@ -799,6 +799,17 @@ dependencies = [
  "brotli-decompressor",
 ]
 
+[[package]]
+name = "brotli"
+version = "7.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
 [[package]]
 name = "brotli-decompressor"
 version = "4.0.1"
@@ -856,9 +867,9 @@ dependencies = [
 
 [[package]]
 name = "bytemuck"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
 
 [[package]]
 name = "byteorder"
@@ -950,9 +961,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.22"
+version = "1.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
+checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
 dependencies = [
  "jobserver",
  "libc",
@@ -1060,18 +1071,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.18"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.18"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2220,9 +2231,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2235,9 +2246,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2245,15 +2256,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2273,9 +2284,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
@@ -2292,9 +2303,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2303,21 +2314,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2516,9 +2527,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.31.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "gio"
@@ -2708,7 +2719,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2744,6 +2755,12 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
 [[package]]
 name = "hashlink"
 version = "0.9.1"
@@ -2866,9 +2883,9 @@ checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -2878,9 +2895,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2908,7 +2925,7 @@ dependencies = [
  "hyper",
  "hyper-util",
  "rustls",
- "rustls-native-certs 0.8.0",
+ "rustls-native-certs",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
@@ -3012,9 +3029,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.25.2"
+version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
+checksum = "d97eb9a8e0cd5b76afea91d7eecd5cf8338cd44ced04256cf1f800474b227c52"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -3035,9 +3052,9 @@ dependencies = [
 
 [[package]]
 name = "image-webp"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904"
+checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
 dependencies = [
  "byteorder-lite",
  "quick-error 2.0.1",
@@ -3045,9 +3062,9 @@ dependencies = [
 
 [[package]]
 name = "imgref"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126"
+checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
 
 [[package]]
 name = "indexmap"
@@ -3062,12 +3079,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
  "serde",
 ]
 
@@ -3184,9 +3201,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.10.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-docker"
@@ -3313,9 +3330,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3441,9 +3458,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "f0b21006cd1874ae9e650973c565615676dc4a274c965bb0a73796dac838ce4f"
 
 [[package]]
 name = "libflate"
@@ -3519,9 +3536,9 @@ dependencies = [
 
 [[package]]
 name = "libsodium-sys-stable"
-version = "1.21.2"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42631d334de875c636a1aae7adb515653ac2e771e5a2ce74b1053f5a4412df3a"
+checksum = "90e7b5bc5a90cb1a680d8b0340f935d575292b8458e077f8da8cf134289d7dcf"
 dependencies = [
  "cc",
  "libc",
@@ -3646,7 +3663,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
 dependencies = [
  "cfg-if",
- "rayon",
 ]
 
 [[package]]
@@ -3919,9 +3935,9 @@ dependencies = [
 
 [[package]]
 name = "notify-debouncer-full"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154"
+checksum = "fb7fd166739789c9ff169e654dc1501373db9d80a4c3f972817c8a4d7cf8f34e"
 dependencies = [
  "crossbeam-channel",
  "file-id",
@@ -4084,6 +4100,9 @@ name = "objc-sys"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
+dependencies = [
+ "cc",
+]
 
 [[package]]
 name = "objc2"
@@ -4111,6 +4130,30 @@ dependencies = [
  "objc2-quartz-core",
 ]
 
+[[package]]
+name = "objc2-cloud-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-contacts"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc2-core-data"
 version = "0.2.2"
@@ -4135,6 +4178,18 @@ dependencies = [
  "objc2-metal",
 ]
 
+[[package]]
+name = "objc2-core-location"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-contacts",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc2-encode"
 version = "4.0.3"
@@ -4154,6 +4209,18 @@ dependencies = [
  "objc2",
 ]
 
+[[package]]
+name = "objc2-link-presentation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc2-metal"
 version = "0.2.2"
@@ -4179,6 +4246,74 @@ dependencies = [
  "objc2-metal",
 ]
 
+[[package]]
+name = "objc2-symbols"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-ui-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-foundation",
+ "objc2-link-presentation",
+ "objc2-quartz-core",
+ "objc2-symbols",
+ "objc2-uniform-type-identifiers",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-uniform-type-identifiers"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-web-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68bc69301064cebefc6c4c90ce9cba69225239e4b8ff99d445a2b5563797da65"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc_id"
 version = "0.1.1"
@@ -4190,21 +4325,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.20.1"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
-dependencies = [
- "portable-atomic",
-]
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "opaque-debug"
@@ -4225,9 +4357,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.66"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
@@ -4266,9 +4398,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -4386,9 +4518,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pathdiff"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"
 
 [[package]]
 name = "pbkdf2"
@@ -4606,7 +4738,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
 dependencies = [
  "base64 0.22.1",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "quick-xml 0.32.0",
  "serde",
  "time",
@@ -4663,12 +4795,6 @@ dependencies = [
  "universal-hash",
 ]
 
-[[package]]
-name = "portable-atomic"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -4742,27 +4868,27 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
+checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
 dependencies = [
  "profiling-procmacros",
 ]
 
 [[package]]
 name = "profiling-procmacros"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
+checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
 dependencies = [
  "quote",
  "syn 2.0.79",
@@ -5033,16 +5159,15 @@ dependencies = [
 
 [[package]]
 name = "ravif"
-version = "0.11.5"
+version = "0.11.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234"
+checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd"
 dependencies = [
  "avif-serialize",
  "imgref",
  "loop9",
  "quick-error 2.0.1",
  "rav1e",
- "rayon",
  "rgb",
 ]
 
@@ -5085,9 +5210,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -5143,9 +5268,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
 dependencies = [
  "async-compression",
  "base64 0.22.1",
@@ -5175,7 +5300,7 @@ dependencies = [
  "pin-project-lite",
  "quinn",
  "rustls",
- "rustls-native-certs 0.7.3",
+ "rustls-native-certs",
  "rustls-pemfile",
  "rustls-pki-types",
  "serde",
@@ -5236,9 +5361,6 @@ name = "rgb"
 version = "0.8.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
-dependencies = [
- "bytemuck",
-]
 
 [[package]]
 name = "ring"
@@ -5396,9 +5518,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.13"
+version = "0.23.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
 dependencies = [
  "once_cell",
  "ring",
@@ -5408,19 +5530,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile",
- "rustls-pki-types",
- "schannel",
- "security-framework",
-]
-
 [[package]]
 name = "rustls-native-certs"
 version = "0.8.0"
@@ -5436,19 +5545,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
 [[package]]
 name = "rustls-webpki"
@@ -5499,9 +5607,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
 dependencies = [
  "windows-sys 0.59.0",
 ]
@@ -5716,15 +5824,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -5734,9 +5842,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -6040,7 +6148,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "hashlink",
  "hex",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "log",
  "memchr",
  "once_cell",
@@ -6425,9 +6533,9 @@ dependencies = [
 
 [[package]]
 name = "tao"
-version = "0.30.2"
+version = "0.30.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e48d7c56b3f7425d061886e8ce3b6acfab1993682ed70bef50fd133d721ee6"
+checksum = "a0dbbebe82d02044dfa481adca1550d6dd7bd16e086bc34fa0fbecceb5a63751"
 dependencies = [
  "bitflags 2.6.0",
  "cocoa",
@@ -6498,9 +6606,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "2.0.1"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3fad474c02a3bcd4a304afff97159a31b9bab84e29563f7109c7b0ce8cd774e"
+checksum = "44438500b50708bfc1e6083844e135d1b516325aae58710dcd8fb67e050ae87c"
 dependencies = [
  "anyhow",
  "bytes",
@@ -6581,7 +6689,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95d7443dd4f0b597704b6a14b964ee2ed16e99928d8e6292ae9825f09fbcd30e"
 dependencies = [
  "base64 0.22.1",
- "brotli",
+ "brotli 6.0.0",
  "ico",
  "json-patch",
  "plist",
@@ -6717,7 +6825,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-dialog"
-version = "2.0.1"
+version = "2.0.3"
 dependencies = [
  "log",
  "raw-window-handle",
@@ -6733,7 +6841,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-fs"
-version = "2.0.1"
+version = "2.0.3"
 dependencies = [
  "anyhow",
  "dunce",
@@ -6793,7 +6901,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-http"
-version = "2.0.1"
+version = "2.0.3"
 dependencies = [
  "data-url",
  "http",
@@ -6897,7 +7005,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-persisted-scope"
-version = "2.0.1"
+version = "2.0.3"
 dependencies = [
  "aho-corasick",
  "bincode",
@@ -6911,7 +7019,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-positioner"
-version = "2.0.1"
+version = "2.0.2"
 dependencies = [
  "log",
  "serde",
@@ -6932,7 +7040,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-shell"
-version = "2.0.1"
+version = "2.0.2"
 dependencies = [
  "encoding_rs",
  "log",
@@ -6969,7 +7077,7 @@ name = "tauri-plugin-sql"
 version = "2.0.1"
 dependencies = [
  "futures-core",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "log",
  "serde",
  "serde_json",
@@ -6983,7 +7091,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-store"
-version = "2.0.1"
+version = "2.1.0"
 dependencies = [
  "dunce",
  "log",
@@ -7094,9 +7202,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af12ad1af974b274ef1d32a94e6eba27a312b429ef28fcb98abc710df7f9151d"
+checksum = "c8f437293d6f5e5dce829250f4dbdce4e0b52905e297a6689cc2963eb53ac728"
 dependencies = [
  "dpi",
  "gtk",
@@ -7113,9 +7221,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45e88aa0b11b302d836e6ea3e507a6359044c4a8bc86b865ba99868c695753d"
+checksum = "1431602bcc71f2f840ad623915c9842ecc32999b867c4a787d975a17a9625cc6"
 dependencies = [
  "gtk",
  "http",
@@ -7144,7 +7252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c38b0230d6880cf6dd07b6d7dd7789a0869f98ac12146e0d18d1c1049215a045"
 dependencies = [
  "aes-gcm",
- "brotli",
+ "brotli 6.0.0",
  "cargo_metadata",
  "ctor",
  "dunce",
@@ -7420,7 +7528,7 @@ dependencies = [
  "log",
  "native-tls",
  "rustls",
- "rustls-native-certs 0.8.0",
+ "rustls-native-certs",
  "rustls-pki-types",
  "tokio",
  "tokio-native-tls",
@@ -7481,7 +7589,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -7494,7 +7602,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -7541,9 +7649,9 @@ dependencies = [
 
 [[package]]
 name = "tray-icon"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f"
+checksum = "7c92af36a182b46206723bdf8a7942e20838cde1cf062e5b97854d57eb01763b"
 dependencies = [
  "core-graphics 0.24.0",
  "crossbeam-channel",
@@ -7668,9 +7776,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-ident"
@@ -7689,9 +7797,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-properties"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524"
+checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 
 [[package]]
 name = "unicode-segmentation"
@@ -7790,9 +7898,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom 0.2.15",
  "serde",
@@ -7901,9 +8009,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -7912,9 +8020,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
@@ -7927,9 +8035,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -7939,9 +8047,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -7949,9 +8057,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7962,9 +8070,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-streams"
@@ -8041,9 +8149,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -8676,14 +8784,12 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.44.1"
+version = "0.46.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "440600584cfbd8b0d28eace95c1f2c253db05dae43780b79380aa1e868f04c73"
+checksum = "6fa1c8c760041c64ce6be99f83d6cb55fe3fcd85a1ad46d32895f6e65cee87ba"
 dependencies = [
  "base64 0.22.1",
- "block",
- "cocoa",
- "core-graphics 0.24.0",
+ "block2",
  "crossbeam-channel",
  "dpi",
  "dunce",
@@ -8696,8 +8802,11 @@ dependencies = [
  "kuchikiki",
  "libc",
  "ndk",
- "objc",
- "objc_id",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "objc2-ui-kit",
+ "objc2-web-kit",
  "once_cell",
  "percent-encoding",
  "raw-window-handle",
@@ -8911,7 +9020,7 @@ dependencies = [
  "crossbeam-utils",
  "displaydoc",
  "flate2",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "memchr",
  "thiserror",
  "zopfli",
diff --git a/Cargo.toml b/Cargo.toml
index f4d619d3..a17d33ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ resolver = "2"
 [workspace.dependencies]
 serde = { version = "1", features = ["derive"] }
 log = "0.4"
-tauri = { version = "2.0.1", default-features = false }
+tauri = { version = "2.0.4", default-features = false }
 tauri-build = "2.0.1"
 tauri-plugin = "2.0.1"
 tauri-utils = "2.0.1"
diff --git a/examples/api/CHANGELOG.md b/examples/api/CHANGELOG.md
index 022ce3f2..0fc70ec0 100644
--- a/examples/api/CHANGELOG.md
+++ b/examples/api/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## \[2.0.1]
+
+### Dependencies
+
+- Upgraded to `dialog-js@2.0.1`
+- Upgraded to `fs-js@2.0.1`
+- Upgraded to `http-js@2.0.1`
+- Upgraded to `shell-js@2.0.1`
+- Upgraded to `store-js@2.1.0`
+
 ## \[2.0.0]
 
 - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release.
diff --git a/examples/api/package.json b/examples/api/package.json
index 599276b8..8336c7d4 100644
--- a/examples/api/package.json
+++ b/examples/api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "svelte-app",
   "private": true,
-  "version": "2.0.0",
+  "version": "2.0.1",
   "type": "module",
   "scripts": {
     "dev": "vite --clearScreen false",
@@ -9,23 +9,23 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "@tauri-apps/api": "2.0.1",
+    "@tauri-apps/api": "2.0.2",
     "@tauri-apps/plugin-barcode-scanner": "2.0.0",
     "@tauri-apps/plugin-biometric": "2.0.0",
     "@tauri-apps/plugin-cli": "2.0.0",
     "@tauri-apps/plugin-clipboard-manager": "2.0.0",
-    "@tauri-apps/plugin-dialog": "2.0.0",
-    "@tauri-apps/plugin-fs": "2.0.0",
+    "@tauri-apps/plugin-dialog": "2.0.1",
+    "@tauri-apps/plugin-fs": "2.0.1",
     "@tauri-apps/plugin-geolocation": "2.0.0",
     "@tauri-apps/plugin-global-shortcut": "2.0.0",
     "@tauri-apps/plugin-haptics": "2.0.0",
-    "@tauri-apps/plugin-http": "2.0.0",
+    "@tauri-apps/plugin-http": "2.0.1",
     "@tauri-apps/plugin-nfc": "2.0.0",
     "@tauri-apps/plugin-notification": "2.0.0",
     "@tauri-apps/plugin-os": "2.0.0",
     "@tauri-apps/plugin-process": "2.0.0",
-    "@tauri-apps/plugin-shell": "2.0.0",
-    "@tauri-apps/plugin-store": "2.0.0",
+    "@tauri-apps/plugin-shell": "2.0.1",
+    "@tauri-apps/plugin-store": "2.1.0",
     "@tauri-apps/plugin-updater": "2.0.0",
     "@zerodevx/svelte-json-view": "1.0.11"
   },
@@ -33,7 +33,7 @@
     "@iconify-json/codicon": "^1.1.37",
     "@iconify-json/ph": "^1.1.8",
     "@sveltejs/vite-plugin-svelte": "^3.0.1",
-    "@tauri-apps/cli": "2.0.0",
+    "@tauri-apps/cli": "2.0.3",
     "@unocss/extractor-svelte": "^0.63.0",
     "svelte": "^4.2.19",
     "unocss": "^0.63.0",
diff --git a/examples/api/src-tauri/CHANGELOG.md b/examples/api/src-tauri/CHANGELOG.md
index 0f557732..b914893a 100644
--- a/examples/api/src-tauri/CHANGELOG.md
+++ b/examples/api/src-tauri/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## \[2.0.4]
+
+### Dependencies
+
+- Upgraded to `fs@2.0.3`
+- Upgraded to `dialog@2.0.3`
+- Upgraded to `http@2.0.3`
+
+## \[2.0.3]
+
+### Dependencies
+
+- Upgraded to `dialog@2.0.2`
+- Upgraded to `fs@2.0.2`
+- Upgraded to `http@2.0.2`
+- Upgraded to `shell@2.0.2`
+- Upgraded to `store@2.1.0`
+
 ## \[2.0.2]
 
 - [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml
index 50cd940f..db6ec283 100644
--- a/examples/api/src-tauri/Cargo.toml
+++ b/examples/api/src-tauri/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "api"
 publish = false
-version = "2.0.2"
+version = "2.0.4"
 description = "An example Tauri Application showcasing the api"
 edition = "2021"
 rust-version = { workspace = true }
@@ -20,21 +20,21 @@ serde = { workspace = true }
 tiny_http = "0.12"
 log = { workspace = true }
 tauri-plugin-log = { path = "../../../plugins/log", version = "2.0.1" }
-tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.0.1", features = [
+tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.0.3", features = [
   "watch",
 ] }
 tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.0.1" }
-tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.1" }
+tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.3" }
 tauri-plugin-http = { path = "../../../plugins/http", features = [
   "multipart",
-], version = "2.0.1" }
+], version = "2.0.3" }
 tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.0.1", features = [
   "windows7-compat",
 ] }
 tauri-plugin-os = { path = "../../../plugins/os", version = "2.0.1" }
 tauri-plugin-process = { path = "../../../plugins/process", version = "2.0.1" }
-tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.0.1" }
-tauri-plugin-store = { path = "../../../plugins/store", version = "2.0.1" }
+tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.0.2" }
+tauri-plugin-store = { path = "../../../plugins/store", version = "2.1.0" }
 
 [dependencies.tauri]
 workspace = true
diff --git a/examples/api/src-tauri/capabilities/base.json b/examples/api/src-tauri/capabilities/base.json
index b76e898c..607828e9 100644
--- a/examples/api/src-tauri/capabilities/base.json
+++ b/examples/api/src-tauri/capabilities/base.json
@@ -79,10 +79,6 @@
       ],
       "deny": ["$APPDATA/db/*.stronghold"]
     },
-    "store:allow-entries",
-    "store:allow-get",
-    "store:allow-set",
-    "store:allow-save",
-    "store:allow-load"
+    "store:default"
   ]
 }
diff --git a/examples/api/src-tauri/gen/android/.idea/gradle.xml b/examples/api/src-tauri/gen/android/.idea/gradle.xml
index be741543..ff118549 100644
--- a/examples/api/src-tauri/gen/android/.idea/gradle.xml
+++ b/examples/api/src-tauri/gen/android/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
@@ -18,7 +19,7 @@
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
-            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tauri-2.0.0-rc.7/mobile/android" />
+            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tauri-2.0.2/mobile/android" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/buildSrc" />
@@ -27,6 +28,8 @@
             <option value="$PROJECT_DIR$/../../../../../plugins/clipboard-manager/android" />
             <option value="$PROJECT_DIR$/../../../../../plugins/dialog/android" />
             <option value="$PROJECT_DIR$/../../../../../plugins/fs/android" />
+            <option value="$PROJECT_DIR$/../../../../../plugins/geolocation/android" />
+            <option value="$PROJECT_DIR$/../../../../../plugins/haptics/android" />
             <option value="$PROJECT_DIR$/../../../../../plugins/nfc/android" />
             <option value="$PROJECT_DIR$/../../../../../plugins/notification/android" />
             <option value="$PROJECT_DIR$/../../../../../plugins/shell/android" />
diff --git a/examples/api/src-tauri/src/lib.rs b/examples/api/src-tauri/src/lib.rs
index f3cacc43..701f6731 100644
--- a/examples/api/src-tauri/src/lib.rs
+++ b/examples/api/src-tauri/src/lib.rs
@@ -67,7 +67,8 @@ pub fn run() {
                     .user_agent(&format!("Tauri API - {}", std::env::consts::OS))
                     .title("Tauri API Validation")
                     .inner_size(1000., 800.)
-                    .min_inner_size(600., 400.);
+                    .min_inner_size(600., 400.)
+                    .visible(false);
             }
 
             #[cfg(target_os = "windows")]
diff --git a/examples/api/src/views/Store.svelte b/examples/api/src/views/Store.svelte
index d8e6653b..6248b009 100644
--- a/examples/api/src/views/Store.svelte
+++ b/examples/api/src/views/Store.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Store } from "@tauri-apps/plugin-store";
+  import { LazyStore } from "@tauri-apps/plugin-store";
   import { onMount } from "svelte";
 
   export let onMessage;
@@ -7,28 +7,65 @@
   let key;
   let value;
 
-  const store = new Store("cache.json");
+  let store = new LazyStore("cache.json");
   let cache = {};
 
-  onMount(async () => {
-    await store.load();
-    const values = await store.entries();
-    for (const [key, value] of values) {
-      cache[key] = value;
+  async function refreshEntries() {
+    try {
+      const values = await store.entries();
+      cache = {};
+      for (const [key, value] of values) {
+        cache[key] = value;
+      }
+    } catch (error) {
+      onMessage(error);
     }
-    cache = cache;
+  }
+
+  onMount(async () => {
+    await refreshEntries();
   });
 
-  function write(key, value) {
-    store
-      .set(key, value)
-      .then(() => store.get(key))
-      .then((v) => {
-        cache[key] = v;
+  async function write(key, value) {
+    try {
+      if (value) {
+        await store.set(key, value);
+      } else {
+        await store.delete(key);
+      }
+      const v = await store.get(key);
+      if (v === undefined) {
+        delete cache[key];
         cache = cache;
-      })
-      .then(() => store.save())
-      .catch(onMessage);
+      } else {
+        cache[key] = v;
+      }
+    } catch (error) {
+      onMessage(error);
+    }
+  }
+
+  async function reset() {
+    try {
+      await store.reset();
+    } catch (error) {
+      onMessage(error);
+    }
+    await refreshEntries();
+  }
+
+  async function close() {
+    try {
+      await store.close();
+      onMessage("Store is now closed, any new operations will error out");
+    } catch (error) {
+      onMessage(error);
+    }
+  }
+
+  function reopen() {
+    store = new LazyStore("cache.json");
+    onMessage("We made a new `LazyStore` instance, operations will now work");
   }
 </script>
 
@@ -44,7 +81,12 @@
       <input class="grow input" bind:value />
     </div>
 
-    <button class="btn" on:click={() => write(key, value)}> Write </button>
+    <div>
+      <button class="btn" on:click={() => write(key, value)}>Write</button>
+      <button class="btn" on:click={() => reset()}>Reset</button>
+      <button class="btn" on:click={() => close()}>Close</button>
+      <button class="btn" on:click={() => reopen()}>Re-open</button>
+    </div>
   </div>
 
   <div>
diff --git a/package.json b/package.json
index 38b712dc..3daae86c 100644
--- a/package.json
+++ b/package.json
@@ -10,20 +10,20 @@
     "format:check": "prettier --check ."
   },
   "devDependencies": {
-    "@eslint/js": "9.11.1",
+    "@eslint/js": "9.13.0",
     "@rollup/plugin-node-resolve": "15.3.0",
     "@rollup/plugin-terser": "0.4.4",
     "@rollup/plugin-typescript": "11.1.6",
     "@types/eslint__js": "8.42.3",
     "covector": "^0.12.3",
-    "eslint": "9.11.1",
+    "eslint": "9.13.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-security": "3.0.1",
     "prettier": "3.3.3",
     "rollup": "4.22.4",
     "tslib": "2.7.0",
-    "typescript": "5.6.2",
-    "typescript-eslint": "8.8.0"
+    "typescript": "5.6.3",
+    "typescript-eslint": "8.10.0"
   },
   "resolutions": {
     "semver": ">=7.5.2",
diff --git a/plugins/clipboard-manager/Cargo.toml b/plugins/clipboard-manager/Cargo.toml
index 3c086574..799b6010 100644
--- a/plugins/clipboard-manager/Cargo.toml
+++ b/plugins/clipboard-manager/Cargo.toml
@@ -37,4 +37,3 @@ tauri = { workspace = true, features = ["wry"] }
 
 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 arboard = "3"
-image = "0.25"
diff --git a/plugins/clipboard-manager/src/desktop.rs b/plugins/clipboard-manager/src/desktop.rs
index bb8ba318..5edd4934 100644
--- a/plugins/clipboard-manager/src/desktop.rs
+++ b/plugins/clipboard-manager/src/desktop.rs
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: MIT
 
 use arboard::ImageData;
-use image::ImageEncoder;
 use serde::de::DeserializeOwned;
 use tauri::{image::Image, plugin::PluginApi, AppHandle, Runtime};
 
@@ -85,16 +84,11 @@ impl<R: Runtime> Clipboard<R> {
         match &self.clipboard {
             Ok(clipboard) => {
                 let image = clipboard.lock().unwrap().get_image()?;
-
-                let mut buffer: Vec<u8> = Vec::new();
-                image::codecs::png::PngEncoder::new(&mut buffer).write_image(
-                    &image.bytes,
+                let image = Image::new_owned(
+                    image.bytes.to_vec(),
                     image.width as u32,
                     image.height as u32,
-                    image::ExtendedColorType::Rgba8,
-                )?;
-
-                let image = Image::new_owned(buffer, image.width as u32, image.height as u32);
+                );
                 Ok(image)
             }
             Err(e) => Err(crate::Error::Clipboard(e.to_string())),
diff --git a/plugins/clipboard-manager/src/error.rs b/plugins/clipboard-manager/src/error.rs
index 7e36a11b..1b8cf482 100644
--- a/plugins/clipboard-manager/src/error.rs
+++ b/plugins/clipboard-manager/src/error.rs
@@ -15,9 +15,6 @@ pub enum Error {
     Clipboard(String),
     #[error(transparent)]
     Tauri(#[from] tauri::Error),
-    #[cfg(desktop)]
-    #[error("invalid image: {0}")]
-    Image(#[from] image::ImageError),
 }
 
 impl Serialize for Error {
diff --git a/plugins/deep-link/examples/app/package.json b/plugins/deep-link/examples/app/package.json
index 98864087..5b9e8efc 100644
--- a/plugins/deep-link/examples/app/package.json
+++ b/plugins/deep-link/examples/app/package.json
@@ -10,11 +10,11 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@tauri-apps/api": "2.0.1",
+    "@tauri-apps/api": "2.0.2",
     "@tauri-apps/plugin-deep-link": "2.0.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.0.0",
+    "@tauri-apps/cli": "2.0.3",
     "typescript": "^5.2.2",
     "vite": "^5.4.7"
   }
diff --git a/plugins/dialog/CHANGELOG.md b/plugins/dialog/CHANGELOG.md
index 150e092e..57c51092 100644
--- a/plugins/dialog/CHANGELOG.md
+++ b/plugins/dialog/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## \[2.0.3]
+
+### Dependencies
+
+- Upgraded to `fs@2.0.3`
+
+## \[2.0.1]
+
+- [`2302c2db`](https://github.com/tauri-apps/plugins-workspace/commit/2302c2db1c49673e61dcbda8cdb01b2c57e9ba6f) ([#1910](https://github.com/tauri-apps/plugins-workspace/pull/1910) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Fix `ask` and `confirm` not using system button texts
+- [`aee14ed4`](https://github.com/tauri-apps/plugins-workspace/commit/aee14ed4261cdedc4ed7cc2686f01f437859a5c7) ([#1892](https://github.com/tauri-apps/plugins-workspace/pull/1892) by [@nashaofu](https://github.com/tauri-apps/plugins-workspace/../../nashaofu)) Set `save` dialog mime type from the `filters` extensions on Android.
+
 ## \[2.0.1]
 
 - [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
@@ -288,3 +299,5 @@
   pull/371)) First v2 alpha release!
   lpha release!
   pull/371)) First v2 alpha release!
+  lease!
+  pull/371)) First v2 alpha release!
diff --git a/plugins/dialog/Cargo.toml b/plugins/dialog/Cargo.toml
index eec855bd..664416a7 100644
--- a/plugins/dialog/Cargo.toml
+++ b/plugins/dialog/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-dialog"
-version = "2.0.1"
+version = "2.0.3"
 description = "Native system dialogs for opening and saving files along with message dialogs on your Tauri application."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -34,7 +34,7 @@ tauri = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
-tauri-plugin-fs = { path = "../fs", version = "2.0.1" }
+tauri-plugin-fs = { path = "../fs", version = "2.0.3" }
 
 [target.'cfg(target_os = "ios")'.dependencies]
 tauri = { workspace = true, features = ["wry"] }
diff --git a/plugins/dialog/android/src/main/java/DialogPlugin.kt b/plugins/dialog/android/src/main/java/DialogPlugin.kt
index 15af6808..af0467d8 100644
--- a/plugins/dialog/android/src/main/java/DialogPlugin.kt
+++ b/plugins/dialog/android/src/main/java/DialogPlugin.kt
@@ -10,6 +10,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Handler
 import android.os.Looper
+import android.webkit.MimeTypeMap
 import androidx.activity.result.ActivityResult
 import app.tauri.Logger
 import app.tauri.annotation.ActivityCallback
@@ -43,6 +44,7 @@ class MessageOptions {
 @InvokeArg
 class SaveFileDialogOptions {
   var fileName: String? = null
+  lateinit var filters: Array<Filter>
 }
 
 @TauriPlugin
@@ -57,20 +59,7 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
       
       val intent = if (parsedTypes.isNotEmpty()) {
         val intent = Intent(Intent.ACTION_PICK)
-        intent.putExtra(Intent.EXTRA_MIME_TYPES, parsedTypes)
-        
-        var uniqueMimeType = true
-        var mimeKind: String? = null
-        for (mime in parsedTypes) {
-          val kind = mime.split("/")[0]
-          if (mimeKind == null) {
-            mimeKind = kind
-          } else if (mimeKind != kind) {
-            uniqueMimeType = false
-          }
-        }
-        
-        intent.type = if (uniqueMimeType) Intent.normalizeMimeType("$mimeKind/*") else "*/*"
+        setIntentMimeTypes(intent, parsedTypes)
         intent
       } else {
         val intent = Intent(Intent.ACTION_GET_CONTENT)
@@ -130,12 +119,46 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
   private fun parseFiltersOption(filters: Array<Filter>): Array<String> {
     val mimeTypes = mutableListOf<String>()
     for (filter in filters) {
-      for (mime in filter.extensions) {
-        mimeTypes.add(if (mime == "text/csv") "text/comma-separated-values" else mime)
+      for (ext in filter.extensions) {
+        if (ext.contains('/')) {
+          mimeTypes.add(if (ext == "text/csv") "text/comma-separated-values" else ext)
+        } else {
+          MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext)?.let {
+            mimeTypes.add(it)
+          }
+        }
       }
     }
     return mimeTypes.toTypedArray()
   }
+
+  private fun setIntentMimeTypes(intent: Intent, mimeTypes: Array<String>) {
+    if (mimeTypes.isNotEmpty()) {
+      var uniqueMimeKind = true
+      var mimeKind: String? = null
+      for (mime in mimeTypes) {
+        val kind = mime.split("/")[0]
+        if (mimeKind == null) {
+          mimeKind = kind
+        } else if (mimeKind != kind) {
+          uniqueMimeKind = false
+        }
+      }
+
+      if (uniqueMimeKind) {
+        if (mimeTypes.size > 1) {
+          intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes)
+          intent.type = Intent.normalizeMimeType("$mimeKind/*")
+        } else {
+          intent.type = mimeTypes[0]
+        }
+      } else {
+        intent.type = "*/*"
+      }
+    } else {
+      intent.type = "*/*"
+    }
+  }
   
   @Command
   fun showMessageDialog(invoke: Invoke) {
@@ -187,10 +210,12 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
   fun saveFileDialog(invoke: Invoke) {
     try {
       val args = invoke.parseArgs(SaveFileDialogOptions::class.java)
+      val parsedTypes = parseFiltersOption(args.filters)
 
       val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
+      setIntentMimeTypes(intent, parsedTypes)
+
       intent.addCategory(Intent.CATEGORY_OPENABLE)
-      intent.setType("text/plain")
       intent.putExtra(Intent.EXTRA_TITLE, args.fileName ?: "")
       startActivityForResult(invoke, intent, "saveFileDialogResult")
     } catch (ex: Exception) {
diff --git a/plugins/dialog/api-iife.js b/plugins/dialog/api-iife.js
index ee604570..c2e0870c 100644
--- a/plugins/dialog/api-iife.js
+++ b/plugins/dialog/api-iife.js
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_DIALOG__=function(t){"use strict";async function n(t,n={},e){return window.__TAURI_INTERNALS__.invoke(t,n,e)}return"function"==typeof SuppressedError&&SuppressedError,t.ask=async function(t,e){const i="string"==typeof e?{title:e}:e;return await n("plugin:dialog|ask",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString()??"Yes",cancelButtonLabel:i?.cancelLabel?.toString()??"No"})},t.confirm=async function(t,e){const i="string"==typeof e?{title:e}:e;return await n("plugin:dialog|confirm",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString()??"Ok",cancelButtonLabel:i?.cancelLabel?.toString()??"Cancel"})},t.message=async function(t,e){const i="string"==typeof e?{title:e}:e;await n("plugin:dialog|message",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString()})},t.open=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|open",{options:t})},t.save=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|save",{options:t})},t}({});Object.defineProperty(window.__TAURI__,"dialog",{value:__TAURI_PLUGIN_DIALOG__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_DIALOG__=function(t){"use strict";async function n(t,n={},e){return window.__TAURI_INTERNALS__.invoke(t,n,e)}return"function"==typeof SuppressedError&&SuppressedError,t.ask=async function(t,e){const i="string"==typeof e?{title:e}:e;return await n("plugin:dialog|ask",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,yesButtonLabel:i?.okLabel?.toString(),noButtonLabel:i?.cancelLabel?.toString()})},t.confirm=async function(t,e){const i="string"==typeof e?{title:e}:e;return await n("plugin:dialog|confirm",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString(),cancelButtonLabel:i?.cancelLabel?.toString()})},t.message=async function(t,e){const i="string"==typeof e?{title:e}:e;await n("plugin:dialog|message",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString()})},t.open=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|open",{options:t})},t.save=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|save",{options:t})},t}({});Object.defineProperty(window.__TAURI__,"dialog",{value:__TAURI_PLUGIN_DIALOG__})}
diff --git a/plugins/dialog/guest-js/index.ts b/plugins/dialog/guest-js/index.ts
index a6301ebe..150be95a 100644
--- a/plugins/dialog/guest-js/index.ts
+++ b/plugins/dialog/guest-js/index.ts
@@ -257,8 +257,8 @@ async function ask(
     message: message.toString(),
     title: opts?.title?.toString(),
     kind: opts?.kind,
-    okButtonLabel: opts?.okLabel?.toString() ?? 'Yes',
-    cancelButtonLabel: opts?.cancelLabel?.toString() ?? 'No'
+    yesButtonLabel: opts?.okLabel?.toString(),
+    noButtonLabel: opts?.cancelLabel?.toString()
   })
 }
 
@@ -287,8 +287,8 @@ async function confirm(
     message: message.toString(),
     title: opts?.title?.toString(),
     kind: opts?.kind,
-    okButtonLabel: opts?.okLabel?.toString() ?? 'Ok',
-    cancelButtonLabel: opts?.cancelLabel?.toString() ?? 'Cancel'
+    okButtonLabel: opts?.okLabel?.toString(),
+    cancelButtonLabel: opts?.cancelLabel?.toString()
   })
 }
 
diff --git a/plugins/dialog/package.json b/plugins/dialog/package.json
index 72ebd27a..27814aed 100644
--- a/plugins/dialog/package.json
+++ b/plugins/dialog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-dialog",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "MIT OR Apache-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"
diff --git a/plugins/dialog/src/commands.rs b/plugins/dialog/src/commands.rs
index 8690a8b0..4129b7b6 100644
--- a/plugins/dialog/src/commands.rs
+++ b/plugins/dialog/src/commands.rs
@@ -10,7 +10,7 @@ use tauri_plugin_fs::FsExt;
 
 use crate::{
     Dialog, FileDialogBuilder, FilePath, MessageDialogButtons, MessageDialogKind, Result, CANCEL,
-    OK,
+    NO, OK, YES,
 };
 
 #[derive(Serialize)]
@@ -299,8 +299,8 @@ pub(crate) async fn ask<R: Runtime>(
     title: Option<String>,
     message: String,
     kind: Option<MessageDialogKind>,
-    ok_button_label: Option<String>,
-    cancel_button_label: Option<String>,
+    yes_button_label: Option<String>,
+    no_button_label: Option<String>,
 ) -> Result<bool> {
     Ok(message_dialog(
         window,
@@ -308,7 +308,16 @@ pub(crate) async fn ask<R: Runtime>(
         title,
         message,
         kind,
-        get_ok_cancel_type(ok_button_label, cancel_button_label),
+        if let Some(yes_button_label) = yes_button_label {
+            MessageDialogButtons::OkCancelCustom(
+                yes_button_label,
+                no_button_label.unwrap_or(NO.to_string()),
+            )
+        } else if let Some(no_button_label) = no_button_label {
+            MessageDialogButtons::OkCancelCustom(YES.to_string(), no_button_label)
+        } else {
+            MessageDialogButtons::YesNo
+        },
     ))
 }
 
@@ -328,22 +337,15 @@ pub(crate) async fn confirm<R: Runtime>(
         title,
         message,
         kind,
-        get_ok_cancel_type(ok_button_label, cancel_button_label),
+        if let Some(ok_button_label) = ok_button_label {
+            MessageDialogButtons::OkCancelCustom(
+                ok_button_label,
+                cancel_button_label.unwrap_or(CANCEL.to_string()),
+            )
+        } else if let Some(cancel_button_label) = cancel_button_label {
+            MessageDialogButtons::OkCancelCustom(OK.to_string(), cancel_button_label)
+        } else {
+            MessageDialogButtons::OkCancel
+        },
     ))
 }
-
-fn get_ok_cancel_type(
-    ok_button_label: Option<String>,
-    cancel_button_label: Option<String>,
-) -> MessageDialogButtons {
-    if let Some(ok_button_label) = ok_button_label {
-        MessageDialogButtons::OkCancelCustom(
-            ok_button_label,
-            cancel_button_label.unwrap_or(CANCEL.to_string()),
-        )
-    } else if let Some(cancel_button_label) = cancel_button_label {
-        MessageDialogButtons::OkCancelCustom(OK.to_string(), cancel_button_label)
-    } else {
-        MessageDialogButtons::OkCancel
-    }
-}
diff --git a/plugins/dialog/src/desktop.rs b/plugins/dialog/src/desktop.rs
index d30f6bfe..d1a3e8b2 100644
--- a/plugins/dialog/src/desktop.rs
+++ b/plugins/dialog/src/desktop.rs
@@ -112,6 +112,7 @@ impl From<MessageDialogButtons> for rfd::MessageButtons {
         match value {
             MessageDialogButtons::Ok => Self::Ok,
             MessageDialogButtons::OkCancel => Self::OkCancel,
+            MessageDialogButtons::YesNo => Self::YesNo,
             MessageDialogButtons::OkCustom(ok) => Self::OkCustom(ok),
             MessageDialogButtons::OkCancelCustom(ok, cancel) => Self::OkCancelCustom(ok, cancel),
         }
diff --git a/plugins/dialog/src/lib.rs b/plugins/dialog/src/lib.rs
index a7538e1b..3d7464d9 100644
--- a/plugins/dialog/src/lib.rs
+++ b/plugins/dialog/src/lib.rs
@@ -43,6 +43,8 @@ use mobile::*;
 
 pub(crate) const OK: &str = "Ok";
 pub(crate) const CANCEL: &str = "Cancel";
+pub(crate) const YES: &str = "Yes";
+pub(crate) const NO: &str = "No";
 
 macro_rules! blocking_fn {
     ($self:ident, $fn:ident) => {{
@@ -236,6 +238,7 @@ impl<R: Runtime> MessageDialogBuilder<R> {
         let (ok_button_label, cancel_button_label) = match &self.buttons {
             MessageDialogButtons::Ok => (Some(OK), None),
             MessageDialogButtons::OkCancel => (Some(OK), Some(CANCEL)),
+            MessageDialogButtons::YesNo => (Some(YES), Some(NO)),
             MessageDialogButtons::OkCustom(ok) => (Some(ok.as_str()), Some(CANCEL)),
             MessageDialogButtons::OkCancelCustom(ok, cancel) => {
                 (Some(ok.as_str()), Some(cancel.as_str()))
diff --git a/plugins/dialog/src/models.rs b/plugins/dialog/src/models.rs
index 3f9eb6c1..d6452bce 100644
--- a/plugins/dialog/src/models.rs
+++ b/plugins/dialog/src/models.rs
@@ -59,6 +59,8 @@ pub enum MessageDialogButtons {
     Ok,
     /// 2 buttons `Ok` and `Cancel` with OS default dialog texts
     OkCancel,
+    /// 2 buttons `Yes` and `No` with OS default dialog texts
+    YesNo,
     /// A single `Ok` button with custom text
     OkCustom(String),
     /// 2 buttons `Ok` and `Cancel` with custom texts
diff --git a/plugins/fs/CHANGELOG.md b/plugins/fs/CHANGELOG.md
index 41e6411a..707733ee 100644
--- a/plugins/fs/CHANGELOG.md
+++ b/plugins/fs/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## \[2.0.3]
+
+- [`14cee64c`](https://github.com/tauri-apps/plugins-workspace/commit/14cee64c82a72655ae6a4ac0892736a2959dbda5) ([#1958](https://github.com/tauri-apps/plugins-workspace/pull/1958) by [@bWanShiTong](https://github.com/tauri-apps/plugins-workspace/../../bWanShiTong)) Fix compilation on targets with pointer width of `16` or `32`
+
+## \[2.0.1]
+
+- [`ae802456`](https://github.com/tauri-apps/plugins-workspace/commit/ae8024565f074f313084777c8b10d1b5e3bbe220) ([#1950](https://github.com/tauri-apps/plugins-workspace/pull/1950) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Improve performance of the `FileHandle.read` and `writeTextFile` APIs.
+
 ## \[2.0.1]
 
 - [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
diff --git a/plugins/fs/Cargo.toml b/plugins/fs/Cargo.toml
index 1d9b5f34..cd4e7716 100644
--- a/plugins/fs/Cargo.toml
+++ b/plugins/fs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-fs"
-version = "2.0.1"
+version = "2.0.3"
 description = "Access the file system."
 authors = { workspace = true }
 license = { workspace = true }
diff --git a/plugins/fs/api-iife.js b/plugins/fs/api-iife.js
index b855277d..f1e5360b 100644
--- a/plugins/fs/api-iife.js
+++ b/plugins/fs/api-iife.js
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_FS__=function(t){"use strict";function e(t,e,n,i){if("a"===n&&!i)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!i:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===n?i:"a"===n?i.call(t):i?i.value:e.get(t)}function n(t,e,n,i,o){if("function"==typeof e?t!==e||!o:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return e.set(t,n),n}var i,o,r,a,s,c;"function"==typeof SuppressedError&&SuppressedError;class f{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,i.set(this,(()=>{})),o.set(this,0),r.set(this,{}),this.id=function(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}((({message:t,id:a})=>{if(a===e(this,o,"f")){n(this,o,a+1),e(this,i,"f").call(this,t);const s=Object.keys(e(this,r,"f"));if(s.length>0){let t=a+1;for(const n of s.sort()){if(parseInt(n)!==t)break;{const o=e(this,r,"f")[n];delete e(this,r,"f")[n],e(this,i,"f").call(this,o),t+=1}}n(this,o,t)}}else e(this,r,"f")[a.toString()]=t}))}set onmessage(t){n(this,i,t)}get onmessage(){return e(this,i,"f")}toJSON(){return`__CHANNEL__:${this.id}`}}async function l(t,e={},n){return window.__TAURI_INTERNALS__.invoke(t,e,n)}i=new WeakMap,o=new WeakMap,r=new WeakMap;class u{get rid(){return e(this,a,"f")}constructor(t){a.set(this,void 0),n(this,a,t)}async close(){return l("plugin:resources|close",{rid:this.rid})}}function p(t){return{isFile:t.isFile,isDirectory:t.isDirectory,isSymlink:t.isSymlink,size:t.size,mtime:null!==t.mtime?new Date(t.mtime):null,atime:null!==t.atime?new Date(t.atime):null,birthtime:null!==t.birthtime?new Date(t.birthtime):null,readonly:t.readonly,fileAttributes:t.fileAttributes,dev:t.dev,ino:t.ino,mode:t.mode,nlink:t.nlink,uid:t.uid,gid:t.gid,rdev:t.rdev,blksize:t.blksize,blocks:t.blocks}}a=new WeakMap,t.BaseDirectory=void 0,(s=t.BaseDirectory||(t.BaseDirectory={}))[s.Audio=1]="Audio",s[s.Cache=2]="Cache",s[s.Config=3]="Config",s[s.Data=4]="Data",s[s.LocalData=5]="LocalData",s[s.Document=6]="Document",s[s.Download=7]="Download",s[s.Picture=8]="Picture",s[s.Public=9]="Public",s[s.Video=10]="Video",s[s.Resource=11]="Resource",s[s.Temp=12]="Temp",s[s.AppConfig=13]="AppConfig",s[s.AppData=14]="AppData",s[s.AppLocalData=15]="AppLocalData",s[s.AppCache=16]="AppCache",s[s.AppLog=17]="AppLog",s[s.Desktop=18]="Desktop",s[s.Executable=19]="Executable",s[s.Font=20]="Font",s[s.Home=21]="Home",s[s.Runtime=22]="Runtime",s[s.Template=23]="Template",t.SeekMode=void 0,(c=t.SeekMode||(t.SeekMode={}))[c.Start=0]="Start",c[c.Current=1]="Current",c[c.End=2]="End";class w extends u{async read(t){if(0===t.byteLength)return 0;const[e,n]=await l("plugin:fs|read",{rid:this.rid,len:t.byteLength});return t.set(e),0===n?null:n}async seek(t,e){return await l("plugin:fs|seek",{rid:this.rid,offset:t,whence:e})}async stat(){return p(await l("plugin:fs|fstat",{rid:this.rid}))}async truncate(t){await l("plugin:fs|ftruncate",{rid:this.rid,len:t})}async write(t){return await l("plugin:fs|write",{rid:this.rid,data:t})}}async function h(t){await l("plugin:fs|unwatch",{rid:t})}return t.FileHandle=w,t.copyFile=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol||e instanceof URL&&"file:"!==e.protocol)throw new TypeError("Must be a file URL.");await l("plugin:fs|copy_file",{fromPath:t instanceof URL?t.toString():t,toPath:e instanceof URL?e.toString():e,options:n})},t.create=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const n=await l("plugin:fs|create",{path:t instanceof URL?t.toString():t,options:e});return new w(n)},t.exists=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");return await l("plugin:fs|exists",{path:t instanceof URL?t.toString():t,options:e})},t.lstat=async function(t,e){return p(await l("plugin:fs|lstat",{path:t instanceof URL?t.toString():t,options:e}))},t.mkdir=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");await l("plugin:fs|mkdir",{path:t instanceof URL?t.toString():t,options:e})},t.open=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const n=await l("plugin:fs|open",{path:t instanceof URL?t.toString():t,options:e});return new w(n)},t.readDir=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");return await l("plugin:fs|read_dir",{path:t instanceof URL?t.toString():t,options:e})},t.readFile=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const n=await l("plugin:fs|read_file",{path:t instanceof URL?t.toString():t,options:e});return n instanceof ArrayBuffer?new Uint8Array(n):Uint8Array.from(n)},t.readTextFile=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");return await l("plugin:fs|read_text_file",{path:t instanceof URL?t.toString():t,options:e})},t.readTextFileLines=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const n=t instanceof URL?t.toString():t;return await Promise.resolve({path:n,rid:null,async next(){null===this.rid&&(this.rid=await l("plugin:fs|read_text_file_lines",{path:n,options:e}));const[t,i]=await l("plugin:fs|read_text_file_lines_next",{rid:this.rid});return i&&(this.rid=null),{value:i?"":t,done:i}},[Symbol.asyncIterator](){return this}})},t.remove=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");await l("plugin:fs|remove",{path:t instanceof URL?t.toString():t,options:e})},t.rename=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol||e instanceof URL&&"file:"!==e.protocol)throw new TypeError("Must be a file URL.");await l("plugin:fs|rename",{oldPath:t instanceof URL?t.toString():t,newPath:e instanceof URL?e.toString():e,options:n})},t.stat=async function(t,e){return p(await l("plugin:fs|stat",{path:t instanceof URL?t.toString():t,options:e}))},t.truncate=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");await l("plugin:fs|truncate",{path:t instanceof URL?t.toString():t,len:e,options:n})},t.watch=async function(t,e,n){const i={recursive:!1,delayMs:2e3,...n},o=Array.isArray(t)?t:[t];for(const t of o)if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const r=new f;r.onmessage=e;const a=await l("plugin:fs|watch",{paths:o.map((t=>t instanceof URL?t.toString():t)),options:i,onEvent:r});return()=>{h(a)}},t.watchImmediate=async function(t,e,n){const i={recursive:!1,...n,delayMs:null},o=Array.isArray(t)?t:[t];for(const t of o)if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const r=new f;r.onmessage=e;const a=await l("plugin:fs|watch",{paths:o.map((t=>t instanceof URL?t.toString():t)),options:i,onEvent:r});return()=>{h(a)}},t.writeFile=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");await l("plugin:fs|write_file",e,{headers:{path:encodeURIComponent(t instanceof URL?t.toString():t),options:JSON.stringify(n)}})},t.writeTextFile=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");await l("plugin:fs|write_text_file",{path:t instanceof URL?t.toString():t,data:e,options:n})},t}({});Object.defineProperty(window.__TAURI__,"fs",{value:__TAURI_PLUGIN_FS__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_FS__=function(t){"use strict";function e(t,e,n,i){if("a"===n&&!i)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!i:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===n?i:"a"===n?i.call(t):i?i.value:e.get(t)}function n(t,e,n,i,o){if("function"==typeof e?t!==e||!o:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return e.set(t,n),n}var i,o,r,a,s,c;"function"==typeof SuppressedError&&SuppressedError;class f{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,i.set(this,(()=>{})),o.set(this,0),r.set(this,{}),this.id=function(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}((({message:t,id:a})=>{if(a===e(this,o,"f")){n(this,o,a+1),e(this,i,"f").call(this,t);const s=Object.keys(e(this,r,"f"));if(s.length>0){let t=a+1;for(const n of s.sort()){if(parseInt(n)!==t)break;{const o=e(this,r,"f")[n];delete e(this,r,"f")[n],e(this,i,"f").call(this,o),t+=1}}n(this,o,t)}}else e(this,r,"f")[a.toString()]=t}))}set onmessage(t){n(this,i,t)}get onmessage(){return e(this,i,"f")}toJSON(){return`__CHANNEL__:${this.id}`}}async function l(t,e={},n){return window.__TAURI_INTERNALS__.invoke(t,e,n)}i=new WeakMap,o=new WeakMap,r=new WeakMap;class u{get rid(){return e(this,a,"f")}constructor(t){a.set(this,void 0),n(this,a,t)}async close(){return l("plugin:resources|close",{rid:this.rid})}}function p(t){return{isFile:t.isFile,isDirectory:t.isDirectory,isSymlink:t.isSymlink,size:t.size,mtime:null!==t.mtime?new Date(t.mtime):null,atime:null!==t.atime?new Date(t.atime):null,birthtime:null!==t.birthtime?new Date(t.birthtime):null,readonly:t.readonly,fileAttributes:t.fileAttributes,dev:t.dev,ino:t.ino,mode:t.mode,nlink:t.nlink,uid:t.uid,gid:t.gid,rdev:t.rdev,blksize:t.blksize,blocks:t.blocks}}a=new WeakMap,t.BaseDirectory=void 0,(s=t.BaseDirectory||(t.BaseDirectory={}))[s.Audio=1]="Audio",s[s.Cache=2]="Cache",s[s.Config=3]="Config",s[s.Data=4]="Data",s[s.LocalData=5]="LocalData",s[s.Document=6]="Document",s[s.Download=7]="Download",s[s.Picture=8]="Picture",s[s.Public=9]="Public",s[s.Video=10]="Video",s[s.Resource=11]="Resource",s[s.Temp=12]="Temp",s[s.AppConfig=13]="AppConfig",s[s.AppData=14]="AppData",s[s.AppLocalData=15]="AppLocalData",s[s.AppCache=16]="AppCache",s[s.AppLog=17]="AppLog",s[s.Desktop=18]="Desktop",s[s.Executable=19]="Executable",s[s.Font=20]="Font",s[s.Home=21]="Home",s[s.Runtime=22]="Runtime",s[s.Template=23]="Template",t.SeekMode=void 0,(c=t.SeekMode||(t.SeekMode={}))[c.Start=0]="Start",c[c.Current=1]="Current",c[c.End=2]="End";class w extends u{async read(t){if(0===t.byteLength)return 0;const e=await l("plugin:fs|read",{rid:this.rid,len:t.byteLength}),n=function(t){const e=new Uint8ClampedArray(t),n=e.byteLength;let i=0;for(let t=0;t<n;t++)i*=256,i+=e[t];return i}(e.slice(-8)),i=e instanceof ArrayBuffer?new Uint8Array(e):e;return t.set(i.slice(0,i.length-8)),0===n?null:n}async seek(t,e){return await l("plugin:fs|seek",{rid:this.rid,offset:t,whence:e})}async stat(){return p(await l("plugin:fs|fstat",{rid:this.rid}))}async truncate(t){await l("plugin:fs|ftruncate",{rid:this.rid,len:t})}async write(t){return await l("plugin:fs|write",{rid:this.rid,data:t})}}async function h(t){await l("plugin:fs|unwatch",{rid:t})}return t.FileHandle=w,t.copyFile=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol||e instanceof URL&&"file:"!==e.protocol)throw new TypeError("Must be a file URL.");await l("plugin:fs|copy_file",{fromPath:t instanceof URL?t.toString():t,toPath:e instanceof URL?e.toString():e,options:n})},t.create=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const n=await l("plugin:fs|create",{path:t instanceof URL?t.toString():t,options:e});return new w(n)},t.exists=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");return await l("plugin:fs|exists",{path:t instanceof URL?t.toString():t,options:e})},t.lstat=async function(t,e){return p(await l("plugin:fs|lstat",{path:t instanceof URL?t.toString():t,options:e}))},t.mkdir=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");await l("plugin:fs|mkdir",{path:t instanceof URL?t.toString():t,options:e})},t.open=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const n=await l("plugin:fs|open",{path:t instanceof URL?t.toString():t,options:e});return new w(n)},t.readDir=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");return await l("plugin:fs|read_dir",{path:t instanceof URL?t.toString():t,options:e})},t.readFile=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const n=await l("plugin:fs|read_file",{path:t instanceof URL?t.toString():t,options:e});return n instanceof ArrayBuffer?new Uint8Array(n):Uint8Array.from(n)},t.readTextFile=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");return await l("plugin:fs|read_text_file",{path:t instanceof URL?t.toString():t,options:e})},t.readTextFileLines=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const n=t instanceof URL?t.toString():t;return await Promise.resolve({path:n,rid:null,async next(){null===this.rid&&(this.rid=await l("plugin:fs|read_text_file_lines",{path:n,options:e}));const[t,i]=await l("plugin:fs|read_text_file_lines_next",{rid:this.rid});return i&&(this.rid=null),{value:i?"":t,done:i}},[Symbol.asyncIterator](){return this}})},t.remove=async function(t,e){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");await l("plugin:fs|remove",{path:t instanceof URL?t.toString():t,options:e})},t.rename=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol||e instanceof URL&&"file:"!==e.protocol)throw new TypeError("Must be a file URL.");await l("plugin:fs|rename",{oldPath:t instanceof URL?t.toString():t,newPath:e instanceof URL?e.toString():e,options:n})},t.stat=async function(t,e){return p(await l("plugin:fs|stat",{path:t instanceof URL?t.toString():t,options:e}))},t.truncate=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");await l("plugin:fs|truncate",{path:t instanceof URL?t.toString():t,len:e,options:n})},t.watch=async function(t,e,n){const i={recursive:!1,delayMs:2e3,...n},o=Array.isArray(t)?t:[t];for(const t of o)if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const r=new f;r.onmessage=e;const a=await l("plugin:fs|watch",{paths:o.map((t=>t instanceof URL?t.toString():t)),options:i,onEvent:r});return()=>{h(a)}},t.watchImmediate=async function(t,e,n){const i={recursive:!1,...n,delayMs:null},o=Array.isArray(t)?t:[t];for(const t of o)if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const r=new f;r.onmessage=e;const a=await l("plugin:fs|watch",{paths:o.map((t=>t instanceof URL?t.toString():t)),options:i,onEvent:r});return()=>{h(a)}},t.writeFile=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");await l("plugin:fs|write_file",e,{headers:{path:encodeURIComponent(t instanceof URL?t.toString():t),options:JSON.stringify(n)}})},t.writeTextFile=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const i=new TextEncoder;await l("plugin:fs|write_text_file",i.encode(e),{headers:{path:encodeURIComponent(t instanceof URL?t.toString():t),options:JSON.stringify(n)}})},t}({});Object.defineProperty(window.__TAURI__,"fs",{value:__TAURI_PLUGIN_FS__})}
diff --git a/plugins/fs/guest-js/index.ts b/plugins/fs/guest-js/index.ts
index 1f314f71..ed8749d7 100644
--- a/plugins/fs/guest-js/index.ts
+++ b/plugins/fs/guest-js/index.ts
@@ -243,6 +243,25 @@ function parseFileInfo(r: UnparsedFileInfo): FileInfo {
   }
 }
 
+// https://mstn.github.io/2018/06/08/fixed-size-arrays-in-typescript/
+type FixedSizeArray<T, N extends number> = ReadonlyArray<T> & {
+  length: N
+}
+
+// https://gist.github.com/zapthedingbat/38ebfbedd98396624e5b5f2ff462611d
+/** Converts a big-endian eight byte array to number  */
+function fromBytes(buffer: FixedSizeArray<number, 8>): number {
+  const bytes = new Uint8ClampedArray(buffer)
+  const size = bytes.byteLength
+  let x = 0
+  for (let i = 0; i < size; i++) {
+    const byte = bytes[i]
+    x *= 0x100
+    x += byte
+  }
+  return x
+}
+
 /**
  *  The Tauri abstraction for reading and writing files.
  *
@@ -285,12 +304,20 @@ class FileHandle extends Resource {
       return 0
     }
 
-    const [data, nread] = await invoke<[number[], number]>('plugin:fs|read', {
+    const data = await invoke<ArrayBuffer | number[]>('plugin:fs|read', {
       rid: this.rid,
       len: buffer.byteLength
     })
 
-    buffer.set(data)
+    // Rust side will never return an empty array for this command and
+    // ensure there is at least 8 elements there.
+    //
+    // This is an optimization to include the number of read bytes (as bigendian bytes)
+    // at the end of returned array to avoid serialization overhead of separate values.
+    const nread = fromBytes(data.slice(-8) as FixedSizeArray<number, 8>)
+
+    const bytes = data instanceof ArrayBuffer ? new Uint8Array(data) : data
+    buffer.set(bytes.slice(0, bytes.length - 8))
 
     return nread === 0 ? null : nread
   }
@@ -1041,10 +1068,13 @@ async function writeTextFile(
     throw new TypeError('Must be a file URL.')
   }
 
-  await invoke('plugin:fs|write_text_file', {
-    path: path instanceof URL ? path.toString() : path,
-    data,
-    options
+  const encoder = new TextEncoder()
+
+  await invoke('plugin:fs|write_text_file', encoder.encode(data), {
+    headers: {
+      path: encodeURIComponent(path instanceof URL ? path.toString() : path),
+      options: JSON.stringify(options)
+    }
   })
 }
 
diff --git a/plugins/fs/package.json b/plugins/fs/package.json
index 7a6cf527..0bce5c6c 100644
--- a/plugins/fs/package.json
+++ b/plugins/fs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-fs",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Access the file system.",
   "license": "MIT OR Apache-2.0",
   "authors": [
diff --git a/plugins/fs/permissions/autogenerated/reference.md b/plugins/fs/permissions/autogenerated/reference.md
index 79ec2f55..3ae15ce8 100644
--- a/plugins/fs/permissions/autogenerated/reference.md
+++ b/plugins/fs/permissions/autogenerated/reference.md
@@ -24,6 +24,7 @@ This default permission set prevents access to critical components
 of the Tauri application by default.
 On Windows the webview data folder access is denied.
 
+#### Included permissions:
 
 
 - `create-app-specific-dirs`
diff --git a/plugins/fs/permissions/default.toml b/plugins/fs/permissions/default.toml
index d519d758..4cc7bd51 100644
--- a/plugins/fs/permissions/default.toml
+++ b/plugins/fs/permissions/default.toml
@@ -26,6 +26,7 @@ This default permission set prevents access to critical components
 of the Tauri application by default.
 On Windows the webview data folder access is denied.
 
+#### Included permissions within this default permission set:
 """
 permissions = [
   "create-app-specific-dirs",
diff --git a/plugins/fs/permissions/schemas/schema.json b/plugins/fs/permissions/schemas/schema.json
index 57ab0634..275e44d1 100644
--- a/plugins/fs/permissions/schemas/schema.json
+++ b/plugins/fs/permissions/schemas/schema.json
@@ -1665,7 +1665,7 @@
           "const": "create-app-specific-dirs"
         },
         {
-          "description": "This set of permissions describes the what kind of\nfile system access the `fs` plugin has enabled or denied by default.\n\n#### Granted Permissions\n\nThis default permission set enables read access to the\napplication specific directories (AppConfig, AppData, AppLocalData, AppCache,\nAppLog) and all files and sub directories created in it.\nThe location of these directories depends on the operating system,\nwhere the application is run.\n\nIn general these directories need to be manually created\nby the application at runtime, before accessing files or folders\nin it is possible.\n\nTherefore, it is also allowed to create all of these folders via\nthe `mkdir` command.\n\n#### Denied Permissions\n\nThis default permission set prevents access to critical components\nof the Tauri application by default.\nOn Windows the webview data folder access is denied.\n\n",
+          "description": "This set of permissions describes the what kind of\nfile system access the `fs` plugin has enabled or denied by default.\n\n#### Granted Permissions\n\nThis default permission set enables read access to the\napplication specific directories (AppConfig, AppData, AppLocalData, AppCache,\nAppLog) and all files and sub directories created in it.\nThe location of these directories depends on the operating system,\nwhere the application is run.\n\nIn general these directories need to be manually created\nby the application at runtime, before accessing files or folders\nin it is possible.\n\nTherefore, it is also allowed to create all of these folders via\nthe `mkdir` command.\n\n#### Denied Permissions\n\nThis default permission set prevents access to critical components\nof the Tauri application by default.\nOn Windows the webview data folder access is denied.\n\n#### Included permissions within this default permission set:\n",
           "type": "string",
           "const": "default"
         },
diff --git a/plugins/fs/src/commands.rs b/plugins/fs/src/commands.rs
index cb40c3ee..99eb5aa0 100644
--- a/plugins/fs/src/commands.rs
+++ b/plugins/fs/src/commands.rs
@@ -9,7 +9,7 @@ use tauri::{
     ipc::{CommandScope, GlobalScope},
     path::BaseDirectory,
     utils::config::FsScope,
-    AppHandle, Manager, Resource, ResourceId, Runtime, Webview,
+    Manager, Resource, ResourceId, Runtime, Webview,
 };
 
 use std::{
@@ -301,13 +301,36 @@ pub async fn read_dir<R: Runtime>(
 pub async fn read<R: Runtime>(
     webview: Webview<R>,
     rid: ResourceId,
-    len: u32,
-) -> CommandResult<(Vec<u8>, usize)> {
-    let mut data = vec![0; len as usize];
+    len: usize,
+) -> CommandResult<tauri::ipc::Response> {
+    let mut data = vec![0; len];
     let file = webview.resources_table().get::<StdFileResource>(rid)?;
     let nread = StdFileResource::with_lock(&file, |mut file| file.read(&mut data))
         .map_err(|e| format!("faied to read bytes from file with error: {e}"))?;
-    Ok((data, nread))
+
+    // This is an optimization to include the number of read bytes (as bigendian bytes)
+    // at the end of returned vector so we can use `tauri::ipc::Response`
+    // and avoid serialization overhead of separate values.
+    #[cfg(target_pointer_width = "16")]
+    let nread = {
+        let nread = nread.to_be_bytes();
+        let mut out = [0; 8];
+        out[6..].copy_from_slice(&nread);
+        out
+    };
+    #[cfg(target_pointer_width = "32")]
+    let nread = {
+        let nread = nread.to_be_bytes();
+        let mut out = [0; 8];
+        out[4..].copy_from_slice(&nread);
+        out
+    };
+    #[cfg(target_pointer_width = "64")]
+    let nread = nread.to_be_bytes();
+
+    data.extend(nread);
+
+    Ok(tauri::ipc::Response::new(data))
 }
 
 #[tauri::command]
@@ -783,10 +806,34 @@ fn write_file_inner<R: Runtime>(
     webview: Webview<R>,
     global_scope: &GlobalScope<Entry>,
     command_scope: &CommandScope<Entry>,
-    path: SafeFilePath,
-    data: &[u8],
-    options: Option<WriteFileOptions>,
+    request: tauri::ipc::Request<'_>,
 ) -> CommandResult<()> {
+    let data = match request.body() {
+        tauri::ipc::InvokeBody::Raw(data) => Cow::Borrowed(data),
+        tauri::ipc::InvokeBody::Json(serde_json::Value::Array(data)) => Cow::Owned(
+            data.iter()
+                .flat_map(|v| v.as_number().and_then(|v| v.as_u64().map(|v| v as u8)))
+                .collect(),
+        ),
+        _ => return Err(anyhow::anyhow!("unexpected invoke body").into()),
+    };
+
+    let path = request
+        .headers()
+        .get("path")
+        .ok_or_else(|| anyhow::anyhow!("missing file path").into())
+        .and_then(|p| {
+            percent_encoding::percent_decode(p.as_ref())
+                .decode_utf8()
+                .map_err(|_| anyhow::anyhow!("path is not a valid UTF-8").into())
+        })
+        .and_then(|p| SafeFilePath::from_str(&p).map_err(CommandError::from))?;
+    let options: Option<WriteFileOptions> = request
+        .headers()
+        .get("options")
+        .and_then(|p| p.to_str().ok())
+        .and_then(|opts| serde_json::from_str(opts).ok());
+
     let (mut file, path) = resolve_file(
         &webview,
         global_scope,
@@ -823,7 +870,7 @@ fn write_file_inner<R: Runtime>(
         },
     )?;
 
-    file.write_all(data)
+    file.write_all(&data)
         .map_err(|e| {
             format!(
                 "failed to write bytes to file at path: {} with error: {e}",
@@ -840,52 +887,18 @@ pub async fn write_file<R: Runtime>(
     command_scope: CommandScope<Entry>,
     request: tauri::ipc::Request<'_>,
 ) -> CommandResult<()> {
-    let data = match request.body() {
-        tauri::ipc::InvokeBody::Raw(data) => Cow::Borrowed(data),
-        tauri::ipc::InvokeBody::Json(serde_json::Value::Array(data)) => Cow::Owned(
-            data.iter()
-                .flat_map(|v| v.as_number().and_then(|v| v.as_u64().map(|v| v as u8)))
-                .collect(),
-        ),
-        _ => return Err(anyhow::anyhow!("unexpected invoke body").into()),
-    };
-
-    let path = request
-        .headers()
-        .get("path")
-        .ok_or_else(|| anyhow::anyhow!("missing file path").into())
-        .and_then(|p| {
-            percent_encoding::percent_decode(p.as_ref())
-                .decode_utf8()
-                .map_err(|_| anyhow::anyhow!("path is not a valid UTF-8").into())
-        })
-        .and_then(|p| SafeFilePath::from_str(&p).map_err(CommandError::from))?;
-    let options = request
-        .headers()
-        .get("options")
-        .and_then(|p| p.to_str().ok())
-        .and_then(|opts| serde_json::from_str(opts).ok());
-    write_file_inner(webview, &global_scope, &command_scope, path, &data, options)
+    write_file_inner(webview, &global_scope, &command_scope, request)
 }
 
+// TODO, in v3, remove this command and rely on `write_file` command only
 #[tauri::command]
 pub async fn write_text_file<R: Runtime>(
-    #[allow(unused)] app: AppHandle<R>,
-    #[allow(unused)] webview: Webview<R>,
-    #[allow(unused)] global_scope: GlobalScope<Entry>,
-    #[allow(unused)] command_scope: CommandScope<Entry>,
-    path: SafeFilePath,
-    data: String,
-    #[allow(unused)] options: Option<WriteFileOptions>,
+    webview: Webview<R>,
+    global_scope: GlobalScope<Entry>,
+    command_scope: CommandScope<Entry>,
+    request: tauri::ipc::Request<'_>,
 ) -> CommandResult<()> {
-    write_file_inner(
-        webview,
-        &global_scope,
-        &command_scope,
-        path,
-        data.as_bytes(),
-        options,
-    )
+    write_file_inner(webview, &global_scope, &command_scope, request)
 }
 
 #[tauri::command]
diff --git a/plugins/http/CHANGELOG.md b/plugins/http/CHANGELOG.md
index 508780fa..e814ddd9 100644
--- a/plugins/http/CHANGELOG.md
+++ b/plugins/http/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## \[2.0.3]
+
+### Dependencies
+
+- Upgraded to `fs@2.0.3`
+
+## \[2.0.1]
+
+- [`cfd48b3b`](https://github.com/tauri-apps/plugins-workspace/commit/cfd48b3b2ec0fccfc162197518694ed59ceda22c) ([#1941](https://github.com/tauri-apps/plugins-workspace/pull/1941) by [@Nipsuli](https://github.com/tauri-apps/plugins-workspace/../../Nipsuli)) Allow skipping sending `Origin` header in HTTP requests by setting `Origin` header to an empty string when calling `fetch`.
+- [`9b2840db`](https://github.com/tauri-apps/plugins-workspace/commit/9b2840db9464cf08db75806270e4441f0af81e5d) ([#1884](https://github.com/tauri-apps/plugins-workspace/pull/1884) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Retain headers order.
+
 ## \[2.0.1]
 
 - [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
@@ -286,3 +297,6 @@
   ha release!
   !
   371\)) First v2 alpha release!
+  lease!
+  !
+  371\)) First v2 alpha release!
diff --git a/plugins/http/Cargo.toml b/plugins/http/Cargo.toml
index 64b9aa75..8c1801a3 100644
--- a/plugins/http/Cargo.toml
+++ b/plugins/http/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-http"
-version = "2.0.1"
+version = "2.0.3"
 description = "Access an HTTP client written in Rust."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -34,7 +34,7 @@ serde_json = { workspace = true }
 tauri = { workspace = true }
 thiserror = { workspace = true }
 tokio = { version = "1", features = ["sync", "macros"] }
-tauri-plugin-fs = { path = "../fs", version = "2.0.1" }
+tauri-plugin-fs = { path = "../fs", version = "2.0.3" }
 urlpattern = "0.3"
 regex = "1"
 http = "1"
diff --git a/plugins/http/package.json b/plugins/http/package.json
index 24fb27f7..493caf75 100644
--- a/plugins/http/package.json
+++ b/plugins/http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-http",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "MIT OR Apache-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"
diff --git a/plugins/http/src/commands.rs b/plugins/http/src/commands.rs
index b9c1cae2..f4bc3aab 100644
--- a/plugins/http/src/commands.rs
+++ b/plugins/http/src/commands.rs
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use std::{collections::HashMap, future::Future, pin::Pin, sync::Arc, time::Duration};
+use std::{future::Future, pin::Pin, str::FromStr, sync::Arc, time::Duration};
 
-use http::{header, HeaderName, Method, StatusCode};
+use http::{header, HeaderMap, HeaderName, HeaderValue, Method, StatusCode};
 use reqwest::{redirect::Policy, NoProxy};
 use serde::{Deserialize, Serialize};
 use tauri::{
@@ -176,7 +176,7 @@ pub async fn fetch<R: Runtime>(
     let ClientConfig {
         method,
         url,
-        headers,
+        headers: headers_raw,
         data,
         connect_timeout,
         max_redirections,
@@ -185,7 +185,22 @@ pub async fn fetch<R: Runtime>(
 
     let scheme = url.scheme();
     let method = Method::from_bytes(method.as_bytes())?;
-    let headers: HashMap<String, String> = HashMap::from_iter(headers);
+
+    let mut headers = HeaderMap::new();
+    for (h, v) in headers_raw {
+        let name = HeaderName::from_str(&h)?;
+        #[cfg(not(feature = "unsafe-headers"))]
+        if is_unsafe_header(&name) {
+            #[cfg(debug_assertions)]
+            {
+                eprintln!("[\x1b[33mWARNING\x1b[0m] Skipping {name} header as it is a forbidden header per fetch spec https://fetch.spec.whatwg.org/#terminology-headers");
+                eprintln!("[\x1b[33mWARNING\x1b[0m] if keeping the header is a desired behavior, you can enable `unsafe-headers` feature flag in your Cargo.toml");
+            }
+            continue;
+        }
+
+        headers.append(name, HeaderValue::from_str(&v)?);
+    }
 
     match scheme {
         "http" | "https" => {
@@ -228,45 +243,46 @@ pub async fn fetch<R: Runtime>(
 
                 let mut request = builder.build()?.request(method.clone(), url);
 
-                for (name, value) in &headers {
-                    let name = HeaderName::from_bytes(name.as_bytes())?;
-                    #[cfg(not(feature = "unsafe-headers"))]
-                    if is_unsafe_header(&name) {
-                        continue;
-                    }
-
-                    request = request.header(name, value);
-                }
-
                 // POST and PUT requests should always have a 0 length content-length,
                 // if there is no body. https://fetch.spec.whatwg.org/#http-network-or-cache-fetch
                 if data.is_none() && matches!(method, Method::POST | Method::PUT) {
-                    request = request.header(header::CONTENT_LENGTH, 0);
+                    headers.append(header::CONTENT_LENGTH, HeaderValue::from_str("0")?);
                 }
 
-                if headers.contains_key(header::RANGE.as_str()) {
+                if headers.contains_key(header::RANGE) {
                     // https://fetch.spec.whatwg.org/#http-network-or-cache-fetch step 18
                     // If httpRequest’s header list contains `Range`, then append (`Accept-Encoding`, `identity`)
-                    request = request.header(header::ACCEPT_ENCODING, "identity");
+                    headers.append(header::ACCEPT_ENCODING, HeaderValue::from_str("identity")?);
                 }
 
-                if !headers.contains_key(header::USER_AGENT.as_str()) {
-                    request = request.header(header::USER_AGENT, HTTP_USER_AGENT);
+                if !headers.contains_key(header::USER_AGENT) {
+                    headers.append(header::USER_AGENT, HeaderValue::from_str(HTTP_USER_AGENT)?);
                 }
 
-                if cfg!(feature = "unsafe-headers")
-                    && !headers.contains_key(header::ORIGIN.as_str())
-                {
+                // ensure we have an Origin header set
+                if cfg!(not(feature = "unsafe-headers")) || !headers.contains_key(header::ORIGIN) {
                     if let Ok(url) = webview.url() {
-                        request =
-                            request.header(header::ORIGIN, url.origin().ascii_serialization());
+                        headers.append(
+                            header::ORIGIN,
+                            HeaderValue::from_str(&url.origin().ascii_serialization())?,
+                        );
                     }
                 }
 
+                // In case empty origin is passed, remove it. Some services do not like Origin header
+                // so this way we can remove it in explicit way. The default behaviour is still to set it
+                if cfg!(feature = "unsafe-headers")
+                    && headers.get(header::ORIGIN) == Some(&HeaderValue::from_static(""))
+                {
+                    headers.remove(header::ORIGIN);
+                };
+
                 if let Some(data) = data {
                     request = request.body(data);
                 }
 
+                request = request.headers(headers);
+
                 let fut = async move { request.send().await.map_err(Into::into) };
                 let mut resources_table = webview.resources_table();
                 let rid = resources_table.add_request(Box::pin(fut));
diff --git a/plugins/persisted-scope/CHANGELOG.md b/plugins/persisted-scope/CHANGELOG.md
index b27277fa..b2c1628c 100644
--- a/plugins/persisted-scope/CHANGELOG.md
+++ b/plugins/persisted-scope/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## \[2.0.3]
+
+### Dependencies
+
+- Upgraded to `fs@2.0.3`
+
+## \[2.0.2]
+
+### Dependencies
+
+- Upgraded to `fs@2.0.2`
+
 ## \[2.0.1]
 
 - [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
diff --git a/plugins/persisted-scope/Cargo.toml b/plugins/persisted-scope/Cargo.toml
index c03276d0..070cf21b 100644
--- a/plugins/persisted-scope/Cargo.toml
+++ b/plugins/persisted-scope/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-persisted-scope"
-version = "2.0.1"
+version = "2.0.3"
 description = "Save filesystem and asset scopes and restore them when the app is reopened."
 authors = { workspace = true }
 license = { workspace = true }
@@ -27,7 +27,7 @@ log = { workspace = true }
 thiserror = { workspace = true }
 aho-corasick = "1"
 bincode = "1"
-tauri-plugin-fs = { path = "../fs", version = "2.0.1" }
+tauri-plugin-fs = { path = "../fs", version = "2.0.3" }
 
 [features]
 protocol-asset = ["tauri/protocol-asset"]
diff --git a/plugins/positioner/CHANGELOG.md b/plugins/positioner/CHANGELOG.md
index ee4c473f..acbc2cda 100644
--- a/plugins/positioner/CHANGELOG.md
+++ b/plugins/positioner/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## \[2.0.1]
 
+- [`3c1f3874`](https://github.com/tauri-apps/plugins-workspace/commit/3c1f3874f4c828637b3aa983cba13c77427faf58) ([#1911](https://github.com/tauri-apps/plugins-workspace/pull/1911) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Added missing permission for `handleIconState` and fixed its event processing logic.
+
+## \[2.0.1]
+
 - [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
 
 ## \[2.0.0]
diff --git a/plugins/positioner/Cargo.toml b/plugins/positioner/Cargo.toml
index 807d1ed9..2288999c 100644
--- a/plugins/positioner/Cargo.toml
+++ b/plugins/positioner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-positioner"
-version = "2.0.1"
+version = "2.0.2"
 description = "Position your windows at well-known locations."
 authors = { workspace = true }
 license = { workspace = true }
diff --git a/plugins/positioner/api-iife.js b/plugins/positioner/api-iife.js
index bce8ee32..0b78572d 100644
--- a/plugins/positioner/api-iife.js
+++ b/plugins/positioner/api-iife.js
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_POSITIONER__=function(t){"use strict";async function e(t,e={},o){return window.__TAURI_INTERNALS__.invoke(t,e,o)}var o;return"function"==typeof SuppressedError&&SuppressedError,t.Position=void 0,(o=t.Position||(t.Position={}))[o.TopLeft=0]="TopLeft",o[o.TopRight=1]="TopRight",o[o.BottomLeft=2]="BottomLeft",o[o.BottomRight=3]="BottomRight",o[o.TopCenter=4]="TopCenter",o[o.BottomCenter=5]="BottomCenter",o[o.LeftCenter=6]="LeftCenter",o[o.RightCenter=7]="RightCenter",o[o.Center=8]="Center",o[o.TrayLeft=9]="TrayLeft",o[o.TrayBottomLeft=10]="TrayBottomLeft",o[o.TrayRight=11]="TrayRight",o[o.TrayBottomRight=12]="TrayBottomRight",o[o.TrayCenter=13]="TrayCenter",o[o.TrayBottomCenter=14]="TrayBottomCenter",t.handleIconState=async function(t){const o={};o[`${t.rect.size.type}`]={width:t.rect.size.width,height:t.rect.size.height};const i={};i[`${t.rect.position.type}`]={x:t.rect.position.x,y:t.rect.position.y},await e("plugin:positioner|set_tray_icon_state",{position:i,size:o})},t.moveWindow=async function(t){await e("plugin:positioner|move_window",{position:t})},t}({});Object.defineProperty(window.__TAURI__,"positioner",{value:__TAURI_PLUGIN_POSITIONER__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_POSITIONER__=function(t){"use strict";async function o(t,o={},e){return window.__TAURI_INTERNALS__.invoke(t,o,e)}var e;return"function"==typeof SuppressedError&&SuppressedError,t.Position=void 0,(e=t.Position||(t.Position={}))[e.TopLeft=0]="TopLeft",e[e.TopRight=1]="TopRight",e[e.BottomLeft=2]="BottomLeft",e[e.BottomRight=3]="BottomRight",e[e.TopCenter=4]="TopCenter",e[e.BottomCenter=5]="BottomCenter",e[e.LeftCenter=6]="LeftCenter",e[e.RightCenter=7]="RightCenter",e[e.Center=8]="Center",e[e.TrayLeft=9]="TrayLeft",e[e.TrayBottomLeft=10]="TrayBottomLeft",e[e.TrayRight=11]="TrayRight",e[e.TrayBottomRight=12]="TrayBottomRight",e[e.TrayCenter=13]="TrayCenter",e[e.TrayBottomCenter=14]="TrayBottomCenter",t.handleIconState=async function(t){await o("plugin:positioner|set_tray_icon_state",{position:t.rect.position,size:t.rect.size})},t.moveWindow=async function(t){await o("plugin:positioner|move_window",{position:t})},t}({});Object.defineProperty(window.__TAURI__,"positioner",{value:__TAURI_PLUGIN_POSITIONER__})}
diff --git a/plugins/positioner/build.rs b/plugins/positioner/build.rs
index 52d33376..896c81aa 100644
--- a/plugins/positioner/build.rs
+++ b/plugins/positioner/build.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-const COMMANDS: &[&str] = &["move_window"];
+const COMMANDS: &[&str] = &["move_window", "set_tray_icon_state"];
 
 fn main() {
     tauri_plugin::Builder::new(COMMANDS)
diff --git a/plugins/positioner/guest-js/index.ts b/plugins/positioner/guest-js/index.ts
index 8ba1d609..d8f6204f 100644
--- a/plugins/positioner/guest-js/index.ts
+++ b/plugins/positioner/guest-js/index.ts
@@ -40,20 +40,8 @@ export async function moveWindow(to: Position): Promise<void> {
 }
 
 export async function handleIconState(event: TrayIconEvent): Promise<void> {
-  const size = {} as Record<string, unknown>
-  size[`${event.rect.size.type}`] = {
-    width: event.rect.size.width,
-    height: event.rect.size.height
-  }
-
-  const position = {} as Record<string, unknown>
-  position[`${event.rect.position.type}`] = {
-    x: event.rect.position.x,
-    y: event.rect.position.y
-  }
-
   await invoke('plugin:positioner|set_tray_icon_state', {
-    position,
-    size
+    position: event.rect.position,
+    size: event.rect.size
   })
 }
diff --git a/plugins/positioner/package.json b/plugins/positioner/package.json
index faba11e2..b738a342 100644
--- a/plugins/positioner/package.json
+++ b/plugins/positioner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-positioner",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Position your windows at well-known locations.",
   "license": "MIT OR Apache-2.0",
   "authors": [
diff --git a/plugins/positioner/permissions/autogenerated/commands/set_tray_icon_state.toml b/plugins/positioner/permissions/autogenerated/commands/set_tray_icon_state.toml
index dcc8fa56..6b85f635 100644
--- a/plugins/positioner/permissions/autogenerated/commands/set_tray_icon_state.toml
+++ b/plugins/positioner/permissions/autogenerated/commands/set_tray_icon_state.toml
@@ -4,5 +4,10 @@
 
 [[permission]]
 identifier = "allow-set-tray-icon-state"
-description = "Enables the set_tray_icon_state to handle events and set the TrayIcon state."
+description = "Enables the set_tray_icon_state command without any pre-configured scope."
 commands.allow = ["set_tray_icon_state"]
+
+[[permission]]
+identifier = "deny-set-tray-icon-state"
+description = "Denies the set_tray_icon_state command without any pre-configured scope."
+commands.deny = ["set_tray_icon_state"]
diff --git a/plugins/positioner/permissions/autogenerated/reference.md b/plugins/positioner/permissions/autogenerated/reference.md
index 324e4e56..8dfe0466 100644
--- a/plugins/positioner/permissions/autogenerated/reference.md
+++ b/plugins/positioner/permissions/autogenerated/reference.md
@@ -1,6 +1,6 @@
 ## Default Permission
 
-Allows the move_window command
+Allows the moveWindow and handleIconState APIs
 
 - `allow-move-window`
 - `set-tray-icon-state`
@@ -48,7 +48,20 @@ Denies the move_window command without any pre-configured scope.
 </td>
 <td>
 
-Enables the set_tray_icon_state to handle events and set the TrayIcon state.
+Enables the set_tray_icon_state command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`positioner:deny-set-tray-icon-state`
+
+</td>
+<td>
+
+Denies the set_tray_icon_state command without any pre-configured scope.
 
 </td>
 </tr>
diff --git a/plugins/positioner/permissions/default.toml b/plugins/positioner/permissions/default.toml
index 8492711c..bd8dc25e 100644
--- a/plugins/positioner/permissions/default.toml
+++ b/plugins/positioner/permissions/default.toml
@@ -1,4 +1,4 @@
 "$schema" = "schemas/schema.json"
 [default]
-description = "Allows the move_window command"
+description = "Allows the moveWindow and handleIconState APIs"
 permissions = ["allow-move-window", "set-tray-icon-state"]
diff --git a/plugins/positioner/permissions/schemas/schema.json b/plugins/positioner/permissions/schemas/schema.json
index 5bddddde..c4d16966 100644
--- a/plugins/positioner/permissions/schemas/schema.json
+++ b/plugins/positioner/permissions/schemas/schema.json
@@ -305,12 +305,17 @@
           "const": "deny-move-window"
         },
         {
-          "description": "Enables the set_tray_icon_state to handle events and set the TrayIcon state.",
+          "description": "Enables the set_tray_icon_state command without any pre-configured scope.",
           "type": "string",
           "const": "allow-set-tray-icon-state"
         },
         {
-          "description": "Allows the move_window command",
+          "description": "Denies the set_tray_icon_state command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-set-tray-icon-state"
+        },
+        {
+          "description": "Allows the moveWindow and handleIconState APIs",
           "type": "string",
           "const": "default"
         }
diff --git a/plugins/shell/CHANGELOG.md b/plugins/shell/CHANGELOG.md
index bcc894c8..a1cfc195 100644
--- a/plugins/shell/CHANGELOG.md
+++ b/plugins/shell/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## \[2.0.1]
 
+- [`51ddf6a7`](https://github.com/tauri-apps/plugins-workspace/commit/51ddf6a71544acfb261ffc9393dab1342da0a219) ([#1881](https://github.com/tauri-apps/plugins-workspace/pull/1881) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) On Windows, Fix `open` JS API hanging and freezing the app.
+
+## \[2.0.1]
+
 - [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
 
 ## \[2.0.0]
diff --git a/plugins/shell/Cargo.toml b/plugins/shell/Cargo.toml
index 31c0cc97..d170cd46 100644
--- a/plugins/shell/Cargo.toml
+++ b/plugins/shell/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-shell"
-version = "2.0.1"
+version = "2.0.2"
 description = "Access the system shell. Allows you to spawn child processes and manage files and URLs using their default application."
 edition = { workspace = true }
 authors = { workspace = true }
diff --git a/plugins/shell/package.json b/plugins/shell/package.json
index 0975f8f9..abbc33ea 100644
--- a/plugins/shell/package.json
+++ b/plugins/shell/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-shell",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "MIT OR Apache-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"
diff --git a/plugins/shell/src/commands.rs b/plugins/shell/src/commands.rs
index 7aac7b6c..3345bb3a 100644
--- a/plugins/shell/src/commands.rs
+++ b/plugins/shell/src/commands.rs
@@ -303,7 +303,7 @@ pub fn kill<R: Runtime>(
 }
 
 #[tauri::command]
-pub fn open<R: Runtime>(
+pub async fn open<R: Runtime>(
     _window: Window<R>,
     shell: State<'_, Shell<R>>,
     path: String,
diff --git a/plugins/single-instance/examples/vanilla/package.json b/plugins/single-instance/examples/vanilla/package.json
index b4c80cbd..7b0d2c5d 100644
--- a/plugins/single-instance/examples/vanilla/package.json
+++ b/plugins/single-instance/examples/vanilla/package.json
@@ -9,6 +9,6 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@tauri-apps/cli": "2.0.0"
+    "@tauri-apps/cli": "2.0.3"
   }
 }
diff --git a/plugins/sql/guest-js/index.ts b/plugins/sql/guest-js/index.ts
index 05eed0e3..e200936e 100644
--- a/plugins/sql/guest-js/index.ts
+++ b/plugins/sql/guest-js/index.ts
@@ -129,12 +129,12 @@ export default class Database {
    * ```ts
    * // for sqlite & postgres
    * const result = await db.select(
-   *    "SELECT * from todos WHERE id = $1", id
+   *    "SELECT * from todos WHERE id = $1", [ id ]
    * );
    *
    * // for mysql
    * const result = await db.select(
-   *    "SELECT * from todos WHERE id = ?", id
+   *    "SELECT * from todos WHERE id = ?", [ id ]
    * );
    * ```
    */
diff --git a/plugins/sql/src/commands.rs b/plugins/sql/src/commands.rs
index 8cd90e9c..760d00b2 100644
--- a/plugins/sql/src/commands.rs
+++ b/plugins/sql/src/commands.rs
@@ -23,7 +23,7 @@ pub(crate) async fn load<R: Runtime>(
         pool.migrate(&migrator).await?;
     }
 
-    db_instances.0.lock().await.insert(db.clone(), pool);
+    db_instances.0.write().await.insert(db.clone(), pool);
 
     Ok(db)
 }
@@ -36,7 +36,7 @@ pub(crate) async fn close(
     db_instances: State<'_, DbInstances>,
     db: Option<String>,
 ) -> Result<bool, crate::Error> {
-    let mut instances = db_instances.0.lock().await;
+    let instances = db_instances.0.read().await;
 
     let pools = if let Some(db) = db {
         vec![db]
@@ -45,9 +45,7 @@ pub(crate) async fn close(
     };
 
     for pool in pools {
-        let db = instances
-            .get_mut(&pool)
-            .ok_or(Error::DatabaseNotLoaded(pool))?;
+        let db = instances.get(&pool).ok_or(Error::DatabaseNotLoaded(pool))?;
         db.close().await;
     }
 
@@ -62,9 +60,9 @@ pub(crate) async fn execute(
     query: String,
     values: Vec<JsonValue>,
 ) -> Result<(u64, LastInsertId), crate::Error> {
-    let mut instances = db_instances.0.lock().await;
+    let instances = db_instances.0.read().await;
 
-    let db = instances.get_mut(&db).ok_or(Error::DatabaseNotLoaded(db))?;
+    let db = instances.get(&db).ok_or(Error::DatabaseNotLoaded(db))?;
     db.execute(query, values).await
 }
 
@@ -75,8 +73,8 @@ pub(crate) async fn select(
     query: String,
     values: Vec<JsonValue>,
 ) -> Result<Vec<IndexMap<String, JsonValue>>, crate::Error> {
-    let mut instances = db_instances.0.lock().await;
+    let instances = db_instances.0.read().await;
 
-    let db = instances.get_mut(&db).ok_or(Error::DatabaseNotLoaded(db))?;
+    let db = instances.get(&db).ok_or(Error::DatabaseNotLoaded(db))?;
     db.select(query, values).await
 }
diff --git a/plugins/sql/src/lib.rs b/plugins/sql/src/lib.rs
index ec9362bf..352ffbec 100644
--- a/plugins/sql/src/lib.rs
+++ b/plugins/sql/src/lib.rs
@@ -29,12 +29,12 @@ use tauri::{
     plugin::{Builder as PluginBuilder, TauriPlugin},
     Manager, RunEvent, Runtime,
 };
-use tokio::sync::Mutex;
+use tokio::sync::{Mutex, RwLock};
 
 use std::collections::HashMap;
 
 #[derive(Default)]
-pub struct DbInstances(pub Mutex<HashMap<String, DbPool>>);
+pub struct DbInstances(pub RwLock<HashMap<String, DbPool>>);
 
 #[derive(Serialize)]
 #[serde(untagged)]
@@ -140,12 +140,14 @@ impl Builder {
 
                 tauri::async_runtime::block_on(async move {
                     let instances = DbInstances::default();
-                    let mut lock = instances.0.lock().await;
+                    let mut lock = instances.0.write().await;
 
                     for db in config.preload {
                         let pool = DbPool::connect(&db, app).await?;
 
-                        if let Some(migrations) = self.migrations.as_mut().unwrap().remove(&db) {
+                        if let Some(migrations) =
+                            self.migrations.as_mut().and_then(|mm| mm.remove(&db))
+                        {
                             let migrator = Migrator::new(migrations).await?;
                             pool.migrate(&migrator).await?;
                         }
@@ -166,7 +168,7 @@ impl Builder {
                 if let RunEvent::Exit = event {
                     tauri::async_runtime::block_on(async move {
                         let instances = &*app.state::<DbInstances>();
-                        let instances = instances.0.lock().await;
+                        let instances = instances.0.read().await;
                         for value in instances.values() {
                             value.close().await;
                         }
diff --git a/plugins/store/CHANGELOG.md b/plugins/store/CHANGELOG.md
index 59d4b9b1..51ac5ed2 100644
--- a/plugins/store/CHANGELOG.md
+++ b/plugins/store/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## \[2.1.0]
+
+### feat
+
+- [`8c67d44a`](https://github.com/tauri-apps/plugins-workspace/commit/8c67d44aef60b1427019538d8420787ef35bd3d5) ([#1860](https://github.com/tauri-apps/plugins-workspace/pull/1860) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) -   Add `getStore`
+  - Add an option to use pre-stored (de)serialize functions (registered on rust)
+  - Add `LazyStore`
+
 ## \[2.0.1]
 
 - [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
@@ -125,3 +133,11 @@
   com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
   plugins-workspace/pull/371)) First v2 alpha release!
   com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
+) First v2 alpha release!
+  com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
+  eb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
+  ps://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
+  717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
+  com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
+  plugins-workspace/pull/371)) First v2 alpha release!
+  com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/store/Cargo.toml b/plugins/store/Cargo.toml
index d270b1f1..ff181ea4 100644
--- a/plugins/store/Cargo.toml
+++ b/plugins/store/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-store"
-version = "2.0.1"
+version = "2.1.0"
 description = "Simple, persistent key-value store."
 authors = { workspace = true }
 license = { workspace = true }
diff --git a/plugins/store/README.md b/plugins/store/README.md
index 391d7a0c..7ab63fd4 100644
--- a/plugins/store/README.md
+++ b/plugins/store/README.md
@@ -70,7 +70,7 @@ Afterwards all the plugin's APIs are available through the JavaScript guest bind
 ```typescript
 import { Store } from '@tauri-apps/plugin-store'
 
-const store = new Store('.settings.dat')
+const store = await Store.load('settings.json')
 
 await store.set('some-key', { value: 5 })
 
@@ -81,14 +81,11 @@ if (val) {
 } else {
   console.log('val is null')
 }
-
-// This manually saves the store.
-await store.save()
 ```
 
 ### Persisting Values
 
-As seen above, values added to the store are not persisted between application loads unless the application is closed gracefully.
+Modifications made to the store are automatically saved by default
 
 You can manually save a store with:
 
@@ -103,65 +100,43 @@ However, you can also load them manually later like so:
 await store.load()
 ```
 
+### LazyStore
+
+There's also a high level API `LazyStore` which only loads the store on first access, note that the options will be ignored if a `Store` with that path has already been created
+
+```typescript
+import { LazyStore } from '@tauri-apps/plugin-store'
+
+const store = new LazyStore('settings.json')
+```
+
 ## Usage from Rust
 
 You can also create `Store` instances directly in Rust:
 
 ```rust
-use tauri_plugin_store::StoreBuilder;
+use tauri_plugin_store::StoreExt;
 use serde_json::json;
 
 fn main() {
     tauri::Builder::default()
         .plugin(tauri_plugin_store::Builder::default().build())
         .setup(|app| {
-            let mut store = StoreBuilder::new("app_data.bin").build(app.handle().clone());
-
-            // Attempt to load the store, if it's saved already.
-            store.load().expect("Failed to load store from disk");
+            // This loads the store from disk
+            let store = app.store("app_data.json")?;
 
             // Note that values must be serde_json::Value instances,
             // otherwise, they will not be compatible with the JavaScript bindings.
-            store.insert("a".to_string(), json!("b"));
-
-            // You can manually save the store after making changes.
-            // Otherwise, it will save upon graceful exit as described above.
-            store.save()
+            store.set("a".to_string(), json!("b"));
         })
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }
 ```
 
-### Loading Gracefully
-
-If you call `load` on a `Store` that hasn't yet been written to the disk, it will return an error. You must handle this error if you want to gracefully continue and use the default store until you save it to the disk. The example above shows how to do this.
-
-For example, this would cause a panic if the store has not yet been created:
-
-```rust
-store.load().unwrap();
-```
-
-Rather than silently continuing like you may expect.
-
-You should always handle the error appropriately rather than unwrapping, or you may experience unexpected app crashes:
-
-```rust
-store.load().expect("Failed to load store from disk");
-```
-
 ### Frontend Interoperability
 
-As you may have noticed, the `Store` crated above isn't accessible to the frontend. To interoperate with stores created by JavaScript use the exported `with_store` method:
-
-```rust
-use tauri::Wry;
-use tauri_plugin_store::StoreExt;
-
-let store = app.store_builder("app_data.bin").build();
-store.insert("key", "value");
-```
+The store created from both Rust side and JavaScript side are stored in the app's resource table and can be accessed by both sides, you can access it by using the same path, with `getStore` and `LazyStore` in the JavaScript side and `get_store` and `store` in the Rust side
 
 ## Contributing
 
diff --git a/plugins/store/api-iife.js b/plugins/store/api-iife.js
index 77295d7f..fc04ff00 100644
--- a/plugins/store/api-iife.js
+++ b/plugins/store/api-iife.js
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_STORE__=function(e){"use strict";var t,r;function a(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}async function i(e,t={},r){return window.__TAURI_INTERNALS__.invoke(e,t,r)}"function"==typeof SuppressedError&&SuppressedError;class n{get rid(){return function(e,t,r,a){if("a"===r&&!a)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof t?e!==t||!a:!t.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===r?a:"a"===r?a.call(e):a?a.value:t.get(e)}(this,t,"f")}constructor(e){t.set(this,void 0),function(e,t,r,a,i){if("function"==typeof t?e!==t||!i:!t.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");t.set(e,r)}(this,t,e)}async close(){return i("plugin:resources|close",{rid:this.rid})}}async function s(e,t,r){const n={kind:"Any"};return i("plugin:event|listen",{event:e,target:n,handler:a(t)}).then((t=>async()=>async function(e,t){await i("plugin:event|unlisten",{event:e,eventId:t})}(e,t)))}t=new WeakMap,function(e){e.WINDOW_RESIZED="tauri://resize",e.WINDOW_MOVED="tauri://move",e.WINDOW_CLOSE_REQUESTED="tauri://close-requested",e.WINDOW_DESTROYED="tauri://destroyed",e.WINDOW_FOCUS="tauri://focus",e.WINDOW_BLUR="tauri://blur",e.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",e.WINDOW_THEME_CHANGED="tauri://theme-changed",e.WINDOW_CREATED="tauri://window-created",e.WEBVIEW_CREATED="tauri://webview-created",e.DRAG_ENTER="tauri://drag-enter",e.DRAG_OVER="tauri://drag-over",e.DRAG_DROP="tauri://drag-drop",e.DRAG_LEAVE="tauri://drag-leave"}(r||(r={}));class o extends n{constructor(e,t){super(e),this.path=t}async set(e,t){await i("plugin:store|set",{rid:this.rid,key:e,value:t})}async get(e){return await i("plugin:store|get",{rid:this.rid,key:e})}async has(e){return await i("plugin:store|has",{rid:this.rid,key:e})}async delete(e){return await i("plugin:store|delete",{rid:this.rid,key:e})}async clear(){await i("plugin:store|clear",{rid:this.rid})}async reset(){await i("plugin:store|reset",{rid:this.rid})}async keys(){return await i("plugin:store|keys",{rid:this.rid})}async values(){return await i("plugin:store|values",{rid:this.rid})}async entries(){return await i("plugin:store|entries",{rid:this.rid})}async length(){return await i("plugin:store|length",{rid:this.rid})}async load(){await i("plugin:store|load",{rid:this.rid})}async save(){await i("plugin:store|save",{rid:this.rid})}async onKeyChange(e,t){return await s("store://change",(r=>{r.payload.path===this.path&&r.payload.key===e&&t(r.payload.value)}))}async onChange(e){return await s("store://change",(t=>{t.payload.path===this.path&&e(t.payload.key,t.payload.value)}))}}return e.Store=o,e.createStore=async function(e,t){const r=await i("plugin:store|create_store",{path:e,...t});return new o(r,e)},e}({});Object.defineProperty(window.__TAURI__,"store",{value:__TAURI_PLUGIN_STORE__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_STORE__=function(t){"use strict";var e,a;function r(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}async function s(t,e={},a){return window.__TAURI_INTERNALS__.invoke(t,e,a)}"function"==typeof SuppressedError&&SuppressedError;class i{get rid(){return function(t,e,a,r){if("a"===a&&!r)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!r:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===a?r:"a"===a?r.call(t):r?r.value:e.get(t)}(this,e,"f")}constructor(t){e.set(this,void 0),function(t,e,a,r,s){if("function"==typeof e?t!==e||!s:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");e.set(t,a)}(this,e,t)}async close(){return s("plugin:resources|close",{rid:this.rid})}}async function n(t,e,a){const i={kind:"Any"};return s("plugin:event|listen",{event:t,target:i,handler:r(e)}).then((e=>async()=>async function(t,e){await s("plugin:event|unlisten",{event:t,eventId:e})}(t,e)))}async function o(t,e){return await u.load(t,e)}e=new WeakMap,function(t){t.WINDOW_RESIZED="tauri://resize",t.WINDOW_MOVED="tauri://move",t.WINDOW_CLOSE_REQUESTED="tauri://close-requested",t.WINDOW_DESTROYED="tauri://destroyed",t.WINDOW_FOCUS="tauri://focus",t.WINDOW_BLUR="tauri://blur",t.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",t.WINDOW_THEME_CHANGED="tauri://theme-changed",t.WINDOW_CREATED="tauri://window-created",t.WEBVIEW_CREATED="tauri://webview-created",t.DRAG_ENTER="tauri://drag-enter",t.DRAG_OVER="tauri://drag-over",t.DRAG_DROP="tauri://drag-drop",t.DRAG_LEAVE="tauri://drag-leave"}(a||(a={}));class u extends i{constructor(t){super(t)}static async load(t,e){const a=await s("plugin:store|load",{path:t,...e});return new u(a)}static async get(t){return await s("plugin:store|get_store",{path:t}).then((t=>t?new u(t):null))}async set(t,e){await s("plugin:store|set",{rid:this.rid,key:t,value:e})}async get(t){const[e,a]=await s("plugin:store|get",{rid:this.rid,key:t});return a?e:void 0}async has(t){return await s("plugin:store|has",{rid:this.rid,key:t})}async delete(t){return await s("plugin:store|delete",{rid:this.rid,key:t})}async clear(){await s("plugin:store|clear",{rid:this.rid})}async reset(){await s("plugin:store|reset",{rid:this.rid})}async keys(){return await s("plugin:store|keys",{rid:this.rid})}async values(){return await s("plugin:store|values",{rid:this.rid})}async entries(){return await s("plugin:store|entries",{rid:this.rid})}async length(){return await s("plugin:store|length",{rid:this.rid})}async reload(){await s("plugin:store|reload",{rid:this.rid})}async save(){await s("plugin:store|save",{rid:this.rid})}async onKeyChange(t,e){return await n("store://change",(a=>{a.payload.resourceId===this.rid&&a.payload.key===t&&e(a.payload.exists?a.payload.value:void 0)}))}async onChange(t){return await n("store://change",(e=>{e.payload.resourceId===this.rid&&t(e.payload.key,e.payload.exists?e.payload.value:void 0)}))}}return t.LazyStore=class{get store(){return this._store||(this._store=o(this.path,this.options)),this._store}constructor(t,e){this.path=t,this.options=e}async init(){await this.store}async set(t,e){return(await this.store).set(t,e)}async get(t){return(await this.store).get(t)}async has(t){return(await this.store).has(t)}async delete(t){return(await this.store).delete(t)}async clear(){await(await this.store).clear()}async reset(){await(await this.store).reset()}async keys(){return(await this.store).keys()}async values(){return(await this.store).values()}async entries(){return(await this.store).entries()}async length(){return(await this.store).length()}async reload(){await(await this.store).reload()}async save(){await(await this.store).save()}async onKeyChange(t,e){return(await this.store).onKeyChange(t,e)}async onChange(t){return(await this.store).onChange(t)}async close(){this._store&&await(await this._store).close()}},t.Store=u,t.getStore=async function(t){return await u.get(t)},t.load=o,t}({});Object.defineProperty(window.__TAURI__,"store",{value:__TAURI_PLUGIN_STORE__})}
diff --git a/plugins/store/build.rs b/plugins/store/build.rs
index 3c9fee01..2e88d59a 100644
--- a/plugins/store/build.rs
+++ b/plugins/store/build.rs
@@ -3,7 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 const COMMANDS: &[&str] = &[
-    "create_store",
+    "load",
+    "get_store",
     "set",
     "get",
     "has",
@@ -12,9 +13,9 @@ const COMMANDS: &[&str] = &[
     "reset",
     "keys",
     "values",
-    "length",
     "entries",
-    "load",
+    "length",
+    "reload",
     "save",
 ];
 
diff --git a/plugins/store/examples/AppSettingsManager/package.json b/plugins/store/examples/AppSettingsManager/package.json
index ca7e3b95..cd2cb198 100644
--- a/plugins/store/examples/AppSettingsManager/package.json
+++ b/plugins/store/examples/AppSettingsManager/package.json
@@ -8,7 +8,7 @@
     "tauri": "tauri"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.0.0",
+    "@tauri-apps/cli": "2.0.3",
     "vite": "^5.0.12",
     "typescript": "^5.4.7"
   }
diff --git a/plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs b/plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs
index 0dd4e0bc..f20db4fc 100644
--- a/plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs
+++ b/plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs
@@ -5,9 +5,8 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
-use std::time::Duration;
-
 use serde_json::json;
+use tauri::Listener;
 use tauri_plugin_store::StoreExt;
 
 mod app;
@@ -18,17 +17,11 @@ fn main() {
         .plugin(tauri_plugin_store::Builder::new().build())
         .setup(|app| {
             // Init store and load it from disk
-            let store = app
-                .handle()
-                .store_builder("settings.json")
-                .auto_save(Duration::from_millis(100))
-                .build();
-
-            // If there are no saved settings yet, this will return an error so we ignore the return value.
-            let _ = store.load();
-
+            let store = app.store("settings.json")?;
+            app.listen("store://change", |event| {
+                dbg!(event);
+            });
             let app_settings = AppSettings::load_from_store(&store);
-
             match app_settings {
                 Ok(app_settings) => {
                     let theme = app_settings.theme;
diff --git a/plugins/store/examples/AppSettingsManager/src-tauri/tauri.conf.json b/plugins/store/examples/AppSettingsManager/src-tauri/tauri.conf.json
index 5a67883d..d3f60daa 100644
--- a/plugins/store/examples/AppSettingsManager/src-tauri/tauri.conf.json
+++ b/plugins/store/examples/AppSettingsManager/src-tauri/tauri.conf.json
@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "identifier": "com.tauri.app-settings-manager",
   "build": {
+    "devUrl": "http://localhost:1420",
     "frontendDist": "../dist"
   },
   "app": {
diff --git a/plugins/store/guest-js/index.ts b/plugins/store/guest-js/index.ts
index 259b0662..1df89fd5 100644
--- a/plugins/store/guest-js/index.ts
+++ b/plugins/store/guest-js/index.ts
@@ -8,8 +8,10 @@ import { invoke, Resource } from '@tauri-apps/api/core'
 
 interface ChangePayload<T> {
   path: string
+  resourceId?: number
   key: string
-  value: T | null
+  value: T
+  exists: boolean
 }
 
 /**
@@ -17,41 +19,213 @@ interface ChangePayload<T> {
  */
 export type StoreOptions = {
   /**
-   * Auto save on modification with debounce duration in milliseconds
+   * Auto save on modification with debounce duration in milliseconds, it's 100ms by default, pass in `false` to disable it
    */
-  autoSave?: boolean
+  autoSave?: boolean | number
+  /**
+   * Name of a serialize function registered in the rust side plugin builder
+   */
+  serializeFnName?: string
+  /**
+   * Name of a deserialize function registered in the rust side plugin builder
+   */
+  deserializeFnName?: string
+  /**
+   * Force create a new store with default values even if it already exists.
+   */
+  createNew?: boolean
+}
+
+/**
+ * Create a new Store or load the existing store with the path.
+ *
+ * @example
+ * ```typescript
+ * import { Store } from '@tauri-apps/api/store';
+ * const store = await Store.load('store.json');
+ * ```
+ *
+ * @param path Path to save the store in `app_data_dir`
+ * @param options Store configuration options
+ */
+export async function load(
+  path: string,
+  options?: StoreOptions
+): Promise<Store> {
+  return await Store.load(path, options)
 }
 
 /**
- * @param path: Path to save the store in `app_data_dir`
- * @param options: Store configuration options
+ * Gets an already loaded store.
+ *
+ * If the store is not loaded, returns `null`. In this case you must {@link Store.load load} it.
+ *
+ * This function is more useful when you already know the store is loaded
+ * and just need to access its instance. Prefer {@link Store.load} otherwise.
+ *
+ * @example
+ * ```typescript
+ * import { getStore } from '@tauri-apps/api/store';
+ * const store = await getStore('store.json');
+ * ```
+ *
+ * @param path Path of the store.
  */
-export async function createStore(path: string, options?: StoreOptions) {
-  const resourceId = await invoke<number>('plugin:store|create_store', {
-    path,
-    ...options
-  })
-  return new Store(resourceId, path)
+export async function getStore(path: string): Promise<Store | null> {
+  return await Store.get(path)
 }
 
 /**
  * A lazy loaded key-value store persisted by the backend layer.
  */
-export class Store extends Resource {
+export class LazyStore implements IStore {
+  private _store?: Promise<Store>
+
+  private get store(): Promise<Store> {
+    if (!this._store) {
+      this._store = load(this.path, this.options)
+    }
+    return this._store
+  }
+
+  /**
+   * Note that the options are not applied if someone else already created the store
+   * @param path Path to save the store in `app_data_dir`
+   * @param options Store configuration options
+   */
   constructor(
-    rid: number,
-    private readonly path: string
-  ) {
+    private readonly path: string,
+    private readonly options?: StoreOptions
+  ) {}
+
+  /**
+   * Init/load the store if it's not loaded already
+   */
+  async init(): Promise<void> {
+    await this.store
+  }
+
+  async set(key: string, value: unknown): Promise<void> {
+    return (await this.store).set(key, value)
+  }
+
+  async get<T>(key: string): Promise<T | undefined> {
+    return (await this.store).get<T>(key)
+  }
+
+  async has(key: string): Promise<boolean> {
+    return (await this.store).has(key)
+  }
+
+  async delete(key: string): Promise<boolean> {
+    return (await this.store).delete(key)
+  }
+
+  async clear(): Promise<void> {
+    await (await this.store).clear()
+  }
+
+  async reset(): Promise<void> {
+    await (await this.store).reset()
+  }
+
+  async keys(): Promise<string[]> {
+    return (await this.store).keys()
+  }
+
+  async values<T>(): Promise<T[]> {
+    return (await this.store).values<T>()
+  }
+
+  async entries<T>(): Promise<Array<[key: string, value: T]>> {
+    return (await this.store).entries<T>()
+  }
+
+  async length(): Promise<number> {
+    return (await this.store).length()
+  }
+
+  async reload(): Promise<void> {
+    await (await this.store).reload()
+  }
+
+  async save(): Promise<void> {
+    await (await this.store).save()
+  }
+
+  async onKeyChange<T>(
+    key: string,
+    cb: (value: T | undefined) => void
+  ): Promise<UnlistenFn> {
+    return (await this.store).onKeyChange<T>(key, cb)
+  }
+
+  async onChange<T>(
+    cb: (key: string, value: T | undefined) => void
+  ): Promise<UnlistenFn> {
+    return (await this.store).onChange<T>(cb)
+  }
+
+  async close(): Promise<void> {
+    if (this._store) {
+      await (await this._store).close()
+    }
+  }
+}
+
+/**
+ * A key-value store persisted by the backend layer.
+ */
+export class Store extends Resource implements IStore {
+  private constructor(rid: number) {
     super(rid)
   }
 
   /**
-   * Inserts a key-value pair into the store.
+   * Create a new Store or load the existing store with the path.
    *
-   * @param key
-   * @param value
-   * @returns
+   * @example
+   * ```typescript
+   * import { Store } from '@tauri-apps/api/store';
+   * const store = await Store.load('store.json');
+   * ```
+   *
+   * @param path Path to save the store in `app_data_dir`
+   * @param options Store configuration options
    */
+  static async load(path: string, options?: StoreOptions): Promise<Store> {
+    const rid = await invoke<number>('plugin:store|load', {
+      path,
+      ...options
+    })
+    return new Store(rid)
+  }
+
+  /**
+   * Gets an already loaded store.
+   *
+   * If the store is not loaded, returns `null`. In this case you must {@link Store.load load} it.
+   *
+   * This function is more useful when you already know the store is loaded
+   * and just need to access its instance. Prefer {@link Store.load} otherwise.
+   *
+   * @example
+   * ```typescript
+   * import { Store } from '@tauri-apps/api/store';
+   * let store = await Store.get('store.json');
+   * if (!store) {
+   *   store = await Store.load('store.json');
+   * }
+   * ```
+   *
+   * @param path Path of the store.
+   */
+  static async get(path: string): Promise<Store | null> {
+    return await invoke<number | null>('plugin:store|get_store', { path }).then(
+      (rid) => (rid ? new Store(rid) : null)
+    )
+  }
+
   async set(key: string, value: unknown): Promise<void> {
     await invoke('plugin:store|set', {
       rid: this.rid,
@@ -60,18 +234,102 @@ export class Store extends Resource {
     })
   }
 
+  async get<T>(key: string): Promise<T | undefined> {
+    const [value, exists] = await invoke<[T, boolean]>('plugin:store|get', {
+      rid: this.rid,
+      key
+    })
+    return exists ? value : undefined
+  }
+
+  async has(key: string): Promise<boolean> {
+    return await invoke('plugin:store|has', {
+      rid: this.rid,
+      key
+    })
+  }
+
+  async delete(key: string): Promise<boolean> {
+    return await invoke('plugin:store|delete', {
+      rid: this.rid,
+      key
+    })
+  }
+
+  async clear(): Promise<void> {
+    await invoke('plugin:store|clear', { rid: this.rid })
+  }
+
+  async reset(): Promise<void> {
+    await invoke('plugin:store|reset', { rid: this.rid })
+  }
+
+  async keys(): Promise<string[]> {
+    return await invoke('plugin:store|keys', { rid: this.rid })
+  }
+
+  async values<T>(): Promise<T[]> {
+    return await invoke('plugin:store|values', { rid: this.rid })
+  }
+
+  async entries<T>(): Promise<Array<[key: string, value: T]>> {
+    return await invoke('plugin:store|entries', { rid: this.rid })
+  }
+
+  async length(): Promise<number> {
+    return await invoke('plugin:store|length', { rid: this.rid })
+  }
+
+  async reload(): Promise<void> {
+    await invoke('plugin:store|reload', { rid: this.rid })
+  }
+
+  async save(): Promise<void> {
+    await invoke('plugin:store|save', { rid: this.rid })
+  }
+
+  async onKeyChange<T>(
+    key: string,
+    cb: (value: T | undefined) => void
+  ): Promise<UnlistenFn> {
+    return await listen<ChangePayload<T>>('store://change', (event) => {
+      if (event.payload.resourceId === this.rid && event.payload.key === key) {
+        cb(event.payload.exists ? event.payload.value : undefined)
+      }
+    })
+  }
+
+  async onChange<T>(
+    cb: (key: string, value: T | undefined) => void
+  ): Promise<UnlistenFn> {
+    return await listen<ChangePayload<T>>('store://change', (event) => {
+      if (event.payload.resourceId === this.rid) {
+        cb(
+          event.payload.key,
+          event.payload.exists ? event.payload.value : undefined
+        )
+      }
+    })
+  }
+}
+
+interface IStore {
   /**
-   * Returns the value for the given `key` or `null` the key does not exist.
+   * Inserts a key-value pair into the store.
    *
    * @param key
+   * @param value
    * @returns
    */
-  async get<T>(key: string): Promise<T | null> {
-    return await invoke('plugin:store|get', {
-      rid: this.rid,
-      key
-    })
-  }
+  set(key: string, value: unknown): Promise<void>
+
+  /**
+   * Returns the value for the given `key` or `undefined` if the key does not exist.
+   *
+   * @param key
+   * @returns
+   */
+  get<T>(key: string): Promise<T | undefined>
 
   /**
    * Returns `true` if the given `key` exists in the store.
@@ -79,12 +337,7 @@ export class Store extends Resource {
    * @param key
    * @returns
    */
-  async has(key: string): Promise<boolean> {
-    return await invoke('plugin:store|has', {
-      rid: this.rid,
-      key
-    })
-  }
+  has(key: string): Promise<boolean>
 
   /**
    * Removes a key-value pair from the store.
@@ -92,91 +345,67 @@ export class Store extends Resource {
    * @param key
    * @returns
    */
-  async delete(key: string): Promise<boolean> {
-    return await invoke('plugin:store|delete', {
-      rid: this.rid,
-      key
-    })
-  }
+  delete(key: string): Promise<boolean>
 
   /**
    * Clears the store, removing all key-value pairs.
    *
-   * Note: To clear the storage and reset it to it's `default` value, use `reset` instead.
+   * Note: To clear the storage and reset it to its `default` value, use {@linkcode reset} instead.
    * @returns
    */
-  async clear(): Promise<void> {
-    await invoke('plugin:store|clear', { rid: this.rid })
-  }
+  clear(): Promise<void>
 
   /**
-   * Resets the store to it's `default` value.
+   * Resets the store to its `default` value.
    *
-   * If no default value has been set, this method behaves identical to `clear`.
+   * If no default value has been set, this method behaves identical to {@linkcode clear}.
    * @returns
    */
-  async reset(): Promise<void> {
-    await invoke('plugin:store|reset', { rid: this.rid })
-  }
+  reset(): Promise<void>
 
   /**
-   * Returns a list of all key in the store.
+   * Returns a list of all keys in the store.
    *
    * @returns
    */
-  async keys(): Promise<string[]> {
-    return await invoke('plugin:store|keys', { rid: this.rid })
-  }
+  keys(): Promise<string[]>
 
   /**
    * Returns a list of all values in the store.
    *
    * @returns
    */
-  async values<T>(): Promise<T[]> {
-    return await invoke('plugin:store|values', { rid: this.rid })
-  }
+  values<T>(): Promise<T[]>
 
   /**
    * Returns a list of all entries in the store.
    *
    * @returns
    */
-  async entries<T>(): Promise<Array<[key: string, value: T]>> {
-    return await invoke('plugin:store|entries', { rid: this.rid })
-  }
+  entries<T>(): Promise<Array<[key: string, value: T]>>
 
   /**
    * Returns the number of key-value pairs in the store.
    *
    * @returns
    */
-  async length(): Promise<number> {
-    return await invoke('plugin:store|length', { rid: this.rid })
-  }
+  length(): Promise<number>
 
   /**
-   * Attempts to load the on-disk state at the stores `path` into memory.
+   * Attempts to load the on-disk state at the store's `path` into memory.
    *
    * This method is useful if the on-disk state was edited by the user and you want to synchronize the changes.
    *
    * Note: This method does not emit change events.
    * @returns
    */
-  async load(): Promise<void> {
-    await invoke('plugin:store|load', { rid: this.rid })
-  }
+  reload(): Promise<void>
 
   /**
-   * Saves the store to disk at the stores `path`.
-   *
-   * As the store is only persisted to disk before the apps exit, changes might be lost in a crash.
-   * This method lets you persist the store to disk whenever you deem necessary.
+   * Saves the store to disk at the store's `path`.
    * @returns
    */
-  async save(): Promise<void> {
-    await invoke('plugin:store|save', { rid: this.rid })
-  }
+  save(): Promise<void>
 
   /**
    * Listen to changes on a store key.
@@ -186,16 +415,10 @@ export class Store extends Resource {
    *
    * @since 2.0.0
    */
-  async onKeyChange<T>(
+  onKeyChange<T>(
     key: string,
-    cb: (value: T | null) => void
-  ): Promise<UnlistenFn> {
-    return await listen<ChangePayload<T>>('store://change', (event) => {
-      if (event.payload.path === this.path && event.payload.key === key) {
-        cb(event.payload.value)
-      }
-    })
-  }
+    cb: (value: T | undefined) => void
+  ): Promise<UnlistenFn>
 
   /**
    * Listen to changes on the store.
@@ -204,13 +427,13 @@ export class Store extends Resource {
    *
    * @since 2.0.0
    */
-  async onChange<T>(
-    cb: (key: string, value: T | null) => void
-  ): Promise<UnlistenFn> {
-    return await listen<ChangePayload<T>>('store://change', (event) => {
-      if (event.payload.path === this.path) {
-        cb(event.payload.key, event.payload.value)
-      }
-    })
-  }
+  onChange<T>(
+    cb: (key: string, value: T | undefined) => void
+  ): Promise<UnlistenFn>
+
+  /**
+   * Close the store and cleans up this resource from memory.
+   * **You should not call any method on this object anymore and should drop any reference to it.**
+   */
+  close(): Promise<void>
 }
diff --git a/plugins/store/package.json b/plugins/store/package.json
index 034f8873..e310463c 100644
--- a/plugins/store/package.json
+++ b/plugins/store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-store",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Simple, persistent key-value store.",
   "license": "MIT OR Apache-2.0",
   "authors": [
diff --git a/plugins/store/permissions/autogenerated/commands/create_store.toml b/plugins/store/permissions/autogenerated/commands/create_store.toml
deleted file mode 100644
index cde71c24..00000000
--- a/plugins/store/permissions/autogenerated/commands/create_store.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-create-store"
-description = "Enables the create_store command without any pre-configured scope."
-commands.allow = ["create_store"]
-
-[[permission]]
-identifier = "deny-create-store"
-description = "Denies the create_store command without any pre-configured scope."
-commands.deny = ["create_store"]
diff --git a/plugins/store/permissions/autogenerated/commands/get_store.toml b/plugins/store/permissions/autogenerated/commands/get_store.toml
new file mode 100644
index 00000000..7c19173a
--- /dev/null
+++ b/plugins/store/permissions/autogenerated/commands/get_store.toml
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-get-store"
+description = "Enables the get_store command without any pre-configured scope."
+commands.allow = ["get_store"]
+
+[[permission]]
+identifier = "deny-get-store"
+description = "Denies the get_store command without any pre-configured scope."
+commands.deny = ["get_store"]
diff --git a/plugins/store/permissions/autogenerated/commands/reload.toml b/plugins/store/permissions/autogenerated/commands/reload.toml
new file mode 100644
index 00000000..92e25253
--- /dev/null
+++ b/plugins/store/permissions/autogenerated/commands/reload.toml
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-reload"
+description = "Enables the reload command without any pre-configured scope."
+commands.allow = ["reload"]
+
+[[permission]]
+identifier = "deny-reload"
+description = "Denies the reload command without any pre-configured scope."
+commands.deny = ["reload"]
diff --git a/plugins/store/permissions/autogenerated/reference.md b/plugins/store/permissions/autogenerated/reference.md
index 4e9bf2cc..5640415d 100644
--- a/plugins/store/permissions/autogenerated/reference.md
+++ b/plugins/store/permissions/autogenerated/reference.md
@@ -9,19 +9,20 @@ All operations are enabled by default.
 
 
 
-- `allow-create-store`
-- `allow-clear`
-- `allow-delete`
-- `allow-entries`
+- `allow-load`
+- `allow-get-store`
+- `allow-set`
 - `allow-get`
 - `allow-has`
+- `allow-delete`
+- `allow-clear`
+- `allow-reset`
 - `allow-keys`
+- `allow-values`
+- `allow-entries`
 - `allow-length`
-- `allow-load`
-- `allow-reset`
+- `allow-reload`
 - `allow-save`
-- `allow-set`
-- `allow-values`
 
 ## Permission Table
 
@@ -61,12 +62,12 @@ Denies the clear command without any pre-configured scope.
 <tr>
 <td>
 
-`store:allow-create-store`
+`store:allow-delete`
 
 </td>
 <td>
 
-Enables the create_store command without any pre-configured scope.
+Enables the delete command without any pre-configured scope.
 
 </td>
 </tr>
@@ -74,12 +75,12 @@ Enables the create_store command without any pre-configured scope.
 <tr>
 <td>
 
-`store:deny-create-store`
+`store:deny-delete`
 
 </td>
 <td>
 
-Denies the create_store command without any pre-configured scope.
+Denies the delete command without any pre-configured scope.
 
 </td>
 </tr>
@@ -87,12 +88,12 @@ Denies the create_store command without any pre-configured scope.
 <tr>
 <td>
 
-`store:allow-delete`
+`store:allow-entries`
 
 </td>
 <td>
 
-Enables the delete command without any pre-configured scope.
+Enables the entries command without any pre-configured scope.
 
 </td>
 </tr>
@@ -100,12 +101,12 @@ Enables the delete command without any pre-configured scope.
 <tr>
 <td>
 
-`store:deny-delete`
+`store:deny-entries`
 
 </td>
 <td>
 
-Denies the delete command without any pre-configured scope.
+Denies the entries command without any pre-configured scope.
 
 </td>
 </tr>
@@ -113,12 +114,12 @@ Denies the delete command without any pre-configured scope.
 <tr>
 <td>
 
-`store:allow-entries`
+`store:allow-get`
 
 </td>
 <td>
 
-Enables the entries command without any pre-configured scope.
+Enables the get command without any pre-configured scope.
 
 </td>
 </tr>
@@ -126,12 +127,12 @@ Enables the entries command without any pre-configured scope.
 <tr>
 <td>
 
-`store:deny-entries`
+`store:deny-get`
 
 </td>
 <td>
 
-Denies the entries command without any pre-configured scope.
+Denies the get command without any pre-configured scope.
 
 </td>
 </tr>
@@ -139,12 +140,12 @@ Denies the entries command without any pre-configured scope.
 <tr>
 <td>
 
-`store:allow-get`
+`store:allow-get-store`
 
 </td>
 <td>
 
-Enables the get command without any pre-configured scope.
+Enables the get_store command without any pre-configured scope.
 
 </td>
 </tr>
@@ -152,12 +153,12 @@ Enables the get command without any pre-configured scope.
 <tr>
 <td>
 
-`store:deny-get`
+`store:deny-get-store`
 
 </td>
 <td>
 
-Denies the get command without any pre-configured scope.
+Denies the get_store command without any pre-configured scope.
 
 </td>
 </tr>
@@ -269,6 +270,32 @@ Denies the load command without any pre-configured scope.
 <tr>
 <td>
 
+`store:allow-reload`
+
+</td>
+<td>
+
+Enables the reload command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`store:deny-reload`
+
+</td>
+<td>
+
+Denies the reload command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
 `store:allow-reset`
 
 </td>
diff --git a/plugins/store/permissions/default.toml b/plugins/store/permissions/default.toml
index bf888679..3a3e4b3a 100644
--- a/plugins/store/permissions/default.toml
+++ b/plugins/store/permissions/default.toml
@@ -11,17 +11,18 @@ All operations are enabled by default.
 
 """
 permissions = [
-  "allow-create-store",
-  "allow-clear",
-  "allow-delete",
-  "allow-entries",
+  "allow-load",
+  "allow-get-store",
+  "allow-set",
   "allow-get",
   "allow-has",
+  "allow-delete",
+  "allow-clear",
+  "allow-reset",
   "allow-keys",
+  "allow-values",
+  "allow-entries",
   "allow-length",
-  "allow-load",
-  "allow-reset",
+  "allow-reload",
   "allow-save",
-  "allow-set",
-  "allow-values",
 ]
diff --git a/plugins/store/permissions/schemas/schema.json b/plugins/store/permissions/schemas/schema.json
index 6ebf788e..4237bc62 100644
--- a/plugins/store/permissions/schemas/schema.json
+++ b/plugins/store/permissions/schemas/schema.json
@@ -304,16 +304,6 @@
           "type": "string",
           "const": "deny-clear"
         },
-        {
-          "description": "Enables the create_store command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-create-store"
-        },
-        {
-          "description": "Denies the create_store command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-create-store"
-        },
         {
           "description": "Enables the delete command without any pre-configured scope.",
           "type": "string",
@@ -344,6 +334,16 @@
           "type": "string",
           "const": "deny-get"
         },
+        {
+          "description": "Enables the get_store command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-get-store"
+        },
+        {
+          "description": "Denies the get_store command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-get-store"
+        },
         {
           "description": "Enables the has command without any pre-configured scope.",
           "type": "string",
@@ -384,6 +384,16 @@
           "type": "string",
           "const": "deny-load"
         },
+        {
+          "description": "Enables the reload command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-reload"
+        },
+        {
+          "description": "Denies the reload command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-reload"
+        },
         {
           "description": "Enables the reset command without any pre-configured scope.",
           "type": "string",
diff --git a/plugins/store/src/error.rs b/plugins/store/src/error.rs
index afd43add..ef5ee593 100644
--- a/plugins/store/src/error.rs
+++ b/plugins/store/src/error.rs
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: MIT
 
 use serde::{Serialize, Serializer};
-use std::path::PathBuf;
 
 pub type Result<T> = std::result::Result<T, Error>;
 
@@ -21,9 +20,15 @@ pub enum Error {
     /// IO error.
     #[error(transparent)]
     Io(#[from] std::io::Error),
-    /// Store not found
-    #[error("Store \"{0}\" not found")]
-    NotFound(PathBuf),
+    // /// Store already exists
+    // #[error("Store at \"{0}\" already exists")]
+    // AlreadyExists(PathBuf),
+    /// Serialize function not found
+    #[error("Serialize Function \"{0}\" not found")]
+    SerializeFunctionNotFound(String),
+    /// Deserialize function not found
+    #[error("Deserialize Function \"{0}\" not found")]
+    DeserializeFunctionNotFound(String),
     /// Some Tauri API failed
     #[error(transparent)]
     Tauri(#[from] tauri::Error),
diff --git a/plugins/store/src/lib.rs b/plugins/store/src/lib.rs
index b05bf4b4..310e80ec 100644
--- a/plugins/store/src/lib.rs
+++ b/plugins/store/src/lib.rs
@@ -12,234 +12,392 @@
 )]
 
 pub use error::{Error, Result};
-use log::warn;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 pub use serde_json::Value as JsonValue;
 use std::{
     collections::HashMap,
     path::{Path, PathBuf},
-    sync::{Mutex, Weak},
+    sync::{Arc, Mutex},
     time::Duration,
 };
-pub use store::{Store, StoreBuilder, StoreInner};
+pub use store::{resolve_store_path, DeserializeFn, SerializeFn, Store, StoreBuilder};
 use tauri::{
     plugin::{self, TauriPlugin},
-    AppHandle, Manager, ResourceId, RunEvent, Runtime, Webview,
+    AppHandle, Manager, ResourceId, RunEvent, Runtime, State,
 };
 
 mod error;
 mod store;
 
 #[derive(Serialize, Clone)]
+#[serde(rename_all = "camelCase")]
 struct ChangePayload<'a> {
     path: &'a Path,
+    resource_id: Option<u32>,
     key: &'a str,
-    value: &'a JsonValue,
+    value: Option<&'a JsonValue>,
+    exists: bool,
 }
 
-pub struct StoreCollection<R: Runtime> {
-    stores: Mutex<HashMap<PathBuf, Weak<Mutex<StoreInner<R>>>>>,
-    // frozen: bool,
+#[derive(Debug)]
+struct StoreState {
+    stores: Arc<Mutex<HashMap<PathBuf, ResourceId>>>,
+    serialize_fns: HashMap<String, SerializeFn>,
+    deserialize_fns: HashMap<String, DeserializeFn>,
+    default_serialize: SerializeFn,
+    default_deserialize: DeserializeFn,
 }
 
-#[tauri::command]
-async fn create_store<R: Runtime>(
+#[derive(Serialize, Deserialize)]
+#[serde(untagged)]
+enum AutoSave {
+    DebounceDuration(u64),
+    Bool(bool),
+}
+
+fn builder<R: Runtime>(
     app: AppHandle<R>,
-    webview: Webview<R>,
+    store_state: State<'_, StoreState>,
     path: PathBuf,
-    auto_save: Option<u64>,
-) -> Result<ResourceId> {
+    auto_save: Option<AutoSave>,
+    serialize_fn_name: Option<String>,
+    deserialize_fn_name: Option<String>,
+    create_new: bool,
+) -> Result<StoreBuilder<R>> {
     let mut builder = app.store_builder(path);
     if let Some(auto_save) = auto_save {
-        builder = builder.auto_save(Duration::from_millis(auto_save));
+        match auto_save {
+            AutoSave::DebounceDuration(duration) => {
+                builder = builder.auto_save(Duration::from_millis(duration));
+            }
+            AutoSave::Bool(false) => {
+                builder = builder.disable_auto_save();
+            }
+            _ => {}
+        }
+    }
+
+    if let Some(serialize_fn_name) = serialize_fn_name {
+        let serialize_fn = store_state
+            .serialize_fns
+            .get(&serialize_fn_name)
+            .ok_or_else(|| crate::Error::SerializeFunctionNotFound(serialize_fn_name))?;
+        builder = builder.serialize(*serialize_fn);
+    }
+
+    if let Some(deserialize_fn_name) = deserialize_fn_name {
+        let deserialize_fn = store_state
+            .deserialize_fns
+            .get(&deserialize_fn_name)
+            .ok_or_else(|| crate::Error::DeserializeFunctionNotFound(deserialize_fn_name))?;
+        builder = builder.deserialize(*deserialize_fn);
     }
-    let store = builder.build();
-    Ok(webview.resources_table().add(store))
+
+    if create_new {
+        builder = builder.create_new();
+    }
+
+    Ok(builder)
+}
+
+#[tauri::command]
+async fn load<R: Runtime>(
+    app: AppHandle<R>,
+    store_state: State<'_, StoreState>,
+    path: PathBuf,
+    auto_save: Option<AutoSave>,
+    serialize_fn_name: Option<String>,
+    deserialize_fn_name: Option<String>,
+    create_new: Option<bool>,
+) -> Result<ResourceId> {
+    let builder = builder(
+        app,
+        store_state,
+        path,
+        auto_save,
+        serialize_fn_name,
+        deserialize_fn_name,
+        create_new.unwrap_or_default(),
+    )?;
+    let (_, rid) = builder.build_inner()?;
+    Ok(rid)
+}
+
+#[tauri::command]
+async fn get_store<R: Runtime>(
+    app: AppHandle<R>,
+    store_state: State<'_, StoreState>,
+    path: PathBuf,
+) -> Result<Option<ResourceId>> {
+    let stores = store_state.stores.lock().unwrap();
+    Ok(stores.get(&resolve_store_path(&app, path)?).copied())
 }
 
 #[tauri::command]
 async fn set<R: Runtime>(
-    webview: Webview<R>,
+    app: AppHandle<R>,
     rid: ResourceId,
     key: String,
     value: JsonValue,
 ) -> Result<()> {
-    let store = webview.resources_table().get::<Store<R>>(rid)?;
+    let store = app.resources_table().get::<Store<R>>(rid)?;
     store.set(key, value);
     Ok(())
 }
 
 #[tauri::command]
 async fn get<R: Runtime>(
-    webview: Webview<R>,
+    app: AppHandle<R>,
     rid: ResourceId,
     key: String,
-) -> Result<Option<JsonValue>> {
-    let store = webview.resources_table().get::<Store<R>>(rid)?;
-    Ok(store.get(key))
+) -> Result<(Option<JsonValue>, bool)> {
+    let store = app.resources_table().get::<Store<R>>(rid)?;
+    let value = store.get(key);
+    let exists = value.is_some();
+    Ok((value, exists))
 }
 
 #[tauri::command]
-async fn has<R: Runtime>(webview: Webview<R>, rid: ResourceId, key: String) -> Result<bool> {
-    let store = webview.resources_table().get::<Store<R>>(rid)?;
+async fn has<R: Runtime>(app: AppHandle<R>, rid: ResourceId, key: String) -> Result<bool> {
+    let store = app.resources_table().get::<Store<R>>(rid)?;
     Ok(store.has(key))
 }
 
 #[tauri::command]
-async fn delete<R: Runtime>(webview: Webview<R>, rid: ResourceId, key: String) -> Result<bool> {
-    let store = webview.resources_table().get::<Store<R>>(rid)?;
+async fn delete<R: Runtime>(app: AppHandle<R>, rid: ResourceId, key: String) -> Result<bool> {
+    let store = app.resources_table().get::<Store<R>>(rid)?;
     Ok(store.delete(key))
 }
 
 #[tauri::command]
-async fn clear<R: Runtime>(webview: Webview<R>, rid: ResourceId) -> Result<()> {
-    let store = webview.resources_table().get::<Store<R>>(rid)?;
+async fn clear<R: Runtime>(app: AppHandle<R>, rid: ResourceId) -> Result<()> {
+    let store = app.resources_table().get::<Store<R>>(rid)?;
     store.clear();
     Ok(())
 }
 
 #[tauri::command]
-async fn reset<R: Runtime>(webview: Webview<R>, rid: ResourceId) -> Result<()> {
-    let store = webview.resources_table().get::<Store<R>>(rid)?;
+async fn reset<R: Runtime>(app: AppHandle<R>, rid: ResourceId) -> Result<()> {
+    let store = app.resources_table().get::<Store<R>>(rid)?;
     store.reset();
     Ok(())
 }
 
 #[tauri::command]
-async fn keys<R: Runtime>(webview: Webview<R>, rid: ResourceId) -> Result<Vec<String>> {
-    let store = webview.resources_table().get::<Store<R>>(rid)?;
+async fn keys<R: Runtime>(app: AppHandle<R>, rid: ResourceId) -> Result<Vec<String>> {
+    let store = app.resources_table().get::<Store<R>>(rid)?;
     Ok(store.keys())
 }
 
 #[tauri::command]
-async fn values<R: Runtime>(webview: Webview<R>, rid: ResourceId) -> Result<Vec<JsonValue>> {
-    let store = webview.resources_table().get::<Store<R>>(rid)?;
+async fn values<R: Runtime>(app: AppHandle<R>, rid: ResourceId) -> Result<Vec<JsonValue>> {
+    let store = app.resources_table().get::<Store<R>>(rid)?;
     Ok(store.values())
 }
 
 #[tauri::command]
 async fn entries<R: Runtime>(
-    webview: Webview<R>,
+    app: AppHandle<R>,
     rid: ResourceId,
 ) -> Result<Vec<(String, JsonValue)>> {
-    let store = webview.resources_table().get::<Store<R>>(rid)?;
+    let store = app.resources_table().get::<Store<R>>(rid)?;
     Ok(store.entries())
 }
 
 #[tauri::command]
-async fn length<R: Runtime>(webview: Webview<R>, rid: ResourceId) -> Result<usize> {
-    let store = webview.resources_table().get::<Store<R>>(rid)?;
+async fn length<R: Runtime>(app: AppHandle<R>, rid: ResourceId) -> Result<usize> {
+    let store = app.resources_table().get::<Store<R>>(rid)?;
     Ok(store.length())
 }
 
 #[tauri::command]
-async fn load<R: Runtime>(webview: Webview<R>, rid: ResourceId) -> Result<()> {
-    let store = webview.resources_table().get::<Store<R>>(rid)?;
-    store.load()
+async fn reload<R: Runtime>(app: AppHandle<R>, rid: ResourceId) -> Result<()> {
+    let store = app.resources_table().get::<Store<R>>(rid)?;
+    store.reload()
 }
 
 #[tauri::command]
-async fn save<R: Runtime>(webview: Webview<R>, rid: ResourceId) -> Result<()> {
-    let store = webview.resources_table().get::<Store<R>>(rid)?;
+async fn save<R: Runtime>(app: AppHandle<R>, rid: ResourceId) -> Result<()> {
+    let store = app.resources_table().get::<Store<R>>(rid)?;
     store.save()
 }
 
 pub trait StoreExt<R: Runtime> {
-    fn store(&self, path: impl AsRef<Path>) -> Store<R>;
+    /// Create a store or load an existing store with default settings at the given path.
+    ///
+    /// If the store is already loaded, its instance is automatically returned.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tauri_plugin_store::StoreExt;
+    ///
+    /// tauri::Builder::default()
+    ///   .plugin(tauri_plugin_store::Builder::default().build())
+    ///   .setup(|app| {
+    ///     let store = app.store("my-store")?;
+    ///     Ok(())
+    ///   });
+    /// ```
+    fn store(&self, path: impl AsRef<Path>) -> Result<Arc<Store<R>>>;
+    /// Get a store builder.
+    ///
+    /// The builder can be used to configure the store.
+    /// To use the default settings see [`Self::store`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tauri_plugin_store::StoreExt;
+    /// use std::time::Duration;
+    ///
+    /// tauri::Builder::default()
+    ///   .plugin(tauri_plugin_store::Builder::default().build())
+    ///   .setup(|app| {
+    ///     let store = app.store_builder("users.json").auto_save(Duration::from_secs(1)).build()?;
+    ///     Ok(())
+    ///   });
+    /// ```
     fn store_builder(&self, path: impl AsRef<Path>) -> StoreBuilder<R>;
+    /// Get a handle of an already loaded store.
+    ///
+    /// If the store is not loaded or does not exist, it returns `None`.
+    ///
+    /// Note that using this function can cause race conditions if you fallback to creating or loading the store,
+    /// so you should consider using [`Self::store`] if you are not sure if the store is loaded or not.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tauri_plugin_store::StoreExt;
+    ///
+    /// tauri::Builder::default()
+    ///   .plugin(tauri_plugin_store::Builder::default().build())
+    ///   .setup(|app| {
+    ///     let store = if let Some(s) = app.get_store("store.json") {
+    ///       s
+    ///     } else {
+    ///       // this is not thread safe; if another thread is doing the same load/create,
+    ///       // there will be a race condition; in this case we could remove the get_store
+    ///       // and only run app.store() as it will return the existing store if it has been loaded
+    ///       app.store("store.json")?
+    ///     };
+    ///     Ok(())
+    ///   });
+    /// ```
+    fn get_store(&self, path: impl AsRef<Path>) -> Option<Arc<Store<R>>>;
 }
 
 impl<R: Runtime, T: Manager<R>> StoreExt<R> for T {
-    fn store(&self, path: impl AsRef<Path>) -> Store<R> {
+    fn store(&self, path: impl AsRef<Path>) -> Result<Arc<Store<R>>> {
         StoreBuilder::new(self.app_handle(), path).build()
     }
 
     fn store_builder(&self, path: impl AsRef<Path>) -> StoreBuilder<R> {
         StoreBuilder::new(self.app_handle(), path)
     }
+
+    fn get_store(&self, path: impl AsRef<Path>) -> Option<Arc<Store<R>>> {
+        let collection = self.state::<StoreState>();
+        let stores = collection.stores.lock().unwrap();
+        stores
+            .get(&resolve_store_path(self.app_handle(), path.as_ref()).ok()?)
+            .and_then(|rid| self.resources_table().get(*rid).ok())
+    }
+}
+
+fn default_serialize(
+    cache: &HashMap<String, JsonValue>,
+) -> std::result::Result<Vec<u8>, Box<dyn std::error::Error + Send + Sync>> {
+    Ok(serde_json::to_vec_pretty(&cache)?)
+}
+
+fn default_deserialize(
+    bytes: &[u8],
+) -> std::result::Result<HashMap<String, JsonValue>, Box<dyn std::error::Error + Send + Sync>> {
+    serde_json::from_slice(bytes).map_err(Into::into)
 }
 
-// #[derive(Default)]
-pub struct Builder<R: Runtime> {
-    stores: HashMap<PathBuf, Store<R>>,
-    // frozen: bool,
+pub struct Builder {
+    serialize_fns: HashMap<String, SerializeFn>,
+    deserialize_fns: HashMap<String, DeserializeFn>,
+    default_serialize: SerializeFn,
+    default_deserialize: DeserializeFn,
 }
 
-impl<R: Runtime> Default for Builder<R> {
+impl Default for Builder {
     fn default() -> Self {
         Self {
-            stores: Default::default(),
-            // frozen: false,
+            serialize_fns: Default::default(),
+            deserialize_fns: Default::default(),
+            default_serialize,
+            default_deserialize,
         }
     }
 }
 
-impl<R: Runtime> Builder<R> {
+impl Builder {
     pub fn new() -> Self {
         Self::default()
     }
 
-    // /// Registers a store with the plugin.
-    // ///
-    // /// # Examples
-    // ///
-    // /// ```
-    // /// use tauri_plugin_store::{StoreBuilder, Builder};
-    // ///
-    // /// tauri::Builder::default()
-    // ///   .setup(|app| {
-    // ///     let store = StoreBuilder::new("store.bin").build(app.handle().clone());
-    // ///     let builder = Builder::default().store(store);
-    // ///     Ok(())
-    // ///   });
-    // /// ```
-    // pub fn store(mut self, store: Store<R>) -> Self {
-    //     self.stores.insert(store.path.clone(), store);
-    //     self
-    // }
-
-    // /// Registers multiple stores with the plugin.
-    // ///
-    // /// # Examples
-    // ///
-    // /// ```
-    // /// use tauri_plugin_store::{StoreBuilder, Builder};
-    // ///
-    // /// tauri::Builder::default()
-    // ///   .setup(|app| {
-    // ///     let store = StoreBuilder::new("store.bin").build(app.handle().clone());
-    // ///     let builder = Builder::default().stores([store]);
-    // ///     Ok(())
-    // ///   });
-    // /// ```
-    // pub fn stores<T: IntoIterator<Item = Store<R>>>(mut self, stores: T) -> Self {
-    //     self.stores = stores
-    //         .into_iter()
-    //         .map(|store| (store.path.clone(), store))
-    //         .collect();
-    //     self
-    // }
-
-    // /// Freezes the collection.
-    // ///
-    // /// This causes requests for plugins that haven't been registered to fail
-    // ///
-    // /// # Examples
-    // ///
-    // /// ```
-    // /// use tauri_plugin_store::{StoreBuilder, Builder};
-    // ///
-    // /// tauri::Builder::default()
-    // ///   .setup(|app| {
-    // ///     let store = StoreBuilder::new("store.bin").build(app.handle().clone());
-    // ///     app.handle().plugin(Builder::default().freeze().build());
-    // ///     Ok(())
-    // ///   });
-    // /// ```
-    // pub fn freeze(mut self) -> Self {
-    //     self.frozen = true;
-    //     self
-    // }
+    /// Register a serialize function to access it from the JavaScript side
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// fn no_pretty_json(
+    ///     cache: &std::collections::HashMap<String, serde_json::Value>,
+    /// ) -> Result<Vec<u8>, Box<dyn std::error::Error + Send + Sync>> {
+    ///     Ok(serde_json::to_vec(&cache)?)
+    /// }
+    ///
+    /// tauri::Builder::default()
+    ///     .plugin(
+    ///         tauri_plugin_store::Builder::default()
+    ///             .register_serialize_fn("no-pretty-json".to_owned(), no_pretty_json)
+    ///             .build(),
+    ///     );
+    /// ```
+    pub fn register_serialize_fn(mut self, name: String, serialize_fn: SerializeFn) -> Self {
+        self.serialize_fns.insert(name, serialize_fn);
+        self
+    }
+
+    /// Register a deserialize function to access it from the JavaScript side
+    pub fn register_deserialize_fn(mut self, name: String, deserialize_fn: DeserializeFn) -> Self {
+        self.deserialize_fns.insert(name, deserialize_fn);
+        self
+    }
+
+    /// Use this serialize function for stores by default
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// fn no_pretty_json(
+    ///     cache: &std::collections::HashMap<String, serde_json::Value>,
+    /// ) -> Result<Vec<u8>, Box<dyn std::error::Error + Send + Sync>> {
+    ///     Ok(serde_json::to_vec(&cache)?)
+    /// }
+    ///
+    /// tauri::Builder::default()
+    ///     .plugin(
+    ///         tauri_plugin_store::Builder::default()
+    ///             .default_serialize_fn(no_pretty_json)
+    ///             .build(),
+    ///     );
+    /// ```
+    pub fn default_serialize_fn(mut self, serialize_fn: SerializeFn) -> Self {
+        self.default_serialize = serialize_fn;
+        self
+    }
+
+    /// Use this deserialize function for stores by default
+    pub fn default_deserialize_fn(mut self, deserialize_fn: DeserializeFn) -> Self {
+        self.default_deserialize = deserialize_fn;
+        self
+    }
 
     /// Builds the plugin.
     ///
@@ -249,56 +407,37 @@ impl<R: Runtime> Builder<R> {
     /// tauri::Builder::default()
     ///   .plugin(tauri_plugin_store::Builder::default().build())
     ///   .setup(|app| {
-    ///     let store = tauri_plugin_store::StoreBuilder::new(app, "store.bin").build();
+    ///     let store = tauri_plugin_store::StoreBuilder::new(app, "store.bin").build()?;
     ///     Ok(())
     ///   });
     /// ```
-    pub fn build(mut self) -> TauriPlugin<R> {
+    pub fn build<R: Runtime>(self) -> TauriPlugin<R> {
         plugin::Builder::new("store")
             .invoke_handler(tauri::generate_handler![
-                create_store,
-                set,
-                get,
-                has,
-                delete,
-                clear,
-                reset,
-                keys,
-                values,
-                length,
-                entries,
-                load,
-                save
+                load, get_store, set, get, has, delete, clear, reset, keys, values, length,
+                entries, reload, save,
             ])
             .setup(move |app_handle, _api| {
-                for (path, store) in self.stores.iter_mut() {
-                    // ignore loading errors, just use the default
-                    if let Err(err) = store.load() {
-                        warn!(
-                            "Failed to load store {path:?} from disk: {err}. Falling back to default values."
-                        );
-                    }
-                }
-
-                app_handle.manage(StoreCollection::<R> {
-                    stores: Mutex::new(HashMap::new()),
-                    // frozen: self.frozen,
+                app_handle.manage(StoreState {
+                    stores: Arc::new(Mutex::new(HashMap::new())),
+                    serialize_fns: self.serialize_fns,
+                    deserialize_fns: self.deserialize_fns,
+                    default_serialize: self.default_serialize,
+                    default_deserialize: self.default_deserialize,
                 });
-
                 Ok(())
             })
-            .on_event(|_app_handle, event| {
+            .on_event(|app_handle, event| {
                 if let RunEvent::Exit = event {
-                    // let collection = app_handle.state::<StoreCollection<R>>();
-
-                    // for store in collection.stores.lock().expect("mutex poisoned").values_mut() {
-                    //     if let Some(sender) = store.auto_save_debounce_sender.take() {
-                    //         let _ = sender.send(AutoSaveMessage::Cancel);
-                    //     }
-                    //     if let Err(err) = store.save() {
-                    //         eprintln!("failed to save store {:?} with error {:?}", store.path, err);
-                    //     }
-                    // }
+                    let collection = app_handle.state::<StoreState>();
+                    let stores = collection.stores.lock().unwrap();
+                    for (path, rid) in stores.iter() {
+                        if let Ok(store) = app_handle.resources_table().get::<Store<R>>(*rid) {
+                            if let Err(err) = store.save() {
+                                log::error!("failed to save store {path:?} with error {err:?}");
+                            }
+                        }
+                    }
                 }
             })
             .build()
diff --git a/plugins/store/src/store.rs b/plugins/store/src/store.rs
index d610525d..1dc5e1d2 100644
--- a/plugins/store/src/store.rs
+++ b/plugins/store/src/store.rs
@@ -2,38 +2,32 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use crate::{ChangePayload, StoreCollection};
+use crate::{ChangePayload, StoreState};
 use serde_json::Value as JsonValue;
 use std::{
     collections::HashMap,
-    fs::{create_dir_all, read, File},
-    io::Write,
+    fs,
     path::{Path, PathBuf},
     sync::{Arc, Mutex},
     time::Duration,
 };
-use tauri::{AppHandle, Emitter, Manager, Resource, Runtime};
+use tauri::{path::BaseDirectory, AppHandle, Emitter, Manager, Resource, ResourceId, Runtime};
 use tokio::{
     select,
     sync::mpsc::{unbounded_channel, UnboundedSender},
     time::sleep,
 };
 
-type SerializeFn =
+pub type SerializeFn =
     fn(&HashMap<String, JsonValue>) -> Result<Vec<u8>, Box<dyn std::error::Error + Send + Sync>>;
-pub(crate) type DeserializeFn =
+pub type DeserializeFn =
     fn(&[u8]) -> Result<HashMap<String, JsonValue>, Box<dyn std::error::Error + Send + Sync>>;
 
-fn default_serialize(
-    cache: &HashMap<String, JsonValue>,
-) -> Result<Vec<u8>, Box<dyn std::error::Error + Send + Sync>> {
-    Ok(serde_json::to_vec(&cache)?)
-}
-
-fn default_deserialize(
-    bytes: &[u8],
-) -> Result<HashMap<String, JsonValue>, Box<dyn std::error::Error + Send + Sync>> {
-    serde_json::from_slice(bytes).map_err(Into::into)
+pub fn resolve_store_path<R: Runtime>(
+    app: &AppHandle<R>,
+    path: impl AsRef<Path>,
+) -> crate::Result<PathBuf> {
+    Ok(dunce::simplified(&app.path().resolve(path, BaseDirectory::AppData)?).to_path_buf())
 }
 
 /// Builds a [`Store`]
@@ -41,10 +35,10 @@ pub struct StoreBuilder<R: Runtime> {
     app: AppHandle<R>,
     path: PathBuf,
     defaults: Option<HashMap<String, JsonValue>>,
-    cache: HashMap<String, JsonValue>,
-    serialize: SerializeFn,
-    deserialize: DeserializeFn,
+    serialize_fn: SerializeFn,
+    deserialize_fn: DeserializeFn,
     auto_save: Option<Duration>,
+    create_new: bool,
 }
 
 impl<R: Runtime> StoreBuilder<R> {
@@ -60,15 +54,18 @@ impl<R: Runtime> StoreBuilder<R> {
     ///   });
     /// ```
     pub fn new<M: Manager<R>, P: AsRef<Path>>(manager: &M, path: P) -> Self {
+        let app = manager.app_handle().clone();
+        let state = app.state::<StoreState>();
+        let serialize_fn = state.default_serialize;
+        let deserialize_fn = state.default_deserialize;
         Self {
-            app: manager.app_handle().clone(),
-            // Since Store.path is only exposed to the user in emit calls we may as well simplify it here already.
-            path: dunce::simplified(path.as_ref()).to_path_buf(),
+            app,
+            path: path.as_ref().to_path_buf(),
             defaults: None,
-            cache: Default::default(),
-            serialize: default_serialize,
-            deserialize: default_deserialize,
-            auto_save: None,
+            serialize_fn,
+            deserialize_fn,
+            auto_save: Some(Duration::from_millis(100)),
+            create_new: false,
         }
     }
 
@@ -84,17 +81,16 @@ impl<R: Runtime> StoreBuilder<R> {
     ///
     ///     let store = tauri_plugin_store::StoreBuilder::new(app, "store.bin")
     ///       .defaults(defaults)
-    ///       .build();
+    ///       .build()?;
     ///     Ok(())
     ///   });
     /// ```
     pub fn defaults(mut self, defaults: HashMap<String, JsonValue>) -> Self {
-        self.cache.clone_from(&defaults);
         self.defaults = Some(defaults);
         self
     }
 
-    /// Inserts multiple key-value pairs.
+    /// Inserts multiple default key-value pairs.
     ///
     /// # Examples
     /// ```
@@ -103,14 +99,13 @@ impl<R: Runtime> StoreBuilder<R> {
     ///   .setup(|app| {
     ///     let store = tauri_plugin_store::StoreBuilder::new(app, "store.bin")
     ///       .default("foo".to_string(), "bar")
-    ///       .build();
+    ///       .build()?;
     ///     Ok(())
     ///   });
     /// ```
     pub fn default(mut self, key: impl Into<String>, value: impl Into<JsonValue>) -> Self {
         let key = key.into();
         let value = value.into();
-        self.cache.insert(key.clone(), value.clone());
         self.defaults
             .get_or_insert(HashMap::new())
             .insert(key, value);
@@ -126,12 +121,12 @@ impl<R: Runtime> StoreBuilder<R> {
     ///   .setup(|app| {
     ///     let store = tauri_plugin_store::StoreBuilder::new(app, "store.json")
     ///       .serialize(|cache| serde_json::to_vec(&cache).map_err(Into::into))
-    ///       .build();
+    ///       .build()?;
     ///     Ok(())
     ///   });
     /// ```
     pub fn serialize(mut self, serialize: SerializeFn) -> Self {
-        self.serialize = serialize;
+        self.serialize_fn = serialize;
         self
     }
 
@@ -144,28 +139,25 @@ impl<R: Runtime> StoreBuilder<R> {
     ///   .setup(|app| {
     ///     let store = tauri_plugin_store::StoreBuilder::new(app, "store.json")
     ///       .deserialize(|bytes| serde_json::from_slice(&bytes).map_err(Into::into))
-    ///       .build();
+    ///       .build()?;
     ///     Ok(())
     ///   });
     /// ```
     pub fn deserialize(mut self, deserialize: DeserializeFn) -> Self {
-        self.deserialize = deserialize;
+        self.deserialize_fn = deserialize;
         self
     }
 
     /// Auto save on modified with a debounce duration
     ///
-    /// Note: only works if this store is managed by the plugin (e.g. made using [`crate::with_store`] or inserted into [`crate::Builder`])
-    ///
     /// # Examples
     /// ```
-    ///
     /// tauri::Builder::default()
     ///    .plugin(tauri_plugin_store::Builder::default().build())
     ///   .setup(|app| {
     ///     let store = tauri_plugin_store::StoreBuilder::new(app, "store.json")
     ///         .auto_save(std::time::Duration::from_millis(100))
-    ///         .build();
+    ///         .build()?;
     ///     Ok(())
     ///   });
     /// ```
@@ -174,7 +166,64 @@ impl<R: Runtime> StoreBuilder<R> {
         self
     }
 
-    /// Builds the [`Store`].
+    /// Disable auto save on modified with a debounce duration.
+    pub fn disable_auto_save(mut self) -> Self {
+        self.auto_save = None;
+        self
+    }
+
+    /// Force create a new store with default values even if it already exists.
+    pub fn create_new(mut self) -> Self {
+        self.create_new = true;
+        self
+    }
+
+    pub(crate) fn build_inner(mut self) -> crate::Result<(Arc<Store<R>>, ResourceId)> {
+        let stores = self.app.state::<StoreState>().stores.clone();
+        let mut stores = stores.lock().unwrap();
+
+        self.path = resolve_store_path(&self.app, self.path)?;
+
+        if self.create_new {
+            if let Some(rid) = stores.remove(&self.path) {
+                let _ = self.app.resources_table().take::<Store<R>>(rid);
+            }
+        } else if let Some(rid) = stores.get(&self.path) {
+            return Ok((self.app.resources_table().get(*rid).unwrap(), *rid));
+        }
+
+        // if stores.contains_key(&self.path) {
+        //     return Err(crate::Error::AlreadyExists(self.path));
+        // }
+
+        let mut store_inner = StoreInner::new(
+            self.app.clone(),
+            self.path.clone(),
+            self.defaults.take(),
+            self.serialize_fn,
+            self.deserialize_fn,
+        );
+
+        if !self.create_new {
+            let _ = store_inner.load();
+        }
+
+        let store = Store {
+            auto_save: self.auto_save,
+            auto_save_debounce_sender: Arc::new(Mutex::new(None)),
+            store: Arc::new(Mutex::new(store_inner)),
+        };
+
+        let store = Arc::new(store);
+        let rid = self.app.resources_table().add_arc(store.clone());
+        stores.insert(self.path, rid);
+
+        Ok((store, rid))
+    }
+
+    /// Load the existing store with the same path or creates a new [`Store`].
+    ///
+    /// If a store with the same path has already been loaded its instance is returned.
     ///
     /// # Examples
     /// ```
@@ -185,131 +234,116 @@ impl<R: Runtime> StoreBuilder<R> {
     ///     Ok(())
     ///   });
     /// ```
-    pub fn build(self) -> Store<R> {
-        let collection = self.app.state::<StoreCollection<R>>();
-        let mut stores = collection.stores.lock().unwrap();
-        let store = stores
-            .get(&self.path)
-            .and_then(|store| store.upgrade())
-            .unwrap_or_else(|| {
-                let mut store = StoreInner::new(self.app.clone(), self.path.clone());
-                let _ = store.load(self.deserialize);
-                let store = Arc::new(Mutex::new(store));
-                stores.insert(
-                    self.path.clone(),
-                    Arc::<Mutex<StoreInner<R>>>::downgrade(&store),
-                );
-                store
-            });
-        drop(stores);
-        Store {
-            defaults: self.defaults,
-            serialize: self.serialize,
-            deserialize: self.deserialize,
-            auto_save: self.auto_save,
-            auto_save_debounce_sender: Arc::new(Mutex::new(None)),
-            store,
-        }
+    pub fn build(self) -> crate::Result<Arc<Store<R>>> {
+        let (store, _) = self.build_inner()?;
+        Ok(store)
     }
 }
 
-pub(crate) enum AutoSaveMessage {
+enum AutoSaveMessage {
     Reset,
     Cancel,
 }
 
 #[derive(Clone)]
-pub struct StoreInner<R: Runtime> {
-    pub(crate) app: AppHandle<R>,
-    pub(crate) path: PathBuf,
-    pub(crate) cache: HashMap<String, JsonValue>,
+struct StoreInner<R: Runtime> {
+    app: AppHandle<R>,
+    path: PathBuf,
+    cache: HashMap<String, JsonValue>,
+    defaults: Option<HashMap<String, JsonValue>>,
+    serialize_fn: SerializeFn,
+    deserialize_fn: DeserializeFn,
 }
 
 impl<R: Runtime> StoreInner<R> {
-    pub fn new(app: AppHandle<R>, path: PathBuf) -> Self {
+    fn new(
+        app: AppHandle<R>,
+        path: PathBuf,
+        defaults: Option<HashMap<String, JsonValue>>,
+        serialize_fn: SerializeFn,
+        deserialize_fn: DeserializeFn,
+    ) -> Self {
         Self {
             app,
             path,
-            cache: HashMap::new(),
+            cache: defaults.clone().unwrap_or_default(),
+            defaults,
+            serialize_fn,
+            deserialize_fn,
         }
     }
 
-    pub fn save(&self, serialize_fn: SerializeFn) -> crate::Result<()> {
-        let app_dir = self
-            .app
-            .path()
-            .app_data_dir()
-            .expect("failed to resolve app dir");
-        let store_path = app_dir.join(&self.path);
-
-        create_dir_all(store_path.parent().expect("invalid store path"))?;
+    /// Saves the store to disk at the store's `path`.
+    pub fn save(&self) -> crate::Result<()> {
+        fs::create_dir_all(self.path.parent().expect("invalid store path"))?;
 
-        let bytes = serialize_fn(&self.cache).map_err(crate::Error::Serialize)?;
-        let mut f = File::create(&store_path)?;
-        f.write_all(&bytes)?;
+        let bytes = (self.serialize_fn)(&self.cache).map_err(crate::Error::Serialize)?;
+        fs::write(&self.path, bytes)?;
 
         Ok(())
     }
 
     /// Update the store from the on-disk state
-    pub fn load(&mut self, deserialize_fn: DeserializeFn) -> crate::Result<()> {
-        let app_dir = self
-            .app
-            .path()
-            .app_data_dir()
-            .expect("failed to resolve app dir");
-        let store_path = app_dir.join(&self.path);
-
-        let bytes = read(store_path)?;
+    pub fn load(&mut self) -> crate::Result<()> {
+        let bytes = fs::read(&self.path)?;
 
         self.cache
-            .extend(deserialize_fn(&bytes).map_err(crate::Error::Deserialize)?);
+            .extend((self.deserialize_fn)(&bytes).map_err(crate::Error::Deserialize)?);
 
         Ok(())
     }
 
-    pub fn insert(&mut self, key: impl Into<String>, value: impl Into<JsonValue>) {
+    /// Inserts a key-value pair into the store.
+    pub fn set(&mut self, key: impl Into<String>, value: impl Into<JsonValue>) {
         let key = key.into();
         let value = value.into();
         self.cache.insert(key.clone(), value.clone());
-        let _ = self.emit_change_event(&key, &value);
+        let _ = self.emit_change_event(&key, Some(&value));
     }
 
+    /// Returns a reference to the value corresponding to the key.
     pub fn get(&self, key: impl AsRef<str>) -> Option<&JsonValue> {
         self.cache.get(key.as_ref())
     }
 
+    /// Returns `true` if the given `key` exists in the store.
     pub fn has(&self, key: impl AsRef<str>) -> bool {
         self.cache.contains_key(key.as_ref())
     }
 
+    /// Removes a key-value pair from the store.
     pub fn delete(&mut self, key: impl AsRef<str>) -> bool {
         let flag = self.cache.remove(key.as_ref()).is_some();
         if flag {
-            let _ = self.emit_change_event(key.as_ref(), &JsonValue::Null);
+            let _ = self.emit_change_event(key.as_ref(), None);
         }
         flag
     }
 
+    /// Clears the store, removing all key-value pairs.
+    ///
+    /// Note: To clear the storage and reset it to its `default` value, use [`reset`](Self::reset) instead.
     pub fn clear(&mut self) {
         let keys: Vec<String> = self.cache.keys().cloned().collect();
         self.cache.clear();
         for key in &keys {
-            let _ = self.emit_change_event(key, &JsonValue::Null);
+            let _ = self.emit_change_event(key, None);
         }
     }
 
-    pub fn reset(&mut self, defaults: &Option<HashMap<String, JsonValue>>) {
-        if let Some(defaults) = &defaults {
+    /// Resets the store to its `default` value.
+    ///
+    /// If no default value has been set, this method behaves identical to [`clear`](Self::clear).
+    pub fn reset(&mut self) {
+        if let Some(defaults) = &self.defaults {
             for (key, value) in &self.cache {
                 if defaults.get(key) != Some(value) {
-                    let _ =
-                        self.emit_change_event(key, defaults.get(key).unwrap_or(&JsonValue::Null));
+                    let _ = self.emit_change_event(key, defaults.get(key));
                 }
             }
             for (key, value) in defaults {
                 if !self.cache.contains_key(key) {
-                    let _ = self.emit_change_event(key, value);
+                    let _ = self.emit_change_event(key, Some(value));
                 }
             }
             self.cache.clone_from(defaults);
@@ -318,33 +352,43 @@ impl<R: Runtime> StoreInner<R> {
         }
     }
 
+    /// An iterator visiting all keys in arbitrary order.
     pub fn keys(&self) -> impl Iterator<Item = &String> {
         self.cache.keys()
     }
 
+    /// An iterator visiting all values in arbitrary order.
     pub fn values(&self) -> impl Iterator<Item = &JsonValue> {
         self.cache.values()
     }
 
+    /// An iterator visiting all key-value pairs in arbitrary order.
     pub fn entries(&self) -> impl Iterator<Item = (&String, &JsonValue)> {
         self.cache.iter()
     }
 
+    /// Returns the number of elements in the store.
     pub fn len(&self) -> usize {
         self.cache.len()
     }
 
+    /// Returns true if the store contains no elements.
     pub fn is_empty(&self) -> bool {
         self.cache.is_empty()
     }
 
-    fn emit_change_event(&self, key: &str, value: &JsonValue) -> crate::Result<()> {
+    fn emit_change_event(&self, key: &str, value: Option<&JsonValue>) -> crate::Result<()> {
+        let state = self.app.state::<StoreState>();
+        let stores = state.stores.lock().unwrap();
+        let exists = value.is_some();
         self.app.emit(
             "store://change",
             ChangePayload {
                 path: &self.path,
+                resource_id: stores.get(&self.path).copied(),
                 key,
                 value,
+                exists,
             },
         )?;
         Ok(())
@@ -361,38 +405,45 @@ impl<R: Runtime> std::fmt::Debug for StoreInner<R> {
 }
 
 pub struct Store<R: Runtime> {
-    defaults: Option<HashMap<String, JsonValue>>,
-    serialize: SerializeFn,
-    deserialize: DeserializeFn,
     auto_save: Option<Duration>,
     auto_save_debounce_sender: Arc<Mutex<Option<UnboundedSender<AutoSaveMessage>>>>,
     store: Arc<Mutex<StoreInner<R>>>,
 }
 
-impl<R: Runtime> Resource for Store<R> {}
-
-impl<R: Runtime> Store<R> {
-    pub fn with_store<T>(
-        &self,
-        f: impl FnOnce(&mut StoreInner<R>) -> crate::Result<T>,
-    ) -> crate::Result<T> {
-        let mut store = self.store.lock().unwrap();
-        f(&mut store)
+impl<R: Runtime> Resource for Store<R> {
+    fn close(self: Arc<Self>) {
+        let store = self.store.lock().unwrap();
+        let state = store.app.state::<StoreState>();
+        let mut stores = state.stores.lock().unwrap();
+        stores.remove(&store.path);
     }
+}
 
+impl<R: Runtime> Store<R> {
+    // /// Do something with the inner store,
+    // /// useful for batching some work if you need higher performance
+    // pub fn with_store<T>(&self, f: impl FnOnce(&mut StoreInner<R>) -> T) -> T {
+    //     let mut store = self.store.lock().unwrap();
+    //     f(&mut store)
+    // }
+
+    /// Inserts a key-value pair into the store.
     pub fn set(&self, key: impl Into<String>, value: impl Into<JsonValue>) {
-        self.store.lock().unwrap().insert(key.into(), value.into());
+        self.store.lock().unwrap().set(key.into(), value.into());
         let _ = self.trigger_auto_save();
     }
 
+    /// Returns the value for the given `key` or `None` if the key does not exist.
     pub fn get(&self, key: impl AsRef<str>) -> Option<JsonValue> {
         self.store.lock().unwrap().get(key).cloned()
     }
 
+    /// Returns `true` if the given `key` exists in the store.
     pub fn has(&self, key: impl AsRef<str>) -> bool {
         self.store.lock().unwrap().has(key)
     }
 
+    /// Removes a key-value pair from the store.
     pub fn delete(&self, key: impl AsRef<str>) -> bool {
         let deleted = self.store.lock().unwrap().delete(key);
         if deleted {
@@ -401,24 +452,33 @@ impl<R: Runtime> Store<R> {
         deleted
     }
 
+    /// Clears the store, removing all key-value pairs.
+    ///
+    /// Note: To clear the storage and reset it to its `default` value, use [`reset`](Self::reset) instead.
     pub fn clear(&self) {
         self.store.lock().unwrap().clear();
         let _ = self.trigger_auto_save();
     }
 
+    /// Resets the store to its `default` value.
+    ///
+    /// If no default value has been set, this method behaves identical to [`clear`](Self::clear).
     pub fn reset(&self) {
-        self.store.lock().unwrap().reset(&self.defaults);
+        self.store.lock().unwrap().reset();
         let _ = self.trigger_auto_save();
     }
 
+    /// Returns a list of all keys in the store.
     pub fn keys(&self) -> Vec<String> {
         self.store.lock().unwrap().keys().cloned().collect()
     }
 
+    /// Returns a list of all values in the store.
     pub fn values(&self) -> Vec<JsonValue> {
         self.store.lock().unwrap().values().cloned().collect()
     }
 
+    /// Returns a list of all key-value pairs in the store.
     pub fn entries(&self) -> Vec<(String, JsonValue)> {
         self.store
             .lock()
@@ -428,19 +488,40 @@ impl<R: Runtime> Store<R> {
             .collect()
     }
 
+    /// Returns the number of elements in the store.
     pub fn length(&self) -> usize {
         self.store.lock().unwrap().len()
     }
 
-    pub fn load(&self) -> crate::Result<()> {
-        self.store.lock().unwrap().load(self.deserialize)
+    /// Returns true if the store contains no elements.
+    pub fn is_empty(&self) -> bool {
+        self.store.lock().unwrap().is_empty()
+    }
+
+    /// Update the store from the on-disk state
+    pub fn reload(&self) -> crate::Result<()> {
+        self.store.lock().unwrap().load()
     }
 
+    /// Saves the store to disk at the store's `path`.
     pub fn save(&self) -> crate::Result<()> {
         if let Some(sender) = self.auto_save_debounce_sender.lock().unwrap().take() {
             let _ = sender.send(AutoSaveMessage::Cancel);
         }
-        self.store.lock().unwrap().save(self.serialize)
+        self.store.lock().unwrap().save()
+    }
+
+    /// Removes the store from the resource table
+    pub fn close_resource(&self) {
+        let store = self.store.lock().unwrap();
+        let app = store.app.clone();
+        let state = app.state::<StoreState>();
+        let stores = state.stores.lock().unwrap();
+        if let Some(rid) = stores.get(&store.path).copied() {
+            drop(store);
+            drop(stores);
+            let _ = app.resources_table().close(rid);
+        }
     }
 
     fn trigger_auto_save(&self) -> crate::Result<()> {
@@ -459,7 +540,6 @@ impl<R: Runtime> Store<R> {
         auto_save_debounce_sender.replace(sender);
         drop(auto_save_debounce_sender);
         let store = self.store.clone();
-        let serialize_fn = self.serialize;
         let auto_save_debounce_sender = self.auto_save_debounce_sender.clone();
         tauri::async_runtime::spawn(async move {
             loop {
@@ -471,7 +551,7 @@ impl<R: Runtime> Store<R> {
                     }
                     _ = sleep(auto_save_delay) => {
                         auto_save_debounce_sender.lock().unwrap().take();
-                        let _ = store.lock().unwrap().save(serialize_fn);
+                        let _ = store.lock().unwrap().save();
                         return;
                     }
                 };
@@ -479,4 +559,18 @@ impl<R: Runtime> Store<R> {
         });
         Ok(())
     }
+
+    fn apply_pending_auto_save(&self) {
+        // Cancel and save if auto save is pending
+        if let Some(sender) = self.auto_save_debounce_sender.lock().unwrap().take() {
+            let _ = sender.send(AutoSaveMessage::Cancel);
+            let _ = self.save();
+        };
+    }
+}
+
+impl<R: Runtime> Drop for Store<R> {
+    fn drop(&mut self) {
+        self.apply_pending_auto_save();
+    }
 }
diff --git a/plugins/websocket/examples/tauri-app/package.json b/plugins/websocket/examples/tauri-app/package.json
index dc8f68bb..e0d196e9 100644
--- a/plugins/websocket/examples/tauri-app/package.json
+++ b/plugins/websocket/examples/tauri-app/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.0.0",
+    "@tauri-apps/cli": "2.0.3",
     "typescript": "^5.3.3",
     "vite": "^5.4.7"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3c643cc5..4abfcf4e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,8 +13,8 @@ importers:
   .:
     devDependencies:
       '@eslint/js':
-        specifier: 9.11.1
-        version: 9.11.1
+        specifier: 9.13.0
+        version: 9.13.0
       '@rollup/plugin-node-resolve':
         specifier: 15.3.0
         version: 15.3.0(rollup@4.22.4)
@@ -23,7 +23,7 @@ importers:
         version: 0.4.4(rollup@4.22.4)
       '@rollup/plugin-typescript':
         specifier: 11.1.6
-        version: 11.1.6(rollup@4.22.4)(tslib@2.7.0)(typescript@5.6.2)
+        version: 11.1.6(rollup@4.22.4)(tslib@2.7.0)(typescript@5.6.3)
       '@types/eslint__js':
         specifier: 8.42.3
         version: 8.42.3
@@ -31,11 +31,11 @@ importers:
         specifier: ^0.12.3
         version: 0.12.3(mocha@10.7.3)
       eslint:
-        specifier: 9.11.1
-        version: 9.11.1(jiti@2.0.0)
+        specifier: 9.13.0
+        version: 9.13.0(jiti@2.0.0)
       eslint-config-prettier:
         specifier: 9.1.0
-        version: 9.1.0(eslint@9.11.1(jiti@2.0.0))
+        version: 9.1.0(eslint@9.13.0(jiti@2.0.0))
       eslint-plugin-security:
         specifier: 3.0.1
         version: 3.0.1
@@ -49,17 +49,17 @@ importers:
         specifier: 2.7.0
         version: 2.7.0
       typescript:
-        specifier: 5.6.2
-        version: 5.6.2
+        specifier: 5.6.3
+        version: 5.6.3
       typescript-eslint:
-        specifier: 8.8.0
-        version: 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)
+        specifier: 8.10.0
+        version: 8.10.0(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3)
 
   examples/api:
     dependencies:
       '@tauri-apps/api':
-        specifier: 2.0.1
-        version: 2.0.1
+        specifier: 2.0.2
+        version: 2.0.2
       '@tauri-apps/plugin-barcode-scanner':
         specifier: 2.0.0
         version: link:../../plugins/barcode-scanner
@@ -73,10 +73,10 @@ importers:
         specifier: 2.0.0
         version: link:../../plugins/clipboard-manager
       '@tauri-apps/plugin-dialog':
-        specifier: 2.0.0
+        specifier: 2.0.1
         version: link:../../plugins/dialog
       '@tauri-apps/plugin-fs':
-        specifier: 2.0.0
+        specifier: 2.0.1
         version: link:../../plugins/fs
       '@tauri-apps/plugin-geolocation':
         specifier: 2.0.0
@@ -88,7 +88,7 @@ importers:
         specifier: 2.0.0
         version: link:../../plugins/haptics
       '@tauri-apps/plugin-http':
-        specifier: 2.0.0
+        specifier: 2.0.1
         version: link:../../plugins/http
       '@tauri-apps/plugin-nfc':
         specifier: 2.0.0
@@ -103,10 +103,10 @@ importers:
         specifier: 2.0.0
         version: link:../../plugins/process
       '@tauri-apps/plugin-shell':
-        specifier: 2.0.0
+        specifier: 2.0.1
         version: link:../../plugins/shell
       '@tauri-apps/plugin-store':
-        specifier: 2.0.0
+        specifier: 2.1.0
         version: link:../../plugins/store
       '@tauri-apps/plugin-updater':
         specifier: 2.0.0
@@ -125,8 +125,8 @@ importers:
         specifier: ^3.0.1
         version: 3.1.2(svelte@4.2.19)(vite@5.4.8(terser@5.34.1))
       '@tauri-apps/cli':
-        specifier: 2.0.0
-        version: 2.0.0
+        specifier: 2.0.3
+        version: 2.0.3
       '@unocss/extractor-svelte':
         specifier: ^0.63.0
         version: 0.63.1
@@ -144,53 +144,53 @@ importers:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/barcode-scanner:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/biometric:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/cli:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/clipboard-manager:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/deep-link:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/deep-link/examples/app:
     dependencies:
       '@tauri-apps/api':
-        specifier: 2.0.1
-        version: 2.0.1
+        specifier: 2.0.2
+        version: 2.0.2
       '@tauri-apps/plugin-deep-link':
         specifier: 2.0.0
         version: link:../..
     devDependencies:
       '@tauri-apps/cli':
-        specifier: 2.0.0
-        version: 2.0.0
+        specifier: 2.0.3
+        version: 2.0.3
       typescript:
         specifier: ^5.2.2
-        version: 5.6.2
+        version: 5.6.3
       vite:
         specifier: ^5.4.7
         version: 5.4.8(terser@5.34.1)
@@ -199,106 +199,106 @@ importers:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/fs:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/geolocation:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/global-shortcut:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/haptics:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/http:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/log:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/nfc:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/notification:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/os:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/positioner:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/process:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/shell:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/single-instance/examples/vanilla:
     devDependencies:
       '@tauri-apps/cli':
-        specifier: 2.0.0
-        version: 2.0.0
+        specifier: 2.0.3
+        version: 2.0.3
 
   plugins/sql:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/store:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/store/examples/AppSettingsManager:
     devDependencies:
       '@tauri-apps/cli':
-        specifier: 2.0.0
-        version: 2.0.0
+        specifier: 2.0.3
+        version: 2.0.3
       typescript:
         specifier: ^5.4.7
-        version: 5.6.2
+        version: 5.6.3
       vite:
         specifier: ^5.0.12
         version: 5.4.8(terser@5.34.1)
@@ -307,25 +307,25 @@ importers:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/updater:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/upload:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/websocket:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
   plugins/websocket/examples/tauri-app:
     dependencies:
@@ -334,11 +334,11 @@ importers:
         version: link:../..
     devDependencies:
       '@tauri-apps/cli':
-        specifier: 2.0.0
-        version: 2.0.0
+        specifier: 2.0.3
+        version: 2.0.3
       typescript:
         specifier: ^5.3.3
-        version: 5.6.2
+        version: 5.6.3
       vite:
         specifier: ^5.4.7
         version: 5.4.8(terser@5.34.1)
@@ -347,7 +347,7 @@ importers:
     dependencies:
       '@tauri-apps/api':
         specifier: ^2.0.0
-        version: 2.0.1
+        version: 2.0.2
 
 packages:
 
@@ -717,16 +717,16 @@ packages:
     resolution: {integrity: sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/core@0.6.0':
-    resolution: {integrity: sha512-8I2Q8ykA4J0x0o7cg67FPVnehcqWTBehu/lmY+bolPFHGjh49YzGBMXTvpqVgEbBdvNCSxj6iFgiIyHzf03lzg==}
+  '@eslint/core@0.7.0':
+    resolution: {integrity: sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/eslintrc@3.1.0':
     resolution: {integrity: sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/js@9.11.1':
-    resolution: {integrity: sha512-/qu+TWz8WwPWc7/HcIJKi+c+MOm46GdVaSlTTQcaqaL53+GsoA6MxWp5PtTx48qbSP7ylM1Kn7nhvkugfJvRSA==}
+  '@eslint/js@9.13.0':
+    resolution: {integrity: sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/object-schema@2.1.4':
@@ -737,12 +737,20 @@ packages:
     resolution: {integrity: sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@humanfs/core@0.19.0':
+    resolution: {integrity: sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==}
+    engines: {node: '>=18.18.0'}
+
+  '@humanfs/node@0.16.5':
+    resolution: {integrity: sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==}
+    engines: {node: '>=18.18.0'}
+
   '@humanwhocodes/module-importer@1.0.1':
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
 
-  '@humanwhocodes/retry@0.3.0':
-    resolution: {integrity: sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==}
+  '@humanwhocodes/retry@0.3.1':
+    resolution: {integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==}
     engines: {node: '>=18.18'}
 
   '@iconify-json/codicon@1.2.2':
@@ -928,71 +936,71 @@ packages:
       svelte: ^4.0.0 || ^5.0.0-next.0
       vite: ^5.0.0
 
-  '@tauri-apps/api@2.0.1':
-    resolution: {integrity: sha512-eoQWT+Tq1qSwQpHV+nw1eNYe5B/nm1PoRjQCRiEOS12I1b+X4PUcREfXVX8dPcBT6GrzWGDtaecY0+1p0Rfqlw==}
+  '@tauri-apps/api@2.0.2':
+    resolution: {integrity: sha512-3wSwmG+1kr6WrgAFKK5ijkNFPp8TT3FLj3YHUb5EwMO+3FxX4uWlfSWkeeBy+Kc1RsKzugtYLuuya+98Flj+3w==}
 
-  '@tauri-apps/cli-darwin-arm64@2.0.0':
-    resolution: {integrity: sha512-+agYqg2c77imaMfKw7mzqecVIDGcwr6bZMdglJ808O2UjTFzMwnAam1sU26YBYU+IyIjwOu00fm9Azpal+N/Ew==}
+  '@tauri-apps/cli-darwin-arm64@2.0.3':
+    resolution: {integrity: sha512-jIsbxGWS+As1ZN7umo90nkql/ZAbrDK0GBT6UsgHSz5zSwwArICsZFFwE1pLZip5yoiV5mn3TGG2c1+v+0puzQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@tauri-apps/cli-darwin-x64@2.0.0':
-    resolution: {integrity: sha512-keN2PLTTcZmbWwFMup/NGcshmvyLnhRPChO8lbm9C5a0IY7zUNQUD7/o/zIulQdLJqDxkdpWJ1j2jTycAtvtKQ==}
+  '@tauri-apps/cli-darwin-x64@2.0.3':
+    resolution: {integrity: sha512-ROITHtLTA1muyrwgyuwyasmaLCGtT4as/Kd1kerXaSDtFcYrnxiM984ZD0+FDUEDl5BgXtYa/sKKkKQFjgmM0A==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0':
-    resolution: {integrity: sha512-FQJNrlCUBb9E7Fhp5ARy+Or8lSvorG41aVrfi0cGNvv1QlIGSj77TN7SKK+L1jAGzKj1Bl2kCZIESF6Zi8N/+Q==}
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.0.3':
+    resolution: {integrity: sha512-bQ3EZwCFfrLg/ZQ2I8sLuifSxESz4TP56SleTkKsPtTIZgNnKpM88PRDz4neiRroHVOq8NK0X276qi9LjGcXPw==}
     engines: {node: '>= 10'}
     cpu: [arm]
     os: [linux]
 
-  '@tauri-apps/cli-linux-arm64-gnu@2.0.0':
-    resolution: {integrity: sha512-TK3VrZG5LK1NGueKwnZA1/3gj/qkwry001MNCHXjT6394dwrDv+digCc9Qc569h+xeH/FF71jyoiRIu3gRE6iA==}
+  '@tauri-apps/cli-linux-arm64-gnu@2.0.3':
+    resolution: {integrity: sha512-aLfAA8P9OTErVUk3sATxtXqpAtlfDPMPp4fGjDysEELG/MyekGhmh2k/kG/i32OdPeCfO+Nr37wJksARJKubGw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@tauri-apps/cli-linux-arm64-musl@2.0.0':
-    resolution: {integrity: sha512-E3hRmS/0m8YUYMTKZtBExpk/284CTi2nymks0dK0L1j+3KjffL7DiilnIfNFmTvWBgMrs0cVCtoaN/ba/A9mNA==}
+  '@tauri-apps/cli-linux-arm64-musl@2.0.3':
+    resolution: {integrity: sha512-I4MVD7nf6lLLRmNQPpe5beEIFM6q7Zkmh77ROA5BNu/+vHNL5kiTMD+bmd10ZL2r753A6pO7AvqkIxcBuIl0tg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@tauri-apps/cli-linux-x64-gnu@2.0.0':
-    resolution: {integrity: sha512-veX4BJp5xnW8KmxVjchWt4oZEIvKGhuSR7qU1WpqTR21e/eTe/ksGsdXPsqOKQvv/w1X6jhqmlPvhnFmDwUJ/w==}
+  '@tauri-apps/cli-linux-x64-gnu@2.0.3':
+    resolution: {integrity: sha512-C6Jkx2zZGKkoi+sg5FK9GoH/0EvAaOgrZfF5azV5EALGba46g7VpWcZgp9zFUd7K2IzTi+0OOY8TQ2OVfKZgew==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@tauri-apps/cli-linux-x64-musl@2.0.0':
-    resolution: {integrity: sha512-9Eso/8wbsWbOyd9PZEIzN/48ZQJrUGQqGZtglcjUku0lO76mnX0fOnit4nQ57Oj0wezJPhv4mgSseG1OsTIVzw==}
+  '@tauri-apps/cli-linux-x64-musl@2.0.3':
+    resolution: {integrity: sha512-qi4ghmTfSAl+EEUDwmwI9AJUiOLNSmU1RgiGgcPRE+7A/W+Am9UnxYySAiRbB/gJgTl9sj/pqH5Y9duP1/sqHg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@tauri-apps/cli-win32-arm64-msvc@2.0.0':
-    resolution: {integrity: sha512-ky8vWAuDUf8WGt9+a0G/EbU0OhdIkogelh9qjIYGHbyEYAJqXfN5P40aHUEg3y8ngQ0YGwRX5ePsQsSZiiR5PQ==}
+  '@tauri-apps/cli-win32-arm64-msvc@2.0.3':
+    resolution: {integrity: sha512-UXxHkYmFesC97qVmZre4vY7oDxRDtC2OeKNv0bH+iSnuUp/ROxzJYGyaelnv9Ybvgl4YVqDCnxgB28qMM938TA==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@tauri-apps/cli-win32-ia32-msvc@2.0.0':
-    resolution: {integrity: sha512-uD45cLZ/EBaT8o4a27tHW7t5UKFplnvDLt/uSUaCpJ3NyOTV6nMXOUrJBe+hH9hSBohqNAF7LEyYo1p932DWFg==}
+  '@tauri-apps/cli-win32-ia32-msvc@2.0.3':
+    resolution: {integrity: sha512-D+xoaa35RGlkXDpnL5uDTpj29untuC5Wp6bN9snfgFDagD0wnFfC8+2ZQGu16bD0IteWqDI0OSoIXhNvy+F+wg==}
     engines: {node: '>= 10'}
     cpu: [ia32]
     os: [win32]
 
-  '@tauri-apps/cli-win32-x64-msvc@2.0.0':
-    resolution: {integrity: sha512-oFlo14YMsvyhJHmmHgRuOpJ1L9w15193c1Nfj1DksS2LHj6tLzirI7YrAF9inY/XjHFjNHzYPmBpABibkf/9wQ==}
+  '@tauri-apps/cli-win32-x64-msvc@2.0.3':
+    resolution: {integrity: sha512-eWV9XWb4dSYHXl13OtYWLjX1JHphUEkHkkGwJrhr8qFBm7RbxXxQvrsUEprSi51ug/dwJenjJgM4zR8By4htfw==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
 
-  '@tauri-apps/cli@2.0.0':
-    resolution: {integrity: sha512-xxmPllRa6w/LRRcPczST3yHrYoi8l6ZZmzwabEmM0cgDdhVDmX+Y4oDJkiKD+8cVdxwwEzIuIKuaCwsX8iNsgA==}
+  '@tauri-apps/cli@2.0.3':
+    resolution: {integrity: sha512-JwEyhc5BAVpn4E8kxzY/h7+bVOiXQdudR1r3ODMfyyumZBfgIWqpD/WuTcPq6Yjchju1BSS+80jAE/oYwI/RKg==}
     engines: {node: '>= 10'}
     hasBin: true
 
@@ -1020,8 +1028,8 @@ packages:
   '@types/unist@2.0.11':
     resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==}
 
-  '@typescript-eslint/eslint-plugin@8.8.0':
-    resolution: {integrity: sha512-wORFWjU30B2WJ/aXBfOm1LX9v9nyt9D3jsSOxC3cCaTQGCW5k4jNpmjFv3U7p/7s4yvdjHzwtv2Sd2dOyhjS0A==}
+  '@typescript-eslint/eslint-plugin@8.10.0':
+    resolution: {integrity: sha512-phuB3hoP7FFKbRXxjl+DRlQDuJqhpOnm5MmtROXyWi3uS/Xg2ZXqiQfcG2BJHiN4QKyzdOJi3NEn/qTnjUlkmQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0
@@ -1031,8 +1039,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/parser@8.8.0':
-    resolution: {integrity: sha512-uEFUsgR+tl8GmzmLjRqz+VrDv4eoaMqMXW7ruXfgThaAShO9JTciKpEsB+TvnfFfbg5IpujgMXVV36gOJRLtZg==}
+  '@typescript-eslint/parser@8.10.0':
+    resolution: {integrity: sha512-E24l90SxuJhytWJ0pTQydFT46Nk0Z+bsLKo/L8rtQSL93rQ6byd1V/QbDpHUTdLPOMsBCcYXZweADNCfOCmOAg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
@@ -1041,12 +1049,12 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/scope-manager@8.8.0':
-    resolution: {integrity: sha512-EL8eaGC6gx3jDd8GwEFEV091210U97J0jeEHrAYvIYosmEGet4wJ+g0SYmLu+oRiAwbSA5AVrt6DxLHfdd+bUg==}
+  '@typescript-eslint/scope-manager@8.10.0':
+    resolution: {integrity: sha512-AgCaEjhfql9MDKjMUxWvH7HjLeBqMCBfIaBbzzIcBbQPZE7CPh1m6FF+L75NUMJFMLYhCywJXIDEMa3//1A0dw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/type-utils@8.8.0':
-    resolution: {integrity: sha512-IKwJSS7bCqyCeG4NVGxnOP6lLT9Okc3Zj8hLO96bpMkJab+10HIfJbMouLrlpyOr3yrQ1cA413YPFiGd1mW9/Q==}
+  '@typescript-eslint/type-utils@8.10.0':
+    resolution: {integrity: sha512-PCpUOpyQSpxBn230yIcK+LeCQaXuxrgCm2Zk1S+PTIRJsEfU6nJ0TtwyH8pIwPK/vJoA+7TZtzyAJSGBz+s/dg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '*'
@@ -1054,12 +1062,12 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/types@8.8.0':
-    resolution: {integrity: sha512-QJwc50hRCgBd/k12sTykOJbESe1RrzmX6COk8Y525C9l7oweZ+1lw9JiU56im7Amm8swlz00DRIlxMYLizr2Vw==}
+  '@typescript-eslint/types@8.10.0':
+    resolution: {integrity: sha512-k/E48uzsfJCRRbGLapdZgrX52csmWJ2rcowwPvOZ8lwPUv3xW6CcFeJAXgx4uJm+Ge4+a4tFOkdYvSpxhRhg1w==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/typescript-estree@8.8.0':
-    resolution: {integrity: sha512-ZaMJwc/0ckLz5DaAZ+pNLmHv8AMVGtfWxZe/x2JVEkD5LnmhWiQMMcYT7IY7gkdJuzJ9P14fRy28lUrlDSWYdw==}
+  '@typescript-eslint/typescript-estree@8.10.0':
+    resolution: {integrity: sha512-3OE0nlcOHaMvQ8Xu5gAfME3/tWVDpb/HxtpUZ1WeOAksZ/h/gwrBzCklaGzwZT97/lBbbxJ16dMA98JMEngW4w==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '*'
@@ -1067,14 +1075,14 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/utils@8.8.0':
-    resolution: {integrity: sha512-QE2MgfOTem00qrlPgyByaCHay9yb1+9BjnMFnSFkUKQfu7adBXDTnCAivURnuPPAG/qiB+kzKkZKmKfaMT0zVg==}
+  '@typescript-eslint/utils@8.10.0':
+    resolution: {integrity: sha512-Oq4uZ7JFr9d1ZunE/QKy5egcDRXT/FrS2z/nlxzPua2VHFtmMvFNDvpq1m/hq0ra+T52aUezfcjGRIB7vNJF9w==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
 
-  '@typescript-eslint/visitor-keys@8.8.0':
-    resolution: {integrity: sha512-8mq51Lx6Hpmd7HnA2fcHQo3YgfX1qbccxQOgZcb4tvasu//zXRaA1j5ZRFeCw/VRAdFi4mRM9DnZw0Nu0Q2d1g==}
+  '@typescript-eslint/visitor-keys@8.10.0':
+    resolution: {integrity: sha512-k8nekgqwr7FadWk548Lfph6V3r9OVqjzAIVskE7orMZR23cGJjAOVazsZSJW+ElyjfTM4wx/1g88Mi70DDtG9A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@unocss/astro@0.63.1':
@@ -1423,8 +1431,8 @@ packages:
     resolution: {integrity: sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  eslint@9.11.1:
-    resolution: {integrity: sha512-MobhYKIoAO1s1e4VUrgx1l1Sk2JBR/Gqjjgw8+mfgoLE2xwsHur4gdfTxyTgShrhvdVFTaJSgMiQBl1jv/AWxg==}
+  eslint@9.13.0:
+    resolution: {integrity: sha512-EYZK6SX6zjFHST/HRytOdA/zE72Cq/bfw45LSyuwrdvcclb/gqV8RRQxywOBEWO2+WDpva6UZa4CcDeJKzUCFA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     hasBin: true
     peerDependencies:
@@ -1654,10 +1662,6 @@ packages:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
-  is-path-inside@3.0.3:
-    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
-    engines: {node: '>=8'}
-
   is-plain-obj@2.1.0:
     resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
     engines: {node: '>=8'}
@@ -2141,8 +2145,8 @@ packages:
     resolution: {integrity: sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==}
     engines: {node: '>=8'}
 
-  typescript-eslint@8.8.0:
-    resolution: {integrity: sha512-BjIT/VwJ8+0rVO01ZQ2ZVnjE1svFBiRczcpr1t1Yxt7sT25VSbPfrJtDsQ8uQTy2pilX5nI9gwxhUyLULNentw==}
+  typescript-eslint@8.10.0:
+    resolution: {integrity: sha512-YIu230PeN7z9zpu/EtqCIuRVHPs4iSlqW6TEvjbyDAE3MZsSl2RXBo+5ag+lbABCG8sFM1WVKEXhlQ8Ml8A3Fw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '*'
@@ -2150,8 +2154,8 @@ packages:
       typescript:
         optional: true
 
-  typescript@5.6.2:
-    resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==}
+  typescript@5.6.3:
+    resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -2330,9 +2334,9 @@ snapshots:
       - encoding
       - mocha
 
-  '@covector/assemble@0.12.0':
+  '@covector/assemble@0.12.0(mocha@10.7.3)':
     dependencies:
-      '@covector/command': 0.8.0
+      '@covector/command': 0.8.0(mocha@10.7.3)
       '@covector/files': 0.8.0
       effection: 2.0.8(mocha@10.7.3)
       js-yaml: 4.1.0
@@ -2343,9 +2347,10 @@ snapshots:
       unified: 9.2.2
     transitivePeerDependencies:
       - encoding
+      - mocha
       - supports-color
 
-  '@covector/changelog@0.12.0':
+  '@covector/changelog@0.12.0(mocha@10.7.3)':
     dependencies:
       '@covector/files': 0.8.0
       effection: 2.0.8(mocha@10.7.3)
@@ -2355,14 +2360,16 @@ snapshots:
       unified: 9.2.2
     transitivePeerDependencies:
       - encoding
+      - mocha
       - supports-color
 
-  '@covector/command@0.8.0':
+  '@covector/command@0.8.0(mocha@10.7.3)':
     dependencies:
-      '@effection/process': 2.1.4
+      '@effection/process': 2.1.4(mocha@10.7.3)
       effection: 2.0.8(mocha@10.7.3)
     transitivePeerDependencies:
       - encoding
+      - mocha
 
   '@covector/files@0.8.0':
     dependencies:
@@ -2409,10 +2416,8 @@ snapshots:
     dependencies:
       effection: 2.0.8(mocha@10.7.3)
       mocha: 10.7.3
-    transitivePeerDependencies:
-      - encoding
 
-  '@effection/process@2.1.4':
+  '@effection/process@2.1.4(mocha@10.7.3)':
     dependencies:
       cross-spawn: 7.0.3
       ctrlc-windows: 2.1.0
@@ -2420,6 +2425,7 @@ snapshots:
       shellwords: 0.1.1
     transitivePeerDependencies:
       - encoding
+      - mocha
 
   '@effection/stream@2.0.6':
     dependencies:
@@ -2571,9 +2577,9 @@ snapshots:
   '@esbuild/win32-x64@0.23.1':
     optional: true
 
-  '@eslint-community/eslint-utils@4.4.0(eslint@9.11.1(jiti@2.0.0))':
+  '@eslint-community/eslint-utils@4.4.0(eslint@9.13.0(jiti@2.0.0))':
     dependencies:
-      eslint: 9.11.1(jiti@2.0.0)
+      eslint: 9.13.0(jiti@2.0.0)
       eslint-visitor-keys: 3.4.3
 
   '@eslint-community/regexpp@4.11.1': {}
@@ -2586,7 +2592,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/core@0.6.0': {}
+  '@eslint/core@0.7.0': {}
 
   '@eslint/eslintrc@3.1.0':
     dependencies:
@@ -2602,7 +2608,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/js@9.11.1': {}
+  '@eslint/js@9.13.0': {}
 
   '@eslint/object-schema@2.1.4': {}
 
@@ -2610,9 +2616,16 @@ snapshots:
     dependencies:
       levn: 0.4.1
 
+  '@humanfs/core@0.19.0': {}
+
+  '@humanfs/node@0.16.5':
+    dependencies:
+      '@humanfs/core': 0.19.0
+      '@humanwhocodes/retry': 0.3.1
+
   '@humanwhocodes/module-importer@1.0.1': {}
 
-  '@humanwhocodes/retry@0.3.0': {}
+  '@humanwhocodes/retry@0.3.1': {}
 
   '@iconify-json/codicon@1.2.2':
     dependencies:
@@ -2690,11 +2703,11 @@ snapshots:
     optionalDependencies:
       rollup: 4.22.4
 
-  '@rollup/plugin-typescript@11.1.6(rollup@4.22.4)(tslib@2.7.0)(typescript@5.6.2)':
+  '@rollup/plugin-typescript@11.1.6(rollup@4.22.4)(tslib@2.7.0)(typescript@5.6.3)':
     dependencies:
       '@rollup/pluginutils': 5.1.2(rollup@4.22.4)
       resolve: 1.22.8
-      typescript: 5.6.2
+      typescript: 5.6.3
     optionalDependencies:
       rollup: 4.22.4
       tslib: 2.7.0
@@ -2778,50 +2791,50 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@tauri-apps/api@2.0.1': {}
+  '@tauri-apps/api@2.0.2': {}
 
-  '@tauri-apps/cli-darwin-arm64@2.0.0':
+  '@tauri-apps/cli-darwin-arm64@2.0.3':
     optional: true
 
-  '@tauri-apps/cli-darwin-x64@2.0.0':
+  '@tauri-apps/cli-darwin-x64@2.0.3':
     optional: true
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0':
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.0.3':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-gnu@2.0.0':
+  '@tauri-apps/cli-linux-arm64-gnu@2.0.3':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-musl@2.0.0':
+  '@tauri-apps/cli-linux-arm64-musl@2.0.3':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-gnu@2.0.0':
+  '@tauri-apps/cli-linux-x64-gnu@2.0.3':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-musl@2.0.0':
+  '@tauri-apps/cli-linux-x64-musl@2.0.3':
     optional: true
 
-  '@tauri-apps/cli-win32-arm64-msvc@2.0.0':
+  '@tauri-apps/cli-win32-arm64-msvc@2.0.3':
     optional: true
 
-  '@tauri-apps/cli-win32-ia32-msvc@2.0.0':
+  '@tauri-apps/cli-win32-ia32-msvc@2.0.3':
     optional: true
 
-  '@tauri-apps/cli-win32-x64-msvc@2.0.0':
+  '@tauri-apps/cli-win32-x64-msvc@2.0.3':
     optional: true
 
-  '@tauri-apps/cli@2.0.0':
+  '@tauri-apps/cli@2.0.3':
     optionalDependencies:
-      '@tauri-apps/cli-darwin-arm64': 2.0.0
-      '@tauri-apps/cli-darwin-x64': 2.0.0
-      '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0
-      '@tauri-apps/cli-linux-arm64-gnu': 2.0.0
-      '@tauri-apps/cli-linux-arm64-musl': 2.0.0
-      '@tauri-apps/cli-linux-x64-gnu': 2.0.0
-      '@tauri-apps/cli-linux-x64-musl': 2.0.0
-      '@tauri-apps/cli-win32-arm64-msvc': 2.0.0
-      '@tauri-apps/cli-win32-ia32-msvc': 2.0.0
-      '@tauri-apps/cli-win32-x64-msvc': 2.0.0
+      '@tauri-apps/cli-darwin-arm64': 2.0.3
+      '@tauri-apps/cli-darwin-x64': 2.0.3
+      '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.3
+      '@tauri-apps/cli-linux-arm64-gnu': 2.0.3
+      '@tauri-apps/cli-linux-arm64-musl': 2.0.3
+      '@tauri-apps/cli-linux-x64-gnu': 2.0.3
+      '@tauri-apps/cli-linux-x64-musl': 2.0.3
+      '@tauri-apps/cli-win32-arm64-msvc': 2.0.3
+      '@tauri-apps/cli-win32-ia32-msvc': 2.0.3
+      '@tauri-apps/cli-win32-x64-msvc': 2.0.3
 
   '@types/eslint@9.6.1':
     dependencies:
@@ -2846,85 +2859,85 @@ snapshots:
 
   '@types/unist@2.0.11': {}
 
-  '@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)':
+  '@typescript-eslint/eslint-plugin@8.10.0(@typescript-eslint/parser@8.10.0(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3))(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3)':
     dependencies:
       '@eslint-community/regexpp': 4.11.1
-      '@typescript-eslint/parser': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)
-      '@typescript-eslint/scope-manager': 8.8.0
-      '@typescript-eslint/type-utils': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)
-      '@typescript-eslint/utils': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)
-      '@typescript-eslint/visitor-keys': 8.8.0
-      eslint: 9.11.1(jiti@2.0.0)
+      '@typescript-eslint/parser': 8.10.0(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3)
+      '@typescript-eslint/scope-manager': 8.10.0
+      '@typescript-eslint/type-utils': 8.10.0(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3)
+      '@typescript-eslint/utils': 8.10.0(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3)
+      '@typescript-eslint/visitor-keys': 8.10.0
+      eslint: 9.13.0(jiti@2.0.0)
       graphemer: 1.4.0
       ignore: 5.3.2
       natural-compare: 1.4.0
-      ts-api-utils: 1.3.0(typescript@5.6.2)
+      ts-api-utils: 1.3.0(typescript@5.6.3)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.6.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)':
+  '@typescript-eslint/parser@8.10.0(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.8.0
-      '@typescript-eslint/types': 8.8.0
-      '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2)
-      '@typescript-eslint/visitor-keys': 8.8.0
+      '@typescript-eslint/scope-manager': 8.10.0
+      '@typescript-eslint/types': 8.10.0
+      '@typescript-eslint/typescript-estree': 8.10.0(typescript@5.6.3)
+      '@typescript-eslint/visitor-keys': 8.10.0
       debug: 4.3.7(supports-color@8.1.1)
-      eslint: 9.11.1(jiti@2.0.0)
+      eslint: 9.13.0(jiti@2.0.0)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.6.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/scope-manager@8.8.0':
+  '@typescript-eslint/scope-manager@8.10.0':
     dependencies:
-      '@typescript-eslint/types': 8.8.0
-      '@typescript-eslint/visitor-keys': 8.8.0
+      '@typescript-eslint/types': 8.10.0
+      '@typescript-eslint/visitor-keys': 8.10.0
 
-  '@typescript-eslint/type-utils@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)':
+  '@typescript-eslint/type-utils@8.10.0(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3)':
     dependencies:
-      '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2)
-      '@typescript-eslint/utils': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)
+      '@typescript-eslint/typescript-estree': 8.10.0(typescript@5.6.3)
+      '@typescript-eslint/utils': 8.10.0(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3)
       debug: 4.3.7(supports-color@8.1.1)
-      ts-api-utils: 1.3.0(typescript@5.6.2)
+      ts-api-utils: 1.3.0(typescript@5.6.3)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.6.3
     transitivePeerDependencies:
       - eslint
       - supports-color
 
-  '@typescript-eslint/types@8.8.0': {}
+  '@typescript-eslint/types@8.10.0': {}
 
-  '@typescript-eslint/typescript-estree@8.8.0(typescript@5.6.2)':
+  '@typescript-eslint/typescript-estree@8.10.0(typescript@5.6.3)':
     dependencies:
-      '@typescript-eslint/types': 8.8.0
-      '@typescript-eslint/visitor-keys': 8.8.0
+      '@typescript-eslint/types': 8.10.0
+      '@typescript-eslint/visitor-keys': 8.10.0
       debug: 4.3.7(supports-color@8.1.1)
       fast-glob: 3.3.2
       is-glob: 4.0.3
       minimatch: 9.0.5
       semver: 7.6.3
-      ts-api-utils: 1.3.0(typescript@5.6.2)
+      ts-api-utils: 1.3.0(typescript@5.6.3)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.6.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)':
+  '@typescript-eslint/utils@8.10.0(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0))
-      '@typescript-eslint/scope-manager': 8.8.0
-      '@typescript-eslint/types': 8.8.0
-      '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2)
-      eslint: 9.11.1(jiti@2.0.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.13.0(jiti@2.0.0))
+      '@typescript-eslint/scope-manager': 8.10.0
+      '@typescript-eslint/types': 8.10.0
+      '@typescript-eslint/typescript-estree': 8.10.0(typescript@5.6.3)
+      eslint: 9.13.0(jiti@2.0.0)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@typescript-eslint/visitor-keys@8.8.0':
+  '@typescript-eslint/visitor-keys@8.10.0':
     dependencies:
-      '@typescript-eslint/types': 8.8.0
+      '@typescript-eslint/types': 8.10.0
       eslint-visitor-keys: 3.4.3
 
   '@unocss/astro@0.63.1(rollup@4.22.4)(vite@5.4.8(terser@5.34.1))':
@@ -3223,9 +3236,9 @@ snapshots:
     dependencies:
       '@clack/prompts': 0.7.0
       '@covector/apply': 0.10.0(mocha@10.7.3)
-      '@covector/assemble': 0.12.0
-      '@covector/changelog': 0.12.0
-      '@covector/command': 0.8.0
+      '@covector/assemble': 0.12.0(mocha@10.7.3)
+      '@covector/changelog': 0.12.0(mocha@10.7.3)
+      '@covector/command': 0.8.0(mocha@10.7.3)
       '@covector/files': 0.8.0
       effection: 2.0.8(mocha@10.7.3)
       globby: 11.1.0
@@ -3360,9 +3373,9 @@ snapshots:
 
   escape-string-regexp@4.0.0: {}
 
-  eslint-config-prettier@9.1.0(eslint@9.11.1(jiti@2.0.0)):
+  eslint-config-prettier@9.1.0(eslint@9.13.0(jiti@2.0.0)):
     dependencies:
-      eslint: 9.11.1(jiti@2.0.0)
+      eslint: 9.13.0(jiti@2.0.0)
 
   eslint-plugin-security@3.0.1:
     dependencies:
@@ -3377,18 +3390,18 @@ snapshots:
 
   eslint-visitor-keys@4.1.0: {}
 
-  eslint@9.11.1(jiti@2.0.0):
+  eslint@9.13.0(jiti@2.0.0):
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0))
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.13.0(jiti@2.0.0))
       '@eslint-community/regexpp': 4.11.1
       '@eslint/config-array': 0.18.0
-      '@eslint/core': 0.6.0
+      '@eslint/core': 0.7.0
       '@eslint/eslintrc': 3.1.0
-      '@eslint/js': 9.11.1
+      '@eslint/js': 9.13.0
       '@eslint/plugin-kit': 0.2.0
+      '@humanfs/node': 0.16.5
       '@humanwhocodes/module-importer': 1.0.1
-      '@humanwhocodes/retry': 0.3.0
-      '@nodelib/fs.walk': 1.2.8
+      '@humanwhocodes/retry': 0.3.1
       '@types/estree': 1.0.6
       '@types/json-schema': 7.0.15
       ajv: 6.12.6
@@ -3408,13 +3421,11 @@ snapshots:
       ignore: 5.3.2
       imurmurhash: 0.1.4
       is-glob: 4.0.3
-      is-path-inside: 3.0.3
       json-stable-stringify-without-jsonify: 1.0.1
       lodash.merge: 4.6.2
       minimatch: 3.1.2
       natural-compare: 1.4.0
       optionator: 0.9.4
-      strip-ansi: 6.0.1
       text-table: 0.2.0
     optionalDependencies:
       jiti: 2.0.0
@@ -3619,8 +3630,6 @@ snapshots:
 
   is-number@7.0.0: {}
 
-  is-path-inside@3.0.3: {}
-
   is-plain-obj@2.1.0: {}
 
   is-reference@3.0.2:
@@ -4111,9 +4120,9 @@ snapshots:
 
   trough@1.0.5: {}
 
-  ts-api-utils@1.3.0(typescript@5.6.2):
+  ts-api-utils@1.3.0(typescript@5.6.3):
     dependencies:
-      typescript: 5.6.2
+      typescript: 5.6.3
 
   tslib@2.7.0: {}
 
@@ -4130,18 +4139,18 @@ snapshots:
 
   type-fest@0.7.1: {}
 
-  typescript-eslint@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2):
+  typescript-eslint@8.10.0(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)
-      '@typescript-eslint/parser': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)
-      '@typescript-eslint/utils': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)
+      '@typescript-eslint/eslint-plugin': 8.10.0(@typescript-eslint/parser@8.10.0(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3))(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3)
+      '@typescript-eslint/parser': 8.10.0(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3)
+      '@typescript-eslint/utils': 8.10.0(eslint@9.13.0(jiti@2.0.0))(typescript@5.6.3)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.6.3
     transitivePeerDependencies:
       - eslint
       - supports-color
 
-  typescript@5.6.2: {}
+  typescript@5.6.3: {}
 
   ufo@1.5.4: {}
 
diff --git a/renovate.json b/renovate.json
index 87300f19..e67495c3 100644
--- a/renovate.json
+++ b/renovate.json
@@ -30,13 +30,6 @@
       "matchBaseBranches": ["v1"],
       "matchUpdateTypes": ["lockFileMaintenance"],
       "enabled": false
-    },
-    {
-      "description": "Prevent Renovate from replacing 2.0.0-beta.10 with 2.0.0-beta - REMOVE ONCE TAURI IS STABLE",
-      "matchManagers": ["cargo"],
-      "matchPackagePatterns": ["^tauri"],
-      "matchCurrentValue": "2.*",
-      "rangeStrategy": "bump"
     }
   ],
   "postUpdateOptions": ["pnpmDedupe"]