diff --git a/Cargo.lock b/Cargo.lock
index 9e728554..00b97da9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -41,9 +41,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.5"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
+checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
 dependencies = [
  "memchr",
 ]
@@ -63,6 +63,12 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -80,9 +86,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.5.0"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -94,15 +100,15 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
 dependencies = [
  "utf8parse",
 ]
@@ -118,9 +124,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "2.1.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
 dependencies = [
  "anstyle",
  "windows-sys",
@@ -140,9 +146,9 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"
 
 [[package]]
 name = "async-compression"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d495b6dc0184693324491a5ac05f559acc97bf937ab31d7a1c33dd0016be6d2b"
+checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c"
 dependencies = [
  "brotli",
  "flate2",
@@ -156,13 +162,13 @@ dependencies = [
 
 [[package]]
 name = "async-recursion"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
+checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -173,35 +179,35 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "attribute-derive"
-version = "0.6.1"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c124f12ade4e670107b132722d0ad1a5c9790bcbc1b265336369ea05626b4498"
+checksum = "0c94f43ede6f25dab1dea046bff84d85dea61bd49aba7a9011ad66c0d449077b"
 dependencies = [
  "attribute-derive-macro",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "attribute-derive-macro"
-version = "0.6.1"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b217a07446e0fb086f83401a98297e2d81492122f5874db5391bd270a185f88"
+checksum = "b409e2b2d2dc206d2c0ad3575a93f001ae21a1593e2d0c69b69c308e63f3b422"
 dependencies = [
  "collection_literals",
  "interpolator",
- "proc-macro-error",
+ "manyhow",
  "proc-macro-utils",
  "proc-macro2",
  "quote",
  "quote-use",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -269,7 +275,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -289,15 +295,9 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.13.1"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
 
 [[package]]
 name = "bincode"
@@ -332,20 +332,11 @@ dependencies = [
  "wyz",
 ]
 
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "brotli"
-version = "3.3.4"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
+checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -354,9 +345,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "2.3.4"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744"
+checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -364,9 +355,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "bytecheck"
@@ -393,9 +384,9 @@ dependencies = [
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "bytesize"
@@ -408,28 +399,24 @@ dependencies = [
 
 [[package]]
 name = "cached"
-version = "0.44.0"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b195e4fbc4b6862bbd065b991a34750399c119797efff72492f28a5864de8700"
+checksum = "90eb5776f28a149524d1d8623035760b4454ec881e8cf3838fa8d7e1b11254b3"
 dependencies = [
- "async-trait",
  "cached_proc_macro",
  "cached_proc_macro_types",
- "futures",
  "hashbrown 0.13.2",
  "instant",
  "once_cell",
  "thiserror",
- "tokio",
 ]
 
 [[package]]
 name = "cached_proc_macro"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b48814962d2fd604c50d2b9433c2a41a0ab567779ee2c02f7fba6eca1221f082"
+checksum = "7da8245dd5f576a41c3b76247b54c15b0e43139ceeb4f732033e15be7c005176"
 dependencies = [
- "cached_proc_macro_types",
  "darling 0.14.4",
  "proc-macro2",
  "quote",
@@ -466,9 +453,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.28"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -506,9 +493,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.2"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6"
+checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -516,9 +503,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.2"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
 dependencies = [
  "anstream",
  "anstyle",
@@ -535,7 +522,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -580,16 +567,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7"
 dependencies = [
  "async-trait",
- "json5",
  "lazy_static",
  "nom",
  "pathdiff",
- "ron",
- "rust-ini",
  "serde",
- "serde_json",
  "toml 0.5.11",
- "yaml-rust",
 ]
 
 [[package]]
@@ -647,15 +629,6 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
-[[package]]
-name = "cpufeatures"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -698,16 +671,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
 [[package]]
 name = "darling"
 version = "0.14.4"
@@ -753,7 +716,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -775,7 +738,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core 0.20.3",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -789,49 +752,21 @@ dependencies = [
 
 [[package]]
 name = "derive-where"
-version = "1.2.3"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875a0460143f2dbcc71fd8a63f34b7c83ac66f14bead94054e7cd619c57bbb27"
+checksum = "146398d62142a0f35248a608f17edf0dde57338354966d6e41d0eb2d16980ccb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
+ "syn 2.0.37",
 ]
 
-[[package]]
-name = "dlv-list"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
-
 [[package]]
 name = "drain_filter_polyfill"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "669a445ee724c5c69b1b06fe0b63e70a1c84bc9bb7d9696cd4f4e3ec45050408"
 
-[[package]]
-name = "educe"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae"
-dependencies = [
- "enum-ordinalize",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "either"
 version = "1.9.0"
@@ -847,19 +782,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "enum-ordinalize"
-version = "3.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1"
-dependencies = [
- "num-bigint",
- "num-traits",
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -868,9 +790,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
+checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480"
 dependencies = [
  "errno-dragonfly",
  "libc",
@@ -974,7 +896,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -1007,16 +929,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.10"
@@ -1263,15 +1175,16 @@ name = "hashbrown"
 version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash 0.8.3",
-]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+dependencies = [
+ "ahash 0.8.3",
+ "allocator-api2",
+]
 
 [[package]]
 name = "heck"
@@ -1281,9 +1194,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
 
 [[package]]
 name = "hex"
@@ -1351,9 +1264,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "human-panic"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2df2fb4e13fa697d21d93061ebcbbd876f5ef643b48ff59cfab57a726ef140"
+checksum = "b82da652938b83f94cfdaaf9ae7aaadb8430d84b0dfda226998416318727eac2"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1361,7 +1274,7 @@ dependencies = [
  "os_info",
  "serde",
  "serde_derive",
- "toml 0.7.6",
+ "toml 0.7.8",
  "uuid",
 ]
 
@@ -1441,12 +1354,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
  "serde",
 ]
 
@@ -1535,6 +1448,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.9"
@@ -1559,17 +1481,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "json5"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1"
-dependencies = [
- "pest",
- "pest_derive",
- "serde",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -1578,9 +1489,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "leptos"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65154cd0fc2f505a1676b870d5c055dec9dafe4d6081358ef1d7e357d6f222c5"
+checksum = "4d3885e75a25bbf43c95350cf2f6b9f5228a3d911e28512c44c2a6c8aa49e9c9"
 dependencies = [
  "cfg-if",
  "leptos_config",
@@ -1591,15 +1502,19 @@ dependencies = [
  "server_fn",
  "tracing",
  "typed-builder",
+ "typed-builder-macro",
+ "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
 name = "leptos_axum"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "309af4ea2fd7e9769f1f10d7e356fcb4e7d2bb1c21588dc73151feca415fd45a"
+checksum = "b7a80173d81017fc69cee180f76040a65b233e486b064ddb1aaf08ba53caa60d"
 dependencies = [
  "axum",
+ "cfg-if",
  "futures",
  "http",
  "hyper",
@@ -1617,9 +1532,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_config"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0108f6c8409c99fcf25f4c55a56b4bf9afeeb58f643879bb115d4258b9e22979"
+checksum = "d3936a83035a4ec03487792d8c9c2c5ad00c269d09701d102630ac5c31caa463"
 dependencies = [
  "config",
  "regex",
@@ -1630,19 +1545,18 @@ dependencies = [
 
 [[package]]
 name = "leptos_dom"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5a92b7a30d6e1363233211babdd59fdd983f28dc3aa6aebbd7bfbdd15630c73"
+checksum = "6cbea8aeea07633b3559818fa963c03857751fbafc6bb4a73c995662836070e1"
 dependencies = [
  "async-recursion",
  "cfg-if",
  "drain_filter_polyfill",
- "educe",
  "futures",
  "getrandom",
  "html-escape",
- "indexmap 2.0.0",
- "itertools",
+ "indexmap 2.0.2",
+ "itertools 0.10.5",
  "js-sys",
  "leptos_reactive",
  "once_cell",
@@ -1671,27 +1585,27 @@ dependencies = [
 
 [[package]]
 name = "leptos_hot_reload"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef84aede40b027d1a4addd9bd54c89de722272429f7b21da40b04f9ebe5e3b2"
+checksum = "b56ec18e255737108b4f4d570c1c4f036f54a9989befe2658758500b636ebda4"
 dependencies = [
  "anyhow",
  "camino",
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
  "parking_lot",
  "proc-macro2",
  "quote",
  "rstml",
  "serde",
- "syn 2.0.29",
+ "syn 2.0.37",
  "walkdir",
 ]
 
 [[package]]
 name = "leptos_integration_utils"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bdd4411a987054b1bce1f89c888ea1bfde50f9c956ce7edc0bb5b54deaf1621"
+checksum = "77e1faf41644272929c47993af12928a51c0a03a1ed7ee55afcacf4a3a02073c"
 dependencies = [
  "futures",
  "leptos",
@@ -1703,15 +1617,15 @@ dependencies = [
 
 [[package]]
 name = "leptos_macro"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cc27567e059d8ab630a33bf782a81bb2e10178011b8c97c080aafcf09c4e5e0"
+checksum = "dae8be584ba63e002cec113e0a831f2ba17ad452104781a2b1b65555db049779"
 dependencies = [
  "attribute-derive",
  "cfg-if",
  "convert_case",
  "html-escape",
- "itertools",
+ "itertools 0.11.0",
  "leptos_hot_reload",
  "prettyplease",
  "proc-macro-error",
@@ -1719,19 +1633,19 @@ dependencies = [
  "quote",
  "rstml",
  "server_fn_macro",
- "syn 2.0.29",
+ "syn 2.0.37",
  "tracing",
  "uuid",
 ]
 
 [[package]]
 name = "leptos_meta"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "329c4bbe4191a0bef6514bab827f2ff1a1e69bc2b431e78ac9799e2bdc26ae33"
+checksum = "013e23a79d48c6eee6063b162e5ba0beb7d1a42c07361e4c16effb916160a5f0"
 dependencies = [
  "cfg-if",
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
  "leptos",
  "tracing",
  "wasm-bindgen",
@@ -1740,9 +1654,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_query"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e49b2c3d199c091071e14071d9f0c9d87399e00040183234affefa1a4832d7bb"
+checksum = "66071614752de947770824578b126f78b7f87436a1fccd71ef9545e7f95d4f94"
 dependencies = [
  "cfg-if",
  "gloo-timers",
@@ -1753,15 +1667,16 @@ dependencies = [
 
 [[package]]
 name = "leptos_reactive"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b4fc821e6a8646635b721dd58b5604b5c447eb3b21c464b3837cd2063a6b209"
+checksum = "90ec5366c79892fa8232dcfa6f05d610d0fd780af155fea8c466e77da18e744f"
 dependencies = [
- "base64 0.21.3",
+ "base64",
  "cfg-if",
  "futures",
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
  "js-sys",
+ "pin-project",
  "rkyv",
  "rustc-hash",
  "self_cell",
@@ -1779,9 +1694,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_router"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f02384aaeff09ba17093305a0dfe8713fb171f7227a8543992a9ce44c75cd"
+checksum = "f55951a1e4ee0b9c26e4ebc0c09ecc4b7fffbefecb912c72db0c5dfa33b1584c"
 dependencies = [
  "cached",
  "cfg-if",
@@ -1790,8 +1705,9 @@ dependencies = [
  "js-sys",
  "lazy_static",
  "leptos",
+ "leptos_integration_utils",
+ "leptos_meta",
  "linear-map",
- "log",
  "lru",
  "once_cell",
  "percent-encoding",
@@ -1809,9 +1725,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_server"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc28e6ae7ca7bd36fc865fb844ecb27ddf72a0eb9514b7ee45d0cad6cf930c7d"
+checksum = "520f4f7221a323c029877ffb09e97d38cc805f1a5821f9554ecf0e7f6852100c"
 dependencies = [
  "inventory",
  "lazy_static",
@@ -1825,9 +1741,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
 
 [[package]]
 name = "linear-map"
@@ -1839,17 +1755,11 @@ dependencies = [
  "serde_test",
 ]
 
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.5"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db"
 
 [[package]]
 name = "lock_api"
@@ -1869,11 +1779,34 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "lru"
-version = "0.10.1"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
+checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
 dependencies = [
- "hashbrown 0.13.2",
+ "hashbrown 0.14.1",
+]
+
+[[package]]
+name = "manyhow"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "516b76546495d933baa165075b95c0a15e8f7ef75e53f56b19b7144d80fd52bd"
+dependencies = [
+ "manyhow-macros",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "manyhow-macros"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ba072c0eadade3160232e70893311f1f8903974488096e2eb8e48caba2f0cf1"
+dependencies = [
+ "proc-macro-utils",
+ "proc-macro2",
+ "quote",
 ]
 
 [[package]]
@@ -1887,15 +1820,15 @@ dependencies = [
 
 [[package]]
 name = "matchit"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "memchr"
-version = "2.6.2"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "memoffset"
@@ -2056,27 +1989,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "num-bigint"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.16"
@@ -2098,9 +2010,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
  "memchr",
 ]
@@ -2122,16 +2034,6 @@ dependencies = [
  "pathdiff",
 ]
 
-[[package]]
-name = "ordered-multimap"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
-dependencies = [
- "dlv-list",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "os_info"
 version = "3.7.0"
@@ -2196,51 +2098,6 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
-[[package]]
-name = "pest"
-version = "2.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33"
-dependencies = [
- "memchr",
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f"
-dependencies = [
- "once_cell",
- "pest",
- "sha2",
-]
-
 [[package]]
 name = "pin-project"
 version = "1.1.3"
@@ -2258,7 +2115,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -2281,12 +2138,12 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -2298,7 +2155,6 @@ dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
  "version_check",
 ]
 
@@ -2326,9 +2182,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
 dependencies = [
  "unicode-ident",
 ]
@@ -2341,7 +2197,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
  "version_check",
  "yansi",
 ]
@@ -2377,14 +2233,25 @@ dependencies = [
 
 [[package]]
 name = "quote-use"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58e9a38ef862d7fec635661503289062bc5b3035e61859a8de3d3f81823accd2"
+checksum = "a7b5abe3fe82fdeeb93f44d66a7b444dedf2e4827defb0a8e69c437b2de2ef94"
+dependencies = [
+ "quote",
+ "quote-use-macros",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "quote-use-macros"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97ea44c7e20f16017a76a245bb42188517e13d16dcb1aa18044bc406cdc3f4af"
 dependencies = [
  "derive-where",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -2424,13 +2291,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.4"
+version = "1.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
+checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.3.7",
+ "regex-automata 0.3.9",
  "regex-syntax 0.7.5",
 ]
 
@@ -2445,9 +2312,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.7"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
+checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2468,9 +2335,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
 name = "rend"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab"
+checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd"
 dependencies = [
  "bytecheck",
 ]
@@ -2481,7 +2348,7 @@ version = "0.11.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
 dependencies = [
- "base64 0.21.3",
+ "base64",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -2537,17 +2404,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "ron"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
-dependencies = [
- "base64 0.13.1",
- "bitflags 1.3.2",
- "serde",
-]
-
 [[package]]
 name = "rstml"
 version = "0.11.2"
@@ -2557,21 +2413,11 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
  "syn_derive",
  "thiserror",
 ]
 
-[[package]]
-name = "rust-ini"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
-dependencies = [
- "cfg-if",
- "ordered-multimap",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@@ -2586,9 +2432,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.38.11"
+version = "0.38.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453"
+checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
@@ -2664,14 +2510,14 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.105"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
  "itoa",
  "ryu",
@@ -2735,11 +2581,11 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237"
 dependencies = [
- "base64 0.21.3",
+ "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
  "serde",
  "serde_json",
  "serde_with_macros",
@@ -2755,14 +2601,14 @@ dependencies = [
  "darling 0.20.3",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "server_fn"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcddd58a35e4fd00f15dac8f2fc08deed175d8178b2c3e615f59a7e7be6fed7"
+checksum = "29eefae61211e81059a092a3428612c475a3a28e0ea4fb3fd49b0a940d837f84"
 dependencies = [
  "ciborium",
  "const_format",
@@ -2778,52 +2624,41 @@ dependencies = [
  "serde_json",
  "serde_qs",
  "server_fn_macro_default",
- "syn 2.0.29",
+ "syn 2.0.37",
  "thiserror",
  "xxhash-rust",
 ]
 
 [[package]]
 name = "server_fn_macro"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9083155d5a075eda2d08f18663e4789e0d447a1000b225bc4e1746e849c95c8e"
+checksum = "f68140099f8e55bd526dc176d17d341189bf669d45216c4797ddc344610a84a4"
 dependencies = [
  "const_format",
  "proc-macro-error",
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.29",
+ "syn 2.0.37",
  "xxhash-rust",
 ]
 
 [[package]]
 name = "server_fn_macro_default"
-version = "0.4.10"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dba6c99de6539ec3193130f764427ead9d784a76ca3126f38e56a6a0b7a2f3d"
+checksum = "eee874f357d640ad221ba0c27c2559fa3d1434f7f7bbf688a34118518c5924b7"
 dependencies = [
  "server_fn_macro",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b"
 dependencies = [
  "lazy_static",
 ]
@@ -2870,9 +2705,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 
 [[package]]
 name = "socket2"
@@ -2886,9 +2721,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
 dependencies = [
  "libc",
  "windows-sys",
@@ -2913,9 +2748,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.29"
+version = "2.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2924,14 +2759,14 @@ dependencies = [
 
 [[package]]
 name = "syn_derive"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8128874d02f9a114ade6d9ad252078cb32d3cb240e26477ac73d7e9c495c605e"
+checksum = "ae6eef0000c4a12ecdfd7873ea84a8b5aab5e44db72e38e07b028a25386f29a5"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -2963,22 +2798,22 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "thiserror"
-version = "1.0.47"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
+checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.47"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
+checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -2993,9 +2828,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
+checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe"
 dependencies = [
  "deranged",
  "itoa",
@@ -3006,15 +2841,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
 dependencies = [
  "time-core",
 ]
@@ -3048,7 +2883,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.3",
+ "socket2 0.5.4",
  "tokio-macros",
  "windows-sys",
 ]
@@ -3061,14 +2896,14 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"
 dependencies = [
  "bytes",
  "futures-core",
@@ -3091,9 +2926,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -3112,11 +2947,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.19.14"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -3141,12 +2976,12 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82"
+checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
  "async-compression",
- "base64 0.21.3",
+ "base64",
  "bitflags 2.4.0",
  "bytes",
  "futures-core",
@@ -3202,7 +3037,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -3263,26 +3098,23 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "typed-builder"
-version = "0.14.0"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64cba322cb9b7bc6ca048de49e83918223f35e7a86311267013afff257004870"
+checksum = "34085c17941e36627a879208083e25d357243812c30e7d7387c3b954f30ade16"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "typed-builder-macro",
 ]
 
 [[package]]
-name = "typenum"
-version = "1.16.0"
+name = "typed-builder-macro"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
 
 [[package]]
 name = "unicase"
@@ -3301,9 +3133,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
@@ -3375,9 +3207,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -3419,7 +3251,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
  "wasm-bindgen-shared",
 ]
 
@@ -3453,7 +3285,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3504,9 +3336,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
  "winapi",
 ]
@@ -3622,18 +3454,9 @@ dependencies = [
 
 [[package]]
 name = "xxhash-rust"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70"
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
+checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b"
 
 [[package]]
 name = "yansi"
diff --git a/Cargo.toml b/Cargo.toml
index fc4a6f1f..aa1323c4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,10 +10,10 @@ repository = "https://github.com/juspay/nix-browser"
 cfg-if = "1"
 clap = { version = "4.3", features = ["derive", "env"] }
 human-panic = "1.1.5"
-leptos = { version = "0.4", features = ["serde", "nightly"] }
-leptos_meta = { version = "0.4", features = ["nightly"] }
-leptos_router = { version = "0.4", features = ["nightly"] }
-leptos_query = "0.2"
+leptos = { version = "0.5", features = ["serde", "nightly"] }
+leptos_meta = { version = "0.5", features = ["nightly"] }
+leptos_router = { version = "0.5", features = ["nightly"] }
+leptos_query = "0.3"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tracing-subscriber-wasm = "0.1"
@@ -53,7 +53,7 @@ http = { version = "0.2", optional = true }
 human-panic.workspace = true
 hyper = { version = "0.14", features = ["server"], optional = true }
 leptos.workspace = true
-leptos_axum = { version = "0.4", optional = true }
+leptos_axum = { version = "0.5", optional = true }
 leptos_meta.workspace = true
 leptos_router.workspace = true
 leptos_query.workspace = true
diff --git a/crates/leptos_extra/src/query.rs b/crates/leptos_extra/src/query.rs
index e42bc870..f03594ca 100644
--- a/crates/leptos_extra/src/query.rs
+++ b/crates/leptos_extra/src/query.rs
@@ -29,14 +29,13 @@ pub fn query_options<V>() -> QueryOptions<V> {
 /// * `fetcher`: The server fn to call
 #[instrument(
     name = "use_server_query",
-    skip(cx, k, fetcher),
+    skip(k, fetcher),
     fields(
         fetcher = std::any::type_name::<F>(),
         render_mode=LEPTOS_MODE
     )
 )]
 pub fn use_server_query<K, V, F, Fu>(
-    cx: Scope,
     k: impl Fn() -> K + 'static,
     fetcher: F,
 ) -> QueryResult<ServerFnResult<V>, impl RefetchFn>
@@ -49,7 +48,6 @@ where
     let span = tracing::Span::current();
     tracing::debug!("use_query");
     leptos_query::use_query(
-        cx,
         k,
         move |k| {
             let _enter = span.enter();
@@ -77,7 +75,6 @@ const LEPTOS_MODE: &str = {
 /// * `query`: The value to pass to [invalidate_query]
 #[component]
 pub fn RefetchQueryButton<K, V, R, F>(
-    cx: Scope,
     result: QueryResult<ServerFnResult<V>, R>,
     query: F,
 ) -> impl IntoView
@@ -87,14 +84,14 @@ where
     R: RefetchFn,
     F: Fn() -> K + 'static,
 {
-    view! { cx,
+    view! {
         <button
             class="p-1 text-white shadow border-1 bg-primary-700 disabled:bg-base-400 disabled:text-black"
             disabled=move || result.is_fetching.get()
             on:click=move |_| {
                 let k = query();
                 tracing::debug!("Invalidating query");
-                use_query_client(cx).invalidate_query::<K, ServerFnResult<V>>(k);
+                use_query_client().invalidate_query::<K, ServerFnResult<V>>(k);
             }
         >
 
diff --git a/crates/leptos_extra/src/signal.rs b/crates/leptos_extra/src/signal.rs
index 7de0a717..bafd6993 100644
--- a/crates/leptos_extra/src/signal.rs
+++ b/crates/leptos_extra/src/signal.rs
@@ -3,9 +3,9 @@ use leptos::*;
 use tracing::instrument;
 
 /// [provide_context] a new signal of type `T` in the current scope
-pub fn provide_signal<T: 'static>(cx: Scope, default: T) {
-    let sig = create_rw_signal(cx, default);
-    provide_context(cx, sig);
+pub fn provide_signal<T: 'static>(default: T) {
+    let sig = create_rw_signal(default);
+    provide_context(sig);
 }
 
 /// [use_context] the signal of type `T` in the current scope
@@ -13,8 +13,8 @@ pub fn provide_signal<T: 'static>(cx: Scope, default: T) {
 /// If the signal was not provided in a top-level scope (via [provide_signal])
 /// this method will panic after tracing an error.
 #[instrument(name = "use_signal")]
-pub fn use_signal<T>(cx: Scope) -> RwSignal<T> {
-    use_context(cx)
+pub fn use_signal<T>() -> RwSignal<T> {
+    use_context()
         .ok_or_else(|| {
             // This happens if the dev forgets to call `provide_signal::<T>` in
             // the parent scope
@@ -30,7 +30,7 @@ pub fn use_signal<T>(cx: Scope) -> RwSignal<T> {
 
 /// Extends [SignalWith] to add a `with_result` method that operates on the
 /// inner value, avoiding the need to clone it.
-pub trait SignalWithResult<T, E>: SignalWith<Option<Result<T, E>>> {
+pub trait SignalWithResult<T, E>: SignalWith<Value = Option<Result<T, E>>> {
     /// Like [SignalWith::with] but operates on the inner [Result] value without cloning it.
     fn with_result<U>(&self, f: impl Fn(&T) -> U + 'static) -> Option<Result<U, E>>
     where
diff --git a/src/app/flake.rs b/src/app/flake.rs
index 290bc684..670e68d5 100644
--- a/src/app/flake.rs
+++ b/src/app/flake.rs
@@ -1,5 +1,8 @@
 //! UI for /flake segment of the app
 
+// https://github.com/leptos-rs/leptos/issues/1825
+#![allow(clippy::needless_lifetimes)]
+
 use std::collections::BTreeMap;
 
 use leptos::*;
@@ -23,13 +26,13 @@ use crate::widget::*;
 
 /// Nix flake dashboard
 #[component]
-pub fn NixFlakeRoute(cx: Scope) -> impl IntoView {
+pub fn NixFlakeRoute() -> impl IntoView {
     let suggestions = FlakeUrl::suggestions();
-    let url = use_signal::<FlakeUrl>(cx);
-    let refresh = use_signal::<Refresh>(cx);
+    let url = use_signal::<FlakeUrl>();
+    let refresh = use_signal::<Refresh>();
     let query = move || (url(), refresh());
-    let result = query::use_server_query(cx, query, get_flake);
-    view! { cx,
+    let result = query::use_server_query(query, get_flake);
+    view! {
         <Title text="Nix Flake"/>
         <h1 class="text-5xl font-bold">{"Nix Flake"}</h1>
         <TextInput id="nix-flake-input" label="Load a Nix Flake" val=url suggestions/>
@@ -39,18 +42,18 @@ pub fn NixFlakeRoute(cx: Scope) -> impl IntoView {
 }
 
 #[component]
-pub fn NixFlakeHomeRoute(cx: Scope) -> impl IntoView {
-    let url = use_signal::<FlakeUrl>(cx);
-    let refresh = use_signal::<Refresh>(cx);
+pub fn NixFlakeHomeRoute() -> impl IntoView {
+    let url = use_signal::<FlakeUrl>();
+    let refresh = use_signal::<Refresh>();
     let query = move || (url(), refresh());
-    let result = query::use_server_query(cx, query, get_flake);
+    let result = query::use_server_query(query, get_flake);
     let data = result.data;
-    view! { cx,
+    view! {
         <div class="p-2 my-1">
             <SuspenseWithErrorHandling>
                 {move || {
                     data.with_result(move |flake| {
-                        view! { cx, <FlakeView flake/> }
+                        view! { <FlakeView flake/> }
                     })
                 }}
 
@@ -60,13 +63,13 @@ pub fn NixFlakeHomeRoute(cx: Scope) -> impl IntoView {
 }
 
 #[component]
-pub fn NixFlakeRawRoute(cx: Scope) -> impl IntoView {
-    let url = use_signal::<FlakeUrl>(cx);
-    let refresh = use_signal::<Refresh>(cx);
+pub fn NixFlakeRawRoute() -> impl IntoView {
+    let url = use_signal::<FlakeUrl>();
+    let refresh = use_signal::<Refresh>();
     let query = move || (url(), refresh());
-    let result = query::use_server_query(cx, query, get_flake);
+    let result = query::use_server_query(query, get_flake);
     let data = result.data;
-    view! { cx,
+    view! {
         <div>
             <A href="/flake">"< Back"</A>
         </div>
@@ -74,7 +77,7 @@ pub fn NixFlakeRawRoute(cx: Scope) -> impl IntoView {
             <SuspenseWithErrorHandling>
                 {move || {
                     data.with_result(move |r| {
-                        view! { cx, <FlakeOutputsRawView outs=&r.output/> }
+                        view! { <FlakeOutputsRawView outs=&r.output/> }
                     })
                 }}
 
@@ -84,8 +87,8 @@ pub fn NixFlakeRawRoute(cx: Scope) -> impl IntoView {
 }
 
 #[component]
-fn FlakeView<'a>(cx: Scope, flake: &'a Flake) -> impl IntoView {
-    view! { cx,
+fn FlakeView<'a>(flake: &'a Flake) -> impl IntoView {
+    view! {
         <div class="flex flex-col my-4">
             <h3 class="text-lg font-bold">{flake.url.to_string()}</h3>
             <div class="text-sm italic text-gray-600">
@@ -101,8 +104,8 @@ fn FlakeView<'a>(cx: Scope, flake: &'a Flake) -> impl IntoView {
 }
 
 #[component]
-fn SectionHeading(cx: Scope, title: &'static str) -> impl IntoView {
-    view! { cx,
+fn SectionHeading(title: &'static str) -> impl IntoView {
+    view! {
         <h3 class="p-2 mt-4 mb-2 font-bold bg-gray-300 border-b-2 border-l-2 border-black text-l">
             {title}
         </h3>
@@ -110,9 +113,9 @@ fn SectionHeading(cx: Scope, title: &'static str) -> impl IntoView {
 }
 
 #[component]
-fn FlakeSchemaView<'a>(cx: Scope, schema: &'a FlakeSchema) -> impl IntoView {
+fn FlakeSchemaView<'a>(schema: &'a FlakeSchema) -> impl IntoView {
     let system = &schema.system.clone();
-    view! { cx,
+    view! {
         <div>
             <h2 class="my-2 ">
                 <div class="text-xl font-bold text-primary-600">{system.human_readable()}</div>
@@ -133,7 +136,7 @@ fn FlakeSchemaView<'a>(cx: Scope, schema: &'a FlakeSchema) -> impl IntoView {
                     .map(|v| {
                         let default = "formatter".to_string();
                         let k = v.name.as_ref().unwrap_or(&default);
-                        view! { cx, <FlakeValView k v/> }
+                        view! { <FlakeValView k v/> }
                     })}
 
                 <SectionHeading title="Other"/>
@@ -141,8 +144,10 @@ fn FlakeSchemaView<'a>(cx: Scope, schema: &'a FlakeSchema) -> impl IntoView {
                     .other
                     .as_ref()
                     .map(|v| {
-                        // TODO: Use a non-recursive rendering component?
-                        view! { cx, <FlakeOutputsRawView outs=&FlakeOutputs::Attrset(v.clone())/> }
+                        view! {
+                            // TODO: Use a non-recursive rendering component?
+                            <FlakeOutputsRawView outs=&FlakeOutputs::Attrset(v.clone())/>
+                        }
                     })}
 
             </div>
@@ -151,13 +156,9 @@ fn FlakeSchemaView<'a>(cx: Scope, schema: &'a FlakeSchema) -> impl IntoView {
 }
 
 #[component]
-fn BTreeMapView<'a>(
-    cx: Scope,
-    title: &'static str,
-    tree: &'a BTreeMap<String, Val>,
-) -> impl IntoView {
+fn BTreeMapView<'a>(title: &'static str, tree: &'a BTreeMap<String, Val>) -> impl IntoView {
     (!tree.is_empty()).then(move || {
-        view! { cx,
+        view! {
             <SectionHeading title/>
             <BTreeMapBodyView tree/>
         }
@@ -165,17 +166,17 @@ fn BTreeMapView<'a>(
 }
 
 #[component]
-fn BTreeMapBodyView<'a>(cx: Scope, tree: &'a BTreeMap<String, Val>) -> impl IntoView {
-    view! { cx,
+fn BTreeMapBodyView<'a>(tree: &'a BTreeMap<String, Val>) -> impl IntoView {
+    view! {
         <div class="flex flex-wrap justify-start">
-            {tree.iter().map(|(k, v)| view! { cx, <FlakeValView k v/> }).collect_view(cx)}
+            {tree.iter().map(|(k, v)| view! { <FlakeValView k v/> }).collect_view()}
         </div>
     }
 }
 
 #[component]
-fn FlakeValView<'a>(cx: Scope, k: &'a String, v: &'a Val) -> impl IntoView {
-    view! { cx,
+fn FlakeValView<'a>(k: &'a String, v: &'a Val) -> impl IntoView {
+    view! {
         <div
             title=format!("{:?}", v.type_)
             class="flex flex-col p-2 my-2 mr-2 space-y-2 bg-white border-4 border-gray-300 rounded hover:border-gray-400"
@@ -188,14 +189,14 @@ fn FlakeValView<'a>(cx: Scope, k: &'a String, v: &'a Val) -> impl IntoView {
                 .name
                 .as_ref()
                 .map(|v| {
-                    view! { cx, <div class="font-mono text-xs text-gray-500">{v}</div> }
+                    view! { <div class="font-mono text-xs text-gray-500">{v}</div> }
                 })}
 
             {v
                 .description
                 .as_ref()
                 .map(|v| {
-                    view! { cx, <div class="font-light">{v}</div> }
+                    view! { <div class="font-light">{v}</div> }
                 })}
 
         </div>
@@ -207,9 +208,9 @@ fn FlakeValView<'a>(cx: Scope, k: &'a String, v: &'a Val) -> impl IntoView {
 ///
 /// WARNING: This may cause performance problems if the tree is large.
 #[component]
-fn FlakeOutputsRawView<'a>(cx: Scope, outs: &'a FlakeOutputs) -> impl IntoView {
-    fn view_val<'b>(cx: Scope, val: &'b Val) -> View {
-        view! { cx,
+fn FlakeOutputsRawView<'a>(outs: &'a FlakeOutputs) -> impl IntoView {
+    fn view_val(val: &Val) -> View {
+        view! {
             <span>
                 <b>{val.name.clone()}</b>
                 " ("
@@ -218,12 +219,12 @@ fn FlakeOutputsRawView<'a>(cx: Scope, outs: &'a FlakeOutputs) -> impl IntoView {
                 <em>{val.description.clone()}</em>
             </span>
         }
-        .into_view(cx)
+        .into_view()
     }
 
     #[component]
-    fn TypeView<'b>(cx: Scope, type_: &'b Type) -> impl IntoView {
-        view! { cx,
+    fn TypeView<'b>(type_: &'b Type) -> impl IntoView {
+        view! {
             <span>
                 {match type_ {
                     Type::NixosModule => "nixosModule ❄️",
@@ -237,23 +238,23 @@ fn FlakeOutputsRawView<'a>(cx: Scope, outs: &'a FlakeOutputs) -> impl IntoView {
         }
     }
     match outs {
-        FlakeOutputs::Val(v) => view_val(cx, v),
-        FlakeOutputs::Attrset(v) => view! { cx,
+        FlakeOutputs::Val(v) => view_val(v),
+        FlakeOutputs::Attrset(v) => view! {
             <ul class="list-disc">
                 {v
                     .iter()
                     .map(|(k, v)| {
-                        view! { cx,
+                        view! {
                             <li class="ml-4">
                                 <span class="px-2 py-1 font-bold text-primary-500">{k}</span>
                                 <FlakeOutputsRawView outs=v/>
                             </li>
                         }
                     })
-                    .collect_view(cx)}
+                    .collect_view()}
             </ul>
         }
-        .into_view(cx),
+        .into_view(),
     }
 }
 
diff --git a/src/app/health.rs b/src/app/health.rs
index 4748ede4..9fc29855 100644
--- a/src/app/health.rs
+++ b/src/app/health.rs
@@ -10,11 +10,11 @@ use crate::widget::*;
 
 /// Nix health checks
 #[component]
-pub fn NixHealthRoute(cx: Scope) -> impl IntoView {
+pub fn NixHealthRoute() -> impl IntoView {
     let title = "Nix Health";
-    let result = query::use_server_query(cx, || (), get_nix_health);
+    let result = query::use_server_query(|| (), get_nix_health);
     let data = result.data;
-    view! { cx,
+    view! {
         <Title text=title/>
         <h1 class="text-5xl font-bold">{title}</h1>
         <RefetchQueryButton result query=|| ()/>
@@ -24,8 +24,8 @@ pub fn NixHealthRoute(cx: Scope) -> impl IntoView {
                     <For
                         each=move || data.get().unwrap_or(Ok(vec![])).unwrap_or(vec![])
                         key=|check| check.title.clone()
-                        view=move |cx, check| {
-                            view! { cx, <ViewCheck check/> }
+                        children=move |check| {
+                            view! { <ViewCheck check/> }
                         }
                     />
 
@@ -37,8 +37,8 @@ pub fn NixHealthRoute(cx: Scope) -> impl IntoView {
 }
 
 #[component]
-fn ViewCheck(cx: Scope, check: Check) -> impl IntoView {
-    view! { cx,
+fn ViewCheck(check: Check) -> impl IntoView {
+    view! {
         <div class="contents">
             <details
                 open=check.result != CheckResult::Green
@@ -55,9 +55,9 @@ fn ViewCheck(cx: Scope, check: Check) -> impl IntoView {
                     </div>
                     <div class="flex flex-col justify-start space-y-4">
                         {match check.result {
-                            CheckResult::Green => view! { cx, "" }.into_view(cx),
+                            CheckResult::Green => view! { "" }.into_view(),
                             CheckResult::Red { msg, suggestion } => {
-                                view! { cx,
+                                view! {
                                     <h3 class="my-2 font-bold text-l"></h3>
                                     <div class="p-2 bg-red-400 rounded bg-border">{msg}</div>
                                     <h3 class="my-2 font-bold text-l"></h3>
@@ -65,7 +65,7 @@ fn ViewCheck(cx: Scope, check: Check) -> impl IntoView {
                                         {suggestion}
                                     </div>
                                 }
-                                    .into_view(cx)
+                                    .into_view()
                             }
                         }}
 
@@ -77,11 +77,11 @@ fn ViewCheck(cx: Scope, check: Check) -> impl IntoView {
 }
 
 #[component]
-pub fn CheckResultSummaryView(cx: Scope, green: bool) -> impl IntoView {
+pub fn CheckResultSummaryView(green: bool) -> impl IntoView {
     if green {
-        view! { cx, <span class="text-green-500">{"✓"}</span> }
+        view! { <span class="text-green-500">{"✓"}</span> }
     } else {
-        view! { cx, <span class="text-red-500">{"✗"}</span> }
+        view! { <span class="text-red-500">{"✗"}</span> }
     }
 }
 
diff --git a/src/app/info.rs b/src/app/info.rs
index 9b4cbd44..0370975f 100644
--- a/src/app/info.rs
+++ b/src/app/info.rs
@@ -1,5 +1,8 @@
 //! Nix info UI
 
+// https://github.com/leptos-rs/leptos/issues/1825
+#![allow(clippy::needless_lifetimes)]
+
 use std::fmt::Display;
 
 use leptos::*;
@@ -16,11 +19,11 @@ use crate::widget::*;
 
 /// Nix information
 #[component]
-pub fn NixInfoRoute(cx: Scope) -> impl IntoView {
+pub fn NixInfoRoute() -> impl IntoView {
     let title = "Nix Info";
-    let result = query::use_server_query(cx, || (), get_nix_info);
+    let result = query::use_server_query(|| (), get_nix_info);
     let data = result.data;
-    view! { cx,
+    view! {
         <Title text=title/>
         <h1 class="text-5xl font-bold">{title}</h1>
         <RefetchQueryButton result query=|| ()/>
@@ -28,7 +31,7 @@ pub fn NixInfoRoute(cx: Scope) -> impl IntoView {
             <SuspenseWithErrorHandling>
                 {move || {
                     data.with_result(move |info| {
-                        view! { cx, <NixInfoView info/> }
+                        view! { <NixInfoView info/> }
                     })
                 }}
 
@@ -38,8 +41,8 @@ pub fn NixInfoRoute(cx: Scope) -> impl IntoView {
 }
 
 #[component]
-fn NixInfoView<'a>(cx: Scope, info: &'a NixInfo) -> impl IntoView {
-    view! { cx,
+fn NixInfoView<'a>(info: &'a NixInfo) -> impl IntoView {
+    view! {
         <div class="flex flex-col p-4 space-y-8 bg-white border-2 rounded border-base-400">
             <div>
                 <b>
@@ -60,8 +63,8 @@ fn NixInfoView<'a>(cx: Scope, info: &'a NixInfo) -> impl IntoView {
 }
 
 #[component]
-fn NixVersionView<'a>(cx: Scope, version: &'a NixVersion) -> impl IntoView {
-    view! { cx,
+fn NixVersionView<'a>(version: &'a NixVersion) -> impl IntoView {
+    view! {
         <a href=nix_rs::refs::RELEASE_HISTORY class="font-mono hover:underline" target="_blank">
             {format!("{}", version)}
         </a>
@@ -69,21 +72,19 @@ fn NixVersionView<'a>(cx: Scope, version: &'a NixVersion) -> impl IntoView {
 }
 
 #[component]
-fn NixConfigView(cx: Scope, config: NixConfig) -> impl IntoView {
+fn NixConfigView(config: NixConfig) -> impl IntoView {
     #[component]
-    fn ConfigRow(cx: Scope, key: &'static str, title: String, children: Children) -> impl IntoView {
-        view! { cx,
-            // TODO: Use a nice Tailwind tooltip here, instead of "title"
-            // attribute.
+    fn ConfigRow(key: &'static str, title: String, children: Children) -> impl IntoView {
+        view! {
             <tr title=title>
                 <td class="px-4 py-2 font-semibold text-base-700">{key}</td>
                 <td class="px-4 py-2 text-left">
-                    <code>{children(cx)}</code>
+                    <code>{children()}</code>
                 </td>
             </tr>
         }
     }
-    view! { cx,
+    view! {
         <div class="py-1 my-1 rounded bg-primary-50">
             <table class="text-right">
                 // FIXME: so many clones
@@ -104,25 +105,24 @@ fn NixConfigView(cx: Scope, config: NixConfig) -> impl IntoView {
             </table>
         </div>
     }
-    .into_view(cx)
+    .into_view()
 }
 
 #[component]
-pub fn ConfigValListView<T>(cx: Scope, cfg: ConfigVal<Vec<T>>) -> impl IntoView
+pub fn ConfigValListView<T>(cfg: ConfigVal<Vec<T>>) -> impl IntoView
 where
     T: Display,
 {
-    view! { cx,
-        // Render a list of T items in the list 'self'
+    view! {
         <div class="flex flex-col space-y-4">
             {cfg
                 .value
                 .into_iter()
-                .map(|item| view! { cx, <li class="list-disc">{item.to_string()}</li> })
-                .collect_view(cx)}
+                .map(|item| view! { <li class="list-disc">{item.to_string()}</li> })
+                .collect_view()}
         </div>
     }
-    .into_view(cx)
+    .into_view()
 }
 
 /// Determine [NixInfo] on the user's system
diff --git a/src/app/mod.rs b/src/app/mod.rs
index 1cd44fc2..92854413 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -21,23 +21,22 @@ use crate::{app::flake::*, app::health::*, app::info::*, widget::*};
 
 /// Main frontend application container
 #[component]
-pub fn App(cx: Scope) -> impl IntoView {
-    provide_meta_context(cx);
-    provide_query_client(cx);
+pub fn App() -> impl IntoView {
+    provide_meta_context();
+    provide_query_client();
     provide_signal::<FlakeUrl>(
-        cx,
         FlakeUrl::suggestions()
             .first()
             .map(Clone::clone)
             .unwrap_or_default(),
     );
-    provide_signal::<Refresh>(cx, false.into()); // refresh flag is unused, but we may add it to UI later.
+    provide_signal::<Refresh>(false.into()); // refresh flag is unused, but we may add it to UI later.
 
-    view! { cx,
+    view! {
         <Stylesheet id="leptos" href="/pkg/nix-browser.css"/>
         <Title formatter=|s| format!("{s} ― nix-browser")/>
-        <Router fallback=|cx| {
-            view! { cx, <NotFound/> }
+        <Router fallback=|| {
+            view! { <NotFound/> }
         }>
             <Body class="overflow-y-scroll"/>
             <div class="flex justify-center w-full min-h-screen bg-center bg-cover bg-base-200">
@@ -65,9 +64,9 @@ pub fn App(cx: Scope) -> impl IntoView {
 ///
 /// TODO Switch to breadcrumbs, as it simplifes the design overall.
 #[component]
-fn Nav(cx: Scope) -> impl IntoView {
+fn Nav() -> impl IntoView {
     let class = "px-3 py-2";
-    view! { cx,
+    view! {
         <nav class="flex flex-row w-full mb-8 text-white md:rounded-b bg-primary-800">
             <A exact=true href="/" class=class>
                 "Dashboard"
@@ -91,26 +90,26 @@ fn Nav(cx: Scope) -> impl IntoView {
 
 /// Home page
 #[component]
-fn Dashboard(cx: Scope) -> impl IntoView {
+fn Dashboard() -> impl IntoView {
     tracing::debug!("Rendering Dashboard page");
-    let result = query::use_server_query(cx, || (), get_nix_health);
+    let result = query::use_server_query(|| (), get_nix_health);
     let data = result.data;
-    let healthy = Signal::derive(cx, move || {
+    let healthy = Signal::derive(move || {
         data.with_result(|checks| checks.iter().all(|check| check.result.green()))
     });
     // A Card component
     #[component]
-    fn Card(cx: Scope, href: &'static str, children: Children) -> impl IntoView {
-        view! { cx,
+    fn Card(href: &'static str, children: Children) -> impl IntoView {
+        view! {
             <A
                 href=href
                 class="flex items-center justify-center w-48 h-48 p-2 m-2 border-2 rounded-lg shadow border-base-400 active:shadow-none bg-base-100 hover:bg-primary-200"
             >
-                <span class="text-3xl text-base-800">{children(cx)}</span>
+                <span class="text-3xl text-base-800">{children()}</span>
             </A>
         }
     }
-    view! { cx,
+    view! {
         <Title text="Dashboard"/>
         <h1 class="text-5xl font-bold">"Dashboard"</h1>
         <div id="cards" class="flex flex-row flex-wrap">
@@ -120,7 +119,7 @@ fn Dashboard(cx: Scope) -> impl IntoView {
                     {move || {
                         healthy
                             .with_result(move |green| {
-                                view! { cx, <CheckResultSummaryView green=*green/> }
+                                view! { <CheckResultSummaryView green=*green/> }
                             })
                     }}
 
@@ -134,8 +133,8 @@ fn Dashboard(cx: Scope) -> impl IntoView {
 
 /// About page
 #[component]
-fn About(cx: Scope) -> impl IntoView {
-    view! { cx,
+fn About() -> impl IntoView {
+    view! {
         <Title text="About"/>
         <h1 class="text-5xl font-bold">"About"</h1>
         <p>
diff --git a/src/lib.rs b/src/lib.rs
index 03b330d6..49e33613 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -19,9 +19,9 @@ pub fn hydrate() {
     use crate::app::*;
     use leptos::*;
 
-    logging::setup_client_logging();
+    crate::logging::setup_client_logging();
     tracing::info!("Hydrating app");
-    leptos::mount_to_body(move |cx| {
-        view! { cx, <App/> }
+    leptos::mount_to_body(move || {
+        view! { <App/> }
     });
 }
diff --git a/src/server.rs b/src/server.rs
index fbf25552..54f1b546 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -34,7 +34,7 @@ async fn create_server(
 ) -> axum::Server<AddrIncoming, IntoMakeService<axum::Router>> {
     tracing::debug!("Firing up Leptos app with config: {:?}", leptos_options);
     leptos_query::suppress_query_load(true); // https://github.com/nicoburniske/leptos_query/issues/6
-    let routes = generate_route_list(|cx| view! { cx, <App/> }).await;
+    let routes = generate_route_list(|| view! { <App/> });
     leptos_query::suppress_query_load(false);
     let client_dist = ServeDir::new(leptos_options.site_root.clone());
     let leptos_options_clone = leptos_options.clone(); // A copy to move to the closure below.
@@ -44,7 +44,7 @@ async fn create_server(
         // server functions API routes
         .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
         // application routes
-        .leptos_routes(&leptos_options, routes, |cx| view! { cx, <App/> })
+        .leptos_routes(&leptos_options, routes, || view! { <App/> })
         // static files are served as fallback (but *before* falling back to
         // error handler)
         .fallback_service(client_dist.clone().not_found_service(not_found_service))
@@ -73,8 +73,7 @@ async fn not_found_handler(
     options: LeptosOptions,
     req: Request<Body>,
 ) -> Result<AxumResponse, Infallible> {
-    let handler =
-        leptos_axum::render_app_to_stream(options.to_owned(), move |cx| view! { cx, <App/> });
+    let handler = leptos_axum::render_app_to_stream(options.to_owned(), move || view! { <App/> });
     Ok(handler(req).await.into_response())
 }
 
diff --git a/src/widget.rs b/src/widget.rs
index 852a57df..4a8b5780 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -12,8 +12,8 @@ use leptos_router::*;
 
 // A loading spinner
 #[component]
-pub fn Spinner(cx: Scope) -> impl IntoView {
-    view! { cx,
+pub fn Spinner() -> impl IntoView {
+    view! {
         <div
             class="animate-spin inline-block w-6 h-6 border-[3px] border-current border-t-transparent text-blue-600 rounded-full"
             role="status"
@@ -26,8 +26,8 @@ pub fn Spinner(cx: Scope) -> impl IntoView {
 
 /// A `<a>` link
 #[component]
-pub fn Link(cx: Scope, link: &'static str, text: &'static str) -> impl IntoView {
-    view! { cx,
+pub fn Link(link: &'static str, text: &'static str) -> impl IntoView {
+    view! {
         <A href=link class="text-primary-100 hover:no-underline">
             {text}
         </A>
@@ -36,8 +36,8 @@ pub fn Link(cx: Scope, link: &'static str, text: &'static str) -> impl IntoView
 
 /// A `<a>` link that links to an external site
 #[component]
-pub fn LinkExternal(cx: Scope, link: &'static str, text: &'static str) -> impl IntoView {
-    view! { cx,
+pub fn LinkExternal(link: &'static str, text: &'static str) -> impl IntoView {
+    view! {
         <a
             href=link
             class="underline text-primary-500 hover:no-underline"
@@ -51,14 +51,13 @@ pub fn LinkExternal(cx: Scope, link: &'static str, text: &'static str) -> impl I
 
 /// 404 page
 #[component]
-pub fn NotFound(cx: Scope) -> impl IntoView {
+pub fn NotFound() -> impl IntoView {
     cfg_if! { if #[cfg(feature="ssr")] {
-        if let Some(response) = use_context::<ResponseOptions>(cx) {
+        if let Some(response) = use_context::<ResponseOptions>() {
             response.set_status(StatusCode::NOT_FOUND);
         }
     }}
-    view! { cx,
-        // The HTML for 404 not found
+    view! {
         <div class="grid w-full min-h-screen bg-center bg-cover bg-base-100 place-items-center">
             <div class="z-0 flex items-center justify-center col-start-1 row-start-1 text-center">
                 <div class="flex flex-col space-y-3">
@@ -76,9 +75,9 @@ pub fn NotFound(cx: Scope) -> impl IntoView {
 
 /// Display errors to the user
 #[component]
-pub fn Errors(cx: Scope, errors: Errors) -> impl IntoView {
+pub fn Errors(errors: Errors) -> impl IntoView {
     tracing::error!("Errors: {:?}", errors);
-    view! { cx,
+    view! {
         <div class="flex flex-col justify-center overflow-auto">
             <header class="p-2 text-xl font-bold text-white bg-error-500">"💣 ERROR 💣"</header>
             <div class="p-2 font-mono text-sm text-left whitespace-pre-wrap bg-black">
@@ -86,7 +85,7 @@ pub fn Errors(cx: Scope, errors: Errors) -> impl IntoView {
                     {errors
                         .into_iter()
                         .map(|(k, e)| {
-                            view! { cx,
+                            view! {
                                 <li class="mb-4">
                                     <header class="px-2 mb-2 font-bold text-gray-100">
                                         {format!("{:?}", k)}
@@ -97,7 +96,7 @@ pub fn Errors(cx: Scope, errors: Errors) -> impl IntoView {
                                 </li>
                             }
                         })
-                        .collect_view(cx)}
+                        .collect_view()}
                 </ul>
             </div>
         </div>
@@ -106,13 +105,13 @@ pub fn Errors(cx: Scope, errors: Errors) -> impl IntoView {
 
 /// Like [Suspense] but also handles errors using [ErrorBoundary]
 #[component(transparent)]
-pub fn SuspenseWithErrorHandling(cx: Scope, children: ChildrenFn) -> impl IntoView {
-    let children = store_value(cx, children);
-    view! { cx,
-        <Suspense fallback=move || view! { cx, <Spinner/> }>
-            <ErrorBoundary fallback=|cx, errors| {
-                view! { cx, <Errors errors=errors.get()/> }
-            }>{children.with_value(|c| c(cx))}</ErrorBoundary>
+pub fn SuspenseWithErrorHandling(children: ChildrenFn) -> impl IntoView {
+    let children = store_value(children);
+    view! {
+        <Suspense fallback=move || view! { <Spinner/> }>
+            <ErrorBoundary fallback=|errors| {
+                view! { <Errors errors=errors.get()/> }
+            }>{children.with_value(|c| c())}</ErrorBoundary>
         </Suspense>
     }
 }
@@ -129,7 +128,6 @@ pub fn SuspenseWithErrorHandling(cx: Scope, children: ChildrenFn) -> impl IntoVi
 /// * `val`: The [RwSignal] mirror'ing the input element value
 #[component]
 pub fn TextInput<K>(
-    cx: Scope,
     id: &'static str,
     label: &'static str,
     /// Initial suggestions to show in the datalist
@@ -143,8 +141,8 @@ where
     let datalist_id = &format!("{}-datalist", id);
     // Input query to the server fn
     // Errors in input element (based on [FromStr::from_str])
-    let (input_err, set_input_err) = create_signal(cx, None::<String>);
-    view! { cx,
+    let (input_err, set_input_err) = create_signal(None::<String>);
+    view! {
         <label for=id>{label}</label>
         <input
             list=datalist_id
@@ -168,8 +166,8 @@ where
         <datalist id=datalist_id>
             {suggestions
                 .iter()
-                .map(|s| view! { cx, <option value=s.to_string()></option> })
-                .collect_view(cx)}
+                .map(|s| view! { <option value=s.to_string()></option> })
+                .collect_view()}
 
         </datalist>
     }