From eb73bff3cd60f28f0aaa99fee4e2d55f53a2c373 Mon Sep 17 00:00:00 2001
From: Maccesch <maccesch@synphonyte.com>
Date: Thu, 22 Aug 2024 17:47:06 +0100
Subject: [PATCH] merged changes from Baptiste

Closes #156
---
 Cargo.toml                                    |  7 ++++-
 examples/Cargo.toml                           | 23 +++++++++------
 examples/on_click_outside/Cargo.toml          | 16 +++++------
 examples/on_click_outside/src/main.rs         |  8 ++++--
 examples/signal_debounced/Cargo.toml          | 16 +++++------
 examples/signal_debounced/src/main.rs         |  6 ++--
 examples/signal_throttled/Cargo.toml          | 16 +++++------
 examples/signal_throttled/src/main.rs         |  6 ++--
 examples/ssr/Cargo.toml                       | 12 +++++---
 examples/sync_signal/Cargo.toml               | 16 +++++------
 examples/sync_signal/src/main.rs              |  6 ++--
 examples/use_abs/Cargo.toml                   |  9 ++++--
 examples/use_abs/src/main.rs                  |  6 ++--
 examples/use_active_element/Cargo.toml        |  9 ++++--
 examples/use_active_element/src/main.rs       |  6 ++--
 examples/use_and/Cargo.toml                   |  9 ++++--
 examples/use_and/src/main.rs                  | 10 ++++---
 examples/use_breakpoints/Cargo.toml           | 16 +++++------
 examples/use_breakpoints/src/main.rs          |  6 ++--
 examples/use_broadcast_channel/Cargo.toml     |  9 ++++--
 examples/use_broadcast_channel/src/main.rs    |  6 ++--
 examples/use_ceil/Cargo.toml                  |  9 ++++--
 examples/use_ceil/src/main.rs                 |  6 ++--
 examples/use_clipboard/Cargo.toml             | 16 +++++------
 examples/use_clipboard/src/main.rs            |  6 ++--
 examples/use_color_mode/Cargo.toml            | 16 +++++------
 examples/use_color_mode/src/main.rs           |  6 ++--
 examples/use_cookie/Cargo.toml                |  9 ++++--
 examples/use_cookie/src/main.rs               |  8 ++++--
 examples/use_css_var/Cargo.toml               | 16 +++++------
 examples/use_css_var/src/main.rs              | 10 ++++---
 examples/use_cycle_list/Cargo.toml            | 16 +++++------
 examples/use_cycle_list/src/main.rs           |  6 ++--
 examples/use_debounce_fn/Cargo.toml           | 16 +++++------
 examples/use_debounce_fn/src/main.rs          |  6 ++--
 examples/use_device_orientation/Cargo.toml    | 16 +++++------
 examples/use_device_orientation/src/main.rs   |  6 ++--
 examples/use_device_pixel_ratio/Cargo.toml    | 16 +++++------
 examples/use_device_pixel_ratio/src/main.rs   |  6 ++--
 examples/use_display_media/Cargo.toml         | 16 +++++------
 examples/use_display_media/src/main.rs        | 26 +++++++++++------
 examples/use_document_visibility/Cargo.toml   | 16 +++++------
 examples/use_document_visibility/src/main.rs  |  8 ++++--
 examples/use_draggable/Cargo.toml             | 16 +++++------
 examples/use_draggable/src/main.rs            |  8 ++++--
 examples/use_drop_zone/Cargo.toml             | 16 +++++------
 examples/use_drop_zone/src/main.rs            |  8 ++++--
 examples/use_element_bounding/Cargo.toml      | 16 +++++------
 examples/use_element_bounding/src/main.rs     |  8 ++++--
 examples/use_element_hover/Cargo.toml         | 16 +++++------
 examples/use_element_hover/src/main.rs        |  8 ++++--
 examples/use_element_size/Cargo.toml          | 16 +++++------
 examples/use_element_size/src/main.rs         |  8 ++++--
 examples/use_element_visibility/Cargo.toml    | 16 +++++------
 examples/use_element_visibility/src/main.rs   |  8 ++++--
 examples/use_event_listener/Cargo.toml        |  9 ++++--
 examples/use_event_listener/src/main.rs       |  4 +--
 examples/use_favicon/Cargo.toml               | 16 +++++------
 examples/use_favicon/src/main.rs              |  6 ++--
 examples/use_floor/Cargo.toml                 |  9 ++++--
 examples/use_floor/src/main.rs                |  6 ++--
 examples/use_geolocation/Cargo.toml           | 16 +++++------
 examples/use_geolocation/src/main.rs          |  6 ++--
 examples/use_idle/Cargo.toml                  | 16 +++++------
 examples/use_idle/src/main.rs                 |  6 ++--
 examples/use_infinite_scroll/Cargo.toml       | 16 +++++------
 examples/use_infinite_scroll/src/main.rs      |  8 ++++--
 examples/use_intersection_observer/Cargo.toml | 16 +++++------
 .../use_intersection_observer/src/main.rs     | 10 ++++---
 examples/use_interval/Cargo.toml              | 16 +++++------
 examples/use_interval/src/main.rs             |  6 ++--
 examples/use_interval_fn/Cargo.toml           |  9 ++++--
 examples/use_interval_fn/src/main.rs          |  6 ++--
 examples/use_intl_number_format/Cargo.toml    | 16 +++++------
 examples/use_intl_number_format/src/main.rs   |  6 ++--
 examples/use_locale/Cargo.toml                |  9 ++++--
 examples/use_locale/src/main.rs               |  8 ++++--
 examples/use_locales/Cargo.toml               | 16 +++++------
 examples/use_locales/src/main.rs              |  8 ++++--
 examples/use_media_query/Cargo.toml           | 16 +++++------
 examples/use_media_query/src/main.rs          |  6 ++--
 examples/use_mouse/Cargo.toml                 | 16 +++++------
 examples/use_mouse/src/main.rs                |  8 ++++--
 examples/use_mouse_in_element/Cargo.toml      | 16 +++++------
 examples/use_mouse_in_element/src/main.rs     |  8 ++++--
 examples/use_mutation_observer/Cargo.toml     | 16 +++++------
 examples/use_mutation_observer/src/main.rs    |  8 ++++--
 examples/use_not/Cargo.toml                   |  9 ++++--
 examples/use_not/src/main.rs                  |  8 ++++--
 examples/use_or/Cargo.toml                    |  9 ++++--
 examples/use_or/src/main.rs                   | 10 ++++---
 examples/use_permission/Cargo.toml            | 16 +++++------
 examples/use_permission/src/main.rs           |  9 ++++--
 .../use_prefers_reduced_motion/Cargo.toml     | 16 +++++------
 .../use_prefers_reduced_motion/src/main.rs    |  8 ++++--
 examples/use_raf_fn/Cargo.toml                | 16 +++++------
 examples/use_raf_fn/src/main.rs               |  6 ++--
 examples/use_resize_observer/Cargo.toml       | 16 +++++------
 examples/use_resize_observer/src/main.rs      |  8 ++++--
 examples/use_round/Cargo.toml                 |  9 ++++--
 examples/use_round/src/main.rs                |  6 ++--
 examples/use_scroll/Cargo.toml                | 16 +++++------
 examples/use_scroll/src/main.rs               | 14 ++++++----
 examples/use_service_worker/Cargo.toml        | 16 +++++------
 examples/use_service_worker/src/main.rs       |  6 ++--
 examples/use_sorted/Cargo.toml                | 16 +++++------
 examples/use_sorted/src/main.rs               | 10 ++++---
 examples/use_storage/Cargo.toml               |  9 ++++--
 examples/use_storage/src/main.rs              | 11 +++++---
 examples/use_throttle_fn/Cargo.toml           | 16 +++++------
 examples/use_throttle_fn/src/main.rs          |  6 ++--
 examples/use_timeout_fn/Cargo.toml            | 16 +++++------
 examples/use_timeout_fn/src/main.rs           |  6 ++--
 examples/use_timestamp/Cargo.toml             | 16 +++++------
 examples/use_timestamp/src/main.rs            |  6 ++--
 examples/use_user_media/Cargo.toml            | 16 +++++------
 examples/use_user_media/src/main.rs           | 28 +++++++++++++------
 examples/use_web_notification/Cargo.toml      | 16 +++++------
 examples/use_web_notification/src/main.rs     |  6 ++--
 examples/use_websocket/Cargo.toml             |  9 ++++--
 examples/use_websocket/src/main.rs            | 22 ++++++++-------
 examples/use_webtransport/Cargo.toml          | 16 +++++------
 examples/use_webtransport/src/main.rs         | 10 ++++---
 examples/use_webtransport/src/stream_bidir.rs |  2 +-
 .../client/Cargo.toml                         |  5 +++-
 .../client/src/main.rs                        |  6 ++--
 examples/use_window_focus/Cargo.toml          | 16 +++++------
 examples/use_window_focus/src/main.rs         |  8 ++++--
 examples/use_window_scroll/Cargo.toml         | 16 +++++------
 examples/use_window_scroll/src/main.rs        |  6 ++--
 examples/watch_debounced/Cargo.toml           | 16 +++++------
 examples/watch_debounced/src/main.rs          |  6 ++--
 examples/watch_pausable/Cargo.toml            | 16 +++++------
 examples/watch_pausable/src/main.rs           |  8 ++++--
 examples/watch_throttled/Cargo.toml           | 16 +++++------
 examples/watch_throttled/src/main.rs          |  6 ++--
 src/core/elements_maybe_signal.rs             |  4 +--
 src/on_click_outside.rs                       |  2 +-
 src/storage/use_storage.rs                    |  2 +-
 src/use_css_var.rs                            |  2 +-
 src/use_device_orientation.rs                 |  3 ++
 src/use_draggable.rs                          |  7 ++---
 src/use_element_bounding.rs                   |  2 +-
 src/use_event_listener.rs                     |  1 +
 src/use_event_source.rs                       |  3 +-
 src/use_favicon.rs                            |  2 +-
 src/use_infinite_scroll.rs                    |  3 +-
 src/use_interval_fn.rs                        | 18 ++++++------
 src/use_locales.rs                            | 15 +++++-----
 src/use_media_query.rs                        |  1 +
 src/use_mouse_in_element.rs                   |  4 ++-
 src/use_mutation_observer.rs                  |  7 +++--
 src/use_raf_fn.rs                             |  5 ++--
 src/use_resize_observer.rs                    |  7 +++--
 src/use_service_worker.rs                     |  5 ++--
 src/use_timestamp.rs                          |  3 +-
 src/use_web_notification.rs                   | 15 ++++++----
 src/utils/filters/debounce.rs                 |  3 +-
 src/utils/filters/throttle.rs                 |  3 +-
 src/utils/header.rs                           |  2 +-
 src/watch_with_options.rs                     |  4 +--
 .../{{ function_name }}/Cargo.ffizer.hbs.toml | 16 +++++------
 162 files changed, 941 insertions(+), 714 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d89be1a..5f6006f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,12 @@ wasm-bindgen-futures = "0.4"
 web-sys = { version = "=0.3.70", optional = true }
 
 [dev-dependencies]
