diff --git a/bevy_kayak_ui/src/cursor.rs b/bevy_kayak_ui/src/cursor.rs
index 338df80827354e96f95b5a08904f14c13144bdcc..c3915e3d905f2a04e89ee8f3b2632f413b5cf28d 100644
--- a/bevy_kayak_ui/src/cursor.rs
+++ b/bevy_kayak_ui/src/cursor.rs
@@ -38,4 +38,4 @@ pub fn convert_cursor_icon(cursor_icon: CursorIcon) -> bevy::prelude::CursorIcon
         CursorIcon::ColResize => bevy::prelude::CursorIcon::ColResize,
         CursorIcon::RowResize => bevy::prelude::CursorIcon::RowResize,
     }
-}
\ No newline at end of file
+}
diff --git a/bevy_kayak_ui/src/lib.rs b/bevy_kayak_ui/src/lib.rs
index 21313338b858fdc139336db11526c54049c9671d..6d60521206cb8ff559dd743187719b44bc8f5842 100644
--- a/bevy_kayak_ui/src/lib.rs
+++ b/bevy_kayak_ui/src/lib.rs
@@ -8,16 +8,16 @@ use bevy::{
 
 mod bevy_context;
 mod camera;
+mod cursor;
 mod key;
 mod render;
-mod cursor;
 
+use crate::cursor::convert_cursor_icon;
 pub use bevy_context::BevyContext;
 pub use camera::*;
 use kayak_core::{bind, Binding, InputEvent, MutableBound};
 pub use render::unified::font::FontMapping;
 pub use render::unified::image::ImageManager;
-use crate::cursor::convert_cursor_icon;
 
 #[derive(Default)]
 pub struct BevyKayakUIPlugin;
diff --git a/kayak_core/src/context.rs b/kayak_core/src/context.rs
index fde229aa8d3465fd23e3b5abf57b6467b5280da4..26b2a2e84e74de5e098e99ce8e816a8a6bfbb7ba 100644
--- a/kayak_core/src/context.rs
+++ b/kayak_core/src/context.rs
@@ -27,7 +27,7 @@ pub struct KayakContext {
     widget_state_lifetimes:
         HashMap<crate::Index, HashMap<crate::flo_binding::Uuid, Box<dyn crate::Releasable>>>,
     widget_states: HashMap<crate::Index, resources::Resources>,
-    cursor_icon: CursorIcon
+    cursor_icon: CursorIcon,
 }
 
 impl std::fmt::Debug for KayakContext {
@@ -577,8 +577,8 @@ impl KayakContext {
         let hovered = self.event_dispatcher.hovered.unwrap();
         if let Some(node) = self.widget_manager.nodes.get(hovered) {
             if let Some(node) = node {
-                    let icon = node.resolved_styles.cursor.resolve();
-                    self.cursor_icon = icon;
+                let icon = node.resolved_styles.cursor.resolve();
+                self.cursor_icon = icon;
             }
         }
     }
diff --git a/kayak_core/src/cursor_icon.rs b/kayak_core/src/cursor_icon.rs
index 82b790e83c0ef49eec8a7c3cee9067d4e6496d5b..7becbecaeae951858d92372cdc38a1f62136fccc 100644
--- a/kayak_core/src/cursor_icon.rs
+++ b/kayak_core/src/cursor_icon.rs
@@ -41,4 +41,4 @@ impl Default for CursorIcon {
     fn default() -> Self {
         CursorIcon::Default
     }
-}
\ No newline at end of file
+}
diff --git a/kayak_core/src/event_dispatcher.rs b/kayak_core/src/event_dispatcher.rs
index 2131b562ade394e8e4976bf7e9207d92044b4cae..9101c0994524d2fcc5baa8b849c7a16802074166 100644
--- a/kayak_core/src/event_dispatcher.rs
+++ b/kayak_core/src/event_dispatcher.rs
@@ -48,7 +48,7 @@ pub(crate) struct EventDispatcher {
     wants_cursor: Option<bool>,
     has_cursor: Option<Index>,
     pub cursor_capture: Option<Index>,
-    pub hovered: Option<Index>
+    pub hovered: Option<Index>,
 }
 
 impl EventDispatcher {
@@ -65,7 +65,7 @@ impl EventDispatcher {
             wants_cursor: None,
             has_cursor: None,
             cursor_capture: None,
-            hovered: None
+            hovered: None,
         }
     }
 
diff --git a/kayak_core/src/lib.rs b/kayak_core/src/lib.rs
index b0a21bb9daa8c9c2485722478f8b25acfddcc4e6..9c6b006c2cb36509da00e4f13c0061f01dbc9dbc 100644
--- a/kayak_core/src/lib.rs
+++ b/kayak_core/src/lib.rs
@@ -5,6 +5,7 @@ pub mod color;
 pub mod context;
 mod context_ref;
 mod cursor;
+mod cursor_icon;
 pub mod event;
 mod event_dispatcher;
 mod flo_binding;
@@ -25,7 +26,6 @@ pub mod tree;
 mod vec;
 pub mod widget;
 pub mod widget_manager;
-mod cursor_icon;
 
 use std::sync::{Arc, RwLock};
 
diff --git a/kayak_core/src/styles.rs b/kayak_core/src/styles.rs
index 9c5934c2d6d4be2e3a4f4c228360ec96597c2738..46ed5d0d5acd64b3757577e489f8a5d24fd572ab 100644
--- a/kayak_core/src/styles.rs
+++ b/kayak_core/src/styles.rs
@@ -1,7 +1,7 @@
 pub use morphorm::{LayoutType, PositionType, Units};
 
 use crate::cursor::PointerEvents;
-use crate::{color::Color, CursorIcon, render_command::RenderCommand};
+use crate::{color::Color, render_command::RenderCommand, CursorIcon};
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum StyleProp<T: Default + Clone> {
diff --git a/src/widgets/button.rs b/src/widgets/button.rs
index 2e31db769774a01e9debf59c6fea6a45b02cae33..a0cf25f65da1da47eb5fe6418f844d7b5fe708af 100644
--- a/src/widgets/button.rs
+++ b/src/widgets/button.rs
@@ -1,10 +1,10 @@
-use kayak_core::CursorIcon;
 use crate::core::{
     render_command::RenderCommand,
     rsx,
     styles::{Style, StyleProp, Units},
     widget, Children, Color, Fragment, OnEvent, WidgetProps,
 };
+use kayak_core::CursorIcon;
 
 #[derive(Default, Debug, PartialEq, Clone)]
 pub struct ButtonProps {
diff --git a/src/widgets/text.rs b/src/widgets/text.rs
index 529ac4325794665ed010f9abcfe218ef1421df75..759d2e6b58e20b2dd3c0e627aee139d44a815908 100644
--- a/src/widgets/text.rs
+++ b/src/widgets/text.rs
@@ -78,7 +78,8 @@ pub fn Text(props: TextProps) {
             render_command: StyleProp::Value(render_command),
             width: StyleProp::Value(Units::Pixels(layout_size.0)),
             height: StyleProp::Value(Units::Pixels(layout_size.1)),
-            cursor: StyleProp::select(&[&styles.cursor, &StyleProp::Value(CursorIcon::Text)]).clone(),
+            cursor: StyleProp::select(&[&styles.cursor, &StyleProp::Value(CursorIcon::Text)])
+                .clone(),
             ..styles
         });
     } else {
diff --git a/src/widgets/text_box.rs b/src/widgets/text_box.rs
index eebabc03e114b11564aecdc54301d03e919cd609..457f9b7624cf66f09839ebe6c4948abbacd05494 100644
--- a/src/widgets/text_box.rs
+++ b/src/widgets/text_box.rs
@@ -4,8 +4,8 @@ use crate::core::{
     styles::{Style, Units},
     widget, Bound, Children, Color, EventType, MutableBound, OnEvent, WidgetProps,
 };
-use std::sync::{Arc, RwLock};
 use kayak_core::CursorIcon;
+use std::sync::{Arc, RwLock};
 
 use crate::widgets::{Background, Clip, Text};
 
diff --git a/src/widgets/window.rs b/src/widgets/window.rs
index a1ff69047f04a797c914243526e746bc20e685f1..707abc73de48d75e57c83efea3d3f55637f72f72 100644
--- a/src/widgets/window.rs
+++ b/src/widgets/window.rs
@@ -1,4 +1,3 @@
-use kayak_core::CursorIcon;
 use crate::core::{
     color::Color,
     render_command::RenderCommand,
@@ -6,6 +5,7 @@ use crate::core::{
     styles::{PositionType, Style, StyleProp, Units},
     use_state, widget, Children, EventType, OnEvent, WidgetProps,
 };
+use kayak_core::CursorIcon;
 
 use crate::widgets::{Background, Clip, Element, Text};