diff --git a/Cargo.toml b/Cargo.toml
index 146057f..1b08bc8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,6 @@ thaw_components = { version = "0.2.0-alpha", path = "./thaw_components" }
 thaw_macro = { version = "0.1.0-alpha", path = "./thaw_macro" }
 thaw_utils = { version = "0.1.0-alpha", path = "./thaw_utils" }
 
-leptos = { git = "https://github.com/leptos-rs/leptos", rev = "867036559489e86c1f25cdf7133d803d88b0579b" }
-leptos_meta = { git = "https://github.com/leptos-rs/leptos", rev = "867036559489e86c1f25cdf7133d803d88b0579b" }
-leptos_router = { git = "https://github.com/leptos-rs/leptos", rev = "867036559489e86c1f25cdf7133d803d88b0579b" }
+leptos = { git = "https://github.com/leptos-rs/leptos", rev = "20af4928b2fffe017408d3f4e7330db22cf68277" }
+leptos_meta = { git = "https://github.com/leptos-rs/leptos", rev = "20af4928b2fffe017408d3f4e7330db22cf68277" }
+leptos_router = { git = "https://github.com/leptos-rs/leptos", rev = "20af4928b2fffe017408d3f4e7330db22cf68277" }
diff --git a/demo/src/app.rs b/demo/src/app.rs
index 24be698..030224f 100644
--- a/demo/src/app.rs
+++ b/demo/src/app.rs
@@ -58,64 +58,56 @@ fn TheRouter() -> impl IntoView {
                     <Route path=path!("/development/components") view=DevelopmentComponentsMdPage/>
                 </ParentRoute>
                 <ParentRoute path=path!("/components") view=ComponentsPage>
-                    {
-                        view! {
-                            <Route path=path!("/accordion") view=AccordionMdPage/>
-                            <Route path=path!("/anchor") view=AnchorMdPage/>
-                            <Route path=path!("/auto-complete") view=AutoCompleteMdPage/>
-                            <Route path=path!("/avatar") view=AvatarMdPage/>
-                            <Route path=path!("/back-top") view=BackTopMdPage/>
-                            <Route path=path!("/badge") view=BadgeMdPage/>
-                            <Route path=path!("/breadcrumb") view=BreadcrumbMdPage/>
-                            <Route path=path!("/button") view=ButtonMdPage/>
-                            <Route path=path!("/calendar") view=CalendarMdPage/>
-                            <Route path=path!("/card") view=CardMdPage/>
-                            <Route path=path!("/checkbox") view=CheckboxMdPage/>
-                            <Route path=path!("/color-picker") view=ColorPickerMdPage/>
-                            <Route path=path!("/combobox") view=ComboboxMdPage/>
-                            <Route path=path!("/config-provider") view=ConfigProviderMdPage/>
-                        }
-                    }
-                    {
-                        view! {
-                            <Route path=path!("date-picker") view=DatePickerMdPage/>
-                            <Route path=path!("/dialog") view=DialogMdPage/>
-                            <Route path=path!("/divider") view=DividerMdPage/>
-                            <Route path=path!("/drawer") view=DrawerMdPage/>
-                            <Route path=path!("/menu") view=MenuMdPage/>
-                            <Route path=path!("/grid") view=GridMdPage/>
-                            <Route path=path!("/icon") view=IconMdPage/>
-                            <Route path=path!("/image") view=ImageMdPage/>
-                            <Route path=path!("/input") view=InputMdPage/>
-                            <Route path=path!("/layout") view=LayoutMdPage/>
-                            <Route path=path!("/loading-bar") view=LoadingBarMdPage/>
-                            <Route path=path!("/message-bar") view=MessageBarMdPage/>
-                            <Route path=path!("/nav") view=NavMdPage/>
-                            <Route path=path!("/pagination") view=PaginationMdPage/>
-                            <Route path=path!("/popover") view=PopoverMdPage/>
-                            <Route path=path!("/progress-bar") view=ProgressBarMdPage/>
-                        }
-                    }
-                    {
-                        view! {
-                            <Route path=path!("/radio") view=RadioMdPage/>
-                            <Route path=path!("/scrollbar") view=ScrollbarMdPage/>
-                            <Route path=path!("/skeleton") view=SkeletonMdPage/>
-                            <Route path=path!("/slider") view=SliderMdPage/>
-                            <Route path=path!("/space") view=SpaceMdPage/>
-                            <Route path=path!("/spin-button") view=SpinButtonMdPage/>
-                            <Route path=path!("/spinner") view=SpinnerMdPage/>
-                            <Route path=path!("/switch") view=SwitchMdPage/>
-                            <Route path=path!("/tab-list") view=TabListMdPage/>
-                            <Route path=path!("/table") view=TableMdPage/>
-                            <Route path=path!("/tag") view=TagMdPage/>
-                            <Route path=path!("/text") view=TextMdPage/>
-                            <Route path=path!("/textarea") view=TextareaMdPage/>
-                            <Route path=path!("/time-picker") view=TimePickerMdPage/>
-                            <Route path=path!("/toast") view=ToastMdPage />
-                            <Route path=path!("/upload") view=UploadMdPage/>
-                        }
-                    }
+                    <Route path=path!("/accordion") view=AccordionMdPage/>
+                    <Route path=path!("/anchor") view=AnchorMdPage/>
+                    <Route path=path!("/auto-complete") view=AutoCompleteMdPage/>
+                    <Route path=path!("/avatar") view=AvatarMdPage/>
+                    <Route path=path!("/back-top") view=BackTopMdPage/>
+                    <Route path=path!("/badge") view=BadgeMdPage/>
+                    <Route path=path!("/breadcrumb") view=BreadcrumbMdPage/>
+                    <Route path=path!("/button") view=ButtonMdPage/>
+                    <Route path=path!("/calendar") view=CalendarMdPage/>
+                    <Route path=path!("/card") view=CardMdPage/>
+                    <Route path=path!("/checkbox") view=CheckboxMdPage/>
+                    <Route path=path!("/color-picker") view=ColorPickerMdPage/>
+                    <Route path=path!("/combobox") view=ComboboxMdPage/>
+                    <Route path=path!("/config-provider") view=ConfigProviderMdPage/>
+                </ParentRoute>
+                <ParentRoute path=path!("/components") view=ComponentsPage>
+                    <Route path=path!("date-picker") view=DatePickerMdPage/>
+                    <Route path=path!("/dialog") view=DialogMdPage/>
+                    <Route path=path!("/divider") view=DividerMdPage/>
+                    <Route path=path!("/drawer") view=DrawerMdPage/>
+                    <Route path=path!("/menu") view=MenuMdPage/>
+                    <Route path=path!("/grid") view=GridMdPage/>
+                    <Route path=path!("/icon") view=IconMdPage/>
+                    <Route path=path!("/image") view=ImageMdPage/>
+                    <Route path=path!("/input") view=InputMdPage/>
+                    <Route path=path!("/layout") view=LayoutMdPage/>
+                    <Route path=path!("/loading-bar") view=LoadingBarMdPage/>
+                    <Route path=path!("/message-bar") view=MessageBarMdPage/>
+                    <Route path=path!("/nav") view=NavMdPage/>
+                    <Route path=path!("/pagination") view=PaginationMdPage/>
+                    <Route path=path!("/popover") view=PopoverMdPage/>
+                    <Route path=path!("/progress-bar") view=ProgressBarMdPage/>
+                </ParentRoute>
+                <ParentRoute path=path!("/components") view=ComponentsPage>
+                    <Route path=path!("/radio") view=RadioMdPage/>
+                    <Route path=path!("/scrollbar") view=ScrollbarMdPage/>
+                    <Route path=path!("/skeleton") view=SkeletonMdPage/>
+                    <Route path=path!("/slider") view=SliderMdPage/>
+                    <Route path=path!("/space") view=SpaceMdPage/>
+                    <Route path=path!("/spin-button") view=SpinButtonMdPage/>
+                    <Route path=path!("/spinner") view=SpinnerMdPage/>
+                    <Route path=path!("/switch") view=SwitchMdPage/>
+                    <Route path=path!("/tab-list") view=TabListMdPage/>
+                    <Route path=path!("/table") view=TableMdPage/>
+                    <Route path=path!("/tag") view=TagMdPage/>
+                    <Route path=path!("/text") view=TextMdPage/>
+                    <Route path=path!("/textarea") view=TextareaMdPage/>
+                    <Route path=path!("/time-picker") view=TimePickerMdPage/>
+                    <Route path=path!("/toast") view=ToastMdPage />
+                    <Route path=path!("/upload") view=UploadMdPage/>
                 </ParentRoute>
             </Routes>
         </Router>
diff --git a/examples/ssr_axum/Cargo.toml b/examples/ssr_axum/Cargo.toml
index 59d6239..222c7ab 100644
--- a/examples/ssr_axum/Cargo.toml
+++ b/examples/ssr_axum/Cargo.toml
@@ -9,10 +9,10 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 axum = { version = "0.7.4", optional = true }
 console_error_panic_hook = "0.1"
-leptos = { git = "https://github.com/leptos-rs/leptos", rev = "867036559489e86c1f25cdf7133d803d88b0579b" }
-leptos_axum = { git = "https://github.com/leptos-rs/leptos", rev = "867036559489e86c1f25cdf7133d803d88b0579b", optional = true }
-leptos_meta = { git = "https://github.com/leptos-rs/leptos", rev = "867036559489e86c1f25cdf7133d803d88b0579b" }
-leptos_router = { git = "https://github.com/leptos-rs/leptos", rev = "867036559489e86c1f25cdf7133d803d88b0579b" }
+leptos = { git = "https://github.com/leptos-rs/leptos", rev = "20af4928b2fffe017408d3f4e7330db22cf68277" }
+leptos_axum = { git = "https://github.com/leptos-rs/leptos", rev = "20af4928b2fffe017408d3f4e7330db22cf68277", optional = true }
+leptos_meta = { git = "https://github.com/leptos-rs/leptos", rev = "20af4928b2fffe017408d3f4e7330db22cf68277" }
+leptos_router = { git = "https://github.com/leptos-rs/leptos", rev = "20af4928b2fffe017408d3f4e7330db22cf68277" }
 tokio = { version = "1", features = ["rt-multi-thread"], optional = true }
 tower = { version = "0.4", optional = true }
 tower-http = { version = "0.5", features = ["fs"], optional = true }