-codee = { version = "0.1", features = ["json_serde", "msgpack_serde", "base64", "prost"] }
+codee = { version = "0.1", features = [
+    "json_serde",
+    "msgpack_serde",
+    "base64",
+    "prost",
+] }
 getrandom = { version = "0.2", features = ["js"] }
 leptos_meta = { git = "https://github.com/leptos-rs/leptos" }
 rand = "0.8"
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
index 187bcf3..b3893d5 100644
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -7,13 +7,11 @@ members = [
     "signal_throttled",
     "sync_signal",
     "use_abs",
-    "use_active_element",
     "use_and",
     "use_breakpoints",
     "use_broadcast_channel",
     "use_ceil",
     "use_clipboard",
-    "use_color_mode",
     "use_cookie",
     "use_css_var",
     "use_cycle_list",
@@ -23,7 +21,6 @@ members = [
     "use_display_media",
     "use_document_visibility",
     "use_draggable",
-    "use_drop_zone",
     "use_element_bounding",
     "use_element_hover",
     "use_element_size",
@@ -61,18 +58,28 @@ members = [
     "use_user_media",
     "use_web_notification",
     "use_websocket",
-    "use_webtransport",
     "use_window_focus",
     "use_window_scroll",
     "watch_debounced",
     "watch_pausable",
     "watch_throttled",
+    # "use_active_element",
+    # "use_color_mode",
+    # "use_drop_zone",
+    # "use_webtransport",
 ]
 
-exclude = [
-    "ssr",
-    "use_webtransport_with_server",
-]
+exclude = ["ssr", "use_webtransport_with_server"]
+
+[workspace.dependencies]
+leptos = { git = "https://github.com/leptos-rs/leptos" }
+console_error_panic_hook = "0.1"
+console_log = "1"
+log = "0.4"
+leptos-use = { path = "..", features = ["docs"] }
+web-sys = "0.3"
+wasm-bindgen = "0.2"
+wasm-bindgen-test = "0.3.0"
 
 [package]
 name = "leptos-use-examples"
diff --git a/examples/on_click_outside/Cargo.toml b/examples/on_click_outside/Cargo.toml
index c6d6279..2f6ea60 100644
--- a/examples/on_click_outside/Cargo.toml
+++ b/examples/on_click_outside/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["on_click_outside", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["on_click_outside", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/on_click_outside/src/main.rs b/examples/on_click_outside/src/main.rs
index 5588c3f..ec77723 100644
--- a/examples/on_click_outside/src/main.rs
+++ b/examples/on_click_outside/src/main.rs
@@ -6,7 +6,7 @@ use leptos_use::on_click_outside;
 #[component]
 fn Demo() -> impl IntoView {
     let (show_modal, set_show_modal) = signal(false);
-    let modal_ref = create_node_ref::<Div>();
+    let modal_ref = NodeRef::<Div>::new();
 
     let _ = on_click_outside(modal_ref, move |_| set_show_modal.set(false));
 
@@ -78,7 +78,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/signal_debounced/Cargo.toml b/examples/signal_debounced/Cargo.toml
index 9411da3..1e818e3 100644
--- a/examples/signal_debounced/Cargo.toml
+++ b/examples/signal_debounced/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["signal_debounced", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["signal_debounced", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/signal_debounced/src/main.rs b/examples/signal_debounced/src/main.rs
index 07f4c26..a79ece0 100644
--- a/examples/signal_debounced/src/main.rs
+++ b/examples/signal_debounced/src/main.rs
@@ -26,7 +26,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/signal_throttled/Cargo.toml b/examples/signal_throttled/Cargo.toml
index 2a14d8a..380cb43 100644
--- a/examples/signal_throttled/Cargo.toml
+++ b/examples/signal_throttled/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["signal_throttled", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["signal_throttled", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/signal_throttled/src/main.rs b/examples/signal_throttled/src/main.rs
index 7468ade..1789b57 100644
--- a/examples/signal_throttled/src/main.rs
+++ b/examples/signal_throttled/src/main.rs
@@ -26,7 +26,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/ssr/Cargo.toml b/examples/ssr/Cargo.toml
index 33e9575..59a77b3 100644
--- a/examples/ssr/Cargo.toml
+++ b/examples/ssr/Cargo.toml
@@ -12,10 +12,14 @@ codee = "0.1"
 console_error_panic_hook = "0.1"
 console_log = "1"
 cfg-if = "1"
-leptos = { version = "0.6", features = ["nightly"] }
-leptos_axum = { version = "0.6", optional = true }
-leptos_meta = { version = "0.6", features = ["nightly"] }
-leptos_router = { version = "0.6", features = ["nightly"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = ["nightly"] }
+leptos_axum = { git = "https://github.com/leptos-rs/leptos", optional = true }
+leptos_meta = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+] }
+leptos_router = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+] }
 log = "0.4"
 simple_logger = "4"
 tokio = { version = "1", features = ["full"], optional = true }
diff --git a/examples/sync_signal/Cargo.toml b/examples/sync_signal/Cargo.toml
index c072a2b..9f70069 100644
--- a/examples/sync_signal/Cargo.toml
+++ b/examples/sync_signal/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["sync_signal", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["sync_signal", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/sync_signal/src/main.rs b/examples/sync_signal/src/main.rs
index 10ec8da..782c9ef 100644
--- a/examples/sync_signal/src/main.rs
+++ b/examples/sync_signal/src/main.rs
@@ -19,7 +19,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_abs/Cargo.toml b/examples/use_abs/Cargo.toml
index 8195e32..2f398ca 100644
--- a/examples/use_abs/Cargo.toml
+++ b/examples/use_abs/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
@@ -12,5 +15,5 @@ leptos-use = { path = "../..", features = ["docs", "math"] }
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_abs/src/main.rs b/examples/use_abs/src/main.rs
index 3570c0d..989fc62 100644
--- a/examples/use_abs/src/main.rs
+++ b/examples/use_abs/src/main.rs
@@ -27,7 +27,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_active_element/Cargo.toml b/examples/use_active_element/Cargo.toml
index e5c31a5..a3775ed 100644
--- a/examples/use_active_element/Cargo.toml
+++ b/examples/use_active_element/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
@@ -12,5 +15,5 @@ leptos-use = { path = "../..", features = ["use_active_element", "docs"] }
 web-sys = { version = "0.3", features = ["HtmlElement", "DomStringMap"] }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_active_element/src/main.rs b/examples/use_active_element/src/main.rs
index f8bea4a..6a9bb84 100644
--- a/examples/use_active_element/src/main.rs
+++ b/examples/use_active_element/src/main.rs
@@ -33,7 +33,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_and/Cargo.toml b/examples/use_and/Cargo.toml
index b8a36ed..eb92b8c 100644
--- a/examples/use_and/Cargo.toml
+++ b/examples/use_and/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
@@ -12,5 +15,5 @@ leptos-use = { path = "../..", features = ["docs", "math"] }
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_and/src/main.rs b/examples/use_and/src/main.rs
index 703646f..d333224 100644
--- a/examples/use_and/src/main.rs
+++ b/examples/use_and/src/main.rs
@@ -11,7 +11,7 @@ fn Demo() -> impl IntoView {
 
     view! {
         <div class="px-6 py-4 rounded grid grid-cols-[100px_auto] gap-4">
-            <label for_="smooth-scrolling-option" class="text-right opacity-75">
+            <label for="smooth-scrolling-option" class="text-right opacity-75">
                 Input <code>A</code>
             </label>
             <span>
@@ -22,7 +22,7 @@ fn Demo() -> impl IntoView {
                     type="checkbox"
                 />
             </span>
-            <label for_="smooth-scrolling-option" class="text-right opacity-75">
+            <label for="smooth-scrolling-option" class="text-right opacity-75">
                 Input <code>B</code>
             </label>
             <span>
@@ -43,7 +43,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_breakpoints/Cargo.toml b/examples/use_breakpoints/Cargo.toml
index b022945..c15d22b 100644
--- a/examples/use_breakpoints/Cargo.toml
+++ b/examples/use_breakpoints/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_breakpoints", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_breakpoints", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_breakpoints/src/main.rs b/examples/use_breakpoints/src/main.rs
index cb4eb67..4221244 100644
--- a/examples/use_breakpoints/src/main.rs
+++ b/examples/use_breakpoints/src/main.rs
@@ -207,7 +207,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_broadcast_channel/Cargo.toml b/examples/use_broadcast_channel/Cargo.toml
index 3cfcd3f..636ae9c 100644
--- a/examples/use_broadcast_channel/Cargo.toml
+++ b/examples/use_broadcast_channel/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 codee = "0.1"
 console_error_panic_hook = "0.1"
 console_log = "1"
@@ -13,5 +16,5 @@ leptos-use = { path = "../..", features = ["use_broadcast_channel", "docs"] }
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_broadcast_channel/src/main.rs b/examples/use_broadcast_channel/src/main.rs
index 124f8bf..2f69785 100644
--- a/examples/use_broadcast_channel/src/main.rs
+++ b/examples/use_broadcast_channel/src/main.rs
@@ -57,7 +57,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_ceil/Cargo.toml b/examples/use_ceil/Cargo.toml
index d694257..46a5d90 100644
--- a/examples/use_ceil/Cargo.toml
+++ b/examples/use_ceil/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
@@ -12,5 +15,5 @@ leptos-use = { path = "../..", features = ["docs", "math"] }
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_ceil/src/main.rs b/examples/use_ceil/src/main.rs
index ebff67d..6299446 100644
--- a/examples/use_ceil/src/main.rs
+++ b/examples/use_ceil/src/main.rs
@@ -27,7 +27,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_clipboard/Cargo.toml b/examples/use_clipboard/Cargo.toml
index 43cba10..bf1e0e7 100644
--- a/examples/use_clipboard/Cargo.toml
+++ b/examples/use_clipboard/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_clipboard", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_clipboard", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_clipboard/src/main.rs b/examples/use_clipboard/src/main.rs
index 04d0108..a3cf29d 100644
--- a/examples/use_clipboard/src/main.rs
+++ b/examples/use_clipboard/src/main.rs
@@ -46,7 +46,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_color_mode/Cargo.toml b/examples/use_color_mode/Cargo.toml
index 26874f0..e5e0c37 100644
--- a/examples/use_color_mode/Cargo.toml
+++ b/examples/use_color_mode/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_color_mode", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_color_mode", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_color_mode/src/main.rs b/examples/use_color_mode/src/main.rs
index 513d2ef..fc35483 100644
--- a/examples/use_color_mode/src/main.rs
+++ b/examples/use_color_mode/src/main.rs
@@ -40,7 +40,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_cookie/Cargo.toml b/examples/use_cookie/Cargo.toml
index 2974155..5a5079d 100644
--- a/examples/use_cookie/Cargo.toml
+++ b/examples/use_cookie/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 codee = "0.1"
 console_error_panic_hook = "0.1"
 console_log = "1"
@@ -15,5 +18,5 @@ getrandom = { version = "0.2", features = ["js"] }
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_cookie/src/main.rs b/examples/use_cookie/src/main.rs
index 75fb31c..9874bf4 100644
--- a/examples/use_cookie/src/main.rs
+++ b/examples/use_cookie/src/main.rs
@@ -1,7 +1,7 @@
+use codee::string::FromToStringCodec;
 use leptos::prelude::*;
 use leptos_use::docs::demo_or_body;
 use leptos_use::use_cookie;
-use codee::string::FromToStringCodec;
 use rand::prelude::*;
 
 #[component]
@@ -40,7 +40,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_css_var/Cargo.toml b/examples/use_css_var/Cargo.toml
index 97d6fa6..93a8d5c 100644
--- a/examples/use_css_var/Cargo.toml
+++ b/examples/use_css_var/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_css_var", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_color_mode", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_css_var/src/main.rs b/examples/use_css_var/src/main.rs
index b715b28..2e29b3e 100644
--- a/examples/use_css_var/src/main.rs
+++ b/examples/use_css_var/src/main.rs
@@ -5,7 +5,7 @@ use leptos_use::{use_css_var_with_options, UseCssVarOptions};
 
 #[component]
 fn Demo() -> impl IntoView {
-    let el = create_node_ref::<Div>();
+    let el = NodeRef::<Div>::new();
     let (color, set_color) =
         use_css_var_with_options("--color", UseCssVarOptions::default().target(el));
     let switch_color = move |_| {
@@ -16,7 +16,7 @@ fn Demo() -> impl IntoView {
         }
     };
 
-    let elv = create_node_ref::<Div>();
+    let elv = NodeRef::<Div>::new();
     let (key, set_key) = signal("--color".to_string());
     let (color_val, _) = use_css_var_with_options(key, UseCssVarOptions::default().target(elv));
     let change_var = move |_| {
@@ -58,7 +58,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_cycle_list/Cargo.toml b/examples/use_cycle_list/Cargo.toml
index 77f6c25..3f7237d 100644
--- a/examples/use_cycle_list/Cargo.toml
+++ b/examples/use_cycle_list/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_cycle_list", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_cycle_list", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_cycle_list/src/main.rs b/examples/use_cycle_list/src/main.rs
index a82d240..8e973c3 100644
--- a/examples/use_cycle_list/src/main.rs
+++ b/examples/use_cycle_list/src/main.rs
@@ -23,7 +23,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_debounce_fn/Cargo.toml b/examples/use_debounce_fn/Cargo.toml
index c3f7b9e..3fde7a2 100644
--- a/examples/use_debounce_fn/Cargo.toml
+++ b/examples/use_debounce_fn/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_debounce_fn", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_debounce_fn", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_debounce_fn/src/main.rs b/examples/use_debounce_fn/src/main.rs
index 2073eba..78b093e 100644
--- a/examples/use_debounce_fn/src/main.rs
+++ b/examples/use_debounce_fn/src/main.rs
@@ -31,7 +31,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_device_orientation/Cargo.toml b/examples/use_device_orientation/Cargo.toml
index 5fec238..dcbd368 100644
--- a/examples/use_device_orientation/Cargo.toml
+++ b/examples/use_device_orientation/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_device_orientation", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_device_orientation", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_device_orientation/src/main.rs b/examples/use_device_orientation/src/main.rs
index 115c164..5756c09 100644
--- a/examples/use_device_orientation/src/main.rs
+++ b/examples/use_device_orientation/src/main.rs
@@ -29,7 +29,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_device_pixel_ratio/Cargo.toml b/examples/use_device_pixel_ratio/Cargo.toml
index 98efdde..714fff2 100644
--- a/examples/use_device_pixel_ratio/Cargo.toml
+++ b/examples/use_device_pixel_ratio/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_device_pixel_ratio", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_device_pixel_ratio", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_device_pixel_ratio/src/main.rs b/examples/use_device_pixel_ratio/src/main.rs
index 7a7461a..4a2e149 100644
--- a/examples/use_device_pixel_ratio/src/main.rs
+++ b/examples/use_device_pixel_ratio/src/main.rs
@@ -18,7 +18,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_display_media/Cargo.toml b/examples/use_display_media/Cargo.toml
index f5f4b79..3b7bb6d 100644
--- a/examples/use_display_media/Cargo.toml
+++ b/examples/use_display_media/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_display_media", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_display_media", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_display_media/src/main.rs b/examples/use_display_media/src/main.rs
index f069e32..fdd13c4 100644
--- a/examples/use_display_media/src/main.rs
+++ b/examples/use_display_media/src/main.rs
@@ -4,7 +4,7 @@ use leptos_use::{use_display_media, UseDisplayMediaReturn};
 
 #[component]
 fn Demo() -> impl IntoView {
-    let video_ref = create_node_ref::<leptos::html::Video>();
+    let video_ref = NodeRef::<leptos::html::Video>::new();
 
     let UseDisplayMediaReturn {
         stream,
@@ -13,17 +13,25 @@ fn Demo() -> impl IntoView {
         ..
     } = use_display_media();
 
-    create_effect(move |_| {
+    Effect::new(move |_| {
         match stream.get() {
             Some(Ok(s)) => {
-                video_ref.get().map(|v| v.set_src_object(Some(&s)));
+                video_ref.with(|v| {
+                    if let Some(v) = v {
+                        v.set_src_object(Some(&s));
+                    }
+                });
                 return;
             }
-            Some(Err(e)) => logging::error!("Failed to get media stream: {:?}", e),
-            None => logging::log!("No stream yet"),
+            Some(Err(e)) => leptos::logging::error!("Failed to get media stream: {:?}", e),
+            None => leptos::logging::log!("No stream yet"),
         }
 
-        video_ref.get().map(|v| v.set_src_object(None));
+        video_ref.with(|v| {
+            if let Some(v) = v {
+                v.set_src_object(None);
+            }
+        });
     });
 
     view! {
@@ -51,7 +59,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_document_visibility/Cargo.toml b/examples/use_document_visibility/Cargo.toml
index 8d5b019..a978c69 100644
--- a/examples/use_document_visibility/Cargo.toml
+++ b/examples/use_document_visibility/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_document_visibility", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_document_visibility", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_document_visibility/src/main.rs b/examples/use_document_visibility/src/main.rs
index 8db909a..4cfb7f8 100644
--- a/examples/use_document_visibility/src/main.rs
+++ b/examples/use_document_visibility/src/main.rs
@@ -9,7 +9,7 @@ fn Demo() -> impl IntoView {
     let (message, set_message) = signal(start_message);
     let visibility = use_document_visibility();
 
-    let _ = watch(
+    Effect::watch(
         visibility,
         move |cur, prev, _| {
             if let Some(prev) = prev {
@@ -37,7 +37,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_draggable/Cargo.toml b/examples/use_draggable/Cargo.toml
index 8427afb..e56ce49 100644
--- a/examples/use_draggable/Cargo.toml
+++ b/examples/use_draggable/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_draggable", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_draggable", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_draggable/src/main.rs b/examples/use_draggable/src/main.rs
index 6613e34..e7141f2 100644
--- a/examples/use_draggable/src/main.rs
+++ b/examples/use_draggable/src/main.rs
@@ -6,7 +6,7 @@ use leptos_use::{use_draggable_with_options, use_window, UseDraggableOptions, Us
 
 #[component]
 fn Demo() -> impl IntoView {
-    let el = create_node_ref::<Div>();
+    let el = NodeRef::<Div>::new();
 
     let inner_width = use_window()
         .as_ref()
@@ -40,7 +40,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_drop_zone/Cargo.toml b/examples/use_drop_zone/Cargo.toml
index aa05fca..3dc7aee 100644
--- a/examples/use_drop_zone/Cargo.toml
+++ b/examples/use_drop_zone/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_drop_zone", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_drop_zone", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_drop_zone/src/main.rs b/examples/use_drop_zone/src/main.rs
index 23ea9ec..dd46b72 100644
--- a/examples/use_drop_zone/src/main.rs
+++ b/examples/use_drop_zone/src/main.rs
@@ -7,7 +7,7 @@ use leptos_use::{use_drop_zone_with_options, UseDropZoneOptions, UseDropZoneRetu
 fn Demo() -> impl IntoView {
     let (dropped, set_dropped) = signal(false);
 
-    let drop_zone_el = create_node_ref::<Div>();
+    let drop_zone_el = NodeRef::<Div>::new();
 
     let UseDropZoneReturn {
         is_over_drop_zone,
@@ -50,7 +50,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_element_bounding/Cargo.toml b/examples/use_element_bounding/Cargo.toml
index 8ef72c3..04a4567 100644
--- a/examples/use_element_bounding/Cargo.toml
+++ b/examples/use_element_bounding/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_element_bounding", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_element_bounding", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_element_bounding/src/main.rs b/examples/use_element_bounding/src/main.rs
index 6bb9b8d..4634bf6 100644
--- a/examples/use_element_bounding/src/main.rs
+++ b/examples/use_element_bounding/src/main.rs
@@ -5,7 +5,7 @@ use leptos_use::{use_element_bounding, UseElementBoundingReturn};
 
 #[component]
 fn Demo() -> impl IntoView {
-    let el = create_node_ref::<Textarea>();
+    let el = NodeRef::<Textarea>::new();
 
     let UseElementBoundingReturn {
         width,
@@ -48,7 +48,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_element_hover/Cargo.toml b/examples/use_element_hover/Cargo.toml
index 9be576c..143ec59 100644
--- a/examples/use_element_hover/Cargo.toml
+++ b/examples/use_element_hover/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_element_hover", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_element_hover", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_element_hover/src/main.rs b/examples/use_element_hover/src/main.rs
index c819687..2a5f4fe 100644
--- a/examples/use_element_hover/src/main.rs
+++ b/examples/use_element_hover/src/main.rs
@@ -5,7 +5,7 @@ use leptos_use::{use_element_hover_with_options, UseElementHoverOptions};
 
 #[component]
 fn Demo() -> impl IntoView {
-    let el = create_node_ref::<Button>();
+    let el = NodeRef::<Button>::new();
 
     let is_hovered = use_element_hover_with_options(
         el,
@@ -25,7 +25,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_element_size/Cargo.toml b/examples/use_element_size/Cargo.toml
index 4e71f62..3f1d086 100644
--- a/examples/use_element_size/Cargo.toml
+++ b/examples/use_element_size/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_element_size", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_element_size", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_element_size/src/main.rs b/examples/use_element_size/src/main.rs
index 3069754..0472c8f 100644
--- a/examples/use_element_size/src/main.rs
+++ b/examples/use_element_size/src/main.rs
@@ -5,7 +5,7 @@ use leptos_use::{use_element_size, UseElementSizeReturn};
 
 #[component]
 fn Demo() -> impl IntoView {
-    let el = create_node_ref::<Textarea>();
+    let el = NodeRef::<Textarea>::new();
 
     let UseElementSizeReturn { width, height } = use_element_size(el);
 
@@ -26,7 +26,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_element_visibility/Cargo.toml b/examples/use_element_visibility/Cargo.toml
index 3506775..49b2cf1 100644
--- a/examples/use_element_visibility/Cargo.toml
+++ b/examples/use_element_visibility/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_element_visibility", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_element_visibility", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_element_visibility/src/main.rs b/examples/use_element_visibility/src/main.rs
index 6fa448b..641afcc 100644
--- a/examples/use_element_visibility/src/main.rs
+++ b/examples/use_element_visibility/src/main.rs
@@ -5,7 +5,7 @@ use leptos_use::use_element_visibility;
 
 #[component]
 fn Demo() -> impl IntoView {
-    let el = create_node_ref::<Div>();
+    let el = NodeRef::<Div>::new();
 
     let is_visible = use_element_visibility(el);
 
@@ -32,7 +32,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_event_listener/Cargo.toml b/examples/use_event_listener/Cargo.toml
index d0e75c1..ebc9999 100644
--- a/examples/use_event_listener/Cargo.toml
+++ b/examples/use_event_listener/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
@@ -12,5 +15,5 @@ leptos-use = { path = "../..", features = ["use_event_listener"] }
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_event_listener/src/main.rs b/examples/use_event_listener/src/main.rs
index 191ebd7..84b1c8e 100644
--- a/examples/use_event_listener/src/main.rs
+++ b/examples/use_event_listener/src/main.rs
@@ -10,7 +10,7 @@ fn Demo() -> impl IntoView {
         log!("window keydown: '{}'", evt.key());
     });
 
-    let element = create_node_ref::<A>();
+    let element = NodeRef::<A>::new();
 
     let _ = use_event_listener(element, click, |evt| {
         log!(
@@ -61,7 +61,7 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to_body(|| {
+    leptos::mount::mount_to_body(|| {
         view! { <Demo/> }
     })
 }
diff --git a/examples/use_favicon/Cargo.toml b/examples/use_favicon/Cargo.toml
index 38d4f05..e82eec4 100644
--- a/examples/use_favicon/Cargo.toml
+++ b/examples/use_favicon/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_favicon", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_favicon", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_favicon/src/main.rs b/examples/use_favicon/src/main.rs
index ef5fdca..c079cae 100644
--- a/examples/use_favicon/src/main.rs
+++ b/examples/use_favicon/src/main.rs
@@ -105,7 +105,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_floor/Cargo.toml b/examples/use_floor/Cargo.toml
index c221e68..7a844f7 100644
--- a/examples/use_floor/Cargo.toml
+++ b/examples/use_floor/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
@@ -12,5 +15,5 @@ leptos-use = { path = "../..", features = ["docs", "math"] }
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_floor/src/main.rs b/examples/use_floor/src/main.rs
index a38d377..8698047 100644
--- a/examples/use_floor/src/main.rs
+++ b/examples/use_floor/src/main.rs
@@ -27,7 +27,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_geolocation/Cargo.toml b/examples/use_geolocation/Cargo.toml
index 4ded1d2..0a6fda4 100644
--- a/examples/use_geolocation/Cargo.toml
+++ b/examples/use_geolocation/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_geolocation", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_geolocation", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_geolocation/src/main.rs b/examples/use_geolocation/src/main.rs
index 8df2f9c..93b7023 100644
--- a/examples/use_geolocation/src/main.rs
+++ b/examples/use_geolocation/src/main.rs
@@ -53,7 +53,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_idle/Cargo.toml b/examples/use_idle/Cargo.toml
index 0e8d92a..7dd2a58 100644
--- a/examples/use_idle/Cargo.toml
+++ b/examples/use_idle/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_idle", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_idle", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_idle/src/main.rs b/examples/use_idle/src/main.rs
index a69aec4..55f9b3a 100644
--- a/examples/use_idle/src/main.rs
+++ b/examples/use_idle/src/main.rs
@@ -26,7 +26,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_infinite_scroll/Cargo.toml b/examples/use_infinite_scroll/Cargo.toml
index 52cafcb..700420c 100644
--- a/examples/use_infinite_scroll/Cargo.toml
+++ b/examples/use_infinite_scroll/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_infinite_scroll", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_infinite_scroll", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_infinite_scroll/src/main.rs b/examples/use_infinite_scroll/src/main.rs
index fbd5e3c..108c174 100644
--- a/examples/use_infinite_scroll/src/main.rs
+++ b/examples/use_infinite_scroll/src/main.rs
@@ -5,7 +5,7 @@ use leptos_use::{use_infinite_scroll_with_options, UseInfiniteScrollOptions};
 
 #[component]
 fn Demo() -> impl IntoView {
-    let el = create_node_ref::<Div>();
+    let el = NodeRef::<Div>::new();
 
     let (data, set_data) = signal(vec![1, 2, 3, 4, 5, 6]);
 
@@ -34,7 +34,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_intersection_observer/Cargo.toml b/examples/use_intersection_observer/Cargo.toml
index b8c5d1a..91b4c4b 100644
--- a/examples/use_intersection_observer/Cargo.toml
+++ b/examples/use_intersection_observer/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_intersection_observer", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_intersection_observer", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_intersection_observer/src/main.rs b/examples/use_intersection_observer/src/main.rs
index af905d1..c842e20 100644
--- a/examples/use_intersection_observer/src/main.rs
+++ b/examples/use_intersection_observer/src/main.rs
@@ -8,8 +8,8 @@ use leptos_use::{
 
 #[component]
 fn Demo() -> impl IntoView {
-    let root = create_node_ref::<Div>();
-    let target = create_node_ref::<Div>();
+    let root = NodeRef::<Div>::new();
+    let target = NodeRef::<Div>::new();
     let (is_visible, set_visible) = signal(false);
 
     let UseIntersectionObserverReturn {
@@ -95,7 +95,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_interval/Cargo.toml b/examples/use_interval/Cargo.toml
index cd02ec5..8de9fc2 100644
--- a/examples/use_interval/Cargo.toml
+++ b/examples/use_interval/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_interval", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_interval", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_interval/src/main.rs b/examples/use_interval/src/main.rs
index d3102df..521ea43 100644
--- a/examples/use_interval/src/main.rs
+++ b/examples/use_interval/src/main.rs
@@ -17,7 +17,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_interval_fn/Cargo.toml b/examples/use_interval_fn/Cargo.toml
index 96de322..5b037fd 100644
--- a/examples/use_interval_fn/Cargo.toml
+++ b/examples/use_interval_fn/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
@@ -12,5 +15,5 @@ leptos-use = { path = "../..", features = ["use_interval_fn", "docs", "math"] }
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_interval_fn/src/main.rs b/examples/use_interval_fn/src/main.rs
index ec5afe7..4e1598d 100644
--- a/examples/use_interval_fn/src/main.rs
+++ b/examples/use_interval_fn/src/main.rs
@@ -66,7 +66,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_intl_number_format/Cargo.toml b/examples/use_intl_number_format/Cargo.toml
index 5ed97da..44dbe06 100644
--- a/examples/use_intl_number_format/Cargo.toml
+++ b/examples/use_intl_number_format/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_intl_number_format", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_intl_number_format", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_intl_number_format/src/main.rs b/examples/use_intl_number_format/src/main.rs
index 6ecbe59..b56285d 100644
--- a/examples/use_intl_number_format/src/main.rs
+++ b/examples/use_intl_number_format/src/main.rs
@@ -50,7 +50,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_locale/Cargo.toml b/examples/use_locale/Cargo.toml
index 1c592fe..27778c3 100644
--- a/examples/use_locale/Cargo.toml
+++ b/examples/use_locale/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
@@ -13,5 +16,5 @@ unic-langid = { version = "0.9", features = ["macros"] }
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_locale/src/main.rs b/examples/use_locale/src/main.rs
index a0fe2a6..7fedddb 100644
--- a/examples/use_locale/src/main.rs
+++ b/examples/use_locale/src/main.rs
@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::prelude::*;
 use leptos_use::docs::demo_or_body;
 use leptos_use::use_locale;
 use unic_langid::langid_slice;
@@ -16,7 +16,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_locales/Cargo.toml b/examples/use_locales/Cargo.toml
index c98524c..4a5a120 100644
--- a/examples/use_locales/Cargo.toml
+++ b/examples/use_locales/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_locales", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_locales", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_locales/src/main.rs b/examples/use_locales/src/main.rs
index dfa206b..1f38e0c 100644
--- a/examples/use_locales/src/main.rs
+++ b/examples/use_locales/src/main.rs
@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::prelude::*;
 use leptos_use::docs::demo_or_body;
 use leptos_use::use_locales;
 
@@ -15,7 +15,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_media_query/Cargo.toml b/examples/use_media_query/Cargo.toml
index a57d7fe..6817e50 100644
--- a/examples/use_media_query/Cargo.toml
+++ b/examples/use_media_query/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_media_query", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_media_query", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_media_query/src/main.rs b/examples/use_media_query/src/main.rs
index b5bfc54..327e132 100644
--- a/examples/use_media_query/src/main.rs
+++ b/examples/use_media_query/src/main.rs
@@ -17,7 +17,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_mouse/Cargo.toml b/examples/use_mouse/Cargo.toml
index cb2dea3..20f521b 100644
--- a/examples/use_mouse/Cargo.toml
+++ b/examples/use_mouse/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_mouse", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_mouse", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_mouse/src/main.rs b/examples/use_mouse/src/main.rs
index 1874478..9916eca 100644
--- a/examples/use_mouse/src/main.rs
+++ b/examples/use_mouse/src/main.rs
@@ -23,7 +23,7 @@ impl UseMouseEventExtractor for Extractor {
 
 #[component]
 fn Demo() -> impl IntoView {
-    let el = create_node_ref::<Div>();
+    let el = NodeRef::<Div>::new();
 
     let mouse_default = use_mouse();
 
@@ -74,7 +74,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_mouse_in_element/Cargo.toml b/examples/use_mouse_in_element/Cargo.toml
index 2823591..4989263 100644
--- a/examples/use_mouse_in_element/Cargo.toml
+++ b/examples/use_mouse_in_element/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_mouse_in_element", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_mouse_in_element", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_mouse_in_element/src/main.rs b/examples/use_mouse_in_element/src/main.rs
index 7cdbfcc..52e50c7 100644
--- a/examples/use_mouse_in_element/src/main.rs
+++ b/examples/use_mouse_in_element/src/main.rs
@@ -5,7 +5,7 @@ use leptos_use::{use_mouse_in_element, UseMouseInElementReturn};
 
 #[component]
 fn Demo() -> impl IntoView {
-    let el = create_node_ref::<Div>();
+    let el = NodeRef::<Div>::new();
 
     let UseMouseInElementReturn {
         x,
@@ -47,7 +47,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_mutation_observer/Cargo.toml b/examples/use_mutation_observer/Cargo.toml
index c85533a..5ad1ac7 100644
--- a/examples/use_mutation_observer/Cargo.toml
+++ b/examples/use_mutation_observer/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_mutation_observer", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_mutation_observer", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_mutation_observer/src/main.rs b/examples/use_mutation_observer/src/main.rs
index f624643..0e06854 100644
--- a/examples/use_mutation_observer/src/main.rs
+++ b/examples/use_mutation_observer/src/main.rs
@@ -6,7 +6,7 @@ use std::time::Duration;
 
 #[component]
 fn Demo() -> impl IntoView {
-    let el = create_node_ref::<Div>();
+    let el = NodeRef::<Div>::new();
     let (messages, set_messages) = signal(vec![]);
     let (class_name, set_class_name) = signal(String::new());
     let (style, set_style) = signal(String::new());
@@ -58,7 +58,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_not/Cargo.toml b/examples/use_not/Cargo.toml
index 29868fc..2d4d20a 100644
--- a/examples/use_not/Cargo.toml
+++ b/examples/use_not/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
@@ -12,5 +15,5 @@ leptos-use = { path = "../..", features = ["docs", "math"] }
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_not/src/main.rs b/examples/use_not/src/main.rs
index 1a7f1af..ed731c7 100644
--- a/examples/use_not/src/main.rs
+++ b/examples/use_not/src/main.rs
@@ -9,7 +9,7 @@ fn Demo() -> impl IntoView {
 
     view! {
         <div class="px-6 py-4 rounded grid grid-cols-[100px_auto] gap-4">
-            <label for_="smooth-scrolling-option" class="text-right opacity-75">
+            <label for="smooth-scrolling-option" class="text-right opacity-75">
                 Input <code>A</code>
             </label>
             <span>
@@ -30,7 +30,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_or/Cargo.toml b/examples/use_or/Cargo.toml
index 4874c27..0e47729 100644
--- a/examples/use_or/Cargo.toml
+++ b/examples/use_or/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
@@ -12,5 +15,5 @@ leptos-use = { path = "../..", features = ["docs", "math"] }
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_or/src/main.rs b/examples/use_or/src/main.rs
index 8c18730..f8d2e3a 100644
--- a/examples/use_or/src/main.rs
+++ b/examples/use_or/src/main.rs
@@ -11,7 +11,7 @@ fn Demo() -> impl IntoView {
 
     view! {
         <div class="px-6 py-4 rounded grid grid-cols-[100px_auto] gap-4">
-            <label for_="smooth-scrolling-option" class="text-right opacity-75">
+            <label for="smooth-scrolling-option" class="text-right opacity-75">
                 Input <code>A</code>
             </label>
             <span>
@@ -22,7 +22,7 @@ fn Demo() -> impl IntoView {
                     type="checkbox"
                 />
             </span>
-            <label for_="smooth-scrolling-option" class="text-right opacity-75">
+            <label for="smooth-scrolling-option" class="text-right opacity-75">
                 Input <code>B</code>
             </label>
             <span>
@@ -43,7 +43,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_permission/Cargo.toml b/examples/use_permission/Cargo.toml
index f03e633..661d91b 100644
--- a/examples/use_permission/Cargo.toml
+++ b/examples/use_permission/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_permission", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_permission", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_permission/src/main.rs b/examples/use_permission/src/main.rs
index 64ede19..7841fd8 100644
--- a/examples/use_permission/src/main.rs
+++ b/examples/use_permission/src/main.rs
@@ -22,6 +22,7 @@ fn Demo() -> impl IntoView {
 
     view! {
         <pre>
+            <>
             "accelerometer: " {move || accelerometer().to_string()}
             "\naccessibility_events: " {move || accessibility_events().to_string()}
             "\nambient_light_sensor: " {move || ambient_light_sensor().to_string()}
@@ -30,6 +31,7 @@ fn Demo() -> impl IntoView {
             "\nclipboard_read: " {move || clipboard_read().to_string()}
             "\nclipboard_write: " {move || clipboard_write().to_string()}
             "\ngyroscope: " {move || gyroscope().to_string()}
+            </><>
             "\nmagnetometer: " {move || magnetometer().to_string()}
             "\nmicrophone: " {move || microphone().to_string()}
             "\nnotifications: " {move || notifications().to_string()}
@@ -37,6 +39,7 @@ fn Demo() -> impl IntoView {
             "\npersistent_storage: " {move || persistent_storage().to_string()}
             "\npush: " {move || push().to_string()}
             "\nspeaker: " {move || speaker().to_string()}
+            </>
         </pre>
     }
 }
@@ -45,7 +48,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_prefers_reduced_motion/Cargo.toml b/examples/use_prefers_reduced_motion/Cargo.toml
index 3cdeb8d..48674e8 100644
--- a/examples/use_prefers_reduced_motion/Cargo.toml
+++ b/examples/use_prefers_reduced_motion/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_prefers_reduced_motion", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_prefers_reduced_motion", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_prefers_reduced_motion/src/main.rs b/examples/use_prefers_reduced_motion/src/main.rs
index 2a6adfc..0194ee0 100644
--- a/examples/use_prefers_reduced_motion/src/main.rs
+++ b/examples/use_prefers_reduced_motion/src/main.rs
@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::prelude::*;
 use leptos_use::docs::{demo_or_body, BooleanDisplay};
 use leptos_use::use_prefers_reduced_motion;
 
@@ -23,7 +23,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_raf_fn/Cargo.toml b/examples/use_raf_fn/Cargo.toml
index e9c4c57..d39c162 100644
--- a/examples/use_raf_fn/Cargo.toml
+++ b/examples/use_raf_fn/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_raf_fn", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_raf_fn", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_raf_fn/src/main.rs b/examples/use_raf_fn/src/main.rs
index b658481..b6fbee0 100644
--- a/examples/use_raf_fn/src/main.rs
+++ b/examples/use_raf_fn/src/main.rs
@@ -29,7 +29,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_resize_observer/Cargo.toml b/examples/use_resize_observer/Cargo.toml
index 8ba4ed2..647952f 100644
--- a/examples/use_resize_observer/Cargo.toml
+++ b/examples/use_resize_observer/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_resize_observer", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_resize_observer", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_resize_observer/src/main.rs b/examples/use_resize_observer/src/main.rs
index 2d40199..59e3e19 100644
--- a/examples/use_resize_observer/src/main.rs
+++ b/examples/use_resize_observer/src/main.rs
@@ -5,7 +5,7 @@ use leptos_use::use_resize_observer;
 
 #[component]
 fn Demo() -> impl IntoView {
-    let el = create_node_ref::<Textarea>();
+    let el = NodeRef::<Textarea>::new();
     let (text, set_text) = signal("".to_string());
 
     use_resize_observer(el, move |entries, _| {
@@ -32,7 +32,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_round/Cargo.toml b/examples/use_round/Cargo.toml
index 6786fc8..7a0ac92 100644
--- a/examples/use_round/Cargo.toml
+++ b/examples/use_round/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
@@ -12,5 +15,5 @@ leptos-use = { path = "../..", features = ["docs", "math"] }
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_round/src/main.rs b/examples/use_round/src/main.rs
index 1929d77..b3d1250 100644
--- a/examples/use_round/src/main.rs
+++ b/examples/use_round/src/main.rs
@@ -27,7 +27,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_scroll/Cargo.toml b/examples/use_scroll/Cargo.toml
index 25874cd..d6b6522 100644
--- a/examples/use_scroll/Cargo.toml
+++ b/examples/use_scroll/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_scroll", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_scroll/src/main.rs b/examples/use_scroll/src/main.rs
index b5206ae..bf0d6e4 100644
--- a/examples/use_scroll/src/main.rs
+++ b/examples/use_scroll/src/main.rs
@@ -8,7 +8,7 @@ use web_sys::Event;
 
 #[component]
 fn Demo() -> impl IntoView {
-    let el = create_node_ref::<Div>();
+    let el = NodeRef::<Div>::new();
     let (smooth, set_smooth) = signal(false);
     let behavior = Signal::derive(move || {
         if smooth.get() {
@@ -39,8 +39,8 @@ fn Demo() -> impl IntoView {
         el,
         UseScrollOptions::default()
             .behavior(behavior)
-            .on_stop(on_stop.clone())
-            .on_scroll(on_scroll.clone()),
+            .on_stop(on_stop)
+            .on_scroll(on_scroll),
     );
 
     view! {
@@ -101,7 +101,7 @@ fn Demo() -> impl IntoView {
                             />
                         </div>
                     </div>
-                    <label for_="smooth-scrolling-option" class="text-right opacity-75">
+                    <label for="smooth-scrolling-option" class="text-right opacity-75">
                         "Smooth scrolling"
                     </label>
                     <span>
@@ -140,7 +140,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_service_worker/Cargo.toml b/examples/use_service_worker/Cargo.toml
index f074dd0..c13cc46 100644
--- a/examples/use_service_worker/Cargo.toml
+++ b/examples/use_service_worker/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_service_worker", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_service_worker", "docs"] }
+web-sys = { workspace = true }
+wasm-bindgen = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_service_worker/src/main.rs b/examples/use_service_worker/src/main.rs
index 91e4167..fe066d1 100644
--- a/examples/use_service_worker/src/main.rs
+++ b/examples/use_service_worker/src/main.rs
@@ -38,9 +38,11 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
 
 fn load_meta_element(name: &str) -> Result<web_sys::HtmlMetaElement, String> {
diff --git a/examples/use_sorted/Cargo.toml b/examples/use_sorted/Cargo.toml
index 8ff335f..e3f5a32 100644
--- a/examples/use_sorted/Cargo.toml
+++ b/examples/use_sorted/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_sorted", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_sorted", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_sorted/src/main.rs b/examples/use_sorted/src/main.rs
index 9a05f3d..ceb2f67 100644
--- a/examples/use_sorted/src/main.rs
+++ b/examples/use_sorted/src/main.rs
@@ -3,7 +3,7 @@ use leptos_use::docs::demo_or_body;
 use leptos_use::use_sorted;
 
 fn string_list(list: &[i32]) -> String {
-    list.into_iter()
+    list.iter()
         .map(i32::to_string)
         .collect::<Vec<_>>()
         .join(",")
@@ -11,7 +11,7 @@ fn string_list(list: &[i32]) -> String {
 
 #[component]
 fn Demo() -> impl IntoView {
-    let (list, set_list) = create_signal::<Vec<i32>>(vec![4, 2, 67, 34, 76, 22, 2, 4, 65, 23]);
+    let (list, set_list) = signal::<Vec<i32>>(vec![4, 2, 67, 34, 76, 22, 2, 4, 65, 23]);
 
     let sorted: Signal<Vec<i32>> = use_sorted(list);
 
@@ -38,7 +38,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_storage/Cargo.toml b/examples/use_storage/Cargo.toml
index b8b2285..17a330d 100644
--- a/examples/use_storage/Cargo.toml
+++ b/examples/use_storage/Cargo.toml
@@ -7,12 +7,15 @@ edition = "2021"
 codee = { version = "0.1", features = ["json_serde"] }
 console_error_panic_hook = "0.1"
 console_log = "1"
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 leptos-use = { path = "../..", features = ["storage", "docs"] }
 log = "0.4"
 serde = "1.0.163"
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_storage/src/main.rs b/examples/use_storage/src/main.rs
index 5cdb26e..5577f5c 100644
--- a/examples/use_storage/src/main.rs
+++ b/examples/use_storage/src/main.rs
@@ -1,7 +1,7 @@
+use codee::string::JsonSerdeCodec;
 use leptos::prelude::*;
 use leptos_use::docs::{demo_or_body, Note};
 use leptos_use::storage::use_local_storage;
-use codee::string::JsonSerdeCodec;
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
@@ -25,7 +25,8 @@ impl Default for BananaState {
 
 #[component]
 fn Demo() -> impl IntoView {
-    let (state, set_state, reset) = use_local_storage::<BananaState, JsonSerdeCodec>("banana-state");
+    let (state, set_state, reset) =
+        use_local_storage::<BananaState, JsonSerdeCodec>("banana-state");
     let (state2, _, _) = use_local_storage::<BananaState, JsonSerdeCodec>("banana-state");
 
     view! {
@@ -83,7 +84,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_throttle_fn/Cargo.toml b/examples/use_throttle_fn/Cargo.toml
index d39fc8d..1e44f6a 100644
--- a/examples/use_throttle_fn/Cargo.toml
+++ b/examples/use_throttle_fn/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_throttle_fn", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_throttle_fn", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_throttle_fn/src/main.rs b/examples/use_throttle_fn/src/main.rs
index 0e70cd8..5c09fee 100644
--- a/examples/use_throttle_fn/src/main.rs
+++ b/examples/use_throttle_fn/src/main.rs
@@ -30,7 +30,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_timeout_fn/Cargo.toml b/examples/use_timeout_fn/Cargo.toml
index 608afac..f4cd012 100644
--- a/examples/use_timeout_fn/Cargo.toml
+++ b/examples/use_timeout_fn/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_timeout_fn", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_timeout_fn", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_timeout_fn/src/main.rs b/examples/use_timeout_fn/src/main.rs
index e45df3c..38622b8 100644
--- a/examples/use_timeout_fn/src/main.rs
+++ b/examples/use_timeout_fn/src/main.rs
@@ -31,7 +31,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_timestamp/Cargo.toml b/examples/use_timestamp/Cargo.toml
index 5e0a16f..2bd05f6 100644
--- a/examples/use_timestamp/Cargo.toml
+++ b/examples/use_timestamp/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_timestamp", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_timestamp", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_timestamp/src/main.rs b/examples/use_timestamp/src/main.rs
index d275859..af2b7e5 100644
--- a/examples/use_timestamp/src/main.rs
+++ b/examples/use_timestamp/src/main.rs
@@ -13,7 +13,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_user_media/Cargo.toml b/examples/use_user_media/Cargo.toml
index 170c4af..acc2f21 100644
--- a/examples/use_user_media/Cargo.toml
+++ b/examples/use_user_media/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_user_media", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_user_media", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_user_media/src/main.rs b/examples/use_user_media/src/main.rs
index 54d406c..f07e69b 100644
--- a/examples/use_user_media/src/main.rs
+++ b/examples/use_user_media/src/main.rs
@@ -1,10 +1,10 @@
-use leptos::*;
+use leptos::prelude::*;
 use leptos_use::docs::demo_or_body;
 use leptos_use::{use_user_media, UseUserMediaReturn};
 
 #[component]
 fn Demo() -> impl IntoView {
-    let video_ref = create_node_ref::<leptos::html::Video>();
+    let video_ref = NodeRef::<leptos::html::Video>::new();
 
     let UseUserMediaReturn {
         stream,
@@ -13,17 +13,25 @@ fn Demo() -> impl IntoView {
         ..
     } = use_user_media();
 
-    create_effect(move |_| {
+    Effect::new(move |_| {
         match stream.get() {
             Some(Ok(s)) => {
-                video_ref.get().map(|v| v.set_src_object(Some(&s)));
+                video_ref.with(|v| {
+                    if let Some(v) = v {
+                        v.set_src_object(Some(&s));
+                    }
+                });
                 return;
             }
-            Some(Err(e)) => logging::error!("Failed to get media stream: {:?}", e),
-            None => logging::log!("No stream yet"),
+            Some(Err(e)) => leptos::logging::error!("Failed to get media stream: {:?}", e),
+            None => leptos::logging::log!("No stream yet"),
         }
 
-        video_ref.get().map(|v| v.set_src_object(None));
+        video_ref.with(|v| {
+            if let Some(v) = v {
+                v.set_src_object(None);
+            }
+        });
     });
 
     view! {
@@ -51,7 +59,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_web_notification/Cargo.toml b/examples/use_web_notification/Cargo.toml
index f499927..7f50392 100644
--- a/examples/use_web_notification/Cargo.toml
+++ b/examples/use_web_notification/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_web_notification", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_web_notification", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_web_notification/src/main.rs b/examples/use_web_notification/src/main.rs
index 241ce18..1a1f9c6 100644
--- a/examples/use_web_notification/src/main.rs
+++ b/examples/use_web_notification/src/main.rs
@@ -46,7 +46,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_websocket/Cargo.toml b/examples/use_websocket/Cargo.toml
index 26ed9a6..160a73e 100644
--- a/examples/use_websocket/Cargo.toml
+++ b/examples/use_websocket/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 codee = { version = "0.1", features = ["msgpack_serde"] }
 console_error_panic_hook = "0.1"
 console_log = "1"
@@ -14,5 +17,5 @@ serde = { version = "1", features = ["derive"] }
 web-sys = "0.3"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_websocket/src/main.rs b/examples/use_websocket/src/main.rs
index 0aaef12..5aba341 100644
--- a/examples/use_websocket/src/main.rs
+++ b/examples/use_websocket/src/main.rs
@@ -55,7 +55,7 @@ fn Demo() -> impl IntoView {
         close();
     };
 
-    create_effect(move |_| {
+    Effect::new(move |_| {
         message.with(move |message| {
             if let Some(m) = message {
                 update_history(&set_history, format!("[message]: {:?}", m));
@@ -105,10 +105,10 @@ fn Demo() -> impl IntoView {
         "wss://echo.websocket.events/",
         UseWebSocketOptions::default()
             .immediate(false)
-            .on_open(on_open_callback.clone())
-            .on_close(on_close_callback.clone())
-            .on_error(on_error_callback.clone())
-            .on_message(on_message_callback.clone()),
+            .on_open(on_open_callback)
+            .on_close(on_close_callback)
+            .on_error(on_error_callback)
+            .on_message(on_message_callback),
     );
 
     let open_connection2 = move |_| {
@@ -126,7 +126,7 @@ fn Demo() -> impl IntoView {
 
     let status2 = move || ready_state2.get().to_string();
 
-    create_effect(move |_| {
+    Effect::new(move |_| {
         if let Some(m) = message2.get() {
             update_history(&set_history2, format!("[message]: {:?}", m));
         };
@@ -154,7 +154,7 @@ fn Demo() -> impl IntoView {
                         <h3 class="text-2xl mr-2">"History"</h3>
                         <button
                             on:click=move |_| set_history(vec![])
-                            disabled=move || history.get().len() <= 0
+                            disabled=move || history2.with(Vec::is_empty)
                         >
                             "Clear"
                         </button>
@@ -185,7 +185,7 @@ fn Demo() -> impl IntoView {
                         <h3 class="text-2xl mr-2">"History"</h3>
                         <button
                             on:click=move |_| set_history2(vec![])
-                            disabled=move || history2.get().len() <= 0
+                            disabled=move || history2.with(Vec::is_empty)
                         >
                             "Clear"
                         </button>
@@ -210,7 +210,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Info);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_webtransport/Cargo.toml b/examples/use_webtransport/Cargo.toml
index 680dc93..c77eb99 100644
--- a/examples/use_webtransport/Cargo.toml
+++ b/examples/use_webtransport/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_web_notification", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_web_notification", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_webtransport/src/main.rs b/examples/use_webtransport/src/main.rs
index ae37fb3..f4f56ac 100644
--- a/examples/use_webtransport/src/main.rs
+++ b/examples/use_webtransport/src/main.rs
@@ -41,7 +41,7 @@ fn Demo() -> impl IntoView {
         }
     };
 
-    let _ = watch(
+    Effect::watch(
         transport.datagrams,
         move |grams, _, _| {
             if let Some(grams) = grams {
@@ -64,7 +64,7 @@ fn Demo() -> impl IntoView {
         move |_| {
             let transport = transport.clone();
 
-            spawn_local(async move {
+            leptos::spawn::spawn_local(async move {
                 match transport.open_bidir_stream().await {
                     Ok(bidir_stream) => {
                         let i = id.get_value();
@@ -105,7 +105,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_webtransport/src/stream_bidir.rs b/examples/use_webtransport/src/stream_bidir.rs
index 43788fb..7b1b4a3 100644
--- a/examples/use_webtransport/src/stream_bidir.rs
+++ b/examples/use_webtransport/src/stream_bidir.rs
@@ -14,7 +14,7 @@ pub fn StreamBidir(
         set_log.update(|log| log.push(format!("Sent: '{}'", msg)));
     };
 
-    let _ = watch(
+    Effect::watch(
         stream.bytes,
         move |bytes, _, _| {
             if let Some(bytes) = bytes {
diff --git a/examples/use_webtransport_with_server/client/Cargo.toml b/examples/use_webtransport_with_server/client/Cargo.toml
index a6a7279..9c78a37 100644
--- a/examples/use_webtransport_with_server/client/Cargo.toml
+++ b/examples/use_webtransport_with_server/client/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { git = "https://github.com/leptos-rs/leptos", features = [
+    "nightly",
+    "csr",
+] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
diff --git a/examples/use_webtransport_with_server/client/src/main.rs b/examples/use_webtransport_with_server/client/src/main.rs
index 631a97a..7795ca4 100644
--- a/examples/use_webtransport_with_server/client/src/main.rs
+++ b/examples/use_webtransport_with_server/client/src/main.rs
@@ -118,7 +118,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_window_focus/Cargo.toml b/examples/use_window_focus/Cargo.toml
index ff9224a..41a1e30 100644
--- a/examples/use_window_focus/Cargo.toml
+++ b/examples/use_window_focus/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_window_focus", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_window_focus", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_window_focus/src/main.rs b/examples/use_window_focus/src/main.rs
index 2269608..6bef7be 100644
--- a/examples/use_window_focus/src/main.rs
+++ b/examples/use_window_focus/src/main.rs
@@ -10,7 +10,7 @@ fn Demo() -> impl IntoView {
 
     let focused = use_window_focus();
 
-    let _ = watch(
+    Effect::watch(
         focused,
         move |focused, _, _| {
             if *focused {
@@ -29,7 +29,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_window_scroll/Cargo.toml b/examples/use_window_scroll/Cargo.toml
index 43092e2..4b293a3 100644
--- a/examples/use_window_scroll/Cargo.toml
+++ b/examples/use_window_scroll/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["use_window_scroll", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["use_window_scroll", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/use_window_scroll/src/main.rs b/examples/use_window_scroll/src/main.rs
index 775d349..ef45ead 100644
--- a/examples/use_window_scroll/src/main.rs
+++ b/examples/use_window_scroll/src/main.rs
@@ -28,7 +28,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/watch_debounced/Cargo.toml b/examples/watch_debounced/Cargo.toml
index b7d1872..09424d9 100644
--- a/examples/watch_debounced/Cargo.toml
+++ b/examples/watch_debounced/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["watch_debounced", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["watch_debounced", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/watch_debounced/src/main.rs b/examples/watch_debounced/src/main.rs
index f19f52a..22d2364 100644
--- a/examples/watch_debounced/src/main.rs
+++ b/examples/watch_debounced/src/main.rs
@@ -39,7 +39,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/watch_pausable/Cargo.toml b/examples/watch_pausable/Cargo.toml
index 548f01a..4028912 100644
--- a/examples/watch_pausable/Cargo.toml
+++ b/examples/watch_pausable/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["watch_pausable", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["watch_pausable", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/watch_pausable/src/main.rs b/examples/watch_pausable/src/main.rs
index 9d3f0e1..86b22c8 100644
--- a/examples/watch_pausable/src/main.rs
+++ b/examples/watch_pausable/src/main.rs
@@ -5,7 +5,7 @@ use leptos_use::{watch_pausable, WatchPausableReturn};
 
 #[component]
 fn Demo() -> impl IntoView {
-    let input = create_node_ref::<Input>();
+    let input = NodeRef::<Input>::new();
     let (log, set_log) = signal("".to_string());
     let (source, set_source) = signal("".to_string());
 
@@ -61,7 +61,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/watch_throttled/Cargo.toml b/examples/watch_throttled/Cargo.toml
index d69a67a..4dbd421 100644
--- a/examples/watch_throttled/Cargo.toml
+++ b/examples/watch_throttled/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["watch_throttled", "docs"] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { workspace = true, features = ["watch_throttled", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }
diff --git a/examples/watch_throttled/src/main.rs b/examples/watch_throttled/src/main.rs
index e8dd004..1f977e5 100644
--- a/examples/watch_throttled/src/main.rs
+++ b/examples/watch_throttled/src/main.rs
@@ -36,7 +36,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/src/core/elements_maybe_signal.rs b/src/core/elements_maybe_signal.rs
index 26ef88c..86cb9de 100644
--- a/src/core/elements_maybe_signal.rs
+++ b/src/core/elements_maybe_signal.rs
@@ -315,7 +315,7 @@ where
     T: Into<E> + Clone + 'static,
 {
     fn from(target: &[Option<T>]) -> Self {
-        Self::Static(SendWrapper::new(target.iter().map(|t| t.clone()).collect()))
+        Self::Static(SendWrapper::new(target.to_vec()))
     }
 }
 
@@ -335,7 +335,7 @@ where
     T: Into<E> + Clone + 'static,
 {
     fn from(target: Vec<Option<T>>) -> Self {
-        Self::Static(SendWrapper::new(target.into_iter().map(|t| t).collect()))
+        Self::Static(SendWrapper::new(target.into_iter().collect()))
     }
 }
 
diff --git a/src/on_click_outside.rs b/src/on_click_outside.rs
index 7f0f14d..89a44d9 100644
--- a/src/on_click_outside.rs
+++ b/src/on_click_outside.rs
@@ -61,7 +61,7 @@ cfg_if! { if #[cfg(not(feature = "ssr"))] {
 /// #
 /// # #[component]
 /// # fn Demo() -> impl IntoView {
-/// # let target = create_node_ref::<Div>();
+/// # let target = NodeRef::<Div>::new();
 /// #
 /// on_click_outside_with_options(
 ///     target,
diff --git a/src/storage/use_storage.rs b/src/storage/use_storage.rs
index d681793..6e01c1e 100644
--- a/src/storage/use_storage.rs
+++ b/src/storage/use_storage.rs
@@ -376,7 +376,7 @@ where
                     // Delete directly from storage
                     let result = storage
                         .remove_item(&key)
-                        .map_err(|e| UseStorageError::RemoveItemFailed(e));
+                        .map_err(UseStorageError::RemoveItemFailed);
                     let _ = handle_error(&on_error, result);
                     notify.trigger();
                     dispatch_storage_event();
diff --git a/src/use_css_var.rs b/src/use_css_var.rs
index 3eae19f..2ec6949 100644
--- a/src/use_css_var.rs
+++ b/src/use_css_var.rs
@@ -155,7 +155,7 @@ where
             );
         }
 
-        let _ = watch(
+        Effect::watch(
                         move || variable.get(),
             move |val, _, _| {
                 if let Some(el) = el_signal.get() {
diff --git a/src/use_device_orientation.rs b/src/use_device_orientation.rs
index f9c0f67..0fb9c5b 100644
--- a/src/use_device_orientation.rs
+++ b/src/use_device_orientation.rs
@@ -44,6 +44,7 @@ pub fn use_device_orientation() -> UseDeviceOrientationReturn {
         use leptos::prelude::*;
         use crate::{use_event_listener_with_options, UseEventListenerOptions, use_supported, js};
         use leptos::ev::deviceorientation;
+        use send_wrapper::SendWrapper;
 
         let is_supported = use_supported(|| js!("DeviceOrientationEvent" in &window()));
         let (absolute, set_absolute) = signal(false);
@@ -69,11 +70,13 @@ pub fn use_device_orientation() -> UseDeviceOrientationReturn {
 
             on_cleanup({
                 let cleanup = SendWrapper::new(cleanup);
+                #[allow(clippy::redundant_closure)]
                 move || cleanup()
             });
         }
     }}
 
+    #[allow(clippy::useless_conversion)]
     UseDeviceOrientationReturn {
         is_supported,
         absolute: absolute.into(),
diff --git a/src/use_draggable.rs b/src/use_draggable.rs
index 54ad4b6..73ef1fe 100644
--- a/src/use_draggable.rs
+++ b/src/use_draggable.rs
@@ -2,7 +2,6 @@ use crate::core::{ElementMaybeSignal, MaybeRwSignal, PointerType, Position};
 use crate::{use_event_listener_with_options, use_window, UseEventListenerOptions, UseWindow};
 use default_struct_builder::DefaultBuilder;
 use leptos::ev::{pointerdown, pointermove, pointerup};
-use leptos::prelude::diagnostics::SpecialNonReactiveZone;
 use leptos::prelude::wrappers::read::Signal;
 use leptos::prelude::*;
 use std::marker::PhantomData;
@@ -138,7 +137,7 @@ where
                 };
 
                 #[cfg(debug_assertions)]
-                let zone = SpecialNonReactiveZone::enter();
+                let zone = leptos::prelude::diagnostics::SpecialNonReactiveZone::enter();
 
                 if !on_start(UseDraggableCallbackArgs {
                     position,
@@ -173,7 +172,7 @@ where
                 set_position.set(position);
 
                 #[cfg(debug_assertions)]
-                let zone = SpecialNonReactiveZone::enter();
+                let zone = leptos::prelude::diagnostics::SpecialNonReactiveZone::enter();
 
                 on_move(UseDraggableCallbackArgs {
                     position,
@@ -198,7 +197,7 @@ where
         set_start_position.set(None);
 
         #[cfg(debug_assertions)]
-        let zone = SpecialNonReactiveZone::enter();
+        let zone = leptos::prelude::diagnostics::SpecialNonReactiveZone::enter();
 
         on_end(UseDraggableCallbackArgs {
             position: position.get_untracked(),
diff --git a/src/use_element_bounding.rs b/src/use_element_bounding.rs
index 74b495f..ac31381 100644
--- a/src/use_element_bounding.rs
+++ b/src/use_element_bounding.rs
@@ -124,7 +124,7 @@ where
             }
         });
 
-        let _ = watch(
+        Effect::watch(
             move || target.get(),
             {
                 let update = update.clone();
diff --git a/src/use_event_listener.rs b/src/use_event_listener.rs
index c4020de..5f581fc 100644
--- a/src/use_event_listener.rs
+++ b/src/use_event_listener.rs
@@ -190,6 +190,7 @@ where
 
         on_cleanup({
             let stop = SendWrapper::new(stop.clone());
+            #[allow(clippy::redundant_closure)]
             move || stop()
         });
 
diff --git a/src/use_event_source.rs b/src/use_event_source.rs
index 4366372..759bfb1 100644
--- a/src/use_event_source.rs
+++ b/src/use_event_source.rs
@@ -2,7 +2,6 @@ use crate::core::ConnectionReadyState;
 use crate::{js, use_event_listener, ReconnectLimit};
 use codee::Decoder;
 use default_struct_builder::DefaultBuilder;
-use leptos::prelude::diagnostics::SpecialNonReactiveZone;
 use leptos::prelude::*;
 use std::marker::PhantomData;
 use std::sync::atomic::{AtomicBool, AtomicU32};
@@ -235,7 +234,7 @@ where
                             );
                         } else {
                             #[cfg(debug_assertions)]
-                            let _z = SpecialNonReactiveZone::enter();
+                            let _z = leptos::prelude::diagnostics::SpecialNonReactiveZone::enter();
 
                             on_failed();
                         }
diff --git a/src/use_favicon.rs b/src/use_favicon.rs
index 5c1c791..b8fbc0e 100644
--- a/src/use_favicon.rs
+++ b/src/use_favicon.rs
@@ -92,7 +92,7 @@ pub fn use_favicon_with_options(
             }
         };
 
-        let _ = watch(
+        Effect::watch(
                         move || favicon.get(),
             move |new_icon, prev_icon, _| {
                 if Some(new_icon) != prev_icon {
diff --git a/src/use_infinite_scroll.rs b/src/use_infinite_scroll.rs
index 3723bbc..32b9eff 100644
--- a/src/use_infinite_scroll.rs
+++ b/src/use_infinite_scroll.rs
@@ -6,7 +6,6 @@ use crate::{
 use default_struct_builder::DefaultBuilder;
 use futures_util::join;
 use gloo_timers::future::sleep;
-use leptos::prelude::diagnostics::SpecialNonReactiveZone;
 use leptos::prelude::wrappers::read::Signal;
 use leptos::prelude::*;
 use std::future::Future;
@@ -160,7 +159,7 @@ where
                     let measure = measure.clone();
                     leptos::spawn::spawn_local(async move {
                         #[cfg(debug_assertions)]
-                        let zone = SpecialNonReactiveZone::enter();
+                        let zone = leptos::prelude::diagnostics::SpecialNonReactiveZone::enter();
 
                         join!(
                             on_load_more.with_value(|f| f(state)),
diff --git a/src/use_interval_fn.rs b/src/use_interval_fn.rs
index a8432e8..b5c7fa3 100644
--- a/src/use_interval_fn.rs
+++ b/src/use_interval_fn.rs
@@ -3,11 +3,10 @@
 use crate::utils::Pausable;
 use default_struct_builder::DefaultBuilder;
 use leptos::leptos_dom::helpers::IntervalHandle;
-use leptos::prelude::diagnostics::SpecialNonReactiveZone;
 use leptos::prelude::*;
 use send_wrapper::SendWrapper;
 use std::cell::Cell;
-use std::rc::Rc;
+use std::sync::Arc;
 use std::time::Duration;
 
 /// Wrapper for `set_interval` with controls.
@@ -41,9 +40,9 @@ use std::time::Duration;
 pub fn use_interval_fn<CbFn, N>(
     callback: CbFn,
     interval: N,
-) -> Pausable<impl Fn() + Clone, impl Fn() + Clone>
+) -> Pausable<impl Fn() + Clone + Send + Sync, impl Fn() + Clone + Send + Sync>
 where
-    CbFn: Fn() + Clone + 'static,
+    CbFn: Fn() + Clone + 'static + Send + Sync,
     N: Into<MaybeSignal<u64>>,
 {
     use_interval_fn_with_options(callback, interval, UseIntervalFnOptions::default())
@@ -64,15 +63,16 @@ where
         immediate_callback,
     } = options;
 
-    let timer: Rc<Cell<Option<IntervalHandle>>> = Rc::new(Cell::new(None));
+    let timer: Arc<SendWrapper<Cell<Option<IntervalHandle>>>> =
+        Arc::new(SendWrapper::new(Cell::new(None)));
 
     let (is_active, set_active) = signal(false);
 
     let clean = {
-        let timer = Rc::clone(&timer);
+        let timer = Arc::clone(&timer);
 
         move || {
-            if let Some(handle) = timer.take() {
+            if let Some(handle) = Cell::take(&timer) {
                 handle.clear();
             }
         }
@@ -104,7 +104,7 @@ where
 
                 move || {
                     #[cfg(debug_assertions)]
-                    let _z = SpecialNonReactiveZone::enter();
+                    let _z = leptos::prelude::diagnostics::SpecialNonReactiveZone::enter();
 
                     callback();
                 }
@@ -127,6 +127,7 @@ where
     }
 
     if matches!(interval, MaybeSignal::Dynamic(_)) {
+        #[allow(clippy::clone_on_copy)]
         let resume = resume.clone();
 
         let effect = Effect::watch(
@@ -143,6 +144,7 @@ where
 
     on_cleanup({
         let pause = SendWrapper::new(pause.clone());
+        #[allow(clippy::redundant_closure)]
         move || pause()
     });
 
diff --git a/src/use_locales.rs b/src/use_locales.rs
index 1e6dbc5..110f4ff 100644
--- a/src/use_locales.rs
+++ b/src/use_locales.rs
@@ -1,7 +1,7 @@
 use crate::utils::get_header;
 use default_struct_builder::DefaultBuilder;
 use leptos::prelude::*;
-use std::rc::Rc;
+use std::sync::Arc;
 
 /// Reactive locales.
 ///
@@ -62,11 +62,12 @@ pub fn use_locales_with_options(options: UseLocalesOptions) -> Signal<Vec<String
                 .collect::<Vec<String>>()
         };
 
-        let (locales, set_locales) = create_signal(read_navigator_languages());
+        let (locales, set_locales) = signal(read_navigator_languages());
 
-        let _ = crate::use_event_listener(crate::use_window(), ev::languagechange, move |_| {
-            set_locales.update(|locales| *locales = read_navigator_languages());
-        });
+        let _ =
+            crate::use_event_listener(crate::use_window(), leptos::ev::languagechange, move |_| {
+                set_locales.update(|locales| *locales = read_navigator_languages());
+            });
 
         locales.into()
     }
@@ -100,13 +101,13 @@ pub struct UseLocalesOptions {
     /// Getter function to return the string value of the accept languange header.
     /// When you use one of the features `"axum"`, `"actix"` or `"spin"` there's a valid default implementation provided.
     #[allow(dead_code)]
-    ssr_lang_header_getter: Rc<dyn Fn() -> Option<String>>,
+    ssr_lang_header_getter: Arc<dyn Fn() -> Option<String>>,
 }
 
 impl Default for UseLocalesOptions {
     fn default() -> Self {
         Self {
-            ssr_lang_header_getter: Rc::new(move || {
+            ssr_lang_header_getter: Arc::new(move || {
                 get_header!(ACCEPT_LANGUAGE, use_locale, ssr_lang_header_getter)
             }),
         }
diff --git a/src/use_media_query.rs b/src/use_media_query.rs
index 0bfee2e..e63475b 100644
--- a/src/use_media_query.rs
+++ b/src/use_media_query.rs
@@ -96,6 +96,7 @@ pub fn use_media_query(query: impl Into<MaybeSignal<String>>) -> Signal<bool> {
 
         on_cleanup({
             let cleanup = send_wrapper::SendWrapper::new(cleanup);
+            #[allow(clippy::redundant_closure)]
             move || cleanup()
         });
     }}
diff --git a/src/use_mouse_in_element.rs b/src/use_mouse_in_element.rs
index e01f994..63f1560 100644
--- a/src/use_mouse_in_element.rs
+++ b/src/use_mouse_in_element.rs
@@ -108,7 +108,7 @@ where
         let target = target.into();
         let window = window();
 
-        let stop = watch(
+        let effect = Effect::watch(
             move || (target.get(), x.get(), y.get()),
             move |(el, x, y), _, _| {
                 if let Some(el) = el {
@@ -146,6 +146,8 @@ where
             false,
         );
 
+        let stop = move || effect.stop();
+
         let _ = use_event_listener(document(), mouseleave, move |_| set_outside.set(true));
     }}
 
diff --git a/src/use_mutation_observer.rs b/src/use_mutation_observer.rs
index abf97f6..eb24c24 100644
--- a/src/use_mutation_observer.rs
+++ b/src/use_mutation_observer.rs
@@ -125,7 +125,7 @@ where
         let stop_watch = {
             let cleanup = cleanup.clone();
 
-            leptos::prelude::watch(
+            let stop = Effect::watch(
                 move || targets.get(),
                 move |targets, _, _| {
                     cleanup();
@@ -144,7 +144,9 @@ where
                     }
                 },
                 false,
-            )
+            );
+
+            move || stop.stop()
         };
 
         let stop = move || {
@@ -154,6 +156,7 @@ where
 
         on_cleanup({
             let stop = SendWrapper::new(stop.clone());
+            #[allow(clippy::redundant_closure)]
             move || stop()
         });
 
diff --git a/src/use_raf_fn.rs b/src/use_raf_fn.rs
index 0568caf..714e487 100644
--- a/src/use_raf_fn.rs
+++ b/src/use_raf_fn.rs
@@ -1,7 +1,6 @@
 use crate::utils::Pausable;
 use cfg_if::cfg_if;
 use default_struct_builder::DefaultBuilder;
-use leptos::prelude::diagnostics::SpecialNonReactiveZone;
 use leptos::prelude::*;
 use std::cell::{Cell, RefCell};
 use std::rc::Rc;
@@ -86,6 +85,7 @@ pub fn use_raf_fn_with_options(
     };
 
     let loop_fn = {
+        #[allow(clippy::clone_on_copy)]
         let request_next_frame = request_next_frame.clone();
         let previous_frame_timestamp = Cell::new(0.0_f64);
 
@@ -102,7 +102,7 @@ pub fn use_raf_fn_with_options(
             };
 
             #[cfg(debug_assertions)]
-            let zone = SpecialNonReactiveZone::enter();
+            let zone = leptos::prelude::diagnostics::SpecialNonReactiveZone::enter();
 
             callback(UseRafFnCallbackArgs { delta, timestamp });
 
@@ -140,6 +140,7 @@ pub fn use_raf_fn_with_options(
 
     on_cleanup({
         let pause = send_wrapper::SendWrapper::new(pause.clone());
+        #[allow(clippy::redundant_closure)]
         move || pause()
     });
 
diff --git a/src/use_resize_observer.rs b/src/use_resize_observer.rs
index 031508c..db4289f 100644
--- a/src/use_resize_observer.rs
+++ b/src/use_resize_observer.rs
@@ -126,7 +126,7 @@ where
         let stop_watch = {
             let cleanup = cleanup.clone();
 
-            watch(
+            let stop = Effect::watch(
                 move || targets.get(),
                 move |targets, _, _| {
                     cleanup();
@@ -145,7 +145,9 @@ where
                     }
                 },
                 true,
-            )
+            );
+
+            move || stop.stop()
         };
 
         let stop = move || {
@@ -155,6 +157,7 @@ where
 
         on_cleanup({
             let stop = send_wrapper::SendWrapper::new(stop.clone());
+            #[allow(clippy::redundant_closure)]
             move || stop()
         });
 
diff --git a/src/use_service_worker.rs b/src/use_service_worker.rs
index 4fed646..8095c97 100644
--- a/src/use_service_worker.rs
+++ b/src/use_service_worker.rs
@@ -1,6 +1,5 @@
 use default_struct_builder::DefaultBuilder;
 use leptos::prelude::actions::Action;
-use leptos::prelude::diagnostics::SpecialNonReactiveZone;
 use leptos::prelude::wrappers::read::Signal;
 use leptos::prelude::*;
 use send_wrapper::SendWrapper;
@@ -55,7 +54,7 @@ pub fn use_service_worker_with_options(
         let on_controller_change = options.on_controller_change.clone();
         let js_closure = Closure::wrap(Box::new(move |_event: JsValue| {
             #[cfg(debug_assertions)]
-            let _z = SpecialNonReactiveZone::enter();
+            let _z = leptos::prelude::diagnostics::SpecialNonReactiveZone::enter();
 
             on_controller_change();
         }) as Box<dyn FnMut(JsValue)>)
@@ -84,7 +83,7 @@ pub fn use_service_worker_with_options(
         match a {
             Some(res) => res.map_err(ServiceWorkerRegistrationError::Js),
             None => match b {
-                Some(res) => res.map_err(|e| ServiceWorkerRegistrationError::Js(e)),
+                Some(res) => res.map_err(ServiceWorkerRegistrationError::Js),
                 None => Err(ServiceWorkerRegistrationError::NeverQueried),
             },
         }
diff --git a/src/use_timestamp.rs b/src/use_timestamp.rs
index d05639c..a02812d 100644
--- a/src/use_timestamp.rs
+++ b/src/use_timestamp.rs
@@ -4,7 +4,6 @@ use crate::{
     use_interval_fn_with_options, use_raf_fn_with_options, UseIntervalFnOptions, UseRafFnOptions,
 };
 use default_struct_builder::DefaultBuilder;
-use leptos::prelude::diagnostics::SpecialNonReactiveZone;
 use leptos::prelude::wrappers::read::Signal;
 use leptos::prelude::*;
 use std::rc::Rc;
@@ -88,7 +87,7 @@ pub fn use_timestamp_with_controls_and_options(options: UseTimestampOptions) ->
             update();
 
             #[cfg(debug_assertions)]
-            let _z = SpecialNonReactiveZone::enter();
+            let _z = leptos::prelude::diagnostics::SpecialNonReactiveZone::enter();
 
             callback(ts.get_untracked());
         }
diff --git a/src/use_web_notification.rs b/src/use_web_notification.rs
index 9f37854..34f528a 100644
--- a/src/use_web_notification.rs
+++ b/src/use_web_notification.rs
@@ -69,6 +69,7 @@ pub fn use_web_notification_with_options(
         use leptos::ev::visibilitychange;
         use wasm_bindgen::closure::Closure;
         use wasm_bindgen::JsCast;
+        use send_wrapper::SendWrapper;
 
         let on_click_closure = Closure::<dyn Fn(web_sys::Event)>::new({
             let on_click = Rc::clone(&options.on_click);
@@ -121,7 +122,7 @@ pub fn use_web_notification_with_options(
             let on_error_closure = on_error_closure.clone();
             let on_show_closure = on_show_closure.clone();
 
-            move |options_override: ShowOptions| {
+            let show = move |options_override: ShowOptions| {
                 if !is_supported.get_untracked() {
                     return;
                 }
@@ -132,7 +133,7 @@ pub fn use_web_notification_with_options(
                 let on_error_closure = on_error_closure.clone();
                 let on_show_closure = on_show_closure.clone();
 
-                spawn_local(async move {
+                leptos::spawn::spawn_local(async move {
                     set_permission.set(request_web_notification_permission().await);
 
                     let mut notification_options = web_sys::NotificationOptions::from(&options);
@@ -151,7 +152,9 @@ pub fn use_web_notification_with_options(
 
                     set_notification.set(Some(notification_value));
                 });
-            }
+            };
+            let wrapped_show = SendWrapper::new(show);
+            move |options_override: ShowOptions| wrapped_show(options_override)
         };
 
         let close = {
@@ -165,7 +168,7 @@ pub fn use_web_notification_with_options(
             }
         };
 
-        spawn_local(async move {
+        leptos::spawn::spawn_local(async move {
             set_permission.set(request_web_notification_permission().await);
         });
 
@@ -489,8 +492,8 @@ async fn request_web_notification_permission() -> NotificationPermission {
 /// Return type for [`use_web_notification`].
 pub struct UseWebNotificationReturn<ShowFn, CloseFn>
 where
-    ShowFn: Fn(ShowOptions) + Clone,
-    CloseFn: Fn() + Clone,
+    ShowFn: Fn(ShowOptions) + Clone + Send + Sync,
+    CloseFn: Fn() + Clone + Send + Sync,
 {
     pub is_supported: Signal<bool>,
     pub notification: Signal<Option<web_sys::Notification>, LocalStorage>,
diff --git a/src/utils/filters/debounce.rs b/src/utils/filters/debounce.rs
index dc835e4..a1fed99 100644
--- a/src/utils/filters/debounce.rs
+++ b/src/utils/filters/debounce.rs
@@ -3,7 +3,6 @@
 use cfg_if::cfg_if;
 use default_struct_builder::DefaultBuilder;
 use leptos::leptos_dom::helpers::TimeoutHandle;
-use leptos::prelude::diagnostics::SpecialNonReactiveZone;
 use leptos::prelude::*;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
@@ -53,7 +52,7 @@ where
         let last_return_val = Arc::clone(&last_return_value);
         let invoke = move || {
             #[cfg(debug_assertions)]
-            let zone = SpecialNonReactiveZone::enter();
+            let zone = leptos::prelude::diagnostics::SpecialNonReactiveZone::enter();
 
             let return_value = _invoke();
 
diff --git a/src/utils/filters/throttle.rs b/src/utils/filters/throttle.rs
index 0227fce..d12785a 100644
--- a/src/utils/filters/throttle.rs
+++ b/src/utils/filters/throttle.rs
@@ -4,7 +4,6 @@ use crate::core::now;
 use cfg_if::cfg_if;
 use default_struct_builder::DefaultBuilder;
 use leptos::leptos_dom::helpers::TimeoutHandle;
-use leptos::prelude::diagnostics::SpecialNonReactiveZone;
 use leptos::prelude::*;
 use std::cmp::max;
 use std::sync::{atomic::AtomicBool, Arc, Mutex};
@@ -59,7 +58,7 @@ where
         let last_return_val = Arc::clone(&last_return_value);
         let invoke = move || {
             #[cfg(debug_assertions)]
-            let zone = SpecialNonReactiveZone::enter();
+            let zone = leptos::prelude::diagnostics::SpecialNonReactiveZone::enter();
 
             let return_value = _invoke();
 
diff --git a/src/utils/header.rs b/src/utils/header.rs
index 0e9d6cd..2df4a81 100644
--- a/src/utils/header.rs
+++ b/src/utils/header.rs
@@ -2,7 +2,7 @@
 use http0_2::HeaderName;
 #[cfg(any(feature = "axum", feature = "spin"))]
 use http1::HeaderName;
-use leptos::*;
+use leptos::prelude::*;
 
 /// Get the value of the header with the given name.
 ///
diff --git a/src/watch_with_options.rs b/src/watch_with_options.rs
index 46cad32..4aea34d 100644
--- a/src/watch_with_options.rs
+++ b/src/watch_with_options.rs
@@ -1,7 +1,7 @@
 use crate::filter_builder_methods;
 use crate::utils::{create_filter_wrapper, DebounceOptions, FilterOptions, ThrottleOptions};
 use default_struct_builder::DefaultBuilder;
-use leptos::prelude::{diagnostics::SpecialNonReactiveZone, *};
+use leptos::prelude::*;
 use std::cell::RefCell;
 use std::rc::Rc;
 
@@ -111,7 +111,7 @@ where
 
         move || {
             #[cfg(debug_assertions)]
-            let _z = SpecialNonReactiveZone::enter();
+            let _z = leptos::prelude::diagnostics::SpecialNonReactiveZone::enter();
 
             let ret = callback(
                 cur_deps_value
diff --git a/template/examples/{{ function_name }}/Cargo.ffizer.hbs.toml b/template/examples/{{ function_name }}/Cargo.ffizer.hbs.toml
index 5ebdd19..f67939b 100644
--- a/template/examples/{{ function_name }}/Cargo.ffizer.hbs.toml	
+++ b/template/examples/{{ function_name }}/Cargo.ffizer.hbs.toml	
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-log = "0.4"
-leptos-use = { path = "../..", features = ["docs"{{#if feature}}, "{{ feature }}"{{/if}}] }
-web-sys = "0.3"
+leptos = { workspace = true, features = ["nightly", "csr"] }
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+log = { workspace = true }
+leptos-use = { path = "../..", features = ["{{ feature }}", "docs"] }
+web-sys = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-test = { workspace = true }