diff --git a/Cargo.lock b/Cargo.lock
index 24b69c4..f1dbc50 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,7 +29,18 @@ dependencies = [
 [[package]]
 name = "any_spawner"
 version = "0.1.1"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9747eb01aed7603aba23f7c869d5d7e5d37aab9c3501aced42d8fdb786f1f6e3"
+dependencies = [
+ "futures",
+ "thiserror",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "any_spawner"
+version = "0.1.1"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
  "futures",
  "thiserror",
@@ -56,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.81"
+version = "0.1.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -210,9 +221,9 @@ checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b"
 dependencies = [
  "shlex",
 ]
@@ -296,7 +307,13 @@ dependencies = [
 [[package]]
 name = "const_str_slice_concat"
 version = "0.1.0"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f67855af358fcb20fac58f9d714c94e2b228fe5694c1c9b4ead4a366343eda1b"
+
+[[package]]
+name = "const_str_slice_concat"
+version = "0.1.0"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 
 [[package]]
 name = "convert_case"
@@ -313,6 +330,41 @@ version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
+[[package]]
+name = "darling"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "dashmap"
 version = "6.0.1"
@@ -327,6 +379,18 @@ dependencies = [
  "parking_lot_core",
 ]
 
+[[package]]
+name = "default-struct-builder"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8fa90da96b8fd491f5754d1f7a731f73921e3b7aa0ce333c821a0e43666ac14"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "derive-where"
 version = "1.2.7"
@@ -353,7 +417,16 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 [[package]]
 name = "either_of"
 version = "0.1.0"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6e22feb4d5cacf9f2c64902a1c35ef0f2d766e42db316a98b93992bbce669cb"
+dependencies = [
+ "pin-project-lite",
+]
+
+[[package]]
+name = "either_of"
+version = "0.1.0"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
  "pin-project-lite",
 ]
@@ -631,15 +704,29 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 [[package]]
 name = "hydration_context"
 version = "0.2.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fd272e5549af207e00abfcbb622a7991f0a15ee12b86a7c3cfef41758a83f43"
+dependencies = [
+ "futures",
+ "once_cell",
+ "or_poisoned 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-lite",
+ "serde",
+ "throw_error 0.2.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "hydration_context"
+version = "0.2.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
  "futures",
  "js-sys",
  "once_cell",
- "or_poisoned",
+ "or_poisoned 0.1.0 (git+https://github.com/leptos-rs/leptos)",
  "pin-project-lite",
  "serde",
- "throw_error",
+ "throw_error 0.2.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "wasm-bindgen",
 ]
 
@@ -677,6 +764,12 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -742,61 +835,114 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 [[package]]
 name = "leptos"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4eb1451927cce0a17cc3af6fdad18911eae7c827bb90a5117fa463b5b109ce4"
+dependencies = [
+ "any_spawner 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "either_of 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures",
+ "hydration_context 0.2.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "leptos_config 0.7.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "leptos_dom 0.7.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "leptos_hot_reload 0.7.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "leptos_macro 0.7.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "leptos_server 0.7.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "oco_ref 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "or_poisoned 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paste",
+ "reactive_graph 0.1.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hash",
+ "send_wrapper",
+ "serde",
+ "serde_qs",
+ "server_fn 0.7.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slotmap",
+ "tachys 0.1.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thiserror",
+ "throw_error 0.2.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typed-builder",
+ "typed-builder-macro",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "leptos"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
- "any_spawner",
+ "any_spawner 0.1.1 (git+https://github.com/leptos-rs/leptos)",
  "base64",
  "cfg-if",
- "either_of",
+ "either_of 0.1.0 (git+https://github.com/leptos-rs/leptos)",
  "futures",
- "hydration_context",
- "leptos_config",
- "leptos_dom",
- "leptos_hot_reload",
- "leptos_macro",
- "leptos_server",
- "oco_ref",
- "or_poisoned",
+ "hydration_context 0.2.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "leptos_config 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "leptos_dom 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "leptos_hot_reload 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "leptos_macro 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "leptos_server 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "oco_ref 0.2.0 (git+https://github.com/leptos-rs/leptos)",
+ "or_poisoned 0.1.0 (git+https://github.com/leptos-rs/leptos)",
  "paste",
  "rand",
- "reactive_graph",
+ "reactive_graph 0.1.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "rustc-hash",
  "send_wrapper",
  "serde",
  "serde_json",
  "serde_qs",
- "server_fn",
+ "server_fn 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "slotmap",
- "tachys",
+ "tachys 0.1.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "thiserror",
- "throw_error",
+ "throw_error 0.2.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "typed-builder",
  "typed-builder-macro",
  "wasm-bindgen",
  "web-sys",
 ]
 
+[[package]]
+name = "leptos-use"
+version = "0.14.0-beta1"
+source = "git+https://github.com/Synphonyte/leptos-use.git?branch=leptos-0.7#e710f1752c4cad3fa6af9650e75c0f948c07dda7"
+dependencies = [
+ "cfg-if",
+ "default-struct-builder",
+ "js-sys",
+ "lazy_static",
+ "leptos 0.7.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paste",
+ "send_wrapper",
+ "thiserror",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "leptos_axum"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
- "any_spawner",
+ "any_spawner 0.1.1 (git+https://github.com/leptos-rs/leptos)",
  "axum",
  "dashmap",
  "futures",
  "http",
  "http-body-util",
- "hydration_context",
- "leptos",
+ "hydration_context 0.2.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "leptos 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "leptos_integration_utils",
- "leptos_macro",
+ "leptos_macro 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "leptos_meta",
  "leptos_router",
  "once_cell",
  "parking_lot",
  "serde_json",
- "server_fn",
+ "server_fn 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "tokio",
  "tower",
  "tower-http",
@@ -805,7 +951,8 @@ dependencies = [
 [[package]]
 name = "leptos_config"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db9b3c211cc072b742a728a71e86969034e7ab75ae68205d604df047b9ffb87e"
 dependencies = [
  "config",
  "regex",
@@ -814,16 +961,43 @@ dependencies = [
  "typed-builder",
 ]
 
+[[package]]
+name = "leptos_config"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
+dependencies = [
+ "config",
+ "regex",
+ "serde",
+ "thiserror",
+ "typed-builder",
+]
+
+[[package]]
+name = "leptos_dom"
+version = "0.7.0-beta4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d356526ed1c9be0804b297b0bf5d768490840d4669bd52e63f6b68d5693f7e7"
+dependencies = [
+ "js-sys",
+ "or_poisoned 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reactive_graph 0.1.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "send_wrapper",
+ "tachys 0.1.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "leptos_dom"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
  "js-sys",
- "or_poisoned",
- "reactive_graph",
+ "or_poisoned 0.1.0 (git+https://github.com/leptos-rs/leptos)",
+ "reactive_graph 0.1.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "send_wrapper",
- "tachys",
+ "tachys 0.1.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -831,7 +1005,25 @@ dependencies = [
 [[package]]
 name = "leptos_hot_reload"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121e56d24140488617d3554674708f0c00deaa287ff7ab01609fd590f32fafc8"
+dependencies = [
+ "anyhow",
+ "camino",
+ "indexmap",
+ "parking_lot",
+ "proc-macro2",
+ "quote",
+ "rstml",
+ "serde",
+ "syn",
+ "walkdir",
+]
+
+[[package]]
+name = "leptos_hot_reload"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
  "anyhow",
  "camino",
@@ -848,34 +1040,56 @@ dependencies = [
 [[package]]
 name = "leptos_integration_utils"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
  "futures",
- "hydration_context",
- "leptos",
- "leptos_config",
+ "hydration_context 0.2.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "leptos 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "leptos_config 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "leptos_meta",
  "leptos_router",
- "reactive_graph",
+ "reactive_graph 0.1.0-beta4 (git+https://github.com/leptos-rs/leptos)",
 ]
 
 [[package]]
 name = "leptos_macro"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5dca48e1894486f762bef0e0de24e39f1bf3a1ae84ab49915a9864856b57961"
 dependencies = [
  "attribute-derive",
  "cfg-if",
  "convert_case",
  "html-escape",
  "itertools",
- "leptos_hot_reload",
+ "leptos_hot_reload 0.7.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
  "prettyplease",
  "proc-macro-error",
  "proc-macro2",
  "quote",
  "rstml",
- "server_fn_macro",
+ "server_fn_macro 0.7.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn",
+ "uuid",
+]
+
+[[package]]
+name = "leptos_macro"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
+dependencies = [
+ "attribute-derive",
+ "cfg-if",
+ "convert_case",
+ "html-escape",
+ "itertools",
+ "leptos_hot_reload 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "prettyplease",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "rstml",
+ "server_fn_macro 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "syn",
  "uuid",
 ]
@@ -883,13 +1097,13 @@ dependencies = [
 [[package]]
 name = "leptos_meta"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
  "futures",
  "indexmap",
- "leptos",
+ "leptos 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "once_cell",
- "or_poisoned",
+ "or_poisoned 0.1.0 (git+https://github.com/leptos-rs/leptos)",
  "send_wrapper",
  "wasm-bindgen",
  "web-sys",
@@ -898,23 +1112,23 @@ dependencies = [
 [[package]]
 name = "leptos_router"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
- "any_spawner",
- "either_of",
+ "any_spawner 0.1.1 (git+https://github.com/leptos-rs/leptos)",
+ "either_of 0.1.0 (git+https://github.com/leptos-rs/leptos)",
  "futures",
  "gloo-net",
  "js-sys",
- "leptos",
+ "leptos 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "leptos_router_macro",
  "once_cell",
- "or_poisoned",
+ "or_poisoned 0.1.0 (git+https://github.com/leptos-rs/leptos)",
  "paste",
  "percent-encoding",
- "reactive_graph",
+ "reactive_graph 0.1.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "send_wrapper",
  "serde",
- "tachys",
+ "tachys 0.1.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "thiserror",
  "url",
  "wasm-bindgen",
@@ -924,7 +1138,7 @@ dependencies = [
 [[package]]
 name = "leptos_router_macro"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -934,18 +1148,37 @@ dependencies = [
 [[package]]
 name = "leptos_server"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bae878288fea9931571a1a9cc471161d3c595e990aa41f4f1a9aaa0cf8d0ccdd"
 dependencies = [
- "any_spawner",
+ "any_spawner 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "base64",
  "codee",
  "futures",
- "hydration_context",
- "reactive_graph",
+ "hydration_context 0.2.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reactive_graph 0.1.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde",
  "serde_json",
- "server_fn",
- "tachys",
+ "server_fn 0.7.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tachys 0.1.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "leptos_server"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
+dependencies = [
+ "any_spawner 0.1.1 (git+https://github.com/leptos-rs/leptos)",
+ "base64",
+ "codee",
+ "futures",
+ "hydration_context 0.2.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "reactive_graph 0.1.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "send_wrapper",
+ "serde",
+ "serde_json",
+ "server_fn 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "tachys 0.1.0-beta4 (git+https://github.com/leptos-rs/leptos)",
 ]
 
 [[package]]
@@ -1074,7 +1307,13 @@ dependencies = [
 [[package]]
 name = "next_tuple"
 version = "0.1.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66dadf287063ab08b1247d1be56e9656b272b10423896fb60d49881f69b2b266"
+
+[[package]]
+name = "next_tuple"
+version = "0.1.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 
 [[package]]
 name = "nom"
@@ -1098,7 +1337,17 @@ dependencies = [
 [[package]]
 name = "oco_ref"
 version = "0.2.0"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64b94982fe39a861561cf67ff17a7849f2cedadbbad960a797634032b7abb998"
+dependencies = [
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "oco_ref"
+version = "0.2.0"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
  "serde",
  "thiserror",
@@ -1113,7 +1362,13 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 [[package]]
 name = "or_poisoned"
 version = "0.1.0"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c04f5d74368e4d0dfe06c45c8627c81bd7c317d52762d118fb9b3076f6420fd"
+
+[[package]]
+name = "or_poisoned"
+version = "0.1.0"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 
 [[package]]
 name = "parking"
@@ -1344,14 +1599,35 @@ dependencies = [
 [[package]]
 name = "reactive_graph"
 version = "0.1.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "277ddf442e2675c536ff4088bae41c937ae4a3a821b53ecaa386c5f911252e2f"
+dependencies = [
+ "any_spawner 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "async-lock",
+ "futures",
+ "guardian",
+ "hydration_context 0.2.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "or_poisoned 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-lite",
+ "rustc-hash",
+ "send_wrapper",
+ "serde",
+ "slotmap",
+ "thiserror",
+ "web-sys",
+]
+
+[[package]]
+name = "reactive_graph"
+version = "0.1.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
- "any_spawner",
+ "any_spawner 0.1.1 (git+https://github.com/leptos-rs/leptos)",
  "async-lock",
  "futures",
  "guardian",
- "hydration_context",
- "or_poisoned",
+ "hydration_context 0.2.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "or_poisoned 0.1.0 (git+https://github.com/leptos-rs/leptos)",
  "pin-project-lite",
  "rustc-hash",
  "send_wrapper",
@@ -1484,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "itoa",
  "memchr",
@@ -1539,7 +1815,37 @@ dependencies = [
 [[package]]
 name = "server_fn"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b802f1cfb1965eb17046f23401597766fc149ffd5a904ab43b55cad41899a6f"
+dependencies = [
+ "bytes",
+ "const_format",
+ "dashmap",
+ "futures",
+ "gloo-net",
+ "http",
+ "js-sys",
+ "once_cell",
+ "pin-project-lite",
+ "send_wrapper",
+ "serde",
+ "serde_json",
+ "serde_qs",
+ "server_fn_macro_default 0.7.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thiserror",
+ "throw_error 0.2.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+ "xxhash-rust",
+]
+
+[[package]]
+name = "server_fn"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
  "axum",
  "bytes",
@@ -1558,9 +1864,9 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_qs",
- "server_fn_macro_default",
+ "server_fn_macro_default 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "thiserror",
- "throw_error",
+ "throw_error 0.2.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "tower",
  "tower-layer",
  "url",
@@ -1574,7 +1880,21 @@ dependencies = [
 [[package]]
 name = "server_fn_macro"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c3b2d6ea0d021a2a21ce64142d589f84e4f0b08c44318f7088d9c6e5ad24b08"
+dependencies = [
+ "const_format",
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "xxhash-rust",
+]
+
+[[package]]
+name = "server_fn_macro"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
  "const_format",
  "convert_case",
@@ -1587,9 +1907,19 @@ dependencies = [
 [[package]]
 name = "server_fn_macro_default"
 version = "0.7.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c3cdf66b25e36aab3a9aca2c675c60645ebbb2ab78294f88957d2870cf72020"
+dependencies = [
+ "server_fn_macro 0.7.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn",
+]
+
+[[package]]
+name = "server_fn_macro_default"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
- "server_fn_macro",
+ "server_fn_macro 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "syn",
 ]
 
@@ -1639,6 +1969,12 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "syn"
 version = "2.0.77"
@@ -1677,30 +2013,62 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
 [[package]]
 name = "tachys"
 version = "0.1.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae9c2a49cafbeacdf5991b2ab48236d7711159ede8510c2efb6be8a28665ee7"
+dependencies = [
+ "any_spawner 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "const_str_slice_concat 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "drain_filter_polyfill",
+ "either_of 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures",
+ "html-escape",
+ "indexmap",
+ "itertools",
+ "js-sys",
+ "linear-map",
+ "next_tuple 0.1.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "oco_ref 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "once_cell",
+ "or_poisoned 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot",
+ "paste",
+ "pin-project-lite",
+ "reactive_graph 0.1.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hash",
+ "send_wrapper",
+ "slotmap",
+ "throw_error 0.2.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "tachys"
+version = "0.1.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
- "any_spawner",
- "const_str_slice_concat",
+ "any_spawner 0.1.1 (git+https://github.com/leptos-rs/leptos)",
+ "const_str_slice_concat 0.1.0 (git+https://github.com/leptos-rs/leptos)",
  "drain_filter_polyfill",
- "either_of",
+ "either_of 0.1.0 (git+https://github.com/leptos-rs/leptos)",
  "futures",
  "html-escape",
  "indexmap",
  "itertools",
  "js-sys",
  "linear-map",
- "next_tuple",
- "oco_ref",
+ "next_tuple 0.1.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "oco_ref 0.2.0 (git+https://github.com/leptos-rs/leptos)",
  "once_cell",
- "or_poisoned",
+ "or_poisoned 0.1.0 (git+https://github.com/leptos-rs/leptos)",
  "parking_lot",
  "paste",
  "pin-project-lite",
- "reactive_graph",
+ "reactive_graph 0.1.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "rustc-hash",
  "send_wrapper",
  "slotmap",
- "throw_error",
+ "throw_error 0.2.0-beta4 (git+https://github.com/leptos-rs/leptos)",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -1728,7 +2096,16 @@ dependencies = [
 [[package]]
 name = "throw_error"
 version = "0.2.0-beta4"
-source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#ac3bbd59cfb54c39ae4dc4178a02897d1ab8dd5a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3c1e41506da98dbdac683e12a2c87813d218f0540dab31c94343ef29a4c062"
+dependencies = [
+ "pin-project-lite",
+]
+
+[[package]]
+name = "throw_error"
+version = "0.2.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos#000896b2f7d73d609cb02dcb4da04f96eed231ca"
 dependencies = [
  "pin-project-lite",
 ]
@@ -1777,9 +2154,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2214,7 +2591,8 @@ dependencies = [
  "axum",
  "console_error_panic_hook",
  "http",
- "leptos",
+ "leptos 0.7.0-beta4 (git+https://github.com/leptos-rs/leptos)",
+ "leptos-use",
  "leptos_axum",
  "leptos_meta",
  "leptos_router",
diff --git a/crates/www/Cargo.toml b/crates/www/Cargo.toml
index d90e0c0..976b680 100644
--- a/crates/www/Cargo.toml
+++ b/crates/www/Cargo.toml
@@ -7,34 +7,34 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-# leptos-use = { git = "https://github.com/Synphonyte/leptos-use.git", branch = "leptos-0.7", default-features = false, features = [
-#     "use_scroll",
-#     "use_window",
-#     "use_event_listener",
-# ] }
+leptos-use = { git = "https://github.com/Synphonyte/leptos-use.git", branch = "leptos-0.7", default-features = false, features = [
+    "use_scroll",
+    "use_window",
+    "use_event_listener",
+] }
 # leptos-use = { git = "https://github.com/christopherbiscardi/leptos-use.git", branch = "leptos-beta4", default-features = false, features = [
 #     "use_scroll",
 #     "use_window",
 #     "use_event_listener",
 # ] }
-# leptos_meta = { git = "https://github.com/leptos-rs/leptos" }
-# leptos = { git = "https://github.com/leptos-rs/leptos", features = [
-#     "nightly",
-#     "experimental-islands",
-# ] }
-# leptos_axum = { git = "https://github.com/leptos-rs/leptos", optional = true }
-# leptos_router = { git = "https://github.com/leptos-rs/leptos", features = [
-#     "nightly",
-# ] }
-leptos_meta = { git = "https://github.com/christopherbiscardi/leptos", branch = "0.7-cdn" }
-leptos = { git = "https://github.com/christopherbiscardi/leptos", features = [
+leptos_meta = { git = "https://github.com/leptos-rs/leptos" }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
     "nightly",
     "experimental-islands",
-], branch = "0.7-cdn" }
-leptos_axum = { git = "https://github.com/christopherbiscardi/leptos", branch = "0.7-cdn", optional = true }
-leptos_router = { git = "https://github.com/christopherbiscardi/leptos", branch = "0.7-cdn", features = [
+] }
+leptos_axum = { git = "https://github.com/leptos-rs/leptos", optional = true }
+leptos_router = { git = "https://github.com/leptos-rs/leptos", features = [
     "nightly",
 ] }
+# leptos_meta = { git = "https://github.com/christopherbiscardi/leptos", branch = "0.7-cdn" }
+# leptos = { git = "https://github.com/christopherbiscardi/leptos", features = [
+#     "nightly",
+#     "experimental-islands",
+# ], branch = "0.7-cdn" }
+# leptos_axum = { git = "https://github.com/christopherbiscardi/leptos", branch = "0.7-cdn", optional = true }
+# leptos_router = { git = "https://github.com/christopherbiscardi/leptos", branch = "0.7-cdn", features = [
+#     "nightly",
+# ] }
 axum = { version = "0.7", optional = true }
 console_error_panic_hook = "0.1"
 
diff --git a/crates/www/src/components.rs b/crates/www/src/components.rs
index 61bd4ec..8762309 100644
--- a/crates/www/src/components.rs
+++ b/crates/www/src/components.rs
@@ -1,6 +1,6 @@
 pub mod button;
 pub mod footer;
-// pub mod progress_bar;
+pub mod progress_bar;
 
 pub use footer::Footer;
-// pub use progress_bar::ProgressBar;
+pub use progress_bar::ProgressBar;
diff --git a/crates/www/src/main.rs b/crates/www/src/main.rs
index b4bf125..5e9c927 100644
--- a/crates/www/src/main.rs
+++ b/crates/www/src/main.rs
@@ -12,10 +12,6 @@ async fn main() {
     // Generate the list of routes in your Leptos App
     let routes = generate_route_list(App);
 
-    // TODO: remove this soonish
-    dbg!(std::env::var("CDN_PKG_PATH"));
-    dbg!(std::env::var("CDN_PATH"));
-
     let app = Router::new()
         .leptos_routes(&leptos_options, routes, {
             let leptos_options = leptos_options.clone();