diff --git a/Cargo.toml b/Cargo.toml
index f6862f6..ede66e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,8 @@
 [workspace]
 resolver = "2"
-members = ["thaw", "demo", "demo_markdown"]
+members = ["thaw", "thaw_utils", "demo", "demo_markdown"]
 exclude = ["examples"]
+
+[workspace.dependencies]
+thaw = { version = "0.2.3", path = "./thaw" }
+thaw_utils = { version = "0.0.1", path = "./thaw_utils" }
diff --git a/thaw/Cargo.toml b/thaw/Cargo.toml
index 846f115..0f8812a 100644
--- a/thaw/Cargo.toml
+++ b/thaw/Cargo.toml
@@ -14,7 +14,7 @@ license = "MIT"
 
 [dependencies]
 leptos = { version = "0.6.9" }
-leptos_meta = { version = "0.6.9", optional = true }
+thaw_utils = { workspace = true }
 web-sys = { version = "0.3.69", features = [
     "DomRect",
     "File",
@@ -30,6 +30,6 @@ chrono = "0.4.35"
 palette = "0.7.5"
 
 [features]
-csr = ["leptos/csr"]
-ssr = ["leptos/ssr", "leptos_meta/ssr"]
-hydrate = ["leptos/hydrate"]
+csr = ["leptos/csr", "thaw_utils/csr"]
+ssr = ["leptos/ssr", "thaw_utils/ssr"]
+hydrate = ["leptos/hydrate", "thaw_utils/hydrate"]
diff --git a/thaw/src/alert/mod.rs b/thaw/src/alert/mod.rs
index d33920e..75cbb98 100644
--- a/thaw/src/alert/mod.rs
+++ b/thaw/src/alert/mod.rs
@@ -1,14 +1,11 @@
 mod theme;
 
-use crate::{
-    components::OptionComp,
-    theme::use_theme,
-    utils::{class_list::class_list, mount_style, OptionalProp},
-    Icon, Theme,
-};
-use leptos::*;
 pub use theme::AlertTheme;
 
+use crate::{components::OptionComp, theme::use_theme, Icon, Theme};
+use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
+
 #[derive(Clone)]
 pub enum AlertVariant {
     Success,
diff --git a/thaw/src/auto_complete/mod.rs b/thaw/src/auto_complete/mod.rs
index 15d0fba..c613aa6 100644
--- a/thaw/src/auto_complete/mod.rs
+++ b/thaw/src/auto_complete/mod.rs
@@ -1,13 +1,13 @@
 mod theme;
 
+pub use theme::AutoCompleteTheme;
+
 use crate::{
     components::{Binder, CSSTransition, Follower, FollowerPlacement, FollowerWidth},
-    use_theme,
-    utils::{class_list::class_list, mount_style, Model, OptionalProp, StoredMaybeSignal},
-    ComponentRef, Input, InputPrefix, InputRef, InputSuffix, Theme,
+    use_theme, ComponentRef, Input, InputPrefix, InputRef, InputSuffix, Theme,
 };
 use leptos::*;
-pub use theme::AutoCompleteTheme;
+use thaw_utils::{class_list, mount_style, Model, OptionalProp, StoredMaybeSignal};
 
 #[derive(Clone, PartialEq)]
 pub struct AutoCompleteOption {
@@ -211,7 +211,13 @@ pub fn AutoComplete(
                 >
                     <div
                         class="thaw-auto-complete__menu"
-                        style=move || display.get().map(|d| d.to_string()).unwrap_or_else(|| menu_css_vars.get())
+                        style=move || {
+                            display
+                                .get()
+                                .map(|d| d.to_string())
+                                .unwrap_or_else(|| menu_css_vars.get())
+                        }
+
                         ref=menu_ref
                     >
 
diff --git a/thaw/src/avatar/mod.rs b/thaw/src/avatar/mod.rs
index 07fba1d..5d31c4c 100644
--- a/thaw/src/avatar/mod.rs
+++ b/thaw/src/avatar/mod.rs
@@ -1,14 +1,11 @@
 mod theme;
 
-use crate::{
-    components::OptionComp,
-    use_theme,
-    utils::{class_list::class_list, mount_style, OptionalProp},
-    Theme,
-};
-use leptos::*;
 pub use theme::AvatarTheme;
 
+use crate::{components::OptionComp, use_theme, Theme};
+use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
+
 #[component]
 pub fn Avatar(
     #[prop(optional, into)] src: Option<MaybeSignal<String>>,
diff --git a/thaw/src/badge/mod.rs b/thaw/src/badge/mod.rs
index 491fda0..9af81d6 100644
--- a/thaw/src/badge/mod.rs
+++ b/thaw/src/badge/mod.rs
@@ -1,9 +1,6 @@
-use crate::{
-    theme::use_theme,
-    utils::{class_list::class_list, mount_style, OptionalProp},
-    Theme,
-};
+use crate::{theme::use_theme, Theme};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[derive(Default, Clone)]
 pub enum BadgeVariant {
diff --git a/thaw/src/breadcrumb/breadcrumb_item.rs b/thaw/src/breadcrumb/breadcrumb_item.rs
index 2e2bfee..826742b 100644
--- a/thaw/src/breadcrumb/breadcrumb_item.rs
+++ b/thaw/src/breadcrumb/breadcrumb_item.rs
@@ -1,6 +1,6 @@
 use super::use_breadcrumb_separator;
-use crate::utils::{class_list::class_list, OptionalProp};
 use leptos::*;
+use thaw_utils::{class_list, OptionalProp};
 
 #[component]
 pub fn BreadcrumbItem(
diff --git a/thaw/src/breadcrumb/mod.rs b/thaw/src/breadcrumb/mod.rs
index 3ab4652..6332243 100644
--- a/thaw/src/breadcrumb/mod.rs
+++ b/thaw/src/breadcrumb/mod.rs
@@ -1,14 +1,12 @@
 mod breadcrumb_item;
 mod theme;
 
-use crate::{
-    use_theme,
-    utils::{class_list::class_list, mount_style, OptionalProp},
-    Theme,
-};
+pub use theme::BreadcrumbTheme;
+
+use crate::{use_theme, Theme};
 pub use breadcrumb_item::BreadcrumbItem;
 use leptos::*;
-pub use theme::BreadcrumbTheme;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[component]
 pub fn Breadcrumb(
diff --git a/thaw/src/button/button_group.rs b/thaw/src/button/button_group.rs
index 28f4235..eb51fe0 100644
--- a/thaw/src/button/button_group.rs
+++ b/thaw/src/button/button_group.rs
@@ -1,5 +1,5 @@
-use crate::utils::{class_list::class_list, mount_style, OptionalProp};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[component]
 pub fn ButtonGroup(
@@ -9,7 +9,10 @@ pub fn ButtonGroup(
 ) -> impl IntoView {
     mount_style("button-group", include_str!("./button-group.css"));
     view! {
-        <div class=class_list!["thaw-button-group", class.map(| c | move || c.get())] class=("thaw-button-group--vertical", vertical)>
+        <div
+            class=class_list!["thaw-button-group", class.map(| c | move || c.get())]
+            class=("thaw-button-group--vertical", vertical)
+        >
             {children()}
         </div>
     }
diff --git a/thaw/src/button/mod.rs b/thaw/src/button/mod.rs
index 08d1bef..775e71d 100644
--- a/thaw/src/button/mod.rs
+++ b/thaw/src/button/mod.rs
@@ -1,15 +1,16 @@
 mod button_group;
 mod theme;
 
+pub use button_group::ButtonGroup;
+pub use theme::ButtonTheme;
+
 use crate::{
     components::{OptionComp, Wave, WaveRef},
     icon::Icon,
     theme::*,
-    utils::{class_list::class_list, mount_style, ComponentRef, OptionalMaybeSignal, OptionalProp},
 };
-pub use button_group::ButtonGroup;
 use leptos::*;
-pub use theme::ButtonTheme;
+use thaw_utils::{class_list, mount_style, ComponentRef, OptionalMaybeSignal, OptionalProp};
 
 #[derive(Default, PartialEq, Clone, Copy)]
 pub enum ButtonVariant {
@@ -229,7 +230,8 @@ pub fn Button(
                 ButtonVariant::Text), ("thaw-button--link", move || variant.get() ==
                 ButtonVariant::Link), ("thaw-button--round", move || round.get()),
                 ("thaw-button--circle", move || circle.get()), ("thaw-button--disabled", move ||
-                disabled.get()), ("thaw-button--block", move || block.get()), class.map(| c | move || c.get())
+                disabled.get()), ("thaw-button--block", move || block.get()), class.map(| c | move
+                || c.get())
             ]
 
             style=move || {
@@ -249,8 +251,8 @@ pub fn Button(
                                 "animation: thawLoadingCircle 1s infinite linear;{icon_style}",
                             )
                         />
-                    }.into_view()
-
+                    }
+                        .into_view()
                 } else {
                     (move || {
                         let icon = icon.get();
@@ -259,7 +261,8 @@ pub fn Button(
                                 <Icon icon=icon style=icon_style/>
                             </OptionComp>
                         }
-                    }).into_view()
+                    })
+                        .into_view()
                 }
             }}
 
diff --git a/thaw/src/calendar/mod.rs b/thaw/src/calendar/mod.rs
index 689f498..508fe9f 100644
--- a/thaw/src/calendar/mod.rs
+++ b/thaw/src/calendar/mod.rs
@@ -2,15 +2,11 @@ mod theme;
 
 pub use theme::CalendarTheme;
 
-use crate::{
-    use_theme,
-    utils::{class_list::class_list, mount_style, Model, OptionalProp},
-    Button, ButtonGroup, ButtonVariant, Theme,
-};
-use chrono::{Datelike, Days, Local, NaiveDate};
-use chrono::{Month, Months};
+use crate::{use_theme, Button, ButtonGroup, ButtonVariant, Theme};
+use chrono::{Datelike, Days, Local, Month, Months, NaiveDate};
 use leptos::*;
 use std::ops::Deref;
+use thaw_utils::{class_list, mount_style, Model, OptionalProp};
 
 #[component]
 pub fn Calendar(
diff --git a/thaw/src/card/mod.rs b/thaw/src/card/mod.rs
index c86e4d2..93d0380 100644
--- a/thaw/src/card/mod.rs
+++ b/thaw/src/card/mod.rs
@@ -1,10 +1,6 @@
-use crate::{
-    components::*,
-    use_theme,
-    utils::{class_list::class_list, mount_style, OptionalProp},
-    Theme,
-};
+use crate::{components::*, use_theme, Theme};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[slot]
 pub struct CardHeader {
diff --git a/thaw/src/checkbox/checkbox_group.rs b/thaw/src/checkbox/checkbox_group.rs
index bc40798..9082359 100644
--- a/thaw/src/checkbox/checkbox_group.rs
+++ b/thaw/src/checkbox/checkbox_group.rs
@@ -1,6 +1,6 @@
-use crate::utils::Model;
 use leptos::*;
 use std::collections::HashSet;
+use thaw_utils::Model;
 
 #[component]
 pub fn CheckboxGroup(
diff --git a/thaw/src/checkbox/checkbox_item.rs b/thaw/src/checkbox/checkbox_item.rs
index 3ff01e9..37de3aa 100644
--- a/thaw/src/checkbox/checkbox_item.rs
+++ b/thaw/src/checkbox/checkbox_item.rs
@@ -1,9 +1,9 @@
 use crate::{
     checkbox::{checkbox_group::use_checkbox_group, Checkbox},
-    utils::OptionalProp,
     SignalWatch,
 };
 use leptos::*;
+use thaw_utils::OptionalProp;
 
 #[component]
 pub fn CheckboxItem(
diff --git a/thaw/src/checkbox/mod.rs b/thaw/src/checkbox/mod.rs
index 204ef9d..ada076c 100644
--- a/thaw/src/checkbox/mod.rs
+++ b/thaw/src/checkbox/mod.rs
@@ -1,16 +1,12 @@
 mod checkbox_group;
 mod checkbox_item;
 
-use crate::{
-    components::*,
-    icon::*,
-    theme::use_theme,
-    utils::{class_list::class_list, mount_style, Model, OptionalProp},
-    Theme,
-};
 pub use checkbox_group::CheckboxGroup;
 pub use checkbox_item::CheckboxItem;
+
+use crate::{components::*, icon::*, theme::use_theme, Theme};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, Model, OptionalProp};
 
 #[component]
 pub fn Checkbox(
diff --git a/thaw/src/code/mod.rs b/thaw/src/code/mod.rs
index 46b6dc4..9d2b445 100644
--- a/thaw/src/code/mod.rs
+++ b/thaw/src/code/mod.rs
@@ -1,5 +1,5 @@
-use crate::utils::{class_list::class_list, mount_style, OptionalProp};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[component]
 pub fn Code(
diff --git a/thaw/src/collapse/collapse_item.rs b/thaw/src/collapse/collapse_item.rs
index 1d2f40d..aaa8894 100644
--- a/thaw/src/collapse/collapse_item.rs
+++ b/thaw/src/collapse/collapse_item.rs
@@ -1,10 +1,7 @@
 use super::use_collapse;
-use crate::{
-    components::CSSTransition,
-    utils::{class_list::class_list, OptionalProp, StoredMaybeSignal},
-    Icon,
-};
+use crate::{components::CSSTransition, Icon};
 use leptos::*;
+use thaw_utils::{class_list, OptionalProp, StoredMaybeSignal};
 
 #[component]
 pub fn CollapseItem(
diff --git a/thaw/src/collapse/mod.rs b/thaw/src/collapse/mod.rs
index d15ddee..a99d1ff 100644
--- a/thaw/src/collapse/mod.rs
+++ b/thaw/src/collapse/mod.rs
@@ -4,13 +4,10 @@ mod theme;
 pub use collapse_item::CollapseItem;
 pub use theme::CollapseTheme;
 
-use crate::{
-    use_theme,
-    utils::{class_list::class_list, mount_style, Model, OptionalProp},
-    Theme,
-};
+use crate::{use_theme, Theme};
 use leptos::*;
 use std::collections::HashSet;
+use thaw_utils::{class_list, mount_style, Model, OptionalProp};
 
 #[component]
 pub fn Collapse(
diff --git a/thaw/src/color_picker/mod.rs b/thaw/src/color_picker/mod.rs
index bde1646..2bae56f 100644
--- a/thaw/src/color_picker/mod.rs
+++ b/thaw/src/color_picker/mod.rs
@@ -6,13 +6,12 @@ pub use theme::ColorPickerTheme;
 
 use crate::{
     components::{Binder, CSSTransition, Follower, FollowerPlacement},
-    use_theme,
-    utils::{class_list::class_list, mount_style, Model, OptionalProp},
-    Theme,
+    use_theme, Theme,
 };
 use leptos::leptos_dom::helpers::WindowListenerHandle;
 use leptos::*;
 use palette::{Hsv, IntoColor, Srgb};
+use thaw_utils::{class_list, mount_style, Model, OptionalProp};
 
 #[component]
 pub fn ColorPicker(
@@ -153,14 +152,20 @@ pub fn ColorPicker(
             </div>
             <Follower slot show=is_show_popover placement=FollowerPlacement::BottomStart>
                 <CSSTransition
-                    node_ref=popover_ref name="fade-in-scale-up-transition"
+                    node_ref=popover_ref
+                    name="fade-in-scale-up-transition"
                     show=is_show_popover
                     let:display
                 >
                     <div
                         class="thaw-color-picker-popover"
                         ref=popover_ref
-                        style=move || display.get().map(|d| d.to_string()).unwrap_or_else(|| popover_css_vars.get())
+                        style=move || {
+                            display
+                                .get()
+                                .map(|d| d.to_string())
+                                .unwrap_or_else(|| popover_css_vars.get())
+                        }
                     >
 
                         <ColorPanel hue=hue.read_only() sv/>
diff --git a/thaw/src/components/binder/mod.rs b/thaw/src/components/binder/mod.rs
index b73ff20..26f7b0d 100644
--- a/thaw/src/components/binder/mod.rs
+++ b/thaw/src/components/binder/mod.rs
@@ -1,17 +1,15 @@
 mod get_placement_style;
 
-use crate::{
-    components::Teleport,
-    utils::{add_event_listener, EventListenerHandle},
-    utils::{mount_style, with_hydration_off},
-};
 pub use get_placement_style::FollowerPlacement;
+
+use crate::components::Teleport;
 use get_placement_style::{get_follower_placement_offset, FollowerPlacementOffset};
 use leptos::{
     html::{AnyElement, ElementDescriptor, ToHtmlElement},
     leptos_dom::helpers::WindowListenerHandle,
     *,
 };
+use thaw_utils::{add_event_listener, mount_style, with_hydration_off, EventListenerHandle};
 
 #[slot]
 pub struct Follower {
diff --git a/thaw/src/components/css_transition/mod.rs b/thaw/src/components/css_transition/mod.rs
index 437021c..4ebda19 100644
--- a/thaw/src/components/css_transition/mod.rs
+++ b/thaw/src/components/css_transition/mod.rs
@@ -1,6 +1,6 @@
-use crate::utils::{add_event_listener, EventListenerHandle};
 use leptos::{html::ElementDescriptor, *};
 use std::{ops::Deref, time::Duration};
+use thaw_utils::{add_event_listener, EventListenerHandle};
 
 /// # CSS Transition
 ///
diff --git a/thaw/src/components/teleport/mod.rs b/thaw/src/components/teleport/mod.rs
index cb371f5..698757d 100644
--- a/thaw/src/components/teleport/mod.rs
+++ b/thaw/src/components/teleport/mod.rs
@@ -11,7 +11,7 @@ pub fn Teleport(
     cfg_if! { if #[cfg(all(target_arch = "wasm32", any(feature = "csr", feature = "hydrate")))] {
         use leptos::wasm_bindgen::JsCast;
         use leptos::leptos_dom::Mountable;
-        use crate::utils::with_hydration_off;
+        use thaw_utils::with_hydration_off;
 
         let mount = mount.unwrap_or_else(|| {
             document()
diff --git a/thaw/src/components/wave/mod.rs b/thaw/src/components/wave/mod.rs
index 0772b3b..b5ee7dc 100644
--- a/thaw/src/components/wave/mod.rs
+++ b/thaw/src/components/wave/mod.rs
@@ -1,6 +1,6 @@
-use crate::utils::{mount_style, ComponentRef};
 use leptos::{leptos_dom::helpers::TimeoutHandle, *};
 use std::time::Duration;
+use thaw_utils::{mount_style, ComponentRef};
 
 #[derive(Clone)]
 pub struct WaveRef {
diff --git a/thaw/src/date_picker/mod.rs b/thaw/src/date_picker/mod.rs
index b140f2d..2ad3ac5 100644
--- a/thaw/src/date_picker/mod.rs
+++ b/thaw/src/date_picker/mod.rs
@@ -5,12 +5,12 @@ pub use theme::DatePickerTheme;
 
 use crate::{
     components::{Binder, Follower, FollowerPlacement},
-    utils::{mount_style, now_date, ComponentRef, Model, OptionalProp},
     Icon, Input, InputSuffix, SignalWatch,
 };
 use chrono::NaiveDate;
 use leptos::*;
 use panel::{Panel, PanelRef};
+use thaw_utils::{mount_style, now_date, ComponentRef, Model, OptionalProp};
 
 #[component]
 pub fn DatePicker(
diff --git a/thaw/src/date_picker/panel/date_panel.rs b/thaw/src/date_picker/panel/date_panel.rs
index c1ccd3b..55a1524 100644
--- a/thaw/src/date_picker/panel/date_panel.rs
+++ b/thaw/src/date_picker/panel/date_panel.rs
@@ -1,8 +1,9 @@
 use super::PanelVariant;
-use crate::{utils::now_date, Button, ButtonSize, ButtonVariant, CalendarItemDate};
+use crate::{Button, ButtonSize, ButtonVariant, CalendarItemDate};
 use chrono::{Datelike, Days, Month, Months, NaiveDate};
 use leptos::*;
 use std::ops::Deref;
+use thaw_utils::now_date;
 
 #[component]
 pub fn DatePanel(
diff --git a/thaw/src/date_picker/panel/mod.rs b/thaw/src/date_picker/panel/mod.rs
index f5a6ac7..1e67d1d 100644
--- a/thaw/src/date_picker/panel/mod.rs
+++ b/thaw/src/date_picker/panel/mod.rs
@@ -2,16 +2,12 @@ mod date_panel;
 mod month_panel;
 mod year_panel;
 
-use crate::{
-    components::CSSTransition,
-    use_theme,
-    utils::{now_date, ComponentRef},
-    Theme,
-};
+use crate::{components::CSSTransition, use_theme, Theme};
 use chrono::NaiveDate;
 use date_panel::DatePanel;
 use leptos::*;
 use month_panel::MonthPanel;
+use thaw_utils::{now_date, ComponentRef};
 use year_panel::YearPanel;
 
 #[component]
diff --git a/thaw/src/divider/mod.rs b/thaw/src/divider/mod.rs
index b433a28..a3793ca 100644
--- a/thaw/src/divider/mod.rs
+++ b/thaw/src/divider/mod.rs
@@ -1,5 +1,5 @@
-use crate::utils::{class_list::class_list, mount_style, OptionalProp};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[component]
 pub fn Divider(#[prop(optional, into)] class: OptionalProp<MaybeSignal<String>>) -> impl IntoView {
diff --git a/thaw/src/drawer/mod.rs b/thaw/src/drawer/mod.rs
index 01e5abc..5168953 100644
--- a/thaw/src/drawer/mod.rs
+++ b/thaw/src/drawer/mod.rs
@@ -1,9 +1,9 @@
 use crate::{
     components::{CSSTransition, Teleport},
-    utils::{class_list::class_list, mount_style, use_lock_html_scroll, Model, OptionalProp},
     Card,
 };
 use leptos::*;
+use thaw_utils::{class_list, mount_style, use_lock_html_scroll, Model, OptionalProp};
 
 #[component]
 pub fn Drawer(
diff --git a/thaw/src/grid/grid_item.rs b/thaw/src/grid/grid_item.rs
index 02da0a7..d306f25 100644
--- a/thaw/src/grid/grid_item.rs
+++ b/thaw/src/grid/grid_item.rs
@@ -1,6 +1,6 @@
 use super::use_grid;
-use crate::utils::{class_list::class_list, OptionalProp};
 use leptos::*;
+use thaw_utils::{class_list, OptionalProp};
 
 #[component]
 pub fn GridItem(
diff --git a/thaw/src/grid/mod.rs b/thaw/src/grid/mod.rs
index 48eec8e..a85b8f9 100644
--- a/thaw/src/grid/mod.rs
+++ b/thaw/src/grid/mod.rs
@@ -1,8 +1,8 @@
 mod grid_item;
 
-use crate::utils::{class_list::class_list, OptionalProp};
 pub use grid_item::*;
 use leptos::*;
+use thaw_utils::{class_list, OptionalProp};
 
 #[component]
 pub fn Grid(
diff --git a/thaw/src/image/mod.rs b/thaw/src/image/mod.rs
index 5a333a3..46eaa75 100644
--- a/thaw/src/image/mod.rs
+++ b/thaw/src/image/mod.rs
@@ -1,5 +1,5 @@
-use crate::utils::OptionalProp;
 use leptos::*;
+use thaw_utils::OptionalProp;
 
 #[component]
 pub fn Image(
diff --git a/thaw/src/input/mod.rs b/thaw/src/input/mod.rs
index 800b2ef..5ab5a4f 100644
--- a/thaw/src/input/mod.rs
+++ b/thaw/src/input/mod.rs
@@ -4,11 +4,9 @@ mod theme;
 pub use text_area::{TextArea, TextAreaRef};
 pub use theme::InputTheme;
 
-use crate::{
-    theme::{use_theme, Theme},
-    utils::{class_list::class_list, mount_style, ComponentRef, Model, OptionalProp},
-};
+use crate::theme::{use_theme, Theme};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, ComponentRef, Model, OptionalProp};
 
 #[derive(Default, Clone)]
 pub enum InputVariant {
diff --git a/thaw/src/input/text_area.rs b/thaw/src/input/text_area.rs
index fb204c8..2b40111 100644
--- a/thaw/src/input/text_area.rs
+++ b/thaw/src/input/text_area.rs
@@ -1,8 +1,6 @@
-use crate::{
-    theme::{use_theme, Theme},
-    utils::{class_list::class_list, mount_style, ComponentRef, Model, OptionalProp},
-};
+use crate::theme::{use_theme, Theme};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, ComponentRef, Model, OptionalProp};
 
 #[component]
 pub fn TextArea(
diff --git a/thaw/src/input_number/mod.rs b/thaw/src/input_number/mod.rs
index 8055b70..fb4fe73 100644
--- a/thaw/src/input_number/mod.rs
+++ b/thaw/src/input_number/mod.rs
@@ -1,8 +1,8 @@
-use crate::utils::{Model, OptionalProp, StoredMaybeSignal};
 use crate::{Button, ButtonVariant, ComponentRef, Icon, Input, InputRef, InputSuffix};
 use leptos::*;
 use std::ops::{Add, Sub};
 use std::str::FromStr;
+use thaw_utils::{Model, OptionalProp, StoredMaybeSignal};
 
 #[component]
 pub fn InputNumber<T>(
diff --git a/thaw/src/layout/layout_header.rs b/thaw/src/layout/layout_header.rs
index b989afe..20eca5d 100644
--- a/thaw/src/layout/layout_header.rs
+++ b/thaw/src/layout/layout_header.rs
@@ -1,5 +1,5 @@
-use crate::utils::{class_list::class_list, OptionalProp};
 use leptos::*;
+use thaw_utils::{class_list, OptionalProp};
 
 #[component]
 pub fn LayoutHeader(
diff --git a/thaw/src/layout/layout_sider.rs b/thaw/src/layout/layout_sider.rs
index 5c92aa4..f705102 100644
--- a/thaw/src/layout/layout_sider.rs
+++ b/thaw/src/layout/layout_sider.rs
@@ -1,5 +1,5 @@
-use crate::utils::{class_list::class_list, mount_style, OptionalProp};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[component]
 pub fn LayoutSider(
diff --git a/thaw/src/layout/mod.rs b/thaw/src/layout/mod.rs
index b53c3f4..3e65154 100644
--- a/thaw/src/layout/mod.rs
+++ b/thaw/src/layout/mod.rs
@@ -1,10 +1,11 @@
 mod layout_header;
 mod layout_sider;
 
-use crate::utils::{class_list::class_list, mount_style, OptionalProp};
 pub use layout_header::*;
 pub use layout_sider::*;
+
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[derive(Default, PartialEq)]
 pub enum LayoutPosition {
diff --git a/thaw/src/lib.rs b/thaw/src/lib.rs
index 8b98209..e166078 100644
--- a/thaw/src/lib.rs
+++ b/thaw/src/lib.rs
@@ -42,7 +42,6 @@ mod theme;
 mod time_picker;
 mod typography;
 mod upload;
-mod utils;
 
 pub use alert::*;
 pub use auto_complete::*;
@@ -82,8 +81,8 @@ pub use switch::*;
 pub use table::*;
 pub use tabs::*;
 pub use tag::*;
+pub use thaw_utils::{create_component_ref, ComponentRef, SignalWatch};
 pub use theme::*;
 pub use time_picker::*;
 pub use typography::*;
 pub use upload::*;
-pub use utils::{create_component_ref, ComponentRef, SignalWatch};
diff --git a/thaw/src/loading_bar/loading_bar_provider.rs b/thaw/src/loading_bar/loading_bar_provider.rs
index 6af19b3..e7d8bce 100644
--- a/thaw/src/loading_bar/loading_bar_provider.rs
+++ b/thaw/src/loading_bar/loading_bar_provider.rs
@@ -1,6 +1,7 @@
 use super::{LoadingBar, LoadingBarRef};
-use crate::{components::Teleport, utils::ComponentRef};
+use crate::components::Teleport;
 use leptos::*;
+use thaw_utils::ComponentRef;
 
 #[component]
 pub fn LoadingBarProvider(children: Children) -> impl IntoView {
diff --git a/thaw/src/loading_bar/mod.rs b/thaw/src/loading_bar/mod.rs
index 06693bb..3374185 100644
--- a/thaw/src/loading_bar/mod.rs
+++ b/thaw/src/loading_bar/mod.rs
@@ -1,9 +1,11 @@
 mod loading_bar_provider;
 
-use crate::{use_theme, utils::mount_style, utils::ComponentRef, Theme};
-use leptos::*;
 pub use loading_bar_provider::{use_loading_bar, LoadingBarProvider};
 
+use crate::{use_theme, Theme};
+use leptos::*;
+use thaw_utils::{mount_style, ComponentRef};
+
 #[derive(Clone)]
 pub(crate) struct LoadingBarRef {
     start: Callback<()>,
diff --git a/thaw/src/menu/menu_group.rs b/thaw/src/menu/menu_group.rs
index c6f8f23..ab54667 100644
--- a/thaw/src/menu/menu_group.rs
+++ b/thaw/src/menu/menu_group.rs
@@ -1,9 +1,6 @@
-use crate::{
-    theme::use_theme,
-    utils::{class_list::class_list, mount_style, OptionalProp},
-    Theme,
-};
+use crate::{theme::use_theme, Theme};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[component]
 pub fn MenuGroup(
diff --git a/thaw/src/menu/menu_item.rs b/thaw/src/menu/menu_item.rs
index ab7077d..f72fe16 100644
--- a/thaw/src/menu/menu_item.rs
+++ b/thaw/src/menu/menu_item.rs
@@ -1,10 +1,7 @@
 use super::use_menu;
-use crate::{
-    theme::use_theme,
-    utils::{class_list::class_list, mount_style, OptionalProp},
-    Theme,
-};
+use crate::{theme::use_theme, Theme};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[component]
 pub fn MenuItem(
diff --git a/thaw/src/menu/mod.rs b/thaw/src/menu/mod.rs
index 54afc02..08598dc 100644
--- a/thaw/src/menu/mod.rs
+++ b/thaw/src/menu/mod.rs
@@ -2,12 +2,13 @@ mod menu_group;
 mod menu_item;
 mod theme;
 
-use crate::utils::{class_list::class_list, Model, OptionalProp};
-use leptos::*;
 pub use menu_group::MenuGroup;
 pub use menu_item::*;
 pub use theme::MenuTheme;
 
+use leptos::*;
+use thaw_utils::{class_list, Model, OptionalProp};
+
 #[component]
 pub fn Menu(
     #[prop(optional, into)] value: Model<String>,
diff --git a/thaw/src/message/message_provider.rs b/thaw/src/message/message_provider.rs
index 1b364e1..fde2f8f 100644
--- a/thaw/src/message/message_provider.rs
+++ b/thaw/src/message/message_provider.rs
@@ -1,10 +1,8 @@
 use super::{message_environment::MessageEnvironment, MessageVariant};
-use crate::{
-    components::Teleport,
-    utils::{class_list::class_list, mount_style},
-};
+use crate::components::Teleport;
 use leptos::*;
 use std::time::Duration;
+use thaw_utils::{class_list, mount_style};
 use uuid::Uuid;
 
 #[derive(Default, Clone)]
diff --git a/thaw/src/message/mod.rs b/thaw/src/message/mod.rs
index 06c5a80..8c45749 100644
--- a/thaw/src/message/mod.rs
+++ b/thaw/src/message/mod.rs
@@ -2,14 +2,15 @@ mod message_environment;
 mod message_provider;
 mod theme;
 
+pub use message_provider::*;
+pub use theme::MessageTheme;
+
 use crate::{
     components::{If, Then},
     theme::use_theme,
     Icon, Theme,
 };
 use leptos::*;
-pub use message_provider::*;
-pub use theme::MessageTheme;
 use uuid::Uuid;
 
 #[derive(Default, Clone)]
diff --git a/thaw/src/mobile/nav_bar/mod.rs b/thaw/src/mobile/nav_bar/mod.rs
index a09ebdf..d7e81cf 100644
--- a/thaw/src/mobile/nav_bar/mod.rs
+++ b/thaw/src/mobile/nav_bar/mod.rs
@@ -1,15 +1,11 @@
 mod theme;
 
-use crate::{
-    components::*,
-    icon::*,
-    use_theme,
-    utils::{class_list::class_list, mount_style, OptionalProp},
-    Theme,
-};
-use leptos::*;
 pub use theme::NavBarTheme;
 
+use crate::{components::*, icon::*, use_theme, Theme};
+use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
+
 #[slot]
 pub struct NavBarLeft {
     #[prop(optional, into)]
diff --git a/thaw/src/mobile/tabbar/mod.rs b/thaw/src/mobile/tabbar/mod.rs
index 1ce6ad7..d4e7286 100644
--- a/thaw/src/mobile/tabbar/mod.rs
+++ b/thaw/src/mobile/tabbar/mod.rs
@@ -1,15 +1,13 @@
 mod tabbar_item;
 mod theme;
 
-use crate::{
-    use_theme,
-    utils::{mount_style, Model},
-    Theme,
-};
-use leptos::*;
 pub use tabbar_item::*;
 pub use theme::TabbarTheme;
 
+use crate::{use_theme, Theme};
+use leptos::*;
+use thaw_utils::{mount_style, Model};
+
 #[component]
 pub fn Tabbar(#[prop(optional, into)] value: Model<String>, children: Children) -> impl IntoView {
     mount_style("tabbar", include_str!("./tabbar.css"));
diff --git a/thaw/src/mobile/tabbar/tabbar_item.rs b/thaw/src/mobile/tabbar/tabbar_item.rs
index b9c97a2..362f196 100644
--- a/thaw/src/mobile/tabbar/tabbar_item.rs
+++ b/thaw/src/mobile/tabbar/tabbar_item.rs
@@ -1,8 +1,8 @@
 use super::use_tabbar;
 use crate::components::*;
-use crate::utils::StoredMaybeSignal;
-use crate::{icon::Icon, theme::use_theme, utils::mount_style, Theme};
+use crate::{icon::Icon, theme::use_theme, Theme};
 use leptos::*;
+use thaw_utils::{mount_style, StoredMaybeSignal};
 
 #[component]
 pub fn TabbarItem(
diff --git a/thaw/src/mobile/toast/mod.rs b/thaw/src/mobile/toast/mod.rs
index e7ebfec..2da9d7f 100644
--- a/thaw/src/mobile/toast/mod.rs
+++ b/thaw/src/mobile/toast/mod.rs
@@ -1,6 +1,6 @@
-use crate::utils::mount_style;
 use cfg_if::cfg_if;
 use std::time::Duration;
+use thaw_utils::mount_style;
 
 pub struct ToastOptions {
     pub message: String,
diff --git a/thaw/src/modal/mod.rs b/thaw/src/modal/mod.rs
index 837e38b..fa60fea 100644
--- a/thaw/src/modal/mod.rs
+++ b/thaw/src/modal/mod.rs
@@ -1,9 +1,9 @@
 use crate::{
     components::{CSSTransition, OptionComp, Teleport},
-    utils::{mount_style, use_click_position, Model},
     Card, CardFooter, CardHeader, CardHeaderExtra, Icon,
 };
 use leptos::*;
+use thaw_utils::{mount_style, use_click_position, Model};
 
 #[slot]
 pub struct ModalFooter {
@@ -82,7 +82,11 @@ pub fn Modal(
                         ref=mask_ref
                     ></div>
                 </CSSTransition>
-                <div class="thaw-modal-scroll" style=move || (!displayed.get()).then_some("display: none") ref=scroll_ref>
+                <div
+                    class="thaw-modal-scroll"
+                    style=move || (!displayed.get()).then_some("display: none")
+                    ref=scroll_ref
+                >
                     <CSSTransition
                         node_ref=modal_ref
                         show=show.signal()
@@ -91,7 +95,13 @@ pub fn Modal(
                         on_after_leave=move |_| displayed.set(false)
                         let:display
                     >
-                        <div class="thaw-modal-body" ref=modal_ref role="dialog" aria-modal="true" style=move || display.get()>
+                        <div
+                            class="thaw-modal-body"
+                            ref=modal_ref
+                            role="dialog"
+                            aria-modal="true"
+                            style=move || display.get()
+                        >
                             <Card>
                                 <CardHeader slot>
                                     <span class="thaw-model-title">{move || title.get()}</span>
diff --git a/thaw/src/popover/mod.rs b/thaw/src/popover/mod.rs
index 43318ed..5e19b09 100644
--- a/thaw/src/popover/mod.rs
+++ b/thaw/src/popover/mod.rs
@@ -4,12 +4,11 @@ pub use theme::PopoverTheme;
 
 use crate::{
     components::{Binder, CSSTransition, Follower, FollowerPlacement},
-    use_theme,
-    utils::{add_event_listener, class_list::class_list, mount_style, OptionalProp},
-    Theme,
+    use_theme, Theme,
 };
 use leptos::{leptos_dom::helpers::TimeoutHandle, *};
 use std::time::Duration;
+use thaw_utils::{add_event_listener, class_list, mount_style, OptionalProp};
 
 #[slot]
 pub struct PopoverTrigger {
@@ -126,7 +125,8 @@ pub fn Popover(
             </div>
             <Follower slot show=follower_enabled placement>
                 <CSSTransition
-                    node_ref=popover_ref name="popover-transition"
+                    node_ref=popover_ref
+                    name="popover-transition"
                     show=is_show_popover
                     on_enter=move |_| follower_enabled.set(true)
                     on_after_leave=move |_| follower_enabled.set(false)
@@ -134,7 +134,10 @@ pub fn Popover(
                 >
                     <div
                         class="thaw-popover"
-                        style=move || display.get().map(|d| d.to_string()).unwrap_or_else(|| css_vars.get())
+                        style=move || {
+                            display.get().map(|d| d.to_string()).unwrap_or_else(|| css_vars.get())
+                        }
+
                         ref=popover_ref
                         on:mouseenter=on_mouse_enter
                         on:mouseleave=on_mouse_leave
diff --git a/thaw/src/progress/mod.rs b/thaw/src/progress/mod.rs
index 07ffe0c..a597dd7 100644
--- a/thaw/src/progress/mod.rs
+++ b/thaw/src/progress/mod.rs
@@ -4,8 +4,9 @@ mod theme;
 pub use progress_circle::ProgressCircle;
 pub use theme::ProgressTheme;
 
-use crate::{use_theme, utils::mount_style, Theme};
+use crate::{use_theme, Theme};
 use leptos::*;
+use thaw_utils::mount_style;
 
 #[derive(Default, Clone, PartialEq)]
 pub enum ProgressIndicatorPlacement {
diff --git a/thaw/src/progress/progress_circle.rs b/thaw/src/progress/progress_circle.rs
index e8fed09..58e0c29 100644
--- a/thaw/src/progress/progress_circle.rs
+++ b/thaw/src/progress/progress_circle.rs
@@ -1,10 +1,7 @@
 use super::ProgressColor;
-use crate::{
-    use_theme,
-    utils::{class_list::class_list, mount_style, OptionalProp},
-    Theme,
-};
+use crate::{use_theme, Theme};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[component]
 pub fn ProgressCircle(
@@ -54,15 +51,15 @@ pub fn ProgressCircle(
 
     view! {
         <div
-            class=class_list!["thaw-progress-circle", class.map(|c| move || c.get())]
+            class=class_list!["thaw-progress-circle", class.map(| c | move || c.get())]
             role="progressbar"
             aria-valuemax="100"
             aria-valuemin="0"
             aria-valuenow=move || percentage.get()
             style=("--thaw-fill-color", move || fill_stroke_color.get())
             style=("--thaw-size", move || size.get())
-
         >
+
             <svg viewBox="0 0 107 107">
                 <g>
                     <path
@@ -87,21 +84,17 @@ pub fn ProgressCircle(
                     ></path>
                 </g>
             </svg>
-            {
-                if let Some(children) = children {
-                    view! {
-                        <div class="thaw-progress-circle__content">
-                            {children()}
-                        </div>
-                    }
-                } else {
-                    view! {
-                        <div class="thaw-progress-circle__content thaw-progress-circle__content--text">
-                            {move || percentage.get()}"%"
-                        </div>
-                    }
+
+            {if let Some(children) = children {
+                view! { <div class="thaw-progress-circle__content">{children()}</div> }
+            } else {
+                view! {
+                    <div class="thaw-progress-circle__content thaw-progress-circle__content--text">
+                        {move || percentage.get()} "%"
+                    </div>
                 }
-            }
+            }}
+
         </div>
     }
 }
diff --git a/thaw/src/radio/mod.rs b/thaw/src/radio/mod.rs
index 453d1b4..d281355 100644
--- a/thaw/src/radio/mod.rs
+++ b/thaw/src/radio/mod.rs
@@ -4,12 +4,9 @@ mod radio_item;
 pub use radio_group::RadioGroup;
 pub use radio_item::RadioItem;
 
-use crate::{
-    theme::use_theme,
-    utils::{class_list::class_list, mount_style, Model, OptionalProp},
-    Theme,
-};
+use crate::{theme::use_theme, Theme};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, Model, OptionalProp};
 
 #[component]
 pub fn Radio(
diff --git a/thaw/src/radio/radio_group.rs b/thaw/src/radio/radio_group.rs
index 0efd55b..0827c39 100644
--- a/thaw/src/radio/radio_group.rs
+++ b/thaw/src/radio/radio_group.rs
@@ -1,5 +1,5 @@
-use crate::utils::Model;
 use leptos::*;
+use thaw_utils::Model;
 
 #[component]
 pub fn RadioGroup(
diff --git a/thaw/src/radio/radio_item.rs b/thaw/src/radio/radio_item.rs
index cfd9801..10dd1ce 100644
--- a/thaw/src/radio/radio_item.rs
+++ b/thaw/src/radio/radio_item.rs
@@ -1,8 +1,6 @@
-use crate::{
-    radio::{radio_group::use_radio_group, Radio},
-    utils::OptionalProp,
-};
+use crate::radio::{radio_group::use_radio_group, Radio};
 use leptos::*;
+use thaw_utils::OptionalProp;
 
 #[component]
 pub fn RadioItem(
diff --git a/thaw/src/select/mod.rs b/thaw/src/select/mod.rs
index 659e85d..fadd6e7 100644
--- a/thaw/src/select/mod.rs
+++ b/thaw/src/select/mod.rs
@@ -1,14 +1,15 @@
 mod theme;
 
+pub use theme::SelectTheme;
+
 use crate::{
     components::{Binder, CSSTransition, Follower, FollowerPlacement, FollowerWidth},
     theme::use_theme,
-    utils::{class_list::class_list, mount_style, Model, OptionalProp},
     Theme,
 };
 use leptos::*;
 use std::hash::Hash;
-pub use theme::SelectTheme;
+use thaw_utils::{class_list, mount_style, Model, OptionalProp};
 
 #[derive(Clone, PartialEq, Eq, Hash)]
 pub struct SelectOption<T> {
@@ -134,7 +135,13 @@ where
                 >
                     <div
                         class="thaw-select-menu"
-                        style=move || display.get().map(|d| d.to_string()).unwrap_or_else(|| menu_css_vars.get())
+                        style=move || {
+                            display
+                                .get()
+                                .map(|d| d.to_string())
+                                .unwrap_or_else(|| menu_css_vars.get())
+                        }
+
                         ref=menu_ref
                     >
                         <For
@@ -143,7 +150,8 @@ where
                             children=move |item| {
                                 let item = store_value(item);
                                 let onclick = move |_| {
-                                    let SelectOption { value: item_value, label: _ } = item.get_value();
+                                    let SelectOption { value: item_value, label: _ } = item
+                                        .get_value();
                                     value.set(Some(item_value));
                                     is_show_menu.set(false);
                                 };
diff --git a/thaw/src/skeleton/mod.rs b/thaw/src/skeleton/mod.rs
index 2e93a8c..8e5daf5 100644
--- a/thaw/src/skeleton/mod.rs
+++ b/thaw/src/skeleton/mod.rs
@@ -1,9 +1,11 @@
 mod theme;
 
-use crate::{theme::use_theme, utils::mount_style, Theme};
-use leptos::*;
 pub use theme::SkeletionTheme;
 
+use crate::{theme::use_theme, Theme};
+use leptos::*;
+use thaw_utils::mount_style;
+
 #[component]
 pub fn Skeleton(
     #[prop(default = MaybeSignal::Static(1), into)] repeat: MaybeSignal<u32>,
diff --git a/thaw/src/slider/mod.rs b/thaw/src/slider/mod.rs
index 9205d02..3dc8563 100644
--- a/thaw/src/slider/mod.rs
+++ b/thaw/src/slider/mod.rs
@@ -1,18 +1,14 @@
 mod slider_label;
 mod theme;
 
-use crate::{
-    components::OptionComp,
-    theme::use_theme,
-    utils::{class_list::class_list, mount_style, Model, OptionalProp},
-    Theme,
-};
-use leptos::*;
-use web_sys::DomRect;
-
 pub use slider_label::SliderLabel;
 pub use theme::SliderTheme;
 
+use crate::{components::OptionComp, theme::use_theme, Theme};
+use leptos::*;
+use thaw_utils::{class_list, mount_style, Model, OptionalProp};
+use web_sys::DomRect;
+
 #[component]
 pub fn Slider(
     #[prop(optional, into)] value: Model<f64>,
diff --git a/thaw/src/slider/slider_label.rs b/thaw/src/slider/slider_label.rs
index a8346bb..a18860e 100644
--- a/thaw/src/slider/slider_label.rs
+++ b/thaw/src/slider/slider_label.rs
@@ -1,5 +1,5 @@
-use crate::utils::mount_style;
 use leptos::*;
+use thaw_utils::mount_style;
 
 #[component]
 pub fn SliderLabel(#[prop(into)] value: MaybeSignal<f64>, children: Children) -> impl IntoView {
diff --git a/thaw/src/space/mod.rs b/thaw/src/space/mod.rs
index fab7b9e..6bfde11 100644
--- a/thaw/src/space/mod.rs
+++ b/thaw/src/space/mod.rs
@@ -1,5 +1,5 @@
-use crate::utils::{class_list::class_list, mount_style, OptionalMaybeSignal, OptionalProp};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalMaybeSignal, OptionalProp};
 
 #[derive(Default)]
 pub enum SpaceGap {
diff --git a/thaw/src/spinner/mod.rs b/thaw/src/spinner/mod.rs
index 4e18c74..42c9e88 100644
--- a/thaw/src/spinner/mod.rs
+++ b/thaw/src/spinner/mod.rs
@@ -1,13 +1,11 @@
 mod theme;
 
-use crate::{
-    theme::use_theme,
-    utils::{class_list::class_list, mount_style, OptionalProp},
-    Theme,
-};
-use leptos::*;
 pub use theme::SpinnerTheme;
 
+use crate::{theme::use_theme, Theme};
+use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
+
 #[derive(Default, Clone)]
 pub enum SpinnerSize {
     Tiny,
diff --git a/thaw/src/switch/mod.rs b/thaw/src/switch/mod.rs
index f0e252c..5c578c8 100644
--- a/thaw/src/switch/mod.rs
+++ b/thaw/src/switch/mod.rs
@@ -1,13 +1,11 @@
 mod theme;
 
-use crate::{
-    theme::use_theme,
-    utils::{class_list::class_list, mount_style, Model, OptionalProp},
-    Theme,
-};
-use leptos::*;
 pub use theme::SwitchTheme;
 
+use crate::{theme::use_theme, Theme};
+use leptos::*;
+use thaw_utils::{class_list, mount_style, Model, OptionalProp};
+
 #[component]
 pub fn Switch(
     #[prop(optional, into)] value: Model<bool>,
diff --git a/thaw/src/table/mod.rs b/thaw/src/table/mod.rs
index 33cb421..7b10127 100644
--- a/thaw/src/table/mod.rs
+++ b/thaw/src/table/mod.rs
@@ -1,13 +1,11 @@
 mod theme;
 
-use crate::{
-    theme::use_theme,
-    utils::{class_list::class_list, mount_style, OptionalProp},
-    Theme,
-};
-use leptos::*;
 pub use theme::TableTheme;
 
+use crate::{theme::use_theme, Theme};
+use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
+
 #[component]
 pub fn Table(
     #[prop(optional, into)] style: MaybeSignal<String>,
diff --git a/thaw/src/tabs/mod.rs b/thaw/src/tabs/mod.rs
index 2fe37a7..6da1e0a 100644
--- a/thaw/src/tabs/mod.rs
+++ b/thaw/src/tabs/mod.rs
@@ -1,14 +1,11 @@
 mod tab;
 
-use crate::{
-    theme::use_theme,
-    utils::{class_list::class_list, mount_style, Model, OptionalProp},
-    Theme,
-};
-use leptos::*;
-
 pub use tab::*;
 
+use crate::{theme::use_theme, Theme};
+use leptos::*;
+use thaw_utils::{class_list, mount_style, Model, OptionalProp};
+
 #[component]
 pub fn Tabs(
     #[prop(optional, into)] value: Model<String>,
diff --git a/thaw/src/tabs/tab.rs b/thaw/src/tabs/tab.rs
index 1ea94d5..3332ad6 100644
--- a/thaw/src/tabs/tab.rs
+++ b/thaw/src/tabs/tab.rs
@@ -1,6 +1,6 @@
 use super::use_tabs;
-use crate::utils::{class_list::class_list, mount_style, OptionalProp};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[derive(Clone)]
 pub(crate) struct TabOption {
diff --git a/thaw/src/tag/mod.rs b/thaw/src/tag/mod.rs
index 7dfa065..67dbbd0 100644
--- a/thaw/src/tag/mod.rs
+++ b/thaw/src/tag/mod.rs
@@ -2,12 +2,9 @@ mod theme;
 
 pub use theme::TagTheme;
 
-use crate::{
-    theme::use_theme,
-    utils::{class_list::class_list, mount_style, OptionalProp},
-    Icon, Theme,
-};
+use crate::{theme::use_theme, Icon, Theme};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[derive(Clone, Default)]
 pub enum TagVariant {
@@ -88,19 +85,20 @@ pub fn Tag(
             style=move || css_vars.get()
         >
             <span class="thaw-tag__content">{children()}</span>
-            {
-                move || {
-                    if closable.get() {
-                        view! {
-                            <button class="thaw-tag__close" on:click=on_close>
-                                <Icon icon=icondata_ai::AiCloseOutlined style="font-size: 14px"/>
-                            </button>
-                        }.into()
-                    } else {
-                        None
+
+            {move || {
+                if closable.get() {
+                    view! {
+                        <button class="thaw-tag__close" on:click=on_close>
+                            <Icon icon=icondata_ai::AiCloseOutlined style="font-size: 14px"/>
+                        </button>
                     }
+                        .into()
+                } else {
+                    None
                 }
-            }
+            }}
+
         </div>
     }
 }
diff --git a/thaw/src/time_picker/mod.rs b/thaw/src/time_picker/mod.rs
index 75054f8..0da5a97 100644
--- a/thaw/src/time_picker/mod.rs
+++ b/thaw/src/time_picker/mod.rs
@@ -4,12 +4,11 @@ pub use theme::TimePickerTheme;
 
 use crate::{
     components::{Binder, CSSTransition, Follower, FollowerPlacement},
-    use_theme,
-    utils::{mount_style, ComponentRef, Model, OptionalProp},
-    Button, ButtonSize, ButtonVariant, Icon, Input, InputSuffix, SignalWatch, Theme,
+    use_theme, Button, ButtonSize, ButtonVariant, Icon, Input, InputSuffix, SignalWatch, Theme,
 };
 use chrono::{Local, NaiveTime, Timelike};
 use leptos::*;
+use thaw_utils::{mount_style, ComponentRef, Model, OptionalProp};
 
 #[component]
 pub fn TimePicker(
@@ -207,7 +206,12 @@ fn Panel(
                                     selected_time.get().map_or(false, |v| v.hour() == hour)
                                 });
                                 view! {
-                                    <PanelTimeItem value=hour on:click=on_click is_selected comp_ref/>
+                                    <PanelTimeItem
+                                        value=hour
+                                        on:click=on_click
+                                        is_selected
+                                        comp_ref
+                                    />
                                 }
                             })
                             .collect_view()}
@@ -233,7 +237,12 @@ fn Panel(
                                     selected_time.get().map_or(false, |v| v.minute() == minute)
                                 });
                                 view! {
-                                    <PanelTimeItem value=minute on:click=on_click is_selected comp_ref/>
+                                    <PanelTimeItem
+                                        value=minute
+                                        on:click=on_click
+                                        is_selected
+                                        comp_ref
+                                    />
                                 }
                             })
                             .collect_view()}
@@ -259,7 +268,12 @@ fn Panel(
                                     selected_time.get().map_or(false, |v| v.second() == second)
                                 });
                                 view! {
-                                    <PanelTimeItem value=second on:click=on_click is_selected comp_ref/>
+                                    <PanelTimeItem
+                                        value=second
+                                        on:click=on_click
+                                        is_selected
+                                        comp_ref
+                                    />
                                 }
                             })
                             .collect_view()}
diff --git a/thaw/src/typography/text.rs b/thaw/src/typography/text.rs
index 981039e..9b13bfd 100644
--- a/thaw/src/typography/text.rs
+++ b/thaw/src/typography/text.rs
@@ -1,9 +1,6 @@
-use crate::{
-    use_theme,
-    utils::{class_list::class_list, mount_style, OptionalProp},
-    Theme,
-};
+use crate::{use_theme, Theme};
 use leptos::*;
+use thaw_utils::{class_list, mount_style, OptionalProp};
 
 #[component]
 pub fn Text(
diff --git a/thaw/src/upload/mod.rs b/thaw/src/upload/mod.rs
index 81a6a19..cbeef28 100644
--- a/thaw/src/upload/mod.rs
+++ b/thaw/src/upload/mod.rs
@@ -1,12 +1,13 @@
 mod theme;
 mod upload_dragger;
 
-use crate::{utils::add_event_listener, utils::mount_style};
-use leptos::*;
 pub use theme::UploadTheme;
 pub use upload_dragger::UploadDragger;
 pub use web_sys::FileList;
 
+use leptos::*;
+use thaw_utils::{add_event_listener, mount_style};
+
 #[component]
 pub fn Upload(
     #[prop(optional, into)] accept: MaybeSignal<String>,
diff --git a/thaw/src/upload/upload_dragger.rs b/thaw/src/upload/upload_dragger.rs
index d18c6f6..2ec16ad 100644
--- a/thaw/src/upload/upload_dragger.rs
+++ b/thaw/src/upload/upload_dragger.rs
@@ -1,5 +1,6 @@
-use crate::{use_theme, utils::mount_style, Theme};
+use crate::{use_theme, Theme};
 use leptos::*;
+use thaw_utils::mount_style;
 
 #[component]
 pub fn UploadDragger(children: Children) -> impl IntoView {
diff --git a/thaw/src/utils/callback.rs b/thaw/src/utils/callback.rs
deleted file mode 100644
index 2be518d..0000000
--- a/thaw/src/utils/callback.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-// use leptos::StoredValue;
-// use std::{fmt, future::Future, pin::Pin, rc::Rc};
-
-// pub struct AsyncCallback<In: 'static, Out: 'static = ()>(
-//     #[allow(clippy::complexity)] StoredValue<Rc<dyn Fn(In) -> Pin<Box<dyn Future<Output = Out>>>>>,
-// );
-
-// impl<In> fmt::Debug for AsyncCallback<In> {
-//     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-//         fmt.write_str("AsyncCallback")
-//     }
-// }
-
-// impl<In, Out> Clone for AsyncCallback<In, Out> {
-//     fn clone(&self) -> Self {
-//         *self
-//     }
-// }
-
-// impl<In, Out> Copy for AsyncCallback<In, Out> {}
-
-// impl<In, Out> AsyncCallback<In, Out> {
-//     pub fn new<F, Fu>(f: F) -> Self
-//     where
-//         F: Fn(In) -> Fu + 'static,
-//         Fu: Future<Output = Out> + 'static,
-//     {
-//         let f = Rc::new(move |input: In| {
-//             let fut = f(input);
-//             Box::pin(fut) as Pin<Box<dyn Future<Output = Out>>>
-//         });
-//         Self(StoredValue::new(f))
-//     }
-
-//     pub async fn call(&self, input: In) -> Out {
-//         let f = self.0.get_value();
-//         f(input).await
-//     }
-// }
-
-// impl<F, In, Fu, Out> From<F> for AsyncCallback<In, Out>
-// where
-//     F: Fn(In) -> Fu + 'static,
-//     Fu: Future<Output = Out> + 'static,
-// {
-//     fn from(f: F) -> AsyncCallback<In, Out> {
-//         AsyncCallback::new(f)
-//     }
-// }
-
-// #[cfg(test)]
-// mod tests {
-//     use crate::utils::AsyncCallback;
-//     use leptos::create_runtime;
-
-//     struct NoClone {}
-
-//     #[test]
-//     fn clone_async_callback() {
-//         let rt = create_runtime();
-//         let callback = AsyncCallback::new(move |_no_clone: NoClone| async { NoClone {} });
-//         let _cloned = callback.clone();
-//         rt.dispose();
-//     }
-
-//     #[test]
-//     fn async_callback_from() {
-//         let rt = create_runtime();
-//         let _callback: AsyncCallback<(), String> = (|()| async { "test".to_string() }).into();
-//         rt.dispose();
-//     }
-
-//     #[test]
-//     fn async_callback_from_html() {
-//         let rt = create_runtime();
-//         use leptos::{
-//             html::{HtmlElement, H1},
-//             *,
-//         };
-
-//         let _callback: AsyncCallback<String, HtmlElement<H1>> = (|x: String| async move {
-//             view! {
-//                 <h1>{x}</h1>
-//             }
-//         })
-//         .into();
-//         rt.dispose();
-//     }
-// }
diff --git a/thaw/src/utils/mod.rs b/thaw/src/utils/mod.rs
deleted file mode 100644
index 6a8bd69..0000000
--- a/thaw/src/utils/mod.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// mod callback;
-pub(crate) mod class_list;
-mod component_ref;
-mod event_listener;
-mod model;
-mod mount_style;
-mod optional_maybe_signal;
-mod optional_prop;
-mod signal;
-mod stored_maybe_signal;
-mod time;
-mod use_click_position;
-mod use_lock_html_scroll;
-
-// pub use callback::AsyncCallback;
-pub use component_ref::{create_component_ref, ComponentRef};
-pub(crate) use event_listener::*;
-pub(crate) use model::Model;
-pub(crate) use mount_style::mount_style;
-pub(crate) use optional_maybe_signal::OptionalMaybeSignal;
-pub(crate) use optional_prop::OptionalProp;
-pub use signal::SignalWatch;
-pub(crate) use stored_maybe_signal::*;
-pub(crate) use time::*;
-pub(crate) use use_click_position::*;
-pub(crate) use use_lock_html_scroll::*;
-
-pub(crate) fn with_hydration_off<T>(f: impl FnOnce() -> T) -> T {
-    #[cfg(feature = "hydrate")]
-    {
-        use leptos::leptos_dom::HydrationCtx;
-        HydrationCtx::with_hydration_off(f)
-    }
-    #[cfg(not(feature = "hydrate"))]
-    {
-        f()
-    }
-}
diff --git a/thaw_utils/Cargo.toml b/thaw_utils/Cargo.toml
new file mode 100644
index 0000000..2e0bf81
--- /dev/null
+++ b/thaw_utils/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "thaw_utils"
+version = "0.0.1"
+edition = "2021"
+keywords = ["leptos", "thaw", "utils"]
+readme = "../README.md"
+authors = ["luoxiaozero"]
+description = "Shared Thaw utility functions"
+repository = "https://github.com/thaw-ui/thaw"
+license = "MIT"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+leptos = { version = "0.6.9" }
+leptos_meta = { version = "0.6.9", optional = true }
+web-sys = "0.3.69"
+wasm-bindgen = "0.2.92"
+cfg-if = "1.0.0"
+chrono = "0.4.35"
+
+[features]
+csr = ["leptos/csr"]
+ssr = ["leptos/ssr", "leptos_meta/ssr"]
+hydrate = ["leptos/hydrate"]
diff --git a/thaw/src/utils/class_list.rs b/thaw_utils/src/class_list.rs
similarity index 98%
rename from thaw/src/utils/class_list.rs
rename to thaw_utils/src/class_list.rs
index b281c8b..567beac 100644
--- a/thaw/src/utils/class_list.rs
+++ b/thaw_utils/src/class_list.rs
@@ -172,15 +172,15 @@ where
     }
 }
 
+#[macro_export]
 macro_rules! class_list {
     ($($name:expr),+) => {
         {
-            use crate::utils::class_list::ClassList;
+            use $crate::class_list::ClassList;
             ClassList::new()$(.add($name))+
         }
     };
 }
-pub(crate) use class_list;
 
 #[cfg(test)]
 mod tests {
diff --git a/thaw/src/utils/event_listener.rs b/thaw_utils/src/event_listener.rs
similarity index 100%
rename from thaw/src/utils/event_listener.rs
rename to thaw_utils/src/event_listener.rs
diff --git a/thaw_utils/src/hooks/mod.rs b/thaw_utils/src/hooks/mod.rs
new file mode 100644
index 0000000..ac26180
--- /dev/null
+++ b/thaw_utils/src/hooks/mod.rs
@@ -0,0 +1,5 @@
+mod use_click_position;
+mod use_lock_html_scroll;
+
+pub use use_click_position::use_click_position;
+pub use use_lock_html_scroll::use_lock_html_scroll;
diff --git a/thaw/src/utils/use_click_position.rs b/thaw_utils/src/hooks/use_click_position.rs
similarity index 100%
rename from thaw/src/utils/use_click_position.rs
rename to thaw_utils/src/hooks/use_click_position.rs
diff --git a/thaw/src/utils/use_lock_html_scroll.rs b/thaw_utils/src/hooks/use_lock_html_scroll.rs
similarity index 100%
rename from thaw/src/utils/use_lock_html_scroll.rs
rename to thaw_utils/src/hooks/use_lock_html_scroll.rs
diff --git a/thaw_utils/src/lib.rs b/thaw_utils/src/lib.rs
new file mode 100644
index 0000000..90fedf5
--- /dev/null
+++ b/thaw_utils/src/lib.rs
@@ -0,0 +1,28 @@
+pub mod class_list;
+mod event_listener;
+mod hooks;
+mod mount_style;
+mod optional_prop;
+mod signals;
+mod time;
+
+pub use event_listener::*;
+pub use hooks::{use_click_position, use_lock_html_scroll};
+pub use mount_style::mount_style;
+pub use optional_prop::OptionalProp;
+pub use signals::{
+    create_component_ref, ComponentRef, Model, OptionalMaybeSignal, SignalWatch, StoredMaybeSignal,
+};
+pub use time::*;
+
+pub fn with_hydration_off<T>(f: impl FnOnce() -> T) -> T {
+    #[cfg(feature = "hydrate")]
+    {
+        use leptos::leptos_dom::HydrationCtx;
+        HydrationCtx::with_hydration_off(f)
+    }
+    #[cfg(not(feature = "hydrate"))]
+    {
+        f()
+    }
+}
diff --git a/thaw/src/utils/mount_style.rs b/thaw_utils/src/mount_style.rs
similarity index 100%
rename from thaw/src/utils/mount_style.rs
rename to thaw_utils/src/mount_style.rs
diff --git a/thaw/src/utils/optional_prop.rs b/thaw_utils/src/optional_prop.rs
similarity index 100%
rename from thaw/src/utils/optional_prop.rs
rename to thaw_utils/src/optional_prop.rs
diff --git a/thaw/src/utils/component_ref.rs b/thaw_utils/src/signals/component_ref.rs
similarity index 100%
rename from thaw/src/utils/component_ref.rs
rename to thaw_utils/src/signals/component_ref.rs
diff --git a/thaw_utils/src/signals/mod.rs b/thaw_utils/src/signals/mod.rs
new file mode 100644
index 0000000..d1f6fc5
--- /dev/null
+++ b/thaw_utils/src/signals/mod.rs
@@ -0,0 +1,11 @@
+mod component_ref;
+mod model;
+mod optional_maybe_signal;
+mod signal_watch;
+mod stored_maybe_signal;
+
+pub use component_ref::{create_component_ref, ComponentRef};
+pub use model::Model;
+pub use optional_maybe_signal::OptionalMaybeSignal;
+pub use signal_watch::SignalWatch;
+pub use stored_maybe_signal::StoredMaybeSignal;
diff --git a/thaw/src/utils/model.rs b/thaw_utils/src/signals/model.rs
similarity index 100%
rename from thaw/src/utils/model.rs
rename to thaw_utils/src/signals/model.rs
diff --git a/thaw/src/utils/optional_maybe_signal.rs b/thaw_utils/src/signals/optional_maybe_signal.rs
similarity index 100%
rename from thaw/src/utils/optional_maybe_signal.rs
rename to thaw_utils/src/signals/optional_maybe_signal.rs
diff --git a/thaw/src/utils/signal.rs b/thaw_utils/src/signals/signal_watch.rs
similarity index 100%
rename from thaw/src/utils/signal.rs
rename to thaw_utils/src/signals/signal_watch.rs
diff --git a/thaw/src/utils/stored_maybe_signal.rs b/thaw_utils/src/signals/stored_maybe_signal.rs
similarity index 100%
rename from thaw/src/utils/stored_maybe_signal.rs
rename to thaw_utils/src/signals/stored_maybe_signal.rs
diff --git a/thaw/src/utils/time.rs b/thaw_utils/src/time.rs
similarity index 100%
rename from thaw/src/utils/time.rs
rename to thaw_utils/src/time.rs