From adf50e7216b9d99ee90a40360199e56453cf82ca Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 20 Dec 2025 20:59:32 -0500
Subject: [PATCH 001/143] Remove layout and add scale factor setter.

---
 crates/craft_retained/src/app.rs              | 21 +++++-----
 .../craft_retained/src/elements/container.rs  |  5 ---
 .../src/elements/core/element_internals.rs    | 39 ++++++++++++++-----
 crates/craft_retained/src/elements/element.rs | 29 ++++++++++++++
 crates/craft_retained/src/elements/image.rs   |  7 ----
 .../src/elements/slider/slider.rs             |  9 -----
 crates/craft_retained/src/elements/text.rs    | 12 +++++-
 .../craft_retained/src/elements/text_input.rs | 28 +++++++++----
 8 files changed, 97 insertions(+), 53 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index df175867..ff1b321e 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -125,6 +125,7 @@ impl App {
     pub fn on_scale_factor_changed(&mut self, scale_factor: f64) {
         self.window_context.scale_factor = scale_factor;
         self.on_resize(self.window.as_ref().unwrap().inner_size());
+        self.root.borrow_mut().scale_factor(self.window_context.effective_scale_factor());
     }
 
     pub fn on_process_user_events(&mut self) {}
@@ -177,6 +178,7 @@ impl App {
         if let Some(renderer) = self.renderer.as_mut() {
             renderer.resize_surface(new_size.width.max(1) as f32, new_size.height.max(1) as f32);
         }
+        style_root_element(self.root.borrow_mut().deref_mut(), self.window_context.window_size());
         // On macOS the window needs to be redrawn manually after resizing
         #[cfg(target_os = "macos")]
         {
@@ -322,6 +324,7 @@ impl App {
             } else {
                 self.window_context.zoom_in();
             }
+            self.root.borrow_mut().scale_factor(self.window_context.effective_scale_factor());
             self.request_redraw(RedrawFlags::new(true));
             return;
         }
@@ -488,7 +491,6 @@ impl App {
         mouse_position: Option<Point>,
     ) {
         let root_element = self.root.clone();
-        style_root_element(root_element.borrow_mut().deref_mut(), viewport_size);
         let text_context = self.text_context.as_mut().unwrap();
 
         {
@@ -595,6 +597,7 @@ fn style_root_element(root: &mut dyn Element, root_size: LogicalSize<f32>) {
     } else {
         style.set_height(Unit::Px(root_size.height));
     }
+    root.update_taffy_style();
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -608,17 +611,11 @@ fn layout(
     scale_factor: f64,
     pointer: Option<Point>,
 ) -> NodeId {
-    let root_node = {
-        let span = span!(Level::INFO, "compute layout(internal)");
-        let _enter = span.enter();
-        root_element.borrow_mut().compute_layout(taffy_tree, scale_factor);
-        // There should usually be a layout node. If not, exiting early could also make sense.
-        root_element.borrow()
-            .element_data()
-            .layout_item
-            .taffy_node_id
-            .expect("A root element must have a layout node.")
-    };
+    let root_node = root_element.borrow()
+        .element_data()
+        .layout_item
+        .taffy_node_id
+        .expect("A root element must have a layout node.");
 
     let available_space: taffy::Size<AvailableSpace> = taffy::Size {
         width: AvailableSpace::Definite(window_size.width),
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 93164d55..c008f58e 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -124,11 +124,6 @@ impl Element for Container {
 }
 
 impl ElementInternals for Container {
-    fn compute_layout(&mut self, taffy_tree: &mut TaffyTree<LayoutContext>, scale_factor: f64) {
-        self.compute_layout_children(taffy_tree, scale_factor);
-
-        self.apply_style_to_layout_node_if_dirty(taffy_tree);
-    }
 
     fn apply_layout(
         &mut self,
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index a669cbd8..247896e4 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -18,18 +18,10 @@ use crate::elements::Element;
 #[cfg(feature = "accesskit")]
 use accesskit::{Action, Role};
 use craft_primitives::geometry::borders::CssRoundedRect;
+use crate::app::TAFFY_TREE;
 
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
-pub trait ElementInternals: ElementData {
-    /// Compute the element's layout.
-    fn compute_layout(&mut self, taffy_tree: &mut TaffyTree<LayoutContext>, scale_factor: f64);
-
-    /// A helper to compute the layout for all children.
-    fn compute_layout_children(&mut self, taffy_tree: &mut TaffyTree<LayoutContext>, scale_factor: f64) {
-        for child in &self.element_data().children {
-            child.borrow_mut().compute_layout(taffy_tree, scale_factor);
-        }
-    }
+pub trait  ElementInternals: ElementData {
 
     /// A helper to apply the layout for all children.
     fn apply_layout_children(
@@ -371,6 +363,33 @@ pub trait ElementInternals: ElementData {
     {
         Style::default()
     }
+
+    /// Mark layout node dirty.
+    fn mark_dirty(&mut self) {
+        let id = self.element_data().layout_item.taffy_node_id;
+        if let Some(id) = id {
+            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+               taffy_tree.mark_dirty(id).expect("Failed to mark taffy node as dirty");
+            });
+        }
+    }
+
+    /// Updates taffy's style to reflect craft's style struct.
+    fn update_taffy_style(&mut self) {
+        let id = self.element_data().layout_item.taffy_node_id;
+        if let Some(id) = id {
+            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+                taffy_tree.set_style(id, self.element_data().style.to_taffy_style()).expect("Failed to set style.");
+            });
+        }
+    }
+
+    /// Set's this element's scale factor. This should not be used to scale individual elements.
+    fn scale_factor(&mut self, scale_factor: f64) {
+        for child in &self.element_data().children {
+            child.borrow_mut().scale_factor(scale_factor);
+        }
+    }
 }
 
 pub(crate) fn resolve_clip_for_scrollable(element: &mut dyn Element, clip_bounds: Option<Rectangle>) {
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 972ca2a5..9c9b3b2a 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -287,6 +287,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_display(display);
+        self.update_taffy_style();
         self
     }
 
@@ -295,6 +296,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_box_sizing(box_sizing);
+        self.update_taffy_style();
         self
     }
 
@@ -303,6 +305,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_position(position);
+        self.update_taffy_style();
         self
     }
 
@@ -311,6 +314,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_margin(TrblRectangle::new(top, right, bottom, left));
+        self.update_taffy_style();
         self
     }
 
@@ -319,6 +323,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_padding(TrblRectangle::new(top, right, bottom, left));
+        self.update_taffy_style();
         self
     }
 
@@ -327,6 +332,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_gap([row_gap, column_gap]);
+        self.update_taffy_style();
         self
     }
 
@@ -335,6 +341,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_inset(TrblRectangle::new(top, right, bottom, left));
+        self.update_taffy_style();
         self
     }
 
@@ -343,6 +350,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_min_width(min_width);
+        self.update_taffy_style();
         self
     }
 
@@ -351,6 +359,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_min_height(min_height);
+        self.update_taffy_style();
         self
     }
 
@@ -359,6 +368,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_width(width);
+        self.update_taffy_style();
         self
     }
 
@@ -367,6 +377,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_height(height);
+        self.update_taffy_style();
         self
     }
 
@@ -375,6 +386,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_max_width(max_width);
+        self.update_taffy_style();
         self
     }
 
@@ -383,6 +395,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_max_height(max_height);
+        self.update_taffy_style();
         self
     }
 
@@ -391,6 +404,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_wrap(wrap);
+        self.update_taffy_style();
         self
     }
 
@@ -399,6 +413,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_align_items(align_items);
+        self.update_taffy_style();
         self
     }
 
@@ -407,6 +422,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_justify_content(justify_content);
+        self.update_taffy_style();
         self
     }
 
@@ -415,6 +431,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_flex_direction(flex_direction);
+        self.update_taffy_style();
         self
     }
 
@@ -423,6 +440,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_flex_grow(flex_grow);
+        self.update_taffy_style();
         self
     }
 
@@ -431,6 +449,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_flex_shrink(flex_shrink);
+        self.update_taffy_style();
         self
     }
 
@@ -439,6 +458,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_flex_basis(flex_basis);
+        self.update_taffy_style();
         self
     }
 
@@ -447,6 +467,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_font_family(font_family);
+        self.update_taffy_style();
         self
     }
 
@@ -455,6 +476,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_color(color);
+        self.update_taffy_style();
         self
     }
 
@@ -471,6 +493,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_font_size(font_size);
+        self.update_taffy_style();
         self
     }
 
@@ -479,6 +502,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_line_height(line_height);
+        self.update_taffy_style();
         self
     }
 
@@ -487,6 +511,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_font_weight(font_weight);
+        self.update_taffy_style();
         self
     }
 
@@ -495,6 +520,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_font_style(font_style);
+        self.update_taffy_style();
         self
     }
 
@@ -503,6 +529,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_underline(underline);
+        self.update_taffy_style();
         self
     }
 
@@ -511,6 +538,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_overflow([overflow_x, overflow_y]);
+        self.update_taffy_style();
         self
     }
 
@@ -527,6 +555,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         Self: Sized,
     {
         self.style_mut().set_border_width(TrblRectangle::new(top, right, bottom, left));
+        self.update_taffy_style();
         self
     }
 
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index c75c2d1b..267fb516 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -96,13 +96,6 @@ impl Element for Image {
 }
 
 impl ElementInternals for Image {
-    fn compute_layout(&mut self, taffy_tree: &mut TaffyTree<LayoutContext>, _scale_factor: f64) {
-        if self.is_image_dirty {
-            taffy_tree.mark_dirty(self.element_data.layout_item.taffy_node_id.unwrap()).unwrap();
-        }
-
-        self.apply_style_to_layout_node_if_dirty(taffy_tree);
-    }
 
     fn apply_layout(
         &mut self,
diff --git a/crates/craft_retained/src/elements/slider/slider.rs b/crates/craft_retained/src/elements/slider/slider.rs
index 35b0a802..180f5768 100644
--- a/crates/craft_retained/src/elements/slider/slider.rs
+++ b/crates/craft_retained/src/elements/slider/slider.rs
@@ -28,7 +28,6 @@ pub enum SliderDirection {
 }
 
 pub struct Slider {
-    is_layout_dirty: bool,
     element_data: ElementData,
     me: Option<Weak<RefCell<Slider>>>,
 
@@ -52,7 +51,6 @@ pub struct Slider {
 impl Slider {
     pub fn new(thumb_size: f32) -> Rc<RefCell<Self>> {
         let me = Rc::new(RefCell::new(Self {
-            is_layout_dirty: false,
             element_data: ElementData::new(true),
             me: None,
             step: 1.0,
@@ -241,13 +239,6 @@ impl Element for Slider {
 }
 
 impl ElementInternals for Slider {
-    fn compute_layout(&mut self, taffy_tree: &mut TaffyTree<LayoutContext>, _scale_factor: f64) {
-        if self.is_layout_dirty {
-            taffy_tree.mark_dirty(self.element_data.layout_item.taffy_node_id.unwrap()).unwrap();
-        }
-
-        self.apply_style_to_layout_node_if_dirty(taffy_tree);
-    }
 
     fn apply_layout(
         &mut self,
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 62d23189..8e768946 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -152,6 +152,7 @@ impl Text {
         self.state.text = text;
         self.state.is_layout_dirty = true;
         self.state.is_render_dirty = true;
+        self.mark_dirty();
     }
 
     pub(crate) fn measure(
@@ -256,7 +257,7 @@ impl ElementInternals for Text {
         tree.nodes.push((current_node_id, current_node));
     }
 
-    fn compute_layout(
+    /*fn compute_layout(
         &mut self,
         taffy_tree: &mut TaffyTree<LayoutContext>,
         scale_factor: f64,
@@ -270,7 +271,7 @@ impl ElementInternals for Text {
         }
 
         self.apply_style_to_layout_node_if_dirty(taffy_tree);
-    }
+    }*/
 
     fn apply_layout(
         &mut self,
@@ -386,6 +387,13 @@ impl ElementInternals for Text {
             }
         }
     }
+
+    fn scale_factor(&mut self, scale_factor: f64) {
+        self.state.is_layout_dirty = true;
+        self.state.is_render_dirty = true;
+        self.mark_dirty();
+        self.state.scale_factor = scale_factor as f32;
+    }
 }
 
 impl TextState {
diff --git a/crates/craft_retained/src/elements/text_input.rs b/crates/craft_retained/src/elements/text_input.rs
index 5519fb64..b9394b09 100644
--- a/crates/craft_retained/src/elements/text_input.rs
+++ b/crates/craft_retained/src/elements/text_input.rs
@@ -11,7 +11,7 @@ use std::cell::RefCell;
 use std::collections::HashMap;
 use std::ops::{Deref, Range};
 use std::rc::{Rc, Weak};
-use taffy::{AvailableSpace, TaffyTree};
+use taffy::{AvailableSpace, NodeId, TaffyTree};
 
 use crate::app::TAFFY_TREE;
 use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
@@ -69,6 +69,7 @@ pub enum TextInputMessage {
 
 #[derive(Clone, Default)]
 pub struct TextInputState {
+    taffy_node: Option<NodeId>,
     pub is_active: bool,
     #[allow(dead_code)]
     pub(crate) ime_state: ImeState,
@@ -107,6 +108,7 @@ impl TextInput {
         default_style.add_styles_to_style_set(style_set);
 
         let text_input_state = TextInputState {
+            taffy_node: None,
             ime_state: ImeState::default(),
             is_active: false,
             editor,
@@ -155,6 +157,7 @@ impl TextInput {
                 .new_leaf_with_context(me.borrow().element_data.current_style().to_taffy_style(), context)
                 .expect("TODO: panic message");
             me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
+            me.borrow_mut().state.taffy_node(Some(node_id));
         });
 
         ELEMENTS.with_borrow_mut(|elements| {
@@ -176,13 +179,6 @@ impl crate::elements::core::ElementData for TextInput {
 }
 
 impl ElementInternals for TextInput {
-    fn compute_layout(&mut self, taffy_tree: &mut TaffyTree<LayoutContext>, _scale_factor: f64) {
-        if self.state.is_layout_dirty {
-            taffy_tree.mark_dirty(self.element_data.layout_item.taffy_node_id.unwrap()).unwrap();
-        }
-
-        self.apply_style_to_layout_node_if_dirty(taffy_tree);
-    }
 
     fn apply_layout(
         &mut self,
@@ -747,6 +743,12 @@ impl ElementInternals for TextInput {
 
         style
     }
+
+    fn scale_factor(&mut self, scale_factor: f64) {
+        self.state.editor.set_scale(scale_factor as f32);
+        self.state.scale_factor = scale_factor;
+        self.state.clear_cache();
+    }
 }
 
 impl TextInput {
@@ -809,6 +811,12 @@ impl TextInputState {
         self.current_render_key = None;
         self.text_render = None;
         self.content_widths = None;
+
+        if let Some(id) = self.taffy_node {
+            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+                taffy_tree.mark_dirty(id).expect("Failed to mark node dirty");
+            })
+        }
     }
 
     pub fn layout(
@@ -888,6 +896,10 @@ impl TextInputState {
         size
     }
 
+    fn taffy_node(&mut self, taffy_node: Option<NodeId>) {
+        self.taffy_node = taffy_node;
+    }
+
     pub fn get_cursor_link(&self, cursor_pos: Point, element: &TextInput) -> Option<String> {
         if let Some(ranged_styles) = &element.ranged_styles {
             let layout = self.editor.try_layout().unwrap();

From 2fd917c3971e5876bcd893b618ac05dcc0a56eaf Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 21 Dec 2025 02:01:05 -0500
Subject: [PATCH 002/143] Cull when adding.

---
 .../src/geometry/rectangle.rs                 | 19 +++++++--
 crates/craft_renderer/src/renderer.rs         | 39 +++++++++++++++++--
 crates/craft_retained/src/app.rs              |  4 +-
 .../craft_retained/src/layout/layout_item.rs  |  8 ++--
 4 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/crates/craft_primitives/src/geometry/rectangle.rs b/crates/craft_primitives/src/geometry/rectangle.rs
index a2b8904b..6af62827 100644
--- a/crates/craft_primitives/src/geometry/rectangle.rs
+++ b/crates/craft_primitives/src/geometry/rectangle.rs
@@ -25,6 +25,7 @@ impl Rectangle {
     /// # Returns
     ///
     /// `true` if the rectangle contains the point, `false` otherwise.
+    #[inline(always)]
     pub fn contains(&self, point: &Point) -> bool {
         point.x as f32 >= self.left()
             && point.x as f32 <= self.right()
@@ -65,30 +66,31 @@ impl Rectangle {
     }
 
     /// Returns the position of the top-left corner of the rectangle.
+    #[inline(always)]
     pub fn position(&self) -> Point {
         Point::new(self.x as f64, self.y as f64)
     }
 
     /// Returns the y-coordinate of the top edge of the rectangle.
-    #[inline]
+    #[inline(always)]
     pub fn top(&self) -> f32 {
         self.y
     }
 
     /// Returns the x-coordinate of the right edge of the rectangle.
-    #[inline]
+    #[inline(always)]
     pub fn right(&self) -> f32 {
         self.x + self.width
     }
 
     /// Returns the y-coordinate of the bottom edge of the rectangle.
-    #[inline]
+    #[inline(always)]
     pub fn bottom(&self) -> f32 {
         self.y + self.height
     }
 
     /// Returns the x-coordinate of the left edge of the rectangle.
-    #[inline]
+    #[inline(always)]
     pub fn left(&self) -> f32 {
         self.x
     }
@@ -106,6 +108,7 @@ impl Rectangle {
         }
     }
 
+
     pub fn intersection(&self, other: &Rectangle) -> Option<Rectangle> {
         let x0 = self.x.max(other.x);
         let y0 = self.y.max(other.y);
@@ -118,6 +121,14 @@ impl Rectangle {
             None
         }
     }
+
+    #[inline(always)]
+    pub fn intersects(&self, other: &Rectangle) -> bool {
+        self.x < other.right()
+            && self.right() > other.x
+            && self.y < other.bottom()
+            && self.bottom() > other.y
+    }
 }
 
 /*impl From<taffy::Rect<f32>> for Rectangle {
diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index 7c7b5138..4dbbc7ee 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -96,6 +96,7 @@ pub struct RenderList {
     pub commands: Vec<RenderCommand>,
     /// Stores a sorted list of render command handles. This gets set in `Renderer::sort_render_list`.
     pub overlay: SortedCommands,
+    cull: Option<Rectangle>,
 }
 
 impl Default for RenderList {
@@ -110,6 +111,7 @@ impl RenderList {
             targets: Vec::new(),
             commands: Vec::new(),
             overlay: SortedCommands { children: vec![] },
+            cull: None,
         }
     }
 
@@ -119,19 +121,41 @@ impl RenderList {
         self.overlay.children.clear();
     }
 
+    #[inline(always)]
     pub fn draw_rect(&mut self, rectangle: Rectangle, fill_color: Color) {
+        if let Some(cull) = &self.cull {
+            if !cull.intersects(&rectangle) {
+                return;
+            }
+        }
         self.commands.push(RenderCommand::DrawRect(rectangle, fill_color));
     }
 
+
     pub fn push_hit_testable(&mut self, id: u64, bounding_box: Rectangle) {
+        if let Some(cull) = &self.cull {
+            if !cull.intersects(&bounding_box) {
+                return;
+            }
+        }
         self.targets.push((id, bounding_box));
     }
 
     pub fn draw_rect_outline(&mut self, rectangle: Rectangle, outline_color: Color, thickness: f64) {
+        if let Some(cull) = &self.cull {
+            if !cull.intersects(&rectangle) {
+                return;
+            }
+        }
         self.commands.push(RenderCommand::DrawRectOutline(rectangle, outline_color, thickness));
     }
 
     pub fn fill_bez_path(&mut self, path: kurbo::BezPath, brush: Brush) {
+        if let Some(cull) = &self.cull {
+            if !cull.intersects(&Rectangle::from_kurbo(path.bounding_box())) {
+                return;
+            }
+        }
         self.commands.push(RenderCommand::FillBezPath(path, brush));
     }
 
@@ -142,8 +166,14 @@ impl RenderList {
         text_scroll: Option<TextScroll>,
         show_cursor: bool,
     ) {
+        if let Some(cull) = &self.cull {
+            if !cull.intersects(&rectangle) {
+                return;
+            }
+        }
         self.commands.push(RenderCommand::DrawText(component, rectangle, text_scroll, show_cursor));
     }
+
     pub fn draw_image(&mut self, rectangle: Rectangle, resource_identifier: ResourceIdentifier) {
         self.commands.push(RenderCommand::DrawImage(rectangle, resource_identifier));
     }
@@ -172,6 +202,10 @@ impl RenderList {
     pub fn end_overlay(&mut self) {
         self.commands.push(RenderCommand::EndOverlay);
     }
+
+    pub fn set_cull(&mut self, cull: Option<Rectangle>) {
+        self.cull = cull;
+    }
 }
 
 pub trait Renderer: Any {
@@ -185,6 +219,7 @@ pub trait Renderer: Any {
     
     fn as_any_mut(&mut self) -> &mut dyn Any;
     
+    #[inline(never)]
     fn sort_and_cull_render_list(&mut self, render_list: &mut RenderList) {
         fn should_cull(rectangle: &Rectangle, window_height: f32) -> bool {
             let cull_top = (rectangle.y + rectangle.height) < 0.0;
@@ -207,10 +242,6 @@ pub trait Renderer: Any {
 
         let window_height = self.surface_height();
 
-        render_list.targets.retain(|(_, bounding_box)| {
-            !should_cull(bounding_box, window_height)
-        });
-
         let mut current: *mut SortedCommands = &mut render_list.overlay;
         let mut stack: Vec<*mut SortedCommands> = vec![current];
 
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index ff1b321e..173bfecf 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -178,6 +178,7 @@ impl App {
         if let Some(renderer) = self.renderer.as_mut() {
             renderer.resize_surface(new_size.width.max(1) as f32, new_size.height.max(1) as f32);
         }
+        self.render_list.set_cull(Some(Rectangle::new(0.0, 0.0, new_size.width as f32, new_size.height as f32)));
         style_root_element(self.root.borrow_mut().deref_mut(), self.window_context.window_size());
         // On macOS the window needs to be redrawn manually after resizing
         #[cfg(target_os = "macos")]
@@ -285,7 +286,7 @@ impl App {
                 );
             }
 
-            self.animate_tree(&delta_time, layout_origin, root_size);
+            //self.animate_tree(&delta_time, layout_origin, root_size);
 
             if self.renderer.is_some() {
                 self.draw_reactive_tree(self.window_context.mouse_position);
@@ -512,6 +513,7 @@ impl App {
     }
 
     #[allow(clippy::too_many_arguments)]
+    #[inline(never)]
     fn draw_reactive_tree(&mut self, mouse_position: Option<Point>) {
         let text_context = self.text_context.as_mut().unwrap();
         {
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index d86fc728..8ad32091 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -191,9 +191,7 @@ impl LayoutItem {
 
         // OPTIMIZATION: Draw a normal rectangle if no border values have been modified.
         match &self.computed_border {
-            ComputedBorder::CssComputedBorder(computed_border) => {
-                draw_borders_generic(renderer, computed_border, current_style.border_color().to_array(), background_color);
-            }
+            ComputedBorder::None => {}
             ComputedBorder::Simple => {
                 let padding_rect =self.computed_box_transformed.padding_rectangle().scale(scale_factor);
                 let border_rect = self.computed_box_transformed.border_rectangle();
@@ -207,7 +205,9 @@ impl LayoutItem {
                     renderer.draw_rect_outline(border_rect, border_color, thickness as f64);
                 }
             }
-            ComputedBorder::None => {}
+            ComputedBorder::CssComputedBorder(computed_border) => {
+                draw_borders_generic(renderer, computed_border, current_style.border_color().to_array(), background_color);
+            }
         }
     }
 }

From b20e529e4398f754638515500b87a5d18d2d7a19 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 21 Dec 2025 14:13:38 -0500
Subject: [PATCH 003/143] Inlines

---
 crates/craft_primitives/src/geometry/size.rs          | 1 +
 crates/craft_primitives/src/geometry/trblrectangle.rs | 1 +
 crates/craft_renderer/src/renderer.rs                 | 3 +--
 crates/craft_retained/src/app.rs                      | 1 -
 crates/craft_retained/src/layout/layout_item.rs       | 1 +
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/crates/craft_primitives/src/geometry/size.rs b/crates/craft_primitives/src/geometry/size.rs
index ac09e1fb..77122f1e 100644
--- a/crates/craft_primitives/src/geometry/size.rs
+++ b/crates/craft_primitives/src/geometry/size.rs
@@ -18,6 +18,7 @@ impl<T> Size<T> {
     /// # Returns
     ///
     /// A `Size` instance with the specified width and height.
+    #[inline(always)]
     pub fn new(width: T, height: T) -> Self {
         Self { width, height }
     }
diff --git a/crates/craft_primitives/src/geometry/trblrectangle.rs b/crates/craft_primitives/src/geometry/trblrectangle.rs
index 8cfac69b..484f4710 100644
--- a/crates/craft_primitives/src/geometry/trblrectangle.rs
+++ b/crates/craft_primitives/src/geometry/trblrectangle.rs
@@ -11,6 +11,7 @@ impl<T> TrblRectangle<T>
 where
     T: Copy + PartialEq,
 {
+    #[inline(always)]
     pub const fn new(top: T, right: T, bottom: T, left: T) -> Self {
         Self {
             top,
diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index 4dbbc7ee..cc771d7b 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -218,8 +218,7 @@ pub trait Renderer: Any {
     fn surface_set_clear_color(&mut self, color: Color);
     
     fn as_any_mut(&mut self) -> &mut dyn Any;
-    
-    #[inline(never)]
+
     fn sort_and_cull_render_list(&mut self, render_list: &mut RenderList) {
         fn should_cull(rectangle: &Rectangle, window_height: f32) -> bool {
             let cull_top = (rectangle.y + rectangle.height) < 0.0;
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 173bfecf..6b6f2b5e 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -513,7 +513,6 @@ impl App {
     }
 
     #[allow(clippy::too_many_arguments)]
-    #[inline(never)]
     fn draw_reactive_tree(&mut self, mouse_position: Option<Point>) {
         let text_context = self.text_context.as_mut().unwrap();
         {
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index 8ad32091..2a040e98 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -250,6 +250,7 @@ pub(crate) enum ComputedBorder {
     None,
 }
 
+#[inline(always)]
 fn from_taffy_point(p: taffy::Point<f32>) -> Point {
     Point {
         x: p.x as f64,

From f3c7409f0fe4dc63bc15a9fb2691b0f8e1e70d9a Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Mon, 22 Dec 2025 01:16:08 -0500
Subject: [PATCH 004/143] poc

---
 Cargo.lock                                    |  2 -
 crates/craft_retained/Cargo.toml              |  3 +-
 crates/craft_retained/src/app.rs              | 11 ++--
 .../craft_retained/src/craft_winit_state.rs   | 12 ++---
 .../craft_retained/src/elements/container.rs  | 35 ++++++++++---
 .../src/elements/core/element_internals.rs    |  3 ++
 crates/craft_retained/src/elements/image.rs   |  1 +
 .../src/elements/scroll_state.rs              | 12 +++++
 .../src/elements/slider/slider.rs             |  1 +
 crates/craft_retained/src/elements/text.rs    | 50 +++++++++++++------
 .../craft_retained/src/elements/text_input.rs |  1 +
 .../craft_retained/src/layout/layout_item.rs  |  8 +++
 crates/craft_retained/src/lib.rs              |  3 --
 13 files changed, 100 insertions(+), 42 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cb8d8749..bcbd6929 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3904,8 +3904,6 @@ dependencies = [
 [[package]]
 name = "taffy"
 version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ba83ebaf2954d31d05d67340fd46cebe99da2b7133b0dd68d70c65473a437b"
 dependencies = [
  "arrayvec",
  "grid",
diff --git a/crates/craft_retained/Cargo.toml b/crates/craft_retained/Cargo.toml
index 1c23e391..699ec0a8 100644
--- a/crates/craft_retained/Cargo.toml
+++ b/crates/craft_retained/Cargo.toml
@@ -87,7 +87,8 @@ optional = true
 workspace = true
 
 [dependencies.taffy]
-version = "0.9.2"
+#version = "0.9.2"
+path = "../../../taffy"
 default-features = false
 features = ["std", "taffy_tree", "flexbox", "content_size", "block_layout"]
 
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 6b6f2b5e..832fa39c 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -30,8 +30,6 @@ use {
     accesskit_winit::Adapter,
 };
 
-#[cfg(not(target_arch = "wasm32"))]
-use std::time;
 #[cfg(target_arch = "wasm32")]
 use web_time as time;
 
@@ -90,7 +88,6 @@ pub struct App {
     #[allow(dead_code)]
     pub(crate) runtime: CraftRuntimeHandle,
     pub(crate) modifiers: Modifiers,
-    pub(crate) last_frame_time: time::Instant,
     pub redraw_flags: RedrawFlags,
 
     pub(crate) render_list: RenderList,
@@ -260,10 +257,6 @@ impl App {
 
         self.update_resources();
 
-        let now = time::Instant::now();
-        let delta_time = now - self.last_frame_time;
-        self.last_frame_time = now;
-
         let surface_size = self.window_context.window_size();
 
         self.update_view();
@@ -451,6 +444,7 @@ impl App {
     }
 
     /// "Animates" a tree by calling `on_animation_frame` and changing an element's styles.
+    #[allow(dead_code)]
     fn animate_tree(&mut self, delta_time: &Duration, layout_origin: Point, viewport_size: LogicalSize<f32>) {
         let span = span!(Level::INFO, "animate_tree");
         let _enter = span.enter();
@@ -591,7 +585,7 @@ fn style_root_element(root: &mut dyn Element, root_size: LogicalSize<f32>) {
 
     style.set_width(Unit::Px(root_size.width));
     style.set_wrap(Wrap::Wrap);
-    style.set_display(Display::Block);
+    style.set_display(Display::Flex);
 
     if is_user_root_height_auto {
         style.set_height(Unit::Auto);
@@ -659,6 +653,7 @@ fn layout(
             text_context,
             None,
             scale_factor,
+            false,
         );
     }
 
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index 1915bcc5..36226d6e 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -14,12 +14,10 @@ use craft_logging::info;
 
 use winit::application::ApplicationHandler;
 use winit::event::{StartCause, WindowEvent};
-use winit::event_loop::{ActiveEventLoop, ControlFlow};
+use winit::event_loop::{ActiveEventLoop};
 use winit::window::WindowAttributes;
 use winit::window::{Window, WindowId};
 
-#[cfg(not(target_arch = "wasm32"))]
-use std::time;
 #[cfg(target_arch = "wasm32")]
 use web_time as time;
 
@@ -34,8 +32,6 @@ use ui_events_winit::{WindowEventReducer, WindowEventTranslation};
 use winit::dpi::LogicalSize;
 use crate::document::Document;
 
-const WAIT_TIME: time::Duration = time::Duration::from_millis(15);
-
 /// Stores state related to Winit.
 ///
 /// Forwards most events to the main Craft Event Loop.
@@ -253,9 +249,11 @@ impl ApplicationHandler for CraftWinitState {
             return;
         }
 
+        //self.craft_state.craft_app.window.clone().unwrap().request_redraw();
+
         // Switch to Poll mode if we are running animations.
 
-        let has_active_animation = self.craft_state.craft_app.previous_animation_flags.has_active_animation();
+/*        let has_active_animation = self.craft_state.craft_app.previous_animation_flags.has_active_animation();
 
         if has_active_animation {
             event_loop.set_control_flow(ControlFlow::Poll);
@@ -263,7 +261,7 @@ impl ApplicationHandler for CraftWinitState {
             event_loop.set_control_flow(ControlFlow::WaitUntil(time::Instant::now() + WAIT_TIME));
         }
         event_loop.set_control_flow(ControlFlow::Poll);
-        
+        */
     }
 }
 
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index c008f58e..b2317a14 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -15,6 +15,7 @@ use std::cell::RefCell;
 use std::ops::Deref;
 use std::rc::{Rc, Weak};
 use taffy::TaffyTree;
+use crate::rgba;
 
 /// Stores one or more elements.
 ///
@@ -135,18 +136,36 @@ impl ElementInternals for Container {
         text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
+        dirty: bool,
     ) {
-        let layout = taffy_tree.layout(self.element_data.layout_item.taffy_node_id.unwrap()).unwrap();
-        self.resolve_box(position, transform, layout, z_index);
-        self.apply_borders(scale_factor);
+        let node = self.element_data.layout_item.taffy_node_id.unwrap();
+        let layout = taffy_tree.layout(node).unwrap();
+
+        let dirty = layout.has_new_layout || transform != self.element_data.layout_item.get_transform() ;
+        self.element_data.layout_item.has_new_layout = dirty;
+        if dirty {
+            self.resolve_box(position, transform, layout, z_index);
+            self.apply_borders(scale_factor);
+            // For scroll changes from taffy;
+            self.element_data.apply_scroll(layout);
+            self.apply_clip(clip_bounds);
+            self.element_data.scroll_state.as_mut().unwrap().mark_old();
+        }
+
+        // For manual scroll updates.
+        if !dirty && self.element_data.scroll_state.map(|scroll_state| scroll_state.is_new()).unwrap_or_default() {
+            self.element_data.apply_scroll(layout);
+            self.element_data.scroll_state.as_mut().unwrap().mark_old();
+        }
 
-        self.element_data.apply_scroll(layout);
-        self.apply_clip(clip_bounds);
+        if layout.has_new_layout {
+            taffy_tree.mark_old(node);
+        }
 
         let scroll_y = self.element_data.scroll().map_or(0.0, |s| s.scroll_y() as f64);
         let child_transform = Affine::translate((0.0, -scroll_y));
 
-        self.apply_layout_children(taffy_tree, z_index, transform * child_transform, pointer, text_context, scale_factor)
+        self.apply_layout_children(taffy_tree, z_index, transform * child_transform, pointer, text_context, scale_factor, false)
     }
 
     fn draw(
@@ -164,6 +183,10 @@ impl ElementInternals for Container {
         // We draw the borders before we start any layers, so that we don't clip the borders.
         self.draw_borders(renderer, scale_factor);
 
+        if self.element_data.layout_item.has_new_layout {
+            renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 1.0);
+        }
+
         self.maybe_start_layer(renderer, scale_factor);
         self.draw_children(renderer, text_context, pointer, scale_factor);
         self.maybe_end_layer(renderer);
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index 247896e4..cfaf8a89 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -32,6 +32,7 @@ pub trait  ElementInternals: ElementData {
         pointer: Option<Point>,
         text_context: &mut TextContext,
         scale_factor: f64,
+        dirty: bool,
     ) {
         for child in &self.element_data().children {
             child.borrow_mut().apply_layout(
@@ -43,6 +44,7 @@ pub trait  ElementInternals: ElementData {
                 text_context,
                 self.element_data().layout_item.clip_bounds,
                 scale_factor,
+                dirty,
             );
         }
     }
@@ -109,6 +111,7 @@ pub trait  ElementInternals: ElementData {
         text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
+        dirty: bool,
     );
 
     /// Draws the element and its visual contents.
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 267fb516..6f767174 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -107,6 +107,7 @@ impl ElementInternals for Image {
         _text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
+        dirty: bool,
     ) {
         let layout = taffy_tree.layout(self.element_data.layout_item.taffy_node_id.unwrap()).unwrap();
         self.resolve_box(position, transform, layout, z_index);
diff --git a/crates/craft_retained/src/elements/scroll_state.rs b/crates/craft_retained/src/elements/scroll_state.rs
index b8ee9a5e..b0087704 100644
--- a/crates/craft_retained/src/elements/scroll_state.rs
+++ b/crates/craft_retained/src/elements/scroll_state.rs
@@ -8,6 +8,9 @@ pub struct ScrollState {
 
     /// Where the scrollbar was clicked.
     pub(crate) scroll_click: Option<Point>,
+
+    // True if the scroll changes are new.
+    is_new: bool,
 }
 
 impl ScrollState {
@@ -16,6 +19,14 @@ impl ScrollState {
         self.scroll_y
     }
 
+    pub fn mark_old(&mut self) {
+        self.is_new = false;
+    }
+
+    pub fn is_new(&self) -> bool {
+        self.is_new
+    }
+
     /// Sets the total amount of vertical scroll.
     ///
     /// # Panics
@@ -25,6 +36,7 @@ impl ScrollState {
         if self.scroll_y < 0.0 {
             panic!("Scroll cannot be negative.");
         }
+        self.is_new = true;
         self.scroll_y = scroll_y;
     }
 }
diff --git a/crates/craft_retained/src/elements/slider/slider.rs b/crates/craft_retained/src/elements/slider/slider.rs
index 180f5768..4fe51aee 100644
--- a/crates/craft_retained/src/elements/slider/slider.rs
+++ b/crates/craft_retained/src/elements/slider/slider.rs
@@ -250,6 +250,7 @@ impl ElementInternals for Slider {
         _text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
+        dirty: bool,
     ) {
         let layout = taffy_tree.layout(self.element_data.layout_item.taffy_node_id.unwrap()).unwrap();
         self.resolve_box(position, transform, layout, z_index);
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 8e768946..16ce4cb9 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -6,6 +6,7 @@ use crate::text::text_context::TextContext;
 use crate::text::text_render_data;
 use crate::text::text_render_data::TextRender;
 use craft_primitives::geometry::{Point, Rectangle};
+use craft_primitives::Color;
 use craft_renderer::renderer::RenderList;
 #[cfg(feature = "accesskit")]
 use parley::LayoutAccessibility;
@@ -37,6 +38,7 @@ use craft_primitives::ColorBrush;
 use craft_renderer::text_renderer_data::TextData;
 use smol_str::{SmolStr, ToSmolStr};
 use ui_events::pointer::{PointerButton, PointerId};
+use crate::rgba;
 
 // A stateful element that shows text.
 #[derive(Clone, Default)]
@@ -203,6 +205,10 @@ impl ElementInternals for Text {
 
         self.draw_borders(renderer, scale_factor);
 
+        if self.element_data.layout_item.has_new_layout {
+            renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 1.0);
+        }
+
         renderer.draw_text(self.me.clone().unwrap(), content_rectangle.scale(scale_factor), None, false);
     }
 
@@ -283,12 +289,23 @@ impl ElementInternals for Text {
         text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
+        dirty: bool,
     ) {
-        let result = taffy_tree.layout(self.element_data.layout_item.taffy_node_id.unwrap()).unwrap();
-        self.resolve_box(position, transform, result, z_index);
-        self.apply_clip(clip_bounds);
+        let node = self.element_data.layout_item.taffy_node_id.unwrap();
+        let result = taffy_tree.layout(node).unwrap();
+
+        let dirty = dirty || result.has_new_layout || transform != self.element_data.layout_item.get_transform();
+        self.element_data.layout_item.has_new_layout = dirty;
+        if dirty {
+            self.resolve_box(position, transform, result, z_index);
+            self.apply_clip(clip_bounds);
+
+            self.apply_borders(scale_factor);
+        }
 
-        self.apply_borders(scale_factor);
+        if result.has_new_layout {
+            taffy_tree.mark_old(node);
+        }
 
         let state: &mut TextState = &mut self.state;
         if state.current_layout_key != state.last_requested_measure_key {
@@ -299,16 +316,6 @@ impl ElementInternals for Text {
         }
 
         state.try_update_text_render(text_context);
-
-        // This needs to be cached.
-        let layout = state.layout.as_ref().unwrap();
-        let text_renderer = state.text_render.as_mut().unwrap();
-        for line in text_renderer.lines.iter_mut() {
-            line.selections.clear();
-        }
-        state.selection.geometry_with(layout, |rect, line| {
-            text_renderer.lines[line].selections.push((Rectangle::new(rect.x0 as f32, rect.y0 as f32, rect.width() as f32, rect.height() as f32), self.element_data.style.selection_color()));
-        });
     }
 
     fn on_event(
@@ -333,10 +340,10 @@ impl ElementInternals for Text {
             let text_position = self.computed_box_transformed().content_rectangle();
 
             let state: &mut TextState = &mut self.state;
-
             match message {
                 CraftMessage::PointerButtonDown(pointer_button) => {
                     if pointer_button.button.map(|button| button == PointerButton::Primary).unwrap_or_default() {
+                        state.update_text_selection(self.element_data.style.selection_color());
                         state.pointer_down = true;
                         state.cursor_reset();
                         let now = Instant::now();
@@ -365,6 +372,7 @@ impl ElementInternals for Text {
                 }
                 CraftMessage::PointerButtonUp(pointer_button) => {
                     if pointer_button.button.map(|button| button == PointerButton::Primary).unwrap_or_default() {
+                        state.update_text_selection(self.element_data.style.selection_color());
                         state.pointer_down = false;
                         state.cursor_reset();
                         self.release_pointer_capture(PointerId::new(1).unwrap());
@@ -377,6 +385,7 @@ impl ElementInternals for Text {
                     state.cursor_pos = pointer_moved.current.logical_point() - kurbo::Vec2::new(text_position.x as f64, text_position.y as f64);
                     // macOS seems to generate a spurious move after selecting word?
                     if state.pointer_down && prev_pos != state.cursor_pos {
+                        state.update_text_selection(self.element_data.style.selection_color());
                         state.cursor_reset();
                         let cursor_pos = state.cursor_pos;
                         state.extend_selection_to_point(cursor_pos);
@@ -524,6 +533,17 @@ impl TextState {
         self.content_widths = None;
         self.is_layout_dirty = false;
     }
+
+    fn update_text_selection(&mut self, selection_color: Color) {
+        let layout = self.layout.as_ref().unwrap();
+        let text_renderer = self.text_render.as_mut().unwrap();
+        for line in text_renderer.lines.iter_mut() {
+            line.selections.clear();
+        }
+        self.selection.geometry_with(layout, |rect, line| {
+            text_renderer.lines[line].selections.push((Rectangle::new(rect.x0 as f32, rect.y0 as f32, rect.width() as f32, rect.height() as f32), selection_color));
+        });
+    }
 }
 
 impl TextData for Text {
diff --git a/crates/craft_retained/src/elements/text_input.rs b/crates/craft_retained/src/elements/text_input.rs
index b9394b09..3241bfd9 100644
--- a/crates/craft_retained/src/elements/text_input.rs
+++ b/crates/craft_retained/src/elements/text_input.rs
@@ -190,6 +190,7 @@ impl ElementInternals for TextInput {
         text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
+        dirty: bool,
     ) {
         let result = taffy_tree.layout(self.element_data.layout_item.taffy_node_id.unwrap()).unwrap();
         self.resolve_box(position, transform, result, z_index);
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index 2a040e98..d00bc59d 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -64,9 +64,16 @@ pub struct LayoutItem {
     //cache_border_spec: Option<(CssRoundedRect, f64)>, // f64 for scale factor
     cache_border_spec: Option<BorderSpec>,
     computed_border: ComputedBorder,
+    /// True if the layout is new.
+    pub has_new_layout: bool,
+    transform: Affine,
 }
 
 impl LayoutItem {
+    pub(crate) fn get_transform(&self) -> Affine {
+        self.transform
+    }
+
     pub fn push_child(&mut self, child: &Option<NodeId>) {
         if let Some(taffy_node_id) = child.as_ref() {
             self.children_awaiting_add.push(*taffy_node_id);
@@ -134,6 +141,7 @@ impl LayoutItem {
             size,
         };
         self.computed_box_transformed = self.computed_box.transform(scroll_transform);
+        self.transform = scroll_transform;
     }
 
     pub fn apply_borders(
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 3c56ba04..4ea52162 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -47,8 +47,6 @@ use std::future::Future;
 use std::pin::Pin;
 use std::rc::Rc;
 use std::sync::Arc;
-#[cfg(not(target_arch = "wasm32"))]
-use std::time;
 #[cfg(target_arch = "wasm32")]
 use web_time as time;
 #[cfg(target_arch = "wasm32")]
@@ -208,7 +206,6 @@ pub fn setup_craft(
 
         runtime: runtime_copy,
         modifiers: Default::default(),
-        last_frame_time: time::Instant::now(),
         redraw_flags: RedrawFlags::new(true),
         render_list: RenderList::new(),
         target_scratch: Vec::new(),

From 4e465e3d9176f2bf6548c37082e2a1af9a983396 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Wed, 24 Dec 2025 13:54:16 -0500
Subject: [PATCH 005/143] poc

---
 Cargo.lock                                    |   1 +
 crates/craft_renderer/src/renderer.rs         |   8 +
 crates/craft_retained/Cargo.toml              |   3 +-
 crates/craft_retained/src/app.rs              |  57 +-
 .../craft_retained/src/craft_winit_state.rs   |  12 +-
 .../craft_retained/src/elements/container.rs  |  20 +-
 .../src/elements/core/element_internals.rs    |   8 +-
 crates/craft_retained/src/elements/image.rs   |   1 -
 .../craft_retained/src/elements/scrollable.rs |   5 +
 .../src/elements/slider/slider.rs             |  21 +-
 crates/craft_retained/src/elements/text.rs    |  42 +-
 .../craft_retained/src/elements/text_input.rs | 984 ------------------
 .../src/elements/text_input/mod.rs            | 431 ++++++++
 .../elements/text_input/text_input_state.rs   | 676 ++++++++++++
 .../src/events/event_dispatch.rs              |   4 +-
 .../craft_retained/src/layout/layout_item.rs  |   4 +-
 crates/craft_retained/src/lib.rs              |   2 +
 .../craft_retained/src/text/parley_editor.rs  |   5 +
 examples/jsframeworkbench/main.rs             |  45 +-
 19 files changed, 1250 insertions(+), 1079 deletions(-)
 delete mode 100644 crates/craft_retained/src/elements/text_input.rs
 create mode 100644 crates/craft_retained/src/elements/text_input/mod.rs
 create mode 100644 crates/craft_retained/src/elements/text_input/text_input_state.rs

diff --git a/Cargo.lock b/Cargo.lock
index bcbd6929..a9f77194 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3904,6 +3904,7 @@ dependencies = [
 [[package]]
 name = "taffy"
 version = "0.9.2"
+source = "git+https://github.com/AustinMReppert/taffy?rev=c99a8e60bf43ea695abda49a4be2b07baf683934#c99a8e60bf43ea695abda49a4be2b07baf683934"
 dependencies = [
  "arrayvec",
  "grid",
diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index cc771d7b..2cb78d6d 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -132,6 +132,7 @@ impl RenderList {
     }
 
 
+    #[inline(always)]
     pub fn push_hit_testable(&mut self, id: u64, bounding_box: Rectangle) {
         if let Some(cull) = &self.cull {
             if !cull.intersects(&bounding_box) {
@@ -141,6 +142,7 @@ impl RenderList {
         self.targets.push((id, bounding_box));
     }
 
+    #[inline(always)]
     pub fn draw_rect_outline(&mut self, rectangle: Rectangle, outline_color: Color, thickness: f64) {
         if let Some(cull) = &self.cull {
             if !cull.intersects(&rectangle) {
@@ -150,6 +152,7 @@ impl RenderList {
         self.commands.push(RenderCommand::DrawRectOutline(rectangle, outline_color, thickness));
     }
 
+    #[inline(always)]
     pub fn fill_bez_path(&mut self, path: kurbo::BezPath, brush: Brush) {
         if let Some(cull) = &self.cull {
             if !cull.intersects(&Rectangle::from_kurbo(path.bounding_box())) {
@@ -159,6 +162,7 @@ impl RenderList {
         self.commands.push(RenderCommand::FillBezPath(path, brush));
     }
 
+    #[inline(always)]
     pub fn draw_text(
         &mut self,
         component: Weak<RefCell<dyn TextData>>,
@@ -174,10 +178,12 @@ impl RenderList {
         self.commands.push(RenderCommand::DrawText(component, rectangle, text_scroll, show_cursor));
     }
 
+    #[inline(always)]
     pub fn draw_image(&mut self, rectangle: Rectangle, resource_identifier: ResourceIdentifier) {
         self.commands.push(RenderCommand::DrawImage(rectangle, resource_identifier));
     }
 
+    #[inline(always)]
     pub fn draw_tiny_vg(
         &mut self,
         rectangle: Rectangle,
@@ -187,10 +193,12 @@ impl RenderList {
         self.commands.push(RenderCommand::DrawTinyVg(rectangle, resource_identifier, override_color));
     }
 
+    #[inline(always)]
     pub fn push_layer(&mut self, rect: Rectangle) {
         self.commands.push(RenderCommand::PushLayer(rect));
     }
 
+    #[inline(always)]
     pub fn pop_layer(&mut self) {
         self.commands.push(RenderCommand::PopLayer);
     }
diff --git a/crates/craft_retained/Cargo.toml b/crates/craft_retained/Cargo.toml
index 699ec0a8..aff0a120 100644
--- a/crates/craft_retained/Cargo.toml
+++ b/crates/craft_retained/Cargo.toml
@@ -88,7 +88,8 @@ workspace = true
 
 [dependencies.taffy]
 #version = "0.9.2"
-path = "../../../taffy"
+git = "https://github.com/AustinMReppert/taffy"
+rev = "c99a8e60bf43ea695abda49a4be2b07baf683934"
 default-features = false
 features = ["std", "taffy_tree", "flexbox", "content_size", "block_layout"]
 
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 832fa39c..b228028c 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -62,6 +62,7 @@ thread_local! {
     pub(crate) static PENDING_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = RefCell::new(VecDeque::new());
     pub(crate) static IN_PROGRESS_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = RefCell::new(VecDeque::new());
     pub(crate) static FOCUS: RefCell<Option<Weak<RefCell<dyn Element>>>> = RefCell::new(None);
+    pub(crate) static LAYOUT_DIRTY: RefCell<bool> = RefCell::new(true);
 }
 
 pub struct App {
@@ -123,6 +124,7 @@ impl App {
         self.window_context.scale_factor = scale_factor;
         self.on_resize(self.window.as_ref().unwrap().inner_size());
         self.root.borrow_mut().scale_factor(self.window_context.effective_scale_factor());
+        style_root_element(self.root.borrow_mut().deref_mut(), self.window_context.window_size());
     }
 
     pub fn on_process_user_events(&mut self) {}
@@ -287,8 +289,8 @@ impl App {
         }
 
         {
-            let span = span!(Level::INFO, "renderer_submit");
-            let _enter = span.enter();
+            /*let span = span!(Level::INFO, "renderer_submit");
+            let _enter = span.enter();*/
 
             if self.renderer.is_some() {
                 self.renderer.as_mut().unwrap().submit(self.resource_manager.clone());
@@ -319,6 +321,8 @@ impl App {
                 self.window_context.zoom_in();
             }
             self.root.borrow_mut().scale_factor(self.window_context.effective_scale_factor());
+            request_layout();
+            style_root_element(self.root.borrow_mut().deref_mut(), self.window_context.window_size());
             self.request_redraw(RedrawFlags::new(true));
             return;
         }
@@ -446,8 +450,8 @@ impl App {
     /// "Animates" a tree by calling `on_animation_frame` and changing an element's styles.
     #[allow(dead_code)]
     fn animate_tree(&mut self, delta_time: &Duration, layout_origin: Point, viewport_size: LogicalSize<f32>) {
-        let span = span!(Level::INFO, "animate_tree");
-        let _enter = span.enter();
+        /*let span = span!(Level::INFO, "animate_tree");
+        let _enter = span.enter();*/
 
         let old_has_active_animation = self.previous_animation_flags.has_active_animation();
         let root_element = self.root.clone();
@@ -489,8 +493,8 @@ impl App {
         let text_context = self.text_context.as_mut().unwrap();
 
         {
-            let span = span!(Level::INFO, "layout");
-            let _enter = span.enter();
+            /*let span = span!(Level::INFO, "layout");
+            let _enter = span.enter();*/
             TAFFY_TREE.with_borrow_mut(|taffy_tree| {
                 layout(
                     taffy_tree,
@@ -510,16 +514,16 @@ impl App {
     fn draw_reactive_tree(&mut self, mouse_position: Option<Point>) {
         let text_context = self.text_context.as_mut().unwrap();
         {
-            let span = span!(Level::INFO, "render");
-            let _enter = span.enter();
+            /*let span = span!(Level::INFO, "render");
+            let _enter = span.enter();*/
             self.render_list.clear();
             let scale_factor = self.window_context.effective_scale_factor();
 
             let renderer = self.renderer.as_mut().unwrap();
 
             {
-                let span = span!(Level::INFO, "render(element)");
-                let _enter = span.enter();
+                /*let span = span!(Level::INFO, "render(element)");
+                let _enter = span.enter();*/
                 self.root.borrow_mut().draw(&mut self.render_list, text_context, mouse_position, scale_factor);
             }
 
@@ -585,7 +589,7 @@ fn style_root_element(root: &mut dyn Element, root_size: LogicalSize<f32>) {
 
     style.set_width(Unit::Px(root_size.width));
     style.set_wrap(Wrap::Wrap);
-    style.set_display(Display::Flex);
+    style.set_display(Display::Block);
 
     if is_user_root_height_auto {
         style.set_height(Unit::Auto);
@@ -606,20 +610,30 @@ fn layout(
     scale_factor: f64,
     pointer: Option<Point>,
 ) -> NodeId {
+    let dirty = LAYOUT_DIRTY.with_borrow(|status| {
+        *status
+    });
+
     let root_node = root_element.borrow()
         .element_data()
         .layout_item
         .taffy_node_id
         .expect("A root element must have a layout node.");
 
+    if !dirty {
+        return root_node;
+    }
+
     let available_space: taffy::Size<AvailableSpace> = taffy::Size {
         width: AvailableSpace::Definite(window_size.width),
         height: AvailableSpace::Definite(window_size.height),
     };
 
     {
-        let span = span!(Level::INFO, "layout(taffy)");
-        let _enter = span.enter();
+        /*let span = span!(Level::INFO, "layout(taffy)");
+        let _enter = span.enter();*/
+        //println!("before layout");
+        //taffy_tree.print_tree(root_node);
         taffy_tree
             .compute_layout_with_measure(
                 root_node,
@@ -637,13 +651,15 @@ fn layout(
             )
             .unwrap();
     }
+        //println!("after layout");
+    //taffy_tree.print_tree(root_node);
 
     let transform = Affine::IDENTITY;
 
     let mut layout_order: u32 = 0;
     {
-        let span = span!(Level::INFO, "layout(apply)");
-        let _enter = span.enter();
+        /*let span = span!(Level::INFO, "layout(apply)");
+        let _enter = span.enter();*/
         root_element.borrow_mut().apply_layout(
             taffy_tree,
             origin,
@@ -653,9 +669,18 @@ fn layout(
             text_context,
             None,
             scale_factor,
-            false,
         );
     }
 
+    LAYOUT_DIRTY.with_borrow_mut(|status| {
+        *status = false;
+    });
+
     root_node
 }
+
+pub fn request_layout() {
+    LAYOUT_DIRTY.with_borrow_mut(|status| {
+        *status = true;
+    });
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index 36226d6e..fbb58cfe 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -14,10 +14,12 @@ use craft_logging::info;
 
 use winit::application::ApplicationHandler;
 use winit::event::{StartCause, WindowEvent};
-use winit::event_loop::{ActiveEventLoop};
+use winit::event_loop::{ActiveEventLoop, ControlFlow};
 use winit::window::WindowAttributes;
 use winit::window::{Window, WindowId};
 
+#[cfg(not(target_arch = "wasm32"))]
+use std::time;
 #[cfg(target_arch = "wasm32")]
 use web_time as time;
 
@@ -32,6 +34,8 @@ use ui_events_winit::{WindowEventReducer, WindowEventTranslation};
 use winit::dpi::LogicalSize;
 use crate::document::Document;
 
+const WAIT_TIME: time::Duration = time::Duration::from_millis(15);
+
 /// Stores state related to Winit.
 ///
 /// Forwards most events to the main Craft Event Loop.
@@ -249,19 +253,15 @@ impl ApplicationHandler for CraftWinitState {
             return;
         }
 
-        //self.craft_state.craft_app.window.clone().unwrap().request_redraw();
-
         // Switch to Poll mode if we are running animations.
 
-/*        let has_active_animation = self.craft_state.craft_app.previous_animation_flags.has_active_animation();
+        let has_active_animation = self.craft_state.craft_app.previous_animation_flags.has_active_animation();
 
         if has_active_animation {
             event_loop.set_control_flow(ControlFlow::Poll);
         } else {
             event_loop.set_control_flow(ControlFlow::WaitUntil(time::Instant::now() + WAIT_TIME));
         }
-        event_loop.set_control_flow(ControlFlow::Poll);
-        */
     }
 }
 
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index b2317a14..dd9a23fc 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -14,8 +14,7 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::ops::Deref;
 use std::rc::{Rc, Weak};
-use taffy::TaffyTree;
-use crate::rgba;
+use taffy::{PrintTree, TaffyTree};
 
 /// Stores one or more elements.
 ///
@@ -136,13 +135,14 @@ impl ElementInternals for Container {
         text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
-        dirty: bool,
     ) {
         let node = self.element_data.layout_item.taffy_node_id.unwrap();
         let layout = taffy_tree.layout(node).unwrap();
+        let has_new_layout = taffy_tree.get_has_new_layout(node);
+
+        let dirty = has_new_layout || transform != self.element_data.layout_item.get_transform() || position != self.element_data.layout_item.position ;
+        self.element_data.layout_item.has_new_layout = has_new_layout;
 
-        let dirty = layout.has_new_layout || transform != self.element_data.layout_item.get_transform() ;
-        self.element_data.layout_item.has_new_layout = dirty;
         if dirty {
             self.resolve_box(position, transform, layout, z_index);
             self.apply_borders(scale_factor);
@@ -158,8 +158,8 @@ impl ElementInternals for Container {
             self.element_data.scroll_state.as_mut().unwrap().mark_old();
         }
 
-        if layout.has_new_layout {
-            taffy_tree.mark_old(node);
+        if has_new_layout {
+            taffy_tree.mark_seen(node);
         }
 
         let scroll_y = self.element_data.scroll().map_or(0.0, |s| s.scroll_y() as f64);
@@ -183,9 +183,9 @@ impl ElementInternals for Container {
         // We draw the borders before we start any layers, so that we don't clip the borders.
         self.draw_borders(renderer, scale_factor);
 
-        if self.element_data.layout_item.has_new_layout {
-            renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 1.0);
-        }
+        /*if self.element_data.layout_item.has_new_layout {
+            renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 5.0);
+        }*/
 
         self.maybe_start_layer(renderer, scale_factor);
         self.draw_children(renderer, text_context, pointer, scale_factor);
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index cfaf8a89..a35b8396 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -18,7 +18,8 @@ use crate::elements::Element;
 #[cfg(feature = "accesskit")]
 use accesskit::{Action, Role};
 use craft_primitives::geometry::borders::CssRoundedRect;
-use crate::app::TAFFY_TREE;
+use crate::app::{LAYOUT_DIRTY, TAFFY_TREE};
+use crate::request_layout;
 
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
 pub trait  ElementInternals: ElementData {
@@ -44,7 +45,6 @@ pub trait  ElementInternals: ElementData {
                 text_context,
                 self.element_data().layout_item.clip_bounds,
                 scale_factor,
-                dirty,
             );
         }
     }
@@ -111,7 +111,6 @@ pub trait  ElementInternals: ElementData {
         text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
-        dirty: bool,
     );
 
     /// Draws the element and its visual contents.
@@ -369,6 +368,7 @@ pub trait  ElementInternals: ElementData {
 
     /// Mark layout node dirty.
     fn mark_dirty(&mut self) {
+        request_layout();
         let id = self.element_data().layout_item.taffy_node_id;
         if let Some(id) = id {
             TAFFY_TREE.with_borrow_mut(|taffy_tree| {
@@ -379,6 +379,8 @@ pub trait  ElementInternals: ElementData {
 
     /// Updates taffy's style to reflect craft's style struct.
     fn update_taffy_style(&mut self) {
+        request_layout();
+
         let id = self.element_data().layout_item.taffy_node_id;
         if let Some(id) = id {
             TAFFY_TREE.with_borrow_mut(|taffy_tree| {
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 6f767174..267fb516 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -107,7 +107,6 @@ impl ElementInternals for Image {
         _text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
-        dirty: bool,
     ) {
         let layout = taffy_tree.layout(self.element_data.layout_item.taffy_node_id.unwrap()).unwrap();
         self.resolve_box(position, transform, layout, z_index);
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 97d911c4..3afbd9d1 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -3,6 +3,8 @@ use crate::events::{CraftMessage, Event};
 use kurbo::Point;
 use ui_events::pointer::{PointerId, PointerType};
 use ui_events::ScrollDelta;
+use crate::app::LAYOUT_DIRTY;
+use crate::request_layout;
 
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage, event: &mut Event) {
@@ -26,6 +28,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
 
                 let current_scroll_y = state.scroll_y();
                 state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
+                request_layout();
 
                 event.prevent_propagate();
                 event.prevent_defaults();
@@ -76,6 +79,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
                         let scroll_y = percent * element_data.layout_item.max_scroll_y;
 
                         state.set_scroll_y(scroll_y.clamp(0.0, element_data.layout_item.max_scroll_y));
+                        request_layout();
 
                         event.prevent_propagate();
                         event.prevent_defaults();
@@ -112,6 +116,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
 
                     let current_scroll_y = state.scroll_y();
                     state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
+                    request_layout();
                     state.scroll_click = Some(Point::new(click.x, pointer_motion.current.position.y));
                     event.prevent_propagate();
                     event.prevent_defaults();
diff --git a/crates/craft_retained/src/elements/slider/slider.rs b/crates/craft_retained/src/elements/slider/slider.rs
index 4fe51aee..da56b095 100644
--- a/crates/craft_retained/src/elements/slider/slider.rs
+++ b/crates/craft_retained/src/elements/slider/slider.rs
@@ -16,7 +16,7 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::ops::Deref;
 use std::rc::{Rc, Weak};
-use taffy::TaffyTree;
+use taffy::{PrintTree, TaffyTree};
 use ui_events::keyboard::{Code, KeyState};
 use ui_events::pointer::PointerId;
 
@@ -250,13 +250,20 @@ impl ElementInternals for Slider {
         _text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
-        dirty: bool,
     ) {
-        let layout = taffy_tree.layout(self.element_data.layout_item.taffy_node_id.unwrap()).unwrap();
-        self.resolve_box(position, transform, layout, z_index);
+        let node = self.element_data.layout_item.taffy_node_id.unwrap();
+        let layout = taffy_tree.layout(node).unwrap();
+        let has_new_layout = taffy_tree.get_has_new_layout(node);
 
-        self.apply_borders(scale_factor);
-        self.apply_clip(clip_bounds);
+        let dirty = has_new_layout || transform != self.element_data.layout_item.get_transform() || position != self.element_data.layout_item.position ;
+        self.element_data.layout_item.has_new_layout = has_new_layout;
+
+        if dirty {
+            self.resolve_box(position, transform, layout, z_index);
+
+            self.apply_borders(scale_factor);
+            self.apply_clip(clip_bounds);
+        }
     }
 
     fn draw(
@@ -328,7 +335,7 @@ impl ElementInternals for Slider {
                 //event.result_message(CraftMessage::SliderValueChanged(value));
 
                 let new_event = Event::new(event.target.clone());
-                dispatch_event(new_event, CraftMessage::SliderValueChanged(self.value));
+                //dispatch_event(new_event, CraftMessage::SliderValueChanged(self.value));
             }
             CraftMessage::PointerMovedEvent(pointer_update) => {
                 if !self.dragging {
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 16ce4cb9..dc43bf6d 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -24,7 +24,7 @@ use kurbo::Affine;
 use rustc_hash::FxHashMap;
 #[cfg(not(target_arch = "wasm32"))]
 use std::time;
-use taffy::{AvailableSpace, Size, TaffyTree};
+use taffy::{AvailableSpace, PrintTree, Size, TaffyTree};
 use time::{Duration, Instant};
 use winit::dpi;
 #[cfg(target_arch = "wasm32")]
@@ -38,7 +38,6 @@ use craft_primitives::ColorBrush;
 use craft_renderer::text_renderer_data::TextData;
 use smol_str::{SmolStr, ToSmolStr};
 use ui_events::pointer::{PointerButton, PointerId};
-use crate::rgba;
 
 // A stateful element that shows text.
 #[derive(Clone, Default)]
@@ -65,7 +64,11 @@ pub struct TextState {
     pub(crate) last_click_time: Option<Instant>,
     pub(crate) click_count: u32,
     pub(crate) pointer_down: bool,
-    pub(crate) cursor_pos: Point,
+    /// The last known cursor position.
+    ///
+    /// The cursor is assumed to start at (0.0, 0.0). The cursor_pos may return points
+    /// outside the text input.
+    cursor_pos: Point,
     pub(crate) start_time: Option<Instant>,
     pub(crate) blink_period: Duration,
 
@@ -205,9 +208,9 @@ impl ElementInternals for Text {
 
         self.draw_borders(renderer, scale_factor);
 
-        if self.element_data.layout_item.has_new_layout {
+        /*if self.element_data.layout_item.has_new_layout {
             renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 1.0);
-        }
+        }*/
 
         renderer.draw_text(self.me.clone().unwrap(), content_rectangle.scale(scale_factor), None, false);
     }
@@ -263,22 +266,6 @@ impl ElementInternals for Text {
         tree.nodes.push((current_node_id, current_node));
     }
 
-    /*fn compute_layout(
-        &mut self,
-        taffy_tree: &mut TaffyTree<LayoutContext>,
-        scale_factor: f64,
-    ) {
-        if scale_factor as f32 != self.state.scale_factor {
-            self.state.is_layout_dirty = true;
-            self.state.scale_factor = scale_factor as f32;
-        }
-        if self.state.is_layout_dirty {
-            taffy_tree.mark_dirty(self.element_data.layout_item.taffy_node_id.unwrap()).unwrap();
-        }
-
-        self.apply_style_to_layout_node_if_dirty(taffy_tree);
-    }*/
-
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree<LayoutContext>,
@@ -289,13 +276,13 @@ impl ElementInternals for Text {
         text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
-        dirty: bool,
     ) {
         let node = self.element_data.layout_item.taffy_node_id.unwrap();
         let result = taffy_tree.layout(node).unwrap();
+        let has_new_layout = taffy_tree.get_has_new_layout(node);
 
-        let dirty = dirty || result.has_new_layout || transform != self.element_data.layout_item.get_transform();
-        self.element_data.layout_item.has_new_layout = dirty;
+        let dirty = has_new_layout || transform != self.element_data.layout_item.get_transform() || position != self.element_data.layout_item.position;
+        self.element_data.layout_item.has_new_layout = has_new_layout;
         if dirty {
             self.resolve_box(position, transform, result, z_index);
             self.apply_clip(clip_bounds);
@@ -303,8 +290,8 @@ impl ElementInternals for Text {
             self.apply_borders(scale_factor);
         }
 
-        if result.has_new_layout {
-            taffy_tree.mark_old(node);
+        if has_new_layout {
+            taffy_tree.mark_seen(node);
         }
 
         let state: &mut TextState = &mut self.state;
@@ -325,9 +312,6 @@ impl ElementInternals for Text {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        //self.on_style_event(message, should_style, event);
-        //self.maybe_unset_focus(message, event, target);
-
         if !self.selectable {
             return;
         }
diff --git a/crates/craft_retained/src/elements/text_input.rs b/crates/craft_retained/src/elements/text_input.rs
deleted file mode 100644
index 3241bfd9..00000000
--- a/crates/craft_retained/src/elements/text_input.rs
+++ /dev/null
@@ -1,984 +0,0 @@
-use crate::app::ELEMENTS;
-use crate::elements::element::Element;
-use crate::elements::element_data::ElementData;
-use crate::layout::layout_context::{LayoutContext, TaffyTextInputContext};
-use crate::style::{Display, Style, TextStyleProperty, Unit};
-use craft_primitives::geometry::{Point, Rectangle, TrblRectangle};
-use craft_primitives::Color;
-use craft_renderer::renderer::{RenderList, TextScroll};
-use std::any::Any;
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::ops::{Deref, Range};
-use std::rc::{Rc, Weak};
-use taffy::{AvailableSpace, NodeId, TaffyTree};
-
-use crate::app::TAFFY_TREE;
-use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
-#[cfg(feature = "accesskit")]
-use crate::elements::element_id::create_unique_element_id;
-use crate::elements::scrollable;
-use crate::events::{CraftMessage, Event};
-use crate::layout::layout_context::TextHashKey;
-use crate::text::parley_editor::{PlainEditor, PlainEditorDriver};
-use crate::text::text_context::TextContext;
-use crate::text::text_render_data::TextRender;
-use crate::text::{text_render_data, RangedStyles};
-use crate::utils::cloneable_any::CloneableAny;
-use craft_renderer::text_renderer_data::TextData;
-use kurbo::Affine;
-use parley::{Affinity, BoundingBox, ContentWidths, Cursor, Selection};
-#[cfg(not(target_arch = "wasm32"))]
-use std::time;
-use time::{Duration, Instant};
-use ui_events::keyboard::{Key, Modifiers, NamedKey};
-use ui_events::pointer::PointerButton;
-#[cfg(target_arch = "wasm32")]
-use web_time as time;
-use winit::dpi;
-use winit::event::Ime;
-
-// A stateful element that shows text.
-#[derive(Clone, Default)]
-pub struct TextInput {
-    element_data: ElementData,
-    /// Whether the text input will update the editor every update with the user provided text.
-    /// NOTE: The editor will always use the user provided text on initialization.
-    use_text_value_on_update: bool,
-    pub text: Option<String>,
-    pub ranged_styles: Option<RangedStyles>,
-    pub disabled: bool,
-    pub(crate) state: TextInputState,
-    me: Option<Weak<RefCell<Self>>>,
-}
-
-#[derive(Clone, Default, Debug, Copy)]
-pub(crate) struct ImeState {
-    #[allow(dead_code)]
-    pub is_ime_active: bool,
-}
-
-#[allow(dead_code)]
-/// An external message that allows others to command the TextInput.
-pub enum TextInputMessage {
-    Copy,
-    Paste,
-    Cut,
-    // TODO: Add more messages.
-}
-
-#[derive(Clone, Default)]
-pub struct TextInputState {
-    taffy_node: Option<NodeId>,
-    pub is_active: bool,
-    #[allow(dead_code)]
-    pub(crate) ime_state: ImeState,
-    pub(crate) editor: PlainEditor,
-
-    cache: HashMap<TextHashKey, taffy::Size<f32>>,
-
-    // The current key used for laying out the text input.
-    current_layout_key: Option<TextHashKey>,
-
-    current_render_key: Option<TextHashKey>,
-    content_widths: Option<ContentWidths>,
-
-    // The most recently requested key for laying out the text input.
-    last_requested_key: Option<TextHashKey>,
-    pub(crate) text_render: Option<TextRender>,
-    scale_factor: f64,
-
-    last_click_time: Option<Instant>,
-    click_count: u32,
-    pointer_down: bool,
-    cursor_pos: Point,
-    cursor_visible: bool,
-    modifiers: Option<Modifiers>,
-    start_time: Option<Instant>,
-    blink_period: Duration,
-    is_layout_dirty: bool,
-}
-
-impl TextInput {
-    pub fn new(text: &str) -> Rc<RefCell<Self>> {
-        let default_style = Self::get_default_style();
-        let mut editor = PlainEditor::new(default_style.font_size());
-        editor.set_scale(1.0f32);
-        let style_set = editor.edit_styles();
-        default_style.add_styles_to_style_set(style_set);
-
-        let text_input_state = TextInputState {
-            taffy_node: None,
-            ime_state: ImeState::default(),
-            is_active: false,
-            editor,
-            cache: Default::default(),
-            current_layout_key: None,
-            current_render_key: None,
-            content_widths: None,
-            last_requested_key: None,
-            text_render: None,
-            scale_factor: 1.0,
-            last_click_time: None,
-            click_count: 0,
-            pointer_down: false,
-            cursor_pos: Point::default(),
-            cursor_visible: false,
-            modifiers: None,
-            start_time: None,
-            blink_period: Default::default(),
-            is_layout_dirty: true,
-        };
-
-        let me = Rc::new(RefCell::new(Self {
-            text: Some(text.to_string()),
-            element_data: ElementData::new(true),
-            use_text_value_on_update: true,
-            ranged_styles: Some(RangedStyles::new(vec![])),
-            disabled: false,
-            state: text_input_state,
-            me: None,
-        }));
-        me.borrow_mut().element_data.style = default_style;
-
-        let me2 = me.clone();
-        me.borrow_mut().me = Some(Rc::downgrade(&me2));
-
-        let me_element: Rc<RefCell<dyn Element>> = me.clone();
-        me.borrow_mut().element_data.me = Some(Rc::downgrade(&me_element));
-
-        me.borrow_mut().text(text);
-
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let context = LayoutContext::TextInput(TaffyTextInputContext {
-                element: me.borrow().me.clone().unwrap(),
-            });
-            let node_id = taffy_tree
-                .new_leaf_with_context(me.borrow().element_data.current_style().to_taffy_style(), context)
-                .expect("TODO: panic message");
-            me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
-            me.borrow_mut().state.taffy_node(Some(node_id));
-        });
-
-        ELEMENTS.with_borrow_mut(|elements| {
-            elements.insert(me.borrow().deref());
-        });
-
-        me
-    }
-}
-
-impl crate::elements::core::ElementData for TextInput {
-    fn element_data(&self) -> &ElementData {
-        &self.element_data
-    }
-
-    fn element_data_mut(&mut self) -> &mut ElementData {
-        &mut self.element_data
-    }
-}
-
-impl ElementInternals for TextInput {
-
-    fn apply_layout(
-        &mut self,
-        taffy_tree: &mut TaffyTree<LayoutContext>,
-        position: Point,
-        z_index: &mut u32,
-        transform: Affine,
-        _pointer: Option<Point>,
-        text_context: &mut TextContext,
-        clip_bounds: Option<Rectangle>,
-        scale_factor: f64,
-        dirty: bool,
-    ) {
-        let result = taffy_tree.layout(self.element_data.layout_item.taffy_node_id.unwrap()).unwrap();
-        self.resolve_box(position, transform, result, z_index);
-        self.apply_clip(clip_bounds);
-
-        self.apply_borders(scale_factor);
-
-        let focused = self.is_focused();
-
-        self.state.layout(
-            self.state.last_requested_key.unwrap().known_dimensions(),
-            self.state.last_requested_key.unwrap().available_space(),
-            text_context,
-            true,
-        );
-
-        let backgrounds: Vec<(Range<usize>, Color)> = self
-            .state
-            .editor
-            .ranged_styles
-            .styles
-            .iter()
-            .filter_map(|(range, style)| {
-                if let TextStyleProperty::BackgroundColor(color) = style {
-                    Some((range.clone(), *color))
-                } else {
-                    None
-                }
-            })
-            .collect();
-
-        let layout = self.state.editor.try_layout().unwrap();
-        let backgrounds: Vec<(Selection, Color)> = backgrounds
-            .iter()
-            .map(|(range, color)| {
-                (
-                    Selection::new(
-                        Cursor::from_byte_index(layout, range.start, Affinity::Downstream),
-                        Cursor::from_byte_index(layout, range.end, Affinity::Downstream),
-                    ),
-                    *color,
-                )
-            })
-            .collect();
-
-        let text_renderer = self.state.text_render.as_mut().unwrap();
-        for line in text_renderer.lines.iter_mut() {
-            line.backgrounds.clear();
-        }
-        for (selection, color) in backgrounds.iter() {
-            selection.geometry_with(layout, |rect, line| {
-                text_renderer.lines[line].backgrounds.push((
-                    Rectangle::new(rect.x0 as f32, rect.y0 as f32, rect.width() as f32, rect.height() as f32),
-                    *color,
-                ));
-            });
-        }
-
-        for line in text_renderer.lines.iter_mut() {
-            line.selections.clear();
-        }
-        self.state.editor.selection_geometry_with(|rect, line| {
-            text_renderer.lines[line]
-                .selections
-                .push((parley_box_to_rect(rect), self.element_data.current_style().selection_color()));
-        });
-
-        if focused {
-            let color =
-                self.element_data.current_style().cursor_color().unwrap_or(self.element_data.current_style().color());
-            text_renderer.cursor = self.state.editor.cursor_geometry(1.0).map(|r| (parley_box_to_rect(r), color));
-        } else {
-            text_renderer.cursor = None;
-        }
-        
-        self.element_data.apply_scroll(result);
-    }
-
-    fn draw(
-        &mut self,
-        renderer: &mut RenderList,
-        _text_context: &mut TextContext,
-        _pointer: Option<Point>,
-        scale_factor: f64,
-    ) {
-        if !self.is_visible() {
-            return;
-        }
-
-        self.add_hit_testable(renderer, true, scale_factor);
-        
-        let computed_box_transformed = self.computed_box();
-        let content_rectangle = computed_box_transformed.content_rectangle();
-
-        self.draw_borders(renderer, scale_factor);
-
-        let is_scrollable = self.element_data.is_scrollable();
-
-        let element_data = &self.element_data;
-        let padding_rectangle = element_data.layout_item.computed_box_transformed.padding_rectangle();
-        renderer.push_layer(padding_rectangle.scale(scale_factor));
-
-        let text_scroll = if is_scrollable {
-            Some(TextScroll::new(
-                self.element_data.scroll().map_or(0.0, |s| s.scroll_y()),
-                self.element_data.layout_item.computed_scroll_track.height,
-            ))
-        } else {
-            None
-        };
-
-        if self.state.text_render.as_ref().is_some() {
-            renderer.draw_text(
-                self.me.clone().unwrap(),
-                content_rectangle.scale(scale_factor),
-                text_scroll,
-                self.state.cursor_visible,
-            );
-        }
-
-        renderer.pop_layer();
-
-        self.draw_scrollbar(renderer, scale_factor);
-    }
-
-    #[cfg(feature = "accesskit")]
-    fn compute_accessibility_tree(
-        &mut self,
-        tree: &mut accesskit::TreeUpdate,
-        parent_index: Option<usize>,
-        scale_factor: f64,
-    ) {
-        let state: &mut TextInputState = &mut self.state;
-
-        if state.editor.try_layout().is_none() {
-            return;
-        }
-
-        let editor = &mut state.editor;
-
-        let current_node_id = accesskit::NodeId(self.element_data.internal_id);
-
-        let mut current_node = accesskit::Node::new(accesskit::Role::TextInput);
-        let padding_box =
-            self.element_data.layout_item.computed_box_transformed.padding_rectangle().scale(scale_factor);
-
-        current_node.set_bounds(accesskit::Rect {
-            x0: padding_box.left() as f64,
-            y0: padding_box.top() as f64,
-            x1: padding_box.right() as f64,
-            y1: padding_box.bottom() as f64,
-        });
-
-        editor.try_accessibility(
-            tree,
-            &mut current_node,
-            || accesskit::NodeId(create_unique_element_id()),
-            padding_box.x as f64,
-            padding_box.y as f64,
-        );
-
-        if let Some(parent_index) = parent_index {
-            let parent_node = tree.nodes.get_mut(parent_index).unwrap();
-            parent_node.1.push_child(current_node_id);
-        }
-
-        tree.nodes.push((current_node_id, current_node));
-    }
-
-    fn on_event(
-        &mut self,
-        message: &CraftMessage,
-        _text_context: &mut TextContext,
-        event: &mut Event,
-        _target: Option<Rc<RefCell<dyn ElementInternals>>>,
-    ) {
-        //self.on_style_event(message, element_state, should_style, event);
-        //self.maybe_unset_focus(message, event, target);
-        self.state.is_active = true;
-
-        scrollable::on_scroll_events(self, message, event);
-
-        if !event.propagate {
-            return;
-        }
-
-        let scroll_y = self.element_data.scroll().map_or(0.0, |s| s.scroll_y() as f64);
-
-        let scale_factor = self.state.scale_factor;
-        let text_position = self.computed_box().content_rectangle();
-        let text_x = text_position.x;
-        let text_y = text_position.y;
-        let focused = self.is_focused();
-
-        #[cfg(all(
-            any(target_os = "windows", target_os = "macos", target_os = "linux"),
-            feature = "clipboard"
-        ))]
-        fn copy(drv: &mut PlainEditorDriver) {
-            use clipboard_rs::{Clipboard, ClipboardContext};
-            if let Some(text) = drv.editor.selected_text() {
-                let cb = ClipboardContext::new().unwrap();
-                cb.set_text(text.to_owned()).ok();
-            }
-        }
-
-        #[cfg(not(all(
-            any(target_os = "windows", target_os = "macos", target_os = "linux"),
-            feature = "clipboard"
-        )))]
-        fn copy(_drv: &mut PlainEditorDriver) {}
-
-        #[cfg(all(
-            any(target_os = "windows", target_os = "macos", target_os = "linux"),
-            feature = "clipboard"
-        ))]
-        fn paste(drv: &mut PlainEditorDriver) {
-            use clipboard_rs::{Clipboard, ClipboardContext};
-            let cb = ClipboardContext::new().unwrap();
-            let text = cb.get_text().unwrap_or_default();
-            drv.insert_or_replace_selection(&text);
-        }
-
-        #[cfg(not(all(
-            any(target_os = "windows", target_os = "macos", target_os = "linux"),
-            feature = "clipboard"
-        )))]
-        fn paste(_drv: &mut PlainEditorDriver) {}
-
-        #[cfg(all(
-            any(target_os = "windows", target_os = "macos", target_os = "linux"),
-            feature = "clipboard"
-        ))]
-        fn cut(drv: &mut PlainEditorDriver) {
-            use clipboard_rs::{Clipboard, ClipboardContext};
-            if let Some(text) = drv.editor.selected_text() {
-                let cb = ClipboardContext::new().unwrap();
-                cb.set_text(text.to_owned()).ok();
-                drv.delete_selection();
-            }
-        }
-
-        #[cfg(not(all(
-            any(target_os = "windows", target_os = "macos", target_os = "linux"),
-            feature = "clipboard"
-        )))]
-        fn cut(_drv: &mut PlainEditorDriver) {}
-
-        let mut generate_text_changed_event = |editor: &mut PlainEditor| {
-            // TODO: generate event.
-            let _new_text = editor.text().to_string();
-            event.prevent_defaults();
-            event.prevent_propagate();
-        };
-
-        if let CraftMessage::ElementMessage(msg) = message
-            && let Some(msg) = msg.as_any().downcast_ref::<TextInputMessage>()
-        {
-            let mut drv = self.state.driver(_text_context);
-            match msg {
-                TextInputMessage::Copy => {
-                    copy(&mut drv);
-                }
-                TextInputMessage::Paste => {
-                    if self.disabled {
-                        return;
-                    }
-                    paste(&mut drv);
-                    self.state.clear_cache();
-                    generate_text_changed_event(&mut self.state.editor);
-                }
-                TextInputMessage::Cut => {
-                    if self.disabled {
-                        return;
-                    }
-                    cut(&mut drv);
-                    self.state.clear_cache();
-                    generate_text_changed_event(&mut self.state.editor);
-                }
-            }
-        }
-
-        match message {
-            CraftMessage::KeyboardInputEvent(keyboard_input) if !self.state.editor.is_composing() => {
-                self.state.modifiers = Some(keyboard_input.modifiers);
-
-                if self.disabled || !keyboard_input.state.is_down() || !focused {
-                    return;
-                }
-
-                self.state.cursor_reset();
-                #[allow(unused)]
-                let (shift, action_mod) = self
-                    .state
-                    .modifiers
-                    .map(|mods| (mods.shift(), if cfg!(target_os = "macos") { mods.meta() } else { mods.ctrl() }))
-                    .unwrap_or_default();
-
-                let mut drv = self.state.driver(_text_context);
-
-                match &keyboard_input.key {
-                    Key::Character(c) if action_mod && matches!(c.as_str(), "c" | "x" | "v") => {
-                        match c.to_lowercase().as_str() {
-                            "c" => copy(&mut drv),
-                            "x" => {
-                                cut(&mut drv);
-                                self.state.clear_cache();
-                                generate_text_changed_event(&mut self.state.editor);
-                            }
-                            "v" => {
-                                paste(&mut drv);
-                                self.state.clear_cache();
-                                generate_text_changed_event(&mut self.state.editor);
-                            }
-                            _ => (),
-                        }
-                    }
-                    Key::Character(c) if action_mod && matches!(c.to_lowercase().as_str(), "a") => {
-                        if shift {
-                            drv.collapse_selection();
-                        } else {
-                            drv.select_all();
-                        }
-                    }
-                    Key::Named(NamedKey::ArrowLeft) => {
-                        if action_mod {
-                            if shift {
-                                drv.select_word_left();
-                            } else {
-                                drv.move_word_left();
-                            }
-                        } else if shift {
-                            drv.select_left();
-                        } else {
-                            drv.move_left();
-                        }
-                    }
-                    Key::Named(NamedKey::ArrowRight) => {
-                        if action_mod {
-                            if shift {
-                                drv.select_word_right();
-                            } else {
-                                drv.move_word_right();
-                            }
-                        } else if shift {
-                            drv.select_right();
-                        } else {
-                            drv.move_right();
-                        }
-                    }
-                    Key::Named(NamedKey::ArrowUp) => {
-                        if shift {
-                            drv.select_up();
-                        } else {
-                            drv.move_up();
-                        }
-                    }
-                    Key::Named(NamedKey::ArrowDown) => {
-                        if shift {
-                            drv.select_down();
-                        } else {
-                            drv.move_down();
-                        }
-                    }
-                    Key::Named(NamedKey::Home) => {
-                        if action_mod {
-                            if shift {
-                                drv.select_to_text_start();
-                            } else {
-                                drv.move_to_text_start();
-                            }
-                        } else if shift {
-                            drv.select_to_line_start();
-                        } else {
-                            drv.move_to_line_start();
-                        }
-                    }
-                    Key::Named(NamedKey::End) => {
-                        let mut drv = self.state.driver(_text_context);
-
-                        if action_mod {
-                            if shift {
-                                drv.select_to_text_end();
-                            } else {
-                                drv.move_to_text_end();
-                            }
-                        } else if shift {
-                            drv.select_to_line_end();
-                        } else {
-                            drv.move_to_line_end();
-                        }
-                    }
-                    Key::Named(NamedKey::Delete) => {
-                        if action_mod {
-                            drv.delete_word();
-                            self.state.clear_cache();
-                        } else {
-                            drv.delete();
-                            self.state.clear_cache();
-                        }
-                        generate_text_changed_event(&mut self.state.editor);
-                    }
-                    Key::Named(NamedKey::Backspace) => {
-                        if action_mod {
-                            drv.backdelete_word();
-                            self.state.clear_cache();
-                        } else {
-                            drv.backdelete();
-                            self.state.clear_cache();
-                        }
-                        generate_text_changed_event(&mut self.state.editor);
-                    }
-                    Key::Named(NamedKey::Enter) => {
-                        drv.insert_or_replace_selection("\n");
-                        self.state.clear_cache();
-                        generate_text_changed_event(&mut self.state.editor);
-                    }
-                    Key::Character(s) => {
-                        drv.insert_or_replace_selection(s);
-                        self.state.clear_cache();
-                        generate_text_changed_event(&mut self.state.editor);
-                    }
-                    _ => (),
-                }
-            }
-            // WindowEvent::Touch(Touch {
-            //     phase, location, ..
-            // }) if !self.editor.is_composing() => {
-            //     let mut drv = self.editor.driver(&mut self.font_cx, &mut self.layout_cx);
-            //     use winit::event::TouchPhase::*;
-            //     match phase {
-            //         Started => {
-            //             // TODO: start a timer to convert to a SelectWordAtPoint
-            //             drv.move_to_point(location.x as f32, location.y as f32);
-            //         }
-            //         Cancelled => {
-            //             drv.collapse_selection();
-            //         }
-            //         Moved => {
-            //             // TODO: cancel SelectWordAtPoint timer
-            //             drv.extend_selection_to_point(
-            //                 location.x as f32,
-            //                 location.y as f32,
-            //             );
-            //         }
-            //         Ended => (),
-            //     }
-            // }
-            CraftMessage::PointerButtonDown(pointer_button) => {
-                if pointer_button.button == Some(PointerButton::Primary) {
-                    self.focus();
-                    self.state.pointer_down = true;
-                    self.state.cursor_reset();
-                    if !self.state.editor.is_composing() {
-                        let now = Instant::now();
-                        if let Some(last) = self.state.last_click_time.take() {
-                            if now.duration_since(last).as_secs_f64() < 0.25 {
-                                self.state.click_count = (self.state.click_count + 1) % 4;
-                            } else {
-                                self.state.click_count = 1;
-                            }
-                        } else {
-                            self.state.click_count = 1;
-                        }
-                        self.state.last_click_time = Some(now);
-                        let click_count = self.state.click_count;
-                        let cursor_pos = self.state.cursor_pos;
-                        let cursor_x = cursor_pos.x as f32;
-                        let cursor_y = cursor_pos.y as f32;
-
-                        if click_count == 1 {
-                            if let Some(_link) = self.state.get_cursor_link(cursor_pos, self) {
-                                // TODO generate event
-                                return;
-                            }
-                        }
-
-                        let mut drv = self.state.driver(_text_context);
-
-                        match click_count {
-                            2 => drv.select_word_at_point(cursor_x, cursor_y),
-                            3 => drv.select_line_at_point(cursor_x, cursor_y),
-                            _ => drv.move_to_point(cursor_x, cursor_y),
-                        }
-                    }
-                }
-            }
-            CraftMessage::PointerButtonUp(pointer_button) => {
-                if pointer_button.button == Some(PointerButton::Primary) {
-                    self.state.pointer_down = false;
-                    self.state.cursor_reset();
-                }
-            }
-            CraftMessage::PointerMovedEvent(pointer_moved) => {
-                let prev_pos = self.state.cursor_pos;
-                // NOTE: Cursor position should be relative to the top left of the text box.
-                let cursor_pos = pointer_moved.current.position;
-                let cursor_pos: Point = (cursor_pos.x as f32 - text_x, cursor_pos.y as f32 - text_y).into();
-                let mut cursor_pos = Point::new(cursor_pos.x * scale_factor, cursor_pos.y * scale_factor);
-                cursor_pos.y += scroll_y as f64;
-                self.state.cursor_pos = cursor_pos;
-                // macOS seems to generate a spurious move after selecting word?
-                if self.state.pointer_down && prev_pos != self.state.cursor_pos && !self.state.editor.is_composing() {
-                    self.state.cursor_reset();
-                    let cursor_pos = self.state.cursor_pos;
-                    self.state
-                        .driver(_text_context)
-                        .extend_selection_to_point(cursor_pos.x as f32, cursor_pos.y as f32);
-                }
-            }
-            CraftMessage::ImeEvent(Ime::Disabled) => {
-                self.state.driver(_text_context).clear_compose();
-                self.state.clear_cache();
-            }
-            CraftMessage::ImeEvent(Ime::Commit(text)) => {
-                self.state.driver(_text_context).insert_or_replace_selection(text);
-                self.state.clear_cache();
-                generate_text_changed_event(&mut self.state.editor);
-            }
-            CraftMessage::ImeEvent(Ime::Preedit(text, cursor)) => {
-                if text.is_empty() {
-                    self.state.driver(_text_context).clear_compose();
-                } else {
-                    self.state.driver(_text_context).set_compose(text, *cursor);
-                }
-                self.state.clear_cache();
-            }
-            _ => {}
-        }
-    }
-
-    fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
-        resolve_clip_for_scrollable(self, clip_bounds);
-    }
-
-    fn get_default_style() -> Style
-    where
-        Self: Sized,
-    {
-        let mut style = Style::default();
-
-        style.set_display(Display::Block);
-
-        const BORDER_COLOR: Color = Color::from_rgb8(199, 199, 206);
-        style.set_border_color(TrblRectangle::new_all(BORDER_COLOR));
-        style.set_border_width(TrblRectangle::new_all(Unit::Px(1.0)));
-        style.set_border_radius([(5.0, 5.0); 4]);
-
-        let padding = Unit::Px(4.0);
-        style.set_padding(TrblRectangle::new_all(padding));
-
-        style
-    }
-
-    fn scale_factor(&mut self, scale_factor: f64) {
-        self.state.editor.set_scale(scale_factor as f32);
-        self.state.scale_factor = scale_factor;
-        self.state.clear_cache();
-    }
-}
-
-impl TextInput {
-    /// Whether the text input will update the editor every update with the user provided text.
-    /// NOTE: The editor will always use the user provided text on initialization.
-    pub fn use_text_value_on_update(mut self, use_initial_text_value: bool) -> Self {
-        self.use_text_value_on_update = use_initial_text_value;
-        self
-    }
-
-    pub fn disable(&mut self) -> &mut Self {
-        self.disabled = true;
-        self
-    }
-
-    pub fn get_disabled(&mut self) -> bool {
-        self.disabled
-    }
-
-    pub fn get_text(&self) -> &str {
-        &self.state.editor.raw_text()
-    }
-
-    /// Set the text.
-    ///
-    /// Updates the text content immediately. Mark layout and render caches as dirty. Layout and
-    /// render caches will be computed in the next layout/render pass.
-    pub fn text(&mut self, text: &str) -> &mut Self {
-        self.state.editor.set_text(text);
-        self.state.clear_cache();
-        self
-    }
-
-    pub fn ranged_styles(&mut self, ranged_styles: RangedStyles) -> &mut Self {
-        self.state.editor.set_ranged_styles(ranged_styles);
-        self.state.clear_cache();
-        self
-    }
-}
-
-impl TextInputState {
-    pub fn measure(
-        &mut self,
-        known_dimensions: taffy::Size<Option<f32>>,
-        available_space: taffy::Size<AvailableSpace>,
-        text_context: &mut TextContext,
-    ) -> taffy::Size<f32> {
-        let key = TextHashKey::new(known_dimensions, available_space);
-
-        self.last_requested_key = Some(key);
-
-        self.layout(known_dimensions, available_space, text_context, false)
-    }
-
-    pub fn clear_cache(&mut self) {
-        self.is_layout_dirty = true;
-        self.cache.clear();
-        self.current_layout_key = None;
-        self.last_requested_key = None;
-        self.current_render_key = None;
-        self.text_render = None;
-        self.content_widths = None;
-
-        if let Some(id) = self.taffy_node {
-            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-                taffy_tree.mark_dirty(id).expect("Failed to mark node dirty");
-            })
-        }
-    }
-
-    pub fn layout(
-        &mut self,
-        known_dimensions: taffy::Size<Option<f32>>,
-        available_space: taffy::Size<AvailableSpace>,
-        text_context: &mut TextContext,
-        last_pass: bool,
-    ) -> taffy::Size<f32> {
-        let key = TextHashKey::new(known_dimensions, available_space);
-
-        if let Some(value) = self.cache.get(&key) {
-            if last_pass {
-                if self.current_layout_key == Some(key) {
-                    if self.current_render_key != self.current_layout_key {
-                        self.current_render_key = self.current_layout_key;
-
-                        let layout = self.editor.try_layout().unwrap();
-                        self.text_render = Some(text_render_data::from_editor(layout));
-                    }
-                    return *value;
-                }
-            } else {
-                return *value;
-            }
-        }
-
-        if self.editor.try_layout().is_none() || self.is_layout_dirty || self.content_widths.is_none() {
-            self.editor.set_width(None);
-            self.editor.refresh_layout(&mut text_context.font_context, &mut text_context.layout_context);
-            self.content_widths = Some(self.editor.try_layout().unwrap().calculate_content_widths());
-        }
-
-        let content_widths = self.content_widths.unwrap();
-        let width_constraint: Option<f32> = known_dimensions
-            .width
-            .or(match available_space.width {
-                AvailableSpace::MinContent => Some(content_widths.min),
-                AvailableSpace::MaxContent => Some(content_widths.max),
-                AvailableSpace::Definite(width) => Some(width),
-            })
-            .map(|width| {
-                let width: f32 = dpi::PhysicalUnit::from_logical::<f32, f32>(width, self.scale_factor).0;
-                // Taffy may give a min width > max_width.
-                // Min-width is preserved in this scenario to ensure text is readable.
-                width.clamp(content_widths.min, content_widths.max.max(content_widths.min))
-            });
-
-        let _height_constraint: Option<f32> = known_dimensions
-            .height
-            .or(match available_space.height {
-                AvailableSpace::MinContent => None,
-                AvailableSpace::MaxContent => None,
-                AvailableSpace::Definite(height) => Some(height),
-            })
-            .map(|height| dpi::PhysicalUnit::from_logical::<f32, f32>(height, self.scale_factor).0);
-
-        self.editor.set_width(width_constraint);
-        self.editor.refresh_layout(&mut text_context.font_context, &mut text_context.layout_context);
-        let layout = self.editor.try_layout().unwrap();
-
-        if last_pass {
-            self.current_render_key = self.current_layout_key;
-            self.text_render = Some(text_render_data::from_editor(layout));
-        }
-
-        let logical_width = dpi::LogicalUnit::from_physical::<f32, f32>(layout.width(), self.scale_factor).0;
-        let logical_height = dpi::LogicalUnit::from_physical::<f32, f32>(layout.height(), self.scale_factor).0;
-
-        let size = taffy::Size {
-            width: logical_width,
-            height: logical_height,
-        };
-
-        self.cache.insert(key, size);
-        self.current_layout_key = Some(key);
-        size
-    }
-
-    fn taffy_node(&mut self, taffy_node: Option<NodeId>) {
-        self.taffy_node = taffy_node;
-    }
-
-    pub fn get_cursor_link(&self, cursor_pos: Point, element: &TextInput) -> Option<String> {
-        if let Some(ranged_styles) = &element.ranged_styles {
-            let layout = self.editor.try_layout().unwrap();
-            for (range, style) in ranged_styles.styles.iter() {
-                if let TextStyleProperty::Link(link) = style {
-                    let anchor = Cursor::from_byte_index(layout, range.start, Affinity::Downstream);
-                    let focus = Cursor::from_byte_index(layout, range.end, Affinity::Downstream);
-                    let selection = Selection::new(anchor, focus);
-                    let link_rects = selection.geometry(layout);
-                    for link_rect in link_rects {
-                        if parley_box_to_rect(link_rect.0).contains(&cursor_pos) {
-                            return Some(link.clone());
-                        }
-                    }
-                }
-            }
-        }
-        None
-    }
-
-    pub fn cursor_reset(&mut self) {
-        self.start_time = Some(Instant::now());
-        // TODO: for real world use, this should be reading from the system settings
-        self.blink_period = Duration::from_millis(500);
-        self.cursor_visible = true;
-    }
-
-    #[allow(dead_code)]
-    pub fn disable_blink(&mut self) {
-        self.start_time = None;
-    }
-
-    #[allow(dead_code)]
-    pub fn next_blink_time(&self) -> Option<Instant> {
-        self.start_time.map(|start_time| {
-            let phase = Instant::now().duration_since(start_time);
-
-            start_time
-                + Duration::from_nanos(
-                    ((phase.as_nanos() / self.blink_period.as_nanos() + 1) * self.blink_period.as_nanos()) as u64,
-                )
-        })
-    }
-
-    #[allow(dead_code)]
-    pub fn cursor_blink(&mut self) {
-        self.cursor_visible = self.start_time.is_some_and(|start_time| {
-            let elapsed = Instant::now().duration_since(start_time);
-            (elapsed.as_millis() / self.blink_period.as_millis()) % 2 == 0
-        });
-    }
-
-    fn driver<'a>(&'a mut self, text_context: &'a mut TextContext) -> PlainEditorDriver<'a> {
-        self.editor.driver(&mut text_context.font_context, &mut text_context.layout_context)
-    }
-}
-
-impl TextData for TextInput {
-    fn get_text_renderer(&self) -> Option<&TextRender> {
-        self.state.text_render.as_ref()
-    }
-}
-
-fn parley_box_to_rect(bounding_box: BoundingBox) -> Rectangle {
-    Rectangle::new(
-        bounding_box.x0 as f32,
-        bounding_box.y0 as f32,
-        bounding_box.width() as f32,
-        bounding_box.height() as f32,
-    )
-}
-
-impl Element for TextInput {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
new file mode 100644
index 00000000..a8938ae1
--- /dev/null
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -0,0 +1,431 @@
+mod text_input_state;
+
+use crate::app::ELEMENTS;
+use crate::elements::element::Element;
+use crate::elements::element_data::ElementData;
+use crate::layout::layout_context::{LayoutContext, TaffyTextInputContext};
+use crate::style::{Display, Style, Unit};
+use craft_primitives::geometry::{Point, Rectangle, TrblRectangle};
+use craft_primitives::Color;
+use craft_renderer::renderer::{RenderList, TextScroll};
+use std::any::Any;
+use std::cell::RefCell;
+use std::ops::{Deref};
+use std::rc::{Rc, Weak};
+use taffy::{PrintTree, TaffyTree};
+
+use crate::app::TAFFY_TREE;
+use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
+#[cfg(feature = "accesskit")]
+use crate::elements::element_id::create_unique_element_id;
+use crate::elements::scrollable;
+use crate::elements::text_input::text_input_state::TextInputState;
+use crate::events::{CraftMessage, Event};
+use crate::text::parley_editor::PlainEditor;
+use crate::text::text_context::TextContext;
+use crate::text::text_render_data::TextRender;
+use crate::text::RangedStyles;
+use crate::utils::cloneable_any::CloneableAny;
+use craft_renderer::text_renderer_data::TextData;
+use kurbo::Affine;
+use parley::{BoundingBox};
+use ui_events::pointer::PointerButton;
+use winit::event::Ime;
+
+// A stateful element that shows text.
+#[derive(Clone, Default)]
+pub struct TextInput {
+    element_data: ElementData,
+    /// Whether the text input will update the editor every update with the user provided text.
+    /// NOTE: The editor will always use the user provided text on initialization.
+    use_text_value_on_update: bool,
+    pub text: Option<String>,
+    pub ranged_styles: Option<RangedStyles>,
+    pub disabled: bool,
+    pub(crate) state: TextInputState,
+    me: Option<Weak<RefCell<Self>>>,
+}
+
+#[allow(dead_code)]
+/// An external message that allows others to command the TextInput.
+pub enum TextInputMessage {
+    Copy,
+    Paste,
+    Cut,
+    // TODO: Add more messages.
+}
+
+impl TextInput {
+    pub fn new(text: &str) -> Rc<RefCell<Self>> {
+        let default_style = Self::get_default_style();
+
+        let text_input_state = TextInputState::default();
+
+        let me = Rc::new(RefCell::new(Self {
+            text: Some(text.to_string()),
+            element_data: ElementData::new(true),
+            use_text_value_on_update: true,
+            ranged_styles: Some(RangedStyles::new(vec![])),
+            disabled: false,
+            state: text_input_state,
+            me: None,
+        }));
+        me.borrow_mut().element_data.style = default_style;
+
+        let me2 = me.clone();
+        me.borrow_mut().me = Some(Rc::downgrade(&me2));
+
+        let me_element: Rc<RefCell<dyn Element>> = me.clone();
+        me.borrow_mut().element_data.me = Some(Rc::downgrade(&me_element));
+
+        me.borrow_mut().text(text);
+
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let context = LayoutContext::TextInput(TaffyTextInputContext {
+                element: me.borrow().me.clone().unwrap(),
+            });
+            let node_id = taffy_tree
+                .new_leaf_with_context(me.borrow().element_data.current_style().to_taffy_style(), context)
+                .expect("TODO: panic message");
+            me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
+            me.borrow_mut().state.taffy_node(Some(node_id));
+        });
+
+        ELEMENTS.with_borrow_mut(|elements| {
+            elements.insert(me.borrow().deref());
+        });
+
+        me
+    }
+}
+
+impl crate::elements::core::ElementData for TextInput {
+    fn element_data(&self) -> &ElementData {
+        &self.element_data
+    }
+
+    fn element_data_mut(&mut self) -> &mut ElementData {
+        &mut self.element_data
+    }
+}
+
+impl ElementInternals for TextInput {
+    fn apply_layout(
+        &mut self,
+        taffy_tree: &mut TaffyTree<LayoutContext>,
+        position: Point,
+        z_index: &mut u32,
+        transform: Affine,
+        _pointer: Option<Point>,
+        text_context: &mut TextContext,
+        clip_bounds: Option<Rectangle>,
+        scale_factor: f64,
+    ) {
+        let node = self.element_data.layout_item.taffy_node_id.unwrap();
+        let has_new_layout = taffy_tree.get_has_new_layout(node);
+
+        let dirty = has_new_layout
+            || transform != self.element_data.layout_item.get_transform()
+            || position != self.element_data.layout_item.position;
+        self.element_data.layout_item.has_new_layout = has_new_layout;
+
+        if dirty {
+            let result = taffy_tree.layout(node).unwrap();
+            self.resolve_box(position, transform, result, z_index);
+            self.apply_clip(clip_bounds);
+            self.apply_borders(scale_factor);
+
+            self.element_data.apply_scroll(result);
+            self.element_data.scroll_state.as_mut().unwrap().mark_old();
+
+            let text_position = self.computed_box().content_rectangle();
+            self.state.set_origin(&text_position.position());
+
+            self.state.is_layout_dirty = false;
+        }
+
+        // For manual scroll updates.
+        if !dirty && self.element_data.scroll_state.map(|scroll_state| scroll_state.is_new()).unwrap_or_default() {
+            let result = taffy_tree.layout(node).unwrap();
+            self.element_data.apply_scroll(result);
+            self.element_data.scroll_state.as_mut().unwrap().mark_old();
+        }
+
+        if has_new_layout {
+            taffy_tree.mark_seen(node);
+        }
+
+        self.state.layout(
+            self.state.last_requested_key.unwrap().known_dimensions(),
+            self.state.last_requested_key.unwrap().available_space(),
+            text_context,
+            true,
+        );
+
+        self.state.render_text(self.is_focused(), self.element_data.current_style());
+    }
+
+    fn draw(
+        &mut self,
+        renderer: &mut RenderList,
+        _text_context: &mut TextContext,
+        _pointer: Option<Point>,
+        scale_factor: f64,
+    ) {
+        if !self.is_visible() {
+            return;
+        }
+
+        self.add_hit_testable(renderer, true, scale_factor);
+
+        let computed_box_transformed = self.computed_box();
+        let content_rectangle = computed_box_transformed.content_rectangle();
+
+        self.draw_borders(renderer, scale_factor);
+
+        let is_scrollable = self.element_data.is_scrollable();
+
+        let element_data = &self.element_data;
+        let padding_rectangle = element_data.layout_item.computed_box_transformed.padding_rectangle();
+        renderer.push_layer(padding_rectangle.scale(scale_factor));
+
+        let text_scroll = if is_scrollable {
+            Some(TextScroll::new(
+                self.element_data.scroll().map_or(0.0, |s| s.scroll_y()),
+                self.element_data.layout_item.computed_scroll_track.height,
+            ))
+        } else {
+            None
+        };
+
+        if self.state.text_render.as_ref().is_some() {
+            renderer.draw_text(
+                self.me.clone().unwrap(),
+                content_rectangle.scale(scale_factor),
+                text_scroll,
+                self.is_focused(),
+            );
+        }
+
+        renderer.pop_layer();
+
+        self.draw_scrollbar(renderer, scale_factor);
+    }
+
+    #[cfg(feature = "accesskit")]
+    fn compute_accessibility_tree(
+        &mut self,
+        tree: &mut accesskit::TreeUpdate,
+        parent_index: Option<usize>,
+        scale_factor: f64,
+    ) {
+        let state: &mut TextInputState = &mut self.state;
+
+        if state.editor().try_layout().is_none() {
+            return;
+        }
+
+        let current_node_id = accesskit::NodeId(self.element_data.internal_id);
+
+        let mut current_node = accesskit::Node::new(accesskit::Role::TextInput);
+        let padding_box =
+            self.element_data.layout_item.computed_box_transformed.padding_rectangle().scale(scale_factor);
+
+        current_node.set_bounds(accesskit::Rect {
+            x0: padding_box.left() as f64,
+            y0: padding_box.top() as f64,
+            x1: padding_box.right() as f64,
+            y1: padding_box.bottom() as f64,
+        });
+
+        self.state.try_accessibility(
+            tree,
+            &mut current_node,
+            || accesskit::NodeId(create_unique_element_id()),
+            padding_box.x as f64,
+            padding_box.y as f64,
+        );
+
+        if let Some(parent_index) = parent_index {
+            let parent_node = tree.nodes.get_mut(parent_index).unwrap();
+            parent_node.1.push_child(current_node_id);
+        }
+
+        tree.nodes.push((current_node_id, current_node));
+    }
+
+    fn on_event(
+        &mut self,
+        message: &CraftMessage,
+        text_context: &mut TextContext,
+        event: &mut Event,
+        _target: Option<Rc<RefCell<dyn ElementInternals>>>,
+    ) {
+        self.state.is_active = true;
+
+        scrollable::on_scroll_events(self, message, event);
+
+        if !event.propagate {
+            return;
+        }
+
+        let scroll_y = self.element_data.scroll().map_or(0.0, |s| s.scroll_y() as f64);
+
+        let focused = self.is_focused();
+
+        if let CraftMessage::ElementMessage(msg) = message
+            && let Some(msg) = msg.as_any().downcast_ref::<TextInputMessage>()
+        {
+            match msg {
+                TextInputMessage::Copy => {
+                    self.state.copy(text_context);
+                }
+                TextInputMessage::Paste => {
+                    if self.disabled {
+                        return;
+                    }
+                    self.state.paste(text_context);
+                    self.mark_dirty();
+                    //generate_text_changed_event(&mut self.state.editor);
+                }
+                TextInputMessage::Cut => {
+                    if self.disabled {
+                        return;
+                    }
+                    self.state.cut(text_context);
+                    self.mark_dirty();
+                    //generate_text_changed_event(&mut self.state.editor);
+                }
+            }
+        }
+
+        match message {
+            CraftMessage::KeyboardInputEvent(keyboard_event) if !self.state.editor().is_composing() => {
+                if self.disabled || !keyboard_event.state.is_down() || !focused {
+                    return;
+                }
+                self.state.key_press(text_context, keyboard_event);
+            }
+            CraftMessage::PointerButtonDown(pointer_button) => {
+                if pointer_button.button == Some(PointerButton::Primary) {
+                    self.focus();
+                    self.state.pointer_down(text_context);
+                }
+            }
+            CraftMessage::PointerButtonUp(pointer_button) => {
+                if pointer_button.button == Some(PointerButton::Primary) {
+                    self.state.pointer_up();
+                }
+            }
+            CraftMessage::PointerMovedEvent(pointer_moved) => {
+                self.state.move_pointer(text_context, pointer_moved, scroll_y);
+            }
+            CraftMessage::ImeEvent(Ime::Disabled) => {
+                self.state.disable_ime(text_context);
+            }
+            CraftMessage::ImeEvent(Ime::Commit(text)) => {
+                self.state.insert_or_replace_selection(text_context, text);
+                //generate_text_changed_event(&mut self.state.editor);
+            }
+            CraftMessage::ImeEvent(Ime::Preedit(text, cursor)) => {
+                self.state.ime_pre_edit(text_context, text, cursor);
+            }
+            _ => {}
+        }
+
+        if self.state.is_layout_dirty {
+            self.mark_dirty();
+        }
+    }
+
+    fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
+        resolve_clip_for_scrollable(self, clip_bounds);
+    }
+
+    fn get_default_style() -> Style
+    where
+        Self: Sized,
+    {
+        let mut style = Style::default();
+
+        style.set_display(Display::Block);
+
+        const BORDER_COLOR: Color = Color::from_rgb8(199, 199, 206);
+        style.set_border_color(TrblRectangle::new_all(BORDER_COLOR));
+        style.set_border_width(TrblRectangle::new_all(Unit::Px(1.0)));
+        style.set_border_radius([(5.0, 5.0); 4]);
+
+        let padding = Unit::Px(4.0);
+        style.set_padding(TrblRectangle::new_all(padding));
+
+        style
+    }
+
+    fn scale_factor(&mut self, scale_factor: f64) {
+        self.state.set_scale_factor(scale_factor);
+        self.mark_dirty();
+    }
+}
+
+impl TextInput {
+    /// Whether the text input will update the editor every update with the user provided text.
+    /// NOTE: The editor will always use the user provided text on initialization.
+    pub fn use_text_value_on_update(mut self, use_initial_text_value: bool) -> Self {
+        self.use_text_value_on_update = use_initial_text_value;
+        self
+    }
+
+    pub fn disable(&mut self) -> &mut Self {
+        self.disabled = true;
+        self
+    }
+
+    pub fn get_disabled(&mut self) -> bool {
+        self.disabled
+    }
+
+    pub fn get_text(&self) -> &str {
+        &self.state.editor().raw_text()
+    }
+
+    /// Set the text.
+    ///
+    /// Updates the text content immediately. Mark layout and render caches as dirty. Layout and
+    /// render caches will be computed in the next layout/render pass.
+    pub fn text(&mut self, text: &str) -> &mut Self {
+        self.state.set_text(text);
+        self.mark_dirty();
+        self
+    }
+
+    pub fn ranged_styles(&mut self, ranged_styles: RangedStyles) -> &mut Self {
+        self.state.set_ranged_styles(ranged_styles);
+        self.mark_dirty();
+        self
+    }
+}
+
+impl TextData for TextInput {
+    fn get_text_renderer(&self) -> Option<&TextRender> {
+        self.state.text_render.as_ref()
+    }
+}
+
+fn parley_box_to_rect(bounding_box: BoundingBox) -> Rectangle {
+    Rectangle::new(
+        bounding_box.x0 as f32,
+        bounding_box.y0 as f32,
+        bounding_box.width() as f32,
+        bounding_box.height() as f32,
+    )
+}
+
+impl Element for TextInput {
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
new file mode 100644
index 00000000..229c0c16
--- /dev/null
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -0,0 +1,676 @@
+use crate::layout::layout_context::TextHashKey;
+use craft_primitives::geometry::{Point, Rectangle};
+use craft_renderer::text_renderer_data::TextRender;
+use std::collections::HashMap;
+use std::ops::Range;
+use taffy::{AvailableSpace, NodeId};
+
+use crate::text::parley_editor::{PlainEditor, PlainEditorDriver};
+
+use ui_events::keyboard::{Key, KeyboardEvent, Modifiers, NamedKey};
+
+#[cfg(feature = "accesskit")]
+use accesskit::{Node, TreeUpdate};
+#[cfg(not(target_arch = "wasm32"))]
+use std::time::{Duration, Instant};
+#[cfg(target_arch = "wasm32")]
+use web_time::{Duration, Instant};
+
+use crate::app::{LAYOUT_DIRTY, TAFFY_TREE};
+use crate::elements::core::ElementInternals;
+use crate::elements::text_input::parley_box_to_rect;
+use crate::elements::TextInput;
+use crate::style::{Style, TextStyleProperty};
+use crate::text::text_context::TextContext;
+use crate::text::{text_render_data, RangedStyles};
+use parley::{Affinity, ContentWidths, Cursor, Selection};
+use peniko::Color;
+use ui_events::pointer::PointerUpdate;
+use winit::dpi;
+use crate::request_layout;
+
+#[derive(Clone)]
+pub struct TextInputState {
+    origin: Point,
+
+    taffy_node: Option<NodeId>,
+    pub is_active: bool,
+    #[allow(dead_code)]
+    pub(crate) ime_state: ImeState,
+    editor: PlainEditor,
+
+    cache: HashMap<TextHashKey, taffy::Size<f32>>,
+
+    // The current key used for laying out the text input.
+    current_layout_key: Option<TextHashKey>,
+
+    current_render_key: Option<TextHashKey>,
+    content_widths: Option<ContentWidths>,
+
+    // The most recently requested key for laying out the text input.
+    pub(crate) last_requested_key: Option<TextHashKey>,
+    pub(crate) text_render: Option<TextRender>,
+    scale_factor: f64,
+
+    last_click_time: Option<Instant>,
+    click_count: u32,
+    pointer_down: bool,
+    cursor_pos: Point,
+    cursor_visible: bool,
+    modifiers: Option<Modifiers>,
+    start_time: Option<Instant>,
+    blink_period: Duration,
+
+    /// True if the node needs laid-out.
+    pub is_layout_dirty: bool,
+}
+
+impl Default for TextInputState {
+    fn default() -> Self {
+        let default_style = TextInput::get_default_style();
+        let mut editor = PlainEditor::new(default_style.font_size());
+        editor.set_scale(1.0f32);
+        let style_set = editor.edit_styles();
+        default_style.add_styles_to_style_set(style_set);
+        Self {
+            origin: Default::default(),
+            taffy_node: None,
+            ime_state: ImeState::default(),
+            is_active: false,
+            editor,
+            cache: Default::default(),
+            current_layout_key: None,
+            current_render_key: None,
+            content_widths: None,
+            last_requested_key: None,
+            text_render: None,
+            scale_factor: 1.0,
+            last_click_time: None,
+            click_count: 0,
+            pointer_down: false,
+            cursor_pos: Point::default(),
+            cursor_visible: false,
+            modifiers: None,
+            start_time: None,
+            blink_period: Default::default(),
+            is_layout_dirty: true,
+        }
+    }
+}
+
+#[derive(Clone, Default, Debug, Copy)]
+pub(crate) struct ImeState {
+    #[allow(dead_code)]
+    pub is_ime_active: bool,
+}
+
+impl TextInputState {
+    /// Returns the last know positon of the cursor relative to the origin.
+    ///
+    /// The cursor is assumed to start at (0.0, 0.0). The cursor_pos may return points
+    /// outside the text input.
+    pub fn cursor_pos(&self) -> Point {
+        self.cursor_pos
+    }
+
+    /// Set the mouse positon.
+    ///
+    /// The point should be relative to the top left of the window.
+    pub fn move_pointer(&mut self, text_context: &mut TextContext, pointer_moved: &PointerUpdate, scroll_y: f64) {
+        let prev_pos = self.cursor_pos();
+        // NOTE: Cursor position should be relative to the top left of the text box.
+        let cursor_pos = pointer_moved.current.logical_point();
+        let cursor_pos: Point = (cursor_pos - self.origin).to_point();
+        let mut cursor_pos = Point::new(cursor_pos.x * self.scale_factor, cursor_pos.y * self.scale_factor);
+        cursor_pos.y += scroll_y;
+        self.cursor_pos = cursor_pos;
+        // macOS seems to generate a spurious move after selecting word?
+        if self.is_pointer_down() && prev_pos != self.cursor_pos() && !self.editor.is_composing() {
+            self.reset_blink();
+            let cursor_pos = self.cursor_pos();
+            self.driver(text_context).extend_selection_to_point(cursor_pos.x as f32, cursor_pos.y as f32);
+            request_layout();
+        }
+    }
+
+    /// Set the origin of the text input state.
+    ///
+    /// The point should be relative to the top left of the window.
+    pub fn set_origin(&mut self, origin: &Point) {
+        let diff = *origin - self.origin;
+        self.cursor_pos += diff;
+        self.origin = *origin;
+    }
+
+    pub fn measure(
+        &mut self,
+        known_dimensions: taffy::Size<Option<f32>>,
+        available_space: taffy::Size<AvailableSpace>,
+        text_context: &mut TextContext,
+    ) -> taffy::Size<f32> {
+        let key = TextHashKey::new(known_dimensions, available_space);
+
+        self.last_requested_key = Some(key);
+
+        self.layout(known_dimensions, available_space, text_context, false)
+    }
+
+    pub fn clear_cache(&mut self) {
+        self.is_layout_dirty = true;
+        self.cache.clear();
+        self.current_layout_key = None;
+        self.last_requested_key = None;
+        self.current_render_key = None;
+        self.text_render = None;
+        self.content_widths = None;
+
+        if let Some(id) = self.taffy_node {
+            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+                taffy_tree.mark_dirty(id).expect("Failed to mark node dirty");
+            })
+        }
+    }
+
+    pub fn layout(
+        &mut self,
+        known_dimensions: taffy::Size<Option<f32>>,
+        available_space: taffy::Size<AvailableSpace>,
+        text_context: &mut TextContext,
+        last_pass: bool,
+    ) -> taffy::Size<f32> {
+        let key = TextHashKey::new(known_dimensions, available_space);
+
+        if let Some(value) = self.cache.get(&key) {
+            if last_pass {
+                if self.current_layout_key == Some(key) {
+                    if self.current_render_key != self.current_layout_key {
+                        self.current_render_key = self.current_layout_key;
+
+                        let layout = self.editor.try_layout().unwrap();
+                        self.text_render = Some(text_render_data::from_editor(layout));
+                    }
+                    return *value;
+                }
+            } else {
+                return *value;
+            }
+        }
+
+        if self.editor.try_layout().is_none() || self.is_layout_dirty || self.content_widths.is_none() {
+            self.editor.set_width(None);
+            self.editor.refresh_layout(&mut text_context.font_context, &mut text_context.layout_context);
+            self.content_widths = Some(self.editor.try_layout().unwrap().calculate_content_widths());
+        }
+
+        let content_widths = self.content_widths.unwrap();
+        let width_constraint: Option<f32> = known_dimensions
+            .width
+            .or(match available_space.width {
+                AvailableSpace::MinContent => Some(content_widths.min),
+                AvailableSpace::MaxContent => Some(content_widths.max),
+                AvailableSpace::Definite(width) => Some(width),
+            })
+            .map(|width| {
+                let width: f32 = dpi::PhysicalUnit::from_logical::<f32, f32>(width, self.scale_factor).0;
+                // Taffy may give a min width > max_width.
+                // Min-width is preserved in this scenario to ensure text is readable.
+                width.clamp(content_widths.min, content_widths.max.max(content_widths.min))
+            });
+
+        let _height_constraint: Option<f32> = known_dimensions
+            .height
+            .or(match available_space.height {
+                AvailableSpace::MinContent => None,
+                AvailableSpace::MaxContent => None,
+                AvailableSpace::Definite(height) => Some(height),
+            })
+            .map(|height| dpi::PhysicalUnit::from_logical::<f32, f32>(height, self.scale_factor).0);
+
+        self.editor.set_width(width_constraint);
+        self.editor.refresh_layout(&mut text_context.font_context, &mut text_context.layout_context);
+        let layout = self.editor.try_layout().unwrap();
+
+        if last_pass {
+            self.current_render_key = self.current_layout_key;
+            self.text_render = Some(text_render_data::from_editor(layout));
+        }
+
+        let logical_width = dpi::LogicalUnit::from_physical::<f32, f32>(layout.width(), self.scale_factor).0;
+        let logical_height = dpi::LogicalUnit::from_physical::<f32, f32>(layout.height(), self.scale_factor).0;
+
+        let size = taffy::Size {
+            width: logical_width,
+            height: logical_height,
+        };
+
+        self.cache.insert(key, size);
+        self.current_layout_key = Some(key);
+        size
+    }
+
+    pub fn taffy_node(&mut self, taffy_node: Option<NodeId>) {
+        self.taffy_node = taffy_node;
+    }
+
+    #[allow(dead_code)]
+    pub fn get_cursor_link(&self, cursor_pos: Point, element: &TextInput) -> Option<String> {
+        if let Some(ranged_styles) = &element.ranged_styles {
+            let layout = self.editor.try_layout().unwrap();
+            for (range, style) in ranged_styles.styles.iter() {
+                if let TextStyleProperty::Link(link) = style {
+                    let anchor = Cursor::from_byte_index(layout, range.start, Affinity::Downstream);
+                    let focus = Cursor::from_byte_index(layout, range.end, Affinity::Downstream);
+                    let selection = Selection::new(anchor, focus);
+                    let link_rects = selection.geometry(layout);
+                    for link_rect in link_rects {
+                        if parley_box_to_rect(link_rect.0).contains(&cursor_pos) {
+                            return Some(link.clone());
+                        }
+                    }
+                }
+            }
+        }
+        None
+    }
+
+    /// Resets the cursor blink.
+    pub fn reset_blink(&mut self) {
+        self.start_time = Some(Instant::now());
+        // TODO: for real world use, this should be reading from the system settings
+        self.blink_period = Duration::from_millis(500);
+        self.cursor_visible = true;
+    }
+
+    #[allow(dead_code)]
+    pub fn disable_blink(&mut self) {
+        self.start_time = None;
+    }
+
+    #[allow(dead_code)]
+    pub fn next_blink_time(&self) -> Option<Instant> {
+        self.start_time.map(|start_time| {
+            let phase = Instant::now().duration_since(start_time);
+
+            start_time
+                + Duration::from_nanos(
+                    ((phase.as_nanos() / self.blink_period.as_nanos() + 1) * self.blink_period.as_nanos()) as u64,
+                )
+        })
+    }
+
+    #[allow(dead_code)]
+    pub fn cursor_blink(&mut self) {
+        self.cursor_visible = self.start_time.is_some_and(|start_time| {
+            let elapsed = Instant::now().duration_since(start_time);
+            (elapsed.as_millis() / self.blink_period.as_millis()) % 2 == 0
+        });
+    }
+
+    fn driver<'a>(&'a mut self, text_context: &'a mut TextContext) -> PlainEditorDriver<'a> {
+        self.editor.driver(&mut text_context.font_context, &mut text_context.layout_context)
+    }
+
+    /// Set's the scale factor.
+    pub fn set_scale_factor(&mut self, scale_factor: f64) {
+        self.scale_factor = scale_factor;
+        self.editor.set_scale(scale_factor as f32);
+        self.clear_cache();
+    }
+
+    pub fn pointer_down(&mut self, text_context: &mut TextContext) {
+        self.cursor_visible = true;
+        self.pointer_down = true;
+        self.reset_blink();
+        if !self.editor.is_composing() {
+            let now = Instant::now();
+            if let Some(last) = self.last_click_time.take() {
+                if now.duration_since(last).as_secs_f64() < 0.25 {
+                    self.click_count = (self.click_count + 1) % 4;
+                } else {
+                    self.click_count = 1;
+                }
+            } else {
+                self.click_count = 1;
+            }
+            self.last_click_time = Some(now);
+            let click_count = self.click_count;
+            let cursor_pos = self.cursor_pos;
+            let cursor_x = cursor_pos.x as f32;
+            let cursor_y = cursor_pos.y as f32;
+
+            if click_count == 1 {
+                /*if let Some(_link) = self.get_cursor_link(cursor_pos, element) {
+                    // TODO generate event
+                    return;
+                }*/
+            }
+
+            let mut drv = self.driver(text_context);
+
+            match click_count {
+                2 => drv.select_word_at_point(cursor_x, cursor_y),
+                3 => drv.select_line_at_point(cursor_x, cursor_y),
+                _ => drv.move_to_point(cursor_x, cursor_y),
+            }
+        }
+    }
+
+    pub fn pointer_up(&mut self) {
+        self.pointer_down = false;
+        self.reset_blink();
+    }
+
+    /// Insert at cursor, or replace selection.
+    ///
+    /// This requires a relayout.
+    pub fn insert_or_replace_selection(&mut self, text_context: &mut TextContext, text: &str) {
+        self.driver(text_context).insert_or_replace_selection(text);
+        self.clear_cache();
+    }
+
+    pub fn is_pointer_down(&self) -> bool {
+        self.pointer_down
+    }
+
+    pub fn key_press(&mut self, text_context: &mut TextContext, keyboard_event: &KeyboardEvent) {
+        // TODO: self.reset_blink();
+
+        self.modifiers = Some(keyboard_event.modifiers);
+
+        #[allow(unused)]
+        let (shift, action_mod) = self
+            .modifiers
+            .map(|mods| (mods.shift(), if cfg!(target_os = "macos") { mods.meta() } else { mods.ctrl() }))
+            .unwrap_or_default();
+
+        let mut driver = self.driver(text_context);
+
+        match &keyboard_event.key {
+            Key::Character(c) if action_mod && matches!(c.as_str(), "c" | "x" | "v") => {
+                match c.to_lowercase().as_str() {
+                    "c" => copy(&mut driver),
+                    "x" => {
+                        cut(&mut driver);
+                        self.clear_cache();
+                        //generate_text_changed_event(&mut self.editor);
+                    }
+                    "v" => {
+                        paste(&mut driver);
+                        self.clear_cache();
+                        //generate_text_changed_event(&mut self.editor);
+                    }
+                    _ => (),
+                }
+            }
+            Key::Character(c) if action_mod && matches!(c.to_lowercase().as_str(), "a") => {
+                if shift {
+                    driver.collapse_selection();
+                } else {
+                    driver.select_all();
+                }
+            }
+            Key::Named(NamedKey::ArrowLeft) => {
+                if action_mod {
+                    if shift {
+                        driver.select_word_left();
+                    } else {
+                        driver.move_word_left();
+                    }
+                } else if shift {
+                    driver.select_left();
+                } else {
+                    driver.move_left();
+                }
+            }
+            Key::Named(NamedKey::ArrowRight) => {
+                if action_mod {
+                    if shift {
+                        driver.select_word_right();
+                    } else {
+                        driver.move_word_right();
+                    }
+                } else if shift {
+                    driver.select_right();
+                } else {
+                    driver.move_right();
+                }
+            }
+            Key::Named(NamedKey::ArrowUp) => {
+                if shift {
+                    driver.select_up();
+                } else {
+                    driver.move_up();
+                }
+            }
+            Key::Named(NamedKey::ArrowDown) => {
+                if shift {
+                    driver.select_down();
+                } else {
+                    driver.move_down();
+                }
+            }
+            Key::Named(NamedKey::Home) => {
+                if action_mod {
+                    if shift {
+                        driver.select_to_text_start();
+                    } else {
+                        driver.move_to_text_start();
+                    }
+                } else if shift {
+                    driver.select_to_line_start();
+                } else {
+                    driver.move_to_line_start();
+                }
+            }
+            Key::Named(NamedKey::End) => {
+                let mut drv = self.driver(text_context);
+
+                if action_mod {
+                    if shift {
+                        drv.select_to_text_end();
+                    } else {
+                        drv.move_to_text_end();
+                    }
+                } else if shift {
+                    drv.select_to_line_end();
+                } else {
+                    drv.move_to_line_end();
+                }
+            }
+            Key::Named(NamedKey::Delete) => {
+                if action_mod {
+                    driver.delete_word();
+                    self.clear_cache();
+                } else {
+                    driver.delete();
+                    self.clear_cache();
+                }
+                //generate_text_changed_event(&mut self.state.editor);
+            }
+            Key::Named(NamedKey::Backspace) => {
+                if action_mod {
+                    driver.backdelete_word();
+                    self.clear_cache();
+                } else {
+                    driver.backdelete();
+                    self.clear_cache();
+                }
+                //generate_text_changed_event(&mut self.state.editor);
+            }
+            Key::Named(NamedKey::Enter) => {
+                driver.insert_or_replace_selection("\n");
+                self.clear_cache();
+                //generate_text_changed_event(&mut self.state.editor);
+            }
+            Key::Character(s) => {
+                driver.insert_or_replace_selection(s);
+                self.clear_cache();
+                //generate_text_changed_event(&mut self.state.editor);
+            }
+            _ => (),
+        }
+    }
+
+    pub fn copy(&mut self, text_context: &mut TextContext) {
+        copy(&mut self.driver(text_context));
+    }
+
+    pub fn paste(&mut self, text_context: &mut TextContext) {
+        paste(&mut self.driver(text_context));
+    }
+
+    pub fn cut(&mut self, text_context: &mut TextContext) {
+        cut(&mut self.driver(text_context));
+        self.clear_cache();
+    }
+
+    pub fn ime_pre_edit(&mut self, text_context: &mut TextContext, text: &String, cursor: &Option<(usize, usize)>) {
+        if text.is_empty() {
+            self.driver(text_context).clear_compose();
+        } else {
+            self.driver(text_context).set_compose(text, *cursor);
+        }
+        self.clear_cache();
+    }
+
+    pub fn disable_ime(&mut self, text_context: &mut TextContext) {
+        self.driver(text_context).clear_compose();
+        self.clear_cache();
+    }
+
+    pub fn editor(&self) -> &PlainEditor {
+        &self.editor
+    }
+
+    pub fn set_text(&mut self, text: &str) {
+        self.editor.set_text(text);
+        self.clear_cache();
+    }
+
+    pub fn set_ranged_styles(&mut self, ranged_styles: RangedStyles) {
+        self.editor.set_ranged_styles(ranged_styles);
+        self.clear_cache();
+    }
+
+    pub fn render_text(&mut self, focused: bool, style: &Style) {
+        let backgrounds: Vec<(Range<usize>, Color)> = self
+            .editor()
+            .ranged_styles
+            .styles
+            .iter()
+            .filter_map(|(range, style)| {
+                if let TextStyleProperty::BackgroundColor(color) = style {
+                    Some((range.clone(), *color))
+                } else {
+                    None
+                }
+            })
+            .collect();
+
+        let layout = self.editor.try_layout().unwrap();
+        let backgrounds: Vec<(Selection, Color)> = backgrounds
+            .iter()
+            .map(|(range, color)| {
+                (
+                    Selection::new(
+                        Cursor::from_byte_index(layout, range.start, Affinity::Downstream),
+                        Cursor::from_byte_index(layout, range.end, Affinity::Downstream),
+                    ),
+                    *color,
+                )
+            })
+            .collect();
+        let text_renderer = self.text_render.as_mut().unwrap();
+        for line in text_renderer.lines.iter_mut() {
+            line.backgrounds.clear();
+        }
+        for (selection, color) in backgrounds.iter() {
+            selection.geometry_with(layout, |rect, line| {
+                text_renderer.lines[line].backgrounds.push((
+                    Rectangle::new(rect.x0 as f32, rect.y0 as f32, rect.width() as f32, rect.height() as f32),
+                    *color,
+                ));
+            });
+        }
+
+        for line in text_renderer.lines.iter_mut() {
+            line.selections.clear();
+        }
+        self.editor.selection_geometry_with(|rect, line| {
+            text_renderer.lines[line].selections.push((parley_box_to_rect(rect), style.selection_color()));
+        });
+
+        if focused {
+            let color = style.cursor_color().unwrap_or(style.color());
+            text_renderer.cursor = self.editor.cursor_geometry(1.0).map(|r| (parley_box_to_rect(r), color));
+        } else {
+            text_renderer.cursor = None;
+        }
+    }
+
+    #[cfg(feature = "accesskit")]
+    pub fn try_accessibility(
+        &mut self,
+        tree: &mut TreeUpdate,
+        current_node: &mut Node,
+        next_node_id: impl FnMut() -> accesskit::NodeId,
+        x_offset: f64,
+        y_offset: f64,
+    ) {
+        self.editor.try_accessibility(tree, current_node, next_node_id, x_offset, y_offset);
+    }
+}
+
+#[cfg(all(
+    any(target_os = "windows", target_os = "macos", target_os = "linux"),
+    feature = "clipboard"
+))]
+fn copy(drv: &mut PlainEditorDriver) {
+    use clipboard_rs::{Clipboard, ClipboardContext};
+    if let Some(text) = drv.editor.selected_text() {
+        let cb = ClipboardContext::new().unwrap();
+        cb.set_text(text.to_owned()).ok();
+    }
+}
+
+#[cfg(not(all(
+    any(target_os = "windows", target_os = "macos", target_os = "linux"),
+    feature = "clipboard"
+)))]
+fn copy(_drv: &mut PlainEditorDriver) {}
+
+#[cfg(all(
+    any(target_os = "windows", target_os = "macos", target_os = "linux"),
+    feature = "clipboard"
+))]
+fn paste(drv: &mut PlainEditorDriver) {
+    use clipboard_rs::{Clipboard, ClipboardContext};
+    let cb = ClipboardContext::new().unwrap();
+    let text = cb.get_text().unwrap_or_default();
+    drv.insert_or_replace_selection(&text);
+}
+
+#[cfg(not(all(
+    any(target_os = "windows", target_os = "macos", target_os = "linux"),
+    feature = "clipboard"
+)))]
+fn paste(_drv: &mut PlainEditorDriver) {}
+
+#[cfg(all(
+    any(target_os = "windows", target_os = "macos", target_os = "linux"),
+    feature = "clipboard"
+))]
+fn cut(drv: &mut PlainEditorDriver) {
+    use clipboard_rs::{Clipboard, ClipboardContext};
+    if let Some(text) = drv.editor.selected_text() {
+        let cb = ClipboardContext::new().unwrap();
+        cb.set_text(text.to_owned()).ok();
+        drv.delete_selection();
+    }
+}
+
+#[cfg(not(all(
+    any(target_os = "windows", target_os = "macos", target_os = "linux"),
+    feature = "clipboard"
+)))]
+fn cut(_drv: &mut PlainEditorDriver) {}
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index 9ffddcf0..8bee51c7 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -158,8 +158,8 @@ impl EventDispatcher {
         target_scratch: &mut Vec<Rc<RefCell<dyn Element>>>,
     ) {
         let mut _focus = FocusAction::None;
-        let span = span!(Level::INFO, "dispatch event");
-        let _enter = span.enter();
+        /*let span = span!(Level::INFO, "dispatch event");
+        let _enter = span.enter();*/
 
         /*for (node, _) in &render_list.targets {
             println!("target: {}", node);
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index d00bc59d..c5894b3a 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -5,7 +5,7 @@ use craft_primitives::geometry::{Border, ElementBox, Margin, Padding, Point, Rec
 use craft_renderer::{Brush, RenderList};
 use kurbo::{Affine, BezPath, Shape, Vec2};
 use peniko::Color;
-use taffy::{NodeId, Position, TaffyTree};
+use taffy::{Layout, NodeId, Position, TaffyTree};
 
 impl CssComputedBorder {
     pub(crate) fn scale(&mut self, scale_factor: f64) {
@@ -67,6 +67,7 @@ pub struct LayoutItem {
     /// True if the layout is new.
     pub has_new_layout: bool,
     transform: Affine,
+    pub position: Point,
 }
 
 impl LayoutItem {
@@ -142,6 +143,7 @@ impl LayoutItem {
         };
         self.computed_box_transformed = self.computed_box.transform(scroll_transform);
         self.transform = scroll_transform;
+        self.position = relative_position;
     }
 
     pub fn apply_borders(
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 4ea52162..59478ae6 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -11,6 +11,8 @@ mod tests;
 pub mod text;
 pub mod document;
 
+pub use crate::app::request_layout;
+
 mod app;
 pub use craft_primitives::geometry as geometry;
 pub mod layout;
diff --git a/crates/craft_retained/src/text/parley_editor.rs b/crates/craft_retained/src/text/parley_editor.rs
index c2c1b8d1..30270721 100644
--- a/crates/craft_retained/src/text/parley_editor.rs
+++ b/crates/craft_retained/src/text/parley_editor.rs
@@ -19,6 +19,7 @@ use parley::layout::LayoutAccessibility;
 use accesskit::{Node, NodeId, TreeUpdate};
 use crate::text::RangedStyles;
 use craft_primitives::ColorBrush;
+use crate::request_layout;
 
 /// Opaque representation of a generation.
 ///
@@ -456,6 +457,7 @@ impl PlainEditorDriver<'_>
         self.refresh_layout();
         self.editor
             .set_selection(Selection::from_point(&self.editor.layout, x, y));
+        request_layout();
     }
 
     /// Move the cursor to a byte index.
@@ -661,6 +663,7 @@ impl PlainEditorDriver<'_>
                 .selection
                 .next_visual_word(&self.editor.layout, true),
         );
+        request_layout();
     }
 
     /// Select the word at the point.
@@ -668,6 +671,7 @@ impl PlainEditorDriver<'_>
         self.refresh_layout();
         self.editor
             .set_selection(Selection::word_from_point(&self.editor.layout, x, y));
+        request_layout();
     }
 
     /// Select the physical line at the point.
@@ -675,6 +679,7 @@ impl PlainEditorDriver<'_>
         self.refresh_layout();
         let line = Selection::line_from_point(&self.editor.layout, x, y);
         self.editor.set_selection(line);
+        request_layout();
     }
 
     /// Move the selection focus point to the cluster boundary closest to point.
diff --git a/examples/jsframeworkbench/main.rs b/examples/jsframeworkbench/main.rs
index 1bbd0249..816c418e 100644
--- a/examples/jsframeworkbench/main.rs
+++ b/examples/jsframeworkbench/main.rs
@@ -9,7 +9,7 @@ use rand::rng;
 use rand::rngs::ThreadRng;
 use rand::seq::IndexedRandom;
 use std::cell::RefCell;
-use std::rc::Rc;
+use std::rc::{Rc, Weak};
 use craft_retained::palette::css::WHITE;
 
 const ADJECTIVES: &[&str] = &[
@@ -81,6 +81,7 @@ impl State {
         self.remove_all_rows();
         self.store.clear();
         self.rows.clear();
+        self.rows.shrink_to_fit();
         self.store.run();
         self.append_rows();
         self.select(None);
@@ -90,6 +91,7 @@ impl State {
         self.remove_all_rows();
         self.store.clear();
         self.rows.clear();
+        self.rows.shrink_to_fit();
         self.store.run_lots();
         self.append_rows();
         self.select(None);
@@ -248,6 +250,7 @@ impl Store {
 
     pub fn clear(&mut self) {
         self.data.clear();
+        self.data.shrink_to_fit();
         self.selected = None;
     }
 
@@ -279,25 +282,27 @@ impl Store {
 #[allow(unused)]
 #[cfg(not(target_os = "android"))]
 fn main() {
-    util::setup_logging();
-    let root = build_root();
+    //util::setup_logging();
+
+    let data_list = build_data_list();
+    let state = Rc::new(RefCell::new(State::new(data_list.clone())));
+
+    let root = build_root(state.clone());
     use craft_retained::CraftOptions;
     craft_retained::craft_main(root, CraftOptions::basic("jsframeworkbench"));
 }
 
-fn build_root() -> Rc<RefCell<Container>> {
+fn build_root(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
     let root = Container::new();
-    let body = build_body();
+    let body = build_body(state);
     root.borrow_mut().push(body);
     root
 }
 
-fn build_body() -> Rc<RefCell<Container>> {
+fn build_body(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
     let body = Container::new();
-    let data_list = build_data_list();
 
-    let state = Rc::new(RefCell::new(State::new(data_list.clone())));
-    let buttons = build_buttons(state.clone());
+    let buttons = build_buttons(Rc::downgrade(&state));
 
     body.borrow_mut()
         .overflow(Overflow::Visible, Overflow::Scroll)
@@ -331,18 +336,20 @@ fn build_body() -> Rc<RefCell<Container>> {
         .width(Unit::Percentage(100.0))
         .push(buttons);
 
-    body.borrow_mut().push(header).push(data_list);
+    body.borrow_mut().push(header).push(state.borrow().element.clone());
 
     body
 }
 
 fn build_data_list() -> Rc<RefCell<Container>> {
     let data_list = Container::new();
-    data_list.borrow_mut().flex_direction(FlexDirection::Column);
+    data_list.borrow_mut()
+        .flex_direction(FlexDirection::Column)
+        .width(Unit::Percentage(100.0));
     data_list
 }
 
-fn build_buttons(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
+fn build_buttons(state: Weak<RefCell<State>>) -> Rc<RefCell<Container>> {
     let buttons = Container::new();
     buttons.borrow_mut()
         .flex_direction(FlexDirection::Column)
@@ -354,26 +361,26 @@ fn build_buttons(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
 
     let state1 = state.clone();
     let btn_create_1k = build_button("Create 1,000 rows", move |_, _| {
-        state1.borrow_mut().run();
+        state1.upgrade().unwrap().borrow_mut().run();
     });
 
     let state2 = state.clone();
     let btn_create_10k = build_button("Create 10,000 rows", move |_, _| {
-        state2.borrow_mut().run_lots();
+        state2.upgrade().unwrap().borrow_mut().run_lots();
     });
 
     let state3 = state.clone();
-    let btn_append_1k = build_button("Append 1,000 rows", move |_, _| state3.borrow_mut().add());
+    let btn_append_1k = build_button("Append 1,000 rows", move |_, _| state3.upgrade().unwrap().borrow_mut().add());
 
     let state4 = state.clone();
-    let btn_update_10th_row = build_button("Update every 10th row", move |_, _| state4.borrow_mut().update());
+    let btn_update_10th_row = build_button("Update every 10th row", move |_, _| state4.upgrade().unwrap().borrow_mut().update());
 
     let state5 = state.clone();
-    let btn_clear = build_button("Clear", move |_, _| state5.borrow_mut().clear());
+    let btn_clear = build_button("Clear", move |_, _| state5.upgrade().unwrap().borrow_mut().clear());
 
     let state6 = state.clone();
-    let btn_swap = build_button("Swap Rows", move |_, _| state6.borrow_mut().swap_rows());
-    
+    let btn_swap = build_button("Swap Rows", move |_, _| state6.upgrade().unwrap().borrow_mut().swap_rows());
+
     buttons
         .borrow_mut()
         .push(btn_create_1k)

From 85cbbfc4b1c51405bba7da2cdb33834efb14cd7e Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Wed, 24 Dec 2025 18:31:09 -0500
Subject: [PATCH 006/143] Allow elements and users to queue an event

Once it is queued and the current event ends, it will dequeue and run the event.
---
 crates/craft_retained/src/app.rs              | 27 ++++++++++++++++---
 .../src/elements/core/element_internals.rs    |  2 +-
 crates/craft_retained/src/elements/element.rs | 10 ++++++-
 .../src/elements/element_data.rs              |  4 ++-
 .../craft_retained/src/elements/scrollable.rs |  1 -
 .../src/elements/slider/slider.rs             | 22 +++++++++------
 .../src/elements/text_input/mod.rs            |  1 -
 .../elements/text_input/text_input_state.rs   |  2 +-
 .../src/events/event_dispatch.rs              | 27 ++++++++++---------
 crates/craft_retained/src/events/helpers.rs   |  8 +++++-
 crates/craft_retained/src/events/mod.rs       |  2 +-
 .../craft_retained/src/layout/layout_item.rs  |  2 +-
 12 files changed, 75 insertions(+), 33 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index b228028c..ce9b1fd6 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -1,12 +1,12 @@
 use crate::elements::ElementIdMap;
-use crate::events::EventDispatcher;
+use crate::events::{Event, EventDispatcher};
 use crate::events::internal::InternalMessage;
 use crate::events::{CraftMessage};
 use crate::layout::layout_context::measure_content;
 use crate::style::{Display, Unit, Wrap};
 use crate::text::text_context::TextContext;
 use crate::{RendererBox, WindowContext};
-use craft_logging::{info, span, Level};
+use craft_logging::info;
 use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::{ResourceIdentifier, ResourceManager};
 use craft_runtime::CraftRuntimeHandle;
@@ -63,11 +63,32 @@ thread_local! {
     pub(crate) static IN_PROGRESS_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = RefCell::new(VecDeque::new());
     pub(crate) static FOCUS: RefCell<Option<Weak<RefCell<dyn Element>>>> = RefCell::new(None);
     pub(crate) static LAYOUT_DIRTY: RefCell<bool> = RefCell::new(true);
+    /// An event queue that users or elements can manipulate. Cleared at the start and end of every event dispatch.
+    static EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(Event, CraftMessage)>> = RefCell::new(VecDeque::with_capacity(10));
+}
+
+/// Enqueues an event at the back of the dispatch queue.
+///
+/// This does **not** invoke any element `on_event` handlers.
+/// Only user-registered event callbacks will be dispatched.
+pub fn queue_event(event: Event, message: CraftMessage) {
+    EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| {
+        return event_queue.push_back((event, message));
+    });
+}
+
+/// Pops from the front of the event dispatch queue and returns the result.
+pub(crate) fn dequeue_event() -> Option<(Event, CraftMessage)> {
+    let event = EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| {
+        return event_queue.pop_front();
+    });
+
+    event
 }
 
 pub struct App {
     pub(crate) event_dispatcher: EventDispatcher,
-    pub(crate) root: Rc<RefCell<dyn crate::elements::Element>>,
+    pub(crate) root: Rc<RefCell<dyn Element>>,
     /// A winit window. This is only valid between resume and pause.
     pub window: Option<Arc<Window>>,
     /// The text context is used to manage fonts and text rendering. It is only valid between resume and pause.
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index a35b8396..ab648a30 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -18,7 +18,7 @@ use crate::elements::Element;
 #[cfg(feature = "accesskit")]
 use accesskit::{Action, Role};
 use craft_primitives::geometry::borders::CssRoundedRect;
-use crate::app::{LAYOUT_DIRTY, TAFFY_TREE};
+use crate::app::TAFFY_TREE;
 use crate::request_layout;
 
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 9c9b3b2a..33e1d11c 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -1,6 +1,6 @@
 use crate::app::{DOCUMENTS, FOCUS, TAFFY_TREE};
 use crate::elements::core::ElementData;
-use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler};
+use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
 use crate::layout::layout_context::LayoutContext;
 use crate::style::{
     AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit,
@@ -141,6 +141,14 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     {
         self.element_data_mut().on_pointer_enter.push(on_pointer_enter);
         self
+    }    
+    
+    fn on_slider_value_changed(&mut self, on_slider_value_changed: SliderValueChangedHandler) -> &mut Self
+    where
+        Self: Sized,
+    {
+        self.element_data_mut().on_slider_value_changed.push(on_slider_value_changed);
+        self
     }
 
     fn on_pointer_leave(&mut self, on_pointer_leave: PointerLeaveHandler) -> &mut Self
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index 35cbd6fa..2f7852d0 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -3,7 +3,7 @@ use crate::elements::element_id::create_unique_element_id;
 use crate::elements::element_states::ElementState;
 use crate::elements::scroll_state::ScrollState;
 use crate::elements::Element;
-use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler};
+use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
 use crate::layout::layout_item::LayoutItem;
 use crate::style::Style;
 use craft_primitives::geometry::{Rectangle, Size};
@@ -45,6 +45,7 @@ pub struct ElementData {
 
     pub(crate) animations: Option<FxHashMap<SmolStr, ActiveAnimation>>,
     pub(crate) parent: Option<Weak<RefCell<dyn Element>>>,
+    pub on_slider_value_changed: Vec<SliderValueChangedHandler>,
     pub on_pointer_enter: Vec<PointerEnterHandler>,
     pub on_pointer_leave: Vec<PointerLeaveHandler>,
     pub(crate) me: Option<Weak<RefCell<dyn Element>>>,
@@ -146,6 +147,7 @@ impl Default for ElementData {
             internal_id: create_unique_element_id(),
             animations: None,
             parent: None,
+            on_slider_value_changed: vec![],
             on_pointer_enter: vec![],
             on_pointer_leave: vec![],
             me: None,
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 3afbd9d1..ad468c27 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -3,7 +3,6 @@ use crate::events::{CraftMessage, Event};
 use kurbo::Point;
 use ui_events::pointer::{PointerId, PointerType};
 use ui_events::ScrollDelta;
-use crate::app::LAYOUT_DIRTY;
 use crate::request_layout;
 
 #[allow(clippy::too_many_arguments)]
diff --git a/crates/craft_retained/src/elements/slider/slider.rs b/crates/craft_retained/src/elements/slider/slider.rs
index da56b095..9f63c0e9 100644
--- a/crates/craft_retained/src/elements/slider/slider.rs
+++ b/crates/craft_retained/src/elements/slider/slider.rs
@@ -1,9 +1,9 @@
-use crate::app::ELEMENTS;
+use crate::app::{queue_event, ELEMENTS};
 use crate::app::TAFFY_TREE;
 use crate::elements::core::ElementInternals;
 use crate::elements::element_data::ElementData;
 use crate::elements::Element;
-use crate::events::{dispatch_event, CraftMessage, Event};
+use crate::events::{CraftMessage, Event};
 use crate::layout::layout_context::LayoutContext;
 use crate::palette;
 use crate::style::Unit;
@@ -291,7 +291,8 @@ impl ElementInternals for Slider {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        let focused = false;
+        // @HARDCODED
+        let focused = true;
 
         match message {
             CraftMessage::KeyboardInputEvent(key) => {
@@ -313,7 +314,9 @@ impl ElementInternals for Slider {
 
                 if let Some(new_value) = new_value {
                     self.value = new_value;
-                    //event.result_message(CraftMessage::SliderValueChanged(self.value));
+
+                    let new_event = Event::new(event.target.clone());
+                    queue_event(new_event, CraftMessage::SliderValueChanged(self.value));
                 }
             }
             CraftMessage::PointerButtonUp(pointer_button_update) => {
@@ -323,7 +326,9 @@ impl ElementInternals for Slider {
 
                 let value = self.compute_slider_value(&Point::new(pointer_button_update.state.position.x, pointer_button_update.state.position.y));
                 self.value = value;
-                //event.result_message(CraftMessage::SliderValueChanged(value));
+
+                let new_event = Event::new(event.target.clone());
+                queue_event(new_event, CraftMessage::SliderValueChanged(self.value));
             }
             CraftMessage::PointerButtonDown(pointer_button_update) => {
                 self.dragging = true;
@@ -332,10 +337,9 @@ impl ElementInternals for Slider {
 
                 let value = self.compute_slider_value(&Point::new(pointer_button_update.state.position.x, pointer_button_update.state.position.y));
                 self.value = value;
-                //event.result_message(CraftMessage::SliderValueChanged(value));
 
                 let new_event = Event::new(event.target.clone());
-                //dispatch_event(new_event, CraftMessage::SliderValueChanged(self.value));
+                queue_event(new_event, CraftMessage::SliderValueChanged(self.value));
             }
             CraftMessage::PointerMovedEvent(pointer_update) => {
                 if !self.dragging {
@@ -344,7 +348,9 @@ impl ElementInternals for Slider {
 
                 let value = self.compute_slider_value(&Point::new(pointer_update.current.position.x, pointer_update.current.position.y));
                 self.value = value;
-                //event.result_message(CraftMessage::SliderValueChanged(value));
+
+                let new_event = Event::new(event.target.clone());
+                queue_event(new_event, CraftMessage::SliderValueChanged(self.value));
             }
             _ => {}
         }
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index a8938ae1..37e682f0 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -21,7 +21,6 @@ use crate::elements::element_id::create_unique_element_id;
 use crate::elements::scrollable;
 use crate::elements::text_input::text_input_state::TextInputState;
 use crate::events::{CraftMessage, Event};
-use crate::text::parley_editor::PlainEditor;
 use crate::text::text_context::TextContext;
 use crate::text::text_render_data::TextRender;
 use crate::text::RangedStyles;
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index 229c0c16..a72c205e 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -16,7 +16,7 @@ use std::time::{Duration, Instant};
 #[cfg(target_arch = "wasm32")]
 use web_time::{Duration, Instant};
 
-use crate::app::{LAYOUT_DIRTY, TAFFY_TREE};
+use crate::app::TAFFY_TREE;
 use crate::elements::core::ElementInternals;
 use crate::elements::text_input::parley_box_to_rect;
 use crate::elements::TextInput;
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index 8bee51c7..9e334c15 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -1,17 +1,17 @@
 use crate::elements::Element;
 use crate::events::{CraftMessage, Event, FocusAction};
 
+use crate::app::dequeue_event;
 use crate::events::helpers::{
     call_default_element_event_handler, call_user_event_handlers, find_target, freeze_target_list,
 };
-use crate::events::pointer_capture::{maybe_handle_implicit_pointer_capture_release};
+use crate::events::pointer_capture::maybe_handle_implicit_pointer_capture_release;
 use crate::text::text_context::TextContext;
-use craft_logging::{span, Level};
 use craft_primitives::geometry::Point;
+use craft_renderer::RenderList;
 use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::rc::{Rc, Weak};
-use craft_renderer::RenderList;
 
 pub(super) fn dispatch_capturing_event(
     _message: &CraftMessage,
@@ -198,15 +198,16 @@ impl EventDispatcher {
         // - gotpointercapture(capture), gotpointercapture(bubble)
         maybe_handle_implicit_pointer_capture_release(message);
 
-        self.previous_targets = targets.iter().map(Rc::downgrade).collect();
-    }
-}
+        // Drain the event dispatch queue and invoke user callbacks.
+        while let Some((event, message)) = dequeue_event() {
+            let mut targets: VecDeque<Rc<RefCell<dyn Element>>> = freeze_target_list(event.target);
+            // Handle capturing
+            dispatch_capturing_event(&message, &mut targets);
 
-pub fn dispatch_event(event: Event, craft_message: CraftMessage) {
-    let mut targets: VecDeque<Rc<RefCell<dyn Element>>> = freeze_target_list(event.target);
-    // Handle capturing
-    dispatch_capturing_event(&craft_message, &mut targets);
+            // Handle bubbling
+            let _ = dispatch_bubbling_event(&message, &mut targets);
+        }
 
-    // Handle bubbling
-    dispatch_bubbling_event(&craft_message, &mut targets);
-}
+        self.previous_targets = targets.iter().map(Rc::downgrade).collect();
+    }
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index fe1b8f83..f0ac6e23 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -112,7 +112,13 @@ pub(super) fn call_user_event_handlers(
         CraftMessage::DropdownToggled(_) => {}
         CraftMessage::DropdownItemSelected(_) => {}
         CraftMessage::SwitchToggled(_) => {}
-        CraftMessage::SliderValueChanged(_) => {}
+        CraftMessage::SliderValueChanged(slider_value) => {
+            let element_data = current_target.borrow().element_data().clone();
+
+            for handler in &element_data.on_slider_value_changed {
+                (*handler)(event, *slider_value);
+            }
+        }
         CraftMessage::ElementMessage(_) => {}
         CraftMessage::GotPointerCapture() => {
             let element_data = current_target.borrow().element_data().clone();
diff --git a/crates/craft_retained/src/events/mod.rs b/crates/craft_retained/src/events/mod.rs
index 54d41101..c88f8688 100644
--- a/crates/craft_retained/src/events/mod.rs
+++ b/crates/craft_retained/src/events/mod.rs
@@ -19,7 +19,6 @@ use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
 pub use winit::event::Ime;
 pub use winit::event::Modifiers;
 pub use winit::event::MouseButton;
-pub use event_dispatch::dispatch_event;
 use crate::PinnedFutureAny;
 use crate::utils::cloneable_any::CloneableAny;
 
@@ -28,6 +27,7 @@ use crate::elements::Element;
 
 pub type PointerEventHandler = Rc<dyn Fn(&mut Event, &PointerButtonEvent)>;
 pub type PointerCaptureHandler = Rc<dyn Fn(&mut Event)>;
+pub type SliderValueChangedHandler = Rc<dyn Fn(&mut Event, f64)>;
 pub type PointerEnterHandler = Rc<dyn Fn(&mut Event)>;
 pub type PointerLeaveHandler = Rc<dyn Fn(&mut Event)>;
 
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index c5894b3a..3c821af4 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -5,7 +5,7 @@ use craft_primitives::geometry::{Border, ElementBox, Margin, Padding, Point, Rec
 use craft_renderer::{Brush, RenderList};
 use kurbo::{Affine, BezPath, Shape, Vec2};
 use peniko::Color;
-use taffy::{Layout, NodeId, Position, TaffyTree};
+use taffy::{NodeId, Position, TaffyTree};
 
 impl CssComputedBorder {
     pub(crate) fn scale(&mut self, scale_factor: f64) {

From 337f22a9b271fb51b9745558721e2b90401e891d Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 27 Dec 2025 01:48:28 -0500
Subject: [PATCH 007/143] Remove unused layout_item funcs

---
 crates/craft_retained/src/layout/layout_item.rs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index 3c821af4..bf666c31 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -58,9 +58,6 @@ pub struct LayoutItem {
     pub layout_order: u32,
     pub clip_bounds: Option<Rectangle>,
 
-    //  ---
-    pub children_awaiting_add: Vec<NodeId>,
-
     //cache_border_spec: Option<(CssRoundedRect, f64)>, // f64 for scale factor
     cache_border_spec: Option<BorderSpec>,
     computed_border: ComputedBorder,
@@ -75,18 +72,6 @@ impl LayoutItem {
         self.transform
     }
 
-    pub fn push_child(&mut self, child: &Option<NodeId>) {
-        if let Some(taffy_node_id) = child.as_ref() {
-            self.children_awaiting_add.push(*taffy_node_id);
-        }
-    }
-
-    pub fn build_tree(&mut self, taffy_tree: &mut TaffyTree<LayoutContext>, style: taffy::Style) -> Option<NodeId> {
-        self.taffy_node_id = Some(taffy_tree.new_with_children(style, &self.children_awaiting_add).unwrap());
-        self.children_awaiting_add.clear();
-        self.taffy_node_id
-    }
-
     pub fn build_tree_with_context(
         &mut self,
         taffy_tree: &mut TaffyTree<LayoutContext>,

From 0ab748f4cfa9ad1805c2a4cad9500680164ce8c7 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 27 Dec 2025 01:49:55 -0500
Subject: [PATCH 008/143] Remove unused layout_item funcs

---
 crates/craft_retained/src/layout/layout_item.rs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index bf666c31..3b0cc94c 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -72,16 +72,6 @@ impl LayoutItem {
         self.transform
     }
 
-    pub fn build_tree_with_context(
-        &mut self,
-        taffy_tree: &mut TaffyTree<LayoutContext>,
-        style: taffy::Style,
-        layout_context: LayoutContext,
-    ) -> Option<NodeId> {
-        self.taffy_node_id = Some(taffy_tree.new_leaf_with_context(style, layout_context).unwrap());
-        self.taffy_node_id
-    }
-
     pub fn resolve_box(
         &mut self,
         relative_position: Point,

From b899e06fe99732d91e002cc1ec27692ec6e1ec2a Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 27 Dec 2025 11:22:22 -0500
Subject: [PATCH 009/143] cleanup on remove

---
 .../src/elements/core/element_internals.rs    |  2 +-
 crates/craft_retained/src/elements/element.rs | 61 +++++++++++++++----
 crates/craft_retained/src/events/helpers.rs   |  4 +-
 .../craft_retained/src/layout/layout_item.rs  |  3 +-
 .../craft_retained/src/text/parley_editor.rs  |  1 +
 examples/jsframeworkbench/main.rs             |  3 -
 6 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index ab648a30..6ae75bb6 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -33,7 +33,7 @@ pub trait  ElementInternals: ElementData {
         pointer: Option<Point>,
         text_context: &mut TextContext,
         scale_factor: f64,
-        dirty: bool,
+        _dirty: bool,
     ) {
         for child in &self.element_data().children {
             child.borrow_mut().apply_layout(
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 33e1d11c..0d18a7b3 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -1,6 +1,11 @@
-use crate::app::{DOCUMENTS, FOCUS, TAFFY_TREE};
+use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
+use crate::document::Document;
 use crate::elements::core::ElementData;
-use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
+use crate::elements::ElementIdMap;
+use crate::events::{
+    KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler,
+    PointerUpdateHandler, SliderValueChangedHandler,
+};
 use crate::layout::layout_context::LayoutContext;
 use crate::style::{
     AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit,
@@ -112,6 +117,32 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
             taffy_tree.mark_dirty(parent_id.unwrap()).expect("Failed to mark taffy node dirty.");
         });
 
+        // TODO: Move to document
+        fn remove_element_from_document(
+            node: Rc<RefCell<dyn Element>>,
+            document: &mut Document,
+            elements: &mut ElementIdMap,
+        ) {
+            elements.remove_id(node.borrow().element_data().internal_id);
+            document
+                .pointer_captures
+                .retain(|_, v| !Weak::ptr_eq(v, &node.borrow().element_data().me.as_ref().unwrap()));
+            document
+                .pending_pointer_captures
+                .retain(|_, v| !Weak::ptr_eq(v, &node.borrow().element_data().me.as_ref().unwrap()));
+            for child in node.borrow().children() {
+                remove_element_from_document(child.clone(), document, elements);
+            }
+        }
+
+        DOCUMENTS.with_borrow_mut(|documents| {
+            ELEMENTS.with_borrow_mut(|elements| {
+                remove_element_from_document(child.clone(), documents.get_current_document(), elements);
+            });
+        });
+
+        child.borrow_mut().unfocus_dyn();
+
         Ok(child)
     }
 
@@ -141,8 +172,8 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     {
         self.element_data_mut().on_pointer_enter.push(on_pointer_enter);
         self
-    }    
-    
+    }
+
     fn on_slider_value_changed(&mut self, on_slider_value_changed: SliderValueChangedHandler) -> &mut Self
     where
         Self: Sized,
@@ -282,7 +313,8 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         // https://w3c.github.io/pointerevents/#dom-element-haspointercapture
         DOCUMENTS.with_borrow_mut(|docs| {
             let current_doc = docs.get_current_document();
-            current_doc.pending_pointer_captures.get(&pointer_id).cloned().map(|w| w.as_ptr()) == self.element_data().me.clone().map(|w|w.as_ptr())
+            current_doc.pending_pointer_captures.get(&pointer_id).cloned().map(|w| w.as_ptr())
+                == self.element_data().me.clone().map(|w| w.as_ptr())
         })
     }
 
@@ -624,7 +656,8 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     /// Sets focus on the specified element, if it can be focused.
     ///
     /// The focused element is the element that will receive keyboard and similar events by default.
-    fn focus(&mut self) where
+    fn focus(&mut self)
+    where
         Self: Sized,
     {
         // Todo: check if the element is focusable. Should we return a result?
@@ -635,9 +668,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
 
     /// Returns true if the element has focus.
     fn is_focused(&self) -> bool {
-        let focus_element = FOCUS.with(|focus| {
-           focus.borrow().clone()
-        });
+        let focus_element = FOCUS.with(|focus| focus.borrow().clone());
 
         if focus_element.is_none() {
             return false;
@@ -649,15 +680,21 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     }
 
     /// Removes focus if the element has focus.
-    fn unfocus(&mut self) -> &mut Self where
+    fn unfocus(&mut self) -> &mut Self
+    where
         Self: Sized,
     {
+        self.unfocus_dyn();
+
+        self
+    }
+
+    /// Removes focus if the element has focus.
+    fn unfocus_dyn(&mut self) {
         if self.is_focused() {
             FOCUS.with(|focus| {
                 *focus.borrow_mut() = None;
             });
         }
-
-        self
     }
 }
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index f0ac6e23..3ae89fc1 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -37,7 +37,9 @@ pub(super) fn find_target(
 
     ELEMENTS.with_borrow_mut(|elements| {
         target_scratch.extend(render_list.targets.iter().rev().filter_map(|(id, _)| {
-            elements.get(*id).unwrap().upgrade()
+            // When an element is removed from the dom, we do not remove it from targets.
+            // So we must handle it here.
+            elements.get(*id).and_then(|target| target.upgrade())
         }));
     });
 
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index 3b0cc94c..9cc3cd12 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -1,11 +1,10 @@
-use crate::layout::layout_context::LayoutContext;
 use crate::style::Style;
 use craft_primitives::geometry::borders::{CssRoundedRect, BOTTOM, LEFT, RIGHT, TOP};
 use craft_primitives::geometry::{Border, ElementBox, Margin, Padding, Point, Rectangle, Size, TrblRectangle};
 use craft_renderer::{Brush, RenderList};
 use kurbo::{Affine, BezPath, Shape, Vec2};
 use peniko::Color;
-use taffy::{NodeId, Position, TaffyTree};
+use taffy::{NodeId, Position};
 
 impl CssComputedBorder {
     pub(crate) fn scale(&mut self, scale_factor: f64) {
diff --git a/crates/craft_retained/src/text/parley_editor.rs b/crates/craft_retained/src/text/parley_editor.rs
index 30270721..62eb1ed2 100644
--- a/crates/craft_retained/src/text/parley_editor.rs
+++ b/crates/craft_retained/src/text/parley_editor.rs
@@ -903,6 +903,7 @@ impl PlainEditor
     ///
     /// The return value is a `SplitString` because it
     /// excludes the IME preedit region.
+    #[allow(dead_code)]
     pub fn text(&self) -> SplitString<'_> {
         if let Some(preedit_range) = &self.compose {
             SplitString([
diff --git a/examples/jsframeworkbench/main.rs b/examples/jsframeworkbench/main.rs
index 816c418e..e75d5956 100644
--- a/examples/jsframeworkbench/main.rs
+++ b/examples/jsframeworkbench/main.rs
@@ -81,7 +81,6 @@ impl State {
         self.remove_all_rows();
         self.store.clear();
         self.rows.clear();
-        self.rows.shrink_to_fit();
         self.store.run();
         self.append_rows();
         self.select(None);
@@ -91,7 +90,6 @@ impl State {
         self.remove_all_rows();
         self.store.clear();
         self.rows.clear();
-        self.rows.shrink_to_fit();
         self.store.run_lots();
         self.append_rows();
         self.select(None);
@@ -250,7 +248,6 @@ impl Store {
 
     pub fn clear(&mut self) {
         self.data.clear();
-        self.data.shrink_to_fit();
         self.selected = None;
     }
 

From ac8fcff072d0ab573f046ff2f8d287b8f09ba6b1 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 27 Dec 2025 11:50:54 -0500
Subject: [PATCH 010/143] Request re-layout on swap

---
 crates/craft_retained/src/elements/element.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 0d18a7b3..a85f86b1 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -11,7 +11,7 @@ use crate::style::{
     AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit,
     Weight, Wrap,
 };
-use crate::CraftError;
+use crate::{request_layout, CraftError};
 use craft_primitives::geometry::Point;
 use craft_primitives::geometry::{ElementBox, TrblRectangle};
 use craft_primitives::Color;
@@ -64,6 +64,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
 
                 taffy_tree.set_children(parent_id, &tchildren).expect("Failed set taffy children");
                 taffy_tree.mark_dirty(parent_id).expect("Failed to mark taffy node dirty.");
+                request_layout();
             }
         });
 

From b8c5d12ceabdeb3e59221fbdac152f46f914ab24 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 28 Dec 2025 19:53:35 -0500
Subject: [PATCH 011/143] sets

---
 crates/craft_retained/src/elements/element.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index a85f86b1..363316af 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -327,18 +327,26 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     where
         Self: Sized,
     {
+        self.set_display(display);
+        self
+    }
+
+    fn set_display(&mut self, display: Display) {
         self.style_mut().set_display(display);
         self.update_taffy_style();
-        self
     }
 
     fn box_sizing(&mut self, box_sizing: BoxSizing) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_box_sizing(box_sizing);
+        self
+    }
+
+    fn set_box_sizing(&mut self, box_sizing: BoxSizing) {
         self.style_mut().set_box_sizing(box_sizing);
         self.update_taffy_style();
-        self
     }
 
     fn position(&mut self, position: Position) -> &mut Self

From 3b0d0f0db034f8883c2dc130e42715d3cea6f141 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 28 Dec 2025 20:51:30 -0500
Subject: [PATCH 012/143] Add position setter

---
 crates/craft_retained/src/elements/element.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 363316af..d0b473c5 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -353,9 +353,13 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     where
         Self: Sized,
     {
+        self.set_position(position);
+        self
+    }
+
+    fn set_position(&mut self, position: Position) {
         self.style_mut().set_position(position);
         self.update_taffy_style();
-        self
     }
 
     fn margin(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> &mut Self

From 905db0afabee51f9b9c044e22f75dfda3c45a9b5 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 28 Dec 2025 21:57:16 -0500
Subject: [PATCH 013/143] more setters

---
 crates/craft_retained/src/elements/element.rs | 60 +++++++++++++++----
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index d0b473c5..a0b058be 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -366,90 +366,130 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     where
         Self: Sized,
     {
+        self.set_margin(top, right, bottom, left);
+        self
+    }
+
+    fn set_margin(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) {
         self.style_mut().set_margin(TrblRectangle::new(top, right, bottom, left));
         self.update_taffy_style();
-        self
     }
 
     fn padding(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_padding(top, right, bottom, left);
+        self
+    }
+
+    fn set_padding(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) {
         self.style_mut().set_padding(TrblRectangle::new(top, right, bottom, left));
         self.update_taffy_style();
-        self
     }
 
     fn gap(&mut self, row_gap: Unit, column_gap: Unit) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_gap(row_gap, column_gap);
+        self
+    }
+
+    fn set_gap(&mut self, row_gap: Unit, column_gap: Unit) {
         self.style_mut().set_gap([row_gap, column_gap]);
         self.update_taffy_style();
-        self
     }
 
     fn inset(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_inset(top, right, bottom, left);
+        self
+    }
+
+    fn set_inset(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) {
         self.style_mut().set_inset(TrblRectangle::new(top, right, bottom, left));
         self.update_taffy_style();
-        self
     }
 
     fn min_width(&mut self, min_width: Unit) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_min_width(min_width);
+        self
+    }
+
+    fn set_min_width(&mut self, min_width: Unit) {
         self.style_mut().set_min_width(min_width);
         self.update_taffy_style();
-        self
     }
 
     fn min_height(&mut self, min_height: Unit) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_min_height(min_height);
+        self
+    }
+
+    fn set_min_height(&mut self, min_height: Unit) {
         self.style_mut().set_min_height(min_height);
         self.update_taffy_style();
-        self
     }
 
     fn width(&mut self, width: Unit) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_width(width);
+        self
+    }
+
+    fn set_width(&mut self, width: Unit) {
         self.style_mut().set_width(width);
         self.update_taffy_style();
-        self
     }
 
     fn height(&mut self, height: Unit) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_height(height);
+        self
+    }
+
+    fn set_height(&mut self, height: Unit) {
         self.style_mut().set_height(height);
         self.update_taffy_style();
-        self
     }
 
     fn max_width(&mut self, max_width: Unit) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_max_width(max_width);
+        self
+    }
+
+    fn set_max_width(&mut self, max_width: Unit) {
         self.style_mut().set_max_width(max_width);
         self.update_taffy_style();
-        self
     }
 
     fn max_height(&mut self, max_height: Unit) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_max_height(max_height);
+        self
+    }
+
+    fn set_max_height(&mut self, max_height: Unit) {
         self.style_mut().set_max_height(max_height);
         self.update_taffy_style();
-        self
     }
 
     fn wrap(&mut self, wrap: Wrap) -> &mut Self

From 65e4bee48ac565e4ca8b4a6fbb0ed75d793058ea Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 28 Dec 2025 22:47:05 -0500
Subject: [PATCH 014/143] more setters

---
 crates/craft_retained/src/elements/element.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index a0b058be..f95b7d11 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -496,18 +496,26 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     where
         Self: Sized,
     {
+        self.set_wrap(wrap);
+        self
+    }
+
+    fn set_wrap(&mut self, wrap: Wrap) {
         self.style_mut().set_wrap(wrap);
         self.update_taffy_style();
-        self
     }
 
     fn align_items(&mut self, align_items: Option<AlignItems>) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_align_items(align_items);
+        self
+    }
+
+    fn set_align_items(&mut self, align_items: Option<AlignItems>) {
         self.style_mut().set_align_items(align_items);
         self.update_taffy_style();
-        self
     }
 
     fn justify_content(&mut self, justify_content: Option<JustifyContent>) -> &mut Self

From 28751887470b291d9e2246de82cdb24ef119f347 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Mon, 29 Dec 2025 07:52:15 -0500
Subject: [PATCH 015/143] more setters

---
 crates/craft_retained/src/elements/element.rs | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index f95b7d11..544c29cf 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -522,45 +522,65 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     where
         Self: Sized,
     {
+        self.set_justify_content(justify_content);
+        self
+    }
+
+    fn set_justify_content(&mut self, justify_content: Option<JustifyContent>) {
         self.style_mut().set_justify_content(justify_content);
         self.update_taffy_style();
-        self
     }
 
     fn flex_direction(&mut self, flex_direction: FlexDirection) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_flex_direction(flex_direction);
+        self
+    }
+
+    fn set_flex_direction(&mut self, flex_direction: FlexDirection) {
         self.style_mut().set_flex_direction(flex_direction);
         self.update_taffy_style();
-        self
     }
 
     fn flex_grow(&mut self, flex_grow: f32) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_flex_grow(flex_grow);
+        self
+    }
+
+    fn set_flex_grow(&mut self, flex_grow: f32) {
         self.style_mut().set_flex_grow(flex_grow);
         self.update_taffy_style();
-        self
     }
 
     fn flex_shrink(&mut self, flex_shrink: f32) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_flex_shrink(flex_shrink);
+        self
+    }
+
+    fn set_flex_shrink(&mut self, flex_shrink: f32) {
         self.style_mut().set_flex_shrink(flex_shrink);
         self.update_taffy_style();
-        self
     }
 
     fn flex_basis(&mut self, flex_basis: Unit) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_flex_basis(flex_basis);
+        self
+    }
+
+    fn set_flex_basis(&mut self, flex_basis: Unit) {
         self.style_mut().set_flex_basis(flex_basis);
         self.update_taffy_style();
-        self
     }
 
     fn font_family(&mut self, font_family: FontFamily) -> &mut Self

From 0a52d1e4d23c4cc6e36c6038a4b514e11bcfff27 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Mon, 29 Dec 2025 10:16:45 -0500
Subject: [PATCH 016/143] more setters

---
 crates/craft_retained/src/elements/element.rs | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 544c29cf..100477f2 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -587,53 +587,77 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     where
         Self: Sized,
     {
+        self.set_font_family(font_family);
+        self
+    }
+
+    fn set_font_family(&mut self, font_family: FontFamily) {
         self.style_mut().set_font_family(font_family);
         self.update_taffy_style();
-        self
     }
 
     fn color(&mut self, color: Color) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_color(color);
+        self
+    }
+
+    fn set_color(&mut self, color: Color) {
         self.style_mut().set_color(color);
         self.update_taffy_style();
-        self
     }
 
     fn background_color(&mut self, color: Color) -> &mut Self
     where
         Self: Sized,
     {
-        self.style_mut().set_background(color);
+        self.set_background_color(color);
         self
     }
 
+    fn set_background_color(&mut self, color: Color) {
+        self.style_mut().set_background(color);
+    }
+
     fn font_size(&mut self, font_size: f32) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_font_size(font_size);
+        self
+    }
+
+    fn set_font_size(&mut self, font_size: f32) {
         self.style_mut().set_font_size(font_size);
         self.update_taffy_style();
-        self
     }
 
     fn line_height(&mut self, line_height: f32) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_line_height(line_height);
+        self
+    }
+
+    fn set_line_height(&mut self, line_height: f32) {
         self.style_mut().set_line_height(line_height);
         self.update_taffy_style();
-        self
     }
 
     fn font_weight(&mut self, font_weight: Weight) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_font_weight(font_weight);
+        self
+    }
+
+    fn set_font_weight(&mut self, font_weight: Weight) {
         self.style_mut().set_font_weight(font_weight);
         self.update_taffy_style();
-        self
     }
 
     fn font_style(&mut self, font_style: FontStyle) -> &mut Self

From 545b34219da38d5d3600dca66a66a0bae48b11e1 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Mon, 29 Dec 2025 16:56:19 -0500
Subject: [PATCH 017/143] more setters

---
 crates/craft_retained/src/elements/element.rs | 66 +++++++++++++++----
 1 file changed, 55 insertions(+), 11 deletions(-)

diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 100477f2..36aead80 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -664,70 +664,102 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     where
         Self: Sized,
     {
+        self.set_font_style(font_style);
+        self
+    }
+
+    fn set_font_style(&mut self, font_style: FontStyle) {
         self.style_mut().set_font_style(font_style);
         self.update_taffy_style();
-        self
     }
 
     fn underline(&mut self, underline: Option<Underline>) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_underline(underline);
+        self
+    }
+
+    fn set_underline(&mut self, underline: Option<Underline>) {
         self.style_mut().set_underline(underline);
         self.update_taffy_style();
-        self
     }
 
     fn overflow(&mut self, overflow_x: Overflow, overflow_y: Overflow) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_overflow(overflow_x, overflow_y);
+        self
+    }
+
+    fn set_overflow(&mut self, overflow_x: Overflow, overflow_y: Overflow) {
         self.style_mut().set_overflow([overflow_x, overflow_y]);
         self.update_taffy_style();
-        self
     }
 
     fn border_color(&mut self, top: Color, right: Color, bottom: Color, left: Color) -> &mut Self
     where
         Self: Sized,
     {
-        self.style_mut().set_border_color(TrblRectangle::new(top, right, bottom, left));
+        self.set_border_color(top, right, bottom, left);
         self
     }
 
+    fn set_border_color(&mut self, top: Color, right: Color, bottom: Color, left: Color) {
+        self.style_mut().set_border_color(TrblRectangle::new(top, right, bottom, left));
+    }
+
     fn border_width(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> &mut Self
     where
         Self: Sized,
     {
+        self.set_border_width(top, right, bottom, left);
+        self
+    }
+
+    fn set_border_width(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) {
         self.style_mut().set_border_width(TrblRectangle::new(top, right, bottom, left));
         self.update_taffy_style();
-        self
     }
 
     fn border_radius(&mut self, top: (f32, f32), right: (f32, f32), bottom: (f32, f32), left: (f32, f32)) -> &mut Self
     where
         Self: Sized,
     {
-        self.style_mut().set_border_radius([top, right, bottom, left]);
+        self.set_border_radius(top, right, bottom, left);
         self
     }
 
+    fn set_border_radius(&mut self, top: (f32, f32), right: (f32, f32), bottom: (f32, f32), left: (f32, f32)) {
+        self.style_mut().set_border_radius([top, right, bottom, left]);
+    }
+
     fn scrollbar_color(&mut self, scrollbar_color: ScrollbarColor) -> &mut Self
     where
         Self: Sized,
     {
-        self.style_mut().set_scrollbar_color(scrollbar_color);
+        self.set_scrollbar_color(scrollbar_color);
         self
     }
 
+    fn set_scrollbar_color(&mut self, scrollbar_color: ScrollbarColor) {
+        self.style_mut().set_scrollbar_color(scrollbar_color);
+    }
+
     fn scrollbar_thumb_margin(&mut self, top: f32, right: f32, bottom: f32, left: f32) -> &mut Self
     where
         Self: Sized,
     {
-        self.style_mut().set_scrollbar_thumb_margin(TrblRectangle::new(top, right, bottom, left));
+        self.set_scrollbar_thumb_margin(top, right, bottom, left);
         self
     }
 
+    fn set_scrollbar_thumb_margin(&mut self, top: f32, right: f32, bottom: f32, left: f32) {
+        self.style_mut().set_scrollbar_thumb_margin(TrblRectangle::new(top, right, bottom, left));
+    }
+
     fn scrollbar_thumb_radius(
         &mut self,
         top: (f32, f32),
@@ -738,26 +770,38 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     where
         Self: Sized,
     {
-        self.style_mut().set_scrollbar_thumb_radius([top, right, bottom, left]);
+        self.set_scrollbar_thumb_radius(top, right, bottom, left);
         self
     }
 
+    fn set_scrollbar_thumb_radius(&mut self, top: (f32, f32), right: (f32, f32), bottom: (f32, f32), left: (f32, f32)) {
+        self.style_mut().set_scrollbar_thumb_radius([top, right, bottom, left]);
+    }
+
     fn scrollbar_width(&mut self, scrollbar_width: f32) -> &mut Self
     where
         Self: Sized,
     {
-        self.style_mut().set_scrollbar_width(scrollbar_width);
+        self.set_scrollbar_width(scrollbar_width);
         self
     }
 
+    fn set_scrollbar_width(&mut self, scrollbar_width: f32) {
+        self.style_mut().set_scrollbar_width(scrollbar_width);
+    }
+
     fn selection_color(&mut self, selection_color: Color) -> &mut Self
     where
         Self: Sized,
     {
-        self.style_mut().set_selection_color(selection_color);
+        self.set_selection_color(selection_color);
         self
     }
 
+    fn set_selection_color(&mut self, selection_color: Color) {
+        self.style_mut().set_selection_color(selection_color);
+    }
+
     /// Sets focus on the specified element, if it can be focused.
     ///
     /// The focused element is the element that will receive keyboard and similar events by default.

From cce291e248f8a39d2d20f14a5d86fe2db5903e93 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Tue, 30 Dec 2025 09:01:29 -0500
Subject: [PATCH 018/143] Taffy Tree wrapper

---
 crates/craft_retained/src/app.rs              |  61 ++++------
 .../craft_retained/src/elements/container.rs  |  24 ++--
 .../src/elements/core/element_internals.rs    |  16 +--
 crates/craft_retained/src/elements/element.rs |  27 ++---
 crates/craft_retained/src/elements/image.rs   |  10 +-
 .../src/elements/slider/slider.rs             |   9 +-
 crates/craft_retained/src/elements/text.rs    |   9 +-
 .../src/elements/text_input/mod.rs            |  11 +-
 .../elements/text_input/text_input_state.rs   |   2 +-
 crates/craft_retained/src/layout/mod.rs       |   3 +
 .../craft_retained/src/layout/taffy_tree.rs   | 113 ++++++++++++++++++
 11 files changed, 186 insertions(+), 99 deletions(-)
 create mode 100644 crates/craft_retained/src/layout/taffy_tree.rs

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index ce9b1fd6..e97cbf54 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -1,8 +1,7 @@
 use crate::elements::ElementIdMap;
-use crate::events::{Event, EventDispatcher};
 use crate::events::internal::InternalMessage;
-use crate::events::{CraftMessage};
-use crate::layout::layout_context::measure_content;
+use crate::events::CraftMessage;
+use crate::events::{Event, EventDispatcher};
 use crate::style::{Display, Unit, Wrap};
 use crate::text::text_context::TextContext;
 use crate::{RendererBox, WindowContext};
@@ -12,9 +11,9 @@ use craft_resource_manager::{ResourceIdentifier, ResourceManager};
 use craft_runtime::CraftRuntimeHandle;
 use kurbo::{Affine, Point};
 use peniko::Color;
-use std::cell::{Cell};
+use std::cell::Cell;
 use std::cell::RefCell;
-use std::collections::{VecDeque};
+use std::collections::VecDeque;
 use std::ops::DerefMut;
 use std::rc::{Rc, Weak};
 use std::sync::Arc;
@@ -36,13 +35,13 @@ use web_time as time;
 use crate::animations::animation::AnimationFlags;
 use crate::document::DocumentManager;
 use crate::elements::Element;
-use crate::layout::layout_context::LayoutContext;
+use crate::layout::TaffyTree;
 use craft_renderer::RenderList;
 use craft_resource_manager::resource_event::ResourceEvent;
 use craft_resource_manager::resource_type::ResourceType;
 use craft_runtime::Sender;
 use std::time::Duration;
-use taffy::{AvailableSpace, NodeId, TaffyTree};
+use taffy::{AvailableSpace, NodeId};
 use ui_events::keyboard::{KeyboardEvent, Modifiers, NamedKey};
 use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
 use ui_events::ScrollDelta;
@@ -58,7 +57,7 @@ thread_local! {
     /// Records document-level state (focus, pointer captures, etc.) for internal use.
     pub static DOCUMENTS: RefCell<DocumentManager> = RefCell::new(DocumentManager::new());
     pub(crate) static ELEMENTS: RefCell<ElementIdMap> = RefCell::new(ElementIdMap::new());
-    pub(crate) static TAFFY_TREE: RefCell<TaffyTree<LayoutContext>> = RefCell::new(TaffyTree::new());
+    pub(crate) static TAFFY_TREE: RefCell<TaffyTree> = RefCell::new(TaffyTree::new());
     pub(crate) static PENDING_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = RefCell::new(VecDeque::new());
     pub(crate) static IN_PROGRESS_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = RefCell::new(VecDeque::new());
     pub(crate) static FOCUS: RefCell<Option<Weak<RefCell<dyn Element>>>> = RefCell::new(None);
@@ -408,7 +407,7 @@ impl App {
             self.root.clone(),
             &mut self.text_context,
             &mut self.render_list,
-            &mut self.target_scratch
+            &mut self.target_scratch,
         );
         self.window.clone().unwrap().request_redraw();
     }
@@ -442,7 +441,7 @@ impl App {
         match resource_event {
             ResourceEvent::Loaded(resource_identifier, resource_type, resource) => {
                 IN_PROGRESS_RESOURCES.with_borrow_mut(|in_progress| {
-                   in_progress.retain_mut(|(resource, _resource_type)| *resource != resource_identifier);
+                    in_progress.retain_mut(|(resource, _resource_type)| *resource != resource_identifier);
                 });
                 if let Some(_text_context) = self.text_context.as_mut()
                     && resource_type == ResourceType::Font
@@ -548,7 +547,7 @@ impl App {
                 self.root.borrow_mut().draw(&mut self.render_list, text_context, mouse_position, scale_factor);
             }
 
-        renderer.sort_and_cull_render_list(&mut self.render_list);
+            renderer.sort_and_cull_render_list(&mut self.render_list);
 
             let window = Rectangle {
                 x: 0.0,
@@ -589,10 +588,16 @@ impl App {
         PENDING_RESOURCES.with_borrow_mut(|pending_resources| {
             IN_PROGRESS_RESOURCES.with_borrow_mut(|in_progress| {
                 for (resource, resource_type) in pending_resources.drain(..) {
-                    if self.resource_manager.contains(&resource) || in_progress.contains(&(resource.clone(), resource_type)) {
+                    if self.resource_manager.contains(&resource)
+                        || in_progress.contains(&(resource.clone(), resource_type))
+                    {
                         continue;
                     }
-                    self.resource_manager.async_download_resource_and_send_message_on_finish(self.app_sender.clone(), resource.clone(), resource_type);
+                    self.resource_manager.async_download_resource_and_send_message_on_finish(
+                        self.app_sender.clone(),
+                        resource.clone(),
+                        resource_type,
+                    );
                     in_progress.push_back((resource, resource_type));
                 }
             });
@@ -622,7 +627,7 @@ fn style_root_element(root: &mut dyn Element, root_size: LogicalSize<f32>) {
 
 #[allow(clippy::too_many_arguments)]
 fn layout(
-    taffy_tree: &mut TaffyTree<LayoutContext>,
+    taffy_tree: &mut TaffyTree,
     root_element: Rc<RefCell<dyn Element>>,
     window_size: LogicalSize<f32>,
     text_context: &mut TextContext,
@@ -631,11 +636,10 @@ fn layout(
     scale_factor: f64,
     pointer: Option<Point>,
 ) -> NodeId {
-    let dirty = LAYOUT_DIRTY.with_borrow(|status| {
-        *status
-    });
+    let dirty = LAYOUT_DIRTY.with_borrow(|status| *status);
 
-    let root_node = root_element.borrow()
+    let root_node = root_element
+        .borrow()
         .element_data()
         .layout_item
         .taffy_node_id
@@ -655,24 +659,9 @@ fn layout(
         let _enter = span.enter();*/
         //println!("before layout");
         //taffy_tree.print_tree(root_node);
-        taffy_tree
-            .compute_layout_with_measure(
-                root_node,
-                available_space,
-                |known_dimensions, available_space, _node_id, node_context, style| {
-                    measure_content(
-                        known_dimensions,
-                        available_space,
-                        node_context,
-                        text_context,
-                        resource_manager.clone(),
-                        style,
-                    )
-                },
-            )
-            .unwrap();
+        taffy_tree.compute_layout(root_node, available_space, text_context, resource_manager.clone())
     }
-        //println!("after layout");
+    //println!("after layout");
     //taffy_tree.print_tree(root_node);
 
     let transform = Affine::IDENTITY;
@@ -704,4 +693,4 @@ pub fn request_layout() {
     LAYOUT_DIRTY.with_borrow_mut(|status| {
         *status = true;
     });
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index dd9a23fc..14357476 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -5,7 +5,6 @@ use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
 use crate::elements::element_data::ElementData;
 use crate::elements::{scrollable, Element};
 use crate::events::{CraftMessage, Event};
-use crate::layout::layout_context::LayoutContext;
 use crate::text::text_context::TextContext;
 use craft_primitives::geometry::Rectangle;
 use craft_renderer::RenderList;
@@ -14,31 +13,28 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::ops::Deref;
 use std::rc::{Rc, Weak};
-use taffy::{PrintTree, TaffyTree};
+use crate::layout::TaffyTree;
 
 /// Stores one or more elements.
 ///
 /// If overflow is set to scroll, it will become scrollable.
 pub struct Container {
     element_data: ElementData,
-    me: Option<Weak<RefCell<Container>>>,
 }
 
 impl Container {
     pub fn new() -> Rc<RefCell<Self>> {
         let me = Rc::new(RefCell::new(Self {
             element_data: ElementData::new(true),
-            me: None,
         }));
 
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let node_id = taffy_tree.new_leaf(me.borrow().style().to_taffy_style()).expect("TODO: panic message");
+            let node_id = taffy_tree.new_leaf(me.borrow().style().to_taffy_style());
             me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
         });
 
         let me_element: Rc<RefCell<dyn Element>> = me.clone();
 
-        me.borrow_mut().me = Some(Rc::downgrade(&me.clone()));
         me.borrow_mut().element_data.me = Some(Rc::downgrade(&me_element));
 
         ELEMENTS.with_borrow_mut(|elements| {
@@ -64,7 +60,7 @@ impl Element for Container {
     where
         Self: Sized,
     {
-        let me: Weak<RefCell<dyn Element>> = self.me.clone().unwrap() as Weak<RefCell<dyn Element>>;
+        let me: Weak<RefCell<dyn Element>> = self.element_data.me.clone().unwrap();
         child.borrow_mut().element_data_mut().parent = Some(me);
         self.element_data.children.push(child.clone());
 
@@ -73,9 +69,9 @@ impl Element for Container {
             let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
             let child_id = child.borrow().element_data().layout_item.taffy_node_id;
             if let Some(child_id) = child_id {
-                taffy_tree.add_child(parent_id, child_id).unwrap();
+                taffy_tree.add_child(parent_id, child_id);
 
-                taffy_tree.mark_dirty(parent_id).expect("Failed to mark taffy node dirty");
+                taffy_tree.mark_dirty(parent_id);
             }
         });
 
@@ -91,7 +87,7 @@ impl Element for Container {
     where
         Self: Sized,
     {
-        let me: Weak<RefCell<dyn Element>> = self.me.clone().unwrap() as Weak<RefCell<dyn Element>>;
+        let me: Weak<RefCell<dyn Element>> = self.element_data.me.clone().unwrap();
         let children: Vec<_> = children.into_iter().collect();
 
         for child in &children {
@@ -105,10 +101,10 @@ impl Element for Container {
             let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
             for child in &children {
                 if let Some(child_id) = child.borrow().element_data().layout_item.taffy_node_id {
-                    taffy_tree.add_child(parent_id, child_id).unwrap();
+                    taffy_tree.add_child(parent_id, child_id);
                 }
             }
-            taffy_tree.mark_dirty(parent_id).expect("Failed to mark taffy node dirty");
+            taffy_tree.mark_dirty(parent_id);
         });
 
         self
@@ -127,7 +123,7 @@ impl ElementInternals for Container {
 
     fn apply_layout(
         &mut self,
-        taffy_tree: &mut TaffyTree<LayoutContext>,
+        taffy_tree: &mut TaffyTree,
         position: Point,
         z_index: &mut u32,
         transform: Affine,
@@ -137,7 +133,7 @@ impl ElementInternals for Container {
         scale_factor: f64,
     ) {
         let node = self.element_data.layout_item.taffy_node_id.unwrap();
-        let layout = taffy_tree.layout(node).unwrap();
+        let layout = taffy_tree.layout(node);
         let has_new_layout = taffy_tree.get_has_new_layout(node);
 
         let dirty = has_new_layout || transform != self.element_data.layout_item.get_transform() || position != self.element_data.layout_item.position ;
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index 6ae75bb6..32cc0060 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -1,6 +1,5 @@
 use crate::animations::animation::{ActiveAnimation, AnimationFlags, AnimationStatus};
 use crate::events::{CraftMessage, Event};
-use crate::layout::layout_context::LayoutContext;
 use crate::layout::layout_item::{draw_borders_generic, CssComputedBorder, LayoutItem};
 use crate::style::{Display, Style};
 use crate::text::text_context::TextContext;
@@ -11,7 +10,7 @@ use rustc_hash::FxHashMap;
 use std::cell::RefCell;
 use std::rc::Rc;
 use std::time::Duration;
-use taffy::{Overflow, TaffyTree};
+use taffy::{Overflow};
 
 use crate::elements::core::element_data::ElementData;
 use crate::elements::Element;
@@ -19,6 +18,7 @@ use crate::elements::Element;
 use accesskit::{Action, Role};
 use craft_primitives::geometry::borders::CssRoundedRect;
 use crate::app::TAFFY_TREE;
+use crate::layout::TaffyTree;
 use crate::request_layout;
 
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
@@ -27,7 +27,7 @@ pub trait  ElementInternals: ElementData {
     /// A helper to apply the layout for all children.
     fn apply_layout_children(
         &mut self,
-        taffy_tree: &mut TaffyTree<LayoutContext>,
+        taffy_tree: &mut TaffyTree,
         z_index: &mut u32,
         transform: Affine,
         pointer: Option<Point>,
@@ -69,12 +69,12 @@ pub trait  ElementInternals: ElementData {
     }
 
     /// A helper to re-apply the style to the layout node when dirty.
-    fn apply_style_to_layout_node_if_dirty(&mut self, taffy_tree: &mut TaffyTree<LayoutContext>) {
+    fn apply_style_to_layout_node_if_dirty(&mut self, taffy_tree: &mut TaffyTree) {
         let element_data = self.element_data_mut();
         if element_data.style.is_dirty {
             let node_id = element_data.layout_item.taffy_node_id.unwrap();
             let style: taffy::Style = element_data.style.to_taffy_style();
-            taffy_tree.set_style(node_id, style).expect("Failed to set style on node.");
+            taffy_tree.set_style(node_id, style);
             element_data.style.is_dirty = false;
         }
     }
@@ -103,7 +103,7 @@ pub trait  ElementInternals: ElementData {
     #[allow(clippy::too_many_arguments)]
     fn apply_layout(
         &mut self,
-        taffy_tree: &mut TaffyTree<LayoutContext>,
+        taffy_tree: &mut TaffyTree,
         position: Point,
         z_index: &mut u32,
         transform: Affine,
@@ -372,7 +372,7 @@ pub trait  ElementInternals: ElementData {
         let id = self.element_data().layout_item.taffy_node_id;
         if let Some(id) = id {
             TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-               taffy_tree.mark_dirty(id).expect("Failed to mark taffy node as dirty");
+               taffy_tree.mark_dirty(id);
             });
         }
     }
@@ -384,7 +384,7 @@ pub trait  ElementInternals: ElementData {
         let id = self.element_data().layout_item.taffy_node_id;
         if let Some(id) = id {
             TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-                taffy_tree.set_style(id, self.element_data().style.to_taffy_style()).expect("Failed to set style.");
+                taffy_tree.set_style(id, self.element_data().style.to_taffy_style());
             });
         }
     }
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 36aead80..3b6b0b46 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -6,7 +6,7 @@ use crate::events::{
     KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler,
     PointerUpdateHandler, SliderValueChangedHandler,
 };
-use crate::layout::layout_context::LayoutContext;
+
 use crate::style::{
     AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit,
     Weight, Wrap,
@@ -18,7 +18,7 @@ use craft_primitives::Color;
 use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
-use taffy::{BoxSizing, NodeId, Overflow, Position, TaffyResult, TaffyTree};
+use taffy::{BoxSizing, Overflow, Position};
 use ui_events::pointer::PointerId;
 
 /// The element trait for end-users.
@@ -47,7 +47,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
                 && let Some(child_2_id) = child_2_id
             {
                 // There isn't a swap API in the taffy tree. Instead swap the children and call set_children.
-                let mut tchildren = taffy_tree.children(parent_id).expect("Failed to get taffy children").to_vec();
+                let mut tchildren = taffy_tree.children(parent_id).to_vec();
 
                 let i1 = tchildren
                     .iter()
@@ -62,8 +62,8 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
 
                 tchildren.swap(i1, i2);
 
-                taffy_tree.set_children(parent_id, &tchildren).expect("Failed set taffy children");
-                taffy_tree.mark_dirty(parent_id).expect("Failed to mark taffy node dirty.");
+                taffy_tree.set_children(parent_id, &tchildren);
+                taffy_tree.mark_dirty(parent_id);
                 request_layout();
             }
         });
@@ -94,28 +94,15 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
 
         child.borrow_mut().element_data_mut().parent = None;
 
-        // Remove the entire layout subtree.
-
-        fn remove_subtree(taffy: &mut TaffyTree<LayoutContext>, node: NodeId) -> TaffyResult<()> {
-            // Can we avoid this allocation?
-            let children = taffy.children(node)?;
-
-            for child in children {
-                remove_subtree(taffy, child)?;
-            }
-
-            taffy.remove(node).map(|_| ())
-        }
-
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let child_id = child.borrow().element_data().layout_item.taffy_node_id;
 
             if let Some(child_id) = child_id {
-                remove_subtree(taffy_tree, child_id).expect("Failed to remove taffy element.");
+                taffy_tree.remove_subtree(child_id);
             }
 
             let parent_id = self.element_data().layout_item.taffy_node_id;
-            taffy_tree.mark_dirty(parent_id.unwrap()).expect("Failed to mark taffy node dirty.");
+            taffy_tree.mark_dirty(parent_id.unwrap());
         });
 
         // TODO: Move to document
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 267fb516..740e0505 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -16,7 +16,7 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::ops::Deref;
 use std::rc::{Rc, Weak};
-use taffy::TaffyTree;
+use crate::layout::TaffyTree;
 
 /// Displays an image.
 pub struct Image {
@@ -38,7 +38,7 @@ impl Image {
         let resource_identifier_2= resource_identifier.clone();
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let context = LayoutContext::Image(ImageContext::new(resource_identifier_2));
-            let node_id = taffy_tree.new_leaf_with_context(me.borrow().style().to_taffy_style(), context).expect("TODO: panic message");
+            let node_id = taffy_tree.new_leaf_with_context(me.borrow().style().to_taffy_style(), context);
             me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
         });
 
@@ -62,7 +62,7 @@ impl Image {
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let context = LayoutContext::Image(ImageContext::new(resource_identifier));
             let node = self.element_data.layout_item.taffy_node_id.expect("Failed to get Image node");
-            taffy_tree.set_node_context(node, Some(context)).expect("Failed to set Image node context");
+            taffy_tree.set_node_context(node, Some(context));
         });
 
         self
@@ -99,7 +99,7 @@ impl ElementInternals for Image {
 
     fn apply_layout(
         &mut self,
-        taffy_tree: &mut TaffyTree<LayoutContext>,
+        taffy_tree: &mut TaffyTree,
         position: Point,
         z_index: &mut u32,
         transform: Affine,
@@ -108,7 +108,7 @@ impl ElementInternals for Image {
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
     ) {
-        let layout = taffy_tree.layout(self.element_data.layout_item.taffy_node_id.unwrap()).unwrap();
+        let layout = taffy_tree.layout(self.element_data.layout_item.taffy_node_id.unwrap());
         self.resolve_box(position, transform, layout, z_index);
 
         self.apply_borders(scale_factor);
diff --git a/crates/craft_retained/src/elements/slider/slider.rs b/crates/craft_retained/src/elements/slider/slider.rs
index 9f63c0e9..0d3ad68a 100644
--- a/crates/craft_retained/src/elements/slider/slider.rs
+++ b/crates/craft_retained/src/elements/slider/slider.rs
@@ -4,7 +4,6 @@ use crate::elements::core::ElementInternals;
 use crate::elements::element_data::ElementData;
 use crate::elements::Element;
 use crate::events::{CraftMessage, Event};
-use crate::layout::layout_context::LayoutContext;
 use crate::palette;
 use crate::style::Unit;
 use crate::text::text_context::TextContext;
@@ -16,9 +15,9 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::ops::Deref;
 use std::rc::{Rc, Weak};
-use taffy::{PrintTree, TaffyTree};
 use ui_events::keyboard::{Code, KeyState};
 use ui_events::pointer::PointerId;
+use crate::layout::TaffyTree;
 
 #[derive(Clone, Copy, Default, Debug, PartialEq, Eq)]
 pub enum SliderDirection {
@@ -84,7 +83,7 @@ impl Slider {
 
 
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let node_id = taffy_tree.new_leaf(me.borrow().style().to_taffy_style()).expect("TODO: panic message");
+            let node_id = taffy_tree.new_leaf(me.borrow().style().to_taffy_style());
             me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
         });
 
@@ -242,7 +241,7 @@ impl ElementInternals for Slider {
 
     fn apply_layout(
         &mut self,
-        taffy_tree: &mut TaffyTree<LayoutContext>,
+        taffy_tree: &mut TaffyTree,
         position: Point,
         z_index: &mut u32,
         transform: Affine,
@@ -252,7 +251,7 @@ impl ElementInternals for Slider {
         scale_factor: f64,
     ) {
         let node = self.element_data.layout_item.taffy_node_id.unwrap();
-        let layout = taffy_tree.layout(node).unwrap();
+        let layout = taffy_tree.layout(node);
         let has_new_layout = taffy_tree.get_has_new_layout(node);
 
         let dirty = has_new_layout || transform != self.element_data.layout_item.get_transform() || position != self.element_data.layout_item.position ;
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index dc43bf6d..dc1f2ea9 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -24,7 +24,7 @@ use kurbo::Affine;
 use rustc_hash::FxHashMap;
 #[cfg(not(target_arch = "wasm32"))]
 use std::time;
-use taffy::{AvailableSpace, PrintTree, Size, TaffyTree};
+use taffy::{AvailableSpace, Size};
 use time::{Duration, Instant};
 use winit::dpi;
 #[cfg(target_arch = "wasm32")]
@@ -38,6 +38,7 @@ use craft_primitives::ColorBrush;
 use craft_renderer::text_renderer_data::TextData;
 use smol_str::{SmolStr, ToSmolStr};
 use ui_events::pointer::{PointerButton, PointerId};
+use crate::layout::TaffyTree;
 
 // A stateful element that shows text.
 #[derive(Clone, Default)]
@@ -116,7 +117,7 @@ impl Text {
             let context = LayoutContext::Text(TaffyTextContext{
                 element: me.borrow().me.clone().unwrap()
             });
-            let node_id = taffy_tree.new_leaf_with_context(me.borrow().style().to_taffy_style(), context).expect("TODO: panic message");
+            let node_id = taffy_tree.new_leaf_with_context(me.borrow().style().to_taffy_style(), context);
             me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
         });
 
@@ -268,7 +269,7 @@ impl ElementInternals for Text {
 
     fn apply_layout(
         &mut self,
-        taffy_tree: &mut TaffyTree<LayoutContext>,
+        taffy_tree: &mut TaffyTree,
         position: Point,
         z_index: &mut u32,
         transform: Affine,
@@ -278,7 +279,7 @@ impl ElementInternals for Text {
         scale_factor: f64,
     ) {
         let node = self.element_data.layout_item.taffy_node_id.unwrap();
-        let result = taffy_tree.layout(node).unwrap();
+        let result = taffy_tree.layout(node);
         let has_new_layout = taffy_tree.get_has_new_layout(node);
 
         let dirty = has_new_layout || transform != self.element_data.layout_item.get_transform() || position != self.element_data.layout_item.position;
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 37e682f0..43055ccf 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -12,7 +12,6 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::ops::{Deref};
 use std::rc::{Rc, Weak};
-use taffy::{PrintTree, TaffyTree};
 
 use crate::app::TAFFY_TREE;
 use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
@@ -30,6 +29,7 @@ use kurbo::Affine;
 use parley::{BoundingBox};
 use ui_events::pointer::PointerButton;
 use winit::event::Ime;
+use crate::layout::TaffyTree;
 
 // A stateful element that shows text.
 #[derive(Clone, Default)]
@@ -84,8 +84,7 @@ impl TextInput {
                 element: me.borrow().me.clone().unwrap(),
             });
             let node_id = taffy_tree
-                .new_leaf_with_context(me.borrow().element_data.current_style().to_taffy_style(), context)
-                .expect("TODO: panic message");
+                .new_leaf_with_context(me.borrow().element_data.current_style().to_taffy_style(), context);
             me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
             me.borrow_mut().state.taffy_node(Some(node_id));
         });
@@ -111,7 +110,7 @@ impl crate::elements::core::ElementData for TextInput {
 impl ElementInternals for TextInput {
     fn apply_layout(
         &mut self,
-        taffy_tree: &mut TaffyTree<LayoutContext>,
+        taffy_tree: &mut TaffyTree,
         position: Point,
         z_index: &mut u32,
         transform: Affine,
@@ -129,7 +128,7 @@ impl ElementInternals for TextInput {
         self.element_data.layout_item.has_new_layout = has_new_layout;
 
         if dirty {
-            let result = taffy_tree.layout(node).unwrap();
+            let result = taffy_tree.layout(node);
             self.resolve_box(position, transform, result, z_index);
             self.apply_clip(clip_bounds);
             self.apply_borders(scale_factor);
@@ -145,7 +144,7 @@ impl ElementInternals for TextInput {
 
         // For manual scroll updates.
         if !dirty && self.element_data.scroll_state.map(|scroll_state| scroll_state.is_new()).unwrap_or_default() {
-            let result = taffy_tree.layout(node).unwrap();
+            let result = taffy_tree.layout(node);
             self.element_data.apply_scroll(result);
             self.element_data.scroll_state.as_mut().unwrap().mark_old();
         }
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index a72c205e..e8373ba8 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -166,7 +166,7 @@ impl TextInputState {
 
         if let Some(id) = self.taffy_node {
             TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-                taffy_tree.mark_dirty(id).expect("Failed to mark node dirty");
+                taffy_tree.mark_dirty(id);
             })
         }
     }
diff --git a/crates/craft_retained/src/layout/mod.rs b/crates/craft_retained/src/layout/mod.rs
index 54df2125..64ee0a6c 100644
--- a/crates/craft_retained/src/layout/mod.rs
+++ b/crates/craft_retained/src/layout/mod.rs
@@ -1,2 +1,5 @@
 pub mod layout_context;
 pub mod layout_item;
+mod taffy_tree;
+
+pub(crate) use taffy_tree::TaffyTree;
\ No newline at end of file
diff --git a/crates/craft_retained/src/layout/taffy_tree.rs b/crates/craft_retained/src/layout/taffy_tree.rs
new file mode 100644
index 00000000..f89c5996
--- /dev/null
+++ b/crates/craft_retained/src/layout/taffy_tree.rs
@@ -0,0 +1,113 @@
+use crate::layout::layout_context::{measure_content, LayoutContext};
+use crate::text::text_context::TextContext;
+use craft_resource_manager::ResourceManager;
+use std::sync::Arc;
+use taffy::{Layout, NodeId, PrintTree, Size, Style};
+
+pub struct TaffyTree {
+    inner: taffy::TaffyTree<LayoutContext>,
+    /// True if at least one node is dirty.
+    dirty: bool,
+}
+
+impl TaffyTree {
+    pub(crate) fn new() -> Self {
+        Self {
+            inner: taffy::TaffyTree::<LayoutContext>::new(),
+            dirty: true,
+        }
+    }
+
+    pub fn new_leaf(&mut self, layout: Style) -> NodeId {
+        self.inner.new_leaf(layout).unwrap()
+    }
+
+    pub fn add_child(&mut self, parent: NodeId, child: NodeId) {
+        self.inner.add_child(parent, child).unwrap();
+    }
+
+    pub fn mark_dirty(&mut self, node: NodeId) {
+        self.inner.mark_dirty(node).unwrap();
+    }
+
+    pub fn children(&self, parent: NodeId) -> Vec<NodeId> {
+        self.inner.children(parent).unwrap()
+    }
+
+    pub fn set_children(&mut self, parent: NodeId, children: &[NodeId]) {
+        self.inner.set_children(parent, children).unwrap();
+    }
+
+    pub fn compute_layout(
+        &mut self,
+        node_id: NodeId,
+        available_space: Size<taffy::AvailableSpace>,
+        text_context: &mut TextContext,
+        resource_manager: Arc<ResourceManager>,
+    ) {
+        self.inner
+            .compute_layout_with_measure(
+                node_id,
+                available_space,
+                |known_dimensions, available_space, _node_id, node_context, style| {
+                    measure_content(
+                        known_dimensions,
+                        available_space,
+                        node_context,
+                        text_context,
+                        resource_manager.clone(),
+                        style,
+                    )
+                },
+            )
+            .unwrap();
+    }
+
+    // Remove the entire layout subtree.
+
+    pub fn remove_subtree(&mut self, node: NodeId) {
+        // Can we avoid this allocation?
+        let children = self.inner.children(node).unwrap();
+
+        for child in children {
+            self.remove_subtree(child);
+        }
+
+        self.inner.remove(node).map(|_| ()).unwrap();
+    }
+
+    #[inline]
+    pub fn set_style(&mut self, node: NodeId, style: Style) {
+        self.inner.set_style(node, style).unwrap();
+    }
+
+    /// Creates and adds a new unattached leaf node to the tree, and returns the [`NodeId`] of the new node
+    ///
+    /// Creates and adds a new leaf node with a supplied context
+    pub fn new_leaf_with_context(&mut self, style: Style, context: LayoutContext) -> NodeId {
+        self.inner.new_leaf_with_context(style, context).unwrap()
+    }
+
+    /// Sets the context data associated with the node
+    #[inline]
+    pub fn set_node_context(&mut self, node: NodeId, measure: Option<LayoutContext>) {
+        self.inner.set_node_context(node, measure).unwrap();
+    }
+
+    /// Return this node layout relative to its parent
+    #[inline]
+    pub fn layout(&self, node: NodeId) -> &Layout {
+        self.inner.layout(node).unwrap()
+    }
+
+    #[inline(always)]
+    pub fn get_has_new_layout(&self, node_id: NodeId) -> bool {
+        self.inner.get_has_new_layout(node_id)
+    }
+
+    /// Marks the layout of this node as seen
+    #[inline]
+    pub fn mark_seen(&mut self, node: NodeId) {
+        self.inner.mark_seen(node);
+    }
+}

From 933108932bcd978fcc0b3b59ec60386140223960 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Tue, 30 Dec 2025 10:10:56 -0500
Subject: [PATCH 019/143] Reduce tolerance

---
 crates/craft_primitives/src/geometry/borders.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/craft_primitives/src/geometry/borders.rs b/crates/craft_primitives/src/geometry/borders.rs
index 9ee4feb9..e7aedb0d 100644
--- a/crates/craft_primitives/src/geometry/borders.rs
+++ b/crates/craft_primitives/src/geometry/borders.rs
@@ -216,7 +216,7 @@ impl CssRoundedRect {
         let mut current_arc = FIRST_ARC;
 
         if let Some(arc) = &self.corners_arcs[corner][current_arc] {
-            path.extend(&arc.to_path(0.01));
+            path.extend(&arc.to_path(0.1));
         } else {
             path.move_to(rect_corner);
         }
@@ -224,7 +224,7 @@ impl CssRoundedRect {
         current_arc = NEXT_ARC[current_arc];
 
         if let Some(arc) = &self.corners_arcs[next_corner][current_arc] {
-            extend_path_with_arc(&mut path, &arc.to_path(0.01));
+            extend_path_with_arc(&mut path, &arc.to_path(0.1));
         } else {
             path.line_to(next_rect_corner);
         }
@@ -232,7 +232,7 @@ impl CssRoundedRect {
         current_arc = NEXT_ARC[current_arc];
 
         if let Some(arc) = &self.corners_arcs[next_corner][current_arc] {
-            extend_path_with_arc(&mut path, &arc.to_path(0.01));
+            extend_path_with_arc(&mut path, &arc.to_path(0.1));
         } else {
             let offset = CORNER_RADIUS_SIGN[next_corner];
             let horizontal_side = CORNER_HORIZONTAL_SIDE[next_corner];
@@ -249,7 +249,7 @@ impl CssRoundedRect {
         current_arc = NEXT_ARC[current_arc];
 
         if let Some(arc) = &self.corners_arcs[corner][current_arc] {
-            extend_path_with_arc(&mut path, &arc.to_path(0.01));
+            extend_path_with_arc(&mut path, &arc.to_path(0.1));
         } else {
             let offset = CORNER_RADIUS_SIGN[corner];
             let horizontal_side = CORNER_HORIZONTAL_SIDE[corner];

From 5779880c3e82aa72d4731e0292b9210700b1290e Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Tue, 30 Dec 2025 14:38:30 -0500
Subject: [PATCH 020/143] Add dirty flag for apply layout.

---
 crates/craft_retained/src/app.rs              | 44 ++++++++-----------
 .../craft_retained/src/elements/scrollable.rs |  8 ++--
 .../craft_retained/src/layout/taffy_tree.rs   | 43 ++++++++++++++++--
 3 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index e97cbf54..43cc955f 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -61,7 +61,6 @@ thread_local! {
     pub(crate) static PENDING_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = RefCell::new(VecDeque::new());
     pub(crate) static IN_PROGRESS_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = RefCell::new(VecDeque::new());
     pub(crate) static FOCUS: RefCell<Option<Weak<RefCell<dyn Element>>>> = RefCell::new(None);
-    pub(crate) static LAYOUT_DIRTY: RefCell<bool> = RefCell::new(true);
     /// An event queue that users or elements can manipulate. Cleared at the start and end of every event dispatch.
     static EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(Event, CraftMessage)>> = RefCell::new(VecDeque::with_capacity(10));
 }
@@ -636,8 +635,6 @@ fn layout(
     scale_factor: f64,
     pointer: Option<Point>,
 ) -> NodeId {
-    let dirty = LAYOUT_DIRTY.with_borrow(|status| *status);
-
     let root_node = root_element
         .borrow()
         .element_data()
@@ -645,52 +642,49 @@ fn layout(
         .taffy_node_id
         .expect("A root element must have a layout node.");
 
-    if !dirty {
-        return root_node;
-    }
-
     let available_space: taffy::Size<AvailableSpace> = taffy::Size {
         width: AvailableSpace::Definite(window_size.width),
         height: AvailableSpace::Definite(window_size.height),
     };
 
-    {
+    if taffy_tree.is_layout_dirty() {
         /*let span = span!(Level::INFO, "layout(taffy)");
         let _enter = span.enter();*/
-        //println!("before layout");
-        //taffy_tree.print_tree(root_node);
-        taffy_tree.compute_layout(root_node, available_space, text_context, resource_manager.clone())
+        taffy_tree.compute_layout(root_node, available_space, text_context, resource_manager.clone());
     }
-    //println!("after layout");
-    //taffy_tree.print_tree(root_node);
 
-    let transform = Affine::IDENTITY;
-
-    let mut layout_order: u32 = 0;
-    {
+    if taffy_tree.is_apply_layout_dirty() {
         /*let span = span!(Level::INFO, "layout(apply)");
-        let _enter = span.enter();*/
+                let _enter = span.enter();*/
+
+        // TODO: move into taffy_tree
+        let mut layout_order: u32 = 0;
         root_element.borrow_mut().apply_layout(
             taffy_tree,
             origin,
             &mut layout_order,
-            transform,
+            Affine::IDENTITY,
             pointer,
             text_context,
             None,
             scale_factor,
         );
+        taffy_tree.apply_layout();
     }
 
-    LAYOUT_DIRTY.with_borrow_mut(|status| {
-        *status = false;
-    });
-
     root_node
 }
 
+#[inline]
 pub fn request_layout() {
-    LAYOUT_DIRTY.with_borrow_mut(|status| {
-        *status = true;
+    TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+        taffy_tree.request_layout();
+    });
+}
+
+#[inline]
+pub fn request_apply_layout() {
+    TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+        taffy_tree.request_apply_layout();
     });
 }
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index ad468c27..d90ebb60 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -3,7 +3,7 @@ use crate::events::{CraftMessage, Event};
 use kurbo::Point;
 use ui_events::pointer::{PointerId, PointerType};
 use ui_events::ScrollDelta;
-use crate::request_layout;
+use crate::app::request_apply_layout;
 
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage, event: &mut Event) {
@@ -27,7 +27,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
 
                 let current_scroll_y = state.scroll_y();
                 state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-                request_layout();
+                request_apply_layout();
 
                 event.prevent_propagate();
                 event.prevent_defaults();
@@ -78,7 +78,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
                         let scroll_y = percent * element_data.layout_item.max_scroll_y;
 
                         state.set_scroll_y(scroll_y.clamp(0.0, element_data.layout_item.max_scroll_y));
-                        request_layout();
+                        request_apply_layout();
 
                         event.prevent_propagate();
                         event.prevent_defaults();
@@ -115,7 +115,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
 
                     let current_scroll_y = state.scroll_y();
                     state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-                    request_layout();
+                    request_apply_layout();
                     state.scroll_click = Some(Point::new(click.x, pointer_motion.current.position.y));
                     event.prevent_propagate();
                     event.prevent_defaults();
diff --git a/crates/craft_retained/src/layout/taffy_tree.rs b/crates/craft_retained/src/layout/taffy_tree.rs
index f89c5996..9bb29b8e 100644
--- a/crates/craft_retained/src/layout/taffy_tree.rs
+++ b/crates/craft_retained/src/layout/taffy_tree.rs
@@ -7,14 +7,17 @@ use taffy::{Layout, NodeId, PrintTree, Size, Style};
 pub struct TaffyTree {
     inner: taffy::TaffyTree<LayoutContext>,
     /// True if at least one node is dirty.
-    dirty: bool,
+    is_layout_dirty: bool,
+    /// True if the layout should be re-applied.
+    is_apply_layout_dirty: bool,
 }
 
 impl TaffyTree {
     pub(crate) fn new() -> Self {
         Self {
             inner: taffy::TaffyTree::<LayoutContext>::new(),
-            dirty: true,
+            is_layout_dirty: true,
+            is_apply_layout_dirty: true,
         }
     }
 
@@ -24,10 +27,12 @@ impl TaffyTree {
 
     pub fn add_child(&mut self, parent: NodeId, child: NodeId) {
         self.inner.add_child(parent, child).unwrap();
+        self.request_layout();
     }
 
     pub fn mark_dirty(&mut self, node: NodeId) {
         self.inner.mark_dirty(node).unwrap();
+        self.request_layout();
     }
 
     pub fn children(&self, parent: NodeId) -> Vec<NodeId> {
@@ -36,6 +41,7 @@ impl TaffyTree {
 
     pub fn set_children(&mut self, parent: NodeId, children: &[NodeId]) {
         self.inner.set_children(parent, children).unwrap();
+        self.request_layout();
     }
 
     pub fn compute_layout(
@@ -61,10 +67,10 @@ impl TaffyTree {
                 },
             )
             .unwrap();
+        self.is_layout_dirty = false;
     }
 
-    // Remove the entire layout subtree.
-
+    /// Remove the entire layout subtree.
     pub fn remove_subtree(&mut self, node: NodeId) {
         // Can we avoid this allocation?
         let children = self.inner.children(node).unwrap();
@@ -74,11 +80,13 @@ impl TaffyTree {
         }
 
         self.inner.remove(node).map(|_| ()).unwrap();
+        self.request_layout();
     }
 
     #[inline]
     pub fn set_style(&mut self, node: NodeId, style: Style) {
         self.inner.set_style(node, style).unwrap();
+        self.request_layout();
     }
 
     /// Creates and adds a new unattached leaf node to the tree, and returns the [`NodeId`] of the new node
@@ -92,6 +100,7 @@ impl TaffyTree {
     #[inline]
     pub fn set_node_context(&mut self, node: NodeId, measure: Option<LayoutContext>) {
         self.inner.set_node_context(node, measure).unwrap();
+        self.request_layout();
     }
 
     /// Return this node layout relative to its parent
@@ -110,4 +119,30 @@ impl TaffyTree {
     pub fn mark_seen(&mut self, node: NodeId) {
         self.inner.mark_seen(node);
     }
+
+    #[inline(always)]
+    pub fn request_layout(&mut self) {
+        self.is_layout_dirty = true;
+        self.is_apply_layout_dirty = true;
+    }
+
+    #[inline(always)]
+    pub fn request_apply_layout(&mut self) {
+        self.is_layout_dirty = true;
+        self.is_apply_layout_dirty = true;
+    }
+
+    #[inline(always)]
+    pub fn is_layout_dirty(&self) -> bool {
+        self.is_layout_dirty
+    }
+
+    #[inline(always)]
+    pub fn is_apply_layout_dirty(&self) -> bool {
+        self.is_apply_layout_dirty
+    }
+
+    pub fn apply_layout(&mut self) {
+        self.is_apply_layout_dirty = false;
+    }
 }

From cf16ce3877e8c721cfe31d6273ba8accaab23e08 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Tue, 30 Dec 2025 21:34:11 -0500
Subject: [PATCH 021/143] create element setup helpers

---
 .../craft_retained/src/elements/container.rs  |  17 +--
 .../src/elements/element_data.rs              |  25 ++++
 .../src/elements/element_id_map.rs            |   4 +
 crates/craft_retained/src/elements/text.rs    | 132 +++++++++---------
 .../craft_retained/src/layout/taffy_tree.rs   |   2 +-
 5 files changed, 100 insertions(+), 80 deletions(-)

diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 14357476..79b3d6d9 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -1,6 +1,6 @@
 //! Stores one or more elements.
 
-use crate::app::{ELEMENTS, TAFFY_TREE};
+use crate::app::{TAFFY_TREE};
 use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
 use crate::elements::element_data::ElementData;
 use crate::elements::{scrollable, Element};
@@ -11,7 +11,6 @@ use craft_renderer::RenderList;
 use kurbo::{Affine, Point};
 use std::any::Any;
 use std::cell::RefCell;
-use std::ops::Deref;
 use std::rc::{Rc, Weak};
 use crate::layout::TaffyTree;
 
@@ -28,18 +27,8 @@ impl Container {
             element_data: ElementData::new(true),
         }));
 
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let node_id = taffy_tree.new_leaf(me.borrow().style().to_taffy_style());
-            me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
-        });
-
-        let me_element: Rc<RefCell<dyn Element>> = me.clone();
-
-        me.borrow_mut().element_data.me = Some(Rc::downgrade(&me_element));
-
-        ELEMENTS.with_borrow_mut(|elements| {
-            elements.insert(me.borrow().deref());
-        });
+        me.borrow_mut().element_data.crate_layout_node(None);
+        me.borrow_mut().element_data.set_element(me.clone());
 
         me
     }
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index 2f7852d0..0c887363 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -12,6 +12,8 @@ use smol_str::SmolStr;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 use taffy::{Layout, Overflow};
+use crate::app::{ELEMENTS, TAFFY_TREE};
+use crate::layout::layout_context::LayoutContext;
 
 /// Stores common data to most elements.
 #[derive(Clone)]
@@ -60,9 +62,11 @@ pub struct ElementData {
 }
 
 impl ElementData {
+
     pub fn new(scrollable: bool) -> Self {
         let mut default = Self::default();
 
+        // Create scroll state if needed.
         if scrollable {
             default.scroll_state = Some(ScrollState::default());
         }
@@ -70,6 +74,27 @@ impl ElementData {
         default
     }
 
+    /// Creates a new taffy node for this element with optional layout context.
+    pub fn crate_layout_node(&mut self, layout_context: Option<LayoutContext>) {
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let style = self.style.to_taffy_style();
+            let node_id = if let Some(layout_context) = layout_context {
+                taffy_tree.new_leaf_with_context(style, layout_context)
+            } else {
+                taffy_tree.new_leaf(style)
+            };
+            self.layout_item.taffy_node_id = Some(node_id);
+        });
+    }
+
+    /// Sets element Weak
+    pub fn set_element(&mut self, element: Rc<RefCell<dyn Element>>) {
+        self.me = Some(Rc::downgrade(&element));
+        ELEMENTS.with_borrow_mut(|elements| {
+            elements.insert_id(self.internal_id, self.me.clone().unwrap());
+        });
+    }
+
     /// Computes the scrollbar's tack and thumb layout.
     pub(crate) fn apply_scroll(&mut self, layout: &Layout) {
         self.layout_item.scrollbar_size = Size::new(layout.scrollbar_size.width, layout.scrollbar_size.height);
diff --git a/crates/craft_retained/src/elements/element_id_map.rs b/crates/craft_retained/src/elements/element_id_map.rs
index 0aa1b251..66fbe8db 100644
--- a/crates/craft_retained/src/elements/element_id_map.rs
+++ b/crates/craft_retained/src/elements/element_id_map.rs
@@ -21,6 +21,10 @@ impl ElementIdMap {
         self.map.insert(element_data.internal_id, element_data.me.clone().unwrap())
     }
 
+    pub fn insert_id(&mut self, id: u64, element: Weak<RefCell<dyn Element>>) -> Option<Weak<RefCell<dyn Element>>> {
+        self.map.insert(id, element)
+    }
+
     pub fn remove(&mut self, element: &dyn Element) -> Option<Weak<RefCell<dyn Element>>> {
         self.map.remove(&element.element_data().internal_id)
     }
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index dc1f2ea9..62905421 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -13,32 +13,30 @@ use parley::LayoutAccessibility;
 use parley::{Alignment, AlignmentOptions, ContentWidths, Selection};
 use std::any::Any;
 use std::cell::RefCell;
-use std::ops::Deref;
 use std::rc::{Rc, Weak};
 
 const MAX_CACHE_SIZE: usize = 16;
 
+use crate::elements::core::ElementInternals;
+#[cfg(feature = "accesskit")]
+use crate::elements::element_id::create_unique_element_id;
+use crate::elements::Element;
+use crate::layout::TaffyTree;
 #[cfg(feature = "accesskit")]
 use accesskit::{Action, Role};
+use craft_primitives::ColorBrush;
+use craft_renderer::text_renderer_data::TextData;
 use kurbo::Affine;
 use rustc_hash::FxHashMap;
+use smol_str::{SmolStr, ToSmolStr};
 #[cfg(not(target_arch = "wasm32"))]
 use std::time;
 use taffy::{AvailableSpace, Size};
 use time::{Duration, Instant};
-use winit::dpi;
+use ui_events::pointer::{PointerButton, PointerId};
 #[cfg(target_arch = "wasm32")]
 use web_time as time;
-use crate::app::{ELEMENTS, TAFFY_TREE};
-use crate::elements::core::ElementInternals;
-#[cfg(feature = "accesskit")]
-use crate::elements::element_id::create_unique_element_id;
-use crate::elements::Element;
-use craft_primitives::ColorBrush;
-use craft_renderer::text_renderer_data::TextData;
-use smol_str::{SmolStr, ToSmolStr};
-use ui_events::pointer::{PointerButton, PointerId};
-use crate::layout::TaffyTree;
+use winit::dpi;
 
 // A stateful element that shows text.
 #[derive(Clone, Default)]
@@ -49,7 +47,7 @@ pub struct Text {
     me: Option<Weak<RefCell<Self>>>,
 }
 
-#[derive(Clone, Default)]
+#[derive(Clone)]
 pub struct TextState {
     text: SmolStr,
     scale_factor: f32,
@@ -79,52 +77,22 @@ pub struct TextState {
 
 impl Text {
     pub fn new(text: &str) -> Rc<RefCell<Self>> {
-        let text_state = TextState {
-            text: SmolStr::new(""),
-            scale_factor: 1.0,
-            selection: Selection::default(),
-            text_render: None,
-            layout: None,
-            cache: Default::default(),
-            current_layout_key: None,
-            last_requested_measure_key: None,
-            current_render_key: None,
-            content_widths: None,
-            last_click_time: None,
-            click_count: 0,
-            pointer_down: false,
-            cursor_pos: Point::new(0.0, 0.0),
-            start_time: None,
-            blink_period: Default::default(),
-            is_layout_dirty: false,
-            is_render_dirty: false,
-        };
         let me = Rc::new(RefCell::new(Text {
             element_data: Default::default(),
             selectable: true,
-            state: text_state,
+            state: TextState::default(),
             me: None,
         }));
-        let me2 = me.clone();
-        me.borrow_mut().me = Some(Rc::downgrade(&me2));
 
-        let me_element: Rc<RefCell<dyn Element>> = me.clone();
-        me.borrow_mut().element_data.me = Some(Rc::downgrade(&me_element));
+        me.borrow_mut().me = Some(Rc::downgrade(&me.clone()));
+        let text_context = Some(LayoutContext::Text(TaffyTextContext {
+            element: me.borrow().me.clone().unwrap(),
+        }));
+        me.borrow_mut().element_data.crate_layout_node(text_context);
+        me.borrow_mut().element_data.set_element(me.clone());
 
         me.borrow_mut().text(text);
 
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let context = LayoutContext::Text(TaffyTextContext{
-                element: me.borrow().me.clone().unwrap()
-            });
-            let node_id = taffy_tree.new_leaf_with_context(me.borrow().style().to_taffy_style(), context);
-            me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
-        });
-
-        ELEMENTS.with_borrow_mut(|elements| {
-            elements.insert(me.borrow().deref());
-        });
-
         me
     }
 
@@ -223,7 +191,8 @@ impl ElementInternals for Text {
         parent_index: Option<usize>,
         scale_factor: f64,
     ) {
-        let padding_box = self.element_data.layout_item.computed_box_transformed.padding_rectangle().scale(scale_factor);
+        let padding_box =
+            self.element_data.layout_item.computed_box_transformed.padding_rectangle().scale(scale_factor);
 
         let state: &mut TextState = &mut self.state;
         if state.layout.is_none() {
@@ -282,7 +251,9 @@ impl ElementInternals for Text {
         let result = taffy_tree.layout(node);
         let has_new_layout = taffy_tree.get_has_new_layout(node);
 
-        let dirty = has_new_layout || transform != self.element_data.layout_item.get_transform() || position != self.element_data.layout_item.position;
+        let dirty = has_new_layout
+            || transform != self.element_data.layout_item.get_transform()
+            || position != self.element_data.layout_item.position;
         self.element_data.layout_item.has_new_layout = has_new_layout;
         if dirty {
             self.resolve_box(position, transform, result, z_index);
@@ -303,7 +274,7 @@ impl ElementInternals for Text {
             );
         }
 
-        state.try_update_text_render(text_context);
+        state.try_update_text_render(text_context, self.element_data.style.selection_color());
     }
 
     fn on_event(
@@ -317,7 +288,6 @@ impl ElementInternals for Text {
             return;
         }
 
-
         let _content_rect = self.computed_box().content_rectangle();
 
         // Handle selection.
@@ -367,7 +337,8 @@ impl ElementInternals for Text {
                 CraftMessage::PointerMovedEvent(pointer_moved) => {
                     let prev_pos = state.cursor_pos;
                     // NOTE: Cursor position should be relative to the top left of the text box.
-                    state.cursor_pos = pointer_moved.current.logical_point() - kurbo::Vec2::new(text_position.x as f64, text_position.y as f64);
+                    state.cursor_pos = pointer_moved.current.logical_point()
+                        - kurbo::Vec2::new(text_position.x as f64, text_position.y as f64);
                     // macOS seems to generate a spurious move after selecting word?
                     if state.pointer_down && prev_pos != state.cursor_pos {
                         state.update_text_selection(self.element_data.style.selection_color());
@@ -431,7 +402,7 @@ impl TextState {
             AvailableSpace::Definite(width) => {
                 let scaled_width: f32 = dpi::PhysicalUnit::from_logical::<f32, f32>(width, self.scale_factor as f64).0;
                 Some(scaled_width.clamp(content_widths.min, content_widths.max))
-            },
+            }
         });
 
         let height_constraint = known_dimensions.height.or(match available_space.height {
@@ -440,7 +411,7 @@ impl TextState {
             AvailableSpace::Definite(height) => {
                 let scaled_height = dpi::PhysicalUnit::from_logical::<f32, f32>(height, self.scale_factor as f64).0;
                 Some(scaled_height)
-            },
+            }
         });
 
         let layout = self.layout.as_mut().unwrap();
@@ -469,7 +440,7 @@ impl TextState {
         size
     }
 
-    pub fn try_update_text_render(&mut self, _text_context: &mut TextContext) {
+    pub fn try_update_text_render(&mut self, _text_context: &mut TextContext, selection_color: Color) {
         if self.current_render_key == self.current_layout_key {
             return;
         }
@@ -477,6 +448,8 @@ impl TextState {
         let layout = self.layout.as_ref().unwrap();
         self.text_render = Some(text_render_data::from_editor(layout));
         self.current_render_key = self.current_layout_key;
+
+        self.update_text_selection(selection_color);
     }
 
     pub fn cursor_reset(&mut self) {
@@ -520,14 +493,18 @@ impl TextState {
     }
 
     fn update_text_selection(&mut self, selection_color: Color) {
-        let layout = self.layout.as_ref().unwrap();
-        let text_renderer = self.text_render.as_mut().unwrap();
-        for line in text_renderer.lines.iter_mut() {
-            line.selections.clear();
+        if let Some(layout) = self.layout.as_ref() {
+            let text_renderer = self.text_render.as_mut().unwrap();
+            for line in text_renderer.lines.iter_mut() {
+                line.selections.clear();
+            }
+            self.selection.geometry_with(layout, |rect, line| {
+                text_renderer.lines[line].selections.push((
+                    Rectangle::new(rect.x0 as f32, rect.y0 as f32, rect.width() as f32, rect.height() as f32),
+                    selection_color,
+                ));
+            });
         }
-        self.selection.geometry_with(layout, |rect, line| {
-            text_renderer.lines[line].selections.push((Rectangle::new(rect.x0 as f32, rect.y0 as f32, rect.width() as f32, rect.height() as f32), selection_color));
-        });
     }
 }
 
@@ -535,4 +512,29 @@ impl TextData for Text {
     fn get_text_renderer(&self) -> Option<&TextRender> {
         self.state.text_render.as_ref()
     }
+}
+
+impl Default for TextState {
+    fn default() -> Self {
+        Self {
+            text: SmolStr::new(""),
+            scale_factor: 1.0,
+            selection: Selection::default(),
+            text_render: None,
+            layout: None,
+            cache: Default::default(),
+            current_layout_key: None,
+            last_requested_measure_key: None,
+            current_render_key: None,
+            content_widths: None,
+            last_click_time: None,
+            click_count: 0,
+            pointer_down: false,
+            cursor_pos: Point::new(0.0, 0.0),
+            start_time: None,
+            blink_period: Default::default(),
+            is_layout_dirty: false,
+            is_render_dirty: false,
+        }
+    }
 }
\ No newline at end of file
diff --git a/crates/craft_retained/src/layout/taffy_tree.rs b/crates/craft_retained/src/layout/taffy_tree.rs
index 9bb29b8e..49122dbb 100644
--- a/crates/craft_retained/src/layout/taffy_tree.rs
+++ b/crates/craft_retained/src/layout/taffy_tree.rs
@@ -145,4 +145,4 @@ impl TaffyTree {
     pub fn apply_layout(&mut self) {
         self.is_apply_layout_dirty = false;
     }
-}
+}
\ No newline at end of file

From 9dfea4acf0d82e9ee6fd11202cc0763ca0b799ba Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Tue, 30 Dec 2025 23:26:53 -0500
Subject: [PATCH 022/143] Fix swap

---
 .../craft_retained/src/elements/container.rs  | 22 ++++++++++++-------
 crates/craft_retained/src/elements/element.rs |  4 ++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 79b3d6d9..f513c17a 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -1,10 +1,11 @@
 //! Stores one or more elements.
 
-use crate::app::{TAFFY_TREE};
+use crate::app::TAFFY_TREE;
 use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
 use crate::elements::element_data::ElementData;
 use crate::elements::{scrollable, Element};
 use crate::events::{CraftMessage, Event};
+use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
 use craft_primitives::geometry::Rectangle;
 use craft_renderer::RenderList;
@@ -12,7 +13,6 @@ use kurbo::{Affine, Point};
 use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
-use crate::layout::TaffyTree;
 
 /// Stores one or more elements.
 ///
@@ -59,8 +59,6 @@ impl Element for Container {
             let child_id = child.borrow().element_data().layout_item.taffy_node_id;
             if let Some(child_id) = child_id {
                 taffy_tree.add_child(parent_id, child_id);
-
-                taffy_tree.mark_dirty(parent_id);
             }
         });
 
@@ -93,7 +91,6 @@ impl Element for Container {
                     taffy_tree.add_child(parent_id, child_id);
                 }
             }
-            taffy_tree.mark_dirty(parent_id);
         });
 
         self
@@ -109,7 +106,6 @@ impl Element for Container {
 }
 
 impl ElementInternals for Container {
-
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
@@ -125,7 +121,9 @@ impl ElementInternals for Container {
         let layout = taffy_tree.layout(node);
         let has_new_layout = taffy_tree.get_has_new_layout(node);
 
-        let dirty = has_new_layout || transform != self.element_data.layout_item.get_transform() || position != self.element_data.layout_item.position ;
+        let dirty = has_new_layout
+            || transform != self.element_data.layout_item.get_transform()
+            || position != self.element_data.layout_item.position;
         self.element_data.layout_item.has_new_layout = has_new_layout;
 
         if dirty {
@@ -150,7 +148,15 @@ impl ElementInternals for Container {
         let scroll_y = self.element_data.scroll().map_or(0.0, |s| s.scroll_y() as f64);
         let child_transform = Affine::translate((0.0, -scroll_y));
 
-        self.apply_layout_children(taffy_tree, z_index, transform * child_transform, pointer, text_context, scale_factor, false)
+        self.apply_layout_children(
+            taffy_tree,
+            z_index,
+            transform * child_transform,
+            pointer,
+            text_context,
+            scale_factor,
+            false,
+        )
     }
 
     fn draw(
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 3b6b0b46..67f8ca69 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -11,7 +11,7 @@ use crate::style::{
     AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit,
     Weight, Wrap,
 };
-use crate::{request_layout, CraftError};
+use crate::{CraftError};
 use craft_primitives::geometry::Point;
 use craft_primitives::geometry::{ElementBox, TrblRectangle};
 use craft_primitives::Color;
@@ -64,7 +64,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
 
                 taffy_tree.set_children(parent_id, &tchildren);
                 taffy_tree.mark_dirty(parent_id);
-                request_layout();
+                taffy_tree.request_layout();
             }
         });
 

From 8431c5219478e2771f7089c4bd003732c7f60ce3 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Wed, 31 Dec 2025 01:36:28 -0500
Subject: [PATCH 023/143] Fix Image

---
 crates/craft_retained/src/elements/image.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 740e0505..75927316 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -23,7 +23,6 @@ pub struct Image {
     is_image_dirty: bool,
     resource_identifier: ResourceIdentifier,
     element_data: ElementData,
-    me: Option<Weak<RefCell<Image>>>,
 }
 
 impl Image {
@@ -32,7 +31,6 @@ impl Image {
             is_image_dirty: false,
             resource_identifier: resource_identifier.clone(),
             element_data: ElementData::new(true),
-            me: None,
         }));
 
         let resource_identifier_2= resource_identifier.clone();
@@ -46,7 +44,7 @@ impl Image {
             pending_resources.push_back((resource_identifier, ResourceType::Image));
         });
 
-        me.borrow_mut().me = Some(Rc::downgrade(&me.clone()));
+        me.borrow_mut().element_data.set_element(me.clone());
 
         ELEMENTS.with_borrow_mut(|elements| {
             elements.insert(me.borrow().deref());

From 28402770ce9f19610155a298b0106ac08b845f8e Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Wed, 31 Dec 2025 07:55:45 -0500
Subject: [PATCH 024/143] Remove unused import

---
 crates/craft_retained/src/elements/image.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 75927316..c31d976d 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -15,7 +15,7 @@ use kurbo::{Affine, Point};
 use std::any::Any;
 use std::cell::RefCell;
 use std::ops::Deref;
-use std::rc::{Rc, Weak};
+use std::rc::{Rc};
 use crate::layout::TaffyTree;
 
 /// Displays an image.

From 999e909fad0d9d241c9af32f452eb28c0a01513b Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Wed, 31 Dec 2025 16:02:42 -0500
Subject: [PATCH 025/143] Make me mandatory in element data.

---
 .../craft_retained/src/elements/container.rs  | 13 ++--
 crates/craft_retained/src/elements/element.rs | 12 ++--
 .../src/elements/element_data.rs              | 72 ++++++++-----------
 .../src/elements/element_id_map.rs            |  2 +-
 crates/craft_retained/src/elements/image.rs   | 29 +++-----
 .../src/elements/slider/slider.rs             | 27 +++----
 crates/craft_retained/src/elements/text.rs    | 16 ++---
 .../src/elements/text_input/mod.rs            | 54 ++++++--------
 .../elements/text_input/text_input_state.rs   |  4 --
 9 files changed, 95 insertions(+), 134 deletions(-)

diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index f513c17a..3dc464ef 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -23,12 +23,13 @@ pub struct Container {
 
 impl Container {
     pub fn new() -> Rc<RefCell<Self>> {
-        let me = Rc::new(RefCell::new(Self {
-            element_data: ElementData::new(true),
-        }));
+        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
+            RefCell::new(Self {
+                element_data: ElementData::new(me.clone(), true),
+            })
+        });
 
         me.borrow_mut().element_data.crate_layout_node(None);
-        me.borrow_mut().element_data.set_element(me.clone());
 
         me
     }
@@ -49,7 +50,7 @@ impl Element for Container {
     where
         Self: Sized,
     {
-        let me: Weak<RefCell<dyn Element>> = self.element_data.me.clone().unwrap();
+        let me: Weak<RefCell<dyn Element>> = self.element_data.me.clone();
         child.borrow_mut().element_data_mut().parent = Some(me);
         self.element_data.children.push(child.clone());
 
@@ -74,7 +75,7 @@ impl Element for Container {
     where
         Self: Sized,
     {
-        let me: Weak<RefCell<dyn Element>> = self.element_data.me.clone().unwrap();
+        let me: Weak<RefCell<dyn Element>> = self.element_data.me.clone();
         let children: Vec<_> = children.into_iter().collect();
 
         for child in &children {
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 67f8ca69..b073cc4b 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -114,10 +114,10 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
             elements.remove_id(node.borrow().element_data().internal_id);
             document
                 .pointer_captures
-                .retain(|_, v| !Weak::ptr_eq(v, &node.borrow().element_data().me.as_ref().unwrap()));
+                .retain(|_, v| !Weak::ptr_eq(v, &node.borrow().element_data().me));
             document
                 .pending_pointer_captures
-                .retain(|_, v| !Weak::ptr_eq(v, &node.borrow().element_data().me.as_ref().unwrap()));
+                .retain(|_, v| !Weak::ptr_eq(v, &node.borrow().element_data().me));
             for child in node.borrow().children() {
                 remove_element_from_document(child.clone(), document, elements);
             }
@@ -275,7 +275,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
             // 5. If the pointer is not in the active buttons state or the element's node document is not the active document of the pointer, then terminate these steps.
             // TODO (POINTER CAPTURE)
             // 6. For the specified pointerId, set the pending pointer capture target override to the Element on which this method was invoked.
-            current_doc.pending_pointer_captures.insert(pointer_id, self.element_data().me.clone().unwrap());
+            current_doc.pending_pointer_captures.insert(pointer_id, self.element_data().me.clone());
         });
     }
 
@@ -302,7 +302,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         DOCUMENTS.with_borrow_mut(|docs| {
             let current_doc = docs.get_current_document();
             current_doc.pending_pointer_captures.get(&pointer_id).cloned().map(|w| w.as_ptr())
-                == self.element_data().me.clone().map(|w| w.as_ptr())
+                == Some(self.element_data().me.clone().as_ptr())
         })
     }
 
@@ -798,7 +798,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     {
         // Todo: check if the element is focusable. Should we return a result?
         FOCUS.with_borrow_mut(|focus| {
-            *focus = self.element_data().me.clone();
+            *focus = Some(self.element_data().me.clone());
         });
     }
 
@@ -812,7 +812,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
 
         let focus_element = focus_element.unwrap();
 
-        Weak::ptr_eq(&focus_element, self.element_data().me.as_ref().unwrap())
+        Weak::ptr_eq(&focus_element, &self.element_data().me)
     }
 
     /// Removes focus if the element has focus.
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index 0c887363..2ecedb47 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -50,7 +50,7 @@ pub struct ElementData {
     pub on_slider_value_changed: Vec<SliderValueChangedHandler>,
     pub on_pointer_enter: Vec<PointerEnterHandler>,
     pub on_pointer_leave: Vec<PointerLeaveHandler>,
-    pub(crate) me: Option<Weak<RefCell<dyn Element>>>,
+    pub(crate) me: Weak<RefCell<dyn Element>>,
     pub on_got_pointer_capture: Vec<PointerCaptureHandler>,
     pub on_lost_pointer_capture: Vec<PointerCaptureHandler>,
     pub on_pointer_button_down: Vec<PointerEventHandler>,
@@ -63,14 +63,42 @@ pub struct ElementData {
 
 impl ElementData {
 
-    pub fn new(scrollable: bool) -> Self {
-        let mut default = Self::default();
+    pub fn new(me: Weak<RefCell<dyn Element>>, scrollable: bool) -> Self {
+        let mut default = Self {
+            current_state: Default::default(),
+            style: Default::default(),
+            layout_item: Default::default(),
+            hover_style: None,
+            pressed_style: None,
+            disabled_style: None,
+            focused_style: None,
+            children: Default::default(),
+            id: None,
+            internal_id: create_unique_element_id(),
+            animations: None,
+            parent: None,
+            on_slider_value_changed: vec![],
+            on_pointer_enter: vec![],
+            on_pointer_leave: vec![],
+            me,
+            on_got_pointer_capture: vec![],
+            on_lost_pointer_capture: vec![],
+            on_pointer_button_down: vec![],
+            on_pointer_button_up: vec![],
+            on_pointer_moved: vec![],
+            on_keyboard_input: vec![],
+            scroll_state: None,
+        };
 
         // Create scroll state if needed.
         if scrollable {
             default.scroll_state = Some(ScrollState::default());
         }
 
+        ELEMENTS.with_borrow_mut(|elements| {
+            elements.insert_id(default.internal_id, default.me.clone());
+        });
+
         default
     }
 
@@ -87,14 +115,6 @@ impl ElementData {
         });
     }
 
-    /// Sets element Weak
-    pub fn set_element(&mut self, element: Rc<RefCell<dyn Element>>) {
-        self.me = Some(Rc::downgrade(&element));
-        ELEMENTS.with_borrow_mut(|elements| {
-            elements.insert_id(self.internal_id, self.me.clone().unwrap());
-        });
-    }
-
     /// Computes the scrollbar's tack and thumb layout.
     pub(crate) fn apply_scroll(&mut self, layout: &Layout) {
         self.layout_item.scrollbar_size = Size::new(layout.scrollbar_size.width, layout.scrollbar_size.height);
@@ -157,36 +177,6 @@ impl ElementData {
     }
 }
 
-impl Default for ElementData {
-    fn default() -> Self {
-        Self {
-            current_state: Default::default(),
-            style: Default::default(),
-            layout_item: Default::default(),
-            hover_style: None,
-            pressed_style: None,
-            disabled_style: None,
-            focused_style: None,
-            children: Default::default(),
-            id: None,
-            internal_id: create_unique_element_id(),
-            animations: None,
-            parent: None,
-            on_slider_value_changed: vec![],
-            on_pointer_enter: vec![],
-            on_pointer_leave: vec![],
-            me: None,
-            on_got_pointer_capture: vec![],
-            on_lost_pointer_capture: vec![],
-            on_pointer_button_down: vec![],
-            on_pointer_button_up: vec![],
-            on_pointer_moved: vec![],
-            on_keyboard_input: vec![],
-            scroll_state: None,
-        }
-    }
-}
-
 impl ElementData {
     pub fn is_scrollable(&self) -> bool {
         self.style.overflow()[1] == taffy::Overflow::Scroll
diff --git a/crates/craft_retained/src/elements/element_id_map.rs b/crates/craft_retained/src/elements/element_id_map.rs
index 66fbe8db..40c579f8 100644
--- a/crates/craft_retained/src/elements/element_id_map.rs
+++ b/crates/craft_retained/src/elements/element_id_map.rs
@@ -18,7 +18,7 @@ impl ElementIdMap {
 
     pub fn insert(&mut self, element: &dyn Element) -> Option<Weak<RefCell<dyn Element>>> {
         let element_data = element.element_data();
-        self.map.insert(element_data.internal_id, element_data.me.clone().unwrap())
+        self.map.insert(element_data.internal_id, element_data.me.clone())
     }
 
     pub fn insert_id(&mut self, id: u64, element: Weak<RefCell<dyn Element>>) -> Option<Weak<RefCell<dyn Element>>> {
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index c31d976d..33a60c2b 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -6,6 +6,7 @@ use crate::elements::core::ElementInternals;
 use crate::elements::element_data::ElementData;
 use crate::elements::Element;
 use crate::layout::layout_context::{ImageContext, LayoutContext};
+use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
 use craft_primitives::geometry::Rectangle;
 use craft_renderer::RenderList;
@@ -15,8 +16,7 @@ use kurbo::{Affine, Point};
 use std::any::Any;
 use std::cell::RefCell;
 use std::ops::Deref;
-use std::rc::{Rc};
-use crate::layout::TaffyTree;
+use std::rc::{Rc, Weak};
 
 /// Displays an image.
 pub struct Image {
@@ -27,25 +27,21 @@ pub struct Image {
 
 impl Image {
     pub fn new(resource_identifier: ResourceIdentifier) -> Rc<RefCell<Self>> {
-        let me = Rc::new(RefCell::new(Self {
-            is_image_dirty: false,
-            resource_identifier: resource_identifier.clone(),
-            element_data: ElementData::new(true),
-        }));
-
-        let resource_identifier_2= resource_identifier.clone();
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let context = LayoutContext::Image(ImageContext::new(resource_identifier_2));
-            let node_id = taffy_tree.new_leaf_with_context(me.borrow().style().to_taffy_style(), context);
-            me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
+        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
+            RefCell::new(Self {
+                is_image_dirty: false,
+                resource_identifier: resource_identifier.clone(),
+                element_data: ElementData::new(me.clone(), false),
+            })
         });
 
+        let layout_context = Some(LayoutContext::Image(ImageContext::new(resource_identifier.clone())));
+        me.borrow_mut().element_data.crate_layout_node(layout_context);
+
         PENDING_RESOURCES.with_borrow_mut(|pending_resources| {
             pending_resources.push_back((resource_identifier, ResourceType::Image));
         });
 
-        me.borrow_mut().element_data.set_element(me.clone());
-
         ELEMENTS.with_borrow_mut(|elements| {
             elements.insert(me.borrow().deref());
         });
@@ -69,7 +65,6 @@ impl Image {
     pub fn get_image(&self) -> &ResourceIdentifier {
         &self.resource_identifier
     }
-
 }
 
 impl crate::elements::core::ElementData for Image {
@@ -83,7 +78,6 @@ impl crate::elements::core::ElementData for Image {
 }
 
 impl Element for Image {
-
     fn as_any(&self) -> &dyn Any {
         self
     }
@@ -94,7 +88,6 @@ impl Element for Image {
 }
 
 impl ElementInternals for Image {
-
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
diff --git a/crates/craft_retained/src/elements/slider/slider.rs b/crates/craft_retained/src/elements/slider/slider.rs
index 0d3ad68a..8cd3b1d3 100644
--- a/crates/craft_retained/src/elements/slider/slider.rs
+++ b/crates/craft_retained/src/elements/slider/slider.rs
@@ -28,7 +28,6 @@ pub enum SliderDirection {
 
 pub struct Slider {
     element_data: ElementData,
-    me: Option<Weak<RefCell<Slider>>>,
 
     step: f64,
     min: f64,
@@ -49,9 +48,8 @@ pub struct Slider {
 
 impl Slider {
     pub fn new(thumb_size: f32) -> Rc<RefCell<Self>> {
-        let me = Rc::new(RefCell::new(Self {
-            element_data: ElementData::new(true),
-            me: None,
+        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| RefCell::new(Self {
+            element_data: ElementData::new(me.clone(), false),
             step: 1.0,
             min: 0.0,
             max: 100.0,
@@ -87,10 +85,6 @@ impl Slider {
             me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
         });
 
-        let me_element: Rc<RefCell<dyn Element>> = me.clone();
-        me.borrow_mut().me = Some(Rc::downgrade(&me.clone()));
-        me.borrow_mut().element_data.me = Some(Rc::downgrade(&me_element));
-
         ELEMENTS.with_borrow_mut(|elements| {
             elements.insert(me.borrow().deref());
         });
@@ -205,15 +199,6 @@ impl crate::elements::core::ElementData for Slider {
 }
 
 impl Element for Slider {
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-
     fn in_bounds(&self, point: Point) -> bool {
         let element_data = &self.element_data;
         let rect = element_data.layout_item.computed_box_transformed.border_rectangle();
@@ -235,6 +220,14 @@ impl Element for Slider {
             rect.contains(&point)
         }
     }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
 }
 
 impl ElementInternals for Slider {
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 62905421..e2b708fb 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -39,12 +39,12 @@ use web_time as time;
 use winit::dpi;
 
 // A stateful element that shows text.
-#[derive(Clone, Default)]
+#[derive(Clone)]
 pub struct Text {
     element_data: ElementData,
     selectable: bool,
     pub(crate) state: TextState,
-    me: Option<Weak<RefCell<Self>>>,
+    me: Weak<RefCell<Self>>,
 }
 
 #[derive(Clone)]
@@ -77,19 +77,17 @@ pub struct TextState {
 
 impl Text {
     pub fn new(text: &str) -> Rc<RefCell<Self>> {
-        let me = Rc::new(RefCell::new(Text {
-            element_data: Default::default(),
+        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| RefCell::new(Text {
+            element_data: ElementData::new(me.clone(), false),
             selectable: true,
             state: TextState::default(),
-            me: None,
+            me: me.clone(),
         }));
 
-        me.borrow_mut().me = Some(Rc::downgrade(&me.clone()));
         let text_context = Some(LayoutContext::Text(TaffyTextContext {
-            element: me.borrow().me.clone().unwrap(),
+            element: me.borrow().me.clone(),
         }));
         me.borrow_mut().element_data.crate_layout_node(text_context);
-        me.borrow_mut().element_data.set_element(me.clone());
 
         me.borrow_mut().text(text);
 
@@ -181,7 +179,7 @@ impl ElementInternals for Text {
             renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 1.0);
         }*/
 
-        renderer.draw_text(self.me.clone().unwrap(), content_rectangle.scale(scale_factor), None, false);
+        renderer.draw_text(self.me.clone(), content_rectangle.scale(scale_factor), None, false);
     }
 
     #[cfg(feature = "accesskit")]
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 43055ccf..e065349c 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -10,29 +10,28 @@ use craft_primitives::Color;
 use craft_renderer::renderer::{RenderList, TextScroll};
 use std::any::Any;
 use std::cell::RefCell;
-use std::ops::{Deref};
+use std::ops::Deref;
 use std::rc::{Rc, Weak};
 
-use crate::app::TAFFY_TREE;
 use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
 #[cfg(feature = "accesskit")]
 use crate::elements::element_id::create_unique_element_id;
 use crate::elements::scrollable;
 use crate::elements::text_input::text_input_state::TextInputState;
 use crate::events::{CraftMessage, Event};
+use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
 use crate::text::text_render_data::TextRender;
 use crate::text::RangedStyles;
 use crate::utils::cloneable_any::CloneableAny;
 use craft_renderer::text_renderer_data::TextData;
 use kurbo::Affine;
-use parley::{BoundingBox};
+use parley::BoundingBox;
 use ui_events::pointer::PointerButton;
 use winit::event::Ime;
-use crate::layout::TaffyTree;
 
 // A stateful element that shows text.
-#[derive(Clone, Default)]
+#[derive(Clone)]
 pub struct TextInput {
     element_data: ElementData,
     /// Whether the text input will update the editor every update with the user provided text.
@@ -42,7 +41,7 @@ pub struct TextInput {
     pub ranged_styles: Option<RangedStyles>,
     pub disabled: bool,
     pub(crate) state: TextInputState,
-    me: Option<Weak<RefCell<Self>>>,
+    me: Weak<RefCell<Self>>,
 }
 
 #[allow(dead_code)]
@@ -60,34 +59,25 @@ impl TextInput {
 
         let text_input_state = TextInputState::default();
 
-        let me = Rc::new(RefCell::new(Self {
-            text: Some(text.to_string()),
-            element_data: ElementData::new(true),
-            use_text_value_on_update: true,
-            ranged_styles: Some(RangedStyles::new(vec![])),
-            disabled: false,
-            state: text_input_state,
-            me: None,
-        }));
+        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
+            RefCell::new(Self {
+                text: Some(text.to_string()),
+                element_data: ElementData::new(me.clone(), true),
+                use_text_value_on_update: true,
+                ranged_styles: Some(RangedStyles::new(vec![])),
+                disabled: false,
+                state: text_input_state,
+                me: me.clone(),
+            })
+        });
         me.borrow_mut().element_data.style = default_style;
 
-        let me2 = me.clone();
-        me.borrow_mut().me = Some(Rc::downgrade(&me2));
-
-        let me_element: Rc<RefCell<dyn Element>> = me.clone();
-        me.borrow_mut().element_data.me = Some(Rc::downgrade(&me_element));
-
         me.borrow_mut().text(text);
 
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let context = LayoutContext::TextInput(TaffyTextInputContext {
-                element: me.borrow().me.clone().unwrap(),
-            });
-            let node_id = taffy_tree
-                .new_leaf_with_context(me.borrow().element_data.current_style().to_taffy_style(), context);
-            me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
-            me.borrow_mut().state.taffy_node(Some(node_id));
-        });
+        let context = Some(LayoutContext::TextInput(TaffyTextInputContext {
+            element: me.borrow().me.clone(),
+        }));
+        me.borrow_mut().element_data.crate_layout_node(context);
 
         ELEMENTS.with_borrow_mut(|elements| {
             elements.insert(me.borrow().deref());
@@ -198,7 +188,7 @@ impl ElementInternals for TextInput {
 
         if self.state.text_render.as_ref().is_some() {
             renderer.draw_text(
-                self.me.clone().unwrap(),
+                self.me.clone(),
                 content_rectangle.scale(scale_factor),
                 text_scroll,
                 self.is_focused(),
@@ -426,4 +416,4 @@ impl Element for TextInput {
     fn as_any_mut(&mut self) -> &mut dyn Any {
         self
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index e8373ba8..0febbc98 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -248,10 +248,6 @@ impl TextInputState {
         size
     }
 
-    pub fn taffy_node(&mut self, taffy_node: Option<NodeId>) {
-        self.taffy_node = taffy_node;
-    }
-
     #[allow(dead_code)]
     pub fn get_cursor_link(&self, cursor_pos: Point, element: &TextInput) -> Option<String> {
         if let Some(ranged_styles) = &element.ranged_styles {

From c3ae0a915eecbafec58f3264eeb090e91ea0aa42 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Wed, 31 Dec 2025 16:47:49 -0500
Subject: [PATCH 026/143] start multi-window

---
 Cargo.lock                                    |   9 +
 Cargo.toml                                    |   1 +
 crates/craft_retained/src/app.rs              |   3 +
 .../craft_retained/src/craft_winit_state.rs   |   6 +-
 .../craft_retained/src/elements/container.rs  |   5 +-
 crates/craft_retained/src/elements/mod.rs     |   4 +-
 crates/craft_retained/src/elements/window.rs  | 210 ++++++++++++++++++
 crates/craft_retained/src/lib.rs              |   1 +
 crates/craft_retained/src/window_manager.rs   |  31 +++
 examples/multiwindow/Cargo.toml               |  25 +++
 examples/multiwindow/main.rs                  | 104 +++++++++
 11 files changed, 394 insertions(+), 5 deletions(-)
 create mode 100644 crates/craft_retained/src/elements/window.rs
 create mode 100644 crates/craft_retained/src/window_manager.rs
 create mode 100644 examples/multiwindow/Cargo.toml
 create mode 100644 examples/multiwindow/main.rs

diff --git a/Cargo.lock b/Cargo.lock
index a9f77194..de424a40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2199,6 +2199,15 @@ dependencies = [
  "pxfm",
 ]
 
+[[package]]
+name = "multiwindow"
+version = "0.1.0"
+dependencies = [
+ "craft_renderer",
+ "craft_retained",
+ "util",
+]
+
 [[package]]
 name = "naga"
 version = "26.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index 385e4f2a..e349c9b0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,6 +6,7 @@ members = [
     "crates/craft_logger",
     "examples/util",
     "examples/counter_retained",
+    "examples/multiwindow",
     "examples/pointer_events",
     "examples/text",
     "examples/jsframeworkbench",
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 43cc955f..e8d9c604 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -50,6 +50,7 @@ use winit::dpi::{LogicalSize, PhysicalSize};
 use winit::event::Ime;
 use winit::event_loop::ActiveEventLoop;
 use winit::window::{Window, WindowId};
+use crate::window_manager::WindowManager;
 
 thread_local! {
     /// The most recently recorded window id. This is set every time a windows event occurs.
@@ -63,6 +64,8 @@ thread_local! {
     pub(crate) static FOCUS: RefCell<Option<Weak<RefCell<dyn Element>>>> = RefCell::new(None);
     /// An event queue that users or elements can manipulate. Cleared at the start and end of every event dispatch.
     static EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(Event, CraftMessage)>> = RefCell::new(VecDeque::with_capacity(10));
+
+    pub(crate) static WINDOW_MANAGER: RefCell<WindowManager> = RefCell::new(WindowManager::new());
 }
 
 /// Enqueues an event at the back of the dispatch queue.
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index fbb58cfe..9b22b048 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -27,7 +27,7 @@ use craft_runtime::Receiver;
 use craft_runtime::Sender;
 use craft_runtime::CraftRuntimeHandle;
 
-use crate::app::{App, CURRENT_WINDOW_ID, DOCUMENTS};
+use crate::app::{App, CURRENT_WINDOW_ID, DOCUMENTS, WINDOW_MANAGER};
 use std::sync::Arc;
 use ui_events::pointer::{PointerEvent};
 use ui_events_winit::{WindowEventReducer, WindowEventTranslation};
@@ -80,6 +80,10 @@ impl ApplicationHandler for CraftWinitState {
             window_attributes =
                 window_attributes.with_inner_size(LogicalSize::new(window_size.width, window_size.height));
         }
+        
+        WINDOW_MANAGER.with_borrow_mut(|window_manager| {
+            window_manager.create_windows(event_loop);
+        });
 
         #[cfg(target_arch = "wasm32")]
         let window_attributes = {
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 3dc464ef..2d2a7393 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -23,14 +23,13 @@ pub struct Container {
 
 impl Container {
     pub fn new() -> Rc<RefCell<Self>> {
-        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
-            RefCell::new(Self {
+        let me = Rc::new_cyclic(|me: &Weak<RefCell<Container>>| {
+            RefCell::new(Container {
                 element_data: ElementData::new(me.clone(), true),
             })
         });
 
         me.borrow_mut().element_data.crate_layout_node(None);
-
         me
     }
 }
diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index 65f95f6f..37e8ca0c 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -12,6 +12,7 @@ mod image;
 mod text_input;
 mod element_id_map;
 mod slider;
+mod window;
 
 pub use container::Container;
 pub use text::Text;
@@ -19,4 +20,5 @@ pub use slider::*;
 pub use text_input::TextInput;
 pub use image::Image;
 pub use element::Element;
-pub use element_id_map::ElementIdMap;
\ No newline at end of file
+pub use element_id_map::ElementIdMap;
+pub use window::Window;
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
new file mode 100644
index 00000000..01cb8de5
--- /dev/null
+++ b/crates/craft_retained/src/elements/window.rs
@@ -0,0 +1,210 @@
+//! Stores one or more elements.
+
+use crate::app::{TAFFY_TREE, WINDOW_MANAGER};
+use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
+use crate::elements::element_data::ElementData;
+use crate::elements::{scrollable, Element};
+use crate::events::{CraftMessage, Event};
+use crate::layout::TaffyTree;
+use crate::text::text_context::TextContext;
+use craft_primitives::geometry::Rectangle;
+use craft_renderer::RenderList;
+use kurbo::{Affine, Point};
+use std::any::Any;
+use std::cell::RefCell;
+use std::rc::{Rc, Weak};
+
+use winit::window::Window as WinitWindow;
+
+/// Stores one or more elements.
+///
+/// If overflow is set to scroll, it will become scrollable.
+pub struct Window {
+    element_data: ElementData,
+    winit_window: Option<Rc<RefCell<WinitWindow>>>,
+}
+
+impl Window {
+    pub fn new() -> Rc<RefCell<Self>> {
+        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
+            RefCell::new(Self {
+                element_data: ElementData::new(me.clone(), true),
+                winit_window: None,
+            })
+        });
+
+        me.borrow_mut().element_data.crate_layout_node(None);
+
+        WINDOW_MANAGER.with_borrow_mut(|window_manager| {
+            window_manager.add_window(me.clone());
+        });
+
+        me
+    }
+}
+
+impl crate::elements::core::ElementData for Window {
+    fn element_data(&self) -> &ElementData {
+        &self.element_data
+    }
+
+    fn element_data_mut(&mut self) -> &mut ElementData {
+        &mut self.element_data
+    }
+}
+
+impl Element for Window {
+    fn push(&mut self, child: Rc<RefCell<dyn Element>>) -> &mut Self
+    where
+        Self: Sized,
+    {
+        let me: Weak<RefCell<dyn Element>> = self.element_data.me.clone();
+        child.borrow_mut().element_data_mut().parent = Some(me);
+        self.element_data.children.push(child.clone());
+
+        // Add the children's taffy node.
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
+            let child_id = child.borrow().element_data().layout_item.taffy_node_id;
+            if let Some(child_id) = child_id {
+                taffy_tree.add_child(parent_id, child_id);
+            }
+        });
+
+        self
+    }
+
+    fn push_dyn(&mut self, child: Rc<RefCell<dyn Element>>) {
+        self.push(child);
+    }
+
+    /// Appends multiple typed children in one call
+    fn extend(&mut self, children: impl IntoIterator<Item = Rc<RefCell<dyn Element>>>) -> &mut Self
+    where
+        Self: Sized,
+    {
+        let me: Weak<RefCell<dyn Element>> = self.element_data.me.clone();
+        let children: Vec<_> = children.into_iter().collect();
+
+        for child in &children {
+            child.borrow_mut().element_data_mut().parent = Some(me.clone());
+        }
+
+        self.element_data.children.extend(children.iter().cloned());
+
+        // Add the children's taffy node.
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
+            for child in &children {
+                if let Some(child_id) = child.borrow().element_data().layout_item.taffy_node_id {
+                    taffy_tree.add_child(parent_id, child_id);
+                }
+            }
+        });
+
+        self
+    }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
+}
+
+impl ElementInternals for Window {
+    fn apply_layout(
+        &mut self,
+        taffy_tree: &mut TaffyTree,
+        position: Point,
+        z_index: &mut u32,
+        transform: Affine,
+        pointer: Option<Point>,
+        text_context: &mut TextContext,
+        clip_bounds: Option<Rectangle>,
+        scale_factor: f64,
+    ) {
+        let node = self.element_data.layout_item.taffy_node_id.unwrap();
+        let layout = taffy_tree.layout(node);
+        let has_new_layout = taffy_tree.get_has_new_layout(node);
+
+        let dirty = has_new_layout
+            || transform != self.element_data.layout_item.get_transform()
+            || position != self.element_data.layout_item.position;
+        self.element_data.layout_item.has_new_layout = has_new_layout;
+
+        if dirty {
+            self.resolve_box(position, transform, layout, z_index);
+            self.apply_borders(scale_factor);
+            // For scroll changes from taffy;
+            self.element_data.apply_scroll(layout);
+            self.apply_clip(clip_bounds);
+            self.element_data.scroll_state.as_mut().unwrap().mark_old();
+        }
+
+        // For manual scroll updates.
+        if !dirty && self.element_data.scroll_state.map(|scroll_state| scroll_state.is_new()).unwrap_or_default() {
+            self.element_data.apply_scroll(layout);
+            self.element_data.scroll_state.as_mut().unwrap().mark_old();
+        }
+
+        if has_new_layout {
+            taffy_tree.mark_seen(node);
+        }
+
+        let scroll_y = self.element_data.scroll().map_or(0.0, |s| s.scroll_y() as f64);
+        let child_transform = Affine::translate((0.0, -scroll_y));
+
+        self.apply_layout_children(
+            taffy_tree,
+            z_index,
+            transform * child_transform,
+            pointer,
+            text_context,
+            scale_factor,
+            false,
+        )
+    }
+
+    fn draw(
+        &mut self,
+        renderer: &mut RenderList,
+        text_context: &mut TextContext,
+        pointer: Option<Point>,
+        scale_factor: f64,
+    ) {
+        if !self.is_visible() {
+            return;
+        }
+        self.add_hit_testable(renderer, true, scale_factor);
+
+        // We draw the borders before we start any layers, so that we don't clip the borders.
+        self.draw_borders(renderer, scale_factor);
+
+        /*if self.element_data.layout_item.has_new_layout {
+            renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 5.0);
+        }*/
+
+        self.maybe_start_layer(renderer, scale_factor);
+        self.draw_children(renderer, text_context, pointer, scale_factor);
+        self.maybe_end_layer(renderer);
+
+        self.draw_scrollbar(renderer, scale_factor);
+    }
+
+    fn on_event(
+        &mut self,
+        message: &CraftMessage,
+        _text_context: &mut TextContext,
+        event: &mut Event,
+        _target: Option<Rc<RefCell<dyn ElementInternals>>>,
+    ) {
+        scrollable::on_scroll_events(self, message, event);
+    }
+
+    fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
+        resolve_clip_for_scrollable(self, clip_bounds);
+    }
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 59478ae6..f29f28fc 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -22,6 +22,7 @@ mod utils;
 #[cfg(target_arch = "wasm32")]
 pub mod wasm_queue;
 pub mod spatial;
+mod window_manager;
 
 pub use options::CraftOptions;
 pub use craft_primitives::palette;
diff --git a/crates/craft_retained/src/window_manager.rs b/crates/craft_retained/src/window_manager.rs
new file mode 100644
index 00000000..438c23a4
--- /dev/null
+++ b/crates/craft_retained/src/window_manager.rs
@@ -0,0 +1,31 @@
+use std::cell::RefCell;
+use std::rc::Rc;
+use winit::event_loop::ActiveEventLoop;
+use winit::window::WindowAttributes;
+use crate::elements::Window;
+
+pub(crate) struct WindowManager {
+    windows: Vec<Rc<RefCell<Window>>>,
+}
+
+impl WindowManager {
+
+    pub(crate) fn new() -> Self {
+        Self {
+            windows: Vec::new(),
+        }
+    }
+
+    pub(crate) fn create_windows(&mut self, event_loop: &ActiveEventLoop) {
+        for window_element in &self.windows {
+            println!("Creating window");
+            let winit_window = event_loop.create_window(WindowAttributes::default()).expect("Failed to create window");
+            winit_window.set_visible(true);
+        }
+    }
+
+    pub(crate) fn add_window(&mut self, window: Rc<RefCell<Window>>) {
+        self.windows.push(window);
+    }
+
+}
\ No newline at end of file
diff --git a/examples/multiwindow/Cargo.toml b/examples/multiwindow/Cargo.toml
new file mode 100644
index 00000000..02037243
--- /dev/null
+++ b/examples/multiwindow/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "multiwindow"
+version = "0.1.0"
+edition = "2024"
+default-run = "multiwindow"
+
+[[bin]]
+name = "multiwindow"
+path = "main.rs"
+
+[dependencies]
+util = { path = "../util" }
+
+[dependencies.craft_retained]
+path = "../../crates/craft_retained"
+default-features = false
+features = ["accesskit", "system_fonts"]
+
+[target.'cfg(not(target_os = "android"))'.dependencies.craft_renderer]
+path = "../../crates/craft_renderer"
+features = ["vello_hybrid_renderer"]
+
+[target.'cfg(target_os = "android")'.dependencies.craft_renderer]
+path = "../../crates/craft_renderer"
+features = ["vello_renderer"]
\ No newline at end of file
diff --git a/examples/multiwindow/main.rs b/examples/multiwindow/main.rs
new file mode 100644
index 00000000..eda014b5
--- /dev/null
+++ b/examples/multiwindow/main.rs
@@ -0,0 +1,104 @@
+use craft_retained::elements::{Element, Window};
+use craft_retained::events::ui_events::pointer::PointerButton;
+use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Unit};
+use craft_retained::{
+    elements::{Container, Text},
+    rgb, Color,
+};
+use std::cell::RefCell;
+use std::rc::Rc;
+
+#[derive(Default, Clone, Copy)]
+pub struct Counter {
+    count: i64,
+}
+
+impl Counter {
+    fn change(&mut self, delta: i64) {
+        self.count += delta;
+    }
+
+    fn count(&self) -> i64 {
+        self.count
+    }
+}
+
+fn create_button(
+    label: &str,
+    base_color: Color,
+    delta: i64,
+    state: Rc<RefCell<Counter>>,
+    count_text: Rc<RefCell<Text>>,
+) -> Rc<RefCell<Container>> {
+    let border_color = rgb(0, 0, 0);
+    let label = Text::new(label);
+    label.borrow_mut().font_size(24.0).color(Color::WHITE).selectable(false);
+    let container = Container::new();
+    container
+        .borrow_mut()
+        .border_width(Unit::Px(1.0), Unit::Px(2.0), Unit::Px(3.0), Unit::Px(4.0))
+        .border_color(border_color, border_color, border_color, border_color)
+        .border_radius((10.0, 10.0), (10.0, 10.0), (10.0, 10.0), (10.0, 10.0))
+        .padding(Unit::Px(15.0), Unit::Px(30.0), Unit::Px(15.0), Unit::Px(30.0))
+        .display(Display::Flex)
+        .justify_content(Some(JustifyContent::Center))
+        .align_items(Some(AlignItems::Center))
+        .background_color(base_color)
+        .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {
+            if pointer_button_event.button == Some(PointerButton::Primary) {
+                state.borrow_mut().change(delta);
+                count_text.borrow_mut().text(&format!("Count: {}", state.borrow().count()));
+                event.prevent_propagate();
+            }
+        }))
+        .push(label);
+    container
+}
+
+pub fn counter() -> Rc<RefCell<dyn Element>> {
+    let count = Rc::new(RefCell::new(Counter::default()));
+
+    let container = Container::new();
+
+    let count_text = Text::new(&format!("Count: {}", count.borrow().count()));
+
+    let button = Container::new();
+    button
+        .borrow_mut()
+        .display(Display::Flex)
+        .flex_direction(FlexDirection::Row)
+        .gap(Unit::Px(20.0), Unit::Px(20.0))
+        .push(create_button("-", rgb(244, 67, 54), -1, count.clone(), count_text.clone()))
+        .push(create_button("+", rgb(76, 175, 80), 1, count.clone(), count_text.clone()));
+
+    container
+        .borrow_mut()
+        .display(Display::Flex)
+        .flex_direction(FlexDirection::Column)
+        .justify_content(Some(JustifyContent::Center))
+        .align_items(Some(AlignItems::Center))
+        .width(Unit::Percentage(100.0))
+        .height(Unit::Percentage(100.0))
+        .gap(Unit::Px(20.0), Unit::Px(20.0))
+        .push(count_text)
+        .font_size(72.0)
+        .color(rgb(50, 50, 50))
+        .push(button);
+
+    let root = Container::new();
+    root.borrow_mut().push(container);
+
+    root
+}
+
+#[allow(unused)]
+#[cfg(not(target_os = "android"))]
+fn main() {
+    let counter = counter();
+
+    let window_2 = Window::new();
+
+    use craft_retained::CraftOptions;
+    util::setup_logging();
+    craft_retained::craft_main(counter, CraftOptions::basic("Counter"));
+}

From 396fa1856bb174003374bc1daff8e1ded7f19f30 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 1 Jan 2026 15:20:44 -0500
Subject: [PATCH 027/143] start multi-window

---
 crates/craft_renderer/src/vello_cpu/mod.rs    |   4 +-
 crates/craft_retained/src/app.rs              | 373 ++++--------------
 .../craft_retained/src/craft_winit_state.rs   |  93 ++---
 .../craft_retained/src/elements/container.rs  |  24 +-
 .../src/elements/core/element_internals.rs    |  15 +-
 crates/craft_retained/src/elements/element.rs |  12 +-
 .../src/elements/element_data.rs              | 127 +++---
 .../src/elements/element_states.rs            |   9 -
 crates/craft_retained/src/elements/image.rs   |  20 +-
 crates/craft_retained/src/elements/mod.rs     |   1 -
 .../craft_retained/src/elements/scrollable.rs |  19 +-
 .../src/elements/slider/slider.rs             |  21 +-
 crates/craft_retained/src/elements/text.rs    |  19 +-
 .../src/elements/text_input/mod.rs            |  13 +-
 .../elements/text_input/text_input_state.rs   |  25 +-
 crates/craft_retained/src/elements/window.rs  | 185 ++++++++-
 crates/craft_retained/src/lib.rs              |  18 +-
 .../craft_retained/src/text/parley_editor.rs  |  19 +-
 crates/craft_retained/src/window_context.rs   |   9 +-
 crates/craft_retained/src/window_manager.rs   |  79 +++-
 examples/counter_retained/Cargo.toml          |   2 +-
 examples/counter_retained/main.rs             |   6 +-
 examples/jsframeworkbench/main.rs             |  38 +-
 examples/multiwindow/Cargo.toml               |  10 +-
 examples/multiwindow/main.rs                  |  32 +-
 examples/pointer_events/Cargo.toml            |   2 +-
 examples/pointer_events/main.rs               |  17 +-
 examples/text/main.rs                         |   6 +-
 28 files changed, 622 insertions(+), 576 deletions(-)
 delete mode 100644 crates/craft_retained/src/elements/element_states.rs

diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index 3befd9ef..e8849a36 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -152,8 +152,8 @@ impl Renderer for VelloCpuRenderer {
                     self.render_context.set_paint(PaintType::Solid(*fill_color));
                     self.render_context.fill_rect(&rectangle.to_kurbo());
                 }
-                RenderCommand::DrawRectOutline(rectangle, outline_color) => {
-                    self.render_context.set_stroke(Stroke::new(1.0));
+                RenderCommand::DrawRectOutline(rectangle, outline_color, thickness) => {
+                    self.render_context.set_stroke(Stroke::new(*thickness));
                     self.render_context.set_paint(PaintType::Solid(*outline_color));
                     self.render_context.stroke_rect(&rectangle.to_kurbo());
                 }
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index e8d9c604..3412fa71 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -1,16 +1,13 @@
-use crate::elements::ElementIdMap;
+use crate::elements::{ElementIdMap, Window};
 use crate::events::internal::InternalMessage;
 use crate::events::CraftMessage;
 use crate::events::{Event, EventDispatcher};
 use crate::style::{Display, Unit, Wrap};
 use crate::text::text_context::TextContext;
-use crate::{RendererBox, WindowContext};
 use craft_logging::info;
-use craft_primitives::geometry::Rectangle;
+use craft_primitives::geometry::{Size, Point};
 use craft_resource_manager::{ResourceIdentifier, ResourceManager};
 use craft_runtime::CraftRuntimeHandle;
-use kurbo::{Affine, Point};
-use peniko::Color;
 use std::cell::Cell;
 use std::cell::RefCell;
 use std::collections::VecDeque;
@@ -35,21 +32,18 @@ use web_time as time;
 use crate::animations::animation::AnimationFlags;
 use crate::document::DocumentManager;
 use crate::elements::Element;
-use crate::layout::TaffyTree;
-use craft_renderer::RenderList;
 use craft_resource_manager::resource_event::ResourceEvent;
 use craft_resource_manager::resource_type::ResourceType;
 use craft_runtime::Sender;
 use std::time::Duration;
-use taffy::{AvailableSpace, NodeId};
 use ui_events::keyboard::{KeyboardEvent, Modifiers, NamedKey};
 use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
 use ui_events::ScrollDelta;
 use ui_events::ScrollDelta::PixelDelta;
-use winit::dpi::{LogicalSize, PhysicalSize};
 use winit::event::Ime;
 use winit::event_loop::ActiveEventLoop;
-use winit::window::{Window, WindowId};
+use winit::window::{WindowId};
+use crate::elements::core::ElementInternals;
 use crate::window_manager::WindowManager;
 
 thread_local! {
@@ -58,7 +52,6 @@ thread_local! {
     /// Records document-level state (focus, pointer captures, etc.) for internal use.
     pub static DOCUMENTS: RefCell<DocumentManager> = RefCell::new(DocumentManager::new());
     pub(crate) static ELEMENTS: RefCell<ElementIdMap> = RefCell::new(ElementIdMap::new());
-    pub(crate) static TAFFY_TREE: RefCell<TaffyTree> = RefCell::new(TaffyTree::new());
     pub(crate) static PENDING_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = RefCell::new(VecDeque::new());
     pub(crate) static IN_PROGRESS_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = RefCell::new(VecDeque::new());
     pub(crate) static FOCUS: RefCell<Option<Weak<RefCell<dyn Element>>>> = RefCell::new(None);
@@ -89,21 +82,13 @@ pub(crate) fn dequeue_event() -> Option<(Event, CraftMessage)> {
 
 pub struct App {
     pub(crate) event_dispatcher: EventDispatcher,
-    pub(crate) root: Rc<RefCell<dyn Element>>,
-    /// A winit window. This is only valid between resume and pause.
-    pub window: Option<Arc<Window>>,
     /// The text context is used to manage fonts and text rendering. It is only valid between resume and pause.
     pub(crate) text_context: Option<TextContext>,
-    /// The renderer is used to draw the view. It is only valid between resume and pause.
-    pub renderer: Option<RendererBox>,
     pub(crate) reload_fonts: bool,
     /// The resource manager is used to manage resources such as images and fonts.
     ///
     /// The resource manager is responsible for loading, caching, and providing access to resources.
     pub(crate) resource_manager: Arc<ResourceManager>,
-    // The user's reactive tree.
-    /// Provides a way for the user to get and set common window properties during view and update.
-    pub window_context: WindowContext,
 
     pub(crate) app_sender: Sender<InternalMessage>,
     #[cfg(feature = "accesskit")]
@@ -113,7 +98,6 @@ pub struct App {
     pub(crate) modifiers: Modifiers,
     pub redraw_flags: RedrawFlags,
 
-    pub(crate) render_list: RenderList,
     pub(super) target_scratch: Vec<Rc<RefCell<dyn Element>>>,
 
     pub(crate) previous_animation_flags: AnimationFlags,
@@ -143,22 +127,17 @@ impl App {
     }
 
     pub fn on_scale_factor_changed(&mut self, scale_factor: f64) {
-        self.window_context.scale_factor = scale_factor;
+        /*self.window_context.scale_factor = scale_factor;
         self.on_resize(self.window.as_ref().unwrap().inner_size());
         self.root.borrow_mut().scale_factor(self.window_context.effective_scale_factor());
-        style_root_element(self.root.borrow_mut().deref_mut(), self.window_context.window_size());
+        style_root_element(self.root.borrow_mut().deref_mut(), self.window_context.window_size());*/
     }
 
-    pub fn on_process_user_events(&mut self) {}
-
     #[allow(unused_variables)]
-    pub fn on_resume(&mut self, window: Arc<Window>, renderer: RendererBox, event_loop: &ActiveEventLoop) {
-        window.set_ime_allowed(true);
+    pub fn on_resume(&mut self, event_loop: &ActiveEventLoop) {
+        //window.set_ime_allowed(true);
 
         self.setup_text_context();
-        self.renderer = Some(renderer);
-
-        self.window = Some(window.clone());
 
         #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
         let action_handler = CraftAccessHandler {
@@ -168,44 +147,32 @@ impl App {
         #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
         let deactivation_handler = CraftDeactivationHandler::new();
 
-        let scale_factor = window.scale_factor();
+        /*let scale_factor = window.scale_factor();
 
         self.window = Some(window.clone());
         self.window_context.scale_factor = scale_factor;
         self.on_resize(window.inner_size());
-        let tree_update = self.on_request_redraw();
-
-        #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-        let craft_activation_handler = CraftActivationHandler::new(tree_update);
-
-        #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-        {
-            self.accesskit_adapter = Some(Adapter::with_direct_handlers(
-                event_loop,
-                &window,
-                craft_activation_handler,
-                #[cfg(feature = "accesskit")]
-                action_handler,
-                deactivation_handler,
-            ));
-        }
-
-        window.set_visible(true);
+        let tree_update = self.on_request_redraw();*/
+
+        /*#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+        let craft_activation_handler = CraftActivationHandler::new(tree_update);*/
+
+        //#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+        //{
+        //    self.accesskit_adapter = Some(Adapter::with_direct_handlers(
+        //        event_loop,
+        //        &window,
+        //        craft_activation_handler,
+        //        #[cfg(feature = "accesskit")]
+        //        action_handler,
+        //        deactivation_handler,
+        //    ));
+        //}
     }
 
     /// Handles the window resize event.
-    pub fn on_resize(&mut self, new_size: PhysicalSize<u32>) {
-        self.window_context.window_size = new_size;
-        if let Some(renderer) = self.renderer.as_mut() {
-            renderer.resize_surface(new_size.width.max(1) as f32, new_size.height.max(1) as f32);
-        }
-        self.render_list.set_cull(Some(Rectangle::new(0.0, 0.0, new_size.width as f32, new_size.height as f32)));
-        style_root_element(self.root.borrow_mut().deref_mut(), self.window_context.window_size());
-        // On macOS the window needs to be redrawn manually after resizing
-        #[cfg(target_os = "macos")]
-        {
-            self.window.as_ref().unwrap().request_redraw();
-        }
+    pub fn on_resize(&mut self, window: Rc<RefCell<Window>>, new_size: Size<f32>) {
+        window.borrow_mut().on_resize(new_size);
     }
 
     /// Initialize any data needed to layout/render text.
@@ -245,91 +212,38 @@ impl App {
         }
     }
 
-    /// Updates the view by applying the latest changes to the reactive tree.
-    pub(crate) fn update_view(&mut self) {}
-
     /// Updates the reactive tree, layouts the elements, and draws the view.
     #[cfg(feature = "accesskit")]
-    pub fn on_request_redraw(&mut self) -> Option<TreeUpdate> {
-        self.on_request_redraw_internal();
-        self.window.as_ref()?;
-        let window = self.window.as_mut().unwrap().clone();
+    pub fn on_request_redraw(&mut self, window: Rc<RefCell<Window>>) -> Option<TreeUpdate> {
+        self.on_request_redraw_internal(window.clone());
+        let winit_window = window.borrow().winit_window().as_mut().unwrap().clone();
 
         let tree_update = self.compute_accessibility_tree();
         if let Some(accesskit_adapter) = &mut self.accesskit_adapter {
             accesskit_adapter.update_if_active(|| tree_update);
-            window.pre_present_notify();
+            winit_window.pre_present_notify();
             None
         } else {
-            window.pre_present_notify();
+            winit_window.pre_present_notify();
             Some(tree_update)
         }
     }
 
     /// Updates the reactive tree, layouts the elements, and draws the view.
     #[cfg(not(feature = "accesskit"))]
-    pub fn on_request_redraw(&mut self) {
-        self.on_request_redraw_internal();
+    pub fn on_request_redraw(&mut self, window: Rc<RefCell<Window>>) {
+        self.on_request_redraw_internal(window);
     }
 
     //#[cfg(not(feature = "accesskit"))]
 
-    fn on_request_redraw_internal(&mut self) {
-        if self.window.is_none() {
-            return;
-        }
-
+    fn on_request_redraw_internal(&mut self, window: Rc<RefCell<Window>>) {
         self.update_resources();
 
-        let surface_size = self.window_context.window_size();
-
-        self.update_view();
-
-        let root_size = surface_size;
-
-        if self.renderer.is_some() {
-            self.renderer.as_mut().unwrap().surface_set_clear_color(Color::WHITE);
-        }
-
-        let layout_origin = Point::new(0.0, 0.0);
-
-        {
-            if self.redraw_flags.should_rebuild_layout() {
-                self.layout_tree(
-                    root_size,
-                    layout_origin,
-                    self.window_context.effective_scale_factor(),
-                    self.window_context.mouse_position,
-                );
-            }
-
-            //self.animate_tree(&delta_time, layout_origin, root_size);
-
-            if self.renderer.is_some() {
-                self.draw_reactive_tree(self.window_context.mouse_position);
-            }
-        }
-
-        {
-            /*let span = span!(Level::INFO, "renderer_submit");
-            let _enter = span.enter();*/
-
-            if self.renderer.is_some() {
-                self.renderer.as_mut().unwrap().submit(self.resource_manager.clone());
-            }
-        }
-
-        if let Some(window) = &self.window {
-            self.window_context.apply_requests(window);
-            self.window_context.reset();
-        }
-
-        self.on_process_user_events();
-
-        self.view_introspection();
+        window.borrow_mut().on_redraw(self.text_context.as_mut().unwrap(), self.resource_manager.clone());
     }
 
-    pub fn on_pointer_scroll(&mut self, pointer_scroll_update: PointerScrollEvent) {
+    pub fn on_pointer_scroll(&mut self, window: Rc<RefCell<Window>>, pointer_scroll_update: PointerScrollEvent) {
         if self.modifiers.ctrl() && pointer_scroll_update.pointer.pointer_type == ui_events::pointer::PointerType::Mouse
         {
             let y: f32 = match pointer_scroll_update.delta {
@@ -338,13 +252,14 @@ impl App {
                 PixelDelta(physical) => physical.y as f32,
             };
             if y < 0.0 {
-                self.window_context.zoom_out();
+                window.borrow_mut().zoom_out();
             } else {
-                self.window_context.zoom_in();
+                window.borrow_mut().zoom_in();
             }
-            self.root.borrow_mut().scale_factor(self.window_context.effective_scale_factor());
-            request_layout();
-            style_root_element(self.root.borrow_mut().deref_mut(), self.window_context.window_size());
+            let scale_factor = window.borrow().effective_scale_factor();
+            window.borrow_mut().scale_factor(scale_factor);
+            window.borrow_mut().mark_dirty();
+            //style_root_element(window.borrow_mut().deref_mut(), window.borrow().window_size());
             self.request_redraw(RedrawFlags::new(true));
             return;
         }
@@ -352,13 +267,13 @@ impl App {
         let event = CraftMessage::PointerScroll(pointer_scroll_update);
         let message = event;
 
-        self.dispatch_event(&message, false);
+        self.dispatch_event(window, &message, false);
         self.request_redraw(RedrawFlags::new(true));
     }
 
-    pub fn on_pointer_button(&mut self, pointer_event: PointerButtonEvent, is_up: bool) {
+    pub fn on_pointer_button(&mut self, window: Rc<RefCell<Window>>, pointer_event: PointerButtonEvent, is_up: bool) {
         let mut pointer_event = pointer_event;
-        let zoom = self.window_context.zoom_factor;
+        let zoom = window.borrow().zoom_scale_factor();
         pointer_event.state.position.x /= zoom;
         pointer_event.state.position.y /= zoom;
 
@@ -370,62 +285,63 @@ impl App {
             CraftMessage::PointerButtonDown(pointer_event)
         };
         let message = event;
-        self.window_context.mouse_position = Some(Point::new(cursor_position.x, cursor_position.y));
+        window.borrow_mut().set_mouse_position(Some(Point::new(cursor_position.x, cursor_position.y)));
 
-        self.dispatch_event(&message, true);
+        self.dispatch_event(window.clone(), &message, true);
 
         self.request_redraw(RedrawFlags::new(true));
     }
 
-    pub fn on_pointer_moved(&mut self, mouse_moved: PointerUpdate) {
+    pub fn on_pointer_moved(&mut self, window: Rc<RefCell<Window>>, mouse_moved: PointerUpdate) {
         let mut mouse_moved = mouse_moved;
-        let zoom = self.window_context.zoom_factor;
+        let zoom = window.borrow().zoom_scale_factor();
         mouse_moved.current.position.x /= zoom;
         mouse_moved.current.position.y /= zoom;
 
-        self.window_context.mouse_position = Some(mouse_moved.current.logical_point());
+        window.borrow_mut().set_mouse_position(Some(mouse_moved.current.logical_point()));
 
         let message = CraftMessage::PointerMovedEvent(mouse_moved);
 
-        self.dispatch_event(&message, true);
+        self.dispatch_event(window.clone(), &message, true);
 
         self.request_redraw(RedrawFlags::new(true));
     }
 
-    pub fn on_ime(&mut self, ime: Ime) {
+    pub fn on_ime(&mut self, window: Rc<RefCell<Window>>, ime: Ime) {
         let event = CraftMessage::ImeEvent(ime);
         let message = event;
 
-        self.dispatch_event(&message, false);
+        self.dispatch_event(window.clone(), &message, false);
 
         self.request_redraw(RedrawFlags::new(true));
     }
 
-    /// Dispatch messages to the reactive tree.
-    fn dispatch_event(&mut self, message: &CraftMessage, _is_style: bool) {
+    fn dispatch_event(&mut self, window: Rc<RefCell<Window>>, message: &CraftMessage, _is_style: bool) {
+        let mouse_pos = Some(window.borrow().mouse_position());
+        let render_list = window.borrow().render_list.clone();
         self.event_dispatcher.dispatch_event(
             message,
-            self.window_context.mouse_position,
-            self.root.clone(),
+            mouse_pos.unwrap_or_default(),
+            window.clone(),
             &mut self.text_context,
-            &mut self.render_list,
+            render_list.borrow_mut().deref_mut(),
             &mut self.target_scratch,
         );
-        self.window.clone().unwrap().request_redraw();
+        window.borrow().winit_window().unwrap().request_redraw();
     }
 
-    pub fn on_keyboard_input(&mut self, keyboard_input: KeyboardEvent) {
+    pub fn on_keyboard_input(&mut self, window: Rc<RefCell<Window>>, keyboard_input: KeyboardEvent) {
         self.modifiers = keyboard_input.modifiers;
         if keyboard_input.key == ui_events::keyboard::Key::Named(NamedKey::Control) && keyboard_input.state.is_up() {
             self.modifiers.set(Modifiers::CONTROL, false);
         }
         if keyboard_input.modifiers.ctrl() {
             if keyboard_input.key == ui_events::keyboard::Key::Character("=".to_string()) {
-                self.window_context.zoom_in();
+                window.borrow_mut().zoom_in();
                 self.request_redraw(RedrawFlags::new(true));
                 return;
             } else if keyboard_input.key == ui_events::keyboard::Key::Character("-".to_string()) {
-                self.window_context.zoom_out();
+                window.borrow_mut().zoom_out();
                 self.request_redraw(RedrawFlags::new(true));
                 return;
             }
@@ -434,7 +350,7 @@ impl App {
         let keyboard_event = CraftMessage::KeyboardInputEvent(keyboard_input.clone());
         let message = keyboard_event;
 
-        self.dispatch_event(&message, false);
+        self.dispatch_event(window.clone(), &message, false);
 
         self.request_redraw(RedrawFlags::new(true));
     }
@@ -460,17 +376,15 @@ impl App {
         }
     }
 
-    fn view_introspection(&mut self) {}
-
     fn request_redraw(&mut self, redraw_flags: RedrawFlags) {
         self.redraw_flags = redraw_flags;
-        if let Some(window) = &self.window {
+        /*if let Some(window) = &self.window {
             window.request_redraw();
-        }
+        }*/
     }
 
     /// "Animates" a tree by calling `on_animation_frame` and changing an element's styles.
-    #[allow(dead_code)]
+    /*#[allow(dead_code)]
     fn animate_tree(&mut self, delta_time: &Duration, layout_origin: Point, viewport_size: LogicalSize<f32>) {
         /*let span = span!(Level::INFO, "animate_tree");
         let _enter = span.enter();*/
@@ -501,65 +415,7 @@ impl App {
             // Winit does not guarantee when a redraw event will happen, but that should be fine, at worst we redraw an extra time.
             self.request_redraw(RedrawFlags::new(old_has_active_animation));
         }
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    fn layout_tree(
-        &mut self,
-        viewport_size: LogicalSize<f32>,
-        origin: Point,
-        scale_factor: f64,
-        mouse_position: Option<Point>,
-    ) {
-        let root_element = self.root.clone();
-        let text_context = self.text_context.as_mut().unwrap();
-
-        {
-            /*let span = span!(Level::INFO, "layout");
-            let _enter = span.enter();*/
-            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-                layout(
-                    taffy_tree,
-                    root_element,
-                    viewport_size,
-                    text_context,
-                    origin,
-                    self.resource_manager.clone(),
-                    scale_factor,
-                    mouse_position,
-                )
-            });
-        };
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    fn draw_reactive_tree(&mut self, mouse_position: Option<Point>) {
-        let text_context = self.text_context.as_mut().unwrap();
-        {
-            /*let span = span!(Level::INFO, "render");
-            let _enter = span.enter();*/
-            self.render_list.clear();
-            let scale_factor = self.window_context.effective_scale_factor();
-
-            let renderer = self.renderer.as_mut().unwrap();
-
-            {
-                /*let span = span!(Level::INFO, "render(element)");
-                let _enter = span.enter();*/
-                self.root.borrow_mut().draw(&mut self.render_list, text_context, mouse_position, scale_factor);
-            }
-
-            renderer.sort_and_cull_render_list(&mut self.render_list);
-
-            let window = Rectangle {
-                x: 0.0,
-                y: 0.0,
-                width: renderer.surface_width(),
-                height: renderer.surface_height(),
-            };
-            renderer.prepare_render_list(&mut self.render_list, self.resource_manager.clone(), window);
-        }
-    }
+    }*/
 
     #[cfg(feature = "accesskit")]
     fn compute_accessibility_tree(&mut self) -> TreeUpdate {
@@ -576,11 +432,11 @@ impl App {
             focus: accesskit::NodeId(focus_id),
         };
 
-        self.root.borrow_mut().compute_accessibility_tree(
+        /*self.root.borrow_mut().compute_accessibility_tree(
             &mut tree_update,
             None,
             self.window_context.effective_scale_factor(),
-        );
+        );*/
         tree_update.nodes[0].1.set_role(Role::Window);
 
         tree_update
@@ -605,89 +461,4 @@ impl App {
             });
         });
     }
-}
-
-fn style_root_element(root: &mut dyn Element, root_size: LogicalSize<f32>) {
-    let is_user_root_height_auto = {
-        let root_children = root.children();
-        root_children[0].borrow().style().height().is_auto()
-    };
-
-    let style = root.style_mut();
-
-    style.set_width(Unit::Px(root_size.width));
-    style.set_wrap(Wrap::Wrap);
-    style.set_display(Display::Block);
-
-    if is_user_root_height_auto {
-        style.set_height(Unit::Auto);
-    } else {
-        style.set_height(Unit::Px(root_size.height));
-    }
-    root.update_taffy_style();
-}
-
-#[allow(clippy::too_many_arguments)]
-fn layout(
-    taffy_tree: &mut TaffyTree,
-    root_element: Rc<RefCell<dyn Element>>,
-    window_size: LogicalSize<f32>,
-    text_context: &mut TextContext,
-    origin: Point,
-    resource_manager: Arc<ResourceManager>,
-    scale_factor: f64,
-    pointer: Option<Point>,
-) -> NodeId {
-    let root_node = root_element
-        .borrow()
-        .element_data()
-        .layout_item
-        .taffy_node_id
-        .expect("A root element must have a layout node.");
-
-    let available_space: taffy::Size<AvailableSpace> = taffy::Size {
-        width: AvailableSpace::Definite(window_size.width),
-        height: AvailableSpace::Definite(window_size.height),
-    };
-
-    if taffy_tree.is_layout_dirty() {
-        /*let span = span!(Level::INFO, "layout(taffy)");
-        let _enter = span.enter();*/
-        taffy_tree.compute_layout(root_node, available_space, text_context, resource_manager.clone());
-    }
-
-    if taffy_tree.is_apply_layout_dirty() {
-        /*let span = span!(Level::INFO, "layout(apply)");
-                let _enter = span.enter();*/
-
-        // TODO: move into taffy_tree
-        let mut layout_order: u32 = 0;
-        root_element.borrow_mut().apply_layout(
-            taffy_tree,
-            origin,
-            &mut layout_order,
-            Affine::IDENTITY,
-            pointer,
-            text_context,
-            None,
-            scale_factor,
-        );
-        taffy_tree.apply_layout();
-    }
-
-    root_node
-}
-
-#[inline]
-pub fn request_layout() {
-    TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-        taffy_tree.request_layout();
-    });
-}
-
-#[inline]
-pub fn request_apply_layout() {
-    TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-        taffy_tree.request_apply_layout();
-    });
-}
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index 9b22b048..051bb460 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -1,3 +1,5 @@
+use std::cell::RefCell;
+use std::rc::Rc;
 #[cfg(target_arch = "wasm32")]
 use {
     wasm_bindgen::JsCast,
@@ -8,15 +10,13 @@ use {
 use {crate::wasm_queue::WasmQueue, crate::wasm_queue::WASM_QUEUE};
 
 use crate::events::internal::InternalMessage;
-use craft_renderer::renderer::Renderer;
 use crate::{CraftOptions};
 use craft_logging::info;
 
 use winit::application::ApplicationHandler;
 use winit::event::{StartCause, WindowEvent};
 use winit::event_loop::{ActiveEventLoop, ControlFlow};
-use winit::window::WindowAttributes;
-use winit::window::{Window, WindowId};
+use winit::window::{WindowId};
 
 #[cfg(not(target_arch = "wasm32"))]
 use std::time;
@@ -28,10 +28,9 @@ use craft_runtime::Sender;
 use craft_runtime::CraftRuntimeHandle;
 
 use crate::app::{App, CURRENT_WINDOW_ID, DOCUMENTS, WINDOW_MANAGER};
-use std::sync::Arc;
 use ui_events::pointer::{PointerEvent};
 use ui_events_winit::{WindowEventReducer, WindowEventTranslation};
-use winit::dpi::LogicalSize;
+use craft_primitives::geometry::Size;
 use crate::document::Document;
 
 const WAIT_TIME: time::Duration = time::Duration::from_millis(15);
@@ -73,19 +72,22 @@ impl ApplicationHandler for CraftWinitState {
     fn resumed(&mut self, event_loop: &ActiveEventLoop) {
         let craft_state = &mut self.craft_state;
         
-        let mut window_attributes =
+/*        let mut window_attributes =
             WindowAttributes::default().with_title(craft_state.craft_options.window_title.as_str()).with_visible(false);
 
         if let Some(window_size) = &craft_state.craft_options.window_size {
             window_attributes =
                 window_attributes.with_inner_size(LogicalSize::new(window_size.width, window_size.height));
-        }
+        }*/
         
         WINDOW_MANAGER.with_borrow_mut(|window_manager| {
-            window_manager.create_windows(event_loop);
+            window_manager.on_resume(craft_state, event_loop);
         });
 
-        #[cfg(target_arch = "wasm32")]
+
+        craft_state.craft_app.on_resume(event_loop);
+
+        /*#[cfg(target_arch = "wasm32")]
         let window_attributes = {
             let canvas = web_sys::window()
                 .unwrap()
@@ -97,39 +99,21 @@ impl ApplicationHandler for CraftWinitState {
                 .unwrap();
 
             window_attributes.with_canvas(Some(canvas))
-        };
-
-        let window: Arc<Window> =
-            Arc::from(event_loop.create_window(window_attributes).expect("Failed to create window."));
-        info!("Created window");
-
+        };*/
         //craft_state.event_reducer.set_scale_factor(&window);
-
-        let renderer_type = craft_state.craft_options.renderer;
-        let window_copy = window.clone();
-
-        cfg_if::cfg_if! {
-            if #[cfg(not(target_arch = "wasm32"))] {
-                    let renderer = craft_state.runtime.borrow_tokio_runtime().block_on(async {
-                        let renderer: Box<dyn Renderer> = renderer_type.create(window_copy).await;
-                    renderer
-                });
-                craft_state.craft_app.on_resume(window, renderer, event_loop);
-            } else {
-                let app_sender = craft_state.app_sender.clone();
-                let window_copy_2 = window_copy.clone();
-                craft_state.runtime.spawn(async move {
-                    let renderer: Box<dyn Renderer> = renderer_type.create(window_copy).await;
-                    app_sender
-                        .send(InternalMessage::RendererCreated(window_copy_2, renderer))
-                        .await
-                        .expect("Failed to send RendererCreated message");
-                });
-            }
-        }
     }
 
     fn window_event(&mut self, event_loop: &ActiveEventLoop, window_id: WindowId, event: WindowEvent) {
+        let window: Option<Rc<RefCell<crate::elements::Window>>> = WINDOW_MANAGER.with_borrow_mut(|window_manager| {
+           window_manager.get_window_by_id(window_id)
+        });
+
+        let window = if let Some(window) = window {
+            window
+        } else {
+            return
+        };
+
         let craft_state = &mut self.craft_state;
 
         CURRENT_WINDOW_ID.set(Some(window_id));
@@ -140,10 +124,10 @@ impl ApplicationHandler for CraftWinitState {
             }
         });
 
-        #[cfg(feature = "accesskit")]
+        /*#[cfg(feature = "accesskit")]
         if let Some(accesskit_adapter) = &mut craft_state.craft_app.accesskit_adapter {
             accesskit_adapter.process_event(craft_state.craft_app.window.as_ref().unwrap(), &event);
-        }
+        }*/
 
         if !matches!(
             event,
@@ -158,26 +142,26 @@ impl ApplicationHandler for CraftWinitState {
                     if keyboard_event.state.is_down() && matches!(keyboard_event.key, Key::Named(NamedKey::Escape)) {
                         event_loop.exit();
                     } else {
-                        craft_state.craft_app.on_keyboard_input(keyboard_event);
+                        craft_state.craft_app.on_keyboard_input(window, keyboard_event);
                     }
                     return;
                 }
                 Some(WindowEventTranslation::Pointer(pointer_event)) => {
                     match pointer_event {
                         PointerEvent::Down(pointer_button_update) => {
-                            craft_state.craft_app.on_pointer_button(pointer_button_update, false);
+                            craft_state.craft_app.on_pointer_button(window, pointer_button_update, false);
                         }
                         PointerEvent::Up(pointer_button_update) => {
-                            craft_state.craft_app.on_pointer_button(pointer_button_update, true);
+                            craft_state.craft_app.on_pointer_button(window, pointer_button_update, true);
                         }
                         PointerEvent::Move(pointer_update) => {
-                            craft_state.craft_app.on_pointer_moved(pointer_update);
+                            craft_state.craft_app.on_pointer_moved(window, pointer_update);
                         }
                         PointerEvent::Cancel(_) => {}
                         PointerEvent::Enter(_) => {}
                         PointerEvent::Leave(_) => {}
                         PointerEvent::Scroll(pointer_scroll_update) => {
-                            craft_state.craft_app.on_pointer_scroll(pointer_scroll_update);
+                            craft_state.craft_app.on_pointer_scroll(window, pointer_scroll_update);
                         },
                         PointerEvent::Gesture(_) => todo!()
                     }
@@ -189,20 +173,29 @@ impl ApplicationHandler for CraftWinitState {
 
         match event {
             WindowEvent::CloseRequested => {
-                craft_state.close_requested = true;
-                craft_state.craft_app.on_close_requested();
+                WINDOW_MANAGER.with_borrow_mut(|window_manager| {
+                   window_manager.close_window(&window);
+                    if window_manager.is_empty() {
+                        craft_state.close_requested = true;
+                        craft_state.craft_app.on_close_requested();
+                    }
+                });
             }
             WindowEvent::ScaleFactorChanged { scale_factor, .. } => {
                 craft_state.craft_app.on_scale_factor_changed(scale_factor);
             }
             WindowEvent::Resized(new_size) => {
-                craft_state.craft_app.on_resize(new_size);
+                let new_size = Size::<f32> {
+                    width: new_size.width as f32,
+                    height: new_size.height as f32,
+                };
+                craft_state.craft_app.on_resize(window, new_size);
             }
             WindowEvent::Ime(ime) => {
-                craft_state.craft_app.on_ime(ime);
+                craft_state.craft_app.on_ime(window, ime);
             }
             WindowEvent::RedrawRequested => {
-                craft_state.craft_app.on_request_redraw();
+                craft_state.craft_app.on_request_redraw(window);
             }
             _ => (),
         }
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 2d2a7393..3f65c183 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -1,9 +1,8 @@
 //! Stores one or more elements.
 
-use crate::app::TAFFY_TREE;
 use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
 use crate::elements::element_data::ElementData;
-use crate::elements::{scrollable, Element};
+use crate::elements::{scrollable, Element, Window};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
@@ -13,6 +12,7 @@ use kurbo::{Affine, Point};
 use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
+use crate::window_manager::WindowManager;
 
 /// Stores one or more elements.
 ///
@@ -22,16 +22,20 @@ pub struct Container {
 }
 
 impl Container {
-    pub fn new() -> Rc<RefCell<Self>> {
+    pub fn new_mw(window: &Rc<RefCell<Window>>) -> Rc<RefCell<Self>> {
         let me = Rc::new_cyclic(|me: &Weak<RefCell<Container>>| {
             RefCell::new(Container {
-                element_data: ElementData::new(me.clone(), true),
+                element_data: ElementData::new(Rc::downgrade(window), me.clone(), true),
             })
         });
 
-        me.borrow_mut().element_data.crate_layout_node(None);
+        me.borrow_mut().element_data.create_layout_node(None);
         me
     }
+
+    pub fn new() -> Rc<RefCell<Self>> {
+        Self::new_mw(&WindowManager::get_main_window())
+    }
 }
 
 impl crate::elements::core::ElementData for Container {
@@ -54,13 +58,14 @@ impl Element for Container {
         self.element_data.children.push(child.clone());
 
         // Add the children's taffy node.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+        {
+            let mut taffy_tree = self.element_data.taffy_tree.borrow_mut();
             let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
             let child_id = child.borrow().element_data().layout_item.taffy_node_id;
             if let Some(child_id) = child_id {
                 taffy_tree.add_child(parent_id, child_id);
             }
-        });
+        }
 
         self
     }
@@ -84,14 +89,15 @@ impl Element for Container {
         self.element_data.children.extend(children.iter().cloned());
 
         // Add the children's taffy node.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+        {
+            let mut taffy_tree = self.element_data.taffy_tree.borrow_mut();
             let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
             for child in &children {
                 if let Some(child_id) = child.borrow().element_data().layout_item.taffy_node_id {
                     taffy_tree.add_child(parent_id, child_id);
                 }
             }
-        });
+        };
 
         self
     }
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index 32cc0060..0a93fa02 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -17,9 +17,7 @@ use crate::elements::Element;
 #[cfg(feature = "accesskit")]
 use accesskit::{Action, Role};
 use craft_primitives::geometry::borders::CssRoundedRect;
-use crate::app::TAFFY_TREE;
 use crate::layout::TaffyTree;
-use crate::request_layout;
 
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
 pub trait  ElementInternals: ElementData {
@@ -368,24 +366,19 @@ pub trait  ElementInternals: ElementData {
 
     /// Mark layout node dirty.
     fn mark_dirty(&mut self) {
-        request_layout();
         let id = self.element_data().layout_item.taffy_node_id;
         if let Some(id) = id {
-            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-               taffy_tree.mark_dirty(id);
-            });
+            let mut taffy_tree = self.element_data().taffy_tree.borrow_mut();
+            taffy_tree.mark_dirty(id);
         }
     }
 
     /// Updates taffy's style to reflect craft's style struct.
     fn update_taffy_style(&mut self) {
-        request_layout();
-
         let id = self.element_data().layout_item.taffy_node_id;
         if let Some(id) = id {
-            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-                taffy_tree.set_style(id, self.element_data().style.to_taffy_style());
-            });
+            let mut taffy_tree = self.element_data().taffy_tree.borrow_mut();
+            taffy_tree.set_style(id, self.element_data().style.to_taffy_style());
         }
     }
 
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index b073cc4b..818c18a0 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -1,4 +1,4 @@
-use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
+use crate::app::{DOCUMENTS, ELEMENTS, FOCUS};
 use crate::document::Document;
 use crate::elements::core::ElementData;
 use crate::elements::ElementIdMap;
@@ -37,7 +37,8 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         self.element_data_mut().children.swap(position_1, position_2);
 
         // Swap the children's taffy nodes.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+        {
+            let mut taffy_tree = self.element_data().taffy_tree.borrow_mut();
             let parent_id = self.element_data().layout_item.taffy_node_id;
             let child_1_id = child_1.borrow().element_data().layout_item.taffy_node_id;
             let child_2_id = child_2.borrow().element_data().layout_item.taffy_node_id;
@@ -66,7 +67,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
                 taffy_tree.mark_dirty(parent_id);
                 taffy_tree.request_layout();
             }
-        });
+        }
 
         Ok(())
     }
@@ -94,7 +95,8 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
 
         child.borrow_mut().element_data_mut().parent = None;
 
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+        {
+            let mut taffy_tree = self.element_data().taffy_tree.borrow_mut();
             let child_id = child.borrow().element_data().layout_item.taffy_node_id;
 
             if let Some(child_id) = child_id {
@@ -103,7 +105,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
 
             let parent_id = self.element_data().layout_item.taffy_node_id;
             taffy_tree.mark_dirty(parent_id.unwrap());
-        });
+        }
 
         // TODO: Move to document
         fn remove_element_from_document(
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index 2ecedb47..9d112178 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -1,8 +1,7 @@
 use crate::animations::animation::ActiveAnimation;
 use crate::elements::element_id::create_unique_element_id;
-use crate::elements::element_states::ElementState;
 use crate::elements::scroll_state::ScrollState;
-use crate::elements::Element;
+use crate::elements::{Element, Window};
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
 use crate::layout::layout_item::LayoutItem;
 use crate::style::Style;
@@ -12,30 +11,30 @@ use smol_str::SmolStr;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 use taffy::{Layout, Overflow};
-use crate::app::{ELEMENTS, TAFFY_TREE};
+use crate::app::{ELEMENTS};
 use crate::layout::layout_context::LayoutContext;
+use crate::layout::TaffyTree;
 
 /// Stores common data to most elements.
 #[derive(Clone)]
 pub struct ElementData {
-    pub current_state: ElementState,
-
-    /// The style of the element.
-    pub style: Style,
+    /// A cyclic weak pointer to the element.
+    pub(crate) me: Weak<RefCell<dyn Element>>,
 
-    pub layout_item: LayoutItem,
+    /// The window which owns this element.
+    pub(crate) window: Option<Weak<RefCell<Window>>>,
 
-    /// The style of the element when it is hovered.
-    pub hover_style: Option<Style>,
+    /// The Element's parent.
+    pub(crate) parent: Option<Weak<RefCell<dyn Element>>>,
 
-    /// The style of the element when it is pressed.
-    pub pressed_style: Option<Style>,
+    /// The taffy tree where the element's layout will be stored.
+    pub(crate) taffy_tree: Rc<RefCell<TaffyTree>>,
 
-    /// The style of the element when it is disabled.
-    pub disabled_style: Option<Style>,
+    /// The style of the element.
+    pub style: Style,
 
-    /// The style of the element when it is focused.
-    pub focused_style: Option<Style>,
+    /// Stores the layout data for an element.
+    pub layout_item: LayoutItem,
 
     /// The children of the element.
     pub children: Vec<Rc<RefCell<dyn Element>>>,
@@ -43,51 +42,88 @@ pub struct ElementData {
     /// A user-defined id for the element.
     pub id: Option<SmolStr>,
 
+    /// A unique id for this element. Within a craft app the id will be unique even across windows.
     pub(crate) internal_id: u64,
 
     pub(crate) animations: Option<FxHashMap<SmolStr, ActiveAnimation>>,
-    pub(crate) parent: Option<Weak<RefCell<dyn Element>>>,
+
+    /// Scrollbar state for elements that may have a scrollbar.
+    pub(super) scroll_state: Option<ScrollState>,
+
+    // Events:
     pub on_slider_value_changed: Vec<SliderValueChangedHandler>,
     pub on_pointer_enter: Vec<PointerEnterHandler>,
     pub on_pointer_leave: Vec<PointerLeaveHandler>,
-    pub(crate) me: Weak<RefCell<dyn Element>>,
     pub on_got_pointer_capture: Vec<PointerCaptureHandler>,
     pub on_lost_pointer_capture: Vec<PointerCaptureHandler>,
     pub on_pointer_button_down: Vec<PointerEventHandler>,
     pub on_pointer_button_up: Vec<PointerEventHandler>,
     pub on_pointer_moved: Vec<PointerUpdateHandler>,
     pub on_keyboard_input: Vec<KeyboardInputHandler>,
-    /// Scrollbar state for elements that may have a scrollbar.
-    pub(super) scroll_state: Option<ScrollState>,
 }
 
 impl ElementData {
 
-    pub fn new(me: Weak<RefCell<dyn Element>>, scrollable: bool) -> Self {
+    pub fn new(window: Weak<RefCell<Window>>, me: Weak<RefCell<dyn Element>>, scrollable: bool) -> Self {
         let mut default = Self {
-            current_state: Default::default(),
+            me,
+            window: Some(window.clone()),
+            parent: None,
             style: Default::default(),
+            taffy_tree: window.upgrade().unwrap().borrow().taffy_tree.clone(),
             layout_item: Default::default(),
-            hover_style: None,
-            pressed_style: None,
-            disabled_style: None,
-            focused_style: None,
             children: Default::default(),
             id: None,
             internal_id: create_unique_element_id(),
             animations: None,
-            parent: None,
-            on_slider_value_changed: vec![],
-            on_pointer_enter: vec![],
-            on_pointer_leave: vec![],
+            scroll_state: None,
+
+            on_slider_value_changed: Vec::new(),
+            on_pointer_enter: Vec::new(),
+            on_pointer_leave: Vec::new(),
+            on_got_pointer_capture: Vec::new(),
+            on_lost_pointer_capture: Vec::new(),
+            on_pointer_button_down: Vec::new(),
+            on_pointer_button_up: Vec::new(),
+            on_pointer_moved: Vec::new(),
+            on_keyboard_input: Vec::new(),
+        };
+
+        // Create scroll state if needed.
+        if scrollable {
+            default.scroll_state = Some(ScrollState::default());
+        }
+
+        ELEMENTS.with_borrow_mut(|elements| {
+            elements.insert_id(default.internal_id, default.me.clone());
+        });
+
+        default
+    }
+
+    pub fn new_window(taffy_tree: Rc<RefCell<TaffyTree>>, me: Weak<RefCell<dyn Element>>, scrollable: bool) -> Self {
+        let mut default = Self {
             me,
-            on_got_pointer_capture: vec![],
-            on_lost_pointer_capture: vec![],
-            on_pointer_button_down: vec![],
-            on_pointer_button_up: vec![],
-            on_pointer_moved: vec![],
-            on_keyboard_input: vec![],
+            window: None,
+            parent: None,
+            style: Default::default(),
+            taffy_tree,
+            layout_item: Default::default(),
+            children: Default::default(),
+            id: None,
+            internal_id: create_unique_element_id(),
+            animations: None,
             scroll_state: None,
+
+            on_slider_value_changed: Vec::new(),
+            on_pointer_enter: Vec::new(),
+            on_pointer_leave: Vec::new(),
+            on_got_pointer_capture: Vec::new(),
+            on_lost_pointer_capture: Vec::new(),
+            on_pointer_button_down: Vec::new(),
+            on_pointer_button_up: Vec::new(),
+            on_pointer_moved: Vec::new(),
+            on_keyboard_input: Vec::new(),
         };
 
         // Create scroll state if needed.
@@ -103,16 +139,15 @@ impl ElementData {
     }
 
     /// Creates a new taffy node for this element with optional layout context.
-    pub fn crate_layout_node(&mut self, layout_context: Option<LayoutContext>) {
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let style = self.style.to_taffy_style();
-            let node_id = if let Some(layout_context) = layout_context {
-                taffy_tree.new_leaf_with_context(style, layout_context)
-            } else {
-                taffy_tree.new_leaf(style)
-            };
-            self.layout_item.taffy_node_id = Some(node_id);
-        });
+    pub fn create_layout_node(&mut self, layout_context: Option<LayoutContext>) {
+        let mut taffy_tree = self.taffy_tree.borrow_mut();
+        let style = self.style.to_taffy_style();
+        let node_id = if let Some(layout_context) = layout_context {
+            taffy_tree.new_leaf_with_context(style, layout_context)
+        } else {
+            taffy_tree.new_leaf(style)
+        };
+        self.layout_item.taffy_node_id = Some(node_id);
     }
 
     /// Computes the scrollbar's tack and thumb layout.
diff --git a/crates/craft_retained/src/elements/element_states.rs b/crates/craft_retained/src/elements/element_states.rs
deleted file mode 100644
index 8e9e4cb1..00000000
--- a/crates/craft_retained/src/elements/element_states.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum ElementState {
-    #[default]
-    Normal,
-    Hovered,
-    Pressed,
-    Disabled,
-    Focused,
-}
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 33a60c2b..fe73361f 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -1,10 +1,10 @@
 //! Displays an image.
 
 use crate::app::ELEMENTS;
-use crate::app::{PENDING_RESOURCES, TAFFY_TREE};
+use crate::app::{PENDING_RESOURCES};
 use crate::elements::core::ElementInternals;
 use crate::elements::element_data::ElementData;
-use crate::elements::Element;
+use crate::elements::{Element, Window};
 use crate::layout::layout_context::{ImageContext, LayoutContext};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
@@ -17,6 +17,7 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::ops::Deref;
 use std::rc::{Rc, Weak};
+use crate::window_manager::WindowManager;
 
 /// Displays an image.
 pub struct Image {
@@ -26,17 +27,17 @@ pub struct Image {
 }
 
 impl Image {
-    pub fn new(resource_identifier: ResourceIdentifier) -> Rc<RefCell<Self>> {
+    pub fn new_mw(window: &Rc<RefCell<Window>>,  resource_identifier: ResourceIdentifier) -> Rc<RefCell<Self>> {
         let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
             RefCell::new(Self {
                 is_image_dirty: false,
                 resource_identifier: resource_identifier.clone(),
-                element_data: ElementData::new(me.clone(), false),
+                element_data: ElementData::new(Rc::downgrade(window), me.clone(), false),
             })
         });
 
         let layout_context = Some(LayoutContext::Image(ImageContext::new(resource_identifier.clone())));
-        me.borrow_mut().element_data.crate_layout_node(layout_context);
+        me.borrow_mut().element_data.create_layout_node(layout_context);
 
         PENDING_RESOURCES.with_borrow_mut(|pending_resources| {
             pending_resources.push_back((resource_identifier, ResourceType::Image));
@@ -49,15 +50,20 @@ impl Image {
         me
     }
 
+    pub fn new(resource_identifier: ResourceIdentifier) -> Rc<RefCell<Self>> {
+        Self::new_mw(&WindowManager::get_main_window(), resource_identifier)
+    }
+
     pub fn image(&mut self, resource_identifier: ResourceIdentifier) -> &mut Self {
         self.is_image_dirty = true;
         self.resource_identifier = resource_identifier.clone();
 
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+        {
+            let mut taffy_tree = self.element_data.taffy_tree.borrow_mut();
             let context = LayoutContext::Image(ImageContext::new(resource_identifier));
             let node = self.element_data.layout_item.taffy_node_id.expect("Failed to get Image node");
             taffy_tree.set_node_context(node, Some(context));
-        });
+        }
 
         self
     }
diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index 37e8ca0c..ff8f19b2 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -3,7 +3,6 @@ mod element;
 pub mod core;
 mod text;
 mod element_data;
-mod element_states;
 mod scroll_state;
 
 mod element_id;
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index d90ebb60..f2d9ca58 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -3,7 +3,6 @@ use crate::events::{CraftMessage, Event};
 use kurbo::Point;
 use ui_events::pointer::{PointerId, PointerType};
 use ui_events::ScrollDelta;
-use crate::app::request_apply_layout;
 
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage, event: &mut Event) {
@@ -27,7 +26,11 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
 
                 let current_scroll_y = state.scroll_y();
                 state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-                request_apply_layout();
+
+                {
+                    let mut taffy_tree = element_data.taffy_tree.borrow_mut();
+                    taffy_tree.request_apply_layout();
+                }
 
                 event.prevent_propagate();
                 event.prevent_defaults();
@@ -78,7 +81,10 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
                         let scroll_y = percent * element_data.layout_item.max_scroll_y;
 
                         state.set_scroll_y(scroll_y.clamp(0.0, element_data.layout_item.max_scroll_y));
-                        request_apply_layout();
+                        {
+                            let mut taffy_tree = element_data.taffy_tree.borrow_mut();
+                            taffy_tree.request_apply_layout();
+                        }
 
                         event.prevent_propagate();
                         event.prevent_defaults();
@@ -115,7 +121,12 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
 
                     let current_scroll_y = state.scroll_y();
                     state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-                    request_apply_layout();
+
+                    {
+                        let mut taffy_tree = element_data.taffy_tree.borrow_mut();
+                        taffy_tree.request_apply_layout();
+                    }
+
                     state.scroll_click = Some(Point::new(click.x, pointer_motion.current.position.y));
                     event.prevent_propagate();
                     event.prevent_defaults();
diff --git a/crates/craft_retained/src/elements/slider/slider.rs b/crates/craft_retained/src/elements/slider/slider.rs
index 8cd3b1d3..c6bc18cf 100644
--- a/crates/craft_retained/src/elements/slider/slider.rs
+++ b/crates/craft_retained/src/elements/slider/slider.rs
@@ -1,8 +1,7 @@
-use crate::app::{queue_event, ELEMENTS};
-use crate::app::TAFFY_TREE;
+use crate::app::{queue_event};
 use crate::elements::core::ElementInternals;
 use crate::elements::element_data::ElementData;
-use crate::elements::Element;
+use crate::elements::{Element, Window};
 use crate::events::{CraftMessage, Event};
 use crate::palette;
 use crate::style::Unit;
@@ -13,11 +12,11 @@ use kurbo::{Affine, Point};
 use peniko::Color;
 use std::any::Any;
 use std::cell::RefCell;
-use std::ops::Deref;
 use std::rc::{Rc, Weak};
 use ui_events::keyboard::{Code, KeyState};
 use ui_events::pointer::PointerId;
 use crate::layout::TaffyTree;
+use crate::window_manager::WindowManager;
 
 #[derive(Clone, Copy, Default, Debug, PartialEq, Eq)]
 pub enum SliderDirection {
@@ -47,9 +46,9 @@ pub struct Slider {
 }
 
 impl Slider {
-    pub fn new(thumb_size: f32) -> Rc<RefCell<Self>> {
+    pub fn new_mw(window: &Rc<RefCell<Window>>, thumb_size: f32) -> Rc<RefCell<Self>> {
         let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| RefCell::new(Self {
-            element_data: ElementData::new(me.clone(), false),
+            element_data: ElementData::new(Rc::downgrade(window), me.clone(), false),
             step: 1.0,
             min: 0.0,
             max: 100.0,
@@ -80,18 +79,24 @@ impl Slider {
         }
 
 
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+        // TODO: FIX
+       /* {
+            let mut taffy_tree = self.element_data.taffy_tree.borrow_mut();
             let node_id = taffy_tree.new_leaf(me.borrow().style().to_taffy_style());
             me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
         });
 
         ELEMENTS.with_borrow_mut(|elements| {
             elements.insert(me.borrow().deref());
-        });
+        });*/
 
         me
     }
 
+    pub fn new(thumb_size: f32) -> Rc<RefCell<Self>> {
+        Self::new_mw(&WindowManager::get_main_window(), thumb_size)
+    }
+
     pub fn value(&mut self, value: f64) -> &mut Self {
         self.value = value;
         self
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index e2b708fb..4ffe6bb0 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -20,7 +20,7 @@ const MAX_CACHE_SIZE: usize = 16;
 use crate::elements::core::ElementInternals;
 #[cfg(feature = "accesskit")]
 use crate::elements::element_id::create_unique_element_id;
-use crate::elements::Element;
+use crate::elements::{Element, Window};
 use crate::layout::TaffyTree;
 #[cfg(feature = "accesskit")]
 use accesskit::{Action, Role};
@@ -37,6 +37,7 @@ use ui_events::pointer::{PointerButton, PointerId};
 #[cfg(target_arch = "wasm32")]
 use web_time as time;
 use winit::dpi;
+use crate::window_manager::WindowManager;
 
 // A stateful element that shows text.
 #[derive(Clone)]
@@ -50,7 +51,7 @@ pub struct Text {
 #[derive(Clone)]
 pub struct TextState {
     text: SmolStr,
-    scale_factor: f32,
+    scale_factor: f64,
     selection: Selection,
     pub(crate) text_render: Option<TextRender>,
     layout: Option<parley::Layout<ColorBrush>>,
@@ -76,9 +77,9 @@ pub struct TextState {
 }
 
 impl Text {
-    pub fn new(text: &str) -> Rc<RefCell<Self>> {
+    pub fn new_mw(window: &Rc<RefCell<Window>>, text: &str) -> Rc<RefCell<Self>> {
         let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| RefCell::new(Text {
-            element_data: ElementData::new(me.clone(), false),
+            element_data: ElementData::new(Rc::downgrade(window), me.clone(), false),
             selectable: true,
             state: TextState::default(),
             me: me.clone(),
@@ -87,13 +88,17 @@ impl Text {
         let text_context = Some(LayoutContext::Text(TaffyTextContext {
             element: me.borrow().me.clone(),
         }));
-        me.borrow_mut().element_data.crate_layout_node(text_context);
+        me.borrow_mut().element_data.create_layout_node(text_context);
 
         me.borrow_mut().text(text);
 
         me
     }
 
+    pub fn new(text: &str) -> Rc<RefCell<Self>> {
+        Self::new_mw(&WindowManager::get_main_window(), text)
+    }
+
     pub fn get_selectable(&self) -> bool {
         self.selectable
     }
@@ -355,7 +360,7 @@ impl ElementInternals for Text {
         self.state.is_layout_dirty = true;
         self.state.is_render_dirty = true;
         self.mark_dirty();
-        self.state.scale_factor = scale_factor as f32;
+        self.state.scale_factor = scale_factor;
     }
 }
 
@@ -372,7 +377,7 @@ impl TextState {
         }
 
         if self.layout.is_none() {
-            let mut builder = text_context.tree_builder(self.scale_factor, &style.to_text_style());
+            let mut builder = text_context.tree_builder(self.scale_factor as f32, &style.to_text_style());
             let text = &self.text;
             builder.push_text(text);
             let (layout, _) = builder.build();
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index e065349c..eb2477f1 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -16,7 +16,7 @@ use std::rc::{Rc, Weak};
 use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
 #[cfg(feature = "accesskit")]
 use crate::elements::element_id::create_unique_element_id;
-use crate::elements::scrollable;
+use crate::elements::{scrollable, Window};
 use crate::elements::text_input::text_input_state::TextInputState;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
@@ -29,6 +29,7 @@ use kurbo::Affine;
 use parley::BoundingBox;
 use ui_events::pointer::PointerButton;
 use winit::event::Ime;
+use crate::window_manager::WindowManager;
 
 // A stateful element that shows text.
 #[derive(Clone)]
@@ -54,7 +55,7 @@ pub enum TextInputMessage {
 }
 
 impl TextInput {
-    pub fn new(text: &str) -> Rc<RefCell<Self>> {
+    pub fn new_mw(window: &Rc<RefCell<Window>>, text: &str) -> Rc<RefCell<Self>> {
         let default_style = Self::get_default_style();
 
         let text_input_state = TextInputState::default();
@@ -62,7 +63,7 @@ impl TextInput {
         let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
             RefCell::new(Self {
                 text: Some(text.to_string()),
-                element_data: ElementData::new(me.clone(), true),
+                element_data: ElementData::new(Rc::downgrade(window), me.clone(), true),
                 use_text_value_on_update: true,
                 ranged_styles: Some(RangedStyles::new(vec![])),
                 disabled: false,
@@ -77,7 +78,7 @@ impl TextInput {
         let context = Some(LayoutContext::TextInput(TaffyTextInputContext {
             element: me.borrow().me.clone(),
         }));
-        me.borrow_mut().element_data.crate_layout_node(context);
+        me.borrow_mut().element_data.create_layout_node(context);
 
         ELEMENTS.with_borrow_mut(|elements| {
             elements.insert(me.borrow().deref());
@@ -85,6 +86,10 @@ impl TextInput {
 
         me
     }
+
+    pub fn new(text: &str) -> Rc<RefCell<Self>> {
+        Self::new_mw(&WindowManager::get_main_window(), text)
+    }
 }
 
 impl crate::elements::core::ElementData for TextInput {
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index 0febbc98..d7afcd43 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -16,7 +16,6 @@ use std::time::{Duration, Instant};
 #[cfg(target_arch = "wasm32")]
 use web_time::{Duration, Instant};
 
-use crate::app::TAFFY_TREE;
 use crate::elements::core::ElementInternals;
 use crate::elements::text_input::parley_box_to_rect;
 use crate::elements::TextInput;
@@ -27,7 +26,6 @@ use parley::{Affinity, ContentWidths, Cursor, Selection};
 use peniko::Color;
 use ui_events::pointer::PointerUpdate;
 use winit::dpi;
-use crate::request_layout;
 
 #[derive(Clone)]
 pub struct TextInputState {
@@ -69,7 +67,7 @@ impl Default for TextInputState {
     fn default() -> Self {
         let default_style = TextInput::get_default_style();
         let mut editor = PlainEditor::new(default_style.font_size());
-        editor.set_scale(1.0f32);
+        editor.set_scale(1.0f64);
         let style_set = editor.edit_styles();
         default_style.add_styles_to_style_set(style_set);
         Self {
@@ -121,7 +119,7 @@ impl TextInputState {
         // NOTE: Cursor position should be relative to the top left of the text box.
         let cursor_pos = pointer_moved.current.logical_point();
         let cursor_pos: Point = (cursor_pos - self.origin).to_point();
-        let mut cursor_pos = Point::new(cursor_pos.x * self.scale_factor, cursor_pos.y * self.scale_factor);
+        let mut cursor_pos = Point::new(cursor_pos.x * self.scale_factor as f64, cursor_pos.y * self.scale_factor as f64);
         cursor_pos.y += scroll_y;
         self.cursor_pos = cursor_pos;
         // macOS seems to generate a spurious move after selecting word?
@@ -129,7 +127,8 @@ impl TextInputState {
             self.reset_blink();
             let cursor_pos = self.cursor_pos();
             self.driver(text_context).extend_selection_to_point(cursor_pos.x as f32, cursor_pos.y as f32);
-            request_layout();
+            // TODO: Fix
+            //request_layout();
         }
     }
 
@@ -165,9 +164,9 @@ impl TextInputState {
         self.content_widths = None;
 
         if let Some(id) = self.taffy_node {
-            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-                taffy_tree.mark_dirty(id);
-            })
+            // TODO: FIX
+            //let mut taffy_tree = self.element_data().taffy_tree.borrow_mut();
+            //taffy_tree.mark_dirty(id);
         }
     }
 
@@ -211,7 +210,7 @@ impl TextInputState {
                 AvailableSpace::Definite(width) => Some(width),
             })
             .map(|width| {
-                let width: f32 = dpi::PhysicalUnit::from_logical::<f32, f32>(width, self.scale_factor).0;
+                let width: f32 = dpi::PhysicalUnit::from_logical::<f32, f32>(width, self.scale_factor as f64).0;
                 // Taffy may give a min width > max_width.
                 // Min-width is preserved in this scenario to ensure text is readable.
                 width.clamp(content_widths.min, content_widths.max.max(content_widths.min))
@@ -224,7 +223,7 @@ impl TextInputState {
                 AvailableSpace::MaxContent => None,
                 AvailableSpace::Definite(height) => Some(height),
             })
-            .map(|height| dpi::PhysicalUnit::from_logical::<f32, f32>(height, self.scale_factor).0);
+            .map(|height| dpi::PhysicalUnit::from_logical::<f32, f32>(height, self.scale_factor as f64).0);
 
         self.editor.set_width(width_constraint);
         self.editor.refresh_layout(&mut text_context.font_context, &mut text_context.layout_context);
@@ -235,8 +234,8 @@ impl TextInputState {
             self.text_render = Some(text_render_data::from_editor(layout));
         }
 
-        let logical_width = dpi::LogicalUnit::from_physical::<f32, f32>(layout.width(), self.scale_factor).0;
-        let logical_height = dpi::LogicalUnit::from_physical::<f32, f32>(layout.height(), self.scale_factor).0;
+        let logical_width = dpi::LogicalUnit::from_physical::<f32, f32>(layout.width(), self.scale_factor as f64).0;
+        let logical_height = dpi::LogicalUnit::from_physical::<f32, f32>(layout.height(), self.scale_factor as f64).0;
 
         let size = taffy::Size {
             width: logical_width,
@@ -309,7 +308,7 @@ impl TextInputState {
     /// Set's the scale factor.
     pub fn set_scale_factor(&mut self, scale_factor: f64) {
         self.scale_factor = scale_factor;
-        self.editor.set_scale(scale_factor as f32);
+        self.editor.set_scale(scale_factor);
         self.clear_cache();
     }
 
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 01cb8de5..9c261787 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -1,39 +1,62 @@
 //! Stores one or more elements.
 
-use crate::app::{TAFFY_TREE, WINDOW_MANAGER};
+use crate::app::{WINDOW_MANAGER};
 use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
 use crate::elements::element_data::ElementData;
 use crate::elements::{scrollable, Element};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
-use craft_primitives::geometry::Rectangle;
+use craft_primitives::geometry::{Rectangle, Size};
 use craft_renderer::RenderList;
 use kurbo::{Affine, Point};
 use std::any::Any;
 use std::cell::RefCell;
+use std::ops::DerefMut;
 use std::rc::{Rc, Weak};
-
+use std::sync::Arc;
+use peniko::Color;
+use taffy::{AvailableSpace, NodeId};
 use winit::window::Window as WinitWindow;
+use crate::RendererBox;
+use craft_resource_manager::ResourceManager;
 
 /// Stores one or more elements.
 ///
 /// If overflow is set to scroll, it will become scrollable.
 pub struct Window {
     element_data: ElementData,
-    winit_window: Option<Rc<RefCell<WinitWindow>>>,
+    pub(crate) winit_window: Option<Arc<WinitWindow>>,
+    /// The physical window size from winit.
+    pub(crate) window_size: Size<f32>,
+    /// The window's scale factor from winit.
+    scale_factor: f64,
+    /// Zoom scale factor.
+    zoom_scale_factor: f64,
+    mouse_positon: Option<Point>,
+    pub(crate) renderer: Option<RendererBox>,
+    pub(crate) taffy_tree: Rc<RefCell<TaffyTree>>,
+    pub(crate) render_list: Rc<RefCell<RenderList>>,
 }
 
 impl Window {
     pub fn new() -> Rc<RefCell<Self>> {
+        let taffy_tree = Rc::new(RefCell::new(TaffyTree::new()));
         let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
             RefCell::new(Self {
-                element_data: ElementData::new(me.clone(), true),
+                element_data: ElementData::new_window(taffy_tree.clone(), me.clone(), true),
                 winit_window: None,
+                window_size: Default::default(),
+                scale_factor: 1.0,
+                zoom_scale_factor: 1.0,
+                mouse_positon: None,
+                renderer: None,
+                taffy_tree,
+                render_list: Rc::new(RefCell::new(RenderList::new())),
             })
         });
 
-        me.borrow_mut().element_data.crate_layout_node(None);
+        me.borrow_mut().element_data.create_layout_node(None);
 
         WINDOW_MANAGER.with_borrow_mut(|window_manager| {
             window_manager.add_window(me.clone());
@@ -41,6 +64,146 @@ impl Window {
 
         me
     }
+
+    pub fn winit_window(&self) -> Option<Arc<winit::window::Window>> {
+        self.winit_window.clone()
+    }
+
+    pub fn set_winit_window(&mut self, window: Arc<WinitWindow>) {
+        self.winit_window = Some(window);
+    }
+
+    /// Get the effective scale factor factoring window scale factor and zoom.
+    pub fn effective_scale_factor(&self) -> f64 {
+        self.scale_factor * self.zoom_scale_factor
+    }
+
+    /// Get the logical size of the window.
+    pub fn window_size(&self) -> Size<f64> {
+        Size::new(
+            self.window_size.width as f64 * self.effective_scale_factor(),
+            self.window_size.height as f64 * self.effective_scale_factor(),
+        )
+    }
+
+    pub(crate) fn zoom_in(&mut self) {
+        self.zoom_scale_factor += 0.01;
+    }
+
+    pub(crate) fn zoom_out(&mut self) {
+        self.zoom_scale_factor = (self.zoom_scale_factor - 0.01).max(1.0);
+    }
+
+    pub(crate) fn zoom_scale_factor(&self) -> f64 {
+        self.zoom_scale_factor
+    }
+
+    pub(crate) fn mouse_position(&self) -> Option<Point> {
+        self.mouse_positon
+    }
+
+    pub(crate) fn on_resize(&mut self, new_size: Size<f32>) {
+        if let Some(renderer) = self.renderer.as_mut() {
+            renderer.resize_surface(new_size.width.max(1.0), new_size.height.max(1.0));
+        }
+        self.window_size = new_size;
+        //self.render_list.set_cull(Some(Rectangle::new(0.0, 0.0, new_size.width as f32, new_size.height as f32)));
+        let size = self.window_size();
+        // On macOS the window needs to be redrawn manually after resizing
+        #[cfg(target_os = "macos")]
+        {
+            self.window.as_ref().unwrap().request_redraw();
+        }
+    }
+
+    pub(crate) fn set_mouse_position(&mut self, point: Option<Point>) {
+        self.mouse_positon = point;
+    }
+
+    pub(crate) fn on_redraw(&mut self, text_context: &mut TextContext, resource_manager: Arc<ResourceManager>) {
+        if self.renderer.is_none() {
+            return;
+        }
+
+        self.renderer.as_mut().unwrap().surface_set_clear_color(Color::WHITE);
+
+        self.layout_window(text_context, resource_manager.clone());
+
+        self.draw_window(text_context, resource_manager);
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn layout_window(
+        &mut self,
+        text_context: &mut TextContext,
+        resource_manager: Arc<ResourceManager>,
+    ) -> NodeId {
+        let root_node = self.
+            element_data
+            .layout_item
+            .taffy_node_id
+            .expect("A root element must have a layout node.");
+
+        let window_size = self.window_size();
+        let available_space: taffy::Size<AvailableSpace> = taffy::Size {
+            width: AvailableSpace::Definite(window_size.width as f32),
+            height: AvailableSpace::Definite(window_size.height as f32),
+        };
+
+        //if self.taffy_tree.borrow().is_layout_dirty() {
+            /*let span = span!(Level::INFO, "layout(taffy)");
+            let _enter = span.enter();*/
+            self.taffy_tree.borrow_mut().compute_layout(root_node, available_space, text_context, resource_manager.clone());
+        //}
+
+        //if self.taffy_tree.borrow().is_apply_layout_dirty() {
+            /*let span = span!(Level::INFO, "layout(apply)");
+                    let _enter = span.enter();*/
+
+            // TODO: move into taffy_tree
+            let mut layout_order: u32 = 0;
+            let sf = self.effective_scale_factor();
+            let x = self.taffy_tree.clone();
+            self.apply_layout(
+                x.borrow_mut().deref_mut(),
+                Point::new(0.0, 0.0),
+                &mut layout_order,
+                Affine::IDENTITY,
+                None,
+                text_context,
+                None,
+                sf
+            );
+            self.taffy_tree.borrow_mut().apply_layout();
+        //}
+
+        root_node
+    }
+
+    fn draw_window(&mut self, text_context: &mut TextContext, resource_manager: Arc<ResourceManager>) {
+        let render_list = self.render_list.clone();
+        render_list.borrow_mut().deref_mut().clear();
+        self.draw(
+            render_list.borrow_mut().deref_mut(),
+            text_context,
+            None,
+            self.scale_factor,
+        );
+
+        self.winit_window.clone().unwrap().pre_present_notify();
+        self.renderer.as_mut().unwrap().sort_and_cull_render_list(render_list.borrow_mut().deref_mut());
+
+        let window = Rectangle {
+            x: 0.0,
+            y: 0.0,
+            width: self.renderer.as_mut().unwrap().surface_width(),
+            height: self.renderer.as_mut().unwrap().surface_height(),
+        };
+        self.renderer.as_mut().unwrap().prepare_render_list(self.render_list.borrow_mut().deref_mut(), resource_manager.clone(), window);
+
+        self.renderer.as_mut().unwrap().submit(resource_manager.clone());
+    }
+
 }
 
 impl crate::elements::core::ElementData for Window {
@@ -63,13 +226,14 @@ impl Element for Window {
         self.element_data.children.push(child.clone());
 
         // Add the children's taffy node.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+        {
+            let mut taffy_tree = self.element_data.taffy_tree.borrow_mut();
             let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
             let child_id = child.borrow().element_data().layout_item.taffy_node_id;
             if let Some(child_id) = child_id {
                 taffy_tree.add_child(parent_id, child_id);
             }
-        });
+        }
 
         self
     }
@@ -93,14 +257,15 @@ impl Element for Window {
         self.element_data.children.extend(children.iter().cloned());
 
         // Add the children's taffy node.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+        {
+            let mut taffy_tree = self.element_data.taffy_tree.borrow_mut();
             let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
             for child in &children {
                 if let Some(child_id) = child.borrow().element_data().layout_item.taffy_node_id {
                     taffy_tree.add_child(parent_id, child_id);
                 }
             }
-        });
+        }
 
         self
     }
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index f29f28fc..3e854798 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -11,8 +11,6 @@ mod tests;
 pub mod text;
 pub mod document;
 
-pub use crate::app::request_layout;
-
 mod app;
 pub use craft_primitives::geometry as geometry;
 pub mod layout;
@@ -43,12 +41,8 @@ pub use winit::window::{Cursor, CursorIcon};
 
 pub use utils::craft_error::CraftError;
 
-pub use window_context::WindowContext;
-
-use std::cell::RefCell;
 use std::future::Future;
 use std::pin::Pin;
-use std::rc::Rc;
 use std::sync::Arc;
 #[cfg(target_arch = "wasm32")]
 use web_time as time;
@@ -113,10 +107,9 @@ pub fn internal_craft_main_with_options(
 /// * `options` - An optional [`CraftOptions`] configuration. If `None` is provided, default options will be applied.
 #[cfg(not(target_os = "android"))]
 pub fn craft_main(
-    root: Rc<RefCell<dyn Element>>,
     options: CraftOptions,
 ) {
-    internal_craft_main_with_options(root, Some(options));
+    internal_craft_main_with_options(Some(options));
 }
 
 /// Starts the Craft application with the provided component specification, global state, and configuration options.
@@ -142,7 +135,6 @@ pub fn craft_main(
 
 #[cfg(not(target_os = "android"))]
 fn internal_craft_main_with_options(
-    root: Rc<RefCell<dyn Element>>,
     options: Option<CraftOptions>,
 ) {
     use winit::event_loop::EventLoop;
@@ -151,13 +143,12 @@ fn internal_craft_main_with_options(
     let event_loop = EventLoop::new().expect("Failed to create winit event loop.");
     info!("Created winit event loop.");
 
-    let craft_state = setup_craft(root, options);
+    let craft_state = setup_craft(options);
     let mut winit_craft_state = CraftWinitState::new(craft_state);
     event_loop.run_app(&mut winit_craft_state).expect("run_app failed");
 }
 
 pub fn setup_craft(
-    root: Rc<RefCell<dyn Element>>,
     craft_options: Option<CraftOptions>,
 ) -> CraftState {
     let craft_options = craft_options.unwrap_or_default();
@@ -196,21 +187,16 @@ pub fn setup_craft(
 
     let craft_app = Box::new(App {
         event_dispatcher: EventDispatcher::new(),
-        root,
         app_sender: app_sender.clone(),
         #[cfg(feature = "accesskit")]
         accesskit_adapter: None,
-        window: None,
         text_context: None,
-        renderer: None,
-        window_context: WindowContext::new(),
         resource_manager,
         reload_fonts: false,
 
         runtime: runtime_copy,
         modifiers: Default::default(),
         redraw_flags: RedrawFlags::new(true),
-        render_list: RenderList::new(),
         target_scratch: Vec::new(),
 
         previous_animation_flags: Default::default(),
diff --git a/crates/craft_retained/src/text/parley_editor.rs b/crates/craft_retained/src/text/parley_editor.rs
index 62eb1ed2..9d6690e6 100644
--- a/crates/craft_retained/src/text/parley_editor.rs
+++ b/crates/craft_retained/src/text/parley_editor.rs
@@ -19,7 +19,6 @@ use parley::layout::LayoutAccessibility;
 use accesskit::{Node, NodeId, TreeUpdate};
 use crate::text::RangedStyles;
 use craft_primitives::ColorBrush;
-use crate::request_layout;
 
 /// Opaque representation of a generation.
 ///
@@ -110,7 +109,7 @@ pub struct PlainEditor
     /// Whether the cursor should be shown. The IME can request to hide the cursor.
     show_cursor: bool,
     width: Option<f32>,
-    scale: f32,
+    scale: f64,
     quantize: bool,
     // Simple tracking of when the layout needs to be updated
     // before it can be used for `Selection` calculations or
@@ -457,7 +456,8 @@ impl PlainEditorDriver<'_>
         self.refresh_layout();
         self.editor
             .set_selection(Selection::from_point(&self.editor.layout, x, y));
-        request_layout();
+        // TODO: Fix
+        //request_layout();
     }
 
     /// Move the cursor to a byte index.
@@ -663,7 +663,8 @@ impl PlainEditorDriver<'_>
                 .selection
                 .next_visual_word(&self.editor.layout, true),
         );
-        request_layout();
+        // TODO: FIx
+        //request_layout();
     }
 
     /// Select the word at the point.
@@ -671,7 +672,8 @@ impl PlainEditorDriver<'_>
         self.refresh_layout();
         self.editor
             .set_selection(Selection::word_from_point(&self.editor.layout, x, y));
-        request_layout();
+        // TODO: Fix
+        //request_layout();
     }
 
     /// Select the physical line at the point.
@@ -679,7 +681,8 @@ impl PlainEditorDriver<'_>
         self.refresh_layout();
         let line = Selection::line_from_point(&self.editor.layout, x, y);
         self.editor.set_selection(line);
-        request_layout();
+        // TODO: FIx
+        //request_layout();
     }
 
     /// Move the selection focus point to the cluster boundary closest to point.
@@ -957,7 +960,7 @@ impl PlainEditor
     }
 
     /// Set the scale for the layout.
-    pub fn set_scale(&mut self, scale: f32) {
+    pub fn set_scale(&mut self, scale: f64) {
         self.scale = scale;
         self.layout_dirty = true;
     }
@@ -1148,7 +1151,7 @@ impl PlainEditor
     /// Update the layout.
     fn update_layout(&mut self, font_cx: &mut FontContext, layout_cx: &mut LayoutContext<ColorBrush>) {
         let mut builder =
-            layout_cx.ranged_builder(font_cx, &self.buffer, self.scale, self.quantize);
+            layout_cx.ranged_builder(font_cx, &self.buffer, self.scale as f32, self.quantize);
         for prop in self.default_style.inner().values() {
             builder.push_default(prop.to_owned());
         }
diff --git a/crates/craft_retained/src/window_context.rs b/crates/craft_retained/src/window_context.rs
index 550f31ab..885f85db 100644
--- a/crates/craft_retained/src/window_context.rs
+++ b/crates/craft_retained/src/window_context.rs
@@ -1,4 +1,4 @@
-use kurbo::Point;
+/*use kurbo::Point;
 use winit::dpi::{LogicalPosition, LogicalSize, PhysicalSize};
 use winit::window::{Cursor, Window};
 
@@ -55,7 +55,7 @@ impl WindowContext {
             )));
         };
     }
-    
+
     pub(crate) fn zoom_in(&mut self) {
         self.zoom_factor += 0.01;
     }
@@ -91,7 +91,7 @@ impl WindowContext {
     pub fn window_height(&self) -> f32 {
         self.window_size.to_logical(self.effective_scale_factor()).height
     }
-    
+
     pub fn window_size(&self) -> LogicalSize<f32> {
         self.window_size.to_logical(self.effective_scale_factor())
     }
@@ -123,7 +123,7 @@ impl WindowContext {
     pub fn set_cursor(&mut self, cursor: Cursor) {
         self.requested_cursor = Some(cursor);
     }
-    
+
     pub fn effective_scale_factor(&self) -> f64 {
         self.scale_factor * self.zoom_factor
     }
@@ -136,3 +136,4 @@ impl WindowContext {
         self.requested_cursor = None;
     }
 }
+*/
\ No newline at end of file
diff --git a/crates/craft_retained/src/window_manager.rs b/crates/craft_retained/src/window_manager.rs
index 438c23a4..b8091d21 100644
--- a/crates/craft_retained/src/window_manager.rs
+++ b/crates/craft_retained/src/window_manager.rs
@@ -1,8 +1,13 @@
 use std::cell::RefCell;
 use std::rc::Rc;
+use std::sync::Arc;
 use winit::event_loop::ActiveEventLoop;
-use winit::window::WindowAttributes;
-use crate::elements::Window;
+use winit::window::{WindowAttributes, WindowId};
+use craft_renderer::renderer::Renderer;
+use crate::app::WINDOW_MANAGER;
+use crate::craft_winit_state::CraftState;
+use crate::elements::{Element, Window};
+use crate::elements::core::ElementData;
 
 pub(crate) struct WindowManager {
     windows: Vec<Rc<RefCell<Window>>>,
@@ -10,22 +15,84 @@ pub(crate) struct WindowManager {
 
 impl WindowManager {
 
+    pub fn get_main_window() -> Rc<RefCell<Window>> {
+        WINDOW_MANAGER.with_borrow(|window_manager| {
+           window_manager.windows[0].clone()
+        })
+    }
+
     pub(crate) fn new() -> Self {
         Self {
             windows: Vec::new(),
         }
     }
 
-    pub(crate) fn create_windows(&mut self, event_loop: &ActiveEventLoop) {
+    pub(crate) fn add_window(&mut self, window: Rc<RefCell<Window>>) {
+        self.windows.push(window);
+    }
+
+    pub(crate) fn get_window_by_id(&self, window_id: WindowId) -> Option<Rc<RefCell<Window>>> {
+        for window in &self.windows {
+            let winit_window = window.borrow_mut().winit_window();
+            if winit_window.is_some() && winit_window.unwrap().id() == window_id {
+                return Some(window.clone());
+            }
+        }
+
+        None
+    }
+
+    pub(crate) fn on_resume(&mut self, craft_state: &mut CraftState, event_loop: &ActiveEventLoop) {
         for window_element in &self.windows {
+
             println!("Creating window");
-            let winit_window = event_loop.create_window(WindowAttributes::default()).expect("Failed to create window");
+            let winit_window = Arc::new(event_loop.create_window(WindowAttributes::default()).expect("Failed to create window"));
             winit_window.set_visible(true);
+            window_element.borrow_mut().set_winit_window(winit_window.clone());
+
+            let renderer_type = craft_state.craft_options.renderer;
+
+            cfg_if::cfg_if! {
+            if #[cfg(not(target_arch = "wasm32"))] {
+                    let renderer = craft_state.runtime.borrow_tokio_runtime().block_on(async {
+                        let renderer: Box<dyn Renderer> = renderer_type.create(winit_window.clone()).await;
+                    renderer
+                });
+                window_element.borrow_mut().renderer = Some(renderer);
+            } else {
+                let app_sender = craft_state.app_sender.clone();
+                let window_copy_2 = window_copy.clone();
+                craft_state.runtime.spawn(async move {
+                    let renderer: Box<dyn Renderer> = renderer_type.create(window_copy).await;
+                    app_sender
+                        .send(InternalMessage::RendererCreated(window_copy_2, renderer))
+                        .await
+                        .expect("Failed to send RendererCreated message");
+                });
+            }
+        }
         }
     }
 
-    pub(crate) fn add_window(&mut self, window: Rc<RefCell<Window>>) {
-        self.windows.push(window);
+    pub fn close_window(&mut self, window: &Rc<RefCell<Window>>) {
+        self.windows.retain(|w| {
+            let is_target = Rc::ptr_eq(w, window);
+
+            if is_target {
+                w.borrow_mut().winit_window = None;
+                w.borrow_mut().renderer = None;
+            }
+
+            !is_target
+        });
+    }
+
+    pub fn len(&self) -> usize {
+        self.windows.len()
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
     }
 
 }
\ No newline at end of file
diff --git a/examples/counter_retained/Cargo.toml b/examples/counter_retained/Cargo.toml
index 3e443dff..a523a33e 100644
--- a/examples/counter_retained/Cargo.toml
+++ b/examples/counter_retained/Cargo.toml
@@ -19,7 +19,7 @@ util = { path = "../util" }
 [dependencies.craft_retained]
 path = "../../crates/craft_retained"
 default-features = false
-features = ["accesskit", "system_fonts"]
+features = ["system_fonts"]
 
 [target.'cfg(not(target_os = "android"))'.dependencies.craft_renderer]
 path = "../../crates/craft_renderer"
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index a781c472..5e584b5f 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -1,4 +1,4 @@
-use craft_retained::elements::Element;
+use craft_retained::elements::{Element, Window};
 use craft_retained::events::ui_events::pointer::PointerButton;
 use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Unit};
 use craft_retained::{
@@ -58,7 +58,7 @@ fn create_button(
 pub fn counter() -> Rc<RefCell<dyn Element>> {
     let count = Rc::new(RefCell::new(Counter::default()));
 
-    let container = Container::new();
+    let container = Window::new();
 
     let count_text = Text::new(&format!("Count: {}", count.borrow().count()));
 
@@ -98,5 +98,5 @@ fn main() {
 
     use craft_retained::CraftOptions;
     util::setup_logging();
-    craft_retained::craft_main(counter, CraftOptions::basic("Counter"));
+    craft_retained::craft_main(CraftOptions::basic("Counter"));
 }
diff --git a/examples/jsframeworkbench/main.rs b/examples/jsframeworkbench/main.rs
index e75d5956..daac021a 100644
--- a/examples/jsframeworkbench/main.rs
+++ b/examples/jsframeworkbench/main.rs
@@ -1,4 +1,4 @@
-use craft_retained::elements::Element;
+use craft_retained::elements::{Element, Window};
 use craft_retained::elements::{Container, Text};
 use craft_retained::events::ui_events::pointer::PointerButtonEvent;
 use craft_retained::events::Event;
@@ -9,7 +9,7 @@ use rand::rng;
 use rand::rngs::ThreadRng;
 use rand::seq::IndexedRandom;
 use std::cell::RefCell;
-use std::rc::{Rc, Weak};
+use std::rc::{Rc};
 use craft_retained::palette::css::WHITE;
 
 const ADJECTIVES: &[&str] = &[
@@ -281,25 +281,25 @@ impl Store {
 fn main() {
     //util::setup_logging();
 
+    let root = Window::new();
+
     let data_list = build_data_list();
     let state = Rc::new(RefCell::new(State::new(data_list.clone())));
 
-    let root = build_root(state.clone());
-    use craft_retained::CraftOptions;
-    craft_retained::craft_main(root, CraftOptions::basic("jsframeworkbench"));
-}
-
-fn build_root(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
-    let root = Container::new();
     let body = build_body(state);
-    root.borrow_mut().push(body);
-    root
+    root.borrow_mut()
+        .width(Unit::Percentage(100.0))
+        .height(Unit::Percentage(100.0))
+        .push(body);
+
+    use craft_retained::CraftOptions;
+    craft_retained::craft_main(CraftOptions::basic("jsframeworkbench"));
 }
 
 fn build_body(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
     let body = Container::new();
 
-    let buttons = build_buttons(Rc::downgrade(&state));
+    let buttons = build_buttons(state.clone());
 
     body.borrow_mut()
         .overflow(Overflow::Visible, Overflow::Scroll)
@@ -346,7 +346,7 @@ fn build_data_list() -> Rc<RefCell<Container>> {
     data_list
 }
 
-fn build_buttons(state: Weak<RefCell<State>>) -> Rc<RefCell<Container>> {
+fn build_buttons(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
     let buttons = Container::new();
     buttons.borrow_mut()
         .flex_direction(FlexDirection::Column)
@@ -358,25 +358,25 @@ fn build_buttons(state: Weak<RefCell<State>>) -> Rc<RefCell<Container>> {
 
     let state1 = state.clone();
     let btn_create_1k = build_button("Create 1,000 rows", move |_, _| {
-        state1.upgrade().unwrap().borrow_mut().run();
+        state1.borrow_mut().run();
     });
 
     let state2 = state.clone();
     let btn_create_10k = build_button("Create 10,000 rows", move |_, _| {
-        state2.upgrade().unwrap().borrow_mut().run_lots();
+        state2.borrow_mut().run_lots();
     });
 
     let state3 = state.clone();
-    let btn_append_1k = build_button("Append 1,000 rows", move |_, _| state3.upgrade().unwrap().borrow_mut().add());
+    let btn_append_1k = build_button("Append 1,000 rows", move |_, _| state3.borrow_mut().add());
 
     let state4 = state.clone();
-    let btn_update_10th_row = build_button("Update every 10th row", move |_, _| state4.upgrade().unwrap().borrow_mut().update());
+    let btn_update_10th_row = build_button("Update every 10th row", move |_, _| state4.borrow_mut().update());
 
     let state5 = state.clone();
-    let btn_clear = build_button("Clear", move |_, _| state5.upgrade().unwrap().borrow_mut().clear());
+    let btn_clear = build_button("Clear", move |_, _| state5.borrow_mut().clear());
 
     let state6 = state.clone();
-    let btn_swap = build_button("Swap Rows", move |_, _| state6.upgrade().unwrap().borrow_mut().swap_rows());
+    let btn_swap = build_button("Swap Rows", move |_, _| state6.borrow_mut().swap_rows());
 
     buttons
         .borrow_mut()
diff --git a/examples/multiwindow/Cargo.toml b/examples/multiwindow/Cargo.toml
index 02037243..f30e0afa 100644
--- a/examples/multiwindow/Cargo.toml
+++ b/examples/multiwindow/Cargo.toml
@@ -14,12 +14,8 @@ util = { path = "../util" }
 [dependencies.craft_retained]
 path = "../../crates/craft_retained"
 default-features = false
-features = ["accesskit", "system_fonts"]
+features = ["system_fonts"]
 
-[target.'cfg(not(target_os = "android"))'.dependencies.craft_renderer]
+[dependencies.craft_renderer]
 path = "../../crates/craft_renderer"
-features = ["vello_hybrid_renderer"]
-
-[target.'cfg(target_os = "android")'.dependencies.craft_renderer]
-path = "../../crates/craft_renderer"
-features = ["vello_renderer"]
\ No newline at end of file
+features = ["vello_renderer"]
diff --git a/examples/multiwindow/main.rs b/examples/multiwindow/main.rs
index eda014b5..d7a300e8 100644
--- a/examples/multiwindow/main.rs
+++ b/examples/multiwindow/main.rs
@@ -24,6 +24,7 @@ impl Counter {
 }
 
 fn create_button(
+    window: &Rc<RefCell<Window>>,
     label: &str,
     base_color: Color,
     delta: i64,
@@ -31,9 +32,9 @@ fn create_button(
     count_text: Rc<RefCell<Text>>,
 ) -> Rc<RefCell<Container>> {
     let border_color = rgb(0, 0, 0);
-    let label = Text::new(label);
+    let label = Text::new_mw(window, label);
     label.borrow_mut().font_size(24.0).color(Color::WHITE).selectable(false);
-    let container = Container::new();
+    let container = Container::new_mw(window);
     container
         .borrow_mut()
         .border_width(Unit::Px(1.0), Unit::Px(2.0), Unit::Px(3.0), Unit::Px(4.0))
@@ -58,20 +59,20 @@ fn create_button(
 pub fn counter() -> Rc<RefCell<dyn Element>> {
     let count = Rc::new(RefCell::new(Counter::default()));
 
-    let container = Container::new();
+    let window = Window::new();
 
-    let count_text = Text::new(&format!("Count: {}", count.borrow().count()));
+    let count_text = Text::new_mw(&window, &format!("Count: {}", count.borrow().count()));
 
-    let button = Container::new();
+    let button = Container::new_mw(&window);
     button
         .borrow_mut()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Row)
         .gap(Unit::Px(20.0), Unit::Px(20.0))
-        .push(create_button("-", rgb(244, 67, 54), -1, count.clone(), count_text.clone()))
-        .push(create_button("+", rgb(76, 175, 80), 1, count.clone(), count_text.clone()));
+        .push(create_button(&window, "-", rgb(244, 67, 54), -1, count.clone(), count_text.clone()))
+        .push(create_button(&window, "+", rgb(76, 175, 80), 1, count.clone(), count_text.clone()));
 
-    container
+    window
         .borrow_mut()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Column)
@@ -85,20 +86,21 @@ pub fn counter() -> Rc<RefCell<dyn Element>> {
         .color(rgb(50, 50, 50))
         .push(button);
 
-    let root = Container::new();
-    root.borrow_mut().push(container);
+    println!("window: {:?}", window.borrow().style());
+
+    let root = Container::new_mw(&window);
+    root.borrow_mut().push(window);
 
     root
 }
 
-#[allow(unused)]
-#[cfg(not(target_os = "android"))]
 fn main() {
-    let counter = counter();
+    let _counter1 = counter();
+    let _counter2 = counter();
 
-    let window_2 = Window::new();
+    //let window_2 = Window::new();
 
     use craft_retained::CraftOptions;
     util::setup_logging();
-    craft_retained::craft_main(counter, CraftOptions::basic("Counter"));
+    craft_retained::craft_main(CraftOptions::basic("Counter"));
 }
diff --git a/examples/pointer_events/Cargo.toml b/examples/pointer_events/Cargo.toml
index 195f12ee..68a44041 100644
--- a/examples/pointer_events/Cargo.toml
+++ b/examples/pointer_events/Cargo.toml
@@ -14,7 +14,7 @@ util = { path = "../util" }
 [dependencies.craft_retained]
 path = "../../crates/craft_retained"
 default-features = false
-features = ["accesskit", "system_fonts"]
+features = ["system_fonts"]
 
 [dependencies.craft_renderer]
 path = "../../crates/craft_renderer"
diff --git a/examples/pointer_events/main.rs b/examples/pointer_events/main.rs
index f7297154..586e3320 100644
--- a/examples/pointer_events/main.rs
+++ b/examples/pointer_events/main.rs
@@ -1,5 +1,5 @@
 use craft_retained::elements::core::ElementData;
-use craft_retained::elements::Element;
+use craft_retained::elements::{Element, Window};
 use craft_retained::events::ui_events::pointer::PointerId;
 use craft_retained::events::Event;
 use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Position, Unit};
@@ -178,21 +178,26 @@ fn pointer_enter_leave_example() -> Rc<RefCell<Container>> {
 #[allow(unused)]
 #[cfg(not(target_os = "android"))]
 fn main() {
+    let window = Window::new();
+
     let pointer_capture_container = Container::new();
     let pointer_capture_event_log = Text::new("");
     let pointer_capture_draggable_container = Text::new("Draggable");
 
-    let root = Container::new();
-    root.borrow_mut()
+
+    window.borrow_mut()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Column)
         .overflow(Overflow::Visible, Overflow::Scroll)
         .max_height(Unit::Percentage(100.0))
         .gap(Unit::Px(50.0), Unit::Px(50.0));
-    root.borrow_mut().push(pointer_capture_example());
-    root.borrow_mut().push(pointer_enter_leave_example());
+
+    let pointer_capture_example = pointer_capture_example();
+    window.borrow_mut().push(pointer_capture_example);
+    let pointer_enter_leave_example = pointer_enter_leave_example();
+    window.borrow_mut().push(pointer_enter_leave_example);
 
     use craft_retained::CraftOptions;
     //util::setup_logging();
-    craft_retained::craft_main(root, CraftOptions::basic("Pointer Events"));
+    craft_retained::craft_main(CraftOptions::basic("Pointer Events"));
 }
diff --git a/examples/text/main.rs b/examples/text/main.rs
index e8a64bff..014a816f 100644
--- a/examples/text/main.rs
+++ b/examples/text/main.rs
@@ -1,4 +1,4 @@
-use craft_retained::elements::{Element, TextInput};
+use craft_retained::elements::{Element, TextInput, Window};
 use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Unit};
 use craft_retained::{
     elements::Container,
@@ -28,10 +28,10 @@ fn main() {
         .color(rgb(50, 50, 50))
         .push(text);
 
-    let root = Container::new();
+    let root = Window::new();
     root.borrow_mut().push(container);
 
     use craft_retained::CraftOptions;
     util::setup_logging();
-    craft_retained::craft_main(root, CraftOptions::basic("text"));
+    craft_retained::craft_main(CraftOptions::basic("text"));
 }
\ No newline at end of file

From 82c3e85916a5f748b43267c2915b1f5d7c53041a Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 1 Jan 2026 22:40:56 -0500
Subject: [PATCH 028/143] start multi-window

---
 crates/craft_retained/src/app.rs              |  20 +++-
 .../craft_retained/src/elements/container.rs  |  26 ++---
 .../src/elements/core/element_internals.rs    |  14 ++-
 crates/craft_retained/src/elements/element.rs |  12 +-
 .../src/elements/element_data.rs              |  69 ++---------
 crates/craft_retained/src/elements/image.rs   |  18 +--
 .../craft_retained/src/elements/scrollable.rs |  19 +---
 .../src/elements/slider/slider.rs             |  11 +-
 crates/craft_retained/src/elements/text.rs    | 107 +++++++++---------
 .../src/elements/text_input/mod.rs            |  11 +-
 .../elements/text_input/text_input_state.rs   |  26 ++---
 crates/craft_retained/src/elements/window.rs  |  41 ++++---
 crates/craft_retained/src/lib.rs              |   2 -
 crates/craft_retained/src/window_manager.rs   |  11 +-
 examples/multiwindow/main.rs                  |  17 ++-
 15 files changed, 162 insertions(+), 242 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 3412fa71..5dec9fc6 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -2,7 +2,6 @@ use crate::elements::{ElementIdMap, Window};
 use crate::events::internal::InternalMessage;
 use crate::events::CraftMessage;
 use crate::events::{Event, EventDispatcher};
-use crate::style::{Display, Unit, Wrap};
 use crate::text::text_context::TextContext;
 use craft_logging::info;
 use craft_primitives::geometry::{Size, Point};
@@ -35,7 +34,6 @@ use crate::elements::Element;
 use craft_resource_manager::resource_event::ResourceEvent;
 use craft_resource_manager::resource_type::ResourceType;
 use craft_runtime::Sender;
-use std::time::Duration;
 use ui_events::keyboard::{KeyboardEvent, Modifiers, NamedKey};
 use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
 use ui_events::ScrollDelta;
@@ -44,6 +42,7 @@ use winit::event::Ime;
 use winit::event_loop::ActiveEventLoop;
 use winit::window::{WindowId};
 use crate::elements::core::ElementInternals;
+use crate::layout::TaffyTree;
 use crate::window_manager::WindowManager;
 
 thread_local! {
@@ -59,6 +58,7 @@ thread_local! {
     static EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(Event, CraftMessage)>> = RefCell::new(VecDeque::with_capacity(10));
 
     pub(crate) static WINDOW_MANAGER: RefCell<WindowManager> = RefCell::new(WindowManager::new());
+    pub(crate) static TAFFY_TREE: RefCell<TaffyTree> = RefCell::new(TaffyTree::new());
 }
 
 /// Enqueues an event at the back of the dispatch queue.
@@ -126,7 +126,7 @@ impl App {
         info!("Craft application is closing.");
     }
 
-    pub fn on_scale_factor_changed(&mut self, scale_factor: f64) {
+    pub fn on_scale_factor_changed(&mut self, _scale_factor: f64) {
         /*self.window_context.scale_factor = scale_factor;
         self.on_resize(self.window.as_ref().unwrap().inner_size());
         self.root.borrow_mut().scale_factor(self.window_context.effective_scale_factor());
@@ -461,4 +461,18 @@ impl App {
             });
         });
     }
+}
+
+#[inline]
+pub fn request_layout() {
+    TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+        taffy_tree.request_layout();
+    });
+}
+
+#[inline]
+pub fn request_apply_layout() {
+    TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+        taffy_tree.request_apply_layout();
+    });
 }
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 3f65c183..463a8718 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -1,8 +1,9 @@
 //! Stores one or more elements.
 
+use crate::app::TAFFY_TREE;
 use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
 use crate::elements::element_data::ElementData;
-use crate::elements::{scrollable, Element, Window};
+use crate::elements::{scrollable, Element};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
@@ -12,7 +13,6 @@ use kurbo::{Affine, Point};
 use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
-use crate::window_manager::WindowManager;
 
 /// Stores one or more elements.
 ///
@@ -22,20 +22,16 @@ pub struct Container {
 }
 
 impl Container {
-    pub fn new_mw(window: &Rc<RefCell<Window>>) -> Rc<RefCell<Self>> {
-        let me = Rc::new_cyclic(|me: &Weak<RefCell<Container>>| {
-            RefCell::new(Container {
-                element_data: ElementData::new(Rc::downgrade(window), me.clone(), true),
+    pub fn new() -> Rc<RefCell<Self>> {
+        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
+            RefCell::new(Self {
+                element_data: ElementData::new(me.clone(), true),
             })
         });
 
         me.borrow_mut().element_data.create_layout_node(None);
         me
     }
-
-    pub fn new() -> Rc<RefCell<Self>> {
-        Self::new_mw(&WindowManager::get_main_window())
-    }
 }
 
 impl crate::elements::core::ElementData for Container {
@@ -58,14 +54,13 @@ impl Element for Container {
         self.element_data.children.push(child.clone());
 
         // Add the children's taffy node.
-        {
-            let mut taffy_tree = self.element_data.taffy_tree.borrow_mut();
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
             let child_id = child.borrow().element_data().layout_item.taffy_node_id;
             if let Some(child_id) = child_id {
                 taffy_tree.add_child(parent_id, child_id);
             }
-        }
+        });
 
         self
     }
@@ -89,15 +84,14 @@ impl Element for Container {
         self.element_data.children.extend(children.iter().cloned());
 
         // Add the children's taffy node.
-        {
-            let mut taffy_tree = self.element_data.taffy_tree.borrow_mut();
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
             for child in &children {
                 if let Some(child_id) = child.borrow().element_data().layout_item.taffy_node_id {
                     taffy_tree.add_child(parent_id, child_id);
                 }
             }
-        };
+        });
 
         self
     }
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index 0a93fa02..4797330e 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -17,6 +17,7 @@ use crate::elements::Element;
 #[cfg(feature = "accesskit")]
 use accesskit::{Action, Role};
 use craft_primitives::geometry::borders::CssRoundedRect;
+use crate::app::{request_layout, TAFFY_TREE};
 use crate::layout::TaffyTree;
 
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
@@ -366,19 +367,24 @@ pub trait  ElementInternals: ElementData {
 
     /// Mark layout node dirty.
     fn mark_dirty(&mut self) {
+        request_layout();
         let id = self.element_data().layout_item.taffy_node_id;
         if let Some(id) = id {
-            let mut taffy_tree = self.element_data().taffy_tree.borrow_mut();
-            taffy_tree.mark_dirty(id);
+            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+                taffy_tree.mark_dirty(id);
+            });
         }
     }
 
     /// Updates taffy's style to reflect craft's style struct.
     fn update_taffy_style(&mut self) {
+        request_layout();
+
         let id = self.element_data().layout_item.taffy_node_id;
         if let Some(id) = id {
-            let mut taffy_tree = self.element_data().taffy_tree.borrow_mut();
-            taffy_tree.set_style(id, self.element_data().style.to_taffy_style());
+            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+                taffy_tree.set_style(id, self.element_data().style.to_taffy_style());
+            });
         }
     }
 
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 818c18a0..b073cc4b 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -1,4 +1,4 @@
-use crate::app::{DOCUMENTS, ELEMENTS, FOCUS};
+use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
 use crate::document::Document;
 use crate::elements::core::ElementData;
 use crate::elements::ElementIdMap;
@@ -37,8 +37,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         self.element_data_mut().children.swap(position_1, position_2);
 
         // Swap the children's taffy nodes.
-        {
-            let mut taffy_tree = self.element_data().taffy_tree.borrow_mut();
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let parent_id = self.element_data().layout_item.taffy_node_id;
             let child_1_id = child_1.borrow().element_data().layout_item.taffy_node_id;
             let child_2_id = child_2.borrow().element_data().layout_item.taffy_node_id;
@@ -67,7 +66,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
                 taffy_tree.mark_dirty(parent_id);
                 taffy_tree.request_layout();
             }
-        }
+        });
 
         Ok(())
     }
@@ -95,8 +94,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
 
         child.borrow_mut().element_data_mut().parent = None;
 
-        {
-            let mut taffy_tree = self.element_data().taffy_tree.borrow_mut();
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let child_id = child.borrow().element_data().layout_item.taffy_node_id;
 
             if let Some(child_id) = child_id {
@@ -105,7 +103,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
 
             let parent_id = self.element_data().layout_item.taffy_node_id;
             taffy_tree.mark_dirty(parent_id.unwrap());
-        }
+        });
 
         // TODO: Move to document
         fn remove_element_from_document(
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index 9d112178..0a3de58c 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -1,7 +1,7 @@
 use crate::animations::animation::ActiveAnimation;
 use crate::elements::element_id::create_unique_element_id;
 use crate::elements::scroll_state::ScrollState;
-use crate::elements::{Element, Window};
+use crate::elements::{Element};
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
 use crate::layout::layout_item::LayoutItem;
 use crate::style::Style;
@@ -11,9 +11,8 @@ use smol_str::SmolStr;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 use taffy::{Layout, Overflow};
-use crate::app::{ELEMENTS};
+use crate::app::{ELEMENTS, TAFFY_TREE};
 use crate::layout::layout_context::LayoutContext;
-use crate::layout::TaffyTree;
 
 /// Stores common data to most elements.
 #[derive(Clone)]
@@ -21,15 +20,9 @@ pub struct ElementData {
     /// A cyclic weak pointer to the element.
     pub(crate) me: Weak<RefCell<dyn Element>>,
 
-    /// The window which owns this element.
-    pub(crate) window: Option<Weak<RefCell<Window>>>,
-
     /// The Element's parent.
     pub(crate) parent: Option<Weak<RefCell<dyn Element>>>,
 
-    /// The taffy tree where the element's layout will be stored.
-    pub(crate) taffy_tree: Rc<RefCell<TaffyTree>>,
-
     /// The style of the element.
     pub style: Style,
 
@@ -64,50 +57,11 @@ pub struct ElementData {
 
 impl ElementData {
 
-    pub fn new(window: Weak<RefCell<Window>>, me: Weak<RefCell<dyn Element>>, scrollable: bool) -> Self {
-        let mut default = Self {
-            me,
-            window: Some(window.clone()),
-            parent: None,
-            style: Default::default(),
-            taffy_tree: window.upgrade().unwrap().borrow().taffy_tree.clone(),
-            layout_item: Default::default(),
-            children: Default::default(),
-            id: None,
-            internal_id: create_unique_element_id(),
-            animations: None,
-            scroll_state: None,
-
-            on_slider_value_changed: Vec::new(),
-            on_pointer_enter: Vec::new(),
-            on_pointer_leave: Vec::new(),
-            on_got_pointer_capture: Vec::new(),
-            on_lost_pointer_capture: Vec::new(),
-            on_pointer_button_down: Vec::new(),
-            on_pointer_button_up: Vec::new(),
-            on_pointer_moved: Vec::new(),
-            on_keyboard_input: Vec::new(),
-        };
-
-        // Create scroll state if needed.
-        if scrollable {
-            default.scroll_state = Some(ScrollState::default());
-        }
-
-        ELEMENTS.with_borrow_mut(|elements| {
-            elements.insert_id(default.internal_id, default.me.clone());
-        });
-
-        default
-    }
-
-    pub fn new_window(taffy_tree: Rc<RefCell<TaffyTree>>, me: Weak<RefCell<dyn Element>>, scrollable: bool) -> Self {
+    pub fn new(me: Weak<RefCell<dyn Element>>, scrollable: bool) -> Self {
         let mut default = Self {
             me,
-            window: None,
             parent: None,
             style: Default::default(),
-            taffy_tree,
             layout_item: Default::default(),
             children: Default::default(),
             id: None,
@@ -140,14 +94,15 @@ impl ElementData {
 
     /// Creates a new taffy node for this element with optional layout context.
     pub fn create_layout_node(&mut self, layout_context: Option<LayoutContext>) {
-        let mut taffy_tree = self.taffy_tree.borrow_mut();
-        let style = self.style.to_taffy_style();
-        let node_id = if let Some(layout_context) = layout_context {
-            taffy_tree.new_leaf_with_context(style, layout_context)
-        } else {
-            taffy_tree.new_leaf(style)
-        };
-        self.layout_item.taffy_node_id = Some(node_id);
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let style = self.style.to_taffy_style();
+            let node_id = if let Some(layout_context) = layout_context {
+                taffy_tree.new_leaf_with_context(style, layout_context)
+            } else {
+                taffy_tree.new_leaf(style)
+            };
+            self.layout_item.taffy_node_id = Some(node_id);
+        });
     }
 
     /// Computes the scrollbar's tack and thumb layout.
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index fe73361f..8de7c063 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -1,10 +1,10 @@
 //! Displays an image.
 
-use crate::app::ELEMENTS;
+use crate::app::{ELEMENTS, TAFFY_TREE};
 use crate::app::{PENDING_RESOURCES};
 use crate::elements::core::ElementInternals;
 use crate::elements::element_data::ElementData;
-use crate::elements::{Element, Window};
+use crate::elements::{Element};
 use crate::layout::layout_context::{ImageContext, LayoutContext};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
@@ -17,7 +17,6 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::ops::Deref;
 use std::rc::{Rc, Weak};
-use crate::window_manager::WindowManager;
 
 /// Displays an image.
 pub struct Image {
@@ -27,12 +26,12 @@ pub struct Image {
 }
 
 impl Image {
-    pub fn new_mw(window: &Rc<RefCell<Window>>,  resource_identifier: ResourceIdentifier) -> Rc<RefCell<Self>> {
+    pub fn new(resource_identifier: ResourceIdentifier) -> Rc<RefCell<Self>> {
         let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
             RefCell::new(Self {
                 is_image_dirty: false,
                 resource_identifier: resource_identifier.clone(),
-                element_data: ElementData::new(Rc::downgrade(window), me.clone(), false),
+                element_data: ElementData::new(me.clone(), false),
             })
         });
 
@@ -50,20 +49,15 @@ impl Image {
         me
     }
 
-    pub fn new(resource_identifier: ResourceIdentifier) -> Rc<RefCell<Self>> {
-        Self::new_mw(&WindowManager::get_main_window(), resource_identifier)
-    }
-
     pub fn image(&mut self, resource_identifier: ResourceIdentifier) -> &mut Self {
         self.is_image_dirty = true;
         self.resource_identifier = resource_identifier.clone();
 
-        {
-            let mut taffy_tree = self.element_data.taffy_tree.borrow_mut();
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let context = LayoutContext::Image(ImageContext::new(resource_identifier));
             let node = self.element_data.layout_item.taffy_node_id.expect("Failed to get Image node");
             taffy_tree.set_node_context(node, Some(context));
-        }
+        });
 
         self
     }
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index f2d9ca58..d90ebb60 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -3,6 +3,7 @@ use crate::events::{CraftMessage, Event};
 use kurbo::Point;
 use ui_events::pointer::{PointerId, PointerType};
 use ui_events::ScrollDelta;
+use crate::app::request_apply_layout;
 
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage, event: &mut Event) {
@@ -26,11 +27,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
 
                 let current_scroll_y = state.scroll_y();
                 state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-
-                {
-                    let mut taffy_tree = element_data.taffy_tree.borrow_mut();
-                    taffy_tree.request_apply_layout();
-                }
+                request_apply_layout();
 
                 event.prevent_propagate();
                 event.prevent_defaults();
@@ -81,10 +78,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
                         let scroll_y = percent * element_data.layout_item.max_scroll_y;
 
                         state.set_scroll_y(scroll_y.clamp(0.0, element_data.layout_item.max_scroll_y));
-                        {
-                            let mut taffy_tree = element_data.taffy_tree.borrow_mut();
-                            taffy_tree.request_apply_layout();
-                        }
+                        request_apply_layout();
 
                         event.prevent_propagate();
                         event.prevent_defaults();
@@ -121,12 +115,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
 
                     let current_scroll_y = state.scroll_y();
                     state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-
-                    {
-                        let mut taffy_tree = element_data.taffy_tree.borrow_mut();
-                        taffy_tree.request_apply_layout();
-                    }
-
+                    request_apply_layout();
                     state.scroll_click = Some(Point::new(click.x, pointer_motion.current.position.y));
                     event.prevent_propagate();
                     event.prevent_defaults();
diff --git a/crates/craft_retained/src/elements/slider/slider.rs b/crates/craft_retained/src/elements/slider/slider.rs
index c6bc18cf..88573f04 100644
--- a/crates/craft_retained/src/elements/slider/slider.rs
+++ b/crates/craft_retained/src/elements/slider/slider.rs
@@ -1,7 +1,7 @@
 use crate::app::{queue_event};
 use crate::elements::core::ElementInternals;
 use crate::elements::element_data::ElementData;
-use crate::elements::{Element, Window};
+use crate::elements::{Element};
 use crate::events::{CraftMessage, Event};
 use crate::palette;
 use crate::style::Unit;
@@ -16,7 +16,6 @@ use std::rc::{Rc, Weak};
 use ui_events::keyboard::{Code, KeyState};
 use ui_events::pointer::PointerId;
 use crate::layout::TaffyTree;
-use crate::window_manager::WindowManager;
 
 #[derive(Clone, Copy, Default, Debug, PartialEq, Eq)]
 pub enum SliderDirection {
@@ -46,9 +45,9 @@ pub struct Slider {
 }
 
 impl Slider {
-    pub fn new_mw(window: &Rc<RefCell<Window>>, thumb_size: f32) -> Rc<RefCell<Self>> {
+    pub fn new(thumb_size: f32) -> Rc<RefCell<Self>> {
         let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| RefCell::new(Self {
-            element_data: ElementData::new(Rc::downgrade(window), me.clone(), false),
+            element_data: ElementData::new(me.clone(), false),
             step: 1.0,
             min: 0.0,
             max: 100.0,
@@ -93,10 +92,6 @@ impl Slider {
         me
     }
 
-    pub fn new(thumb_size: f32) -> Rc<RefCell<Self>> {
-        Self::new_mw(&WindowManager::get_main_window(), thumb_size)
-    }
-
     pub fn value(&mut self, value: f64) -> &mut Self {
         self.value = value;
         self
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 4ffe6bb0..b67528d0 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -20,7 +20,7 @@ const MAX_CACHE_SIZE: usize = 16;
 use crate::elements::core::ElementInternals;
 #[cfg(feature = "accesskit")]
 use crate::elements::element_id::create_unique_element_id;
-use crate::elements::{Element, Window};
+use crate::elements::{Element};
 use crate::layout::TaffyTree;
 #[cfg(feature = "accesskit")]
 use accesskit::{Action, Role};
@@ -37,7 +37,6 @@ use ui_events::pointer::{PointerButton, PointerId};
 #[cfg(target_arch = "wasm32")]
 use web_time as time;
 use winit::dpi;
-use crate::window_manager::WindowManager;
 
 // A stateful element that shows text.
 #[derive(Clone)]
@@ -77,13 +76,15 @@ pub struct TextState {
 }
 
 impl Text {
-    pub fn new_mw(window: &Rc<RefCell<Window>>, text: &str) -> Rc<RefCell<Self>> {
-        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| RefCell::new(Text {
-            element_data: ElementData::new(Rc::downgrade(window), me.clone(), false),
-            selectable: true,
-            state: TextState::default(),
-            me: me.clone(),
-        }));
+    pub fn new(text: &str) -> Rc<RefCell<Self>> {
+        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
+            RefCell::new(Self {
+                element_data: ElementData::new(me.clone(), false),
+                selectable: true,
+                state: TextState::default(),
+                me: me.clone(),
+            })
+        });
 
         let text_context = Some(LayoutContext::Text(TaffyTextContext {
             element: me.borrow().me.clone(),
@@ -95,10 +96,6 @@ impl Text {
         me
     }
 
-    pub fn new(text: &str) -> Rc<RefCell<Self>> {
-        Self::new_mw(&WindowManager::get_main_window(), text)
-    }
-
     pub fn get_selectable(&self) -> bool {
         self.selectable
     }
@@ -163,6 +160,47 @@ impl crate::elements::Element for Text {
 }
 
 impl ElementInternals for Text {
+    fn apply_layout(
+        &mut self,
+        taffy_tree: &mut TaffyTree,
+        position: Point,
+        z_index: &mut u32,
+        transform: Affine,
+        _pointer: Option<Point>,
+        text_context: &mut TextContext,
+        clip_bounds: Option<Rectangle>,
+        scale_factor: f64,
+    ) {
+        let node = self.element_data.layout_item.taffy_node_id.unwrap();
+        let result = taffy_tree.layout(node);
+        let has_new_layout = taffy_tree.get_has_new_layout(node);
+
+        let dirty = has_new_layout
+            || transform != self.element_data.layout_item.get_transform()
+            || position != self.element_data.layout_item.position;
+        self.element_data.layout_item.has_new_layout = has_new_layout;
+        if dirty {
+            self.resolve_box(position, transform, result, z_index);
+            self.apply_clip(clip_bounds);
+
+            self.apply_borders(scale_factor);
+        }
+
+        if has_new_layout {
+            taffy_tree.mark_seen(node);
+        }
+
+        let state: &mut TextState = &mut self.state;
+        if state.current_layout_key != state.last_requested_measure_key {
+            state.layout(
+                state.last_requested_measure_key.unwrap().known_dimensions(),
+                state.last_requested_measure_key.unwrap().available_space(),
+            );
+        }
+
+        state.try_update_text_render(text_context, self.element_data.style.selection_color());
+    }
+
     fn draw(
         &mut self,
         renderer: &mut RenderList,
@@ -239,47 +277,6 @@ impl ElementInternals for Text {
         tree.nodes.push((current_node_id, current_node));
     }
 
-    fn apply_layout(
-        &mut self,
-        taffy_tree: &mut TaffyTree,
-        position: Point,
-        z_index: &mut u32,
-        transform: Affine,
-        _pointer: Option<Point>,
-        text_context: &mut TextContext,
-        clip_bounds: Option<Rectangle>,
-        scale_factor: f64,
-    ) {
-        let node = self.element_data.layout_item.taffy_node_id.unwrap();
-        let result = taffy_tree.layout(node);
-        let has_new_layout = taffy_tree.get_has_new_layout(node);
-
-        let dirty = has_new_layout
-            || transform != self.element_data.layout_item.get_transform()
-            || position != self.element_data.layout_item.position;
-        self.element_data.layout_item.has_new_layout = has_new_layout;
-        if dirty {
-            self.resolve_box(position, transform, result, z_index);
-            self.apply_clip(clip_bounds);
-
-            self.apply_borders(scale_factor);
-        }
-
-        if has_new_layout {
-            taffy_tree.mark_seen(node);
-        }
-
-        let state: &mut TextState = &mut self.state;
-        if state.current_layout_key != state.last_requested_measure_key {
-            state.layout(
-                state.last_requested_measure_key.unwrap().known_dimensions(),
-                state.last_requested_measure_key.unwrap().available_space(),
-            );
-        }
-
-        state.try_update_text_render(text_context, self.element_data.style.selection_color());
-    }
-
     fn on_event(
         &mut self,
         message: &CraftMessage,
@@ -540,4 +537,4 @@ impl Default for TextState {
             is_render_dirty: false,
         }
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index eb2477f1..f532b292 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -16,7 +16,7 @@ use std::rc::{Rc, Weak};
 use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
 #[cfg(feature = "accesskit")]
 use crate::elements::element_id::create_unique_element_id;
-use crate::elements::{scrollable, Window};
+use crate::elements::{scrollable};
 use crate::elements::text_input::text_input_state::TextInputState;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
@@ -29,7 +29,6 @@ use kurbo::Affine;
 use parley::BoundingBox;
 use ui_events::pointer::PointerButton;
 use winit::event::Ime;
-use crate::window_manager::WindowManager;
 
 // A stateful element that shows text.
 #[derive(Clone)]
@@ -55,7 +54,7 @@ pub enum TextInputMessage {
 }
 
 impl TextInput {
-    pub fn new_mw(window: &Rc<RefCell<Window>>, text: &str) -> Rc<RefCell<Self>> {
+    pub fn new(text: &str) -> Rc<RefCell<Self>> {
         let default_style = Self::get_default_style();
 
         let text_input_state = TextInputState::default();
@@ -63,7 +62,7 @@ impl TextInput {
         let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
             RefCell::new(Self {
                 text: Some(text.to_string()),
-                element_data: ElementData::new(Rc::downgrade(window), me.clone(), true),
+                element_data: ElementData::new(me.clone(), true),
                 use_text_value_on_update: true,
                 ranged_styles: Some(RangedStyles::new(vec![])),
                 disabled: false,
@@ -86,10 +85,6 @@ impl TextInput {
 
         me
     }
-
-    pub fn new(text: &str) -> Rc<RefCell<Self>> {
-        Self::new_mw(&WindowManager::get_main_window(), text)
-    }
 }
 
 impl crate::elements::core::ElementData for TextInput {
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index d7afcd43..ba49b624 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -16,6 +16,7 @@ use std::time::{Duration, Instant};
 #[cfg(target_arch = "wasm32")]
 use web_time::{Duration, Instant};
 
+use crate::app::{request_layout, TAFFY_TREE};
 use crate::elements::core::ElementInternals;
 use crate::elements::text_input::parley_box_to_rect;
 use crate::elements::TextInput;
@@ -67,7 +68,7 @@ impl Default for TextInputState {
     fn default() -> Self {
         let default_style = TextInput::get_default_style();
         let mut editor = PlainEditor::new(default_style.font_size());
-        editor.set_scale(1.0f64);
+        editor.set_scale(1.0);
         let style_set = editor.edit_styles();
         default_style.add_styles_to_style_set(style_set);
         Self {
@@ -119,7 +120,7 @@ impl TextInputState {
         // NOTE: Cursor position should be relative to the top left of the text box.
         let cursor_pos = pointer_moved.current.logical_point();
         let cursor_pos: Point = (cursor_pos - self.origin).to_point();
-        let mut cursor_pos = Point::new(cursor_pos.x * self.scale_factor as f64, cursor_pos.y * self.scale_factor as f64);
+        let mut cursor_pos = Point::new(cursor_pos.x * self.scale_factor, cursor_pos.y * self.scale_factor);
         cursor_pos.y += scroll_y;
         self.cursor_pos = cursor_pos;
         // macOS seems to generate a spurious move after selecting word?
@@ -127,8 +128,7 @@ impl TextInputState {
             self.reset_blink();
             let cursor_pos = self.cursor_pos();
             self.driver(text_context).extend_selection_to_point(cursor_pos.x as f32, cursor_pos.y as f32);
-            // TODO: Fix
-            //request_layout();
+            request_layout();
         }
     }
 
@@ -164,9 +164,9 @@ impl TextInputState {
         self.content_widths = None;
 
         if let Some(id) = self.taffy_node {
-            // TODO: FIX
-            //let mut taffy_tree = self.element_data().taffy_tree.borrow_mut();
-            //taffy_tree.mark_dirty(id);
+            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+                taffy_tree.mark_dirty(id);
+            })
         }
     }
 
@@ -210,7 +210,7 @@ impl TextInputState {
                 AvailableSpace::Definite(width) => Some(width),
             })
             .map(|width| {
-                let width: f32 = dpi::PhysicalUnit::from_logical::<f32, f32>(width, self.scale_factor as f64).0;
+                let width: f32 = dpi::PhysicalUnit::from_logical::<f32, f32>(width, self.scale_factor).0;
                 // Taffy may give a min width > max_width.
                 // Min-width is preserved in this scenario to ensure text is readable.
                 width.clamp(content_widths.min, content_widths.max.max(content_widths.min))
@@ -223,7 +223,7 @@ impl TextInputState {
                 AvailableSpace::MaxContent => None,
                 AvailableSpace::Definite(height) => Some(height),
             })
-            .map(|height| dpi::PhysicalUnit::from_logical::<f32, f32>(height, self.scale_factor as f64).0);
+            .map(|height| dpi::PhysicalUnit::from_logical::<f32, f32>(height, self.scale_factor).0);
 
         self.editor.set_width(width_constraint);
         self.editor.refresh_layout(&mut text_context.font_context, &mut text_context.layout_context);
@@ -234,8 +234,8 @@ impl TextInputState {
             self.text_render = Some(text_render_data::from_editor(layout));
         }
 
-        let logical_width = dpi::LogicalUnit::from_physical::<f32, f32>(layout.width(), self.scale_factor as f64).0;
-        let logical_height = dpi::LogicalUnit::from_physical::<f32, f32>(layout.height(), self.scale_factor as f64).0;
+        let logical_width = dpi::LogicalUnit::from_physical::<f32, f32>(layout.width(), self.scale_factor).0;
+        let logical_height = dpi::LogicalUnit::from_physical::<f32, f32>(layout.height(), self.scale_factor).0;
 
         let size = taffy::Size {
             width: logical_width,
@@ -288,8 +288,8 @@ impl TextInputState {
 
             start_time
                 + Duration::from_nanos(
-                    ((phase.as_nanos() / self.blink_period.as_nanos() + 1) * self.blink_period.as_nanos()) as u64,
-                )
+                ((phase.as_nanos() / self.blink_period.as_nanos() + 1) * self.blink_period.as_nanos()) as u64,
+            )
         })
     }
 
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 9c261787..48059fa0 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -1,6 +1,6 @@
 //! Stores one or more elements.
 
-use crate::app::{WINDOW_MANAGER};
+use crate::app::{TAFFY_TREE, WINDOW_MANAGER};
 use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
 use crate::elements::element_data::ElementData;
 use crate::elements::{scrollable, Element};
@@ -35,23 +35,20 @@ pub struct Window {
     zoom_scale_factor: f64,
     mouse_positon: Option<Point>,
     pub(crate) renderer: Option<RendererBox>,
-    pub(crate) taffy_tree: Rc<RefCell<TaffyTree>>,
     pub(crate) render_list: Rc<RefCell<RenderList>>,
 }
 
 impl Window {
     pub fn new() -> Rc<RefCell<Self>> {
-        let taffy_tree = Rc::new(RefCell::new(TaffyTree::new()));
         let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
             RefCell::new(Self {
-                element_data: ElementData::new_window(taffy_tree.clone(), me.clone(), true),
+                element_data: ElementData::new(me.clone(), true),
                 winit_window: None,
                 window_size: Default::default(),
                 scale_factor: 1.0,
                 zoom_scale_factor: 1.0,
                 mouse_positon: None,
                 renderer: None,
-                taffy_tree,
                 render_list: Rc::new(RefCell::new(RenderList::new())),
             })
         });
@@ -107,8 +104,8 @@ impl Window {
             renderer.resize_surface(new_size.width.max(1.0), new_size.height.max(1.0));
         }
         self.window_size = new_size;
-        //self.render_list.set_cull(Some(Rectangle::new(0.0, 0.0, new_size.width as f32, new_size.height as f32)));
         let size = self.window_size();
+        self.render_list.borrow_mut().set_cull(Some(Rectangle::new(0.0, 0.0, size.width as f32, size.height as f32)));
         // On macOS the window needs to be redrawn manually after resizing
         #[cfg(target_os = "macos")]
         {
@@ -150,22 +147,22 @@ impl Window {
             height: AvailableSpace::Definite(window_size.height as f32),
         };
 
-        //if self.taffy_tree.borrow().is_layout_dirty() {
-            /*let span = span!(Level::INFO, "layout(taffy)");
-            let _enter = span.enter();*/
-            self.taffy_tree.borrow_mut().compute_layout(root_node, available_space, text_context, resource_manager.clone());
-        //}
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            //if taffy_tree.is_layout_dirty() {
+                /*let span = span!(Level::INFO, "layout(taffy)");
+                let _enter = span.enter();*/
+                taffy_tree.compute_layout(root_node, available_space, text_context, resource_manager.clone());
+            //}
 
-        //if self.taffy_tree.borrow().is_apply_layout_dirty() {
+            //if self.taffy_tree.borrow().is_apply_layout_dirty() {
             /*let span = span!(Level::INFO, "layout(apply)");
                     let _enter = span.enter();*/
 
             // TODO: move into taffy_tree
             let mut layout_order: u32 = 0;
             let sf = self.effective_scale_factor();
-            let x = self.taffy_tree.clone();
             self.apply_layout(
-                x.borrow_mut().deref_mut(),
+                taffy_tree,
                 Point::new(0.0, 0.0),
                 &mut layout_order,
                 Affine::IDENTITY,
@@ -174,8 +171,10 @@ impl Window {
                 None,
                 sf
             );
-            self.taffy_tree.borrow_mut().apply_layout();
-        //}
+            taffy_tree.apply_layout();
+            //}
+
+        });
 
         root_node
     }
@@ -226,14 +225,13 @@ impl Element for Window {
         self.element_data.children.push(child.clone());
 
         // Add the children's taffy node.
-        {
-            let mut taffy_tree = self.element_data.taffy_tree.borrow_mut();
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
             let child_id = child.borrow().element_data().layout_item.taffy_node_id;
             if let Some(child_id) = child_id {
                 taffy_tree.add_child(parent_id, child_id);
             }
-        }
+        });
 
         self
     }
@@ -257,15 +255,14 @@ impl Element for Window {
         self.element_data.children.extend(children.iter().cloned());
 
         // Add the children's taffy node.
-        {
-            let mut taffy_tree = self.element_data.taffy_tree.borrow_mut();
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
             for child in &children {
                 if let Some(child_id) = child.borrow().element_data().layout_item.taffy_node_id {
                     taffy_tree.add_child(parent_id, child_id);
                 }
             }
-        }
+        });
 
         self
     }
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 3e854798..21331257 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -57,10 +57,8 @@ use craft_logging::info;
 use {winit::event_loop::EventLoopBuilder, winit::platform::android::EventLoopBuilderExtAndroid};
 
 use app::App;
-use craft_renderer::RenderList;
 use crate::app::RedrawFlags;
 use crate::craft_winit_state::CraftWinitState;
-use crate::elements::Element;
 use crate::events::EventDispatcher;
 use crate::utils::cloneable_any::CloneableAny;
 
diff --git a/crates/craft_retained/src/window_manager.rs b/crates/craft_retained/src/window_manager.rs
index b8091d21..416df48f 100644
--- a/crates/craft_retained/src/window_manager.rs
+++ b/crates/craft_retained/src/window_manager.rs
@@ -4,23 +4,14 @@ use std::sync::Arc;
 use winit::event_loop::ActiveEventLoop;
 use winit::window::{WindowAttributes, WindowId};
 use craft_renderer::renderer::Renderer;
-use crate::app::WINDOW_MANAGER;
 use crate::craft_winit_state::CraftState;
-use crate::elements::{Element, Window};
-use crate::elements::core::ElementData;
+use crate::elements::{Window};
 
 pub(crate) struct WindowManager {
     windows: Vec<Rc<RefCell<Window>>>,
 }
 
 impl WindowManager {
-
-    pub fn get_main_window() -> Rc<RefCell<Window>> {
-        WINDOW_MANAGER.with_borrow(|window_manager| {
-           window_manager.windows[0].clone()
-        })
-    }
-
     pub(crate) fn new() -> Self {
         Self {
             windows: Vec::new(),
diff --git a/examples/multiwindow/main.rs b/examples/multiwindow/main.rs
index d7a300e8..1963b80f 100644
--- a/examples/multiwindow/main.rs
+++ b/examples/multiwindow/main.rs
@@ -24,7 +24,6 @@ impl Counter {
 }
 
 fn create_button(
-    window: &Rc<RefCell<Window>>,
     label: &str,
     base_color: Color,
     delta: i64,
@@ -32,9 +31,9 @@ fn create_button(
     count_text: Rc<RefCell<Text>>,
 ) -> Rc<RefCell<Container>> {
     let border_color = rgb(0, 0, 0);
-    let label = Text::new_mw(window, label);
+    let label = Text::new(label);
     label.borrow_mut().font_size(24.0).color(Color::WHITE).selectable(false);
-    let container = Container::new_mw(window);
+    let container = Container::new();
     container
         .borrow_mut()
         .border_width(Unit::Px(1.0), Unit::Px(2.0), Unit::Px(3.0), Unit::Px(4.0))
@@ -61,16 +60,16 @@ pub fn counter() -> Rc<RefCell<dyn Element>> {
 
     let window = Window::new();
 
-    let count_text = Text::new_mw(&window, &format!("Count: {}", count.borrow().count()));
+    let count_text = Text::new(&format!("Count: {}", count.borrow().count()));
 
-    let button = Container::new_mw(&window);
+    let button = Container::new();
     button
         .borrow_mut()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Row)
         .gap(Unit::Px(20.0), Unit::Px(20.0))
-        .push(create_button(&window, "-", rgb(244, 67, 54), -1, count.clone(), count_text.clone()))
-        .push(create_button(&window, "+", rgb(76, 175, 80), 1, count.clone(), count_text.clone()));
+        .push(create_button("-", rgb(244, 67, 54), -1, count.clone(), count_text.clone()))
+        .push(create_button("+", rgb(76, 175, 80), 1, count.clone(), count_text.clone()));
 
     window
         .borrow_mut()
@@ -86,9 +85,7 @@ pub fn counter() -> Rc<RefCell<dyn Element>> {
         .color(rgb(50, 50, 50))
         .push(button);
 
-    println!("window: {:?}", window.borrow().style());
-
-    let root = Container::new_mw(&window);
+    let root = Container::new();
     root.borrow_mut().push(window);
 
     root

From 94813a5fab6f9bad43f78e148c6c9479f999c7cc Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 1 Jan 2026 23:39:54 -0500
Subject: [PATCH 029/143] start multi-window

---
 crates/craft_retained/src/app.rs              |  5 ++-
 .../craft_retained/src/elements/scrollable.rs |  6 +--
 crates/craft_retained/src/elements/window.rs  | 36 ++++++++++--------
 .../craft_retained/src/layout/taffy_tree.rs   | 37 +++++++++++++------
 .../craft_retained/src/text/parley_editor.rs  | 13 +++----
 5 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 5dec9fc6..abb84c48 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -13,6 +13,7 @@ use std::collections::VecDeque;
 use std::ops::DerefMut;
 use std::rc::{Rc, Weak};
 use std::sync::Arc;
+use taffy::NodeId;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use {
     crate::accessibility::access_handler::CraftAccessHandler,
@@ -471,8 +472,8 @@ pub fn request_layout() {
 }
 
 #[inline]
-pub fn request_apply_layout() {
+pub fn request_apply_layout(node: NodeId) {
     TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-        taffy_tree.request_apply_layout();
+        taffy_tree.request_apply_layout(node);
     });
 }
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index d90ebb60..2c56feca 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -27,7 +27,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
 
                 let current_scroll_y = state.scroll_y();
                 state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-                request_apply_layout();
+                request_apply_layout(element_data.layout_item.taffy_node_id.unwrap());
 
                 event.prevent_propagate();
                 event.prevent_defaults();
@@ -78,7 +78,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
                         let scroll_y = percent * element_data.layout_item.max_scroll_y;
 
                         state.set_scroll_y(scroll_y.clamp(0.0, element_data.layout_item.max_scroll_y));
-                        request_apply_layout();
+                        request_apply_layout(element_data.layout_item.taffy_node_id.unwrap());
 
                         event.prevent_propagate();
                         event.prevent_defaults();
@@ -115,7 +115,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage
 
                     let current_scroll_y = state.scroll_y();
                     state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-                    request_apply_layout();
+                    request_apply_layout(element_data.layout_item.taffy_node_id.unwrap());
                     state.scroll_click = Some(Point::new(click.x, pointer_motion.current.position.y));
                     event.prevent_propagate();
                     event.prevent_defaults();
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 48059fa0..970156b3 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -148,30 +148,34 @@ impl Window {
         };
 
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            //if taffy_tree.is_layout_dirty() {
+            let root_dirty = taffy_tree.is_layout_dirty(root_node);
+
+            if root_dirty {
                 /*let span = span!(Level::INFO, "layout(taffy)");
                 let _enter = span.enter();*/
                 taffy_tree.compute_layout(root_node, available_space, text_context, resource_manager.clone());
-            //}
+            }
 
             //if self.taffy_tree.borrow().is_apply_layout_dirty() {
             /*let span = span!(Level::INFO, "layout(apply)");
                     let _enter = span.enter();*/
 
-            // TODO: move into taffy_tree
-            let mut layout_order: u32 = 0;
-            let sf = self.effective_scale_factor();
-            self.apply_layout(
-                taffy_tree,
-                Point::new(0.0, 0.0),
-                &mut layout_order,
-                Affine::IDENTITY,
-                None,
-                text_context,
-                None,
-                sf
-            );
-            taffy_tree.apply_layout();
+            if root_dirty || taffy_tree.is_apply_layout_dirty(&root_node) {
+                // TODO: move into taffy_tree
+                let mut layout_order: u32 = 0;
+                let sf = self.effective_scale_factor();
+                self.apply_layout(
+                    taffy_tree,
+                    Point::new(0.0, 0.0),
+                    &mut layout_order,
+                    Affine::IDENTITY,
+                    None,
+                    text_context,
+                    None,
+                    sf
+                );
+                taffy_tree.apply_layout(root_node);
+            }
             //}
 
         });
diff --git a/crates/craft_retained/src/layout/taffy_tree.rs b/crates/craft_retained/src/layout/taffy_tree.rs
index 49122dbb..dd2d7950 100644
--- a/crates/craft_retained/src/layout/taffy_tree.rs
+++ b/crates/craft_retained/src/layout/taffy_tree.rs
@@ -9,7 +9,7 @@ pub struct TaffyTree {
     /// True if at least one node is dirty.
     is_layout_dirty: bool,
     /// True if the layout should be re-applied.
-    is_apply_layout_dirty: bool,
+    is_apply_layout_dirty: Vec<NodeId>,
 }
 
 impl TaffyTree {
@@ -17,7 +17,7 @@ impl TaffyTree {
         Self {
             inner: taffy::TaffyTree::<LayoutContext>::new(),
             is_layout_dirty: true,
-            is_apply_layout_dirty: true,
+            is_apply_layout_dirty: Vec::new(),
         }
     }
 
@@ -123,26 +123,41 @@ impl TaffyTree {
     #[inline(always)]
     pub fn request_layout(&mut self) {
         self.is_layout_dirty = true;
-        self.is_apply_layout_dirty = true;
+        self.is_apply_layout_dirty = Vec::new();
     }
 
     #[inline(always)]
-    pub fn request_apply_layout(&mut self) {
-        self.is_layout_dirty = true;
-        self.is_apply_layout_dirty = true;
+    pub fn request_apply_layout(&mut self, node: NodeId) {
+        let root = self.root_of(node);
+        if !self.is_apply_layout_dirty(&root) {
+            self.is_apply_layout_dirty.push(root);
+        }
     }
 
-    #[inline(always)]
+    /*#[inline(always)]
     pub fn is_layout_dirty(&self) -> bool {
         self.is_layout_dirty
+    }*/
+
+    #[inline(always)]
+    pub fn is_layout_dirty(&self, root: NodeId) -> bool {
+        self.inner.dirty(root).unwrap()
     }
 
     #[inline(always)]
-    pub fn is_apply_layout_dirty(&self) -> bool {
-        self.is_apply_layout_dirty
+    pub fn is_apply_layout_dirty(&self, root: &NodeId) -> bool {
+        self.is_apply_layout_dirty.contains(root)
+    }
+
+    pub fn apply_layout(&mut self, root: NodeId) {
+        self.is_apply_layout_dirty.retain(|node| *node != root);
     }
 
-    pub fn apply_layout(&mut self) {
-        self.is_apply_layout_dirty = false;
+    /// Get an node's root.
+    pub fn root_of(&self, mut node: NodeId) -> NodeId {
+        while let Some(parent) = self.inner.parent(node) {
+            node = parent;
+        }
+        node
     }
 }
\ No newline at end of file
diff --git a/crates/craft_retained/src/text/parley_editor.rs b/crates/craft_retained/src/text/parley_editor.rs
index 9d6690e6..fbea3b86 100644
--- a/crates/craft_retained/src/text/parley_editor.rs
+++ b/crates/craft_retained/src/text/parley_editor.rs
@@ -19,6 +19,7 @@ use parley::layout::LayoutAccessibility;
 use accesskit::{Node, NodeId, TreeUpdate};
 use crate::text::RangedStyles;
 use craft_primitives::ColorBrush;
+use crate::app::request_layout;
 
 /// Opaque representation of a generation.
 ///
@@ -456,8 +457,7 @@ impl PlainEditorDriver<'_>
         self.refresh_layout();
         self.editor
             .set_selection(Selection::from_point(&self.editor.layout, x, y));
-        // TODO: Fix
-        //request_layout();
+        request_layout();
     }
 
     /// Move the cursor to a byte index.
@@ -663,8 +663,7 @@ impl PlainEditorDriver<'_>
                 .selection
                 .next_visual_word(&self.editor.layout, true),
         );
-        // TODO: FIx
-        //request_layout();
+        request_layout();
     }
 
     /// Select the word at the point.
@@ -672,8 +671,7 @@ impl PlainEditorDriver<'_>
         self.refresh_layout();
         self.editor
             .set_selection(Selection::word_from_point(&self.editor.layout, x, y));
-        // TODO: Fix
-        //request_layout();
+        request_layout();
     }
 
     /// Select the physical line at the point.
@@ -681,8 +679,7 @@ impl PlainEditorDriver<'_>
         self.refresh_layout();
         let line = Selection::line_from_point(&self.editor.layout, x, y);
         self.editor.set_selection(line);
-        // TODO: FIx
-        //request_layout();
+        request_layout();
     }
 
     /// Move the selection focus point to the cluster boundary closest to point.

From 9630f9e9419f3efc79f93b6b9e427e2bc2321490 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Fri, 2 Jan 2026 23:38:29 -0500
Subject: [PATCH 030/143] fmt

---
 crates/craft_logger/src/lib.rs                |   4 +-
 crates/craft_primitives/src/color.rs          |   2 +-
 .../craft_primitives/src/geometry/borders.rs  |  66 ++---
 .../src/geometry/element_box.rs               |  13 +-
 crates/craft_primitives/src/geometry/mod.rs   |   5 +-
 crates/craft_primitives/src/geometry/point.rs |   1 -
 .../src/geometry/rectangle.rs                 |  13 +-
 crates/craft_primitives/src/geometry/size.rs  |   2 +-
 .../src/geometry/trblrectangle.rs             |   4 +-
 crates/craft_primitives/src/hit_testable.rs   |   4 +-
 crates/craft_primitives/src/lib.rs            |   7 +-
 crates/craft_renderer/src/blank_renderer.rs   |  14 +-
 crates/craft_renderer/src/color.rs            |   1 +
 crates/craft_renderer/src/image_adapter.rs    |   3 +-
 crates/craft_renderer/src/lib.rs              |   8 +-
 crates/craft_renderer/src/renderer.rs         |  36 ++-
 crates/craft_renderer/src/renderer_type.rs    |   9 +-
 .../craft_renderer/src/text_renderer_data.rs  |   5 +-
 crates/craft_renderer/src/tinyvg_helpers.rs   |   8 +-
 crates/craft_renderer/src/vello/mod.rs        |  51 ++--
 crates/craft_renderer/src/vello/tinyvg.rs     |  60 +++-
 crates/craft_renderer/src/vello_cpu/mod.rs    |  39 +--
 crates/craft_renderer/src/vello_cpu/tinyvg.rs |  63 +++-
 crates/craft_renderer/src/vello_hybrid/mod.rs | 105 ++++---
 .../src/vello_hybrid/render_context.rs        |  39 +--
 .../craft_renderer/src/vello_hybrid/tinyvg.rs |  64 ++++-
 .../craft_resource_manager/src/identifier.rs  |   9 +-
 crates/craft_resource_manager/src/image.rs    |   3 +-
 crates/craft_resource_manager/src/lib.rs      |  32 ++-
 .../src/lock_free_map.rs                      |  12 +-
 crates/craft_resource_manager/src/resource.rs |   6 +-
 .../src/resource_data.rs                      |   3 +-
 .../src/resource_event.rs                     |   2 +-
 .../src/tinyvg_resource.rs                    |   3 +-
 .../src/accessibility/access_handler.rs       |   5 +-
 .../src/animations/animation.rs               |  99 +++----
 crates/craft_retained/src/animations/mod.rs   |   5 +-
 crates/craft_retained/src/app.rs              |  89 +++---
 .../craft_retained/src/craft_winit_state.rs   |  79 +++---
 crates/craft_retained/src/document/core.rs    |   4 +-
 .../src/document/document_manager.rs          |   7 +-
 crates/craft_retained/src/document/mod.rs     |   3 +-
 .../craft_retained/src/elements/container.rs  |  26 +-
 .../src/elements/core/element_data.rs         |   3 +-
 .../src/elements/core/element_internals.rs    |  78 +++--
 .../craft_retained/src/elements/core/mod.rs   |   4 +-
 crates/craft_retained/src/elements/element.rs |  84 ++++--
 .../src/elements/element_data.rs              |  33 ++-
 .../craft_retained/src/elements/element_id.rs |   2 +-
 .../src/elements/element_id_map.rs            |   8 +-
 crates/craft_retained/src/elements/image.rs   |  33 ++-
 crates/craft_retained/src/elements/mod.rs     |  20 +-
 .../craft_retained/src/elements/scrollable.rs |   7 +-
 .../craft_retained/src/elements/slider/mod.rs |   6 +-
 .../src/elements/slider/slider.rs             | 107 ++++---
 .../src/elements/slider/slider_draw.rs        |  51 ++--
 .../src/elements/slider/slider_logic.rs       |  17 +-
 crates/craft_retained/src/elements/text.rs    |  74 +++--
 .../src/elements/text_input/mod.rs            |  52 ++--
 .../elements/text_input/text_input_state.rs   |  73 +++--
 crates/craft_retained/src/elements/window.rs  |  65 +++--
 .../src/events/event_dispatch.rs              |  27 +-
 crates/craft_retained/src/events/helpers.rs   |  16 +-
 crates/craft_retained/src/events/internal.rs  |   1 -
 crates/craft_retained/src/events/mod.rs       |  35 +--
 .../src/events/pointer_capture.rs             |  21 +-
 .../src/layout/layout_context.rs              |  43 +--
 .../craft_retained/src/layout/layout_item.rs  |  63 ++--
 crates/craft_retained/src/layout/mod.rs       |   2 +-
 .../craft_retained/src/layout/taffy_tree.rs   |  10 +-
 crates/craft_retained/src/lib.rs              |  80 +++---
 crates/craft_retained/src/spatial/mod.rs      |   1 +
 crates/craft_retained/src/style/styles.rs     | 198 +++++++++----
 .../src/style/taffy_conversions.rs            |   4 +-
 crates/craft_retained/src/text/mod.rs         |  19 +-
 .../craft_retained/src/text/parley_editor.rs  | 268 ++++++------------
 .../craft_retained/src/text/text_context.rs   |   5 +-
 .../src/text/text_render_data.rs              |  20 +-
 .../craft_retained/src/utils/craft_error.rs   |   4 +-
 crates/craft_retained/src/utils/mod.rs        |   2 +-
 crates/craft_retained/src/wasm_queue.rs       |   3 +-
 crates/craft_retained/src/window_context.rs   |   2 +-
 crates/craft_retained/src/window_manager.rs   |  50 ++--
 crates/craft_runtime/src/lib.rs               |   6 +-
 crates/syntect_dumper/src/main.rs             |   8 +-
 examples/counter_retained/counter_android.rs  |   5 +-
 examples/counter_retained/main.rs             |  32 ++-
 examples/jsframeworkbench/main.rs             |  63 ++--
 examples/multiwindow/main.rs                  |  32 ++-
 examples/pointer_events/main.rs               |  86 +++---
 examples/text/main.rs                         |   9 +-
 examples/util/src/lib.rs                      |  13 +-
 rustfmt.toml                                  |  23 +-
 93 files changed, 1650 insertions(+), 1231 deletions(-)

diff --git a/crates/craft_logger/src/lib.rs b/crates/craft_logger/src/lib.rs
index 563a190b..be6f469a 100644
--- a/crates/craft_logger/src/lib.rs
+++ b/crates/craft_logger/src/lib.rs
@@ -1,3 +1 @@
-pub use tracing::{debug, error, info, warn, Level};
-
-pub use tracing::span;
+pub use tracing::{Level, debug, error, info, span, warn};
diff --git a/crates/craft_primitives/src/color.rs b/crates/craft_primitives/src/color.rs
index 4be84cc0..3cef8b50 100644
--- a/crates/craft_primitives/src/color.rs
+++ b/crates/craft_primitives/src/color.rs
@@ -1,2 +1,2 @@
-pub use peniko::color::palette;
 pub use peniko::Color;
+pub use peniko::color::palette;
diff --git a/crates/craft_primitives/src/geometry/borders.rs b/crates/craft_primitives/src/geometry/borders.rs
index e7aedb0d..3f6a74f3 100644
--- a/crates/craft_primitives/src/geometry/borders.rs
+++ b/crates/craft_primitives/src/geometry/borders.rs
@@ -1,7 +1,7 @@
-use kurbo::{Arc, BezPath, PathEl, Point, Rect, Shape, Vec2};
-
 use std::f64::consts::{FRAC_PI_2, PI};
 use std::ops::Add;
+
+use kurbo::{Arc, BezPath, PathEl, Point, Rect, Shape, Vec2};
 pub const TOP_LEFT: usize = 0;
 pub const TOP_RIGHT: usize = 1;
 pub const BOTTOM_RIGHT: usize = 2;
@@ -88,8 +88,7 @@ impl CssRoundedRect {
             let width_y = css_rounded_rect.widths[CORNER_VERTICAL_SIDE[corner]];
             let is_sharp = is_inner_radius_sharp(width_x, outer_radius.x, width_y, outer_radius.y);
             if !is_sharp {
-                css_rounded_rect.inner_radii[corner] =
-                    Vec2::new(outer_radius.x - width_x, outer_radius.y - width_y);
+                css_rounded_rect.inner_radii[corner] = Vec2::new(outer_radius.x - width_x, outer_radius.y - width_y);
             }
 
             let inner_radius = css_rounded_rect.inner_radii[corner];
@@ -107,13 +106,10 @@ impl CssRoundedRect {
                 std::mem::swap(&mut side_for_radius_x, &mut side_for_radius_y);
             }
 
-            let outer_sweep_angle =
-                intersect_angle(outer_x, outer_y, side_for_radius_x, side_for_radius_y);
-            let inner_sweep_angle =
-                intersect_angle(inner_x, inner_y, side_for_radius_x, side_for_radius_y);
+            let outer_sweep_angle = intersect_angle(outer_x, outer_y, side_for_radius_x, side_for_radius_y);
+            let inner_sweep_angle = intersect_angle(inner_x, inner_y, side_for_radius_x, side_for_radius_y);
 
-            css_rounded_rect.intersect_angles[corner] =
-                Vec2::new(inner_sweep_angle, outer_sweep_angle);
+            css_rounded_rect.intersect_angles[corner] = Vec2::new(inner_sweep_angle, outer_sweep_angle);
         }
 
         css_rounded_rect.compute_arcs();
@@ -127,14 +123,8 @@ impl CssRoundedRect {
 
             let radius_sign = CORNER_RADIUS_SIGN[corner];
 
-            let outer_radius = Vec2::new(
-                radius_sign.x * outer_radius.x,
-                radius_sign.y * outer_radius.y,
-            );
-            let inner_radius = Vec2::new(
-                radius_sign.x * inner_radius.x,
-                radius_sign.y * inner_radius.y,
-            );
+            let outer_radius = Vec2::new(radius_sign.x * outer_radius.x, radius_sign.y * outer_radius.y);
+            let inner_radius = Vec2::new(radius_sign.x * inner_radius.x, radius_sign.y * inner_radius.y);
 
             if is_outer_radius_sharp(outer_radius) {
                 continue;
@@ -239,10 +229,7 @@ impl CssRoundedRect {
             let vertical_side = CORNER_VERTICAL_SIDE[next_corner];
             let horizontal_width = self.widths[horizontal_side];
             let vertical_width = self.widths[vertical_side];
-            let inside_corner = next_rect_corner.add(Vec2::new(
-                horizontal_width * offset.x,
-                vertical_width * offset.y,
-            ));
+            let inside_corner = next_rect_corner.add(Vec2::new(horizontal_width * offset.x, vertical_width * offset.y));
             path.line_to(inside_corner);
         }
 
@@ -256,10 +243,7 @@ impl CssRoundedRect {
             let vertical_side = CORNER_VERTICAL_SIDE[corner];
             let horizontal_width = self.widths[horizontal_side];
             let vertical_width = self.widths[vertical_side];
-            let inside_corner = rect_corner.add(Vec2::new(
-                horizontal_width * offset.x,
-                vertical_width * offset.y,
-            ));
+            let inside_corner = rect_corner.add(Vec2::new(horizontal_width * offset.x, vertical_width * offset.y));
             path.line_to(inside_corner);
         }
         path.close_path();
@@ -273,19 +257,12 @@ impl CssRoundedRect {
         let box_height = self.height();
 
         let f_top_x = box_width / (self.outer_radii[TOP_LEFT].x + self.outer_radii[TOP_RIGHT].x);
-        let f_bottom_x =
-            box_width / (self.outer_radii[BOTTOM_LEFT].x + self.outer_radii[BOTTOM_RIGHT].x);
+        let f_bottom_x = box_width / (self.outer_radii[BOTTOM_LEFT].x + self.outer_radii[BOTTOM_RIGHT].x);
 
-        let f_left_y =
-            box_height / (self.outer_radii[BOTTOM_LEFT].y + self.outer_radii[TOP_LEFT].y);
-        let f_right_y =
-            box_height / (self.outer_radii[BOTTOM_RIGHT].y + self.outer_radii[TOP_RIGHT].y);
+        let f_left_y = box_height / (self.outer_radii[BOTTOM_LEFT].y + self.outer_radii[TOP_LEFT].y);
+        let f_right_y = box_height / (self.outer_radii[BOTTOM_RIGHT].y + self.outer_radii[TOP_RIGHT].y);
 
-        let radius_scale = f_top_x
-            .min(f_left_y)
-            .min(f_bottom_x)
-            .min(f_right_y)
-            .min(1.0);
+        let radius_scale = f_top_x.min(f_left_y).min(f_bottom_x).min(f_right_y).min(1.0);
 
         for radius in &mut self.outer_radii {
             *radius *= radius_scale;
@@ -310,12 +287,7 @@ impl CssRoundedRect {
 }
 
 /// Calculate the angle of intersection between the quarter-ellipse and a line from the border point to the corner point.
-fn intersect_angle(
-    top_left_radius_x: f64,
-    top_left_radius_y: f64,
-    top_width: f64,
-    right_width: f64,
-) -> f64 {
+fn intersect_angle(top_left_radius_x: f64, top_left_radius_y: f64, top_width: f64, right_width: f64) -> f64 {
     // 1. Set up the equations and solve for the intersection point using the quadratic formula.
     // 2. To get the angle, we use the parametric equation of the ellipse, solving for the angle.
 
@@ -489,10 +461,7 @@ impl Shape for CssRoundedRect {
                 let border_radius = self.outer_radii[corner];
                 let sign = CORNER_RADIUS_SIGN[corner];
                 let corner_point = self.corners[corner];
-                let border_point = corner_point.add(Vec2::new(
-                    border_radius.x * sign.x,
-                    border_radius.y * sign.y,
-                ));
+                let border_point = corner_point.add(Vec2::new(border_radius.x * sign.x, border_radius.y * sign.y));
                 let quarter_ellipse_bounds = Rect::from_points(corner_point, border_point);
                 if quarter_ellipse_bounds.contains(p) && arc.contains(p) {
                     return 0;
@@ -519,9 +488,10 @@ fn is_outer_radius_sharp(radii: Vec2) -> bool {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use std::f64::consts::FRAC_PI_2;
 
+    use super::*;
+
     const EPS: f64 = 1e-9;
 
     #[test]
diff --git a/crates/craft_primitives/src/geometry/element_box.rs b/crates/craft_primitives/src/geometry/element_box.rs
index d59257e7..16c63981 100644
--- a/crates/craft_primitives/src/geometry/element_box.rs
+++ b/crates/craft_primitives/src/geometry/element_box.rs
@@ -1,4 +1,5 @@
 use kurbo::Affine;
+
 use crate::geometry::{Border, Margin, Padding, Point, Rectangle, Size};
 
 /// An element's box roughly analogous to CSS's box-model.
@@ -19,7 +20,10 @@ impl ElementBox {
     }
 
     pub fn margin_rectangle_position(&self) -> Point {
-        Point::new(self.position.x - self.margin.left as f64, self.position.y - self.margin.top as f64)
+        Point::new(
+            self.position.x - self.margin.left as f64,
+            self.position.y - self.margin.top as f64,
+        )
     }
 
     pub fn margin_rectangle_size(&self) -> Size<f32> {
@@ -111,6 +115,11 @@ impl ElementBox {
         let content_position = self.content_rectangle_position();
         let content_size = self.content_rectangle_size();
 
-        Rectangle::new(content_position.x as f32, content_position.y as f32, content_size.width, content_size.height)
+        Rectangle::new(
+            content_position.x as f32,
+            content_position.y as f32,
+            content_size.width,
+            content_size.height,
+        )
     }
 }
diff --git a/crates/craft_primitives/src/geometry/mod.rs b/crates/craft_primitives/src/geometry/mod.rs
index 8ac00cb6..521950e3 100644
--- a/crates/craft_primitives/src/geometry/mod.rs
+++ b/crates/craft_primitives/src/geometry/mod.rs
@@ -6,8 +6,7 @@ mod size;
 mod trblrectangle;
 
 pub use element_box::ElementBox;
-pub use point::Point;
-pub use point::PointConverter;
+pub use point::{Point, PointConverter};
 pub use rectangle::Rectangle;
 pub use size::Size;
 pub use trblrectangle::TrblRectangle;
@@ -16,4 +15,4 @@ pub type Border = TrblRectangle<f32>;
 pub type Padding = TrblRectangle<f32>;
 pub type Margin = TrblRectangle<f32>;
 
-pub use kurbo::Affine;
\ No newline at end of file
+pub use kurbo::Affine;
diff --git a/crates/craft_primitives/src/geometry/point.rs b/crates/craft_primitives/src/geometry/point.rs
index 94ce34c0..de02fdca 100644
--- a/crates/craft_primitives/src/geometry/point.rs
+++ b/crates/craft_primitives/src/geometry/point.rs
@@ -1,5 +1,4 @@
 use dpi::PhysicalPosition;
-
 pub use kurbo::Point;
 
 /// A “Point-converter” extension trait.
diff --git a/crates/craft_primitives/src/geometry/rectangle.rs b/crates/craft_primitives/src/geometry/rectangle.rs
index 6af62827..cbe5f949 100644
--- a/crates/craft_primitives/src/geometry/rectangle.rs
+++ b/crates/craft_primitives/src/geometry/rectangle.rs
@@ -1,6 +1,7 @@
-use crate::geometry::Point;
-use peniko::kurbo;
 use dpi;
+use peniko::kurbo;
+
+use crate::geometry::Point;
 
 /// A structure representing a rectangle in 2D space.
 #[derive(Debug, Clone, Copy, Default, PartialEq)]
@@ -108,7 +109,6 @@ impl Rectangle {
         }
     }
 
-
     pub fn intersection(&self, other: &Rectangle) -> Option<Rectangle> {
         let x0 = self.x.max(other.x);
         let y0 = self.y.max(other.y);
@@ -124,10 +124,7 @@ impl Rectangle {
 
     #[inline(always)]
     pub fn intersects(&self, other: &Rectangle) -> bool {
-        self.x < other.right()
-            && self.right() > other.x
-            && self.y < other.bottom()
-            && self.bottom() > other.y
+        self.x < other.right() && self.right() > other.x && self.y < other.bottom() && self.bottom() > other.y
     }
 }
 
@@ -152,4 +149,4 @@ impl From<parley::Rect> for Rectangle {
         }
     }
 }
-*/
\ No newline at end of file
+*/
diff --git a/crates/craft_primitives/src/geometry/size.rs b/crates/craft_primitives/src/geometry/size.rs
index 77122f1e..24fdc692 100644
--- a/crates/craft_primitives/src/geometry/size.rs
+++ b/crates/craft_primitives/src/geometry/size.rs
@@ -38,4 +38,4 @@ impl<T> Size<T> {
         Self::new(size.width, size.height)
     }
 }
-*/
\ No newline at end of file
+*/
diff --git a/crates/craft_primitives/src/geometry/trblrectangle.rs b/crates/craft_primitives/src/geometry/trblrectangle.rs
index 484f4710..f06a3c24 100644
--- a/crates/craft_primitives/src/geometry/trblrectangle.rs
+++ b/crates/craft_primitives/src/geometry/trblrectangle.rs
@@ -1,6 +1,5 @@
 #[derive(Copy, Clone, Debug, Default, PartialEq)]
-pub struct TrblRectangle<T>
-{
+pub struct TrblRectangle<T> {
     pub top: T,
     pub right: T,
     pub bottom: T,
@@ -20,6 +19,7 @@ where
             left,
         }
     }
+
     pub const fn new_all(value: T) -> Self {
         Self {
             top: value,
diff --git a/crates/craft_primitives/src/hit_testable.rs b/crates/craft_primitives/src/hit_testable.rs
index 343f1c93..b19d8ac9 100644
--- a/crates/craft_primitives/src/hit_testable.rs
+++ b/crates/craft_primitives/src/hit_testable.rs
@@ -1,11 +1,9 @@
 use crate::geometry::Point;
 
 pub trait HitTestable {
-
     fn hit_test(&self, point: &Point) -> bool;
 
     fn has_event_handlers(&self) -> bool;
 
     fn id(&self) -> usize;
-
-}
\ No newline at end of file
+}
diff --git a/crates/craft_primitives/src/lib.rs b/crates/craft_primitives/src/lib.rs
index 4963d84c..534279bf 100644
--- a/crates/craft_primitives/src/lib.rs
+++ b/crates/craft_primitives/src/lib.rs
@@ -1,10 +1,9 @@
 mod color;
 
-pub mod geometry;
 mod color_brush;
+pub mod geometry;
 mod hit_testable;
 
-pub use color::Color;
-pub use color::palette;
+pub use color::{Color, palette};
 pub use color_brush::ColorBrush;
-pub use hit_testable::HitTestable;
\ No newline at end of file
+pub use hit_testable::HitTestable;
diff --git a/crates/craft_renderer/src/blank_renderer.rs b/crates/craft_renderer/src/blank_renderer.rs
index 95cdcfb9..2be78695 100644
--- a/crates/craft_renderer/src/blank_renderer.rs
+++ b/crates/craft_renderer/src/blank_renderer.rs
@@ -1,10 +1,12 @@
-use crate::renderer::{RenderList, Renderer};
-use craft_primitives::geometry::Rectangle;
-use craft_primitives::Color;
-use craft_resource_manager::ResourceManager;
 use std::any::Any;
 use std::sync::Arc;
 
+use craft_primitives::Color;
+use craft_primitives::geometry::Rectangle;
+use craft_resource_manager::ResourceManager;
+
+use crate::renderer::{RenderList, Renderer};
+
 pub struct BlankRenderer;
 
 impl Renderer for BlankRenderer {
@@ -19,17 +21,17 @@ impl Renderer for BlankRenderer {
     fn resize_surface(&mut self, _width: f32, _height: f32) {}
 
     fn surface_set_clear_color(&mut self, _color: Color) {}
+
     fn as_any_mut(&mut self) -> &mut dyn Any {
         self
     }
-    
+
     fn prepare_render_list<'a>(
         &mut self,
         _render_list: &mut RenderList,
         _resource_manager: Arc<ResourceManager>,
         _window: Rectangle,
     ) {
-
     }
 
     fn submit(&mut self, _resource_manager: Arc<ResourceManager>) {}
diff --git a/crates/craft_renderer/src/color.rs b/crates/craft_renderer/src/color.rs
index e69de29b..8b137891 100644
--- a/crates/craft_renderer/src/color.rs
+++ b/crates/craft_renderer/src/color.rs
@@ -0,0 +1 @@
+
diff --git a/crates/craft_renderer/src/image_adapter.rs b/crates/craft_renderer/src/image_adapter.rs
index 50f2f149..d37e3f0b 100644
--- a/crates/craft_renderer/src/image_adapter.rs
+++ b/crates/craft_renderer/src/image_adapter.rs
@@ -1,6 +1,7 @@
-use craft_resource_manager::image::ImageResource;
 use std::sync::Arc;
 
+use craft_resource_manager::image::ImageResource;
+
 pub struct ImageAdapter {
     image: Arc<ImageResource>,
 }
diff --git a/crates/craft_renderer/src/lib.rs b/crates/craft_renderer/src/lib.rs
index de8aed24..d9d370a5 100644
--- a/crates/craft_renderer/src/lib.rs
+++ b/crates/craft_renderer/src/lib.rs
@@ -11,13 +11,11 @@ pub mod vello_cpu;
 
 pub mod blank_renderer;
 mod image_adapter;
+mod renderer_type;
+pub mod text_renderer_data;
 pub(crate) mod tinyvg_helpers;
 #[cfg(feature = "vello_hybrid_renderer")]
 pub mod vello_hybrid;
-pub mod text_renderer_data;
-mod renderer_type;
 
-pub use renderer::Brush;
-pub use renderer::RenderCommand;
-pub use renderer::RenderList;
+pub use renderer::{Brush, RenderCommand, RenderList};
 pub use renderer_type::RendererType;
diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index 2cb78d6d..a51dab0b 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -1,14 +1,16 @@
-use crate::text_renderer_data::TextData;
-use craft_primitives::geometry::Rectangle;
-use craft_primitives::Color;
-use craft_resource_manager::{ResourceIdentifier, ResourceManager};
-use peniko::kurbo::Shape;
-use peniko::{kurbo, BrushRef, Gradient};
 use std::any::Any;
 use std::cell::RefCell;
 use std::rc::Weak;
 use std::sync::Arc;
 
+use craft_primitives::Color;
+use craft_primitives::geometry::Rectangle;
+use craft_resource_manager::{ResourceIdentifier, ResourceManager};
+use peniko::kurbo::Shape;
+use peniko::{BrushRef, Gradient, kurbo};
+
+use crate::text_renderer_data::TextData;
+
 #[derive(Clone)]
 pub enum RenderCommand {
     DrawRect(Rectangle, Color),
@@ -131,7 +133,6 @@ impl RenderList {
         self.commands.push(RenderCommand::DrawRect(rectangle, fill_color));
     }
 
-
     #[inline(always)]
     pub fn push_hit_testable(&mut self, id: u64, bounding_box: Rectangle) {
         if let Some(cull) = &self.cull {
@@ -149,7 +150,8 @@ impl RenderList {
                 return;
             }
         }
-        self.commands.push(RenderCommand::DrawRectOutline(rectangle, outline_color, thickness));
+        self.commands
+            .push(RenderCommand::DrawRectOutline(rectangle, outline_color, thickness));
     }
 
     #[inline(always)]
@@ -175,12 +177,14 @@ impl RenderList {
                 return;
             }
         }
-        self.commands.push(RenderCommand::DrawText(component, rectangle, text_scroll, show_cursor));
+        self.commands
+            .push(RenderCommand::DrawText(component, rectangle, text_scroll, show_cursor));
     }
 
     #[inline(always)]
     pub fn draw_image(&mut self, rectangle: Rectangle, resource_identifier: ResourceIdentifier) {
-        self.commands.push(RenderCommand::DrawImage(rectangle, resource_identifier));
+        self.commands
+            .push(RenderCommand::DrawImage(rectangle, resource_identifier));
     }
 
     #[inline(always)]
@@ -190,7 +194,11 @@ impl RenderList {
         resource_identifier: ResourceIdentifier,
         override_color: Option<Color>,
     ) {
-        self.commands.push(RenderCommand::DrawTinyVg(rectangle, resource_identifier, override_color));
+        self.commands.push(RenderCommand::DrawTinyVg(
+            rectangle,
+            resource_identifier,
+            override_color,
+        ));
     }
 
     #[inline(always)]
@@ -224,7 +232,7 @@ pub trait Renderer: Any {
     fn surface_height(&self) -> f32;
     fn resize_surface(&mut self, width: f32, height: f32);
     fn surface_set_clear_color(&mut self, color: Color);
-    
+
     fn as_any_mut(&mut self) -> &mut dyn Any;
 
     fn sort_and_cull_render_list(&mut self, render_list: &mut RenderList) {
@@ -257,7 +265,9 @@ pub trait Renderer: Any {
                 RenderCommand::StartOverlay => {
                     // Overlay Start
                     unsafe {
-                        (*current).children.push(SortedItem::Overlay(SortedCommands { children: vec![] }));
+                        (*current)
+                            .children
+                            .push(SortedItem::Overlay(SortedCommands { children: vec![] }));
                         match (*current).children.last_mut() {
                             Some(SortedItem::Overlay(overlay)) => {
                                 stack.push(overlay);
diff --git a/crates/craft_renderer/src/renderer_type.rs b/crates/craft_renderer/src/renderer_type.rs
index ae907a5b..e3a8ac91 100644
--- a/crates/craft_renderer/src/renderer_type.rs
+++ b/crates/craft_renderer/src/renderer_type.rs
@@ -1,14 +1,14 @@
 use std::fmt::{Display, Formatter};
 use std::sync::Arc;
+
 use winit::window::Window;
+
 use crate::blank_renderer::BlankRenderer;
 use crate::renderer::Renderer;
 #[cfg(feature = "vello_renderer")]
 use crate::vello::VelloRenderer;
-
 #[cfg(feature = "vello_cpu_renderer")]
 use crate::vello_cpu::VelloCpuRenderer;
-
 #[cfg(feature = "vello_hybrid_renderer")]
 use crate::vello_hybrid::VelloHybridRenderer;
 
@@ -60,7 +60,6 @@ impl Display for RendererType {
 }
 
 impl RendererType {
-
     pub async fn create(&self, window: Arc<Window>) -> Box<dyn Renderer> {
         let renderer: Box<dyn Renderer> = match self {
             #[cfg(feature = "vello_renderer")]
@@ -73,9 +72,9 @@ impl RendererType {
                 // So the linter does not complain about window being unused.
                 let _ = window;
                 Box::new(BlankRenderer)
-            },
+            }
         };
 
         renderer
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_renderer/src/text_renderer_data.rs b/crates/craft_renderer/src/text_renderer_data.rs
index fd944585..c9c9fdcc 100644
--- a/crates/craft_renderer/src/text_renderer_data.rs
+++ b/crates/craft_renderer/src/text_renderer_data.rs
@@ -1,7 +1,7 @@
+use craft_primitives::ColorBrush;
 use craft_primitives::geometry::Rectangle;
 use peniko::Color;
 use peniko::kurbo::{Affine, Line};
-use craft_primitives::ColorBrush;
 
 #[derive(Clone, Debug)]
 pub struct TextRender {
@@ -49,5 +49,4 @@ pub struct TextRenderGlyph {
 
 pub trait TextData {
     fn get_text_renderer(&self) -> Option<&TextRender>;
-
-}
\ No newline at end of file
+}
diff --git a/crates/craft_renderer/src/tinyvg_helpers.rs b/crates/craft_renderer/src/tinyvg_helpers.rs
index fc37758a..f85e6fa9 100644
--- a/crates/craft_renderer/src/tinyvg_helpers.rs
+++ b/crates/craft_renderer/src/tinyvg_helpers.rs
@@ -1,11 +1,11 @@
-use crate::renderer::Brush;
 use peniko::color::AlphaColor;
-use peniko::kurbo::BezPath;
-use peniko::kurbo::SvgArc;
-use peniko::{kurbo, Color, Gradient};
+use peniko::kurbo::{BezPath, SvgArc};
+use peniko::{Color, Gradient, kurbo};
 use tinyvg_rs::color_table::ColorTable;
 use tinyvg_rs::commands::{Path, PathCommand, Point, Style};
 
+use crate::renderer::Brush;
+
 #[allow(clippy::wrong_self_convention)]
 /// Convert the TinyVG point to a kurbo color.
 pub(crate) fn to_kurbo_point(point: Point) -> kurbo::Point {
diff --git a/crates/craft_renderer/src/vello/mod.rs b/crates/craft_renderer/src/vello/mod.rs
index 918fe0da..401fcd46 100644
--- a/crates/craft_renderer/src/vello/mod.rs
+++ b/crates/craft_renderer/src/vello/mod.rs
@@ -1,27 +1,25 @@
 mod tinyvg;
 
-use crate::image_adapter::ImageAdapter;
-use crate::renderer::{RenderCommand, RenderList, Renderer, SortedCommands, TextScroll};
-use crate::text_renderer_data::TextRenderLine;
-use crate::vello::tinyvg::draw_tiny_vg;
-use craft_primitives::geometry::Rectangle;
+use std::any::Any;
+use std::sync::Arc;
+
 use craft_primitives::Color;
-use craft_resource_manager::resource::Resource;
+use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::ResourceManager;
+use craft_resource_manager::resource::Resource;
 use peniko::{BrushRef, ImageAlphaType};
-use std::any::Any;
-use std::sync::Arc;
 use vello::kurbo::{Affine, Rect, Stroke};
 use vello::peniko::{BlendMode, Blob, Fill};
-use vello::{kurbo, peniko, AaConfig, Error, RendererOptions};
-use vello::{Glyph, Scene};
+use vello::{AaConfig, Error, Glyph, RendererOptions, Scene, kurbo, peniko};
 use wgpu::util::TextureBlitter;
-use wgpu::{
-    Adapter, Device, Instance, Limits, MemoryHints, Queue, Surface, SurfaceConfiguration, SurfaceError, SurfaceTexture,
-    Texture, TextureFormat, TextureView,
-};
+use wgpu::{Adapter, Device, Instance, Limits, MemoryHints, Queue, Surface, SurfaceConfiguration, SurfaceError, SurfaceTexture, Texture, TextureFormat, TextureView};
 use winit::window::Window;
 
+use crate::image_adapter::ImageAdapter;
+use crate::renderer::{RenderCommand, RenderList, Renderer, SortedCommands, TextScroll};
+use crate::text_renderer_data::TextRenderLine;
+use crate::vello::tinyvg::draw_tiny_vg;
+
 pub struct RenderSurface {
     pub surface: Surface<'static>,
     pub surface_config: SurfaceConfiguration,
@@ -69,7 +67,9 @@ impl RenderSurface {
                         panic!("Failed to acquire surface texture: {err:?}");
                     }
                 }
-                self.surface.get_current_texture().expect("Failed to get surface texture after resize")
+                self.surface
+                    .get_current_texture()
+                    .expect("Failed to get surface texture after resize")
             }
         }
     }
@@ -280,7 +280,13 @@ impl Renderer for VelloRenderer {
                     vello_draw_rect(scene, *rectangle, *fill_color);
                 }
                 RenderCommand::DrawRectOutline(rectangle, outline_color, thickness) => {
-                    self.scene.stroke(&Stroke::new(*thickness), Affine::IDENTITY, outline_color, None, &rectangle.to_kurbo());
+                    self.scene.stroke(
+                        &Stroke::new(*thickness),
+                        Affine::IDENTITY,
+                        outline_color,
+                        None,
+                        &rectangle.to_kurbo(),
+                    );
                 }
                 RenderCommand::DrawImage(rectangle, resource_identifier) => {
                     let resource = resource_manager.get(resource_identifier);
@@ -392,7 +398,10 @@ impl Renderer for VelloRenderer {
                                 .draw_glyphs(&item.font)
                                 .font_size(item.font_size)
                                 .brush(BrushRef::Solid(
-                                    text_render.override_brush.map(|b| b.color).unwrap_or_else(|| item.brush.color),
+                                    text_render
+                                        .override_brush
+                                        .map(|b| b.color)
+                                        .unwrap_or_else(|| item.brush.color),
                                 ))
                                 .transform(text_transform)
                                 .glyph_transform(item.glyph_transform)
@@ -471,9 +480,11 @@ impl Renderer for VelloRenderer {
 
         if !self.render_into_texture {
             let swapchain_surface_texture =
-                self.render_surface.get_swapchain_surface_texture(&self.device, width, height);
-            let swapchain_surface_texture_view =
-                swapchain_surface_texture.texture.create_view(&wgpu::TextureViewDescriptor::default());
+                self.render_surface
+                    .get_swapchain_surface_texture(&self.device, width, height);
+            let swapchain_surface_texture_view = swapchain_surface_texture
+                .texture
+                .create_view(&wgpu::TextureViewDescriptor::default());
             let mut encoder = self.device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
                 label: Some("Surface Blit"),
             });
diff --git a/crates/craft_renderer/src/vello/tinyvg.rs b/crates/craft_renderer/src/vello/tinyvg.rs
index e8f65ff7..bd0ea5b6 100644
--- a/crates/craft_renderer/src/vello/tinyvg.rs
+++ b/crates/craft_renderer/src/vello/tinyvg.rs
@@ -1,15 +1,17 @@
-use crate::tinyvg_helpers;
+use std::sync::Arc;
+
 use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::resource::Resource;
 use craft_resource_manager::{ResourceIdentifier, ResourceManager};
 use peniko::kurbo::{Affine, Line, Stroke};
-use peniko::{kurbo, Color, Fill};
-use std::sync::Arc;
+use peniko::{Color, Fill, kurbo};
 use tinyvg_rs::color_table::ColorTable;
 use tinyvg_rs::commands::{DrawCommand, Path, PathCommand, Segment, Style};
 use tinyvg_rs::common::Unit;
 use vello::Scene;
 
+use crate::tinyvg_helpers;
+
 pub(crate) fn draw_path(
     scene: &mut Scene,
     path: &Path,
@@ -77,7 +79,15 @@ pub(crate) fn draw_tiny_vg(
                     let path = Path {
                         segments: vec![segment],
                     };
-                    draw_path(scene, &path, &data.style, None, &tiny_vg.color_table, &affine, override_color);
+                    draw_path(
+                        scene,
+                        &path,
+                        &data.style,
+                        None,
+                        &tiny_vg.color_table,
+                        &affine,
+                        override_color,
+                    );
                 }
                 DrawCommand::FillRectangles(data) => {
                     let brush = tinyvg_helpers::get_brush(&data.style, &tiny_vg.color_table, override_color);
@@ -88,7 +98,15 @@ pub(crate) fn draw_tiny_vg(
                     }
                 }
                 DrawCommand::FillPath(data) => {
-                    draw_path(scene, &data.path, &data.style, None, &tiny_vg.color_table, &affine, override_color);
+                    draw_path(
+                        scene,
+                        &data.path,
+                        &data.style,
+                        None,
+                        &tiny_vg.color_table,
+                        &affine,
+                        override_color,
+                    );
                 }
                 DrawCommand::DrawLines(data) => {
                     let brush = tinyvg_helpers::get_brush(&data.line_style, &tiny_vg.color_table, override_color);
@@ -106,8 +124,10 @@ pub(crate) fn draw_tiny_vg(
 
                     let mut start = data.points[0];
                     for point in &data.points {
-                        let line =
-                            Line::new(tinyvg_helpers::to_kurbo_point(start), tinyvg_helpers::to_kurbo_point(*point));
+                        let line = Line::new(
+                            tinyvg_helpers::to_kurbo_point(start),
+                            tinyvg_helpers::to_kurbo_point(*point),
+                        );
                         scene.stroke(&Stroke::new(data.line_width.0), affine, &brush, None, &line);
                         start = *point;
                     }
@@ -117,8 +137,10 @@ pub(crate) fn draw_tiny_vg(
 
                     let mut start = data.points[0];
                     for point in &data.points {
-                        let line =
-                            Line::new(tinyvg_helpers::to_kurbo_point(start), tinyvg_helpers::to_kurbo_point(*point));
+                        let line = Line::new(
+                            tinyvg_helpers::to_kurbo_point(start),
+                            tinyvg_helpers::to_kurbo_point(*point),
+                        );
                         scene.stroke(&Stroke::new(data.line_width.0), affine, &brush, None, &line);
                         start = *point;
                     }
@@ -147,7 +169,15 @@ pub(crate) fn draw_tiny_vg(
                     let path = Path {
                         segments: vec![segment],
                     };
-                    draw_path(scene, &path, &data.fill_style, None, &tiny_vg.color_table, &affine, override_color);
+                    draw_path(
+                        scene,
+                        &path,
+                        &data.fill_style,
+                        None,
+                        &tiny_vg.color_table,
+                        &affine,
+                        override_color,
+                    );
                     draw_path(
                         scene,
                         &path,
@@ -169,7 +199,15 @@ pub(crate) fn draw_tiny_vg(
                     }
                 }
                 DrawCommand::OutlineFillPath(data) => {
-                    draw_path(scene, &data.path, &data.fill_style, None, &tiny_vg.color_table, &affine, override_color);
+                    draw_path(
+                        scene,
+                        &data.path,
+                        &data.fill_style,
+                        None,
+                        &tiny_vg.color_table,
+                        &affine,
+                        override_color,
+                    );
                     draw_path(
                         scene,
                         &data.path,
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index e8849a36..27b6346b 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -1,29 +1,28 @@
 pub(crate) mod tinyvg;
 
-use crate::image_adapter::ImageAdapter;
-use crate::renderer::{RenderList, Renderer, SortedCommands, TextScroll};
-use crate::text_renderer_data::TextRenderLine;
-use crate::vello_cpu::tinyvg::draw_tiny_vg;
-use crate::{Brush, RenderCommand};
+use std::any::Any;
+use std::num::{NonZero, NonZeroU32};
+use std::ops::{Deref, DerefMut};
+use std::sync::Arc;
+
 use craft_primitives::geometry::Rectangle;
-use craft_resource_manager::resource::Resource;
 use craft_resource_manager::ResourceManager;
-use peniko::kurbo::Affine;
-use peniko::kurbo::Shape;
-use peniko::{kurbo, Blob, Color, Fill, ImageAlphaType};
+use craft_resource_manager::resource::Resource;
+use peniko::kurbo::{Affine, Shape};
+use peniko::{Blob, Color, Fill, ImageAlphaType, kurbo};
 use softbuffer::Buffer;
-use std::any::Any;
-use std::num::NonZero;
-use std::num::NonZeroU32;
-use std::ops::Deref;
-use std::ops::DerefMut;
-use std::sync::Arc;
 use vello_common::glyph::Glyph;
 use vello_common::kurbo::Stroke;
 use vello_common::paint::PaintType;
 use vello_cpu::{Pixmap, RenderContext};
 use winit::window::Window;
 
+use crate::image_adapter::ImageAdapter;
+use crate::renderer::{RenderList, Renderer, SortedCommands, TextScroll};
+use crate::text_renderer_data::TextRenderLine;
+use crate::vello_cpu::tinyvg::draw_tiny_vg;
+use crate::{Brush, RenderCommand};
+
 pub struct Surface {
     inner_surface: softbuffer::Surface<Arc<Window>, Arc<Window>>,
 }
@@ -114,7 +113,10 @@ impl Renderer for VelloCpuRenderer {
         self.window_width = width as u16;
         self.window_height = height as u16;
         self.surface
-            .resize(NonZeroU32::new(width as u32).unwrap(), NonZeroU32::new(height as u32).unwrap())
+            .resize(
+                NonZeroU32::new(width as u32).unwrap(),
+                NonZeroU32::new(height as u32).unwrap(),
+            )
             .expect("TODO: panic message");
         self.pixmap = Pixmap::new(width as u16, height as u16);
         self.render_context = RenderContext::new(width as u16, height as u16);
@@ -277,7 +279,10 @@ impl Renderer for VelloCpuRenderer {
                             }
 
                             self.render_context.set_paint(PaintType::from(
-                                text_render.override_brush.map(|b| b.color).unwrap_or_else(|| item.brush.color),
+                                text_render
+                                    .override_brush
+                                    .map(|b| b.color)
+                                    .unwrap_or_else(|| item.brush.color),
                             ));
                             self.render_context.reset_transform();
 
diff --git a/crates/craft_renderer/src/vello_cpu/tinyvg.rs b/crates/craft_renderer/src/vello_cpu/tinyvg.rs
index e527b675..1af8e95d 100644
--- a/crates/craft_renderer/src/vello_cpu/tinyvg.rs
+++ b/crates/craft_renderer/src/vello_cpu/tinyvg.rs
@@ -1,17 +1,18 @@
+use std::sync::Arc;
+
 use craft_primitives::geometry::Rectangle;
-use crate::vello_cpu::brush_to_paint;
-use crate::{tinyvg_helpers, Brush};
 use craft_resource_manager::resource::Resource;
 use craft_resource_manager::{ResourceIdentifier, ResourceManager};
 use peniko::kurbo::{Affine, BezPath, Line, Shape, Stroke};
-use peniko::Color;
-use peniko::{kurbo, Fill};
-use std::sync::Arc;
+use peniko::{Color, Fill, kurbo};
 use tinyvg_rs::color_table::ColorTable;
 use tinyvg_rs::commands::{DrawCommand, Path, PathCommand, Segment, Style};
 use tinyvg_rs::common::Unit;
 use vello_cpu::RenderContext;
 
+use crate::vello_cpu::brush_to_paint;
+use crate::{Brush, tinyvg_helpers};
+
 fn stroke_path(scene: &mut RenderContext, bez_path: &BezPath, affine: &Affine, line_width: f64, brush: &Brush) {
     scene.set_stroke(Stroke::new(line_width));
     scene.set_transform(*affine);
@@ -96,7 +97,15 @@ pub(crate) fn draw_tiny_vg(
                     let path = Path {
                         segments: vec![segment],
                     };
-                    draw_path(scene, &path, &data.style, None, &tiny_vg.color_table, &affine, override_color);
+                    draw_path(
+                        scene,
+                        &path,
+                        &data.style,
+                        None,
+                        &tiny_vg.color_table,
+                        &affine,
+                        override_color,
+                    );
                 }
                 DrawCommand::FillRectangles(data) => {
                     let brush = tinyvg_helpers::get_brush(&data.style, &tiny_vg.color_table, override_color);
@@ -107,7 +116,15 @@ pub(crate) fn draw_tiny_vg(
                     }
                 }
                 DrawCommand::FillPath(data) => {
-                    draw_path(scene, &data.path, &data.style, None, &tiny_vg.color_table, &affine, override_color);
+                    draw_path(
+                        scene,
+                        &data.path,
+                        &data.style,
+                        None,
+                        &tiny_vg.color_table,
+                        &affine,
+                        override_color,
+                    );
                 }
                 DrawCommand::DrawLines(data) => {
                     let brush = tinyvg_helpers::get_brush(&data.line_style, &tiny_vg.color_table, override_color);
@@ -125,8 +142,10 @@ pub(crate) fn draw_tiny_vg(
 
                     let mut start = data.points[0];
                     for point in &data.points {
-                        let line =
-                            Line::new(tinyvg_helpers::to_kurbo_point(start), tinyvg_helpers::to_kurbo_point(*point));
+                        let line = Line::new(
+                            tinyvg_helpers::to_kurbo_point(start),
+                            tinyvg_helpers::to_kurbo_point(*point),
+                        );
                         stroke_path(scene, &line.into_path(0.1), &affine, data.line_width.0, &brush);
                         start = *point;
                     }
@@ -136,8 +155,10 @@ pub(crate) fn draw_tiny_vg(
 
                     let mut start = data.points[0];
                     for point in &data.points {
-                        let line =
-                            Line::new(tinyvg_helpers::to_kurbo_point(start), tinyvg_helpers::to_kurbo_point(*point));
+                        let line = Line::new(
+                            tinyvg_helpers::to_kurbo_point(start),
+                            tinyvg_helpers::to_kurbo_point(*point),
+                        );
                         stroke_path(scene, &line.into_path(0.1), &affine, data.line_width.0, &brush);
                         start = *point;
                     }
@@ -166,7 +187,15 @@ pub(crate) fn draw_tiny_vg(
                     let path = Path {
                         segments: vec![segment],
                     };
-                    draw_path(scene, &path, &data.fill_style, None, &tiny_vg.color_table, &affine, override_color);
+                    draw_path(
+                        scene,
+                        &path,
+                        &data.fill_style,
+                        None,
+                        &tiny_vg.color_table,
+                        &affine,
+                        override_color,
+                    );
                     draw_path(
                         scene,
                         &path,
@@ -189,7 +218,15 @@ pub(crate) fn draw_tiny_vg(
                     }
                 }
                 DrawCommand::OutlineFillPath(data) => {
-                    draw_path(scene, &data.path, &data.fill_style, None, &tiny_vg.color_table, &affine, override_color);
+                    draw_path(
+                        scene,
+                        &data.path,
+                        &data.fill_style,
+                        None,
+                        &tiny_vg.color_table,
+                        &affine,
+                        override_color,
+                    );
                     draw_path(
                         scene,
                         &data.path,
diff --git a/crates/craft_renderer/src/vello_hybrid/mod.rs b/crates/craft_renderer/src/vello_hybrid/mod.rs
index 091d7a79..b5959c78 100644
--- a/crates/craft_renderer/src/vello_hybrid/mod.rs
+++ b/crates/craft_renderer/src/vello_hybrid/mod.rs
@@ -1,34 +1,31 @@
 mod render_context;
 mod tinyvg;
 
-use crate::renderer::{RenderCommand, RenderList, Renderer as CraftRenderer, SortedCommands, TextScroll};
+use std::any::Any;
+use std::collections::{HashMap, HashSet};
+use std::sync::Arc;
+
 use chrono::{DateTime, Utc};
-use craft_primitives::geometry::Rectangle;
 use craft_primitives::Color;
+use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::resource::Resource;
 use craft_resource_manager::{ResourceIdentifier, ResourceManager};
 use kurbo::{Affine, Stroke};
 use peniko::kurbo::Shape;
-use std::any::Any;
-use std::collections::{HashMap, HashSet};
-use std::sync::Arc;
 use vello_common::color::PremulRgba8;
 use vello_common::glyph::Glyph;
-use vello_common::paint::ImageId;
-use vello_common::paint::{ImageSource, PaintType};
+use vello_common::paint::{ImageId, ImageSource, PaintType};
 use vello_common::pixmap::Pixmap;
 use vello_common::{kurbo, peniko};
-use vello_hybrid::RenderSize;
-use vello_hybrid::{RenderTargetConfig, Renderer};
+use vello_hybrid::{RenderSize, RenderTargetConfig, Renderer, Scene};
 use wgpu::TextureFormat;
 use winit::window::Window;
 
+use crate::Brush;
+use crate::renderer::{RenderCommand, RenderList, Renderer as CraftRenderer, SortedCommands, TextScroll};
 use crate::text_renderer_data::TextRenderLine;
-use crate::vello_hybrid::render_context::RenderContext;
-use crate::vello_hybrid::render_context::RenderSurface;
+use crate::vello_hybrid::render_context::{RenderContext, RenderSurface};
 use crate::vello_hybrid::tinyvg::draw_tiny_vg;
-use crate::Brush;
-use vello_hybrid::Scene;
 
 pub struct ActiveRenderState {
     // The fields MUST be in this order, so that the surface is dropped before the window
@@ -107,7 +104,9 @@ impl VelloHybridRenderer {
             .await;
 
         // Create a vello Renderer for the surface (using its device id)
-        vello_renderer.renderers.resize_with(vello_renderer.context.devices.len(), || None);
+        vello_renderer
+            .renderers
+            .resize_with(vello_renderer.context.devices.len(), || None);
         vello_renderer.renderers[0].get_or_insert_with(|| create_vello_renderer(&vello_renderer.context, &surface));
 
         // Save the Window and Surface to a state variable
@@ -148,7 +147,8 @@ impl CraftRenderer for VelloHybridRenderer {
         };
         render_state.window_height = height;
         render_state.window_width = width;
-        self.context.resize_surface(&mut render_state.surface, width as u32, height as u32);
+        self.context
+            .resize_surface(&mut render_state.surface, width as u32, height as u32);
         self.scene = Scene::new(width as u16, height as u16);
     }
 
@@ -178,13 +178,19 @@ impl CraftRenderer for VelloHybridRenderer {
         let width = surface.config.width;
         let height = surface.config.height;
 
-        vello_draw_rect(&mut self.scene, Rectangle::new(0.0, 0.0, width as f32, height as f32), Color::WHITE);
+        vello_draw_rect(
+            &mut self.scene,
+            Rectangle::new(0.0, 0.0, width as f32, height as f32),
+            Color::WHITE,
+        );
 
         let renderer = self.renderers[surface.dev_id].as_mut().unwrap();
         let device_handle = &self.context.devices[surface.dev_id];
-        let mut encoder = device_handle.device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
-            label: Some("Blit Textures onto a Texture Atlas Encoder"),
-        });
+        let mut encoder = device_handle
+            .device
+            .create_command_encoder(&wgpu::CommandEncoderDescriptor {
+                label: Some("Blit Textures onto a Texture Atlas Encoder"),
+            });
 
         let mut images_were_uploaded = false;
 
@@ -248,7 +254,8 @@ impl CraftRenderer for VelloHybridRenderer {
                                 &mut encoder,
                                 &pixmap,
                             );
-                            self.images.insert(resource_identifier.clone(), (image_id, expiration_time));
+                            self.images
+                                .insert(resource_identifier.clone(), (image_id, expiration_time));
 
                             image_id
                         };
@@ -348,12 +355,17 @@ impl CraftRenderer for VelloHybridRenderer {
                             }
 
                             scene.set_paint(PaintType::from(
-                                text_render.override_brush.map(|b| b.color).unwrap_or_else(|| item.brush.color),
+                                text_render
+                                    .override_brush
+                                    .map(|b| b.color)
+                                    .unwrap_or_else(|| item.brush.color),
                             ));
                             scene.reset_transform();
 
-                            let glyph_run_builder =
-                                scene.glyph_run(&item.font).font_size(item.font_size).glyph_transform(text_transform);
+                            let glyph_run_builder = scene
+                                .glyph_run(&item.font)
+                                .font_size(item.font_size)
+                                .glyph_transform(text_transform);
                             glyph_run_builder.fill_glyphs(item.glyphs.iter().map(|glyph| Glyph {
                                 id: glyph.id,
                                 x: glyph.x,
@@ -373,7 +385,13 @@ impl CraftRenderer for VelloHybridRenderer {
                     }
                 }
                 RenderCommand::DrawTinyVg(rectangle, resource_identifier, override_color) => {
-                    draw_tiny_vg(scene, *rectangle, &resource_manager, resource_identifier.clone(), override_color);
+                    draw_tiny_vg(
+                        scene,
+                        *rectangle,
+                        &resource_manager,
+                        resource_identifier.clone(),
+                        override_color,
+                    );
                 }
                 RenderCommand::PushLayer(rect) => {
                     let clip_path = Some(
@@ -401,7 +419,12 @@ impl CraftRenderer for VelloHybridRenderer {
         for expired_image_id in &expired_images {
             // Note: Expired images will have an entry in the images hashmap, but with a new ImageId.
             // Meaning, that we need to delete the detached/abandoned expired image id here.
-            renderer.destroy_image(&device_handle.device, &device_handle.queue, &mut encoder, *expired_image_id);
+            renderer.destroy_image(
+                &device_handle.device,
+                &device_handle.queue,
+                &mut encoder,
+                *expired_image_id,
+            );
             images_were_uploaded = true;
         }
 
@@ -446,22 +469,36 @@ impl CraftRenderer for VelloHybridRenderer {
         let device_handle = &self.context.devices[surface.dev_id];
 
         // Get the surface's texture
-        let surface_texture = surface.surface.get_current_texture().expect("failed to get surface texture");
+        let surface_texture = surface
+            .surface
+            .get_current_texture()
+            .expect("failed to get surface texture");
 
         let render_size = RenderSize {
             width: surface.config.width,
             height: surface.config.height,
         };
 
-        let mut encoder = device_handle.device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
-            label: Some("Vello Render to Surface pass"),
-        });
-        let texture_view = surface_texture.texture.create_view(&wgpu::TextureViewDescriptor::default());
+        let mut encoder = device_handle
+            .device
+            .create_command_encoder(&wgpu::CommandEncoderDescriptor {
+                label: Some("Vello Render to Surface pass"),
+            });
+        let texture_view = surface_texture
+            .texture
+            .create_view(&wgpu::TextureViewDescriptor::default());
 
         self.renderers[surface.dev_id]
             .as_mut()
             .unwrap()
-            .render(&self.scene, &device_handle.device, &device_handle.queue, &mut encoder, &render_size, &texture_view)
+            .render(
+                &self.scene,
+                &device_handle.device,
+                &device_handle.queue,
+                &mut encoder,
+                &render_size,
+                &texture_view,
+            )
             .unwrap();
 
         device_handle.queue.submit([encoder.finish()]);
@@ -478,7 +515,11 @@ fn brush_to_paint(brush: &Brush) -> PaintType {
         Brush::Color(color) => PaintType::from(*color),
         Brush::Gradient(gradient) => {
             // Paint::Gradient does not exist yet, so we need to come back and fix this later.
-            let color = gradient.stops.first().map(|c| c.color.to_alpha_color()).unwrap_or(Color::BLACK);
+            let color = gradient
+                .stops
+                .first()
+                .map(|c| c.color.to_alpha_color())
+                .unwrap_or(Color::BLACK);
             PaintType::from(color)
         }
     }
diff --git a/crates/craft_renderer/src/vello_hybrid/render_context.rs b/crates/craft_renderer/src/vello_hybrid/render_context.rs
index 63d1d62a..20300c47 100644
--- a/crates/craft_renderer/src/vello_hybrid/render_context.rs
+++ b/crates/craft_renderer/src/vello_hybrid/render_context.rs
@@ -6,14 +6,10 @@
     reason = "This is a shared module between examples; not all examples use all functionality from it"
 )]
 
-use winit::window::Window;
-
 use vello_hybrid::{RenderTargetConfig, Renderer};
-use wgpu::{
-    Adapter, Device, Features, Instance, Limits, MemoryHints, Queue, Surface, SurfaceConfiguration, SurfaceTarget,
-    TextureFormat,
-};
+use wgpu::{Adapter, Device, Features, Instance, Limits, MemoryHints, Queue, Surface, SurfaceConfiguration, SurfaceTarget, TextureFormat};
 use winit::event_loop::ActiveEventLoop;
+use winit::window::Window;
 
 /// Helper function that creates a Winit window and returns it (wrapped in an Arc for sharing)
 pub(crate) fn create_winit_window(
@@ -94,7 +90,9 @@ impl RenderContext {
         format: TextureFormat,
     ) -> RenderSurface<'w> {
         self.create_render_surface(
-            self.instance.create_surface(window.into()).expect("Error creating surface"),
+            self.instance
+                .create_surface(window.into())
+                .expect("Error creating surface"),
             width,
             height,
             present_mode,
@@ -154,7 +152,12 @@ impl RenderContext {
     /// Finds or creates a compatible device handle id.
     pub(crate) async fn device(&mut self, compatible_surface: Option<&Surface<'_>>) -> Option<usize> {
         let compatible = match compatible_surface {
-            Some(s) => self.devices.iter().enumerate().find(|(_, d)| d.adapter.is_surface_supported(s)).map(|(i, _)| i),
+            Some(s) => self
+                .devices
+                .iter()
+                .enumerate()
+                .find(|(_, d)| d.adapter.is_surface_supported(s))
+                .map(|(i, _)| i),
             None => (!self.devices.is_empty()).then_some(0),
         };
         if compatible.is_none() {
@@ -165,7 +168,9 @@ impl RenderContext {
 
     /// Creates a compatible device handle id.
     async fn new_device(&mut self, compatible_surface: Option<&Surface<'_>>) -> Option<usize> {
-        let adapter = wgpu::util::initialize_adapter_from_env_or_default(&self.instance, compatible_surface).await.ok()?;
+        let adapter = wgpu::util::initialize_adapter_from_env_or_default(&self.instance, compatible_surface)
+            .await
+            .ok()?;
         #[cfg(feature = "vello_hybrid_renderer_webgl")]
         let limits = Limits {
             max_color_attachments: 4,
@@ -177,15 +182,13 @@ impl RenderContext {
         let limits = Limits::default();
 
         let (device, queue) = adapter
-            .request_device(
-                &wgpu::DeviceDescriptor {
-                    label: None,
-                    required_features: Features::empty(),
-                    required_limits: limits,
-                    memory_hints: MemoryHints::default(),
-                    trace: Default::default(),
-                },
-            )
+            .request_device(&wgpu::DeviceDescriptor {
+                label: None,
+                required_features: Features::empty(),
+                required_limits: limits,
+                memory_hints: MemoryHints::default(),
+                trace: Default::default(),
+            })
             .await
             .ok()?;
         let device_handle = DeviceHandle {
diff --git a/crates/craft_renderer/src/vello_hybrid/tinyvg.rs b/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
index b87ed8d6..8fec49a2 100644
--- a/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
+++ b/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
@@ -1,17 +1,19 @@
+use std::sync::Arc;
+
+use craft_primitives::Color;
 use craft_primitives::geometry::Rectangle;
-use crate::vello_hybrid::brush_to_paint;
-use crate::renderer::Brush;
 use craft_resource_manager::resource::Resource;
 use craft_resource_manager::{ResourceIdentifier, ResourceManager};
-use craft_primitives::Color;
 use peniko::kurbo::{Affine, BezPath, Line, Shape, Stroke};
-use peniko::{kurbo, Fill};
-use std::sync::Arc;
+use peniko::{Fill, kurbo};
 use tinyvg_rs::color_table::ColorTable;
 use tinyvg_rs::commands::{DrawCommand, Path, PathCommand, Segment, Style};
 use tinyvg_rs::common::Unit;
 use vello_hybrid::Scene;
+
+use crate::renderer::Brush;
 use crate::tinyvg_helpers;
+use crate::vello_hybrid::brush_to_paint;
 
 fn stroke_path(scene: &mut Scene, bez_path: &BezPath, affine: &Affine, line_width: f64, brush: &Brush) {
     scene.set_stroke(Stroke::new(line_width));
@@ -97,7 +99,15 @@ pub(crate) fn draw_tiny_vg(
                     let path = Path {
                         segments: vec![segment],
                     };
-                    draw_path(scene, &path, &data.style, None, &tiny_vg.color_table, &affine, override_color);
+                    draw_path(
+                        scene,
+                        &path,
+                        &data.style,
+                        None,
+                        &tiny_vg.color_table,
+                        &affine,
+                        override_color,
+                    );
                 }
                 DrawCommand::FillRectangles(data) => {
                     let brush = tinyvg_helpers::get_brush(&data.style, &tiny_vg.color_table, override_color);
@@ -108,7 +118,15 @@ pub(crate) fn draw_tiny_vg(
                     }
                 }
                 DrawCommand::FillPath(data) => {
-                    draw_path(scene, &data.path, &data.style, None, &tiny_vg.color_table, &affine, override_color);
+                    draw_path(
+                        scene,
+                        &data.path,
+                        &data.style,
+                        None,
+                        &tiny_vg.color_table,
+                        &affine,
+                        override_color,
+                    );
                 }
                 DrawCommand::DrawLines(data) => {
                     let brush = tinyvg_helpers::get_brush(&data.line_style, &tiny_vg.color_table, override_color);
@@ -126,8 +144,10 @@ pub(crate) fn draw_tiny_vg(
 
                     let mut start = data.points[0];
                     for point in &data.points {
-                        let line =
-                            Line::new(tinyvg_helpers::to_kurbo_point(start), tinyvg_helpers::to_kurbo_point(*point));
+                        let line = Line::new(
+                            tinyvg_helpers::to_kurbo_point(start),
+                            tinyvg_helpers::to_kurbo_point(*point),
+                        );
                         stroke_path(scene, &line.into_path(0.1), &affine, data.line_width.0, &brush);
                         start = *point;
                     }
@@ -137,8 +157,10 @@ pub(crate) fn draw_tiny_vg(
 
                     let mut start = data.points[0];
                     for point in &data.points {
-                        let line =
-                            Line::new(tinyvg_helpers::to_kurbo_point(start), tinyvg_helpers::to_kurbo_point(*point));
+                        let line = Line::new(
+                            tinyvg_helpers::to_kurbo_point(start),
+                            tinyvg_helpers::to_kurbo_point(*point),
+                        );
                         stroke_path(scene, &line.into_path(0.1), &affine, data.line_width.0, &brush);
                         start = *point;
                     }
@@ -167,7 +189,15 @@ pub(crate) fn draw_tiny_vg(
                     let path = Path {
                         segments: vec![segment],
                     };
-                    draw_path(scene, &path, &data.fill_style, None, &tiny_vg.color_table, &affine, override_color);
+                    draw_path(
+                        scene,
+                        &path,
+                        &data.fill_style,
+                        None,
+                        &tiny_vg.color_table,
+                        &affine,
+                        override_color,
+                    );
                     draw_path(
                         scene,
                         &path,
@@ -190,7 +220,15 @@ pub(crate) fn draw_tiny_vg(
                     }
                 }
                 DrawCommand::OutlineFillPath(data) => {
-                    draw_path(scene, &data.path, &data.fill_style, None, &tiny_vg.color_table, &affine, override_color);
+                    draw_path(
+                        scene,
+                        &data.path,
+                        &data.fill_style,
+                        None,
+                        &tiny_vg.color_table,
+                        &affine,
+                        override_color,
+                    );
                     draw_path(
                         scene,
                         &data.path,
diff --git a/crates/craft_resource_manager/src/identifier.rs b/crates/craft_resource_manager/src/identifier.rs
index 314cb629..6d590ea7 100644
--- a/crates/craft_resource_manager/src/identifier.rs
+++ b/crates/craft_resource_manager/src/identifier.rs
@@ -1,12 +1,11 @@
-use crate::ResourceIdentifier::{Bytes, File};
-
-#[cfg(feature = "http_client")]
-use crate::ResourceIdentifier::Url;
-
 use std::fmt::Display;
 use std::path::PathBuf;
 use std::{fmt, fs};
 
+#[cfg(feature = "http_client")]
+use crate::ResourceIdentifier::Url;
+use crate::ResourceIdentifier::{Bytes, File};
+
 #[derive(Clone, Debug, Hash, Eq, PartialEq)]
 pub enum ResourceIdentifier {
     #[cfg(feature = "http_client")]
diff --git a/crates/craft_resource_manager/src/image.rs b/crates/craft_resource_manager/src/image.rs
index e27c56e3..713ab2b4 100644
--- a/crates/craft_resource_manager/src/image.rs
+++ b/crates/craft_resource_manager/src/image.rs
@@ -1,6 +1,7 @@
-use crate::resource_data::ResourceData;
 use image::{EncodableLayout, RgbaImage};
 
+use crate::resource_data::ResourceData;
+
 #[derive(Debug)]
 pub struct ImageResource {
     pub common_data: ResourceData,
diff --git a/crates/craft_resource_manager/src/lib.rs b/crates/craft_resource_manager/src/lib.rs
index d5fc325e..4065b83a 100644
--- a/crates/craft_resource_manager/src/lib.rs
+++ b/crates/craft_resource_manager/src/lib.rs
@@ -8,25 +8,24 @@ pub(crate) mod tinyvg_resource;
 
 pub mod resource_event;
 
+use std::any::Any;
+use std::future::Future;
+use std::io::Cursor;
+use std::pin::Pin;
+use std::sync::Arc;
+
+use ::image::ImageReader;
+use craft_logging::info;
+use craft_runtime::{CraftRuntimeHandle, Sender};
+
 pub use crate::identifier::ResourceIdentifier;
 use crate::image::ImageResource;
+use crate::lock_free_map::LockFreeMap;
 use crate::resource::Resource;
 use crate::resource_data::ResourceData;
 use crate::resource_event::ResourceEvent;
 use crate::resource_type::ResourceType;
-use craft_logging::info;
-
-use craft_runtime::Sender;
-
-use crate::lock_free_map::LockFreeMap;
 use crate::tinyvg_resource::TinyVgResource;
-use ::image::ImageReader;
-use craft_runtime::CraftRuntimeHandle;
-use std::any::Any;
-use std::future::Future;
-use std::io::Cursor;
-use std::pin::Pin;
-use std::sync::Arc;
 
 pub type ResourceFuture = Pin<Box<dyn Future<Output = Box<dyn Any + Send + Sync>> + Send + Sync>>;
 
@@ -42,6 +41,7 @@ impl ResourceManager {
             runtime: craft_runtime_handle,
         }
     }
+
     // TODO: FIx the duplicate code in this function.
     #[cfg(target_arch = "wasm32")]
     pub fn async_download_resource_and_send_message_on_finish<Message: From<ResourceEvent> + 'static>(
@@ -63,7 +63,9 @@ impl ResourceManager {
                     if let Some(image_resource) = &image {
                         let bytes = image_resource;
                         let cursor = Cursor::new(&bytes);
-                        let reader = ImageReader::new(cursor).with_guessed_format().expect("Failed to guess format");
+                        let reader = ImageReader::new(cursor)
+                            .with_guessed_format()
+                            .expect("Failed to guess format");
                         let size = reader.into_dimensions().unwrap_or_default();
                         let generic_resource = ResourceData::new(
                             resource_identifier.clone(),
@@ -150,7 +152,9 @@ impl ResourceManager {
                     if let Some(image_resource) = &image {
                         let bytes = image_resource;
                         let cursor = Cursor::new(&bytes);
-                        let reader = ImageReader::new(cursor).with_guessed_format().expect("Failed to guess format");
+                        let reader = ImageReader::new(cursor)
+                            .with_guessed_format()
+                            .expect("Failed to guess format");
                         let size = reader.into_dimensions().unwrap_or_default();
                         let generic_resource = ResourceData::new(
                             resource_identifier.clone(),
diff --git a/crates/craft_resource_manager/src/lock_free_map.rs b/crates/craft_resource_manager/src/lock_free_map.rs
index 993bc3e8..c6bb2728 100644
--- a/crates/craft_resource_manager/src/lock_free_map.rs
+++ b/crates/craft_resource_manager/src/lock_free_map.rs
@@ -1,8 +1,8 @@
 use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};
 use std::ptr;
-use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
 
 pub struct Node<K: Clone + Hash + PartialEq, V> {
     pub key: K,
@@ -18,12 +18,16 @@ pub struct Inner<K: Clone + Hash + PartialEq, V> {
 impl<K: Clone + Hash + PartialEq, V> Inner<K, V> {
     pub fn new(size: usize) -> Self {
         let size = size.next_power_of_two().max(1);
-        let buckets = (0..size).map(|_| AtomicPtr::new(ptr::null_mut())).collect::<Vec<_>>().into_boxed_slice();
+        let buckets = (0..size)
+            .map(|_| AtomicPtr::new(ptr::null_mut()))
+            .collect::<Vec<_>>()
+            .into_boxed_slice();
         Inner {
             mask: size - 1,
             buckets,
         }
     }
+
     pub fn bucket(&self, key: &K) -> usize {
         let mut h = DefaultHasher::new();
         key.hash(&mut h);
@@ -51,6 +55,7 @@ impl<K: Clone + Hash + PartialEq, V> LockFreeMap<K, V> {
             count: AtomicUsize::new(0),
         }
     }
+
     fn with_root<F, R>(&self, f: F) -> R
     where
         F: FnOnce(&Arc<Inner<K, V>>) -> R,
@@ -64,6 +69,7 @@ impl<K: Clone + Hash + PartialEq, V> LockFreeMap<K, V> {
             res
         }
     }
+
     fn resize_if_needed(&self) {
         let count = self.count.load(Ordering::Relaxed);
         self.with_root(|inner| {
@@ -98,6 +104,7 @@ impl<K: Clone + Hash + PartialEq, V> LockFreeMap<K, V> {
             }
         });
     }
+
     pub fn insert(&self, key: K, value: Arc<V>) {
         self.resize_if_needed();
         self.with_root(|inner| {
@@ -112,6 +119,7 @@ impl<K: Clone + Hash + PartialEq, V> LockFreeMap<K, V> {
         });
         self.count.fetch_add(1, Ordering::Relaxed);
     }
+
     pub fn get(&self, key: &K) -> Option<Arc<V>> {
         self.with_root(|inner| {
             let idx = inner.bucket(key);
diff --git a/crates/craft_resource_manager/src/resource.rs b/crates/craft_resource_manager/src/resource.rs
index 512347ab..22641620 100644
--- a/crates/craft_resource_manager/src/resource.rs
+++ b/crates/craft_resource_manager/src/resource.rs
@@ -1,8 +1,10 @@
-use crate::image::ImageResource;
-use crate::tinyvg_resource::TinyVgResource;
 use std::sync::Arc;
+
 use image::EncodableLayout;
+
+use crate::image::ImageResource;
 use crate::resource_data::ResourceData;
+use crate::tinyvg_resource::TinyVgResource;
 
 #[derive(Debug)]
 pub enum Resource {
diff --git a/crates/craft_resource_manager/src/resource_data.rs b/crates/craft_resource_manager/src/resource_data.rs
index 0d574813..dde9ca83 100644
--- a/crates/craft_resource_manager/src/resource_data.rs
+++ b/crates/craft_resource_manager/src/resource_data.rs
@@ -1,6 +1,7 @@
+use chrono::{DateTime, Utc};
+
 use crate::identifier::ResourceIdentifier;
 use crate::resource_type::ResourceType;
-use chrono::{DateTime, Utc};
 
 #[allow(dead_code)]
 #[derive(Debug)]
diff --git a/crates/craft_resource_manager/src/resource_event.rs b/crates/craft_resource_manager/src/resource_event.rs
index 8e65a6df..a4a5af4e 100644
--- a/crates/craft_resource_manager/src/resource_event.rs
+++ b/crates/craft_resource_manager/src/resource_event.rs
@@ -1,6 +1,6 @@
+use crate::ResourceIdentifier;
 use crate::resource::Resource;
 use crate::resource_type::ResourceType;
-use crate::ResourceIdentifier;
 
 #[derive(Debug)]
 pub enum ResourceEvent {
diff --git a/crates/craft_resource_manager/src/tinyvg_resource.rs b/crates/craft_resource_manager/src/tinyvg_resource.rs
index 3690c77c..f4b8842c 100644
--- a/crates/craft_resource_manager/src/tinyvg_resource.rs
+++ b/crates/craft_resource_manager/src/tinyvg_resource.rs
@@ -1,6 +1,7 @@
-use crate::resource_data::ResourceData;
 use tinyvg_rs::TinyVg;
 
+use crate::resource_data::ResourceData;
+
 #[derive(Debug)]
 pub struct TinyVgResource {
     pub common_data: ResourceData,
diff --git a/crates/craft_retained/src/accessibility/access_handler.rs b/crates/craft_retained/src/accessibility/access_handler.rs
index e491884b..177c255e 100644
--- a/crates/craft_retained/src/accessibility/access_handler.rs
+++ b/crates/craft_retained/src/accessibility/access_handler.rs
@@ -1,9 +1,10 @@
+use accesskit::{ActionHandler, ActionRequest};
 #[cfg(not(target_arch = "wasm32"))]
 use craft_runtime::CraftRuntimeHandle;
-use crate::events::internal::InternalMessage;
-use accesskit::{ActionHandler, ActionRequest};
 use craft_runtime::Sender;
 
+use crate::events::internal::InternalMessage;
+
 pub(crate) struct CraftAccessHandler {
     #[cfg(not(target_arch = "wasm32"))]
     #[allow(dead_code)]
diff --git a/crates/craft_retained/src/animations/animation.rs b/crates/craft_retained/src/animations/animation.rs
index 8689b189..1a38ab85 100644
--- a/crates/craft_retained/src/animations/animation.rs
+++ b/crates/craft_retained/src/animations/animation.rs
@@ -1,18 +1,20 @@
-use crate::style::{Style, StyleProperty, Unit};
-use craft_primitives::geometry::TrblRectangle;
-use kurbo::{CubicBez, ParamCurve, Point};
-use smallvec::SmallVec;
 use std::collections::HashMap;
 use std::iter::zip;
 use std::time::Duration;
+
+use craft_primitives::geometry::TrblRectangle;
+use kurbo::{CubicBez, ParamCurve, Point};
+use smallvec::SmallVec;
 use smol_str::SmolStr;
 
+use crate::style::{Style, StyleProperty, Unit};
+
 #[derive(Clone, Debug)]
 pub struct KeyFrame {
     /// The action / styles interpolated at `offset_percentage`.
     /// Range [0.0, 100.0]
     offset_percentage: f32,
-    
+
     /// The list of styles interpolated to an element at this keyframe.
     properties: SmallVec<[StyleProperty; 3]>,
 }
@@ -24,15 +26,14 @@ impl KeyFrame {
             properties: SmallVec::new(),
         }
     }
-    
+
     pub fn push(mut self, property: StyleProperty) -> Self {
         self.properties.push(property);
         self
     }
 }
 
-#[derive(Copy, Clone, Debug)]
-#[derive(PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq)]
 pub enum AnimationStatus {
     Paused,
     Playing,
@@ -54,12 +55,11 @@ impl FixedCubicBezier {
                 Point::new(x1 as f64, y1 as f64),
                 Point::new(x2 as f64, y2 as f64),
                 Point::new(1.0, 1.0),
-            )
+            ),
         }
     }
 }
 
-
 /// The motion of an animation modeled with a mathematical function.
 #[derive(Default, Copy, Clone, Debug)]
 pub enum TimingFunction {
@@ -90,7 +90,7 @@ pub struct Animation {
 #[derive(Copy, Clone, Debug)]
 pub enum LoopAmount {
     Infinite,
-    Fixed(u32)
+    Fixed(u32),
 }
 
 impl Animation {
@@ -103,12 +103,12 @@ impl Animation {
             loop_amount: LoopAmount::Fixed(1),
         }
     }
-    
+
     pub fn push(mut self, key_frame: KeyFrame) -> Self {
         self.key_frames.push(key_frame);
         self
     }
-    
+
     pub fn loop_amount(mut self, loop_amount: LoopAmount) -> Self {
         self.loop_amount = loop_amount;
         self
@@ -137,7 +137,7 @@ impl AnimationFlags {
     pub fn set_needs_relayout(&mut self, needs_relayout: bool) {
         self.needs_relayout |= needs_relayout;
     }
-    
+
     /// Returns whether we need to perform a relayout or not.
     pub fn needs_relayout(&self) -> bool {
         self.needs_relayout
@@ -155,14 +155,13 @@ impl AnimationFlags {
 }
 
 impl ActiveAnimation {
-    
-    /// Advances an active animation, and it is also responsible for tracking the status and element_state. 
+    /// Advances an active animation, and it is also responsible for tracking the status and element_state.
     pub fn tick(&mut self, animation_flags: &mut AnimationFlags, animation: &Animation, delta: Duration) {
         if self.status == AnimationStatus::Playing {
             self.current += delta;
 
             let is_completed = self.current >= animation.duration;
-            
+
             match &mut self.loop_amount {
                 LoopAmount::Infinite => {
                     if is_completed {
@@ -183,13 +182,17 @@ impl ActiveAnimation {
                     }
                 }
             }
-            
         }
     }
 
     /// Called after `tick`, and is responsible for using the current animation time and
     /// computing an interpolated style from a provided `Animation`.
-    pub fn compute_style(&mut self, element_style: &Style, animation: &Animation, animation_flags: &mut AnimationFlags) -> Style {
+    pub fn compute_style(
+        &mut self,
+        element_style: &Style,
+        animation: &Animation,
+        animation_flags: &mut AnimationFlags,
+    ) -> Style {
         if self.status != AnimationStatus::Playing {
             return element_style.clone();
         }
@@ -209,7 +212,7 @@ impl ActiveAnimation {
         }
 
         let (keyframe_start, keyframe_end) = find_keyframe_pair(pos, animation);
-        
+
         let mut style = Style::default();
         let mut start_map = HashMap::new();
         let mut end_map = HashMap::new();
@@ -217,12 +220,16 @@ impl ActiveAnimation {
         for prop in &keyframe_start.properties {
             start_map.insert(std::mem::discriminant(prop), prop);
         }
-        
+
         for prop in &keyframe_end.properties {
             end_map.insert(std::mem::discriminant(prop), prop);
         }
 
-        for key in start_map.keys().chain(end_map.keys()).collect::<std::collections::HashSet<_>>() {
+        for key in start_map
+            .keys()
+            .chain(end_map.keys())
+            .collect::<std::collections::HashSet<_>>()
+        {
             let start_prop = start_map.get(key);
             let end_prop = end_map.get(key);
 
@@ -257,9 +264,7 @@ impl ActiveAnimation {
                     ease_in_out.cubic_bez.eval(local_t as f64).y
                 }
                 // https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function#cubic-beziernumber_01_number_number_01_number
-                TimingFunction::BezierCurve(cubic_bezier) => {
-                    cubic_bezier.cubic_bez.eval(local_t as f64).y
-                }
+                TimingFunction::BezierCurve(cubic_bezier) => cubic_bezier.cubic_bez.eval(local_t as f64).y,
             };
 
             fn lerp(a: f32, b: f32, t: f32) -> f32 {
@@ -271,26 +276,26 @@ impl ActiveAnimation {
                 let resolved_start = match start {
                     Unit::Px(px) => px,
                     Unit::Percentage(percent) => percent,
-                    Unit::Auto => panic!("Unit must not be auto.")
+                    Unit::Auto => panic!("Unit must not be auto."),
                 };
-                
+
                 let resolved_end = match end {
                     Unit::Px(px) => px,
                     Unit::Percentage(percent) => percent,
-                    Unit::Auto => panic!("Unit must not be auto.")
+                    Unit::Auto => panic!("Unit must not be auto."),
                 };
                 let new = lerp(resolved_start, resolved_end, t as f32);
-                
+
                 // Naively asserts that start and end must be the same Unit type.
                 let new = match start {
                     Unit::Px(_) => Unit::Px(new),
                     Unit::Percentage(_) => Unit::Percentage(new),
-                    _ => unreachable!()
+                    _ => unreachable!(),
                 };
-                
+
                 set_prop(new);
             }
-            
+
             match (start_prop, end_prop) {
                 (Some(StyleProperty::Background(start)), Some(StyleProperty::Background(end))) => {
                     let new_color = start.lerp_rect(*end, t as f32);
@@ -306,8 +311,7 @@ impl ActiveAnimation {
                     style.set_font_size(new);
                     animation_flags.set_needs_relayout(true);
                 }
-                (Some(StyleProperty::Width(start)), Some(StyleProperty::Width(end))) 
-                => {
+                (Some(StyleProperty::Width(start)), Some(StyleProperty::Width(end))) => {
                     resolve_unit(*start, *end, t, &mut |new| {
                         style.set_width(new);
                     });
@@ -321,28 +325,27 @@ impl ActiveAnimation {
                 }
 
                 (Some(StyleProperty::Inset(start)), Some(StyleProperty::Inset(end))) => {
-                    let trlb = zip(start.to_array(), end.to_array()).map(|(start, end)| {
-                        let mut inset_unit = Unit::Auto;
-                        resolve_unit(start, end, t, &mut |new| {
-                            inset_unit = new;
-                        });
-                        
-                        inset_unit
-                    }).collect::<Vec<Unit>>();
+                    let trlb = zip(start.to_array(), end.to_array())
+                        .map(|(start, end)| {
+                            let mut inset_unit = Unit::Auto;
+                            resolve_unit(start, end, t, &mut |new| {
+                                inset_unit = new;
+                            });
+
+                            inset_unit
+                        })
+                        .collect::<Vec<Unit>>();
 
                     let inset = TrblRectangle::new(trlb[0], trlb[1], trlb[2], trlb[3]);
-                    
+
                     style.set_inset(inset);
                     animation_flags.set_needs_relayout(true);
                 }
-                
+
                 _ => {}
             }
-
         }
 
-
-
         style
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/animations/mod.rs b/crates/craft_retained/src/animations/mod.rs
index 8e10d763..aeea80f4 100644
--- a/crates/craft_retained/src/animations/mod.rs
+++ b/crates/craft_retained/src/animations/mod.rs
@@ -1,6 +1,3 @@
 pub mod animation;
 
-pub use animation::Animation;
-pub use animation::KeyFrame;
-pub use animation::LoopAmount;
-pub use animation::TimingFunction;
\ No newline at end of file
+pub use animation::{Animation, KeyFrame, LoopAmount, TimingFunction};
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index abb84c48..1812f40b 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -1,49 +1,38 @@
-use crate::elements::{ElementIdMap, Window};
-use crate::events::internal::InternalMessage;
-use crate::events::CraftMessage;
-use crate::events::{Event, EventDispatcher};
-use crate::text::text_context::TextContext;
-use craft_logging::info;
-use craft_primitives::geometry::{Size, Point};
-use craft_resource_manager::{ResourceIdentifier, ResourceManager};
-use craft_runtime::CraftRuntimeHandle;
-use std::cell::Cell;
-use std::cell::RefCell;
+use std::cell::{Cell, RefCell};
 use std::collections::VecDeque;
 use std::ops::DerefMut;
 use std::rc::{Rc, Weak};
 use std::sync::Arc;
-use taffy::NodeId;
-#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-use {
-    crate::accessibility::access_handler::CraftAccessHandler,
-    crate::accessibility::activation_handler::CraftActivationHandler,
-    crate::accessibility::deactivation_handler::CraftDeactivationHandler,
-};
-#[cfg(feature = "accesskit")]
-use {
-    accesskit::{Role, TreeUpdate},
-    accesskit_winit::Adapter,
-};
 
-#[cfg(target_arch = "wasm32")]
-use web_time as time;
-
-use crate::animations::animation::AnimationFlags;
-use crate::document::DocumentManager;
-use crate::elements::Element;
+use craft_logging::info;
+use craft_primitives::geometry::{Point, Size};
 use craft_resource_manager::resource_event::ResourceEvent;
 use craft_resource_manager::resource_type::ResourceType;
-use craft_runtime::Sender;
-use ui_events::keyboard::{KeyboardEvent, Modifiers, NamedKey};
-use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
+use craft_resource_manager::{ResourceIdentifier, ResourceManager};
+use craft_runtime::{CraftRuntimeHandle, Sender};
+use taffy::NodeId;
 use ui_events::ScrollDelta;
 use ui_events::ScrollDelta::PixelDelta;
+use ui_events::keyboard::{KeyboardEvent, Modifiers, NamedKey};
+use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
+#[cfg(target_arch = "wasm32")]
+use web_time as time;
 use winit::event::Ime;
 use winit::event_loop::ActiveEventLoop;
-use winit::window::{WindowId};
+use winit::window::WindowId;
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+use {crate::accessibility::access_handler::CraftAccessHandler, crate::accessibility::activation_handler::CraftActivationHandler, crate::accessibility::deactivation_handler::CraftDeactivationHandler};
+#[cfg(feature = "accesskit")]
+use {accesskit::{Role, TreeUpdate}, accesskit_winit::Adapter};
+
+use crate::animations::animation::AnimationFlags;
+use crate::document::DocumentManager;
 use crate::elements::core::ElementInternals;
+use crate::elements::{Element, ElementIdMap, Window};
+use crate::events::internal::InternalMessage;
+use crate::events::{CraftMessage, Event, EventDispatcher};
 use crate::layout::TaffyTree;
+use crate::text::text_context::TextContext;
 use crate::window_manager::WindowManager;
 
 thread_local! {
@@ -241,7 +230,9 @@ impl App {
     fn on_request_redraw_internal(&mut self, window: Rc<RefCell<Window>>) {
         self.update_resources();
 
-        window.borrow_mut().on_redraw(self.text_context.as_mut().unwrap(), self.resource_manager.clone());
+        window
+            .borrow_mut()
+            .on_redraw(self.text_context.as_mut().unwrap(), self.resource_manager.clone());
     }
 
     pub fn on_pointer_scroll(&mut self, window: Rc<RefCell<Window>>, pointer_scroll_update: PointerScrollEvent) {
@@ -286,7 +277,9 @@ impl App {
             CraftMessage::PointerButtonDown(pointer_event)
         };
         let message = event;
-        window.borrow_mut().set_mouse_position(Some(Point::new(cursor_position.x, cursor_position.y)));
+        window
+            .borrow_mut()
+            .set_mouse_position(Some(Point::new(cursor_position.x, cursor_position.y)));
 
         self.dispatch_event(window.clone(), &message, true);
 
@@ -299,7 +292,9 @@ impl App {
         mouse_moved.current.position.x /= zoom;
         mouse_moved.current.position.y /= zoom;
 
-        window.borrow_mut().set_mouse_position(Some(mouse_moved.current.logical_point()));
+        window
+            .borrow_mut()
+            .set_mouse_position(Some(mouse_moved.current.logical_point()));
 
         let message = CraftMessage::PointerMovedEvent(mouse_moved);
 
@@ -367,7 +362,8 @@ impl App {
                     && resource.data().is_some()
                 {
                     // Todo: Load the font into the text context.
-                    self.resource_manager.insert(resource_identifier.clone(), Arc::new(resource));
+                    self.resource_manager
+                        .insert(resource_identifier.clone(), Arc::new(resource));
                     self.reload_fonts = true;
                 } else if resource_type == ResourceType::Image || resource_type == ResourceType::TinyVg {
                     self.resource_manager.insert(resource_identifier, Arc::new(resource));
@@ -426,7 +422,11 @@ impl App {
             toolkit_version: None,
         };
 
-        let focus_id = self.focus.clone().map(|node| node.upgrade().unwrap().borrow().id()).unwrap_or(0);
+        let focus_id = self
+            .focus
+            .clone()
+            .map(|node| node.upgrade().unwrap().borrow().id())
+            .unwrap_or(0);
         let mut tree_update = TreeUpdate {
             nodes: vec![],
             tree: Some(tree),
@@ -452,11 +452,12 @@ impl App {
                     {
                         continue;
                     }
-                    self.resource_manager.async_download_resource_and_send_message_on_finish(
-                        self.app_sender.clone(),
-                        resource.clone(),
-                        resource_type,
-                    );
+                    self.resource_manager
+                        .async_download_resource_and_send_message_on_finish(
+                            self.app_sender.clone(),
+                            resource.clone(),
+                            resource_type,
+                        );
                     in_progress.push_back((resource, resource_type));
                 }
             });
@@ -476,4 +477,4 @@ pub fn request_apply_layout(node: NodeId) {
     TAFFY_TREE.with_borrow_mut(|taffy_tree| {
         taffy_tree.request_apply_layout(node);
     });
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index 051bb460..6d368a74 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -1,37 +1,28 @@
 use std::cell::RefCell;
 use std::rc::Rc;
-#[cfg(target_arch = "wasm32")]
-use {
-    wasm_bindgen::JsCast,
-    winit::platform::web::WindowAttributesExtWebSys,
-};
-
-#[cfg(target_arch = "wasm32")]
-use {crate::wasm_queue::WasmQueue, crate::wasm_queue::WASM_QUEUE};
+#[cfg(not(target_arch = "wasm32"))]
+use std::time;
 
-use crate::events::internal::InternalMessage;
-use crate::{CraftOptions};
 use craft_logging::info;
-
+use craft_primitives::geometry::Size;
+use craft_runtime::{CraftRuntimeHandle, Receiver, Sender};
+use ui_events::pointer::PointerEvent;
+use ui_events_winit::{WindowEventReducer, WindowEventTranslation};
+#[cfg(target_arch = "wasm32")]
+use web_time as time;
 use winit::application::ApplicationHandler;
 use winit::event::{StartCause, WindowEvent};
 use winit::event_loop::{ActiveEventLoop, ControlFlow};
-use winit::window::{WindowId};
-
-#[cfg(not(target_arch = "wasm32"))]
-use std::time;
+use winit::window::WindowId;
 #[cfg(target_arch = "wasm32")]
-use web_time as time;
-
-use craft_runtime::Receiver;
-use craft_runtime::Sender;
-use craft_runtime::CraftRuntimeHandle;
+use {crate::wasm_queue::WASM_QUEUE, crate::wasm_queue::WasmQueue};
+#[cfg(target_arch = "wasm32")]
+use {wasm_bindgen::JsCast, winit::platform::web::WindowAttributesExtWebSys};
 
+use crate::CraftOptions;
 use crate::app::{App, CURRENT_WINDOW_ID, DOCUMENTS, WINDOW_MANAGER};
-use ui_events::pointer::{PointerEvent};
-use ui_events_winit::{WindowEventReducer, WindowEventTranslation};
-use craft_primitives::geometry::Size;
 use crate::document::Document;
+use crate::events::internal::InternalMessage;
 
 const WAIT_TIME: time::Duration = time::Duration::from_millis(15);
 
@@ -58,9 +49,7 @@ pub(crate) struct CraftWinitState {
 
 impl CraftWinitState {
     pub(crate) fn new(craft_state: CraftState) -> Self {
-        Self {
-            craft_state,
-        }
+        Self { craft_state }
     }
 }
 
@@ -71,20 +60,19 @@ impl ApplicationHandler for CraftWinitState {
 
     fn resumed(&mut self, event_loop: &ActiveEventLoop) {
         let craft_state = &mut self.craft_state;
-        
-/*        let mut window_attributes =
+
+        /*        let mut window_attributes =
             WindowAttributes::default().with_title(craft_state.craft_options.window_title.as_str()).with_visible(false);
 
         if let Some(window_size) = &craft_state.craft_options.window_size {
             window_attributes =
                 window_attributes.with_inner_size(LogicalSize::new(window_size.width, window_size.height));
         }*/
-        
+
         WINDOW_MANAGER.with_borrow_mut(|window_manager| {
             window_manager.on_resume(craft_state, event_loop);
         });
 
-
         craft_state.craft_app.on_resume(event_loop);
 
         /*#[cfg(target_arch = "wasm32")]
@@ -104,15 +92,10 @@ impl ApplicationHandler for CraftWinitState {
     }
 
     fn window_event(&mut self, event_loop: &ActiveEventLoop, window_id: WindowId, event: WindowEvent) {
-        let window: Option<Rc<RefCell<crate::elements::Window>>> = WINDOW_MANAGER.with_borrow_mut(|window_manager| {
-           window_manager.get_window_by_id(window_id)
-        });
+        let window: Option<Rc<RefCell<crate::elements::Window>>> =
+            WINDOW_MANAGER.with_borrow_mut(|window_manager| window_manager.get_window_by_id(window_id));
 
-        let window = if let Some(window) = window {
-            window
-        } else {
-            return
-        };
+        let window = if let Some(window) = window { window } else { return };
 
         let craft_state = &mut self.craft_state;
 
@@ -149,10 +132,14 @@ impl ApplicationHandler for CraftWinitState {
                 Some(WindowEventTranslation::Pointer(pointer_event)) => {
                     match pointer_event {
                         PointerEvent::Down(pointer_button_update) => {
-                            craft_state.craft_app.on_pointer_button(window, pointer_button_update, false);
+                            craft_state
+                                .craft_app
+                                .on_pointer_button(window, pointer_button_update, false);
                         }
                         PointerEvent::Up(pointer_button_update) => {
-                            craft_state.craft_app.on_pointer_button(window, pointer_button_update, true);
+                            craft_state
+                                .craft_app
+                                .on_pointer_button(window, pointer_button_update, true);
                         }
                         PointerEvent::Move(pointer_update) => {
                             craft_state.craft_app.on_pointer_moved(window, pointer_update);
@@ -162,8 +149,8 @@ impl ApplicationHandler for CraftWinitState {
                         PointerEvent::Leave(_) => {}
                         PointerEvent::Scroll(pointer_scroll_update) => {
                             craft_state.craft_app.on_pointer_scroll(window, pointer_scroll_update);
-                        },
-                        PointerEvent::Gesture(_) => todo!()
+                        }
+                        PointerEvent::Gesture(_) => todo!(),
                     }
                     return;
                 }
@@ -174,7 +161,7 @@ impl ApplicationHandler for CraftWinitState {
         match event {
             WindowEvent::CloseRequested => {
                 WINDOW_MANAGER.with_borrow_mut(|window_manager| {
-                   window_manager.close_window(&window);
+                    window_manager.close_window(&window);
                     if window_manager.is_empty() {
                         craft_state.close_requested = true;
                         craft_state.craft_app.on_close_requested();
@@ -252,7 +239,11 @@ impl ApplicationHandler for CraftWinitState {
 
         // Switch to Poll mode if we are running animations.
 
-        let has_active_animation = self.craft_state.craft_app.previous_animation_flags.has_active_animation();
+        let has_active_animation = self
+            .craft_state
+            .craft_app
+            .previous_animation_flags
+            .has_active_animation();
 
         if has_active_animation {
             event_loop.set_control_flow(ControlFlow::Poll);
diff --git a/crates/craft_retained/src/document/core.rs b/crates/craft_retained/src/document/core.rs
index 7506831a..3b6c3d23 100644
--- a/crates/craft_retained/src/document/core.rs
+++ b/crates/craft_retained/src/document/core.rs
@@ -1,7 +1,9 @@
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::rc::Weak;
+
 use ui_events::pointer::PointerId;
+
 use crate::elements::Element;
 
 /// Stores window specific information like pointer captures, focus (soon), etc.
@@ -25,4 +27,4 @@ impl Document {
             pending_pointer_captures: Default::default(),
         }
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/document/document_manager.rs b/crates/craft_retained/src/document/document_manager.rs
index 6edae241..5fbc8af0 100644
--- a/crates/craft_retained/src/document/document_manager.rs
+++ b/crates/craft_retained/src/document/document_manager.rs
@@ -1,6 +1,8 @@
 use std::collections::HashMap;
+
 use winit::window::WindowId;
-use crate::app::{CURRENT_WINDOW_ID};
+
+use crate::app::CURRENT_WINDOW_ID;
 use crate::document::Document;
 
 /// A wrapper to get a document with a window id or the current document.
@@ -23,7 +25,8 @@ impl DocumentManager {
         let window_id_key = &CURRENT_WINDOW_ID.get().unwrap();
         self.documents.get_mut(window_id_key).unwrap()
     }
+
     pub fn get_document_by_window_id(&mut self, window_id: WindowId) -> Option<&mut Document> {
         self.documents.get_mut(&window_id)
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/document/mod.rs b/crates/craft_retained/src/document/mod.rs
index 249cec00..ce254da5 100644
--- a/crates/craft_retained/src/document/mod.rs
+++ b/crates/craft_retained/src/document/mod.rs
@@ -1,5 +1,6 @@
 pub mod core;
 pub mod document_manager;
 
+pub use core::Document;
+
 pub use document_manager::DocumentManager;
-pub use core::Document;
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 463a8718..6312823f 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -1,18 +1,20 @@
 //! Stores one or more elements.
 
+use std::any::Any;
+use std::cell::RefCell;
+use std::rc::{Rc, Weak};
+
+use craft_primitives::geometry::Rectangle;
+use craft_renderer::RenderList;
+use kurbo::{Affine, Point};
+
 use crate::app::TAFFY_TREE;
-use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
+use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
 use crate::elements::element_data::ElementData;
-use crate::elements::{scrollable, Element};
+use crate::elements::{Element, scrollable};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
-use craft_primitives::geometry::Rectangle;
-use craft_renderer::RenderList;
-use kurbo::{Affine, Point};
-use std::any::Any;
-use std::cell::RefCell;
-use std::rc::{Rc, Weak};
 
 /// Stores one or more elements.
 ///
@@ -136,7 +138,13 @@ impl ElementInternals for Container {
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.scroll_state.map(|scroll_state| scroll_state.is_new()).unwrap_or_default() {
+        if !dirty
+            && self
+                .element_data
+                .scroll_state
+                .map(|scroll_state| scroll_state.is_new())
+                .unwrap_or_default()
+        {
             self.element_data.apply_scroll(layout);
             self.element_data.scroll_state.as_mut().unwrap().mark_old();
         }
diff --git a/crates/craft_retained/src/elements/core/element_data.rs b/crates/craft_retained/src/elements/core/element_data.rs
index cd912105..2efec7fd 100644
--- a/crates/craft_retained/src/elements/core/element_data.rs
+++ b/crates/craft_retained/src/elements/core/element_data.rs
@@ -1,5 +1,6 @@
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
+
 use crate::elements::Element;
 
 /// The trait to provide common element data.
@@ -24,4 +25,4 @@ pub trait ElementData {
     fn children(&self) -> &[Rc<RefCell<dyn Element>>] {
         self.element_data().children.as_slice()
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index 4797330e..d92180d4 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -1,28 +1,28 @@
-use crate::animations::animation::{ActiveAnimation, AnimationFlags, AnimationStatus};
-use crate::events::{CraftMessage, Event};
-use crate::layout::layout_item::{draw_borders_generic, CssComputedBorder, LayoutItem};
-use crate::style::{Display, Style};
-use crate::text::text_context::TextContext;
-use craft_primitives::geometry::{ElementBox, Rectangle};
-use craft_renderer::RenderList;
-use kurbo::{Affine, Point, Vec2};
-use rustc_hash::FxHashMap;
 use std::cell::RefCell;
 use std::rc::Rc;
 use std::time::Duration;
-use taffy::{Overflow};
 
-use crate::elements::core::element_data::ElementData;
-use crate::elements::Element;
 #[cfg(feature = "accesskit")]
 use accesskit::{Action, Role};
 use craft_primitives::geometry::borders::CssRoundedRect;
-use crate::app::{request_layout, TAFFY_TREE};
+use craft_primitives::geometry::{ElementBox, Rectangle};
+use craft_renderer::RenderList;
+use kurbo::{Affine, Point, Vec2};
+use rustc_hash::FxHashMap;
+use taffy::Overflow;
+
+use crate::animations::animation::{ActiveAnimation, AnimationFlags, AnimationStatus};
+use crate::app::{TAFFY_TREE, request_layout};
+use crate::elements::Element;
+use crate::elements::core::element_data::ElementData;
+use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
+use crate::layout::layout_item::{CssComputedBorder, LayoutItem, draw_borders_generic};
+use crate::style::{Display, Style};
+use crate::text::text_context::TextContext;
 
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
-pub trait  ElementInternals: ElementData {
-
+pub trait ElementInternals: ElementData {
     /// A helper to apply the layout for all children.
     fn apply_layout_children(
         &mut self,
@@ -147,8 +147,12 @@ pub trait  ElementInternals: ElementData {
             current_node.add_action(Action::Click);
         }
 
-        let padding_box =
-            self.element_data().layout_item.computed_box_transformed.padding_rectangle().scale(scale_factor);
+        let padding_box = self
+            .element_data()
+            .layout_item
+            .computed_box_transformed
+            .padding_rectangle()
+            .scale(scale_factor);
 
         current_node.set_bounds(accesskit::Rect {
             x0: padding_box.left() as f64,
@@ -167,7 +171,9 @@ pub trait  ElementInternals: ElementData {
         tree.nodes.push((current_node_id, current_node));
 
         for child in self.element_data_mut().children.iter_mut() {
-            child.borrow_mut().compute_accessibility_tree(tree, Some(current_index), scale_factor);
+            child
+                .borrow_mut()
+                .compute_accessibility_tree(tree, Some(current_index), scale_factor);
         }
     }
 
@@ -210,7 +216,9 @@ pub trait  ElementInternals: ElementData {
         let border_radius = current_style.border_radius();
         let border_color = &current_style.border_color();
 
-        self.element_data_mut().layout_item.apply_borders(has_border, border_radius, scale_factor, border_color);
+        self.element_data_mut()
+            .layout_item
+            .apply_borders(has_border, border_radius, scale_factor, border_color);
     }
 
     /// Called after layout, and is responsible for updating the animation state of an element.
@@ -291,20 +299,32 @@ pub trait  ElementInternals: ElementData {
             !ed.on_lost_pointer_capture;*/
         if hit_testable {
             let id = self.element_data().internal_id;
-            renderer.push_hit_testable(id, self.element_data().layout_item.computed_box_transformed.padding_rectangle().scale(scale_factor));
+            renderer.push_hit_testable(
+                id,
+                self.element_data()
+                    .layout_item
+                    .computed_box_transformed
+                    .padding_rectangle()
+                    .scale(scale_factor),
+            );
         }
     }
 
     fn draw_borders(&self, renderer: &mut RenderList, scale_factor: f64) {
         let current_style = self.element_data().current_style();
 
-        self.element_data().layout_item.draw_borders(renderer, current_style, scale_factor);
+        self.element_data()
+            .layout_item
+            .draw_borders(renderer, current_style, scale_factor);
     }
 
     fn maybe_start_layer(&self, renderer: &mut RenderList, scale_factor: f64) {
         let element_data = self.element_data();
-        let padding_rectangle =
-            element_data.layout_item.computed_box_transformed.padding_rectangle().scale(scale_factor);
+        let padding_rectangle = element_data
+            .layout_item
+            .computed_box_transformed
+            .padding_rectangle()
+            .scale(scale_factor);
 
         if self.should_start_new_layer() {
             renderer.push_layer(padding_rectangle);
@@ -330,8 +350,16 @@ pub trait  ElementInternals: ElementData {
             .scrollbar_thumb_radius()
             .map(|radii| Vec2::new(radii.0 as f64, radii.1 as f64));
         // let scrollbar_thumb_radius = self.element_data().current_style().
-        let track_rect = self.element_data_mut().layout_item.computed_scroll_track.scale(scale_factor);
-        let thumb_rect = self.element_data_mut().layout_item.computed_scroll_thumb.scale(scale_factor);
+        let track_rect = self
+            .element_data_mut()
+            .layout_item
+            .computed_scroll_track
+            .scale(scale_factor);
+        let thumb_rect = self
+            .element_data_mut()
+            .layout_item
+            .computed_scroll_thumb
+            .scale(scale_factor);
 
         let border_spec = CssRoundedRect::new(thumb_rect.to_kurbo(), [0.0, 0.0, 0.0, 0.0], scrollbar_thumb_radius);
         let mut computed_border_spec = CssComputedBorder::new(border_spec);
diff --git a/crates/craft_retained/src/elements/core/mod.rs b/crates/craft_retained/src/elements/core/mod.rs
index 5892c0bf..82e2934b 100644
--- a/crates/craft_retained/src/elements/core/mod.rs
+++ b/crates/craft_retained/src/elements/core/mod.rs
@@ -1,7 +1,7 @@
-mod element_internals;
 mod element_data;
+mod element_internals;
 
+pub use element_data::ElementData;
 /// Note: this could be hidden behind a custom elements feature.
 pub use element_internals::ElementInternals;
 pub(crate) use element_internals::resolve_clip_for_scrollable;
-pub use element_data::ElementData;
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index b073cc4b..f206e2b1 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -1,26 +1,20 @@
-use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
-use crate::document::Document;
-use crate::elements::core::ElementData;
-use crate::elements::ElementIdMap;
-use crate::events::{
-    KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler,
-    PointerUpdateHandler, SliderValueChangedHandler,
-};
-
-use crate::style::{
-    AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit,
-    Weight, Wrap,
-};
-use crate::{CraftError};
-use craft_primitives::geometry::Point;
-use craft_primitives::geometry::{ElementBox, TrblRectangle};
-use craft_primitives::Color;
 use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
+
+use craft_primitives::Color;
+use craft_primitives::geometry::{ElementBox, Point, TrblRectangle};
 use taffy::{BoxSizing, Overflow, Position};
 use ui_events::pointer::PointerId;
 
+use crate::CraftError;
+use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
+use crate::document::Document;
+use crate::elements::ElementIdMap;
+use crate::elements::core::ElementData;
+use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
+use crate::style::{AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit, Weight, Wrap};
+
 /// The element trait for end-users.
 pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     fn swap_child(
@@ -29,9 +23,15 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         child_2: Rc<RefCell<dyn Element>>,
     ) -> Result<(), CraftError> {
         let children = &mut self.element_data_mut().children;
-        let position_1 = children.iter().position(|x| Rc::ptr_eq(x, &child_1)).ok_or(CraftError::ElementNotFound)?;
+        let position_1 = children
+            .iter()
+            .position(|x| Rc::ptr_eq(x, &child_1))
+            .ok_or(CraftError::ElementNotFound)?;
 
-        let position_2 = children.iter().position(|x| Rc::ptr_eq(x, &child_2)).ok_or(CraftError::ElementNotFound)?;
+        let position_2 = children
+            .iter()
+            .position(|x| Rc::ptr_eq(x, &child_2))
+            .ok_or(CraftError::ElementNotFound)?;
 
         // Swap the children.
         self.element_data_mut().children.swap(position_1, position_2);
@@ -82,7 +82,10 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     fn remove_child(&mut self, child: Rc<RefCell<dyn Element>>) -> Result<Rc<RefCell<dyn Element>>, CraftError> {
         // Find the node.
         let children = &mut self.element_data_mut().children;
-        let position = children.iter().position(|x| Rc::ptr_eq(x, &child)).ok_or(CraftError::ElementNotFound)?;
+        let position = children
+            .iter()
+            .position(|x| Rc::ptr_eq(x, &child))
+            .ok_or(CraftError::ElementNotFound)?;
 
         let child = children[position].clone();
 
@@ -166,7 +169,9 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     where
         Self: Sized,
     {
-        self.element_data_mut().on_slider_value_changed.push(on_slider_value_changed);
+        self.element_data_mut()
+            .on_slider_value_changed
+            .push(on_slider_value_changed);
         self
     }
 
@@ -182,7 +187,9 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     where
         Self: Sized,
     {
-        self.element_data_mut().on_got_pointer_capture.push(on_got_pointer_capture);
+        self.element_data_mut()
+            .on_got_pointer_capture
+            .push(on_got_pointer_capture);
         self
     }
 
@@ -190,7 +197,9 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     where
         Self: Sized,
     {
-        self.element_data_mut().on_lost_pointer_capture.push(on_lost_pointer_capture);
+        self.element_data_mut()
+            .on_lost_pointer_capture
+            .push(on_lost_pointer_capture);
         self
     }
 
@@ -198,7 +207,9 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     where
         Self: Sized,
     {
-        self.element_data_mut().on_pointer_button_down.push(on_pointer_button_down);
+        self.element_data_mut()
+            .on_pointer_button_down
+            .push(on_pointer_button_down);
         self
     }
 
@@ -275,7 +286,9 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
             // 5. If the pointer is not in the active buttons state or the element's node document is not the active document of the pointer, then terminate these steps.
             // TODO (POINTER CAPTURE)
             // 6. For the specified pointerId, set the pending pointer capture target override to the Element on which this method was invoked.
-            current_doc.pending_pointer_captures.insert(pointer_id, self.element_data().me.clone());
+            current_doc
+                .pending_pointer_captures
+                .insert(pointer_id, self.element_data().me.clone());
         });
     }
 
@@ -301,7 +314,11 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         // https://w3c.github.io/pointerevents/#dom-element-haspointercapture
         DOCUMENTS.with_borrow_mut(|docs| {
             let current_doc = docs.get_current_document();
-            current_doc.pending_pointer_captures.get(&pointer_id).cloned().map(|w| w.as_ptr())
+            current_doc
+                .pending_pointer_captures
+                .get(&pointer_id)
+                .cloned()
+                .map(|w| w.as_ptr())
                 == Some(self.element_data().me.clone().as_ptr())
         })
     }
@@ -358,7 +375,8 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     }
 
     fn set_margin(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) {
-        self.style_mut().set_margin(TrblRectangle::new(top, right, bottom, left));
+        self.style_mut()
+            .set_margin(TrblRectangle::new(top, right, bottom, left));
         self.update_taffy_style();
     }
 
@@ -371,7 +389,8 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     }
 
     fn set_padding(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) {
-        self.style_mut().set_padding(TrblRectangle::new(top, right, bottom, left));
+        self.style_mut()
+            .set_padding(TrblRectangle::new(top, right, bottom, left));
         self.update_taffy_style();
     }
 
@@ -695,7 +714,8 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     }
 
     fn set_border_color(&mut self, top: Color, right: Color, bottom: Color, left: Color) {
-        self.style_mut().set_border_color(TrblRectangle::new(top, right, bottom, left));
+        self.style_mut()
+            .set_border_color(TrblRectangle::new(top, right, bottom, left));
     }
 
     fn border_width(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> &mut Self
@@ -707,7 +727,8 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     }
 
     fn set_border_width(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) {
-        self.style_mut().set_border_width(TrblRectangle::new(top, right, bottom, left));
+        self.style_mut()
+            .set_border_width(TrblRectangle::new(top, right, bottom, left));
         self.update_taffy_style();
     }
 
@@ -744,7 +765,8 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     }
 
     fn set_scrollbar_thumb_margin(&mut self, top: f32, right: f32, bottom: f32, left: f32) {
-        self.style_mut().set_scrollbar_thumb_margin(TrblRectangle::new(top, right, bottom, left));
+        self.style_mut()
+            .set_scrollbar_thumb_margin(TrblRectangle::new(top, right, bottom, left));
     }
 
     fn scrollbar_thumb_radius(
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index 0a3de58c..cbe6c7fc 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -1,18 +1,20 @@
-use crate::animations::animation::ActiveAnimation;
-use crate::elements::element_id::create_unique_element_id;
-use crate::elements::scroll_state::ScrollState;
-use crate::elements::{Element};
-use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
-use crate::layout::layout_item::LayoutItem;
-use crate::style::Style;
+use std::cell::RefCell;
+use std::rc::{Rc, Weak};
+
 use craft_primitives::geometry::{Rectangle, Size};
 use rustc_hash::FxHashMap;
 use smol_str::SmolStr;
-use std::cell::RefCell;
-use std::rc::{Rc, Weak};
 use taffy::{Layout, Overflow};
+
+use crate::animations::animation::ActiveAnimation;
 use crate::app::{ELEMENTS, TAFFY_TREE};
+use crate::elements::Element;
+use crate::elements::element_id::create_unique_element_id;
+use crate::elements::scroll_state::ScrollState;
+use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
 use crate::layout::layout_context::LayoutContext;
+use crate::layout::layout_item::LayoutItem;
+use crate::style::Style;
 
 /// Stores common data to most elements.
 #[derive(Clone)]
@@ -56,7 +58,6 @@ pub struct ElementData {
 }
 
 impl ElementData {
-
     pub fn new(me: Weak<RefCell<dyn Element>>, scrollable: bool) -> Self {
         let mut default = Self {
             me,
@@ -127,7 +128,8 @@ impl ElementData {
 
             // Content Size = overflowed content size + padding
             // Scroll Height = Content Size
-            let scroll_height = (content_height + box_transformed.padding.bottom + box_transformed.padding.top).max(1.0);
+            let scroll_height =
+                (content_height + box_transformed.padding.bottom + box_transformed.padding.top).max(1.0);
             let scroll_track_width = self.layout_item.scrollbar_size.width;
 
             // The scroll track height is the height of the padding box.
@@ -147,8 +149,11 @@ impl ElementData {
             let scroll_thumb_height = scroll_track_height * visible_y;
             let scroll_thumb_height = scroll_thumb_height.max(15.0);
             let remaining_height = scroll_track_height - scroll_thumb_height;
-            let scroll_thumb_offset =
-                if max_scroll_y != 0.0 { state.scroll_y() / max_scroll_y * remaining_height } else { 0.0 };
+            let scroll_thumb_offset = if max_scroll_y != 0.0 {
+                state.scroll_y() / max_scroll_y * remaining_height
+            } else {
+                0.0
+            };
 
             let thumb_margin = self.style.scrollbar_thumb_margin();
             let scroll_thumb_width = scroll_track_width - (thumb_margin.left + thumb_margin.right);
@@ -183,4 +188,4 @@ impl ElementData {
     pub fn current_style_mut_no_fallback<'a>(&self) -> Option<&'a mut Style> {
         None
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/elements/element_id.rs b/crates/craft_retained/src/elements/element_id.rs
index 12bfc263..2a9b799b 100644
--- a/crates/craft_retained/src/elements/element_id.rs
+++ b/crates/craft_retained/src/elements/element_id.rs
@@ -10,4 +10,4 @@ pub fn create_unique_element_id() -> u64 {
         counter.set(id + 1);
         id
     })
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/elements/element_id_map.rs b/crates/craft_retained/src/elements/element_id_map.rs
index 40c579f8..05415ba2 100644
--- a/crates/craft_retained/src/elements/element_id_map.rs
+++ b/crates/craft_retained/src/elements/element_id_map.rs
@@ -1,17 +1,18 @@
 use std::cell::RefCell;
 use std::rc::Weak;
+
 use rustc_hash::FxHashMap;
+
 use crate::elements::Element;
 
 /// Maps element ids to Weak<Refcell<dyn Element>>
 
 #[derive(Default, Clone)]
 pub struct ElementIdMap {
-    map: FxHashMap<u64, Weak<RefCell<dyn Element>>>
+    map: FxHashMap<u64, Weak<RefCell<dyn Element>>>,
 }
 
 impl ElementIdMap {
-
     pub fn new() -> Self {
         Self::default()
     }
@@ -36,5 +37,4 @@ impl ElementIdMap {
     pub fn get(&self, id: u64) -> Option<&Weak<RefCell<dyn Element>>> {
         self.map.get(&id)
     }
-
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 8de7c063..e6452c8e 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -1,23 +1,24 @@
 //! Displays an image.
 
-use crate::app::{ELEMENTS, TAFFY_TREE};
-use crate::app::{PENDING_RESOURCES};
-use crate::elements::core::ElementInternals;
-use crate::elements::element_data::ElementData;
-use crate::elements::{Element};
-use crate::layout::layout_context::{ImageContext, LayoutContext};
-use crate::layout::TaffyTree;
-use crate::text::text_context::TextContext;
-use craft_primitives::geometry::Rectangle;
-use craft_renderer::RenderList;
-use craft_resource_manager::resource_type::ResourceType;
-use craft_resource_manager::ResourceIdentifier;
-use kurbo::{Affine, Point};
 use std::any::Any;
 use std::cell::RefCell;
 use std::ops::Deref;
 use std::rc::{Rc, Weak};
 
+use craft_primitives::geometry::Rectangle;
+use craft_renderer::RenderList;
+use craft_resource_manager::ResourceIdentifier;
+use craft_resource_manager::resource_type::ResourceType;
+use kurbo::{Affine, Point};
+
+use crate::app::{ELEMENTS, PENDING_RESOURCES, TAFFY_TREE};
+use crate::elements::Element;
+use crate::elements::core::ElementInternals;
+use crate::elements::element_data::ElementData;
+use crate::layout::TaffyTree;
+use crate::layout::layout_context::{ImageContext, LayoutContext};
+use crate::text::text_context::TextContext;
+
 /// Displays an image.
 pub struct Image {
     is_image_dirty: bool,
@@ -55,7 +56,11 @@ impl Image {
 
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let context = LayoutContext::Image(ImageContext::new(resource_identifier));
-            let node = self.element_data.layout_item.taffy_node_id.expect("Failed to get Image node");
+            let node = self
+                .element_data
+                .layout_item
+                .taffy_node_id
+                .expect("Failed to get Image node");
             taffy_tree.set_node_context(node, Some(context));
         });
 
diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index ff8f19b2..ec33cb6b 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -1,23 +1,23 @@
 mod container;
-mod element;
 pub mod core;
-mod text;
+mod element;
 mod element_data;
 mod scroll_state;
+mod text;
 
 mod element_id;
-mod scrollable;
-mod image;
-mod text_input;
 mod element_id_map;
+mod image;
+mod scrollable;
 mod slider;
+mod text_input;
 mod window;
 
 pub use container::Container;
-pub use text::Text;
-pub use slider::*;
-pub use text_input::TextInput;
-pub use image::Image;
 pub use element::Element;
 pub use element_id_map::ElementIdMap;
-pub use window::Window;
\ No newline at end of file
+pub use image::Image;
+pub use slider::*;
+pub use text::Text;
+pub use text_input::TextInput;
+pub use window::Window;
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 2c56feca..87ca0af6 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -1,9 +1,10 @@
-use crate::elements::Element;
-use crate::events::{CraftMessage, Event};
 use kurbo::Point;
-use ui_events::pointer::{PointerId, PointerType};
 use ui_events::ScrollDelta;
+use ui_events::pointer::{PointerId, PointerType};
+
 use crate::app::request_apply_layout;
+use crate::elements::Element;
+use crate::events::{CraftMessage, Event};
 
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage, event: &mut Event) {
diff --git a/crates/craft_retained/src/elements/slider/mod.rs b/crates/craft_retained/src/elements/slider/mod.rs
index e0a90f79..ec20ba8d 100644
--- a/crates/craft_retained/src/elements/slider/mod.rs
+++ b/crates/craft_retained/src/elements/slider/mod.rs
@@ -1,7 +1,5 @@
 mod slider;
-mod slider_logic;
 mod slider_draw;
+mod slider_logic;
 
-
-pub use slider::Slider;
-pub use slider::SliderDirection;
\ No newline at end of file
+pub use slider::{Slider, SliderDirection};
diff --git a/crates/craft_retained/src/elements/slider/slider.rs b/crates/craft_retained/src/elements/slider/slider.rs
index 88573f04..ae9a8314 100644
--- a/crates/craft_retained/src/elements/slider/slider.rs
+++ b/crates/craft_retained/src/elements/slider/slider.rs
@@ -1,21 +1,23 @@
-use crate::app::{queue_event};
-use crate::elements::core::ElementInternals;
-use crate::elements::element_data::ElementData;
-use crate::elements::{Element};
-use crate::events::{CraftMessage, Event};
-use crate::palette;
-use crate::style::Unit;
-use crate::text::text_context::TextContext;
+use std::any::Any;
+use std::cell::RefCell;
+use std::rc::{Rc, Weak};
+
 use craft_primitives::geometry::Rectangle;
 use craft_renderer::RenderList;
 use kurbo::{Affine, Point};
 use peniko::Color;
-use std::any::Any;
-use std::cell::RefCell;
-use std::rc::{Rc, Weak};
 use ui_events::keyboard::{Code, KeyState};
 use ui_events::pointer::PointerId;
+
+use crate::app::queue_event;
+use crate::elements::Element;
+use crate::elements::core::ElementInternals;
+use crate::elements::element_data::ElementData;
+use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
+use crate::palette;
+use crate::style::Unit;
+use crate::text::text_context::TextContext;
 
 #[derive(Clone, Copy, Default, Debug, PartialEq, Eq)]
 pub enum SliderDirection {
@@ -46,20 +48,22 @@ pub struct Slider {
 
 impl Slider {
     pub fn new(thumb_size: f32) -> Rc<RefCell<Self>> {
-        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| RefCell::new(Self {
-            element_data: ElementData::new(me.clone(), false),
-            step: 1.0,
-            min: 0.0,
-            max: 100.0,
-            direction: Default::default(),
-            value: 0.0,
-            dragging: false,
-            thumb_size: thumb_size as f64,
-            thumb_background_color: Color::BLACK,
-            thumb_border_radius: None,
-            track_background_color: Some(palette::css::DODGER_BLUE),
-            track_border_radius: None,
-        }));
+        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
+            RefCell::new(Self {
+                element_data: ElementData::new(me.clone(), false),
+                step: 1.0,
+                min: 0.0,
+                max: 100.0,
+                direction: Default::default(),
+                value: 0.0,
+                dragging: false,
+                thumb_size: thumb_size as f64,
+                thumb_background_color: Color::BLACK,
+                thumb_border_radius: None,
+                track_background_color: Some(palette::css::DODGER_BLUE),
+                track_border_radius: None,
+            })
+        });
 
         me.borrow_mut().background_color(palette::css::LIGHT_GRAY);
         let border_radius = 25.0;
@@ -67,7 +71,7 @@ impl Slider {
             (border_radius, border_radius),
             (border_radius, border_radius),
             (border_radius, border_radius),
-            (border_radius, border_radius)
+            (border_radius, border_radius),
         );
         if me.borrow_mut().direction == SliderDirection::Horizontal {
             me.borrow_mut().width(Unit::Px(140.0));
@@ -77,9 +81,8 @@ impl Slider {
             me.borrow_mut().width(Unit::Px(10.0));
         }
 
-
         // TODO: FIX
-       /* {
+        /* {
             let mut taffy_tree = self.element_data.taffy_tree.borrow_mut();
             let node_id = taffy_tree.new_leaf(me.borrow().style().to_taffy_style());
             me.borrow_mut().element_data.layout_item.taffy_node_id = Some(node_id);
@@ -159,7 +162,13 @@ impl Slider {
         self.thumb_background_color
     }
 
-    pub fn thumb_border_radius(&mut self, top: (f32, f32), right: (f32, f32), bottom: (f32, f32), left: (f32, f32)) -> &mut Self {
+    pub fn thumb_border_radius(
+        &mut self,
+        top: (f32, f32),
+        right: (f32, f32),
+        bottom: (f32, f32),
+        left: (f32, f32),
+    ) -> &mut Self {
         self.thumb_border_radius = Some([top, right, bottom, left]);
         self
     }
@@ -177,7 +186,13 @@ impl Slider {
         self.track_background_color
     }
 
-    pub fn track_border_radius(&mut self, top: (f32, f32), right: (f32, f32), bottom: (f32, f32), left: (f32, f32)) -> &mut Self {
+    pub fn track_border_radius(
+        &mut self,
+        top: (f32, f32),
+        right: (f32, f32),
+        bottom: (f32, f32),
+        left: (f32, f32),
+    ) -> &mut Self {
         self.track_border_radius = Some([top, right, bottom, left]);
         self
     }
@@ -185,7 +200,6 @@ impl Slider {
     pub fn get_track_border_radius(&self) -> Option<[(f32, f32); 4]> {
         self.track_border_radius
     }
-
 }
 
 impl crate::elements::core::ElementData for Slider {
@@ -205,7 +219,12 @@ impl Element for Slider {
 
         let thumb_pos = self.thumb_position(self.get_value());
         let thumb_size = self.get_thumb_size();
-        let thumb_rect = Rectangle::new(thumb_pos.x as f32, thumb_pos.y as f32, thumb_size as f32, thumb_size as f32);
+        let thumb_rect = Rectangle::new(
+            thumb_pos.x as f32,
+            thumb_pos.y as f32,
+            thumb_size as f32,
+            thumb_size as f32,
+        );
 
         if thumb_rect.contains(&point) {
             return true;
@@ -231,7 +250,6 @@ impl Element for Slider {
 }
 
 impl ElementInternals for Slider {
-
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
@@ -247,7 +265,9 @@ impl ElementInternals for Slider {
         let layout = taffy_tree.layout(node);
         let has_new_layout = taffy_tree.get_has_new_layout(node);
 
-        let dirty = has_new_layout || transform != self.element_data.layout_item.get_transform() || position != self.element_data.layout_item.position ;
+        let dirty = has_new_layout
+            || transform != self.element_data.layout_item.get_transform()
+            || position != self.element_data.layout_item.position;
         self.element_data.layout_item.has_new_layout = has_new_layout;
 
         if dirty {
@@ -299,9 +319,7 @@ impl ElementInternals for Slider {
                     Code::End => Some(self.max),
                     Code::PageUp => Some(self.compute_step(10, self.value)),
                     Code::PageDown => Some(self.compute_step(-10, self.value)),
-                    _ => {
-                        None
-                    }
+                    _ => None,
                 };
 
                 if let Some(new_value) = new_value {
@@ -316,7 +334,10 @@ impl ElementInternals for Slider {
                 // FIXME: Turn pointer capture on with the correct device id.
                 self.release_pointer_capture(PointerId::new(1).unwrap());
 
-                let value = self.compute_slider_value(&Point::new(pointer_button_update.state.position.x, pointer_button_update.state.position.y));
+                let value = self.compute_slider_value(&Point::new(
+                    pointer_button_update.state.position.x,
+                    pointer_button_update.state.position.y,
+                ));
                 self.value = value;
 
                 let new_event = Event::new(event.target.clone());
@@ -327,7 +348,10 @@ impl ElementInternals for Slider {
                 // FIXME: Turn pointer capture on with the correct device id.
                 self.set_pointer_capture(PointerId::new(1).unwrap());
 
-                let value = self.compute_slider_value(&Point::new(pointer_button_update.state.position.x, pointer_button_update.state.position.y));
+                let value = self.compute_slider_value(&Point::new(
+                    pointer_button_update.state.position.x,
+                    pointer_button_update.state.position.y,
+                ));
                 self.value = value;
 
                 let new_event = Event::new(event.target.clone());
@@ -338,7 +362,10 @@ impl ElementInternals for Slider {
                     return;
                 }
 
-                let value = self.compute_slider_value(&Point::new(pointer_update.current.position.x, pointer_update.current.position.y));
+                let value = self.compute_slider_value(&Point::new(
+                    pointer_update.current.position.x,
+                    pointer_update.current.position.y,
+                ));
                 self.value = value;
 
                 let new_event = Event::new(event.target.clone());
diff --git a/crates/craft_retained/src/elements/slider/slider_draw.rs b/crates/craft_retained/src/elements/slider/slider_draw.rs
index f37f2150..70556a77 100644
--- a/crates/craft_retained/src/elements/slider/slider_draw.rs
+++ b/crates/craft_retained/src/elements/slider/slider_draw.rs
@@ -1,11 +1,12 @@
-use crate::elements::slider::slider::SliderDirection;
-use crate::elements::{Element, Slider};
-use crate::layout::layout_item::{draw_borders_generic, CssComputedBorder};
-use craft_primitives::geometry::borders::CssRoundedRect;
 use craft_primitives::geometry::Rectangle;
+use craft_primitives::geometry::borders::CssRoundedRect;
 use craft_renderer::RenderList;
 use kurbo::Vec2;
 
+use crate::elements::slider::slider::SliderDirection;
+use crate::elements::{Element, Slider};
+use crate::layout::layout_item::{CssComputedBorder, draw_borders_generic};
+
 fn border_radius_to_vec_radius(border_radius: [(f32, f32); 4]) -> [Vec2; 4] {
     let br = border_radius;
     [
@@ -23,8 +24,7 @@ impl Slider {
             let thumb_pos = self.thumb_position(self.get_value());
 
             if self.get_direction() == SliderDirection::Horizontal {
-                element_rect.size.width = (thumb_pos.x
-                    - self.computed_box_transformed().position.x) as f32;
+                element_rect.size.width = (thumb_pos.x - self.computed_box_transformed().position.x) as f32;
 
                 // HACK: When the value track is visible add some extra width to make sure there are no gaps in the value track color.
                 // The background track may show through on the left edge if the thumb is round.
@@ -32,8 +32,7 @@ impl Slider {
                     element_rect.size.width += self.get_thumb_size() as f32 / 2.0;
                 }
             } else {
-                element_rect.size.height = (thumb_pos.y
-                    - self.computed_box_transformed().position.y) as f32;
+                element_rect.size.height = (thumb_pos.y - self.computed_box_transformed().position.y) as f32;
 
                 // HACK: When the value track is visible add some extra height to make sure there are no gaps in the value track color.
                 // The background track may show through on the top edge if the thumb is round.
@@ -49,16 +48,16 @@ impl Slider {
                 border_radius_to_vec_radius(self.style().border_radius())
             };
 
-            let css_rounded_rect =  CssRoundedRect::new(element_rect.border_rectangle().to_kurbo(), [0.0, 0.0, 0.0, 0.0], thumb_radii);
+            let css_rounded_rect = CssRoundedRect::new(
+                element_rect.border_rectangle().to_kurbo(),
+                [0.0, 0.0, 0.0, 0.0],
+                thumb_radii,
+            );
             let mut computed_border_spec = CssComputedBorder::new(css_rounded_rect);
             computed_border_spec.scale(scale_factor);
 
             let color_rect = [track_color, track_color, track_color, track_color];
-            draw_borders_generic(renderer,
-                                 &computed_border_spec,
-                                 color_rect,
-                                 track_color
-            );
+            draw_borders_generic(renderer, &computed_border_spec, color_rect, track_color);
         }
     }
 
@@ -66,7 +65,12 @@ impl Slider {
         let thumb_pos = self.thumb_position(self.get_value());
         let thumb_size = self.get_thumb_size();
         let thumb_background_color = self.get_thumb_color();
-        let thumb_rect = Rectangle::new(thumb_pos.x as f32, thumb_pos.y as f32, thumb_size as f32, thumb_size as f32);
+        let thumb_rect = Rectangle::new(
+            thumb_pos.x as f32,
+            thumb_pos.y as f32,
+            thumb_size as f32,
+            thumb_size as f32,
+        );
 
         // Use the specified border radius or default to 50% (a circle).
         let thumb_radii = if let Some(br) = self.get_thumb_border_radius() {
@@ -77,13 +81,14 @@ impl Slider {
             [half_size, half_size, half_size, half_size]
         };
 
-        let css_rounded_rect =  CssRoundedRect::new(thumb_rect.to_kurbo(), [0.0, 0.0, 0.0, 0.0], thumb_radii);
+        let css_rounded_rect = CssRoundedRect::new(thumb_rect.to_kurbo(), [0.0, 0.0, 0.0, 0.0], thumb_radii);
         let computed_border_spec = CssComputedBorder::new(css_rounded_rect);
-        let color_rect = [thumb_background_color, thumb_background_color, thumb_background_color, thumb_background_color];
-        draw_borders_generic(renderer,
-                             &computed_border_spec,
-                             color_rect,
-                             thumb_background_color
-        );
+        let color_rect = [
+            thumb_background_color,
+            thumb_background_color,
+            thumb_background_color,
+            thumb_background_color,
+        ];
+        draw_borders_generic(renderer, &computed_border_spec, color_rect, thumb_background_color);
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/elements/slider/slider_logic.rs b/crates/craft_retained/src/elements/slider/slider_logic.rs
index 3bd0441c..9167df94 100644
--- a/crates/craft_retained/src/elements/slider/slider_logic.rs
+++ b/crates/craft_retained/src/elements/slider/slider_logic.rs
@@ -1,6 +1,7 @@
 use kurbo::Point;
-use crate::elements::core::ElementInternals;
+
 use crate::elements::Slider;
+use crate::elements::core::ElementInternals;
 use crate::elements::slider::slider::SliderDirection;
 
 impl Slider {
@@ -29,8 +30,11 @@ impl Slider {
             content_rectangle.bottom() as f64
         };
 
-        let pointer_position_component =
-            if self.get_direction() == SliderDirection::Horizontal { pointer_position.x } else { pointer_position.y };
+        let pointer_position_component = if self.get_direction() == SliderDirection::Horizontal {
+            pointer_position.x
+        } else {
+            pointer_position.y
+        };
 
         // [0, 1]
         let mut normalized_value = (pointer_position_component - start) / (end - start);
@@ -84,9 +88,10 @@ impl Slider {
 #[cfg(test)]
 mod tests {
     use std::cell::RefCell;
-    use super::*;
     use std::rc::Rc;
 
+    use super::*;
+
     fn make_test_slider() -> Rc<RefCell<Slider>> {
         let slider = Slider::new(16.0);
         slider
@@ -96,7 +101,7 @@ mod tests {
     fn steps_one() {
         let slider_ref = make_test_slider();
         let mut slider = slider_ref.borrow_mut();
-        
+
         slider.value(50.0);
         let next_step = slider.compute_step(1, slider.get_value());
 
@@ -107,7 +112,7 @@ mod tests {
     fn steps_down_one() {
         let slider_ref = make_test_slider();
         let mut slider = slider_ref.borrow_mut();
-        
+
         slider.value(50.0);
         let next_step = slider.compute_step(-1, slider.get_value());
 
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index b67528d0..fb8aa69e 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -1,3 +1,14 @@
+use std::any::Any;
+use std::cell::RefCell;
+use std::rc::{Rc, Weak};
+
+use craft_primitives::Color;
+use craft_primitives::geometry::{Point, Rectangle};
+use craft_renderer::renderer::RenderList;
+#[cfg(feature = "accesskit")]
+use parley::LayoutAccessibility;
+use parley::{Alignment, AlignmentOptions, ContentWidths, Selection};
+
 use crate::elements::element_data::ElementData;
 use crate::events::{CraftMessage, Event};
 use crate::layout::layout_context::{LayoutContext, TaffyTextContext, TextHashKey};
@@ -5,23 +16,12 @@ use crate::style::Style;
 use crate::text::text_context::TextContext;
 use crate::text::text_render_data;
 use crate::text::text_render_data::TextRender;
-use craft_primitives::geometry::{Point, Rectangle};
-use craft_primitives::Color;
-use craft_renderer::renderer::RenderList;
-#[cfg(feature = "accesskit")]
-use parley::LayoutAccessibility;
-use parley::{Alignment, AlignmentOptions, ContentWidths, Selection};
-use std::any::Any;
-use std::cell::RefCell;
-use std::rc::{Rc, Weak};
 
 const MAX_CACHE_SIZE: usize = 16;
 
-use crate::elements::core::ElementInternals;
-#[cfg(feature = "accesskit")]
-use crate::elements::element_id::create_unique_element_id;
-use crate::elements::{Element};
-use crate::layout::TaffyTree;
+#[cfg(not(target_arch = "wasm32"))]
+use std::time;
+
 #[cfg(feature = "accesskit")]
 use accesskit::{Action, Role};
 use craft_primitives::ColorBrush;
@@ -29,8 +29,6 @@ use craft_renderer::text_renderer_data::TextData;
 use kurbo::Affine;
 use rustc_hash::FxHashMap;
 use smol_str::{SmolStr, ToSmolStr};
-#[cfg(not(target_arch = "wasm32"))]
-use std::time;
 use taffy::{AvailableSpace, Size};
 use time::{Duration, Instant};
 use ui_events::pointer::{PointerButton, PointerId};
@@ -38,6 +36,12 @@ use ui_events::pointer::{PointerButton, PointerId};
 use web_time as time;
 use winit::dpi;
 
+use crate::elements::Element;
+use crate::elements::core::ElementInternals;
+#[cfg(feature = "accesskit")]
+use crate::elements::element_id::create_unique_element_id;
+use crate::layout::TaffyTree;
+
 // A stateful element that shows text.
 #[derive(Clone)]
 pub struct Text {
@@ -135,7 +139,12 @@ impl Text {
         available_space: Size<AvailableSpace>,
         text_context: &mut TextContext,
     ) -> Size<f32> {
-        self.state.measure(&self.element_data.style, known_dimensions, available_space, text_context)
+        self.state.measure(
+            &self.element_data.style,
+            known_dimensions,
+            available_space,
+            text_context,
+        )
     }
 }
 
@@ -232,8 +241,12 @@ impl ElementInternals for Text {
         parent_index: Option<usize>,
         scale_factor: f64,
     ) {
-        let padding_box =
-            self.element_data.layout_item.computed_box_transformed.padding_rectangle().scale(scale_factor);
+        let padding_box = self
+            .element_data
+            .layout_item
+            .computed_box_transformed
+            .padding_rectangle()
+            .scale(scale_factor);
 
         let state: &mut TextState = &mut self.state;
         if state.layout.is_none() {
@@ -297,7 +310,11 @@ impl ElementInternals for Text {
             let state: &mut TextState = &mut self.state;
             match message {
                 CraftMessage::PointerButtonDown(pointer_button) => {
-                    if pointer_button.button.map(|button| button == PointerButton::Primary).unwrap_or_default() {
+                    if pointer_button
+                        .button
+                        .map(|button| button == PointerButton::Primary)
+                        .unwrap_or_default()
+                    {
                         state.update_text_selection(self.element_data.style.selection_color());
                         state.pointer_down = true;
                         state.cursor_reset();
@@ -326,7 +343,11 @@ impl ElementInternals for Text {
                     }
                 }
                 CraftMessage::PointerButtonUp(pointer_button) => {
-                    if pointer_button.button.map(|button| button == PointerButton::Primary).unwrap_or_default() {
+                    if pointer_button
+                        .button
+                        .map(|button| button == PointerButton::Primary)
+                        .unwrap_or_default()
+                    {
                         state.update_text_selection(self.element_data.style.selection_color());
                         state.pointer_down = false;
                         state.cursor_reset();
@@ -460,7 +481,9 @@ impl TextState {
     pub fn extend_selection_to_point(&mut self, point: Point) {
         let scale_factor = self.layout.as_ref().unwrap().scale() as f64;
         let point = Point::new(point.x * scale_factor, point.y * scale_factor);
-        self.selection = self.selection.extend_to_point(self.layout.as_ref().unwrap(), point.x as f32, point.y as f32);
+        self.selection = self
+            .selection
+            .extend_to_point(self.layout.as_ref().unwrap(), point.x as f32, point.y as f32);
     }
 
     pub fn select_word_at_point(&mut self, point: Point) {
@@ -500,7 +523,12 @@ impl TextState {
             }
             self.selection.geometry_with(layout, |rect, line| {
                 text_renderer.lines[line].selections.push((
-                    Rectangle::new(rect.x0 as f32, rect.y0 as f32, rect.width() as f32, rect.height() as f32),
+                    Rectangle::new(
+                        rect.x0 as f32,
+                        rect.y0 as f32,
+                        rect.width() as f32,
+                        rect.height() as f32,
+                    ),
                     selection_color,
                 ));
             });
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index f532b292..525a8394 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -1,34 +1,35 @@
 mod text_input_state;
 
-use crate::app::ELEMENTS;
-use crate::elements::element::Element;
-use crate::elements::element_data::ElementData;
-use crate::layout::layout_context::{LayoutContext, TaffyTextInputContext};
-use crate::style::{Display, Style, Unit};
-use craft_primitives::geometry::{Point, Rectangle, TrblRectangle};
-use craft_primitives::Color;
-use craft_renderer::renderer::{RenderList, TextScroll};
 use std::any::Any;
 use std::cell::RefCell;
 use std::ops::Deref;
 use std::rc::{Rc, Weak};
 
-use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
+use craft_primitives::Color;
+use craft_primitives::geometry::{Point, Rectangle, TrblRectangle};
+use craft_renderer::renderer::{RenderList, TextScroll};
+use craft_renderer::text_renderer_data::TextData;
+use kurbo::Affine;
+use parley::BoundingBox;
+use ui_events::pointer::PointerButton;
+use winit::event::Ime;
+
+use crate::app::ELEMENTS;
+use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
+use crate::elements::element::Element;
+use crate::elements::element_data::ElementData;
 #[cfg(feature = "accesskit")]
 use crate::elements::element_id::create_unique_element_id;
-use crate::elements::{scrollable};
+use crate::elements::scrollable;
 use crate::elements::text_input::text_input_state::TextInputState;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
+use crate::layout::layout_context::{LayoutContext, TaffyTextInputContext};
+use crate::style::{Display, Style, Unit};
+use crate::text::RangedStyles;
 use crate::text::text_context::TextContext;
 use crate::text::text_render_data::TextRender;
-use crate::text::RangedStyles;
 use crate::utils::cloneable_any::CloneableAny;
-use craft_renderer::text_renderer_data::TextData;
-use kurbo::Affine;
-use parley::BoundingBox;
-use ui_events::pointer::PointerButton;
-use winit::event::Ime;
 
 // A stateful element that shows text.
 #[derive(Clone)]
@@ -133,7 +134,13 @@ impl ElementInternals for TextInput {
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.scroll_state.map(|scroll_state| scroll_state.is_new()).unwrap_or_default() {
+        if !dirty
+            && self
+                .element_data
+                .scroll_state
+                .map(|scroll_state| scroll_state.is_new())
+                .unwrap_or_default()
+        {
             let result = taffy_tree.layout(node);
             self.element_data.apply_scroll(result);
             self.element_data.scroll_state.as_mut().unwrap().mark_old();
@@ -150,7 +157,8 @@ impl ElementInternals for TextInput {
             true,
         );
 
-        self.state.render_text(self.is_focused(), self.element_data.current_style());
+        self.state
+            .render_text(self.is_focused(), self.element_data.current_style());
     }
 
     fn draw(
@@ -216,8 +224,12 @@ impl ElementInternals for TextInput {
         let current_node_id = accesskit::NodeId(self.element_data.internal_id);
 
         let mut current_node = accesskit::Node::new(accesskit::Role::TextInput);
-        let padding_box =
-            self.element_data.layout_item.computed_box_transformed.padding_rectangle().scale(scale_factor);
+        let padding_box = self
+            .element_data
+            .layout_item
+            .computed_box_transformed
+            .padding_rectangle()
+            .scale(scale_factor);
 
         current_node.set_bounds(accesskit::Rect {
             x0: padding_box.left() as f64,
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index ba49b624..eed5809a 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -1,32 +1,30 @@
-use crate::layout::layout_context::TextHashKey;
-use craft_primitives::geometry::{Point, Rectangle};
-use craft_renderer::text_renderer_data::TextRender;
 use std::collections::HashMap;
 use std::ops::Range;
-use taffy::{AvailableSpace, NodeId};
-
-use crate::text::parley_editor::{PlainEditor, PlainEditorDriver};
-
-use ui_events::keyboard::{Key, KeyboardEvent, Modifiers, NamedKey};
+#[cfg(not(target_arch = "wasm32"))]
+use std::time::{Duration, Instant};
 
 #[cfg(feature = "accesskit")]
 use accesskit::{Node, TreeUpdate};
-#[cfg(not(target_arch = "wasm32"))]
-use std::time::{Duration, Instant};
+use craft_primitives::geometry::{Point, Rectangle};
+use craft_renderer::text_renderer_data::TextRender;
+use parley::{Affinity, ContentWidths, Cursor, Selection};
+use peniko::Color;
+use taffy::{AvailableSpace, NodeId};
+use ui_events::keyboard::{Key, KeyboardEvent, Modifiers, NamedKey};
+use ui_events::pointer::PointerUpdate;
 #[cfg(target_arch = "wasm32")]
 use web_time::{Duration, Instant};
+use winit::dpi;
 
-use crate::app::{request_layout, TAFFY_TREE};
+use crate::app::{TAFFY_TREE, request_layout};
+use crate::elements::TextInput;
 use crate::elements::core::ElementInternals;
 use crate::elements::text_input::parley_box_to_rect;
-use crate::elements::TextInput;
+use crate::layout::layout_context::TextHashKey;
 use crate::style::{Style, TextStyleProperty};
+use crate::text::parley_editor::{PlainEditor, PlainEditorDriver};
 use crate::text::text_context::TextContext;
-use crate::text::{text_render_data, RangedStyles};
-use parley::{Affinity, ContentWidths, Cursor, Selection};
-use peniko::Color;
-use ui_events::pointer::PointerUpdate;
-use winit::dpi;
+use crate::text::{RangedStyles, text_render_data};
 
 #[derive(Clone)]
 pub struct TextInputState {
@@ -127,7 +125,8 @@ impl TextInputState {
         if self.is_pointer_down() && prev_pos != self.cursor_pos() && !self.editor.is_composing() {
             self.reset_blink();
             let cursor_pos = self.cursor_pos();
-            self.driver(text_context).extend_selection_to_point(cursor_pos.x as f32, cursor_pos.y as f32);
+            self.driver(text_context)
+                .extend_selection_to_point(cursor_pos.x as f32, cursor_pos.y as f32);
             request_layout();
         }
     }
@@ -197,7 +196,8 @@ impl TextInputState {
 
         if self.editor.try_layout().is_none() || self.is_layout_dirty || self.content_widths.is_none() {
             self.editor.set_width(None);
-            self.editor.refresh_layout(&mut text_context.font_context, &mut text_context.layout_context);
+            self.editor
+                .refresh_layout(&mut text_context.font_context, &mut text_context.layout_context);
             self.content_widths = Some(self.editor.try_layout().unwrap().calculate_content_widths());
         }
 
@@ -226,7 +226,8 @@ impl TextInputState {
             .map(|height| dpi::PhysicalUnit::from_logical::<f32, f32>(height, self.scale_factor).0);
 
         self.editor.set_width(width_constraint);
-        self.editor.refresh_layout(&mut text_context.font_context, &mut text_context.layout_context);
+        self.editor
+            .refresh_layout(&mut text_context.font_context, &mut text_context.layout_context);
         let layout = self.editor.try_layout().unwrap();
 
         if last_pass {
@@ -288,8 +289,8 @@ impl TextInputState {
 
             start_time
                 + Duration::from_nanos(
-                ((phase.as_nanos() / self.blink_period.as_nanos() + 1) * self.blink_period.as_nanos()) as u64,
-            )
+                    ((phase.as_nanos() / self.blink_period.as_nanos() + 1) * self.blink_period.as_nanos()) as u64,
+                )
         })
     }
 
@@ -302,7 +303,8 @@ impl TextInputState {
     }
 
     fn driver<'a>(&'a mut self, text_context: &'a mut TextContext) -> PlainEditorDriver<'a> {
-        self.editor.driver(&mut text_context.font_context, &mut text_context.layout_context)
+        self.editor
+            .driver(&mut text_context.font_context, &mut text_context.layout_context)
     }
 
     /// Set's the scale factor.
@@ -375,7 +377,16 @@ impl TextInputState {
         #[allow(unused)]
         let (shift, action_mod) = self
             .modifiers
-            .map(|mods| (mods.shift(), if cfg!(target_os = "macos") { mods.meta() } else { mods.ctrl() }))
+            .map(|mods| {
+                (
+                    mods.shift(),
+                    if cfg!(target_os = "macos") {
+                        mods.meta()
+                    } else {
+                        mods.ctrl()
+                    },
+                )
+            })
             .unwrap_or_default();
 
         let mut driver = self.driver(text_context);
@@ -582,7 +593,12 @@ impl TextInputState {
         for (selection, color) in backgrounds.iter() {
             selection.geometry_with(layout, |rect, line| {
                 text_renderer.lines[line].backgrounds.push((
-                    Rectangle::new(rect.x0 as f32, rect.y0 as f32, rect.width() as f32, rect.height() as f32),
+                    Rectangle::new(
+                        rect.x0 as f32,
+                        rect.y0 as f32,
+                        rect.width() as f32,
+                        rect.height() as f32,
+                    ),
                     *color,
                 ));
             });
@@ -592,7 +608,9 @@ impl TextInputState {
             line.selections.clear();
         }
         self.editor.selection_geometry_with(|rect, line| {
-            text_renderer.lines[line].selections.push((parley_box_to_rect(rect), style.selection_color()));
+            text_renderer.lines[line]
+                .selections
+                .push((parley_box_to_rect(rect), style.selection_color()));
         });
 
         if focused {
@@ -612,7 +630,8 @@ impl TextInputState {
         x_offset: f64,
         y_offset: f64,
     ) {
-        self.editor.try_accessibility(tree, current_node, next_node_id, x_offset, y_offset);
+        self.editor
+            .try_accessibility(tree, current_node, next_node_id, x_offset, y_offset);
     }
 }
 
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 970156b3..b86cd7ab 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -1,25 +1,27 @@
 //! Stores one or more elements.
 
-use crate::app::{TAFFY_TREE, WINDOW_MANAGER};
-use crate::elements::core::{resolve_clip_for_scrollable, ElementInternals};
-use crate::elements::element_data::ElementData;
-use crate::elements::{scrollable, Element};
-use crate::events::{CraftMessage, Event};
-use crate::layout::TaffyTree;
-use crate::text::text_context::TextContext;
-use craft_primitives::geometry::{Rectangle, Size};
-use craft_renderer::RenderList;
-use kurbo::{Affine, Point};
 use std::any::Any;
 use std::cell::RefCell;
 use std::ops::DerefMut;
 use std::rc::{Rc, Weak};
 use std::sync::Arc;
+
+use craft_primitives::geometry::{Rectangle, Size};
+use craft_renderer::RenderList;
+use craft_resource_manager::ResourceManager;
+use kurbo::{Affine, Point};
 use peniko::Color;
 use taffy::{AvailableSpace, NodeId};
 use winit::window::Window as WinitWindow;
+
 use crate::RendererBox;
-use craft_resource_manager::ResourceManager;
+use crate::app::{TAFFY_TREE, WINDOW_MANAGER};
+use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
+use crate::elements::element_data::ElementData;
+use crate::elements::{Element, scrollable};
+use crate::events::{CraftMessage, Event};
+use crate::layout::TaffyTree;
+use crate::text::text_context::TextContext;
 
 /// Stores one or more elements.
 ///
@@ -105,7 +107,9 @@ impl Window {
         }
         self.window_size = new_size;
         let size = self.window_size();
-        self.render_list.borrow_mut().set_cull(Some(Rectangle::new(0.0, 0.0, size.width as f32, size.height as f32)));
+        self.render_list
+            .borrow_mut()
+            .set_cull(Some(Rectangle::new(0.0, 0.0, size.width as f32, size.height as f32)));
         // On macOS the window needs to be redrawn manually after resizing
         #[cfg(target_os = "macos")]
         {
@@ -130,13 +134,9 @@ impl Window {
     }
 
     #[allow(clippy::too_many_arguments)]
-    fn layout_window(
-        &mut self,
-        text_context: &mut TextContext,
-        resource_manager: Arc<ResourceManager>,
-    ) -> NodeId {
-        let root_node = self.
-            element_data
+    fn layout_window(&mut self, text_context: &mut TextContext, resource_manager: Arc<ResourceManager>) -> NodeId {
+        let root_node = self
+            .element_data
             .layout_item
             .taffy_node_id
             .expect("A root element must have a layout node.");
@@ -158,7 +158,7 @@ impl Window {
 
             //if self.taffy_tree.borrow().is_apply_layout_dirty() {
             /*let span = span!(Level::INFO, "layout(apply)");
-                    let _enter = span.enter();*/
+            let _enter = span.enter();*/
 
             if root_dirty || taffy_tree.is_apply_layout_dirty(&root_node) {
                 // TODO: move into taffy_tree
@@ -172,12 +172,11 @@ impl Window {
                     None,
                     text_context,
                     None,
-                    sf
+                    sf,
                 );
                 taffy_tree.apply_layout(root_node);
             }
             //}
-
         });
 
         root_node
@@ -194,7 +193,10 @@ impl Window {
         );
 
         self.winit_window.clone().unwrap().pre_present_notify();
-        self.renderer.as_mut().unwrap().sort_and_cull_render_list(render_list.borrow_mut().deref_mut());
+        self.renderer
+            .as_mut()
+            .unwrap()
+            .sort_and_cull_render_list(render_list.borrow_mut().deref_mut());
 
         let window = Rectangle {
             x: 0.0,
@@ -202,11 +204,14 @@ impl Window {
             width: self.renderer.as_mut().unwrap().surface_width(),
             height: self.renderer.as_mut().unwrap().surface_height(),
         };
-        self.renderer.as_mut().unwrap().prepare_render_list(self.render_list.borrow_mut().deref_mut(), resource_manager.clone(), window);
+        self.renderer.as_mut().unwrap().prepare_render_list(
+            self.render_list.borrow_mut().deref_mut(),
+            resource_manager.clone(),
+            window,
+        );
 
         self.renderer.as_mut().unwrap().submit(resource_manager.clone());
     }
-
 }
 
 impl crate::elements::core::ElementData for Window {
@@ -311,7 +316,13 @@ impl ElementInternals for Window {
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.scroll_state.map(|scroll_state| scroll_state.is_new()).unwrap_or_default() {
+        if !dirty
+            && self
+                .element_data
+                .scroll_state
+                .map(|scroll_state| scroll_state.is_new())
+                .unwrap_or_default()
+        {
             self.element_data.apply_scroll(layout);
             self.element_data.scroll_state.as_mut().unwrap().mark_old();
         }
@@ -373,4 +384,4 @@ impl ElementInternals for Window {
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
         resolve_clip_for_scrollable(self, clip_bounds);
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index 9e334c15..b3f91f11 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -1,23 +1,18 @@
-use crate::elements::Element;
-use crate::events::{CraftMessage, Event, FocusAction};
+use std::cell::RefCell;
+use std::collections::VecDeque;
+use std::rc::{Rc, Weak};
+
+use craft_primitives::geometry::Point;
+use craft_renderer::RenderList;
 
 use crate::app::dequeue_event;
-use crate::events::helpers::{
-    call_default_element_event_handler, call_user_event_handlers, find_target, freeze_target_list,
-};
+use crate::elements::Element;
+use crate::events::helpers::{call_default_element_event_handler, call_user_event_handlers, find_target, freeze_target_list};
 use crate::events::pointer_capture::maybe_handle_implicit_pointer_capture_release;
+use crate::events::{CraftMessage, Event, FocusAction};
 use crate::text::text_context::TextContext;
-use craft_primitives::geometry::Point;
-use craft_renderer::RenderList;
-use std::cell::RefCell;
-use std::collections::VecDeque;
-use std::rc::{Rc, Weak};
 
-pub(super) fn dispatch_capturing_event(
-    _message: &CraftMessage,
-    _targets: &mut VecDeque<Rc<RefCell<dyn Element>>>,
-) {
-}
+pub(super) fn dispatch_capturing_event(_message: &CraftMessage, _targets: &mut VecDeque<Rc<RefCell<dyn Element>>>) {}
 
 /// Dispatches 1 event to many elements.
 /// The first dispatch happens at the top-most visual element.
@@ -210,4 +205,4 @@ impl EventDispatcher {
 
         self.previous_targets = targets.iter().map(Rc::downgrade).collect();
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index 3ae89fc1..50564894 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -1,13 +1,15 @@
-use crate::elements::Element;
-use crate::events::pointer_capture::find_pointer_capture_target;
-use crate::events::{CraftMessage, Event};
-use crate::text::text_context::TextContext;
-use kurbo::Point;
 use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::rc::Rc;
+
 use craft_renderer::RenderList;
+use kurbo::Point;
+
 use crate::app::ELEMENTS;
+use crate::elements::Element;
+use crate::events::pointer_capture::find_pointer_capture_target;
+use crate::events::{CraftMessage, Event};
+use crate::text::text_context::TextContext;
 
 pub(super) fn freeze_target_list(target: Rc<RefCell<dyn Element>>) -> VecDeque<Rc<RefCell<dyn Element>>> {
     let mut current_target = Some(Rc::clone(&target));
@@ -146,5 +148,7 @@ pub(super) fn call_default_element_event_handler(
     text_context: &mut Option<TextContext>,
     message: &CraftMessage,
 ) {
-    current_target.borrow_mut().on_event(message, text_context.as_mut().unwrap(), event, Some(target.clone()));
+    current_target
+        .borrow_mut()
+        .on_event(message, text_context.as_mut().unwrap(), event, Some(target.clone()));
 }
diff --git a/crates/craft_retained/src/events/internal.rs b/crates/craft_retained/src/events/internal.rs
index 3c944236..9c871496 100644
--- a/crates/craft_retained/src/events/internal.rs
+++ b/crates/craft_retained/src/events/internal.rs
@@ -1,5 +1,4 @@
 use craft_resource_manager::resource_event::ResourceEvent;
-
 #[cfg(target_arch = "wasm32")]
 use {craft_renderer::renderer::Renderer, std::sync::Arc, winit::window::Window};
 
diff --git a/crates/craft_retained/src/events/mod.rs b/crates/craft_retained/src/events/mod.rs
index c88f8688..b5338e6b 100644
--- a/crates/craft_retained/src/events/mod.rs
+++ b/crates/craft_retained/src/events/mod.rs
@@ -1,29 +1,27 @@
 mod mouse_wheel;
 
-pub mod internal;
 mod event_dispatch;
-mod pointer_capture;
 mod helpers;
+pub mod internal;
+mod pointer_capture;
 //#[cfg(test)]
 //mod tests;
 
-pub use mouse_wheel::MouseWheel;
-pub use winit::event::ElementState;
 use std::any::Any;
 use std::cell::RefCell;
 use std::rc::Rc;
 use std::sync::Arc;
+
+pub(crate) use event_dispatch::EventDispatcher;
+pub use mouse_wheel::MouseWheel;
 pub use ui_events;
 use ui_events::keyboard::KeyboardEvent;
 use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
-pub use winit::event::Ime;
-pub use winit::event::Modifiers;
-pub use winit::event::MouseButton;
-use crate::PinnedFutureAny;
-use crate::utils::cloneable_any::CloneableAny;
+pub use winit::event::{ElementState, Ime, Modifiers, MouseButton};
 
-pub(crate) use event_dispatch::EventDispatcher;
+use crate::PinnedFutureAny;
 use crate::elements::Element;
+use crate::utils::cloneable_any::CloneableAny;
 
 pub type PointerEventHandler = Rc<dyn Fn(&mut Event, &PointerButtonEvent)>;
 pub type PointerCaptureHandler = Rc<dyn Fn(&mut Event)>;
@@ -70,19 +68,18 @@ impl CraftMessage {
         matches!(
             self,
             CraftMessage::PointerMovedEvent(_)
-            | CraftMessage::PointerButtonUp(_)
-            | CraftMessage::PointerButtonDown(_)
-            | CraftMessage::GotPointerCapture()
-            | CraftMessage::LostPointerCapture()
-            | CraftMessage::PointerScroll(_)
+                | CraftMessage::PointerButtonUp(_)
+                | CraftMessage::PointerButtonDown(_)
+                | CraftMessage::GotPointerCapture()
+                | CraftMessage::LostPointerCapture()
+                | CraftMessage::PointerScroll(_)
         )
     }
 
     pub(super) fn is_got_or_lost_pointer_capture(&self) -> bool {
         matches!(
             self,
-            CraftMessage::GotPointerCapture()
-            | CraftMessage::LostPointerCapture()
+            CraftMessage::GotPointerCapture() | CraftMessage::LostPointerCapture()
         )
     }
 
@@ -95,7 +92,6 @@ impl CraftMessage {
 }
 pub type UserMessage = dyn CloneableAny;
 
-
 /// The result of an update.
 pub struct Event {
     pub target: Rc<RefCell<dyn Element>>,
@@ -108,7 +104,6 @@ pub struct Event {
     pub prevent_defaults: bool,
 }
 
-
 #[derive(Debug, Clone, Copy, Default)]
 pub enum FocusAction {
     #[default]
@@ -118,7 +113,6 @@ pub enum FocusAction {
 }
 
 impl Event {
-
     #[cfg(not(target_arch = "wasm32"))]
     pub fn async_result<T: Send + Sync + 'static + Clone>(t: T) -> Box<dyn CloneableAny + Send + Sync + 'static> {
         Box::new(t)
@@ -173,5 +167,4 @@ impl Event {
     pub fn prevent_propagate(&mut self) {
         self.propagate = false;
     }
-
 }
diff --git a/crates/craft_retained/src/events/pointer_capture.rs b/crates/craft_retained/src/events/pointer_capture.rs
index 43831371..def25589 100644
--- a/crates/craft_retained/src/events/pointer_capture.rs
+++ b/crates/craft_retained/src/events/pointer_capture.rs
@@ -1,17 +1,16 @@
-use crate::app::DOCUMENTS;
-use crate::elements::Element;
-use crate::events::event_dispatch::{dispatch_bubbling_event, dispatch_capturing_event};
-use crate::events::CraftMessage;
 use std::cell::RefCell;
 use std::collections::VecDeque;
-use std::rc::Rc;
-use std::rc::Weak;
+use std::rc::{Rc, Weak};
+
 use ui_events::pointer::PointerId;
 
+use crate::app::DOCUMENTS;
+use crate::elements::Element;
+use crate::events::CraftMessage;
+use crate::events::event_dispatch::{dispatch_bubbling_event, dispatch_capturing_event};
+
 /// Returns the currently pointer captured element or None.
-pub(super) fn find_pointer_capture_target(
-    message: &CraftMessage,
-) -> Option<Rc<RefCell<dyn Element>>> {
+pub(super) fn find_pointer_capture_target(message: &CraftMessage) -> Option<Rc<RefCell<dyn Element>>> {
     // 9.4 Implicit pointer capture
     // https://w3c.github.io/pointerevents/#implicit-pointer-capture
     //
@@ -96,9 +95,7 @@ pub(super) fn process_pending_pointer_capture() {
     });
 }
 
-pub(super) fn maybe_handle_implicit_pointer_capture_release(
-    message: &CraftMessage,
-) {
+pub(super) fn maybe_handle_implicit_pointer_capture_release(message: &CraftMessage) {
     // 9.5 Implicit release of pointer capture
     // https://w3c.github.io/pointerevents/#implicit-release-of-pointer-capture
     let is_pointer_up_event = matches!(message, CraftMessage::PointerButtonUp(_));
diff --git a/crates/craft_retained/src/layout/layout_context.rs b/crates/craft_retained/src/layout/layout_context.rs
index 35d3c06e..05b22873 100644
--- a/crates/craft_retained/src/layout/layout_context.rs
+++ b/crates/craft_retained/src/layout/layout_context.rs
@@ -1,19 +1,20 @@
 use std::cell::RefCell;
 use std::rc::Weak;
-use craft_resource_manager::resource::Resource;
-use craft_resource_manager::{ResourceIdentifier, ResourceManager};
 use std::sync::Arc;
 
+use craft_resource_manager::resource::Resource;
+use craft_resource_manager::{ResourceIdentifier, ResourceManager};
 use taffy::{AvailableSpace, Size};
+
 use crate::elements::{Text, TextInput};
 use crate::text::text_context::TextContext;
 
 pub struct TaffyTextContext {
-    pub element: Weak<RefCell<Text>>
+    pub element: Weak<RefCell<Text>>,
 }
 
 pub struct TaffyTextInputContext {
-    pub element: Weak<RefCell<TextInput>>
+    pub element: Weak<RefCell<TextInput>>,
 }
 
 #[derive(Eq, Hash, PartialEq, Copy, Clone, Debug)]
@@ -34,8 +35,7 @@ pub enum AvailableSpaceKey {
     MaxContent,
 }
 
-impl TaffyTextContext {
-}
+impl TaffyTextContext {}
 
 pub struct ImageContext {
     pub(crate) resource_identifier: ResourceIdentifier,
@@ -44,10 +44,10 @@ pub struct ImageContext {
 impl ImageContext {
     pub(crate) fn new(resource_identifier: ResourceIdentifier) -> Self {
         Self {
-            resource_identifier
+            resource_identifier,
         }
     }
-    
+
     pub fn measure(
         &mut self,
         known_dimensions: Size<Option<f32>>,
@@ -57,7 +57,9 @@ impl ImageContext {
     ) -> Size<f32> {
         let mut original_image_width: f32 = 0.0;
         let mut original_image_height: f32 = 0.0;
-        if let Some(resource) = resource_manager.get(&self.resource_identifier) && let Resource::Image(image_data) = resource.as_ref() {
+        if let Some(resource) = resource_manager.get(&self.resource_identifier)
+            && let Resource::Image(image_data) = resource.as_ref()
+        {
             original_image_width = image_data.width as f32;
             original_image_height = image_data.height as f32;
         }
@@ -162,15 +164,19 @@ pub fn measure_content(
         None => Size::ZERO,
         Some(LayoutContext::Text(taffy_text_context)) => {
             let element = &taffy_text_context.element;
-            if let Some(element) = element.upgrade() && let Ok(mut element) = element.try_borrow_mut() {
-                return element.measure(known_dimensions, available_space, text_context)
+            if let Some(element) = element.upgrade()
+                && let Ok(mut element) = element.try_borrow_mut()
+            {
+                return element.measure(known_dimensions, available_space, text_context);
             }
             Size::ZERO
         }
         Some(LayoutContext::TextInput(taffy_text_input_context)) => {
             let element = &taffy_text_input_context.element;
-            if let Some(element) = element.upgrade() && let Ok(mut element) = element.try_borrow_mut() {
-                return element.state.measure(known_dimensions, available_space, text_context)
+            if let Some(element) = element.upgrade()
+                && let Ok(mut element) = element.try_borrow_mut()
+            {
+                return element.state.measure(known_dimensions, available_space, text_context);
             }
             Size::ZERO
         }
@@ -180,9 +186,7 @@ pub fn measure_content(
         Some(LayoutContext::TinyVg(tinyvg_context)) => {
             tinyvg_context.measure(known_dimensions, available_space, resource_manager, style)
         }
-        Some(LayoutContext::Other(_measure_fn)) => {
-            Size::ZERO
-        }
+        Some(LayoutContext::Other(_measure_fn)) => Size::ZERO,
     }
 }
 
@@ -197,9 +201,10 @@ impl TinyVgContext {
         let mut original_image_width: f32 = 0.0;
         let mut original_image_height: f32 = 0.0;
 
-        if let Some(resource) = resource_manager.get(&self.resource_identifier) &&
-            let Resource::TinyVg(resource) = resource.as_ref() && 
-            let Some(tinyvg) = &resource.tinyvg {
+        if let Some(resource) = resource_manager.get(&self.resource_identifier)
+            && let Resource::TinyVg(resource) = resource.as_ref()
+            && let Some(tinyvg) = &resource.tinyvg
+        {
             original_image_width = tinyvg.header.width as f32;
             original_image_height = tinyvg.header.height as f32;
         }
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index 9cc3cd12..8f164360 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -1,11 +1,12 @@
-use crate::style::Style;
-use craft_primitives::geometry::borders::{CssRoundedRect, BOTTOM, LEFT, RIGHT, TOP};
+use craft_primitives::geometry::borders::{BOTTOM, CssRoundedRect, LEFT, RIGHT, TOP};
 use craft_primitives::geometry::{Border, ElementBox, Margin, Padding, Point, Rectangle, Size, TrblRectangle};
 use craft_renderer::{Brush, RenderList};
 use kurbo::{Affine, BezPath, Shape, Vec2};
 use peniko::Color;
 use taffy::{NodeId, Position};
 
+use crate::style::Style;
+
 impl CssComputedBorder {
     pub(crate) fn scale(&mut self, scale_factor: f64) {
         let scale_factor = Affine::scale(scale_factor);
@@ -21,7 +22,6 @@ impl CssComputedBorder {
 }
 
 impl CssComputedBorder {
-
     pub(crate) fn new(css_rect: CssRoundedRect) -> Self {
         let top = css_rect.get_side(TOP);
         let right = css_rect.get_side(RIGHT);
@@ -34,7 +34,6 @@ impl CssComputedBorder {
             background,
         }
     }
-
 }
 
 #[derive(Clone, Default)]
@@ -109,9 +108,24 @@ impl LayoutItem {
 
         self.content_size = Size::new(result.content_size.width, result.content_size.height);
         self.computed_box = ElementBox {
-            margin: Margin::new(result.margin.top, result.margin.right, result.margin.bottom, result.margin.left),
-            border: Border::new(result.border.top, result.border.right, result.border.bottom, result.border.left),
-            padding: Padding::new(result.padding.top, result.padding.right, result.padding.bottom, result.padding.left),
+            margin: Margin::new(
+                result.margin.top,
+                result.margin.right,
+                result.margin.bottom,
+                result.margin.left,
+            ),
+            border: Border::new(
+                result.border.top,
+                result.border.right,
+                result.border.bottom,
+                result.border.left,
+            ),
+            padding: Padding::new(
+                result.padding.top,
+                result.padding.right,
+                result.padding.bottom,
+                result.padding.left,
+            ),
             position: at_position,
             size,
         };
@@ -127,7 +141,6 @@ impl LayoutItem {
         scale_factor: f64,
         border_color: &TrblRectangle<Color>,
     ) {
-
         let element_rect = self.computed_box_transformed;
         let border_spec = BorderSpec {
             rect: element_rect.border_rectangle(),
@@ -141,11 +154,10 @@ impl LayoutItem {
         }
         self.cache_border_spec = Some(border_spec);
 
-        let is_rectangle =
-            border_radius[0] == (0.0, 0.0) &&
-            border_radius[1] == (0.0, 0.0) &&
-            border_radius[2] == (0.0, 0.0) &&
-            border_radius[3] == (0.0, 0.0);
+        let is_rectangle = border_radius[0] == (0.0, 0.0)
+            && border_radius[1] == (0.0, 0.0)
+            && border_radius[2] == (0.0, 0.0)
+            && border_radius[3] == (0.0, 0.0);
 
         // OPTIMIZATION: Don't compute the border if no border style values have been modified.
         // Note: even if all radii are 0.0, if the color varies between two edges,
@@ -157,7 +169,12 @@ impl LayoutItem {
         let borders = element_rect.border;
         let border_spec = CssRoundedRect::new(
             element_rect.border_rectangle().to_kurbo(),
-            [borders.top as f64, borders.right as f64, borders.bottom as f64, borders.left as f64],
+            [
+                borders.top as f64,
+                borders.right as f64,
+                borders.bottom as f64,
+                borders.left as f64,
+            ],
             border_radius.map(|radii| Vec2::new(radii.0 as f64, radii.1 as f64)),
         );
 
@@ -177,7 +194,7 @@ impl LayoutItem {
         match &self.computed_border {
             ComputedBorder::None => {}
             ComputedBorder::Simple => {
-                let padding_rect =self.computed_box_transformed.padding_rectangle().scale(scale_factor);
+                let padding_rect = self.computed_box_transformed.padding_rectangle().scale(scale_factor);
                 let border_rect = self.computed_box_transformed.border_rectangle();
                 // Draw the background.
                 if background_color.components[3] != 0.0 {
@@ -190,13 +207,23 @@ impl LayoutItem {
                 }
             }
             ComputedBorder::CssComputedBorder(computed_border) => {
-                draw_borders_generic(renderer, computed_border, current_style.border_color().to_array(), background_color);
+                draw_borders_generic(
+                    renderer,
+                    computed_border,
+                    current_style.border_color().to_array(),
+                    background_color,
+                );
             }
         }
     }
 }
 
-pub(crate) fn draw_borders_generic(renderer: &mut RenderList, computed_border: &CssComputedBorder, side_colors: [Color; 4], bg_color: Color) {
+pub(crate) fn draw_borders_generic(
+    renderer: &mut RenderList,
+    computed_border: &CssComputedBorder,
+    side_colors: [Color; 4],
+    bg_color: Color,
+) {
     let background_color = bg_color;
 
     if background_color.components[3] != 0.0 {
@@ -240,4 +267,4 @@ fn from_taffy_point(p: taffy::Point<f32>) -> Point {
         x: p.x as f64,
         y: p.y as f64,
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/layout/mod.rs b/crates/craft_retained/src/layout/mod.rs
index 64ee0a6c..c659c0c8 100644
--- a/crates/craft_retained/src/layout/mod.rs
+++ b/crates/craft_retained/src/layout/mod.rs
@@ -2,4 +2,4 @@ pub mod layout_context;
 pub mod layout_item;
 mod taffy_tree;
 
-pub(crate) use taffy_tree::TaffyTree;
\ No newline at end of file
+pub(crate) use taffy_tree::TaffyTree;
diff --git a/crates/craft_retained/src/layout/taffy_tree.rs b/crates/craft_retained/src/layout/taffy_tree.rs
index dd2d7950..d566bc93 100644
--- a/crates/craft_retained/src/layout/taffy_tree.rs
+++ b/crates/craft_retained/src/layout/taffy_tree.rs
@@ -1,9 +1,11 @@
-use crate::layout::layout_context::{measure_content, LayoutContext};
-use crate::text::text_context::TextContext;
-use craft_resource_manager::ResourceManager;
 use std::sync::Arc;
+
+use craft_resource_manager::ResourceManager;
 use taffy::{Layout, NodeId, PrintTree, Size, Style};
 
+use crate::layout::layout_context::{LayoutContext, measure_content};
+use crate::text::text_context::TextContext;
+
 pub struct TaffyTree {
     inner: taffy::TaffyTree<LayoutContext>,
     /// True if at least one node is dirty.
@@ -160,4 +162,4 @@ impl TaffyTree {
         }
         node
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 21331257..9b6d9ffe 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -1,66 +1,58 @@
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 pub mod accessibility;
+pub mod animations;
 pub mod craft_winit_state;
+pub mod document;
 pub mod elements;
 pub mod events;
-pub mod animations;
 mod options;
 pub mod style;
 #[cfg(test)]
 mod tests;
 pub mod text;
-pub mod document;
 
 mod app;
-pub use craft_primitives::geometry as geometry;
+pub use craft_primitives::geometry;
 pub mod layout;
 pub use craft_runtime::CraftRuntime;
-mod window_context;
+pub mod spatial;
 mod utils;
 #[cfg(target_arch = "wasm32")]
 pub mod wasm_queue;
-pub mod spatial;
+mod window_context;
 mod window_manager;
 
-pub use options::CraftOptions;
-pub use craft_primitives::palette;
-pub use craft_primitives::Color;
-
-#[cfg(target_os = "android")]
-pub use winit::platform::android::activity::*;
+use std::future::Future;
+use std::pin::Pin;
+use std::sync::Arc;
 
+use app::App;
+use cfg_if::cfg_if;
+use craft_logging::info;
+pub use craft_primitives::{Color, palette};
 pub use craft_renderer::RendererType;
-use events::internal::InternalMessage;
 use craft_renderer::renderer::Renderer;
-use craft_resource_manager::ResourceManager;
 pub use craft_resource_manager::ResourceIdentifier;
-
-use craft_runtime::{channel, CraftRuntimeHandle, Receiver, Sender};
-
-pub use winit::window::{Cursor, CursorIcon};
-
+use craft_resource_manager::ResourceManager;
+use craft_runtime::{CraftRuntimeHandle, Receiver, Sender, channel};
+use craft_winit_state::CraftState;
+use events::internal::InternalMessage;
+pub use options::CraftOptions;
 pub use utils::craft_error::CraftError;
-
-use std::future::Future;
-use std::pin::Pin;
-use std::sync::Arc;
 #[cfg(target_arch = "wasm32")]
 use web_time as time;
-#[cfg(target_arch = "wasm32")]
-use crate::wasm_queue::WASM_QUEUE;
-use craft_winit_state::CraftState;
-
-use cfg_if::cfg_if;
-use craft_logging::info;
-
+#[cfg(target_os = "android")]
+pub use winit::platform::android::activity::*;
+pub use winit::window::{Cursor, CursorIcon};
 #[cfg(target_os = "android")]
 use {winit::event_loop::EventLoopBuilder, winit::platform::android::EventLoopBuilderExtAndroid};
 
-use app::App;
 use crate::app::RedrawFlags;
 use crate::craft_winit_state::CraftWinitState;
 use crate::events::EventDispatcher;
 use crate::utils::cloneable_any::CloneableAny;
+#[cfg(target_arch = "wasm32")]
+use crate::wasm_queue::WASM_QUEUE;
 
 #[cfg(target_arch = "wasm32")]
 pub type FutureAny = dyn Future<Output = Box<dyn CloneableAny>> + 'static;
@@ -83,8 +75,10 @@ pub fn internal_craft_main_with_options(
 ) {
     info!("Craft started");
 
-    let event_loop =
-        EventLoopBuilder::default().with_android_app(app).build().expect("Failed to create winit event loop.");
+    let event_loop = EventLoopBuilder::default()
+        .with_android_app(app)
+        .build()
+        .expect("Failed to create winit event loop.");
     info!("Created winit event loop.");
 
     let craft_state = setup_craft(root, options);
@@ -104,9 +98,7 @@ pub fn internal_craft_main_with_options(
 /// * `root` - The root element.
 /// * `options` - An optional [`CraftOptions`] configuration. If `None` is provided, default options will be applied.
 #[cfg(not(target_os = "android"))]
-pub fn craft_main(
-    options: CraftOptions,
-) {
+pub fn craft_main(options: CraftOptions) {
     internal_craft_main_with_options(Some(options));
 }
 
@@ -123,18 +115,12 @@ pub fn craft_main(
 /// * `options` - An optional [`CraftOptions`] configuration. If `None` is provided, default options will be applied.
 /// * `android_app` - The Android application instance.
 #[cfg(target_os = "android")]
-pub fn craft_main(
-    root: Rc<RefCell<dyn Element>>,
-    options: CraftOptions,
-    android_app: AndroidApp,
-) {
+pub fn craft_main(root: Rc<RefCell<dyn Element>>, options: CraftOptions, android_app: AndroidApp) {
     internal_craft_main_with_options(root, Some(options), android_app);
 }
 
 #[cfg(not(target_os = "android"))]
-fn internal_craft_main_with_options(
-    options: Option<CraftOptions>,
-) {
+fn internal_craft_main_with_options(options: Option<CraftOptions>) {
     use winit::event_loop::EventLoop;
 
     info!("Craft started");
@@ -146,9 +132,7 @@ fn internal_craft_main_with_options(
     event_loop.run_app(&mut winit_craft_state).expect("run_app failed");
 }
 
-pub fn setup_craft(
-    craft_options: Option<CraftOptions>,
-) -> CraftState {
+pub fn setup_craft(craft_options: Option<CraftOptions>) -> CraftState {
     let craft_options = craft_options.unwrap_or_default();
 
     let (app_sender, app_receiver) = channel::<InternalMessage>(100);
@@ -178,7 +162,9 @@ pub fn setup_craft(
         }
     }
 
-    let runtime = runtime_receiver.blocking_recv().expect("Failed to receive runtime handle");
+    let runtime = runtime_receiver
+        .blocking_recv()
+        .expect("Failed to receive runtime handle");
     let runtime_copy = runtime.clone();
     #[allow(clippy::arc_with_non_send_sync)]
     let resource_manager = Arc::new(ResourceManager::new(runtime.clone()));
diff --git a/crates/craft_retained/src/spatial/mod.rs b/crates/craft_retained/src/spatial/mod.rs
index e69de29b..8b137891 100644
--- a/crates/craft_retained/src/spatial/mod.rs
+++ b/crates/craft_retained/src/spatial/mod.rs
@@ -0,0 +1 @@
+
diff --git a/crates/craft_retained/src/style/styles.rs b/crates/craft_retained/src/style/styles.rs
index 5c342fd1..f2954537 100644
--- a/crates/craft_retained/src/style/styles.rs
+++ b/crates/craft_retained/src/style/styles.rs
@@ -1,17 +1,14 @@
-use crate::style::style_flags::StyleFlags;
-use craft_primitives::Color;
 use std::borrow::Cow;
-
-pub use taffy::BoxSizing;
-pub use taffy::Overflow;
-pub use taffy::Position;
+use std::fmt;
+use std::fmt::Debug;
 
 use craft_primitives::geometry::TrblRectangle;
-use craft_primitives::ColorBrush;
+use craft_primitives::{Color, ColorBrush};
 use smallvec::SmallVec;
-use std::fmt;
-use std::fmt::Debug;
+pub use taffy::{BoxSizing, Overflow, Position};
+
 use crate::animations::Animation;
+use crate::style::style_flags::StyleFlags;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum Unit {
@@ -87,32 +84,24 @@ pub struct ScrollbarColor {
 }
 
 impl Weight {
-    /// Thin weight (100), the thinnest value.
-    pub const THIN: Weight = Weight(100);
-
+    /// Black weight (900), the thickest value.
+    pub const BLACK: Weight = Weight(900);
+    /// Bold weight (700).
+    pub const BOLD: Weight = Weight(700);
+    /// Extra-bold weight (800).
+    pub const EXTRA_BOLD: Weight = Weight(800);
     /// Extra light weight (200).
     pub const EXTRA_LIGHT: Weight = Weight(200);
-
     /// Light weight (300).
     pub const LIGHT: Weight = Weight(300);
-
-    /// Normal (400).
-    pub const NORMAL: Weight = Weight(400);
-
     /// Medium weight (500, higher than normal).
     pub const MEDIUM: Weight = Weight(500);
-
+    /// Normal (400).
+    pub const NORMAL: Weight = Weight(400);
     /// Semibold weight (600).
     pub const SEMIBOLD: Weight = Weight(600);
-
-    /// Bold weight (700).
-    pub const BOLD: Weight = Weight(700);
-
-    /// Extra-bold weight (800).
-    pub const EXTRA_BOLD: Weight = Weight(800);
-
-    /// Black weight (900), the thickest value.
-    pub const BLACK: Weight = Weight(900);
+    /// Thin weight (100), the thinnest value.
+    pub const THIN: Weight = Weight(100);
 }
 
 #[derive(Default, Copy, Clone, PartialEq, Eq, Debug)]
@@ -249,9 +238,9 @@ impl TextStyleProperty {
                 Some(parley::StyleProperty::FontStyle(font_style))
             }
 
-            TextStyleProperty::FontWeight(font_weight) => {
-                Some(parley::StyleProperty::FontWeight(parley::FontWeight::new(font_weight.0 as f32)))
-            }
+            TextStyleProperty::FontWeight(font_weight) => Some(parley::StyleProperty::FontWeight(
+                parley::FontWeight::new(font_weight.0 as f32),
+            )),
             TextStyleProperty::Underline(underline) => Some(parley::StyleProperty::Underline(*underline)),
             TextStyleProperty::UnderlineOffset(offset) => Some(parley::StyleProperty::UnderlineOffset(Some(*offset))),
 
@@ -337,7 +326,13 @@ macro_rules! style_property {
             pub fn $get(&self) -> $inner {
                 self.properties
                     .iter()
-                    .find_map(|p| if let StyleProperty::$variant(val) = p { Some(*val) } else { None })
+                    .find_map(|p| {
+                        if let StyleProperty::$variant(val) = p {
+                            Some(*val)
+                        } else {
+                            None
+                        }
+                    })
                     .unwrap_or($default)
             }
 
@@ -353,12 +348,40 @@ macro_rules! style_property {
     };
 }
 
-style_property!(box_sizing, set_box_sizing, BoxSizing, BoxSizing, BOX_SIZING, BoxSizing::BorderBox);
+style_property!(
+    box_sizing,
+    set_box_sizing,
+    BoxSizing,
+    BoxSizing,
+    BOX_SIZING,
+    BoxSizing::BorderBox
+);
 style_property!(position, set_position, Position, Position, POSITION, Position::Relative);
-style_property!(margin, set_margin, Margin, TrblRectangle<Unit>, MARGIN, TrblRectangle::new_all(Unit::Px(0.0)));
-style_property!(padding, set_padding, Padding, TrblRectangle<Unit>, PADDING, TrblRectangle::new_all(Unit::Px(0.0)));
+style_property!(
+    margin,
+    set_margin,
+    Margin,
+    TrblRectangle<Unit>,
+    MARGIN,
+    TrblRectangle::new_all(Unit::Px(0.0))
+);
+style_property!(
+    padding,
+    set_padding,
+    Padding,
+    TrblRectangle<Unit>,
+    PADDING,
+    TrblRectangle::new_all(Unit::Px(0.0))
+);
 style_property!(gap, set_gap, Gap, [Unit; 2], GAP, [Unit::Px(0.0); 2]);
-style_property!(inset, set_inset, Inset, TrblRectangle<Unit>, INSET, TrblRectangle::new_all(Unit::Px(0.0)));
+style_property!(
+    inset,
+    set_inset,
+    Inset,
+    TrblRectangle<Unit>,
+    INSET,
+    TrblRectangle::new_all(Unit::Px(0.0))
+);
 
 style_property!(width, set_width, Width, Unit, WIDTH, Unit::Auto);
 style_property!(height, set_height, Height, Unit, HEIGHT, Unit::Auto);
@@ -369,22 +392,78 @@ style_property!(min_height, set_min_height, MinHeight, Unit, MIN_HEIGHT, Unit::A
 
 style_property!(display, set_display, Display, Display, DISPLAY, Display::Flex);
 style_property!(wrap, set_wrap, Wrap, Wrap, WRAP, Wrap::default());
-style_property!(align_items, set_align_items, AlignItems, Option<AlignItems>, ALIGN_ITEMS, None);
-style_property!(justify_content, set_justify_content, JustifyContent, Option<JustifyContent>, JUSTIFY_CONTENT, None);
-style_property!(flex_direction, set_flex_direction, FlexDirection, FlexDirection, FLEX_DIRECTION, FlexDirection::Row);
+style_property!(
+    align_items,
+    set_align_items,
+    AlignItems,
+    Option<AlignItems>,
+    ALIGN_ITEMS,
+    None
+);
+style_property!(
+    justify_content,
+    set_justify_content,
+    JustifyContent,
+    Option<JustifyContent>,
+    JUSTIFY_CONTENT,
+    None
+);
+style_property!(
+    flex_direction,
+    set_flex_direction,
+    FlexDirection,
+    FlexDirection,
+    FLEX_DIRECTION,
+    FlexDirection::Row
+);
 style_property!(flex_grow, set_flex_grow, FlexGrow, f32, FLEX_GROW, 0.0);
 style_property!(flex_shrink, set_flex_shrink, FlexShrink, f32, FLEX_SHRINK, 1.0);
 style_property!(flex_basis, set_flex_basis, FlexBasis, Unit, FLEX_BASIS, Unit::Auto);
 
-style_property!(font_family, set_font_family, FontFamily, FontFamily, FONT_FAMILY, FontFamily::default());
+style_property!(
+    font_family,
+    set_font_family,
+    FontFamily,
+    FontFamily,
+    FONT_FAMILY,
+    FontFamily::default()
+);
 style_property!(color, set_color, Color, Color, COLOR, Color::BLACK);
-style_property!(background, set_background, Background, Color, BACKGROUND, Color::TRANSPARENT);
+style_property!(
+    background,
+    set_background,
+    Background,
+    Color,
+    BACKGROUND,
+    Color::TRANSPARENT
+);
 style_property!(font_size, set_font_size, FontSize, f32, FONT_SIZE, 16.0);
 style_property!(line_height, set_line_height, LineHeight, f32, LINE_HEIGHT, 1.2);
-style_property!(font_weight, set_font_weight, FontWeight, Weight, FONT_WEIGHT, Weight::default());
-style_property!(font_style, set_font_style, FontStyle, FontStyle, FONT_STYLE, FontStyle::default());
+style_property!(
+    font_weight,
+    set_font_weight,
+    FontWeight,
+    Weight,
+    FONT_WEIGHT,
+    Weight::default()
+);
+style_property!(
+    font_style,
+    set_font_style,
+    FontStyle,
+    FontStyle,
+    FONT_STYLE,
+    FontStyle::default()
+);
 style_property!(underline, set_underline, Underline, Option<Underline>, UNDERLINE, None);
-style_property!(overflow, set_overflow, Overflow, [Overflow; 2], OVERFLOW, [Overflow::default(); 2]);
+style_property!(
+    overflow,
+    set_overflow,
+    Overflow,
+    [Overflow; 2],
+    OVERFLOW,
+    [Overflow::default(); 2]
+);
 
 style_property!(
     border_color,
@@ -402,7 +481,14 @@ style_property!(
     BORDER_WIDTH,
     TrblRectangle::new_all(Unit::Px(0.0))
 );
-style_property!(border_radius, set_border_radius, BorderRadius, [(f32, f32); 4], BORDER_RADIUS, [(0.0, 0.0); 4]);
+style_property!(
+    border_radius,
+    set_border_radius,
+    BorderRadius,
+    [(f32, f32); 4],
+    BORDER_RADIUS,
+    [(0.0, 0.0); 4]
+);
 
 style_property!(
     scrollbar_color,
@@ -442,7 +528,11 @@ style_property!(
     ScrollbarWidth,
     f32,
     SCROLLBAR_WIDTH,
-    if cfg!(any(target_os = "android", target_os = "ios")) { 0.0 } else { 10.0 }
+    if cfg!(any(target_os = "android", target_os = "ios")) {
+        0.0
+    } else {
+        10.0
+    }
 );
 
 style_property!(visible, set_visible, Visible, bool, VISIBLE, true);
@@ -454,10 +544,16 @@ style_property!(
     SELECTION_COLOR,
     Color::from_rgb8(0, 120, 215)
 );
-style_property!(cursor_color, set_cursor_color, CursorColor, Option<Color>, CURSOR_COLOR, None);
+style_property!(
+    cursor_color,
+    set_cursor_color,
+    CursorColor,
+    Option<Color>,
+    CURSOR_COLOR,
+    None
+);
 
 impl Style {
-
     fn remove_property(&mut self, f: impl Fn(&StyleProperty) -> bool) {
         if let Some(pos) = self.properties.iter().position(f) {
             self.properties.remove(pos);
@@ -646,12 +742,16 @@ impl Style {
             Cow::Owned(vec![parley::FontFamily::Generic(parley::GenericFamily::SystemUi)])
         };
 
-        style_set.insert(parley::StyleProperty::from(parley::FontStack::List(font_stack_cow_list)));
+        style_set.insert(parley::StyleProperty::from(parley::FontStack::List(
+            font_stack_cow_list,
+        )));
         style_set.insert(parley::StyleProperty::FontSize(font_size));
         style_set.insert(parley::StyleProperty::FontStyle(font_style));
         style_set.insert(parley::StyleProperty::FontWeight(font_weight));
         style_set.insert(parley::StyleProperty::Brush(brush));
-        style_set.insert(parley::StyleProperty::LineHeight(parley::LineHeight::FontSizeRelative(line_height)));
+        style_set.insert(parley::StyleProperty::LineHeight(parley::LineHeight::FontSizeRelative(
+            line_height,
+        )));
         style_set.insert(parley::StyleProperty::Underline(has_underline));
         style_set.insert(parley::StyleProperty::UnderlineBrush(underline_brush));
         style_set.insert(parley::StyleProperty::UnderlineOffset(underline_offset));
diff --git a/crates/craft_retained/src/style/taffy_conversions.rs b/crates/craft_retained/src/style/taffy_conversions.rs
index 96c131a0..c4a6ce41 100644
--- a/crates/craft_retained/src/style/taffy_conversions.rs
+++ b/crates/craft_retained/src/style/taffy_conversions.rs
@@ -1,6 +1,7 @@
-use crate::style::{AlignItems, Display, FlexDirection, JustifyContent, Style, Unit, Wrap};
 use taffy::{FlexWrap, Overflow};
+
 use crate::animations::Animation;
+use crate::style::{AlignItems, Display, FlexDirection, JustifyContent, Style, Unit, Wrap};
 
 fn unit_to_taffy_dimension(unit: Unit) -> taffy::Dimension {
     match unit {
@@ -27,7 +28,6 @@ fn unit_to_taffy_length_percentage(unit: Unit) -> taffy::LengthPercentage {
 }
 
 impl Style {
-
     pub fn animation(&self, animation: &str) -> Option<&Animation> {
         self.animations.iter().find(|ani| ani.name == animation)
     }
diff --git a/crates/craft_retained/src/text/mod.rs b/crates/craft_retained/src/text/mod.rs
index f7fc73fc..5cd75f40 100644
--- a/crates/craft_retained/src/text/mod.rs
+++ b/crates/craft_retained/src/text/mod.rs
@@ -1,24 +1,21 @@
+pub(crate) mod parley_editor;
 pub mod text_context;
 pub(crate) mod text_render_data;
-pub(crate) mod parley_editor;
 
-pub use parley;
 use std::ops::Range;
 
-use crate::style::TextStyleProperty;
+pub use parley;
 pub use text_render_data::from_editor;
 
-#[derive(Clone)]
-#[derive(Default)]
-#[derive(PartialEq)]
-pub struct RangedStyles  {
+use crate::style::TextStyleProperty;
+
+#[derive(Clone, Default, PartialEq)]
+pub struct RangedStyles {
     pub styles: Vec<(Range<usize>, TextStyleProperty)>,
 }
 
 impl RangedStyles {
     pub fn new(styles: Vec<(Range<usize>, TextStyleProperty)>) -> Self {
-        Self { 
-            styles
-        }
+        Self { styles }
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/text/parley_editor.rs b/crates/craft_retained/src/text/parley_editor.rs
index fbea3b86..cc51514e 100644
--- a/crates/craft_retained/src/text/parley_editor.rs
+++ b/crates/craft_retained/src/text/parley_editor.rs
@@ -1,25 +1,25 @@
 //! A simple plain text editor and related types.
-use parley::{FontContext, LayoutContext, StyleProperty, StyleSet, layout::{
-    Affinity, Alignment, AlignmentOptions, Layout,
-}, Selection, Cursor, BoundingBox};
+use parley::layout::{Affinity, Alignment, AlignmentOptions, Layout};
+use parley::{BoundingBox, Cursor, FontContext, LayoutContext, Selection, StyleProperty, StyleSet};
 
 extern crate alloc;
-use alloc::{borrow::ToOwned, string::String, vec::Vec};
-use core::{
-    cmp::PartialEq,
-    default::Default,
-    fmt::{Debug, Display},
-    num::NonZeroUsize,
-    ops::Range,
-};
+use alloc::borrow::ToOwned;
+use alloc::string::String;
+use alloc::vec::Vec;
+use core::cmp::PartialEq;
+use core::default::Default;
+use core::fmt::{Debug, Display};
+use core::num::NonZeroUsize;
+use core::ops::Range;
 
-#[cfg(feature = "accesskit")]
-use parley::layout::LayoutAccessibility;
 #[cfg(feature = "accesskit")]
 use accesskit::{Node, NodeId, TreeUpdate};
-use crate::text::RangedStyles;
 use craft_primitives::ColorBrush;
+#[cfg(feature = "accesskit")]
+use parley::layout::LayoutAccessibility;
+
 use crate::app::request_layout;
+use crate::text::RangedStyles;
 
 /// Opaque representation of a generation.
 ///
@@ -46,7 +46,6 @@ impl Generation {
 pub struct SplitString<'source>(pub [&'source str; 2]);
 
 impl<'source> SplitString<'source> {
-
     /// Get the characters of this string.
     #[allow(dead_code)]
     pub fn chars(self) -> impl Iterator<Item = char> + 'source {
@@ -82,8 +81,9 @@ impl Display for SplitString<'_> {
 
 /// Iterate through the source strings.
 impl<'source> IntoIterator for SplitString<'source> {
-    type Item = &'source str;
     type IntoIter = <[&'source str; 2] as IntoIterator>::IntoIter;
+    type Item = &'source str;
+
     fn into_iter(self) -> Self::IntoIter {
         self.0.into_iter()
     }
@@ -95,8 +95,7 @@ impl<'source> IntoIterator for SplitString<'source> {
 /// which is kept up-to-date as needed.
 /// This layout is invalidated by a number.
 #[derive(Clone)]
-pub struct PlainEditor
-{
+pub struct PlainEditor {
     layout: Layout<ColorBrush>,
     buffer: String,
     default_style: StyleSet<ColorBrush>,
@@ -148,8 +147,7 @@ impl Default for PlainEditor {
     }
 }
 
-impl PlainEditor
-{
+impl PlainEditor {
     /// Create a new editor, with default font size `font_size`.
     pub fn new(font_size: f32) -> Self {
         Self {
@@ -179,20 +177,17 @@ impl PlainEditor
 ///
 /// This can perform operations which require the editor's layout to
 /// be up-to-date by refreshing it as necessary.
-pub struct PlainEditorDriver<'a>
-{
+pub struct PlainEditorDriver<'a> {
     pub editor: &'a mut PlainEditor,
     pub font_cx: &'a mut FontContext,
     pub layout_cx: &'a mut LayoutContext<ColorBrush>,
 }
 
-impl PlainEditorDriver<'_>
-{
+impl PlainEditorDriver<'_> {
     // --- MARK: Forced relayout ---
     /// Insert at cursor, or replace selection.
     pub fn insert_or_replace_selection(&mut self, s: &str) {
-        self.editor
-            .replace_selection(self.font_cx, self.layout_cx, s);
+        self.editor.replace_selection(self.font_cx, self.layout_cx, s);
     }
 
     /// Delete the selection.
@@ -215,8 +210,7 @@ impl PlainEditorDriver<'_>
             return;
         }
         self.editor.buffer.replace_range(range.clone(), "");
-        self.editor
-            .update_compose_for_replaced_range(range.clone(), 0);
+        self.editor.update_compose_for_replaced_range(range.clone(), 0);
         self.update_layout();
         let old_anchor = old_selection.anchor();
         let old_focus = old_selection.focus();
@@ -228,16 +222,8 @@ impl PlainEditorDriver<'_>
             (old_anchor.affinity(), old_focus.affinity())
         };
         self.editor.set_selection(Selection::new(
-            Cursor::from_byte_index(
-                &self.editor.layout,
-                old_anchor.index() - range.len(),
-                anchor_affinity,
-            ),
-            Cursor::from_byte_index(
-                &self.editor.layout,
-                old_focus.index() - range.len(),
-                focus_affinity,
-            ),
+            Cursor::from_byte_index(&self.editor.layout, old_anchor.index() - range.len(), anchor_affinity),
+            Cursor::from_byte_index(&self.editor.layout, old_focus.index() - range.len(), focus_affinity),
         ));
     }
 
@@ -251,9 +237,9 @@ impl PlainEditorDriver<'_>
         let selection_range = self.editor.selection.text_range();
         let range = selection_range.end
             ..selection_range
-            .end
-            .saturating_add(len.get())
-            .min(self.editor.buffer.len());
+                .end
+                .saturating_add(len.get())
+                .min(self.editor.buffer.len());
         if range.is_empty() || !self.editor.buffer.is_char_boundary(range.end) {
             return;
         }
@@ -266,11 +252,7 @@ impl PlainEditorDriver<'_>
     pub fn delete(&mut self) {
         if self.editor.selection.is_collapsed() {
             // Upstream cluster range
-            if let Some(range) = self
-                .editor
-                .selection
-                .focus()
-                .logical_clusters(&self.editor.layout)[1]
+            if let Some(range) = self.editor.selection.focus().logical_clusters(&self.editor.layout)[1]
                 .as_ref()
                 .map(|cluster| cluster.text_range())
                 .and_then(|range| (!range.is_empty()).then_some(range))
@@ -294,10 +276,8 @@ impl PlainEditorDriver<'_>
                 self.editor.buffer.replace_range(start..end, "");
                 self.editor.update_compose_for_replaced_range(start..end, 0);
                 self.update_layout();
-                self.editor.set_selection(
-                    Cursor::from_byte_index(&self.editor.layout, start, Affinity::Downstream)
-                        .into(),
-                );
+                self.editor
+                    .set_selection(Cursor::from_byte_index(&self.editor.layout, start, Affinity::Downstream).into());
             }
         } else {
             self.delete_selection();
@@ -308,12 +288,7 @@ impl PlainEditorDriver<'_>
     pub fn backdelete(&mut self) {
         if self.editor.selection.is_collapsed() {
             // Upstream cluster
-            if let Some(cluster) = self
-                .editor
-                .selection
-                .focus()
-                .logical_clusters(&self.editor.layout)[0]
-            {
+            if let Some(cluster) = self.editor.selection.focus().logical_clusters(&self.editor.layout)[0] {
                 let range = cluster.text_range();
                 let end = range.end;
                 let start = if cluster.is_hard_line_break() || cluster.is_emoji() {
@@ -334,10 +309,8 @@ impl PlainEditorDriver<'_>
                 self.editor.buffer.replace_range(start..end, "");
                 self.editor.update_compose_for_replaced_range(start..end, 0);
                 self.update_layout();
-                self.editor.set_selection(
-                    Cursor::from_byte_index(&self.editor.layout, start, Affinity::Downstream)
-                        .into(),
-                );
+                self.editor
+                    .set_selection(Cursor::from_byte_index(&self.editor.layout, start, Affinity::Downstream).into());
             }
         } else {
             self.delete_selection();
@@ -354,10 +327,8 @@ impl PlainEditorDriver<'_>
                 self.editor.buffer.replace_range(start..end, "");
                 self.editor.update_compose_for_replaced_range(start..end, 0);
                 self.update_layout();
-                self.editor.set_selection(
-                    Cursor::from_byte_index(&self.editor.layout, start, Affinity::Downstream)
-                        .into(),
-                );
+                self.editor
+                    .set_selection(Cursor::from_byte_index(&self.editor.layout, start, Affinity::Downstream).into());
             }
         } else {
             self.delete_selection();
@@ -382,9 +353,7 @@ impl PlainEditorDriver<'_>
         debug_assert!(cursor.map(|cursor| cursor.1 <= text.len()).unwrap_or(true));
 
         let start = if let Some(preedit_range) = &self.editor.compose {
-            self.editor
-                .buffer
-                .replace_range(preedit_range.clone(), text);
+            self.editor.buffer.replace_range(preedit_range.clone(), text);
             preedit_range.start
         } else {
             if self.editor.selection.is_collapsed() {
@@ -467,19 +436,15 @@ impl PlainEditorDriver<'_>
     pub fn move_to_byte(&mut self, index: usize) {
         if self.editor.buffer.is_char_boundary(index) {
             self.refresh_layout();
-            self.editor
-                .set_selection(self.editor.cursor_at(index).into());
+            self.editor.set_selection(self.editor.cursor_at(index).into());
         }
     }
 
     /// Move the cursor to the start of the buffer.
     pub fn move_to_text_start(&mut self) {
         self.refresh_layout();
-        self.editor.set_selection(self.editor.selection.move_lines(
-            &self.editor.layout,
-            isize::MIN,
-            false,
-        ));
+        self.editor
+            .set_selection(self.editor.selection.move_lines(&self.editor.layout, isize::MIN, false));
     }
 
     /// Move the cursor to the start of the physical line.
@@ -492,11 +457,8 @@ impl PlainEditorDriver<'_>
     /// Move the cursor to the end of the buffer.
     pub fn move_to_text_end(&mut self) {
         self.refresh_layout();
-        self.editor.set_selection(self.editor.selection.move_lines(
-            &self.editor.layout,
-            isize::MAX,
-            false,
-        ));
+        self.editor
+            .set_selection(self.editor.selection.move_lines(&self.editor.layout, isize::MAX, false));
     }
 
     /// Move the cursor to the end of the physical line.
@@ -509,11 +471,8 @@ impl PlainEditorDriver<'_>
     /// Move up to the closest physical cluster boundary on the previous line, preserving the horizontal position for repeated movements.
     pub fn move_up(&mut self) {
         self.refresh_layout();
-        self.editor.set_selection(
-            self.editor
-                .selection
-                .previous_line(&self.editor.layout, false),
-        );
+        self.editor
+            .set_selection(self.editor.selection.previous_line(&self.editor.layout, false));
     }
 
     /// Move down to the closest physical cluster boundary on the next line, preserving the horizontal position for repeated movements.
@@ -526,49 +485,40 @@ impl PlainEditorDriver<'_>
     /// Move to the next cluster left in visual order.
     pub fn move_left(&mut self) {
         self.refresh_layout();
-        self.editor.set_selection(
-            self.editor
-                .selection
-                .previous_visual(&self.editor.layout, false),
-        );
+        self.editor
+            .set_selection(self.editor.selection.previous_visual(&self.editor.layout, false));
     }
 
     /// Move to the next cluster right in visual order.
     pub fn move_right(&mut self) {
         self.refresh_layout();
-        self.editor.set_selection(
-            self.editor
-                .selection
-                .next_visual(&self.editor.layout, false),
-        );
+        self.editor
+            .set_selection(self.editor.selection.next_visual(&self.editor.layout, false));
     }
 
     /// Move to the next word boundary left.
     pub fn move_word_left(&mut self) {
         self.refresh_layout();
-        self.editor.set_selection(
-            self.editor
-                .selection
-                .previous_visual_word(&self.editor.layout, false),
-        );
+        self.editor
+            .set_selection(self.editor.selection.previous_visual_word(&self.editor.layout, false));
     }
 
     /// Move to the next word boundary right.
     pub fn move_word_right(&mut self) {
         self.refresh_layout();
-        self.editor.set_selection(
-            self.editor
-                .selection
-                .next_visual_word(&self.editor.layout, false),
-        );
+        self.editor
+            .set_selection(self.editor.selection.next_visual_word(&self.editor.layout, false));
     }
 
     /// Select the whole buffer.
     pub fn select_all(&mut self) {
         self.refresh_layout();
         self.editor.set_selection(
-            Selection::from_byte_index(&self.editor.layout, 0_usize, Affinity::default())
-                .move_lines(&self.editor.layout, isize::MAX, true),
+            Selection::from_byte_index(&self.editor.layout, 0_usize, Affinity::default()).move_lines(
+                &self.editor.layout,
+                isize::MAX,
+                true,
+            ),
         );
     }
 
@@ -580,11 +530,8 @@ impl PlainEditorDriver<'_>
     /// Move the selection focus point to the start of the buffer.
     pub fn select_to_text_start(&mut self) {
         self.refresh_layout();
-        self.editor.set_selection(self.editor.selection.move_lines(
-            &self.editor.layout,
-            isize::MIN,
-            true,
-        ));
+        self.editor
+            .set_selection(self.editor.selection.move_lines(&self.editor.layout, isize::MIN, true));
     }
 
     /// Move the selection focus point to the start of the physical line.
@@ -597,11 +544,8 @@ impl PlainEditorDriver<'_>
     /// Move the selection focus point to the end of the buffer.
     pub fn select_to_text_end(&mut self) {
         self.refresh_layout();
-        self.editor.set_selection(self.editor.selection.move_lines(
-            &self.editor.layout,
-            isize::MAX,
-            true,
-        ));
+        self.editor
+            .set_selection(self.editor.selection.move_lines(&self.editor.layout, isize::MAX, true));
     }
 
     /// Move the selection focus point to the end of the physical line.
@@ -614,11 +558,8 @@ impl PlainEditorDriver<'_>
     /// Move the selection focus point up to the nearest cluster boundary on the previous line, preserving the horizontal position for repeated movements.
     pub fn select_up(&mut self) {
         self.refresh_layout();
-        self.editor.set_selection(
-            self.editor
-                .selection
-                .previous_line(&self.editor.layout, true),
-        );
+        self.editor
+            .set_selection(self.editor.selection.previous_line(&self.editor.layout, true));
     }
 
     /// Move the selection focus point down to the nearest cluster boundary on the next line, preserving the horizontal position for repeated movements.
@@ -631,11 +572,8 @@ impl PlainEditorDriver<'_>
     /// Move the selection focus point to the next cluster left in visual order.
     pub fn select_left(&mut self) {
         self.refresh_layout();
-        self.editor.set_selection(
-            self.editor
-                .selection
-                .previous_visual(&self.editor.layout, true),
-        );
+        self.editor
+            .set_selection(self.editor.selection.previous_visual(&self.editor.layout, true));
     }
 
     /// Move the selection focus point to the next cluster right in visual order.
@@ -648,21 +586,15 @@ impl PlainEditorDriver<'_>
     /// Move the selection focus point to the next word boundary left.
     pub fn select_word_left(&mut self) {
         self.refresh_layout();
-        self.editor.set_selection(
-            self.editor
-                .selection
-                .previous_visual_word(&self.editor.layout, true),
-        );
+        self.editor
+            .set_selection(self.editor.selection.previous_visual_word(&self.editor.layout, true));
     }
 
     /// Move the selection focus point to the next word boundary right.
     pub fn select_word_right(&mut self) {
         self.refresh_layout();
-        self.editor.set_selection(
-            self.editor
-                .selection
-                .next_visual_word(&self.editor.layout, true),
-        );
+        self.editor
+            .set_selection(self.editor.selection.next_visual_word(&self.editor.layout, true));
         request_layout();
     }
 
@@ -686,11 +618,8 @@ impl PlainEditorDriver<'_>
     pub fn extend_selection_to_point(&mut self, x: f32, y: f32) {
         self.refresh_layout();
         // FIXME: This is usually the wrong way to handle selection extension for mouse moves, but not a regression.
-        self.editor.set_selection(
-            self.editor
-                .selection
-                .extend_to_point(&self.editor.layout, x, y),
-        );
+        self.editor
+            .set_selection(self.editor.selection.extend_to_point(&self.editor.layout, x, y));
     }
 
     /// Move the selection focus point to a byte index.
@@ -712,10 +641,8 @@ impl PlainEditorDriver<'_>
     pub fn select_byte_range(&mut self, start: usize, end: usize) {
         if self.editor.buffer.is_char_boundary(start) && self.editor.buffer.is_char_boundary(end) {
             self.refresh_layout();
-            self.editor.set_selection(Selection::new(
-                self.editor.cursor_at(start),
-                self.editor.cursor_at(end),
-            ));
+            self.editor
+                .set_selection(Selection::new(self.editor.cursor_at(start), self.editor.cursor_at(end)));
         }
     }
 
@@ -724,11 +651,9 @@ impl PlainEditorDriver<'_>
     #[allow(dead_code)]
     pub fn select_from_accesskit(&mut self, selection: &accesskit::TextSelection) {
         self.refresh_layout();
-        if let Some(selection) = Selection::from_access_selection(
-            selection,
-            &self.editor.layout,
-            &self.editor.layout_access,
-        ) {
+        if let Some(selection) =
+            Selection::from_access_selection(selection, &self.editor.layout, &self.editor.layout_access)
+        {
             self.editor.set_selection(selection);
         }
     }
@@ -769,8 +694,7 @@ impl PlainEditorDriver<'_>
     }
 }
 
-impl PlainEditor
-{
+impl PlainEditor {
     /// Run a series of [`PlainEditorDriver`] methods.
     ///
     /// This type is only used to simplify methods which require both
@@ -851,10 +775,7 @@ impl PlainEditor
     /// selection on the focused line.
     pub fn ime_cursor_area(&self) -> BoundingBox {
         let (area, focus) = if let Some(preedit_range) = &self.compose {
-            let selection = Selection::new(
-                self.cursor_at(preedit_range.start),
-                self.cursor_at(preedit_range.end),
-            );
+            let selection = Selection::new(self.cursor_at(preedit_range.start), self.cursor_at(preedit_range.end));
 
             // Bound the entire preedit text.
             let mut area = None;
@@ -887,7 +808,7 @@ impl PlainEditor
         let font_size = downstream
             .or(upstream)
             .map(|cluster| cluster.run().font_size())
-            .unwrap_or(16.0/*ResolvedStyle::<T>::default().font_size*/);
+            .unwrap_or(16.0 /*ResolvedStyle::<T>::default().font_size*/);
         // Using 0.6 as an estimate of the average advance
         let inflate = 3. * 0.6 * font_size as f64;
         let editor_width = self.width.map(f64::from).unwrap_or(f64::INFINITY);
@@ -906,10 +827,7 @@ impl PlainEditor
     #[allow(dead_code)]
     pub fn text(&self) -> SplitString<'_> {
         if let Some(preedit_range) = &self.compose {
-            SplitString([
-                &self.buffer[..preedit_range.start],
-                &self.buffer[preedit_range.end..],
-            ])
+            SplitString([&self.buffer[..preedit_range.start], &self.buffer[preedit_range.end..]])
         } else {
             SplitString([&self.buffer, ""])
         }
@@ -994,12 +912,11 @@ impl PlainEditor
     }
 
     /// Sets the ranged styles provided for this editor.
-    pub fn set_ranged_styles(&mut self, ranged_styles: RangedStyles){
+    pub fn set_ranged_styles(&mut self, ranged_styles: RangedStyles) {
         self.layout_dirty = true;
         self.ranged_styles = ranged_styles;
     }
 
-
     /// Whether the editor is currently in IME composing mode.
     pub fn is_composing(&self) -> bool {
         self.compose.is_some()
@@ -1028,11 +945,7 @@ impl PlainEditor
     ///
     /// The [`layout`](Self::layout) method should generally be preferred.
     pub fn try_layout(&self) -> Option<&Layout<ColorBrush>> {
-        if self.layout_dirty {
-            None
-        } else {
-            Some(&self.layout)
-        }
+        if self.layout_dirty { None } else { Some(&self.layout) }
     }
 
     #[cfg(feature = "accesskit")]
@@ -1111,12 +1024,7 @@ impl PlainEditor
         }
     }
 
-    fn replace_selection(
-        &mut self,
-        font_cx: &mut FontContext,
-        layout_cx: &mut LayoutContext<ColorBrush>,
-        s: &str,
-    ) {
+    fn replace_selection(&mut self, font_cx: &mut FontContext, layout_cx: &mut LayoutContext<ColorBrush>, s: &str) {
         let range = self.selection.text_range();
         let start = range.start;
         if self.selection.is_collapsed() {
@@ -1138,17 +1046,16 @@ impl PlainEditor
 
     /// Update the selection, and nudge the `Generation` if something other than `h_pos` changed.
     fn set_selection(&mut self, new_sel: Selection) {
-        if new_sel.focus() != self.selection.focus() || new_sel.anchor() != self.selection.anchor()
-        {
+        if new_sel.focus() != self.selection.focus() || new_sel.anchor() != self.selection.anchor() {
             self.generation.nudge();
         }
 
         self.selection = new_sel;
     }
+
     /// Update the layout.
     fn update_layout(&mut self, font_cx: &mut FontContext, layout_cx: &mut LayoutContext<ColorBrush>) {
-        let mut builder =
-            layout_cx.ranged_builder(font_cx, &self.buffer, self.scale as f32, self.quantize);
+        let mut builder = layout_cx.ranged_builder(font_cx, &self.buffer, self.scale as f32, self.quantize);
         for prop in self.default_style.inner().values() {
             builder.push_default(prop.to_owned());
         }
@@ -1197,10 +1104,7 @@ impl PlainEditor
             y_offset,
         );
         if self.show_cursor {
-            if let Some(selection) = self
-                .selection
-                .to_access_selection(&self.layout, &self.layout_access)
-            {
+            if let Some(selection) = self.selection.to_access_selection(&self.layout, &self.layout_access) {
                 node.set_text_selection(selection);
             }
         } else {
diff --git a/crates/craft_retained/src/text/text_context.rs b/crates/craft_retained/src/text/text_context.rs
index 066628fc..db8bd4e1 100644
--- a/crates/craft_retained/src/text/text_context.rs
+++ b/crates/craft_retained/src/text/text_context.rs
@@ -1,5 +1,5 @@
-use parley::{FontContext, TextStyle, TreeBuilder};
 use craft_primitives::ColorBrush;
+use parley::{FontContext, TextStyle, TreeBuilder};
 
 pub struct TextContext {
     pub font_context: FontContext,
@@ -25,6 +25,7 @@ impl TextContext {
         scale: f32,
         raw_style: &TextStyle<'_, ColorBrush>,
     ) -> TreeBuilder<'a, ColorBrush> {
-        self.layout_context.tree_builder(&mut self.font_context, scale, true, raw_style)
+        self.layout_context
+            .tree_builder(&mut self.font_context, scale, true, raw_style)
     }
 }
diff --git a/crates/craft_retained/src/text/text_render_data.rs b/crates/craft_retained/src/text/text_render_data.rs
index 8a9ec649..328781a8 100644
--- a/crates/craft_retained/src/text/text_render_data.rs
+++ b/crates/craft_retained/src/text/text_render_data.rs
@@ -1,8 +1,8 @@
 use craft_primitives::ColorBrush;
-use parley::{Layout, PositionedLayoutItem};
-use peniko::kurbo::{Affine, Line};
 pub(crate) use craft_renderer::text_renderer_data::{TextRender, TextRenderGlyph, TextRenderLine};
 use craft_renderer::text_renderer_data::{TextRenderItem, TextRenderItemLine};
+use parley::{Layout, PositionedLayoutItem};
+use peniko::kurbo::{Affine, Line};
 
 pub fn from_editor(layout: &Layout<ColorBrush>) -> TextRender {
     let mut text_render = TextRender {
@@ -48,7 +48,11 @@ pub fn from_editor(layout: &Layout<ColorBrush>) -> TextRender {
                     (glyph_run.offset() as f64, y as f64),
                     ((glyph_run.offset() + glyph_run.advance()) as f64, y as f64),
                 );
-                Some(TextRenderItemLine { line, width, brush: underline_brush })
+                Some(TextRenderItemLine {
+                    line,
+                    width,
+                    brush: underline_brush,
+                })
             } else {
                 None
             };
@@ -59,7 +63,9 @@ pub fn from_editor(layout: &Layout<ColorBrush>) -> TextRender {
             let font = run.font();
             let font_size = run.font_size();
             let synthesis = run.synthesis();
-            let glyph_xform = synthesis.skew().map(|angle| Affine::skew(angle.to_radians().tan() as f64, 0.0));
+            let glyph_xform = synthesis
+                .skew()
+                .map(|angle| Affine::skew(angle.to_radians().tan() as f64, 0.0));
 
             let glyphs = glyph_run.glyphs().map(|glyph| {
                 let gx = x + glyph.x;
@@ -93,7 +99,11 @@ pub fn from_editor(layout: &Layout<ColorBrush>) -> TextRender {
                     (glyph_run.offset() as f64, y as f64),
                     ((glyph_run.offset() + glyph_run.advance()) as f64, y as f64),
                 );
-                Some(TextRenderItemLine { line, width, brush: strikethrough_brush })
+                Some(TextRenderItemLine {
+                    line,
+                    width,
+                    brush: strikethrough_brush,
+                })
             } else {
                 None
             };
diff --git a/crates/craft_retained/src/utils/craft_error.rs b/crates/craft_retained/src/utils/craft_error.rs
index ae9b8b3c..88e8cf9d 100644
--- a/crates/craft_retained/src/utils/craft_error.rs
+++ b/crates/craft_retained/src/utils/craft_error.rs
@@ -1,5 +1,5 @@
 #[derive(Debug)]
 pub enum CraftError {
     /// Thrown when an element cannot be found.
-    ElementNotFound
-}
\ No newline at end of file
+    ElementNotFound,
+}
diff --git a/crates/craft_retained/src/utils/mod.rs b/crates/craft_retained/src/utils/mod.rs
index b2146dbd..b63c749e 100644
--- a/crates/craft_retained/src/utils/mod.rs
+++ b/crates/craft_retained/src/utils/mod.rs
@@ -1,2 +1,2 @@
 pub mod cloneable_any;
-pub(crate) mod craft_error;
\ No newline at end of file
+pub(crate) mod craft_error;
diff --git a/crates/craft_retained/src/wasm_queue.rs b/crates/craft_retained/src/wasm_queue.rs
index 6fee6118..1e4018dc 100644
--- a/crates/craft_retained/src/wasm_queue.rs
+++ b/crates/craft_retained/src/wasm_queue.rs
@@ -1,6 +1,7 @@
-use crate::events::internal::InternalMessage;
 use std::cell::RefCell;
 
+use crate::events::internal::InternalMessage;
+
 pub const WASM_QUEUE_SIZE: usize = 100;
 
 pub struct WasmQueue {
diff --git a/crates/craft_retained/src/window_context.rs b/crates/craft_retained/src/window_context.rs
index 885f85db..a9592b22 100644
--- a/crates/craft_retained/src/window_context.rs
+++ b/crates/craft_retained/src/window_context.rs
@@ -136,4 +136,4 @@ impl WindowContext {
         self.requested_cursor = None;
     }
 }
-*/
\ No newline at end of file
+*/
diff --git a/crates/craft_retained/src/window_manager.rs b/crates/craft_retained/src/window_manager.rs
index 416df48f..48c54d6b 100644
--- a/crates/craft_retained/src/window_manager.rs
+++ b/crates/craft_retained/src/window_manager.rs
@@ -1,11 +1,13 @@
 use std::cell::RefCell;
 use std::rc::Rc;
 use std::sync::Arc;
+
+use craft_renderer::renderer::Renderer;
 use winit::event_loop::ActiveEventLoop;
 use winit::window::{WindowAttributes, WindowId};
-use craft_renderer::renderer::Renderer;
+
 use crate::craft_winit_state::CraftState;
-use crate::elements::{Window};
+use crate::elements::Window;
 
 pub(crate) struct WindowManager {
     windows: Vec<Rc<RefCell<Window>>>,
@@ -35,34 +37,37 @@ impl WindowManager {
 
     pub(crate) fn on_resume(&mut self, craft_state: &mut CraftState, event_loop: &ActiveEventLoop) {
         for window_element in &self.windows {
-
             println!("Creating window");
-            let winit_window = Arc::new(event_loop.create_window(WindowAttributes::default()).expect("Failed to create window"));
+            let winit_window = Arc::new(
+                event_loop
+                    .create_window(WindowAttributes::default())
+                    .expect("Failed to create window"),
+            );
             winit_window.set_visible(true);
             window_element.borrow_mut().set_winit_window(winit_window.clone());
 
             let renderer_type = craft_state.craft_options.renderer;
 
             cfg_if::cfg_if! {
-            if #[cfg(not(target_arch = "wasm32"))] {
-                    let renderer = craft_state.runtime.borrow_tokio_runtime().block_on(async {
-                        let renderer: Box<dyn Renderer> = renderer_type.create(winit_window.clone()).await;
-                    renderer
-                });
-                window_element.borrow_mut().renderer = Some(renderer);
-            } else {
-                let app_sender = craft_state.app_sender.clone();
-                let window_copy_2 = window_copy.clone();
-                craft_state.runtime.spawn(async move {
-                    let renderer: Box<dyn Renderer> = renderer_type.create(window_copy).await;
-                    app_sender
-                        .send(InternalMessage::RendererCreated(window_copy_2, renderer))
-                        .await
-                        .expect("Failed to send RendererCreated message");
-                });
+                if #[cfg(not(target_arch = "wasm32"))] {
+                        let renderer = craft_state.runtime.borrow_tokio_runtime().block_on(async {
+                            let renderer: Box<dyn Renderer> = renderer_type.create(winit_window.clone()).await;
+                        renderer
+                    });
+                    window_element.borrow_mut().renderer = Some(renderer);
+                } else {
+                    let app_sender = craft_state.app_sender.clone();
+                    let window_copy_2 = window_copy.clone();
+                    craft_state.runtime.spawn(async move {
+                        let renderer: Box<dyn Renderer> = renderer_type.create(window_copy).await;
+                        app_sender
+                            .send(InternalMessage::RendererCreated(window_copy_2, renderer))
+                            .await
+                            .expect("Failed to send RendererCreated message");
+                    });
+                }
             }
         }
-        }
     }
 
     pub fn close_window(&mut self, window: &Rc<RefCell<Window>>) {
@@ -85,5 +90,4 @@ impl WindowManager {
     pub fn is_empty(&self) -> bool {
         self.len() == 0
     }
-
-}
\ No newline at end of file
+}
diff --git a/crates/craft_runtime/src/lib.rs b/crates/craft_runtime/src/lib.rs
index e5210d76..23d778b3 100644
--- a/crates/craft_runtime/src/lib.rs
+++ b/crates/craft_runtime/src/lib.rs
@@ -1,9 +1,7 @@
-use cfg_if::cfg_if;
 use std::future::Future;
 
-pub use tokio::sync::mpsc::Sender;
-pub use tokio::sync::mpsc::Receiver;
-pub use tokio::sync::mpsc::channel;
+use cfg_if::cfg_if;
+pub use tokio::sync::mpsc::{Receiver, Sender, channel};
 
 pub struct CraftRuntime {
     #[cfg(not(target_arch = "wasm32"))]
diff --git a/crates/syntect_dumper/src/main.rs b/crates/syntect_dumper/src/main.rs
index cc777e61..7aeafc9c 100644
--- a/crates/syntect_dumper/src/main.rs
+++ b/crates/syntect_dumper/src/main.rs
@@ -1,7 +1,8 @@
-use reqwest::blocking::get;
 use std::error::Error;
 use std::fs;
 use std::path::PathBuf;
+
+use reqwest::blocking::get;
 use syntect::dumps::dump_to_file;
 use syntect::highlighting::ThemeSet;
 use syntect::parsing::{SyntaxDefinition, SyntaxSetBuilder};
@@ -44,7 +45,10 @@ fn main() -> Result<(), Box<dyn Error>> {
         let contents = get(*theme_url)?.text()?;
 
         // Use the filename from the URL directly
-        let filename = theme_url.split('/').next_back().ok_or("Invalid URL, no filename found")?;
+        let filename = theme_url
+            .split('/')
+            .next_back()
+            .ok_or("Invalid URL, no filename found")?;
 
         let theme_path = theme_dir.join(filename);
         fs::write(&theme_path, contents)?;
diff --git a/examples/counter_retained/counter_android.rs b/examples/counter_retained/counter_android.rs
index 1b2bb1cb..55cd7eb7 100644
--- a/examples/counter_retained/counter_android.rs
+++ b/examples/counter_retained/counter_android.rs
@@ -1,9 +1,10 @@
 #![cfg(target_os = "android")]
 
-use crate::counter::counter;
-use craft_retained::{craft_main, AndroidApp, CraftOptions};
+use craft_retained::{AndroidApp, CraftOptions, craft_main};
 use util::setup_logging;
 
+use crate::counter::counter;
+
 #[path = "main.rs"]
 mod counter;
 
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index 5e584b5f..db513b3c 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -1,13 +1,11 @@
-use craft_retained::elements::{Element, Window};
-use craft_retained::events::ui_events::pointer::PointerButton;
-use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Unit};
-use craft_retained::{
-    elements::{Container, Text},
-    rgb, Color,
-};
 use std::cell::RefCell;
 use std::rc::Rc;
 
+use craft_retained::elements::{Container, Element, Text, Window};
+use craft_retained::events::ui_events::pointer::PointerButton;
+use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Unit};
+use craft_retained::{Color, rgb};
+
 #[derive(Default, Clone, Copy)]
 pub struct Counter {
     count: i64,
@@ -47,7 +45,9 @@ fn create_button(
         .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {
             if pointer_button_event.button == Some(PointerButton::Primary) {
                 state.borrow_mut().change(delta);
-                count_text.borrow_mut().text(&format!("Count: {}", state.borrow().count()));
+                count_text
+                    .borrow_mut()
+                    .text(&format!("Count: {}", state.borrow().count()));
                 event.prevent_propagate();
             }
         }))
@@ -68,8 +68,20 @@ pub fn counter() -> Rc<RefCell<dyn Element>> {
         .display(Display::Flex)
         .flex_direction(FlexDirection::Row)
         .gap(Unit::Px(20.0), Unit::Px(20.0))
-        .push(create_button("-", rgb(244, 67, 54), -1, count.clone(), count_text.clone()))
-        .push(create_button("+", rgb(76, 175, 80), 1, count.clone(), count_text.clone()));
+        .push(create_button(
+            "-",
+            rgb(244, 67, 54),
+            -1,
+            count.clone(),
+            count_text.clone(),
+        ))
+        .push(create_button(
+            "+",
+            rgb(76, 175, 80),
+            1,
+            count.clone(),
+            count_text.clone(),
+        ));
 
     container
         .borrow_mut()
diff --git a/examples/jsframeworkbench/main.rs b/examples/jsframeworkbench/main.rs
index daac021a..c51800f7 100644
--- a/examples/jsframeworkbench/main.rs
+++ b/examples/jsframeworkbench/main.rs
@@ -1,16 +1,15 @@
-use craft_retained::elements::{Element, Window};
-use craft_retained::elements::{Container, Text};
-use craft_retained::events::ui_events::pointer::PointerButtonEvent;
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use craft_retained::elements::{Container, Element, Text, Window};
 use craft_retained::events::Event;
-use craft_retained::style::{AlignItems, JustifyContent, Overflow, Wrap};
-use craft_retained::style::{Display, FlexDirection, Unit};
-use craft_retained::{rgb, Color};
+use craft_retained::events::ui_events::pointer::PointerButtonEvent;
+use craft_retained::palette::css::WHITE;
+use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Unit, Wrap};
+use craft_retained::{Color, rgb};
 use rand::rng;
 use rand::rngs::ThreadRng;
 use rand::seq::IndexedRandom;
-use std::cell::RefCell;
-use std::rc::{Rc};
-use craft_retained::palette::css::WHITE;
 
 const ADJECTIVES: &[&str] = &[
     "pretty",
@@ -40,8 +39,9 @@ const ADJECTIVES: &[&str] = &[
     "fancy",
 ];
 
-const COLOURS: &[&str] =
-    &["red", "yellow", "blue", "green", "pink", "brown", "purple", "brown", "white", "black", "orange"];
+const COLOURS: &[&str] = &[
+    "red", "yellow", "blue", "green", "pink", "brown", "purple", "brown", "white", "black", "orange",
+];
 
 const NOUNS: &[&str] = &[
     "table", "chair", "house", "bbq", "desk", "car", "pony", "cookie", "sandwich", "burger", "pizza", "mouse",
@@ -98,7 +98,10 @@ impl State {
     pub fn remove_all_rows(&mut self) {
         let to_remove = self.element.borrow().children().to_vec();
         for child in to_remove {
-            self.element.borrow_mut().remove_child(child).expect("Failed to remove child!");
+            self.element
+                .borrow_mut()
+                .remove_child(child)
+                .expect("Failed to remove child!");
         }
     }
 
@@ -108,13 +111,18 @@ impl State {
             self.rows.swap(1, 998);
             let child_1 = self.element.borrow().children()[1].clone();
             let child_2 = self.element.borrow().children()[998].clone();
-            self.element.borrow_mut().swap_child(child_1, child_2).expect("Failed to swap children");
+            self.element
+                .borrow_mut()
+                .swap_child(child_1, child_2)
+                .expect("Failed to swap children");
         }
     }
 
     pub fn append_rows(&mut self) {
         // Collect all new rows that need to be appended
-        let new_rows: Vec<Rc<RefCell<dyn Element>>> = self.store.data
+        let new_rows: Vec<Rc<RefCell<dyn Element>>> = self
+            .store
+            .data
             .iter()
             .skip(self.rows.len())
             .map(|data| {
@@ -125,7 +133,12 @@ impl State {
 
         self.rows.extend(new_rows.iter().cloned());
 
-        self.element.borrow_mut().as_any_mut().downcast_mut::<Container>().unwrap().extend(new_rows);
+        self.element
+            .borrow_mut()
+            .as_any_mut()
+            .downcast_mut::<Container>()
+            .unwrap()
+            .extend(new_rows);
     }
 
     pub fn select(&mut self, row: Option<usize>) {
@@ -152,15 +165,14 @@ impl State {
         }
 
         let id_text = Text::new(&data.id.to_string());
-        id_text.borrow_mut()
+        id_text
+            .borrow_mut()
             .width(Unit::Px(60.0))
             .margin(Unit::Px(0.0), Unit::Px(12.0), Unit::Px(0.0), Unit::Px(0.0));
 
         let label_text = Text::new(&data.label);
 
-        row.borrow_mut()
-            .push(id_text)
-            .push(label_text);
+        row.borrow_mut().push(id_text).push(label_text);
 
         row
     }
@@ -313,7 +325,8 @@ fn build_body(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
     text.borrow_mut().font_size(32.0).color(Color::BLACK);
 
     let text_container = Container::new();
-    text_container.borrow_mut()
+    text_container
+        .borrow_mut()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Row)
         .width(Unit::Percentage(50.0))
@@ -321,9 +334,9 @@ fn build_body(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
         .align_items(Some(AlignItems::Center))
         .push(text);
 
-
     let header = Container::new();
-    header.borrow_mut()
+    header
+        .borrow_mut()
         .background_color(rgb(238, 238, 238))
         .display(Display::Flex)
         .flex_direction(FlexDirection::Row)
@@ -340,7 +353,8 @@ fn build_body(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
 
 fn build_data_list() -> Rc<RefCell<Container>> {
     let data_list = Container::new();
-    data_list.borrow_mut()
+    data_list
+        .borrow_mut()
         .flex_direction(FlexDirection::Column)
         .width(Unit::Percentage(100.0));
     data_list
@@ -348,7 +362,8 @@ fn build_data_list() -> Rc<RefCell<Container>> {
 
 fn build_buttons(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
     let buttons = Container::new();
-    buttons.borrow_mut()
+    buttons
+        .borrow_mut()
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::FlexEnd))
         .align_items(Some(AlignItems::Start))
diff --git a/examples/multiwindow/main.rs b/examples/multiwindow/main.rs
index 1963b80f..917631cd 100644
--- a/examples/multiwindow/main.rs
+++ b/examples/multiwindow/main.rs
@@ -1,13 +1,11 @@
-use craft_retained::elements::{Element, Window};
-use craft_retained::events::ui_events::pointer::PointerButton;
-use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Unit};
-use craft_retained::{
-    elements::{Container, Text},
-    rgb, Color,
-};
 use std::cell::RefCell;
 use std::rc::Rc;
 
+use craft_retained::elements::{Container, Element, Text, Window};
+use craft_retained::events::ui_events::pointer::PointerButton;
+use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Unit};
+use craft_retained::{Color, rgb};
+
 #[derive(Default, Clone, Copy)]
 pub struct Counter {
     count: i64,
@@ -47,7 +45,9 @@ fn create_button(
         .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {
             if pointer_button_event.button == Some(PointerButton::Primary) {
                 state.borrow_mut().change(delta);
-                count_text.borrow_mut().text(&format!("Count: {}", state.borrow().count()));
+                count_text
+                    .borrow_mut()
+                    .text(&format!("Count: {}", state.borrow().count()));
                 event.prevent_propagate();
             }
         }))
@@ -68,8 +68,20 @@ pub fn counter() -> Rc<RefCell<dyn Element>> {
         .display(Display::Flex)
         .flex_direction(FlexDirection::Row)
         .gap(Unit::Px(20.0), Unit::Px(20.0))
-        .push(create_button("-", rgb(244, 67, 54), -1, count.clone(), count_text.clone()))
-        .push(create_button("+", rgb(76, 175, 80), 1, count.clone(), count_text.clone()));
+        .push(create_button(
+            "-",
+            rgb(244, 67, 54),
+            -1,
+            count.clone(),
+            count_text.clone(),
+        ))
+        .push(create_button(
+            "+",
+            rgb(76, 175, 80),
+            1,
+            count.clone(),
+            count_text.clone(),
+        ));
 
     window
         .borrow_mut()
diff --git a/examples/pointer_events/main.rs b/examples/pointer_events/main.rs
index 586e3320..5d9b8d4f 100644
--- a/examples/pointer_events/main.rs
+++ b/examples/pointer_events/main.rs
@@ -1,18 +1,19 @@
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use craft_retained::Color;
 use craft_retained::elements::core::ElementData;
-use craft_retained::elements::{Element, Window};
-use craft_retained::events::ui_events::pointer::PointerId;
+use craft_retained::elements::{Container, Element, Text, Window};
 use craft_retained::events::Event;
+use craft_retained::events::ui_events::pointer::PointerId;
 use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Position, Unit};
-use craft_retained::{
-    elements::{Container, Text},
-    Color,
-};
-use std::cell::RefCell;
-use std::rc::Rc;
 
 fn title(txt: &str) -> Rc<RefCell<Text>> {
     let title = Text::new(txt);
-    title.borrow_mut().font_size(24.0).padding(Unit::Px(0.0), Unit::Px(0.0), Unit::Px(25.0), Unit::Px(0.0));
+    title
+        .borrow_mut()
+        .font_size(24.0)
+        .padding(Unit::Px(0.0), Unit::Px(0.0), Unit::Px(25.0), Unit::Px(0.0));
 
     title
 }
@@ -57,7 +58,10 @@ fn event_log() -> (Rc<RefCell<Container>>, Rc<dyn Fn(String)>) {
         .on_pointer_button_down(Rc::new(move |_e, _pb_event| {
             let to_remove = event_log_copy.borrow().children().to_vec();
             for child in to_remove {
-                event_log_copy.borrow_mut().remove_child(child).expect("Failed to remove child!");
+                event_log_copy
+                    .borrow_mut()
+                    .remove_child(child)
+                    .expect("Failed to remove child!");
             }
         }));
 
@@ -71,12 +75,16 @@ fn event_log() -> (Rc<RefCell<Container>>, Rc<dyn Fn(String)>) {
 fn pointer_capture_example() -> Rc<RefCell<Container>> {
     let container = Container::new();
     let container_padding = 20.0;
-    container.borrow_mut().display(Display::Flex).flex_direction(FlexDirection::Column).padding(
-        Unit::Px(container_padding),
-        Unit::Px(container_padding),
-        Unit::Px(container_padding),
-        Unit::Px(container_padding),
-    );
+    container
+        .borrow_mut()
+        .display(Display::Flex)
+        .flex_direction(FlexDirection::Column)
+        .padding(
+            Unit::Px(container_padding),
+            Unit::Px(container_padding),
+            Unit::Px(container_padding),
+            Unit::Px(container_padding),
+        );
 
     let draggable_text = Text::new("Draggable");
 
@@ -95,19 +103,24 @@ fn pointer_capture_example() -> Rc<RefCell<Container>> {
     let push_text_clone = push_text.clone();
 
     let draggable_text_clone = draggable_text.clone();
-    draggable_text.borrow_mut().on_pointer_moved(Rc::new(move |e, pointer_moved_event| {
-        let mouse_y = pointer_moved_event.current.logical_position().x as f32;
-        let half_size = draggable_text_clone.borrow_mut().computed_box_transformed().size.width / 2.0;
-        if draggable_text_clone.borrow_mut().has_pointer_capture(PointerId::new(1).unwrap()) {
-            draggable_text_clone.borrow_mut().position(Position::Relative).inset(
-                Unit::Px(0.0),
-                Unit::Px(0.0),
-                Unit::Px(0.0),
-                Unit::Px(mouse_y - half_size - container_padding),
-            );
-        }
-        e.prevent_defaults();
-    }));
+    draggable_text
+        .borrow_mut()
+        .on_pointer_moved(Rc::new(move |e, pointer_moved_event| {
+            let mouse_y = pointer_moved_event.current.logical_position().x as f32;
+            let half_size = draggable_text_clone.borrow_mut().computed_box_transformed().size.width / 2.0;
+            if draggable_text_clone
+                .borrow_mut()
+                .has_pointer_capture(PointerId::new(1).unwrap())
+            {
+                draggable_text_clone.borrow_mut().position(Position::Relative).inset(
+                    Unit::Px(0.0),
+                    Unit::Px(0.0),
+                    Unit::Px(0.0),
+                    Unit::Px(mouse_y - half_size - container_padding),
+                );
+            }
+            e.prevent_defaults();
+        }));
 
     draggable_text.borrow_mut().on_got_pointer_capture(Rc::new(move |_e| {
         push_text_clone("Got Pointer Capture".to_string());
@@ -127,12 +140,11 @@ fn pointer_capture_example() -> Rc<RefCell<Container>> {
 
 fn pointer_enter_leave_example() -> Rc<RefCell<Container>> {
     let container = Container::new();
-    container.borrow_mut().display(Display::Flex).flex_direction(FlexDirection::Column).padding(
-        Unit::Px(20.0),
-        Unit::Px(20.0),
-        Unit::Px(20.0),
-        Unit::Px(20.0),
-    );
+    container
+        .borrow_mut()
+        .display(Display::Flex)
+        .flex_direction(FlexDirection::Column)
+        .padding(Unit::Px(20.0), Unit::Px(20.0), Unit::Px(20.0), Unit::Px(20.0));
 
     let (event_log, push_text) = event_log();
 
@@ -184,8 +196,8 @@ fn main() {
     let pointer_capture_event_log = Text::new("");
     let pointer_capture_draggable_container = Text::new("Draggable");
 
-
-    window.borrow_mut()
+    window
+        .borrow_mut()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Column)
         .overflow(Overflow::Visible, Overflow::Scroll)
diff --git a/examples/text/main.rs b/examples/text/main.rs
index 014a816f..fb8f64ec 100644
--- a/examples/text/main.rs
+++ b/examples/text/main.rs
@@ -1,9 +1,6 @@
-use craft_retained::elements::{Element, TextInput, Window};
+use craft_retained::elements::{Container, Element, TextInput, Window};
+use craft_retained::rgb;
 use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Unit};
-use craft_retained::{
-    elements::Container,
-    rgb,
-};
 
 fn main() {
     let container = Container::new();
@@ -34,4 +31,4 @@ fn main() {
     use craft_retained::CraftOptions;
     util::setup_logging();
     craft_retained::craft_main(CraftOptions::basic("text"));
-}
\ No newline at end of file
+}
diff --git a/examples/util/src/lib.rs b/examples/util/src/lib.rs
index f44d6267..3dce0758 100644
--- a/examples/util/src/lib.rs
+++ b/examples/util/src/lib.rs
@@ -4,7 +4,9 @@ pub struct ExampleProps {
 
 impl Default for ExampleProps {
     fn default() -> Self {
-        ExampleProps { show_scrollbar: true }
+        ExampleProps {
+            show_scrollbar: true,
+        }
     }
 }
 
@@ -15,11 +17,11 @@ pub fn setup_logging() {
         std::panic::set_hook(Box::new(console_error_panic_hook::hook));
 
         use tracing::level_filters::LevelFilter;
+        use tracing_subscriber::Layer;
         use tracing_subscriber::fmt::format::Pretty;
         use tracing_subscriber::layer::SubscriberExt;
         use tracing_subscriber::util::SubscriberInitExt;
-        use tracing_subscriber::Layer;
-        use tracing_web::{performance_layer, MakeWebConsoleWriter};
+        use tracing_web::{MakeWebConsoleWriter, performance_layer};
 
         let fmt_layer = tracing_subscriber::fmt::layer()
             .with_ansi(true)
@@ -34,6 +36,9 @@ pub fn setup_logging() {
     #[cfg(not(target_arch = "wasm32"))]
     {
         use tracing_subscriber::fmt::format::FmtSpan;
-        tracing_subscriber::fmt().with_max_level(tracing::Level::INFO).with_span_events(FmtSpan::CLOSE).init();
+        tracing_subscriber::fmt()
+            .with_max_level(tracing::Level::INFO)
+            .with_span_events(FmtSpan::CLOSE)
+            .init();
     }
 }
diff --git a/rustfmt.toml b/rustfmt.toml
index 887cd1fa..2d878d1d 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -4,13 +4,9 @@ tab_spaces = 4
 newline_style = "Auto"
 indent_style = "Block"
 use_small_heuristics = "Default"
-fn_call_width = 200
 attr_fn_like_width = 70
 struct_lit_width = 18
 struct_variant_width = 35
-array_width = 200
-chain_width = 200
-single_line_if_else_max_width = 200
 wrap_comments = false
 format_code_in_doc_comments = false
 doc_comment_code_block_width = 100
@@ -25,13 +21,13 @@ empty_item_single_line = true
 struct_lit_single_line = true
 fn_single_line = false
 where_single_line = false
-imports_indent = "Block"
-imports_layout = "Mixed"
-imports_granularity = "Preserve"
-group_imports = "Preserve"
+imports_indent = "Visual"
+imports_layout = "Horizontal"
+imports_granularity = "Module"
+group_imports = "StdExternalCrate"
 reorder_imports = true
 reorder_modules = true
-reorder_impl_items = false
+reorder_impl_items = true
 type_punctuation_density = "Wide"
 space_before_colon = false
 space_after_colon = true
@@ -46,7 +42,7 @@ enum_discrim_align_threshold = 0
 match_arm_blocks = true
 match_arm_leading_pipes = "Never"
 force_multiline_blocks = false
-fn_args_layout = "Tall"
+fn_params_layout = "Tall"
 brace_style = "SameLineWhere"
 control_brace_style = "AlwaysSameLine"
 trailing_semicolon = true
@@ -55,7 +51,7 @@ match_block_trailing_comma = false
 blank_lines_upper_bound = 1
 blank_lines_lower_bound = 0
 edition = "2024"
-version = "One"
+style_edition = "2024"
 inline_attribute_width = 0
 format_generated_files = true
 merge_derives = true
@@ -64,13 +60,12 @@ use_field_init_shorthand = false
 force_explicit_abi = true
 condense_wildcard_suffixes = false
 color = "Auto"
-required_version = "1.5.1"
 unstable_features = false
 disable_all_formatting = false
 skip_children = false
-hide_parse_errors = false
+show_parse_errors = false
 error_on_line_overflow = false
 error_on_unformatted = false
 ignore = []
 emit_mode = "Files"
-make_backup = false
+make_backup = false
\ No newline at end of file

From 6b512346eed709f01a530582083d5212073769f8 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 3 Jan 2026 15:21:04 -0500
Subject: [PATCH 031/143] accessibility

---
 .../src/accessibility/access_handler.rs       |  13 +-
 crates/craft_retained/src/app.rs              | 103 +++-------
 .../craft_retained/src/craft_winit_state.rs   |  40 +---
 .../src/elements/core/element_internals.rs    |   4 +-
 crates/craft_retained/src/elements/text.rs    |   8 +-
 .../src/elements/text_input/mod.rs            |   4 +-
 .../elements/text_input/text_input_state.rs   |   4 +-
 crates/craft_retained/src/elements/window.rs  | 178 +++++++++++++++++-
 crates/craft_retained/src/lib.rs              |   5 +-
 crates/craft_retained/src/options.rs          |   1 +
 .../craft_retained/src/text/parley_editor.rs  |  18 +-
 crates/craft_retained/src/window_manager.rs   |  46 ++---
 examples/counter_retained/Cargo.toml          |   2 +-
 examples/multiwindow/Cargo.toml               |   2 +-
 examples/multiwindow/main.rs                  |   7 +-
 15 files changed, 253 insertions(+), 182 deletions(-)

diff --git a/crates/craft_retained/src/accessibility/access_handler.rs b/crates/craft_retained/src/accessibility/access_handler.rs
index 177c255e..4f8514f1 100644
--- a/crates/craft_retained/src/accessibility/access_handler.rs
+++ b/crates/craft_retained/src/accessibility/access_handler.rs
@@ -1,17 +1,6 @@
 use accesskit::{ActionHandler, ActionRequest};
-#[cfg(not(target_arch = "wasm32"))]
-use craft_runtime::CraftRuntimeHandle;
-use craft_runtime::Sender;
 
-use crate::events::internal::InternalMessage;
-
-pub(crate) struct CraftAccessHandler {
-    #[cfg(not(target_arch = "wasm32"))]
-    #[allow(dead_code)]
-    pub(crate) runtime_handle: CraftRuntimeHandle,
-    #[allow(dead_code)]
-    pub(crate) app_sender: Sender<InternalMessage>,
-}
+pub(crate) struct CraftAccessHandler {}
 
 impl ActionHandler for CraftAccessHandler {
     fn do_action(&mut self, _request: ActionRequest) {}
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 1812f40b..d770f95c 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -4,6 +4,8 @@ use std::ops::DerefMut;
 use std::rc::{Rc, Weak};
 use std::sync::Arc;
 
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+use accesskit::TreeUpdate;
 use craft_logging::info;
 use craft_primitives::geometry::{Point, Size};
 use craft_resource_manager::resource_event::ResourceEvent;
@@ -20,11 +22,8 @@ use web_time as time;
 use winit::event::Ime;
 use winit::event_loop::ActiveEventLoop;
 use winit::window::WindowId;
-#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-use {crate::accessibility::access_handler::CraftAccessHandler, crate::accessibility::activation_handler::CraftActivationHandler, crate::accessibility::deactivation_handler::CraftDeactivationHandler};
-#[cfg(feature = "accesskit")]
-use {accesskit::{Role, TreeUpdate}, accesskit_winit::Adapter};
 
+use crate::CraftOptions;
 use crate::animations::animation::AnimationFlags;
 use crate::document::DocumentManager;
 use crate::elements::core::ElementInternals;
@@ -81,8 +80,6 @@ pub struct App {
     pub(crate) resource_manager: Arc<ResourceManager>,
 
     pub(crate) app_sender: Sender<InternalMessage>,
-    #[cfg(feature = "accesskit")]
-    pub(crate) accesskit_adapter: Option<Adapter>,
     #[allow(dead_code)]
     pub(crate) runtime: CraftRuntimeHandle,
     pub(crate) modifiers: Modifiers,
@@ -92,8 +89,10 @@ pub struct App {
 
     pub(crate) previous_animation_flags: AnimationFlags,
 
-    #[allow(dead_code)]
-    pub(crate) focus: Option<Weak<RefCell<dyn Element>>>,
+    pub(crate) craft_options: CraftOptions,
+
+    /// True if the winit app is active.
+    pub(crate) active: bool,
 }
 
 #[derive(Debug)]
@@ -123,41 +122,23 @@ impl App {
         style_root_element(self.root.borrow_mut().deref_mut(), self.window_context.window_size());*/
     }
 
-    #[allow(unused_variables)]
     pub fn on_resume(&mut self, event_loop: &ActiveEventLoop) {
-        //window.set_ime_allowed(true);
-
+        self.active = true;
         self.setup_text_context();
 
-        #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-        let action_handler = CraftAccessHandler {
-            runtime_handle: self.runtime.clone(),
-            app_sender: self.app_sender.clone(),
-        };
-        #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-        let deactivation_handler = CraftDeactivationHandler::new();
-
-        /*let scale_factor = window.scale_factor();
-
-        self.window = Some(window.clone());
-        self.window_context.scale_factor = scale_factor;
-        self.on_resize(window.inner_size());
-        let tree_update = self.on_request_redraw();*/
-
-        /*#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-        let craft_activation_handler = CraftActivationHandler::new(tree_update);*/
-
-        //#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-        //{
-        //    self.accesskit_adapter = Some(Adapter::with_direct_handlers(
-        //        event_loop,
-        //        &window,
-        //        craft_activation_handler,
-        //        #[cfg(feature = "accesskit")]
-        //        action_handler,
-        //        deactivation_handler,
-        //    ));
-        //}
+        WINDOW_MANAGER.with_borrow_mut(|window_manager| {
+            window_manager.on_resume(self, event_loop);
+        });
+    }
+
+    pub fn on_about_to_wait(&mut self, event_loop: &ActiveEventLoop) {
+        WINDOW_MANAGER.with_borrow_mut(|window_manager| {
+            window_manager.on_about_to_wait(self, event_loop);
+        });
+    }
+
+    pub fn on_suspended(&mut self, _event_loop: &ActiveEventLoop) {
+        self.active = false;
     }
 
     /// Handles the window resize event.
@@ -203,29 +184,26 @@ impl App {
     }
 
     /// Updates the reactive tree, layouts the elements, and draws the view.
-    #[cfg(feature = "accesskit")]
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     pub fn on_request_redraw(&mut self, window: Rc<RefCell<Window>>) -> Option<TreeUpdate> {
         self.on_request_redraw_internal(window.clone());
-        let winit_window = window.borrow().winit_window().as_mut().unwrap().clone();
 
-        let tree_update = self.compute_accessibility_tree();
-        if let Some(accesskit_adapter) = &mut self.accesskit_adapter {
+        let tree_update = window.borrow_mut().compute_accessibility_tree_window();
+        if let Some(accesskit_adapter) = &mut window.borrow_mut().accesskit_adapter {
             accesskit_adapter.update_if_active(|| tree_update);
-            winit_window.pre_present_notify();
             None
         } else {
-            winit_window.pre_present_notify();
             Some(tree_update)
         }
     }
 
     /// Updates the reactive tree, layouts the elements, and draws the view.
-    #[cfg(not(feature = "accesskit"))]
+    #[cfg(any(not(feature = "accesskit"), target_arch = "wasm32"))]
     pub fn on_request_redraw(&mut self, window: Rc<RefCell<Window>>) {
         self.on_request_redraw_internal(window);
     }
 
-    //#[cfg(not(feature = "accesskit"))]
+    pub fn on_move(&mut self, _window: Rc<RefCell<Window>>) {}
 
     fn on_request_redraw_internal(&mut self, window: Rc<RefCell<Window>>) {
         self.update_resources();
@@ -414,35 +392,6 @@ impl App {
         }
     }*/
 
-    #[cfg(feature = "accesskit")]
-    fn compute_accessibility_tree(&mut self) -> TreeUpdate {
-        let tree = accesskit::Tree {
-            root: accesskit::NodeId(0),
-            toolkit_name: Some("Craft".to_string()),
-            toolkit_version: None,
-        };
-
-        let focus_id = self
-            .focus
-            .clone()
-            .map(|node| node.upgrade().unwrap().borrow().id())
-            .unwrap_or(0);
-        let mut tree_update = TreeUpdate {
-            nodes: vec![],
-            tree: Some(tree),
-            focus: accesskit::NodeId(focus_id),
-        };
-
-        /*self.root.borrow_mut().compute_accessibility_tree(
-            &mut tree_update,
-            None,
-            self.window_context.effective_scale_factor(),
-        );*/
-        tree_update.nodes[0].1.set_role(Role::Window);
-
-        tree_update
-    }
-
     fn update_resources(&mut self) {
         PENDING_RESOURCES.with_borrow_mut(|pending_resources| {
             IN_PROGRESS_RESOURCES.with_borrow_mut(|in_progress| {
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index 6d368a74..459f89aa 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -59,36 +59,11 @@ impl ApplicationHandler for CraftWinitState {
     }
 
     fn resumed(&mut self, event_loop: &ActiveEventLoop) {
-        let craft_state = &mut self.craft_state;
-
-        /*        let mut window_attributes =
-            WindowAttributes::default().with_title(craft_state.craft_options.window_title.as_str()).with_visible(false);
-
-        if let Some(window_size) = &craft_state.craft_options.window_size {
-            window_attributes =
-                window_attributes.with_inner_size(LogicalSize::new(window_size.width, window_size.height));
-        }*/
-
-        WINDOW_MANAGER.with_borrow_mut(|window_manager| {
-            window_manager.on_resume(craft_state, event_loop);
-        });
-
-        craft_state.craft_app.on_resume(event_loop);
-
-        /*#[cfg(target_arch = "wasm32")]
-        let window_attributes = {
-            let canvas = web_sys::window()
-                .unwrap()
-                .document()
-                .unwrap()
-                .get_element_by_id("canvas")
-                .unwrap()
-                .dyn_into::<web_sys::HtmlCanvasElement>()
-                .unwrap();
+        self.craft_state.craft_app.on_resume(event_loop);
+    }
 
-            window_attributes.with_canvas(Some(canvas))
-        };*/
-        //craft_state.event_reducer.set_scale_factor(&window);
+    fn suspended(&mut self, event_loop: &ActiveEventLoop) {
+        self.craft_state.craft_app.on_suspended(event_loop);
     }
 
     fn window_event(&mut self, event_loop: &ActiveEventLoop, window_id: WindowId, event: WindowEvent) {
@@ -107,7 +82,7 @@ impl ApplicationHandler for CraftWinitState {
             }
         });
 
-        /*#[cfg(feature = "accesskit")]
+        /*#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
         if let Some(accesskit_adapter) = &mut craft_state.craft_app.accesskit_adapter {
             accesskit_adapter.process_event(craft_state.craft_app.window.as_ref().unwrap(), &event);
         }*/
@@ -184,6 +159,9 @@ impl ApplicationHandler for CraftWinitState {
             WindowEvent::RedrawRequested => {
                 craft_state.craft_app.on_request_redraw(window);
             }
+            WindowEvent::Moved(_) => {
+                craft_state.craft_app.on_move(window);
+            }
             _ => (),
         }
     }
@@ -230,6 +208,8 @@ impl ApplicationHandler for CraftWinitState {
             }
         }
 
+        craft_state.craft_app.on_about_to_wait(event_loop);
+
         if craft_state.close_requested {
             info!("Exiting winit event loop");
 
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index d92180d4..a5d0d1f0 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -2,7 +2,7 @@ use std::cell::RefCell;
 use std::rc::Rc;
 use std::time::Duration;
 
-#[cfg(feature = "accesskit")]
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::{Action, Role};
 use craft_primitives::geometry::borders::CssRoundedRect;
 use craft_primitives::geometry::{ElementBox, Rectangle};
@@ -132,7 +132,7 @@ pub trait ElementInternals: ElementData {
     }
 
     /// Computes a [`TreeUpdate`] reflecting any accessibility changes.
-    #[cfg(feature = "accesskit")]
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     fn compute_accessibility_tree(
         &mut self,
         tree: &mut accesskit::TreeUpdate,
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index fb8aa69e..69995206 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -5,7 +5,7 @@ use std::rc::{Rc, Weak};
 use craft_primitives::Color;
 use craft_primitives::geometry::{Point, Rectangle};
 use craft_renderer::renderer::RenderList;
-#[cfg(feature = "accesskit")]
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use parley::LayoutAccessibility;
 use parley::{Alignment, AlignmentOptions, ContentWidths, Selection};
 
@@ -22,7 +22,7 @@ const MAX_CACHE_SIZE: usize = 16;
 #[cfg(not(target_arch = "wasm32"))]
 use std::time;
 
-#[cfg(feature = "accesskit")]
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::{Action, Role};
 use craft_primitives::ColorBrush;
 use craft_renderer::text_renderer_data::TextData;
@@ -38,7 +38,7 @@ use winit::dpi;
 
 use crate::elements::Element;
 use crate::elements::core::ElementInternals;
-#[cfg(feature = "accesskit")]
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::elements::element_id::create_unique_element_id;
 use crate::layout::TaffyTree;
 
@@ -234,7 +234,7 @@ impl ElementInternals for Text {
         renderer.draw_text(self.me.clone(), content_rectangle.scale(scale_factor), None, false);
     }
 
-    #[cfg(feature = "accesskit")]
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     fn compute_accessibility_tree(
         &mut self,
         tree: &mut accesskit::TreeUpdate,
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 525a8394..e2f7c199 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -18,7 +18,7 @@ use crate::app::ELEMENTS;
 use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
 use crate::elements::element::Element;
 use crate::elements::element_data::ElementData;
-#[cfg(feature = "accesskit")]
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::elements::element_id::create_unique_element_id;
 use crate::elements::scrollable;
 use crate::elements::text_input::text_input_state::TextInputState;
@@ -208,7 +208,7 @@ impl ElementInternals for TextInput {
         self.draw_scrollbar(renderer, scale_factor);
     }
 
-    #[cfg(feature = "accesskit")]
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     fn compute_accessibility_tree(
         &mut self,
         tree: &mut accesskit::TreeUpdate,
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index eed5809a..11e06e65 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 #[cfg(not(target_arch = "wasm32"))]
 use std::time::{Duration, Instant};
 
-#[cfg(feature = "accesskit")]
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::{Node, TreeUpdate};
 use craft_primitives::geometry::{Point, Rectangle};
 use craft_renderer::text_renderer_data::TextRender;
@@ -621,7 +621,7 @@ impl TextInputState {
         }
     }
 
-    #[cfg(feature = "accesskit")]
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     pub fn try_accessibility(
         &mut self,
         tree: &mut TreeUpdate,
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index b86cd7ab..fe8b0b9e 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -6,16 +6,24 @@ use std::ops::DerefMut;
 use std::rc::{Rc, Weak};
 use std::sync::Arc;
 
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+use accesskit::TreeUpdate;
 use craft_primitives::geometry::{Rectangle, Size};
 use craft_renderer::RenderList;
+use craft_renderer::renderer::Renderer;
 use craft_resource_manager::ResourceManager;
 use kurbo::{Affine, Point};
 use peniko::Color;
 use taffy::{AvailableSpace, NodeId};
-use winit::window::Window as WinitWindow;
+use winit::event_loop::ActiveEventLoop;
+use winit::window::{Window as WinitWindow, WindowAttributes};
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+use {accesskit::{Action, Role}, accesskit_winit::Adapter};
 
 use crate::RendererBox;
-use crate::app::{TAFFY_TREE, WINDOW_MANAGER};
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+use crate::accessibility::{access_handler::CraftAccessHandler, activation_handler::CraftActivationHandler, deactivation_handler::CraftDeactivationHandler};
+use crate::app::{App, FOCUS, TAFFY_TREE, WINDOW_MANAGER};
 use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
 use crate::elements::element_data::ElementData;
 use crate::elements::{Element, scrollable};
@@ -28,7 +36,6 @@ use crate::text::text_context::TextContext;
 /// If overflow is set to scroll, it will become scrollable.
 pub struct Window {
     element_data: ElementData,
-    pub(crate) winit_window: Option<Arc<WinitWindow>>,
     /// The physical window size from winit.
     pub(crate) window_size: Size<f32>,
     /// The window's scale factor from winit.
@@ -38,6 +45,13 @@ pub struct Window {
     mouse_positon: Option<Point>,
     pub(crate) renderer: Option<RendererBox>,
     pub(crate) render_list: Rc<RefCell<RenderList>>,
+
+    // Will be empty when paused.
+    pub(crate) winit_window: Option<Arc<WinitWindow>>,
+
+    // Will be empty when paused.
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+    pub(crate) accesskit_adapter: Option<Adapter>,
 }
 
 impl Window {
@@ -45,13 +59,15 @@ impl Window {
         let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
             RefCell::new(Self {
                 element_data: ElementData::new(me.clone(), true),
-                winit_window: None,
                 window_size: Default::default(),
                 scale_factor: 1.0,
                 zoom_scale_factor: 1.0,
                 mouse_positon: None,
                 renderer: None,
                 render_list: Rc::new(RefCell::new(RenderList::new())),
+                winit_window: None,
+                #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+                accesskit_adapter: None,
             })
         });
 
@@ -102,6 +118,9 @@ impl Window {
     }
 
     pub(crate) fn on_resize(&mut self, new_size: Size<f32>) {
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            taffy_tree.mark_dirty(self.element_data.layout_item.taffy_node_id.unwrap());
+        });
         if let Some(renderer) = self.renderer.as_mut() {
             renderer.resize_surface(new_size.width.max(1.0), new_size.height.max(1.0));
         }
@@ -212,6 +231,112 @@ impl Window {
 
         self.renderer.as_mut().unwrap().submit(resource_manager.clone());
     }
+
+    pub(crate) fn create(&mut self, craft_app: &mut App, event_loop: &ActiveEventLoop) {
+        let winit_window = Arc::new(
+            event_loop
+                .create_window(WindowAttributes::default().with_visible(false))
+                .expect("Failed to create window"),
+        );
+        self.set_winit_window(winit_window.clone());
+
+        let renderer_type = craft_app.craft_options.renderer;
+
+        cfg_if::cfg_if! {
+            if #[cfg(not(target_arch = "wasm32"))] {
+                    let renderer = craft_app.runtime.borrow_tokio_runtime().block_on(async {
+                        let renderer: Box<dyn Renderer> = renderer_type.create(winit_window.clone()).await;
+                    renderer
+                });
+                self.renderer = Some(renderer);
+            } else {
+                let app_sender = craft_state.app_sender.clone();
+                let window_copy_2 = window_copy.clone();
+                craft_state.runtime.spawn(async move {
+                    let renderer: Box<dyn Renderer> = renderer_type.create(window_copy).await;
+                    app_sender
+                        .send(InternalMessage::RendererCreated(window_copy_2, renderer))
+                        .await
+                        .expect("Failed to send RendererCreated message");
+                });
+            }
+        }
+
+        #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+        {
+            let action_handler = CraftAccessHandler {};
+            let deactivation_handler = CraftDeactivationHandler::new();
+
+            let tree_update = self.on_request_redraw(craft_app);
+
+            let craft_activation_handler = CraftActivationHandler::new(tree_update);
+            self.accesskit_adapter = Some(Adapter::with_direct_handlers(
+                event_loop,
+                &winit_window,
+                craft_activation_handler,
+                action_handler,
+                deactivation_handler,
+            ));
+        }
+
+        winit_window.set_visible(true);
+    }
+
+    /// Updates the reactive tree, layouts the elements, and draws the view.
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+    pub fn on_request_redraw(&mut self, craft_app: &mut App) -> Option<TreeUpdate> {
+        self.on_redraw(
+            craft_app.text_context.as_mut().unwrap(),
+            craft_app.resource_manager.clone(),
+        );
+
+        let tree_update = self.compute_accessibility_tree_window();
+        if let Some(accesskit_adapter) = &mut self.accesskit_adapter {
+            accesskit_adapter.update_if_active(|| tree_update);
+            None
+        } else {
+            Some(tree_update)
+        }
+    }
+
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+    pub(crate) fn compute_accessibility_tree_window(&mut self) -> TreeUpdate {
+        let window_accesskit_id = self.element_data.internal_id;
+        let tree = accesskit::Tree {
+            root: accesskit::NodeId(window_accesskit_id),
+            toolkit_name: Some("Craft".to_string()),
+            toolkit_version: None,
+        };
+
+        let focus_id = FOCUS.with_borrow_mut(|focus| {
+            if let Some(focus) = focus {
+                if let Some(focus) = focus.upgrade() {
+                    return focus.borrow().element_data().internal_id;
+                }
+            }
+            window_accesskit_id
+        });
+
+        let mut tree_update = TreeUpdate {
+            nodes: vec![],
+            tree: Some(tree),
+            focus: accesskit::NodeId(focus_id),
+        };
+
+        let scale_factor = self.winit_window.as_mut().unwrap().scale_factor();
+        self.compute_accessibility_tree(&mut tree_update, None, scale_factor);
+
+        tree_update
+    }
+
+    /// Updates the reactive tree, layouts the elements, and draws the view.
+    #[cfg(any(not(feature = "accesskit"), target_arch = "wasm32"))]
+    pub fn on_request_redraw(&mut self, craft_app: &mut App) {
+        self.on_redraw(
+            craft_app.text_context.as_mut().unwrap(),
+            craft_app.resource_manager.clone(),
+        );
+    }
 }
 
 impl crate::elements::core::ElementData for Window {
@@ -371,6 +496,51 @@ impl ElementInternals for Window {
         self.draw_scrollbar(renderer, scale_factor);
     }
 
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+    fn compute_accessibility_tree(
+        &mut self,
+        tree: &mut accesskit::TreeUpdate,
+        parent_index: Option<usize>,
+        scale_factor: f64,
+    ) {
+        let current_node_id = accesskit::NodeId(self.element_data.internal_id);
+
+        let mut current_node = accesskit::Node::new(Role::Window);
+        if !self.element_data.on_pointer_button_up.is_empty() {
+            current_node.set_role(Role::Button);
+            current_node.add_action(Action::Click);
+        }
+
+        let padding_box = self
+            .element_data
+            .layout_item
+            .computed_box_transformed
+            .padding_rectangle()
+            .scale(scale_factor);
+
+        current_node.set_bounds(accesskit::Rect {
+            x0: padding_box.left() as f64,
+            y0: padding_box.top() as f64,
+            x1: padding_box.right() as f64,
+            y1: padding_box.bottom() as f64,
+        });
+
+        let current_index = tree.nodes.len(); // The current node is the last one added.
+
+        if let Some(parent_index) = parent_index {
+            let parent_node = tree.nodes.get_mut(parent_index).unwrap();
+            parent_node.1.push_child(current_node_id);
+        }
+
+        tree.nodes.push((current_node_id, current_node));
+
+        for child in self.element_data.children.iter_mut() {
+            child
+                .borrow_mut()
+                .compute_accessibility_tree(tree, Some(current_index), scale_factor);
+        }
+    }
+
     fn on_event(
         &mut self,
         message: &CraftMessage,
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 9b6d9ffe..2350bdd2 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -172,8 +172,6 @@ pub fn setup_craft(craft_options: Option<CraftOptions>) -> CraftState {
     let craft_app = Box::new(App {
         event_dispatcher: EventDispatcher::new(),
         app_sender: app_sender.clone(),
-        #[cfg(feature = "accesskit")]
-        accesskit_adapter: None,
         text_context: None,
         resource_manager,
         reload_fonts: false,
@@ -184,7 +182,8 @@ pub fn setup_craft(craft_options: Option<CraftOptions>) -> CraftState {
         target_scratch: Vec::new(),
 
         previous_animation_flags: Default::default(),
-        focus: None,
+        craft_options: craft_options.clone(),
+        active: false,
     });
 
     CraftState::new(runtime, winit_receiver, app_sender, craft_options, craft_app)
diff --git a/crates/craft_retained/src/options.rs b/crates/craft_retained/src/options.rs
index b06afd98..d83dda66 100644
--- a/crates/craft_retained/src/options.rs
+++ b/crates/craft_retained/src/options.rs
@@ -6,6 +6,7 @@ use craft_renderer::RendererType;
 /// This struct holds various options that can be used to customize the behavior
 /// of the application. In particular, it configures which renderer to use and
 /// sets the default window title.
+#[derive(Clone)]
 pub struct CraftOptions {
     /// The type of renderer to use.
     ///
diff --git a/crates/craft_retained/src/text/parley_editor.rs b/crates/craft_retained/src/text/parley_editor.rs
index cc51514e..7acb0244 100644
--- a/crates/craft_retained/src/text/parley_editor.rs
+++ b/crates/craft_retained/src/text/parley_editor.rs
@@ -12,10 +12,10 @@ use core::fmt::{Debug, Display};
 use core::num::NonZeroUsize;
 use core::ops::Range;
 
-#[cfg(feature = "accesskit")]
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::{Node, NodeId, TreeUpdate};
 use craft_primitives::ColorBrush;
-#[cfg(feature = "accesskit")]
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use parley::layout::LayoutAccessibility;
 
 use crate::app::request_layout;
@@ -100,7 +100,7 @@ pub struct PlainEditor {
     buffer: String,
     default_style: StyleSet<ColorBrush>,
     pub(crate) ranged_styles: RangedStyles,
-    #[cfg(feature = "accesskit")]
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     layout_access: LayoutAccessibility,
     selection: Selection,
     /// Byte offsets of IME composing preedit text in the text buffer.
@@ -132,7 +132,7 @@ impl Default for PlainEditor {
             buffer: "".to_string(),
             default_style: StyleSet::new(1.0),
             ranged_styles: Default::default(),
-            #[cfg(feature = "accesskit")]
+            #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
             layout_access: Default::default(),
             selection: Default::default(),
             compose: None,
@@ -154,7 +154,7 @@ impl PlainEditor {
             default_style: StyleSet::new(font_size),
             buffer: Default::default(),
             layout: Default::default(),
-            #[cfg(feature = "accesskit")]
+            #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
             layout_access: Default::default(),
             selection: Default::default(),
             compose: None,
@@ -646,7 +646,7 @@ impl PlainEditorDriver<'_> {
         }
     }
 
-    #[cfg(feature = "accesskit")]
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     /// Select inside the editor based on the selection provided by accesskit.
     #[allow(dead_code)]
     pub fn select_from_accesskit(&mut self, selection: &accesskit::TextSelection) {
@@ -659,7 +659,7 @@ impl PlainEditorDriver<'_> {
     }
 
     // --- MARK: Rendering ---
-    #[cfg(feature = "accesskit")]
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     /// Perform an accessibility update.
     #[allow(dead_code)]
     pub fn accessibility(
@@ -948,7 +948,7 @@ impl PlainEditor {
         if self.layout_dirty { None } else { Some(&self.layout) }
     }
 
-    #[cfg(feature = "accesskit")]
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     #[inline]
     /// Perform an accessibility update if the layout is valid.
     ///
@@ -1078,7 +1078,7 @@ impl PlainEditor {
         self.generation.nudge();
     }
 
-    #[cfg(feature = "accesskit")]
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     /// Perform an accessibility update, assuming that the layout is valid.
     ///
     /// The wrapper [`accessibility`](PlainEditorDriver::accessibility) on the driver type should
diff --git a/crates/craft_retained/src/window_manager.rs b/crates/craft_retained/src/window_manager.rs
index 48c54d6b..26f28cd0 100644
--- a/crates/craft_retained/src/window_manager.rs
+++ b/crates/craft_retained/src/window_manager.rs
@@ -1,12 +1,10 @@
 use std::cell::RefCell;
 use std::rc::Rc;
-use std::sync::Arc;
 
-use craft_renderer::renderer::Renderer;
 use winit::event_loop::ActiveEventLoop;
-use winit::window::{WindowAttributes, WindowId};
+use winit::window::WindowId;
 
-use crate::craft_winit_state::CraftState;
+use crate::app::App;
 use crate::elements::Window;
 
 pub(crate) struct WindowManager {
@@ -35,37 +33,21 @@ impl WindowManager {
         None
     }
 
-    pub(crate) fn on_resume(&mut self, craft_state: &mut CraftState, event_loop: &ActiveEventLoop) {
+    pub(crate) fn on_resume(&mut self, craft_app: &mut App, event_loop: &ActiveEventLoop) {
         for window_element in &self.windows {
-            println!("Creating window");
-            let winit_window = Arc::new(
-                event_loop
-                    .create_window(WindowAttributes::default())
-                    .expect("Failed to create window"),
-            );
-            winit_window.set_visible(true);
-            window_element.borrow_mut().set_winit_window(winit_window.clone());
+            window_element.borrow_mut().create(craft_app, event_loop);
+        }
+    }
 
-            let renderer_type = craft_state.craft_options.renderer;
+    pub(crate) fn on_about_to_wait(&mut self, craft_app: &mut App, event_loop: &ActiveEventLoop) {
+        if !craft_app.active {
+            return;
+        }
 
-            cfg_if::cfg_if! {
-                if #[cfg(not(target_arch = "wasm32"))] {
-                        let renderer = craft_state.runtime.borrow_tokio_runtime().block_on(async {
-                            let renderer: Box<dyn Renderer> = renderer_type.create(winit_window.clone()).await;
-                        renderer
-                    });
-                    window_element.borrow_mut().renderer = Some(renderer);
-                } else {
-                    let app_sender = craft_state.app_sender.clone();
-                    let window_copy_2 = window_copy.clone();
-                    craft_state.runtime.spawn(async move {
-                        let renderer: Box<dyn Renderer> = renderer_type.create(window_copy).await;
-                        app_sender
-                            .send(InternalMessage::RendererCreated(window_copy_2, renderer))
-                            .await
-                            .expect("Failed to send RendererCreated message");
-                    });
-                }
+        // Create windows that were created during the program run.
+        for window_element in &self.windows {
+            if window_element.borrow().winit_window.is_none() {
+                window_element.borrow_mut().create(craft_app, event_loop);
             }
         }
     }
diff --git a/examples/counter_retained/Cargo.toml b/examples/counter_retained/Cargo.toml
index a523a33e..3e443dff 100644
--- a/examples/counter_retained/Cargo.toml
+++ b/examples/counter_retained/Cargo.toml
@@ -19,7 +19,7 @@ util = { path = "../util" }
 [dependencies.craft_retained]
 path = "../../crates/craft_retained"
 default-features = false
-features = ["system_fonts"]
+features = ["accesskit", "system_fonts"]
 
 [target.'cfg(not(target_os = "android"))'.dependencies.craft_renderer]
 path = "../../crates/craft_renderer"
diff --git a/examples/multiwindow/Cargo.toml b/examples/multiwindow/Cargo.toml
index f30e0afa..07924ed6 100644
--- a/examples/multiwindow/Cargo.toml
+++ b/examples/multiwindow/Cargo.toml
@@ -14,7 +14,7 @@ util = { path = "../util" }
 [dependencies.craft_retained]
 path = "../../crates/craft_retained"
 default-features = false
-features = ["system_fonts"]
+features = ["accesskit", "system_fonts"]
 
 [dependencies.craft_renderer]
 path = "../../crates/craft_renderer"
diff --git a/examples/multiwindow/main.rs b/examples/multiwindow/main.rs
index 917631cd..1ad86239 100644
--- a/examples/multiwindow/main.rs
+++ b/examples/multiwindow/main.rs
@@ -14,6 +14,10 @@ pub struct Counter {
 impl Counter {
     fn change(&mut self, delta: i64) {
         self.count += delta;
+
+        if self.count >= 10 {
+            counter();
+        }
     }
 
     fn count(&self) -> i64 {
@@ -105,9 +109,6 @@ pub fn counter() -> Rc<RefCell<dyn Element>> {
 
 fn main() {
     let _counter1 = counter();
-    let _counter2 = counter();
-
-    //let window_2 = Window::new();
 
     use craft_retained::CraftOptions;
     util::setup_logging();

From 7c157893ecd584251acdccc1988adfc7b79e03b1 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 3 Jan 2026 20:25:02 -0500
Subject: [PATCH 032/143] Fix unused import

---
 crates/craft_retained/src/elements/window.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index fe8b0b9e..4783d7ae 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -23,7 +23,9 @@ use {accesskit::{Action, Role}, accesskit_winit::Adapter};
 use crate::RendererBox;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::accessibility::{access_handler::CraftAccessHandler, activation_handler::CraftActivationHandler, deactivation_handler::CraftDeactivationHandler};
-use crate::app::{App, FOCUS, TAFFY_TREE, WINDOW_MANAGER};
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+use crate::app::FOCUS;
+use crate::app::{App, TAFFY_TREE, WINDOW_MANAGER};
 use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
 use crate::elements::element_data::ElementData;
 use crate::elements::{Element, scrollable};

From 11a7d5e2d29d1b56e83e9106e36a930639b948a5 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 3 Jan 2026 22:52:29 -0500
Subject: [PATCH 033/143] Add readme

---
 README.md                                     | 88 +++++++++++++++++++
 crates/craft_retained/src/elements/element.rs |  5 ++
 2 files changed, 93 insertions(+)

diff --git a/README.md b/README.md
index 4e087b7b..1b90b977 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,91 @@
 # 📜 Craft
 [![License: Unlicense](https://img.shields.io/badge/license-Unlicense-blue.svg)](./LICENSE)
 [![Discord](https://img.shields.io/discord/1382383100562243746?logo=discord&logoColor=%23ffffff&labelColor=%236A7EC2&color=%237389D8)](https://discord.gg/Atb8nuAub2)
+
+Craft is a library for creating desktops user interfaces. craft_retained provides platform independent widgets.
+
+
+## Example
+
+```rust
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use craft_retained::CraftOptions;
+use craft_retained::elements::{Container, Element, Text, Window};
+use craft_retained::events::ui_events::pointer::PointerButton;
+use craft_retained::style::{AlignItems, FlexDirection, JustifyContent, Unit};
+use craft_retained::{Color, rgb};
+
+fn create_button(
+    label: &str,
+    base_color: Color,
+    delta: i64,
+    state: Rc<RefCell<i64>>,
+    count_text: Rc<RefCell<Text>>,
+) -> Rc<RefCell<dyn Element>> {
+    let border_color = rgb(0, 0, 0);
+    Container::new()
+        .borrow_mut()
+        .border_width(Unit::Px(1.0), Unit::Px(2.0), Unit::Px(3.0), Unit::Px(4.0))
+        .border_color(border_color, border_color, border_color, border_color)
+        .border_radius((10.0, 10.0), (10.0, 10.0), (10.0, 10.0), (10.0, 10.0))
+        .padding(Unit::Px(15.0), Unit::Px(30.0), Unit::Px(15.0), Unit::Px(30.0))
+        .justify_content(Some(JustifyContent::Center))
+        .background_color(base_color)
+        .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {
+            if pointer_button_event.button == Some(PointerButton::Primary) {
+                *state.borrow_mut() += delta;
+                count_text.borrow_mut().text(&format!("Count: {}", state.borrow()));
+                event.prevent_propagate();
+            }
+        }))
+        .push({
+            Text::new(label)
+                .borrow_mut()
+                .font_size(24.0)
+                .color(Color::WHITE)
+                .selectable(false)
+                .to_rc()
+        })
+        .to_rc()
+}
+
+fn main() {
+    let count = Rc::new(RefCell::new(0));
+    let count_text = Text::new(&format!("Count: {}", count.borrow()));
+
+    Window::new()
+        .borrow_mut()
+        .flex_direction(FlexDirection::Column)
+        .justify_content(Some(JustifyContent::Center))
+        .align_items(Some(AlignItems::Center))
+        .width(Unit::Percentage(100.0))
+        .height(Unit::Percentage(100.0))
+        .gap(Unit::Px(20.0), Unit::Px(20.0))
+        .push(count_text.clone())
+        .push({
+            Container::new()
+                .borrow_mut()
+                .gap(Unit::Px(20.0), Unit::Px(20.0))
+                .push(create_button(
+                    "-",
+                    rgb(244, 67, 54),
+                    -1,
+                    count.clone(),
+                    count_text.clone(),
+                ))
+                .push(create_button(
+                    "+",
+                    rgb(76, 175, 80),
+                    1,
+                    count.clone(),
+                    count_text.clone(),
+                ))
+                .to_rc()
+        });
+
+    craft_retained::craft_main(CraftOptions::basic("Counter"));
+}
+
+```
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index f206e2b1..77e9e7c3 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -855,4 +855,9 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
             });
         }
     }
+
+    /// Re-
+    fn to_rc(&self) -> Rc<RefCell<dyn Element>> {
+        self.element_data().me.upgrade().unwrap()
+    }
 }

From c277316e662ea91c1a5f87d656e4b9ad27eacc85 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 3 Jan 2026 22:57:46 -0500
Subject: [PATCH 034/143] Remove window_context.rs

---
 crates/craft_retained/src/lib.rs            |   1 -
 crates/craft_retained/src/window_context.rs | 139 --------------------
 2 files changed, 140 deletions(-)
 delete mode 100644 crates/craft_retained/src/window_context.rs

diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 2350bdd2..ef27fde5 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -19,7 +19,6 @@ pub mod spatial;
 mod utils;
 #[cfg(target_arch = "wasm32")]
 pub mod wasm_queue;
-mod window_context;
 mod window_manager;
 
 use std::future::Future;
diff --git a/crates/craft_retained/src/window_context.rs b/crates/craft_retained/src/window_context.rs
deleted file mode 100644
index a9592b22..00000000
--- a/crates/craft_retained/src/window_context.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-/*use kurbo::Point;
-use winit::dpi::{LogicalPosition, LogicalSize, PhysicalSize};
-use winit::window::{Cursor, Window};
-
-#[derive(Debug, Clone)]
-/// User-level API to get and set common window properties.
-/// All values are in logical pixels.
-pub struct WindowContext {
-    pub(crate) scale_factor: f64,
-    pub(crate) zoom_factor: f64,
-    pub(crate) window_size: PhysicalSize<u32>,
-    pub(crate) mouse_position: Option<Point>,
-    pub(crate) cursor: Option<Cursor>,
-
-    requested_window_width: Option<f32>,
-    requested_window_height: Option<f32>,
-    requested_mouse_position_x: Option<f32>,
-    requested_mouse_position_y: Option<f32>,
-    requested_cursor: Option<Cursor>,
-}
-
-impl WindowContext {
-    pub(crate) fn apply_requests(&self, window: &Window) {
-        if let Some(requested_cursor) = &self.requested_cursor {
-            window.set_cursor(requested_cursor.clone());
-        };
-
-        if let Some(requested_window_width) = self.requested_window_width {
-            let _ = window.request_inner_size(winit::dpi::Size::Logical(LogicalSize::new(
-                requested_window_width as f64,
-                self.window_size.height as f64,
-            )));
-        };
-
-        if let Some(requested_window_height) = self.requested_window_height {
-            let _ = window.request_inner_size(winit::dpi::Size::Logical(LogicalSize::new(
-                self.window_size.width as f64,
-                requested_window_height as f64,
-            )));
-        };
-
-        if let Some(requested_mouse_position_x) = self.requested_mouse_position_x {
-            let mouse_y = self.requested_mouse_position_y.unwrap_or_default() as f64;
-            let _ = window.set_cursor_position(winit::dpi::Position::Logical(LogicalPosition::new(
-                requested_mouse_position_x as f64,
-                mouse_y,
-            )));
-        };
-
-        if let Some(requested_mouse_position_y) = self.requested_mouse_position_y {
-            let mouse_x = self.requested_mouse_position_x.unwrap_or_default() as f64;
-            let _ = window.set_cursor_position(winit::dpi::Position::Logical(LogicalPosition::new(
-                mouse_x,
-                requested_mouse_position_y as f64,
-            )));
-        };
-    }
-
-    pub(crate) fn zoom_in(&mut self) {
-        self.zoom_factor += 0.01;
-    }
-
-    pub(crate) fn zoom_out(&mut self) {
-        self.zoom_factor = (self.zoom_factor - 0.01).max(1.0);
-    }
-}
-
-impl WindowContext {
-    pub(crate) fn new() -> WindowContext {
-        Self {
-            scale_factor: 1.0,
-            zoom_factor: 1.0,
-            window_size: Default::default(),
-            mouse_position: None,
-            cursor: None,
-            requested_window_width: None,
-            requested_window_height: None,
-            requested_mouse_position_x: None,
-            requested_mouse_position_y: None,
-            requested_cursor: None,
-        }
-    }
-
-    pub fn cursor(&self) -> Option<&Cursor> {
-        self.cursor.as_ref()
-    }
-
-    pub fn window_width(&self) -> f32 {
-        self.window_size.to_logical(self.effective_scale_factor()).width
-    }
-    pub fn window_height(&self) -> f32 {
-        self.window_size.to_logical(self.effective_scale_factor()).height
-    }
-
-    pub fn window_size(&self) -> LogicalSize<f32> {
-        self.window_size.to_logical(self.effective_scale_factor())
-    }
-
-    pub fn mouse_position_x(&self) -> Option<f32> {
-        self.mouse_position.map(|pos| pos.x as f32)
-    }
-
-    pub fn mouse_position_y(&self) -> Option<f32> {
-        self.mouse_position.map(|pos| pos.y as f32)
-    }
-
-    pub fn set_window_width(&mut self, width: f32) {
-        self.requested_window_width = Some(width);
-    }
-
-    pub fn set_window_height(&mut self, height: f32) {
-        self.requested_window_height = Some(height);
-    }
-
-    pub fn set_mouse_position_x(&mut self, x: f32) {
-        self.requested_mouse_position_x = Some(x);
-    }
-
-    pub fn set_mouse_position_y(&mut self, y: f32) {
-        self.requested_mouse_position_y = Some(y);
-    }
-
-    pub fn set_cursor(&mut self, cursor: Cursor) {
-        self.requested_cursor = Some(cursor);
-    }
-
-    pub fn effective_scale_factor(&self) -> f64 {
-        self.scale_factor * self.zoom_factor
-    }
-
-    pub(crate) fn reset(&mut self) {
-        self.requested_window_width = None;
-        self.requested_window_height = None;
-        self.requested_mouse_position_x = None;
-        self.requested_mouse_position_y = None;
-        self.requested_cursor = None;
-    }
-}
-*/

From de8bcecb3681c6a37a9ab59280c86ee64d80d7a9 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 3 Jan 2026 23:33:19 -0500
Subject: [PATCH 035/143] Require node id in request layout funcs

---
 crates/craft_retained/src/app.rs              |  4 ++--
 .../src/elements/core/element_internals.rs    |  5 +----
 .../src/elements/text_input/mod.rs            |  5 +++++
 .../elements/text_input/text_input_state.rs   | 10 ++++++---
 .../craft_retained/src/text/parley_editor.rs  | 21 ++++++++++++++-----
 5 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index d770f95c..fac9e93a 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -415,9 +415,9 @@ impl App {
 }
 
 #[inline]
-pub fn request_layout() {
+pub fn request_layout(taffy_node: NodeId) {
     TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-        taffy_tree.request_layout();
+        taffy_tree.mark_dirty(taffy_node);
     });
 }
 
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index a5d0d1f0..4c1c4d80 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -12,7 +12,7 @@ use rustc_hash::FxHashMap;
 use taffy::Overflow;
 
 use crate::animations::animation::{ActiveAnimation, AnimationFlags, AnimationStatus};
-use crate::app::{TAFFY_TREE, request_layout};
+use crate::app::{TAFFY_TREE};
 use crate::elements::Element;
 use crate::elements::core::element_data::ElementData;
 use crate::events::{CraftMessage, Event};
@@ -395,7 +395,6 @@ pub trait ElementInternals: ElementData {
 
     /// Mark layout node dirty.
     fn mark_dirty(&mut self) {
-        request_layout();
         let id = self.element_data().layout_item.taffy_node_id;
         if let Some(id) = id {
             TAFFY_TREE.with_borrow_mut(|taffy_tree| {
@@ -406,8 +405,6 @@ pub trait ElementInternals: ElementData {
 
     /// Updates taffy's style to reflect craft's style struct.
     fn update_taffy_style(&mut self) {
-        request_layout();
-
         let id = self.element_data().layout_item.taffy_node_id;
         if let Some(id) = id {
             TAFFY_TREE.with_borrow_mut(|taffy_tree| {
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index e2f7c199..95d3852f 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -80,6 +80,11 @@ impl TextInput {
         }));
         me.borrow_mut().element_data.create_layout_node(context);
 
+
+        let taffy_id = me.borrow().element_data.layout_item.taffy_node_id;
+        me.borrow_mut().state.taffy_id = taffy_id;
+        me.borrow_mut().state.editor.taffy_id = taffy_id;
+
         ELEMENTS.with_borrow_mut(|elements| {
             elements.insert(me.borrow().deref());
         });
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index 11e06e65..2e7e6d64 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -28,13 +28,14 @@ use crate::text::{RangedStyles, text_render_data};
 
 #[derive(Clone)]
 pub struct TextInputState {
+    pub(crate) taffy_id: Option<NodeId>,
     origin: Point,
 
     taffy_node: Option<NodeId>,
     pub is_active: bool,
     #[allow(dead_code)]
     pub(crate) ime_state: ImeState,
-    editor: PlainEditor,
+    pub(crate) editor: PlainEditor,
 
     cache: HashMap<TextHashKey, taffy::Size<f32>>,
 
@@ -65,11 +66,12 @@ pub struct TextInputState {
 impl Default for TextInputState {
     fn default() -> Self {
         let default_style = TextInput::get_default_style();
-        let mut editor = PlainEditor::new(default_style.font_size());
+        let mut editor = PlainEditor::new(default_style.font_size(), None);
         editor.set_scale(1.0);
         let style_set = editor.edit_styles();
         default_style.add_styles_to_style_set(style_set);
         Self {
+            taffy_id: None,
             origin: Default::default(),
             taffy_node: None,
             ime_state: ImeState::default(),
@@ -127,7 +129,9 @@ impl TextInputState {
             let cursor_pos = self.cursor_pos();
             self.driver(text_context)
                 .extend_selection_to_point(cursor_pos.x as f32, cursor_pos.y as f32);
-            request_layout();
+            if let Some(taffy_id) = self.taffy_node {
+                request_layout(taffy_id);
+            }
         }
     }
 
diff --git a/crates/craft_retained/src/text/parley_editor.rs b/crates/craft_retained/src/text/parley_editor.rs
index 7acb0244..6ae8a07c 100644
--- a/crates/craft_retained/src/text/parley_editor.rs
+++ b/crates/craft_retained/src/text/parley_editor.rs
@@ -96,6 +96,7 @@ impl<'source> IntoIterator for SplitString<'source> {
 /// This layout is invalidated by a number.
 #[derive(Clone)]
 pub struct PlainEditor {
+    pub(crate) taffy_id: Option<taffy::NodeId>,
     layout: Layout<ColorBrush>,
     buffer: String,
     default_style: StyleSet<ColorBrush>,
@@ -128,6 +129,7 @@ pub struct PlainEditor {
 impl Default for PlainEditor {
     fn default() -> Self {
         PlainEditor {
+            taffy_id: None,
             layout: Default::default(),
             buffer: "".to_string(),
             default_style: StyleSet::new(1.0),
@@ -149,8 +151,9 @@ impl Default for PlainEditor {
 
 impl PlainEditor {
     /// Create a new editor, with default font size `font_size`.
-    pub fn new(font_size: f32) -> Self {
+    pub fn new(font_size: f32, taffy_id: Option<taffy::NodeId>) -> Self {
         Self {
+            taffy_id,
             default_style: StyleSet::new(font_size),
             buffer: Default::default(),
             layout: Default::default(),
@@ -426,7 +429,9 @@ impl PlainEditorDriver<'_> {
         self.refresh_layout();
         self.editor
             .set_selection(Selection::from_point(&self.editor.layout, x, y));
-        request_layout();
+        if let Some(taffy_id) = self.editor.taffy_id {
+            request_layout(taffy_id);
+        }
     }
 
     /// Move the cursor to a byte index.
@@ -595,7 +600,9 @@ impl PlainEditorDriver<'_> {
         self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.next_visual_word(&self.editor.layout, true));
-        request_layout();
+        if let Some(taffy_id) = self.editor.taffy_id {
+            request_layout(taffy_id);
+        }
     }
 
     /// Select the word at the point.
@@ -603,7 +610,9 @@ impl PlainEditorDriver<'_> {
         self.refresh_layout();
         self.editor
             .set_selection(Selection::word_from_point(&self.editor.layout, x, y));
-        request_layout();
+        if let Some(taffy_id) = self.editor.taffy_id {
+            request_layout(taffy_id);
+        }
     }
 
     /// Select the physical line at the point.
@@ -611,7 +620,9 @@ impl PlainEditorDriver<'_> {
         self.refresh_layout();
         let line = Selection::line_from_point(&self.editor.layout, x, y);
         self.editor.set_selection(line);
-        request_layout();
+        if let Some(taffy_id) = self.editor.taffy_id {
+            request_layout(taffy_id);
+        }
     }
 
     /// Move the selection focus point to the cluster boundary closest to point.

From a6fa2b36bef53c0b9a0d7508f3586ffd16a042d9 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 3 Jan 2026 23:43:27 -0500
Subject: [PATCH 036/143] Fix text editor cache bug

---
 .../src/elements/text_input/text_input_state.rs             | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index 2e7e6d64..be06e59e 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -31,7 +31,6 @@ pub struct TextInputState {
     pub(crate) taffy_id: Option<NodeId>,
     origin: Point,
 
-    taffy_node: Option<NodeId>,
     pub is_active: bool,
     #[allow(dead_code)]
     pub(crate) ime_state: ImeState,
@@ -73,7 +72,6 @@ impl Default for TextInputState {
         Self {
             taffy_id: None,
             origin: Default::default(),
-            taffy_node: None,
             ime_state: ImeState::default(),
             is_active: false,
             editor,
@@ -129,7 +127,7 @@ impl TextInputState {
             let cursor_pos = self.cursor_pos();
             self.driver(text_context)
                 .extend_selection_to_point(cursor_pos.x as f32, cursor_pos.y as f32);
-            if let Some(taffy_id) = self.taffy_node {
+            if let Some(taffy_id) = self.taffy_id {
                 request_layout(taffy_id);
             }
         }
@@ -166,7 +164,7 @@ impl TextInputState {
         self.text_render = None;
         self.content_widths = None;
 
-        if let Some(id) = self.taffy_node {
+        if let Some(id) = self.taffy_id {
             TAFFY_TREE.with_borrow_mut(|taffy_tree| {
                 taffy_tree.mark_dirty(id);
             })

From 86396f7e812b69ec43759e874c7162206bff64a5 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 4 Jan 2026 00:30:58 -0500
Subject: [PATCH 037/143] Add px, pct, auto

---
 README.md                        | 17 ++++++++---------
 crates/craft_retained/src/lib.rs | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 1b90b977..99f27ba5 100644
--- a/README.md
+++ b/README.md
@@ -11,11 +11,11 @@ Craft is a library for creating desktops user interfaces. craft_retained provide
 use std::cell::RefCell;
 use std::rc::Rc;
 
-use craft_retained::CraftOptions;
 use craft_retained::elements::{Container, Element, Text, Window};
 use craft_retained::events::ui_events::pointer::PointerButton;
-use craft_retained::style::{AlignItems, FlexDirection, JustifyContent, Unit};
+use craft_retained::style::{AlignItems, FlexDirection, JustifyContent};
 use craft_retained::{Color, rgb};
+use craft_retained::{CraftOptions, pct, px};
 
 fn create_button(
     label: &str,
@@ -27,10 +27,10 @@ fn create_button(
     let border_color = rgb(0, 0, 0);
     Container::new()
         .borrow_mut()
-        .border_width(Unit::Px(1.0), Unit::Px(2.0), Unit::Px(3.0), Unit::Px(4.0))
+        .border_width(px(1), px(2), px(3), px(4))
         .border_color(border_color, border_color, border_color, border_color)
         .border_radius((10.0, 10.0), (10.0, 10.0), (10.0, 10.0), (10.0, 10.0))
-        .padding(Unit::Px(15.0), Unit::Px(30.0), Unit::Px(15.0), Unit::Px(30.0))
+        .padding(px(15), px(30.0), px(15), px(30))
         .justify_content(Some(JustifyContent::Center))
         .background_color(base_color)
         .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {
@@ -60,14 +60,14 @@ fn main() {
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::Center))
         .align_items(Some(AlignItems::Center))
-        .width(Unit::Percentage(100.0))
-        .height(Unit::Percentage(100.0))
-        .gap(Unit::Px(20.0), Unit::Px(20.0))
+        .width(pct(100))
+        .height(pct(100))
+        .gap(px(20), px(20))
         .push(count_text.clone())
         .push({
             Container::new()
                 .borrow_mut()
-                .gap(Unit::Px(20.0), Unit::Px(20.0))
+                .gap(px(20), px(20))
                 .push(create_button(
                     "-",
                     rgb(244, 67, 54),
@@ -87,5 +87,4 @@ fn main() {
 
     craft_retained::craft_main(CraftOptions::basic("Counter"));
 }
-
 ```
\ No newline at end of file
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index ef27fde5..2f46bb6f 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -49,6 +49,7 @@ use {winit::event_loop::EventLoopBuilder, winit::platform::android::EventLoopBui
 use crate::app::RedrawFlags;
 use crate::craft_winit_state::CraftWinitState;
 use crate::events::EventDispatcher;
+use crate::style::Unit;
 use crate::utils::cloneable_any::CloneableAny;
 #[cfg(target_arch = "wasm32")]
 use crate::wasm_queue::WASM_QUEUE;
@@ -218,3 +219,21 @@ pub fn rgb(r: u8, g: u8, b: u8) -> Color {
 pub fn rgba(r: u8, g: u8, b: u8, a: u8) -> Color {
     Color::from_rgba8(r, g, b, a)
 }
+
+pub fn px<U>(val: U) -> Unit
+where
+    U: Into<f64>,
+{
+    Unit::Px(val.into() as f32)
+}
+
+pub fn pct<U>(val: U) -> Unit
+where
+    U: Into<f64>,
+{
+    Unit::Percentage(val.into() as f32)
+}
+
+pub const fn auto() -> Unit {
+    Unit::Auto
+}

From c27cb76385fe0bc9c22e52d876f9ce429d841bc9 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 4 Jan 2026 00:47:23 -0500
Subject: [PATCH 038/143] fix readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 99f27ba5..6d6efdd2 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ fn create_button(
         .border_width(px(1), px(2), px(3), px(4))
         .border_color(border_color, border_color, border_color, border_color)
         .border_radius((10.0, 10.0), (10.0, 10.0), (10.0, 10.0), (10.0, 10.0))
-        .padding(px(15), px(30.0), px(15), px(30))
+        .padding(px(15), px(30), px(15), px(30))
         .justify_content(Some(JustifyContent::Center))
         .background_color(base_color)
         .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {

From f661e9c2bc53d36f6fe4a3d7128591761740dbb6 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 4 Jan 2026 18:08:31 -0500
Subject: [PATCH 039/143] Add wrapper types for elements.

---
 crates/craft_retained/src/app.rs              |  69 +-
 .../craft_retained/src/craft_winit_state.rs   |   4 +-
 crates/craft_retained/src/document/core.rs    |   6 +-
 .../craft_retained/src/elements/container.rs  |  79 +-
 .../src/elements/core/element_data.rs         |   6 +-
 .../src/elements/core/element_internals.rs    |   4 +-
 crates/craft_retained/src/elements/element.rs | 708 ++++++++----------
 .../src/elements/element_data.rs              |  10 +-
 .../src/elements/element_id_map.rs            |  14 +-
 crates/craft_retained/src/elements/image.rs   |   6 +-
 crates/craft_retained/src/elements/mod.rs     |   8 +-
 .../craft_retained/src/elements/scrollable.rs |   4 +-
 .../craft_retained/src/elements/slider/mod.rs |   2 +-
 .../src/elements/slider/slider.rs             | 177 ++++-
 .../src/elements/slider/slider_draw.rs        |  10 +-
 .../src/elements/slider/slider_logic.rs       |  12 +-
 crates/craft_retained/src/elements/text.rs    |  76 +-
 .../src/elements/text_input/mod.rs            |  98 ++-
 .../elements/text_input/text_input_state.rs   |   6 +-
 crates/craft_retained/src/elements/window.rs  | 166 ++--
 .../src/events/event_dispatch.rs              |  24 +-
 crates/craft_retained/src/events/helpers.rs   |  18 +-
 crates/craft_retained/src/events/mod.rs       |   6 +-
 .../src/events/pointer_capture.rs             |  10 +-
 .../src/layout/layout_context.rs              |   6 +-
 crates/craft_retained/src/window_manager.rs   |  23 +-
 examples/counter_retained/main.rs             | 128 ++--
 examples/jsframeworkbench/main.rs             | 147 ++--
 examples/multiwindow/main.rs                  |  33 +-
 examples/pointer_events/main.rs               | 162 ++--
 examples/text/main.rs                         |  25 +-
 31 files changed, 1048 insertions(+), 999 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index fac9e93a..cdbf5b08 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -27,7 +27,7 @@ use crate::CraftOptions;
 use crate::animations::animation::AnimationFlags;
 use crate::document::DocumentManager;
 use crate::elements::core::ElementInternals;
-use crate::elements::{Element, ElementIdMap, Window};
+use crate::elements::{ElementImpl, ElementIdMap, Window};
 use crate::events::internal::InternalMessage;
 use crate::events::{CraftMessage, Event, EventDispatcher};
 use crate::layout::TaffyTree;
@@ -42,7 +42,7 @@ thread_local! {
     pub(crate) static ELEMENTS: RefCell<ElementIdMap> = RefCell::new(ElementIdMap::new());
     pub(crate) static PENDING_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = RefCell::new(VecDeque::new());
     pub(crate) static IN_PROGRESS_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = RefCell::new(VecDeque::new());
-    pub(crate) static FOCUS: RefCell<Option<Weak<RefCell<dyn Element>>>> = RefCell::new(None);
+    pub(crate) static FOCUS: RefCell<Option<Weak<RefCell<dyn ElementImpl >>>> = RefCell::new(None);
     /// An event queue that users or elements can manipulate. Cleared at the start and end of every event dispatch.
     static EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(Event, CraftMessage)>> = RefCell::new(VecDeque::with_capacity(10));
 
@@ -85,7 +85,7 @@ pub struct App {
     pub(crate) modifiers: Modifiers,
     pub redraw_flags: RedrawFlags,
 
-    pub(super) target_scratch: Vec<Rc<RefCell<dyn Element>>>,
+    pub(super) target_scratch: Vec<Rc<RefCell<dyn ElementImpl>>>,
 
     pub(crate) previous_animation_flags: AnimationFlags,
 
@@ -142,8 +142,8 @@ impl App {
     }
 
     /// Handles the window resize event.
-    pub fn on_resize(&mut self, window: Rc<RefCell<Window>>, new_size: Size<f32>) {
-        window.borrow_mut().on_resize(new_size);
+    pub fn on_resize(&mut self, window: Window, new_size: Size<f32>) {
+        window.on_resize(new_size);
     }
 
     /// Initialize any data needed to layout/render text.
@@ -185,11 +185,11 @@ impl App {
 
     /// Updates the reactive tree, layouts the elements, and draws the view.
     #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-    pub fn on_request_redraw(&mut self, window: Rc<RefCell<Window>>) -> Option<TreeUpdate> {
+    pub fn on_request_redraw(&mut self, window: Window) -> Option<TreeUpdate> {
         self.on_request_redraw_internal(window.clone());
 
-        let tree_update = window.borrow_mut().compute_accessibility_tree_window();
-        if let Some(accesskit_adapter) = &mut window.borrow_mut().accesskit_adapter {
+        let tree_update = window.compute_accessibility_tree_window();
+        if let Some(accesskit_adapter) = &mut window.inner.borrow_mut().accesskit_adapter {
             accesskit_adapter.update_if_active(|| tree_update);
             None
         } else {
@@ -199,21 +199,19 @@ impl App {
 
     /// Updates the reactive tree, layouts the elements, and draws the view.
     #[cfg(any(not(feature = "accesskit"), target_arch = "wasm32"))]
-    pub fn on_request_redraw(&mut self, window: Rc<RefCell<Window>>) {
+    pub fn on_request_redraw(&mut self, window: Window) {
         self.on_request_redraw_internal(window);
     }
 
-    pub fn on_move(&mut self, _window: Rc<RefCell<Window>>) {}
+    pub fn on_move(&mut self, _window: Window) {}
 
-    fn on_request_redraw_internal(&mut self, window: Rc<RefCell<Window>>) {
+    fn on_request_redraw_internal(&mut self, window: Window) {
         self.update_resources();
 
-        window
-            .borrow_mut()
-            .on_redraw(self.text_context.as_mut().unwrap(), self.resource_manager.clone());
+        window.on_redraw(self.text_context.as_mut().unwrap(), self.resource_manager.clone());
     }
 
-    pub fn on_pointer_scroll(&mut self, window: Rc<RefCell<Window>>, pointer_scroll_update: PointerScrollEvent) {
+    pub fn on_pointer_scroll(&mut self, window: Window, pointer_scroll_update: PointerScrollEvent) {
         if self.modifiers.ctrl() && pointer_scroll_update.pointer.pointer_type == ui_events::pointer::PointerType::Mouse
         {
             let y: f32 = match pointer_scroll_update.delta {
@@ -222,13 +220,13 @@ impl App {
                 PixelDelta(physical) => physical.y as f32,
             };
             if y < 0.0 {
-                window.borrow_mut().zoom_out();
+                window.zoom_out();
             } else {
-                window.borrow_mut().zoom_in();
+                window.zoom_in();
             }
-            let scale_factor = window.borrow().effective_scale_factor();
-            window.borrow_mut().scale_factor(scale_factor);
-            window.borrow_mut().mark_dirty();
+            let scale_factor = window.effective_scale_factor();
+            window.inner.borrow_mut().set_scale_factor(scale_factor);
+            window.inner.borrow_mut().mark_dirty();
             //style_root_element(window.borrow_mut().deref_mut(), window.borrow().window_size());
             self.request_redraw(RedrawFlags::new(true));
             return;
@@ -241,9 +239,9 @@ impl App {
         self.request_redraw(RedrawFlags::new(true));
     }
 
-    pub fn on_pointer_button(&mut self, window: Rc<RefCell<Window>>, pointer_event: PointerButtonEvent, is_up: bool) {
+    pub fn on_pointer_button(&mut self, window: Window, pointer_event: PointerButtonEvent, is_up: bool) {
         let mut pointer_event = pointer_event;
-        let zoom = window.borrow().zoom_scale_factor();
+        let zoom = window.zoom_scale_factor();
         pointer_event.state.position.x /= zoom;
         pointer_event.state.position.y /= zoom;
 
@@ -256,7 +254,6 @@ impl App {
         };
         let message = event;
         window
-            .borrow_mut()
             .set_mouse_position(Some(Point::new(cursor_position.x, cursor_position.y)));
 
         self.dispatch_event(window.clone(), &message, true);
@@ -264,15 +261,13 @@ impl App {
         self.request_redraw(RedrawFlags::new(true));
     }
 
-    pub fn on_pointer_moved(&mut self, window: Rc<RefCell<Window>>, mouse_moved: PointerUpdate) {
+    pub fn on_pointer_moved(&mut self, window: Window, mouse_moved: PointerUpdate) {
         let mut mouse_moved = mouse_moved;
-        let zoom = window.borrow().zoom_scale_factor();
+        let zoom = window.zoom_scale_factor();
         mouse_moved.current.position.x /= zoom;
         mouse_moved.current.position.y /= zoom;
 
-        window
-            .borrow_mut()
-            .set_mouse_position(Some(mouse_moved.current.logical_point()));
+        window.set_mouse_position(Some(mouse_moved.current.logical_point()));
 
         let message = CraftMessage::PointerMovedEvent(mouse_moved);
 
@@ -281,7 +276,7 @@ impl App {
         self.request_redraw(RedrawFlags::new(true));
     }
 
-    pub fn on_ime(&mut self, window: Rc<RefCell<Window>>, ime: Ime) {
+    pub fn on_ime(&mut self, window: Window, ime: Ime) {
         let event = CraftMessage::ImeEvent(ime);
         let message = event;
 
@@ -290,32 +285,32 @@ impl App {
         self.request_redraw(RedrawFlags::new(true));
     }
 
-    fn dispatch_event(&mut self, window: Rc<RefCell<Window>>, message: &CraftMessage, _is_style: bool) {
-        let mouse_pos = Some(window.borrow().mouse_position());
-        let render_list = window.borrow().render_list.clone();
+    fn dispatch_event(&mut self, window: Window, message: &CraftMessage, _is_style: bool) {
+        let mouse_pos = Some(window.mouse_position());
+        let render_list = window.inner.borrow().render_list.clone();
         self.event_dispatcher.dispatch_event(
             message,
             mouse_pos.unwrap_or_default(),
-            window.clone(),
+            window.inner.clone(),
             &mut self.text_context,
             render_list.borrow_mut().deref_mut(),
             &mut self.target_scratch,
         );
-        window.borrow().winit_window().unwrap().request_redraw();
+        window.winit_window().unwrap().request_redraw();
     }
 
-    pub fn on_keyboard_input(&mut self, window: Rc<RefCell<Window>>, keyboard_input: KeyboardEvent) {
+    pub fn on_keyboard_input(&mut self, window: Window, keyboard_input: KeyboardEvent) {
         self.modifiers = keyboard_input.modifiers;
         if keyboard_input.key == ui_events::keyboard::Key::Named(NamedKey::Control) && keyboard_input.state.is_up() {
             self.modifiers.set(Modifiers::CONTROL, false);
         }
         if keyboard_input.modifiers.ctrl() {
             if keyboard_input.key == ui_events::keyboard::Key::Character("=".to_string()) {
-                window.borrow_mut().zoom_in();
+                window.zoom_in();
                 self.request_redraw(RedrawFlags::new(true));
                 return;
             } else if keyboard_input.key == ui_events::keyboard::Key::Character("-".to_string()) {
-                window.borrow_mut().zoom_out();
+                window.zoom_out();
                 self.request_redraw(RedrawFlags::new(true));
                 return;
             }
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index 459f89aa..e3948e33 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -1,5 +1,3 @@
-use std::cell::RefCell;
-use std::rc::Rc;
 #[cfg(not(target_arch = "wasm32"))]
 use std::time;
 
@@ -67,7 +65,7 @@ impl ApplicationHandler for CraftWinitState {
     }
 
     fn window_event(&mut self, event_loop: &ActiveEventLoop, window_id: WindowId, event: WindowEvent) {
-        let window: Option<Rc<RefCell<crate::elements::Window>>> =
+        let window: Option<crate::elements::Window> =
             WINDOW_MANAGER.with_borrow_mut(|window_manager| window_manager.get_window_by_id(window_id));
 
         let window = if let Some(window) = window { window } else { return };
diff --git a/crates/craft_retained/src/document/core.rs b/crates/craft_retained/src/document/core.rs
index 3b6c3d23..2697f450 100644
--- a/crates/craft_retained/src/document/core.rs
+++ b/crates/craft_retained/src/document/core.rs
@@ -4,14 +4,14 @@ use std::rc::Weak;
 
 use ui_events::pointer::PointerId;
 
-use crate::elements::Element;
+use crate::elements::ElementImpl;
 
 /// Stores window specific information like pointer captures, focus (soon), etc.
 pub struct Document {
     /// Tracks elements that are *currently* pointer captured.
-    pub(crate) pointer_captures: HashMap<PointerId, Weak<RefCell<dyn Element>>>,
+    pub(crate) pointer_captures: HashMap<PointerId, Weak<RefCell<dyn ElementImpl>>>,
     /// Tracks elements that *should* be pointer captured.
-    pub(crate) pending_pointer_captures: HashMap<PointerId, Weak<RefCell<dyn Element>>>,
+    pub(crate) pending_pointer_captures: HashMap<PointerId, Weak<RefCell<dyn ElementImpl>>>,
 }
 
 impl Default for Document {
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 6312823f..3c2b53be 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -11,32 +11,49 @@ use kurbo::{Affine, Point};
 use crate::app::TAFFY_TREE;
 use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
 use crate::elements::element_data::ElementData;
-use crate::elements::{Element, scrollable};
+use crate::elements::{ElementImpl, scrollable};
+use crate::elements::element::{AsElement, Element};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
 
+#[derive(Clone)]
+pub struct Container {
+    pub inner: Rc<RefCell<ContainerInner>>,
+}
+
 /// Stores one or more elements.
 ///
 /// If overflow is set to scroll, it will become scrollable.
-pub struct Container {
+pub struct ContainerInner {
     element_data: ElementData,
 }
 
 impl Container {
-    pub fn new() -> Rc<RefCell<Self>> {
-        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
-            RefCell::new(Self {
+    pub fn new() -> Self {
+        let inner = Rc::new_cyclic(|me: &Weak<RefCell<ContainerInner>>| {
+            RefCell::new(ContainerInner {
                 element_data: ElementData::new(me.clone(), true),
             })
         });
 
-        me.borrow_mut().element_data.create_layout_node(None);
-        me
+        inner.borrow_mut().element_data.create_layout_node(None);
+
+        Self {
+            inner
+        }
+    }
+}
+
+impl Element for Container {}
+
+impl AsElement for Container {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementImpl>> {
+        self.inner.clone()
     }
 }
 
-impl crate::elements::core::ElementData for Container {
+impl crate::elements::core::ElementData for ContainerInner {
     fn element_data(&self) -> &ElementData {
         &self.element_data
     }
@@ -46,12 +63,9 @@ impl crate::elements::core::ElementData for Container {
     }
 }
 
-impl Element for Container {
-    fn push(&mut self, child: Rc<RefCell<dyn Element>>) -> &mut Self
-    where
-        Self: Sized,
-    {
-        let me: Weak<RefCell<dyn Element>> = self.element_data.me.clone();
+impl ElementImpl for ContainerInner {
+    fn push(&mut self, child: Rc<RefCell<dyn ElementImpl>>) {
+        let me: Weak<RefCell<dyn ElementImpl>> = self.element_data.me.clone();
         child.borrow_mut().element_data_mut().parent = Some(me);
         self.element_data.children.push(child.clone());
 
@@ -63,39 +77,6 @@ impl Element for Container {
                 taffy_tree.add_child(parent_id, child_id);
             }
         });
-
-        self
-    }
-
-    fn push_dyn(&mut self, child: Rc<RefCell<dyn Element>>) {
-        self.push(child);
-    }
-
-    /// Appends multiple typed children in one call
-    fn extend(&mut self, children: impl IntoIterator<Item = Rc<RefCell<dyn Element>>>) -> &mut Self
-    where
-        Self: Sized,
-    {
-        let me: Weak<RefCell<dyn Element>> = self.element_data.me.clone();
-        let children: Vec<_> = children.into_iter().collect();
-
-        for child in &children {
-            child.borrow_mut().element_data_mut().parent = Some(me.clone());
-        }
-
-        self.element_data.children.extend(children.iter().cloned());
-
-        // Add the children's taffy node.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
-            for child in &children {
-                if let Some(child_id) = child.borrow().element_data().layout_item.taffy_node_id {
-                    taffy_tree.add_child(parent_id, child_id);
-                }
-            }
-        });
-
-        self
     }
 
     fn as_any(&self) -> &dyn Any {
@@ -107,7 +88,7 @@ impl Element for Container {
     }
 }
 
-impl ElementInternals for Container {
+impl ElementInternals for ContainerInner {
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
@@ -206,4 +187,4 @@ impl ElementInternals for Container {
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
         resolve_clip_for_scrollable(self, clip_bounds);
     }
-}
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/core/element_data.rs b/crates/craft_retained/src/elements/core/element_data.rs
index 2efec7fd..4b809659 100644
--- a/crates/craft_retained/src/elements/core/element_data.rs
+++ b/crates/craft_retained/src/elements/core/element_data.rs
@@ -1,7 +1,7 @@
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 
-use crate::elements::Element;
+use crate::elements::ElementImpl;
 
 /// The trait to provide common element data.
 pub trait ElementData {
@@ -17,12 +17,12 @@ pub trait ElementData {
     }
 
     /// Returns the element's parent element.
-    fn parent(&self) -> Option<Weak<RefCell<dyn Element>>> {
+    fn parent(&self) -> Option<Weak<RefCell<dyn ElementImpl>>> {
         self.element_data().parent.clone()
     }
 
     /// Returns the element's children.
-    fn children(&self) -> &[Rc<RefCell<dyn Element>>] {
+    fn children(&self) -> &[Rc<RefCell<dyn ElementImpl>>] {
         self.element_data().children.as_slice()
     }
 }
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index 4c1c4d80..04f95f53 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -13,7 +13,7 @@ use taffy::Overflow;
 
 use crate::animations::animation::{ActiveAnimation, AnimationFlags, AnimationStatus};
 use crate::app::{TAFFY_TREE};
-use crate::elements::Element;
+use crate::elements::ElementImpl;
 use crate::elements::core::element_data::ElementData;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
@@ -421,7 +421,7 @@ pub trait ElementInternals: ElementData {
     }
 }
 
-pub(crate) fn resolve_clip_for_scrollable(element: &mut dyn Element, clip_bounds: Option<Rectangle>) {
+pub(crate) fn resolve_clip_for_scrollable(element: &mut dyn ElementImpl, clip_bounds: Option<Rectangle>) {
     let element_data = element.element_data_mut();
     if element_data.is_scrollable() {
         let scroll_clip_bounds = element_data.layout_item.computed_box_transformed.padding_rectangle();
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 77e9e7c3..2d4ade1c 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -12,15 +12,21 @@ use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
 use crate::document::Document;
 use crate::elements::ElementIdMap;
 use crate::elements::core::ElementData;
-use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
-use crate::style::{AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit, Weight, Wrap};
+use crate::events::{
+    KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler,
+    PointerUpdateHandler, SliderValueChangedHandler,
+};
+use crate::style::{
+    AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit,
+    Weight, Wrap,
+};
 
 /// The element trait for end-users.
-pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
+pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + Any {
     fn swap_child(
         &mut self,
-        child_1: Rc<RefCell<dyn Element>>,
-        child_2: Rc<RefCell<dyn Element>>,
+        child_1: Rc<RefCell<dyn ElementImpl>>,
+        child_2: Rc<RefCell<dyn ElementImpl>>,
     ) -> Result<(), CraftError> {
         let children = &mut self.element_data_mut().children;
         let position_1 = children
@@ -79,7 +85,10 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     ///
     /// # Panics
     /// Panics if the corresponding Taffy layout nodes fail to be removed.
-    fn remove_child(&mut self, child: Rc<RefCell<dyn Element>>) -> Result<Rc<RefCell<dyn Element>>, CraftError> {
+    fn remove_child(
+        &mut self,
+        child: Rc<RefCell<dyn ElementImpl>>,
+    ) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
         // Find the node.
         let children = &mut self.element_data_mut().children;
         let position = children
@@ -110,7 +119,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
 
         // TODO: Move to document
         fn remove_element_from_document(
-            node: Rc<RefCell<dyn Element>>,
+            node: Rc<RefCell<dyn ElementImpl>>,
             document: &mut Document,
             elements: &mut ElementIdMap,
         ) {
@@ -132,37 +141,17 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
             });
         });
 
-        child.borrow_mut().unfocus_dyn();
+        child.borrow_mut().unfocus();
 
         Ok(child)
     }
 
-    /// Appends a child to the element.
-    fn push(&mut self, _child: Rc<RefCell<dyn Element>>) -> &mut Self
-    where
-        Self: Sized,
-    {
-        panic!("Pushing children is not supported.")
-    }
-
-    fn push_dyn(&mut self, _child: Rc<RefCell<dyn Element>>) {
+    fn push(&mut self, _child: Rc<RefCell<dyn ElementImpl>>) {
         panic!("Pushing children is not supported.")
     }
 
-    /// Appends multiple children to the element.
-    fn extend(&mut self, _children: impl IntoIterator<Item = Rc<RefCell<dyn Element>>>) -> &mut Self
-    where
-        Self: Sized,
-    {
-        panic!("")
-    }
-
-    fn on_pointer_enter(&mut self, on_pointer_enter: PointerEnterHandler) -> &mut Self
-    where
-        Self: Sized,
-    {
+    fn on_pointer_enter(&mut self, on_pointer_enter: PointerEnterHandler) {
         self.element_data_mut().on_pointer_enter.push(on_pointer_enter);
-        self
     }
 
     fn on_slider_value_changed(&mut self, on_slider_value_changed: SliderValueChangedHandler) -> &mut Self
@@ -175,70 +164,42 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         self
     }
 
-    fn on_pointer_leave(&mut self, on_pointer_leave: PointerLeaveHandler) -> &mut Self
-    where
-        Self: Sized,
-    {
+    fn on_pointer_leave(&mut self, on_pointer_leave: PointerLeaveHandler) {
         self.element_data_mut().on_pointer_leave.push(on_pointer_leave);
-        self
     }
 
-    fn on_got_pointer_capture(&mut self, on_got_pointer_capture: PointerCaptureHandler) -> &mut Self
-    where
-        Self: Sized,
-    {
+    fn on_got_pointer_capture(&mut self, on_got_pointer_capture: PointerCaptureHandler) {
         self.element_data_mut()
             .on_got_pointer_capture
             .push(on_got_pointer_capture);
-        self
     }
 
-    fn on_lost_pointer_capture(&mut self, on_lost_pointer_capture: PointerCaptureHandler) -> &mut Self
-    where
-        Self: Sized,
-    {
+    fn on_lost_pointer_capture(&mut self, on_lost_pointer_capture: PointerCaptureHandler) {
         self.element_data_mut()
             .on_lost_pointer_capture
             .push(on_lost_pointer_capture);
-        self
     }
 
-    fn on_pointer_button_down(&mut self, on_pointer_button_down: PointerEventHandler) -> &mut Self
-    where
-        Self: Sized,
-    {
+    fn on_pointer_button_down(&mut self, on_pointer_button_down: PointerEventHandler) {
         self.element_data_mut()
             .on_pointer_button_down
             .push(on_pointer_button_down);
-        self
     }
 
-    fn on_pointer_button_up(&mut self, on_pointer_button_up: PointerEventHandler) -> &mut Self
-    where
-        Self: Sized,
-    {
+    fn on_pointer_button_up(&mut self, on_pointer_button_up: PointerEventHandler) {
         self.element_data_mut().on_pointer_button_up.push(on_pointer_button_up);
-        self
     }
 
-    fn on_pointer_moved(&mut self, on_pointer_moved: PointerUpdateHandler) -> &mut Self
-    where
-        Self: Sized,
-    {
+    fn on_pointer_moved(&mut self, on_pointer_moved: PointerUpdateHandler) {
         self.element_data_mut().on_pointer_moved.push(on_pointer_moved);
-        self
     }
 
-    fn on_keyboard_input(&mut self, on_keyboard_input: KeyboardInputHandler) -> &mut Self
-    where
-        Self: Sized,
-    {
+    fn on_keyboard_input(&mut self, on_keyboard_input: KeyboardInputHandler) {
         self.element_data_mut().on_keyboard_input.push(on_keyboard_input);
-        self
     }
 
     /// Returns the element's [`ElementBox`].
-    fn computed_box_transformed(&self) -> ElementBox {
+    fn get_computed_box_transformed(&self) -> ElementBox {
         self.element_data().layout_item.computed_box_transformed
     }
 
@@ -327,405 +288,157 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
 
     fn as_any_mut(&mut self) -> &mut dyn Any;
 
-    fn display(&mut self, display: Display) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_display(display);
-        self
-    }
-
     fn set_display(&mut self, display: Display) {
         self.style_mut().set_display(display);
         self.update_taffy_style();
     }
 
-    fn box_sizing(&mut self, box_sizing: BoxSizing) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_box_sizing(box_sizing);
-        self
-    }
-
     fn set_box_sizing(&mut self, box_sizing: BoxSizing) {
         self.style_mut().set_box_sizing(box_sizing);
         self.update_taffy_style();
     }
 
-    fn position(&mut self, position: Position) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_position(position);
-        self
-    }
-
     fn set_position(&mut self, position: Position) {
         self.style_mut().set_position(position);
         self.update_taffy_style();
     }
 
-    fn margin(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_margin(top, right, bottom, left);
-        self
-    }
-
     fn set_margin(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) {
         self.style_mut()
             .set_margin(TrblRectangle::new(top, right, bottom, left));
         self.update_taffy_style();
     }
 
-    fn padding(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_padding(top, right, bottom, left);
-        self
-    }
-
     fn set_padding(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) {
         self.style_mut()
             .set_padding(TrblRectangle::new(top, right, bottom, left));
         self.update_taffy_style();
     }
 
-    fn gap(&mut self, row_gap: Unit, column_gap: Unit) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_gap(row_gap, column_gap);
-        self
-    }
-
     fn set_gap(&mut self, row_gap: Unit, column_gap: Unit) {
         self.style_mut().set_gap([row_gap, column_gap]);
         self.update_taffy_style();
     }
 
-    fn inset(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_inset(top, right, bottom, left);
-        self
-    }
-
     fn set_inset(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) {
         self.style_mut().set_inset(TrblRectangle::new(top, right, bottom, left));
         self.update_taffy_style();
     }
 
-    fn min_width(&mut self, min_width: Unit) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_min_width(min_width);
-        self
-    }
-
     fn set_min_width(&mut self, min_width: Unit) {
         self.style_mut().set_min_width(min_width);
         self.update_taffy_style();
     }
 
-    fn min_height(&mut self, min_height: Unit) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_min_height(min_height);
-        self
-    }
-
     fn set_min_height(&mut self, min_height: Unit) {
         self.style_mut().set_min_height(min_height);
         self.update_taffy_style();
     }
 
-    fn width(&mut self, width: Unit) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_width(width);
-        self
-    }
-
     fn set_width(&mut self, width: Unit) {
         self.style_mut().set_width(width);
         self.update_taffy_style();
     }
 
-    fn height(&mut self, height: Unit) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_height(height);
-        self
-    }
-
     fn set_height(&mut self, height: Unit) {
         self.style_mut().set_height(height);
         self.update_taffy_style();
     }
 
-    fn max_width(&mut self, max_width: Unit) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_max_width(max_width);
-        self
-    }
-
     fn set_max_width(&mut self, max_width: Unit) {
         self.style_mut().set_max_width(max_width);
         self.update_taffy_style();
     }
 
-    fn max_height(&mut self, max_height: Unit) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_max_height(max_height);
-        self
-    }
-
     fn set_max_height(&mut self, max_height: Unit) {
         self.style_mut().set_max_height(max_height);
         self.update_taffy_style();
     }
 
-    fn wrap(&mut self, wrap: Wrap) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_wrap(wrap);
-        self
-    }
-
     fn set_wrap(&mut self, wrap: Wrap) {
         self.style_mut().set_wrap(wrap);
         self.update_taffy_style();
     }
 
-    fn align_items(&mut self, align_items: Option<AlignItems>) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_align_items(align_items);
-        self
-    }
-
     fn set_align_items(&mut self, align_items: Option<AlignItems>) {
         self.style_mut().set_align_items(align_items);
         self.update_taffy_style();
     }
 
-    fn justify_content(&mut self, justify_content: Option<JustifyContent>) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_justify_content(justify_content);
-        self
-    }
-
     fn set_justify_content(&mut self, justify_content: Option<JustifyContent>) {
         self.style_mut().set_justify_content(justify_content);
         self.update_taffy_style();
     }
 
-    fn flex_direction(&mut self, flex_direction: FlexDirection) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_flex_direction(flex_direction);
-        self
-    }
-
     fn set_flex_direction(&mut self, flex_direction: FlexDirection) {
         self.style_mut().set_flex_direction(flex_direction);
         self.update_taffy_style();
     }
 
-    fn flex_grow(&mut self, flex_grow: f32) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_flex_grow(flex_grow);
-        self
-    }
-
     fn set_flex_grow(&mut self, flex_grow: f32) {
         self.style_mut().set_flex_grow(flex_grow);
         self.update_taffy_style();
     }
 
-    fn flex_shrink(&mut self, flex_shrink: f32) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_flex_shrink(flex_shrink);
-        self
-    }
-
     fn set_flex_shrink(&mut self, flex_shrink: f32) {
         self.style_mut().set_flex_shrink(flex_shrink);
         self.update_taffy_style();
     }
 
-    fn flex_basis(&mut self, flex_basis: Unit) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_flex_basis(flex_basis);
-        self
-    }
-
     fn set_flex_basis(&mut self, flex_basis: Unit) {
         self.style_mut().set_flex_basis(flex_basis);
         self.update_taffy_style();
     }
 
-    fn font_family(&mut self, font_family: FontFamily) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_font_family(font_family);
-        self
-    }
-
     fn set_font_family(&mut self, font_family: FontFamily) {
         self.style_mut().set_font_family(font_family);
         self.update_taffy_style();
     }
 
-    fn color(&mut self, color: Color) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_color(color);
-        self
-    }
-
     fn set_color(&mut self, color: Color) {
         self.style_mut().set_color(color);
         self.update_taffy_style();
     }
 
-    fn background_color(&mut self, color: Color) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_background_color(color);
-        self
-    }
-
     fn set_background_color(&mut self, color: Color) {
         self.style_mut().set_background(color);
     }
 
-    fn font_size(&mut self, font_size: f32) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_font_size(font_size);
-        self
-    }
-
     fn set_font_size(&mut self, font_size: f32) {
         self.style_mut().set_font_size(font_size);
         self.update_taffy_style();
     }
 
-    fn line_height(&mut self, line_height: f32) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_line_height(line_height);
-        self
-    }
-
     fn set_line_height(&mut self, line_height: f32) {
         self.style_mut().set_line_height(line_height);
         self.update_taffy_style();
     }
 
-    fn font_weight(&mut self, font_weight: Weight) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_font_weight(font_weight);
-        self
-    }
-
     fn set_font_weight(&mut self, font_weight: Weight) {
         self.style_mut().set_font_weight(font_weight);
         self.update_taffy_style();
     }
 
-    fn font_style(&mut self, font_style: FontStyle) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_font_style(font_style);
-        self
-    }
-
     fn set_font_style(&mut self, font_style: FontStyle) {
         self.style_mut().set_font_style(font_style);
         self.update_taffy_style();
     }
 
-    fn underline(&mut self, underline: Option<Underline>) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_underline(underline);
-        self
-    }
-
     fn set_underline(&mut self, underline: Option<Underline>) {
         self.style_mut().set_underline(underline);
         self.update_taffy_style();
     }
 
-    fn overflow(&mut self, overflow_x: Overflow, overflow_y: Overflow) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_overflow(overflow_x, overflow_y);
-        self
-    }
-
     fn set_overflow(&mut self, overflow_x: Overflow, overflow_y: Overflow) {
         self.style_mut().set_overflow([overflow_x, overflow_y]);
         self.update_taffy_style();
     }
 
-    fn border_color(&mut self, top: Color, right: Color, bottom: Color, left: Color) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_border_color(top, right, bottom, left);
-        self
-    }
-
     fn set_border_color(&mut self, top: Color, right: Color, bottom: Color, left: Color) {
         self.style_mut()
             .set_border_color(TrblRectangle::new(top, right, bottom, left));
     }
 
-    fn border_width(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_border_width(top, right, bottom, left);
-        self
-    }
-
     fn set_border_width(&mut self, top: Unit, right: Unit, bottom: Unit, left: Unit) {
         self.style_mut()
             .set_border_width(TrblRectangle::new(top, right, bottom, left));
@@ -744,69 +457,23 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
         self.style_mut().set_border_radius([top, right, bottom, left]);
     }
 
-    fn scrollbar_color(&mut self, scrollbar_color: ScrollbarColor) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_scrollbar_color(scrollbar_color);
-        self
-    }
-
     fn set_scrollbar_color(&mut self, scrollbar_color: ScrollbarColor) {
         self.style_mut().set_scrollbar_color(scrollbar_color);
     }
 
-    fn scrollbar_thumb_margin(&mut self, top: f32, right: f32, bottom: f32, left: f32) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_scrollbar_thumb_margin(top, right, bottom, left);
-        self
-    }
-
     fn set_scrollbar_thumb_margin(&mut self, top: f32, right: f32, bottom: f32, left: f32) {
         self.style_mut()
             .set_scrollbar_thumb_margin(TrblRectangle::new(top, right, bottom, left));
     }
 
-    fn scrollbar_thumb_radius(
-        &mut self,
-        top: (f32, f32),
-        right: (f32, f32),
-        bottom: (f32, f32),
-        left: (f32, f32),
-    ) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_scrollbar_thumb_radius(top, right, bottom, left);
-        self
-    }
-
     fn set_scrollbar_thumb_radius(&mut self, top: (f32, f32), right: (f32, f32), bottom: (f32, f32), left: (f32, f32)) {
         self.style_mut().set_scrollbar_thumb_radius([top, right, bottom, left]);
     }
 
-    fn scrollbar_width(&mut self, scrollbar_width: f32) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_scrollbar_width(scrollbar_width);
-        self
-    }
-
     fn set_scrollbar_width(&mut self, scrollbar_width: f32) {
         self.style_mut().set_scrollbar_width(scrollbar_width);
     }
 
-    fn selection_color(&mut self, selection_color: Color) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.set_selection_color(selection_color);
-        self
-    }
-
     fn set_selection_color(&mut self, selection_color: Color) {
         self.style_mut().set_selection_color(selection_color);
     }
@@ -814,10 +481,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     /// Sets focus on the specified element, if it can be focused.
     ///
     /// The focused element is the element that will receive keyboard and similar events by default.
-    fn focus(&mut self)
-    where
-        Self: Sized,
-    {
+    fn focus(&mut self) {
         // Todo: check if the element is focusable. Should we return a result?
         FOCUS.with_borrow_mut(|focus| {
             *focus = Some(self.element_data().me.clone());
@@ -838,17 +502,7 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     }
 
     /// Removes focus if the element has focus.
-    fn unfocus(&mut self) -> &mut Self
-    where
-        Self: Sized,
-    {
-        self.unfocus_dyn();
-
-        self
-    }
-
-    /// Removes focus if the element has focus.
-    fn unfocus_dyn(&mut self) {
+    fn unfocus(&mut self) {
         if self.is_focused() {
             FOCUS.with(|focus| {
                 *focus.borrow_mut() = None;
@@ -857,7 +511,309 @@ pub trait Element: ElementData + crate::elements::core::ElementInternals + Any {
     }
 
     /// Re-
-    fn to_rc(&self) -> Rc<RefCell<dyn Element>> {
+    fn to_rc(&self) -> Rc<RefCell<dyn ElementImpl>> {
         self.element_data().me.upgrade().unwrap()
     }
 }
+
+pub trait AsElement {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementImpl>>;
+}
+
+pub trait Element: Clone + AsElement {
+    fn get_children(&self) -> Vec<Rc<RefCell<dyn ElementImpl>>> {
+        self.as_element_rc().borrow().children().iter().cloned().collect()
+    }
+
+    fn remove_child(&self, child: Rc<RefCell<dyn ElementImpl>>) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+        self.as_element_rc().borrow_mut().remove_child(child)
+    }
+
+    fn swap_child(
+        &self,
+        child_1: Rc<RefCell<dyn ElementImpl>>,
+        child_2: Rc<RefCell<dyn ElementImpl>>,
+    ) -> Result<(), CraftError> {
+        self.as_element_rc().borrow_mut().swap_child(child_1, child_2)
+    }
+
+    fn push(self, child: impl AsElement) -> Self {
+        let child_rc = child.as_element_rc();
+        self.as_element_rc().borrow_mut().push(child_rc);
+        self
+    }
+
+    /*fn extend(self, children: impl IntoIterator<Item = Rc<RefCell<dyn ElementImpl>>>) -> Self {
+        self.as_element_rc().borrow_mut().extend(children);
+        self
+    }*/
+
+    fn on_pointer_enter(self, on_pointer_enter: PointerEnterHandler) -> Self {
+        self.as_element_rc().borrow_mut().on_pointer_enter(on_pointer_enter);
+        self
+    }
+
+    fn on_pointer_leave(self, on_pointer_leave: PointerLeaveHandler) -> Self {
+        self.as_element_rc().borrow_mut().on_pointer_leave(on_pointer_leave);
+        self
+    }
+
+    fn on_pointer_button_down(self, on_pointer_button_down: PointerEventHandler) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .on_pointer_button_down(on_pointer_button_down);
+        self
+    }
+
+    fn on_pointer_moved(self, on_pointer_moved: PointerUpdateHandler) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .on_pointer_moved(on_pointer_moved);
+        self
+    }
+
+    fn on_pointer_button_up(self, on_pointer_button_up: PointerEventHandler) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .on_pointer_button_up(on_pointer_button_up);
+        self
+    }
+
+    fn on_lost_pointer_capture(self, on_lost_pointer_capture: PointerCaptureHandler) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .on_lost_pointer_capture(on_lost_pointer_capture);
+        self
+    }
+
+    fn on_got_pointer_capture(self, on_got_pointer_capture: PointerCaptureHandler) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .on_got_pointer_capture(on_got_pointer_capture);
+        self
+    }
+
+    fn on_keyboard_input(self, on_keyboard_input: KeyboardInputHandler) -> Self {
+        self.as_element_rc().borrow_mut().on_keyboard_input(on_keyboard_input);
+        self
+    }
+
+    fn display(self, display: Display) -> Self {
+        self.as_element_rc().borrow_mut().set_display(display);
+        self
+    }
+
+    fn box_sizing(self, box_sizing: BoxSizing) -> Self {
+        self.as_element_rc().borrow_mut().set_box_sizing(box_sizing);
+        self
+    }
+
+    fn position(self, position: Position) -> Self {
+        self.as_element_rc().borrow_mut().set_position(position);
+        self
+    }
+
+    fn margin(self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_margin(top, right, bottom, left);
+        self
+    }
+
+    fn padding(self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_padding(top, right, bottom, left);
+        self
+    }
+
+    fn gap(self, row_gap: Unit, column_gap: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_gap(row_gap, column_gap);
+        self
+    }
+
+    fn inset(self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_inset(top, right, bottom, left);
+        self
+    }
+
+    fn min_width(self, min_width: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_min_width(min_width);
+        self
+    }
+
+    fn min_height(self, min_height: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_min_height(min_height);
+        self
+    }
+
+    fn width(self, width: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_width(width);
+        self
+    }
+
+    fn height(self, height: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_height(height);
+        self
+    }
+
+    fn max_width(self, max_width: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_max_width(max_width);
+        self
+    }
+
+    fn max_height(self, max_height: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_max_height(max_height);
+        self
+    }
+
+    fn wrap(self, wrap: Wrap) -> Self {
+        self.as_element_rc().borrow_mut().set_wrap(wrap);
+        self
+    }
+
+    fn align_items(self, align_items: Option<AlignItems>) -> Self {
+        self.as_element_rc().borrow_mut().set_align_items(align_items);
+        self
+    }
+
+    fn justify_content(self, justify_content: Option<JustifyContent>) -> Self {
+        self.as_element_rc().borrow_mut().set_justify_content(justify_content);
+        self
+    }
+
+    fn flex_direction(self, flex_direction: FlexDirection) -> Self {
+        self.as_element_rc().borrow_mut().set_flex_direction(flex_direction);
+        self
+    }
+
+    fn flex_grow(self, flex_grow: f32) -> Self {
+        self.as_element_rc().borrow_mut().set_flex_grow(flex_grow);
+        self
+    }
+
+    fn flex_shrink(self, flex_shrink: f32) -> Self {
+        self.as_element_rc().borrow_mut().set_flex_shrink(flex_shrink);
+        self
+    }
+
+    fn flex_basis(self, flex_basis: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_flex_basis(flex_basis);
+        self
+    }
+
+    fn font_family(self, font_family: FontFamily) -> Self {
+        self.as_element_rc().borrow_mut().set_font_family(font_family);
+        self
+    }
+
+    fn color(self, color: Color) -> Self {
+        self.as_element_rc().borrow_mut().set_color(color);
+        self
+    }
+
+    fn background_color(self, background_color: Color) -> Self {
+        self.as_element_rc().borrow_mut().set_background_color(background_color);
+        self
+    }
+
+    fn font_size(self, font_size: f32) -> Self {
+        self.as_element_rc().borrow_mut().set_font_size(font_size);
+        self
+    }
+
+    fn line_height(self, line_height: f32) -> Self {
+        self.as_element_rc().borrow_mut().set_line_height(line_height);
+        self
+    }
+
+    fn font_weight(self, font_weight: Weight) -> Self {
+        self.as_element_rc().borrow_mut().set_font_weight(font_weight);
+        self
+    }
+
+    fn font_style(self, font_style: FontStyle) -> Self {
+        self.as_element_rc().borrow_mut().set_font_style(font_style);
+        self
+    }
+
+    fn underline(self, underline: Option<Underline>) -> Self {
+        self.as_element_rc().borrow_mut().set_underline(underline);
+        self
+    }
+
+    fn overflow(self, overflow_x: Overflow, overflow_y: Overflow) -> Self {
+        self.as_element_rc().borrow_mut().set_overflow(overflow_x, overflow_y);
+        self
+    }
+
+    fn border_color(self, top: Color, right: Color, bottom: Color, left: Color) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .set_border_color(top, right, bottom, left);
+        self
+    }
+
+    fn border_width(self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .set_border_width(top, right, bottom, left);
+        self
+    }
+
+    fn border_radius(self, top: (f32, f32), right: (f32, f32), bottom: (f32, f32), left: (f32, f32)) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .set_border_radius(top, right, bottom, left);
+        self
+    }
+
+    fn scrollbar_color(self, scrollbar_color: ScrollbarColor) -> Self {
+        self.as_element_rc().borrow_mut().set_scrollbar_color(scrollbar_color);
+        self
+    }
+
+    fn scrollbar_thumb_margin(self, top: f32, right: f32, bottom: f32, left: f32) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .set_scrollbar_thumb_margin(top, right, bottom, left);
+        self
+    }
+
+    fn set_scrollbar_thumb_radius(
+        self,
+        top: (f32, f32),
+        right: (f32, f32),
+        bottom: (f32, f32),
+        left: (f32, f32),
+    ) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .set_scrollbar_thumb_radius(top, right, bottom, left);
+        self
+    }
+
+    fn scrollbar_width(self, selection_color: Color) -> Self {
+        self.as_element_rc().borrow_mut().set_selection_color(selection_color);
+        self
+    }
+
+    fn focus(self) -> Self {
+        self.as_element_rc().borrow_mut().focus();
+        self
+    }
+
+    fn is_focused(&self) -> bool {
+        self.as_element_rc().borrow_mut().is_focused()
+    }
+
+    fn unfocus(self) -> Self {
+        self.as_element_rc().borrow_mut().unfocus();
+        self
+    }
+
+    fn get_computed_box_transformed(&self) -> ElementBox {
+        self.as_element_rc().borrow().get_computed_box_transformed()
+    }
+
+    fn has_pointer_capture(&self, pointer_id: PointerId) -> bool {
+        self.as_element_rc().borrow().has_pointer_capture(pointer_id)
+    }
+
+}
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index cbe6c7fc..5bd91028 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -8,7 +8,7 @@ use taffy::{Layout, Overflow};
 
 use crate::animations::animation::ActiveAnimation;
 use crate::app::{ELEMENTS, TAFFY_TREE};
-use crate::elements::Element;
+use crate::elements::ElementImpl;
 use crate::elements::element_id::create_unique_element_id;
 use crate::elements::scroll_state::ScrollState;
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
@@ -20,10 +20,10 @@ use crate::style::Style;
 #[derive(Clone)]
 pub struct ElementData {
     /// A cyclic weak pointer to the element.
-    pub(crate) me: Weak<RefCell<dyn Element>>,
+    pub(crate) me: Weak<RefCell<dyn ElementImpl>>,
 
     /// The Element's parent.
-    pub(crate) parent: Option<Weak<RefCell<dyn Element>>>,
+    pub(crate) parent: Option<Weak<RefCell<dyn ElementImpl>>>,
 
     /// The style of the element.
     pub style: Style,
@@ -32,7 +32,7 @@ pub struct ElementData {
     pub layout_item: LayoutItem,
 
     /// The children of the element.
-    pub children: Vec<Rc<RefCell<dyn Element>>>,
+    pub children: Vec<Rc<RefCell<dyn ElementImpl>>>,
 
     /// A user-defined id for the element.
     pub id: Option<SmolStr>,
@@ -58,7 +58,7 @@ pub struct ElementData {
 }
 
 impl ElementData {
-    pub fn new(me: Weak<RefCell<dyn Element>>, scrollable: bool) -> Self {
+    pub fn new(me: Weak<RefCell<dyn ElementImpl>>, scrollable: bool) -> Self {
         let mut default = Self {
             me,
             parent: None,
diff --git a/crates/craft_retained/src/elements/element_id_map.rs b/crates/craft_retained/src/elements/element_id_map.rs
index 05415ba2..f3c04532 100644
--- a/crates/craft_retained/src/elements/element_id_map.rs
+++ b/crates/craft_retained/src/elements/element_id_map.rs
@@ -3,13 +3,13 @@ use std::rc::Weak;
 
 use rustc_hash::FxHashMap;
 
-use crate::elements::Element;
+use crate::elements::ElementImpl;
 
 /// Maps element ids to Weak<Refcell<dyn Element>>
 
 #[derive(Default, Clone)]
 pub struct ElementIdMap {
-    map: FxHashMap<u64, Weak<RefCell<dyn Element>>>,
+    map: FxHashMap<u64, Weak<RefCell<dyn ElementImpl>>>,
 }
 
 impl ElementIdMap {
@@ -17,24 +17,24 @@ impl ElementIdMap {
         Self::default()
     }
 
-    pub fn insert(&mut self, element: &dyn Element) -> Option<Weak<RefCell<dyn Element>>> {
+    pub fn insert(&mut self, element: &dyn ElementImpl) -> Option<Weak<RefCell<dyn ElementImpl>>> {
         let element_data = element.element_data();
         self.map.insert(element_data.internal_id, element_data.me.clone())
     }
 
-    pub fn insert_id(&mut self, id: u64, element: Weak<RefCell<dyn Element>>) -> Option<Weak<RefCell<dyn Element>>> {
+    pub fn insert_id(&mut self, id: u64, element: Weak<RefCell<dyn ElementImpl>>) -> Option<Weak<RefCell<dyn ElementImpl>>> {
         self.map.insert(id, element)
     }
 
-    pub fn remove(&mut self, element: &dyn Element) -> Option<Weak<RefCell<dyn Element>>> {
+    pub fn remove(&mut self, element: &dyn ElementImpl) -> Option<Weak<RefCell<dyn ElementImpl>>> {
         self.map.remove(&element.element_data().internal_id)
     }
 
-    pub fn remove_id(&mut self, id: u64) -> Option<Weak<RefCell<dyn Element>>> {
+    pub fn remove_id(&mut self, id: u64) -> Option<Weak<RefCell<dyn ElementImpl>>> {
         self.map.remove(&id)
     }
 
-    pub fn get(&self, id: u64) -> Option<&Weak<RefCell<dyn Element>>> {
+    pub fn get(&self, id: u64) -> Option<&Weak<RefCell<dyn ElementImpl>>> {
         self.map.get(&id)
     }
 }
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index e6452c8e..362f9792 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -12,7 +12,7 @@ use craft_resource_manager::resource_type::ResourceType;
 use kurbo::{Affine, Point};
 
 use crate::app::{ELEMENTS, PENDING_RESOURCES, TAFFY_TREE};
-use crate::elements::Element;
+use crate::elements::ElementImpl;
 use crate::elements::core::ElementInternals;
 use crate::elements::element_data::ElementData;
 use crate::layout::TaffyTree;
@@ -82,7 +82,7 @@ impl crate::elements::core::ElementData for Image {
     }
 }
 
-impl Element for Image {
+impl ElementImpl for Image {
     fn as_any(&self) -> &dyn Any {
         self
     }
@@ -125,7 +125,7 @@ impl ElementInternals for Image {
         // We draw the borders before we start any layers, so that we don't clip the borders.
         self.draw_borders(renderer, scale_factor);
 
-        let computed_box_transformed = self.computed_box_transformed();
+        let computed_box_transformed = self.get_computed_box_transformed();
         let content_rectangle = computed_box_transformed.content_rectangle();
         self.draw_borders(renderer, scale_factor);
 
diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index ec33cb6b..36f75051 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -15,9 +15,15 @@ mod window;
 
 pub use container::Container;
 pub use element::Element;
+pub use element::ElementImpl;
 pub use element_id_map::ElementIdMap;
 pub use image::Image;
-pub use slider::*;
+pub use slider::Slider;
+pub use slider::SliderDirection;
 pub use text::Text;
 pub use text_input::TextInput;
 pub use window::Window;
+
+pub use text::TextInner;
+pub use text_input::TextInputInner;
+pub use slider::SliderInner;
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 87ca0af6..60ead93e 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -3,11 +3,11 @@ use ui_events::ScrollDelta;
 use ui_events::pointer::{PointerId, PointerType};
 
 use crate::app::request_apply_layout;
-use crate::elements::Element;
+use crate::elements::ElementImpl;
 use crate::events::{CraftMessage, Event};
 
 #[allow(clippy::too_many_arguments)]
-pub(crate) fn on_scroll_events(element: &mut dyn Element, message: &CraftMessage, event: &mut Event) {
+pub(crate) fn on_scroll_events(element: &mut dyn ElementImpl, message: &CraftMessage, event: &mut Event) {
     let element_data = element.element_data_mut();
 
     if element_data.is_scrollable()
diff --git a/crates/craft_retained/src/elements/slider/mod.rs b/crates/craft_retained/src/elements/slider/mod.rs
index ec20ba8d..2943f9fc 100644
--- a/crates/craft_retained/src/elements/slider/mod.rs
+++ b/crates/craft_retained/src/elements/slider/mod.rs
@@ -2,4 +2,4 @@ mod slider;
 mod slider_draw;
 mod slider_logic;
 
-pub use slider::{Slider, SliderDirection};
+pub use slider::{Slider, SliderInner, SliderDirection};
diff --git a/crates/craft_retained/src/elements/slider/slider.rs b/crates/craft_retained/src/elements/slider/slider.rs
index ae9a8314..879e6c65 100644
--- a/crates/craft_retained/src/elements/slider/slider.rs
+++ b/crates/craft_retained/src/elements/slider/slider.rs
@@ -10,8 +10,9 @@ use ui_events::keyboard::{Code, KeyState};
 use ui_events::pointer::PointerId;
 
 use crate::app::queue_event;
-use crate::elements::Element;
+use crate::elements::{Element, ElementImpl};
 use crate::elements::core::ElementInternals;
+use crate::elements::element::AsElement;
 use crate::elements::element_data::ElementData;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
@@ -26,7 +27,12 @@ pub enum SliderDirection {
     Vertical,
 }
 
+#[derive(Clone)]
 pub struct Slider {
+    pub inner: Rc<RefCell<SliderInner>>,
+}
+
+pub struct SliderInner {
     element_data: ElementData,
 
     step: f64,
@@ -47,6 +53,117 @@ pub struct Slider {
 }
 
 impl Slider {
+    pub fn new(thumb_size: f32) -> Self {
+        Self {
+            inner: SliderInner::new(thumb_size)
+        }
+    }
+
+    pub fn value(self, value: f64) -> Self {
+        self.inner.borrow_mut().set_value(value);
+        self
+    }
+
+    pub fn get_value(&self) -> f64 {
+        self.inner.borrow().get_value()
+    }
+
+    pub fn step(self, value: f64) -> Self {
+        self.inner.borrow_mut().set_step(value);
+        self
+    }
+
+    pub fn get_step(&self) -> f64 {
+        self.inner.borrow().get_step()
+    }
+
+    pub fn min(self, min: f64) -> Self {
+        self.inner.borrow_mut().set_min(min);
+        self
+    }
+
+    pub fn get_min(&self) -> f64 {
+        self.inner.borrow().get_min()
+    }
+
+    pub fn max(self, max: f64) -> Self {
+        self.inner.borrow_mut().set_max(max);
+        self
+    }
+
+    pub fn get_max(&self) -> f64 {
+        self.inner.borrow().get_max()
+    }
+
+    pub fn direction(self, direction: SliderDirection) -> Self {
+        self.inner.borrow_mut().set_direction(direction);
+        self
+    }
+
+    pub fn get_direction(&self) -> SliderDirection {
+        self.inner.borrow().get_direction()
+    }
+
+    pub fn thumb_size(self, thumb_size: f64) -> Self {
+        self.inner.borrow_mut().set_thumb_size(thumb_size);
+        self
+    }
+
+    pub fn get_thumb_size(&self) -> f64 {
+        self.inner.borrow().get_thumb_size()
+    }
+
+    pub fn thumb_color(self, thumb_background_color: Color) -> Self {
+        self.inner.borrow_mut().set_thumb_color(thumb_background_color);
+        self
+    }
+
+    pub fn get_thumb_color(&self) -> Color {
+        self.inner.borrow().get_thumb_color()
+    }
+
+    pub fn thumb_border_radius(
+        self,
+        top: (f32, f32),
+        right: (f32, f32),
+        bottom: (f32, f32),
+        left: (f32, f32),
+    ) -> Self {
+        self.inner.borrow_mut().set_thumb_border_radius(top, right, bottom, left);
+        self
+    }
+
+    pub fn get_thumb_border_radius(&self) -> Option<[(f32, f32); 4]> {
+        self.inner.borrow().get_thumb_border_radius()
+    }
+
+    pub fn track_color(self, track_background_color: Color) -> Self {
+        self.inner.borrow_mut().set_track_color(track_background_color);
+        self
+    }
+
+    pub fn get_track_color(&self) -> Option<Color> {
+        self.inner.borrow().get_track_color()
+    }
+
+    pub fn track_border_radius(
+        self,
+        top: (f32, f32),
+        right: (f32, f32),
+        bottom: (f32, f32),
+        left: (f32, f32),
+    ) -> Self {
+        self.inner.borrow_mut().set_track_border_radius(top, right, bottom, left);
+        self
+    }
+
+    pub fn get_track_border_radius(&self) -> Option<[(f32, f32); 4]> {
+        self.inner.borrow().get_track_border_radius()
+    }
+
+}
+
+impl SliderInner {
     pub fn new(thumb_size: f32) -> Rc<RefCell<Self>> {
         let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
             RefCell::new(Self {
@@ -65,7 +182,7 @@ impl Slider {
             })
         });
 
-        me.borrow_mut().background_color(palette::css::LIGHT_GRAY);
+        me.borrow_mut().set_background_color(palette::css::LIGHT_GRAY);
         let border_radius = 25.0;
         me.borrow_mut().border_radius(
             (border_radius, border_radius),
@@ -74,11 +191,11 @@ impl Slider {
             (border_radius, border_radius),
         );
         if me.borrow_mut().direction == SliderDirection::Horizontal {
-            me.borrow_mut().width(Unit::Px(140.0));
-            me.borrow_mut().height(Unit::Px(10.0));
+            me.borrow_mut().set_width(Unit::Px(140.0));
+            me.borrow_mut().set_height(Unit::Px(10.0));
         } else {
-            me.borrow_mut().height(Unit::Px(140.0));
-            me.borrow_mut().width(Unit::Px(10.0));
+            me.borrow_mut().set_height(Unit::Px(140.0));
+            me.borrow_mut().set_width(Unit::Px(10.0));
         }
 
         // TODO: FIX
@@ -95,9 +212,8 @@ impl Slider {
         me
     }
 
-    pub fn value(&mut self, value: f64) -> &mut Self {
+    pub fn set_value(&mut self, value: f64) {
         self.value = value;
-        self
     }
 
     pub fn get_value(&self) -> f64 {
@@ -105,9 +221,8 @@ impl Slider {
     }
 
     /// Set the slider step value. Defaults to 1.
-    pub fn step(&mut self, value: f64) -> &mut Self {
+    pub fn set_step(&mut self, value: f64) {
         self.step = value;
-        self
     }
 
     pub fn get_step(&self) -> f64 {
@@ -115,9 +230,8 @@ impl Slider {
     }
 
     /// Set the minimum slider value. Defaults to 0.
-    pub fn min(&mut self, min: f64) -> &mut Self {
+    pub fn set_min(&mut self, min: f64) {
         self.min = min;
-        self
     }
 
     pub fn get_min(&self) -> f64 {
@@ -125,9 +239,8 @@ impl Slider {
     }
 
     /// Set the max slider value. Defaults to 100.
-    pub fn max(&mut self, max: f64) -> &mut Self {
+    pub fn set_max(&mut self, max: f64) {
         self.max = max;
-        self
     }
 
     pub fn get_max(&self) -> f64 {
@@ -135,66 +248,60 @@ impl Slider {
     }
 
     /// Set the slider direction.
-    pub fn direction(&mut self, direction: SliderDirection) -> &mut Self {
+    pub fn set_direction(&mut self, direction: SliderDirection) {
         self.direction = direction;
-        self
     }
 
     pub fn get_direction(&self) -> SliderDirection {
         self.direction
     }
 
-    pub fn thumb_size(&mut self, thumb_size: f64) -> &mut Self {
+    pub fn set_thumb_size(&mut self, thumb_size: f64) {
         self.thumb_size = thumb_size;
-        self
     }
 
     pub fn get_thumb_size(&self) -> f64 {
         self.thumb_size
     }
 
-    pub fn thumb_color(&mut self, thumb_background_color: Color) -> &mut Self {
+    pub fn set_thumb_color(&mut self, thumb_background_color: Color) {
         self.thumb_background_color = thumb_background_color;
-        self
     }
 
     pub fn get_thumb_color(&self) -> Color {
         self.thumb_background_color
     }
 
-    pub fn thumb_border_radius(
+    pub fn set_thumb_border_radius(
         &mut self,
         top: (f32, f32),
         right: (f32, f32),
         bottom: (f32, f32),
         left: (f32, f32),
-    ) -> &mut Self {
+    ) {
         self.thumb_border_radius = Some([top, right, bottom, left]);
-        self
     }
 
     pub fn get_thumb_border_radius(&self) -> Option<[(f32, f32); 4]> {
         self.thumb_border_radius
     }
 
-    pub fn track_color(&mut self, track_background_color: Color) -> &mut Self {
+    pub fn set_track_color(&mut self, track_background_color: Color) {
         self.track_background_color = Some(track_background_color);
-        self
     }
 
     pub fn get_track_color(&self) -> Option<Color> {
         self.track_background_color
     }
 
-    pub fn track_border_radius(
+    pub fn set_track_border_radius(
         &mut self,
         top: (f32, f32),
         right: (f32, f32),
         bottom: (f32, f32),
         left: (f32, f32),
-    ) -> &mut Self {
+    ) {
         self.track_border_radius = Some([top, right, bottom, left]);
-        self
     }
 
     pub fn get_track_border_radius(&self) -> Option<[(f32, f32); 4]> {
@@ -202,7 +309,15 @@ impl Slider {
     }
 }
 
-impl crate::elements::core::ElementData for Slider {
+impl Element for Slider {}
+
+impl AsElement for Slider {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementImpl>> {
+        self.inner.clone()
+    }
+}
+
+impl crate::elements::core::ElementData for SliderInner {
     fn element_data(&self) -> &ElementData {
         &self.element_data
     }
@@ -212,7 +327,7 @@ impl crate::elements::core::ElementData for Slider {
     }
 }
 
-impl Element for Slider {
+impl ElementImpl for SliderInner {
     fn in_bounds(&self, point: Point) -> bool {
         let element_data = &self.element_data;
         let rect = element_data.layout_item.computed_box_transformed.border_rectangle();
@@ -249,7 +364,7 @@ impl Element for Slider {
     }
 }
 
-impl ElementInternals for Slider {
+impl ElementInternals for SliderInner {
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
diff --git a/crates/craft_retained/src/elements/slider/slider_draw.rs b/crates/craft_retained/src/elements/slider/slider_draw.rs
index 70556a77..3e0d0909 100644
--- a/crates/craft_retained/src/elements/slider/slider_draw.rs
+++ b/crates/craft_retained/src/elements/slider/slider_draw.rs
@@ -4,7 +4,7 @@ use craft_renderer::RenderList;
 use kurbo::Vec2;
 
 use crate::elements::slider::slider::SliderDirection;
-use crate::elements::{Element, Slider};
+use crate::elements::{ElementImpl, SliderInner};
 use crate::layout::layout_item::{CssComputedBorder, draw_borders_generic};
 
 fn border_radius_to_vec_radius(border_radius: [(f32, f32); 4]) -> [Vec2; 4] {
@@ -17,14 +17,14 @@ fn border_radius_to_vec_radius(border_radius: [(f32, f32); 4]) -> [Vec2; 4] {
     ]
 }
 
-impl Slider {
+impl SliderInner {
     pub(super) fn draw_track(&mut self, renderer: &mut RenderList, scale_factor: f64) {
         if let Some(track_color) = self.get_track_color() {
-            let mut element_rect = self.computed_box_transformed();
+            let mut element_rect = self.get_computed_box_transformed();
             let thumb_pos = self.thumb_position(self.get_value());
 
             if self.get_direction() == SliderDirection::Horizontal {
-                element_rect.size.width = (thumb_pos.x - self.computed_box_transformed().position.x) as f32;
+                element_rect.size.width = (thumb_pos.x - self.get_computed_box_transformed().position.x) as f32;
 
                 // HACK: When the value track is visible add some extra width to make sure there are no gaps in the value track color.
                 // The background track may show through on the left edge if the thumb is round.
@@ -32,7 +32,7 @@ impl Slider {
                     element_rect.size.width += self.get_thumb_size() as f32 / 2.0;
                 }
             } else {
-                element_rect.size.height = (thumb_pos.y - self.computed_box_transformed().position.y) as f32;
+                element_rect.size.height = (thumb_pos.y - self.get_computed_box_transformed().position.y) as f32;
 
                 // HACK: When the value track is visible add some extra height to make sure there are no gaps in the value track color.
                 // The background track may show through on the top edge if the thumb is round.
diff --git a/crates/craft_retained/src/elements/slider/slider_logic.rs b/crates/craft_retained/src/elements/slider/slider_logic.rs
index 9167df94..96855097 100644
--- a/crates/craft_retained/src/elements/slider/slider_logic.rs
+++ b/crates/craft_retained/src/elements/slider/slider_logic.rs
@@ -1,10 +1,10 @@
 use kurbo::Point;
 
-use crate::elements::Slider;
+use crate::elements::SliderInner;
 use crate::elements::core::ElementInternals;
 use crate::elements::slider::slider::SliderDirection;
 
-impl Slider {
+impl SliderInner {
     pub(super) fn compute_step(&self, by: i32, current_value: f64) -> f64 {
         let delta = by.abs() as f64 * self.get_step();
 
@@ -92,8 +92,8 @@ mod tests {
 
     use super::*;
 
-    fn make_test_slider() -> Rc<RefCell<Slider>> {
-        let slider = Slider::new(16.0);
+    fn make_test_slider() -> Rc<RefCell<SliderInner>> {
+        let slider = SliderInner::new(16.0);
         slider
     }
 
@@ -102,7 +102,7 @@ mod tests {
         let slider_ref = make_test_slider();
         let mut slider = slider_ref.borrow_mut();
 
-        slider.value(50.0);
+        slider.set_value(50.0);
         let next_step = slider.compute_step(1, slider.get_value());
 
         assert_eq!(next_step as i32, 51i32);
@@ -113,7 +113,7 @@ mod tests {
         let slider_ref = make_test_slider();
         let mut slider = slider_ref.borrow_mut();
 
-        slider.value(50.0);
+        slider.set_value(50.0);
         let next_step = slider.compute_step(-1, slider.get_value());
 
         assert_eq!(next_step as i32, 49i32);
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 69995206..e7b8b3e7 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -36,15 +36,21 @@ use ui_events::pointer::{PointerButton, PointerId};
 use web_time as time;
 use winit::dpi;
 
-use crate::elements::Element;
+use crate::elements::{Element, ElementImpl};
 use crate::elements::core::ElementInternals;
+use crate::elements::element::AsElement;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::elements::element_id::create_unique_element_id;
 use crate::layout::TaffyTree;
 
-// A stateful element that shows text.
 #[derive(Clone)]
 pub struct Text {
+    pub inner: Rc<RefCell<TextInner>>,
+}
+
+// A stateful element that shows text.
+#[derive(Clone)]
+pub struct TextInner {
     element_data: ElementData,
     selectable: bool,
     pub(crate) state: TextState,
@@ -80,9 +86,9 @@ pub struct TextState {
 }
 
 impl Text {
-    pub fn new(text: &str) -> Rc<RefCell<Self>> {
-        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
-            RefCell::new(Self {
+    pub fn new(text: &str) -> Self {
+        let inner = Rc::new_cyclic(|me: &Weak<RefCell<TextInner>>| {
+            RefCell::new(TextInner {
                 element_data: ElementData::new(me.clone(), false),
                 selectable: true,
                 state: TextState::default(),
@@ -91,20 +97,48 @@ impl Text {
         });
 
         let text_context = Some(LayoutContext::Text(TaffyTextContext {
-            element: me.borrow().me.clone(),
+            element: inner.borrow().me.clone(),
         }));
-        me.borrow_mut().element_data.create_layout_node(text_context);
+        inner.borrow_mut().element_data.create_layout_node(text_context);
+
+        inner.borrow_mut().set_text(text);
+
+        Text {
+            inner
+        }
+    }
+
+    pub fn get_selectable(&self) -> bool {
+        self.inner.borrow().selectable
+    }
+
+    pub fn selectable(self, selectable: bool) -> Self {
+        self.inner.borrow_mut().set_selectable(selectable);
+        self
+    }
 
-        me.borrow_mut().text(text);
+    pub fn get_text(&self) -> String {
+        self.inner.borrow().get_text().to_owned()
+    }
 
-        me
+    pub fn text(self, text: &str) -> Self {
+        self.inner.borrow_mut().set_text(text);
+        self
     }
 
+    pub fn set_text_smol_str(self, text: SmolStr) -> Self {
+        self.inner.borrow_mut().set_text_smol_str(text);
+        self
+    }
+}
+
+impl TextInner {
+
     pub fn get_selectable(&self) -> bool {
         self.selectable
     }
 
-    pub fn selectable(&mut self, selectable: bool) -> &mut Self {
+    pub fn set_selectable(&mut self, selectable: bool) -> &mut Self {
         self.selectable = selectable;
         self
     }
@@ -117,7 +151,7 @@ impl Text {
     ///
     /// Updates the text content immediately. Mark layout and render caches as dirty. Layout and
     /// render caches will be computed in the next layout/render pass.
-    pub fn text(&mut self, text: &str) -> &mut Self {
+    pub fn set_text(&mut self, text: &str) -> &mut Self {
         self.set_text_smol_str(text.to_smolstr());
         self
     }
@@ -148,7 +182,15 @@ impl Text {
     }
 }
 
-impl crate::elements::core::ElementData for Text {
+impl Element for Text {}
+
+impl AsElement for Text {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementImpl>> {
+        self.inner.clone()
+    }
+}
+
+impl crate::elements::core::ElementData for TextInner {
     fn element_data(&self) -> &ElementData {
         &self.element_data
     }
@@ -158,7 +200,7 @@ impl crate::elements::core::ElementData for Text {
     }
 }
 
-impl crate::elements::Element for Text {
+impl crate::elements::ElementImpl for TextInner {
     fn as_any(&self) -> &dyn Any {
         self
     }
@@ -168,7 +210,7 @@ impl crate::elements::Element for Text {
     }
 }
 
-impl ElementInternals for Text {
+impl ElementInternals for TextInner {
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
@@ -222,7 +264,7 @@ impl ElementInternals for Text {
         }
         self.add_hit_testable(renderer, true, scale_factor);
 
-        let computed_box_transformed = self.computed_box_transformed();
+        let computed_box_transformed = self.get_computed_box_transformed();
         let content_rectangle = computed_box_transformed.content_rectangle();
 
         self.draw_borders(renderer, scale_factor);
@@ -305,7 +347,7 @@ impl ElementInternals for Text {
 
         // Handle selection.
         if self.selectable {
-            let text_position = self.computed_box_transformed().content_rectangle();
+            let text_position = self.get_computed_box_transformed().content_rectangle();
 
             let state: &mut TextState = &mut self.state;
             match message {
@@ -536,7 +578,7 @@ impl TextState {
     }
 }
 
-impl TextData for Text {
+impl TextData for TextInner {
     fn get_text_renderer(&self) -> Option<&TextRender> {
         self.state.text_render.as_ref()
     }
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 95d3852f..57381806 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -16,11 +16,11 @@ use winit::event::Ime;
 
 use crate::app::ELEMENTS;
 use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
-use crate::elements::element::Element;
+use crate::elements::element::{AsElement, ElementImpl};
 use crate::elements::element_data::ElementData;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::elements::element_id::create_unique_element_id;
-use crate::elements::scrollable;
+use crate::elements::{scrollable, Element};
 use crate::elements::text_input::text_input_state::TextInputState;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
@@ -31,9 +31,14 @@ use crate::text::text_context::TextContext;
 use crate::text::text_render_data::TextRender;
 use crate::utils::cloneable_any::CloneableAny;
 
-// A stateful element that shows text.
 #[derive(Clone)]
 pub struct TextInput {
+    pub inner: Rc<RefCell<TextInputInner>>,
+}
+
+// A stateful element that shows text.
+#[derive(Clone)]
+pub struct TextInputInner {
     element_data: ElementData,
     /// Whether the text input will update the editor every update with the user provided text.
     /// NOTE: The editor will always use the user provided text on initialization.
@@ -55,13 +60,13 @@ pub enum TextInputMessage {
 }
 
 impl TextInput {
-    pub fn new(text: &str) -> Rc<RefCell<Self>> {
-        let default_style = Self::get_default_style();
+    pub fn new(text: &str) -> Self {
+        let default_style = TextInputInner::get_default_style();
 
         let text_input_state = TextInputState::default();
 
-        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
-            RefCell::new(Self {
+        let inner = Rc::new_cyclic(|me: &Weak<RefCell<TextInputInner>>| {
+            RefCell::new(TextInputInner {
                 text: Some(text.to_string()),
                 element_data: ElementData::new(me.clone(), true),
                 use_text_value_on_update: true,
@@ -71,29 +76,73 @@ impl TextInput {
                 me: me.clone(),
             })
         });
-        me.borrow_mut().element_data.style = default_style;
+        inner.borrow_mut().element_data.style = default_style;
 
-        me.borrow_mut().text(text);
+        inner.borrow_mut().set_text(text);
 
         let context = Some(LayoutContext::TextInput(TaffyTextInputContext {
-            element: me.borrow().me.clone(),
+            element: inner.borrow().me.clone(),
         }));
-        me.borrow_mut().element_data.create_layout_node(context);
+        inner.borrow_mut().element_data.create_layout_node(context);
 
 
-        let taffy_id = me.borrow().element_data.layout_item.taffy_node_id;
-        me.borrow_mut().state.taffy_id = taffy_id;
-        me.borrow_mut().state.editor.taffy_id = taffy_id;
+        let taffy_id = inner.borrow().element_data.layout_item.taffy_node_id;
+        inner.borrow_mut().state.taffy_id = taffy_id;
+        inner.borrow_mut().state.editor.taffy_id = taffy_id;
 
         ELEMENTS.with_borrow_mut(|elements| {
-            elements.insert(me.borrow().deref());
+            elements.insert(inner.borrow().deref());
         });
 
-        me
+        Self {
+            inner
+        }
+    }
+
+    /// Whether the text input will update the editor every update with the user provided text.
+    /// NOTE: The editor will always use the user provided text on initialization.
+    pub fn use_text_value_on_update(self, use_initial_text_value: bool) -> Self {
+        self.inner.borrow_mut().use_text_value_on_update(use_initial_text_value);
+        self
+    }
+
+    pub fn disable(self) -> Self {
+        self.inner.borrow_mut().disable();
+        self
+    }
+
+    pub fn get_disabled(&self) -> bool {
+        self.inner.borrow().disabled
+    }
+
+    pub fn get_text(&self) -> String {
+        self.inner.borrow().state.editor().raw_text().to_owned()
+    }
+
+    /// Set the text.
+    ///
+    /// Updates the text content immediately. Mark layout and render caches as dirty. Layout and
+    /// render caches will be computed in the next layout/render pass.
+    pub fn set_text(self, text: &str) -> Self {
+        self.inner.borrow_mut().set_text(text);
+        self
+    }
+
+    pub fn ranged_styles(self, ranged_styles: RangedStyles) -> Self {
+        self.inner.borrow_mut().set_ranged_styles(ranged_styles);
+        self
+    }
+}
+
+impl Element for TextInput {}
+
+impl AsElement for TextInput {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementImpl>> {
+        self.inner.clone()
     }
 }
 
-impl crate::elements::core::ElementData for TextInput {
+impl crate::elements::core::ElementData for TextInputInner {
     fn element_data(&self) -> &ElementData {
         &self.element_data
     }
@@ -103,7 +152,7 @@ impl crate::elements::core::ElementData for TextInput {
     }
 }
 
-impl ElementInternals for TextInput {
+impl ElementInternals for TextInputInner {
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
@@ -372,12 +421,11 @@ impl ElementInternals for TextInput {
     }
 }
 
-impl TextInput {
+impl TextInputInner {
     /// Whether the text input will update the editor every update with the user provided text.
     /// NOTE: The editor will always use the user provided text on initialization.
-    pub fn use_text_value_on_update(mut self, use_initial_text_value: bool) -> Self {
+    pub fn use_text_value_on_update(&mut self, use_initial_text_value: bool) {
         self.use_text_value_on_update = use_initial_text_value;
-        self
     }
 
     pub fn disable(&mut self) -> &mut Self {
@@ -397,20 +445,20 @@ impl TextInput {
     ///
     /// Updates the text content immediately. Mark layout and render caches as dirty. Layout and
     /// render caches will be computed in the next layout/render pass.
-    pub fn text(&mut self, text: &str) -> &mut Self {
+    pub fn set_text(&mut self, text: &str) -> &mut Self {
         self.state.set_text(text);
         self.mark_dirty();
         self
     }
 
-    pub fn ranged_styles(&mut self, ranged_styles: RangedStyles) -> &mut Self {
+    pub fn set_ranged_styles(&mut self, ranged_styles: RangedStyles) -> &mut Self {
         self.state.set_ranged_styles(ranged_styles);
         self.mark_dirty();
         self
     }
 }
 
-impl TextData for TextInput {
+impl TextData for TextInputInner {
     fn get_text_renderer(&self) -> Option<&TextRender> {
         self.state.text_render.as_ref()
     }
@@ -425,7 +473,7 @@ fn parley_box_to_rect(bounding_box: BoundingBox) -> Rectangle {
     )
 }
 
-impl Element for TextInput {
+impl ElementImpl for TextInputInner {
     fn as_any(&self) -> &dyn Any {
         self
     }
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index be06e59e..0d1fe62c 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -17,7 +17,7 @@ use web_time::{Duration, Instant};
 use winit::dpi;
 
 use crate::app::{TAFFY_TREE, request_layout};
-use crate::elements::TextInput;
+use crate::elements::{TextInputInner};
 use crate::elements::core::ElementInternals;
 use crate::elements::text_input::parley_box_to_rect;
 use crate::layout::layout_context::TextHashKey;
@@ -64,7 +64,7 @@ pub struct TextInputState {
 
 impl Default for TextInputState {
     fn default() -> Self {
-        let default_style = TextInput::get_default_style();
+        let default_style = TextInputInner::get_default_style();
         let mut editor = PlainEditor::new(default_style.font_size(), None);
         editor.set_scale(1.0);
         let style_set = editor.edit_styles();
@@ -251,7 +251,7 @@ impl TextInputState {
     }
 
     #[allow(dead_code)]
-    pub fn get_cursor_link(&self, cursor_pos: Point, element: &TextInput) -> Option<String> {
+    pub fn get_cursor_link(&self, cursor_pos: Point, element: &TextInputInner) -> Option<String> {
         if let Some(ranged_styles) = &element.ranged_styles {
             let layout = self.editor.try_layout().unwrap();
             for (range, style) in ranged_styles.styles.iter() {
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 4783d7ae..1a6538cb 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -28,15 +28,21 @@ use crate::app::FOCUS;
 use crate::app::{App, TAFFY_TREE, WINDOW_MANAGER};
 use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
 use crate::elements::element_data::ElementData;
-use crate::elements::{Element, scrollable};
+use crate::elements::{ElementImpl, scrollable, Element};
+use crate::elements::element::AsElement;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
 
+#[derive(Clone)]
+pub struct Window {
+    pub inner: Rc<RefCell<WindowInternal>>
+}
+
 /// Stores one or more elements.
 ///
 /// If overflow is set to scroll, it will become scrollable.
-pub struct Window {
+pub struct WindowInternal {
     element_data: ElementData,
     /// The physical window size from winit.
     pub(crate) window_size: Size<f32>,
@@ -57,9 +63,9 @@ pub struct Window {
 }
 
 impl Window {
-    pub fn new() -> Rc<RefCell<Self>> {
-        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
-            RefCell::new(Self {
+    pub fn new() -> Self {
+        let inner = Rc::new_cyclic(|me: &Weak<RefCell<WindowInternal>>| {
+            RefCell::new(WindowInternal {
                 element_data: ElementData::new(me.clone(), true),
                 window_size: Default::default(),
                 scale_factor: 1.0,
@@ -73,21 +79,104 @@ impl Window {
             })
         });
 
-        me.borrow_mut().element_data.create_layout_node(None);
+        inner.borrow_mut().element_data.create_layout_node(None);
 
         WINDOW_MANAGER.with_borrow_mut(|window_manager| {
-            window_manager.add_window(me.clone());
+            window_manager.add_window(Window {inner: inner.clone()});
         });
 
-        me
+        Window {
+            inner
+        }
+    }
+}
+
+impl Window {
+
+    pub fn winit_window(&self) -> Option<Arc<winit::window::Window>> {
+        self.inner.borrow().winit_window()
+    }
+
+    pub fn set_winit_window(&self, window: Option<Arc<WinitWindow>>) {
+        self.inner.borrow_mut().set_winit_window(window)
+    }
+
+    pub fn set_scale_factor(&self, scale_factor: f64) {
+        self.inner.borrow_mut().set_scale_factor(scale_factor)
+    }
+
+    /// Get the effective scale factor factoring window scale factor and zoom.
+    pub fn effective_scale_factor(&self) -> f64 {
+        self.inner.borrow().effective_scale_factor()
+    }
+
+    /// Get the logical size of the window.
+    pub fn window_size(&self) -> Size<f64> {
+        self.inner.borrow().window_size()
+    }
+
+    pub(crate) fn zoom_in(&self) {
+        self.inner.borrow_mut().zoom_in()
+    }
+
+    pub(crate) fn zoom_out(&self) {
+        self.inner.borrow_mut().zoom_out()
+    }
+
+    pub(crate) fn zoom_scale_factor(&self) -> f64 {
+        self.inner.borrow().zoom_scale_factor()
+    }
+
+    pub(crate) fn mouse_position(&self) -> Option<Point> {
+        self.inner.borrow().mouse_position()
+    }
+
+    pub(crate) fn on_resize(&self, new_size: Size<f32>) {
+        self.inner.borrow_mut().on_resize(new_size)
+    }
+
+    pub(crate) fn set_mouse_position(&self, point: Option<Point>) {
+        self.inner.borrow_mut().set_mouse_position(point)
+    }
+
+    pub(crate) fn on_redraw(&self, text_context: &mut TextContext, resource_manager: Arc<ResourceManager>) {
+        self.inner.borrow_mut().on_redraw(text_context, resource_manager)
     }
 
+    /// Updates the reactive tree, layouts the elements, and draws the view.
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+    pub fn on_request_redraw(&self, craft_app: &mut App) -> Option<TreeUpdate> {
+        self.inner.borrow_mut().on_request_redraw(craft_app)
+    }
+
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+    pub(crate) fn compute_accessibility_tree_window(&self) -> TreeUpdate {
+        self.inner.borrow_mut().compute_accessibility_tree_window()
+    }
+
+    /// Updates the reactive tree, layouts the elements, and draws the view.
+    #[cfg(any(not(feature = "accesskit"), target_arch = "wasm32"))]
+    pub fn on_request_redraw(&self, craft_app: &mut App) {
+       self.inner.borrow_mut().on_request_redraw(craft_app)
+    }
+
+    pub(crate) fn create(&self, craft_app: &mut App, event_loop: &ActiveEventLoop) {
+        self.inner.borrow_mut().create(craft_app, event_loop)
+    }
+}
+
+impl WindowInternal {
+
     pub fn winit_window(&self) -> Option<Arc<winit::window::Window>> {
         self.winit_window.clone()
     }
 
-    pub fn set_winit_window(&mut self, window: Arc<WinitWindow>) {
-        self.winit_window = Some(window);
+    pub fn set_winit_window(&mut self, window: Option<Arc<WinitWindow>>) {
+        self.winit_window = window;
+    }
+
+    pub fn set_scale_factor(&mut self, scale_factor: f64) {
+        self.scale_factor = scale_factor;
     }
 
     /// Get the effective scale factor factoring window scale factor and zoom.
@@ -154,7 +243,6 @@ impl Window {
         self.draw_window(text_context, resource_manager);
     }
 
-    #[allow(clippy::too_many_arguments)]
     fn layout_window(&mut self, text_context: &mut TextContext, resource_manager: Arc<ResourceManager>) -> NodeId {
         let root_node = self
             .element_data
@@ -240,7 +328,7 @@ impl Window {
                 .create_window(WindowAttributes::default().with_visible(false))
                 .expect("Failed to create window"),
         );
-        self.set_winit_window(winit_window.clone());
+        self.set_winit_window(Some(winit_window.clone()));
 
         let renderer_type = craft_app.craft_options.renderer;
 
@@ -341,7 +429,15 @@ impl Window {
     }
 }
 
-impl crate::elements::core::ElementData for Window {
+impl Element for Window {}
+
+impl AsElement for Window {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementImpl>> {
+        self.inner.clone()
+    }
+}
+
+impl crate::elements::core::ElementData for WindowInternal {
     fn element_data(&self) -> &ElementData {
         &self.element_data
     }
@@ -351,12 +447,9 @@ impl crate::elements::core::ElementData for Window {
     }
 }
 
-impl Element for Window {
-    fn push(&mut self, child: Rc<RefCell<dyn Element>>) -> &mut Self
-    where
-        Self: Sized,
-    {
-        let me: Weak<RefCell<dyn Element>> = self.element_data.me.clone();
+impl ElementImpl for WindowInternal {
+    fn push(&mut self, child: Rc<RefCell<dyn ElementImpl>>) {
+        let me: Weak<RefCell<dyn ElementImpl>> = self.element_data.me.clone();
         child.borrow_mut().element_data_mut().parent = Some(me);
         self.element_data.children.push(child.clone());
 
@@ -368,39 +461,6 @@ impl Element for Window {
                 taffy_tree.add_child(parent_id, child_id);
             }
         });
-
-        self
-    }
-
-    fn push_dyn(&mut self, child: Rc<RefCell<dyn Element>>) {
-        self.push(child);
-    }
-
-    /// Appends multiple typed children in one call
-    fn extend(&mut self, children: impl IntoIterator<Item = Rc<RefCell<dyn Element>>>) -> &mut Self
-    where
-        Self: Sized,
-    {
-        let me: Weak<RefCell<dyn Element>> = self.element_data.me.clone();
-        let children: Vec<_> = children.into_iter().collect();
-
-        for child in &children {
-            child.borrow_mut().element_data_mut().parent = Some(me.clone());
-        }
-
-        self.element_data.children.extend(children.iter().cloned());
-
-        // Add the children's taffy node.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
-            for child in &children {
-                if let Some(child_id) = child.borrow().element_data().layout_item.taffy_node_id {
-                    taffy_tree.add_child(parent_id, child_id);
-                }
-            }
-        });
-
-        self
     }
 
     fn as_any(&self) -> &dyn Any {
@@ -412,7 +472,7 @@ impl Element for Window {
     }
 }
 
-impl ElementInternals for Window {
+impl ElementInternals for WindowInternal {
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index b3f91f11..1d494c71 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -6,19 +6,19 @@ use craft_primitives::geometry::Point;
 use craft_renderer::RenderList;
 
 use crate::app::dequeue_event;
-use crate::elements::Element;
+use crate::elements::ElementImpl;
 use crate::events::helpers::{call_default_element_event_handler, call_user_event_handlers, find_target, freeze_target_list};
 use crate::events::pointer_capture::maybe_handle_implicit_pointer_capture_release;
 use crate::events::{CraftMessage, Event, FocusAction};
 use crate::text::text_context::TextContext;
 
-pub(super) fn dispatch_capturing_event(_message: &CraftMessage, _targets: &mut VecDeque<Rc<RefCell<dyn Element>>>) {}
+pub(super) fn dispatch_capturing_event(_message: &CraftMessage, _targets: &mut VecDeque<Rc<RefCell<dyn ElementImpl>>>) {}
 
 /// Dispatches 1 event to many elements.
 /// The first dispatch happens at the top-most visual element.
 pub(super) fn dispatch_bubbling_event(
     message: &CraftMessage,
-    targets: &mut VecDeque<Rc<RefCell<dyn Element>>>,
+    targets: &mut VecDeque<Rc<RefCell<dyn ElementImpl>>>,
 ) -> Event {
     let target = targets[0].clone();
     let mut base_event = Event::new(target.clone());
@@ -38,7 +38,7 @@ pub(super) fn dispatch_bubbling_event(
 pub(crate) struct EventDispatcher {
     /// A "frozen" target list used to diff against the current target list.
     /// This is useful for pointer enter, leave, etc.
-    previous_targets: VecDeque<Weak<RefCell<dyn Element>>>,
+    previous_targets: VecDeque<Weak<RefCell<dyn ElementImpl>>>,
 }
 
 impl EventDispatcher {
@@ -55,7 +55,7 @@ impl EventDispatcher {
         &self,
         message: &CraftMessage,
         text_context: &mut Option<TextContext>,
-        target: &Rc<RefCell<dyn Element>>,
+        target: &Rc<RefCell<dyn ElementImpl>>,
     ) {
         let mut base_event = Event::new(target.clone());
 
@@ -76,7 +76,7 @@ impl EventDispatcher {
     pub(super) fn maybe_dispatch_pointer_leave(
         &self,
         text_context: &mut Option<TextContext>,
-        targets: &VecDeque<Rc<RefCell<dyn Element>>>,
+        targets: &VecDeque<Rc<RefCell<dyn ElementImpl>>>,
     ) {
         for prev_target in self.previous_targets.iter() {
             let mut found = false;
@@ -113,7 +113,7 @@ impl EventDispatcher {
     pub(super) fn maybe_dispatch_pointer_enter(
         &self,
         text_context: &mut Option<TextContext>,
-        targets: &VecDeque<Rc<RefCell<dyn Element>>>,
+        targets: &VecDeque<Rc<RefCell<dyn ElementImpl>>>,
     ) {
         for target in targets.iter().rev() {
             let mut found = false;
@@ -147,10 +147,10 @@ impl EventDispatcher {
         &mut self,
         message: &CraftMessage,
         mouse_position: Option<Point>,
-        root: Rc<RefCell<dyn Element>>,
+        root: Rc<RefCell<dyn ElementImpl>>,
         text_context: &mut Option<TextContext>,
         render_list: &mut RenderList,
-        target_scratch: &mut Vec<Rc<RefCell<dyn Element>>>,
+        target_scratch: &mut Vec<Rc<RefCell<dyn ElementImpl>>>,
     ) {
         let mut _focus = FocusAction::None;
         /*let span = span!(Level::INFO, "dispatch event");
@@ -161,8 +161,8 @@ impl EventDispatcher {
         }*/
 
         // Find the target and freeze the list, so the same set of elements are visited across sub event dispatches.
-        let target: Rc<RefCell<dyn Element>> = find_target(&root, mouse_position, message, render_list, target_scratch);
-        let mut targets: VecDeque<Rc<RefCell<dyn Element>>> = freeze_target_list(target);
+        let target: Rc<RefCell<dyn ElementImpl>> = find_target(&root, mouse_position, message, render_list, target_scratch);
+        let mut targets: VecDeque<Rc<RefCell<dyn ElementImpl>>> = freeze_target_list(target);
 
         self.maybe_dispatch_pointer_leave(text_context, &targets);
         self.maybe_dispatch_pointer_enter(text_context, &targets);
@@ -195,7 +195,7 @@ impl EventDispatcher {
 
         // Drain the event dispatch queue and invoke user callbacks.
         while let Some((event, message)) = dequeue_event() {
-            let mut targets: VecDeque<Rc<RefCell<dyn Element>>> = freeze_target_list(event.target);
+            let mut targets: VecDeque<Rc<RefCell<dyn ElementImpl>>> = freeze_target_list(event.target);
             // Handle capturing
             dispatch_capturing_event(&message, &mut targets);
 
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index 50564894..8c3c7c8d 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -6,16 +6,16 @@ use craft_renderer::RenderList;
 use kurbo::Point;
 
 use crate::app::ELEMENTS;
-use crate::elements::Element;
+use crate::elements::ElementImpl;
 use crate::events::pointer_capture::find_pointer_capture_target;
 use crate::events::{CraftMessage, Event};
 use crate::text::text_context::TextContext;
 
-pub(super) fn freeze_target_list(target: Rc<RefCell<dyn Element>>) -> VecDeque<Rc<RefCell<dyn Element>>> {
+pub(super) fn freeze_target_list(target: Rc<RefCell<dyn ElementImpl>>) -> VecDeque<Rc<RefCell<dyn ElementImpl>>> {
     let mut current_target = Some(Rc::clone(&target));
 
     // Gather and "freeze" the elements we will visit.
-    let mut targets: VecDeque<Rc<RefCell<dyn Element>>> = VecDeque::new();
+    let mut targets: VecDeque<Rc<RefCell<dyn ElementImpl>>> = VecDeque::new();
     while let Some(node) = current_target {
         targets.push_back(Rc::clone(&node));
         current_target = node.borrow().parent().as_ref().and_then(|p| p.upgrade());
@@ -26,12 +26,12 @@ pub(super) fn freeze_target_list(target: Rc<RefCell<dyn Element>>) -> VecDeque<R
 
 /// Find the target that should be visited.
 pub(super) fn find_target(
-    root: &Rc<RefCell<dyn Element>>,
+    root: &Rc<RefCell<dyn ElementImpl>>,
     mouse_position: Option<Point>,
     message: &CraftMessage,
     render_list: &mut RenderList,
-    target_scratch: &mut Vec<Rc<RefCell<dyn Element>>>,
-) -> Rc<RefCell<dyn Element>> {
+    target_scratch: &mut Vec<Rc<RefCell<dyn ElementImpl>>>,
+) -> Rc<RefCell<dyn ElementImpl>> {
     let mut target = find_pointer_capture_target(message);
     if let Some(target) = target {
         return target;
@@ -63,7 +63,7 @@ pub(super) fn find_target(
 
 pub(super) fn call_user_event_handlers(
     event: &mut Event,
-    current_target: &Rc<RefCell<dyn Element>>,
+    current_target: &Rc<RefCell<dyn ElementImpl>>,
     message: &CraftMessage,
 ) {
     match message {
@@ -143,8 +143,8 @@ pub(super) fn call_user_event_handlers(
 
 pub(super) fn call_default_element_event_handler(
     event: &mut Event,
-    current_target: &Rc<RefCell<dyn Element>>,
-    target: &Rc<RefCell<dyn Element>>,
+    current_target: &Rc<RefCell<dyn ElementImpl>>,
+    target: &Rc<RefCell<dyn ElementImpl>>,
     text_context: &mut Option<TextContext>,
     message: &CraftMessage,
 ) {
diff --git a/crates/craft_retained/src/events/mod.rs b/crates/craft_retained/src/events/mod.rs
index b5338e6b..e5c3b5a7 100644
--- a/crates/craft_retained/src/events/mod.rs
+++ b/crates/craft_retained/src/events/mod.rs
@@ -20,7 +20,7 @@ use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
 pub use winit::event::{ElementState, Ime, Modifiers, MouseButton};
 
 use crate::PinnedFutureAny;
-use crate::elements::Element;
+use crate::elements::ElementImpl;
 use crate::utils::cloneable_any::CloneableAny;
 
 pub type PointerEventHandler = Rc<dyn Fn(&mut Event, &PointerButtonEvent)>;
@@ -94,7 +94,7 @@ pub type UserMessage = dyn CloneableAny;
 
 /// The result of an update.
 pub struct Event {
-    pub target: Rc<RefCell<dyn Element>>,
+    pub target: Rc<RefCell<dyn ElementImpl>>,
     /// Propagate craft_events to the next element. True by default.
     pub propagate: bool,
     /// A future that will produce a message when complete. The message will be sent to the origin component.
@@ -135,7 +135,7 @@ impl Event {
 }
 
 impl Event {
-    pub fn new(target: Rc<RefCell<dyn Element>>) -> Self {
+    pub fn new(target: Rc<RefCell<dyn ElementImpl>>) -> Self {
         Event {
             target,
             propagate: true,
diff --git a/crates/craft_retained/src/events/pointer_capture.rs b/crates/craft_retained/src/events/pointer_capture.rs
index def25589..8d2df9bc 100644
--- a/crates/craft_retained/src/events/pointer_capture.rs
+++ b/crates/craft_retained/src/events/pointer_capture.rs
@@ -5,16 +5,16 @@ use std::rc::{Rc, Weak};
 use ui_events::pointer::PointerId;
 
 use crate::app::DOCUMENTS;
-use crate::elements::Element;
+use crate::elements::ElementImpl;
 use crate::events::CraftMessage;
 use crate::events::event_dispatch::{dispatch_bubbling_event, dispatch_capturing_event};
 
 /// Returns the currently pointer captured element or None.
-pub(super) fn find_pointer_capture_target(message: &CraftMessage) -> Option<Rc<RefCell<dyn Element>>> {
+pub(super) fn find_pointer_capture_target(message: &CraftMessage) -> Option<Rc<RefCell<dyn ElementImpl>>> {
     // 9.4 Implicit pointer capture
     // https://w3c.github.io/pointerevents/#implicit-pointer-capture
     //
-    let pointer_capture_element_id: Option<Weak<RefCell<dyn Element>>> = DOCUMENTS.with_borrow_mut(|docs| {
+    let pointer_capture_element_id: Option<Weak<RefCell<dyn ElementImpl>>> = DOCUMENTS.with_borrow_mut(|docs| {
         let key = &PointerId::new(1).unwrap();
         if matches!(message, CraftMessage::GotPointerCapture()) {
             // Check pending (step 2):
@@ -49,7 +49,7 @@ pub(super) fn process_pending_pointer_capture() {
         let target = find_pointer_capture_target(&msg);
 
         if let Some(target) = target {
-            let mut targets: VecDeque<Rc<RefCell<dyn Element>>> = VecDeque::new();
+            let mut targets: VecDeque<Rc<RefCell<dyn ElementImpl>>> = VecDeque::new();
             let mut current_target = Some(Rc::clone(&target));
             while let Some(node) = current_target {
                 targets.push_back(Rc::clone(&node));
@@ -70,7 +70,7 @@ pub(super) fn process_pending_pointer_capture() {
         let target = find_pointer_capture_target(&msg);
 
         if let Some(target) = target {
-            let mut targets: VecDeque<Rc<RefCell<dyn Element>>> = VecDeque::new();
+            let mut targets: VecDeque<Rc<RefCell<dyn ElementImpl>>> = VecDeque::new();
             let mut current_target = Some(Rc::clone(&target));
             while let Some(node) = current_target {
                 targets.push_back(Rc::clone(&node));
diff --git a/crates/craft_retained/src/layout/layout_context.rs b/crates/craft_retained/src/layout/layout_context.rs
index 05b22873..00809e46 100644
--- a/crates/craft_retained/src/layout/layout_context.rs
+++ b/crates/craft_retained/src/layout/layout_context.rs
@@ -6,15 +6,15 @@ use craft_resource_manager::resource::Resource;
 use craft_resource_manager::{ResourceIdentifier, ResourceManager};
 use taffy::{AvailableSpace, Size};
 
-use crate::elements::{Text, TextInput};
+use crate::elements::{TextInner, TextInputInner};
 use crate::text::text_context::TextContext;
 
 pub struct TaffyTextContext {
-    pub element: Weak<RefCell<Text>>,
+    pub element: Weak<RefCell<TextInner>>,
 }
 
 pub struct TaffyTextInputContext {
-    pub element: Weak<RefCell<TextInput>>,
+    pub element: Weak<RefCell<TextInputInner>>,
 }
 
 #[derive(Eq, Hash, PartialEq, Copy, Clone, Debug)]
diff --git a/crates/craft_retained/src/window_manager.rs b/crates/craft_retained/src/window_manager.rs
index 26f28cd0..891cafb2 100644
--- a/crates/craft_retained/src/window_manager.rs
+++ b/crates/craft_retained/src/window_manager.rs
@@ -1,4 +1,3 @@
-use std::cell::RefCell;
 use std::rc::Rc;
 
 use winit::event_loop::ActiveEventLoop;
@@ -8,7 +7,7 @@ use crate::app::App;
 use crate::elements::Window;
 
 pub(crate) struct WindowManager {
-    windows: Vec<Rc<RefCell<Window>>>,
+    windows: Vec<Window>,
 }
 
 impl WindowManager {
@@ -18,13 +17,13 @@ impl WindowManager {
         }
     }
 
-    pub(crate) fn add_window(&mut self, window: Rc<RefCell<Window>>) {
+    pub(crate) fn add_window(&mut self, window: Window) {
         self.windows.push(window);
     }
 
-    pub(crate) fn get_window_by_id(&self, window_id: WindowId) -> Option<Rc<RefCell<Window>>> {
+    pub(crate) fn get_window_by_id(&self, window_id: WindowId) -> Option<Window> {
         for window in &self.windows {
-            let winit_window = window.borrow_mut().winit_window();
+            let winit_window = window.winit_window();
             if winit_window.is_some() && winit_window.unwrap().id() == window_id {
                 return Some(window.clone());
             }
@@ -35,7 +34,7 @@ impl WindowManager {
 
     pub(crate) fn on_resume(&mut self, craft_app: &mut App, event_loop: &ActiveEventLoop) {
         for window_element in &self.windows {
-            window_element.borrow_mut().create(craft_app, event_loop);
+            window_element.create(craft_app, event_loop);
         }
     }
 
@@ -46,19 +45,19 @@ impl WindowManager {
 
         // Create windows that were created during the program run.
         for window_element in &self.windows {
-            if window_element.borrow().winit_window.is_none() {
-                window_element.borrow_mut().create(craft_app, event_loop);
+            if window_element.winit_window().is_none() {
+                window_element.create(craft_app, event_loop);
             }
         }
     }
 
-    pub fn close_window(&mut self, window: &Rc<RefCell<Window>>) {
+    pub fn close_window(&mut self, window: &Window) {
         self.windows.retain(|w| {
-            let is_target = Rc::ptr_eq(w, window);
+            let is_target = Rc::ptr_eq(&w.inner, &window.inner);
 
             if is_target {
-                w.borrow_mut().winit_window = None;
-                w.borrow_mut().renderer = None;
+                w.set_winit_window(None);
+                w.inner.borrow_mut().renderer = None;
             }
 
             !is_target
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index db513b3c..0407f4f1 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -3,112 +3,70 @@ use std::rc::Rc;
 
 use craft_retained::elements::{Container, Element, Text, Window};
 use craft_retained::events::ui_events::pointer::PointerButton;
-use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Unit};
+use craft_retained::style::{AlignItems, FlexDirection, JustifyContent};
 use craft_retained::{Color, rgb};
-
-#[derive(Default, Clone, Copy)]
-pub struct Counter {
-    count: i64,
-}
-
-impl Counter {
-    fn change(&mut self, delta: i64) {
-        self.count += delta;
-    }
-
-    fn count(&self) -> i64 {
-        self.count
-    }
-}
+use craft_retained::{CraftOptions, pct, px};
 
 fn create_button(
     label: &str,
     base_color: Color,
     delta: i64,
-    state: Rc<RefCell<Counter>>,
-    count_text: Rc<RefCell<Text>>,
-) -> Rc<RefCell<Container>> {
+    state: Rc<RefCell<i64>>,
+    count_text: Text,
+) -> Container {
     let border_color = rgb(0, 0, 0);
-    let label = Text::new(label);
-    label.borrow_mut().font_size(24.0).color(Color::WHITE).selectable(false);
-    let container = Container::new();
-    container
-        .borrow_mut()
-        .border_width(Unit::Px(1.0), Unit::Px(2.0), Unit::Px(3.0), Unit::Px(4.0))
+    Container::new()
+        .border_width(px(1), px(2), px(3), px(4))
         .border_color(border_color, border_color, border_color, border_color)
         .border_radius((10.0, 10.0), (10.0, 10.0), (10.0, 10.0), (10.0, 10.0))
-        .padding(Unit::Px(15.0), Unit::Px(30.0), Unit::Px(15.0), Unit::Px(30.0))
-        .display(Display::Flex)
+        .padding(px(15), px(30), px(15), px(30))
         .justify_content(Some(JustifyContent::Center))
-        .align_items(Some(AlignItems::Center))
         .background_color(base_color)
         .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {
             if pointer_button_event.button == Some(PointerButton::Primary) {
-                state.borrow_mut().change(delta);
-                count_text
-                    .borrow_mut()
-                    .text(&format!("Count: {}", state.borrow().count()));
+                *state.borrow_mut() += delta;
+                count_text.clone().text(&format!("Count: {}", state.borrow()));
                 event.prevent_propagate();
             }
         }))
-        .push(label);
-    container
+        .push({
+            Text::new(label)
+                .font_size(24.0)
+                .color(Color::WHITE)
+                .selectable(false)
+        })
 }
 
-pub fn counter() -> Rc<RefCell<dyn Element>> {
-    let count = Rc::new(RefCell::new(Counter::default()));
-
-    let container = Window::new();
-
-    let count_text = Text::new(&format!("Count: {}", count.borrow().count()));
-
-    let button = Container::new();
-    button
-        .borrow_mut()
-        .display(Display::Flex)
-        .flex_direction(FlexDirection::Row)
-        .gap(Unit::Px(20.0), Unit::Px(20.0))
-        .push(create_button(
-            "-",
-            rgb(244, 67, 54),
-            -1,
-            count.clone(),
-            count_text.clone(),
-        ))
-        .push(create_button(
-            "+",
-            rgb(76, 175, 80),
-            1,
-            count.clone(),
-            count_text.clone(),
-        ));
+fn main() {
+    let count = Rc::new(RefCell::new(0));
+    let count_text = Text::new(&format!("Count: {}", count.borrow()));
 
-    container
-        .borrow_mut()
-        .display(Display::Flex)
+    Window::new()
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::Center))
         .align_items(Some(AlignItems::Center))
-        .width(Unit::Percentage(100.0))
-        .height(Unit::Percentage(100.0))
-        .gap(Unit::Px(20.0), Unit::Px(20.0))
-        .push(count_text)
-        .font_size(72.0)
-        .color(rgb(50, 50, 50))
-        .push(button);
-
-    let root = Container::new();
-    root.borrow_mut().push(container);
-
-    root
-}
-
-#[allow(unused)]
-#[cfg(not(target_os = "android"))]
-fn main() {
-    let counter = counter();
+        .width(pct(100))
+        .height(pct(100))
+        .gap(px(20), px(20))
+        .push(count_text.clone())
+        .push({
+            Container::new()
+                .gap(px(20), px(20))
+                .push(create_button(
+                    "-",
+                    rgb(244, 67, 54),
+                    -1,
+                    count.clone(),
+                    count_text.clone(),
+                ))
+                .push(create_button(
+                    "+",
+                    rgb(76, 175, 80),
+                    1,
+                    count.clone(),
+                    count_text.clone(),
+                ))
+        });
 
-    use craft_retained::CraftOptions;
-    util::setup_logging();
     craft_retained::craft_main(CraftOptions::basic("Counter"));
-}
+}
\ No newline at end of file
diff --git a/examples/jsframeworkbench/main.rs b/examples/jsframeworkbench/main.rs
index c51800f7..4a37f85f 100644
--- a/examples/jsframeworkbench/main.rs
+++ b/examples/jsframeworkbench/main.rs
@@ -1,7 +1,7 @@
 use std::cell::RefCell;
 use std::rc::Rc;
 
-use craft_retained::elements::{Container, Element, Text, Window};
+use craft_retained::elements::{Container, Element, Text, TextInner, Window};
 use craft_retained::events::Event;
 use craft_retained::events::ui_events::pointer::PointerButtonEvent;
 use craft_retained::palette::css::WHITE;
@@ -62,13 +62,13 @@ impl Data {
 
 pub struct State {
     store: Store,
-    rows: Vec<Rc<RefCell<dyn Element>>>,
+    rows: Vec<Container>,
     selected_row: Option<usize>,
-    element: Rc<RefCell<dyn Element>>,
+    element: Container,
 }
 
 impl State {
-    fn new(element: Rc<RefCell<dyn Element>>) -> Self {
+    fn new(element: Container) -> Self {
         Self {
             store: Store::new(),
             rows: Vec::new(),
@@ -96,10 +96,9 @@ impl State {
     }
 
     pub fn remove_all_rows(&mut self) {
-        let to_remove = self.element.borrow().children().to_vec();
+        let to_remove = self.element.get_children();
         for child in to_remove {
             self.element
-                .borrow_mut()
                 .remove_child(child)
                 .expect("Failed to remove child!");
         }
@@ -109,10 +108,9 @@ impl State {
         if self.store.data.len() >= 999 {
             self.store.swap_rows();
             self.rows.swap(1, 998);
-            let child_1 = self.element.borrow().children()[1].clone();
-            let child_2 = self.element.borrow().children()[998].clone();
+            let child_1 = self.element.get_children()[1].clone();
+            let child_2 = self.element.get_children()[998].clone();
             self.element
-                .borrow_mut()
                 .swap_child(child_1, child_2)
                 .expect("Failed to swap children");
         }
@@ -120,7 +118,7 @@ impl State {
 
     pub fn append_rows(&mut self) {
         // Collect all new rows that need to be appended
-        let new_rows: Vec<Rc<RefCell<dyn Element>>> = self
+        let new_rows: Vec<Container> = self
             .store
             .data
             .iter()
@@ -133,48 +131,32 @@ impl State {
 
         self.rows.extend(new_rows.iter().cloned());
 
-        self.element
-            .borrow_mut()
-            .as_any_mut()
-            .downcast_mut::<Container>()
-            .unwrap()
-            .extend(new_rows);
+        for row in new_rows {
+            self.element.clone().push(row);
+        }
     }
 
     pub fn select(&mut self, row: Option<usize>) {
         self.selected_row = row;
     }
 
-    pub fn create_row(data: &Data) -> Rc<RefCell<dyn Element>> {
-        let row = Container::new();
-
-        {
-            let mut row_mut = row.borrow_mut();
-            row_mut
-                .display(Display::Flex)
-                .flex_direction(FlexDirection::Row)
-                .width(Unit::Auto)
-                //.align_items(Some(AlignItems::Center))
-                .padding(Unit::Px(4.0), Unit::Px(4.0), Unit::Px(4.0), Unit::Px(4.0))
-                .border_color(
-                    Color::from_rgb8(230, 230, 230),
-                    Color::from_rgb8(230, 230, 230),
-                    Color::from_rgb8(230, 230, 230),
-                    Color::from_rgb8(230, 230, 230),
-                );
-        }
-
-        let id_text = Text::new(&data.id.to_string());
-        id_text
-            .borrow_mut()
-            .width(Unit::Px(60.0))
-            .margin(Unit::Px(0.0), Unit::Px(12.0), Unit::Px(0.0), Unit::Px(0.0));
-
-        let label_text = Text::new(&data.label);
-
-        row.borrow_mut().push(id_text).push(label_text);
+    pub fn create_row(data: &Data) -> Container {
 
-        row
+        Container::new()
+            .display(Display::Flex)
+            .flex_direction(FlexDirection::Row)
+            .width(Unit::Auto)
+            .padding(Unit::Px(4.0), Unit::Px(4.0), Unit::Px(4.0), Unit::Px(4.0))
+            .border_color(
+                Color::from_rgb8(230, 230, 230),
+                Color::from_rgb8(230, 230, 230),
+                Color::from_rgb8(230, 230, 230),
+                Color::from_rgb8(230, 230, 230),
+            ).push(
+            Text::new(&data.id.to_string())
+                .width(Unit::Px(60.0))
+                .margin(Unit::Px(0.0), Unit::Px(12.0), Unit::Px(0.0), Unit::Px(0.0))
+            ).push(Text::new(&data.label))
     }
 
     pub fn add(&mut self) {
@@ -192,10 +174,10 @@ impl State {
     pub fn update(&mut self) {
         self.store.update();
         for (index, data) in self.store.data.iter().enumerate().step_by(10) {
-            let container = self.rows[index].borrow_mut();
-            let mut text = container.children()[1].borrow_mut();
-            if let Some(text) = text.as_any_mut().downcast_mut::<Text>() {
-                text.text(&data.label);
+            let container = self.rows[index].clone();
+            let text = container.get_children()[1].clone();
+            if let Some(text) = text.borrow_mut().as_any_mut().downcast_mut::<TextInner>() {
+                text.set_text(&data.label);
             }
         }
     }
@@ -293,13 +275,11 @@ impl Store {
 fn main() {
     //util::setup_logging();
 
-    let root = Window::new();
-
     let data_list = build_data_list();
     let state = Rc::new(RefCell::new(State::new(data_list.clone())));
 
     let body = build_body(state);
-    root.borrow_mut()
+    Window::new()
         .width(Unit::Percentage(100.0))
         .height(Unit::Percentage(100.0))
         .push(body);
@@ -308,12 +288,10 @@ fn main() {
     craft_retained::craft_main(CraftOptions::basic("jsframeworkbench"));
 }
 
-fn build_body(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
-    let body = Container::new();
-
+fn build_body(state: Rc<RefCell<State>>) -> Container {
     let buttons = build_buttons(state.clone());
 
-    body.borrow_mut()
+    let body = Container::new()
         .overflow(Overflow::Visible, Overflow::Scroll)
         .width(Unit::Percentage(100.0))
         .height(Unit::Percentage(100.0))
@@ -321,12 +299,10 @@ fn build_body(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
         .align_items(Some(AlignItems::Start))
         .padding(Unit::Px(15.0), Unit::Px(15.0), Unit::Px(15.0), Unit::Px(15.0));
 
-    let text = Text::new(r#"Craft-"keyed""#);
-    text.borrow_mut().font_size(32.0).color(Color::BLACK);
+    let text = Text::new(r#"Craft-"keyed""#)
+        .font_size(32.0).color(Color::BLACK);
 
-    let text_container = Container::new();
-    text_container
-        .borrow_mut()
+    let text_container = Container::new()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Row)
         .width(Unit::Percentage(50.0))
@@ -334,9 +310,7 @@ fn build_body(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
         .align_items(Some(AlignItems::Center))
         .push(text);
 
-    let header = Container::new();
-    header
-        .borrow_mut()
+    let header = Container::new()
         .background_color(rgb(238, 238, 238))
         .display(Display::Flex)
         .flex_direction(FlexDirection::Row)
@@ -346,24 +320,19 @@ fn build_body(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
         .width(Unit::Percentage(100.0))
         .push(buttons);
 
-    body.borrow_mut().push(header).push(state.borrow().element.clone());
-
     body
+        .push(header)
+        .push(state.borrow().element.clone())
 }
 
-fn build_data_list() -> Rc<RefCell<Container>> {
-    let data_list = Container::new();
-    data_list
-        .borrow_mut()
+fn build_data_list() -> Container {
+    Container::new()
         .flex_direction(FlexDirection::Column)
-        .width(Unit::Percentage(100.0));
-    data_list
+        .width(Unit::Percentage(100.0))
 }
 
-fn build_buttons(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
-    let buttons = Container::new();
-    buttons
-        .borrow_mut()
+fn build_buttons(state: Rc<RefCell<State>>) -> Container {
+    let buttons = Container::new()
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::FlexEnd))
         .align_items(Some(AlignItems::Start))
@@ -394,27 +363,21 @@ fn build_buttons(state: Rc<RefCell<State>>) -> Rc<RefCell<Container>> {
     let btn_swap = build_button("Swap Rows", move |_, _| state6.borrow_mut().swap_rows());
 
     buttons
-        .borrow_mut()
         .push(btn_create_1k)
         .push(btn_create_10k)
         .push(btn_append_1k)
         .push(btn_update_10th_row)
         .push(btn_clear)
-        .push(btn_swap);
-
-    buttons
+        .push(btn_swap)
 }
 
-fn build_button<F>(label: &str, callback: F) -> Rc<RefCell<Container>>
+fn build_button<F>(label: &str, callback: F) -> Container
 where
     F: Fn(&mut Event, &PointerButtonEvent) + 'static,
-{
-    let button = Container::new();
 
     {
         let border_color = Color::from_rgb8(111, 111, 111);
-        button
-            .borrow_mut()
+        Container::new()
             .background_color(Color::from_rgb8(211, 211, 211))
             .border_color(border_color, border_color, border_color, border_color)
             .flex_direction(FlexDirection::Row)
@@ -425,14 +388,8 @@ where
             .height(Unit::Px(35.0))
             .background_color(Color::from_rgb8(51, 122, 183))
             .color(WHITE)
-            .border_radius((4.0, 4.0), (4.0, 4.0), (4.0, 4.0), (4.0, 4.0));
-    }
-
-    let text = Text::new(label);
-    text.borrow_mut().selectable(false).color(Color::WHITE);
-    button.borrow_mut().push(text);
-
-    button.borrow_mut().on_pointer_button_up(Rc::new(callback));
-
-    button
+            .border_radius((4.0, 4.0), (4.0, 4.0), (4.0, 4.0), (4.0, 4.0))
+            .push(
+                Text::new(label).selectable(false).color(Color::WHITE)
+            ).on_pointer_button_up(Rc::new(callback))
 }
diff --git a/examples/multiwindow/main.rs b/examples/multiwindow/main.rs
index 1ad86239..8558e3b5 100644
--- a/examples/multiwindow/main.rs
+++ b/examples/multiwindow/main.rs
@@ -30,14 +30,11 @@ fn create_button(
     base_color: Color,
     delta: i64,
     state: Rc<RefCell<Counter>>,
-    count_text: Rc<RefCell<Text>>,
-) -> Rc<RefCell<Container>> {
+    count_text: Text,
+) -> Container {
     let border_color = rgb(0, 0, 0);
-    let label = Text::new(label);
-    label.borrow_mut().font_size(24.0).color(Color::WHITE).selectable(false);
-    let container = Container::new();
-    container
-        .borrow_mut()
+    let label = Text::new(label).font_size(24.0).color(Color::WHITE).selectable(false);
+    let container = Container::new()
         .border_width(Unit::Px(1.0), Unit::Px(2.0), Unit::Px(3.0), Unit::Px(4.0))
         .border_color(border_color, border_color, border_color, border_color)
         .border_radius((10.0, 10.0), (10.0, 10.0), (10.0, 10.0), (10.0, 10.0))
@@ -49,9 +46,7 @@ fn create_button(
         .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {
             if pointer_button_event.button == Some(PointerButton::Primary) {
                 state.borrow_mut().change(delta);
-                count_text
-                    .borrow_mut()
-                    .text(&format!("Count: {}", state.borrow().count()));
+                count_text.clone().text(&format!("Count: {}", state.borrow().count()));
                 event.prevent_propagate();
             }
         }))
@@ -59,16 +54,12 @@ fn create_button(
     container
 }
 
-pub fn counter() -> Rc<RefCell<dyn Element>> {
+pub fn counter() -> Window {
     let count = Rc::new(RefCell::new(Counter::default()));
 
-    let window = Window::new();
-
     let count_text = Text::new(&format!("Count: {}", count.borrow().count()));
 
-    let button = Container::new();
-    button
-        .borrow_mut()
+    let button = Container::new()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Row)
         .gap(Unit::Px(20.0), Unit::Px(20.0))
@@ -87,8 +78,7 @@ pub fn counter() -> Rc<RefCell<dyn Element>> {
             count_text.clone(),
         ));
 
-    window
-        .borrow_mut()
+    Window::new()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::Center))
@@ -99,12 +89,7 @@ pub fn counter() -> Rc<RefCell<dyn Element>> {
         .push(count_text)
         .font_size(72.0)
         .color(rgb(50, 50, 50))
-        .push(button);
-
-    let root = Container::new();
-    root.borrow_mut().push(window);
-
-    root
+        .push(button)
 }
 
 fn main() {
diff --git a/examples/pointer_events/main.rs b/examples/pointer_events/main.rs
index 5d9b8d4f..26fd65e3 100644
--- a/examples/pointer_events/main.rs
+++ b/examples/pointer_events/main.rs
@@ -1,35 +1,20 @@
-use std::cell::RefCell;
 use std::rc::Rc;
 
 use craft_retained::Color;
-use craft_retained::elements::core::ElementData;
 use craft_retained::elements::{Container, Element, Text, Window};
 use craft_retained::events::Event;
 use craft_retained::events::ui_events::pointer::PointerId;
 use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Position, Unit};
 
-fn title(txt: &str) -> Rc<RefCell<Text>> {
-    let title = Text::new(txt);
-    title
-        .borrow_mut()
+fn title(txt: &str) -> Text {
+    Text::new(txt)
         .font_size(24.0)
-        .padding(Unit::Px(0.0), Unit::Px(0.0), Unit::Px(25.0), Unit::Px(0.0));
-
-    title
+        .padding(Unit::Px(0.0), Unit::Px(0.0), Unit::Px(25.0), Unit::Px(0.0))
 }
 
-fn event_log() -> (Rc<RefCell<Container>>, Rc<dyn Fn(String)>) {
-    let container = Container::new();
-    container
-        .borrow_mut()
-        .display(Display::Flex)
-        .flex_direction(FlexDirection::Column)
-        .gap(Unit::Px(20.0), Unit::Px(20.0));
-
-    let event_log = Container::new();
+fn event_log() -> (Container, Rc<dyn Fn(String)>) {
     let border_color = Color::from_rgb8(99, 99, 99);
-    event_log
-        .borrow_mut()
+    let event_log = Container::new()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Column)
         .overflow(Overflow::Visible, Overflow::Scroll)
@@ -43,76 +28,56 @@ fn event_log() -> (Rc<RefCell<Container>>, Rc<dyn Fn(String)>) {
 
     let event_log_copy = event_log.clone();
     let push_text = Rc::new(move |string: String| {
-        event_log_copy.borrow_mut().push(Text::new(&string));
+        event_log_copy.clone().push(Text::new(&string));
     });
 
     let event_log_copy = event_log.clone();
-    let clear_log = Text::new("Clear");
-    clear_log
-        .borrow_mut()
+    let clear_log = Text::new("Clear")
         .background_color(Color::from_rgb8(210, 210, 215))
         .border_width(Unit::Px(1.0), Unit::Px(1.0), Unit::Px(1.0), Unit::Px(1.0))
         .border_radius((6.0, 6.0), (6.0, 6.0), (6.0, 6.0), (6.0, 6.0))
         .padding(Unit::Px(10.0), Unit::Px(25.0), Unit::Px(10.0), Unit::Px(25.0))
         .width(Unit::Px(90.0))
         .on_pointer_button_down(Rc::new(move |_e, _pb_event| {
-            let to_remove = event_log_copy.borrow().children().to_vec();
+            let to_remove = event_log_copy.get_children();
             for child in to_remove {
-                event_log_copy
-                    .borrow_mut()
-                    .remove_child(child)
-                    .expect("Failed to remove child!");
+                event_log_copy.remove_child(child).expect("Failed to remove child!");
             }
         }));
 
-    container.borrow_mut().push(event_log);
-
-    container.borrow_mut().push(clear_log);
+    let container = Container::new()
+        .display(Display::Flex)
+        .flex_direction(FlexDirection::Column)
+        .gap(Unit::Px(20.0), Unit::Px(20.0))
+        .push(event_log)
+        .push(clear_log);
 
     (container, push_text)
 }
 
-fn pointer_capture_example() -> Rc<RefCell<Container>> {
-    let container = Container::new();
+fn pointer_capture_example() -> Container {
     let container_padding = 20.0;
-    container
-        .borrow_mut()
-        .display(Display::Flex)
-        .flex_direction(FlexDirection::Column)
-        .padding(
-            Unit::Px(container_padding),
-            Unit::Px(container_padding),
-            Unit::Px(container_padding),
-            Unit::Px(container_padding),
-        );
 
-    let draggable_text = Text::new("Draggable");
+    let draggable_text_clone = Text::new("Draggable");
+
+    let (event_log, push_text) = event_log();
+    let push_text_clone = push_text.clone();
+    let push_text_clone2 = push_text.clone();
 
-    draggable_text
+    let draggable_text = draggable_text_clone
         .clone()
-        .borrow_mut()
         .display(Display::Flex)
         .width(Unit::Px(100.0))
         .color(Color::WHITE)
         .background_color(Color::from_rgba8(40, 40, 255, 100))
         .on_pointer_button_down(Rc::new(|e, _pb_event| {
             e.target.borrow_mut().set_pointer_capture(PointerId::new(1).unwrap());
-        }));
-
-    let (event_log, push_text) = event_log();
-    let push_text_clone = push_text.clone();
-
-    let draggable_text_clone = draggable_text.clone();
-    draggable_text
-        .borrow_mut()
+        }))
         .on_pointer_moved(Rc::new(move |e, pointer_moved_event| {
             let mouse_y = pointer_moved_event.current.logical_position().x as f32;
-            let half_size = draggable_text_clone.borrow_mut().computed_box_transformed().size.width / 2.0;
-            if draggable_text_clone
-                .borrow_mut()
-                .has_pointer_capture(PointerId::new(1).unwrap())
-            {
-                draggable_text_clone.borrow_mut().position(Position::Relative).inset(
+            let half_size = draggable_text_clone.get_computed_box_transformed().size.width / 2.0;
+            if draggable_text_clone.has_pointer_capture(PointerId::new(1).unwrap()) {
+                draggable_text_clone.clone().position(Position::Relative).inset(
                     Unit::Px(0.0),
                     Unit::Px(0.0),
                     Unit::Px(0.0),
@@ -120,35 +85,31 @@ fn pointer_capture_example() -> Rc<RefCell<Container>> {
                 );
             }
             e.prevent_defaults();
+        }))
+        .on_lost_pointer_capture(Rc::new(move |_e| {
+            push_text_clone("Lost Pointer Capture".to_string());
+        }))
+        .on_got_pointer_capture(Rc::new(move |_e| {
+            push_text_clone2("Got Pointer Capture".to_string());
         }));
 
-    draggable_text.borrow_mut().on_got_pointer_capture(Rc::new(move |_e| {
-        push_text_clone("Got Pointer Capture".to_string());
-    }));
-
-    let push_text_clone = push_text.clone();
-    draggable_text.borrow_mut().on_lost_pointer_capture(Rc::new(move |_e| {
-        push_text_clone("Lost Pointer Capture".to_string());
-    }));
-
-    container.borrow_mut().push(title("Pointer Capture"));
-    container.borrow_mut().push(draggable_text);
-    container.borrow_mut().push(event_log);
-
-    container
-}
-
-fn pointer_enter_leave_example() -> Rc<RefCell<Container>> {
-    let container = Container::new();
-    container
-        .borrow_mut()
+    Container::new()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Column)
-        .padding(Unit::Px(20.0), Unit::Px(20.0), Unit::Px(20.0), Unit::Px(20.0));
+        .padding(
+            Unit::Px(container_padding),
+            Unit::Px(container_padding),
+            Unit::Px(container_padding),
+            Unit::Px(container_padding),
+        )
+        .push(title("Pointer Capture"))
+        .push(draggable_text)
+        .push(event_log)
+}
 
+fn pointer_enter_leave_example() -> Container {
     let (event_log, push_text) = event_log();
 
-    let parent = Container::new();
     let pointer_enter_leave_log = move |is_enter: bool, node_name: &'static str| {
         let push_text_clone_2 = push_text.clone();
         let pointer_event_name = if is_enter { "Pointer Enter" } else { "Pointer Leave" };
@@ -157,8 +118,7 @@ fn pointer_enter_leave_example() -> Rc<RefCell<Container>> {
         });
     };
 
-    parent
-        .borrow_mut()
+    let parent = Container::new()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Row)
         .align_items(Some(AlignItems::Center))
@@ -169,45 +129,39 @@ fn pointer_enter_leave_example() -> Rc<RefCell<Container>> {
         .on_pointer_enter(pointer_enter_leave_log(true, "Parent").clone())
         .on_pointer_leave(pointer_enter_leave_log(false, "Parent").clone());
 
-    let child_container = Container::new();
-    child_container
-        .borrow_mut()
+    let child_container = Container::new()
         .width(Unit::Px(125.0))
         .height(Unit::Px(125.0))
         .background_color(Color::from_rgba8(255, 10, 10, 150))
         .on_pointer_enter(pointer_enter_leave_log(true, "Child").clone())
         .on_pointer_leave(pointer_enter_leave_log(false, "Child").clone());
 
-    parent.borrow_mut().push(child_container);
-
-    container.borrow_mut().push(title("Pointer Enter + Leave"));
-    container.borrow_mut().push(parent);
-    container.borrow_mut().push(event_log);
+    let parent = parent.push(child_container);
 
-    container
+    Container::new()
+        .display(Display::Flex)
+        .flex_direction(FlexDirection::Column)
+        .padding(Unit::Px(20.0), Unit::Px(20.0), Unit::Px(20.0), Unit::Px(20.0))
+        .push(title("Pointer Enter + Leave"))
+        .push(parent)
+        .push(event_log)
 }
 
 #[allow(unused)]
 #[cfg(not(target_os = "android"))]
 fn main() {
-    let window = Window::new();
-
     let pointer_capture_container = Container::new();
     let pointer_capture_event_log = Text::new("");
     let pointer_capture_draggable_container = Text::new("Draggable");
 
-    window
-        .borrow_mut()
+    Window::new()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Column)
         .overflow(Overflow::Visible, Overflow::Scroll)
         .max_height(Unit::Percentage(100.0))
-        .gap(Unit::Px(50.0), Unit::Px(50.0));
-
-    let pointer_capture_example = pointer_capture_example();
-    window.borrow_mut().push(pointer_capture_example);
-    let pointer_enter_leave_example = pointer_enter_leave_example();
-    window.borrow_mut().push(pointer_enter_leave_example);
+        .gap(Unit::Px(50.0), Unit::Px(50.0))
+        .push(pointer_capture_example())
+        .push(pointer_enter_leave_example());
 
     use craft_retained::CraftOptions;
     //util::setup_logging();
diff --git a/examples/text/main.rs b/examples/text/main.rs
index fb8f64ec..59141f6f 100644
--- a/examples/text/main.rs
+++ b/examples/text/main.rs
@@ -3,17 +3,8 @@ use craft_retained::rgb;
 use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Unit};
 
 fn main() {
-    let container = Container::new();
-
-    let text = TextInput::new(include_str!("../counter_retained/main.rs"));
-    text.borrow_mut()
-        .overflow(Overflow::Visible, Overflow::Scroll)
-        .width(Unit::Px(600.0))
-        .height(Unit::Px(600.0))
-        .display(Display::Block);
-
-    container
-        .borrow_mut()
+    let root = Window::new();
+    root.push(Container::new()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::Center))
@@ -23,10 +14,14 @@ fn main() {
         .gap(Unit::Px(20.0), Unit::Px(20.0))
         .font_size(72.0)
         .color(rgb(50, 50, 50))
-        .push(text);
-
-    let root = Window::new();
-    root.borrow_mut().push(container);
+        .push(
+            TextInput::new(include_str!("../counter_retained/main.rs"))
+                .overflow(Overflow::Visible, Overflow::Scroll)
+                .width(Unit::Px(600.0))
+                .height(Unit::Px(600.0))
+                .display(Display::Block)
+        )
+        );
 
     use craft_retained::CraftOptions;
     util::setup_logging();

From 776b0d181cf66bc99639129aac6f90e485119c2c Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 4 Jan 2026 18:10:13 -0500
Subject: [PATCH 040/143] format

---
 crates/craft_retained/src/app.rs              |  5 +-
 .../craft_retained/src/elements/container.rs  |  8 +--
 .../src/elements/core/element_internals.rs    |  2 +-
 crates/craft_retained/src/elements/element.rs | 15 +----
 .../src/elements/element_id_map.rs            |  6 +-
 crates/craft_retained/src/elements/mod.rs     | 14 ++---
 .../craft_retained/src/elements/slider/mod.rs |  2 +-
 .../src/elements/slider/slider.rs             | 29 ++++-----
 crates/craft_retained/src/elements/text.rs    |  7 +--
 .../src/elements/text_input/mod.rs            |  7 +--
 .../elements/text_input/text_input_state.rs   |  2 +-
 crates/craft_retained/src/elements/window.rs  | 18 +++---
 .../src/events/event_dispatch.rs              |  6 +-
 examples/counter_retained/main.rs             | 20 ++-----
 examples/jsframeworkbench/main.rs             | 59 +++++++++----------
 examples/text/main.rs                         | 37 ++++++------
 16 files changed, 96 insertions(+), 141 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index cdbf5b08..5c82157a 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -27,7 +27,7 @@ use crate::CraftOptions;
 use crate::animations::animation::AnimationFlags;
 use crate::document::DocumentManager;
 use crate::elements::core::ElementInternals;
-use crate::elements::{ElementImpl, ElementIdMap, Window};
+use crate::elements::{ElementIdMap, ElementImpl, Window};
 use crate::events::internal::InternalMessage;
 use crate::events::{CraftMessage, Event, EventDispatcher};
 use crate::layout::TaffyTree;
@@ -253,8 +253,7 @@ impl App {
             CraftMessage::PointerButtonDown(pointer_event)
         };
         let message = event;
-        window
-            .set_mouse_position(Some(Point::new(cursor_position.x, cursor_position.y)));
+        window.set_mouse_position(Some(Point::new(cursor_position.x, cursor_position.y)));
 
         self.dispatch_event(window.clone(), &message, true);
 
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 3c2b53be..471f99dd 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -10,9 +10,9 @@ use kurbo::{Affine, Point};
 
 use crate::app::TAFFY_TREE;
 use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
+use crate::elements::element::{AsElement, Element};
 use crate::elements::element_data::ElementData;
 use crate::elements::{ElementImpl, scrollable};
-use crate::elements::element::{AsElement, Element};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
@@ -39,9 +39,7 @@ impl Container {
 
         inner.borrow_mut().element_data.create_layout_node(None);
 
-        Self {
-            inner
-        }
+        Self { inner }
     }
 }
 
@@ -187,4 +185,4 @@ impl ElementInternals for ContainerInner {
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
         resolve_clip_for_scrollable(self, clip_bounds);
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index 04f95f53..a4b81650 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -12,7 +12,7 @@ use rustc_hash::FxHashMap;
 use taffy::Overflow;
 
 use crate::animations::animation::{ActiveAnimation, AnimationFlags, AnimationStatus};
-use crate::app::{TAFFY_TREE};
+use crate::app::TAFFY_TREE;
 use crate::elements::ElementImpl;
 use crate::elements::core::element_data::ElementData;
 use crate::events::{CraftMessage, Event};
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 2d4ade1c..4fb5d227 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -12,14 +12,8 @@ use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
 use crate::document::Document;
 use crate::elements::ElementIdMap;
 use crate::elements::core::ElementData;
-use crate::events::{
-    KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler,
-    PointerUpdateHandler, SliderValueChangedHandler,
-};
-use crate::style::{
-    AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit,
-    Weight, Wrap,
-};
+use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
+use crate::style::{AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit, Weight, Wrap};
 
 /// The element trait for end-users.
 pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + Any {
@@ -566,9 +560,7 @@ pub trait Element: Clone + AsElement {
     }
 
     fn on_pointer_moved(self, on_pointer_moved: PointerUpdateHandler) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .on_pointer_moved(on_pointer_moved);
+        self.as_element_rc().borrow_mut().on_pointer_moved(on_pointer_moved);
         self
     }
 
@@ -815,5 +807,4 @@ pub trait Element: Clone + AsElement {
     fn has_pointer_capture(&self, pointer_id: PointerId) -> bool {
         self.as_element_rc().borrow().has_pointer_capture(pointer_id)
     }
-
 }
diff --git a/crates/craft_retained/src/elements/element_id_map.rs b/crates/craft_retained/src/elements/element_id_map.rs
index f3c04532..1c8df674 100644
--- a/crates/craft_retained/src/elements/element_id_map.rs
+++ b/crates/craft_retained/src/elements/element_id_map.rs
@@ -22,7 +22,11 @@ impl ElementIdMap {
         self.map.insert(element_data.internal_id, element_data.me.clone())
     }
 
-    pub fn insert_id(&mut self, id: u64, element: Weak<RefCell<dyn ElementImpl>>) -> Option<Weak<RefCell<dyn ElementImpl>>> {
+    pub fn insert_id(
+        &mut self,
+        id: u64,
+        element: Weak<RefCell<dyn ElementImpl>>,
+    ) -> Option<Weak<RefCell<dyn ElementImpl>>> {
         self.map.insert(id, element)
     }
 
diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index 36f75051..f3de6d2c 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -14,16 +14,10 @@ mod text_input;
 mod window;
 
 pub use container::Container;
-pub use element::Element;
-pub use element::ElementImpl;
+pub use element::{Element, ElementImpl};
 pub use element_id_map::ElementIdMap;
 pub use image::Image;
-pub use slider::Slider;
-pub use slider::SliderDirection;
-pub use text::Text;
-pub use text_input::TextInput;
+pub use slider::{Slider, SliderDirection, SliderInner};
+pub use text::{Text, TextInner};
+pub use text_input::{TextInput, TextInputInner};
 pub use window::Window;
-
-pub use text::TextInner;
-pub use text_input::TextInputInner;
-pub use slider::SliderInner;
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/slider/mod.rs b/crates/craft_retained/src/elements/slider/mod.rs
index 2943f9fc..168f004d 100644
--- a/crates/craft_retained/src/elements/slider/mod.rs
+++ b/crates/craft_retained/src/elements/slider/mod.rs
@@ -2,4 +2,4 @@ mod slider;
 mod slider_draw;
 mod slider_logic;
 
-pub use slider::{Slider, SliderInner, SliderDirection};
+pub use slider::{Slider, SliderDirection, SliderInner};
diff --git a/crates/craft_retained/src/elements/slider/slider.rs b/crates/craft_retained/src/elements/slider/slider.rs
index 879e6c65..1f93e3ae 100644
--- a/crates/craft_retained/src/elements/slider/slider.rs
+++ b/crates/craft_retained/src/elements/slider/slider.rs
@@ -10,10 +10,10 @@ use ui_events::keyboard::{Code, KeyState};
 use ui_events::pointer::PointerId;
 
 use crate::app::queue_event;
-use crate::elements::{Element, ElementImpl};
 use crate::elements::core::ElementInternals;
 use crate::elements::element::AsElement;
 use crate::elements::element_data::ElementData;
+use crate::elements::{Element, ElementImpl};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::palette;
@@ -55,7 +55,7 @@ pub struct SliderInner {
 impl Slider {
     pub fn new(thumb_size: f32) -> Self {
         Self {
-            inner: SliderInner::new(thumb_size)
+            inner: SliderInner::new(thumb_size),
         }
     }
 
@@ -122,14 +122,10 @@ impl Slider {
         self.inner.borrow().get_thumb_color()
     }
 
-    pub fn thumb_border_radius(
-        self,
-        top: (f32, f32),
-        right: (f32, f32),
-        bottom: (f32, f32),
-        left: (f32, f32),
-    ) -> Self {
-        self.inner.borrow_mut().set_thumb_border_radius(top, right, bottom, left);
+    pub fn thumb_border_radius(self, top: (f32, f32), right: (f32, f32), bottom: (f32, f32), left: (f32, f32)) -> Self {
+        self.inner
+            .borrow_mut()
+            .set_thumb_border_radius(top, right, bottom, left);
         self
     }
 
@@ -146,21 +142,16 @@ impl Slider {
         self.inner.borrow().get_track_color()
     }
 
-    pub fn track_border_radius(
-        self,
-        top: (f32, f32),
-        right: (f32, f32),
-        bottom: (f32, f32),
-        left: (f32, f32),
-    ) -> Self {
-        self.inner.borrow_mut().set_track_border_radius(top, right, bottom, left);
+    pub fn track_border_radius(self, top: (f32, f32), right: (f32, f32), bottom: (f32, f32), left: (f32, f32)) -> Self {
+        self.inner
+            .borrow_mut()
+            .set_track_border_radius(top, right, bottom, left);
         self
     }
 
     pub fn get_track_border_radius(&self) -> Option<[(f32, f32); 4]> {
         self.inner.borrow().get_track_border_radius()
     }
-
 }
 
 impl SliderInner {
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index e7b8b3e7..2d4ee084 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -36,11 +36,11 @@ use ui_events::pointer::{PointerButton, PointerId};
 use web_time as time;
 use winit::dpi;
 
-use crate::elements::{Element, ElementImpl};
 use crate::elements::core::ElementInternals;
 use crate::elements::element::AsElement;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::elements::element_id::create_unique_element_id;
+use crate::elements::{Element, ElementImpl};
 use crate::layout::TaffyTree;
 
 #[derive(Clone)]
@@ -103,9 +103,7 @@ impl Text {
 
         inner.borrow_mut().set_text(text);
 
-        Text {
-            inner
-        }
+        Text { inner }
     }
 
     pub fn get_selectable(&self) -> bool {
@@ -133,7 +131,6 @@ impl Text {
 }
 
 impl TextInner {
-
     pub fn get_selectable(&self) -> bool {
         self.selectable
     }
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 57381806..0eaf1e87 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -20,8 +20,8 @@ use crate::elements::element::{AsElement, ElementImpl};
 use crate::elements::element_data::ElementData;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::elements::element_id::create_unique_element_id;
-use crate::elements::{scrollable, Element};
 use crate::elements::text_input::text_input_state::TextInputState;
+use crate::elements::{Element, scrollable};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::layout::layout_context::{LayoutContext, TaffyTextInputContext};
@@ -85,7 +85,6 @@ impl TextInput {
         }));
         inner.borrow_mut().element_data.create_layout_node(context);
 
-
         let taffy_id = inner.borrow().element_data.layout_item.taffy_node_id;
         inner.borrow_mut().state.taffy_id = taffy_id;
         inner.borrow_mut().state.editor.taffy_id = taffy_id;
@@ -94,9 +93,7 @@ impl TextInput {
             elements.insert(inner.borrow().deref());
         });
 
-        Self {
-            inner
-        }
+        Self { inner }
     }
 
     /// Whether the text input will update the editor every update with the user provided text.
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index 0d1fe62c..4bba21ec 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -17,7 +17,7 @@ use web_time::{Duration, Instant};
 use winit::dpi;
 
 use crate::app::{TAFFY_TREE, request_layout};
-use crate::elements::{TextInputInner};
+use crate::elements::TextInputInner;
 use crate::elements::core::ElementInternals;
 use crate::elements::text_input::parley_box_to_rect;
 use crate::layout::layout_context::TextHashKey;
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 1a6538cb..dc4d2214 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -27,16 +27,16 @@ use crate::accessibility::{access_handler::CraftAccessHandler, activation_handle
 use crate::app::FOCUS;
 use crate::app::{App, TAFFY_TREE, WINDOW_MANAGER};
 use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
-use crate::elements::element_data::ElementData;
-use crate::elements::{ElementImpl, scrollable, Element};
 use crate::elements::element::AsElement;
+use crate::elements::element_data::ElementData;
+use crate::elements::{Element, ElementImpl, scrollable};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
 
 #[derive(Clone)]
 pub struct Window {
-    pub inner: Rc<RefCell<WindowInternal>>
+    pub inner: Rc<RefCell<WindowInternal>>,
 }
 
 /// Stores one or more elements.
@@ -82,17 +82,16 @@ impl Window {
         inner.borrow_mut().element_data.create_layout_node(None);
 
         WINDOW_MANAGER.with_borrow_mut(|window_manager| {
-            window_manager.add_window(Window {inner: inner.clone()});
+            window_manager.add_window(Window {
+                inner: inner.clone(),
+            });
         });
 
-        Window {
-            inner
-        }
+        Window { inner }
     }
 }
 
 impl Window {
-
     pub fn winit_window(&self) -> Option<Arc<winit::window::Window>> {
         self.inner.borrow().winit_window()
     }
@@ -157,7 +156,7 @@ impl Window {
     /// Updates the reactive tree, layouts the elements, and draws the view.
     #[cfg(any(not(feature = "accesskit"), target_arch = "wasm32"))]
     pub fn on_request_redraw(&self, craft_app: &mut App) {
-       self.inner.borrow_mut().on_request_redraw(craft_app)
+        self.inner.borrow_mut().on_request_redraw(craft_app)
     }
 
     pub(crate) fn create(&self, craft_app: &mut App, event_loop: &ActiveEventLoop) {
@@ -166,7 +165,6 @@ impl Window {
 }
 
 impl WindowInternal {
-
     pub fn winit_window(&self) -> Option<Arc<winit::window::Window>> {
         self.winit_window.clone()
     }
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index 1d494c71..f5b58af1 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -12,7 +12,8 @@ use crate::events::pointer_capture::maybe_handle_implicit_pointer_capture_releas
 use crate::events::{CraftMessage, Event, FocusAction};
 use crate::text::text_context::TextContext;
 
-pub(super) fn dispatch_capturing_event(_message: &CraftMessage, _targets: &mut VecDeque<Rc<RefCell<dyn ElementImpl>>>) {}
+pub(super) fn dispatch_capturing_event(_message: &CraftMessage, _targets: &mut VecDeque<Rc<RefCell<dyn ElementImpl>>>) {
+}
 
 /// Dispatches 1 event to many elements.
 /// The first dispatch happens at the top-most visual element.
@@ -161,7 +162,8 @@ impl EventDispatcher {
         }*/
 
         // Find the target and freeze the list, so the same set of elements are visited across sub event dispatches.
-        let target: Rc<RefCell<dyn ElementImpl>> = find_target(&root, mouse_position, message, render_list, target_scratch);
+        let target: Rc<RefCell<dyn ElementImpl>> =
+            find_target(&root, mouse_position, message, render_list, target_scratch);
         let mut targets: VecDeque<Rc<RefCell<dyn ElementImpl>>> = freeze_target_list(target);
 
         self.maybe_dispatch_pointer_leave(text_context, &targets);
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index 0407f4f1..037ebef7 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -4,16 +4,9 @@ use std::rc::Rc;
 use craft_retained::elements::{Container, Element, Text, Window};
 use craft_retained::events::ui_events::pointer::PointerButton;
 use craft_retained::style::{AlignItems, FlexDirection, JustifyContent};
-use craft_retained::{Color, rgb};
-use craft_retained::{CraftOptions, pct, px};
+use craft_retained::{Color, CraftOptions, pct, px, rgb};
 
-fn create_button(
-    label: &str,
-    base_color: Color,
-    delta: i64,
-    state: Rc<RefCell<i64>>,
-    count_text: Text,
-) -> Container {
+fn create_button(label: &str, base_color: Color, delta: i64, state: Rc<RefCell<i64>>, count_text: Text) -> Container {
     let border_color = rgb(0, 0, 0);
     Container::new()
         .border_width(px(1), px(2), px(3), px(4))
@@ -29,12 +22,7 @@ fn create_button(
                 event.prevent_propagate();
             }
         }))
-        .push({
-            Text::new(label)
-                .font_size(24.0)
-                .color(Color::WHITE)
-                .selectable(false)
-        })
+        .push({ Text::new(label).font_size(24.0).color(Color::WHITE).selectable(false) })
 }
 
 fn main() {
@@ -69,4 +57,4 @@ fn main() {
         });
 
     craft_retained::craft_main(CraftOptions::basic("Counter"));
-}
\ No newline at end of file
+}
diff --git a/examples/jsframeworkbench/main.rs b/examples/jsframeworkbench/main.rs
index 4a37f85f..9a605ae7 100644
--- a/examples/jsframeworkbench/main.rs
+++ b/examples/jsframeworkbench/main.rs
@@ -98,9 +98,7 @@ impl State {
     pub fn remove_all_rows(&mut self) {
         let to_remove = self.element.get_children();
         for child in to_remove {
-            self.element
-                .remove_child(child)
-                .expect("Failed to remove child!");
+            self.element.remove_child(child).expect("Failed to remove child!");
         }
     }
 
@@ -141,7 +139,6 @@ impl State {
     }
 
     pub fn create_row(data: &Data) -> Container {
-
         Container::new()
             .display(Display::Flex)
             .flex_direction(FlexDirection::Row)
@@ -152,11 +149,14 @@ impl State {
                 Color::from_rgb8(230, 230, 230),
                 Color::from_rgb8(230, 230, 230),
                 Color::from_rgb8(230, 230, 230),
-            ).push(
-            Text::new(&data.id.to_string())
-                .width(Unit::Px(60.0))
-                .margin(Unit::Px(0.0), Unit::Px(12.0), Unit::Px(0.0), Unit::Px(0.0))
-            ).push(Text::new(&data.label))
+            )
+            .push(Text::new(&data.id.to_string()).width(Unit::Px(60.0)).margin(
+                Unit::Px(0.0),
+                Unit::Px(12.0),
+                Unit::Px(0.0),
+                Unit::Px(0.0),
+            ))
+            .push(Text::new(&data.label))
     }
 
     pub fn add(&mut self) {
@@ -299,8 +299,7 @@ fn build_body(state: Rc<RefCell<State>>) -> Container {
         .align_items(Some(AlignItems::Start))
         .padding(Unit::Px(15.0), Unit::Px(15.0), Unit::Px(15.0), Unit::Px(15.0));
 
-    let text = Text::new(r#"Craft-"keyed""#)
-        .font_size(32.0).color(Color::BLACK);
+    let text = Text::new(r#"Craft-"keyed""#).font_size(32.0).color(Color::BLACK);
 
     let text_container = Container::new()
         .display(Display::Flex)
@@ -320,9 +319,7 @@ fn build_body(state: Rc<RefCell<State>>) -> Container {
         .width(Unit::Percentage(100.0))
         .push(buttons);
 
-    body
-        .push(header)
-        .push(state.borrow().element.clone())
+    body.push(header).push(state.borrow().element.clone())
 }
 
 fn build_data_list() -> Container {
@@ -374,22 +371,20 @@ fn build_buttons(state: Rc<RefCell<State>>) -> Container {
 fn build_button<F>(label: &str, callback: F) -> Container
 where
     F: Fn(&mut Event, &PointerButtonEvent) + 'static,
-
-    {
-        let border_color = Color::from_rgb8(111, 111, 111);
-        Container::new()
-            .background_color(Color::from_rgb8(211, 211, 211))
-            .border_color(border_color, border_color, border_color, border_color)
-            .flex_direction(FlexDirection::Row)
-            .justify_content(Some(JustifyContent::Center))
-            .align_items(Some(AlignItems::Center))
-            .gap(Unit::Px(12.0), Unit::Px(12.0))
-            .width(Unit::Px(250.0))
-            .height(Unit::Px(35.0))
-            .background_color(Color::from_rgb8(51, 122, 183))
-            .color(WHITE)
-            .border_radius((4.0, 4.0), (4.0, 4.0), (4.0, 4.0), (4.0, 4.0))
-            .push(
-                Text::new(label).selectable(false).color(Color::WHITE)
-            ).on_pointer_button_up(Rc::new(callback))
+{
+    let border_color = Color::from_rgb8(111, 111, 111);
+    Container::new()
+        .background_color(Color::from_rgb8(211, 211, 211))
+        .border_color(border_color, border_color, border_color, border_color)
+        .flex_direction(FlexDirection::Row)
+        .justify_content(Some(JustifyContent::Center))
+        .align_items(Some(AlignItems::Center))
+        .gap(Unit::Px(12.0), Unit::Px(12.0))
+        .width(Unit::Px(250.0))
+        .height(Unit::Px(35.0))
+        .background_color(Color::from_rgb8(51, 122, 183))
+        .color(WHITE)
+        .border_radius((4.0, 4.0), (4.0, 4.0), (4.0, 4.0), (4.0, 4.0))
+        .push(Text::new(label).selectable(false).color(Color::WHITE))
+        .on_pointer_button_up(Rc::new(callback))
 }
diff --git a/examples/text/main.rs b/examples/text/main.rs
index 59141f6f..05c2318c 100644
--- a/examples/text/main.rs
+++ b/examples/text/main.rs
@@ -4,24 +4,25 @@ use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent,
 
 fn main() {
     let root = Window::new();
-    root.push(Container::new()
-        .display(Display::Flex)
-        .flex_direction(FlexDirection::Column)
-        .justify_content(Some(JustifyContent::Center))
-        .align_items(Some(AlignItems::Center))
-        .width(Unit::Percentage(100.0))
-        .height(Unit::Percentage(100.0))
-        .gap(Unit::Px(20.0), Unit::Px(20.0))
-        .font_size(72.0)
-        .color(rgb(50, 50, 50))
-        .push(
-            TextInput::new(include_str!("../counter_retained/main.rs"))
-                .overflow(Overflow::Visible, Overflow::Scroll)
-                .width(Unit::Px(600.0))
-                .height(Unit::Px(600.0))
-                .display(Display::Block)
-        )
-        );
+    root.push(
+        Container::new()
+            .display(Display::Flex)
+            .flex_direction(FlexDirection::Column)
+            .justify_content(Some(JustifyContent::Center))
+            .align_items(Some(AlignItems::Center))
+            .width(Unit::Percentage(100.0))
+            .height(Unit::Percentage(100.0))
+            .gap(Unit::Px(20.0), Unit::Px(20.0))
+            .font_size(72.0)
+            .color(rgb(50, 50, 50))
+            .push(
+                TextInput::new(include_str!("../counter_retained/main.rs"))
+                    .overflow(Overflow::Visible, Overflow::Scroll)
+                    .width(Unit::Px(600.0))
+                    .height(Unit::Px(600.0))
+                    .display(Display::Block),
+            ),
+    );
 
     use craft_retained::CraftOptions;
     util::setup_logging();

From 8f27b27d353cf0832f2b587a2f58fa4642459334 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 4 Jan 2026 18:10:57 -0500
Subject: [PATCH 041/143] update readme

---
 README.md | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 6d6efdd2..3aa460e5 100644
--- a/README.md
+++ b/README.md
@@ -14,19 +14,11 @@ use std::rc::Rc;
 use craft_retained::elements::{Container, Element, Text, Window};
 use craft_retained::events::ui_events::pointer::PointerButton;
 use craft_retained::style::{AlignItems, FlexDirection, JustifyContent};
-use craft_retained::{Color, rgb};
-use craft_retained::{CraftOptions, pct, px};
+use craft_retained::{Color, CraftOptions, pct, px, rgb};
 
-fn create_button(
-    label: &str,
-    base_color: Color,
-    delta: i64,
-    state: Rc<RefCell<i64>>,
-    count_text: Rc<RefCell<Text>>,
-) -> Rc<RefCell<dyn Element>> {
+fn create_button(label: &str, base_color: Color, delta: i64, state: Rc<RefCell<i64>>, count_text: Text) -> Container {
     let border_color = rgb(0, 0, 0);
     Container::new()
-        .borrow_mut()
         .border_width(px(1), px(2), px(3), px(4))
         .border_color(border_color, border_color, border_color, border_color)
         .border_radius((10.0, 10.0), (10.0, 10.0), (10.0, 10.0), (10.0, 10.0))
@@ -36,19 +28,11 @@ fn create_button(
         .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {
             if pointer_button_event.button == Some(PointerButton::Primary) {
                 *state.borrow_mut() += delta;
-                count_text.borrow_mut().text(&format!("Count: {}", state.borrow()));
+                count_text.clone().text(&format!("Count: {}", state.borrow()));
                 event.prevent_propagate();
             }
         }))
-        .push({
-            Text::new(label)
-                .borrow_mut()
-                .font_size(24.0)
-                .color(Color::WHITE)
-                .selectable(false)
-                .to_rc()
-        })
-        .to_rc()
+        .push({ Text::new(label).font_size(24.0).color(Color::WHITE).selectable(false) })
 }
 
 fn main() {
@@ -56,7 +40,6 @@ fn main() {
     let count_text = Text::new(&format!("Count: {}", count.borrow()));
 
     Window::new()
-        .borrow_mut()
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::Center))
         .align_items(Some(AlignItems::Center))
@@ -66,7 +49,6 @@ fn main() {
         .push(count_text.clone())
         .push({
             Container::new()
-                .borrow_mut()
                 .gap(px(20), px(20))
                 .push(create_button(
                     "-",
@@ -82,7 +64,6 @@ fn main() {
                     count.clone(),
                     count_text.clone(),
                 ))
-                .to_rc()
         });
 
     craft_retained::craft_main(CraftOptions::basic("Counter"));

From f76cb78bbe02f680355a4a182cb08a22e7ebb949 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 4 Jan 2026 19:18:23 -0500
Subject: [PATCH 042/143] remove unnecessary braces

---
 README.md                         | 2 +-
 examples/counter_retained/main.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3aa460e5..0887a74c 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ fn create_button(label: &str, base_color: Color, delta: i64, state: Rc<RefCell<i
                 event.prevent_propagate();
             }
         }))
-        .push({ Text::new(label).font_size(24.0).color(Color::WHITE).selectable(false) })
+        .push(Text::new(label).font_size(24.0).color(Color::WHITE).selectable(false))
 }
 
 fn main() {
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index 037ebef7..bdd57b47 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -22,7 +22,7 @@ fn create_button(label: &str, base_color: Color, delta: i64, state: Rc<RefCell<i
                 event.prevent_propagate();
             }
         }))
-        .push({ Text::new(label).font_size(24.0).color(Color::WHITE).selectable(false) })
+        .push(Text::new(label).font_size(24.0).color(Color::WHITE).selectable(false))
 }
 
 fn main() {

From 5602a4df5081db658f7b2d82f94e2f57410f2535 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 4 Jan 2026 23:21:38 -0500
Subject: [PATCH 043/143] scale factor fixes

---
 crates/craft_retained/src/app.rs              | 11 +++-----
 .../craft_retained/src/craft_winit_state.rs   |  2 +-
 .../src/elements/core/element_internals.rs    |  5 ++--
 crates/craft_retained/src/elements/text.rs    |  5 ++--
 .../src/elements/text_input/mod.rs            |  3 +-
 crates/craft_retained/src/elements/window.rs  | 28 +++++++++++--------
 6 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 5c82157a..769a5777 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -115,11 +115,8 @@ impl App {
         info!("Craft application is closing.");
     }
 
-    pub fn on_scale_factor_changed(&mut self, _scale_factor: f64) {
-        /*self.window_context.scale_factor = scale_factor;
-        self.on_resize(self.window.as_ref().unwrap().inner_size());
-        self.root.borrow_mut().scale_factor(self.window_context.effective_scale_factor());
-        style_root_element(self.root.borrow_mut().deref_mut(), self.window_context.window_size());*/
+    pub fn on_scale_factor_changed(&mut self, window: Window, scale_factor: f64) {
+        window.on_scale_factor_changed(scale_factor);
     }
 
     pub fn on_resume(&mut self, event_loop: &ActiveEventLoop) {
@@ -241,7 +238,7 @@ impl App {
 
     pub fn on_pointer_button(&mut self, window: Window, pointer_event: PointerButtonEvent, is_up: bool) {
         let mut pointer_event = pointer_event;
-        let zoom = window.zoom_scale_factor();
+        let zoom = window.effective_scale_factor();
         pointer_event.state.position.x /= zoom;
         pointer_event.state.position.y /= zoom;
 
@@ -262,7 +259,7 @@ impl App {
 
     pub fn on_pointer_moved(&mut self, window: Window, mouse_moved: PointerUpdate) {
         let mut mouse_moved = mouse_moved;
-        let zoom = window.zoom_scale_factor();
+        let zoom = window.effective_scale_factor();
         mouse_moved.current.position.x /= zoom;
         mouse_moved.current.position.y /= zoom;
 
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index e3948e33..7bafe0ae 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -142,7 +142,7 @@ impl ApplicationHandler for CraftWinitState {
                 });
             }
             WindowEvent::ScaleFactorChanged { scale_factor, .. } => {
-                craft_state.craft_app.on_scale_factor_changed(scale_factor);
+                craft_state.craft_app.on_scale_factor_changed(window, scale_factor);
             }
             WindowEvent::Resized(new_size) => {
                 let new_size = Size::<f32> {
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index a4b81650..2301b8e7 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -414,9 +414,10 @@ pub trait ElementInternals: ElementData {
     }
 
     /// Set's this element's scale factor. This should not be used to scale individual elements.
-    fn scale_factor(&mut self, scale_factor: f64) {
+    fn set_scale_factor(&mut self, scale_factor: f64) {
+        self.apply_borders(scale_factor);
         for child in &self.element_data().children {
-            child.borrow_mut().scale_factor(scale_factor);
+            child.borrow_mut().set_scale_factor(scale_factor);
         }
     }
 }
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 2d4ee084..2e5e47e0 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -413,7 +413,8 @@ impl ElementInternals for TextInner {
         }
     }
 
-    fn scale_factor(&mut self, scale_factor: f64) {
+    fn set_scale_factor(&mut self, scale_factor: f64) {
+        self.apply_borders(scale_factor);
         self.state.is_layout_dirty = true;
         self.state.is_render_dirty = true;
         self.mark_dirty();
@@ -460,7 +461,7 @@ impl TextState {
             AvailableSpace::MinContent => Some(content_widths.min),
             AvailableSpace::MaxContent => Some(content_widths.max),
             AvailableSpace::Definite(width) => {
-                let scaled_width: f32 = dpi::PhysicalUnit::from_logical::<f32, f32>(width, self.scale_factor as f64).0;
+                let scaled_width: f32 = dpi::PhysicalUnit::from_logical::<f32, f32>(width, self.scale_factor).0;
                 Some(scaled_width.clamp(content_widths.min, content_widths.max))
             }
         });
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 0eaf1e87..88fd17ce 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -412,7 +412,8 @@ impl ElementInternals for TextInputInner {
         style
     }
 
-    fn scale_factor(&mut self, scale_factor: f64) {
+    fn set_scale_factor(&mut self, scale_factor: f64) {
+        self.apply_borders(scale_factor);
         self.state.set_scale_factor(scale_factor);
         self.mark_dirty();
     }
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index dc4d2214..b71aab26 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -110,7 +110,7 @@ impl Window {
     }
 
     /// Get the logical size of the window.
-    pub fn window_size(&self) -> Size<f64> {
+    pub fn window_size(&self) -> Size<f32> {
         self.inner.borrow().window_size()
     }
 
@@ -122,7 +122,7 @@ impl Window {
         self.inner.borrow_mut().zoom_out()
     }
 
-    pub(crate) fn zoom_scale_factor(&self) -> f64 {
+    pub fn zoom_scale_factor(&self) -> f64 {
         self.inner.borrow().zoom_scale_factor()
     }
 
@@ -162,6 +162,10 @@ impl Window {
     pub(crate) fn create(&self, craft_app: &mut App, event_loop: &ActiveEventLoop) {
         self.inner.borrow_mut().create(craft_app, event_loop)
     }
+
+    pub(crate) fn on_scale_factor_changed(&self, scale_factor: f64) {
+        self.inner.borrow_mut().on_scale_factor_changed(scale_factor);
+    }
 }
 
 impl WindowInternal {
@@ -173,20 +177,16 @@ impl WindowInternal {
         self.winit_window = window;
     }
 
-    pub fn set_scale_factor(&mut self, scale_factor: f64) {
-        self.scale_factor = scale_factor;
-    }
-
     /// Get the effective scale factor factoring window scale factor and zoom.
     pub fn effective_scale_factor(&self) -> f64 {
         self.scale_factor * self.zoom_scale_factor
     }
 
     /// Get the logical size of the window.
-    pub fn window_size(&self) -> Size<f64> {
+    pub fn window_size(&self) -> Size<f32> {
         Size::new(
-            self.window_size.width as f64 * self.effective_scale_factor(),
-            self.window_size.height as f64 * self.effective_scale_factor(),
+            self.window_size.width / self.effective_scale_factor() as f32,
+            self.window_size.height / self.effective_scale_factor() as f32,
         )
     }
 
@@ -217,7 +217,7 @@ impl WindowInternal {
         let size = self.window_size();
         self.render_list
             .borrow_mut()
-            .set_cull(Some(Rectangle::new(0.0, 0.0, size.width as f32, size.height as f32)));
+            .set_cull(Some(Rectangle::new(0.0, 0.0, size.width, size.height)));
         // On macOS the window needs to be redrawn manually after resizing
         #[cfg(target_os = "macos")]
         {
@@ -241,6 +241,12 @@ impl WindowInternal {
         self.draw_window(text_context, resource_manager);
     }
 
+    pub(crate) fn on_scale_factor_changed(&mut self, scale_factor: f64) {
+        self.scale_factor = scale_factor;
+        self.set_scale_factor(self.effective_scale_factor());
+        self.on_resize(self.window_size);
+    }
+
     fn layout_window(&mut self, text_context: &mut TextContext, resource_manager: Arc<ResourceManager>) -> NodeId {
         let root_node = self
             .element_data
@@ -296,7 +302,7 @@ impl WindowInternal {
             render_list.borrow_mut().deref_mut(),
             text_context,
             None,
-            self.scale_factor,
+            self.effective_scale_factor(),
         );
 
         self.winit_window.clone().unwrap().pre_present_notify();

From 668c6539ecebfa21219fea03a2b6aa0f08464ca1 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 4 Jan 2026 23:41:36 -0500
Subject: [PATCH 044/143] Do not scale clip

---
 crates/craft_retained/src/elements/window.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index b71aab26..0f355357 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -214,7 +214,7 @@ impl WindowInternal {
             renderer.resize_surface(new_size.width.max(1.0), new_size.height.max(1.0));
         }
         self.window_size = new_size;
-        let size = self.window_size();
+        let size = self.window_size;
         self.render_list
             .borrow_mut()
             .set_cull(Some(Rectangle::new(0.0, 0.0, size.width, size.height)));

From 1b54420f7d3b2ba3487005b8869f830ba7cabf2e Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 4 Jan 2026 23:50:14 -0500
Subject: [PATCH 045/143] set scale factor on window creation

---
 crates/craft_retained/src/elements/window.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 0f355357..8b8e2b2e 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -333,6 +333,7 @@ impl WindowInternal {
                 .expect("Failed to create window"),
         );
         self.set_winit_window(Some(winit_window.clone()));
+        self.on_scale_factor_changed(winit_window.scale_factor());
 
         let renderer_type = craft_app.craft_options.renderer;
 

From 528aa014ea257a0bc02a30fe1aca754f182d72d6 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Tue, 6 Jan 2026 01:26:45 -0500
Subject: [PATCH 046/143] Add new_advanced for window.

---
 crates/craft_retained/src/app.rs              | 12 +---
 .../craft_retained/src/craft_winit_state.rs   |  5 +-
 .../craft_retained/src/elements/scrollable.rs |  2 +-
 crates/craft_retained/src/elements/text.rs    |  3 +
 crates/craft_retained/src/elements/window.rs  | 65 ++++++++++++++-----
 crates/craft_retained/src/lib.rs              |  2 +-
 6 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 769a5777..e586b9f4 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -237,12 +237,7 @@ impl App {
     }
 
     pub fn on_pointer_button(&mut self, window: Window, pointer_event: PointerButtonEvent, is_up: bool) {
-        let mut pointer_event = pointer_event;
-        let zoom = window.effective_scale_factor();
-        pointer_event.state.position.x /= zoom;
-        pointer_event.state.position.y /= zoom;
-
-        let cursor_position = pointer_event.state.position;
+        let cursor_position = pointer_event.state.logical_point();
 
         let event = if is_up {
             CraftMessage::PointerButtonUp(pointer_event)
@@ -258,11 +253,6 @@ impl App {
     }
 
     pub fn on_pointer_moved(&mut self, window: Window, mouse_moved: PointerUpdate) {
-        let mut mouse_moved = mouse_moved;
-        let zoom = window.effective_scale_factor();
-        mouse_moved.current.position.x /= zoom;
-        mouse_moved.current.position.y /= zoom;
-
         window.set_mouse_position(Some(mouse_moved.current.logical_point()));
 
         let message = CraftMessage::PointerMovedEvent(mouse_moved);
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index 7bafe0ae..f681ec1a 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -92,7 +92,10 @@ impl ApplicationHandler for CraftWinitState {
                 ..
             }
         ) {
-            match craft_state.event_reducer.reduce(1.0, &event) {
+            match craft_state
+                .event_reducer
+                .reduce(window.effective_scale_factor(), &event)
+            {
                 Some(WindowEventTranslation::Keyboard(keyboard_event)) => {
                     use ui_events::keyboard::{Key, NamedKey};
                     if keyboard_event.state.is_down() && matches!(keyboard_event.key, Key::Named(NamedKey::Escape)) {
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 60ead93e..28881c53 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -46,7 +46,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementImpl, message: &CraftMes
 
                         if container_rectangle.contains(&pointer_button.state.logical_point()) && !in_scroll_bar {
                             state.scroll_click = Some(Point::new(
-                                pointer_button.state.position.x,
+                                pointer_button.state.logical_point().x,
                                 pointer_button.state.logical_point().y,
                             ));
                             event.prevent_propagate();
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 2e5e47e0..9c643df2 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -399,6 +399,9 @@ impl ElementInternals for TextInner {
                     // NOTE: Cursor position should be relative to the top left of the text box.
                     state.cursor_pos = pointer_moved.current.logical_point()
                         - kurbo::Vec2::new(text_position.x as f64, text_position.y as f64);
+                    state.cursor_pos.x /= state.scale_factor;
+                    state.cursor_pos.y /= state.scale_factor;
+                    println!("SF: {}", state.scale_factor);
                     // macOS seems to generate a spurious move after selecting word?
                     if state.pointer_down && prev_pos != state.cursor_pos {
                         state.update_text_selection(self.element_data.style.selection_color());
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 8b8e2b2e..48f753ab 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -39,6 +39,8 @@ pub struct Window {
     pub inner: Rc<RefCell<WindowInternal>>,
 }
 
+pub type WindowConstructor = Box<dyn FnMut(&ActiveEventLoop) -> WinitWindow>;
+
 /// Stores one or more elements.
 ///
 /// If overflow is set to scroll, it will become scrollable.
@@ -60,25 +62,31 @@ pub struct WindowInternal {
     // Will be empty when paused.
     #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     pub(crate) accesskit_adapter: Option<Adapter>,
+
+    advanced_window_fn: Option<WindowConstructor>,
 }
 
 impl Window {
-    pub fn new() -> Self {
-        let inner = Rc::new_cyclic(|me: &Weak<RefCell<WindowInternal>>| {
-            RefCell::new(WindowInternal {
-                element_data: ElementData::new(me.clone(), true),
-                window_size: Default::default(),
-                scale_factor: 1.0,
-                zoom_scale_factor: 1.0,
-                mouse_positon: None,
-                renderer: None,
-                render_list: Rc::new(RefCell::new(RenderList::new())),
-                winit_window: None,
-                #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-                accesskit_adapter: None,
-            })
+    pub fn new_advanced<F>(f: F) -> Self
+    where
+        F: FnMut(&ActiveEventLoop) -> WinitWindow + 'static,
+    {
+        let inner = WindowInternal::new(Some(f));
+
+        inner.borrow_mut().element_data.create_layout_node(None);
+
+        WINDOW_MANAGER.with_borrow_mut(|window_manager| {
+            window_manager.add_window(Window {
+                inner: inner.clone(),
+            });
         });
 
+        Window { inner }
+    }
+
+    pub fn new() -> Self {
+        let inner = WindowInternal::new(None::<fn(&ActiveEventLoop) -> WinitWindow>);
+
         inner.borrow_mut().element_data.create_layout_node(None);
 
         WINDOW_MANAGER.with_borrow_mut(|window_manager| {
@@ -169,6 +177,27 @@ impl Window {
 }
 
 impl WindowInternal {
+    pub fn new<F>(f: Option<F>) -> Rc<RefCell<Self>>
+    where
+        F: FnMut(&ActiveEventLoop) -> WinitWindow + 'static,
+    {
+        Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
+            RefCell::new(Self {
+                element_data: ElementData::new(me.clone(), true),
+                window_size: Default::default(),
+                scale_factor: 1.0,
+                zoom_scale_factor: 1.0,
+                mouse_positon: None,
+                renderer: None,
+                render_list: Rc::new(RefCell::new(RenderList::new())),
+                winit_window: None,
+                #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+                accesskit_adapter: None,
+                advanced_window_fn: f.map(|f| Box::new(f) as WindowConstructor),
+            })
+        })
+    }
+
     pub fn winit_window(&self) -> Option<Arc<winit::window::Window>> {
         self.winit_window.clone()
     }
@@ -327,11 +356,13 @@ impl WindowInternal {
     }
 
     pub(crate) fn create(&mut self, craft_app: &mut App, event_loop: &ActiveEventLoop) {
-        let winit_window = Arc::new(
+        let winit_window: Arc<WinitWindow> = Arc::new(if let Some(window_fn) = &mut self.advanced_window_fn {
+            (*window_fn)(event_loop)
+        } else {
             event_loop
                 .create_window(WindowAttributes::default().with_visible(false))
-                .expect("Failed to create window"),
-        );
+                .expect("Failed to create window")
+        });
         self.set_winit_window(Some(winit_window.clone()));
         self.on_scale_factor_changed(winit_window.scale_factor());
 
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 2f46bb6f..c11b524c 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -42,7 +42,7 @@ pub use utils::craft_error::CraftError;
 use web_time as time;
 #[cfg(target_os = "android")]
 pub use winit::platform::android::activity::*;
-pub use winit::window::{Cursor, CursorIcon};
+pub use winit::window::{Cursor, CursorIcon, WindowAttributes};
 #[cfg(target_os = "android")]
 use {winit::event_loop::EventLoopBuilder, winit::platform::android::EventLoopBuilderExtAndroid};
 

From 3f8ec065a99acb9ef4d8add2aec7e4d012d811d0 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Tue, 6 Jan 2026 01:40:32 -0500
Subject: [PATCH 047/143] Add new_advanced for window.

---
 crates/craft_retained/src/elements/window.rs | 30 ++++++++------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 48f753ab..79f8830c 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -73,28 +73,12 @@ impl Window {
     {
         let inner = WindowInternal::new(Some(f));
 
-        inner.borrow_mut().element_data.create_layout_node(None);
-
-        WINDOW_MANAGER.with_borrow_mut(|window_manager| {
-            window_manager.add_window(Window {
-                inner: inner.clone(),
-            });
-        });
-
         Window { inner }
     }
 
     pub fn new() -> Self {
         let inner = WindowInternal::new(None::<fn(&ActiveEventLoop) -> WinitWindow>);
 
-        inner.borrow_mut().element_data.create_layout_node(None);
-
-        WINDOW_MANAGER.with_borrow_mut(|window_manager| {
-            window_manager.add_window(Window {
-                inner: inner.clone(),
-            });
-        });
-
         Window { inner }
     }
 }
@@ -181,7 +165,7 @@ impl WindowInternal {
     where
         F: FnMut(&ActiveEventLoop) -> WinitWindow + 'static,
     {
-        Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
+        let inner = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
             RefCell::new(Self {
                 element_data: ElementData::new(me.clone(), true),
                 window_size: Default::default(),
@@ -195,7 +179,17 @@ impl WindowInternal {
                 accesskit_adapter: None,
                 advanced_window_fn: f.map(|f| Box::new(f) as WindowConstructor),
             })
-        })
+        });
+
+        inner.borrow_mut().element_data.create_layout_node(None);
+
+        WINDOW_MANAGER.with_borrow_mut(|window_manager| {
+            window_manager.add_window(Window {
+                inner: inner.clone(),
+            });
+        });
+
+        inner
     }
 
     pub fn winit_window(&self) -> Option<Arc<winit::window::Window>> {

From c5b7a72cc1b5e2fceac0747b69a2b6f515af37a7 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Tue, 6 Jan 2026 21:31:37 -0500
Subject: [PATCH 048/143] Make Style a simple old Box<Style>

---
 .../src/animations/animation.rs               | 351 -------
 crates/craft_retained/src/animations/mod.rs   |   3 -
 crates/craft_retained/src/app.rs              |   4 -
 .../craft_retained/src/craft_winit_state.rs   |  14 +-
 .../src/elements/core/element_internals.rs    |  82 +-
 crates/craft_retained/src/elements/element.rs |  13 +-
 .../src/elements/element_data.rs              |  19 +-
 .../craft_retained/src/elements/scrollable.rs |   2 +-
 .../src/elements/slider/slider_draw.rs        |   2 +-
 crates/craft_retained/src/elements/text.rs    |   9 +-
 .../src/elements/text_input/mod.rs            |   6 +-
 .../elements/text_input/text_input_state.rs   |   6 +-
 .../craft_retained/src/layout/layout_item.rs  |  10 +-
 crates/craft_retained/src/lib.rs              |   2 -
 crates/craft_retained/src/style/mod.rs        | 297 +++++-
 .../craft_retained/src/style/style_flags.rs   |  49 -
 crates/craft_retained/src/style/styles.rs     | 980 +++++++-----------
 .../src/style/taffy_conversions.rs            | 106 +-
 examples/counter_retained/Cargo.toml          |   4 +-
 examples/jsframeworkbench/main.rs             |   4 +-
 20 files changed, 791 insertions(+), 1172 deletions(-)
 delete mode 100644 crates/craft_retained/src/animations/animation.rs
 delete mode 100644 crates/craft_retained/src/animations/mod.rs
 delete mode 100644 crates/craft_retained/src/style/style_flags.rs

diff --git a/crates/craft_retained/src/animations/animation.rs b/crates/craft_retained/src/animations/animation.rs
deleted file mode 100644
index 1a38ab85..00000000
--- a/crates/craft_retained/src/animations/animation.rs
+++ /dev/null
@@ -1,351 +0,0 @@
-use std::collections::HashMap;
-use std::iter::zip;
-use std::time::Duration;
-
-use craft_primitives::geometry::TrblRectangle;
-use kurbo::{CubicBez, ParamCurve, Point};
-use smallvec::SmallVec;
-use smol_str::SmolStr;
-
-use crate::style::{Style, StyleProperty, Unit};
-
-#[derive(Clone, Debug)]
-pub struct KeyFrame {
-    /// The action / styles interpolated at `offset_percentage`.
-    /// Range [0.0, 100.0]
-    offset_percentage: f32,
-
-    /// The list of styles interpolated to an element at this keyframe.
-    properties: SmallVec<[StyleProperty; 3]>,
-}
-
-impl KeyFrame {
-    pub fn new(offset_percentage: f32) -> Self {
-        KeyFrame {
-            offset_percentage,
-            properties: SmallVec::new(),
-        }
-    }
-
-    pub fn push(mut self, property: StyleProperty) -> Self {
-        self.properties.push(property);
-        self
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-pub enum AnimationStatus {
-    Paused,
-    Playing,
-    Scheduled,
-}
-
-/// A cubic bézier curve where P0 and P3 are stuck at (0,0) and (1,1).
-#[derive(Clone, Copy, Debug)]
-pub struct FixedCubicBezier {
-    cubic_bez: CubicBez,
-}
-
-impl FixedCubicBezier {
-    /// Sets P1 and P2 of a fixed cubic bézier curve.
-    pub fn new(x1: f32, y1: f32, x2: f32, y2: f32) -> Self {
-        Self {
-            cubic_bez: CubicBez::new(
-                Point::new(0.0, 0.0),
-                Point::new(x1 as f64, y1 as f64),
-                Point::new(x2 as f64, y2 as f64),
-                Point::new(1.0, 1.0),
-            ),
-        }
-    }
-}
-
-/// The motion of an animation modeled with a mathematical function.
-#[derive(Default, Copy, Clone, Debug)]
-pub enum TimingFunction {
-    /// https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function#linear
-    #[default]
-    Linear,
-    /// https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function#ease
-    Ease,
-    /// https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function#ease-in
-    EaseIn,
-    /// https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function#ease-out
-    EaseOut,
-    /// https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function#ease-in-out
-    EaseInOut,
-    /// https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function#cubic-beziernumber_01_number_number_01_number
-    BezierCurve(FixedCubicBezier),
-}
-
-#[derive(Clone, Debug)]
-pub struct Animation {
-    pub name: SmolStr,
-    pub key_frames: SmallVec<[KeyFrame; 2]>,
-    pub duration: Duration,
-    pub timing_function: TimingFunction,
-    pub loop_amount: LoopAmount,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum LoopAmount {
-    Infinite,
-    Fixed(u32),
-}
-
-impl Animation {
-    pub fn new(name: &str, duration: Duration, timing_function: TimingFunction) -> Self {
-        Self {
-            name: name.into(),
-            key_frames: SmallVec::new(),
-            duration,
-            timing_function,
-            loop_amount: LoopAmount::Fixed(1),
-        }
-    }
-
-    pub fn push(mut self, key_frame: KeyFrame) -> Self {
-        self.key_frames.push(key_frame);
-        self
-    }
-
-    pub fn loop_amount(mut self, loop_amount: LoopAmount) -> Self {
-        self.loop_amount = loop_amount;
-        self
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-pub struct ActiveAnimation {
-    /// How far into an animation we are.
-    pub(crate) current: Duration,
-    /// Tracks the status of an animation, if it is playing, scheduled, or paused.
-    pub(crate) status: AnimationStatus,
-    pub(crate) loop_amount: LoopAmount,
-}
-
-/// For damage tracking across recursive calls to `on_animation_frame`.
-#[derive(Clone, Copy, Debug, Default)]
-pub struct AnimationFlags {
-    needs_relayout: bool,
-    has_active_animation: bool,
-}
-
-impl AnimationFlags {
-    /// OR'd with the provided boolean and the previously stored boolean, to track if an animatable property effects layout.
-    /// This is used after `on_animation_frame` to optionally recompute the layout.
-    pub fn set_needs_relayout(&mut self, needs_relayout: bool) {
-        self.needs_relayout |= needs_relayout;
-    }
-
-    /// Returns whether we need to perform a relayout or not.
-    pub fn needs_relayout(&self) -> bool {
-        self.needs_relayout
-    }
-
-    /// OR'd with the provided boolean and the previously stored boolean, to track if any animation is active.
-    pub fn set_has_active_animation(&mut self, has_active_animation: bool) {
-        self.has_active_animation |= has_active_animation;
-    }
-
-    /// Returns true if any animation is in the Playing state.
-    pub fn has_active_animation(&self) -> bool {
-        self.has_active_animation
-    }
-}
-
-impl ActiveAnimation {
-    /// Advances an active animation, and it is also responsible for tracking the status and element_state.
-    pub fn tick(&mut self, animation_flags: &mut AnimationFlags, animation: &Animation, delta: Duration) {
-        if self.status == AnimationStatus::Playing {
-            self.current += delta;
-
-            let is_completed = self.current >= animation.duration;
-
-            match &mut self.loop_amount {
-                LoopAmount::Infinite => {
-                    if is_completed {
-                        self.current = Duration::ZERO;
-                    }
-                }
-                LoopAmount::Fixed(amount) => {
-                    if is_completed {
-                        *amount -= 1;
-
-                        if *amount == 0 {
-                            self.current = Duration::ZERO;
-                            self.status = AnimationStatus::Paused;
-                            animation_flags.set_needs_relayout(true);
-                        } else {
-                            self.current = Duration::ZERO;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /// Called after `tick`, and is responsible for using the current animation time and
-    /// computing an interpolated style from a provided `Animation`.
-    pub fn compute_style(
-        &mut self,
-        element_style: &Style,
-        animation: &Animation,
-        animation_flags: &mut AnimationFlags,
-    ) -> Style {
-        if self.status != AnimationStatus::Playing {
-            return element_style.clone();
-        }
-
-        let pos = Duration::div_duration_f32(self.current, animation.duration);
-        fn find_keyframe_pair(pos: f32, animation: &Animation) -> (&KeyFrame, &KeyFrame) {
-            let mut sorted = animation.key_frames.iter().collect::<Vec<_>>();
-            sorted.sort_unstable_by(|a, b| a.offset_percentage.total_cmp(&b.offset_percentage));
-            for window in sorted.windows(2) {
-                let [start, end] = window else { continue };
-                if pos >= (start.offset_percentage / 100.0) && pos <= (end.offset_percentage / 100.0) {
-                    return (start, end);
-                }
-            }
-
-            panic!("No keyframes available.");
-        }
-
-        let (keyframe_start, keyframe_end) = find_keyframe_pair(pos, animation);
-
-        let mut style = Style::default();
-        let mut start_map = HashMap::new();
-        let mut end_map = HashMap::new();
-
-        for prop in &keyframe_start.properties {
-            start_map.insert(std::mem::discriminant(prop), prop);
-        }
-
-        for prop in &keyframe_end.properties {
-            end_map.insert(std::mem::discriminant(prop), prop);
-        }
-
-        for key in start_map
-            .keys()
-            .chain(end_map.keys())
-            .collect::<std::collections::HashSet<_>>()
-        {
-            let start_prop = start_map.get(key);
-            let end_prop = end_map.get(key);
-
-            let start_percentage = keyframe_start.offset_percentage / 100.0;
-            let end_percentage = keyframe_end.offset_percentage / 100.0;
-            let local_t = (pos - start_percentage) / (end_percentage - start_percentage);
-
-            let t = match &animation.timing_function {
-                TimingFunction::Linear => {
-                    // https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function#linear
-                    let linear = FixedCubicBezier::new(0.0, 0.0, 1.0, 1.0);
-                    linear.cubic_bez.eval(local_t as f64).y
-                }
-                TimingFunction::Ease => {
-                    // https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function#ease
-                    let ease = FixedCubicBezier::new(0.25, 0.1, 0.25, 1.0);
-                    ease.cubic_bez.eval(local_t as f64).y
-                }
-                TimingFunction::EaseIn => {
-                    // https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function#ease-in
-                    let ease_in = FixedCubicBezier::new(0.42, 0.0, 1.0, 1.0);
-                    ease_in.cubic_bez.eval(local_t as f64).y
-                }
-                TimingFunction::EaseOut => {
-                    // https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function#ease-out
-                    let ease_out = FixedCubicBezier::new(0.0, 0.0, 0.58, 1.0);
-                    ease_out.cubic_bez.eval(local_t as f64).y
-                }
-                TimingFunction::EaseInOut => {
-                    // https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function#ease-in-out
-                    let ease_in_out = FixedCubicBezier::new(0.42, 0.0, 0.58, 1.0);
-                    ease_in_out.cubic_bez.eval(local_t as f64).y
-                }
-                // https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function#cubic-beziernumber_01_number_number_01_number
-                TimingFunction::BezierCurve(cubic_bezier) => cubic_bezier.cubic_bez.eval(local_t as f64).y,
-            };
-
-            fn lerp(a: f32, b: f32, t: f32) -> f32 {
-                a + (b - a) * t
-            }
-
-            #[inline(always)]
-            fn resolve_unit(start: Unit, end: Unit, t: f64, set_prop: &mut dyn FnMut(Unit)) {
-                let resolved_start = match start {
-                    Unit::Px(px) => px,
-                    Unit::Percentage(percent) => percent,
-                    Unit::Auto => panic!("Unit must not be auto."),
-                };
-
-                let resolved_end = match end {
-                    Unit::Px(px) => px,
-                    Unit::Percentage(percent) => percent,
-                    Unit::Auto => panic!("Unit must not be auto."),
-                };
-                let new = lerp(resolved_start, resolved_end, t as f32);
-
-                // Naively asserts that start and end must be the same Unit type.
-                let new = match start {
-                    Unit::Px(_) => Unit::Px(new),
-                    Unit::Percentage(_) => Unit::Percentage(new),
-                    _ => unreachable!(),
-                };
-
-                set_prop(new);
-            }
-
-            match (start_prop, end_prop) {
-                (Some(StyleProperty::Background(start)), Some(StyleProperty::Background(end))) => {
-                    let new_color = start.lerp_rect(*end, t as f32);
-                    style.set_background(new_color);
-                }
-                (Some(StyleProperty::Color(start)), Some(StyleProperty::Color(end))) => {
-                    let new_color = start.lerp_rect(*end, t as f32);
-                    style.set_color(new_color);
-                    animation_flags.set_needs_relayout(true);
-                }
-                (Some(StyleProperty::FontSize(start)), Some(StyleProperty::FontSize(end))) => {
-                    let new = lerp(*start, *end, t as f32);
-                    style.set_font_size(new);
-                    animation_flags.set_needs_relayout(true);
-                }
-                (Some(StyleProperty::Width(start)), Some(StyleProperty::Width(end))) => {
-                    resolve_unit(*start, *end, t, &mut |new| {
-                        style.set_width(new);
-                    });
-                    animation_flags.set_needs_relayout(true);
-                }
-                (Some(StyleProperty::Height(start)), Some(StyleProperty::Height(end))) => {
-                    resolve_unit(*start, *end, t, &mut |new| {
-                        style.set_height(new);
-                    });
-                    animation_flags.set_needs_relayout(true);
-                }
-
-                (Some(StyleProperty::Inset(start)), Some(StyleProperty::Inset(end))) => {
-                    let trlb = zip(start.to_array(), end.to_array())
-                        .map(|(start, end)| {
-                            let mut inset_unit = Unit::Auto;
-                            resolve_unit(start, end, t, &mut |new| {
-                                inset_unit = new;
-                            });
-
-                            inset_unit
-                        })
-                        .collect::<Vec<Unit>>();
-
-                    let inset = TrblRectangle::new(trlb[0], trlb[1], trlb[2], trlb[3]);
-
-                    style.set_inset(inset);
-                    animation_flags.set_needs_relayout(true);
-                }
-
-                _ => {}
-            }
-        }
-
-        style
-    }
-}
diff --git a/crates/craft_retained/src/animations/mod.rs b/crates/craft_retained/src/animations/mod.rs
deleted file mode 100644
index aeea80f4..00000000
--- a/crates/craft_retained/src/animations/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod animation;
-
-pub use animation::{Animation, KeyFrame, LoopAmount, TimingFunction};
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index e586b9f4..df6677f5 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -24,7 +24,6 @@ use winit::event_loop::ActiveEventLoop;
 use winit::window::WindowId;
 
 use crate::CraftOptions;
-use crate::animations::animation::AnimationFlags;
 use crate::document::DocumentManager;
 use crate::elements::core::ElementInternals;
 use crate::elements::{ElementIdMap, ElementImpl, Window};
@@ -86,9 +85,6 @@ pub struct App {
     pub redraw_flags: RedrawFlags,
 
     pub(super) target_scratch: Vec<Rc<RefCell<dyn ElementImpl>>>,
-
-    pub(crate) previous_animation_flags: AnimationFlags,
-
     pub(crate) craft_options: CraftOptions,
 
     /// True if the winit app is active.
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index f681ec1a..b93556c2 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -218,19 +218,7 @@ impl ApplicationHandler for CraftWinitState {
             return;
         }
 
-        // Switch to Poll mode if we are running animations.
-
-        let has_active_animation = self
-            .craft_state
-            .craft_app
-            .previous_animation_flags
-            .has_active_animation();
-
-        if has_active_animation {
-            event_loop.set_control_flow(ControlFlow::Poll);
-        } else {
-            event_loop.set_control_flow(ControlFlow::WaitUntil(time::Instant::now() + WAIT_TIME));
-        }
+        event_loop.set_control_flow(ControlFlow::WaitUntil(time::Instant::now() + WAIT_TIME));
     }
 }
 
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index 2301b8e7..132e9303 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -1,6 +1,5 @@
 use std::cell::RefCell;
 use std::rc::Rc;
-use std::time::Duration;
 
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::{Action, Role};
@@ -8,17 +7,14 @@ use craft_primitives::geometry::borders::CssRoundedRect;
 use craft_primitives::geometry::{ElementBox, Rectangle};
 use craft_renderer::RenderList;
 use kurbo::{Affine, Point, Vec2};
-use rustc_hash::FxHashMap;
-use taffy::Overflow;
 
-use crate::animations::animation::{ActiveAnimation, AnimationFlags, AnimationStatus};
 use crate::app::TAFFY_TREE;
 use crate::elements::ElementImpl;
 use crate::elements::core::element_data::ElementData;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::layout::layout_item::{CssComputedBorder, LayoutItem, draw_borders_generic};
-use crate::style::{Display, Style};
+use crate::style::{Display, Overflow, Style};
 use crate::text::text_context::TextContext;
 
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
@@ -51,7 +47,7 @@ pub trait ElementInternals: ElementData {
     /// A helper to check if the element is visible.
     fn is_visible(&self) -> bool {
         let style = &self.element_data().style;
-        style.visible() && style.display() != Display::None
+        style.get_visible() && style.get_display() != Display::None
     }
 
     /// A helper to draw all children.
@@ -195,7 +191,7 @@ pub trait ElementInternals: ElementData {
         result: &taffy::Layout,
         layout_order: &mut u32,
     ) {
-        let position = self.element_data().style.position();
+        let position = self.element_data().style.get_position();
         self.element_data_mut().layout_item.resolve_box(
             relative_position,
             scroll_transform,
@@ -213,70 +209,14 @@ pub trait ElementInternals: ElementData {
     fn apply_borders(&mut self, scale_factor: f64) {
         let current_style = self.element_data().current_style();
         let has_border = current_style.has_border();
-        let border_radius = current_style.border_radius();
-        let border_color = &current_style.border_color();
+        let border_radius = current_style.get_border_radius();
+        let border_color = &current_style.get_border_color();
 
         self.element_data_mut()
             .layout_item
             .apply_borders(has_border, border_radius, scale_factor, border_color);
     }
 
-    /// Called after layout, and is responsible for updating the animation state of an element.
-    fn on_animation_frame(&mut self, animation_flags: &mut AnimationFlags, delta_time: Duration) {
-        let base_state = self.element_data_mut();
-
-        // If we don't have an animation in the current style then try to fall back to the normal style.
-        let current_style = if let Some(current_style) = base_state.current_style_mut_no_fallback() {
-            current_style
-        } else {
-            &mut base_state.style
-        };
-
-        // This is pretty hacky, but we can avoid allocating a hashmap for every element.
-        let active_animations = {
-            if base_state.animations.is_none() {
-                base_state.animations = Some(FxHashMap::default());
-            }
-
-            base_state.animations.as_mut().unwrap()
-        };
-
-        let current_style_animations = &mut current_style.animations;
-        for ani in &mut *current_style_animations {
-            if !active_animations.contains_key(&ani.name) {
-                active_animations.insert(
-                    ani.name.clone(),
-                    ActiveAnimation {
-                        current: Duration::ZERO,
-                        status: AnimationStatus::Playing,
-                        loop_amount: ani.loop_amount,
-                    },
-                );
-            }
-        }
-
-        active_animations.retain(|key, _| current_style_animations.iter().any(|ani| &ani.name == key));
-
-        active_animations.retain(|anim_name, active_animation| {
-            if active_animation.status == AnimationStatus::Playing {
-                animation_flags.set_has_active_animation(true);
-            }
-
-            if let Some(animation) = current_style.animation(anim_name) {
-                active_animation.tick(animation_flags, animation, delta_time);
-                let new_style = active_animation.compute_style(current_style, animation, animation_flags);
-                *current_style = Style::merge(current_style, &new_style);
-                true
-            } else {
-                false
-            }
-        });
-
-        for child in self.children() {
-            child.borrow_mut().on_animation_frame(animation_flags, delta_time);
-        }
-    }
-
     /// A bit of a hack to reset the layout item of an element recursively.
     fn reset_layout_item(&mut self) {
         self.element_data_mut().layout_item = LayoutItem::default();
@@ -342,12 +282,12 @@ pub trait ElementInternals: ElementData {
             return;
         }
 
-        let border_color = self.element_data().current_style().border_color();
-        let scrollbar_color = self.element_data().current_style().scrollbar_color();
+        let border_color = self.element_data().current_style().get_border_color();
+        let scrollbar_color = self.element_data().current_style().get_scrollbar_color();
         let scrollbar_thumb_radius = self
             .element_data()
             .current_style()
-            .scrollbar_thumb_radius()
+            .get_scrollbar_thumb_radius()
             .map(|radii| Vec2::new(radii.0 as f64, radii.1 as f64));
         // let scrollbar_thumb_radius = self.element_data().current_style().
         let track_rect = self
@@ -377,7 +317,7 @@ pub trait ElementInternals: ElementData {
     fn should_start_new_layer(&self) -> bool {
         let element_data = self.element_data();
 
-        element_data.current_style().overflow()[1] == Overflow::Scroll
+        element_data.current_style().get_overflow()[1] == Overflow::Scroll
     }
 
     /// Returns the element's [`ElementBox`] without any transforms applied.
@@ -386,11 +326,11 @@ pub trait ElementInternals: ElementData {
     }
 
     /// Gets
-    fn get_default_style() -> Style
+    fn get_default_style() -> Box<Style>
     where
         Self: Sized,
     {
-        Style::default()
+        Style::new()
     }
 
     /// Mark layout node dirty.
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 4fb5d227..1dfcbf77 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -4,7 +4,6 @@ use std::rc::{Rc, Weak};
 
 use craft_primitives::Color;
 use craft_primitives::geometry::{ElementBox, Point, TrblRectangle};
-use taffy::{BoxSizing, Overflow, Position};
 use ui_events::pointer::PointerId;
 
 use crate::CraftError;
@@ -13,7 +12,7 @@ use crate::document::Document;
 use crate::elements::ElementIdMap;
 use crate::elements::core::ElementData;
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
-use crate::style::{AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit, Weight, Wrap};
+use crate::style::{AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit, FontWeight, FlexWrap, BoxSizing, Position, Overflow};
 
 /// The element trait for end-users.
 pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + Any {
@@ -349,7 +348,7 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
         self.update_taffy_style();
     }
 
-    fn set_wrap(&mut self, wrap: Wrap) {
+    fn set_wrap(&mut self, wrap: FlexWrap) {
         self.style_mut().set_wrap(wrap);
         self.update_taffy_style();
     }
@@ -395,7 +394,7 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
     }
 
     fn set_background_color(&mut self, color: Color) {
-        self.style_mut().set_background(color);
+        self.style_mut().set_background_color(color);
     }
 
     fn set_font_size(&mut self, font_size: f32) {
@@ -408,7 +407,7 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
         self.update_taffy_style();
     }
 
-    fn set_font_weight(&mut self, font_weight: Weight) {
+    fn set_font_weight(&mut self, font_weight: FontWeight) {
         self.style_mut().set_font_weight(font_weight);
         self.update_taffy_style();
     }
@@ -655,7 +654,7 @@ pub trait Element: Clone + AsElement {
         self
     }
 
-    fn wrap(self, wrap: Wrap) -> Self {
+    fn wrap(self, wrap: FlexWrap) -> Self {
         self.as_element_rc().borrow_mut().set_wrap(wrap);
         self
     }
@@ -715,7 +714,7 @@ pub trait Element: Clone + AsElement {
         self
     }
 
-    fn font_weight(self, font_weight: Weight) -> Self {
+    fn font_weight(self, font_weight: FontWeight) -> Self {
         self.as_element_rc().borrow_mut().set_font_weight(font_weight);
         self
     }
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index 5bd91028..5d09425e 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -2,11 +2,9 @@ use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 
 use craft_primitives::geometry::{Rectangle, Size};
-use rustc_hash::FxHashMap;
 use smol_str::SmolStr;
-use taffy::{Layout, Overflow};
+use taffy::Layout;
 
-use crate::animations::animation::ActiveAnimation;
 use crate::app::{ELEMENTS, TAFFY_TREE};
 use crate::elements::ElementImpl;
 use crate::elements::element_id::create_unique_element_id;
@@ -14,7 +12,7 @@ use crate::elements::scroll_state::ScrollState;
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
 use crate::layout::layout_context::LayoutContext;
 use crate::layout::layout_item::LayoutItem;
-use crate::style::Style;
+use crate::style::{Overflow, Style};
 
 /// Stores common data to most elements.
 #[derive(Clone)]
@@ -26,7 +24,7 @@ pub struct ElementData {
     pub(crate) parent: Option<Weak<RefCell<dyn ElementImpl>>>,
 
     /// The style of the element.
-    pub style: Style,
+    pub style: Box<Style>,
 
     /// Stores the layout data for an element.
     pub layout_item: LayoutItem,
@@ -40,8 +38,6 @@ pub struct ElementData {
     /// A unique id for this element. Within a craft app the id will be unique even across windows.
     pub(crate) internal_id: u64,
 
-    pub(crate) animations: Option<FxHashMap<SmolStr, ActiveAnimation>>,
-
     /// Scrollbar state for elements that may have a scrollbar.
     pub(super) scroll_state: Option<ScrollState>,
 
@@ -62,12 +58,11 @@ impl ElementData {
         let mut default = Self {
             me,
             parent: None,
-            style: Default::default(),
+            style: Style::new(),
             layout_item: Default::default(),
             children: Default::default(),
             id: None,
             internal_id: create_unique_element_id(),
-            animations: None,
             scroll_state: None,
 
             on_slider_value_changed: Vec::new(),
@@ -112,7 +107,7 @@ impl ElementData {
         self.layout_item.computed_scrollbar_size = Size::new(layout.scroll_width(), layout.scroll_height());
 
         if let Some(state) = &mut self.scroll_state {
-            if self.style.overflow()[1] != Overflow::Scroll {
+            if self.style.get_overflow()[1] != Overflow::Scroll {
                 return;
             }
 
@@ -155,7 +150,7 @@ impl ElementData {
                 0.0
             };
 
-            let thumb_margin = self.style.scrollbar_thumb_margin();
+            let thumb_margin = self.style.get_scrollbar_thumb_margin();
             let scroll_thumb_width = scroll_track_width - (thumb_margin.left + thumb_margin.right);
             let scroll_thumb_height = (scroll_thumb_height - (thumb_margin.top + thumb_margin.bottom)).max(0.0);
 
@@ -174,7 +169,7 @@ impl ElementData {
 
 impl ElementData {
     pub fn is_scrollable(&self) -> bool {
-        self.style.overflow()[1] == taffy::Overflow::Scroll
+        self.style.get_overflow()[1] == Overflow::Scroll
     }
 
     pub fn current_style(&self) -> &Style {
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 28881c53..23aba53f 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -17,7 +17,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementImpl, message: &CraftMes
             CraftMessage::PointerScroll(mouse_wheel) => {
                 let delta = match mouse_wheel.delta {
                     ScrollDelta::LineDelta(_x, y) => {
-                        y * element_data.style.font_size().max(12.0) * element_data.style.line_height()
+                        y * element_data.style.get_font_size().max(12.0) * element_data.style.get_line_height()
                     }
                     ScrollDelta::PixelDelta(physical) => physical.y as f32,
                     ScrollDelta::PageDelta(_x, y) => y,
diff --git a/crates/craft_retained/src/elements/slider/slider_draw.rs b/crates/craft_retained/src/elements/slider/slider_draw.rs
index 3e0d0909..61995588 100644
--- a/crates/craft_retained/src/elements/slider/slider_draw.rs
+++ b/crates/craft_retained/src/elements/slider/slider_draw.rs
@@ -45,7 +45,7 @@ impl SliderInner {
             let thumb_radii = if let Some(br) = self.get_track_border_radius() {
                 border_radius_to_vec_radius(br)
             } else {
-                border_radius_to_vec_radius(self.style().border_radius())
+                border_radius_to_vec_radius(self.style().get_border_radius())
             };
 
             let css_rounded_rect = CssRoundedRect::new(
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 9c643df2..19df5e98 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -246,7 +246,7 @@ impl ElementInternals for TextInner {
             );
         }
 
-        state.try_update_text_render(text_context, self.element_data.style.selection_color());
+        state.try_update_text_render(text_context, self.element_data.style.get_selection_color());
     }
 
     fn draw(
@@ -354,7 +354,7 @@ impl ElementInternals for TextInner {
                         .map(|button| button == PointerButton::Primary)
                         .unwrap_or_default()
                     {
-                        state.update_text_selection(self.element_data.style.selection_color());
+                        state.update_text_selection(self.element_data.style.get_selection_color());
                         state.pointer_down = true;
                         state.cursor_reset();
                         let now = Instant::now();
@@ -387,7 +387,7 @@ impl ElementInternals for TextInner {
                         .map(|button| button == PointerButton::Primary)
                         .unwrap_or_default()
                     {
-                        state.update_text_selection(self.element_data.style.selection_color());
+                        state.update_text_selection(self.element_data.style.get_selection_color());
                         state.pointer_down = false;
                         state.cursor_reset();
                         self.release_pointer_capture(PointerId::new(1).unwrap());
@@ -401,10 +401,9 @@ impl ElementInternals for TextInner {
                         - kurbo::Vec2::new(text_position.x as f64, text_position.y as f64);
                     state.cursor_pos.x /= state.scale_factor;
                     state.cursor_pos.y /= state.scale_factor;
-                    println!("SF: {}", state.scale_factor);
                     // macOS seems to generate a spurious move after selecting word?
                     if state.pointer_down && prev_pos != state.cursor_pos {
-                        state.update_text_selection(self.element_data.style.selection_color());
+                        state.update_text_selection(self.element_data.style.get_selection_color());
                         state.cursor_reset();
                         let cursor_pos = state.cursor_pos;
                         state.extend_selection_to_point(cursor_pos);
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 88fd17ce..4b73340b 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -76,7 +76,7 @@ impl TextInput {
                 me: me.clone(),
             })
         });
-        inner.borrow_mut().element_data.style = default_style;
+        *inner.borrow_mut().element_data.style = *default_style;
 
         inner.borrow_mut().set_text(text);
 
@@ -393,11 +393,11 @@ impl ElementInternals for TextInputInner {
         resolve_clip_for_scrollable(self, clip_bounds);
     }
 
-    fn get_default_style() -> Style
+    fn get_default_style() -> Box<Style>
     where
         Self: Sized,
     {
-        let mut style = Style::default();
+        let mut style = Style::new();
 
         style.set_display(Display::Block);
 
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index 4bba21ec..8b9c90b9 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -65,7 +65,7 @@ pub struct TextInputState {
 impl Default for TextInputState {
     fn default() -> Self {
         let default_style = TextInputInner::get_default_style();
-        let mut editor = PlainEditor::new(default_style.font_size(), None);
+        let mut editor = PlainEditor::new(default_style.get_font_size(), None);
         editor.set_scale(1.0);
         let style_set = editor.edit_styles();
         default_style.add_styles_to_style_set(style_set);
@@ -612,11 +612,11 @@ impl TextInputState {
         self.editor.selection_geometry_with(|rect, line| {
             text_renderer.lines[line]
                 .selections
-                .push((parley_box_to_rect(rect), style.selection_color()));
+                .push((parley_box_to_rect(rect), style.get_selection_color()));
         });
 
         if focused {
-            let color = style.cursor_color().unwrap_or(style.color());
+            let color = style.get_cursor_color().unwrap_or(style.get_color());
             text_renderer.cursor = self.editor.cursor_geometry(1.0).map(|r| (parley_box_to_rect(r), color));
         } else {
             text_renderer.cursor = None;
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index 8f164360..f4a9f585 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -3,9 +3,9 @@ use craft_primitives::geometry::{Border, ElementBox, Margin, Padding, Point, Rec
 use craft_renderer::{Brush, RenderList};
 use kurbo::{Affine, BezPath, Shape, Vec2};
 use peniko::Color;
-use taffy::{NodeId, Position};
+use taffy::NodeId;
 
-use crate::style::Style;
+use crate::style::{Position, Style};
 
 impl CssComputedBorder {
     pub(crate) fn scale(&mut self, scale_factor: f64) {
@@ -188,7 +188,7 @@ impl LayoutItem {
     }
 
     pub fn draw_borders(&self, renderer: &mut RenderList, current_style: &Style, scale_factor: f64) {
-        let background_color = current_style.background();
+        let background_color = current_style.get_background_color();
 
         // OPTIMIZATION: Draw a normal rectangle if no border values have been modified.
         match &self.computed_border {
@@ -201,7 +201,7 @@ impl LayoutItem {
                     renderer.draw_rect(padding_rect, background_color);
                 }
                 let thickness = self.cache_border_spec.as_ref().unwrap().width.top;
-                let border_color = current_style.border_color().top;
+                let border_color = current_style.get_border_color().top;
                 if thickness != 0.0 && border_color.components[3] != 0.0 {
                     renderer.draw_rect_outline(border_rect, border_color, thickness as f64);
                 }
@@ -210,7 +210,7 @@ impl LayoutItem {
                 draw_borders_generic(
                     renderer,
                     computed_border,
-                    current_style.border_color().to_array(),
+                    current_style.get_border_color().to_array(),
                     background_color,
                 );
             }
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index c11b524c..9f2f0c50 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -1,6 +1,5 @@
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 pub mod accessibility;
-pub mod animations;
 pub mod craft_winit_state;
 pub mod document;
 pub mod elements;
@@ -181,7 +180,6 @@ pub fn setup_craft(craft_options: Option<CraftOptions>) -> CraftState {
         redraw_flags: RedrawFlags::new(true),
         target_scratch: Vec::new(),
 
-        previous_animation_flags: Default::default(),
         craft_options: craft_options.clone(),
         active: false,
     });
diff --git a/crates/craft_retained/src/style/mod.rs b/crates/craft_retained/src/style/mod.rs
index d7c8662d..ff5c851c 100644
--- a/crates/craft_retained/src/style/mod.rs
+++ b/crates/craft_retained/src/style/mod.rs
@@ -1,5 +1,300 @@
-pub(crate) mod style_flags;
 mod styles;
 mod taffy_conversions;
 
+use std::borrow::Cow;
+use std::fmt;
+use std::fmt::Debug;
+use peniko::Color;
+use craft_primitives::ColorBrush;
 pub use styles::*;
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum Unit {
+    Px(f32),
+    Percentage(f32),
+    Auto,
+}
+
+impl fmt::Display for Unit {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Unit::Px(value) => write!(f, "{value}px"),
+            Unit::Percentage(value) => write!(f, "{value}%"),
+            Unit::Auto => write!(f, "auto"),
+        }
+    }
+}
+
+impl Unit {
+    pub fn is_auto(&self) -> bool {
+        matches!(self, Unit::Auto)
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum Display {
+    Flex,
+    Block,
+    None,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum AlignItems {
+    Start,
+    End,
+    FlexStart,
+    FlexEnd,
+    Center,
+    Baseline,
+    Stretch,
+}
+
+#[derive(Clone, Copy, Debug)]
+pub enum AlignContent {
+    Start,
+    End,
+    FlexStart,
+    FlexEnd,
+    Center,
+    Stretch,
+    SpaceBetween,
+    SpaceEvenly,
+    SpaceAround,
+}
+
+pub type JustifyContent = AlignContent;
+
+#[derive(Clone, Copy, Debug)]
+pub enum FlexDirection {
+    Row,
+    Column,
+    RowReverse,
+    ColumnReverse,
+}
+
+#[derive(Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Debug, Hash)]
+pub struct FontWeight(pub u16);
+
+#[derive(Clone, Copy, Debug)]
+pub struct ScrollbarColor {
+    pub thumb_color: Color,
+    pub track_color: Color,
+}
+
+impl FontWeight {
+    /// Black weight (900), the thickest value.
+    pub const BLACK: FontWeight = FontWeight(900);
+    /// Bold weight (700).
+    pub const BOLD: FontWeight = FontWeight(700);
+    /// Extra-bold weight (800).
+    pub const EXTRA_BOLD: FontWeight = FontWeight(800);
+    /// Extra light weight (200).
+    pub const EXTRA_LIGHT: FontWeight = FontWeight(200);
+    /// Light weight (300).
+    pub const LIGHT: FontWeight = FontWeight(300);
+    /// Medium weight (500, higher than normal).
+    pub const MEDIUM: FontWeight = FontWeight(500);
+    /// Normal (400).
+    pub const NORMAL: FontWeight = FontWeight(400);
+    /// Semibold weight (600).
+    pub const SEMIBOLD: FontWeight = FontWeight(600);
+    /// Thin weight (100), the thinnest value.
+    pub const THIN: FontWeight = FontWeight(100);
+}
+
+#[derive(Default, Copy, Clone, PartialEq, Eq, Debug)]
+pub enum FlexWrap {
+    #[default]
+    NoWrap,
+    Wrap,
+    WrapReverse,
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Default)]
+pub enum Overflow {
+    #[default]
+    Visible,
+    Clip,
+    Hidden,
+    Scroll,
+}
+
+impl Default for FontWeight {
+    #[inline]
+    fn default() -> FontWeight {
+        FontWeight::NORMAL
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Underline {
+    pub thickness: Option<f32>,
+    pub color: Color,
+    pub offset: Option<f32>,
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
+pub enum FontStyle {
+    Normal,
+    Italic,
+    Oblique,
+}
+
+impl Default for FontStyle {
+    #[inline]
+    fn default() -> FontStyle {
+        FontStyle::Normal
+    }
+}
+
+#[derive(Clone, PartialEq)]
+pub enum TextStyleProperty {
+    Color(Color),
+    FontFamily(String),
+    FontSize(f32),
+    FontWeight(FontWeight),
+    FontStyle(FontStyle),
+    UnderlineOffset(f32),
+    Underline(bool),
+    UnderlineSize(f32),
+    UnderlineBrush(Color),
+    Link(String),
+    BackgroundColor(Color),
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Default)]
+pub enum BoxSizing {
+    #[default]
+    BorderBox,
+    ContentBox,
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Default)]
+pub enum Position {
+    #[default]
+    Relative,
+    Absolute,
+}
+
+#[derive(Clone, Debug, Copy)]
+pub struct StyleProperty<T> where T: Clone + Debug + Copy {
+    property: T,
+    is_dirty: bool,
+}
+
+impl<T> StyleProperty<T> where T: Clone + Debug + Copy {
+    pub fn new(property: T) -> StyleProperty<T> {
+        Self {
+            property,
+            is_dirty: false,
+        }
+    }
+
+    #[inline(always)]
+    pub fn set(&mut self, property: T) {
+        self.property = property;
+        self.is_dirty = true;
+    }
+
+    #[inline(always)]
+    pub fn get(&self) -> T {
+        self.property.clone()
+    }
+
+    #[inline(always)]
+    pub fn is_dirty(&self) -> bool {
+        self.is_dirty
+    }
+}
+
+impl TextStyleProperty {
+    pub(crate) fn to_parley_style_property(&self) -> Option<parley::StyleProperty<'static, ColorBrush>> {
+        match self {
+            TextStyleProperty::FontFamily(font_family) => {
+                let font_stack_cow_list = Cow::Owned(vec![
+                    parley::FontFamily::Named(Cow::Owned(font_family.to_string())),
+                    parley::FontFamily::Generic(parley::GenericFamily::SystemUi),
+                ]);
+                let font_stack = parley::FontStack::List(font_stack_cow_list);
+
+                Some(parley::StyleProperty::FontStack(font_stack))
+            }
+
+            TextStyleProperty::FontSize(font_size) => Some(parley::StyleProperty::FontSize(*font_size)),
+
+            TextStyleProperty::Color(color) => {
+                let brush = ColorBrush { color: *color };
+
+                Some(parley::StyleProperty::Brush(brush))
+            }
+
+            TextStyleProperty::FontStyle(font_style) => {
+                let font_style = match font_style {
+                    FontStyle::Normal => parley::FontStyle::Normal,
+                    FontStyle::Italic => parley::FontStyle::Italic,
+                    // FIXME: Allow an angle when setting the obliqueness.
+                    FontStyle::Oblique => parley::FontStyle::Oblique(None),
+                };
+
+                Some(parley::StyleProperty::FontStyle(font_style))
+            }
+
+            TextStyleProperty::FontWeight(font_weight) => Some(parley::StyleProperty::FontWeight(
+                parley::FontWeight::new(font_weight.0 as f32),
+            )),
+            TextStyleProperty::Underline(underline) => Some(parley::StyleProperty::Underline(*underline)),
+            TextStyleProperty::UnderlineOffset(offset) => Some(parley::StyleProperty::UnderlineOffset(Some(*offset))),
+
+            TextStyleProperty::UnderlineSize(size) => Some(parley::StyleProperty::UnderlineSize(Some(*size))),
+
+            TextStyleProperty::UnderlineBrush(color) => {
+                let brush = ColorBrush { color: *color };
+
+                Some(parley::StyleProperty::UnderlineBrush(Some(brush)))
+            }
+            TextStyleProperty::Link(_) | TextStyleProperty::BackgroundColor(_) => None,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Copy, PartialEq)]
+pub struct FontFamily {
+    font_family_length: u8,
+    font_family_name: [u8; 64],
+}
+
+impl FontFamily {
+    pub fn new(font_family: &str) -> FontFamily {
+        let mut font_family_res = FontFamily {
+            font_family_length: 0,
+            font_family_name: [0; 64],
+        };
+
+        let chars = font_family.chars().collect::<Vec<char>>();
+        font_family_res.font_family_length = chars.len() as u8;
+        font_family_res.font_family_name[..font_family.len()].copy_from_slice(font_family.as_bytes());
+
+        font_family_res
+    }
+
+    fn is_empty(&self) -> bool {
+        self.font_family_length == 0
+    }
+
+    pub fn name(&self) -> Option<&str> {
+        if self.is_empty() {
+            None
+        } else {
+            Some(std::str::from_utf8(&self.font_family_name[..self.font_family_length as usize]).unwrap())
+        }
+    }
+}
+
+impl Default for FontFamily {
+    fn default() -> FontFamily {
+        Self {
+            font_family_length: 0,
+            font_family_name: [0; 64],
+        }
+    }
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/style/style_flags.rs b/crates/craft_retained/src/style/style_flags.rs
deleted file mode 100644
index 281311c2..00000000
--- a/crates/craft_retained/src/style/style_flags.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use bitflags::bitflags;
-
-bitflags! {
-    #[derive(Clone, Copy, Debug)]
-    pub struct StyleFlags: u128 {
-        const FONT_FAMILY_LENGTH = 1 << 0;
-        const FONT_FAMILY = 1 << 1;
-        const BOX_SIZING = 1 << 2;
-        const SCROLLBAR_WIDTH = 1 << 3;
-        const POSITION = 1 << 4;
-        const MARGIN = 1 << 5;
-        const PADDING = 1 << 6;
-        const GAP = 1 << 7;
-        const INSET = 1 << 8;
-        const WIDTH = 1 << 9;
-        const HEIGHT = 1 << 10;
-        const MAX_WIDTH = 1 << 11;
-        const MAX_HEIGHT = 1 << 12;
-        const MIN_WIDTH = 1 << 13;
-        const MIN_HEIGHT = 1 << 14;
-        const X = 1 << 15;
-        const Y = 1 << 16;
-        const DISPLAY = 1 << 17;
-        const WRAP = 1 << 18;
-        const ALIGN_ITEMS = 1 << 19;
-        const JUSTIFY_CONTENT = 1 << 20;
-        const FLEX_DIRECTION = 1 << 21;
-        const FLEX_GROW = 1 << 22;
-        const FLEX_SHRINK = 1 << 23;
-        const FLEX_BASIS = 1 << 24;
-        const COLOR = 1 << 25;
-        const BACKGROUND = 1 << 26;
-        const FONT_SIZE = 1 << 27;
-        const FONT_WEIGHT = 1 << 28;
-        const FONT_STYLE = 1 << 29;
-        const OVERFLOW = 1 << 30;
-        const BORDER_COLOR = 1 << 31;
-        const BORDER_WIDTH = 1 << 32;
-        const BORDER_RADIUS = 1 << 33;
-        const SCROLLBAR_COLOR = 1 << 34;
-        const SCROLLBAR_RADIUS = 1 << 35;
-        const SCROLLBAR_THUMB_MARGIN = 1 << 36;
-        const VISIBLE = 1 << 37;
-        const UNDERLINE = 1 << 38;
-        const SELECTION_COLOR = 1 << 39;
-        const CURSOR_COLOR = 1 << 40;
-        const LINE_HEIGHT = 1 << 41;
-    }
-}
diff --git a/crates/craft_retained/src/style/styles.rs b/crates/craft_retained/src/style/styles.rs
index f2954537..5b9ebbfe 100644
--- a/crates/craft_retained/src/style/styles.rs
+++ b/crates/craft_retained/src/style/styles.rs
@@ -1,655 +1,461 @@
 use std::borrow::Cow;
-use std::fmt;
 use std::fmt::Debug;
 
+use crate::style::*;
 use craft_primitives::geometry::TrblRectangle;
 use craft_primitives::{Color, ColorBrush};
-use smallvec::SmallVec;
-pub use taffy::{BoxSizing, Overflow, Position};
 
-use crate::animations::Animation;
-use crate::style::style_flags::StyleFlags;
+#[derive(Clone, Debug)]
+pub struct Style {
+    box_sizing: StyleProperty<BoxSizing>,
+    position: StyleProperty<Position>,
+    margin: StyleProperty<TrblRectangle<Unit>>,
+    padding: StyleProperty<TrblRectangle<Unit>>,
+    gap: StyleProperty<[Unit; 2]>,
+    inset: StyleProperty<TrblRectangle<Unit>>,
+
+    width: StyleProperty<Unit>,
+    min_width: StyleProperty<Unit>,
+    max_width: StyleProperty<Unit>,
+
+    height: StyleProperty<Unit>,
+    min_height: StyleProperty<Unit>,
+    max_height: StyleProperty<Unit>,
+
+    display: StyleProperty<Display>,
+    wrap: StyleProperty<FlexWrap>,
+    align_items: StyleProperty<Option<AlignItems>>,
+    justify_content: StyleProperty<Option<JustifyContent>>,
+    flex_direction: StyleProperty<FlexDirection>,
+    flex_grow: StyleProperty<f32>,
+    flex_shrink: StyleProperty<f32>,
+    flex_basis: StyleProperty<Unit>,
+    font_family: StyleProperty<FontFamily>,
+
+    background_color: StyleProperty<Color>,
+    color: StyleProperty<Color>,
+
+    line_height: StyleProperty<f32>,
+    font_size: StyleProperty<f32>,
+    font_weight: StyleProperty<FontWeight>,
+    font_style: StyleProperty<FontStyle>,
+    underline: StyleProperty<Option<Underline>>,
+
+    overflow: StyleProperty<[Overflow; 2]>,
+
+    border_color: StyleProperty<TrblRectangle<Color>>,
+    border_width: StyleProperty<TrblRectangle<Unit>>,
+    border_radius: StyleProperty<[(f32, f32); 4]>,
+
+    scrollbar_color: StyleProperty<ScrollbarColor>,
+    scrollbar_thumb_margin: StyleProperty<TrblRectangle<f32>>,
+    scrollbar_thumb_radius: StyleProperty<[(f32, f32); 4]>,
+    scrollbar_width: StyleProperty<f32>,
+
+    visible: StyleProperty<bool>,
+    selection_color: StyleProperty<Color>,
+    cursor_color: StyleProperty<Option<Color>>,
 
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Unit {
-    Px(f32),
-    Percentage(f32),
-    Auto,
+    /// Set to true anytime a setter is called.
+    pub is_dirty: bool,
 }
+const SCROLLBAR_THUMB_MARGIN: TrblRectangle<f32> = if cfg!(any(target_os = "android", target_os = "ios")) {
+    TrblRectangle::new_all(0.0)
+} else {
+    TrblRectangle::new(1.0, 2.0, 1.0, 2.0)
+};
 
-impl fmt::Display for Unit {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Unit::Px(value) => write!(f, "{value}px"),
-            Unit::Percentage(value) => write!(f, "{value}%"),
-            Unit::Auto => write!(f, "auto"),
-        }
+impl Style {
+    pub(crate) fn new() -> Box<Self> {
+        Box::new(Style {
+            is_dirty: true,
+            box_sizing: StyleProperty::new(BoxSizing::BorderBox),
+            position: StyleProperty::new(Position::Relative),
+            margin: StyleProperty::new(TrblRectangle::new_all(Unit::Px(0.0))),
+            padding: StyleProperty::new(TrblRectangle::new_all(Unit::Px(0.0))),
+            gap: StyleProperty::new([Unit::Px(0.0), Unit::Px(0.0)]),
+            inset: StyleProperty::new(TrblRectangle::new_all(Unit::Px(0.0))),
+            width: StyleProperty::new(Unit::Auto),
+            min_width: StyleProperty::new(Unit::Auto),
+            max_width: StyleProperty::new(Unit::Auto),
+            height: StyleProperty::new(Unit::Auto),
+            min_height: StyleProperty::new(Unit::Auto),
+            max_height: StyleProperty::new(Unit::Auto),
+            display: StyleProperty::new(Display::Flex),
+            wrap: StyleProperty::new(FlexWrap::default()),
+            align_items: StyleProperty::new(None),
+            justify_content: StyleProperty::new(None),
+            flex_direction: StyleProperty::new(FlexDirection::Row),
+            flex_grow: StyleProperty::new(0.0),
+            flex_shrink: StyleProperty::new(1.0),
+            flex_basis: StyleProperty::new(Unit::Auto),
+            font_family: StyleProperty::new(FontFamily::default()),
+            background_color: StyleProperty::new(Color::TRANSPARENT),
+            color: StyleProperty::new(Color::BLACK),
+            line_height: StyleProperty::new(1.2),
+            font_size: StyleProperty::new(16.0),
+            font_weight: StyleProperty::new(FontWeight::default()),
+            font_style: StyleProperty::new(FontStyle::default()),
+            underline: StyleProperty::new(None),
+            overflow: StyleProperty::new([Overflow::default(); 2]),
+            border_color: StyleProperty::new(TrblRectangle::new_all(Color::BLACK)),
+            border_width: StyleProperty::new(TrblRectangle::new_all(Unit::Px(0.0))),
+            border_radius: StyleProperty::new([(0.0, 0.0); 4]),
+            scrollbar_color: StyleProperty::new(ScrollbarColor {
+                thumb_color: Color::from_rgb8(150, 150, 152),
+                track_color: Color::TRANSPARENT
+            }),
+            scrollbar_thumb_margin: StyleProperty::new(SCROLLBAR_THUMB_MARGIN),
+            scrollbar_thumb_radius: StyleProperty::new([(10.0, 10.0); 4]),
+            scrollbar_width: StyleProperty::new(if cfg!(any(target_os = "android", target_os = "ios")) {
+                0.0
+            } else {
+                10.0
+            }),
+            visible: StyleProperty::new(true),
+            selection_color: StyleProperty::new(Color::from_rgb8(0, 120, 215)),
+            cursor_color: StyleProperty::new(None),
+        })
     }
 }
 
-impl Unit {
-    pub fn is_auto(&self) -> bool {
-        matches!(self, Unit::Auto)
+impl Style {
+    pub fn get_box_sizing(&self) -> BoxSizing {
+        self.box_sizing.get()
+    }
+    pub fn set_box_sizing(&mut self, val: BoxSizing) {
+        self.is_dirty = true;
+        self.box_sizing.set(val);
     }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Display {
-    Flex,
-    Block,
-    None,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum AlignItems {
-    Start,
-    End,
-    FlexStart,
-    FlexEnd,
-    Center,
-    Baseline,
-    Stretch,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub enum AlignContent {
-    Start,
-    End,
-    FlexStart,
-    FlexEnd,
-    Center,
-    Stretch,
-    SpaceBetween,
-    SpaceEvenly,
-    SpaceAround,
-}
-
-pub type JustifyContent = AlignContent;
 
-#[derive(Clone, Copy, Debug)]
-pub enum FlexDirection {
-    Row,
-    Column,
-    RowReverse,
-    ColumnReverse,
-}
+    pub fn get_position(&self) -> Position {
+        self.position.get()
+    }
+    pub fn set_position(&mut self, val: Position) {
+        self.is_dirty = true;
+        self.position.set(val);
+    }
 
-#[derive(Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Debug, Hash)]
-pub struct Weight(pub u16);
+    pub fn get_margin(&self) -> TrblRectangle<Unit> {
+        self.margin.get()
+    }
+    pub fn set_margin(&mut self, val: TrblRectangle<Unit>) {
+        self.is_dirty = true;
+        self.margin.set(val);
+    }
 
-#[derive(Clone, Copy, Debug)]
-pub struct ScrollbarColor {
-    pub thumb_color: Color,
-    pub track_color: Color,
-}
+    pub fn get_padding(&self) -> TrblRectangle<Unit> {
+        self.padding.get()
+    }
+    pub fn set_padding(&mut self, val: TrblRectangle<Unit>) {
+        self.is_dirty = true;
+        self.padding.set(val);
+    }
 
-impl Weight {
-    /// Black weight (900), the thickest value.
-    pub const BLACK: Weight = Weight(900);
-    /// Bold weight (700).
-    pub const BOLD: Weight = Weight(700);
-    /// Extra-bold weight (800).
-    pub const EXTRA_BOLD: Weight = Weight(800);
-    /// Extra light weight (200).
-    pub const EXTRA_LIGHT: Weight = Weight(200);
-    /// Light weight (300).
-    pub const LIGHT: Weight = Weight(300);
-    /// Medium weight (500, higher than normal).
-    pub const MEDIUM: Weight = Weight(500);
-    /// Normal (400).
-    pub const NORMAL: Weight = Weight(400);
-    /// Semibold weight (600).
-    pub const SEMIBOLD: Weight = Weight(600);
-    /// Thin weight (100), the thinnest value.
-    pub const THIN: Weight = Weight(100);
-}
+    pub fn get_gap(&self) -> [Unit; 2] {
+        self.gap.get()
+    }
+    pub fn set_gap(&mut self, val: [Unit; 2]) {
+        self.is_dirty = true;
+        self.gap.set(val);
+    }
 
-#[derive(Default, Copy, Clone, PartialEq, Eq, Debug)]
-pub enum Wrap {
-    #[default]
-    /// Items will not wrap and stay on a single line
-    NoWrap,
-    /// Items will wrap according to this item's [`taffy::FlexDirection`]
-    Wrap,
-    /// Items will wrap in the opposite direction to this item's [`taffy::FlexDirection`]
-    WrapReverse,
-}
+    pub fn get_inset(&self) -> TrblRectangle<Unit> {
+        self.margin.get()
+    }
+    pub fn set_inset(&mut self, val: TrblRectangle<Unit>) {
+        self.is_dirty = true;
+        self.inset.set(val);
+    }
 
-impl Default for Weight {
-    #[inline]
-    fn default() -> Weight {
-        Weight::NORMAL
+    pub fn get_width(&self) -> Unit {
+        self.width.get()
+    }
+    pub fn set_width(&mut self, val: Unit) {
+        self.is_dirty = true;
+        self.width.set(val);
     }
-}
 
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Underline {
-    pub thickness: Option<f32>,
-    pub color: Color,
-    pub offset: Option<f32>,
-}
+    pub fn get_min_width(&self) -> Unit {
+        self.min_width.get()
+    }
+    pub fn set_min_width(&mut self, val: Unit) {
+        self.is_dirty = true;
+        self.min_width.set(val);
+    }
 
-#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
-pub enum FontStyle {
-    Normal,
-    Italic,
-    Oblique,
-}
+    pub fn get_max_width(&self) -> Unit {
+        self.max_width.get()
+    }
+    pub fn set_max_width(&mut self, val: Unit) {
+        self.is_dirty = true;
+        self.max_width.set(val);
+    }
 
-impl Default for FontStyle {
-    #[inline]
-    fn default() -> FontStyle {
-        FontStyle::Normal
+    pub fn get_height(&self) -> Unit {
+        self.height.get()
+    }
+    pub fn set_height(&mut self, val: Unit) {
+        self.is_dirty = true;
+        self.height.set(val);
     }
-}
 
-#[derive(Clone, PartialEq)]
-pub enum TextStyleProperty {
-    Color(Color),
-    FontFamily(String),
-    FontSize(f32),
-    FontWeight(Weight),
-    FontStyle(FontStyle),
-    UnderlineOffset(f32),
-    Underline(bool),
-    UnderlineSize(f32),
-    UnderlineBrush(Color),
-    Link(String),
-    BackgroundColor(Color),
-}
+    pub fn get_min_height(&self) -> Unit {
+        self.min_height.get()
+    }
+    pub fn set_min_height(&mut self, val: Unit) {
+        self.is_dirty = true;
+        self.min_height.set(val);
+    }
 
-#[derive(Clone, Debug, Copy)]
-pub enum StyleProperty {
-    BoxSizing(BoxSizing),
-    Position(Position),
-    Margin(TrblRectangle<Unit>),
-    Padding(TrblRectangle<Unit>),
-    Gap([Unit; 2]),
-    Inset(TrblRectangle<Unit>),
-    Width(Unit),
-    Height(Unit),
-    MaxWidth(Unit),
-    MaxHeight(Unit),
-    MinWidth(Unit),
-    MinHeight(Unit),
-    Display(Display),
-    Wrap(Wrap),
-    AlignItems(Option<AlignItems>),
-    JustifyContent(Option<JustifyContent>),
-    FlexDirection(FlexDirection),
-    FlexGrow(f32),
-    FlexShrink(f32),
-    FlexBasis(Unit),
-
-    Color(Color),
-    Background(Color),
-    /// Defaults to the text color, if it is None.
-    CursorColor(Option<Color>),
-    SelectionColor(Color),
-    FontFamily(FontFamily),
-    FontSize(f32),
-    LineHeight(f32),
-    FontWeight(Weight),
-    FontStyle(FontStyle),
-    Underline(Option<Underline>),
-    Overflow([Overflow; 2]),
-
-    BorderColor(TrblRectangle<Color>),
-    BorderWidth(TrblRectangle<Unit>),
-    BorderRadius([(f32, f32); 4]),
-
-    ScrollbarColor(ScrollbarColor),
-    ScrollbarThumbMargin(TrblRectangle<f32>),
-    ScrollbarRadius([(f32, f32); 4]),
-    ScrollbarWidth(f32),
-
-    Visible(bool),
-}
+    pub fn get_max_height(&self) -> Unit {
+        self.max_height.get()
+    }
+    pub fn set_max_height(&mut self, val: Unit) {
+        self.is_dirty = true;
+        self.max_height.set(val);
+    }
 
-impl TextStyleProperty {
-    pub(crate) fn to_parley_style_property(&self) -> Option<parley::StyleProperty<'static, ColorBrush>> {
-        match self {
-            TextStyleProperty::FontFamily(font_family) => {
-                let font_stack_cow_list = Cow::Owned(vec![
-                    parley::FontFamily::Named(Cow::Owned(font_family.to_string())),
-                    parley::FontFamily::Generic(parley::GenericFamily::SystemUi),
-                ]);
-                let font_stack = parley::FontStack::List(font_stack_cow_list);
+    pub fn get_display(&self) -> Display {
+        self.display.get()
+    }
+    pub fn set_display(&mut self, val: Display) {
+        self.is_dirty = true;
+        self.display.set(val);
+    }
 
-                Some(parley::StyleProperty::FontStack(font_stack))
-            }
+    pub fn get_wrap(&self) -> FlexWrap {
+        self.wrap.get()
+    }
+    pub fn set_wrap(&mut self, val: FlexWrap) {
+        self.is_dirty = true;
+        self.wrap.set(val);
+    }
 
-            TextStyleProperty::FontSize(font_size) => Some(parley::StyleProperty::FontSize(*font_size)),
+    pub fn get_align_items(&self) -> Option<AlignItems> {
+        self.align_items.get()
+    }
+    pub fn set_align_items(&mut self, val: Option<AlignItems>) {
+        self.is_dirty = true;
+        self.align_items.set(val);
+    }
 
-            TextStyleProperty::Color(color) => {
-                let brush = ColorBrush { color: *color };
+    pub fn get_justify_content(&self) -> Option<JustifyContent> {
+        self.justify_content.get()
+    }
+    pub fn set_justify_content(&mut self, val: Option<JustifyContent>) {
+        self.is_dirty = true;
+        self.justify_content.set(val);
+    }
 
-                Some(parley::StyleProperty::Brush(brush))
-            }
+    pub fn get_flex_direction(&self) -> FlexDirection {
+        self.flex_direction.get()
+    }
+    pub fn set_flex_direction(&mut self, val: FlexDirection) {
+        self.is_dirty = true;
+        self.flex_direction.set(val);
+    }
 
-            TextStyleProperty::FontStyle(font_style) => {
-                let font_style = match font_style {
-                    FontStyle::Normal => parley::FontStyle::Normal,
-                    FontStyle::Italic => parley::FontStyle::Italic,
-                    // FIXME: Allow an angle when setting the obliqueness.
-                    FontStyle::Oblique => parley::FontStyle::Oblique(None),
-                };
+    pub fn get_flex_grow(&self) -> f32 {
+        self.flex_grow.get()
+    }
+    pub fn set_flex_grow(&mut self, val: f32) {
+        self.is_dirty = true;
+        self.flex_grow.set(val);
+    }
 
-                Some(parley::StyleProperty::FontStyle(font_style))
-            }
+    pub fn get_flex_shrink(&self) -> f32 {
+        self.flex_shrink.get()
+    }
+    pub fn set_flex_shrink(&mut self, val: f32) {
+        self.is_dirty = true;
+        self.flex_shrink.set(val);
+    }
 
-            TextStyleProperty::FontWeight(font_weight) => Some(parley::StyleProperty::FontWeight(
-                parley::FontWeight::new(font_weight.0 as f32),
-            )),
-            TextStyleProperty::Underline(underline) => Some(parley::StyleProperty::Underline(*underline)),
-            TextStyleProperty::UnderlineOffset(offset) => Some(parley::StyleProperty::UnderlineOffset(Some(*offset))),
+    pub fn get_flex_basis(&self) -> Unit {
+        self.flex_basis.get()
+    }
+    pub fn set_flex_basis(&mut self, val: Unit) {
+        self.is_dirty = true;
+        self.flex_basis.set(val);
+    }
 
-            TextStyleProperty::UnderlineSize(size) => Some(parley::StyleProperty::UnderlineSize(Some(*size))),
+    pub fn get_font_family(&self) -> FontFamily {
+        self.font_family.get()
+    }
+    pub fn set_font_family(&mut self, val: FontFamily) {
+        self.is_dirty = true;
+        self.font_family.set(val);
+    }
 
-            TextStyleProperty::UnderlineBrush(color) => {
-                let brush = ColorBrush { color: *color };
+    pub fn get_color(&self) -> Color {
+        self.color.get()
+    }
+    pub fn set_color(&mut self, val: Color) {
+        self.is_dirty = true;
+        self.color.set(val);
+    }
 
-                Some(parley::StyleProperty::UnderlineBrush(Some(brush)))
-            }
-            TextStyleProperty::Link(_) | TextStyleProperty::BackgroundColor(_) => None,
-        }
+    pub fn get_background_color(&self) -> Color {
+        self.background_color.get()
+    }
+    pub fn set_background_color(&mut self, val: Color) {
+        self.is_dirty = true;
+        self.background_color.set(val);
     }
-}
 
-#[derive(Clone, Debug, Copy, PartialEq)]
-pub struct FontFamily {
-    font_family_length: u8,
-    font_family_name: [u8; 64],
-}
+    pub fn get_font_size(&self) -> f32 {
+        self.font_size.get()
+    }
+    pub fn set_font_size(&mut self, val: f32) {
+        self.is_dirty = true;
+        self.font_size.set(val);
+    }
 
-impl FontFamily {
-    pub fn new(font_family: &str) -> FontFamily {
-        let mut font_family_res = FontFamily {
-            font_family_length: 0,
-            font_family_name: [0; 64],
-        };
+    pub fn get_line_height(&self) -> f32 {
+        self.line_height.get()
+    }
+    pub fn set_line_height(&mut self, val: f32) {
+        self.is_dirty = true;
+        self.line_height.set(val);
+    }
 
-        let chars = font_family.chars().collect::<Vec<char>>();
-        font_family_res.font_family_length = chars.len() as u8;
-        font_family_res.font_family_name[..font_family.len()].copy_from_slice(font_family.as_bytes());
+    pub fn get_font_weight(&self) -> FontWeight {
+        self.font_weight.get()
+    }
+    pub fn set_font_weight(&mut self, val: FontWeight) {
+        self.is_dirty = true;
+        self.font_weight.set(val);
+    }
 
-        font_family_res
+    pub fn get_font_style(&self) -> FontStyle {
+        self.font_style.get()
+    }
+    pub fn set_font_style(&mut self, val: FontStyle) {
+        self.is_dirty = true;
+        self.font_style.set(val);
     }
 
-    fn is_empty(&self) -> bool {
-        self.font_family_length == 0
+    pub fn get_underline(&self) -> Option<Underline> {
+        self.underline.get()
+    }
+    pub fn set_underline(&mut self, val: Option<Underline>) {
+        self.is_dirty = true;
+        self.underline.set(val);
     }
 
-    pub fn name(&self) -> Option<&str> {
-        if self.is_empty() {
-            None
-        } else {
-            Some(std::str::from_utf8(&self.font_family_name[..self.font_family_length as usize]).unwrap())
-        }
+    pub fn get_overflow(&self) -> [Overflow; 2] {
+        self.overflow.get()
+    }
+    pub fn set_overflow(&mut self, val: [Overflow; 2]) {
+        self.is_dirty = true;
+        self.overflow.set(val);
     }
-}
 
-impl Default for FontFamily {
-    fn default() -> FontFamily {
-        Self {
-            font_family_length: 0,
-            font_family_name: [0; 64],
-        }
+    pub fn get_border_color(&self) -> TrblRectangle<Color> {
+        self.border_color.get()
+    }
+    pub fn set_border_color(&mut self, val: TrblRectangle<Color>) {
+        self.is_dirty = true;
+        self.border_color.set(val);
     }
-}
 
-#[derive(Clone, Debug)]
-pub struct Style {
-    properties: SmallVec<[StyleProperty; 5]>,
-    pub dirty_flags: StyleFlags,
-    pub animations: Vec<Animation>,
-    /// Set to true anytime a setter is called.
-    pub is_dirty: bool,
-}
+    pub fn get_border_width(&self) -> TrblRectangle<Unit> {
+        self.border_width.get()
+    }
+    pub fn set_border_width(&mut self, val: TrblRectangle<Unit>) {
+        self.is_dirty = true;
+        self.border_width.set(val);
+    }
 
-impl Default for Style {
-    fn default() -> Self {
-        Style {
-            properties: SmallVec::new(),
-            dirty_flags: StyleFlags::empty(),
-            animations: Vec::new(),
-            is_dirty: true,
-        }
+    pub fn get_border_radius(&self) -> [(f32, f32); 4] {
+        self.border_radius.get()
+    }
+    pub fn set_border_radius(&mut self, val: [(f32, f32); 4]) {
+        self.is_dirty = true;
+        self.border_radius.set(val);
     }
-}
 
-macro_rules! style_property {
-    (
-        $get:ident, $set:ident, $variant:ident, $inner:ty, $flag:ident, $default:expr
-    ) => {
-        impl Style {
-            pub fn $get(&self) -> $inner {
-                self.properties
-                    .iter()
-                    .find_map(|p| {
-                        if let StyleProperty::$variant(val) = p {
-                            Some(*val)
-                        } else {
-                            None
-                        }
-                    })
-                    .unwrap_or($default)
-            }
-
-            pub fn $set(&mut self, val: $inner) {
-                self.is_dirty = true;
-                if self.dirty_flags.contains(StyleFlags::$flag) {
-                    self.remove_property(|p| matches!(p, StyleProperty::$variant(_)));
-                }
-                self.properties.push(StyleProperty::$variant(val));
-                self.dirty_flags.insert(StyleFlags::$flag);
-            }
-        }
-    };
-}
+    pub fn get_scrollbar_color(&self) -> ScrollbarColor {
+        self.scrollbar_color.get()
+    }
+    pub fn set_scrollbar_color(&mut self, val: ScrollbarColor) {
+        self.is_dirty = true;
+        self.scrollbar_color.set(val);
+    }
 
-style_property!(
-    box_sizing,
-    set_box_sizing,
-    BoxSizing,
-    BoxSizing,
-    BOX_SIZING,
-    BoxSizing::BorderBox
-);
-style_property!(position, set_position, Position, Position, POSITION, Position::Relative);
-style_property!(
-    margin,
-    set_margin,
-    Margin,
-    TrblRectangle<Unit>,
-    MARGIN,
-    TrblRectangle::new_all(Unit::Px(0.0))
-);
-style_property!(
-    padding,
-    set_padding,
-    Padding,
-    TrblRectangle<Unit>,
-    PADDING,
-    TrblRectangle::new_all(Unit::Px(0.0))
-);
-style_property!(gap, set_gap, Gap, [Unit; 2], GAP, [Unit::Px(0.0); 2]);
-style_property!(
-    inset,
-    set_inset,
-    Inset,
-    TrblRectangle<Unit>,
-    INSET,
-    TrblRectangle::new_all(Unit::Px(0.0))
-);
-
-style_property!(width, set_width, Width, Unit, WIDTH, Unit::Auto);
-style_property!(height, set_height, Height, Unit, HEIGHT, Unit::Auto);
-style_property!(max_width, set_max_width, MaxWidth, Unit, MAX_WIDTH, Unit::Auto);
-style_property!(max_height, set_max_height, MaxHeight, Unit, MAX_HEIGHT, Unit::Auto);
-style_property!(min_width, set_min_width, MinWidth, Unit, MIN_WIDTH, Unit::Auto);
-style_property!(min_height, set_min_height, MinHeight, Unit, MIN_HEIGHT, Unit::Auto);
-
-style_property!(display, set_display, Display, Display, DISPLAY, Display::Flex);
-style_property!(wrap, set_wrap, Wrap, Wrap, WRAP, Wrap::default());
-style_property!(
-    align_items,
-    set_align_items,
-    AlignItems,
-    Option<AlignItems>,
-    ALIGN_ITEMS,
-    None
-);
-style_property!(
-    justify_content,
-    set_justify_content,
-    JustifyContent,
-    Option<JustifyContent>,
-    JUSTIFY_CONTENT,
-    None
-);
-style_property!(
-    flex_direction,
-    set_flex_direction,
-    FlexDirection,
-    FlexDirection,
-    FLEX_DIRECTION,
-    FlexDirection::Row
-);
-style_property!(flex_grow, set_flex_grow, FlexGrow, f32, FLEX_GROW, 0.0);
-style_property!(flex_shrink, set_flex_shrink, FlexShrink, f32, FLEX_SHRINK, 1.0);
-style_property!(flex_basis, set_flex_basis, FlexBasis, Unit, FLEX_BASIS, Unit::Auto);
-
-style_property!(
-    font_family,
-    set_font_family,
-    FontFamily,
-    FontFamily,
-    FONT_FAMILY,
-    FontFamily::default()
-);
-style_property!(color, set_color, Color, Color, COLOR, Color::BLACK);
-style_property!(
-    background,
-    set_background,
-    Background,
-    Color,
-    BACKGROUND,
-    Color::TRANSPARENT
-);
-style_property!(font_size, set_font_size, FontSize, f32, FONT_SIZE, 16.0);
-style_property!(line_height, set_line_height, LineHeight, f32, LINE_HEIGHT, 1.2);
-style_property!(
-    font_weight,
-    set_font_weight,
-    FontWeight,
-    Weight,
-    FONT_WEIGHT,
-    Weight::default()
-);
-style_property!(
-    font_style,
-    set_font_style,
-    FontStyle,
-    FontStyle,
-    FONT_STYLE,
-    FontStyle::default()
-);
-style_property!(underline, set_underline, Underline, Option<Underline>, UNDERLINE, None);
-style_property!(
-    overflow,
-    set_overflow,
-    Overflow,
-    [Overflow; 2],
-    OVERFLOW,
-    [Overflow::default(); 2]
-);
-
-style_property!(
-    border_color,
-    set_border_color,
-    BorderColor,
-    TrblRectangle<Color>,
-    BORDER_COLOR,
-    TrblRectangle::new_all(Color::BLACK)
-);
-style_property!(
-    border_width,
-    set_border_width,
-    BorderWidth,
-    TrblRectangle<Unit>,
-    BORDER_WIDTH,
-    TrblRectangle::new_all(Unit::Px(0.0))
-);
-style_property!(
-    border_radius,
-    set_border_radius,
-    BorderRadius,
-    [(f32, f32); 4],
-    BORDER_RADIUS,
-    [(0.0, 0.0); 4]
-);
-
-style_property!(
-    scrollbar_color,
-    set_scrollbar_color,
-    ScrollbarColor,
-    ScrollbarColor,
-    SCROLLBAR_COLOR,
-    ScrollbarColor {
-        thumb_color: Color::from_rgb8(150, 150, 152),
-        track_color: Color::TRANSPARENT
-    }
-);
-const SCROLLBAR_THUMB_MARGIN: TrblRectangle<f32> = if cfg!(any(target_os = "android", target_os = "ios")) {
-    TrblRectangle::new_all(0.0)
-} else {
-    TrblRectangle::new(1.0, 2.0, 1.0, 2.0)
-};
-style_property!(
-    scrollbar_thumb_margin,
-    set_scrollbar_thumb_margin,
-    ScrollbarThumbMargin,
-    TrblRectangle<f32>,
-    SCROLLBAR_THUMB_MARGIN,
-    SCROLLBAR_THUMB_MARGIN
-);
-style_property!(
-    scrollbar_thumb_radius,
-    set_scrollbar_thumb_radius,
-    ScrollbarRadius,
-    [(f32, f32); 4],
-    SCROLLBAR_RADIUS,
-    [(10.0, 10.0); 4]
-);
-style_property!(
-    scrollbar_width,
-    set_scrollbar_width,
-    ScrollbarWidth,
-    f32,
-    SCROLLBAR_WIDTH,
-    if cfg!(any(target_os = "android", target_os = "ios")) {
-        0.0
-    } else {
-        10.0
-    }
-);
-
-style_property!(visible, set_visible, Visible, bool, VISIBLE, true);
-style_property!(
-    selection_color,
-    set_selection_color,
-    SelectionColor,
-    Color,
-    SELECTION_COLOR,
-    Color::from_rgb8(0, 120, 215)
-);
-style_property!(
-    cursor_color,
-    set_cursor_color,
-    CursorColor,
-    Option<Color>,
-    CURSOR_COLOR,
-    None
-);
+    pub fn get_scrollbar_thumb_margin(&self) -> TrblRectangle<f32> {
+        self.scrollbar_thumb_margin.get()
+    }
+    pub fn set_scrollbar_thumb_margin(&mut self, val: TrblRectangle<f32>) {
+        self.is_dirty = true;
+        self.scrollbar_thumb_margin.set(val);
+    }
 
-impl Style {
-    fn remove_property(&mut self, f: impl Fn(&StyleProperty) -> bool) {
-        if let Some(pos) = self.properties.iter().position(f) {
-            self.properties.remove(pos);
-        }
+    pub fn get_scrollbar_thumb_radius(&self) -> [(f32, f32); 4] {
+        self.scrollbar_thumb_radius.get()
+    }
+    pub fn set_scrollbar_thumb_radius(&mut self, val: [(f32, f32); 4]) {
+        self.is_dirty = true;
+        self.scrollbar_thumb_radius.set(val);
     }
 
-    pub fn has_border(&self) -> bool {
-        self.dirty_flags.contains(StyleFlags::BORDER_WIDTH)
-            || self.dirty_flags.contains(StyleFlags::BORDER_RADIUS)
-            || self.dirty_flags.contains(StyleFlags::BORDER_COLOR)
+    pub fn get_scrollbar_width(&self) -> f32 {
+        self.scrollbar_width.get()
+    }
+    pub fn set_scrollbar_width(&mut self, val: f32) {
+        self.is_dirty = true;
+        self.scrollbar_width.set(val);
     }
 
-    /// Take an old style and update it with the non-default values from the new style.
-    pub fn merge(old: &Self, new: &Self) -> Self {
-        // If either is fully default, return the other early.
-        if old.dirty_flags.is_empty() {
-            return new.clone();
-        }
+    pub fn get_visible(&self) -> bool {
+        self.visible.get()
+    }
+    pub fn set_visible(&mut self, val: bool) {
+        self.is_dirty = true;
+        self.visible.set(val);
+    }
 
-        if new.dirty_flags.is_empty() {
-            return old.clone();
-        }
+    pub fn get_selection_color(&self) -> Color {
+        self.selection_color.get()
+    }
+    pub fn set_selection_color(&mut self, val: Color) {
+        self.is_dirty = true;
+        self.selection_color.set(val);
+    }
 
-        let mut merged = old.clone();
-
-        for prop in &new.properties {
-            let flag = match prop {
-                StyleProperty::BoxSizing(_) => StyleFlags::BOX_SIZING,
-                StyleProperty::Position(_) => StyleFlags::POSITION,
-                StyleProperty::Margin(_) => StyleFlags::MARGIN,
-                StyleProperty::Padding(_) => StyleFlags::PADDING,
-                StyleProperty::Gap(_) => StyleFlags::GAP,
-                StyleProperty::Inset(_) => StyleFlags::INSET,
-                StyleProperty::Width(_) => StyleFlags::WIDTH,
-                StyleProperty::Height(_) => StyleFlags::HEIGHT,
-                StyleProperty::MaxWidth(_) => StyleFlags::MAX_WIDTH,
-                StyleProperty::MaxHeight(_) => StyleFlags::MAX_HEIGHT,
-                StyleProperty::MinWidth(_) => StyleFlags::MIN_WIDTH,
-                StyleProperty::MinHeight(_) => StyleFlags::MIN_HEIGHT,
-                StyleProperty::Display(_) => StyleFlags::DISPLAY,
-                StyleProperty::Wrap(_) => StyleFlags::WRAP,
-                StyleProperty::AlignItems(_) => StyleFlags::ALIGN_ITEMS,
-                StyleProperty::JustifyContent(_) => StyleFlags::JUSTIFY_CONTENT,
-                StyleProperty::FlexDirection(_) => StyleFlags::FLEX_DIRECTION,
-                StyleProperty::FlexGrow(_) => StyleFlags::FLEX_GROW,
-                StyleProperty::FlexShrink(_) => StyleFlags::FLEX_SHRINK,
-                StyleProperty::FlexBasis(_) => StyleFlags::FLEX_BASIS,
-                StyleProperty::FontFamily(_) => StyleFlags::FONT_FAMILY,
-                StyleProperty::Color(_) => StyleFlags::COLOR,
-                StyleProperty::Background(_) => StyleFlags::BACKGROUND,
-                StyleProperty::FontSize(_) => StyleFlags::FONT_SIZE,
-                StyleProperty::FontWeight(_) => StyleFlags::FONT_WEIGHT,
-                StyleProperty::FontStyle(_) => StyleFlags::FONT_STYLE,
-                StyleProperty::Underline(_) => StyleFlags::UNDERLINE,
-                StyleProperty::Overflow(_) => StyleFlags::OVERFLOW,
-                StyleProperty::BorderColor(_) => StyleFlags::BORDER_COLOR,
-                StyleProperty::BorderWidth(_) => StyleFlags::BORDER_WIDTH,
-                StyleProperty::BorderRadius(_) => StyleFlags::BORDER_RADIUS,
-                StyleProperty::ScrollbarColor(_) => StyleFlags::SCROLLBAR_COLOR,
-                StyleProperty::ScrollbarRadius(_) => StyleFlags::SCROLLBAR_RADIUS,
-                StyleProperty::ScrollbarThumbMargin(_) => StyleFlags::SCROLLBAR_THUMB_MARGIN,
-                StyleProperty::ScrollbarWidth(_) => StyleFlags::SCROLLBAR_WIDTH,
-                StyleProperty::Visible(_) => StyleFlags::VISIBLE,
-                StyleProperty::SelectionColor(_) => StyleFlags::SELECTION_COLOR,
-                StyleProperty::CursorColor(_) => StyleFlags::CURSOR_COLOR,
-                StyleProperty::LineHeight(_) => StyleFlags::LINE_HEIGHT,
-            };
-
-            if new.dirty_flags.contains(flag) {
-                // Remove from merged if it already exists
-                merged.remove_property(|p| std::mem::discriminant(p) == std::mem::discriminant(prop));
-                // Push the updated property
-                merged.properties.push(*prop);
-                merged.dirty_flags.insert(flag);
-            }
-        }
+    pub fn get_cursor_color(&self) -> Option<Color> {
+        self.cursor_color.get()
+    }
+    pub fn set_cursor_color(&mut self, val: Option<Color>) {
+        self.is_dirty = true;
+        self.cursor_color.set(val);
+    }
+}
 
-        merged
+impl Style {
+    pub fn has_border(&self) -> bool {
+        self.border_width.is_dirty() ||
+        self.border_radius.is_dirty() ||
+        self.border_color.is_dirty()
     }
 
     #[allow(clippy::wrong_self_convention)]
     pub fn to_text_style(&'_ self) -> parley::TextStyle<'_, ColorBrush> {
-        let font_size = self.font_size();
-        let line_height = self.line_height();
-        let font_weight = parley::FontWeight::new(self.font_weight().0 as f32);
-        let font_style = match self.font_style() {
+        let font_size = self.get_font_size();
+        let line_height = self.get_line_height();
+        let font_weight = parley::FontWeight::new(self.get_font_weight().0 as f32);
+        let font_style = match self.get_font_style() {
             FontStyle::Normal => parley::FontStyle::Normal,
             FontStyle::Italic => parley::FontStyle::Italic,
             // FIXME: Allow an angle when setting the obliqueness.
             FontStyle::Oblique => parley::FontStyle::Oblique(None),
         };
         let brush = ColorBrush {
-            color: self.color(),
+            color: self.get_color(),
         };
 
-        let font_stack_cow_list = if let Some(font_family) = self.font_family().name() {
+        let font_stack_cow_list = if let Some(font_family) = self.get_font_family().name() {
             // Use the user-provided font and fallback to system UI fonts as needed.
             Cow::Owned(vec![
                 parley::FontFamily::Named(Cow::Owned(font_family.to_string())),
@@ -660,7 +466,7 @@ impl Style {
             Cow::Owned(vec![parley::FontFamily::Generic(parley::GenericFamily::SystemUi)])
         };
 
-        let underline = self.underline();
+        let underline = self.get_underline();
         let has_underline = underline.is_some();
         let mut underline_offset = None;
         let mut underline_size = None;
@@ -703,20 +509,20 @@ impl Style {
     }
 
     pub fn add_styles_to_style_set(&self, style_set: &mut parley::StyleSet<ColorBrush>) {
-        let font_size = self.font_size();
-        let line_height = self.line_height();
-        let font_weight = parley::FontWeight::new(self.font_weight().0 as f32);
-        let font_style = match self.font_style() {
+        let font_size = self.get_font_size();
+        let line_height = self.get_line_height();
+        let font_weight = parley::FontWeight::new(self.get_font_weight().0 as f32);
+        let font_style = match self.get_font_style() {
             FontStyle::Normal => parley::FontStyle::Normal,
             FontStyle::Italic => parley::FontStyle::Italic,
             // FIXME: Allow an angle when setting the obliqueness.
             FontStyle::Oblique => parley::FontStyle::Oblique(None),
         };
         let brush = ColorBrush {
-            color: self.color(),
+            color: self.get_color(),
         };
 
-        let underline = self.underline();
+        let underline = self.get_underline();
         let has_underline = underline.is_some();
         let mut underline_offset = None;
         let mut underline_size = None;
@@ -730,7 +536,7 @@ impl Style {
             });
         }
 
-        let font_family = self.font_family();
+        let font_family = self.get_font_family();
         let font_stack_cow_list = if let Some(font_family) = font_family.name() {
             // Use the user-provided font and fallback to system UI fonts as needed.
             Cow::Owned(vec![
@@ -757,4 +563,4 @@ impl Style {
         style_set.insert(parley::StyleProperty::UnderlineOffset(underline_offset));
         style_set.insert(parley::StyleProperty::UnderlineSize(underline_size));
     }
-}
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/style/taffy_conversions.rs b/crates/craft_retained/src/style/taffy_conversions.rs
index c4a6ce41..55b3d2a8 100644
--- a/crates/craft_retained/src/style/taffy_conversions.rs
+++ b/crates/craft_retained/src/style/taffy_conversions.rs
@@ -1,7 +1,4 @@
-use taffy::{FlexWrap, Overflow};
-
-use crate::animations::Animation;
-use crate::style::{AlignItems, Display, FlexDirection, JustifyContent, Style, Unit, Wrap};
+use crate::style::{AlignItems, Display, FlexDirection, JustifyContent, Style, Unit, FlexWrap, Overflow, BoxSizing, Position};
 
 fn unit_to_taffy_dimension(unit: Unit) -> taffy::Dimension {
     match unit {
@@ -28,68 +25,65 @@ fn unit_to_taffy_length_percentage(unit: Unit) -> taffy::LengthPercentage {
 }
 
 impl Style {
-    pub fn animation(&self, animation: &str) -> Option<&Animation> {
-        self.animations.iter().find(|ani| ani.name == animation)
-    }
 
     pub fn to_taffy_style(&self) -> taffy::Style {
         let style = self;
 
         let gap = taffy::Size {
-            width: unit_to_taffy_length_percentage(style.gap()[0]),
-            height: unit_to_taffy_length_percentage(style.gap()[1]),
+            width: unit_to_taffy_length_percentage(style.get_gap()[0]),
+            height: unit_to_taffy_length_percentage(style.get_gap()[1]),
         };
 
-        let display = match style.display() {
+        let display = match style.get_display() {
             Display::Flex => taffy::Display::Flex,
             Display::Block => taffy::Display::Block,
             Display::None => taffy::Display::None,
         };
 
         let size = taffy::Size {
-            width: unit_to_taffy_dimension(style.width()),
-            height: unit_to_taffy_dimension(style.height()),
+            width: unit_to_taffy_dimension(style.get_width()),
+            height: unit_to_taffy_dimension(style.get_height()),
         };
 
         let max_size = taffy::Size {
-            width: unit_to_taffy_dimension(style.max_width()),
-            height: unit_to_taffy_dimension(style.max_height()),
+            width: unit_to_taffy_dimension(style.get_max_width()),
+            height: unit_to_taffy_dimension(style.get_max_height()),
         };
 
         let min_size = taffy::Size {
-            width: unit_to_taffy_dimension(style.min_width()),
-            height: unit_to_taffy_dimension(style.min_height()),
+            width: unit_to_taffy_dimension(style.get_min_width()),
+            height: unit_to_taffy_dimension(style.get_min_height()),
         };
 
         let margin: taffy::Rect<taffy::LengthPercentageAuto> = taffy::Rect {
-            left: unit_to_taffy_lengthpercentageauto(style.margin().left),
-            right: unit_to_taffy_lengthpercentageauto(style.margin().right),
-            top: unit_to_taffy_lengthpercentageauto(style.margin().top),
-            bottom: unit_to_taffy_lengthpercentageauto(style.margin().bottom),
+            left: unit_to_taffy_lengthpercentageauto(style.get_margin().left),
+            right: unit_to_taffy_lengthpercentageauto(style.get_margin().right),
+            top: unit_to_taffy_lengthpercentageauto(style.get_margin().top),
+            bottom: unit_to_taffy_lengthpercentageauto(style.get_margin().bottom),
         };
 
         let padding: taffy::Rect<taffy::LengthPercentage> = taffy::Rect {
-            left: unit_to_taffy_length_percentage(style.padding().left),
-            right: unit_to_taffy_length_percentage(style.padding().right),
-            top: unit_to_taffy_length_percentage(style.padding().top),
-            bottom: unit_to_taffy_length_percentage(style.padding().bottom),
+            left: unit_to_taffy_length_percentage(style.get_padding().left),
+            right: unit_to_taffy_length_percentage(style.get_padding().right),
+            top: unit_to_taffy_length_percentage(style.get_padding().top),
+            bottom: unit_to_taffy_length_percentage(style.get_padding().bottom),
         };
 
         let border: taffy::Rect<taffy::LengthPercentage> = taffy::Rect {
-            left: unit_to_taffy_length_percentage(style.border_width().left),
-            right: unit_to_taffy_length_percentage(style.border_width().right),
-            top: unit_to_taffy_length_percentage(style.border_width().top),
-            bottom: unit_to_taffy_length_percentage(style.border_width().bottom),
+            left: unit_to_taffy_length_percentage(style.get_border_width().left),
+            right: unit_to_taffy_length_percentage(style.get_border_width().right),
+            top: unit_to_taffy_length_percentage(style.get_border_width().top),
+            bottom: unit_to_taffy_length_percentage(style.get_border_width().bottom),
         };
 
         let inset: taffy::Rect<taffy::LengthPercentageAuto> = taffy::Rect {
-            left: unit_to_taffy_lengthpercentageauto(style.inset().left),
-            right: unit_to_taffy_lengthpercentageauto(style.inset().right),
-            top: unit_to_taffy_lengthpercentageauto(style.inset().top),
-            bottom: unit_to_taffy_lengthpercentageauto(style.inset().bottom),
+            left: unit_to_taffy_lengthpercentageauto(style.get_inset().left),
+            right: unit_to_taffy_lengthpercentageauto(style.get_inset().right),
+            top: unit_to_taffy_lengthpercentageauto(style.get_inset().top),
+            bottom: unit_to_taffy_lengthpercentageauto(style.get_inset().bottom),
         };
 
-        let align_items = match style.align_items() {
+        let align_items = match style.get_align_items() {
             None => None,
             Some(AlignItems::Start) => Some(taffy::AlignItems::Start),
             Some(AlignItems::End) => Some(taffy::AlignItems::End),
@@ -100,7 +94,7 @@ impl Style {
             Some(AlignItems::Stretch) => Some(taffy::AlignItems::Stretch),
         };
 
-        let justify_content = match style.justify_content() {
+        let justify_content = match style.get_justify_content() {
             None => None,
             Some(JustifyContent::Start) => Some(taffy::JustifyContent::Start),
             Some(JustifyContent::End) => Some(taffy::JustifyContent::End),
@@ -113,40 +107,52 @@ impl Style {
             Some(JustifyContent::SpaceAround) => Some(taffy::JustifyContent::SpaceAround),
         };
 
-        let flex_direction = match style.flex_direction() {
+        let flex_direction = match style.get_flex_direction() {
             FlexDirection::Row => taffy::FlexDirection::Row,
             FlexDirection::Column => taffy::FlexDirection::Column,
             FlexDirection::RowReverse => taffy::FlexDirection::RowReverse,
             FlexDirection::ColumnReverse => taffy::FlexDirection::ColumnReverse,
         };
 
-        let flex_wrap = match style.wrap() {
-            Wrap::NoWrap => FlexWrap::NoWrap,
-            Wrap::Wrap => FlexWrap::Wrap,
-            Wrap::WrapReverse => FlexWrap::WrapReverse,
+        let flex_wrap = match style.get_wrap() {
+            FlexWrap::NoWrap => taffy::FlexWrap::NoWrap,
+            FlexWrap::Wrap => taffy::FlexWrap::Wrap,
+            FlexWrap::WrapReverse => taffy::FlexWrap::WrapReverse,
         };
 
-        let flex_grow = style.flex_grow();
-        let flex_shrink = style.flex_shrink();
-        let flex_basis: taffy::Dimension = unit_to_taffy_dimension(style.flex_basis());
-
-        fn overflow_to_taffy_overflow(overflow: Overflow) -> Overflow {
-            overflow
+        let flex_grow = style.get_flex_grow();
+        let flex_shrink = style.get_flex_shrink();
+        let flex_basis: taffy::Dimension = unit_to_taffy_dimension(style.get_flex_basis());
+
+        fn overflow_to_taffy_overflow(overflow: Overflow) -> taffy::Overflow {
+            match overflow {
+                Overflow::Visible => taffy::Overflow::Visible,
+                Overflow::Clip => taffy::Overflow::Clip,
+                Overflow::Hidden => taffy::Overflow::Hidden,
+                Overflow::Scroll => taffy::Overflow::Scroll,
+            }
         }
 
-        let overflow_x = overflow_to_taffy_overflow(style.overflow()[0]);
-        let overflow_y = overflow_to_taffy_overflow(style.overflow()[1]);
+        let overflow_x = overflow_to_taffy_overflow(style.get_overflow()[0]);
+        let overflow_y = overflow_to_taffy_overflow(style.get_overflow()[1]);
 
-        let scrollbar_width = style.scrollbar_width();
+        let scrollbar_width = style.get_scrollbar_width();
+        let box_sizing = match style.get_box_sizing() {
+            BoxSizing::BorderBox => taffy::BoxSizing::BorderBox,
+            BoxSizing::ContentBox => taffy::BoxSizing::ContentBox,
+        };
 
-        let box_sizing = taffy::BoxSizing::BorderBox;
+        let position = match style.get_position() {
+            Position::Relative => taffy::Position::Relative,
+            Position::Absolute => taffy::Position::Absolute
+        };
 
         taffy::Style {
             gap,
             box_sizing,
             inset,
             scrollbar_width,
-            position: style.position(),
+            position,
             size,
             min_size,
             max_size,
diff --git a/examples/counter_retained/Cargo.toml b/examples/counter_retained/Cargo.toml
index 3e443dff..2e73f028 100644
--- a/examples/counter_retained/Cargo.toml
+++ b/examples/counter_retained/Cargo.toml
@@ -23,8 +23,8 @@ features = ["accesskit", "system_fonts"]
 
 [target.'cfg(not(target_os = "android"))'.dependencies.craft_renderer]
 path = "../../crates/craft_renderer"
-features = ["vello_hybrid_renderer"]
+features = ["vello_renderer"]
 
 [target.'cfg(target_os = "android")'.dependencies.craft_renderer]
 path = "../../crates/craft_renderer"
-features = ["vello_renderer"]
\ No newline at end of file
+features = ["vello_hybrid_renderer"]
\ No newline at end of file
diff --git a/examples/jsframeworkbench/main.rs b/examples/jsframeworkbench/main.rs
index 9a605ae7..f148d1da 100644
--- a/examples/jsframeworkbench/main.rs
+++ b/examples/jsframeworkbench/main.rs
@@ -5,7 +5,7 @@ use craft_retained::elements::{Container, Element, Text, TextInner, Window};
 use craft_retained::events::Event;
 use craft_retained::events::ui_events::pointer::PointerButtonEvent;
 use craft_retained::palette::css::WHITE;
-use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Unit, Wrap};
+use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Unit, FlexWrap};
 use craft_retained::{Color, rgb};
 use rand::rng;
 use rand::rngs::ThreadRng;
@@ -334,7 +334,7 @@ fn build_buttons(state: Rc<RefCell<State>>) -> Container {
         .justify_content(Some(JustifyContent::FlexEnd))
         .align_items(Some(AlignItems::Start))
         .gap(Unit::Px(12.0), Unit::Px(12.0))
-        .wrap(Wrap::Wrap)
+        .wrap(FlexWrap::Wrap)
         .max_height(Unit::Px(150.0));
 
     let state1 = state.clone();

From e01d1b3320a9bbeb21f5134c2dae76c7ba081188 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Tue, 6 Jan 2026 22:02:04 -0500
Subject: [PATCH 049/143] Fix wrong variable being returned in style getter

---
 crates/craft_retained/src/style/styles.rs        |  2 +-
 .../src/style/taffy_conversions.rs               | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/crates/craft_retained/src/style/styles.rs b/crates/craft_retained/src/style/styles.rs
index 5b9ebbfe..7181d62d 100644
--- a/crates/craft_retained/src/style/styles.rs
+++ b/crates/craft_retained/src/style/styles.rs
@@ -161,7 +161,7 @@ impl Style {
     }
 
     pub fn get_inset(&self) -> TrblRectangle<Unit> {
-        self.margin.get()
+        self.inset.get()
     }
     pub fn set_inset(&mut self, val: TrblRectangle<Unit>) {
         self.is_dirty = true;
diff --git a/crates/craft_retained/src/style/taffy_conversions.rs b/crates/craft_retained/src/style/taffy_conversions.rs
index 55b3d2a8..8ae2734f 100644
--- a/crates/craft_retained/src/style/taffy_conversions.rs
+++ b/crates/craft_retained/src/style/taffy_conversions.rs
@@ -56,31 +56,31 @@ impl Style {
         };
 
         let margin: taffy::Rect<taffy::LengthPercentageAuto> = taffy::Rect {
-            left: unit_to_taffy_lengthpercentageauto(style.get_margin().left),
-            right: unit_to_taffy_lengthpercentageauto(style.get_margin().right),
             top: unit_to_taffy_lengthpercentageauto(style.get_margin().top),
+            right: unit_to_taffy_lengthpercentageauto(style.get_margin().right),
             bottom: unit_to_taffy_lengthpercentageauto(style.get_margin().bottom),
+            left: unit_to_taffy_lengthpercentageauto(style.get_margin().left),
         };
 
         let padding: taffy::Rect<taffy::LengthPercentage> = taffy::Rect {
-            left: unit_to_taffy_length_percentage(style.get_padding().left),
-            right: unit_to_taffy_length_percentage(style.get_padding().right),
             top: unit_to_taffy_length_percentage(style.get_padding().top),
+            right: unit_to_taffy_length_percentage(style.get_padding().right),
             bottom: unit_to_taffy_length_percentage(style.get_padding().bottom),
+            left: unit_to_taffy_length_percentage(style.get_padding().left),
         };
 
         let border: taffy::Rect<taffy::LengthPercentage> = taffy::Rect {
-            left: unit_to_taffy_length_percentage(style.get_border_width().left),
-            right: unit_to_taffy_length_percentage(style.get_border_width().right),
             top: unit_to_taffy_length_percentage(style.get_border_width().top),
+            right: unit_to_taffy_length_percentage(style.get_border_width().right),
             bottom: unit_to_taffy_length_percentage(style.get_border_width().bottom),
+            left: unit_to_taffy_length_percentage(style.get_border_width().left),
         };
 
         let inset: taffy::Rect<taffy::LengthPercentageAuto> = taffy::Rect {
-            left: unit_to_taffy_lengthpercentageauto(style.get_inset().left),
-            right: unit_to_taffy_lengthpercentageauto(style.get_inset().right),
             top: unit_to_taffy_lengthpercentageauto(style.get_inset().top),
+            right: unit_to_taffy_lengthpercentageauto(style.get_inset().right),
             bottom: unit_to_taffy_lengthpercentageauto(style.get_inset().bottom),
+            left: unit_to_taffy_lengthpercentageauto(style.get_inset().left),
         };
 
         let align_items = match style.get_align_items() {

From bb6a4207e05acfb37a2687205a9aabfab7fb4beb Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Tue, 6 Jan 2026 22:04:40 -0500
Subject: [PATCH 050/143] Don't alias JustifyContent to AlignContent

Otherwise, bindings have to alias it too
---
 crates/craft_retained/src/style/mod.rs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/crates/craft_retained/src/style/mod.rs b/crates/craft_retained/src/style/mod.rs
index ff5c851c..bee9900a 100644
--- a/crates/craft_retained/src/style/mod.rs
+++ b/crates/craft_retained/src/style/mod.rs
@@ -62,7 +62,18 @@ pub enum AlignContent {
     SpaceAround,
 }
 
-pub type JustifyContent = AlignContent;
+#[derive(Clone, Copy, Debug)]
+pub enum JustifyContent {
+    Start,
+    End,
+    FlexStart,
+    FlexEnd,
+    Center,
+    Stretch,
+    SpaceBetween,
+    SpaceEvenly,
+    SpaceAround,
+}
 
 #[derive(Clone, Copy, Debug)]
 pub enum FlexDirection {

From 947091fa068c98f81927a38ac166a8b0d278be1c Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 10 Jan 2026 23:39:57 -0500
Subject: [PATCH 051/143] Update deps

---
 Cargo.lock                                    | 1731 +++++++++--------
 Cargo.toml                                    |   10 +-
 crates/craft_renderer/Cargo.toml              |   12 +-
 crates/craft_renderer/src/vello/mod.rs        |    3 +-
 crates/craft_renderer/src/vello_cpu/mod.rs    |    2 +-
 crates/craft_renderer/src/vello_hybrid/mod.rs |    2 +-
 .../src/vello_hybrid/render_context.rs        |    1 +
 crates/craft_resource_manager/Cargo.toml      |    2 +-
 crates/craft_retained/Cargo.toml              |   14 +-
 9 files changed, 907 insertions(+), 870 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index de424a40..965c4c90 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 4
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.29"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0"
+checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -14,9 +14,9 @@ dependencies = [
 
 [[package]]
 name = "ab_glyph_rasterizer"
-version = "0.1.8"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
+checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
 
 [[package]]
 name = "accesskit"
@@ -88,7 +88,7 @@ dependencies = [
  "accesskit_consumer",
  "hashbrown 0.15.5",
  "static_assertions",
- "windows 0.61.1",
+ "windows 0.61.3",
  "windows-core 0.61.2",
 ]
 
@@ -108,9 +108,9 @@ dependencies = [
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "ahash"
@@ -119,7 +119,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -127,9 +127,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -217,9 +217,9 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "2.3.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
 dependencies = [
  "concurrent-queue",
  "event-listener-strategy",
@@ -229,9 +229,9 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.13.2"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
+checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
 dependencies = [
  "async-task",
  "concurrent-queue",
@@ -243,28 +243,27 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.4.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1237c0ae75a0f3765f58910ff9cdd0a12eeb39ab2f4c7de23262f337f0aacbb3"
+checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
 dependencies = [
- "async-lock",
+ "autocfg",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
  "futures-lite",
  "parking",
  "polling",
- "rustix 1.0.7",
+ "rustix 1.1.3",
  "slab",
- "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "async-lock"
-version = "3.4.0"
+version = "3.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
 dependencies = [
  "event-listener",
  "event-listener-strategy",
@@ -273,9 +272,9 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "2.3.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
+checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75"
 dependencies = [
  "async-channel",
  "async-io",
@@ -286,8 +285,7 @@ dependencies = [
  "cfg-if",
  "event-listener",
  "futures-lite",
- "rustix 0.38.44",
- "tracing",
+ "rustix 1.1.3",
 ]
 
 [[package]]
@@ -303,9 +301,9 @@ dependencies = [
 
 [[package]]
 name = "async-signal"
-version = "0.2.10"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
+checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c"
 dependencies = [
  "async-io",
  "async-lock",
@@ -313,10 +311,10 @@ dependencies = [
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 0.38.44",
+ "rustix 1.1.3",
  "signal-hook-registry",
  "slab",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -327,9 +325,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.88"
+version = "0.1.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -394,9 +392,31 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "aws-lc-rs"
+version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "6a88aab2464f1f25453baa7a07c84c5b7684e274054ba06817f382357f77a288"
+dependencies = [
+ "aws-lc-sys",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.35.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b45afffdee1e7c9126814751f88dddc747f41d91da16c9551a0f1e8a11e788a1"
+dependencies = [
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
 
 [[package]]
 name = "base64"
@@ -439,9 +459,6 @@ name = "bitflags"
 version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
-dependencies = [
- "serde_core",
-]
 
 [[package]]
 name = "block"
@@ -460,18 +477,18 @@ dependencies = [
 
 [[package]]
 name = "block2"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "340d2f0bdb2a43c1d3cd40513185b2bd7def0aa1052f956455114bc98f82dcf2"
+checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 dependencies = [
  "objc2 0.6.3",
 ]
 
 [[package]]
 name = "blocking"
-version = "1.6.1"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
 dependencies = [
  "async-channel",
  "async-task",
@@ -482,18 +499,18 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.5.7"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
+checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f"
 dependencies = [
  "cfg_aliases",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.17.0"
+version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
 
 [[package]]
 name = "bytemuck"
@@ -529,9 +546,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
 
 [[package]]
 name = "calloop"
@@ -561,10 +578,11 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.22"
+version = "1.2.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32db95edf998450acc7881c932f94cd9b05c87b4b2599e8bab064753da4acfd1"
+checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -578,9 +596,9 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
 
 [[package]]
 name = "cfg-if"
-version = "1.0.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "cfg_aliases"
@@ -590,39 +608,48 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
  "num-traits",
 ]
 
 [[package]]
 name = "clipboard-rs"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4320896621317ada426b440ebb0534c6234d2da9714ac05ae604ea7e2ddc3a5"
+checksum = "915fa0d77c59e330333562661159b14205f76a41a6e6eb59957724f938cb8203"
 dependencies = [
  "clipboard-win",
  "image",
  "objc2 0.6.3",
- "objc2-app-kit 0.3.1",
+ "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
- "objc2-ui-kit 0.3.1",
+ "objc2-ui-kit 0.3.2",
  "windows 0.59.0",
  "x11rb",
 ]
 
 [[package]]
 name = "clipboard-win"
-version = "5.4.0"
+version = "5.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
+checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4"
 dependencies = [
  "error-code",
  "windows-win",
 ]
 
+[[package]]
+name = "cmake"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "codespan-reporting"
 version = "0.12.0"
@@ -684,9 +711,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -711,19 +738,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "core-graphics"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
-dependencies = [
- "bitflags 2.10.0",
- "core-foundation 0.10.0",
- "core-graphics-types 0.2.0",
- "foreign-types 0.5.0",
- "libc",
-]
-
 [[package]]
 name = "core-graphics-types"
 version = "0.1.3"
@@ -742,7 +756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
  "bitflags 2.10.0",
- "core-foundation 0.10.0",
+ "core-foundation 0.10.1",
  "libc",
 ]
 
@@ -807,7 +821,7 @@ dependencies = [
  "craft_logging",
  "craft_runtime",
  "image",
- "reqwest",
+ "reqwest 0.13.1",
  "tinyvg-rs",
 ]
 
@@ -834,7 +848,7 @@ dependencies = [
  "pulldown-cmark",
  "rustc-hash 2.1.1",
  "smallvec",
- "smol_str 0.3.4",
+ "smol_str 0.3.5",
  "syntect",
  "taffy",
  "tinyvg-rs",
@@ -858,9 +872,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
@@ -913,15 +927,15 @@ checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b"
 
 [[package]]
 name = "cursor-icon"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
+checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f"
 
 [[package]]
 name = "deranged"
-version = "0.4.0"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
 dependencies = [
  "powerfmt",
 ]
@@ -964,9 +978,9 @@ dependencies = [
 
 [[package]]
 name = "document-features"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
+checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
 dependencies = [
  "litrs",
 ]
@@ -985,22 +999,23 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
 [[package]]
 name = "drm"
-version = "0.12.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1"
+checksum = "80bc8c5c6c2941f70a55c15f8d9f00f9710ebda3ffda98075f996a0e6c92756f"
 dependencies = [
  "bitflags 2.10.0",
  "bytemuck",
  "drm-ffi",
  "drm-fourcc",
+ "libc",
  "rustix 0.38.44",
 ]
 
 [[package]]
 name = "drm-ffi"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53"
+checksum = "d8e41459d99a9b529845f6d2c909eb9adf3b6d2f82635ae40be8de0601726e8b"
 dependencies = [
  "drm-sys",
  "rustix 0.38.44",
@@ -1014,14 +1029,20 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
 
 [[package]]
 name = "drm-sys"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986"
+checksum = "bafb66c8dbc944d69e15cfcc661df7e703beffbaec8bd63151368b06c5f9858c"
 dependencies = [
  "libc",
  "linux-raw-sys 0.6.5",
 ]
 
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
 [[package]]
 name = "either"
 version = "1.15.0"
@@ -1039,15 +1060,15 @@ dependencies = [
 
 [[package]]
 name = "endi"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099"
 
 [[package]]
 name = "enumflags2"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147"
+checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
 dependencies = [
  "enumflags2_derive",
  "serde",
@@ -1055,9 +1076,9 @@ dependencies = [
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79"
+checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1072,12 +1093,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.11"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1097,9 +1118,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "5.4.0"
+version = "5.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -1171,11 +1192,17 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41"
+
 [[package]]
 name = "flate2"
-version = "1.1.1"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1201,9 +1228,9 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
 [[package]]
 name = "font-types"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "511e2c18a516c666d27867d2f9821f76e7d591f762e9fc41dd6cc5c90fe54b0b"
+checksum = "39a654f404bbcbd48ea58c617c2993ee91d1cb63727a37bf2323a4edeed1b8c5"
 dependencies = [
  "bytemuck",
 ]
@@ -1275,13 +1302,19 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
 [[package]]
 name = "futures-channel"
 version = "0.3.31"
@@ -1317,9 +1350,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "2.6.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -1358,12 +1391,12 @@ dependencies = [
 
 [[package]]
 name = "gethostname"
-version = "0.4.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
 dependencies = [
- "libc",
- "windows-targets 0.48.5",
+ "rustix 1.1.3",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -1375,21 +1408,21 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasip2",
  "wasm-bindgen",
 ]
 
@@ -1494,9 +1527,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.10"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
+checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1560,9 +1593,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.4.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "hex"
@@ -1578,12 +1611,11 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
 [[package]]
 name = "http"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
 dependencies = [
  "bytes",
- "fnv",
  "itoa",
 ]
 
@@ -1618,19 +1650,21 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "hyper"
-version = "1.6.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-util",
+ "futures-core",
  "h2",
  "http",
  "http-body",
  "httparse",
  "itoa",
  "pin-project-lite",
+ "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -1638,11 +1672,10 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.5"
+version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
- "futures-util",
  "http",
  "hyper",
  "hyper-util",
@@ -1651,7 +1684,6 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tower-service",
- "webpki-roots 0.26.11",
 ]
 
 [[package]]
@@ -1672,9 +1704,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.14"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb"
+checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f"
 dependencies = [
  "base64",
  "bytes",
@@ -1688,7 +1720,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.5.9",
+ "socket2",
  "system-configuration",
  "tokio",
  "tower-service",
@@ -1698,14 +1730,15 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "1.5.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
 dependencies = [
  "displaydoc",
+ "potential_utf",
  "yoke",
  "zerofrom",
- "zerovec 0.10.4",
+ "zerovec",
 ]
 
 [[package]]
@@ -1715,123 +1748,73 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
 dependencies = [
  "displaydoc",
- "litemap 0.8.0",
+ "litemap",
  "serde",
- "tinystr 0.8.1",
- "writeable 0.6.2",
-]
-
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap 0.7.5",
- "tinystr 0.7.6",
- "writeable 0.5.5",
- "zerovec 0.10.4",
-]
-
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr 0.7.6",
- "zerovec 0.10.4",
+ "tinystr",
+ "writeable",
+ "zerovec",
 ]
 
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
-
 [[package]]
 name = "icu_normalizer"
-version = "1.5.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
  "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec 0.10.4",
+ "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
 dependencies = [
- "displaydoc",
  "icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "tinystr 0.7.6",
- "zerovec 0.10.4",
+ "zerotrie",
+ "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
+checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
 
 [[package]]
 name = "icu_provider"
-version = "1.5.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
 dependencies = [
  "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr 0.7.6",
- "writeable 0.5.5",
+ "icu_locale_core",
+ "writeable",
  "yoke",
  "zerofrom",
- "zerovec 0.10.4",
-]
-
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "zerotrie",
+ "zerovec",
 ]
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -1840,9 +1823,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -1850,9 +1833,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.25.8"
+version = "0.25.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "529feb3e6769d234375c4cf1ee2ce713682b8e76538cb13f9fc23e1400a591e7"
+checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -1860,18 +1843,18 @@ dependencies = [
  "num-traits",
  "png 0.18.0",
  "tiff",
- "zune-core",
- "zune-jpeg",
+ "zune-core 0.5.0",
+ "zune-jpeg 0.5.8",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
 ]
 
 [[package]]
@@ -1882,9 +1865,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "iri-string"
-version = "0.7.8"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a"
 dependencies = [
  "memchr",
  "serde",
@@ -1911,9 +1894,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 
 [[package]]
 name = "jni"
@@ -1939,19 +1922,19 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -1969,9 +1952,9 @@ dependencies = [
 
 [[package]]
 name = "keyboard-types"
-version = "0.8.0"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6e0f18953c66af118a70064505bd3780a226d65b06553b7293fb8933067967"
+checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d"
 dependencies = [
  "bitflags 2.10.0",
  "serde",
@@ -1996,9 +1979,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
 name = "kurbo"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce9729cc38c18d86123ab736fd2e7151763ba226ac2490ec092d1dd148825e32"
+checksum = "7564e90fe3c0d5771e1f0bc95322b21baaeaa0d9213fa6a0b61c99f8b17b3bfb"
 dependencies = [
  "arrayvec",
  "euclid",
@@ -2013,18 +1996,18 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.172"
+version = "0.2.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
 
 [[package]]
 name = "libloading"
-version = "0.8.7"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 dependencies = [
  "cfg-if",
- "windows-targets 0.53.0",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -2035,13 +2018,13 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
 dependencies = [
  "bitflags 2.10.0",
  "libc",
- "redox_syscall 0.5.12",
+ "redox_syscall 0.7.0",
 ]
 
 [[package]]
@@ -2070,43 +2053,36 @@ checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "litemap"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
-
-[[package]]
-name = "litemap"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 
 [[package]]
 name = "litrs"
-version = "0.4.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
+checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "lru-slab"
@@ -2125,9 +2101,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "memmap2"
@@ -2170,9 +2146,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
  "simd-adler32",
@@ -2180,20 +2156,20 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
 dependencies = [
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "wasi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "moxcms"
-version = "0.7.8"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692af879e4d9383c0fd9dec15524af6b6977c8bf1c6b278a4526d5341347c574"
+checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97"
 dependencies = [
  "num-traits",
  "pxfm",
@@ -2210,9 +2186,9 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "26.0.0"
+version = "27.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "916cbc7cb27db60be930a4e2da243cf4bc39569195f22fd8ee419cd31d5b662c"
+checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8"
 dependencies = [
  "arrayvec",
  "bit-set",
@@ -2221,7 +2197,7 @@ dependencies = [
  "cfg_aliases",
  "codespan-reporting",
  "half",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
  "hexf-parse",
  "indexmap",
  "libm",
@@ -2230,7 +2206,7 @@ dependencies = [
  "once_cell",
  "rustc-hash 1.1.0",
  "spirv",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "unicode-ident",
 ]
 
@@ -2243,10 +2219,10 @@ dependencies = [
  "libc",
  "log",
  "openssl",
- "openssl-probe",
+ "openssl-probe 0.1.6",
  "openssl-sys",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
  "security-framework-sys",
  "tempfile",
 ]
@@ -2281,27 +2257,13 @@ dependencies = [
  "jni-sys",
 ]
 
-[[package]]
-name = "nix"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
-dependencies = [
- "bitflags 2.10.0",
- "cfg-if",
- "cfg_aliases",
- "libc",
- "memoffset",
-]
-
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2322,18 +2284,19 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.3"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
+checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c"
 dependencies = [
  "num_enum_derive",
+ "rustversion",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.3"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
+checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2393,21 +2356,23 @@ dependencies = [
 
 [[package]]
 name = "objc2-app-kit"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc"
+checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
  "bitflags 2.10.0",
- "block2 0.6.1",
+ "block2 0.6.2",
  "libc",
  "objc2 0.6.3",
- "objc2-cloud-kit 0.3.1",
- "objc2-core-data 0.3.1",
+ "objc2-cloud-kit 0.3.2",
+ "objc2-core-data 0.3.2",
  "objc2-core-foundation",
  "objc2-core-graphics",
- "objc2-core-image 0.3.1",
+ "objc2-core-image 0.3.2",
+ "objc2-core-text",
+ "objc2-core-video",
  "objc2-foundation 0.3.2",
- "objc2-quartz-core 0.3.1",
+ "objc2-quartz-core 0.3.2",
 ]
 
 [[package]]
@@ -2425,9 +2390,9 @@ dependencies = [
 
 [[package]]
 name = "objc2-cloud-kit"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17614fdcd9b411e6ff1117dfb1d0150f908ba83a7df81b1f118005fe0a8ea15d"
+checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
 dependencies = [
  "bitflags 2.10.0",
  "objc2 0.6.3",
@@ -2459,9 +2424,9 @@ dependencies = [
 
 [[package]]
 name = "objc2-core-data"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291fbbf7d29287518e8686417cf7239c74700fd4b607623140a7d4a3c834329d"
+checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
 dependencies = [
  "bitflags 2.10.0",
  "objc2 0.6.3",
@@ -2481,9 +2446,9 @@ dependencies = [
 
 [[package]]
 name = "objc2-core-graphics"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989c6c68c13021b5c2d6b71456ebb0f9dc78d752e86a98da7c716f4f9470f5a4"
+checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
  "bitflags 2.10.0",
  "dispatch2",
@@ -2506,9 +2471,9 @@ dependencies = [
 
 [[package]]
 name = "objc2-core-image"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79b3dc0cc4386b6ccf21c157591b34a7f44c8e75b064f85502901ab2188c007e"
+checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
 dependencies = [
  "objc2 0.6.3",
  "objc2-foundation 0.3.2",
@@ -2528,9 +2493,9 @@ dependencies = [
 
 [[package]]
 name = "objc2-core-location"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac0f75792558aa9d618443bbb5db7426a7a0b6fddf96903f86ef9ad02e135740"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
 dependencies = [
  "objc2 0.6.3",
  "objc2-foundation 0.3.2",
@@ -2543,7 +2508,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
 dependencies = [
  "bitflags 2.10.0",
+ "objc2 0.6.3",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+]
+
+[[package]]
+name = "objc2-core-video"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
+dependencies = [
+ "bitflags 2.10.0",
+ "objc2 0.6.3",
  "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-io-surface",
 ]
 
 [[package]]
@@ -2572,7 +2552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
  "bitflags 2.10.0",
- "block2 0.6.1",
+ "block2 0.6.2",
  "libc",
  "objc2 0.6.3",
  "objc2-core-foundation",
@@ -2580,9 +2560,9 @@ dependencies = [
 
 [[package]]
 name = "objc2-io-surface"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7282e9ac92529fa3457ce90ebb15f4ecbc383e8338060960760fa2cf75420c3c"
+checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
  "bitflags 2.10.0",
  "objc2 0.6.3",
@@ -2628,9 +2608,9 @@ dependencies = [
 
 [[package]]
 name = "objc2-quartz-core"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ffb6a0cd5f182dc964334388560b12a57f7b74b3e2dec5e2722aa2dfb2ccd5"
+checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
  "bitflags 2.10.0",
  "objc2 0.6.3",
@@ -2671,22 +2651,23 @@ dependencies = [
 
 [[package]]
 name = "objc2-ui-kit"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b1312ad7bc8a0e92adae17aa10f90aae1fb618832f9b993b022b591027daed"
+checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
  "bitflags 2.10.0",
- "block2 0.6.1",
+ "block2 0.6.2",
  "objc2 0.6.3",
- "objc2-cloud-kit 0.3.1",
- "objc2-core-data 0.3.1",
+ "objc2-cloud-kit 0.3.2",
+ "objc2-core-data 0.3.2",
  "objc2-core-foundation",
  "objc2-core-graphics",
- "objc2-core-image 0.3.1",
- "objc2-core-location 0.3.1",
+ "objc2-core-image 0.3.2",
+ "objc2-core-location 0.3.2",
+ "objc2-core-text",
  "objc2-foundation 0.3.2",
- "objc2-quartz-core 0.3.1",
- "objc2-user-notifications 0.3.1",
+ "objc2-quartz-core 0.3.2",
+ "objc2-user-notifications 0.3.2",
 ]
 
 [[package]]
@@ -2715,9 +2696,9 @@ dependencies = [
 
 [[package]]
 name = "objc2-user-notifications"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a3f5ec77a81d9e0c5a0b32159b0cb143d7086165e79708351e02bf37dfc65cd"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
 dependencies = [
  "objc2 0.6.3",
  "objc2-foundation 0.3.2",
@@ -2753,9 +2734,9 @@ dependencies = [
 
 [[package]]
 name = "open"
-version = "5.3.2"
+version = "5.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2483562e62ea94312f3576a7aca397306df7990b8d89033e18766744377ef95"
+checksum = "43bb73a7fa3799b198970490a51174027ba0d4ec504b03cd08caf513d40024bc"
 dependencies = [
  "is-wsl",
  "libc",
@@ -2764,9 +2745,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.72"
+version = "0.10.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
+checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
 dependencies = [
  "bitflags 2.10.0",
  "cfg-if",
@@ -2794,11 +2775,17 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
+[[package]]
+name = "openssl-probe"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f50d9b3dabb09ecd771ad0aa242ca6894994c130308ca3d7684634df8037391"
+
 [[package]]
 name = "openssl-sys"
-version = "0.9.108"
+version = "0.9.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
+checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
 dependencies = [
  "cc",
  "libc",
@@ -2808,10 +2795,11 @@ dependencies = [
 
 [[package]]
 name = "orbclient"
-version = "0.3.48"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43"
+checksum = "52ad2c6bae700b7aa5d1cc30c59bdd3a1c180b09dbaea51e2ae2b8e1cf211fdd"
 dependencies = [
+ "libc",
  "libredox",
 ]
 
@@ -2826,9 +2814,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "4.6.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
+checksum = "e2c1f9f56e534ac6a9b8a4600bdf0f530fb393b5f393e7b4d03489c3cf0c3f01"
 dependencies = [
  "num-traits",
 ]
@@ -2843,17 +2831,11 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "owned_ttf_parser"
-version = "0.25.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4"
+checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b"
 dependencies = [
  "ttf-parser",
 ]
@@ -2866,9 +2848,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -2876,15 +2858,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.12",
+ "redox_syscall 0.5.18",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -2916,9 +2898,9 @@ checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
 
 [[package]]
 name = "peniko"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3c76095c9a636173600478e0373218c7b955335048c2bcd12dc6a79657649d8"
+checksum = "9a2b6aadb221872732e87d465213e9be5af2849b0e8cc5300a8ba98fffa2e00a"
 dependencies = [
  "bytemuck",
  "color",
@@ -2929,9 +2911,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pin-project"
@@ -2984,13 +2966,13 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "plist"
-version = "1.7.2"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d77244ce2d584cd84f6a15f86195b8c9b2a0dfbfd817c09e0464244091a58ed"
+checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
 dependencies = [
  "base64",
  "indexmap",
- "quick-xml 0.37.5",
+ "quick-xml",
  "serde",
  "time",
 ]
@@ -3032,24 +3014,23 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.7.4"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
  "hermit-abi",
  "pin-project-lite",
- "rustix 0.38.44",
- "tracing",
- "windows-sys 0.59.0",
+ "rustix 1.1.3",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
 
 [[package]]
 name = "portable-atomic-util"
@@ -3060,6 +3041,15 @@ dependencies = [
  "portable-atomic",
 ]
 
+[[package]]
+name = "potential_utf"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
+dependencies = [
+ "zerovec",
+]
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -3083,27 +3073,27 @@ checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
 dependencies = [
  "toml_edit",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
+checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
 
 [[package]]
 name = "pulldown-cmark"
@@ -3118,9 +3108,9 @@ dependencies = [
 
 [[package]]
 name = "pxfm"
-version = "0.1.25"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3cbdf373972bf78df4d3b518d07003938e2c7d1fb5891e55f9cb6df57009d84"
+checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8"
 dependencies = [
  "num-traits",
 ]
@@ -3133,28 +3123,19 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quick-xml"
-version = "0.36.2"
+version = "0.38.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
+checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
 dependencies = [
  "memchr",
  "serde",
 ]
 
-[[package]]
-name = "quick-xml"
-version = "0.37.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "quinn"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
 dependencies = [
  "bytes",
  "cfg_aliases",
@@ -3163,8 +3144,8 @@ dependencies = [
  "quinn-udp",
  "rustc-hash 2.1.1",
  "rustls",
- "socket2 0.5.9",
- "thiserror 2.0.12",
+ "socket2",
+ "thiserror 2.0.17",
  "tokio",
  "tracing",
  "web-time",
@@ -3172,12 +3153,13 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.12"
+version = "0.11.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
+checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
 dependencies = [
+ "aws-lc-rs",
  "bytes",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "lru-slab",
  "rand",
  "ring",
@@ -3185,7 +3167,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tinyvec",
  "tracing",
  "web-time",
@@ -3193,32 +3175,32 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.12"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
 dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.5.9",
+ "socket2",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "r-efi"
-version = "5.2.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "rand"
@@ -3246,7 +3228,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
 ]
 
 [[package]]
@@ -3263,9 +3245,9 @@ checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
 
 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 dependencies = [
  "either",
  "rayon-core",
@@ -3273,9 +3255,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -3303,18 +3285,27 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.12"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags 2.10.0",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27"
 dependencies = [
  "bitflags 2.10.0",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3323,9 +3314,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "renderdoc-sys"
@@ -3335,9 +3326,9 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
 
 [[package]]
 name = "reqwest"
-version = "0.12.20"
+version = "0.12.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813"
+checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
 dependencies = [
  "base64",
  "bytes",
@@ -3359,8 +3350,6 @@ dependencies = [
  "native-tls",
  "percent-encoding",
  "pin-project-lite",
- "quinn",
- "rustls",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -3368,6 +3357,43 @@ dependencies = [
  "sync_wrapper",
  "tokio",
  "tokio-native-tls",
+ "tower",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04e9018c9d814e5f30cc16a0f03271aeab3571e609612d9fe78c1aa8d11c2f62"
+dependencies = [
+ "base64",
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "native-tls",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-pki-types",
+ "rustls-platform-verifier",
+ "sync_wrapper",
+ "tokio",
+ "tokio-native-tls",
  "tokio-rustls",
  "tower",
  "tower-http",
@@ -3376,7 +3402,6 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots 1.0.0",
 ]
 
 [[package]]
@@ -3429,47 +3454,87 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.7"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
 dependencies = [
  "bitflags 2.10.0",
  "errno",
  "libc",
- "linux-raw-sys 0.9.4",
- "windows-sys 0.59.0",
+ "linux-raw-sys 0.11.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.27"
+version = "0.23.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
+checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
 dependencies = [
+ "aws-lc-rs",
  "once_cell",
- "ring",
  "rustls-pki-types",
  "rustls-webpki",
  "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
+dependencies = [
+ "openssl-probe 0.2.0",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework 3.5.1",
+]
+
 [[package]]
 name = "rustls-pki-types"
-version = "1.12.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282"
 dependencies = [
  "web-time",
  "zeroize",
 ]
 
+[[package]]
+name = "rustls-platform-verifier"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784"
+dependencies = [
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework 3.5.1",
+ "security-framework-sys",
+ "webpki-root-certs",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
+
 [[package]]
 name = "rustls-webpki"
-version = "0.103.3"
+version = "0.103.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
 dependencies = [
+ "aws-lc-rs",
  "ring",
  "rustls-pki-types",
  "untrusted",
@@ -3477,15 +3542,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984"
 
 [[package]]
 name = "same-file"
@@ -3498,11 +3563,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3543,11 +3608,24 @@ dependencies = [
  "security-framework-sys",
 ]
 
+[[package]]
+name = "security-framework"
+version = "3.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
+dependencies = [
+ "bitflags 2.10.0",
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
 [[package]]
 name = "security-framework-sys"
-version = "2.14.0"
+version = "2.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3585,14 +3663,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 dependencies = [
  "itoa",
  "memchr",
- "ryu",
  "serde",
+ "serde_core",
+ "zmij",
 ]
 
 [[package]]
@@ -3635,18 +3714,19 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.5"
+version = "1.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
+checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
 dependencies = [
+ "errno",
  "libc",
 ]
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
 
 [[package]]
 name = "skrifa"
@@ -3660,18 +3740,15 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "slotmap"
-version = "1.0.7"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
+checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038"
 dependencies = [
  "version_check",
 ]
@@ -3718,9 +3795,9 @@ dependencies = [
 
 [[package]]
 name = "smol_str"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3498b0a27f93ef1402f20eefacfaa1691272ac4eca1cdc8c596cb0a245d6cbf5"
+checksum = "0f7a918bd2a9951d18ee6e48f076843e8e73a9a5d22cf05bcd4b7a81bdd04e17"
 dependencies = [
  "borsh",
  "serde_core",
@@ -3728,53 +3805,43 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "socket2"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "softbuffer"
-version = "0.4.6"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08"
+checksum = "aac18da81ebbf05109ab275b157c22a653bb3c12cf884450179942f81bcbf6c3"
 dependencies = [
  "as-raw-xcb-connection",
  "bytemuck",
- "cfg_aliases",
- "core-graphics 0.24.0",
  "drm",
  "fastrand",
- "foreign-types 0.5.0",
  "js-sys",
- "log",
  "memmap2",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
- "objc2-quartz-core 0.2.2",
+ "ndk",
+ "objc2 0.6.3",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core 0.3.2",
  "raw-window-handle",
- "redox_syscall 0.5.12",
- "rustix 0.38.44",
+ "redox_syscall 0.5.18",
+ "rustix 1.1.3",
  "tiny-xlib",
+ "tracing",
  "wasm-bindgen",
  "wayland-backend",
  "wayland-client",
  "wayland-sys",
  "web-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
  "x11rb",
 ]
 
@@ -3789,9 +3856,9 @@ dependencies = [
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "static_assertions"
@@ -3830,9 +3897,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.101"
+version = "2.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3876,7 +3943,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "walkdir",
  "yaml-rust",
 ]
@@ -3885,7 +3952,7 @@ dependencies = [
 name = "syntect_dumper"
 version = "0.1.0"
 dependencies = [
- "reqwest",
+ "reqwest 0.12.28",
  "syntect",
 ]
 
@@ -3923,15 +3990,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.20.0"
+version = "3.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
 dependencies = [
  "fastrand",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "once_cell",
- "rustix 1.0.7",
- "windows-sys 0.59.0",
+ "rustix 1.1.3",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3963,11 +4030,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl 2.0.17",
 ]
 
 [[package]]
@@ -3983,9 +4050,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3994,12 +4061,11 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
@@ -4013,14 +4079,14 @@ dependencies = [
  "half",
  "quick-error",
  "weezl",
- "zune-jpeg",
+ "zune-jpeg 0.4.21",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.41"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
 dependencies = [
  "deranged",
  "itoa",
@@ -4033,15 +4099,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
 
 [[package]]
 name = "time-macros"
-version = "0.2.22"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
 dependencies = [
  "num-conv",
  "time-core",
@@ -4087,29 +4153,20 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.7.6"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 dependencies = [
  "displaydoc",
- "zerovec 0.10.4",
-]
-
-[[package]]
-name = "tinystr"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
-dependencies = [
- "displaydoc",
- "zerovec 0.11.2",
+ "serde_core",
+ "zerovec",
 ]
 
 [[package]]
 name = "tinyvec"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -4131,15 +4188,15 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.48.0"
+version = "1.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
 dependencies = [
  "bytes",
  "libc",
  "mio",
  "pin-project-lite",
- "socket2 0.6.0",
+ "socket2",
  "tokio-macros",
  "windows-sys 0.61.2",
 ]
@@ -4167,9 +4224,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
  "rustls",
  "tokio",
@@ -4177,9 +4234,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -4188,9 +4245,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.15"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
+checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
 dependencies = [
  "bytes",
  "futures-core",
@@ -4201,18 +4258,31 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.9"
+version = "0.7.5+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+dependencies = [
+ "serde_core",
+]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.26"
+version = "0.23.10+spec-1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
+checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
 dependencies = [
  "indexmap",
  "toml_datetime",
+ "toml_parser",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.6+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
+dependencies = [
  "winnow",
 ]
 
@@ -4233,9 +4303,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
 dependencies = [
  "bitflags 2.10.0",
  "bytes",
@@ -4263,9 +4333,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -4274,9 +4344,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4285,9 +4355,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
 dependencies = [
  "once_cell",
  "valuable",
@@ -4306,9 +4376,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
 dependencies = [
  "nu-ansi-term",
  "sharded-slab",
@@ -4357,8 +4427,7 @@ dependencies = [
 [[package]]
 name = "ui-events"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a57da61c5700db75d28822c56068295055ec216996560af57a5d4a457914d34"
+source = "git+https://github.com/AustinMReppert/ui-events?rev=7bc839dff9548883b0e0aaea85e48ab5f74caf05#7bc839dff9548883b0e0aaea85e48ab5f74caf05"
 dependencies = [
  "dpi",
  "keyboard-types",
@@ -4368,8 +4437,7 @@ dependencies = [
 [[package]]
 name = "ui-events-winit"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ef6b086ceb9e4bbf0148e494959b18cf08de7604f8d8e958a94e73fc2d531e"
+source = "git+https://github.com/AustinMReppert/ui-events?rev=7bc839dff9548883b0e0aaea85e48ab5f74caf05#7bc839dff9548883b0e0aaea85e48ab5f74caf05"
 dependencies = [
  "ui-events",
  "web-time",
@@ -4378,15 +4446,15 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.8.1"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unicode-segmentation"
@@ -4396,9 +4464,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.14"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
 name = "untrusted"
@@ -4408,21 +4476,16 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
+ "serde",
 ]
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -4439,6 +4502,17 @@ dependencies = [
  "tracing-web",
 ]
 
+[[package]]
+name = "uuid"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
+dependencies = [
+ "js-sys",
+ "serde_core",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "valuable"
 version = "0.1.1"
@@ -4454,7 +4528,7 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 [[package]]
 name = "vello"
 version = "0.6.0"
-source = "git+https://github.com/linebender/vello.git?rev=459e0a7b1fa328d8b6adeea0c31a2069621a85d0#459e0a7b1fa328d8b6adeea0c31a2069621a85d0"
+source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
 dependencies = [
  "bytemuck",
  "futures-intrusive",
@@ -4463,7 +4537,7 @@ dependencies = [
  "png 0.17.16",
  "skrifa",
  "static_assertions",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "vello_encoding",
  "vello_shaders",
  "wgpu",
@@ -4471,8 +4545,8 @@ dependencies = [
 
 [[package]]
 name = "vello_common"
-version = "0.0.4"
-source = "git+https://github.com/linebender/vello.git?rev=459e0a7b1fa328d8b6adeea0c31a2069621a85d0#459e0a7b1fa328d8b6adeea0c31a2069621a85d0"
+version = "0.0.5"
+source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
 dependencies = [
  "bytemuck",
  "fearless_simd",
@@ -4486,11 +4560,12 @@ dependencies = [
 
 [[package]]
 name = "vello_cpu"
-version = "0.0.4"
-source = "git+https://github.com/linebender/vello.git?rev=459e0a7b1fa328d8b6adeea0c31a2069621a85d0#459e0a7b1fa328d8b6adeea0c31a2069621a85d0"
+version = "0.0.5"
+source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
 dependencies = [
  "bytemuck",
  "crossbeam-channel",
+ "hashbrown 0.15.5",
  "ordered-channel",
  "rayon",
  "thread_local",
@@ -4500,7 +4575,7 @@ dependencies = [
 [[package]]
 name = "vello_encoding"
 version = "0.6.0"
-source = "git+https://github.com/linebender/vello.git?rev=459e0a7b1fa328d8b6adeea0c31a2069621a85d0#459e0a7b1fa328d8b6adeea0c31a2069621a85d0"
+source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
 dependencies = [
  "bytemuck",
  "guillotiere",
@@ -4511,14 +4586,14 @@ dependencies = [
 
 [[package]]
 name = "vello_hybrid"
-version = "0.0.4"
-source = "git+https://github.com/linebender/vello.git?rev=459e0a7b1fa328d8b6adeea0c31a2069621a85d0#459e0a7b1fa328d8b6adeea0c31a2069621a85d0"
+version = "0.0.5"
+source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
 dependencies = [
  "bytemuck",
  "guillotiere",
  "hashbrown 0.15.5",
  "log",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "vello_common",
  "vello_sparse_shaders",
  "wgpu",
@@ -4527,19 +4602,19 @@ dependencies = [
 [[package]]
 name = "vello_shaders"
 version = "0.6.0"
-source = "git+https://github.com/linebender/vello.git?rev=459e0a7b1fa328d8b6adeea0c31a2069621a85d0#459e0a7b1fa328d8b6adeea0c31a2069621a85d0"
+source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
 dependencies = [
  "bytemuck",
  "log",
  "naga",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "vello_encoding",
 ]
 
 [[package]]
 name = "vello_sparse_shaders"
-version = "0.0.4"
-source = "git+https://github.com/linebender/vello.git?rev=459e0a7b1fa328d8b6adeea0c31a2069621a85d0#459e0a7b1fa328d8b6adeea0c31a2069621a85d0"
+version = "0.0.5"
+source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
 
 [[package]]
 name = "version_check"
@@ -4568,50 +4643,37 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
 dependencies = [
  "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4622,9 +4684,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4632,35 +4694,35 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
  "syn",
- "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.10"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121"
+checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9"
 dependencies = [
  "cc",
  "downcast-rs",
- "rustix 0.38.44",
+ "rustix 1.1.3",
  "scoped-tls",
  "smallvec",
  "wayland-sys",
@@ -4668,12 +4730,12 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.10"
+version = "0.31.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61"
+checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec"
 dependencies = [
  "bitflags 2.10.0",
- "rustix 0.38.44",
+ "rustix 1.1.3",
  "wayland-backend",
  "wayland-scanner",
 ]
@@ -4691,20 +4753,20 @@ dependencies = [
 
 [[package]]
 name = "wayland-cursor"
-version = "0.31.10"
+version = "0.31.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a65317158dec28d00416cb16705934070aef4f8393353d41126c54264ae0f182"
+checksum = "5864c4b5b6064b06b1e8b74ead4a98a6c45a285fe7a0e784d24735f011fdb078"
 dependencies = [
- "rustix 0.38.44",
+ "rustix 1.1.3",
  "wayland-client",
  "xcursor",
 ]
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.8"
+version = "0.32.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a"
+checksum = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -4714,9 +4776,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-plasma"
-version = "0.3.8"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fd38cdad69b56ace413c6bcc1fbf5acc5e2ef4af9d5f8f1f9570c0c83eae175"
+checksum = "aa98634619300a535a9a97f338aed9a5ff1e01a461943e8346ff4ae26007306b"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -4727,9 +4789,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.8"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf"
+checksum = "e9597cdf02cf0c34cd5823786dce6b5ae8598f05c2daf5621b6e178d4f7345f3"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -4740,20 +4802,20 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.6"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484"
+checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3"
 dependencies = [
  "proc-macro2",
- "quick-xml 0.37.5",
+ "quick-xml",
  "quote",
 ]
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.6"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615"
+checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd"
 dependencies = [
  "dlib",
  "log",
@@ -4763,9 +4825,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4782,41 +4844,32 @@ dependencies = [
 ]
 
 [[package]]
-name = "webpki-roots"
-version = "0.26.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
-dependencies = [
- "webpki-roots 1.0.0",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "1.0.0"
+name = "webpki-root-certs"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb"
+checksum = "36a29fc0408b113f68cf32637857ab740edfafdf460c326cd2afaa2d84cc05dc"
 dependencies = [
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "weezl"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3"
+checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
 
 [[package]]
 name = "wgpu"
-version = "26.0.1"
+version = "27.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70b6ff82bbf6e9206828e1a3178e851f8c20f1c9028e74dd3a8090741ccd5798"
+checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77"
 dependencies = [
  "arrayvec",
  "bitflags 2.10.0",
  "cfg-if",
  "cfg_aliases",
  "document-features",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
  "js-sys",
  "log",
  "naga",
@@ -4836,17 +4889,18 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "26.0.1"
+version = "27.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f62f1053bd28c2268f42916f31588f81f64796e2ff91b81293515017ca8bd9"
+checksum = "27a75de515543b1897b26119f93731b385a19aea165a1ec5f0e3acecc229cae7"
 dependencies = [
  "arrayvec",
  "bit-set",
  "bit-vec",
  "bitflags 2.10.0",
+ "bytemuck",
  "cfg_aliases",
  "document-features",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
  "indexmap",
  "log",
  "naga",
@@ -4857,7 +4911,7 @@ dependencies = [
  "raw-window-handle",
  "rustc-hash 1.1.0",
  "smallvec",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "wgpu-core-deps-apple",
  "wgpu-core-deps-emscripten",
  "wgpu-core-deps-wasm",
@@ -4868,45 +4922,45 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core-deps-apple"
-version = "26.0.0"
+version = "27.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18ae5fbde6a4cbebae38358aa73fcd6e0f15c6144b67ef5dc91ded0db125dbdf"
+checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-emscripten"
-version = "26.0.0"
+version = "27.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7670e390f416006f746b4600fdd9136455e3627f5bd763abf9a65daa216dd2d"
+checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-wasm"
-version = "26.0.0"
+version = "27.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03b9f9e1a50686d315fc6debe4980cc45cd37b0e919351917df494e8fdc8885"
+checksum = "9b1027dcf3b027a877e44819df7ceb0e2e98578830f8cd34cd6c3c7c2a7a50b7"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-windows-linux-android"
-version = "26.0.0"
+version = "27.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "720a5cb9d12b3d337c15ff0e24d3e97ed11490ff3f7506e7f3d98c68fa5d6f14"
+checksum = "71197027d61a71748e4120f05a9242b2ad142e3c01f8c1b47707945a879a03c3"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-hal"
-version = "26.0.6"
+version = "27.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d0e67224cc7305b3b4eb2cc57ca4c4c3afc665c1d1bee162ea806e19c47bdd"
+checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -4923,7 +4977,7 @@ dependencies = [
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
  "js-sys",
  "khronos-egl",
  "libc",
@@ -4933,6 +4987,7 @@ dependencies = [
  "naga",
  "ndk-sys",
  "objc",
+ "once_cell",
  "ordered-float",
  "parking_lot",
  "portable-atomic",
@@ -4942,7 +4997,7 @@ dependencies = [
  "raw-window-handle",
  "renderdoc-sys",
  "smallvec",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "wasm-bindgen",
  "web-sys",
  "wgpu-types",
@@ -4952,15 +5007,15 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "26.0.0"
+version = "27.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca7a8d8af57c18f57d393601a1fb159ace8b2328f1b6b5f80893f7d672c9ae2"
+checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb"
 dependencies = [
  "bitflags 2.10.0",
  "bytemuck",
  "js-sys",
  "log",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "web-sys",
 ]
 
@@ -4982,11 +5037,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.9"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5012,19 +5067,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1"
 dependencies = [
  "windows-core 0.59.0",
- "windows-targets 0.53.0",
+ "windows-targets 0.53.5",
 ]
 
 [[package]]
 name = "windows"
-version = "0.61.1"
+version = "0.61.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
+checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
 dependencies = [
  "windows-collections",
  "windows-core 0.61.2",
  "windows-future",
- "windows-link 0.1.1",
+ "windows-link 0.1.3",
  "windows-numerics",
 ]
 
@@ -5057,10 +5112,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce"
 dependencies = [
  "windows-implement 0.59.0",
- "windows-interface 0.59.1",
+ "windows-interface 0.59.3",
  "windows-result 0.3.4",
  "windows-strings 0.3.1",
- "windows-targets 0.53.0",
+ "windows-targets 0.53.5",
 ]
 
 [[package]]
@@ -5069,9 +5124,9 @@ version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
- "windows-implement 0.60.0",
- "windows-interface 0.59.1",
- "windows-link 0.1.1",
+ "windows-implement 0.60.2",
+ "windows-interface 0.59.3",
+ "windows-link 0.1.3",
  "windows-result 0.3.4",
  "windows-strings 0.4.2",
 ]
@@ -5083,7 +5138,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
  "windows-core 0.61.2",
- "windows-link 0.1.1",
+ "windows-link 0.1.3",
  "windows-threading",
 ]
 
@@ -5111,9 +5166,9 @@ dependencies = [
 
 [[package]]
 name = "windows-implement"
-version = "0.60.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5133,9 +5188,9 @@ dependencies = [
 
 [[package]]
 name = "windows-interface"
-version = "0.59.1"
+version = "0.59.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5144,9 +5199,9 @@ dependencies = [
 
 [[package]]
 name = "windows-link"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
 [[package]]
 name = "windows-link"
@@ -5161,18 +5216,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
  "windows-core 0.61.2",
- "windows-link 0.1.1",
+ "windows-link 0.1.3",
 ]
 
 [[package]]
 name = "windows-registry"
-version = "0.5.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
 dependencies = [
- "windows-link 0.1.1",
- "windows-result 0.3.4",
- "windows-strings 0.4.2",
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
 ]
 
 [[package]]
@@ -5190,7 +5245,16 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
- "windows-link 0.1.1",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -5209,7 +5273,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
 dependencies = [
- "windows-link 0.1.1",
+ "windows-link 0.1.3",
 ]
 
 [[package]]
@@ -5218,7 +5282,16 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
- "windows-link 0.1.1",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -5248,6 +5321,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.61.2"
@@ -5272,21 +5354,6 @@ dependencies = [
  "windows_x86_64_msvc 0.42.2",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -5305,18 +5372,19 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.0"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
+ "windows-link 0.2.1",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
 ]
 
 [[package]]
@@ -5325,7 +5393,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
 dependencies = [
- "windows-link 0.1.1",
+ "windows-link 0.1.3",
 ]
 
 [[package]]
@@ -5343,12 +5411,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -5357,9 +5419,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5367,12 +5429,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
@@ -5381,9 +5437,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -5391,12 +5447,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -5405,9 +5455,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 
 [[package]]
 name = "windows_i686_gnullvm"
@@ -5417,9 +5467,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -5427,12 +5477,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
@@ -5441,9 +5485,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -5451,12 +5495,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
@@ -5465,9 +5503,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -5475,12 +5513,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
@@ -5489,9 +5521,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -5499,12 +5531,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -5513,9 +5539,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winit"
@@ -5533,7 +5559,7 @@ dependencies = [
  "cfg_aliases",
  "concurrent-queue",
  "core-foundation 0.9.4",
- "core-graphics 0.23.2",
+ "core-graphics",
  "cursor-icon",
  "dpi",
  "js-sys",
@@ -5571,33 +5597,18 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.10"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
+checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags 2.10.0",
-]
-
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
-[[package]]
-name = "writeable"
-version = "0.5.5"
+name = "wit-bindgen"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "writeable"
@@ -5618,30 +5629,30 @@ dependencies = [
 
 [[package]]
 name = "x11rb"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
+checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
 dependencies = [
  "as-raw-xcb-connection",
  "gethostname",
  "libc",
  "libloading",
  "once_cell",
- "rustix 0.38.44",
+ "rustix 1.1.3",
  "x11rb-protocol",
 ]
 
 [[package]]
 name = "x11rb-protocol"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
+checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
 
 [[package]]
 name = "xcursor"
-version = "0.3.8"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
+checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b"
 
 [[package]]
 name = "xkbcommon-dl"
@@ -5664,9 +5675,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.26"
+version = "0.8.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda"
+checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
 
 [[package]]
 name = "yaml-rust"
@@ -5696,11 +5707,10 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.7.5"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
 dependencies = [
- "serde",
  "stable_deref_trait",
  "yoke-derive",
  "zerofrom",
@@ -5708,9 +5718,9 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5720,9 +5730,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.7.1"
+version = "5.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3a7c7cee313d044fca3f48fa782cb750c79e4ca76ba7bc7718cd4024cdf6f68"
+checksum = "7515214ab069b46f614dee52c1256015cdc1a0b441ed612118e2871014956741"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -5738,13 +5748,15 @@ dependencies = [
  "futures-core",
  "futures-lite",
  "hex",
- "nix",
+ "libc",
  "ordered-stream",
+ "rustix 1.1.3",
  "serde",
  "serde_repr",
  "tracing",
  "uds_windows",
- "windows-sys 0.59.0",
+ "uuid",
+ "windows-sys 0.61.2",
  "winnow",
  "zbus_macros",
  "zbus_names",
@@ -5753,9 +5765,9 @@ dependencies = [
 
 [[package]]
 name = "zbus-lockstep"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a22426b1bc2aca91de97772506f0655fa373448e6010d79d5d5880915c388409"
+checksum = "6998de05217a084b7578728a9443d04ea4cd80f2a0839b8d78770b76ccd45863"
 dependencies = [
  "zbus_xml",
  "zvariant",
@@ -5763,9 +5775,9 @@ dependencies = [
 
 [[package]]
 name = "zbus-lockstep-macros"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "100ffec29ed51859052f4563061abe35557acb56ba574510571f8398efc70a29"
+checksum = "10da05367f3a7b7553c8cdf8fa91aee6b64afebe32b51c95177957efc47ca3a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5777,9 +5789,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.7.1"
+version = "5.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17e7e5eec1550f747e71a058df81a9a83813ba0f6a95f39c4e218bdc7ba366a"
+checksum = "04f54d8a5b4e9c46cf4a9732da4899b12851b5df952fc8deda23aca1d6f3e26c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -5792,25 +5804,23 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "4.2.0"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
+checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f"
 dependencies = [
  "serde",
- "static_assertions",
  "winnow",
  "zvariant",
 ]
 
 [[package]]
 name = "zbus_xml"
-version = "5.0.2"
+version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589e9a02bfafb9754bb2340a9e3b38f389772684c63d9637e76b1870377bec29"
+checksum = "441a0064125265655bccc3a6af6bef56814d9277ac83fce48b1cd7e160b80eac"
 dependencies = [
- "quick-xml 0.36.2",
+ "quick-xml",
  "serde",
- "static_assertions",
  "zbus_names",
  "zvariant",
 ]
@@ -5823,18 +5833,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
 
 [[package]]
 name = "zerocopy"
-version = "0.8.27"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.27"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5864,61 +5874,85 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
 [[package]]
-name = "zerovec"
-version = "0.10.4"
+name = "zerotrie"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
 dependencies = [
+ "displaydoc",
  "yoke",
  "zerofrom",
- "zerovec-derive",
 ]
 
 [[package]]
 name = "zerovec"
-version = "0.11.2"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 dependencies = [
+ "serde",
+ "yoke",
  "zerofrom",
+ "zerovec-derive",
 ]
 
 [[package]]
 name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
+[[package]]
+name = "zmij"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fc5a66a20078bf1251bde995aa2fdcc4b800c70b5d92dd2c62abc5c60f679f8"
+
 [[package]]
 name = "zune-core"
 version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
 
+[[package]]
+name = "zune-core"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773"
+
 [[package]]
 name = "zune-jpeg"
 version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713"
 dependencies = [
- "zune-core",
+ "zune-core 0.4.12",
+]
+
+[[package]]
+name = "zune-jpeg"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e35aee689668bf9bd6f6f3a6c60bb29ba1244b3b43adfd50edd554a371da37d5"
+dependencies = [
+ "zune-core 0.5.0",
 ]
 
 [[package]]
 name = "zvariant"
-version = "5.5.3"
+version = "5.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d30786f75e393ee63a21de4f9074d4c038d52c5b1bb4471f955db249f9dffb1"
+checksum = "788ca131e3757991e4b9fe9f7b78ae302749ed96093ff60858a1f4732b04b164"
 dependencies = [
  "endi",
  "enumflags2",
@@ -5930,9 +5964,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "5.5.3"
+version = "5.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75fda702cd42d735ccd48117b1630432219c0e9616bf6cb0f8350844ee4d9580"
+checksum = "0e69a2f6b221a6fec9bd6bcc77c19360cca106f92a5fd948b8aa17d2339c7505"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -5943,14 +5977,13 @@ dependencies = [
 
 [[package]]
 name = "zvariant_utils"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16edfee43e5d7b553b77872d99bc36afdda75c223ca7ad5e3fbecd82ca5fc34"
+checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "static_assertions",
  "syn",
  "winnow",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index e349c9b0..a448e541 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,18 +28,18 @@ debug = true
 #debug = false
 
 [workspace.dependencies]
-reqwest = { version = "0.12.19", default-features = false }
+reqwest = { version = "0.13.1", default-features = false }
 tracing = { version = "0.1.41" }
 tracing-subscriber = {version = "0.3.19"}
 
 [workspace.dependencies.peniko]
-version = "0.5.0"
+version = "0.6.0"
 default-features = false
 features = ["std"]
 
 
 [workspace.dependencies.kurbo]
-version = "0.12.0"
+version = "0.13.0"
 default-features = false
 features = ["std"]
 
@@ -49,12 +49,12 @@ default-features = false
 features = []
 
 [workspace.dependencies.tokio]
-version = "1.48.0"
+version = "1.49.0"
 default-features = false
 features = ["sync", "time"]
 
 [workspace.dependencies.image]
-version = "0.25.8"
+version = "0.25.9"
 default-features = false
 features = []
 
diff --git a/crates/craft_renderer/Cargo.toml b/crates/craft_renderer/Cargo.toml
index 2ba7f41b..73549d57 100644
--- a/crates/craft_renderer/Cargo.toml
+++ b/crates/craft_renderer/Cargo.toml
@@ -13,35 +13,35 @@ vello_hybrid_renderer_webgl = ["wgpu/webgl"]
 
 [dependencies.vello]
 git = "https://github.com/linebender/vello.git"
-rev = "459e0a7b1fa328d8b6adeea0c31a2069621a85d0"
+rev = "514a52db453e741f09e9c40283afcc186a675436"
 default-features = false
 features = ["wgpu"]
 optional = true
 
 [dependencies.vello_cpu]
 git = "https://github.com/linebender/vello.git"
-rev = "459e0a7b1fa328d8b6adeea0c31a2069621a85d0"
+rev = "514a52db453e741f09e9c40283afcc186a675436"
 optional = true
 features = ["multithreading"]
 
 [dependencies.vello_hybrid]
 git = "https://github.com/linebender/vello.git"
-rev = "459e0a7b1fa328d8b6adeea0c31a2069621a85d0"
+rev = "514a52db453e741f09e9c40283afcc186a675436"
 default-features = false
 features = ["default"]
 optional = true
 
 [dependencies.vello_common]
 git = "https://github.com/linebender/vello.git"
-rev = "459e0a7b1fa328d8b6adeea0c31a2069621a85d0"
+rev = "514a52db453e741f09e9c40283afcc186a675436"
 optional = true
 
 [dependencies.softbuffer]
-version = "0.4.6"
+version = "0.4.8"
 optional = true
 
 [dependencies.wgpu]
-version = "26.0.1"
+version = "27.0.1"
 default-features = false
 features = ["wgsl", "vulkan", "dx12"]
 optional = true
diff --git a/crates/craft_renderer/src/vello/mod.rs b/crates/craft_renderer/src/vello/mod.rs
index 401fcd46..c0ed9150 100644
--- a/crates/craft_renderer/src/vello/mod.rs
+++ b/crates/craft_renderer/src/vello/mod.rs
@@ -202,6 +202,7 @@ async fn new_device(instance: &Instance, surface: &Surface<'_>) -> (Device, Queu
             label: None,
             required_features: features & maybe_features,
             required_limits: limits,
+            experimental_features: Default::default(),
             memory_hints: MemoryHints::default(),
             trace: Default::default(),
         })
@@ -442,7 +443,7 @@ impl Renderer for VelloRenderer {
                         (rect.x + rect.width) as f64,
                         (rect.y + rect.height) as f64,
                     );
-                    scene.push_layer(BlendMode::default(), 1.0, Affine::IDENTITY, &clip);
+                    scene.push_layer(Fill::NonZero, BlendMode::default(), 1.0, Affine::IDENTITY, &clip);
                 }
                 RenderCommand::PopLayer => {
                     scene.pop_layer();
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index 27b6346b..ac41f522 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -317,7 +317,7 @@ impl Renderer for VelloCpuRenderer {
                         )
                         .into_path(0.1),
                     );
-                    self.render_context.push_layer(clip_path.as_ref(), None, None, None);
+                    self.render_context.push_layer(clip_path.as_ref(), None, None, None, None);
                 }
                 RenderCommand::PopLayer => {
                     self.render_context.pop_layer();
diff --git a/crates/craft_renderer/src/vello_hybrid/mod.rs b/crates/craft_renderer/src/vello_hybrid/mod.rs
index b5959c78..a0c0c413 100644
--- a/crates/craft_renderer/src/vello_hybrid/mod.rs
+++ b/crates/craft_renderer/src/vello_hybrid/mod.rs
@@ -401,7 +401,7 @@ impl CraftRenderer for VelloHybridRenderer {
                         )
                         .into_path(0.1),
                     );
-                    scene.push_layer(clip_path.as_ref(), None, None, None);
+                    scene.push_layer(clip_path.as_ref(), None, None, None, None);
                 }
                 RenderCommand::PopLayer => {
                     scene.pop_layer();
diff --git a/crates/craft_renderer/src/vello_hybrid/render_context.rs b/crates/craft_renderer/src/vello_hybrid/render_context.rs
index 20300c47..de6dcdb4 100644
--- a/crates/craft_renderer/src/vello_hybrid/render_context.rs
+++ b/crates/craft_renderer/src/vello_hybrid/render_context.rs
@@ -186,6 +186,7 @@ impl RenderContext {
                 label: None,
                 required_features: Features::empty(),
                 required_limits: limits,
+                experimental_features: Default::default(),
                 memory_hints: MemoryHints::default(),
                 trace: Default::default(),
             })
diff --git a/crates/craft_resource_manager/Cargo.toml b/crates/craft_resource_manager/Cargo.toml
index 0cc4a70a..99846e32 100644
--- a/crates/craft_resource_manager/Cargo.toml
+++ b/crates/craft_resource_manager/Cargo.toml
@@ -25,7 +25,7 @@ optional = true
 [target.'cfg(target_os = "android")'.dependencies.reqwest]
 workspace = true
 default-features = false
-features = ["rustls-tls"]
+features = ["rustls"]
 optional = true
 
 [dependencies.image]
diff --git a/crates/craft_retained/Cargo.toml b/crates/craft_retained/Cargo.toml
index aff0a120..768cbe90 100644
--- a/crates/craft_retained/Cargo.toml
+++ b/crates/craft_retained/Cargo.toml
@@ -68,7 +68,7 @@ default-features = false
 features = ["std"]
 
 [target.'cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))'.dependencies.clipboard-rs]
-version = "0.3.0"
+version = "0.3.1"
 optional = true
 
 [dependencies.pulldown-cmark]
@@ -105,11 +105,13 @@ workspace = true
 features = ["android-native-activity"]
 
 [dependencies.ui-events]
-version = "0.2.0"
+git = "https://github.com/AustinMReppert/ui-events"
+rev = "7bc839dff9548883b0e0aaea85e48ab5f74caf05"
 features = ["kurbo"]
 
 [dependencies.ui-events-winit]
-version = "0.2.0"
+git = "https://github.com/AustinMReppert/ui-events"
+rev = "7bc839dff9548883b0e0aaea85e48ab5f74caf05"
 features = []
 
 [dependencies.parley]
@@ -123,12 +125,12 @@ default-features = false
 features = []
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.wasm-bindgen]
-version = "0.2.100"
+version = "0.2.106"
 default-features = false
 features = ["std", "msrv"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]
-version = "0.3.77"
+version = "0.3.83"
 default-features = false
 features = [
     "Document",
@@ -137,7 +139,7 @@ features = [
 ]
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.open]
-version = "5.3.2"
+version = "5.3.3"
 default-features = false
 optional = true
 features = []

From 94048980bacd2377edb53a45cfdc63525c3e044b Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Mon, 12 Jan 2026 01:19:01 -0500
Subject: [PATCH 052/143] Feature/testing (#16)

* Add spawn_local

* Begin integration testing.

* Add to ci

* Try to add fontconfig to ci.

* try xvfb

* Missing dep

* Report

* Always generate kompari report.

* Include images in report

* ...

* ...

* ...

* ...

* ...

* ...

* ...

* ...

* ...

* ...

* ...
---
 .cargo/config.toml                            |   2 +
 .github/workflows/ci.yml                      |  42 +-
 Cargo.lock                                    | 544 +++++++++++++++++-
 Cargo.toml                                    |   1 +
 .../craft_primitives/src/geometry/borders.rs  |   9 +-
 crates/craft_renderer/src/renderer.rs         |  54 +-
 crates/craft_renderer/src/vello_cpu/mod.rs    |  13 +-
 crates/craft_retained/Cargo.toml              |  13 +-
 crates/craft_retained/src/app.rs              |  71 +--
 .../craft_retained/src/craft_winit_state.rs   |  11 +-
 crates/craft_retained/src/craftcallback.rs    |  35 ++
 .../craft_retained/src/elements/container.rs  |   6 +
 .../src/elements/core/element_internals.rs    |   1 +
 crates/craft_retained/src/elements/element.rs |  65 ++-
 .../craft_retained/src/elements/slider/mod.rs |   4 +-
 .../src/elements/slider/slider_draw.rs        |   2 +-
 .../slider/{slider.rs => slider_element.rs}   |   0
 .../src/elements/slider/slider_logic.rs       |   5 +-
 crates/craft_retained/src/elements/text.rs    |   6 +-
 .../src/elements/text_input/mod.rs            |   2 +-
 .../elements/text_input/text_input_state.rs   |   4 +-
 crates/craft_retained/src/elements/window.rs  |  46 +-
 .../craft_retained/src/layout/layout_item.rs  |   6 +-
 crates/craft_retained/src/lib.rs              |   9 +
 crates/craft_retained/src/options.rs          |  17 +
 crates/craft_retained/src/style/mod.rs        |  17 +-
 crates/craft_retained/src/style/styles.rs     |  50 +-
 .../src/style/taffy_conversions.rs            |   5 +-
 crates/craft_retained/tests/counter.rs        |  99 ++++
 .../craft_retained/tests/current/.gitignore   |   1 +
 .../tests/snapshots/counter.png               | Bin 0 -> 4725 bytes
 crates/craft_retained/tests/test_utils.rs     |  55 ++
 crates/craft_runtime/src/lib.rs               |  41 +-
 examples/jsframeworkbench/main.rs             |   7 +-
 examples/multiwindow/main.rs                  |   5 +-
 examples/pointer_events/main.rs               |   4 +-
 xtask/Cargo.toml                              |  10 +
 xtask/src/main.rs                             |  43 ++
 38 files changed, 1174 insertions(+), 131 deletions(-)
 create mode 100644 .cargo/config.toml
 create mode 100644 crates/craft_retained/src/craftcallback.rs
 rename crates/craft_retained/src/elements/slider/{slider.rs => slider_element.rs} (100%)
 create mode 100644 crates/craft_retained/tests/counter.rs
 create mode 100644 crates/craft_retained/tests/current/.gitignore
 create mode 100644 crates/craft_retained/tests/snapshots/counter.png
 create mode 100644 crates/craft_retained/tests/test_utils.rs
 create mode 100644 xtask/Cargo.toml
 create mode 100644 xtask/src/main.rs

diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 00000000..feeb78fc
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[alias]
+xtask = "run --release --package xtask --"
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 91458c19..109d9a73 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
-
+      - name: Install native dependencies
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libfontconfig1-dev
       - name: Install Stable Toolchain
         uses: dtolnay/rust-toolchain@master
         with:
@@ -35,6 +36,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+      - name: Install native dependencies
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libfontconfig1-dev
       - name: Install Stable Toolchain
         uses: dtolnay/rust-toolchain@master
         with:
@@ -75,7 +78,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
-
+      - name: Install native dependencies
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libfontconfig1-dev
       - name: Install Stable Toolchain
         uses: dtolnay/rust-toolchain@master
         with:
@@ -122,6 +126,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+      - name: Install native dependencies
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libfontconfig1-dev
       - name: Install Stable Toolchain
         uses: dtolnay/rust-toolchain@master
         with:
@@ -130,3 +136,35 @@ jobs:
         run: cargo test --package craft_retained --no-run
       - name: Run Unit Tests
         run: cargo test --package craft_retained --no-fail-fast --verbose
+
+  integration-tests:
+    runs-on: windows-latest
+    env:
+      CRAFT_RETAINED_TEST: generate-all
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Install Stable Toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUST_STABLE_VER }}
+
+      - name: Run Integration Tests
+        run: |
+          cargo test --test counter --no-default-features --features="vello_cpu_renderer png"
+
+      - name: Generate Kompari report
+        if: always()
+        run: cargo xtask report
+
+      - name: Upload Kompari report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: kompari-report
+          path: |
+            report.html
+            crates/craft_retained/tests/current
+            crates/craft_retained/tests/snapshots
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 965c4c90..ed3b21c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -176,6 +176,56 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "arrayref"
 version = "0.3.9"
@@ -418,6 +468,58 @@ dependencies = [
  "fs_extra",
 ]
 
+[[package]]
+name = "axum"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8"
+dependencies = [
+ "axum-core",
+ "bytes",
+ "form_urlencoded",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "serde_core",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -460,6 +562,18 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
 [[package]]
 name = "block"
 version = "0.1.6"
@@ -612,9 +726,53 @@ version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
+ "iana-time-zone",
+ "js-sys",
  "num-traits",
+ "wasm-bindgen",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
+[[package]]
+name = "clap_lex"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
+
 [[package]]
 name = "clipboard-rs"
 version = "0.3.1"
@@ -661,6 +819,15 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "color"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7f99105610438d4b3ee7ae8e453c2990e325c806a14d71e8ea937d584c5289"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "color"
 version = "0.3.2"
@@ -670,6 +837,12 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -689,6 +862,19 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "console"
+version = "0.15.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
+dependencies = [
+ "encode_unicode",
+ "libc",
+ "once_cell",
+ "unicode-width",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "console_error_panic_hook"
 version = "0.1.7"
@@ -842,6 +1028,7 @@ dependencies = [
  "craft_runtime",
  "image",
  "kurbo",
+ "libtest-mimic-collect",
  "open",
  "parley",
  "peniko",
@@ -919,6 +1106,16 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
+[[package]]
+name = "ctor"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "ctor-lite"
 version = "0.1.0"
@@ -1049,6 +1246,12 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
+[[package]]
+name = "encode_unicode"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@@ -1107,6 +1310,12 @@ version = "3.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
 
+[[package]]
+name = "escape8259"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5692dd7b5a1978a5aeb0ce83b7655c58ca8efdcb79d21036ea249da95afec2c6"
+
 [[package]]
 name = "euclid"
 version = "0.22.11"
@@ -1192,6 +1401,18 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "filetime"
+version = "0.2.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "find-msvc-tools"
 version = "0.1.7"
@@ -1315,6 +1536,12 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
 
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
 [[package]]
 name = "futures-channel"
 version = "0.3.31"
@@ -1591,6 +1818,12 @@ dependencies = [
  "foldhash 0.2.0",
 ]
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
 version = "0.5.2"
@@ -1648,6 +1881,21 @@ version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "humansize"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"
+dependencies = [
+ "libm",
+]
+
 [[package]]
 name = "hyper"
 version = "1.8.1"
@@ -1662,6 +1910,7 @@ dependencies = [
  "http",
  "http-body",
  "httparse",
+ "httpdate",
  "itoa",
  "pin-project-lite",
  "pin-utils",
@@ -1728,6 +1977,30 @@ dependencies = [
  "windows-registry",
 ]
 
+[[package]]
+name = "iana-time-zone"
+version = "0.1.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core 0.58.0",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "icu_collections"
 version = "2.1.1"
@@ -1847,6 +2120,12 @@ dependencies = [
  "zune-jpeg 0.5.8",
 ]
 
+[[package]]
+name = "imagesize"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
+
 [[package]]
 name = "indexmap"
 version = "2.13.0"
@@ -1855,6 +2134,20 @@ checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 dependencies = [
  "equivalent",
  "hashbrown 0.16.1",
+ "rayon",
+]
+
+[[package]]
+name = "indicatif"
+version = "0.17.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235"
+dependencies = [
+ "console",
+ "number_prefix",
+ "portable-atomic",
+ "unicode-width",
+ "web-time",
 ]
 
 [[package]]
@@ -1892,6 +2185,12 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
+
 [[package]]
 name = "itoa"
 version = "1.0.17"
@@ -1977,6 +2276,51 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
+[[package]]
+name = "kompari"
+version = "0.1.0"
+source = "git+https://github.com/linebender/kompari.git?rev=63476ab8a6413cd5add210b76c1d2d671dd67212#63476ab8a6413cd5add210b76c1d2d671dd67212"
+dependencies = [
+ "bytemuck",
+ "color 0.2.4",
+ "log",
+ "oxipng",
+ "png 0.17.16",
+ "rayon",
+ "thiserror 2.0.17",
+ "walkdir",
+]
+
+[[package]]
+name = "kompari-html"
+version = "0.1.0"
+source = "git+https://github.com/linebender/kompari.git?rev=63476ab8a6413cd5add210b76c1d2d671dd67212#63476ab8a6413cd5add210b76c1d2d671dd67212"
+dependencies = [
+ "axum",
+ "base64",
+ "chrono",
+ "imagesize",
+ "kompari",
+ "maud",
+ "rayon",
+ "serde",
+ "tokio",
+]
+
+[[package]]
+name = "kompari-tasks"
+version = "0.1.0"
+source = "git+https://github.com/linebender/kompari.git?rev=63476ab8a6413cd5add210b76c1d2d671dd67212#63476ab8a6413cd5add210b76c1d2d671dd67212"
+dependencies = [
+ "clap",
+ "humansize",
+ "indicatif",
+ "kompari",
+ "kompari-html",
+ "rayon",
+ "termcolor",
+]
+
 [[package]]
 name = "kurbo"
 version = "0.13.0"
@@ -2000,6 +2344,24 @@ version = "0.2.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
 
+[[package]]
+name = "libdeflate-sys"
+version = "1.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23bd6304ebf75390d8a99b88bdf2a266f62647838140cb64af8e6702f6e3fddc"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "libdeflater"
+version = "1.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5d4880e6d634d3d029d65fa016038e788cc728a17b782684726fb34ee140caf"
+dependencies = [
+ "libdeflate-sys",
+]
+
 [[package]]
 name = "libloading"
 version = "0.8.9"
@@ -2027,6 +2389,40 @@ dependencies = [
  "redox_syscall 0.7.0",
 ]
 
+[[package]]
+name = "libtest-mimic"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5297962ef19edda4ce33aaa484386e0a5b3d7f2f4e037cbeee00503ef6b29d33"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap",
+ "escape8259",
+]
+
+[[package]]
+name = "libtest-mimic-collect"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a30974da57f2ec4e94399f6036f7d6c02128e96b780760b46efde9cd058e3ec"
+dependencies = [
+ "ctor",
+ "libtest-mimic",
+ "libtest-mimic-collect-macro",
+]
+
+[[package]]
+name = "libtest-mimic-collect-macro"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6eeb2525f5cee3328f83ac5ba57977b458e5ed7b54eeebd52709445f156a3c9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "linebender_resource_handle"
 version = "0.1.1"
@@ -2099,6 +2495,34 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "matchit"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
+
+[[package]]
+name = "maud"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8156733e27020ea5c684db5beac5d1d611e1272ab17901a49466294b84fc217e"
+dependencies = [
+ "itoa",
+ "maud_macros",
+]
+
+[[package]]
+name = "maud_macros"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7261b00f3952f617899bc012e3dbd56e4f0110a038175929fa5d18e5a19913ca"
+dependencies = [
+ "proc-macro2",
+ "proc-macro2-diagnostics",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.6"
@@ -2304,6 +2728,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
 [[package]]
 name = "objc"
 version = "0.2.7"
@@ -2710,6 +3140,12 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+
 [[package]]
 name = "onig"
 version = "6.5.1"
@@ -2840,6 +3276,24 @@ dependencies = [
  "ttf-parser",
 ]
 
+[[package]]
+name = "oxipng"
+version = "9.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26c613f0f566526a647c7473f6a8556dbce22c91b13485ee4b4ec7ab648e4973"
+dependencies = [
+ "bitvec",
+ "crossbeam-channel",
+ "filetime",
+ "indexmap",
+ "libdeflater",
+ "log",
+ "rayon",
+ "rgb",
+ "rustc-hash 2.1.1",
+ "zopfli",
+]
+
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -2903,7 +3357,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a2b6aadb221872732e87d465213e9be5af2849b0e8cc5300a8ba98fffa2e00a"
 dependencies = [
  "bytemuck",
- "color",
+ "color 0.3.2",
  "kurbo",
  "linebender_resource_handle",
  "smallvec",
@@ -3089,6 +3543,18 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
 [[package]]
 name = "profiling"
 version = "1.0.17"
@@ -3202,6 +3668,12 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
 [[package]]
 name = "rand"
 version = "0.9.2"
@@ -3404,6 +3876,15 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "rgb"
+version = "0.8.52"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "ring"
 version = "0.17.14"
@@ -3674,6 +4155,17 @@ dependencies = [
  "zmij",
 ]
 
+[[package]]
+name = "serde_path_to_error"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
+dependencies = [
+ "itoa",
+ "serde",
+ "serde_core",
+]
+
 [[package]]
 name = "serde_repr"
 version = "0.1.20"
@@ -3872,6 +4364,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "subtle"
 version = "2.6.1"
@@ -3988,6 +4486,12 @@ dependencies = [
  "slotmap",
 ]
 
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
 [[package]]
 name = "tempfile"
 version = "3.24.0"
@@ -4299,6 +4803,7 @@ dependencies = [
  "tokio",
  "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -4337,6 +4842,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
+ "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -4492,6 +4998,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
 [[package]]
 name = "util"
 version = "0.1.0"
@@ -5616,6 +6128,15 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
 [[package]]
 name = "x11-dl"
 version = "2.21.0"
@@ -5679,6 +6200,15 @@ version = "0.8.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
 
+[[package]]
+name = "xtask"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "kompari",
+ "kompari-tasks",
+]
+
 [[package]]
 name = "yaml-rust"
 version = "0.4.5"
@@ -5918,6 +6448,18 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fc5a66a20078bf1251bde995aa2fdcc4b800c70b5d92dd2c62abc5c60f679f8"
 
+[[package]]
+name = "zopfli"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "log",
+ "simd-adler32",
+]
+
 [[package]]
 name = "zune-core"
 version = "0.4.12"
diff --git a/Cargo.toml b/Cargo.toml
index a448e541..0b588c1f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,6 +4,7 @@ resolver = "2"
 members = [
     "crates/craft_retained",
     "crates/craft_logger",
+    "xtask",
     "examples/util",
     "examples/counter_retained",
     "examples/multiwindow",
diff --git a/crates/craft_primitives/src/geometry/borders.rs b/crates/craft_primitives/src/geometry/borders.rs
index 3f6a74f3..6ae0a730 100644
--- a/crates/craft_primitives/src/geometry/borders.rs
+++ b/crates/craft_primitives/src/geometry/borders.rs
@@ -355,10 +355,11 @@ impl CssRectPathIter {
         if let Some(iter) = &mut self.current_corner_iter {
             if let Some(el) = iter.next() {
                 // Turn MoveTo into LineTo except for the first corner
-                if self.current_corner != 1 && matches!(el, PathEl::MoveTo(_)) {
-                    if let PathEl::MoveTo(p) = el {
-                        return Some(PathEl::LineTo(p));
-                    }
+                if self.current_corner != 1
+                    && matches!(el, PathEl::MoveTo(_))
+                    && let PathEl::MoveTo(p) = el
+                {
+                    return Some(PathEl::LineTo(p));
                 }
                 return Some(el);
             } else {
diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index a51dab0b..9c683413 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -125,30 +125,30 @@ impl RenderList {
 
     #[inline(always)]
     pub fn draw_rect(&mut self, rectangle: Rectangle, fill_color: Color) {
-        if let Some(cull) = &self.cull {
-            if !cull.intersects(&rectangle) {
-                return;
-            }
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&rectangle)
+        {
+            return;
         }
         self.commands.push(RenderCommand::DrawRect(rectangle, fill_color));
     }
 
     #[inline(always)]
     pub fn push_hit_testable(&mut self, id: u64, bounding_box: Rectangle) {
-        if let Some(cull) = &self.cull {
-            if !cull.intersects(&bounding_box) {
-                return;
-            }
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&bounding_box)
+        {
+            return;
         }
         self.targets.push((id, bounding_box));
     }
 
     #[inline(always)]
     pub fn draw_rect_outline(&mut self, rectangle: Rectangle, outline_color: Color, thickness: f64) {
-        if let Some(cull) = &self.cull {
-            if !cull.intersects(&rectangle) {
-                return;
-            }
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&rectangle)
+        {
+            return;
         }
         self.commands
             .push(RenderCommand::DrawRectOutline(rectangle, outline_color, thickness));
@@ -156,10 +156,10 @@ impl RenderList {
 
     #[inline(always)]
     pub fn fill_bez_path(&mut self, path: kurbo::BezPath, brush: Brush) {
-        if let Some(cull) = &self.cull {
-            if !cull.intersects(&Rectangle::from_kurbo(path.bounding_box())) {
-                return;
-            }
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&Rectangle::from_kurbo(path.bounding_box()))
+        {
+            return;
         }
         self.commands.push(RenderCommand::FillBezPath(path, brush));
     }
@@ -172,10 +172,10 @@ impl RenderList {
         text_scroll: Option<TextScroll>,
         show_cursor: bool,
     ) {
-        if let Some(cull) = &self.cull {
-            if !cull.intersects(&rectangle) {
-                return;
-            }
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&rectangle)
+        {
+            return;
         }
         self.commands
             .push(RenderCommand::DrawText(component, rectangle, text_scroll, show_cursor));
@@ -313,4 +313,18 @@ pub trait Renderer: Any {
     );
 
     fn submit(&mut self, resource_manager: Arc<ResourceManager>);
+
+    fn screenshot(&self) -> Screenshot {
+        Screenshot {
+            width: 0,
+            height: 0,
+            pixels: Vec::new(),
+        }
+    }
+}
+
+pub struct Screenshot {
+    pub width: u16,
+    pub height: u16,
+    pub pixels: Vec<u8>,
 }
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index ac41f522..913b1aa2 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -18,7 +18,7 @@ use vello_cpu::{Pixmap, RenderContext};
 use winit::window::Window;
 
 use crate::image_adapter::ImageAdapter;
-use crate::renderer::{RenderList, Renderer, SortedCommands, TextScroll};
+use crate::renderer::{RenderList, Renderer, Screenshot, SortedCommands, TextScroll};
 use crate::text_renderer_data::TextRenderLine;
 use crate::vello_cpu::tinyvg::draw_tiny_vg;
 use crate::{Brush, RenderCommand};
@@ -317,7 +317,8 @@ impl Renderer for VelloCpuRenderer {
                         )
                         .into_path(0.1),
                     );
-                    self.render_context.push_layer(clip_path.as_ref(), None, None, None, None);
+                    self.render_context
+                        .push_layer(clip_path.as_ref(), None, None, None, None);
                 }
                 RenderCommand::PopLayer => {
                     self.render_context.pop_layer();
@@ -347,6 +348,14 @@ impl Renderer for VelloCpuRenderer {
         buffer.present().expect("Failed to present buffer");
         self.render_context.reset();
     }
+
+    fn screenshot(&self) -> Screenshot {
+        Screenshot {
+            width: self.pixmap.width(),
+            height: self.pixmap.height(),
+            pixels: self.pixmap.data_as_u8_slice().to_vec(),
+        }
+    }
 }
 
 impl VelloCpuRenderer {
diff --git a/crates/craft_retained/Cargo.toml b/crates/craft_retained/Cargo.toml
index 768cbe90..24b5a976 100644
--- a/crates/craft_retained/Cargo.toml
+++ b/crates/craft_retained/Cargo.toml
@@ -11,6 +11,7 @@ repository = "https://github.com/craft-gui/craft"
 [features]
 dynamic_linking = []
 clipboard = ["dep:clipboard-rs"]
+vello_cpu_renderer = ["craft_renderer/vello_cpu_renderer"]
 
 system_fonts = ["parley/system"]
 
@@ -162,4 +163,14 @@ version = "0.1.1"
 [dependencies.craft_resource_manager]
 path = "../craft_resource_manager"
 default-features = false
-version = "0.1.1"
\ No newline at end of file
+version = "0.1.1"
+
+[dev-dependencies]
+libtest-mimic-collect  = "0.3.3"
+
+
+[[test]]
+name = "counter"
+path = "tests/counter.rs"
+harness = false
+required-features = ["vello_cpu_renderer", "png"]
\ No newline at end of file
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index df6677f5..471908a6 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -19,7 +19,7 @@ use ui_events::keyboard::{KeyboardEvent, Modifiers, NamedKey};
 use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
 #[cfg(target_arch = "wasm32")]
 use web_time as time;
-use winit::event::Ime;
+use winit::event::{Ime, WindowEvent};
 use winit::event_loop::ActiveEventLoop;
 use winit::window::WindowId;
 
@@ -39,12 +39,15 @@ thread_local! {
     /// Records document-level state (focus, pointer captures, etc.) for internal use.
     pub static DOCUMENTS: RefCell<DocumentManager> = RefCell::new(DocumentManager::new());
     pub(crate) static ELEMENTS: RefCell<ElementIdMap> = RefCell::new(ElementIdMap::new());
-    pub(crate) static PENDING_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = RefCell::new(VecDeque::new());
-    pub(crate) static IN_PROGRESS_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = RefCell::new(VecDeque::new());
+    pub(crate) static PENDING_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = const { RefCell::new(VecDeque::new()) };
+    pub(crate) static IN_PROGRESS_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = const { RefCell::new(VecDeque::new()) };
     pub(crate) static FOCUS: RefCell<Option<Weak<RefCell<dyn ElementImpl >>>> = RefCell::new(None);
     /// An event queue that users or elements can manipulate. Cleared at the start and end of every event dispatch.
     static EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(Event, CraftMessage)>> = RefCell::new(VecDeque::with_capacity(10));
 
+    /// An event queue for capturing window events not generated by winit.
+    static WINDOW_EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(winit::window::WindowId, winit::event::WindowEvent)>> = RefCell::new(VecDeque::with_capacity(10));
+
     pub(crate) static WINDOW_MANAGER: RefCell<WindowManager> = RefCell::new(WindowManager::new());
     pub(crate) static TAFFY_TREE: RefCell<TaffyTree> = RefCell::new(TaffyTree::new());
 }
@@ -55,17 +58,28 @@ thread_local! {
 /// Only user-registered event callbacks will be dispatched.
 pub fn queue_event(event: Event, message: CraftMessage) {
     EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| {
-        return event_queue.push_back((event, message));
+        event_queue.push_back((event, message));
     });
 }
 
 /// Pops from the front of the event dispatch queue and returns the result.
 pub(crate) fn dequeue_event() -> Option<(Event, CraftMessage)> {
-    let event = EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| {
-        return event_queue.pop_front();
+    EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| event_queue.pop_front())
+}
+
+/// Enqueues an event at the back of the dispatch queue.
+///
+/// This does **not** invoke any element `on_event` handlers.
+/// Only user-registered event callbacks will be dispatched.
+pub fn queue_window_event(window_id: WindowId, event: WindowEvent) {
+    WINDOW_EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| {
+        event_queue.push_back((window_id, event));
     });
+}
 
-    event
+/// Pops from the front of the event dispatch queue and returns the result.
+pub(crate) fn dequeue_window_event() -> Option<(WindowId, WindowEvent)> {
+    WINDOW_EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| event_queue.pop_front())
 }
 
 pub struct App {
@@ -128,6 +142,11 @@ impl App {
         WINDOW_MANAGER.with_borrow_mut(|window_manager| {
             window_manager.on_about_to_wait(self, event_loop);
         });
+
+        if let Some(callback) = self.craft_options.craft_callback.take() {
+            let future = callback.call();
+            self.runtime.spawn_current_thread(future);
+        }
     }
 
     pub fn on_suspended(&mut self, _event_loop: &ActiveEventLoop) {
@@ -268,11 +287,11 @@ impl App {
     }
 
     fn dispatch_event(&mut self, window: Window, message: &CraftMessage, _is_style: bool) {
-        let mouse_pos = Some(window.mouse_position());
+        let mouse_pos = window.mouse_position();
         let render_list = window.inner.borrow().render_list.clone();
         self.event_dispatcher.dispatch_event(
             message,
-            mouse_pos.unwrap_or_default(),
+            mouse_pos,
             window.inner.clone(),
             &mut self.text_context,
             render_list.borrow_mut().deref_mut(),
@@ -335,40 +354,6 @@ impl App {
         }*/
     }
 
-    /// "Animates" a tree by calling `on_animation_frame` and changing an element's styles.
-    /*#[allow(dead_code)]
-    fn animate_tree(&mut self, delta_time: &Duration, layout_origin: Point, viewport_size: LogicalSize<f32>) {
-        /*let span = span!(Level::INFO, "animate_tree");
-        let _enter = span.enter();*/
-
-        let old_has_active_animation = self.previous_animation_flags.has_active_animation();
-        let root_element = self.root.clone();
-
-        // Damage track across recursive calls to `on_animation_frame`.
-        let mut animation_flags = AnimationFlags::default();
-        root_element.borrow_mut().on_animation_frame(&mut animation_flags, *delta_time);
-        self.previous_animation_flags = animation_flags;
-
-        // Perform a relayout if an animation used any layout effecting style property.
-        if animation_flags.needs_relayout() || old_has_active_animation {
-            root_element.borrow_mut().reset_layout_item();
-
-            self.layout_tree(
-                viewport_size,
-                layout_origin,
-                self.window_context.effective_scale_factor(),
-                self.window_context.mouse_position,
-            );
-        }
-
-        // Request a redraw if there is at least one animation playing.
-        // ControlFlow::Poll is set in `about_to_wait`.
-        if animation_flags.has_active_animation() || old_has_active_animation {
-            // Winit does not guarantee when a redraw event will happen, but that should be fine, at worst we redraw an extra time.
-            self.request_redraw(RedrawFlags::new(old_has_active_animation));
-        }
-    }*/
-
     fn update_resources(&mut self) {
         PENDING_RESOURCES.with_borrow_mut(|pending_resources| {
             IN_PROGRESS_RESOURCES.with_borrow_mut(|in_progress| {
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index b93556c2..fa830668 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -18,7 +18,7 @@ use {crate::wasm_queue::WASM_QUEUE, crate::wasm_queue::WasmQueue};
 use {wasm_bindgen::JsCast, winit::platform::web::WindowAttributesExtWebSys};
 
 use crate::CraftOptions;
-use crate::app::{App, CURRENT_WINDOW_ID, DOCUMENTS, WINDOW_MANAGER};
+use crate::app::{App, CURRENT_WINDOW_ID, DOCUMENTS, WINDOW_MANAGER, dequeue_window_event};
 use crate::document::Document;
 use crate::events::internal::InternalMessage;
 
@@ -172,6 +172,15 @@ impl ApplicationHandler for CraftWinitState {
             return;
         }
 
+        {
+            let craft_state = &mut self.craft_state;
+            craft_state.runtime.update_local_set();
+        }
+
+        while let Some((window_id, event)) = dequeue_window_event() {
+            self.window_event(event_loop, window_id, event);
+        }
+
         let craft_state = &mut self.craft_state;
 
         cfg_if::cfg_if! {
diff --git a/crates/craft_retained/src/craftcallback.rs b/crates/craft_retained/src/craftcallback.rs
new file mode 100644
index 00000000..bf2e6d29
--- /dev/null
+++ b/crates/craft_retained/src/craftcallback.rs
@@ -0,0 +1,35 @@
+use std::future::Future;
+use std::pin::Pin;
+
+pub trait CloneableCraftFn: 'static {
+    fn call(&self) -> Pin<Box<dyn Future<Output = ()>>>;
+    fn clone_box(&self) -> Box<dyn CloneableCraftFn>;
+}
+
+impl<F, Fut> CloneableCraftFn for F
+where
+    F: Fn() -> Fut + Clone + 'static,
+    Fut: Future<Output = ()> + 'static,
+{
+    fn call(&self) -> Pin<Box<dyn Future<Output = ()>>> {
+        Box::pin((self)())
+    }
+
+    fn clone_box(&self) -> Box<dyn CloneableCraftFn> {
+        Box::new(self.clone())
+    }
+}
+
+pub struct CraftCallback(pub Box<dyn CloneableCraftFn>);
+
+impl Clone for CraftCallback {
+    fn clone(&self) -> Self {
+        CraftCallback(self.0.clone_box())
+    }
+}
+
+impl CraftCallback {
+    pub fn call(&self) -> Pin<Box<dyn Future<Output = ()>>> {
+        self.0.call()
+    }
+}
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 471f99dd..63e7b42b 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -29,6 +29,12 @@ pub struct ContainerInner {
     element_data: ElementData,
 }
 
+impl Default for Container {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Container {
     pub fn new() -> Self {
         let inner = Rc::new_cyclic(|me: &Weak<RefCell<ContainerInner>>| {
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index 132e9303..64a04044 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -20,6 +20,7 @@ use crate::text::text_context::TextContext;
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
 pub trait ElementInternals: ElementData {
     /// A helper to apply the layout for all children.
+    #[allow(clippy::too_many_arguments)]
     fn apply_layout_children(
         &mut self,
         taffy_tree: &mut TaffyTree,
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 1dfcbf77..be57f2e5 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -1,18 +1,23 @@
 use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
+use std::sync::Arc;
 
 use craft_primitives::Color;
 use craft_primitives::geometry::{ElementBox, Point, TrblRectangle};
 use ui_events::pointer::PointerId;
+use winit::dpi::PhysicalPosition;
+use winit::event::WindowEvent::{CursorMoved, MouseInput};
+use winit::event::{DeviceId, ElementState, MouseButton};
 
 use crate::CraftError;
-use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
+use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE, queue_window_event};
 use crate::document::Document;
 use crate::elements::ElementIdMap;
 use crate::elements::core::ElementData;
+use crate::elements::window::WindowInternal;
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
-use crate::style::{AlignItems, Display, FlexDirection, FontFamily, FontStyle, JustifyContent, ScrollbarColor, Style, Underline, Unit, FontWeight, FlexWrap, BoxSizing, Position, Overflow};
+use crate::style::{AlignItems, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Style, Underline, Unit};
 
 /// The element trait for end-users.
 pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + Any {
@@ -507,6 +512,33 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
     fn to_rc(&self) -> Rc<RefCell<dyn ElementImpl>> {
         self.element_data().me.upgrade().unwrap()
     }
+
+    /// Returns the root element.
+    fn get_root_element(&self) -> Weak<RefCell<dyn ElementImpl>> {
+        let mut root_ancestor: Weak<RefCell<dyn ElementImpl>> = self.element_data().me.clone();
+        loop {
+            let me = root_ancestor.upgrade().unwrap();
+            if let Some(parent) = me.borrow().parent() {
+                root_ancestor = parent;
+            } else {
+                break;
+            }
+        }
+        root_ancestor
+    }
+
+    /// Gets the winit window of this element.
+    ///
+    /// This will panic if the element does not have a window as its root.
+    fn get_winit_window(&self) -> Option<Arc<winit::window::Window>> {
+        let root = self.get_root_element().upgrade().unwrap();
+        root.borrow()
+            .as_any()
+            .downcast_ref::<WindowInternal>()
+            .unwrap()
+            .winit_window
+            .clone()
+    }
 }
 
 pub trait AsElement {
@@ -515,7 +547,7 @@ pub trait AsElement {
 
 pub trait Element: Clone + AsElement {
     fn get_children(&self) -> Vec<Rc<RefCell<dyn ElementImpl>>> {
-        self.as_element_rc().borrow().children().iter().cloned().collect()
+        self.as_element_rc().borrow().children().to_vec()
     }
 
     fn remove_child(&self, child: Rc<RefCell<dyn ElementImpl>>) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
@@ -806,4 +838,31 @@ pub trait Element: Clone + AsElement {
     fn has_pointer_capture(&self, pointer_id: PointerId) -> bool {
         self.as_element_rc().borrow().has_pointer_capture(pointer_id)
     }
+
+    #[allow(async_fn_in_trait)]
+    async fn click(&self) {
+        let pos = self
+            .as_element_rc()
+            .borrow()
+            .get_computed_box_transformed()
+            .padding_rectangle();
+        let mouse_move = CursorMoved {
+            device_id: DeviceId::dummy(),
+            position: PhysicalPosition::new(pos.x as f64, pos.y as f64),
+        };
+        let mouse_down = MouseInput {
+            device_id: DeviceId::dummy(),
+            state: ElementState::Pressed,
+            button: MouseButton::Left,
+        };
+        let mouse_up = MouseInput {
+            device_id: DeviceId::dummy(),
+            state: ElementState::Released,
+            button: MouseButton::Left,
+        };
+        let window_id = self.as_element_rc().borrow().get_winit_window().unwrap().id();
+        queue_window_event(window_id, mouse_move);
+        queue_window_event(window_id, mouse_down);
+        queue_window_event(window_id, mouse_up);
+    }
 }
diff --git a/crates/craft_retained/src/elements/slider/mod.rs b/crates/craft_retained/src/elements/slider/mod.rs
index 168f004d..291b3a38 100644
--- a/crates/craft_retained/src/elements/slider/mod.rs
+++ b/crates/craft_retained/src/elements/slider/mod.rs
@@ -1,5 +1,5 @@
-mod slider;
 mod slider_draw;
+mod slider_element;
 mod slider_logic;
 
-pub use slider::{Slider, SliderDirection, SliderInner};
+pub use slider_element::{Slider, SliderDirection, SliderInner};
diff --git a/crates/craft_retained/src/elements/slider/slider_draw.rs b/crates/craft_retained/src/elements/slider/slider_draw.rs
index 61995588..8d7d703c 100644
--- a/crates/craft_retained/src/elements/slider/slider_draw.rs
+++ b/crates/craft_retained/src/elements/slider/slider_draw.rs
@@ -3,7 +3,7 @@ use craft_primitives::geometry::borders::CssRoundedRect;
 use craft_renderer::RenderList;
 use kurbo::Vec2;
 
-use crate::elements::slider::slider::SliderDirection;
+use crate::elements::slider::slider_element::SliderDirection;
 use crate::elements::{ElementImpl, SliderInner};
 use crate::layout::layout_item::{CssComputedBorder, draw_borders_generic};
 
diff --git a/crates/craft_retained/src/elements/slider/slider.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
similarity index 100%
rename from crates/craft_retained/src/elements/slider/slider.rs
rename to crates/craft_retained/src/elements/slider/slider_element.rs
diff --git a/crates/craft_retained/src/elements/slider/slider_logic.rs b/crates/craft_retained/src/elements/slider/slider_logic.rs
index 96855097..3d75008c 100644
--- a/crates/craft_retained/src/elements/slider/slider_logic.rs
+++ b/crates/craft_retained/src/elements/slider/slider_logic.rs
@@ -2,7 +2,7 @@ use kurbo::Point;
 
 use crate::elements::SliderInner;
 use crate::elements::core::ElementInternals;
-use crate::elements::slider::slider::SliderDirection;
+use crate::elements::slider::slider_element::SliderDirection;
 
 impl SliderInner {
     pub(super) fn compute_step(&self, by: i32, current_value: f64) -> f64 {
@@ -93,8 +93,7 @@ mod tests {
     use super::*;
 
     fn make_test_slider() -> Rc<RefCell<SliderInner>> {
-        let slider = SliderInner::new(16.0);
-        slider
+        SliderInner::new(16.0)
     }
 
     #[test]
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 19df5e98..ebc5ebfa 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -472,7 +472,7 @@ impl TextState {
             AvailableSpace::MinContent => None,
             AvailableSpace::MaxContent => None,
             AvailableSpace::Definite(height) => {
-                let scaled_height = dpi::PhysicalUnit::from_logical::<f32, f32>(height, self.scale_factor as f64).0;
+                let scaled_height = dpi::PhysicalUnit::from_logical::<f32, f32>(height, self.scale_factor).0;
                 Some(scaled_height)
             }
         });
@@ -484,8 +484,8 @@ impl TextState {
         let width = layout.width();
         let height = layout.height().min(height_constraint.unwrap_or(f32::MAX));
 
-        let logical_width = dpi::LogicalUnit::from_physical::<f32, f32>(width, self.scale_factor as f64).0;
-        let logical_height = dpi::LogicalUnit::from_physical::<f32, f32>(height, self.scale_factor as f64).0;
+        let logical_width = dpi::LogicalUnit::from_physical::<f32, f32>(width, self.scale_factor).0;
+        let logical_height = dpi::LogicalUnit::from_physical::<f32, f32>(height, self.scale_factor).0;
 
         let size = Size {
             width: logical_width,
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 4b73340b..264d98a4 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -436,7 +436,7 @@ impl TextInputInner {
     }
 
     pub fn get_text(&self) -> &str {
-        &self.state.editor().raw_text()
+        self.state.editor().raw_text()
     }
 
     /// Set the text.
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index 8b9c90b9..4ddc8419 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -300,7 +300,7 @@ impl TextInputState {
     pub fn cursor_blink(&mut self) {
         self.cursor_visible = self.start_time.is_some_and(|start_time| {
             let elapsed = Instant::now().duration_since(start_time);
-            (elapsed.as_millis() / self.blink_period.as_millis()) % 2 == 0
+            (elapsed.as_millis() / self.blink_period.as_millis()).is_multiple_of(2)
         });
     }
 
@@ -532,7 +532,7 @@ impl TextInputState {
         self.clear_cache();
     }
 
-    pub fn ime_pre_edit(&mut self, text_context: &mut TextContext, text: &String, cursor: &Option<(usize, usize)>) {
+    pub fn ime_pre_edit(&mut self, text_context: &mut TextContext, text: &str, cursor: &Option<(usize, usize)>) {
         if text.is_empty() {
             self.driver(text_context).clear_compose();
         } else {
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 79f8830c..2a4b6cc5 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -10,11 +10,12 @@ use std::sync::Arc;
 use accesskit::TreeUpdate;
 use craft_primitives::geometry::{Rectangle, Size};
 use craft_renderer::RenderList;
-use craft_renderer::renderer::Renderer;
+use craft_renderer::renderer::{Renderer, Screenshot};
 use craft_resource_manager::ResourceManager;
 use kurbo::{Affine, Point};
 use peniko::Color;
 use taffy::{AvailableSpace, NodeId};
+use winit::event::WindowEvent;
 use winit::event_loop::ActiveEventLoop;
 use winit::window::{Window as WinitWindow, WindowAttributes};
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
@@ -25,7 +26,7 @@ use crate::RendererBox;
 use crate::accessibility::{access_handler::CraftAccessHandler, activation_handler::CraftActivationHandler, deactivation_handler::CraftDeactivationHandler};
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::app::FOCUS;
-use crate::app::{App, TAFFY_TREE, WINDOW_MANAGER};
+use crate::app::{App, TAFFY_TREE, WINDOW_MANAGER, queue_window_event};
 use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
 use crate::elements::element::AsElement;
 use crate::elements::element_data::ElementData;
@@ -66,6 +67,12 @@ pub struct WindowInternal {
     advanced_window_fn: Option<WindowConstructor>,
 }
 
+impl Default for Window {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Window {
     pub fn new_advanced<F>(f: F) -> Self
     where
@@ -81,9 +88,15 @@ impl Window {
 
         Window { inner }
     }
-}
 
-impl Window {
+    pub fn screenshot(&self) -> Screenshot {
+        self.inner.borrow().screenshot()
+    }
+
+    pub fn close(&self) {
+        self.inner.borrow().close();
+    }
+
     pub fn winit_window(&self) -> Option<Arc<winit::window::Window>> {
         self.inner.borrow().winit_window()
     }
@@ -244,7 +257,8 @@ impl WindowInternal {
         // On macOS the window needs to be redrawn manually after resizing
         #[cfg(target_os = "macos")]
         {
-            self.window.as_ref().unwrap().request_redraw();
+            // TODO: Fix
+            //self.window.as_ref().unwrap().request_redraw();
         }
     }
 
@@ -279,8 +293,8 @@ impl WindowInternal {
 
         let window_size = self.window_size();
         let available_space: taffy::Size<AvailableSpace> = taffy::Size {
-            width: AvailableSpace::Definite(window_size.width as f32),
-            height: AvailableSpace::Definite(window_size.height as f32),
+            width: AvailableSpace::Definite(window_size.width),
+            height: AvailableSpace::Definite(window_size.height),
         };
 
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
@@ -429,10 +443,10 @@ impl WindowInternal {
         };
 
         let focus_id = FOCUS.with_borrow_mut(|focus| {
-            if let Some(focus) = focus {
-                if let Some(focus) = focus.upgrade() {
-                    return focus.borrow().element_data().internal_id;
-                }
+            if let Some(focus) = focus
+                && let Some(focus) = focus.upgrade()
+            {
+                return focus.borrow().element_data().internal_id;
             }
             window_accesskit_id
         });
@@ -457,6 +471,16 @@ impl WindowInternal {
             craft_app.resource_manager.clone(),
         );
     }
+
+    fn screenshot(&self) -> Screenshot {
+        self.renderer.as_ref().unwrap().screenshot()
+    }
+
+    fn close(&self) {
+        if let Some(winit_window) = &self.winit_window {
+            queue_window_event(winit_window.id(), WindowEvent::CloseRequested);
+        }
+    }
 }
 
 impl Element for Window {}
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index f4a9f585..ae1e9092 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -13,10 +13,8 @@ impl CssComputedBorder {
 
         self.background.apply_affine(scale_factor);
 
-        for side in self.sides.iter_mut() {
-            if let Some(side) = side {
-                side.apply_affine(scale_factor);
-            }
+        for side in self.sides.iter_mut().flatten() {
+            side.apply_affine(scale_factor);
         }
     }
 }
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 9f2f0c50..cde906ec 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -14,6 +14,7 @@ mod app;
 pub use craft_primitives::geometry;
 pub mod layout;
 pub use craft_runtime::CraftRuntime;
+mod craftcallback;
 pub mod spatial;
 mod utils;
 #[cfg(target_arch = "wasm32")]
@@ -34,6 +35,7 @@ pub use craft_resource_manager::ResourceIdentifier;
 use craft_resource_manager::ResourceManager;
 use craft_runtime::{CraftRuntimeHandle, Receiver, Sender, channel};
 use craft_winit_state::CraftState;
+pub use craftcallback::CraftCallback;
 use events::internal::InternalMessage;
 pub use options::CraftOptions;
 pub use utils::craft_error::CraftError;
@@ -61,6 +63,8 @@ pub type FutureAny = dyn Future<Output = Box<dyn CloneableAny + Send + Sync>> +
 
 pub type PinnedFutureAny = Pin<Box<FutureAny>>;
 
+pub use {craft_runtime, image};
+
 #[cfg(not(target_arch = "wasm32"))]
 type RendererBox = Box<dyn Renderer>;
 #[cfg(target_arch = "wasm32")]
@@ -101,6 +105,11 @@ pub fn craft_main(options: CraftOptions) {
     internal_craft_main_with_options(Some(options));
 }
 
+#[cfg(not(target_os = "android"))]
+pub fn craft_test(options: CraftOptions) {
+    internal_craft_main_with_options(Some(options));
+}
+
 /// Starts the Craft application with the provided component specification, global state, and configuration options.
 ///
 /// This function serves as the main entry point for launching a Craft application. It accepts a component
diff --git a/crates/craft_retained/src/options.rs b/crates/craft_retained/src/options.rs
index d83dda66..c4710dcc 100644
--- a/crates/craft_retained/src/options.rs
+++ b/crates/craft_retained/src/options.rs
@@ -1,6 +1,8 @@
 use craft_primitives::geometry::Size;
 use craft_renderer::RendererType;
 
+use crate::craftcallback::CraftCallback;
+
 /// Configuration options for the Craft application.
 ///
 /// This struct holds various options that can be used to customize the behavior
@@ -19,6 +21,7 @@ pub struct CraftOptions {
     pub window_title: String,
     /// The initial size of the window.
     pub window_size: Option<Size<f32>>,
+    pub craft_callback: Option<CraftCallback>,
 }
 
 impl Default for CraftOptions {
@@ -27,6 +30,7 @@ impl Default for CraftOptions {
             renderer: RendererType::default(),
             window_title: "craft".to_string(),
             window_size: None,
+            craft_callback: None,
         }
     }
 }
@@ -37,6 +41,19 @@ impl CraftOptions {
             renderer: RendererType::default(),
             window_title: title.to_string(),
             window_size: None,
+            craft_callback: None,
+        }
+    }
+
+    pub fn test(title: &str, callback: CraftCallback) -> Self {
+        Self {
+            #[cfg(feature = "vello_cpu_renderer")]
+            renderer: RendererType::VelloCPU,
+            #[cfg(not(feature = "vello_cpu_renderer"))]
+            renderer: RendererType::default(),
+            window_title: title.to_string(),
+            window_size: None,
+            craft_callback: Some(callback),
         }
     }
 }
diff --git a/crates/craft_retained/src/style/mod.rs b/crates/craft_retained/src/style/mod.rs
index bee9900a..c314e79a 100644
--- a/crates/craft_retained/src/style/mod.rs
+++ b/crates/craft_retained/src/style/mod.rs
@@ -4,8 +4,9 @@ mod taffy_conversions;
 use std::borrow::Cow;
 use std::fmt;
 use std::fmt::Debug;
-use peniko::Color;
+
 use craft_primitives::ColorBrush;
+use peniko::Color;
 pub use styles::*;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -188,12 +189,18 @@ pub enum Position {
 }
 
 #[derive(Clone, Debug, Copy)]
-pub struct StyleProperty<T> where T: Clone + Debug + Copy {
+pub struct StyleProperty<T>
+where
+    T: Clone + Debug + Copy,
+{
     property: T,
     is_dirty: bool,
 }
 
-impl<T> StyleProperty<T> where T: Clone + Debug + Copy {
+impl<T> StyleProperty<T>
+where
+    T: Clone + Debug + Copy,
+{
     pub fn new(property: T) -> StyleProperty<T> {
         Self {
             property,
@@ -209,7 +216,7 @@ impl<T> StyleProperty<T> where T: Clone + Debug + Copy {
 
     #[inline(always)]
     pub fn get(&self) -> T {
-        self.property.clone()
+        self.property
     }
 
     #[inline(always)]
@@ -308,4 +315,4 @@ impl Default for FontFamily {
             font_family_name: [0; 64],
         }
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/style/styles.rs b/crates/craft_retained/src/style/styles.rs
index 7181d62d..12b8ac0a 100644
--- a/crates/craft_retained/src/style/styles.rs
+++ b/crates/craft_retained/src/style/styles.rs
@@ -1,10 +1,11 @@
 use std::borrow::Cow;
 use std::fmt::Debug;
 
-use crate::style::*;
 use craft_primitives::geometry::TrblRectangle;
 use craft_primitives::{Color, ColorBrush};
 
+use crate::style::*;
+
 #[derive(Clone, Debug)]
 pub struct Style {
     box_sizing: StyleProperty<BoxSizing>,
@@ -103,7 +104,7 @@ impl Style {
             border_radius: StyleProperty::new([(0.0, 0.0); 4]),
             scrollbar_color: StyleProperty::new(ScrollbarColor {
                 thumb_color: Color::from_rgb8(150, 150, 152),
-                track_color: Color::TRANSPARENT
+                track_color: Color::TRANSPARENT,
             }),
             scrollbar_thumb_margin: StyleProperty::new(SCROLLBAR_THUMB_MARGIN),
             scrollbar_thumb_radius: StyleProperty::new([(10.0, 10.0); 4]),
@@ -123,6 +124,7 @@ impl Style {
     pub fn get_box_sizing(&self) -> BoxSizing {
         self.box_sizing.get()
     }
+
     pub fn set_box_sizing(&mut self, val: BoxSizing) {
         self.is_dirty = true;
         self.box_sizing.set(val);
@@ -131,6 +133,7 @@ impl Style {
     pub fn get_position(&self) -> Position {
         self.position.get()
     }
+
     pub fn set_position(&mut self, val: Position) {
         self.is_dirty = true;
         self.position.set(val);
@@ -139,6 +142,7 @@ impl Style {
     pub fn get_margin(&self) -> TrblRectangle<Unit> {
         self.margin.get()
     }
+
     pub fn set_margin(&mut self, val: TrblRectangle<Unit>) {
         self.is_dirty = true;
         self.margin.set(val);
@@ -147,6 +151,7 @@ impl Style {
     pub fn get_padding(&self) -> TrblRectangle<Unit> {
         self.padding.get()
     }
+
     pub fn set_padding(&mut self, val: TrblRectangle<Unit>) {
         self.is_dirty = true;
         self.padding.set(val);
@@ -155,6 +160,7 @@ impl Style {
     pub fn get_gap(&self) -> [Unit; 2] {
         self.gap.get()
     }
+
     pub fn set_gap(&mut self, val: [Unit; 2]) {
         self.is_dirty = true;
         self.gap.set(val);
@@ -163,6 +169,7 @@ impl Style {
     pub fn get_inset(&self) -> TrblRectangle<Unit> {
         self.inset.get()
     }
+
     pub fn set_inset(&mut self, val: TrblRectangle<Unit>) {
         self.is_dirty = true;
         self.inset.set(val);
@@ -171,6 +178,7 @@ impl Style {
     pub fn get_width(&self) -> Unit {
         self.width.get()
     }
+
     pub fn set_width(&mut self, val: Unit) {
         self.is_dirty = true;
         self.width.set(val);
@@ -179,6 +187,7 @@ impl Style {
     pub fn get_min_width(&self) -> Unit {
         self.min_width.get()
     }
+
     pub fn set_min_width(&mut self, val: Unit) {
         self.is_dirty = true;
         self.min_width.set(val);
@@ -187,6 +196,7 @@ impl Style {
     pub fn get_max_width(&self) -> Unit {
         self.max_width.get()
     }
+
     pub fn set_max_width(&mut self, val: Unit) {
         self.is_dirty = true;
         self.max_width.set(val);
@@ -195,6 +205,7 @@ impl Style {
     pub fn get_height(&self) -> Unit {
         self.height.get()
     }
+
     pub fn set_height(&mut self, val: Unit) {
         self.is_dirty = true;
         self.height.set(val);
@@ -203,6 +214,7 @@ impl Style {
     pub fn get_min_height(&self) -> Unit {
         self.min_height.get()
     }
+
     pub fn set_min_height(&mut self, val: Unit) {
         self.is_dirty = true;
         self.min_height.set(val);
@@ -211,6 +223,7 @@ impl Style {
     pub fn get_max_height(&self) -> Unit {
         self.max_height.get()
     }
+
     pub fn set_max_height(&mut self, val: Unit) {
         self.is_dirty = true;
         self.max_height.set(val);
@@ -219,6 +232,7 @@ impl Style {
     pub fn get_display(&self) -> Display {
         self.display.get()
     }
+
     pub fn set_display(&mut self, val: Display) {
         self.is_dirty = true;
         self.display.set(val);
@@ -227,6 +241,7 @@ impl Style {
     pub fn get_wrap(&self) -> FlexWrap {
         self.wrap.get()
     }
+
     pub fn set_wrap(&mut self, val: FlexWrap) {
         self.is_dirty = true;
         self.wrap.set(val);
@@ -235,6 +250,7 @@ impl Style {
     pub fn get_align_items(&self) -> Option<AlignItems> {
         self.align_items.get()
     }
+
     pub fn set_align_items(&mut self, val: Option<AlignItems>) {
         self.is_dirty = true;
         self.align_items.set(val);
@@ -243,6 +259,7 @@ impl Style {
     pub fn get_justify_content(&self) -> Option<JustifyContent> {
         self.justify_content.get()
     }
+
     pub fn set_justify_content(&mut self, val: Option<JustifyContent>) {
         self.is_dirty = true;
         self.justify_content.set(val);
@@ -251,6 +268,7 @@ impl Style {
     pub fn get_flex_direction(&self) -> FlexDirection {
         self.flex_direction.get()
     }
+
     pub fn set_flex_direction(&mut self, val: FlexDirection) {
         self.is_dirty = true;
         self.flex_direction.set(val);
@@ -259,6 +277,7 @@ impl Style {
     pub fn get_flex_grow(&self) -> f32 {
         self.flex_grow.get()
     }
+
     pub fn set_flex_grow(&mut self, val: f32) {
         self.is_dirty = true;
         self.flex_grow.set(val);
@@ -267,6 +286,7 @@ impl Style {
     pub fn get_flex_shrink(&self) -> f32 {
         self.flex_shrink.get()
     }
+
     pub fn set_flex_shrink(&mut self, val: f32) {
         self.is_dirty = true;
         self.flex_shrink.set(val);
@@ -275,6 +295,7 @@ impl Style {
     pub fn get_flex_basis(&self) -> Unit {
         self.flex_basis.get()
     }
+
     pub fn set_flex_basis(&mut self, val: Unit) {
         self.is_dirty = true;
         self.flex_basis.set(val);
@@ -283,6 +304,7 @@ impl Style {
     pub fn get_font_family(&self) -> FontFamily {
         self.font_family.get()
     }
+
     pub fn set_font_family(&mut self, val: FontFamily) {
         self.is_dirty = true;
         self.font_family.set(val);
@@ -291,6 +313,7 @@ impl Style {
     pub fn get_color(&self) -> Color {
         self.color.get()
     }
+
     pub fn set_color(&mut self, val: Color) {
         self.is_dirty = true;
         self.color.set(val);
@@ -299,6 +322,7 @@ impl Style {
     pub fn get_background_color(&self) -> Color {
         self.background_color.get()
     }
+
     pub fn set_background_color(&mut self, val: Color) {
         self.is_dirty = true;
         self.background_color.set(val);
@@ -307,6 +331,7 @@ impl Style {
     pub fn get_font_size(&self) -> f32 {
         self.font_size.get()
     }
+
     pub fn set_font_size(&mut self, val: f32) {
         self.is_dirty = true;
         self.font_size.set(val);
@@ -315,6 +340,7 @@ impl Style {
     pub fn get_line_height(&self) -> f32 {
         self.line_height.get()
     }
+
     pub fn set_line_height(&mut self, val: f32) {
         self.is_dirty = true;
         self.line_height.set(val);
@@ -323,6 +349,7 @@ impl Style {
     pub fn get_font_weight(&self) -> FontWeight {
         self.font_weight.get()
     }
+
     pub fn set_font_weight(&mut self, val: FontWeight) {
         self.is_dirty = true;
         self.font_weight.set(val);
@@ -331,6 +358,7 @@ impl Style {
     pub fn get_font_style(&self) -> FontStyle {
         self.font_style.get()
     }
+
     pub fn set_font_style(&mut self, val: FontStyle) {
         self.is_dirty = true;
         self.font_style.set(val);
@@ -339,6 +367,7 @@ impl Style {
     pub fn get_underline(&self) -> Option<Underline> {
         self.underline.get()
     }
+
     pub fn set_underline(&mut self, val: Option<Underline>) {
         self.is_dirty = true;
         self.underline.set(val);
@@ -347,6 +376,7 @@ impl Style {
     pub fn get_overflow(&self) -> [Overflow; 2] {
         self.overflow.get()
     }
+
     pub fn set_overflow(&mut self, val: [Overflow; 2]) {
         self.is_dirty = true;
         self.overflow.set(val);
@@ -355,6 +385,7 @@ impl Style {
     pub fn get_border_color(&self) -> TrblRectangle<Color> {
         self.border_color.get()
     }
+
     pub fn set_border_color(&mut self, val: TrblRectangle<Color>) {
         self.is_dirty = true;
         self.border_color.set(val);
@@ -363,6 +394,7 @@ impl Style {
     pub fn get_border_width(&self) -> TrblRectangle<Unit> {
         self.border_width.get()
     }
+
     pub fn set_border_width(&mut self, val: TrblRectangle<Unit>) {
         self.is_dirty = true;
         self.border_width.set(val);
@@ -371,6 +403,7 @@ impl Style {
     pub fn get_border_radius(&self) -> [(f32, f32); 4] {
         self.border_radius.get()
     }
+
     pub fn set_border_radius(&mut self, val: [(f32, f32); 4]) {
         self.is_dirty = true;
         self.border_radius.set(val);
@@ -379,6 +412,7 @@ impl Style {
     pub fn get_scrollbar_color(&self) -> ScrollbarColor {
         self.scrollbar_color.get()
     }
+
     pub fn set_scrollbar_color(&mut self, val: ScrollbarColor) {
         self.is_dirty = true;
         self.scrollbar_color.set(val);
@@ -387,6 +421,7 @@ impl Style {
     pub fn get_scrollbar_thumb_margin(&self) -> TrblRectangle<f32> {
         self.scrollbar_thumb_margin.get()
     }
+
     pub fn set_scrollbar_thumb_margin(&mut self, val: TrblRectangle<f32>) {
         self.is_dirty = true;
         self.scrollbar_thumb_margin.set(val);
@@ -395,6 +430,7 @@ impl Style {
     pub fn get_scrollbar_thumb_radius(&self) -> [(f32, f32); 4] {
         self.scrollbar_thumb_radius.get()
     }
+
     pub fn set_scrollbar_thumb_radius(&mut self, val: [(f32, f32); 4]) {
         self.is_dirty = true;
         self.scrollbar_thumb_radius.set(val);
@@ -403,6 +439,7 @@ impl Style {
     pub fn get_scrollbar_width(&self) -> f32 {
         self.scrollbar_width.get()
     }
+
     pub fn set_scrollbar_width(&mut self, val: f32) {
         self.is_dirty = true;
         self.scrollbar_width.set(val);
@@ -411,6 +448,7 @@ impl Style {
     pub fn get_visible(&self) -> bool {
         self.visible.get()
     }
+
     pub fn set_visible(&mut self, val: bool) {
         self.is_dirty = true;
         self.visible.set(val);
@@ -419,6 +457,7 @@ impl Style {
     pub fn get_selection_color(&self) -> Color {
         self.selection_color.get()
     }
+
     pub fn set_selection_color(&mut self, val: Color) {
         self.is_dirty = true;
         self.selection_color.set(val);
@@ -427,6 +466,7 @@ impl Style {
     pub fn get_cursor_color(&self) -> Option<Color> {
         self.cursor_color.get()
     }
+
     pub fn set_cursor_color(&mut self, val: Option<Color>) {
         self.is_dirty = true;
         self.cursor_color.set(val);
@@ -435,9 +475,7 @@ impl Style {
 
 impl Style {
     pub fn has_border(&self) -> bool {
-        self.border_width.is_dirty() ||
-        self.border_radius.is_dirty() ||
-        self.border_color.is_dirty()
+        self.border_width.is_dirty() || self.border_radius.is_dirty() || self.border_color.is_dirty()
     }
 
     #[allow(clippy::wrong_self_convention)]
@@ -563,4 +601,4 @@ impl Style {
         style_set.insert(parley::StyleProperty::UnderlineOffset(underline_offset));
         style_set.insert(parley::StyleProperty::UnderlineSize(underline_size));
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/style/taffy_conversions.rs b/crates/craft_retained/src/style/taffy_conversions.rs
index 8ae2734f..62c00e6d 100644
--- a/crates/craft_retained/src/style/taffy_conversions.rs
+++ b/crates/craft_retained/src/style/taffy_conversions.rs
@@ -1,4 +1,4 @@
-use crate::style::{AlignItems, Display, FlexDirection, JustifyContent, Style, Unit, FlexWrap, Overflow, BoxSizing, Position};
+use crate::style::{AlignItems, BoxSizing, Display, FlexDirection, FlexWrap, JustifyContent, Overflow, Position, Style, Unit};
 
 fn unit_to_taffy_dimension(unit: Unit) -> taffy::Dimension {
     match unit {
@@ -25,7 +25,6 @@ fn unit_to_taffy_length_percentage(unit: Unit) -> taffy::LengthPercentage {
 }
 
 impl Style {
-
     pub fn to_taffy_style(&self) -> taffy::Style {
         let style = self;
 
@@ -144,7 +143,7 @@ impl Style {
 
         let position = match style.get_position() {
             Position::Relative => taffy::Position::Relative,
-            Position::Absolute => taffy::Position::Absolute
+            Position::Absolute => taffy::Position::Absolute,
         };
 
         taffy::Style {
diff --git a/crates/craft_retained/tests/counter.rs b/crates/craft_retained/tests/counter.rs
new file mode 100644
index 00000000..8ac73794
--- /dev/null
+++ b/crates/craft_retained/tests/counter.rs
@@ -0,0 +1,99 @@
+#[macro_use]
+extern crate libtest_mimic_collect;
+
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use craft_retained::elements::{Container, Element, Text, Window};
+use craft_retained::events::ui_events::pointer::PointerButton;
+use craft_retained::style::{AlignItems, FlexDirection, JustifyContent};
+use craft_retained::{Color, CraftCallback, CraftOptions, pct, px, rgb};
+use image::RgbImage;
+use libtest_mimic_collect::TestCollection;
+use libtest_mimic_collect::libtest_mimic::Arguments;
+
+fn create_button(label: &str, base_color: Color, delta: i64, state: Rc<RefCell<i64>>, count_text: Text) -> Container {
+    let border_color = rgb(0, 0, 0);
+    Container::new()
+        .border_width(px(1), px(2), px(3), px(4))
+        .border_color(border_color, border_color, border_color, border_color)
+        .border_radius((10.0, 10.0), (10.0, 10.0), (10.0, 10.0), (10.0, 10.0))
+        .padding(px(15), px(30), px(15), px(30))
+        .justify_content(Some(JustifyContent::Center))
+        .background_color(base_color)
+        .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {
+            if pointer_button_event.button == Some(PointerButton::Primary) {
+                *state.borrow_mut() += delta;
+                count_text.clone().text(&format!("Count: {}", state.borrow()));
+                event.prevent_propagate();
+            }
+        }))
+        .push(Text::new(label).font_size(24.0).color(Color::WHITE).selectable(false))
+}
+
+#[cfg(test)]
+mod test_utils;
+
+#[test]
+fn counter() {
+    let count = Rc::new(RefCell::new(0));
+    let count_text = Text::new(&format!("Count: {}", count.borrow()));
+
+    let add_button = create_button("+", rgb(76, 175, 80), 1, count.clone(), count_text.clone());
+
+    let window = Window::new()
+        .flex_direction(FlexDirection::Column)
+        .justify_content(Some(JustifyContent::Center))
+        .align_items(Some(AlignItems::Center))
+        .width(pct(100))
+        .height(pct(100))
+        .gap(px(20), px(20))
+        .push(count_text.clone())
+        .push({
+            Container::new()
+                .gap(px(20), px(20))
+                .push(create_button(
+                    "-",
+                    rgb(244, 67, 54),
+                    -1,
+                    count.clone(),
+                    count_text.clone(),
+                ))
+                .push(add_button.clone())
+        });
+
+    let result_image: Rc<RefCell<Option<RgbImage>>> = Rc::new(RefCell::new(None));
+    let result_image_clone = result_image.clone();
+    let cb = CraftCallback(Box::new(move || {
+        let add_button = add_button.clone();
+        let window = window.clone();
+        let result_image = result_image_clone.clone();
+        async move {
+            for _ in 0..3 {
+                craft_retained::craft_runtime::time::sleep(craft_runtime::time::Duration::from_millis(500)).await;
+                add_button.click().await;
+            }
+
+            craft_retained::craft_runtime::time::sleep(craft_runtime::time::Duration::from_millis(500)).await;
+
+            let screenshot = window.clone().screenshot();
+            let img_buffer = image::ImageBuffer::<image::Rgba<u8>, _>::from_raw(
+                screenshot.width as u32,
+                screenshot.height as u32,
+                screenshot.pixels,
+            )
+            .unwrap();
+            let dynamic_img = image::DynamicImage::ImageRgba8(img_buffer);
+            *result_image.borrow_mut() = Some(dynamic_img.to_rgb8());
+            window.close();
+        }
+    }));
+    craft_retained::craft_test(CraftOptions::test("counter_test", cb));
+    test_utils::check_snapshot(result_image.take().unwrap(), "counter.png");
+}
+
+pub fn main() {
+    let mut args = Arguments::from_args();
+    args.test_threads = Some(1);
+    TestCollection::run_with_args(args);
+}
diff --git a/crates/craft_retained/tests/current/.gitignore b/crates/craft_retained/tests/current/.gitignore
new file mode 100644
index 00000000..aab52d90
--- /dev/null
+++ b/crates/craft_retained/tests/current/.gitignore
@@ -0,0 +1 @@
+*.png
\ No newline at end of file
diff --git a/crates/craft_retained/tests/snapshots/counter.png b/crates/craft_retained/tests/snapshots/counter.png
new file mode 100644
index 0000000000000000000000000000000000000000..175767d80f6ea902fdb1a3d85268e31ecc322ce5
GIT binary patch
literal 4725
zcmb_fc|25m8$VR0Xe?#9O|O)0Y22|~Vj@ck88Ma^!`Mq{EQ2g#S6VEg8j`38iL%{N
zmM}M4CA%TZgj{R(DcQZ}xO(q-KUcSUKkxiApYxpW^Zh;N`8{i>KK>|@6U7Mt01~IA
zZU_MDb^-u9aU(k@5#SdP1Ar|`IQ7Fu)b^3KUy%T?xhy9_budyrN?1NjD-Hnk^KcwM
z(2jE(fSox2aOW(J4JceM2n5mD0bU}=#03DW??5T^c*vR!*oXmu9|b`=-(-S;R!?8!
zxV1r$`7oRQKcFwCuNn@s33eO|1aliC{U!+J5lD4yrXK^f<dUkO%LjrNGPj~HSUk)a
zwl+2vew2|BY;5e2laZlFG&V;3DTN-n3C4`yGvFZT@kc;ki2sr4M?qgqTs0hK6O0KC
zT0MQ$@Na`)9syOq!UPAktp5%a%x{n`%qSQY3<SFYNcv3>XVLT)&P5d6b-|USC9A$y
z+ZiXx7luR|@^hiXugU$kZO<>!5y!^JIak#}FB)Dqm(|G9Fx4^KyA2usD)m<z=eqQU
z<_=%Y1HuE(k9XC13bL}h`a4)kP;NtEwi1CWi4Vo@LK0q2k3shE@hMbG+P80?{h2el
zW|>oga*B#(1_peBf;SQpl%%EUnm|BEDG(%5&tzH<i8tfo6jW6yGI5%kn$FJ77{TzF
zZ80%1va+)8Wx2Sx$a!Yjt<Umxb#-(3gYMEd2?hmr4G)v`_3L|jk`}Vd%gc3ibY70{
z!(bkzr`uovb3XP7BpQuIMQ8@l``mQ#`2PNWasIFi7cR`r&CSpI4z<+R>zkUQl|4N@
zFYpS6YiKJdD`y&}*VfjCg@r|H+YtyY@7~>sb~|z6$bzk(-@??CjHKk)qRH$eHs$_(
zZY1(oL9nm|@lbtyrdTYJrR5C~dkV!Q-N?eiqP4a4@#Dv)rl#KB-uN_D6P=TrTM~^1
z1q~lQ+1c66&dyru<!t6SVs75Kv{dr3^3>zeu`zipcA&rimd@U3b}*$U*boSWS_q4E
zb||9Fk(-lqcxY%g^B#dfP(fmLl~-0?awl0?@od~E9beN`DB9WHzQs8-G&DXw{>lch
zDs*q(%n{6M>+4JMNp2dtz$+vq)L7QzqOPv~ae6ucMbu7h>~Yb;K4c6JWlAA#42<LP
zc+mCtl9NG(HZJg5>4<!D$%|?YZEfgcQxb{AVigq@&gD@>ckc!*OO1|*h)7LMZ5&;^
zIs6PuY%Cjc=iJrO(y}zU`*TlE51mdQ7&yIm-O85;3kxSDC4pX<qBv71>)6@B8%V7h
z8_VKVOKZZRFJHP8t)0qrj&(*w^oO4l5E02{ko&wal9C(<M2DmNsy`?cN<~G5cnq0L
z9tMAtldcp>HfYk=7+$-rxtU);fYI7|dOr$uqMMuB>+0&%j)sP7rKN!+QhbAbLPCNL
z4mWFS&1h*M7#S%kDQTglq@;>f+^mSiLD2g@Z6-W4PHWn;XV01asLGWq*l-6xZQt%&
z_vr0gVxCzhgKTAG)iu5z{CqGjkEp3NHa41(NLH4XDOKg=>Y)3mRI0Ht0~8Cb`!F+;
zpPx@mH>$0x3*;yI6qjUWNy^C?C+VL&ecB<<tcY1_xY80=x+PS{*T^N{F9g)4V2Bk3
zs8g&UmTX%CENPLw2O>*LWw5cfVSNj^5+0(0+m6eBerS%S-D(Wu$hv2JxuH;l*C?$a
zDMZ8Za#qb@CnLhuyu@Sm64R>X&ceF~|M0Rxs-!U)WhQrcECXK*AnVEyD`!A0=FbFQ
zu>xw7e>eMpeJNpn!Oz1+RC$C|SeR+M<*1W#8e%@S)=ovq-*(U^*@--#m)H7%R)G%0
z)Q=AGHT_oLnAD^HG@2x#+Jw9v%LBH`_P+TJ?CgnkH0RTeLsVYwu}HC{zQ+4+vt?hA
zWtOD3D0MRAhFJj}J`DTd*R9%A%zK3~S7gD7)R~VySu>N@aoESMHhy;EgfP-5VL6mO
zo#ymT6|~<zx6tM}(d>yCM)bN{d*EGRgC5(GQ9HwD2*0$1$e2byrZh^zwmE_nbwk2J
zkk3_vIq)n@{J5gc?381^^dDjQ+3yNYH6xwbK!-eevsf*p5xV0yP+y#&^SmO_M16;q
zmHm^KF@4?!BWy=YlpZ#wB+K9A34Iyii!Fc>vL01rl_99R)vouXkz828XKehP$$a$`
zvw$}H_Sz`nntP$w3lH84OKBodRR?rGg}yvxM+=88w?@X@|3#OWHoaw0>|h3};^Vx+
zjr#o(eael0-1TDC2Zsh2_$U`&^g5fNrRdV+V5-~Xx7=26S11mQhF&REa-8XPh8e-B
zgI}B5O`l&#A<ol$n&+zO3j>3Iioovf5$Wm!iksbBu5#HPEh@lNwi&#fwsX^;6YpA_
zrhZiMj~buTsViX(6;WQ__TnWTGWC+Q((YLpap&9Tar5}Wr+ZBE1Ns~`nNTc_*^DnN
zi5?wRcqo<Y+*vYYeyAdoN8c%GevzO13f6Ep>!8^6&QYe`rp2R+{7>IF>SpSSbkS10
zvIjuqCd`9Eq3~e-Q`o3fO|uAHoTZdh+Jy=eilM!Z+;N8*i(cFfj$^eOHewQ^W5-of
zq>n$NqmIe^6rjE77m5i8k~egyVfNxKjjJdM>AQ|uA7<F8yZWZ9&_tFP0eG*2c_OOJ
zZf<Z!E#1iWWk`j>8jA1L2@rZ*odBWq`rF(_Z}%GOZnI2t;Q9OOrORcs%RaZq>f#*o
zXjfDUs2|Tuu(5N^*p=mOtwHDo#(Q*#IdXJUoSv{-Gh)SfRPQR;@&rye&O9%6IrUK%
zc{X$UvzYukYVe;U^?E@%)^oHgFH}0RcLs4wq_zBQOY?nP=B<o$hI}sPwUBa-gSbnQ
z=a<igh2$$L79DV>ozD+BvLQD(<esob`g_rRWWLns^SUP@2VE=msq{t88sTxFI*|!K
zo|1`v>dK@J08yQ6)<sNj)m9Zh1hDWsSc3jjQC8CXA8QV*9zZhys4x+u^X7W)RF#4C
zO;<yL(T?)DUYUSpM{)X_Af`WaWCQ5miIjXVVr5ZbCg4q?Xer*>5sjFy`uysFe-;`<
z#RYGhW(Q568otq65F#QsyrkvbN}253<$YDv;A-w<>it6`|6)<J*U9K&=%()QSD!xF
zIiK6&vMkQ~&T)T#Nw&7QiTG5axp?)=v}2o7A?JfndLOFwO0{o^>*Wd^N^@Wvbkyxo
zQK^^eeeW{d+IFw2&Jb-SJV-OrPBX7M<86%{Z5~X#GE#7DxGb*w_UjS%xszs%_2oON
zJl=98mhlmTc>Ji7N_?DWn$F#nJ9r~=UOuxOTk3yc`}nZ7=8K}_YbH@5c}gU6v&~g6
z+WGay_nF5%szp4=>OVad8+q{&Sp1uZa|JCWbNIj(Ywgfk>|<(}j%~ni#WlUUGk>wO
zs)-gblre2A!taLFyoCR>_hjdDmy$e<EM}qPnO36A$;A@`OU7HSya2cZ&5Vv83EV_W
z{8`k^o|ooA3*khCW6~uL+vgN-+)b8>N1@JNN}OOfD@uw=W^@Y=CMwkl{EK_wVwVeb
z`I!4De|eMYSX9SihjHNLItyov$RnLccunCxavKJW@51{6YQ=8*6Li$q?YgFA9?L`8
z^`z+MCoj&7VicmUaOe$G;w8nC1m3WN8Ce}rqQZ6dvBBMHyzX;V<)^-hvrHYkf#h?t
z#rvD6PSoX{IYE}2To*jg8Z+C(B_!Pm?$hU9HC*!}k5L~_xSH^|c8<jzDE~Cj!DJQd
zs5G^5DIBe;YIGQSA27Mp_j|VIYAV8Z8Yn)$<m+nsLZH?3T}|q5gJ3xhsjkiR7pQck
zB^L~JfW9;EgF2^8D|`X^t}V$UXYYd_T9cqP3^wk=wz9RCo3C$WUs-Oz{cdfhuPis<
z68IG+*xK@4AlTaSUAq))0fJOv$HACjAeh^}YfDlj#&~`>1YPf;tEHcI3TXg4!H7B!
z7Gx-}z|H}+2XF{mm4JV%l7D=$CI_Uk=8ONG{J+il7Wwyl5{%==$X&Kd9LuqLZl1t`
OoQc!Gt7oZMpZ_<DVOXI6

literal 0
HcmV?d00001

diff --git a/crates/craft_retained/tests/test_utils.rs b/crates/craft_retained/tests/test_utils.rs
new file mode 100644
index 00000000..3bbbf2b6
--- /dev/null
+++ b/crates/craft_retained/tests/test_utils.rs
@@ -0,0 +1,55 @@
+// Copyright 2024 the Kompari Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+use std::path::{Path, PathBuf};
+
+use image::RgbImage;
+
+/// Directory where current tests creates images
+pub fn current_dir() -> PathBuf {
+    Path::new(env!("CARGO_MANIFEST_DIR"))
+        .parent()
+        .unwrap()
+        .join("craft_retained")
+        .join("tests")
+        .join("current")
+}
+
+/// Directory with blessed snapshots
+pub fn snapshot_dir() -> PathBuf {
+    Path::new(env!("CARGO_MANIFEST_DIR"))
+        .parent()
+        .unwrap()
+        .join("craft_retained")
+        .join("tests")
+        .join("snapshots")
+}
+
+pub fn is_generate_all_mode() -> bool {
+    std::env::var("CRAFT_RETAINED_TEST")
+        .map(|x| x.eq_ignore_ascii_case("generate-all"))
+        .unwrap_or(false)
+}
+
+/// Check an image against snapshot
+pub fn check_snapshot(image: RgbImage, image_name: &str) {
+    let snapshot_dir = snapshot_dir();
+    println!("Snapshots DIR: {}", snapshot_dir.to_str().unwrap());
+    let snapshot = image::ImageReader::open(snapshot_dir.join(image_name))
+        .map_err(|e| e.to_string())
+        .and_then(|x| x.decode().map_err(|e| e.to_string()))
+        .map(|x| x.to_rgb8());
+    if let Ok(snapshot) = snapshot {
+        if snapshot != image {
+            image.save(current_dir().join(image_name)).unwrap();
+            panic!("Snapshot is different; run 'cargo xtask-test report' for report")
+        }
+    } else {
+        println!("writing test to {}", current_dir().join(image_name).display());
+        image.save(current_dir().join(image_name)).unwrap();
+        snapshot.unwrap();
+    }
+    if is_generate_all_mode() {
+        image.save(current_dir().join(image_name)).unwrap();
+    }
+}
diff --git a/crates/craft_runtime/src/lib.rs b/crates/craft_runtime/src/lib.rs
index 23d778b3..b88a5f8f 100644
--- a/crates/craft_runtime/src/lib.rs
+++ b/crates/craft_runtime/src/lib.rs
@@ -2,6 +2,12 @@ use std::future::Future;
 
 use cfg_if::cfg_if;
 pub use tokio::sync::mpsc::{Receiver, Sender, channel};
+pub use tokio::*;
+
+thread_local! {
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(crate) static LOCAL_SET: tokio::task::LocalSet = tokio::task::LocalSet::new();
+}
 
 pub struct CraftRuntime {
     #[cfg(not(target_arch = "wasm32"))]
@@ -21,7 +27,9 @@ impl Default for CraftRuntime {
             if #[cfg(target_arch = "wasm32")] {
                 Self { }
             } else {
-                Self { tokio_runtime: tokio::runtime::Builder::new_multi_thread().enable_all().build().expect("Failed to create tokio runtime.") }
+                Self {
+                    tokio_runtime: tokio::runtime::Builder::new_current_thread().enable_all().build().expect("Failed to create tokio runtime."),
+                }
             }
         }
     }
@@ -40,7 +48,9 @@ impl CraftRuntime {
             if #[cfg(target_arch = "wasm32")] {
                 Self { }
             } else {
-                Self { tokio_runtime: tokio::runtime::Builder::new_multi_thread().enable_all().build().expect("Failed to create tokio runtime.") }
+                Self {
+                    tokio_runtime: tokio::runtime::Builder::new_current_thread().enable_all().build().expect("Failed to create tokio runtime."),
+                }
             }
         }
     }
@@ -50,7 +60,9 @@ impl CraftRuntime {
             if #[cfg(target_arch = "wasm32")] {
                 CraftRuntimeHandle { }
             } else {
-                CraftRuntimeHandle { tokio_runtime: self.tokio_runtime.handle().clone() }
+                CraftRuntimeHandle {
+                    tokio_runtime: self.tokio_runtime.handle().clone(),
+                }
             }
         }
     }
@@ -136,6 +148,29 @@ impl CraftRuntime {
 }
 
 impl CraftRuntimeHandle {
+    pub fn update_local_set(&self) {
+        #[cfg(not(target_arch = "wasm32"))]
+        LOCAL_SET.with(|local_set| {
+            self.tokio_runtime.block_on(async {
+                local_set
+                    .run_until(async {
+                        tokio::task::yield_now().await;
+                    })
+                    .await;
+            });
+        });
+    }
+
+    #[allow(dead_code)]
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn spawn_current_thread<F>(&self, future: F)
+    where
+        F: Future + 'static,
+        F::Output: 'static,
+    {
+        LOCAL_SET.with(|ls| ls.spawn_local(future));
+    }
+
     #[allow(dead_code)]
     #[cfg(target_arch = "wasm32")]
     pub fn spawn<F>(&self, future: F)
diff --git a/examples/jsframeworkbench/main.rs b/examples/jsframeworkbench/main.rs
index f148d1da..b41d4d6b 100644
--- a/examples/jsframeworkbench/main.rs
+++ b/examples/jsframeworkbench/main.rs
@@ -5,7 +5,7 @@ use craft_retained::elements::{Container, Element, Text, TextInner, Window};
 use craft_retained::events::Event;
 use craft_retained::events::ui_events::pointer::PointerButtonEvent;
 use craft_retained::palette::css::WHITE;
-use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Unit, FlexWrap};
+use craft_retained::style::{AlignItems, Display, FlexDirection, FlexWrap, JustifyContent, Overflow, Unit};
 use craft_retained::{Color, rgb};
 use rand::rng;
 use rand::rngs::ThreadRng;
@@ -121,10 +121,7 @@ impl State {
             .data
             .iter()
             .skip(self.rows.len())
-            .map(|data| {
-                let row = Self::create_row(data);
-                row
-            })
+            .map(Self::create_row)
             .collect();
 
         self.rows.extend(new_rows.iter().cloned());
diff --git a/examples/multiwindow/main.rs b/examples/multiwindow/main.rs
index 8558e3b5..29c2747a 100644
--- a/examples/multiwindow/main.rs
+++ b/examples/multiwindow/main.rs
@@ -34,7 +34,7 @@ fn create_button(
 ) -> Container {
     let border_color = rgb(0, 0, 0);
     let label = Text::new(label).font_size(24.0).color(Color::WHITE).selectable(false);
-    let container = Container::new()
+    Container::new()
         .border_width(Unit::Px(1.0), Unit::Px(2.0), Unit::Px(3.0), Unit::Px(4.0))
         .border_color(border_color, border_color, border_color, border_color)
         .border_radius((10.0, 10.0), (10.0, 10.0), (10.0, 10.0), (10.0, 10.0))
@@ -50,8 +50,7 @@ fn create_button(
                 event.prevent_propagate();
             }
         }))
-        .push(label);
-    container
+        .push(label)
 }
 
 pub fn counter() -> Window {
diff --git a/examples/pointer_events/main.rs b/examples/pointer_events/main.rs
index 26fd65e3..a42f2594 100644
--- a/examples/pointer_events/main.rs
+++ b/examples/pointer_events/main.rs
@@ -113,9 +113,9 @@ fn pointer_enter_leave_example() -> Container {
     let pointer_enter_leave_log = move |is_enter: bool, node_name: &'static str| {
         let push_text_clone_2 = push_text.clone();
         let pointer_event_name = if is_enter { "Pointer Enter" } else { "Pointer Leave" };
-        return Rc::new(move |_event: &mut Event| {
+        Rc::new(move |_event: &mut Event| {
             push_text_clone_2(format!("{}: {}", pointer_event_name, node_name));
-        });
+        })
     };
 
     let parent = Container::new()
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
new file mode 100644
index 00000000..29c4e318
--- /dev/null
+++ b/xtask/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "xtask"
+publish = false
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+clap = { version = "4.5", features = ["derive"] }
+kompari = { git = "https://github.com/linebender/kompari.git", rev = "63476ab8a6413cd5add210b76c1d2d671dd67212" }
+kompari-tasks = { git = "https://github.com/linebender/kompari.git", rev = "63476ab8a6413cd5add210b76c1d2d671dd67212" }
\ No newline at end of file
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
new file mode 100644
index 00000000..919460a9
--- /dev/null
+++ b/xtask/src/main.rs
@@ -0,0 +1,43 @@
+// Copyright 2024 the Kompari Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+use std::path::Path;
+use std::process::Command;
+
+use clap::Parser;
+use kompari::DirDiffConfig;
+use kompari_tasks::{Actions, Args, Task};
+
+struct ActionsImpl();
+
+impl Actions for ActionsImpl {
+    fn generate_all_tests(&self) -> kompari::Result<()> {
+        let cargo = std::env::var("CARGO").unwrap();
+        Command::new(&cargo)
+            .arg("test")
+            .arg("--test")
+            .arg("counter")
+            .env("CRAFT_RETAINED_TEST", "generate-all")
+            .status()?;
+        Ok(())
+    }
+}
+
+fn main() -> kompari::Result<()> {
+    let tests_path = Path::new(env!("CARGO_MANIFEST_DIR"))
+        .parent()
+        .unwrap()
+        .join("crates")
+        .join("craft_retained")
+        .join("tests");
+
+    let snapshots_path = tests_path.join("snapshots");
+    let current_path = tests_path.join("current");
+
+    let args = Args::parse();
+    let diff_config = DirDiffConfig::new(snapshots_path, current_path);
+    let actions = ActionsImpl();
+    let mut task = Task::new(diff_config, Box::new(actions));
+    task.run(&args)?;
+    Ok(())
+}

From 1ce7f01ffe4b3b2038f7b45b78819010618aa588 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Mon, 12 Jan 2026 17:27:23 -0500
Subject: [PATCH 053/143] Export Inners for Elements for bindings

---
 crates/craft_retained/src/elements/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index f3de6d2c..da15937f 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -13,11 +13,11 @@ mod slider;
 mod text_input;
 mod window;
 
-pub use container::Container;
+pub use container::{Container, ContainerInner};
 pub use element::{Element, ElementImpl};
 pub use element_id_map::ElementIdMap;
 pub use image::Image;
 pub use slider::{Slider, SliderDirection, SliderInner};
 pub use text::{Text, TextInner};
 pub use text_input::{TextInput, TextInputInner};
-pub use window::Window;
+pub use window::{Window, WindowInternal};

From a25e04407393376f23e1678ecaf680c7731a87d4 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Mon, 12 Jan 2026 19:10:47 -0500
Subject: [PATCH 054/143] Add helper functions to find elements in the tree

---
 .../src/elements/core/element_internals.rs    | 20 +++++
 crates/craft_retained/src/elements/element.rs | 81 +++++++++++++++++--
 examples/jsframeworkbench/main.rs             |  5 +-
 3 files changed, 96 insertions(+), 10 deletions(-)

diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index 64a04044..00cfb0e3 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -19,6 +19,26 @@ use crate::text::text_context::TextContext;
 
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
 pub trait ElementInternals: ElementData {
+    fn position_in_parent(&self) -> Option<usize> {
+        let parent = self.parent();
+
+        // @OPTIMIZE: We are copying the vec here.
+        if let Some(parent) = parent && let Some(parent) = parent.upgrade() {
+
+            let me_ptr = self.element_data().me.clone().upgrade().unwrap();
+            let children = parent.borrow_mut().element_data().children.clone();
+
+            let self_position = children
+                .iter()
+                .position(|x| Rc::ptr_eq(x, &me_ptr))
+                .unwrap();
+
+            Some(self_position)
+        } else {
+            None
+        }
+    }
+
     /// A helper to apply the layout for all children.
     #[allow(clippy::too_many_arguments)]
     fn apply_layout_children(
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index be57f2e5..466b5dcf 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -2,7 +2,7 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 use std::sync::Arc;
-
+use taffy::CoreStyle;
 use craft_primitives::Color;
 use craft_primitives::geometry::{ElementBox, Point, TrblRectangle};
 use ui_events::pointer::PointerId;
@@ -21,6 +21,44 @@ use crate::style::{AlignItems, BoxSizing, Display, FlexDirection, FlexWrap, Font
 
 /// The element trait for end-users.
 pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + Any {
+    fn get_first_child(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+        self.children().first().cloned().ok_or(CraftError::ElementNotFound)
+    }
+
+    fn get_last_child(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+        self.children().last().cloned().ok_or(CraftError::ElementNotFound)
+    }
+
+    fn get_previous_sibling(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+        let parent = self.parent();
+        let position = self.position_in_parent();
+
+        if let Some(position) = position && let Some(parent) = parent.unwrap().upgrade() {
+            if let Some(next_sibling) = parent.borrow().children().get(position - 1) {
+                Ok(next_sibling.clone())
+            } else {
+                Err(CraftError::ElementNotFound)
+            }
+        } else {
+            Err(CraftError::ElementNotFound)
+        }
+    }
+
+    fn get_next_sibling(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+        let parent = self.parent();
+        let position = self.position_in_parent();
+
+        if let Some(position) = position && let Some(parent) = parent.unwrap().upgrade() {
+            if let Some(next_sibling) = parent.borrow().children().get(position + 1) {
+                Ok(next_sibling.clone())
+            } else {
+                Err(CraftError::ElementNotFound)
+            }
+        } else {
+            Err(CraftError::ElementNotFound)
+        }
+    }
+
     fn swap_child(
         &mut self,
         child_1: Rc<RefCell<dyn ElementImpl>>,
@@ -144,6 +182,13 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
         Ok(child)
     }
 
+    fn remove_all_children(&mut self) {
+        // @OPTIMIZE: We are copying the vec here.
+        for child in self.element_data().children.clone().iter().rev() {
+            self.remove_child(child.clone()).unwrap();
+        }
+    }
+
     fn push(&mut self, _child: Rc<RefCell<dyn ElementImpl>>) {
         panic!("Pushing children is not supported.")
     }
@@ -550,10 +595,39 @@ pub trait Element: Clone + AsElement {
         self.as_element_rc().borrow().children().to_vec()
     }
 
+    fn get_previous_sibling(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+        self.as_element_rc().borrow().get_previous_sibling()
+    }
+
+    fn get_next_sibling(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+        self.as_element_rc().borrow().get_next_sibling()
+    }
+
+    fn get_parent(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+        let parent = self.as_element_rc().borrow().parent();
+        if let Some(parent) = parent {
+            parent.upgrade().ok_or(CraftError::ElementNotFound)
+        } else {
+            Err(CraftError::ElementNotFound)
+        }
+    }
+
+    fn get_first_child(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+        self.as_element_rc().borrow().get_first_child()
+    }
+
+    fn get_last_child(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+        self.as_element_rc().borrow().get_last_child()
+    }
+
     fn remove_child(&self, child: Rc<RefCell<dyn ElementImpl>>) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
         self.as_element_rc().borrow_mut().remove_child(child)
     }
 
+    fn remove_all_children(&self) {
+       self.as_element_rc().borrow_mut().remove_all_children()
+    }
+
     fn swap_child(
         &self,
         child_1: Rc<RefCell<dyn ElementImpl>>,
@@ -568,11 +642,6 @@ pub trait Element: Clone + AsElement {
         self
     }
 
-    /*fn extend(self, children: impl IntoIterator<Item = Rc<RefCell<dyn ElementImpl>>>) -> Self {
-        self.as_element_rc().borrow_mut().extend(children);
-        self
-    }*/
-
     fn on_pointer_enter(self, on_pointer_enter: PointerEnterHandler) -> Self {
         self.as_element_rc().borrow_mut().on_pointer_enter(on_pointer_enter);
         self
diff --git a/examples/jsframeworkbench/main.rs b/examples/jsframeworkbench/main.rs
index b41d4d6b..11f6c909 100644
--- a/examples/jsframeworkbench/main.rs
+++ b/examples/jsframeworkbench/main.rs
@@ -96,10 +96,7 @@ impl State {
     }
 
     pub fn remove_all_rows(&mut self) {
-        let to_remove = self.element.get_children();
-        for child in to_remove {
-            self.element.remove_child(child).expect("Failed to remove child!");
-        }
+        self.element.remove_all_children();
     }
 
     pub fn swap_rows(&mut self) {

From 61fcbdb556de60dbbf48de5707cd5acfe3cee97d Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Mon, 12 Jan 2026 19:12:51 -0500
Subject: [PATCH 055/143] Remove accidental import

---
 crates/craft_retained/src/elements/element.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 466b5dcf..addc2c9b 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -2,7 +2,6 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 use std::sync::Arc;
-use taffy::CoreStyle;
 use craft_primitives::Color;
 use craft_primitives::geometry::{ElementBox, Point, TrblRectangle};
 use ui_events::pointer::PointerId;

From d5fb1bb1bf7914199c77083182c05cd0971f9215 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 14 Feb 2026 18:50:23 -0500
Subject: [PATCH 056/143] Allow jobs to be scheduled from other threads and run
 on the gui thread

---
 crates/craft_retained/src/app.rs              |  2 +-
 .../craft_retained/src/craft_winit_state.rs   | 18 +++-
 .../src/elements/core/element_internals.rs    | 10 +-
 crates/craft_retained/src/elements/element.rs | 11 ++-
 .../src/elements/slider/slider_element.rs     |  2 +
 crates/craft_retained/src/window_manager.rs   | 14 +++
 crates/craft_runtime/src/lib.rs               |  3 +
 crates/craft_runtime/src/run_later.rs         | 91 +++++++++++++++++++
 8 files changed, 140 insertions(+), 11 deletions(-)
 create mode 100644 crates/craft_runtime/src/run_later.rs

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 471908a6..89602b27 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -347,7 +347,7 @@ impl App {
         }
     }
 
-    fn request_redraw(&mut self, redraw_flags: RedrawFlags) {
+    pub(crate) fn request_redraw(&mut self, redraw_flags: RedrawFlags) {
         self.redraw_flags = redraw_flags;
         /*if let Some(window) = &self.window {
             window.request_redraw();
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index fa830668..01c96a12 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -3,7 +3,7 @@ use std::time;
 
 use craft_logging::info;
 use craft_primitives::geometry::Size;
-use craft_runtime::{CraftRuntimeHandle, Receiver, Sender};
+use craft_runtime::{CraftRuntimeHandle, Receiver, Sender, pop_gui_thread_work};
 use ui_events::pointer::PointerEvent;
 use ui_events_winit::{WindowEventReducer, WindowEventTranslation};
 #[cfg(target_arch = "wasm32")]
@@ -218,6 +218,22 @@ impl ApplicationHandler for CraftWinitState {
             }
         }
 
+        // Do work sent from other threads and update all the windows.
+        let mut work_done = false;
+        loop {
+            if let Some(work) = pop_gui_thread_work() {
+                work();
+                work_done = true;
+            } else {
+                break;
+            }
+        }
+        if work_done {
+            WINDOW_MANAGER.with_borrow_mut(|window_manager| {
+                window_manager.redraw_all(&mut craft_state.craft_app);
+            });
+        }
+
         craft_state.craft_app.on_about_to_wait(event_loop);
 
         if craft_state.close_requested {
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index 00cfb0e3..8f3e7c0f 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -23,15 +23,13 @@ pub trait ElementInternals: ElementData {
         let parent = self.parent();
 
         // @OPTIMIZE: We are copying the vec here.
-        if let Some(parent) = parent && let Some(parent) = parent.upgrade() {
-
+        if let Some(parent) = parent
+            && let Some(parent) = parent.upgrade()
+        {
             let me_ptr = self.element_data().me.clone().upgrade().unwrap();
             let children = parent.borrow_mut().element_data().children.clone();
 
-            let self_position = children
-                .iter()
-                .position(|x| Rc::ptr_eq(x, &me_ptr))
-                .unwrap();
+            let self_position = children.iter().position(|x| Rc::ptr_eq(x, &me_ptr)).unwrap();
 
             Some(self_position)
         } else {
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index addc2c9b..259144aa 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -2,6 +2,7 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 use std::sync::Arc;
+
 use craft_primitives::Color;
 use craft_primitives::geometry::{ElementBox, Point, TrblRectangle};
 use ui_events::pointer::PointerId;
@@ -32,7 +33,9 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
         let parent = self.parent();
         let position = self.position_in_parent();
 
-        if let Some(position) = position && let Some(parent) = parent.unwrap().upgrade() {
+        if let Some(position) = position
+            && let Some(parent) = parent.unwrap().upgrade()
+        {
             if let Some(next_sibling) = parent.borrow().children().get(position - 1) {
                 Ok(next_sibling.clone())
             } else {
@@ -47,7 +50,9 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
         let parent = self.parent();
         let position = self.position_in_parent();
 
-        if let Some(position) = position && let Some(parent) = parent.unwrap().upgrade() {
+        if let Some(position) = position
+            && let Some(parent) = parent.unwrap().upgrade()
+        {
             if let Some(next_sibling) = parent.borrow().children().get(position + 1) {
                 Ok(next_sibling.clone())
             } else {
@@ -624,7 +629,7 @@ pub trait Element: Clone + AsElement {
     }
 
     fn remove_all_children(&self) {
-       self.as_element_rc().borrow_mut().remove_all_children()
+        self.as_element_rc().borrow_mut().remove_all_children()
     }
 
     fn swap_child(
diff --git a/crates/craft_retained/src/elements/slider/slider_element.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
index 1f93e3ae..a0f8afe7 100644
--- a/crates/craft_retained/src/elements/slider/slider_element.rs
+++ b/crates/craft_retained/src/elements/slider/slider_element.rs
@@ -173,6 +173,8 @@ impl SliderInner {
             })
         });
 
+        me.borrow_mut().element_data.create_layout_node(None);
+
         me.borrow_mut().set_background_color(palette::css::LIGHT_GRAY);
         let border_radius = 25.0;
         me.borrow_mut().border_radius(
diff --git a/crates/craft_retained/src/window_manager.rs b/crates/craft_retained/src/window_manager.rs
index 891cafb2..55016ced 100644
--- a/crates/craft_retained/src/window_manager.rs
+++ b/crates/craft_retained/src/window_manager.rs
@@ -32,6 +32,20 @@ impl WindowManager {
         None
     }
 
+    // Improve this.
+    pub(crate) fn redraw_all(&mut self, craft_app: &mut App) {
+        if !craft_app.active {
+            return;
+        }
+
+        // Create windows that were created during the program run.
+        for window_element in &self.windows {
+            if let Some(winit_window) = window_element.winit_window() {
+                winit_window.request_redraw();
+            }
+        }
+    }
+
     pub(crate) fn on_resume(&mut self, craft_app: &mut App, event_loop: &ActiveEventLoop) {
         for window_element in &self.windows {
             window_element.create(craft_app, event_loop);
diff --git a/crates/craft_runtime/src/lib.rs b/crates/craft_runtime/src/lib.rs
index b88a5f8f..60b3bfb0 100644
--- a/crates/craft_runtime/src/lib.rs
+++ b/crates/craft_runtime/src/lib.rs
@@ -1,6 +1,9 @@
+mod run_later;
+
 use std::future::Future;
 
 use cfg_if::cfg_if;
+pub use run_later::{pop_gui_thread_work, run_later_on_gui_thread};
 pub use tokio::sync::mpsc::{Receiver, Sender, channel};
 pub use tokio::*;
 
diff --git a/crates/craft_runtime/src/run_later.rs b/crates/craft_runtime/src/run_later.rs
new file mode 100644
index 00000000..286bf740
--- /dev/null
+++ b/crates/craft_runtime/src/run_later.rs
@@ -0,0 +1,91 @@
+#[cfg(target_arch = "wasm32")]
+use std::cell::RefCell;
+use std::collections::VecDeque;
+#[cfg(not(target_arch = "wasm32"))]
+use std::sync::{Arc, Mutex, OnceLock};
+
+type Job = Box<dyn FnOnce() + Send + 'static>;
+
+pub struct GuiThreadJobQueue {
+    #[cfg(target_arch = "wasm32")]
+    inner: VecDeque<Job>,
+    #[cfg(not(target_arch = "wasm32"))]
+    inner: Mutex<VecDeque<Job>>,
+}
+
+impl GuiThreadJobQueue {
+    const fn new() -> Self {
+        #[cfg(target_arch = "wasm32")]
+        let inner = VecDeque::new();
+        #[cfg(not(target_arch = "wasm32"))]
+        let inner = Mutex::new(VecDeque::new());
+        Self { inner }
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+static GUI_THREAD_JOB_QUEUE: OnceLock<Arc<GuiThreadJobQueue>> = OnceLock::new();
+
+#[cfg(target_arch = "wasm32")]
+thread_local! {
+    static GUI_THREAD_JOB_QUEUE: RefCell<GuiThreadJobQueue> = const { RefCell::new(GuiThreadJobQueue::new()) };
+}
+
+pub fn pop_gui_thread_work() -> Option<Job> {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let queue = GUI_THREAD_JOB_QUEUE
+            .get_or_init(|| Arc::new(GuiThreadJobQueue::new()))
+            .clone();
+        queue.pop()
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    {
+        GUI_THREAD_JOB_QUEUE.with_borrow_mut(|queue| queue.pop())
+    }
+}
+
+/// Runs a FnOnce at a later time on the GUI thread.
+/// This is useful if you need to do work on another thread, but guarantee that GUI changes are done on the GUI thread.
+/// This should only run for a very short time, because it will block the GUI from doing other work.
+pub fn run_later_on_gui_thread(work: Job) {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let queue = GUI_THREAD_JOB_QUEUE
+            .get_or_init(|| Arc::new(GuiThreadJobQueue::new()))
+            .clone();
+        queue.push(work);
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    {
+        GUI_THREAD_JOB_QUEUE.with_borrow_mut(|queue| {
+            queue.push(work);
+        });
+    }
+}
+
+impl GuiThreadJobQueue {
+    #[cfg(target_arch = "wasm32")]
+    pub fn push(&mut self, item: Job) {
+        self.inner.push_back(item);
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    pub fn pop(&mut self) -> Option<Job> {
+        self.inner.pop_front()
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn push(&self, item: Job) {
+        let mut queue = self.inner.lock().unwrap();
+        queue.push_back(item);
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn pop(&self) -> Option<Job> {
+        let mut queue = self.inner.lock().unwrap();
+        queue.pop_front()
+    }
+}

From 811daa7d9ead5b4f062b930200830dca6e1d7124 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 26 Feb 2026 05:03:31 -0500
Subject: [PATCH 057/143] Feature/box shadow (#17)

* Start box shadows

* Start box shadows

* Update Vello

* Update Vello

* remove comment
---
 Cargo.lock                                    | 116 +++++++------
 .../craft_primitives/src/geometry/borders.rs  |  90 ++++++++++
 .../src/geometry/rectangle.rs                 |   4 +
 crates/craft_renderer/Cargo.toml              |  10 +-
 crates/craft_renderer/src/renderer.rs         |  45 ++++-
 crates/craft_renderer/src/vello_cpu/mod.rs    |  62 ++++++-
 .../src/elements/core/element_internals.rs    |   3 +-
 crates/craft_retained/src/elements/element.rs |  11 +-
 .../craft_retained/src/layout/layout_item.rs  | 155 +++++++++++++++++-
 crates/craft_retained/src/style/box_shadow.rs |  26 +++
 crates/craft_retained/src/style/mod.rs        |  13 +-
 crates/craft_retained/src/style/styles.rs     |  12 ++
 examples/counter_retained/Cargo.toml          |   2 +-
 examples/counter_retained/main.rs             |  17 +-
 14 files changed, 490 insertions(+), 76 deletions(-)
 create mode 100644 crates/craft_retained/src/style/box_shadow.rs

diff --git a/Cargo.lock b/Cargo.lock
index ed3b21c2..73681beb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1394,12 +1394,9 @@ dependencies = [
 
 [[package]]
 name = "fearless_simd"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb2907d1f08b2b316b9223ced5b0e89d87028ba8deae9764741dba8ff7f3903"
-dependencies = [
- "bytemuck",
-]
+checksum = "76258897e51fd156ee03b6246ea53f3e0eb395d0b327e9961c4fc4c8b2fa151a"
 
 [[package]]
 name = "filetime"
@@ -1456,6 +1453,15 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "font-types"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e4d2d0cf79d38430cc9dc9aadec84774bff2e1ba30ae2bf6c16cfce9385a23"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "fontique"
 version = "0.7.0"
@@ -1471,7 +1477,7 @@ dependencies = [
  "objc2-core-foundation",
  "objc2-core-text",
  "objc2-foundation 0.3.2",
- "read-fonts",
+ "read-fonts 0.35.0",
  "roxmltree",
  "smallvec",
  "windows 0.58.0",
@@ -1792,7 +1798,7 @@ dependencies = [
  "bitflags 2.10.0",
  "bytemuck",
  "core_maths",
- "read-fonts",
+ "read-fonts 0.35.0",
  "smallvec",
 ]
 
@@ -1802,8 +1808,6 @@ version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
- "allocator-api2",
- "equivalent",
  "foldhash 0.1.5",
 ]
 
@@ -3239,15 +3243,6 @@ dependencies = [
  "libredox",
 ]
 
-[[package]]
-name = "ordered-channel"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95be4d57809897b5a7539fc15a7dfe0e84141bc3dfaa2e9b1b27caa90acf61ab"
-dependencies = [
- "crossbeam-channel",
-]
-
 [[package]]
 name = "ordered-float"
 version = "5.0.0"
@@ -3334,7 +3329,7 @@ dependencies = [
  "harfrust",
  "hashbrown 0.16.1",
  "linebender_resource_handle",
- "skrifa",
+ "skrifa 0.37.0",
  "swash",
 ]
 
@@ -3743,7 +3738,17 @@ checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358"
 dependencies = [
  "bytemuck",
  "core_maths",
- "font-types",
+ "font-types 0.10.1",
+]
+
+[[package]]
+name = "read-fonts"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5"
+dependencies = [
+ "bytemuck",
+ "font-types 0.11.0",
 ]
 
 [[package]]
@@ -4227,7 +4232,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841"
 dependencies = [
  "bytemuck",
- "read-fonts",
+ "read-fonts 0.35.0",
+]
+
+[[package]]
+name = "skrifa"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac"
+dependencies = [
+ "bytemuck",
+ "read-fonts 0.37.0",
 ]
 
 [[package]]
@@ -4388,7 +4403,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47846491253e976bdd07d0f9cc24b7daf24720d11309302ccbbc6e6b6e53550a"
 dependencies = [
- "skrifa",
+ "skrifa 0.37.0",
  "yazi",
  "zeno",
 ]
@@ -5039,15 +5054,15 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "vello"
-version = "0.6.0"
-source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
+version = "0.7.0"
+source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
 dependencies = [
  "bytemuck",
  "futures-intrusive",
  "log",
  "peniko",
  "png 0.17.16",
- "skrifa",
+ "skrifa 0.40.0",
  "static_assertions",
  "thiserror 2.0.17",
  "vello_encoding",
@@ -5055,57 +5070,66 @@ dependencies = [
  "wgpu",
 ]
 
+[[package]]
+name = "vello_api"
+version = "0.7.0"
+source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
+dependencies = [
+ "bytemuck",
+ "peniko",
+]
+
 [[package]]
 name = "vello_common"
-version = "0.0.5"
-source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
+version = "0.0.6"
+source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
 dependencies = [
  "bytemuck",
  "fearless_simd",
- "hashbrown 0.15.5",
+ "guillotiere",
+ "hashbrown 0.16.1",
  "log",
  "peniko",
  "png 0.17.16",
- "skrifa",
+ "skrifa 0.40.0",
  "smallvec",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "vello_cpu"
-version = "0.0.5"
-source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
+version = "0.0.6"
+source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
 dependencies = [
  "bytemuck",
- "crossbeam-channel",
- "hashbrown 0.15.5",
- "ordered-channel",
- "rayon",
- "thread_local",
+ "hashbrown 0.16.1",
+ "vello_api",
  "vello_common",
 ]
 
 [[package]]
 name = "vello_encoding"
-version = "0.6.0"
-source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
+version = "0.7.0"
+source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
 dependencies = [
  "bytemuck",
  "guillotiere",
  "peniko",
- "skrifa",
+ "skrifa 0.40.0",
  "smallvec",
 ]
 
 [[package]]
 name = "vello_hybrid"
-version = "0.0.5"
-source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
+version = "0.0.6"
+source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
 dependencies = [
  "bytemuck",
  "guillotiere",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
  "log",
  "thiserror 2.0.17",
+ "vello_api",
  "vello_common",
  "vello_sparse_shaders",
  "wgpu",
@@ -5113,8 +5137,8 @@ dependencies = [
 
 [[package]]
 name = "vello_shaders"
-version = "0.6.0"
-source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
+version = "0.7.0"
+source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
 dependencies = [
  "bytemuck",
  "log",
@@ -5125,8 +5149,8 @@ dependencies = [
 
 [[package]]
 name = "vello_sparse_shaders"
-version = "0.0.5"
-source = "git+https://github.com/linebender/vello.git?rev=514a52db453e741f09e9c40283afcc186a675436#514a52db453e741f09e9c40283afcc186a675436"
+version = "0.0.6"
+source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
 
 [[package]]
 name = "version_check"
diff --git a/crates/craft_primitives/src/geometry/borders.rs b/crates/craft_primitives/src/geometry/borders.rs
index 6ae0a730..216c199c 100644
--- a/crates/craft_primitives/src/geometry/borders.rs
+++ b/crates/craft_primitives/src/geometry/borders.rs
@@ -116,6 +116,96 @@ impl CssRoundedRect {
         css_rounded_rect
     }
 
+    pub fn get_outline(&self) -> BezPath {
+        let mut outline_path = BezPath::new();
+
+        for corner in CORNERS {
+            if let Some(arc) = &self.background_arcs[corner] {
+                let arc_path = arc.to_path(0.1);
+                if corner == TOP_LEFT {
+                    // For the very first segment, we MoveTo the start of the arc
+                    outline_path.extend(arc_path);
+                } else {
+                    // For subsequent corners, we LineTo the start of the arc to close the gaps
+                    extend_path_with_arc(&mut outline_path, &arc_path);
+                }
+            } else {
+                // If there is no arc (sharp corner), move or line to the corner point
+                let p = self.corners[corner];
+                if corner == TOP_LEFT {
+                    outline_path.move_to(p);
+                } else {
+                    outline_path.line_to(p);
+                }
+            }
+        }
+
+        outline_path.close_path();
+        outline_path
+    }
+
+    /// Get an outline with a radius relative to the outline.
+    pub fn get_outline_with_radius(&self, radius: f64) -> BezPath {
+        let mut box_shadow_arcs: [Option<Arc>; 4] = [None; 4];
+
+        for corner in CORNERS {
+            let outer_radius = self.outer_radii[corner];
+            let radius_sign = CORNER_RADIUS_SIGN[corner];
+
+            let outer_radius = Vec2::new(
+                radius_sign.x * outer_radius.x,
+                radius_sign.y * outer_radius.y,
+            );
+
+            if is_outer_radius_sharp(outer_radius) {
+                continue;
+            }
+
+            let center = self.corners[corner].add(outer_radius);
+
+            let box_shadow_arc = Arc::new(
+                center,
+                self.outer_radii[corner]
+                    + Vec2::new(radius, radius),
+                CORNER_START_ANGLES[corner],
+                FRAC_PI_2,
+                0.0,
+            );
+            box_shadow_arcs[corner] = Some(box_shadow_arc);
+        }
+
+        let mut outline_path = BezPath::new();
+
+        for corner in CORNERS {
+            if let Some(arc) = &box_shadow_arcs[corner] {
+                let arc_path = arc.to_path(0.1);
+                if corner == TOP_LEFT {
+                    // For the very first segment, we MoveTo the start of the arc
+                    outline_path.extend(arc_path);
+                } else {
+                    // For subsequent corners, we LineTo the start of the arc to close the gaps
+                    extend_path_with_arc(&mut outline_path, &arc_path);
+                }
+            } else {
+                // If there is no arc (sharp corner), move or line to the corner point
+                let sign = CORNER_RADIUS_SIGN[corner];
+                let p = self.corners[corner]
+                    + Vec2::new(
+                    -sign.x * radius,
+                    -sign.y * radius,
+                );
+                if corner == TOP_LEFT {
+                    outline_path.move_to(p);
+                } else {
+                    outline_path.line_to(p);
+                }
+            }
+        }
+
+        outline_path.close_path();
+        outline_path
+    }
+
     fn compute_arcs(&mut self) {
         for corner in CORNERS {
             let outer_radius = self.outer_radii[corner];
diff --git a/crates/craft_primitives/src/geometry/rectangle.rs b/crates/craft_primitives/src/geometry/rectangle.rs
index cbe5f949..38862649 100644
--- a/crates/craft_primitives/src/geometry/rectangle.rs
+++ b/crates/craft_primitives/src/geometry/rectangle.rs
@@ -126,6 +126,10 @@ impl Rectangle {
     pub fn intersects(&self, other: &Rectangle) -> bool {
         self.x < other.right() && self.right() > other.x && self.y < other.bottom() && self.bottom() > other.y
     }
+
+    pub fn expand(&self, radius: f32) -> Self {
+        Rectangle::new(self.x - radius, self.y - radius, self.width + radius, self.height + radius)
+    }
 }
 
 /*impl From<taffy::Rect<f32>> for Rectangle {
diff --git a/crates/craft_renderer/Cargo.toml b/crates/craft_renderer/Cargo.toml
index 73549d57..ac60047e 100644
--- a/crates/craft_renderer/Cargo.toml
+++ b/crates/craft_renderer/Cargo.toml
@@ -13,27 +13,27 @@ vello_hybrid_renderer_webgl = ["wgpu/webgl"]
 
 [dependencies.vello]
 git = "https://github.com/linebender/vello.git"
-rev = "514a52db453e741f09e9c40283afcc186a675436"
+rev = "ab333dc5205c00fb527a36ff8466abd35798c6b6"
 default-features = false
 features = ["wgpu"]
 optional = true
 
 [dependencies.vello_cpu]
 git = "https://github.com/linebender/vello.git"
-rev = "514a52db453e741f09e9c40283afcc186a675436"
+rev = "ab333dc5205c00fb527a36ff8466abd35798c6b6"
 optional = true
-features = ["multithreading"]
+features = []
 
 [dependencies.vello_hybrid]
 git = "https://github.com/linebender/vello.git"
-rev = "514a52db453e741f09e9c40283afcc186a675436"
+rev = "ab333dc5205c00fb527a36ff8466abd35798c6b6"
 default-features = false
 features = ["default"]
 optional = true
 
 [dependencies.vello_common]
 git = "https://github.com/linebender/vello.git"
-rev = "514a52db453e741f09e9c40283afcc186a675436"
+rev = "ab333dc5205c00fb527a36ff8466abd35798c6b6"
 optional = true
 
 [dependencies.softbuffer]
diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index 9c683413..2bf5e48d 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -6,9 +6,8 @@ use std::sync::Arc;
 use craft_primitives::Color;
 use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::{ResourceIdentifier, ResourceManager};
-use peniko::kurbo::Shape;
-use peniko::{BrushRef, Gradient, kurbo};
-
+use peniko::kurbo::{BezPath, Shape, Vec2};
+use peniko::{BrushRef, Gradient};
 use crate::text_renderer_data::TextData;
 
 #[derive(Clone)]
@@ -20,9 +19,21 @@ pub enum RenderCommand {
     DrawText(Weak<RefCell<dyn TextData>>, Rectangle, Option<TextScroll>, bool),
     PushLayer(Rectangle),
     PopLayer,
-    FillBezPath(kurbo::BezPath, Brush),
+    FillBezPath(BezPath, Brush),
     StartOverlay,
     EndOverlay,
+    BoxShadowCmd(BoxShadowCmd)
+}
+
+#[derive(Clone)]
+pub struct BoxShadowCmd {
+    pub inset: bool,
+    pub offset: Vec2,
+    pub outline: BezPath,
+    pub path: BezPath,
+    pub blur_radius: f64,
+    pub color: Color,
+    pub border_box: Rectangle,
 }
 
 #[derive(Clone, Debug)]
@@ -155,7 +166,7 @@ impl RenderList {
     }
 
     #[inline(always)]
-    pub fn fill_bez_path(&mut self, path: kurbo::BezPath, brush: Brush) {
+    pub fn fill_bez_path(&mut self, path: BezPath, brush: Brush) {
         if let Some(cull) = &self.cull
             && !cull.intersects(&Rectangle::from_kurbo(path.bounding_box()))
         {
@@ -219,6 +230,21 @@ impl RenderList {
         self.commands.push(RenderCommand::EndOverlay);
     }
 
+    #[inline(always)]
+    pub fn draw_outset_box_shadow(
+        &mut self,
+        box_shadow: BoxShadowCmd,
+        //rectangle: Rectangle,
+    ) {
+/*        if let Some(cull) = &self.cull
+            && !cull.intersects(&rectangle)
+        {
+            return;
+        }*/
+        self.commands
+            .push(RenderCommand::BoxShadowCmd(box_shadow));
+    }
+
     pub fn set_cull(&mut self, cull: Option<Rectangle>) {
         self.cull = cull;
     }
@@ -251,6 +277,15 @@ pub trait Renderer: Any {
                 | RenderCommand::DrawTinyVg(rect, _, _)
                 | RenderCommand::DrawText(_, rect, _, _) => *rect,
                 RenderCommand::FillBezPath(path, _) => Rectangle::from_kurbo(path.bounding_box()),
+                | RenderCommand::BoxShadowCmd(box_shadow) => {
+                    let bounding_box = box_shadow.path.bounding_box();
+                    Rectangle::new(
+                        (bounding_box.x0 + box_shadow.offset.x) as f32,
+                        (bounding_box.y0 + box_shadow.offset.y) as f32,
+                        (bounding_box.x1 + box_shadow.offset.x) as f32,
+                        (bounding_box.y1 + box_shadow.offset.y) as f32
+                    )
+                }
                 _ => unreachable!("Cannot compute the bounding rect of this render command."),
             }
         }
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index 913b1aa2..001b5f9b 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -1,5 +1,10 @@
 pub(crate) mod tinyvg;
 
+use vello_common::filter_effects::FilterFunction;
+use vello_common::filter_effects::Filter;
+use peniko::Compose;
+use peniko::Mix;
+use peniko::BlendMode;
 use std::any::Any;
 use std::num::{NonZero, NonZeroU32};
 use std::ops::{Deref, DerefMut};
@@ -18,7 +23,7 @@ use vello_cpu::{Pixmap, RenderContext};
 use winit::window::Window;
 
 use crate::image_adapter::ImageAdapter;
-use crate::renderer::{RenderList, Renderer, Screenshot, SortedCommands, TextScroll};
+use crate::renderer::{BoxShadowCmd, RenderList, Renderer, Screenshot, SortedCommands, TextScroll};
 use crate::text_renderer_data::TextRenderLine;
 use crate::vello_cpu::tinyvg::draw_tiny_vg;
 use crate::{Brush, RenderCommand};
@@ -336,7 +341,11 @@ impl Renderer for VelloCpuRenderer {
                         override_color,
                     );
                 }
-                _ => {}
+                RenderCommand::StartOverlay => {}
+                RenderCommand::EndOverlay => {}
+                RenderCommand::BoxShadowCmd(box_shadow) => {
+                    self.draw_box_shadow(&box_shadow)
+                }
             }
         });
     }
@@ -375,6 +384,55 @@ impl VelloCpuRenderer {
 
         buffer
     }
+
+    pub fn draw_box_shadow(&mut self, box_shadow: &BoxShadowCmd) {
+        let radius = box_shadow.blur_radius / 2.0;
+        let filter = Some(Filter::from_function(FilterFunction::Blur {
+            radius: box_shadow.blur_radius as f32,
+        }));
+
+        if box_shadow.inset {
+            let mut clip_path = kurbo::BezPath::new();
+            let outline_rect = box_shadow.border_box.expand((radius * 3.0) as f32).to_kurbo();
+            clip_path.extend(&outline_rect.to_path(0.1));
+            clip_path.extend(&box_shadow.path);
+            self.render_context.push_layer(
+                Some(&box_shadow.outline),
+                None,
+                None,
+                None,
+                filter,
+            );
+            self.render_context.set_fill_rule(Fill::EvenOdd);
+            self.render_context.set_paint(box_shadow.color);
+            self.render_context.fill_path(&clip_path);
+            self.render_context.pop_layer();
+            self.render_context.set_fill_rule(Fill::NonZero);
+        } else {
+            self.render_context.push_layer(
+                None,
+                Some(BlendMode::new(Mix::Normal, Compose::SrcOver)),
+                None,
+                None,
+                filter,
+            );
+
+            self.render_context.set_transform(Affine::translate(box_shadow.offset));
+
+            self.render_context.set_paint(box_shadow.color);
+            self.render_context.fill_path(&box_shadow.path);
+
+            self.render_context.set_transform(Affine::IDENTITY);
+
+            self.render_context.set_blend_mode(BlendMode::new(Mix::Normal, Compose::DestOut));
+            self.render_context.set_paint(Color::WHITE);
+            self.render_context.fill_path(&box_shadow.outline);
+
+            self.render_context.set_blend_mode(BlendMode::new(Mix::Normal, Compose::SrcOver));
+
+            self.render_context.pop_layer();
+        }
+    }
 }
 
 fn brush_to_paint(brush: &Brush) -> PaintType {
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
index 8f3e7c0f..0f99e56d 100644
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ b/crates/craft_retained/src/elements/core/element_internals.rs
@@ -230,10 +230,11 @@ pub trait ElementInternals: ElementData {
         let has_border = current_style.has_border();
         let border_radius = current_style.get_border_radius();
         let border_color = &current_style.get_border_color();
+        let box_shadows = current_style.get_box_shadows();
 
         self.element_data_mut()
             .layout_item
-            .apply_borders(has_border, border_radius, scale_factor, border_color);
+            .apply_borders(has_border, border_radius, scale_factor, border_color, box_shadows);
     }
 
     /// A bit of a hack to reset the layout item of an element recursively.
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 259144aa..9051a23b 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -17,7 +17,7 @@ use crate::elements::ElementIdMap;
 use crate::elements::core::ElementData;
 use crate::elements::window::WindowInternal;
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
-use crate::style::{AlignItems, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Style, Underline, Unit};
+use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Style, Underline, Unit};
 
 /// The element trait for end-users.
 pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + Any {
@@ -525,6 +525,10 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
         self.style_mut().set_selection_color(selection_color);
     }
 
+    fn set_box_shadows(&mut self, box_shadows: Vec<BoxShadow>) {
+        self.style_mut().set_box_shadows(box_shadows);
+    }
+
     /// Sets focus on the specified element, if it can be focused.
     ///
     /// The focused element is the element that will receive keyboard and similar events by default.
@@ -890,6 +894,11 @@ pub trait Element: Clone + AsElement {
         self
     }
 
+    fn box_shadows(self, box_shadows: Vec<BoxShadow>) -> Self {
+        self.as_element_rc().borrow_mut().set_box_shadows(box_shadows);
+        self
+    }
+
     fn focus(self) -> Self {
         self.as_element_rc().borrow_mut().focus();
         self
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index ae1e9092..d4592bbf 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -4,8 +4,8 @@ use craft_renderer::{Brush, RenderList};
 use kurbo::{Affine, BezPath, Shape, Vec2};
 use peniko::Color;
 use taffy::NodeId;
-
-use crate::style::{Position, Style};
+use craft_renderer::renderer::BoxShadowCmd;
+use crate::style::{BoxShadow, Position, Style};
 
 impl CssComputedBorder {
     pub(crate) fn scale(&mut self, scale_factor: f64) {
@@ -28,6 +28,7 @@ impl CssComputedBorder {
         let background = css_rect.to_path(0.1f64);
 
         Self {
+            css_rect,
             sides: [top, right, bottom, left],
             background,
         }
@@ -56,6 +57,7 @@ pub struct LayoutItem {
 
     //cache_border_spec: Option<(CssRoundedRect, f64)>, // f64 for scale factor
     cache_border_spec: Option<BorderSpec>,
+    cache_box_shadows: Option<ComputedBoxShadows>,
     computed_border: ComputedBorder,
     /// True if the layout is new.
     pub has_new_layout: bool,
@@ -138,6 +140,7 @@ impl LayoutItem {
         border_radius: [(f32, f32); 4],
         scale_factor: f64,
         border_color: &TrblRectangle<Color>,
+        box_shadows: Vec<BoxShadow>,
     ) {
         let element_rect = self.computed_box_transformed;
         let border_spec = BorderSpec {
@@ -145,9 +148,10 @@ impl LayoutItem {
             width: element_rect.border,
             radii: border_radius,
             scale_factor,
+            box_shadows,
         };
 
-        if Some(border_spec) == self.cache_border_spec {
+        if Some(&border_spec) == self.cache_border_spec.as_ref() {
             return;
         }
         self.cache_border_spec = Some(border_spec);
@@ -162,8 +166,10 @@ impl LayoutItem {
         // then the color will split diagonally and cannot be drawn as a rect.
         if !has_border || (is_rectangle && border_color.are_edges_uniform()) {
             self.computed_border = ComputedBorder::Simple;
+            self.apply_box_shadows(scale_factor, border_radius);
             return;
         }
+
         let borders = element_rect.border;
         let border_spec = CssRoundedRect::new(
             element_rect.border_rectangle().to_kurbo(),
@@ -179,6 +185,74 @@ impl LayoutItem {
         let mut computed = CssComputedBorder::new(border_spec);
         computed.scale(scale_factor);
         self.computed_border = ComputedBorder::CssComputedBorder(computed);
+
+        self.apply_box_shadows(scale_factor, border_radius);
+    }
+
+    fn apply_box_shadows(&mut self, scale_factor: f64, border_radius: [(f32, f32); 4],) {
+        let scale_transform = Affine::scale(scale_factor);
+        let box_shadows = &self.cache_border_spec.as_ref().unwrap().box_shadows;
+        match &self.computed_border {
+            ComputedBorder::CssComputedBorder(css_rect) => {
+                let mut outline = css_rect.css_rect.get_outline();
+                outline.apply_affine(scale_transform);
+                let mut cache_box_shadows = ComputedBoxShadows {
+                    outline: BezPathOrRect::BezPath(outline),
+                    box_shadows: Vec::with_capacity(box_shadows.len()),
+                    border_box: self.computed_box_transformed.border_rectangle().scale(scale_factor),
+                };
+                for box_shadow in box_shadows {
+                    let offset = Vec2::new(box_shadow.offset_x, box_shadow.offset_y);
+
+
+                    let element_rect = self.computed_box_transformed;
+                    let borders = element_rect.border;
+                    let inset_css_rect = CssRoundedRect::new(
+                        element_rect.border_rectangle().to_kurbo().inflate(-box_shadow.spread_radius, -box_shadow.spread_radius),
+                        [
+                            borders.top as f64,
+                            borders.right as f64,
+                            borders.bottom as f64,
+                            borders.left as f64,
+                        ],
+                        border_radius.map(|radii| Vec2::new((radii.0 as f64 - box_shadow.spread_radius).max(0.0), (radii.1 as f64 - box_shadow.spread_radius).max(0.0))),
+                    );
+                    let mut inset_rect_outline = inset_css_rect.get_outline_with_radius(0.0);
+                    inset_rect_outline.apply_affine(Affine::translate(offset));
+                    inset_rect_outline.apply_affine(scale_transform);
+                    cache_box_shadows.box_shadows.push(ComputedBoxShadow {
+                        inset: box_shadow.inset,
+                        shape: BezPathOrRect::BezPath(inset_rect_outline),
+                        offset: offset * scale_factor,
+                        blur_radius: box_shadow.blur_radius * scale_factor,
+                        color: box_shadow.color,
+                    })
+                }
+                self.cache_box_shadows = Some(cache_box_shadows);
+            }
+            ComputedBorder::Simple => {
+                let outline = self.computed_box_transformed.border_rectangle();
+
+                let mut cache_box_shadows = ComputedBoxShadows {
+                    outline: BezPathOrRect::Rect(outline),
+                    box_shadows: Vec::with_capacity(box_shadows.len()),
+                    border_box: self.computed_box_transformed.border_rectangle().scale(scale_factor),
+                };
+                for box_shadow in box_shadows {
+                    let radius_modifier = if box_shadow.inset {-1.0} else {1.0};
+                    let offset = Vec2::new(box_shadow.offset_x, box_shadow.offset_y);
+                    cache_box_shadows.box_shadows.push(ComputedBoxShadow {
+                        inset: box_shadow.inset,
+                        shape: BezPathOrRect::Rect(outline.expand((box_shadow.spread_radius * radius_modifier) as f32).scale(scale_factor)),
+                        offset: offset * scale_factor,
+                        blur_radius: box_shadow.blur_radius * scale_factor,
+                        color: box_shadow.color,
+                    })
+                }
+                self.cache_box_shadows = Some(cache_box_shadows);
+            }
+            ComputedBorder::None => {}
+        }
     }
 
     pub fn resolve_clip(&mut self, clip_bounds: Option<Rectangle>) {
@@ -186,6 +260,24 @@ impl LayoutItem {
     }
 
     pub fn draw_borders(&self, renderer: &mut RenderList, current_style: &Style, scale_factor: f64) {
+        if let Some(cache_box_shadows) = &self.cache_box_shadows {
+            for shadow in &cache_box_shadows.box_shadows {
+                if shadow.inset {
+                    continue;
+                }
+
+                renderer.draw_outset_box_shadow(BoxShadowCmd {
+                    inset: false,
+                    offset: shadow.offset,
+                    outline: cache_box_shadows.outline.to_path(),
+                    path: shadow.shape.to_path(),
+                    blur_radius: shadow.blur_radius,
+                    color: shadow.color,
+                    border_box: cache_box_shadows.border_box,
+                });
+            }
+        }
+
         let background_color = current_style.get_background_color();
 
         // OPTIMIZATION: Draw a normal rectangle if no border values have been modified.
@@ -213,6 +305,24 @@ impl LayoutItem {
                 );
             }
         }
+
+        if let Some(cache_box_shadows) = &self.cache_box_shadows {
+            for shadow in &cache_box_shadows.box_shadows {
+                if !shadow.inset {
+                    continue;
+                }
+
+                renderer.draw_outset_box_shadow(BoxShadowCmd {
+                    inset: true,
+                    offset: shadow.offset,
+                    outline: cache_box_shadows.outline.to_path(),
+                    path: shadow.shape.to_path(),
+                    blur_radius: shadow.blur_radius,
+                    color: shadow.color,
+                    border_box: cache_box_shadows.border_box,
+                });
+            }
+        }
     }
 }
 
@@ -237,18 +347,55 @@ pub(crate) fn draw_borders_generic(
     }
 }
 
+#[derive(Clone)]
+enum BezPathOrRect {
+    Rect(Rectangle),
+    BezPath(BezPath),
+}
+
+impl BezPathOrRect {
+
+    pub fn to_path(&self) -> BezPath {
+        match self {
+            BezPathOrRect::Rect(rect) => {
+                rect.to_kurbo().to_path(0.1)
+            }
+            BezPathOrRect::BezPath(path) => {path.clone()}
+        }
+    }
+
+}
+
+#[derive(Clone)]
+struct ComputedBoxShadow {
+    pub inset: bool,
+    pub shape: BezPathOrRect,
+    pub offset: Vec2,
+    pub blur_radius: f64,
+    pub color: Color,
+}
+
+#[derive(Clone)]
+pub(crate) struct ComputedBoxShadows {
+    outline: BezPathOrRect,
+    box_shadows: Vec<ComputedBoxShadow>,
+    border_box: Rectangle,
+}
+
 #[derive(Clone)]
 pub(crate) struct CssComputedBorder {
+    css_rect: CssRoundedRect,
     sides: [Option<BezPath>; 4],
     background: BezPath,
 }
 
-#[derive(Copy, Clone, PartialEq)]
+#[derive(Clone, PartialEq)]
 struct BorderSpec {
     rect: Rectangle,
     width: TrblRectangle<f32>,
     radii: [(f32, f32); 4],
     scale_factor: f64,
+    box_shadows: Vec<BoxShadow>,
 }
 
 #[derive(Clone, Default)]
diff --git a/crates/craft_retained/src/style/box_shadow.rs b/crates/craft_retained/src/style/box_shadow.rs
new file mode 100644
index 00000000..ef4c4aa0
--- /dev/null
+++ b/crates/craft_retained/src/style/box_shadow.rs
@@ -0,0 +1,26 @@
+// https://www.w3.org/TR/css-backgrounds-3/
+// https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/box-shadow
+use craft_primitives::Color;
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct BoxShadow {
+    pub inset: bool,
+    pub offset_x: f64,
+    pub offset_y: f64,
+    pub blur_radius: f64,
+    pub spread_radius: f64,
+    pub color: Color,
+}
+
+impl BoxShadow {
+    pub fn new(inset: bool, offset_x: f64, offset_y: f64, blur_radius: f64, spread_radius: f64, color: Color) -> Self {
+        Self {
+            inset,
+            offset_x,
+            offset_y,
+            blur_radius,
+            spread_radius,
+            color,
+        }
+    }
+}
diff --git a/crates/craft_retained/src/style/mod.rs b/crates/craft_retained/src/style/mod.rs
index c314e79a..6e80e4c1 100644
--- a/crates/craft_retained/src/style/mod.rs
+++ b/crates/craft_retained/src/style/mod.rs
@@ -1,12 +1,14 @@
 mod styles;
 mod taffy_conversions;
+mod box_shadow;
 
 use std::borrow::Cow;
 use std::fmt;
 use std::fmt::Debug;
 
 use craft_primitives::ColorBrush;
-use peniko::Color;
+use craft_primitives::Color;
+pub use box_shadow::BoxShadow;
 pub use styles::*;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -188,10 +190,10 @@ pub enum Position {
     Absolute,
 }
 
-#[derive(Clone, Debug, Copy)]
+#[derive(Clone, Debug)]
 pub struct StyleProperty<T>
 where
-    T: Clone + Debug + Copy,
+    T: Clone + Debug,
 {
     property: T,
     is_dirty: bool,
@@ -199,7 +201,7 @@ where
 
 impl<T> StyleProperty<T>
 where
-    T: Clone + Debug + Copy,
+    T: Clone + Debug,
 {
     pub fn new(property: T) -> StyleProperty<T> {
         Self {
@@ -214,9 +216,10 @@ where
         self.is_dirty = true;
     }
 
+    // TODO: Return a ref.
     #[inline(always)]
     pub fn get(&self) -> T {
-        self.property
+        self.property.clone()
     }
 
     #[inline(always)]
diff --git a/crates/craft_retained/src/style/styles.rs b/crates/craft_retained/src/style/styles.rs
index 12b8ac0a..ba0ec908 100644
--- a/crates/craft_retained/src/style/styles.rs
+++ b/crates/craft_retained/src/style/styles.rs
@@ -5,6 +5,7 @@ use craft_primitives::geometry::TrblRectangle;
 use craft_primitives::{Color, ColorBrush};
 
 use crate::style::*;
+use crate::style::box_shadow::BoxShadow;
 
 #[derive(Clone, Debug)]
 pub struct Style {
@@ -57,6 +58,8 @@ pub struct Style {
     selection_color: StyleProperty<Color>,
     cursor_color: StyleProperty<Option<Color>>,
 
+    box_shadows: StyleProperty<Vec<BoxShadow>>,
+
     /// Set to true anytime a setter is called.
     pub is_dirty: bool,
 }
@@ -116,6 +119,7 @@ impl Style {
             visible: StyleProperty::new(true),
             selection_color: StyleProperty::new(Color::from_rgb8(0, 120, 215)),
             cursor_color: StyleProperty::new(None),
+            box_shadows: StyleProperty::new(Vec::new()),
         })
     }
 }
@@ -471,6 +475,14 @@ impl Style {
         self.is_dirty = true;
         self.cursor_color.set(val);
     }
+
+    pub fn get_box_shadows(&self) -> Vec<BoxShadow> {
+        self.box_shadows.get()
+    }
+
+    pub fn set_box_shadows(&mut self, box_shadows: Vec<BoxShadow>) {
+        self.box_shadows = StyleProperty::new(box_shadows)
+    }
 }
 
 impl Style {
diff --git a/examples/counter_retained/Cargo.toml b/examples/counter_retained/Cargo.toml
index 2e73f028..81629871 100644
--- a/examples/counter_retained/Cargo.toml
+++ b/examples/counter_retained/Cargo.toml
@@ -23,7 +23,7 @@ features = ["accesskit", "system_fonts"]
 
 [target.'cfg(not(target_os = "android"))'.dependencies.craft_renderer]
 path = "../../crates/craft_renderer"
-features = ["vello_renderer"]
+features = ["vello_cpu_renderer"]
 
 [target.'cfg(target_os = "android")'.dependencies.craft_renderer]
 path = "../../crates/craft_renderer"
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index bdd57b47..5ea3e831 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -3,15 +3,20 @@ use std::rc::Rc;
 
 use craft_retained::elements::{Container, Element, Text, Window};
 use craft_retained::events::ui_events::pointer::PointerButton;
-use craft_retained::style::{AlignItems, FlexDirection, JustifyContent};
-use craft_retained::{Color, CraftOptions, pct, px, rgb};
+use craft_retained::style::{AlignItems, BoxShadow, FlexDirection, JustifyContent};
+use craft_retained::{Color, CraftOptions, pct, px, rgb, rgba};
 
 fn create_button(label: &str, base_color: Color, delta: i64, state: Rc<RefCell<i64>>, count_text: Text) -> Container {
     let border_color = rgb(0, 0, 0);
     Container::new()
-        .border_width(px(1), px(2), px(3), px(4))
+        .box_shadows(vec![
+            BoxShadow::new(false, 0.0, 5.0, 5.0, 0.0, rgba(0, 0, 0, 200)),
+            BoxShadow::new(false, 0.0, 25.0, 35.0, 0.0, rgba(0, 0, 0, 150)),
+            BoxShadow::new(true, 0.0, 4.0, 4.0, 0.0, rgba(255, 255, 255, 120)),
+        ])
+        .border_width(px(0), px(0), px(0), px(0))
         .border_color(border_color, border_color, border_color, border_color)
-        .border_radius((10.0, 10.0), (10.0, 10.0), (10.0, 10.0), (10.0, 10.0))
+        .border_radius((8.0, 8.0), (8.0, 8.0), (8.0, 8.0), (8.0, 8.0))
         .padding(px(15), px(30), px(15), px(30))
         .justify_content(Some(JustifyContent::Center))
         .background_color(base_color)
@@ -42,14 +47,14 @@ fn main() {
                 .gap(px(20), px(20))
                 .push(create_button(
                     "-",
-                    rgb(244, 67, 54),
+                    rgb(244, 63, 94),
                     -1,
                     count.clone(),
                     count_text.clone(),
                 ))
                 .push(create_button(
                     "+",
-                    rgb(76, 175, 80),
+                    rgb(16, 185, 129),
                     1,
                     count.clone(),
                     count_text.clone(),

From add99d17119cd84568c62a6f398b88c58bdc3171 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 26 Feb 2026 07:29:40 -0500
Subject: [PATCH 058/143] Use border inner for inset and border outer for
 outset.

---
 .../craft_primitives/src/geometry/borders.rs  | 39 +++++++++++
 crates/craft_renderer/src/vello_cpu/mod.rs    |  4 ++
 .../craft_retained/src/layout/layout_item.rs  | 66 ++++++++++++-------
 3 files changed, 85 insertions(+), 24 deletions(-)

diff --git a/crates/craft_primitives/src/geometry/borders.rs b/crates/craft_primitives/src/geometry/borders.rs
index 216c199c..047f4dd7 100644
--- a/crates/craft_primitives/src/geometry/borders.rs
+++ b/crates/craft_primitives/src/geometry/borders.rs
@@ -56,6 +56,7 @@ pub struct CssRoundedRect {
     corners_arcs: [[Option<Arc>; 4]; 4],
 
     background_arcs: [Option<Arc>; 4],
+    background_inner_arcs: [Option<Arc>; 4],
 
     widths: [f64; 4],
 }
@@ -72,6 +73,7 @@ impl CssRoundedRect {
             intersect_angles: [Vec2::default(); 4],
             corners_arcs: [[None; 4]; 4],
             background_arcs: [None; 4],
+            background_inner_arcs: [None; 4],
             widths,
             corners: [
                 Point::new(rect.x0, rect.y0),
@@ -144,6 +146,34 @@ impl CssRoundedRect {
         outline_path
     }
 
+    pub fn get_inline(&self) -> BezPath {
+        let mut outline_path = BezPath::new();
+
+        for corner in CORNERS {
+            if let Some(arc) = &self.background_inner_arcs[corner] {
+                let arc_path = arc.to_path(0.1);
+                if corner == TOP_LEFT {
+                    // For the very first segment, we MoveTo the start of the arc
+                    outline_path.extend(arc_path);
+                } else {
+                    // For subsequent corners, we LineTo the start of the arc to close the gaps
+                    extend_path_with_arc(&mut outline_path, &arc_path);
+                }
+            } else {
+                // If there is no arc (sharp corner), move or line to the corner point
+                let p = self.corners[corner];
+                if corner == TOP_LEFT {
+                    outline_path.move_to(p);
+                } else {
+                    outline_path.line_to(p);
+                }
+            }
+        }
+
+        outline_path.close_path();
+        outline_path
+    }
+
     /// Get an outline with a radius relative to the outline.
     pub fn get_outline_with_radius(&self, radius: f64) -> BezPath {
         let mut box_shadow_arcs: [Option<Arc>; 4] = [None; 4];
@@ -248,9 +278,18 @@ impl CssRoundedRect {
                 0.0,
             );
 
+            let background_inner_arc = Arc::new(
+                center,
+                self.inner_radii[corner],
+                CORNER_START_ANGLES[corner],
+                FRAC_PI_2,
+                0.0,
+            );
+
             self.corners_arcs[corner][0] = Some(outside_1st_arc);
             self.corners_arcs[corner][1] = Some(outside_2nd_arc);
             self.background_arcs[corner] = Some(background_arc);
+            self.background_inner_arcs[corner] = Some(background_inner_arc);
 
             if is_outer_radius_sharp(inner_radius) {
                 continue;
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index 001b5f9b..38578bec 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -432,6 +432,10 @@ impl VelloCpuRenderer {
 
             self.render_context.pop_layer();
         }
+
+        //self.render_context.set_paint(Color::from_rgb8(0, 0, 255));
+        //self.render_context.set_stroke(Stroke::new(5.0));
+        //self.render_context.stroke_path(&box_shadow.outline.to_path(0.1));
     }
 }
 
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index d4592bbf..4870b54f 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -195,46 +195,63 @@ impl LayoutItem {
         match &self.computed_border {
             ComputedBorder::CssComputedBorder(css_rect) => {
                 let mut outline = css_rect.css_rect.get_outline();
+                let mut inline = css_rect.css_rect.get_inline();
                 outline.apply_affine(scale_transform);
+                inline.apply_affine(scale_transform);
                 let mut cache_box_shadows = ComputedBoxShadows {
                     outline: BezPathOrRect::BezPath(outline),
+                    inline: BezPathOrRect::BezPath(inline),
                     box_shadows: Vec::with_capacity(box_shadows.len()),
                     border_box: self.computed_box_transformed.border_rectangle().scale(scale_factor),
                 };
                 for box_shadow in box_shadows {
                     let offset = Vec2::new(box_shadow.offset_x, box_shadow.offset_y);
 
-
-                    let element_rect = self.computed_box_transformed;
-                    let borders = element_rect.border;
-                    let inset_css_rect = CssRoundedRect::new(
-                        element_rect.border_rectangle().to_kurbo().inflate(-box_shadow.spread_radius, -box_shadow.spread_radius),
-                        [
-                            borders.top as f64,
-                            borders.right as f64,
-                            borders.bottom as f64,
-                            borders.left as f64,
-                        ],
-                        border_radius.map(|radii| Vec2::new((radii.0 as f64 - box_shadow.spread_radius).max(0.0), (radii.1 as f64 - box_shadow.spread_radius).max(0.0))),
-                    );
-                    let mut inset_rect_outline = inset_css_rect.get_outline_with_radius(0.0);
-                    inset_rect_outline.apply_affine(Affine::translate(offset));
-                    inset_rect_outline.apply_affine(scale_transform);
-                    cache_box_shadows.box_shadows.push(ComputedBoxShadow {
-                        inset: box_shadow.inset,
-                        shape: BezPathOrRect::BezPath(inset_rect_outline),
-                        offset: offset * scale_factor,
-                        blur_radius: box_shadow.blur_radius * scale_factor,
-                        color: box_shadow.color,
-                    })
+                    if box_shadow.inset {
+                        let element_rect = self.computed_box_transformed;
+                        let borders = element_rect.border;
+                        let inset_css_rect = CssRoundedRect::new(
+                            element_rect.border_rectangle().to_kurbo().inflate(-box_shadow.spread_radius, -box_shadow.spread_radius),
+                            [
+                                borders.top as f64,
+                                borders.right as f64,
+                                borders.bottom as f64,
+                                borders.left as f64,
+                            ],
+                            border_radius.map(|radii| Vec2::new((radii.0 as f64 - box_shadow.spread_radius).max(0.0), (radii.1 as f64 - box_shadow.spread_radius).max(0.0))),
+                        );
+                        let mut inset_rect_outline = inset_css_rect.get_outline();
+                        inset_rect_outline.apply_affine(Affine::translate(offset));
+                        inset_rect_outline.apply_affine(scale_transform);
+                        cache_box_shadows.box_shadows.push(ComputedBoxShadow {
+                            inset: box_shadow.inset,
+                            shape: BezPathOrRect::BezPath(inset_rect_outline),
+                            offset: offset * scale_factor,
+                            blur_radius: box_shadow.blur_radius * scale_factor,
+                            color: box_shadow.color,
+                        })
+                    } else {
+                        let mut shape = css_rect.css_rect.get_outline_with_radius(box_shadow.spread_radius);
+                        shape.apply_affine(Affine::translate(offset));
+                        shape.apply_affine(scale_transform);
+                        cache_box_shadows.box_shadows.push(ComputedBoxShadow {
+                            inset: box_shadow.inset,
+                            shape: BezPathOrRect::BezPath(shape),
+                            offset: offset * scale_factor,
+                            blur_radius: box_shadow.blur_radius * scale_factor,
+                            color: box_shadow.color,
+                        })
+                    }
                 }
                 self.cache_box_shadows = Some(cache_box_shadows);
             }
             ComputedBorder::Simple => {
                 let outline = self.computed_box_transformed.border_rectangle();
+                let inline = self.computed_box_transformed.padding_rectangle();
 
                 let mut cache_box_shadows = ComputedBoxShadows {
                     outline: BezPathOrRect::Rect(outline),
+                    inline: BezPathOrRect::Rect(inline),
                     box_shadows: Vec::with_capacity(box_shadows.len()),
                     border_box: self.computed_box_transformed.border_rectangle().scale(scale_factor),
                 };
@@ -315,7 +332,7 @@ impl LayoutItem {
                 renderer.draw_outset_box_shadow(BoxShadowCmd {
                     inset: true,
                     offset: shadow.offset,
-                    outline: cache_box_shadows.outline.to_path(),
+                    outline: cache_box_shadows.inline.to_path(),
                     path: shadow.shape.to_path(),
                     blur_radius: shadow.blur_radius,
                     color: shadow.color,
@@ -378,6 +395,7 @@ struct ComputedBoxShadow {
 #[derive(Clone)]
 pub(crate) struct ComputedBoxShadows {
     outline: BezPathOrRect,
+    inline: BezPathOrRect,
     box_shadows: Vec<ComputedBoxShadow>,
     border_box: Rectangle,
 }

From d71e0858c87896bb56acbd5e4a9b6d5405517ec9 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Fri, 27 Feb 2026 05:29:51 -0500
Subject: [PATCH 059/143] Add a few functions to programmatically scroll a
 scrollable

---
 .../craft_retained/src/elements/container.rs  |  13 +-
 crates/craft_retained/src/elements/element.rs | 104 +++++++-
 .../src/elements/element_data.rs              |  86 +------
 crates/craft_retained/src/elements/mod.rs     |   2 +-
 .../src/elements/scroll_state.rs              |  42 ----
 .../craft_retained/src/elements/scrollable.rs | 231 +++++++++++++++++-
 .../src/elements/text_input/mod.rs            |  15 +-
 crates/craft_retained/src/elements/window.rs  |  13 +-
 crates/craft_retained/src/events/helpers.rs   |   7 +
 crates/craft_retained/src/events/mod.rs       |   2 +
 .../craft_retained/src/layout/layout_item.rs  |  16 +-
 crates/craft_retained/src/style/mod.rs        |   9 +
 12 files changed, 371 insertions(+), 169 deletions(-)
 delete mode 100644 crates/craft_retained/src/elements/scroll_state.rs

diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 63e7b42b..51fb237b 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -119,26 +119,21 @@ impl ElementInternals for ContainerInner {
             // For scroll changes from taffy;
             self.element_data.apply_scroll(layout);
             self.apply_clip(clip_bounds);
-            self.element_data.scroll_state.as_mut().unwrap().mark_old();
+            self.element_data.scroll_state.mark_old();
         }
 
         // For manual scroll updates.
-        if !dirty
-            && self
-                .element_data
-                .scroll_state
-                .map(|scroll_state| scroll_state.is_new())
-                .unwrap_or_default()
+        if !dirty && self.element_data.scroll_state.is_new()
         {
             self.element_data.apply_scroll(layout);
-            self.element_data.scroll_state.as_mut().unwrap().mark_old();
+            self.element_data.scroll_state.mark_old();
         }
 
         if has_new_layout {
             taffy_tree.mark_seen(node);
         }
 
-        let scroll_y = self.element_data.scroll().map_or(0.0, |s| s.scroll_y() as f64);
+        let scroll_y = self.element_data.scroll().scroll_y() as f64;
         let child_transform = Affine::translate((0.0, -scroll_y));
 
         self.apply_layout_children(
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/element.rs
index 259144aa..5a012277 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/element.rs
@@ -3,21 +3,22 @@ use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 use std::sync::Arc;
 
-use craft_primitives::Color;
 use craft_primitives::geometry::{ElementBox, Point, TrblRectangle};
+use craft_primitives::Color;
 use ui_events::pointer::PointerId;
 use winit::dpi::PhysicalPosition;
 use winit::event::WindowEvent::{CursorMoved, MouseInput};
 use winit::event::{DeviceId, ElementState, MouseButton};
 
-use crate::CraftError;
-use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE, queue_window_event};
+use crate::app::{queue_window_event, DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
 use crate::document::Document;
-use crate::elements::ElementIdMap;
 use crate::elements::core::ElementData;
+use crate::elements::scrollable::{ScrollOptions, ScrollState};
 use crate::elements::window::WindowInternal;
-use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
+use crate::elements::ElementIdMap;
+use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::style::{AlignItems, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Style, Underline, Unit};
+use crate::CraftError;
 
 /// The element trait for end-users.
 pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + Any {
@@ -227,6 +228,10 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
             .push(on_lost_pointer_capture);
     }
 
+    fn set_id(&mut self, id: &str) {
+        self.element_data_mut().id = Some(id.into());
+    }
+
     fn on_pointer_button_down(&mut self, on_pointer_button_down: PointerEventHandler) {
         self.element_data_mut()
             .on_pointer_button_down
@@ -245,6 +250,34 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
         self.element_data_mut().on_keyboard_input.push(on_keyboard_input);
     }
 
+    fn on_scroll(&mut self, on_scroll: ScrollHandler) {
+        self.element_data_mut().on_scroll.push(on_scroll);
+    }
+
+    fn scroll_to_child_by_id_with_options(&mut self, id: &str, options: ScrollOptions) {
+        crate::elements::scrollable::scroll_to_child_by_id_with_options(self.element_data_mut(), id, options);
+    }
+
+    fn scroll_to(&mut self, y: f32) {
+        crate::elements::scrollable::scroll_to(self.element_data_mut(), y);
+    }
+
+    fn scroll_to_top(&mut self) {
+        crate::elements::scrollable::scroll_to_top(self.element_data_mut());
+    }
+
+    fn scroll_to_bottom(&mut self) {
+        crate::elements::scrollable::scroll_to_bottom(self.element_data_mut());
+    }
+
+    fn scroll_by(&mut self, y: f32) {
+        crate::elements::scrollable::scroll_by(self.element_data_mut(), y);
+    }
+
+    fn get_scroll_state(&self) -> ScrollState {
+        self.element_data().scroll_state
+    }
+
     /// Returns the element's [`ElementBox`].
     fn get_computed_box_transformed(&self) -> ElementBox {
         self.element_data().layout_item.computed_box_transformed
@@ -656,6 +689,13 @@ pub trait Element: Clone + AsElement {
         self
     }
 
+    fn id(self, id: &str) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .set_id(id);
+        self
+    }
+
     fn on_pointer_button_down(self, on_pointer_button_down: PointerEventHandler) -> Self {
         self.as_element_rc()
             .borrow_mut()
@@ -694,6 +734,60 @@ pub trait Element: Clone + AsElement {
         self
     }
 
+    fn on_scroll(self, on_scroll: ScrollHandler) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .on_scroll(on_scroll);
+        self
+    }
+
+    fn scroll_to_child_by_id(self, id: &str) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .scroll_to_child_by_id_with_options(id, ScrollOptions::default());
+        self
+    }
+
+    fn scroll_to_child_by_id_with_options(self, id: &str, options: ScrollOptions) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .scroll_to_child_by_id_with_options(id, options);
+        self
+    }
+    fn scroll_to(self, y: f32) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .scroll_to(y);
+        self
+    }
+
+    fn scroll_to_top(self) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .scroll_to_top();
+        self
+    }
+
+    fn scroll_to_bottom(self) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .scroll_to_bottom();
+        self
+    }
+
+    fn scroll_by(self, y: f32) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .scroll_by(y);
+        self
+    }
+
+    fn get_scroll_state(&self) -> ScrollState {
+        self.as_element_rc()
+            .borrow_mut()
+            .get_scroll_state()
+    }
+
     fn display(self, display: Display) -> Self {
         self.as_element_rc().borrow_mut().set_display(display);
         self
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index 5d09425e..91e64ca2 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -1,15 +1,13 @@
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
-
-use craft_primitives::geometry::{Rectangle, Size};
 use smol_str::SmolStr;
 use taffy::Layout;
 
 use crate::app::{ELEMENTS, TAFFY_TREE};
 use crate::elements::ElementImpl;
 use crate::elements::element_id::create_unique_element_id;
-use crate::elements::scroll_state::ScrollState;
-use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, SliderValueChangedHandler};
+use crate::elements::scrollable::{apply_scroll_layout, ScrollState};
+use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::layout::layout_context::LayoutContext;
 use crate::layout::layout_item::LayoutItem;
 use crate::style::{Overflow, Style};
@@ -39,7 +37,8 @@ pub struct ElementData {
     pub(crate) internal_id: u64,
 
     /// Scrollbar state for elements that may have a scrollbar.
-    pub(super) scroll_state: Option<ScrollState>,
+    pub(super) scroll_state: ScrollState,
+    pub(super) is_scrollable: bool,
 
     // Events:
     pub on_slider_value_changed: Vec<SliderValueChangedHandler>,
@@ -51,11 +50,12 @@ pub struct ElementData {
     pub on_pointer_button_up: Vec<PointerEventHandler>,
     pub on_pointer_moved: Vec<PointerUpdateHandler>,
     pub on_keyboard_input: Vec<KeyboardInputHandler>,
+    pub on_scroll: Vec<ScrollHandler>,
 }
 
 impl ElementData {
     pub fn new(me: Weak<RefCell<dyn ElementImpl>>, scrollable: bool) -> Self {
-        let mut default = Self {
+        let default = Self {
             me,
             parent: None,
             style: Style::new(),
@@ -63,8 +63,8 @@ impl ElementData {
             children: Default::default(),
             id: None,
             internal_id: create_unique_element_id(),
-            scroll_state: None,
-
+            scroll_state: ScrollState::default(),
+            is_scrollable: scrollable,
             on_slider_value_changed: Vec::new(),
             on_pointer_enter: Vec::new(),
             on_pointer_leave: Vec::new(),
@@ -74,13 +74,9 @@ impl ElementData {
             on_pointer_button_up: Vec::new(),
             on_pointer_moved: Vec::new(),
             on_keyboard_input: Vec::new(),
+            on_scroll: Vec::new(),
         };
 
-        // Create scroll state if needed.
-        if scrollable {
-            default.scroll_state = Some(ScrollState::default());
-        }
-
         ELEMENTS.with_borrow_mut(|elements| {
             elements.insert_id(default.internal_id, default.me.clone());
         });
@@ -103,73 +99,17 @@ impl ElementData {
 
     /// Computes the scrollbar's tack and thumb layout.
     pub(crate) fn apply_scroll(&mut self, layout: &Layout) {
-        self.layout_item.scrollbar_size = Size::new(layout.scrollbar_size.width, layout.scrollbar_size.height);
-        self.layout_item.computed_scrollbar_size = Size::new(layout.scroll_width(), layout.scroll_height());
-
-        if let Some(state) = &mut self.scroll_state {
-            if self.style.get_overflow()[1] != Overflow::Scroll {
-                return;
-            }
-
-            let box_transformed = self.layout_item.computed_box_transformed;
-
-            // Client Height = padding box height.
-            let client_height = box_transformed.padding_rectangle().height;
-
-            let mut content_height = self.layout_item.content_size.height;
-            // Taffy is adding the top border and padding height to the content size.
-            content_height -= box_transformed.border.top;
-            content_height -= box_transformed.padding.top;
-
-            // Content Size = overflowed content size + padding
-            // Scroll Height = Content Size
-            let scroll_height =
-                (content_height + box_transformed.padding.bottom + box_transformed.padding.top).max(1.0);
-            let scroll_track_width = self.layout_item.scrollbar_size.width;
-
-            // The scroll track height is the height of the padding box.
-            let scroll_track_height = client_height;
-
-            let max_scroll_y = (scroll_height - client_height).max(0.0);
-            self.layout_item.max_scroll_y = max_scroll_y;
-
-            self.layout_item.computed_scroll_track = Rectangle::new(
-                box_transformed.padding_rectangle().right() - scroll_track_width,
-                box_transformed.padding_rectangle().top(),
-                scroll_track_width,
-                scroll_track_height,
-            );
-
-            let visible_y = (client_height / scroll_height).clamp(0.0, 1.0);
-            let scroll_thumb_height = scroll_track_height * visible_y;
-            let scroll_thumb_height = scroll_thumb_height.max(15.0);
-            let remaining_height = scroll_track_height - scroll_thumb_height;
-            let scroll_thumb_offset = if max_scroll_y != 0.0 {
-                state.scroll_y() / max_scroll_y * remaining_height
-            } else {
-                0.0
-            };
-
-            let thumb_margin = self.style.get_scrollbar_thumb_margin();
-            let scroll_thumb_width = scroll_track_width - (thumb_margin.left + thumb_margin.right);
-            let scroll_thumb_height = (scroll_thumb_height - (thumb_margin.top + thumb_margin.bottom)).max(0.0);
-
-            self.layout_item.computed_scroll_thumb = self.layout_item.computed_scroll_track;
-            self.layout_item.computed_scroll_thumb.x += thumb_margin.left;
-            self.layout_item.computed_scroll_thumb.y += scroll_thumb_offset + thumb_margin.top;
-            self.layout_item.computed_scroll_thumb.width = scroll_thumb_width;
-            self.layout_item.computed_scroll_thumb.height = scroll_thumb_height;
-        }
+       apply_scroll_layout(self, layout);
     }
 
-    pub(crate) fn scroll(&self) -> Option<&ScrollState> {
-        self.scroll_state.as_ref()
+    pub(crate) fn scroll(&self) -> ScrollState {
+        self.scroll_state
     }
 }
 
 impl ElementData {
     pub fn is_scrollable(&self) -> bool {
-        self.style.get_overflow()[1] == Overflow::Scroll
+        self.style.get_overflow()[1] == Overflow::Scroll && self.is_scrollable
     }
 
     pub fn current_style(&self) -> &Style {
diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index da15937f..0739efe7 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -2,7 +2,6 @@ mod container;
 pub mod core;
 mod element;
 mod element_data;
-mod scroll_state;
 mod text;
 
 mod element_id;
@@ -21,3 +20,4 @@ pub use slider::{Slider, SliderDirection, SliderInner};
 pub use text::{Text, TextInner};
 pub use text_input::{TextInput, TextInputInner};
 pub use window::{Window, WindowInternal};
+pub use scrollable::{ScrollToBox, ScrollOptions};
diff --git a/crates/craft_retained/src/elements/scroll_state.rs b/crates/craft_retained/src/elements/scroll_state.rs
deleted file mode 100644
index b0087704..00000000
--- a/crates/craft_retained/src/elements/scroll_state.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use craft_primitives::geometry::Point;
-
-/// Stores state for elements with a scrollbar.
-#[derive(Debug, Clone, Default, Copy)]
-pub struct ScrollState {
-    /// The total amount of vertical scroll.
-    scroll_y: f32,
-
-    /// Where the scrollbar was clicked.
-    pub(crate) scroll_click: Option<Point>,
-
-    // True if the scroll changes are new.
-    is_new: bool,
-}
-
-impl ScrollState {
-    /// Returns the total amount of vertical scroll.
-    pub fn scroll_y(&self) -> f32 {
-        self.scroll_y
-    }
-
-    pub fn mark_old(&mut self) {
-        self.is_new = false;
-    }
-
-    pub fn is_new(&self) -> bool {
-        self.is_new
-    }
-
-    /// Sets the total amount of vertical scroll.
-    ///
-    /// # Panics
-    ///
-    /// This function will panic if `scroll_y` is less than zero.
-    pub fn set_scroll_y(&mut self, scroll_y: f32) {
-        if self.scroll_y < 0.0 {
-            panic!("Scroll cannot be negative.");
-        }
-        self.is_new = true;
-        self.scroll_y = scroll_y;
-    }
-}
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 23aba53f..ba5ace0f 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -1,18 +1,239 @@
+use std::cell::RefCell;
+use std::collections::VecDeque;
+use std::rc::Rc;
 use kurbo::Point;
+use taffy::Layout;
 use ui_events::ScrollDelta;
 use ui_events::pointer::{PointerId, PointerType};
-
-use crate::app::request_apply_layout;
+use craft_primitives::geometry::{Rectangle, Size};
+use crate::app::{queue_event, request_apply_layout};
+use crate::elements::element_data::ElementData;
 use crate::elements::ElementImpl;
 use crate::events::{CraftMessage, Event};
+use crate::style::Overflow;
+
+/**
+
+A scrollable gives an element the ability to scroll(transform) through overflowed children.
+Internally when an element is created, it specifies if it is a scrollable. When an element specifics
+that it is a scrollable, the element should call `on_scroll_events` in `on_events` and
+`apply_scroll_layout` in apply_layout, so that scroll specific data is updated.
+
+The element trait contains trait methods for user-level scroll methods,
+but the internals of those APIs are defined in this file.
+User API methods include:
+    - scroll_to
+    - scroll_by
+    - scroll_to_child_by_id_with_options
+    - scroll_to_top
+    - scroll_to_bottom
+**/
+
+#[derive(Default, Clone, Copy)]
+pub enum ScrollToBox {
+    MarginBox,
+    #[default]
+    BorderBox,
+    PaddingBox,
+    ContentBox,
+}
+
+#[derive(Default, Clone, Copy)]
+pub struct ScrollOptions {
+    /// Which box the top of the scroll thumb will start at.
+    pub to: ScrollToBox,
+    pub offset: Option<Point>,
+    // todo: Add an option to align the element itself in the scroll container.
+}
+
+impl ScrollOptions {
+    pub fn new(to: ScrollToBox, offset: Point) -> Self {
+        ScrollOptions { to , offset: Some(offset) }
+    }
+}
+
+/// Stores state for elements with a scrollbar.
+#[derive(Debug, Clone, Default, Copy)]
+pub struct ScrollState {
+    /// The total amount of vertical scroll.
+    scroll_y: f32,
+
+    /// Where the scrollbar was clicked.
+    pub(crate) scroll_click: Option<Point>,
+
+    // True if the scroll changes are new.
+    is_new: bool,
+}
+
+impl ScrollState {
+    /// Returns the total amount of vertical scroll.
+    pub fn scroll_y(&self) -> f32 {
+        self.scroll_y
+    }
+
+    pub fn mark_old(&mut self) {
+        self.is_new = false;
+    }
+
+    pub fn is_new(&self) -> bool {
+        self.is_new
+    }
+
+    /// Sets the total amount of vertical scroll.
+    ///
+    /// # Panics
+    ///
+    /// This function will panic if `scroll_y` is less than zero.
+    pub fn set_scroll_y(&mut self, scroll_y: f32) {
+        if scroll_y < 0.0 {
+            panic!("Scroll cannot be negative.");
+        }
+        self.is_new = true;
+        self.scroll_y = scroll_y;
+    }
+}
+
+pub(crate) fn scroll_to_bottom(data: &mut ElementData) {
+    let bottom_y = data.layout_item.max_scroll_y;
+    scroll_to(data, bottom_y);
+}
+
+pub(crate) fn scroll_to_top(data: &mut ElementData) {
+    scroll_to(data, 0.0);
+}
+
+
+/// Scroll to y. A valid y is in the interval [0, max_scroll_y].
+pub(crate) fn scroll_to(data: &mut ElementData, y: f32) {
+    if !data.is_scrollable() {
+        return;
+    }
+
+    data.scroll_state.set_scroll_y(f32::max(0.0, y));
+    let new_event = Event::new(data.me.upgrade().unwrap().clone());
+    request_apply_layout(data.layout_item.taffy_node_id.unwrap());
+    queue_event(new_event, CraftMessage::Scroll());
+}
+
+/// Scroll an amount y from the current scroll position.
+pub (crate) fn scroll_by(data: &mut ElementData, y: f32) {
+    scroll_to(data, data.scroll().scroll_y() + y);
+}
+
+/// Scrolls to a child with the `id` and uses level-order traversal.
+pub(crate) fn scroll_to_child_by_id_with_options(data: &mut ElementData, id: &str, options: ScrollOptions) {
+    let mut child_y: Option<f32> = None;
+    if !data.is_scrollable() {
+        return;
+    }
+
+    let mut queue: VecDeque<Rc<RefCell<dyn ElementImpl>>> = VecDeque::new();
+    for child in data.children.as_slice() {
+        queue.push_back(child.clone());
+    }
+
+    let top_py = data.layout_item.computed_box.padding_rectangle().top();
+
+    while let Some(child) = queue.pop_front().clone() {
+        let child = child.borrow();
+        let element_data = child.element_data();
+        if let Some(child_id) = element_data.id.as_ref() {
+            if child_id.as_str() == id {
+                let box_model_selected = match options.to {
+                    ScrollToBox::BorderBox => element_data.layout_item.computed_box.border_rectangle(),
+                    ScrollToBox::MarginBox => element_data.layout_item.computed_box.margin_rectangle(),
+                    ScrollToBox::PaddingBox => element_data.layout_item.computed_box.padding_rectangle(),
+                    ScrollToBox::ContentBox => element_data.layout_item.computed_box.content_rectangle()
+                };
+                let distance_from_parent = box_model_selected.y - top_py;
+                child_y = Some(distance_from_parent);
+                break;
+            }
+        }
+
+        for child in child.children() {
+            queue.push_back(child.clone());
+        }
+    }
+
+    if let Some(child_y) = child_y {
+        let offset = options.offset.unwrap_or(Point::new(0.0, 0.0));
+        scroll_to(data, child_y + offset.y as f32);
+    }
+}
+
+/// Computes the scrollbar's tack and thumb layout.
+pub(crate) fn apply_scroll_layout(element: &mut ElementData, layout: &Layout) {
+    element.layout_item.scrollbar_size = Size::new(layout.scrollbar_size.width, layout.scrollbar_size.height);
+    element.layout_item.computed_scrollbar_size = Size::new(layout.scroll_width(), layout.scroll_height());
+    let state = &mut element.scroll_state;
+
+    if element.style.get_overflow()[1] != Overflow::Scroll {
+        return;
+    }
+
+    let box_transformed = element.layout_item.computed_box_transformed;
+
+    // Client Height = padding box height.
+    let client_height = box_transformed.padding_rectangle().height;
+
+    let mut content_height = element.layout_item.content_size.height;
+    // Taffy is adding the top border and padding height to the content size.
+    content_height -= box_transformed.border.top;
+    content_height -= box_transformed.padding.top;
+
+    // Content Size = overflowed content size + padding
+    // Scroll Height = Content Size
+    let scroll_height =
+        (content_height + box_transformed.padding.bottom + box_transformed.padding.top).max(1.0);
+    let scroll_track_width = element.layout_item.scrollbar_size.width;
+
+    // The scroll track height is the height of the padding box.
+    let scroll_track_height = client_height;
+
+    let max_scroll_y = (scroll_height - client_height).max(0.0);
+    element.layout_item.max_scroll_y = max_scroll_y;
+    // The scroll amount can be updated by the user, but it should be clamped here when
+    // the computed max scroll height is calculated.
+    state.set_scroll_y(state.scroll_y().min(max_scroll_y));
+    state.mark_old();
+
+    element.layout_item.computed_scroll_track = Rectangle::new(
+        box_transformed.padding_rectangle().right() - scroll_track_width,
+        box_transformed.padding_rectangle().top(),
+        scroll_track_width,
+        scroll_track_height,
+    );
+
+    let visible_y = (client_height / scroll_height).clamp(0.0, 1.0);
+    let scroll_thumb_height = scroll_track_height * visible_y;
+    let scroll_thumb_height = scroll_thumb_height.max(15.0);
+    let remaining_height = scroll_track_height - scroll_thumb_height;
+    let scroll_thumb_offset = if max_scroll_y != 0.0 {
+        (state.scroll_y() / max_scroll_y) * remaining_height
+    } else {
+        0.0
+    };
+
+    let thumb_margin = element.style.get_scrollbar_thumb_margin();
+    let scroll_thumb_width = scroll_track_width - (thumb_margin.left + thumb_margin.right);
+    let scroll_thumb_height = (scroll_thumb_height - (thumb_margin.top + thumb_margin.bottom)).max(0.0);
+
+    element.layout_item.computed_scroll_thumb = element.layout_item.computed_scroll_track;
+    element.layout_item.computed_scroll_thumb.x += thumb_margin.left;
+    element.layout_item.computed_scroll_thumb.y += scroll_thumb_offset + thumb_margin.top;
+    element.layout_item.computed_scroll_thumb.width = scroll_thumb_width;
+    element.layout_item.computed_scroll_thumb.height = scroll_thumb_height;
+}
+
 
+/// Updates the scroll state when an event occurs.
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn on_scroll_events(element: &mut dyn ElementImpl, message: &CraftMessage, event: &mut Event) {
     let element_data = element.element_data_mut();
 
-    if element_data.is_scrollable()
-        && let Some(state) = &mut element_data.scroll_state
-    {
+    if element_data.is_scrollable() {
+        let state = &mut element_data.scroll_state;
         match message {
             CraftMessage::PointerScroll(mouse_wheel) => {
                 let delta = match mouse_wheel.delta {
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 264d98a4..94f66e37 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -176,7 +176,7 @@ impl ElementInternals for TextInputInner {
             self.apply_borders(scale_factor);
 
             self.element_data.apply_scroll(result);
-            self.element_data.scroll_state.as_mut().unwrap().mark_old();
+            self.element_data.scroll_state.mark_old();
 
             let text_position = self.computed_box().content_rectangle();
             self.state.set_origin(&text_position.position());
@@ -185,16 +185,11 @@ impl ElementInternals for TextInputInner {
         }
 
         // For manual scroll updates.
-        if !dirty
-            && self
-                .element_data
-                .scroll_state
-                .map(|scroll_state| scroll_state.is_new())
-                .unwrap_or_default()
+        if !dirty && self.element_data.scroll_state.is_new()
         {
             let result = taffy_tree.layout(node);
             self.element_data.apply_scroll(result);
-            self.element_data.scroll_state.as_mut().unwrap().mark_old();
+            self.element_data.scroll_state.mark_old();
         }
 
         if has_new_layout {
@@ -238,7 +233,7 @@ impl ElementInternals for TextInputInner {
 
         let text_scroll = if is_scrollable {
             Some(TextScroll::new(
-                self.element_data.scroll().map_or(0.0, |s| s.scroll_y()),
+                self.element_data.scroll().scroll_y(),
                 self.element_data.layout_item.computed_scroll_track.height,
             ))
         } else {
@@ -320,7 +315,7 @@ impl ElementInternals for TextInputInner {
             return;
         }
 
-        let scroll_y = self.element_data.scroll().map_or(0.0, |s| s.scroll_y() as f64);
+        let scroll_y = self.element_data.scroll().scroll_y() as f64;
 
         let focused = self.is_focused();
 
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 2a4b6cc5..6bc83e86 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -553,26 +553,21 @@ impl ElementInternals for WindowInternal {
             // For scroll changes from taffy;
             self.element_data.apply_scroll(layout);
             self.apply_clip(clip_bounds);
-            self.element_data.scroll_state.as_mut().unwrap().mark_old();
+            self.element_data.scroll_state.mark_old();
         }
 
         // For manual scroll updates.
-        if !dirty
-            && self
-                .element_data
-                .scroll_state
-                .map(|scroll_state| scroll_state.is_new())
-                .unwrap_or_default()
+        if !dirty && self.element_data.scroll_state.is_new()
         {
             self.element_data.apply_scroll(layout);
-            self.element_data.scroll_state.as_mut().unwrap().mark_old();
+            self.element_data.scroll_state.mark_old();
         }
 
         if has_new_layout {
             taffy_tree.mark_seen(node);
         }
 
-        let scroll_y = self.element_data.scroll().map_or(0.0, |s| s.scroll_y() as f64);
+        let scroll_y = self.element_data.scroll().scroll_y() as f64;
         let child_transform = Affine::translate((0.0, -scroll_y));
 
         self.apply_layout_children(
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index 8c3c7c8d..a36756a0 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -138,6 +138,13 @@ pub(super) fn call_user_event_handlers(
                 (*handler)(event);
             }
         }
+        CraftMessage::Scroll() => {
+            let element_data = current_target.borrow().element_data().clone();
+
+            for handler in &element_data.on_scroll {
+                (*handler)(event);
+            }
+        }
     }
 }
 
diff --git a/crates/craft_retained/src/events/mod.rs b/crates/craft_retained/src/events/mod.rs
index e5c3b5a7..8dc85120 100644
--- a/crates/craft_retained/src/events/mod.rs
+++ b/crates/craft_retained/src/events/mod.rs
@@ -32,6 +32,7 @@ pub type PointerLeaveHandler = Rc<dyn Fn(&mut Event)>;
 pub type PointerUpdateHandler = Rc<dyn Fn(&mut Event, &PointerUpdate)>;
 
 pub type KeyboardInputHandler = Rc<dyn Fn(&mut Event, &KeyboardEvent)>;
+pub type ScrollHandler = Rc<dyn Fn(&mut Event)>;
 
 #[derive(Clone)]
 pub enum EventDispatchType {
@@ -49,6 +50,7 @@ pub enum CraftMessage {
     KeyboardInputEvent(KeyboardEvent),
     PointerMovedEvent(PointerUpdate),
     PointerScroll(PointerScrollEvent),
+    Scroll(),
     ImeEvent(Ime),
     TextInputChanged(String),
     LinkClicked(String),
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index ae1e9092..1ad6fab8 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -85,24 +85,10 @@ impl LayoutItem {
             Position::Absolute => relative_position + from_taffy_point(result.location).to_vec2(),
         };
 
-        let mut size = Size {
+        let size = Size {
             width: result.size.width,
             height: result.size.height,
         };
-        // FIXME: Don't use the content size for position absolute containers.
-        // The following is a broken layout using result.size.
-        // └──  FLEX COL [x: 1    y: 44   w: 140  h: 45   content_w: 139  content_h: 142  border: l:1 r:1 t:1 b:1, padding: l:12 r:12 t:8 b:8] (NodeId(4294967303))
-        //     ├──  LEAF [x: 13   y: 9    w: 114  h: 25   content_w: 29   content_h: 25   border: l:0 r:0 t:0 b:0, padding: l:0 r:0 t:0 b:0] (NodeId(4294967298))
-        //     ├──  LEAF [x: 13   y: 34   w: 114  h: 25   content_w: 29   content_h: 25   border: l:0 r:0 t:0 b:0, padding: l:0 r:0 t:0 b:0] (NodeId(4294967299))
-        //     ├──  LEAF [x: 13   y: 59   w: 114  h: 25   content_w: 29   content_h: 25   border: l:0 r:0 t:0 b:0, padding: l:0 r:0 t:0 b:0] (NodeId(4294967300))
-        //     ├──  LEAF [x: 13   y: 84   w: 114  h: 25   content_w: 29   content_h: 25   border: l:0 r:0 t:0 b:0, padding: l:0 r:0 t:0 b:0] (NodeId(4294967301))
-        //     └──  LEAF [x: 13   y: 109  w: 114  h: 25   content_w: 29   content_h: 25   border: l:0 r:0 t:0 b:0, padding: l:0 r:0 t:0 b:0] (NodeId(4294967302))
-        if position == Position::Absolute {
-            size = Size::new(
-                f32::max(result.size.width, result.content_size.width),
-                f32::max(result.size.height, result.content_size.height),
-            );
-        }
 
         self.content_size = Size::new(result.content_size.width, result.content_size.height);
         self.computed_box = ElementBox {
diff --git a/crates/craft_retained/src/style/mod.rs b/crates/craft_retained/src/style/mod.rs
index c314e79a..b5711327 100644
--- a/crates/craft_retained/src/style/mod.rs
+++ b/crates/craft_retained/src/style/mod.rs
@@ -30,6 +30,15 @@ impl Unit {
     pub fn is_auto(&self) -> bool {
         matches!(self, Unit::Auto)
     }
+
+    /// Gets the raw unit value. The backing f32 or 0 if self == Unit::Auto
+    pub fn raw_value(&self) -> f32 {
+        match self {
+            Unit::Px(px) => *px,
+            Unit::Percentage(pct) => *pct,
+            Unit::Auto => 0.0
+        }
+    }
 }
 
 #[derive(Clone, Copy, Debug, PartialEq)]

From a1b1a1b525d9760eaa84d146f2b78619fdcd9314 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Fri, 27 Feb 2026 05:40:07 -0500
Subject: [PATCH 060/143] Fix vello hybrid (make sure it compiles)

---
 crates/craft_renderer/src/vello_hybrid/mod.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/craft_renderer/src/vello_hybrid/mod.rs b/crates/craft_renderer/src/vello_hybrid/mod.rs
index a0c0c413..d1e68c5a 100644
--- a/crates/craft_renderer/src/vello_hybrid/mod.rs
+++ b/crates/craft_renderer/src/vello_hybrid/mod.rs
@@ -271,7 +271,10 @@ impl CraftRenderer for VelloHybridRenderer {
                         scene.set_transform(transform);
 
                         scene.set_paint(PaintType::Image(vello_common::paint::Image {
-                            image: ImageSource::OpaqueId(image_id),
+                            image: ImageSource::OpaqueId {
+                                id: image_id,
+                                may_have_opacities: true,
+                            },
                             sampler: Default::default(),
                         }));
 

From 96955f16e91572a5c160753d90bf0082f19877dd Mon Sep 17 00:00:00 2001
From: Noah <51396418+NoahR02@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:19:24 -0500
Subject: [PATCH 061/143] Simplify element traits (#18)

* Remove the element impl trait and make a traits folder

* Apply the same trait order

* Fix a few of the clippy warnings
---
 crates/craft_renderer/src/vello_cpu/mod.rs    |   2 +-
 crates/craft_retained/src/app.rs              |   8 +-
 .../craft_retained/src/craft_winit_state.rs   |  11 +-
 crates/craft_retained/src/document/core.rs    |   7 +-
 .../craft_retained/src/elements/container.rs  |  57 +-
 .../src/elements/core/element_internals.rs    | 397 ---------
 .../craft_retained/src/elements/core/mod.rs   |   7 -
 .../src/elements/element_data.rs              |  10 +-
 .../src/elements/element_id_map.rs            |  16 +-
 crates/craft_retained/src/elements/image.rs   |  22 +-
 crates/craft_retained/src/elements/mod.rs     |   5 +-
 .../craft_retained/src/elements/scrollable.rs |  28 +-
 .../src/elements/slider/slider_draw.rs        |   3 +-
 .../src/elements/slider/slider_element.rs     |  81 +-
 .../src/elements/slider/slider_logic.rs       |   2 +-
 crates/craft_retained/src/elements/text.rs    |  28 +-
 .../src/elements/text_input/mod.rs            |  27 +-
 .../elements/text_input/text_input_state.rs   |   2 +-
 .../src/elements/traits/as_element.rs         |   9 +
 .../src/elements/traits/element.rs            | 431 +++++++++
 .../elements/{core => traits}/element_data.rs |  10 +-
 .../element_internals.rs}                     | 839 +++++++++---------
 .../craft_retained/src/elements/traits/mod.rs |  10 +
 crates/craft_retained/src/elements/window.rs  |  57 +-
 .../src/events/event_dispatch.rs              |  24 +-
 crates/craft_retained/src/events/helpers.rs   |  18 +-
 crates/craft_retained/src/events/mod.rs       |   6 +-
 .../src/events/pointer_capture.rs             |  10 +-
 28 files changed, 1056 insertions(+), 1071 deletions(-)
 delete mode 100644 crates/craft_retained/src/elements/core/element_internals.rs
 delete mode 100644 crates/craft_retained/src/elements/core/mod.rs
 create mode 100644 crates/craft_retained/src/elements/traits/as_element.rs
 create mode 100644 crates/craft_retained/src/elements/traits/element.rs
 rename crates/craft_retained/src/elements/{core => traits}/element_data.rs (70%)
 rename crates/craft_retained/src/elements/{element.rs => traits/element_internals.rs} (58%)
 create mode 100644 crates/craft_retained/src/elements/traits/mod.rs

diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index 38578bec..23e91b5d 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -344,7 +344,7 @@ impl Renderer for VelloCpuRenderer {
                 RenderCommand::StartOverlay => {}
                 RenderCommand::EndOverlay => {}
                 RenderCommand::BoxShadowCmd(box_shadow) => {
-                    self.draw_box_shadow(&box_shadow)
+                    self.draw_box_shadow(box_shadow)
                 }
             }
         });
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 89602b27..86bebb51 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -25,8 +25,8 @@ use winit::window::WindowId;
 
 use crate::CraftOptions;
 use crate::document::DocumentManager;
-use crate::elements::core::ElementInternals;
-use crate::elements::{ElementIdMap, ElementImpl, Window};
+use crate::elements::ElementInternals;
+use crate::elements::{ElementIdMap, Window};
 use crate::events::internal::InternalMessage;
 use crate::events::{CraftMessage, Event, EventDispatcher};
 use crate::layout::TaffyTree;
@@ -41,7 +41,7 @@ thread_local! {
     pub(crate) static ELEMENTS: RefCell<ElementIdMap> = RefCell::new(ElementIdMap::new());
     pub(crate) static PENDING_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = const { RefCell::new(VecDeque::new()) };
     pub(crate) static IN_PROGRESS_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = const { RefCell::new(VecDeque::new()) };
-    pub(crate) static FOCUS: RefCell<Option<Weak<RefCell<dyn ElementImpl >>>> = RefCell::new(None);
+    pub(crate) static FOCUS: RefCell<Option<Weak<RefCell<dyn ElementInternals>>>> = RefCell::new(None);
     /// An event queue that users or elements can manipulate. Cleared at the start and end of every event dispatch.
     static EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(Event, CraftMessage)>> = RefCell::new(VecDeque::with_capacity(10));
 
@@ -98,7 +98,7 @@ pub struct App {
     pub(crate) modifiers: Modifiers,
     pub redraw_flags: RedrawFlags,
 
-    pub(super) target_scratch: Vec<Rc<RefCell<dyn ElementImpl>>>,
+    pub(super) target_scratch: Vec<Rc<RefCell<dyn ElementInternals>>>,
     pub(crate) craft_options: CraftOptions,
 
     /// True if the winit app is active.
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index 01c96a12..e2be1e43 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -220,14 +220,11 @@ impl ApplicationHandler for CraftWinitState {
 
         // Do work sent from other threads and update all the windows.
         let mut work_done = false;
-        loop {
-            if let Some(work) = pop_gui_thread_work() {
-                work();
-                work_done = true;
-            } else {
-                break;
-            }
+        while let Some(work) = pop_gui_thread_work() {
+            work();
+            work_done = true;
         }
+
         if work_done {
             WINDOW_MANAGER.with_borrow_mut(|window_manager| {
                 window_manager.redraw_all(&mut craft_state.craft_app);
diff --git a/crates/craft_retained/src/document/core.rs b/crates/craft_retained/src/document/core.rs
index 2697f450..d92faee2 100644
--- a/crates/craft_retained/src/document/core.rs
+++ b/crates/craft_retained/src/document/core.rs
@@ -3,15 +3,14 @@ use std::collections::HashMap;
 use std::rc::Weak;
 
 use ui_events::pointer::PointerId;
-
-use crate::elements::ElementImpl;
+use crate::elements::ElementInternals;
 
 /// Stores window specific information like pointer captures, focus (soon), etc.
 pub struct Document {
     /// Tracks elements that are *currently* pointer captured.
-    pub(crate) pointer_captures: HashMap<PointerId, Weak<RefCell<dyn ElementImpl>>>,
+    pub(crate) pointer_captures: HashMap<PointerId, Weak<RefCell<dyn ElementInternals>>>,
     /// Tracks elements that *should* be pointer captured.
-    pub(crate) pending_pointer_captures: HashMap<PointerId, Weak<RefCell<dyn ElementImpl>>>,
+    pub(crate) pending_pointer_captures: HashMap<PointerId, Weak<RefCell<dyn ElementInternals>>>,
 }
 
 impl Default for Document {
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 51fb237b..697d809b 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -9,10 +9,9 @@ use craft_renderer::RenderList;
 use kurbo::{Affine, Point};
 
 use crate::app::TAFFY_TREE;
-use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
-use crate::elements::element::{AsElement, Element};
+use crate::elements::{resolve_clip_for_scrollable, ElementInternals, AsElement, Element};
 use crate::elements::element_data::ElementData;
-use crate::elements::{ElementImpl, scrollable};
+use crate::elements::{scrollable};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
@@ -52,12 +51,12 @@ impl Container {
 impl Element for Container {}
 
 impl AsElement for Container {
-    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementImpl>> {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.inner.clone()
     }
 }
 
-impl crate::elements::core::ElementData for ContainerInner {
+impl crate::elements::ElementData for ContainerInner {
     fn element_data(&self) -> &ElementData {
         &self.element_data
     }
@@ -67,31 +66,6 @@ impl crate::elements::core::ElementData for ContainerInner {
     }
 }
 
-impl ElementImpl for ContainerInner {
-    fn push(&mut self, child: Rc<RefCell<dyn ElementImpl>>) {
-        let me: Weak<RefCell<dyn ElementImpl>> = self.element_data.me.clone();
-        child.borrow_mut().element_data_mut().parent = Some(me);
-        self.element_data.children.push(child.clone());
-
-        // Add the children's taffy node.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
-            let child_id = child.borrow().element_data().layout_item.taffy_node_id;
-            if let Some(child_id) = child_id {
-                taffy_tree.add_child(parent_id, child_id);
-            }
-        });
-    }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
-
 impl ElementInternals for ContainerInner {
     fn apply_layout(
         &mut self,
@@ -186,4 +160,27 @@ impl ElementInternals for ContainerInner {
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
         resolve_clip_for_scrollable(self, clip_bounds);
     }
+
+    fn push(&mut self, child: Rc<RefCell<dyn ElementInternals>>) {
+        let me: Weak<RefCell<dyn ElementInternals>> = self.element_data.me.clone();
+        child.borrow_mut().element_data_mut().parent = Some(me);
+        self.element_data.children.push(child.clone());
+
+        // Add the children's taffy node.
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
+            let child_id = child.borrow().element_data().layout_item.taffy_node_id;
+            if let Some(child_id) = child_id {
+                taffy_tree.add_child(parent_id, child_id);
+            }
+        });
+    }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
 }
diff --git a/crates/craft_retained/src/elements/core/element_internals.rs b/crates/craft_retained/src/elements/core/element_internals.rs
deleted file mode 100644
index 0f99e56d..00000000
--- a/crates/craft_retained/src/elements/core/element_internals.rs
+++ /dev/null
@@ -1,397 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-
-#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-use accesskit::{Action, Role};
-use craft_primitives::geometry::borders::CssRoundedRect;
-use craft_primitives::geometry::{ElementBox, Rectangle};
-use craft_renderer::RenderList;
-use kurbo::{Affine, Point, Vec2};
-
-use crate::app::TAFFY_TREE;
-use crate::elements::ElementImpl;
-use crate::elements::core::element_data::ElementData;
-use crate::events::{CraftMessage, Event};
-use crate::layout::TaffyTree;
-use crate::layout::layout_item::{CssComputedBorder, LayoutItem, draw_borders_generic};
-use crate::style::{Display, Overflow, Style};
-use crate::text::text_context::TextContext;
-
-/// Internal element methods that should typically be ignored by users. Public for custom elements.
-pub trait ElementInternals: ElementData {
-    fn position_in_parent(&self) -> Option<usize> {
-        let parent = self.parent();
-
-        // @OPTIMIZE: We are copying the vec here.
-        if let Some(parent) = parent
-            && let Some(parent) = parent.upgrade()
-        {
-            let me_ptr = self.element_data().me.clone().upgrade().unwrap();
-            let children = parent.borrow_mut().element_data().children.clone();
-
-            let self_position = children.iter().position(|x| Rc::ptr_eq(x, &me_ptr)).unwrap();
-
-            Some(self_position)
-        } else {
-            None
-        }
-    }
-
-    /// A helper to apply the layout for all children.
-    #[allow(clippy::too_many_arguments)]
-    fn apply_layout_children(
-        &mut self,
-        taffy_tree: &mut TaffyTree,
-        z_index: &mut u32,
-        transform: Affine,
-        pointer: Option<Point>,
-        text_context: &mut TextContext,
-        scale_factor: f64,
-        _dirty: bool,
-    ) {
-        for child in &self.element_data().children {
-            child.borrow_mut().apply_layout(
-                taffy_tree,
-                self.element_data().layout_item.computed_box.position,
-                z_index,
-                transform,
-                pointer,
-                text_context,
-                self.element_data().layout_item.clip_bounds,
-                scale_factor,
-            );
-        }
-    }
-
-    /// A helper to check if the element is visible.
-    fn is_visible(&self) -> bool {
-        let style = &self.element_data().style;
-        style.get_visible() && style.get_display() != Display::None
-    }
-
-    /// A helper to draw all children.
-    fn draw_children(
-        &mut self,
-        renderer: &mut RenderList,
-        text_context: &mut TextContext,
-        pointer: Option<Point>,
-        scale_factor: f64,
-    ) {
-        for child in self.children() {
-            child.borrow_mut().draw(renderer, text_context, pointer, scale_factor);
-        }
-    }
-
-    /// A helper to re-apply the style to the layout node when dirty.
-    fn apply_style_to_layout_node_if_dirty(&mut self, taffy_tree: &mut TaffyTree) {
-        let element_data = self.element_data_mut();
-        if element_data.style.is_dirty {
-            let node_id = element_data.layout_item.taffy_node_id.unwrap();
-            let style: taffy::Style = element_data.style.to_taffy_style();
-            taffy_tree.set_style(node_id, style);
-            element_data.style.is_dirty = false;
-        }
-    }
-
-    /// Applies the layout results from the [`TaffyTree`].
-    /// This method retrieves the computed layout for `root_node` and updates the
-    /// element’s internal state accordingly. It resolves the element's position,
-    /// transform, clipping, borders, and stacking order, producing the final
-    /// layout state used for rendering.
-    ///
-    /// # Parameters
-    /// - `taffy_tree`: The layout tree containing the computed results.
-    /// - `root_node`: The node whose layout information should be applied.
-    /// - `position`: The absolute position of the element within its parent context.
-    /// - `z_index`: A mutable counter used to assign stacking order as elements
-    ///   are processed.
-    /// - `transform`: The accumulated transform to apply to this element.
-    /// - `pointer`: The current pointer position, if available, for hit-testing.
-    /// - `text_context`: Context used for text layout and measurement.
-    /// - `clip_bounds`: Optional clipping rectangle inherited from ancestors.
-    ///
-    /// # Effects
-    /// This function mutates internal element state to reflect the final resolved
-    /// layout and may trigger updates such as clipping regions, border geometry,
-    /// and z-index assignment.
-    #[allow(clippy::too_many_arguments)]
-    fn apply_layout(
-        &mut self,
-        taffy_tree: &mut TaffyTree,
-        position: Point,
-        z_index: &mut u32,
-        transform: Affine,
-        pointer: Option<Point>,
-        text_context: &mut TextContext,
-        clip_bounds: Option<Rectangle>,
-        scale_factor: f64,
-    );
-
-    /// Draws the element and its visual contents.
-    ///
-    /// Implementations should use the provided [`RenderList`] to issue
-    /// drawing commands.
-    ///
-    /// - `renderer`: the active render list to draw into.
-    /// - `text_context`: text shaping and layout context.
-    /// - `pointer`: optional pointer position for hover effects.
-    /// - `window`: optional window handle.
-    /// - `scale_factor`: scale factor.
-    fn draw(
-        &mut self,
-        _renderer: &mut RenderList,
-        _text_context: &mut TextContext,
-        _pointer: Option<Point>,
-        _scale_factor: f64,
-    ) {
-    }
-
-    /// Computes a [`TreeUpdate`] reflecting any accessibility changes.
-    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-    fn compute_accessibility_tree(
-        &mut self,
-        tree: &mut accesskit::TreeUpdate,
-        parent_index: Option<usize>,
-        scale_factor: f64,
-    ) {
-        let current_node_id = accesskit::NodeId(self.element_data().internal_id);
-
-        let mut current_node = accesskit::Node::new(Role::GenericContainer);
-        if !self.element_data().on_pointer_button_up.is_empty() {
-            current_node.set_role(Role::Button);
-            current_node.add_action(Action::Click);
-        }
-
-        let padding_box = self
-            .element_data()
-            .layout_item
-            .computed_box_transformed
-            .padding_rectangle()
-            .scale(scale_factor);
-
-        current_node.set_bounds(accesskit::Rect {
-            x0: padding_box.left() as f64,
-            y0: padding_box.top() as f64,
-            x1: padding_box.right() as f64,
-            y1: padding_box.bottom() as f64,
-        });
-
-        let current_index = tree.nodes.len(); // The current node is the last one added.
-
-        if let Some(parent_index) = parent_index {
-            let parent_node = tree.nodes.get_mut(parent_index).unwrap();
-            parent_node.1.push_child(current_node_id);
-        }
-
-        tree.nodes.push((current_node_id, current_node));
-
-        for child in self.element_data_mut().children.iter_mut() {
-            child
-                .borrow_mut()
-                .compute_accessibility_tree(tree, Some(current_index), scale_factor);
-        }
-    }
-
-    /// Handles default events.
-    fn on_event(
-        &mut self,
-        _message: &CraftMessage,
-        _text_context: &mut TextContext,
-        _event: &mut Event,
-        _target: Option<Rc<RefCell<dyn ElementInternals>>>,
-    ) {
-    }
-
-    /// Computes this element's box model.
-    fn resolve_box(
-        &mut self,
-        relative_position: Point,
-        scroll_transform: Affine,
-        result: &taffy::Layout,
-        layout_order: &mut u32,
-    ) {
-        let position = self.element_data().style.get_position();
-        self.element_data_mut().layout_item.resolve_box(
-            relative_position,
-            scroll_transform,
-            result,
-            layout_order,
-            position,
-        );
-    }
-
-    /// Computes this element's clip box.
-    fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
-        self.element_data_mut().layout_item.resolve_clip(clip_bounds);
-    }
-
-    fn apply_borders(&mut self, scale_factor: f64) {
-        let current_style = self.element_data().current_style();
-        let has_border = current_style.has_border();
-        let border_radius = current_style.get_border_radius();
-        let border_color = &current_style.get_border_color();
-        let box_shadows = current_style.get_box_shadows();
-
-        self.element_data_mut()
-            .layout_item
-            .apply_borders(has_border, border_radius, scale_factor, border_color, box_shadows);
-    }
-
-    /// A bit of a hack to reset the layout item of an element recursively.
-    fn reset_layout_item(&mut self) {
-        self.element_data_mut().layout_item = LayoutItem::default();
-
-        for child in self.element_data_mut().children.iter_mut() {
-            child.borrow_mut().reset_layout_item();
-        }
-    }
-
-    fn add_hit_testable(&mut self, renderer: &mut RenderList, hit_testable: bool, scale_factor: f64) {
-        /*let ed = self.element_data().borrow();
-        let has_events =
-            !ed.on_pointer_button_up.is_empty() ||
-            !ed.on_pointer_moved.is_empty() ||
-            !ed.on_keyboard_input.is_empty() ||
-            !ed.on_pointer_button_down.is_empty() ||
-            !ed.on_got_pointer_capture.is_empty() ||
-            !ed.on_pointer_enter.is_empty() ||
-            !ed.on_pointer_leave.is_empty() ||
-            !ed.on_lost_pointer_capture;*/
-        if hit_testable {
-            let id = self.element_data().internal_id;
-            renderer.push_hit_testable(
-                id,
-                self.element_data()
-                    .layout_item
-                    .computed_box_transformed
-                    .padding_rectangle()
-                    .scale(scale_factor),
-            );
-        }
-    }
-
-    fn draw_borders(&self, renderer: &mut RenderList, scale_factor: f64) {
-        let current_style = self.element_data().current_style();
-
-        self.element_data()
-            .layout_item
-            .draw_borders(renderer, current_style, scale_factor);
-    }
-
-    fn maybe_start_layer(&self, renderer: &mut RenderList, scale_factor: f64) {
-        let element_data = self.element_data();
-        let padding_rectangle = element_data
-            .layout_item
-            .computed_box_transformed
-            .padding_rectangle()
-            .scale(scale_factor);
-
-        if self.should_start_new_layer() {
-            renderer.push_layer(padding_rectangle);
-        }
-    }
-
-    fn maybe_end_layer(&self, renderer: &mut RenderList) {
-        if self.should_start_new_layer() {
-            renderer.pop_layer();
-        }
-    }
-
-    fn draw_scrollbar(&mut self, renderer: &mut RenderList, scale_factor: f64) {
-        if !self.element_data().is_scrollable() {
-            return;
-        }
-
-        let border_color = self.element_data().current_style().get_border_color();
-        let scrollbar_color = self.element_data().current_style().get_scrollbar_color();
-        let scrollbar_thumb_radius = self
-            .element_data()
-            .current_style()
-            .get_scrollbar_thumb_radius()
-            .map(|radii| Vec2::new(radii.0 as f64, radii.1 as f64));
-        // let scrollbar_thumb_radius = self.element_data().current_style().
-        let track_rect = self
-            .element_data_mut()
-            .layout_item
-            .computed_scroll_track
-            .scale(scale_factor);
-        let thumb_rect = self
-            .element_data_mut()
-            .layout_item
-            .computed_scroll_thumb
-            .scale(scale_factor);
-
-        let border_spec = CssRoundedRect::new(thumb_rect.to_kurbo(), [0.0, 0.0, 0.0, 0.0], scrollbar_thumb_radius);
-        let mut computed_border_spec = CssComputedBorder::new(border_spec);
-        computed_border_spec.scale(scale_factor);
-
-        renderer.draw_rect(track_rect, scrollbar_color.track_color);
-        draw_borders_generic(
-            renderer,
-            &computed_border_spec,
-            border_color.to_array(),
-            scrollbar_color.thumb_color,
-        );
-    }
-
-    fn should_start_new_layer(&self) -> bool {
-        let element_data = self.element_data();
-
-        element_data.current_style().get_overflow()[1] == Overflow::Scroll
-    }
-
-    /// Returns the element's [`ElementBox`] without any transforms applied.
-    fn computed_box(&self) -> ElementBox {
-        self.element_data().layout_item.computed_box
-    }
-
-    /// Gets
-    fn get_default_style() -> Box<Style>
-    where
-        Self: Sized,
-    {
-        Style::new()
-    }
-
-    /// Mark layout node dirty.
-    fn mark_dirty(&mut self) {
-        let id = self.element_data().layout_item.taffy_node_id;
-        if let Some(id) = id {
-            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-                taffy_tree.mark_dirty(id);
-            });
-        }
-    }
-
-    /// Updates taffy's style to reflect craft's style struct.
-    fn update_taffy_style(&mut self) {
-        let id = self.element_data().layout_item.taffy_node_id;
-        if let Some(id) = id {
-            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-                taffy_tree.set_style(id, self.element_data().style.to_taffy_style());
-            });
-        }
-    }
-
-    /// Set's this element's scale factor. This should not be used to scale individual elements.
-    fn set_scale_factor(&mut self, scale_factor: f64) {
-        self.apply_borders(scale_factor);
-        for child in &self.element_data().children {
-            child.borrow_mut().set_scale_factor(scale_factor);
-        }
-    }
-}
-
-pub(crate) fn resolve_clip_for_scrollable(element: &mut dyn ElementImpl, clip_bounds: Option<Rectangle>) {
-    let element_data = element.element_data_mut();
-    if element_data.is_scrollable() {
-        let scroll_clip_bounds = element_data.layout_item.computed_box_transformed.padding_rectangle();
-        if let Some(clip_bounds) = clip_bounds {
-            element_data.layout_item.clip_bounds = scroll_clip_bounds.intersection(&clip_bounds);
-        } else {
-            element_data.layout_item.clip_bounds = Some(scroll_clip_bounds);
-        }
-    } else {
-        element_data.layout_item.clip_bounds = clip_bounds;
-    }
-}
diff --git a/crates/craft_retained/src/elements/core/mod.rs b/crates/craft_retained/src/elements/core/mod.rs
deleted file mode 100644
index 82e2934b..00000000
--- a/crates/craft_retained/src/elements/core/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod element_data;
-mod element_internals;
-
-pub use element_data::ElementData;
-/// Note: this could be hidden behind a custom elements feature.
-pub use element_internals::ElementInternals;
-pub(crate) use element_internals::resolve_clip_for_scrollable;
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index 91e64ca2..e72a31c6 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -4,7 +4,7 @@ use smol_str::SmolStr;
 use taffy::Layout;
 
 use crate::app::{ELEMENTS, TAFFY_TREE};
-use crate::elements::ElementImpl;
+use crate::elements::ElementInternals;
 use crate::elements::element_id::create_unique_element_id;
 use crate::elements::scrollable::{apply_scroll_layout, ScrollState};
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
@@ -16,10 +16,10 @@ use crate::style::{Overflow, Style};
 #[derive(Clone)]
 pub struct ElementData {
     /// A cyclic weak pointer to the element.
-    pub(crate) me: Weak<RefCell<dyn ElementImpl>>,
+    pub(crate) me: Weak<RefCell<dyn ElementInternals>>,
 
     /// The Element's parent.
-    pub(crate) parent: Option<Weak<RefCell<dyn ElementImpl>>>,
+    pub(crate) parent: Option<Weak<RefCell<dyn ElementInternals>>>,
 
     /// The style of the element.
     pub style: Box<Style>,
@@ -28,7 +28,7 @@ pub struct ElementData {
     pub layout_item: LayoutItem,
 
     /// The children of the element.
-    pub children: Vec<Rc<RefCell<dyn ElementImpl>>>,
+    pub children: Vec<Rc<RefCell<dyn ElementInternals>>>,
 
     /// A user-defined id for the element.
     pub id: Option<SmolStr>,
@@ -54,7 +54,7 @@ pub struct ElementData {
 }
 
 impl ElementData {
-    pub fn new(me: Weak<RefCell<dyn ElementImpl>>, scrollable: bool) -> Self {
+    pub fn new(me: Weak<RefCell<dyn ElementInternals>>, scrollable: bool) -> Self {
         let default = Self {
             me,
             parent: None,
diff --git a/crates/craft_retained/src/elements/element_id_map.rs b/crates/craft_retained/src/elements/element_id_map.rs
index 1c8df674..b773f942 100644
--- a/crates/craft_retained/src/elements/element_id_map.rs
+++ b/crates/craft_retained/src/elements/element_id_map.rs
@@ -3,13 +3,13 @@ use std::rc::Weak;
 
 use rustc_hash::FxHashMap;
 
-use crate::elements::ElementImpl;
+use crate::elements::ElementInternals;
 
 /// Maps element ids to Weak<Refcell<dyn Element>>
 
 #[derive(Default, Clone)]
 pub struct ElementIdMap {
-    map: FxHashMap<u64, Weak<RefCell<dyn ElementImpl>>>,
+    map: FxHashMap<u64, Weak<RefCell<dyn ElementInternals>>>,
 }
 
 impl ElementIdMap {
@@ -17,7 +17,7 @@ impl ElementIdMap {
         Self::default()
     }
 
-    pub fn insert(&mut self, element: &dyn ElementImpl) -> Option<Weak<RefCell<dyn ElementImpl>>> {
+    pub fn insert(&mut self, element: &dyn ElementInternals) -> Option<Weak<RefCell<dyn ElementInternals>>> {
         let element_data = element.element_data();
         self.map.insert(element_data.internal_id, element_data.me.clone())
     }
@@ -25,20 +25,20 @@ impl ElementIdMap {
     pub fn insert_id(
         &mut self,
         id: u64,
-        element: Weak<RefCell<dyn ElementImpl>>,
-    ) -> Option<Weak<RefCell<dyn ElementImpl>>> {
+        element: Weak<RefCell<dyn ElementInternals>>,
+    ) -> Option<Weak<RefCell<dyn ElementInternals>>> {
         self.map.insert(id, element)
     }
 
-    pub fn remove(&mut self, element: &dyn ElementImpl) -> Option<Weak<RefCell<dyn ElementImpl>>> {
+    pub fn remove(&mut self, element: &dyn ElementInternals) -> Option<Weak<RefCell<dyn ElementInternals>>> {
         self.map.remove(&element.element_data().internal_id)
     }
 
-    pub fn remove_id(&mut self, id: u64) -> Option<Weak<RefCell<dyn ElementImpl>>> {
+    pub fn remove_id(&mut self, id: u64) -> Option<Weak<RefCell<dyn ElementInternals>>> {
         self.map.remove(&id)
     }
 
-    pub fn get(&self, id: u64) -> Option<&Weak<RefCell<dyn ElementImpl>>> {
+    pub fn get(&self, id: u64) -> Option<&Weak<RefCell<dyn ElementInternals>>> {
         self.map.get(&id)
     }
 }
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 362f9792..2d5cca49 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -12,8 +12,7 @@ use craft_resource_manager::resource_type::ResourceType;
 use kurbo::{Affine, Point};
 
 use crate::app::{ELEMENTS, PENDING_RESOURCES, TAFFY_TREE};
-use crate::elements::ElementImpl;
-use crate::elements::core::ElementInternals;
+use crate::elements::ElementInternals;
 use crate::elements::element_data::ElementData;
 use crate::layout::TaffyTree;
 use crate::layout::layout_context::{ImageContext, LayoutContext};
@@ -72,7 +71,7 @@ impl Image {
     }
 }
 
-impl crate::elements::core::ElementData for Image {
+impl crate::elements::ElementData for Image {
     fn element_data(&self) -> &ElementData {
         &self.element_data
     }
@@ -82,15 +81,6 @@ impl crate::elements::core::ElementData for Image {
     }
 }
 
-impl ElementImpl for Image {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
 
 impl ElementInternals for Image {
     fn apply_layout(
@@ -131,4 +121,12 @@ impl ElementInternals for Image {
 
         renderer.draw_image(content_rectangle.scale(scale_factor), self.resource_identifier.clone());
     }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
 }
diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index 0739efe7..d635f672 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -1,6 +1,5 @@
 mod container;
-pub mod core;
-mod element;
+mod traits;
 mod element_data;
 mod text;
 
@@ -12,8 +11,8 @@ mod slider;
 mod text_input;
 mod window;
 
+pub use traits::{ElementInternals, ElementData, Element, AsElement, resolve_clip_for_scrollable};
 pub use container::{Container, ContainerInner};
-pub use element::{Element, ElementImpl};
 pub use element_id_map::ElementIdMap;
 pub use image::Image;
 pub use slider::{Slider, SliderDirection, SliderInner};
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index ba5ace0f..8e45ab64 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -8,7 +8,7 @@ use ui_events::pointer::{PointerId, PointerType};
 use craft_primitives::geometry::{Rectangle, Size};
 use crate::app::{queue_event, request_apply_layout};
 use crate::elements::element_data::ElementData;
-use crate::elements::ElementImpl;
+use crate::elements::ElementInternals;
 use crate::events::{CraftMessage, Event};
 use crate::style::Overflow;
 
@@ -127,7 +127,7 @@ pub(crate) fn scroll_to_child_by_id_with_options(data: &mut ElementData, id: &st
         return;
     }
 
-    let mut queue: VecDeque<Rc<RefCell<dyn ElementImpl>>> = VecDeque::new();
+    let mut queue: VecDeque<Rc<RefCell<dyn ElementInternals>>> = VecDeque::new();
     for child in data.children.as_slice() {
         queue.push_back(child.clone());
     }
@@ -137,18 +137,16 @@ pub(crate) fn scroll_to_child_by_id_with_options(data: &mut ElementData, id: &st
     while let Some(child) = queue.pop_front().clone() {
         let child = child.borrow();
         let element_data = child.element_data();
-        if let Some(child_id) = element_data.id.as_ref() {
-            if child_id.as_str() == id {
-                let box_model_selected = match options.to {
-                    ScrollToBox::BorderBox => element_data.layout_item.computed_box.border_rectangle(),
-                    ScrollToBox::MarginBox => element_data.layout_item.computed_box.margin_rectangle(),
-                    ScrollToBox::PaddingBox => element_data.layout_item.computed_box.padding_rectangle(),
-                    ScrollToBox::ContentBox => element_data.layout_item.computed_box.content_rectangle()
-                };
-                let distance_from_parent = box_model_selected.y - top_py;
-                child_y = Some(distance_from_parent);
-                break;
-            }
+        if let Some(child_id) = element_data.id.as_ref() && child_id.as_str() == id {
+            let box_model_selected = match options.to {
+                ScrollToBox::BorderBox => element_data.layout_item.computed_box.border_rectangle(),
+                ScrollToBox::MarginBox => element_data.layout_item.computed_box.margin_rectangle(),
+                ScrollToBox::PaddingBox => element_data.layout_item.computed_box.padding_rectangle(),
+                ScrollToBox::ContentBox => element_data.layout_item.computed_box.content_rectangle()
+            };
+            let distance_from_parent = box_model_selected.y - top_py;
+            child_y = Some(distance_from_parent);
+            break;
         }
 
         for child in child.children() {
@@ -229,7 +227,7 @@ pub(crate) fn apply_scroll_layout(element: &mut ElementData, layout: &Layout) {
 
 /// Updates the scroll state when an event occurs.
 #[allow(clippy::too_many_arguments)]
-pub(crate) fn on_scroll_events(element: &mut dyn ElementImpl, message: &CraftMessage, event: &mut Event) {
+pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &CraftMessage, event: &mut Event) {
     let element_data = element.element_data_mut();
 
     if element_data.is_scrollable() {
diff --git a/crates/craft_retained/src/elements/slider/slider_draw.rs b/crates/craft_retained/src/elements/slider/slider_draw.rs
index 8d7d703c..6a616d18 100644
--- a/crates/craft_retained/src/elements/slider/slider_draw.rs
+++ b/crates/craft_retained/src/elements/slider/slider_draw.rs
@@ -4,7 +4,8 @@ use craft_renderer::RenderList;
 use kurbo::Vec2;
 
 use crate::elements::slider::slider_element::SliderDirection;
-use crate::elements::{ElementImpl, SliderInner};
+use crate::elements::{SliderInner};
+use crate::elements::ElementInternals;
 use crate::layout::layout_item::{CssComputedBorder, draw_borders_generic};
 
 fn border_radius_to_vec_radius(border_radius: [(f32, f32); 4]) -> [Vec2; 4] {
diff --git a/crates/craft_retained/src/elements/slider/slider_element.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
index a0f8afe7..6dcd89d0 100644
--- a/crates/craft_retained/src/elements/slider/slider_element.rs
+++ b/crates/craft_retained/src/elements/slider/slider_element.rs
@@ -10,10 +10,9 @@ use ui_events::keyboard::{Code, KeyState};
 use ui_events::pointer::PointerId;
 
 use crate::app::queue_event;
-use crate::elements::core::ElementInternals;
-use crate::elements::element::AsElement;
+use crate::elements::{ElementInternals, AsElement};
 use crate::elements::element_data::ElementData;
-use crate::elements::{Element, ElementImpl};
+use crate::elements::{Element};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::palette;
@@ -305,12 +304,12 @@ impl SliderInner {
 impl Element for Slider {}
 
 impl AsElement for Slider {
-    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementImpl>> {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.inner.clone()
     }
 }
 
-impl crate::elements::core::ElementData for SliderInner {
+impl crate::elements::ElementData for SliderInner {
     fn element_data(&self) -> &ElementData {
         &self.element_data
     }
@@ -320,43 +319,6 @@ impl crate::elements::core::ElementData for SliderInner {
     }
 }
 
-impl ElementImpl for SliderInner {
-    fn in_bounds(&self, point: Point) -> bool {
-        let element_data = &self.element_data;
-        let rect = element_data.layout_item.computed_box_transformed.border_rectangle();
-
-        let thumb_pos = self.thumb_position(self.get_value());
-        let thumb_size = self.get_thumb_size();
-        let thumb_rect = Rectangle::new(
-            thumb_pos.x as f32,
-            thumb_pos.y as f32,
-            thumb_size as f32,
-            thumb_size as f32,
-        );
-
-        if thumb_rect.contains(&point) {
-            return true;
-        }
-
-        if let Some(clip) = element_data.layout_item.clip_bounds {
-            match rect.intersection(&clip) {
-                Some(bounds) => bounds.contains(&point),
-                None => false,
-            }
-        } else {
-            rect.contains(&point)
-        }
-    }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
-
 impl ElementInternals for SliderInner {
     fn apply_layout(
         &mut self,
@@ -484,4 +446,39 @@ impl ElementInternals for SliderInner {
 
         //println!("Slider Value: {}", self.value);
     }
+
+    fn in_bounds(&self, point: Point) -> bool {
+        let element_data = &self.element_data;
+        let rect = element_data.layout_item.computed_box_transformed.border_rectangle();
+
+        let thumb_pos = self.thumb_position(self.get_value());
+        let thumb_size = self.get_thumb_size();
+        let thumb_rect = Rectangle::new(
+            thumb_pos.x as f32,
+            thumb_pos.y as f32,
+            thumb_size as f32,
+            thumb_size as f32,
+        );
+
+        if thumb_rect.contains(&point) {
+            return true;
+        }
+
+        if let Some(clip) = element_data.layout_item.clip_bounds {
+            match rect.intersection(&clip) {
+                Some(bounds) => bounds.contains(&point),
+                None => false,
+            }
+        } else {
+            rect.contains(&point)
+        }
+    }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
 }
diff --git a/crates/craft_retained/src/elements/slider/slider_logic.rs b/crates/craft_retained/src/elements/slider/slider_logic.rs
index 3d75008c..d15210d6 100644
--- a/crates/craft_retained/src/elements/slider/slider_logic.rs
+++ b/crates/craft_retained/src/elements/slider/slider_logic.rs
@@ -1,7 +1,7 @@
 use kurbo::Point;
 
 use crate::elements::SliderInner;
-use crate::elements::core::ElementInternals;
+use crate::elements::ElementInternals;
 use crate::elements::slider::slider_element::SliderDirection;
 
 impl SliderInner {
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index ebc5ebfa..bfd54ba9 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -36,11 +36,11 @@ use ui_events::pointer::{PointerButton, PointerId};
 use web_time as time;
 use winit::dpi;
 
-use crate::elements::core::ElementInternals;
-use crate::elements::element::AsElement;
+use crate::elements::ElementInternals;
+use crate::elements::AsElement;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::elements::element_id::create_unique_element_id;
-use crate::elements::{Element, ElementImpl};
+use crate::elements::{Element};
 use crate::layout::TaffyTree;
 
 #[derive(Clone)]
@@ -182,12 +182,12 @@ impl TextInner {
 impl Element for Text {}
 
 impl AsElement for Text {
-    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementImpl>> {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.inner.clone()
     }
 }
 
-impl crate::elements::core::ElementData for TextInner {
+impl crate::elements::ElementData for TextInner {
     fn element_data(&self) -> &ElementData {
         &self.element_data
     }
@@ -197,16 +197,6 @@ impl crate::elements::core::ElementData for TextInner {
     }
 }
 
-impl crate::elements::ElementImpl for TextInner {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
-
 impl ElementInternals for TextInner {
     fn apply_layout(
         &mut self,
@@ -422,6 +412,14 @@ impl ElementInternals for TextInner {
         self.mark_dirty();
         self.state.scale_factor = scale_factor;
     }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
 }
 
 impl TextState {
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 94f66e37..4f34acab 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -15,8 +15,7 @@ use ui_events::pointer::PointerButton;
 use winit::event::Ime;
 
 use crate::app::ELEMENTS;
-use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
-use crate::elements::element::{AsElement, ElementImpl};
+use crate::elements::{ElementInternals, resolve_clip_for_scrollable, AsElement};
 use crate::elements::element_data::ElementData;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::elements::element_id::create_unique_element_id;
@@ -134,12 +133,12 @@ impl TextInput {
 impl Element for TextInput {}
 
 impl AsElement for TextInput {
-    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementImpl>> {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.inner.clone()
     }
 }
 
-impl crate::elements::core::ElementData for TextInputInner {
+impl crate::elements::ElementData for TextInputInner {
     fn element_data(&self) -> &ElementData {
         &self.element_data
     }
@@ -412,6 +411,14 @@ impl ElementInternals for TextInputInner {
         self.state.set_scale_factor(scale_factor);
         self.mark_dirty();
     }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
 }
 
 impl TextInputInner {
@@ -464,14 +471,4 @@ fn parley_box_to_rect(bounding_box: BoundingBox) -> Rectangle {
         bounding_box.width() as f32,
         bounding_box.height() as f32,
     )
-}
-
-impl ElementImpl for TextInputInner {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index 4ddc8419..c1281b65 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -18,7 +18,7 @@ use winit::dpi;
 
 use crate::app::{TAFFY_TREE, request_layout};
 use crate::elements::TextInputInner;
-use crate::elements::core::ElementInternals;
+use crate::elements::ElementInternals;
 use crate::elements::text_input::parley_box_to_rect;
 use crate::layout::layout_context::TextHashKey;
 use crate::style::{Style, TextStyleProperty};
diff --git a/crates/craft_retained/src/elements/traits/as_element.rs b/crates/craft_retained/src/elements/traits/as_element.rs
new file mode 100644
index 00000000..67a82fa0
--- /dev/null
+++ b/crates/craft_retained/src/elements/traits/as_element.rs
@@ -0,0 +1,9 @@
+use std::cell::RefCell;
+use std::rc::Rc;
+use crate::elements::ElementInternals;
+
+/// Used as a super trait in `Element`, so that
+/// the internal element can be retrieved.
+pub trait AsElement {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>>;
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/traits/element.rs b/crates/craft_retained/src/elements/traits/element.rs
new file mode 100644
index 00000000..5a0c8cc6
--- /dev/null
+++ b/crates/craft_retained/src/elements/traits/element.rs
@@ -0,0 +1,431 @@
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use craft_primitives::geometry::ElementBox;
+use craft_primitives::Color;
+use ui_events::pointer::PointerId;
+use winit::dpi::PhysicalPosition;
+use winit::event::WindowEvent::{CursorMoved, MouseInput};
+use winit::event::{DeviceId, ElementState, MouseButton};
+
+use crate::app::queue_window_event;
+use crate::elements::{AsElement, ElementInternals};
+use crate::elements::scrollable::{ScrollOptions, ScrollState};
+use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler};
+use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Underline, Unit};
+use crate::CraftError;
+
+/// Exposes a fluent/builder-pattern like API for elements.
+/// Setters in this trait return Self and have no prefix.
+/// Getters in this trait return specific data and have a get prefix.
+pub trait Element: Clone + AsElement {
+    fn get_children(&self) -> Vec<Rc<RefCell<dyn ElementInternals>>> {
+        self.as_element_rc().borrow().children().to_vec()
+    }
+
+    fn get_previous_sibling(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
+        self.as_element_rc().borrow().get_previous_sibling()
+    }
+
+    fn get_next_sibling(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
+        self.as_element_rc().borrow().get_next_sibling()
+    }
+
+    fn get_parent(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
+        let parent = self.as_element_rc().borrow().parent();
+        if let Some(parent) = parent {
+            parent.upgrade().ok_or(CraftError::ElementNotFound)
+        } else {
+            Err(CraftError::ElementNotFound)
+        }
+    }
+
+    fn get_first_child(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
+        self.as_element_rc().borrow().get_first_child()
+    }
+
+    fn get_last_child(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
+        self.as_element_rc().borrow().get_last_child()
+    }
+
+    fn remove_child(&self, child: Rc<RefCell<dyn ElementInternals>>) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
+        self.as_element_rc().borrow_mut().remove_child(child)
+    }
+
+    fn remove_all_children(&self) {
+        self.as_element_rc().borrow_mut().remove_all_children()
+    }
+
+    fn swap_child(
+        &self,
+        child_1: Rc<RefCell<dyn ElementInternals>>,
+        child_2: Rc<RefCell<dyn ElementInternals>>,
+    ) -> Result<(), CraftError> {
+        self.as_element_rc().borrow_mut().swap_child(child_1, child_2)
+    }
+
+    fn push(self, child: impl AsElement) -> Self {
+        let child_rc = child.as_element_rc();
+        self.as_element_rc().borrow_mut().push(child_rc);
+        self
+    }
+
+    fn on_pointer_enter(self, on_pointer_enter: PointerEnterHandler) -> Self {
+        self.as_element_rc().borrow_mut().on_pointer_enter(on_pointer_enter);
+        self
+    }
+
+    fn on_pointer_leave(self, on_pointer_leave: PointerLeaveHandler) -> Self {
+        self.as_element_rc().borrow_mut().on_pointer_leave(on_pointer_leave);
+        self
+    }
+
+    fn id(self, id: &str) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .set_id(id);
+        self
+    }
+
+    fn on_pointer_button_down(self, on_pointer_button_down: PointerEventHandler) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .on_pointer_button_down(on_pointer_button_down);
+        self
+    }
+
+    fn on_pointer_moved(self, on_pointer_moved: PointerUpdateHandler) -> Self {
+        self.as_element_rc().borrow_mut().on_pointer_moved(on_pointer_moved);
+        self
+    }
+
+    fn on_pointer_button_up(self, on_pointer_button_up: PointerEventHandler) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .on_pointer_button_up(on_pointer_button_up);
+        self
+    }
+
+    fn on_lost_pointer_capture(self, on_lost_pointer_capture: PointerCaptureHandler) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .on_lost_pointer_capture(on_lost_pointer_capture);
+        self
+    }
+
+    fn on_got_pointer_capture(self, on_got_pointer_capture: PointerCaptureHandler) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .on_got_pointer_capture(on_got_pointer_capture);
+        self
+    }
+
+    fn on_keyboard_input(self, on_keyboard_input: KeyboardInputHandler) -> Self {
+        self.as_element_rc().borrow_mut().on_keyboard_input(on_keyboard_input);
+        self
+    }
+
+    fn on_scroll(self, on_scroll: ScrollHandler) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .on_scroll(on_scroll);
+        self
+    }
+
+    fn scroll_to_child_by_id(self, id: &str) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .scroll_to_child_by_id_with_options(id, ScrollOptions::default());
+        self
+    }
+
+    fn scroll_to_child_by_id_with_options(self, id: &str, options: ScrollOptions) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .scroll_to_child_by_id_with_options(id, options);
+        self
+    }
+    fn scroll_to(self, y: f32) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .scroll_to(y);
+        self
+    }
+
+    fn scroll_to_top(self) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .scroll_to_top();
+        self
+    }
+
+    fn scroll_to_bottom(self) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .scroll_to_bottom();
+        self
+    }
+
+    fn scroll_by(self, y: f32) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .scroll_by(y);
+        self
+    }
+
+    fn get_scroll_state(&self) -> ScrollState {
+        self.as_element_rc()
+            .borrow_mut()
+            .get_scroll_state()
+    }
+
+    fn display(self, display: Display) -> Self {
+        self.as_element_rc().borrow_mut().set_display(display);
+        self
+    }
+
+    fn box_sizing(self, box_sizing: BoxSizing) -> Self {
+        self.as_element_rc().borrow_mut().set_box_sizing(box_sizing);
+        self
+    }
+
+    fn position(self, position: Position) -> Self {
+        self.as_element_rc().borrow_mut().set_position(position);
+        self
+    }
+
+    fn margin(self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_margin(top, right, bottom, left);
+        self
+    }
+
+    fn padding(self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_padding(top, right, bottom, left);
+        self
+    }
+
+    fn gap(self, row_gap: Unit, column_gap: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_gap(row_gap, column_gap);
+        self
+    }
+
+    fn inset(self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_inset(top, right, bottom, left);
+        self
+    }
+
+    fn min_width(self, min_width: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_min_width(min_width);
+        self
+    }
+
+    fn min_height(self, min_height: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_min_height(min_height);
+        self
+    }
+
+    fn width(self, width: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_width(width);
+        self
+    }
+
+    fn height(self, height: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_height(height);
+        self
+    }
+
+    fn max_width(self, max_width: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_max_width(max_width);
+        self
+    }
+
+    fn max_height(self, max_height: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_max_height(max_height);
+        self
+    }
+
+    fn wrap(self, wrap: FlexWrap) -> Self {
+        self.as_element_rc().borrow_mut().set_wrap(wrap);
+        self
+    }
+
+    fn align_items(self, align_items: Option<AlignItems>) -> Self {
+        self.as_element_rc().borrow_mut().set_align_items(align_items);
+        self
+    }
+
+    fn justify_content(self, justify_content: Option<JustifyContent>) -> Self {
+        self.as_element_rc().borrow_mut().set_justify_content(justify_content);
+        self
+    }
+
+    fn flex_direction(self, flex_direction: FlexDirection) -> Self {
+        self.as_element_rc().borrow_mut().set_flex_direction(flex_direction);
+        self
+    }
+
+    fn flex_grow(self, flex_grow: f32) -> Self {
+        self.as_element_rc().borrow_mut().set_flex_grow(flex_grow);
+        self
+    }
+
+    fn flex_shrink(self, flex_shrink: f32) -> Self {
+        self.as_element_rc().borrow_mut().set_flex_shrink(flex_shrink);
+        self
+    }
+
+    fn flex_basis(self, flex_basis: Unit) -> Self {
+        self.as_element_rc().borrow_mut().set_flex_basis(flex_basis);
+        self
+    }
+
+    fn font_family(self, font_family: FontFamily) -> Self {
+        self.as_element_rc().borrow_mut().set_font_family(font_family);
+        self
+    }
+
+    fn color(self, color: Color) -> Self {
+        self.as_element_rc().borrow_mut().set_color(color);
+        self
+    }
+
+    fn background_color(self, background_color: Color) -> Self {
+        self.as_element_rc().borrow_mut().set_background_color(background_color);
+        self
+    }
+
+    fn font_size(self, font_size: f32) -> Self {
+        self.as_element_rc().borrow_mut().set_font_size(font_size);
+        self
+    }
+
+    fn line_height(self, line_height: f32) -> Self {
+        self.as_element_rc().borrow_mut().set_line_height(line_height);
+        self
+    }
+
+    fn font_weight(self, font_weight: FontWeight) -> Self {
+        self.as_element_rc().borrow_mut().set_font_weight(font_weight);
+        self
+    }
+
+    fn font_style(self, font_style: FontStyle) -> Self {
+        self.as_element_rc().borrow_mut().set_font_style(font_style);
+        self
+    }
+
+    fn underline(self, underline: Option<Underline>) -> Self {
+        self.as_element_rc().borrow_mut().set_underline(underline);
+        self
+    }
+
+    fn overflow(self, overflow_x: Overflow, overflow_y: Overflow) -> Self {
+        self.as_element_rc().borrow_mut().set_overflow(overflow_x, overflow_y);
+        self
+    }
+
+    fn border_color(self, top: Color, right: Color, bottom: Color, left: Color) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .set_border_color(top, right, bottom, left);
+        self
+    }
+
+    fn border_width(self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .set_border_width(top, right, bottom, left);
+        self
+    }
+
+    fn border_radius(self, top: (f32, f32), right: (f32, f32), bottom: (f32, f32), left: (f32, f32)) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .set_border_radius(top, right, bottom, left);
+        self
+    }
+
+    fn scrollbar_color(self, scrollbar_color: ScrollbarColor) -> Self {
+        self.as_element_rc().borrow_mut().set_scrollbar_color(scrollbar_color);
+        self
+    }
+
+    fn scrollbar_thumb_margin(self, top: f32, right: f32, bottom: f32, left: f32) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .set_scrollbar_thumb_margin(top, right, bottom, left);
+        self
+    }
+
+    fn set_scrollbar_thumb_radius(
+        self,
+        top: (f32, f32),
+        right: (f32, f32),
+        bottom: (f32, f32),
+        left: (f32, f32),
+    ) -> Self {
+        self.as_element_rc()
+            .borrow_mut()
+            .set_scrollbar_thumb_radius(top, right, bottom, left);
+        self
+    }
+
+    fn scrollbar_width(self, selection_color: Color) -> Self {
+        self.as_element_rc().borrow_mut().set_selection_color(selection_color);
+        self
+    }
+
+    fn box_shadows(self, box_shadows: Vec<BoxShadow>) -> Self {
+        self.as_element_rc().borrow_mut().set_box_shadows(box_shadows);
+        self
+    }
+
+    fn focus(self) -> Self {
+        self.as_element_rc().borrow_mut().focus();
+        self
+    }
+
+    fn is_focused(&self) -> bool {
+        self.as_element_rc().borrow_mut().is_focused()
+    }
+
+    fn unfocus(self) -> Self {
+        self.as_element_rc().borrow_mut().unfocus();
+        self
+    }
+
+    fn get_computed_box_transformed(&self) -> ElementBox {
+        self.as_element_rc().borrow().get_computed_box_transformed()
+    }
+
+    fn has_pointer_capture(&self, pointer_id: PointerId) -> bool {
+        self.as_element_rc().borrow().has_pointer_capture(pointer_id)
+    }
+
+    #[allow(async_fn_in_trait)]
+    async fn click(&self) {
+        let pos = self
+            .as_element_rc()
+            .borrow()
+            .get_computed_box_transformed()
+            .padding_rectangle();
+        let mouse_move = CursorMoved {
+            device_id: DeviceId::dummy(),
+            position: PhysicalPosition::new(pos.x as f64, pos.y as f64),
+        };
+        let mouse_down = MouseInput {
+            device_id: DeviceId::dummy(),
+            state: ElementState::Pressed,
+            button: MouseButton::Left,
+        };
+        let mouse_up = MouseInput {
+            device_id: DeviceId::dummy(),
+            state: ElementState::Released,
+            button: MouseButton::Left,
+        };
+        let window_id = self.as_element_rc().borrow().get_winit_window().unwrap().id();
+        queue_window_event(window_id, mouse_move);
+        queue_window_event(window_id, mouse_down);
+        queue_window_event(window_id, mouse_up);
+    }
+}
diff --git a/crates/craft_retained/src/elements/core/element_data.rs b/crates/craft_retained/src/elements/traits/element_data.rs
similarity index 70%
rename from crates/craft_retained/src/elements/core/element_data.rs
rename to crates/craft_retained/src/elements/traits/element_data.rs
index 4b809659..04a659c1 100644
--- a/crates/craft_retained/src/elements/core/element_data.rs
+++ b/crates/craft_retained/src/elements/traits/element_data.rs
@@ -1,9 +1,9 @@
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
+use crate::elements::ElementInternals;
 
-use crate::elements::ElementImpl;
-
-/// The trait to provide common element data.
+/// Used as a super trait and forces implementations to
+/// support the retrieval and mutation of `ElementData`(struct).
 pub trait ElementData {
     /// Get a shared reference to this element's common element data.
     fn element_data(&self) -> &crate::elements::element_data::ElementData;
@@ -17,12 +17,12 @@ pub trait ElementData {
     }
 
     /// Returns the element's parent element.
-    fn parent(&self) -> Option<Weak<RefCell<dyn ElementImpl>>> {
+    fn parent(&self) -> Option<Weak<RefCell<dyn ElementInternals>>> {
         self.element_data().parent.clone()
     }
 
     /// Returns the element's children.
-    fn children(&self) -> &[Rc<RefCell<dyn ElementImpl>>] {
+    fn children(&self) -> &[Rc<RefCell<dyn ElementInternals>>] {
         self.element_data().children.as_slice()
     }
 }
diff --git a/crates/craft_retained/src/elements/element.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
similarity index 58%
rename from crates/craft_retained/src/elements/element.rs
rename to crates/craft_retained/src/elements/traits/element_internals.rs
index cc2257e0..22fda066 100644
--- a/crates/craft_retained/src/elements/element.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -2,35 +2,398 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 use std::sync::Arc;
-
-use craft_primitives::geometry::{ElementBox, Point, TrblRectangle};
-use craft_primitives::Color;
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+use accesskit::{Action, Role};
+use craft_primitives::geometry::borders::CssRoundedRect;
+use craft_primitives::geometry::{ElementBox, Rectangle, TrblRectangle};
+use craft_renderer::RenderList;
+use kurbo::{Affine, Point, Vec2};
+use peniko::Color;
 use ui_events::pointer::PointerId;
-use winit::dpi::PhysicalPosition;
-use winit::event::WindowEvent::{CursorMoved, MouseInput};
-use winit::event::{DeviceId, ElementState, MouseButton};
-
+use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
 use crate::CraftError;
-use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE, queue_window_event};
 use crate::document::Document;
-use crate::elements::core::ElementData;
-use crate::elements::ElementIdMap;
-use crate::elements::scrollable::{ScrollOptions, ScrollState};
-use crate::elements::window::WindowInternal;
-use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
+use crate::elements::{ElementData, ElementIdMap, ScrollOptions, WindowInternal};
+use crate::elements::scrollable::ScrollState;
+use crate::events::{CraftMessage, Event, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
+use crate::layout::TaffyTree;
+use crate::layout::layout_item::{CssComputedBorder, LayoutItem, draw_borders_generic};
 use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Style, Underline, Unit};
+use crate::text::text_context::TextContext;
+
+/// Internal element methods that should typically be ignored by users. Public for custom elements.
+pub trait ElementInternals: ElementData + Any {
+    fn position_in_parent(&self) -> Option<usize> {
+        let parent = self.parent();
+
+        // @OPTIMIZE: We are copying the vec here.
+        if let Some(parent) = parent
+            && let Some(parent) = parent.upgrade()
+        {
+            let me_ptr = self.element_data().me.clone().upgrade().unwrap();
+            let children = parent.borrow_mut().element_data().children.clone();
+
+            let self_position = children.iter().position(|x| Rc::ptr_eq(x, &me_ptr)).unwrap();
+
+            Some(self_position)
+        } else {
+            None
+        }
+    }
+
+    /// A helper to apply the layout for all children.
+    #[allow(clippy::too_many_arguments)]
+    fn apply_layout_children(
+        &mut self,
+        taffy_tree: &mut TaffyTree,
+        z_index: &mut u32,
+        transform: Affine,
+        pointer: Option<Point>,
+        text_context: &mut TextContext,
+        scale_factor: f64,
+        _dirty: bool,
+    ) {
+        for child in &self.element_data().children {
+            child.borrow_mut().apply_layout(
+                taffy_tree,
+                self.element_data().layout_item.computed_box.position,
+                z_index,
+                transform,
+                pointer,
+                text_context,
+                self.element_data().layout_item.clip_bounds,
+                scale_factor,
+            );
+        }
+    }
+
+    /// A helper to check if the element is visible.
+    fn is_visible(&self) -> bool {
+        let style = &self.element_data().style;
+        style.get_visible() && style.get_display() != Display::None
+    }
+
+    /// A helper to draw all children.
+    fn draw_children(
+        &mut self,
+        renderer: &mut RenderList,
+        text_context: &mut TextContext,
+        pointer: Option<Point>,
+        scale_factor: f64,
+    ) {
+        for child in self.children() {
+            child.borrow_mut().draw(renderer, text_context, pointer, scale_factor);
+        }
+    }
+
+    /// A helper to re-apply the style to the layout node when dirty.
+    fn apply_style_to_layout_node_if_dirty(&mut self, taffy_tree: &mut TaffyTree) {
+        let element_data = self.element_data_mut();
+        if element_data.style.is_dirty {
+            let node_id = element_data.layout_item.taffy_node_id.unwrap();
+            let style: taffy::Style = element_data.style.to_taffy_style();
+            taffy_tree.set_style(node_id, style);
+            element_data.style.is_dirty = false;
+        }
+    }
+
+    /// Applies the layout results from the [`TaffyTree`].
+    /// This method retrieves the computed layout for `root_node` and updates the
+    /// element’s internal state accordingly. It resolves the element's position,
+    /// transform, clipping, borders, and stacking order, producing the final
+    /// layout state used for rendering.
+    ///
+    /// # Parameters
+    /// - `taffy_tree`: The layout tree containing the computed results.
+    /// - `root_node`: The node whose layout information should be applied.
+    /// - `position`: The absolute position of the element within its parent context.
+    /// - `z_index`: A mutable counter used to assign stacking order as elements
+    ///   are processed.
+    /// - `transform`: The accumulated transform to apply to this element.
+    /// - `pointer`: The current pointer position, if available, for hit-testing.
+    /// - `text_context`: Context used for text layout and measurement.
+    /// - `clip_bounds`: Optional clipping rectangle inherited from ancestors.
+    ///
+    /// # Effects
+    /// This function mutates internal element state to reflect the final resolved
+    /// layout and may trigger updates such as clipping regions, border geometry,
+    /// and z-index assignment.
+    #[allow(clippy::too_many_arguments)]
+    fn apply_layout(
+        &mut self,
+        taffy_tree: &mut TaffyTree,
+        position: Point,
+        z_index: &mut u32,
+        transform: Affine,
+        pointer: Option<Point>,
+        text_context: &mut TextContext,
+        clip_bounds: Option<Rectangle>,
+        scale_factor: f64,
+    );
+
+    /// Draws the element and its visual contents.
+    ///
+    /// Implementations should use the provided [`RenderList`] to issue
+    /// drawing commands.
+    ///
+    /// - `renderer`: the active render list to draw into.
+    /// - `text_context`: text shaping and layout context.
+    /// - `pointer`: optional pointer position for hover effects.
+    /// - `window`: optional window handle.
+    /// - `scale_factor`: scale factor.
+    fn draw(
+        &mut self,
+        _renderer: &mut RenderList,
+        _text_context: &mut TextContext,
+        _pointer: Option<Point>,
+        _scale_factor: f64,
+    ) {
+    }
+
+    /// Computes a [`TreeUpdate`] reflecting any accessibility changes.
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+    fn compute_accessibility_tree(
+        &mut self,
+        tree: &mut accesskit::TreeUpdate,
+        parent_index: Option<usize>,
+        scale_factor: f64,
+    ) {
+        let current_node_id = accesskit::NodeId(self.element_data().internal_id);
+
+        let mut current_node = accesskit::Node::new(Role::GenericContainer);
+        if !self.element_data().on_pointer_button_up.is_empty() {
+            current_node.set_role(Role::Button);
+            current_node.add_action(Action::Click);
+        }
+
+        let padding_box = self
+            .element_data()
+            .layout_item
+            .computed_box_transformed
+            .padding_rectangle()
+            .scale(scale_factor);
+
+        current_node.set_bounds(accesskit::Rect {
+            x0: padding_box.left() as f64,
+            y0: padding_box.top() as f64,
+            x1: padding_box.right() as f64,
+            y1: padding_box.bottom() as f64,
+        });
+
+        let current_index = tree.nodes.len(); // The current node is the last one added.
+
+        if let Some(parent_index) = parent_index {
+            let parent_node = tree.nodes.get_mut(parent_index).unwrap();
+            parent_node.1.push_child(current_node_id);
+        }
+
+        tree.nodes.push((current_node_id, current_node));
+
+        for child in self.element_data_mut().children.iter_mut() {
+            child
+                .borrow_mut()
+                .compute_accessibility_tree(tree, Some(current_index), scale_factor);
+        }
+    }
+
+    /// Handles default events.
+    fn on_event(
+        &mut self,
+        _message: &CraftMessage,
+        _text_context: &mut TextContext,
+        _event: &mut Event,
+        _target: Option<Rc<RefCell<dyn ElementInternals>>>,
+    ) {
+    }
+
+    /// Computes this element's box model.
+    fn resolve_box(
+        &mut self,
+        relative_position: Point,
+        scroll_transform: Affine,
+        result: &taffy::Layout,
+        layout_order: &mut u32,
+    ) {
+        let position = self.element_data().style.get_position();
+        self.element_data_mut().layout_item.resolve_box(
+            relative_position,
+            scroll_transform,
+            result,
+            layout_order,
+            position,
+        );
+    }
+
+    /// Computes this element's clip box.
+    fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
+        self.element_data_mut().layout_item.resolve_clip(clip_bounds);
+    }
+
+    fn apply_borders(&mut self, scale_factor: f64) {
+        let current_style = self.element_data().current_style();
+        let has_border = current_style.has_border();
+        let border_radius = current_style.get_border_radius();
+        let border_color = &current_style.get_border_color();
+        let box_shadows = current_style.get_box_shadows();
+
+        self.element_data_mut()
+            .layout_item
+            .apply_borders(has_border, border_radius, scale_factor, border_color, box_shadows);
+    }
+
+    /// A bit of a hack to reset the layout item of an element recursively.
+    fn reset_layout_item(&mut self) {
+        self.element_data_mut().layout_item = LayoutItem::default();
+
+        for child in self.element_data_mut().children.iter_mut() {
+            child.borrow_mut().reset_layout_item();
+        }
+    }
+
+    fn add_hit_testable(&mut self, renderer: &mut RenderList, hit_testable: bool, scale_factor: f64) {
+        /*let ed = self.element_data().borrow();
+        let has_events =
+            !ed.on_pointer_button_up.is_empty() ||
+            !ed.on_pointer_moved.is_empty() ||
+            !ed.on_keyboard_input.is_empty() ||
+            !ed.on_pointer_button_down.is_empty() ||
+            !ed.on_got_pointer_capture.is_empty() ||
+            !ed.on_pointer_enter.is_empty() ||
+            !ed.on_pointer_leave.is_empty() ||
+            !ed.on_lost_pointer_capture;*/
+        if hit_testable {
+            let id = self.element_data().internal_id;
+            renderer.push_hit_testable(
+                id,
+                self.element_data()
+                    .layout_item
+                    .computed_box_transformed
+                    .padding_rectangle()
+                    .scale(scale_factor),
+            );
+        }
+    }
+
+    fn draw_borders(&self, renderer: &mut RenderList, scale_factor: f64) {
+        let current_style = self.element_data().current_style();
+
+        self.element_data()
+            .layout_item
+            .draw_borders(renderer, current_style, scale_factor);
+    }
+
+    fn maybe_start_layer(&self, renderer: &mut RenderList, scale_factor: f64) {
+        let element_data = self.element_data();
+        let padding_rectangle = element_data
+            .layout_item
+            .computed_box_transformed
+            .padding_rectangle()
+            .scale(scale_factor);
+
+        if self.should_start_new_layer() {
+            renderer.push_layer(padding_rectangle);
+        }
+    }
+
+    fn maybe_end_layer(&self, renderer: &mut RenderList) {
+        if self.should_start_new_layer() {
+            renderer.pop_layer();
+        }
+    }
+
+    fn draw_scrollbar(&mut self, renderer: &mut RenderList, scale_factor: f64) {
+        if !self.element_data().is_scrollable() {
+            return;
+        }
+
+        let border_color = self.element_data().current_style().get_border_color();
+        let scrollbar_color = self.element_data().current_style().get_scrollbar_color();
+        let scrollbar_thumb_radius = self
+            .element_data()
+            .current_style()
+            .get_scrollbar_thumb_radius()
+            .map(|radii| Vec2::new(radii.0 as f64, radii.1 as f64));
+        // let scrollbar_thumb_radius = self.element_data().current_style().
+        let track_rect = self
+            .element_data_mut()
+            .layout_item
+            .computed_scroll_track
+            .scale(scale_factor);
+        let thumb_rect = self
+            .element_data_mut()
+            .layout_item
+            .computed_scroll_thumb
+            .scale(scale_factor);
+
+        let border_spec = CssRoundedRect::new(thumb_rect.to_kurbo(), [0.0, 0.0, 0.0, 0.0], scrollbar_thumb_radius);
+        let mut computed_border_spec = CssComputedBorder::new(border_spec);
+        computed_border_spec.scale(scale_factor);
+
+        renderer.draw_rect(track_rect, scrollbar_color.track_color);
+        draw_borders_generic(
+            renderer,
+            &computed_border_spec,
+            border_color.to_array(),
+            scrollbar_color.thumb_color,
+        );
+    }
+
+    fn should_start_new_layer(&self) -> bool {
+        let element_data = self.element_data();
 
-/// The element trait for end-users.
-pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + Any {
-    fn get_first_child(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+        element_data.current_style().get_overflow()[1] == Overflow::Scroll
+    }
+
+    /// Returns the element's [`ElementBox`] without any transforms applied.
+    fn computed_box(&self) -> ElementBox {
+        self.element_data().layout_item.computed_box
+    }
+
+    /// Gets
+    fn get_default_style() -> Box<Style>
+    where
+        Self: Sized,
+    {
+        Style::new()
+    }
+
+    /// Mark layout node dirty.
+    fn mark_dirty(&mut self) {
+        let id = self.element_data().layout_item.taffy_node_id;
+        if let Some(id) = id {
+            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+                taffy_tree.mark_dirty(id);
+            });
+        }
+    }
+
+    /// Updates taffy's style to reflect craft's style struct.
+    fn update_taffy_style(&mut self) {
+        let id = self.element_data().layout_item.taffy_node_id;
+        if let Some(id) = id {
+            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+                taffy_tree.set_style(id, self.element_data().style.to_taffy_style());
+            });
+        }
+    }
+
+    /// Set's this element's scale factor. This should not be used to scale individual elements.
+    fn set_scale_factor(&mut self, scale_factor: f64) {
+        self.apply_borders(scale_factor);
+        for child in &self.element_data().children {
+            child.borrow_mut().set_scale_factor(scale_factor);
+        }
+    }
+
+    fn get_first_child(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
         self.children().first().cloned().ok_or(CraftError::ElementNotFound)
     }
 
-    fn get_last_child(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+    fn get_last_child(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
         self.children().last().cloned().ok_or(CraftError::ElementNotFound)
     }
 
-    fn get_previous_sibling(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+    fn get_previous_sibling(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
         let parent = self.parent();
         let position = self.position_in_parent();
 
@@ -47,7 +410,7 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
         }
     }
 
-    fn get_next_sibling(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+    fn get_next_sibling(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
         let parent = self.parent();
         let position = self.position_in_parent();
 
@@ -66,8 +429,8 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
 
     fn swap_child(
         &mut self,
-        child_1: Rc<RefCell<dyn ElementImpl>>,
-        child_2: Rc<RefCell<dyn ElementImpl>>,
+        child_1: Rc<RefCell<dyn ElementInternals>>,
+        child_2: Rc<RefCell<dyn ElementInternals>>,
     ) -> Result<(), CraftError> {
         let children = &mut self.element_data_mut().children;
         let position_1 = children
@@ -128,8 +491,8 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
     /// Panics if the corresponding Taffy layout nodes fail to be removed.
     fn remove_child(
         &mut self,
-        child: Rc<RefCell<dyn ElementImpl>>,
-    ) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
+        child: Rc<RefCell<dyn ElementInternals>>,
+    ) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
         // Find the node.
         let children = &mut self.element_data_mut().children;
         let position = children
@@ -160,7 +523,7 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
 
         // TODO: Move to document
         fn remove_element_from_document(
-            node: Rc<RefCell<dyn ElementImpl>>,
+            node: Rc<RefCell<dyn ElementInternals>>,
             document: &mut Document,
             elements: &mut ElementIdMap,
         ) {
@@ -194,7 +557,7 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
         }
     }
 
-    fn push(&mut self, _child: Rc<RefCell<dyn ElementImpl>>) {
+    fn push(&mut self, _child: Rc<RefCell<dyn ElementInternals>>) {
         panic!("Pushing children is not supported.")
     }
 
@@ -595,13 +958,13 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
     }
 
     /// Re-
-    fn to_rc(&self) -> Rc<RefCell<dyn ElementImpl>> {
+    fn to_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.element_data().me.upgrade().unwrap()
     }
 
     /// Returns the root element.
-    fn get_root_element(&self) -> Weak<RefCell<dyn ElementImpl>> {
-        let mut root_ancestor: Weak<RefCell<dyn ElementImpl>> = self.element_data().me.clone();
+    fn get_root_element(&self) -> Weak<RefCell<dyn ElementInternals>> {
+        let mut root_ancestor: Weak<RefCell<dyn ElementInternals>> = self.element_data().me.clone();
         loop {
             let me = root_ancestor.upgrade().unwrap();
             if let Some(parent) = me.borrow().parent() {
@@ -627,418 +990,16 @@ pub trait ElementImpl: ElementData + crate::elements::core::ElementInternals + A
     }
 }
 
-pub trait AsElement {
-    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementImpl>>;
-}
-
-pub trait Element: Clone + AsElement {
-    fn get_children(&self) -> Vec<Rc<RefCell<dyn ElementImpl>>> {
-        self.as_element_rc().borrow().children().to_vec()
-    }
-
-    fn get_previous_sibling(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
-        self.as_element_rc().borrow().get_previous_sibling()
-    }
-
-    fn get_next_sibling(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
-        self.as_element_rc().borrow().get_next_sibling()
-    }
-
-    fn get_parent(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
-        let parent = self.as_element_rc().borrow().parent();
-        if let Some(parent) = parent {
-            parent.upgrade().ok_or(CraftError::ElementNotFound)
+pub fn resolve_clip_for_scrollable(element: &mut dyn ElementInternals, clip_bounds: Option<Rectangle>) {
+    let element_data = element.element_data_mut();
+    if element_data.is_scrollable() {
+        let scroll_clip_bounds = element_data.layout_item.computed_box_transformed.padding_rectangle();
+        if let Some(clip_bounds) = clip_bounds {
+            element_data.layout_item.clip_bounds = scroll_clip_bounds.intersection(&clip_bounds);
         } else {
-            Err(CraftError::ElementNotFound)
+            element_data.layout_item.clip_bounds = Some(scroll_clip_bounds);
         }
-    }
-
-    fn get_first_child(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
-        self.as_element_rc().borrow().get_first_child()
-    }
-
-    fn get_last_child(&self) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
-        self.as_element_rc().borrow().get_last_child()
-    }
-
-    fn remove_child(&self, child: Rc<RefCell<dyn ElementImpl>>) -> Result<Rc<RefCell<dyn ElementImpl>>, CraftError> {
-        self.as_element_rc().borrow_mut().remove_child(child)
-    }
-
-    fn remove_all_children(&self) {
-        self.as_element_rc().borrow_mut().remove_all_children()
-    }
-
-    fn swap_child(
-        &self,
-        child_1: Rc<RefCell<dyn ElementImpl>>,
-        child_2: Rc<RefCell<dyn ElementImpl>>,
-    ) -> Result<(), CraftError> {
-        self.as_element_rc().borrow_mut().swap_child(child_1, child_2)
-    }
-
-    fn push(self, child: impl AsElement) -> Self {
-        let child_rc = child.as_element_rc();
-        self.as_element_rc().borrow_mut().push(child_rc);
-        self
-    }
-
-    fn on_pointer_enter(self, on_pointer_enter: PointerEnterHandler) -> Self {
-        self.as_element_rc().borrow_mut().on_pointer_enter(on_pointer_enter);
-        self
-    }
-
-    fn on_pointer_leave(self, on_pointer_leave: PointerLeaveHandler) -> Self {
-        self.as_element_rc().borrow_mut().on_pointer_leave(on_pointer_leave);
-        self
-    }
-
-    fn id(self, id: &str) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .set_id(id);
-        self
-    }
-
-    fn on_pointer_button_down(self, on_pointer_button_down: PointerEventHandler) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .on_pointer_button_down(on_pointer_button_down);
-        self
-    }
-
-    fn on_pointer_moved(self, on_pointer_moved: PointerUpdateHandler) -> Self {
-        self.as_element_rc().borrow_mut().on_pointer_moved(on_pointer_moved);
-        self
-    }
-
-    fn on_pointer_button_up(self, on_pointer_button_up: PointerEventHandler) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .on_pointer_button_up(on_pointer_button_up);
-        self
-    }
-
-    fn on_lost_pointer_capture(self, on_lost_pointer_capture: PointerCaptureHandler) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .on_lost_pointer_capture(on_lost_pointer_capture);
-        self
-    }
-
-    fn on_got_pointer_capture(self, on_got_pointer_capture: PointerCaptureHandler) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .on_got_pointer_capture(on_got_pointer_capture);
-        self
-    }
-
-    fn on_keyboard_input(self, on_keyboard_input: KeyboardInputHandler) -> Self {
-        self.as_element_rc().borrow_mut().on_keyboard_input(on_keyboard_input);
-        self
-    }
-
-    fn on_scroll(self, on_scroll: ScrollHandler) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .on_scroll(on_scroll);
-        self
-    }
-
-    fn scroll_to_child_by_id(self, id: &str) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .scroll_to_child_by_id_with_options(id, ScrollOptions::default());
-        self
-    }
-
-    fn scroll_to_child_by_id_with_options(self, id: &str, options: ScrollOptions) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .scroll_to_child_by_id_with_options(id, options);
-        self
-    }
-    fn scroll_to(self, y: f32) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .scroll_to(y);
-        self
-    }
-
-    fn scroll_to_top(self) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .scroll_to_top();
-        self
-    }
-
-    fn scroll_to_bottom(self) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .scroll_to_bottom();
-        self
-    }
-
-    fn scroll_by(self, y: f32) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .scroll_by(y);
-        self
-    }
-
-    fn get_scroll_state(&self) -> ScrollState {
-        self.as_element_rc()
-            .borrow_mut()
-            .get_scroll_state()
-    }
-
-    fn display(self, display: Display) -> Self {
-        self.as_element_rc().borrow_mut().set_display(display);
-        self
-    }
-
-    fn box_sizing(self, box_sizing: BoxSizing) -> Self {
-        self.as_element_rc().borrow_mut().set_box_sizing(box_sizing);
-        self
-    }
-
-    fn position(self, position: Position) -> Self {
-        self.as_element_rc().borrow_mut().set_position(position);
-        self
-    }
-
-    fn margin(self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> Self {
-        self.as_element_rc().borrow_mut().set_margin(top, right, bottom, left);
-        self
-    }
-
-    fn padding(self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> Self {
-        self.as_element_rc().borrow_mut().set_padding(top, right, bottom, left);
-        self
-    }
-
-    fn gap(self, row_gap: Unit, column_gap: Unit) -> Self {
-        self.as_element_rc().borrow_mut().set_gap(row_gap, column_gap);
-        self
-    }
-
-    fn inset(self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> Self {
-        self.as_element_rc().borrow_mut().set_inset(top, right, bottom, left);
-        self
-    }
-
-    fn min_width(self, min_width: Unit) -> Self {
-        self.as_element_rc().borrow_mut().set_min_width(min_width);
-        self
-    }
-
-    fn min_height(self, min_height: Unit) -> Self {
-        self.as_element_rc().borrow_mut().set_min_height(min_height);
-        self
-    }
-
-    fn width(self, width: Unit) -> Self {
-        self.as_element_rc().borrow_mut().set_width(width);
-        self
-    }
-
-    fn height(self, height: Unit) -> Self {
-        self.as_element_rc().borrow_mut().set_height(height);
-        self
-    }
-
-    fn max_width(self, max_width: Unit) -> Self {
-        self.as_element_rc().borrow_mut().set_max_width(max_width);
-        self
-    }
-
-    fn max_height(self, max_height: Unit) -> Self {
-        self.as_element_rc().borrow_mut().set_max_height(max_height);
-        self
-    }
-
-    fn wrap(self, wrap: FlexWrap) -> Self {
-        self.as_element_rc().borrow_mut().set_wrap(wrap);
-        self
-    }
-
-    fn align_items(self, align_items: Option<AlignItems>) -> Self {
-        self.as_element_rc().borrow_mut().set_align_items(align_items);
-        self
-    }
-
-    fn justify_content(self, justify_content: Option<JustifyContent>) -> Self {
-        self.as_element_rc().borrow_mut().set_justify_content(justify_content);
-        self
-    }
-
-    fn flex_direction(self, flex_direction: FlexDirection) -> Self {
-        self.as_element_rc().borrow_mut().set_flex_direction(flex_direction);
-        self
-    }
-
-    fn flex_grow(self, flex_grow: f32) -> Self {
-        self.as_element_rc().borrow_mut().set_flex_grow(flex_grow);
-        self
-    }
-
-    fn flex_shrink(self, flex_shrink: f32) -> Self {
-        self.as_element_rc().borrow_mut().set_flex_shrink(flex_shrink);
-        self
-    }
-
-    fn flex_basis(self, flex_basis: Unit) -> Self {
-        self.as_element_rc().borrow_mut().set_flex_basis(flex_basis);
-        self
-    }
-
-    fn font_family(self, font_family: FontFamily) -> Self {
-        self.as_element_rc().borrow_mut().set_font_family(font_family);
-        self
-    }
-
-    fn color(self, color: Color) -> Self {
-        self.as_element_rc().borrow_mut().set_color(color);
-        self
-    }
-
-    fn background_color(self, background_color: Color) -> Self {
-        self.as_element_rc().borrow_mut().set_background_color(background_color);
-        self
-    }
-
-    fn font_size(self, font_size: f32) -> Self {
-        self.as_element_rc().borrow_mut().set_font_size(font_size);
-        self
-    }
-
-    fn line_height(self, line_height: f32) -> Self {
-        self.as_element_rc().borrow_mut().set_line_height(line_height);
-        self
-    }
-
-    fn font_weight(self, font_weight: FontWeight) -> Self {
-        self.as_element_rc().borrow_mut().set_font_weight(font_weight);
-        self
-    }
-
-    fn font_style(self, font_style: FontStyle) -> Self {
-        self.as_element_rc().borrow_mut().set_font_style(font_style);
-        self
-    }
-
-    fn underline(self, underline: Option<Underline>) -> Self {
-        self.as_element_rc().borrow_mut().set_underline(underline);
-        self
-    }
-
-    fn overflow(self, overflow_x: Overflow, overflow_y: Overflow) -> Self {
-        self.as_element_rc().borrow_mut().set_overflow(overflow_x, overflow_y);
-        self
-    }
-
-    fn border_color(self, top: Color, right: Color, bottom: Color, left: Color) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .set_border_color(top, right, bottom, left);
-        self
-    }
-
-    fn border_width(self, top: Unit, right: Unit, bottom: Unit, left: Unit) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .set_border_width(top, right, bottom, left);
-        self
-    }
-
-    fn border_radius(self, top: (f32, f32), right: (f32, f32), bottom: (f32, f32), left: (f32, f32)) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .set_border_radius(top, right, bottom, left);
-        self
-    }
-
-    fn scrollbar_color(self, scrollbar_color: ScrollbarColor) -> Self {
-        self.as_element_rc().borrow_mut().set_scrollbar_color(scrollbar_color);
-        self
-    }
-
-    fn scrollbar_thumb_margin(self, top: f32, right: f32, bottom: f32, left: f32) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .set_scrollbar_thumb_margin(top, right, bottom, left);
-        self
-    }
-
-    fn set_scrollbar_thumb_radius(
-        self,
-        top: (f32, f32),
-        right: (f32, f32),
-        bottom: (f32, f32),
-        left: (f32, f32),
-    ) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .set_scrollbar_thumb_radius(top, right, bottom, left);
-        self
-    }
-
-    fn scrollbar_width(self, selection_color: Color) -> Self {
-        self.as_element_rc().borrow_mut().set_selection_color(selection_color);
-        self
-    }
-
-    fn box_shadows(self, box_shadows: Vec<BoxShadow>) -> Self {
-        self.as_element_rc().borrow_mut().set_box_shadows(box_shadows);
-        self
-    }
-
-    fn focus(self) -> Self {
-        self.as_element_rc().borrow_mut().focus();
-        self
-    }
-
-    fn is_focused(&self) -> bool {
-        self.as_element_rc().borrow_mut().is_focused()
-    }
-
-    fn unfocus(self) -> Self {
-        self.as_element_rc().borrow_mut().unfocus();
-        self
-    }
-
-    fn get_computed_box_transformed(&self) -> ElementBox {
-        self.as_element_rc().borrow().get_computed_box_transformed()
-    }
-
-    fn has_pointer_capture(&self, pointer_id: PointerId) -> bool {
-        self.as_element_rc().borrow().has_pointer_capture(pointer_id)
-    }
-
-    #[allow(async_fn_in_trait)]
-    async fn click(&self) {
-        let pos = self
-            .as_element_rc()
-            .borrow()
-            .get_computed_box_transformed()
-            .padding_rectangle();
-        let mouse_move = CursorMoved {
-            device_id: DeviceId::dummy(),
-            position: PhysicalPosition::new(pos.x as f64, pos.y as f64),
-        };
-        let mouse_down = MouseInput {
-            device_id: DeviceId::dummy(),
-            state: ElementState::Pressed,
-            button: MouseButton::Left,
-        };
-        let mouse_up = MouseInput {
-            device_id: DeviceId::dummy(),
-            state: ElementState::Released,
-            button: MouseButton::Left,
-        };
-        let window_id = self.as_element_rc().borrow().get_winit_window().unwrap().id();
-        queue_window_event(window_id, mouse_move);
-        queue_window_event(window_id, mouse_down);
-        queue_window_event(window_id, mouse_up);
+    } else {
+        element_data.layout_item.clip_bounds = clip_bounds;
     }
 }
diff --git a/crates/craft_retained/src/elements/traits/mod.rs b/crates/craft_retained/src/elements/traits/mod.rs
new file mode 100644
index 00000000..7c0e9348
--- /dev/null
+++ b/crates/craft_retained/src/elements/traits/mod.rs
@@ -0,0 +1,10 @@
+mod element_data;
+mod element_internals;
+mod as_element;
+mod element;
+
+pub use element_data::ElementData;
+pub use as_element::AsElement;
+pub use element::Element;
+/// Note: this could be hidden behind a custom elements feature.
+pub use element_internals::{ElementInternals, resolve_clip_for_scrollable};
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 6bc83e86..6ddfdf57 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -27,10 +27,9 @@ use crate::accessibility::{access_handler::CraftAccessHandler, activation_handle
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::app::FOCUS;
 use crate::app::{App, TAFFY_TREE, WINDOW_MANAGER, queue_window_event};
-use crate::elements::core::{ElementInternals, resolve_clip_for_scrollable};
-use crate::elements::element::AsElement;
+use crate::elements::{AsElement, ElementInternals, resolve_clip_for_scrollable};
 use crate::elements::element_data::ElementData;
-use crate::elements::{Element, ElementImpl, scrollable};
+use crate::elements::{Element, scrollable};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
@@ -486,12 +485,12 @@ impl WindowInternal {
 impl Element for Window {}
 
 impl AsElement for Window {
-    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementImpl>> {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.inner.clone()
     }
 }
 
-impl crate::elements::core::ElementData for WindowInternal {
+impl crate::elements::ElementData for WindowInternal {
     fn element_data(&self) -> &ElementData {
         &self.element_data
     }
@@ -501,31 +500,6 @@ impl crate::elements::core::ElementData for WindowInternal {
     }
 }
 
-impl ElementImpl for WindowInternal {
-    fn push(&mut self, child: Rc<RefCell<dyn ElementImpl>>) {
-        let me: Weak<RefCell<dyn ElementImpl>> = self.element_data.me.clone();
-        child.borrow_mut().element_data_mut().parent = Some(me);
-        self.element_data.children.push(child.clone());
-
-        // Add the children's taffy node.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
-            let child_id = child.borrow().element_data().layout_item.taffy_node_id;
-            if let Some(child_id) = child_id {
-                taffy_tree.add_child(parent_id, child_id);
-            }
-        });
-    }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
-
 impl ElementInternals for WindowInternal {
     fn apply_layout(
         &mut self,
@@ -665,4 +639,27 @@ impl ElementInternals for WindowInternal {
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
         resolve_clip_for_scrollable(self, clip_bounds);
     }
+
+    fn push(&mut self, child: Rc<RefCell<dyn ElementInternals>>) {
+        let me: Weak<RefCell<dyn ElementInternals>> = self.element_data.me.clone();
+        child.borrow_mut().element_data_mut().parent = Some(me);
+        self.element_data.children.push(child.clone());
+
+        // Add the children's taffy node.
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
+            let child_id = child.borrow().element_data().layout_item.taffy_node_id;
+            if let Some(child_id) = child_id {
+                taffy_tree.add_child(parent_id, child_id);
+            }
+        });
+    }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
 }
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index f5b58af1..334d4c45 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -6,20 +6,20 @@ use craft_primitives::geometry::Point;
 use craft_renderer::RenderList;
 
 use crate::app::dequeue_event;
-use crate::elements::ElementImpl;
+use crate::elements::ElementInternals;
 use crate::events::helpers::{call_default_element_event_handler, call_user_event_handlers, find_target, freeze_target_list};
 use crate::events::pointer_capture::maybe_handle_implicit_pointer_capture_release;
 use crate::events::{CraftMessage, Event, FocusAction};
 use crate::text::text_context::TextContext;
 
-pub(super) fn dispatch_capturing_event(_message: &CraftMessage, _targets: &mut VecDeque<Rc<RefCell<dyn ElementImpl>>>) {
+pub(super) fn dispatch_capturing_event(_message: &CraftMessage, _targets: &mut VecDeque<Rc<RefCell<dyn ElementInternals>>>) {
 }
 
 /// Dispatches 1 event to many elements.
 /// The first dispatch happens at the top-most visual element.
 pub(super) fn dispatch_bubbling_event(
     message: &CraftMessage,
-    targets: &mut VecDeque<Rc<RefCell<dyn ElementImpl>>>,
+    targets: &mut VecDeque<Rc<RefCell<dyn ElementInternals>>>,
 ) -> Event {
     let target = targets[0].clone();
     let mut base_event = Event::new(target.clone());
@@ -39,7 +39,7 @@ pub(super) fn dispatch_bubbling_event(
 pub(crate) struct EventDispatcher {
     /// A "frozen" target list used to diff against the current target list.
     /// This is useful for pointer enter, leave, etc.
-    previous_targets: VecDeque<Weak<RefCell<dyn ElementImpl>>>,
+    previous_targets: VecDeque<Weak<RefCell<dyn ElementInternals>>>,
 }
 
 impl EventDispatcher {
@@ -56,7 +56,7 @@ impl EventDispatcher {
         &self,
         message: &CraftMessage,
         text_context: &mut Option<TextContext>,
-        target: &Rc<RefCell<dyn ElementImpl>>,
+        target: &Rc<RefCell<dyn ElementInternals>>,
     ) {
         let mut base_event = Event::new(target.clone());
 
@@ -77,7 +77,7 @@ impl EventDispatcher {
     pub(super) fn maybe_dispatch_pointer_leave(
         &self,
         text_context: &mut Option<TextContext>,
-        targets: &VecDeque<Rc<RefCell<dyn ElementImpl>>>,
+        targets: &VecDeque<Rc<RefCell<dyn ElementInternals>>>,
     ) {
         for prev_target in self.previous_targets.iter() {
             let mut found = false;
@@ -114,7 +114,7 @@ impl EventDispatcher {
     pub(super) fn maybe_dispatch_pointer_enter(
         &self,
         text_context: &mut Option<TextContext>,
-        targets: &VecDeque<Rc<RefCell<dyn ElementImpl>>>,
+        targets: &VecDeque<Rc<RefCell<dyn ElementInternals>>>,
     ) {
         for target in targets.iter().rev() {
             let mut found = false;
@@ -148,10 +148,10 @@ impl EventDispatcher {
         &mut self,
         message: &CraftMessage,
         mouse_position: Option<Point>,
-        root: Rc<RefCell<dyn ElementImpl>>,
+        root: Rc<RefCell<dyn ElementInternals>>,
         text_context: &mut Option<TextContext>,
         render_list: &mut RenderList,
-        target_scratch: &mut Vec<Rc<RefCell<dyn ElementImpl>>>,
+        target_scratch: &mut Vec<Rc<RefCell<dyn ElementInternals>>>,
     ) {
         let mut _focus = FocusAction::None;
         /*let span = span!(Level::INFO, "dispatch event");
@@ -162,9 +162,9 @@ impl EventDispatcher {
         }*/
 
         // Find the target and freeze the list, so the same set of elements are visited across sub event dispatches.
-        let target: Rc<RefCell<dyn ElementImpl>> =
+        let target: Rc<RefCell<dyn ElementInternals>> =
             find_target(&root, mouse_position, message, render_list, target_scratch);
-        let mut targets: VecDeque<Rc<RefCell<dyn ElementImpl>>> = freeze_target_list(target);
+        let mut targets: VecDeque<Rc<RefCell<dyn ElementInternals>>> = freeze_target_list(target);
 
         self.maybe_dispatch_pointer_leave(text_context, &targets);
         self.maybe_dispatch_pointer_enter(text_context, &targets);
@@ -197,7 +197,7 @@ impl EventDispatcher {
 
         // Drain the event dispatch queue and invoke user callbacks.
         while let Some((event, message)) = dequeue_event() {
-            let mut targets: VecDeque<Rc<RefCell<dyn ElementImpl>>> = freeze_target_list(event.target);
+            let mut targets: VecDeque<Rc<RefCell<dyn ElementInternals>>> = freeze_target_list(event.target);
             // Handle capturing
             dispatch_capturing_event(&message, &mut targets);
 
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index a36756a0..ae1e65ac 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -6,16 +6,16 @@ use craft_renderer::RenderList;
 use kurbo::Point;
 
 use crate::app::ELEMENTS;
-use crate::elements::ElementImpl;
+use crate::elements::ElementInternals;
 use crate::events::pointer_capture::find_pointer_capture_target;
 use crate::events::{CraftMessage, Event};
 use crate::text::text_context::TextContext;
 
-pub(super) fn freeze_target_list(target: Rc<RefCell<dyn ElementImpl>>) -> VecDeque<Rc<RefCell<dyn ElementImpl>>> {
+pub(super) fn freeze_target_list(target: Rc<RefCell<dyn ElementInternals>>) -> VecDeque<Rc<RefCell<dyn ElementInternals>>> {
     let mut current_target = Some(Rc::clone(&target));
 
     // Gather and "freeze" the elements we will visit.
-    let mut targets: VecDeque<Rc<RefCell<dyn ElementImpl>>> = VecDeque::new();
+    let mut targets: VecDeque<Rc<RefCell<dyn ElementInternals>>> = VecDeque::new();
     while let Some(node) = current_target {
         targets.push_back(Rc::clone(&node));
         current_target = node.borrow().parent().as_ref().and_then(|p| p.upgrade());
@@ -26,12 +26,12 @@ pub(super) fn freeze_target_list(target: Rc<RefCell<dyn ElementImpl>>) -> VecDeq
 
 /// Find the target that should be visited.
 pub(super) fn find_target(
-    root: &Rc<RefCell<dyn ElementImpl>>,
+    root: &Rc<RefCell<dyn ElementInternals>>,
     mouse_position: Option<Point>,
     message: &CraftMessage,
     render_list: &mut RenderList,
-    target_scratch: &mut Vec<Rc<RefCell<dyn ElementImpl>>>,
-) -> Rc<RefCell<dyn ElementImpl>> {
+    target_scratch: &mut Vec<Rc<RefCell<dyn ElementInternals>>>,
+) -> Rc<RefCell<dyn ElementInternals>> {
     let mut target = find_pointer_capture_target(message);
     if let Some(target) = target {
         return target;
@@ -63,7 +63,7 @@ pub(super) fn find_target(
 
 pub(super) fn call_user_event_handlers(
     event: &mut Event,
-    current_target: &Rc<RefCell<dyn ElementImpl>>,
+    current_target: &Rc<RefCell<dyn ElementInternals>>,
     message: &CraftMessage,
 ) {
     match message {
@@ -150,8 +150,8 @@ pub(super) fn call_user_event_handlers(
 
 pub(super) fn call_default_element_event_handler(
     event: &mut Event,
-    current_target: &Rc<RefCell<dyn ElementImpl>>,
-    target: &Rc<RefCell<dyn ElementImpl>>,
+    current_target: &Rc<RefCell<dyn ElementInternals>>,
+    target: &Rc<RefCell<dyn ElementInternals>>,
     text_context: &mut Option<TextContext>,
     message: &CraftMessage,
 ) {
diff --git a/crates/craft_retained/src/events/mod.rs b/crates/craft_retained/src/events/mod.rs
index 8dc85120..aa8036d9 100644
--- a/crates/craft_retained/src/events/mod.rs
+++ b/crates/craft_retained/src/events/mod.rs
@@ -20,7 +20,7 @@ use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
 pub use winit::event::{ElementState, Ime, Modifiers, MouseButton};
 
 use crate::PinnedFutureAny;
-use crate::elements::ElementImpl;
+use crate::elements::ElementInternals;
 use crate::utils::cloneable_any::CloneableAny;
 
 pub type PointerEventHandler = Rc<dyn Fn(&mut Event, &PointerButtonEvent)>;
@@ -96,7 +96,7 @@ pub type UserMessage = dyn CloneableAny;
 
 /// The result of an update.
 pub struct Event {
-    pub target: Rc<RefCell<dyn ElementImpl>>,
+    pub target: Rc<RefCell<dyn ElementInternals>>,
     /// Propagate craft_events to the next element. True by default.
     pub propagate: bool,
     /// A future that will produce a message when complete. The message will be sent to the origin component.
@@ -137,7 +137,7 @@ impl Event {
 }
 
 impl Event {
-    pub fn new(target: Rc<RefCell<dyn ElementImpl>>) -> Self {
+    pub fn new(target: Rc<RefCell<dyn ElementInternals>>) -> Self {
         Event {
             target,
             propagate: true,
diff --git a/crates/craft_retained/src/events/pointer_capture.rs b/crates/craft_retained/src/events/pointer_capture.rs
index 8d2df9bc..e97f0f1b 100644
--- a/crates/craft_retained/src/events/pointer_capture.rs
+++ b/crates/craft_retained/src/events/pointer_capture.rs
@@ -5,16 +5,16 @@ use std::rc::{Rc, Weak};
 use ui_events::pointer::PointerId;
 
 use crate::app::DOCUMENTS;
-use crate::elements::ElementImpl;
+use crate::elements::ElementInternals;
 use crate::events::CraftMessage;
 use crate::events::event_dispatch::{dispatch_bubbling_event, dispatch_capturing_event};
 
 /// Returns the currently pointer captured element or None.
-pub(super) fn find_pointer_capture_target(message: &CraftMessage) -> Option<Rc<RefCell<dyn ElementImpl>>> {
+pub(super) fn find_pointer_capture_target(message: &CraftMessage) -> Option<Rc<RefCell<dyn ElementInternals>>> {
     // 9.4 Implicit pointer capture
     // https://w3c.github.io/pointerevents/#implicit-pointer-capture
     //
-    let pointer_capture_element_id: Option<Weak<RefCell<dyn ElementImpl>>> = DOCUMENTS.with_borrow_mut(|docs| {
+    let pointer_capture_element_id: Option<Weak<RefCell<dyn ElementInternals>>> = DOCUMENTS.with_borrow_mut(|docs| {
         let key = &PointerId::new(1).unwrap();
         if matches!(message, CraftMessage::GotPointerCapture()) {
             // Check pending (step 2):
@@ -49,7 +49,7 @@ pub(super) fn process_pending_pointer_capture() {
         let target = find_pointer_capture_target(&msg);
 
         if let Some(target) = target {
-            let mut targets: VecDeque<Rc<RefCell<dyn ElementImpl>>> = VecDeque::new();
+            let mut targets: VecDeque<Rc<RefCell<dyn ElementInternals>>> = VecDeque::new();
             let mut current_target = Some(Rc::clone(&target));
             while let Some(node) = current_target {
                 targets.push_back(Rc::clone(&node));
@@ -70,7 +70,7 @@ pub(super) fn process_pending_pointer_capture() {
         let target = find_pointer_capture_target(&msg);
 
         if let Some(target) = target {
-            let mut targets: VecDeque<Rc<RefCell<dyn ElementImpl>>> = VecDeque::new();
+            let mut targets: VecDeque<Rc<RefCell<dyn ElementInternals>>> = VecDeque::new();
             let mut current_target = Some(Rc::clone(&target));
             while let Some(node) = current_target {
                 targets.push_back(Rc::clone(&node));

From d9d68e860362b0a96e189103d8d576540a731b8e Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 7 Mar 2026 15:25:17 -0500
Subject: [PATCH 062/143] Update vello/wgpu

---
 Cargo.lock                       | 1163 ++++++++++++++++++------------
 crates/craft_renderer/Cargo.toml |   10 +-
 2 files changed, 687 insertions(+), 486 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 73681beb..f7fbf0cc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -147,7 +147,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
 dependencies = [
  "android-properties",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "cc",
  "cesu8",
  "jni",
@@ -226,6 +226,12 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "anyhow"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+
 [[package]]
 name = "arrayref"
 version = "0.3.9"
@@ -279,9 +285,9 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.13.3"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
+checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a"
 dependencies = [
  "async-task",
  "concurrent-queue",
@@ -304,7 +310,7 @@ dependencies = [
  "futures-lite",
  "parking",
  "polling",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "slab",
  "windows-sys 0.61.2",
 ]
@@ -335,7 +341,7 @@ dependencies = [
  "cfg-if",
  "event-listener",
  "futures-lite",
- "rustix 1.1.3",
+ "rustix 1.1.4",
 ]
 
 [[package]]
@@ -361,7 +367,7 @@ dependencies = [
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.61.2",
@@ -448,9 +454,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.15.2"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a88aab2464f1f25453baa7a07c84c5b7684e274054ba06817f382357f77a288"
+checksum = "94bffc006df10ac2a68c83692d734a465f8ee6c5b384d8545a636f81d858f4bf"
 dependencies = [
  "aws-lc-sys",
  "zeroize",
@@ -458,9 +464,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.35.0"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45afffdee1e7c9126814751f88dddc747f41d91da16c9551a0f1e8a11e788a1"
+checksum = "4321e568ed89bb5a7d291a7f37997c2c0df89809d7b6d12062c81ddb54aa782e"
 dependencies = [
  "cc",
  "cmake",
@@ -558,9 +564,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
 
 [[package]]
 name = "bitvec"
@@ -595,7 +601,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 dependencies = [
- "objc2 0.6.3",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -622,15 +628,15 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.19.1"
+version = "3.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
+checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
 
 [[package]]
 name = "bytemuck"
-version = "1.24.0"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
+checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -660,9 +666,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 
 [[package]]
 name = "calloop"
@@ -670,7 +676,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "log",
  "polling",
  "rustix 0.38.44",
@@ -692,9 +698,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.52"
+version = "1.2.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3"
+checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -722,9 +728,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.42"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
 dependencies = [
  "iana-time-zone",
  "js-sys",
@@ -735,9 +741,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.54"
+version = "4.5.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394"
+checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -745,9 +751,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.54"
+version = "4.5.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00"
+checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876"
 dependencies = [
  "anstream",
  "anstyle",
@@ -757,9 +763,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.49"
+version = "4.5.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
+checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -769,19 +775,19 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
+checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"
 
 [[package]]
 name = "clipboard-rs"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915fa0d77c59e330333562661159b14205f76a41a6e6eb59957724f938cb8203"
+checksum = "58c4843457db4cfc367efd4fc554e0f222c9da86359606132adc0db01592b82b"
 dependencies = [
  "clipboard-win",
  "image",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
  "objc2-ui-kit 0.3.2",
@@ -941,7 +947,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "core-foundation 0.10.1",
  "libc",
 ]
@@ -1007,7 +1013,7 @@ dependencies = [
  "craft_logging",
  "craft_runtime",
  "image",
- "reqwest 0.13.1",
+ "reqwest 0.13.2",
  "tinyvg-rs",
 ]
 
@@ -1017,7 +1023,7 @@ version = "0.1.1"
 dependencies = [
  "accesskit",
  "accesskit_winit",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "cfg-if",
  "chrono",
  "clipboard-rs",
@@ -1035,7 +1041,7 @@ dependencies = [
  "pulldown-cmark",
  "rustc-hash 2.1.1",
  "smallvec",
- "smol_str 0.3.5",
+ "smol_str 0.3.6",
  "syntect",
  "taffy",
  "tinyvg-rs",
@@ -1118,9 +1124,9 @@ dependencies = [
 
 [[package]]
 name = "ctor-lite"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b"
+checksum = "e162d0c2e2068eb736b71e5597eff0b9944e6b973cd9f37b6a288ab9bf20e300"
 
 [[package]]
 name = "cursor-icon"
@@ -1130,9 +1136,9 @@ checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f"
 
 [[package]]
 name = "deranged"
-version = "0.5.5"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 dependencies = [
  "powerfmt",
 ]
@@ -1145,12 +1151,12 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
 [[package]]
 name = "dispatch2"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
+checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.11.0",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -1166,9 +1172,9 @@ dependencies = [
 
 [[package]]
 name = "dlib"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+checksum = "ab8ecd87370524b461f8557c119c405552c396ed91fc0a8eec68679eab26f94a"
 dependencies = [
  "libloading",
 ]
@@ -1196,26 +1202,27 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
 [[package]]
 name = "drm"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80bc8c5c6c2941f70a55c15f8d9f00f9710ebda3ffda98075f996a0e6c92756f"
+checksum = "c5b71449a23fe79542d6527ca572844b2016abf9573c49e43144d546b1735aec"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytemuck",
+ "bytemuck_derive",
  "drm-ffi",
  "drm-fourcc",
  "libc",
- "rustix 0.38.44",
+ "rustix 1.1.4",
 ]
 
 [[package]]
 name = "drm-ffi"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8e41459d99a9b529845f6d2c909eb9adf3b6d2f82635ae40be8de0601726e8b"
+checksum = "51a91c9b32ac4e8105dec255e849e0d66e27d7c34d184364fb93e469db08f690"
 dependencies = [
  "drm-sys",
- "rustix 0.38.44",
+ "rustix 1.1.4",
 ]
 
 [[package]]
@@ -1226,12 +1233,12 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
 
 [[package]]
 name = "drm-sys"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bafb66c8dbc944d69e15cfcc661df7e703beffbaec8bd63151368b06c5f9858c"
+checksum = "ecc8e1361066d91f5ffccff060a3c3be9c3ecde15be2959c1937595f7a82a9f8"
 dependencies = [
  "libc",
- "linux-raw-sys 0.6.5",
+ "linux-raw-sys 0.9.4",
 ]
 
 [[package]]
@@ -1318,9 +1325,9 @@ checksum = "5692dd7b5a1978a5aeb0ce83b7655c58ca8efdcb79d21036ea249da95afec2c6"
 
 [[package]]
 name = "euclid"
-version = "0.22.11"
+version = "0.22.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48"
+checksum = "df61bf483e837f88d5c2291dcf55c67be7e676b3a51acc48db3a7b163b91ed63"
 dependencies = [
  "num-traits",
 ]
@@ -1400,27 +1407,26 @@ checksum = "76258897e51fd156ee03b6246ea53f3e0eb395d0b327e9961c4fc4c8b2fa151a"
 
 [[package]]
 name = "filetime"
-version = "0.2.26"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
+checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db"
 dependencies = [
  "cfg-if",
  "libc",
  "libredox",
- "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.7"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
 [[package]]
 name = "flate2"
-version = "1.1.5"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1473,7 +1479,7 @@ dependencies = [
  "icu_locale_core",
  "linebender_resource_handle",
  "memmap2",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-core-text",
  "objc2-foundation 0.3.2",
@@ -1550,9 +1556,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures-channel"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1560,9 +1566,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
 [[package]]
 name = "futures-intrusive"
@@ -1577,9 +1583,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
 
 [[package]]
 name = "futures-lite"
@@ -1596,21 +1602,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
 
 [[package]]
 name = "futures-task"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
 
 [[package]]
 name = "futures-util"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
  "futures-core",
  "futures-io",
@@ -1618,7 +1624,6 @@ dependencies = [
  "futures-task",
  "memchr",
  "pin-project-lite",
- "pin-utils",
  "slab",
 ]
 
@@ -1628,15 +1633,15 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
 dependencies = [
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "windows-link 0.2.1",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1654,11 +1659,24 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "r-efi",
+ "r-efi 5.3.0",
  "wasip2",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 6.0.0",
+ "wasip2",
+ "wasip3",
+]
+
 [[package]]
 name = "gl_generator"
 version = "0.14.0"
@@ -1691,35 +1709,18 @@ dependencies = [
  "gl_generator",
 ]
 
-[[package]]
-name = "gpu-alloc"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
-dependencies = [
- "bitflags 2.10.0",
- "gpu-alloc-types",
-]
-
-[[package]]
-name = "gpu-alloc-types"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
-dependencies = [
- "bitflags 2.10.0",
-]
-
 [[package]]
 name = "gpu-allocator"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd"
+checksum = "51255ea7cfaadb6c5f1528d43e92a82acb2b96c43365989a28b2d44ee38f8795"
 dependencies = [
+ "ash",
+ "hashbrown 0.16.1",
  "log",
  "presser",
- "thiserror 1.0.69",
- "windows 0.58.0",
+ "thiserror 2.0.18",
+ "windows 0.62.2",
 ]
 
 [[package]]
@@ -1728,7 +1729,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "gpu-descriptor-types",
  "hashbrown 0.15.5",
 ]
@@ -1739,7 +1740,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
@@ -1795,7 +1796,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92c020db12c71d8a12a3fe7607873cade3a01a6287e29d540c8723276221b9d8"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytemuck",
  "core_maths",
  "read-fonts 0.35.0",
@@ -1957,14 +1958,13 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.19"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f"
+checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
 dependencies = [
  "base64",
  "bytes",
  "futures-channel",
- "futures-core",
  "futures-util",
  "http",
  "http-body",
@@ -1983,9 +1983,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.64"
+version = "0.1.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1993,7 +1993,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core 0.58.0",
+ "windows-core 0.62.2",
 ]
 
 [[package]]
@@ -2087,6 +2087,12 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
 [[package]]
 name = "idna"
 version = "1.1.0"
@@ -2118,10 +2124,10 @@ dependencies = [
  "byteorder-lite",
  "moxcms",
  "num-traits",
- "png 0.18.0",
+ "png 0.18.1",
  "tiff",
- "zune-core 0.5.0",
- "zune-jpeg 0.5.8",
+ "zune-core 0.5.1",
+ "zune-jpeg 0.5.12",
 ]
 
 [[package]]
@@ -2139,6 +2145,8 @@ dependencies = [
  "equivalent",
  "hashbrown 0.16.1",
  "rayon",
+ "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -2156,9 +2164,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.11.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
 
 [[package]]
 name = "iri-string"
@@ -2235,9 +2243,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.83"
+version = "0.3.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
+checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -2259,7 +2267,7 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "serde",
 ]
 
@@ -2291,7 +2299,7 @@ dependencies = [
  "oxipng",
  "png 0.17.16",
  "rayon",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "walkdir",
 ]
 
@@ -2342,26 +2350,32 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
 [[package]]
 name = "libc"
-version = "0.2.180"
+version = "0.2.182"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
+checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
 
 [[package]]
 name = "libdeflate-sys"
-version = "1.25.0"
+version = "1.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bd6304ebf75390d8a99b88bdf2a266f62647838140cb64af8e6702f6e3fddc"
+checksum = "72753e0008ea87963d2f0770042d0df7abe51fafbb8dcaf618ac440f2f1fec0a"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "libdeflater"
-version = "1.25.0"
+version = "1.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d4880e6d634d3d029d65fa016038e788cc728a17b782684726fb34ee140caf"
+checksum = "d1ee41cf6fb1bb6030dfb59ffb7bc01ab26aade44142084c87f0fc7a1658fe71"
 dependencies = [
  "libdeflate-sys",
 ]
@@ -2378,19 +2392,20 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
-version = "0.1.12"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
+checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "libc",
- "redox_syscall 0.7.0",
+ "plain",
+ "redox_syscall 0.7.3",
 ]
 
 [[package]]
@@ -2447,15 +2462,15 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.6.5"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "litemap"
@@ -2529,15 +2544,15 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.6"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
 [[package]]
 name = "memmap2"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490"
+checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3"
 dependencies = [
  "libc",
 ]
@@ -2553,11 +2568,11 @@ dependencies = [
 
 [[package]]
 name = "metal"
-version = "0.32.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605"
+checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block",
  "core-graphics-types 0.2.0",
  "foreign-types 0.5.0",
@@ -2614,13 +2629,13 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "27.0.3"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8"
+checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135"
 dependencies = [
  "arrayvec",
  "bit-set",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "cfg-if",
  "cfg_aliases",
  "codespan-reporting",
@@ -2634,23 +2649,23 @@ dependencies = [
  "once_cell",
  "rustc-hash 1.1.0",
  "spirv",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "unicode-ident",
 ]
 
 [[package]]
 name = "native-tls"
-version = "0.2.14"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2"
 dependencies = [
  "libc",
  "log",
  "openssl",
- "openssl-probe 0.1.6",
+ "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework 2.11.1",
+ "security-framework",
  "security-framework-sys",
  "tempfile",
 ]
@@ -2661,7 +2676,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "jni-sys",
  "log",
  "ndk-sys",
@@ -2696,9 +2711,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
 
 [[package]]
 name = "num-traits"
@@ -2765,9 +2780,9 @@ dependencies = [
 
 [[package]]
 name = "objc2"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05"
+checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
 dependencies = [
  "objc2-encode",
 ]
@@ -2778,7 +2793,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -2794,10 +2809,10 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.6.2",
  "libc",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-cloud-kit 0.3.2",
  "objc2-core-data 0.3.2",
  "objc2-core-foundation",
@@ -2815,7 +2830,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location 0.2.2",
@@ -2828,8 +2843,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.11.0",
+ "objc2 0.6.4",
  "objc2-foundation 0.3.2",
 ]
 
@@ -2850,7 +2865,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -2862,8 +2877,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.11.0",
+ "objc2 0.6.4",
  "objc2-foundation 0.3.2",
 ]
 
@@ -2873,9 +2888,9 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "dispatch2",
- "objc2 0.6.3",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -2884,9 +2899,9 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "dispatch2",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-io-surface",
 ]
@@ -2909,7 +2924,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
 dependencies = [
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-foundation 0.3.2",
 ]
 
@@ -2931,7 +2946,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
 dependencies = [
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-foundation 0.3.2",
 ]
 
@@ -2941,8 +2956,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.11.0",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-core-graphics",
 ]
@@ -2953,8 +2968,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.11.0",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-io-surface",
@@ -2972,7 +2987,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "dispatch",
  "libc",
@@ -2985,10 +3000,10 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.6.2",
  "libc",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-core-foundation",
 ]
 
@@ -2998,8 +3013,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.11.0",
+ "objc2 0.6.4",
  "objc2-core-foundation",
 ]
 
@@ -3021,7 +3036,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -3033,7 +3048,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -3046,8 +3061,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.11.0",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
 ]
@@ -3068,7 +3083,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-cloud-kit 0.2.2",
@@ -3089,9 +3104,9 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.6.2",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-cloud-kit 0.3.2",
  "objc2-core-data 0.3.2",
  "objc2-core-foundation",
@@ -3121,7 +3136,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location 0.2.2",
@@ -3134,7 +3149,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
 dependencies = [
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-foundation 0.3.2",
 ]
 
@@ -3156,7 +3171,7 @@ version = "6.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "libc",
  "once_cell",
  "onig_sys",
@@ -3189,7 +3204,7 @@ version = "0.10.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "cfg-if",
  "foreign-types 0.3.2",
  "libc",
@@ -3211,15 +3226,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
-
-[[package]]
-name = "openssl-probe"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f50d9b3dabb09ecd771ad0aa242ca6894994c130308ca3d7684634df8037391"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-sys"
@@ -3245,9 +3254,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "5.0.0"
+version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2c1f9f56e534ac6a9b8a4600bdf0f530fb393b5f393e7b4d03489c3cf0c3f01"
+checksum = "7f4779c6901a562440c3786d08192c6fbda7c1c2060edd10006b05ee35d10f2d"
 dependencies = [
  "num-traits",
 ]
@@ -3366,18 +3375,18 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pin-project"
-version = "1.1.10"
+version = "1.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.10"
+version = "1.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3386,9 +3395,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "pin-utils"
@@ -3398,9 +3407,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "piper"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1"
 dependencies = [
  "atomic-waker",
  "fastrand",
@@ -3413,6 +3422,12 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+
 [[package]]
 name = "plist"
 version = "1.8.0"
@@ -3421,7 +3436,7 @@ checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
 dependencies = [
  "base64",
  "indexmap",
- "quick-xml",
+ "quick-xml 0.38.4",
  "serde",
  "time",
 ]
@@ -3441,11 +3456,11 @@ dependencies = [
 
 [[package]]
 name = "png"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0"
+checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -3471,21 +3486,21 @@ dependencies = [
  "concurrent-queue",
  "hermit-abi",
  "pin-project-lite",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "portable-atomic"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "portable-atomic-util"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+checksum = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5"
 dependencies = [
  "portable-atomic",
 ]
@@ -3520,20 +3535,30 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
 [[package]]
 name = "proc-macro-crate"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
  "toml_edit",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.105"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
@@ -3558,23 +3583,20 @@ checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
 
 [[package]]
 name = "pulldown-cmark"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0"
+checksum = "83c41efbf8f90ac44de7f3a868f0867851d261b56291732d0cbf7cceaaeb55a6"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "memchr",
  "unicase",
 ]
 
 [[package]]
 name = "pxfm"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8"
-dependencies = [
- "num-traits",
-]
+checksum = "b5a041e753da8b807c9255f28de81879c78c876392ff2469cde94799b2896b9d"
 
 [[package]]
 name = "quick-error"
@@ -3592,6 +3614,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.39.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quinn"
 version = "0.11.9"
@@ -3606,7 +3637,7 @@ dependencies = [
  "rustc-hash 2.1.1",
  "rustls",
  "socket2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
  "web-time",
@@ -3628,7 +3659,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tinyvec",
  "tracing",
  "web-time",
@@ -3650,9 +3681,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.43"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
@@ -3663,6 +3694,12 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -3691,18 +3728,18 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.9.3"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
 dependencies = [
  "getrandom 0.3.4",
 ]
 
 [[package]]
 name = "range-alloc"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde"
+checksum = "ca45419789ae5a7899559e9512e58ca889e41f04f1f2445e9f4b290ceccd1d08"
 
 [[package]]
 name = "raw-window-handle"
@@ -3766,23 +3803,23 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27"
+checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3791,9 +3828,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.8"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
 [[package]]
 name = "renderdoc-sys"
@@ -3845,9 +3882,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e9018c9d814e5f30cc16a0f03271aeab3571e609612d9fe78c1aa8d11c2f62"
+checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801"
 dependencies = [
  "base64",
  "bytes",
@@ -3883,9 +3920,9 @@ dependencies = [
 
 [[package]]
 name = "rgb"
-version = "0.8.52"
+version = "0.8.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce"
+checksum = "47b34b781b31e5d73e9fbc8689c70551fd1ade9a19e3e28cfec8580a79290cc4"
 dependencies = [
  "bytemuck",
 ]
@@ -3898,7 +3935,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -3931,7 +3968,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -3940,22 +3977,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "errno",
  "libc",
- "linux-raw-sys 0.11.0",
+ "linux-raw-sys 0.12.1",
  "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.36"
+version = "0.23.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
+checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4"
 dependencies = [
  "aws-lc-rs",
  "once_cell",
@@ -3971,17 +4008,17 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
 dependencies = [
- "openssl-probe 0.2.0",
+ "openssl-probe",
  "rustls-pki-types",
  "schannel",
- "security-framework 3.5.1",
+ "security-framework",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.13.2"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282"
+checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
 dependencies = [
  "web-time",
  "zeroize",
@@ -4002,7 +4039,7 @@ dependencies = [
  "rustls-native-certs",
  "rustls-platform-verifier-android",
  "rustls-webpki",
- "security-framework 3.5.1",
+ "security-framework",
  "security-framework-sys",
  "webpki-root-certs",
  "windows-sys 0.61.2",
@@ -4016,9 +4053,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.8"
+version = "0.103.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
+checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -4034,9 +4071,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
 
 [[package]]
 name = "same-file"
@@ -4083,39 +4120,32 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.11.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
 dependencies = [
- "bitflags 2.10.0",
- "core-foundation 0.9.4",
+ "bitflags 2.11.0",
+ "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
 ]
 
 [[package]]
-name = "security-framework"
-version = "3.5.1"
+name = "security-framework-sys"
+version = "2.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
 dependencies = [
- "bitflags 2.10.0",
- "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
- "security-framework-sys",
 ]
 
 [[package]]
-name = "security-framework-sys"
-version = "2.15.0"
+name = "semver"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
 
 [[package]]
 name = "serde"
@@ -4247,9 +4277,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "slotmap"
@@ -4272,7 +4302,7 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "calloop",
  "calloop-wayland-source",
  "cursor-icon",
@@ -4302,9 +4332,9 @@ dependencies = [
 
 [[package]]
 name = "smol_str"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f7a918bd2a9951d18ee6e48f076843e8e73a9a5d22cf05bcd4b7a81bdd04e17"
+checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523"
 dependencies = [
  "borsh",
  "serde_core",
@@ -4312,12 +4342,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4333,14 +4363,14 @@ dependencies = [
  "js-sys",
  "memmap2",
  "ndk",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-foundation 0.3.2",
  "objc2-quartz-core 0.3.2",
  "raw-window-handle",
  "redox_syscall 0.5.18",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "tiny-xlib",
  "tracing",
  "wasm-bindgen",
@@ -4358,7 +4388,7 @@ version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
@@ -4410,9 +4440,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.114"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4456,7 +4486,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "walkdir",
  "yaml-rust",
 ]
@@ -4471,11 +4501,11 @@ dependencies = [
 
 [[package]]
 name = "system-configuration"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
@@ -4509,14 +4539,14 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.24.0"
+version = "3.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
+checksum = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0"
 dependencies = [
  "fastrand",
- "getrandom 0.3.4",
+ "getrandom 0.4.2",
  "once_cell",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "windows-sys 0.61.2",
 ]
 
@@ -4549,11 +4579,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 dependencies = [
- "thiserror-impl 2.0.17",
+ "thiserror-impl 2.0.18",
 ]
 
 [[package]]
@@ -4569,9 +4599,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4603,30 +4633,30 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.44"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
+checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
 dependencies = [
  "deranged",
  "itoa",
  "num-conv",
  "powerfmt",
- "serde",
+ "serde_core",
  "time-core",
  "time-macros",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.24"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
 dependencies = [
  "num-conv",
  "time-core",
@@ -4707,9 +4737,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.49.0"
+version = "1.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
+checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
 dependencies = [
  "bytes",
  "libc",
@@ -4722,9 +4752,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.6.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4777,18 +4807,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.7.5+spec-1.1.0"
+version = "1.0.0+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+checksum = "32c2555c699578a4f59f0cc68e5116c8d7cabbd45e1409b989d4be085b53f13e"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.23.10+spec-1.0.0"
+version = "0.25.4+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
+checksum = "7193cbd0ce53dc966037f54351dbbcf0d5a642c7f0038c382ef9e677ce8c13f2"
 dependencies = [
  "indexmap",
  "toml_datetime",
@@ -4798,18 +4828,18 @@ dependencies = [
 
 [[package]]
 name = "toml_parser"
-version = "1.0.6+spec-1.1.0"
+version = "1.0.9+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
+checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4"
 dependencies = [
  "winnow",
 ]
 
 [[package]]
 name = "tower"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
 dependencies = [
  "futures-core",
  "futures-util",
@@ -4827,7 +4857,7 @@ version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytes",
  "futures-util",
  "http",
@@ -4936,13 +4966,13 @@ checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
 
 [[package]]
 name = "uds_windows"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
+checksum = "51b70b87d15e91f553711b40df3048faf27a7a04e01e0ddc0cf9309f0af7c2ca"
 dependencies = [
  "memoffset",
  "tempfile",
- "winapi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4973,9 +5003,9 @@ checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.22"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-segmentation"
@@ -4989,6 +5019,12 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -5031,9 +5067,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.19.0"
+version = "1.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
+checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37"
 dependencies = [
  "js-sys",
  "serde_core",
@@ -5055,7 +5091,7 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 [[package]]
 name = "vello"
 version = "0.7.0"
-source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
+source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
 dependencies = [
  "bytemuck",
  "futures-intrusive",
@@ -5064,7 +5100,7 @@ dependencies = [
  "png 0.17.16",
  "skrifa 0.40.0",
  "static_assertions",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "vello_encoding",
  "vello_shaders",
  "wgpu",
@@ -5073,7 +5109,7 @@ dependencies = [
 [[package]]
 name = "vello_api"
 version = "0.7.0"
-source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
+source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
 dependencies = [
  "bytemuck",
  "peniko",
@@ -5082,24 +5118,23 @@ dependencies = [
 [[package]]
 name = "vello_common"
 version = "0.0.6"
-source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
+source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
 dependencies = [
  "bytemuck",
  "fearless_simd",
- "guillotiere",
  "hashbrown 0.16.1",
  "log",
  "peniko",
  "png 0.17.16",
  "skrifa 0.40.0",
  "smallvec",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "vello_cpu"
 version = "0.0.6"
-source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
+source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
 dependencies = [
  "bytemuck",
  "hashbrown 0.16.1",
@@ -5110,7 +5145,7 @@ dependencies = [
 [[package]]
 name = "vello_encoding"
 version = "0.7.0"
-source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
+source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
 dependencies = [
  "bytemuck",
  "guillotiere",
@@ -5122,13 +5157,12 @@ dependencies = [
 [[package]]
 name = "vello_hybrid"
 version = "0.0.6"
-source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
+source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
 dependencies = [
  "bytemuck",
- "guillotiere",
  "hashbrown 0.16.1",
  "log",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "vello_api",
  "vello_common",
  "vello_sparse_shaders",
@@ -5138,19 +5172,19 @@ dependencies = [
 [[package]]
 name = "vello_shaders"
 version = "0.7.0"
-source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
+source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
 dependencies = [
  "bytemuck",
  "log",
  "naga",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "vello_encoding",
 ]
 
 [[package]]
 name = "vello_sparse_shaders"
 version = "0.0.6"
-source = "git+https://github.com/linebender/vello.git?rev=ab333dc5205c00fb527a36ff8466abd35798c6b6#ab333dc5205c00fb527a36ff8466abd35798c6b6"
+source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
 
 [[package]]
 name = "version_check"
@@ -5185,18 +5219,27 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.1+wasi-0.2.4"
+version = "1.0.2+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
  "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.106"
+version = "0.2.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
+checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -5207,11 +5250,12 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.56"
+version = "0.4.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c"
+checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
 dependencies = [
  "cfg-if",
+ "futures-util",
  "js-sys",
  "once_cell",
  "wasm-bindgen",
@@ -5220,9 +5264,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.106"
+version = "0.2.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
+checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5230,9 +5274,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.106"
+version = "0.2.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
+checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -5243,22 +5287,56 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.106"
+version = "0.2.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
+checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags 2.11.0",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver",
+]
+
 [[package]]
 name = "wayland-backend"
-version = "0.3.12"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9"
+checksum = "aa75f400b7f719bcd68b3f47cd939ba654cedeef690f486db71331eec4c6a406"
 dependencies = [
  "cc",
  "downcast-rs",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "scoped-tls",
  "smallvec",
  "wayland-sys",
@@ -5266,12 +5344,12 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.12"
+version = "0.31.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec"
+checksum = "ab51d9f7c071abeee76007e2b742499e535148035bb835f97aaed1338cf516c3"
 dependencies = [
- "bitflags 2.10.0",
- "rustix 1.1.3",
+ "bitflags 2.11.0",
+ "rustix 1.1.4",
  "wayland-backend",
  "wayland-scanner",
 ]
@@ -5282,29 +5360,29 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "cursor-icon",
  "wayland-backend",
 ]
 
 [[package]]
 name = "wayland-cursor"
-version = "0.31.12"
+version = "0.31.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5864c4b5b6064b06b1e8b74ead4a98a6c45a285fe7a0e784d24735f011fdb078"
+checksum = "4b3298683470fbdc6ca40151dfc48c8f2fd4c41a26e13042f801f85002384091"
 dependencies = [
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "wayland-client",
  "xcursor",
 ]
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.10"
+version = "0.32.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3"
+checksum = "b23b5df31ceff1328f06ac607591d5ba360cf58f90c8fad4ac8d3a55a3c4aec7"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -5312,11 +5390,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-plasma"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa98634619300a535a9a97f338aed9a5ff1e01a461943e8346ff4ae26007306b"
+checksum = "d392fc283a87774afc9beefcd6f931582bb97fe0e6ced0b306a62cb1d026527c"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -5325,11 +5403,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9597cdf02cf0c34cd5823786dce6b5ae8598f05c2daf5621b6e178d4f7345f3"
+checksum = "78248e4cc0eff8163370ba5c158630dcae1f3497a586b826eca2ef5f348d6235"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -5338,20 +5416,20 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.8"
+version = "0.31.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3"
+checksum = "c86287151a309799b821ca709b7345a048a2956af05957c89cb824ab919fa4e3"
 dependencies = [
  "proc-macro2",
- "quick-xml",
+ "quick-xml 0.39.2",
  "quote",
 ]
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.8"
+version = "0.31.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd"
+checksum = "374f6b70e8e0d6bf9461a32988fd553b59ff630964924dad6e4a4eb6bd538d17"
 dependencies = [
  "dlib",
  "log",
@@ -5361,9 +5439,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.83"
+version = "0.3.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac"
+checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5381,9 +5459,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-root-certs"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36a29fc0408b113f68cf32637857ab740edfafdf460c326cd2afaa2d84cc05dc"
+checksum = "804f18a4ac2676ffb4e8b5b5fa9ae38af06df08162314f96a68d2a363e21a8ca"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -5396,12 +5474,13 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
 
 [[package]]
 name = "wgpu"
-version = "27.0.1"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77"
+checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f"
 dependencies = [
  "arrayvec",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
+ "bytemuck",
  "cfg-if",
  "cfg_aliases",
  "document-features",
@@ -5425,14 +5504,14 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "27.0.3"
+version = "28.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27a75de515543b1897b26119f93731b385a19aea165a1ec5f0e3acecc229cae7"
+checksum = "d23f4642f53f666adcfd2d3218ab174d1e6681101aef18696b90cbe64d1c10f9"
 dependencies = [
  "arrayvec",
  "bit-set",
  "bit-vec",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytemuck",
  "cfg_aliases",
  "document-features",
@@ -5447,7 +5526,7 @@ dependencies = [
  "raw-window-handle",
  "rustc-hash 1.1.0",
  "smallvec",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "wgpu-core-deps-apple",
  "wgpu-core-deps-emscripten",
  "wgpu-core-deps-wasm",
@@ -5458,51 +5537,51 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core-deps-apple"
-version = "27.0.0"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233"
+checksum = "87b7b696b918f337c486bf93142454080a32a37832ba8a31e4f48221890047da"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-emscripten"
-version = "27.0.0"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5"
+checksum = "34b251c331f84feac147de3c4aa3aa45112622a95dd7ee1b74384fa0458dbd79"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-wasm"
-version = "27.0.0"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b1027dcf3b027a877e44819df7ceb0e2e98578830f8cd34cd6c3c7c2a7a50b7"
+checksum = "12a2cf578ce8d7d50d0e63ddc2345c7dcb599f6eb90b888813406ea78b9b7010"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-windows-linux-android"
-version = "27.0.0"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71197027d61a71748e4120f05a9242b2ad142e3c01f8c1b47707945a879a03c3"
+checksum = "68ca976e72b2c9964eb243e281f6ce7f14a514e409920920dcda12ae40febaae"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-hal"
-version = "27.0.4"
+version = "28.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce"
+checksum = "44d6cb474beb218824dcc9e1ce679d973f719262789bfb27407da560cac20eeb"
 dependencies = [
  "android_system_properties",
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block",
  "bytemuck",
  "cfg-if",
@@ -5510,7 +5589,6 @@ dependencies = [
  "core-graphics-types 0.2.0",
  "glow",
  "glutin_wgl_sys",
- "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
  "hashbrown 0.16.1",
@@ -5533,44 +5611,27 @@ dependencies = [
  "raw-window-handle",
  "renderdoc-sys",
  "smallvec",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "wasm-bindgen",
  "web-sys",
  "wgpu-types",
- "windows 0.58.0",
- "windows-core 0.58.0",
+ "windows 0.62.2",
+ "windows-core 0.62.2",
 ]
 
 [[package]]
 name = "wgpu-types"
-version = "27.0.1"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb"
+checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytemuck",
  "js-sys",
  "log",
- "thiserror 2.0.17",
  "web-sys",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
 version = "0.1.11"
@@ -5580,12 +5641,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows"
 version = "0.58.0"
@@ -5612,11 +5667,23 @@ version = "0.61.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
 dependencies = [
- "windows-collections",
+ "windows-collections 0.2.0",
  "windows-core 0.61.2",
- "windows-future",
+ "windows-future 0.2.1",
  "windows-link 0.1.3",
- "windows-numerics",
+ "windows-numerics 0.2.0",
+]
+
+[[package]]
+name = "windows"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
+dependencies = [
+ "windows-collections 0.3.2",
+ "windows-core 0.62.2",
+ "windows-future 0.3.2",
+ "windows-numerics 0.3.1",
 ]
 
 [[package]]
@@ -5628,6 +5695,15 @@ dependencies = [
  "windows-core 0.61.2",
 ]
 
+[[package]]
+name = "windows-collections"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
+dependencies = [
+ "windows-core 0.62.2",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.58.0"
@@ -5667,6 +5743,19 @@ dependencies = [
  "windows-strings 0.4.2",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement 0.60.2",
+ "windows-interface 0.59.3",
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
+]
+
 [[package]]
 name = "windows-future"
 version = "0.2.1"
@@ -5675,7 +5764,18 @@ checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
  "windows-core 0.61.2",
  "windows-link 0.1.3",
- "windows-threading",
+ "windows-threading 0.1.0",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+ "windows-threading 0.2.1",
 ]
 
 [[package]]
@@ -5755,6 +5855,16 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-numerics"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-registry"
 version = "0.6.1"
@@ -5932,6 +6042,15 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-threading"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-win"
 version = "3.0.0"
@@ -6081,14 +6200,14 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winit"
-version = "0.30.12"
+version = "0.30.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66d4b9ed69c4009f6321f762d6e61ad8a2389cd431b97cb1e146812e9e6c732"
+checksum = "a6755fa58a9f8350bd1e472d4c3fcc25f824ec358933bba33306d0b63df5978d"
 dependencies = [
  "ahash",
  "android-activity",
  "atomic-waker",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "bytemuck",
  "calloop",
@@ -6133,18 +6252,100 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.14"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
+checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "wit-bindgen"
-version = "0.46.0"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap",
+ "prettyplease",
+ "syn",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags 2.11.0",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
 
 [[package]]
 name = "writeable"
@@ -6183,7 +6384,7 @@ dependencies = [
  "libc",
  "libloading",
  "once_cell",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "x11rb-protocol",
 ]
 
@@ -6205,7 +6406,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "dlib",
  "log",
  "once_cell",
@@ -6284,9 +6485,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.13.0"
+version = "5.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7515214ab069b46f614dee52c1256015cdc1a0b441ed612118e2871014956741"
+checksum = "ca82f95dbd3943a40a53cfded6c2d0a2ca26192011846a1810c4256ef92c60bc"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -6304,7 +6505,7 @@ dependencies = [
  "hex",
  "libc",
  "ordered-stream",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "serde",
  "serde_repr",
  "tracing",
@@ -6343,9 +6544,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.13.0"
+version = "5.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f54d8a5b4e9c46cf4a9732da4899b12851b5df952fc8deda23aca1d6f3e26c"
+checksum = "897e79616e84aac4b2c46e9132a4f63b93105d54fe8c0e8f6bffc21fa8d49222"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -6373,7 +6574,7 @@ version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "441a0064125265655bccc3a6af6bef56814d9277ac83fce48b1cd7e160b80eac"
 dependencies = [
- "quick-xml",
+ "quick-xml 0.38.4",
  "serde",
  "zbus_names",
  "zvariant",
@@ -6387,18 +6588,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
 
 [[package]]
 name = "zerocopy"
-version = "0.8.33"
+version = "0.8.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd"
+checksum = "a789c6e490b576db9f7e6b6d661bcc9799f7c0ac8352f56ea20193b2681532e5"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.33"
+version = "0.8.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1"
+checksum = "f65c489a7071a749c849713807783f70672b28094011623e200cb86dcb835953"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6468,9 +6669,9 @@ dependencies = [
 
 [[package]]
 name = "zmij"
-version = "1.0.12"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc5a66a20078bf1251bde995aa2fdcc4b800c70b5d92dd2c62abc5c60f679f8"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
 
 [[package]]
 name = "zopfli"
@@ -6492,9 +6693,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
 
 [[package]]
 name = "zune-core"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773"
+checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9"
 
 [[package]]
 name = "zune-jpeg"
@@ -6507,18 +6708,18 @@ dependencies = [
 
 [[package]]
 name = "zune-jpeg"
-version = "0.5.8"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e35aee689668bf9bd6f6f3a6c60bb29ba1244b3b43adfd50edd554a371da37d5"
+checksum = "410e9ecef634c709e3831c2cfdb8d9c32164fae1c67496d5b68fff728eec37fe"
 dependencies = [
- "zune-core 0.5.0",
+ "zune-core 0.5.1",
 ]
 
 [[package]]
 name = "zvariant"
-version = "5.9.0"
+version = "5.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "788ca131e3757991e4b9fe9f7b78ae302749ed96093ff60858a1f4732b04b164"
+checksum = "5708299b21903bbe348e94729f22c49c55d04720a004aa350f1f9c122fd2540b"
 dependencies = [
  "endi",
  "enumflags2",
@@ -6530,9 +6731,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "5.9.0"
+version = "5.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e69a2f6b221a6fec9bd6bcc77c19360cca106f92a5fd948b8aa17d2339c7505"
+checksum = "5b59b012ebe9c46656f9cc08d8da8b4c726510aef12559da3e5f1bf72780752c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/crates/craft_renderer/Cargo.toml b/crates/craft_renderer/Cargo.toml
index ac60047e..8de06bd8 100644
--- a/crates/craft_renderer/Cargo.toml
+++ b/crates/craft_renderer/Cargo.toml
@@ -13,27 +13,27 @@ vello_hybrid_renderer_webgl = ["wgpu/webgl"]
 
 [dependencies.vello]
 git = "https://github.com/linebender/vello.git"
-rev = "ab333dc5205c00fb527a36ff8466abd35798c6b6"
+rev = "ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
 default-features = false
 features = ["wgpu"]
 optional = true
 
 [dependencies.vello_cpu]
 git = "https://github.com/linebender/vello.git"
-rev = "ab333dc5205c00fb527a36ff8466abd35798c6b6"
+rev = "ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
 optional = true
 features = []
 
 [dependencies.vello_hybrid]
 git = "https://github.com/linebender/vello.git"
-rev = "ab333dc5205c00fb527a36ff8466abd35798c6b6"
+rev = "ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
 default-features = false
 features = ["default"]
 optional = true
 
 [dependencies.vello_common]
 git = "https://github.com/linebender/vello.git"
-rev = "ab333dc5205c00fb527a36ff8466abd35798c6b6"
+rev = "ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
 optional = true
 
 [dependencies.softbuffer]
@@ -41,7 +41,7 @@ version = "0.4.8"
 optional = true
 
 [dependencies.wgpu]
-version = "27.0.1"
+version = "28.0.0"
 default-features = false
 features = ["wgsl", "vulkan", "dx12"]
 optional = true

From 4a3009b5fbc34d7b3803245cac595a421219cad0 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 7 Mar 2026 15:28:51 -0500
Subject: [PATCH 063/143] Update deps.

---
 Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0b588c1f..c9894b6d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,7 +50,7 @@ default-features = false
 features = []
 
 [workspace.dependencies.tokio]
-version = "1.49.0"
+version = "1.50.0"
 default-features = false
 features = ["sync", "time"]
 
@@ -73,6 +73,6 @@ features = ["std"]
 version = "1.0.1"
 
 [workspace.dependencies.winit]
-version = "0.30.12"
+version = "0.30.13"
 default-features = false
 features = []
\ No newline at end of file

From 9c96cfe134ee13218db409796f0dad791aefe32c Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 7 Mar 2026 15:32:00 -0500
Subject: [PATCH 064/143] Add vello hybrid and classic features to craft
 retained.

---
 crates/craft_retained/Cargo.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/craft_retained/Cargo.toml b/crates/craft_retained/Cargo.toml
index 24b5a976..295312b3 100644
--- a/crates/craft_retained/Cargo.toml
+++ b/crates/craft_retained/Cargo.toml
@@ -12,6 +12,8 @@ repository = "https://github.com/craft-gui/craft"
 dynamic_linking = []
 clipboard = ["dep:clipboard-rs"]
 vello_cpu_renderer = ["craft_renderer/vello_cpu_renderer"]
+vello_hybrid_renderer = ["craft_renderer/vello_hybrid_renderer"]
+vello_renderer = ["craft_renderer/vello_renderer"]
 
 system_fonts = ["parley/system"]
 

From 4c77ea752ab897b1491fe453f2083f9b563a50ef Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 7 Mar 2026 16:56:09 -0500
Subject: [PATCH 065/143] Use request_apply_layout for text selection.

---
 .../craft_retained/src/text/parley_editor.rs  | 84 +++++++++----------
 1 file changed, 40 insertions(+), 44 deletions(-)

diff --git a/crates/craft_retained/src/text/parley_editor.rs b/crates/craft_retained/src/text/parley_editor.rs
index 6ae8a07c..b1a38e98 100644
--- a/crates/craft_retained/src/text/parley_editor.rs
+++ b/crates/craft_retained/src/text/parley_editor.rs
@@ -18,7 +18,7 @@ use craft_primitives::ColorBrush;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use parley::layout::LayoutAccessibility;
 
-use crate::app::request_layout;
+use crate::app::{request_layout, request_apply_layout};
 use crate::text::RangedStyles;
 
 /// Opaque representation of a generation.
@@ -240,9 +240,9 @@ impl PlainEditorDriver<'_> {
         let selection_range = self.editor.selection.text_range();
         let range = selection_range.end
             ..selection_range
-                .end
-                .saturating_add(len.get())
-                .min(self.editor.buffer.len());
+            .end
+            .saturating_add(len.get())
+            .min(self.editor.buffer.len());
         if range.is_empty() || !self.editor.buffer.is_char_boundary(range.end) {
             return;
         }
@@ -426,12 +426,9 @@ impl PlainEditorDriver<'_> {
     // --- MARK: Cursor Movement ---
     /// Move the cursor to the cluster boundary nearest this point in the layout.
     pub fn move_to_point(&mut self, x: f32, y: f32) {
-        self.refresh_layout();
         self.editor
             .set_selection(Selection::from_point(&self.editor.layout, x, y));
-        if let Some(taffy_id) = self.editor.taffy_id {
-            request_layout(taffy_id);
-        }
+        self.request_apply_layout();
     }
 
     /// Move the cursor to a byte index.
@@ -443,81 +440,81 @@ impl PlainEditorDriver<'_> {
             self.refresh_layout();
             self.editor.set_selection(self.editor.cursor_at(index).into());
         }
+        self.request_apply_layout();
     }
 
     /// Move the cursor to the start of the buffer.
     pub fn move_to_text_start(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.move_lines(&self.editor.layout, isize::MIN, false));
+        self.request_apply_layout();
     }
 
     /// Move the cursor to the start of the physical line.
     pub fn move_to_line_start(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.line_start(&self.editor.layout, false));
+        self.request_apply_layout();
     }
 
     /// Move the cursor to the end of the buffer.
     pub fn move_to_text_end(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.move_lines(&self.editor.layout, isize::MAX, false));
+        self.request_apply_layout();
     }
 
     /// Move the cursor to the end of the physical line.
     pub fn move_to_line_end(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.line_end(&self.editor.layout, false));
+        self.request_apply_layout();
     }
 
     /// Move up to the closest physical cluster boundary on the previous line, preserving the horizontal position for repeated movements.
     pub fn move_up(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.previous_line(&self.editor.layout, false));
+        self.request_apply_layout();
     }
 
     /// Move down to the closest physical cluster boundary on the next line, preserving the horizontal position for repeated movements.
     pub fn move_down(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.next_line(&self.editor.layout, false));
+        self.request_apply_layout();
     }
 
     /// Move to the next cluster left in visual order.
     pub fn move_left(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.previous_visual(&self.editor.layout, false));
+        self.request_apply_layout();
     }
 
     /// Move to the next cluster right in visual order.
     pub fn move_right(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.next_visual(&self.editor.layout, false));
+        self.request_apply_layout();
     }
 
     /// Move to the next word boundary left.
     pub fn move_word_left(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.previous_visual_word(&self.editor.layout, false));
+        self.request_apply_layout();
     }
 
     /// Move to the next word boundary right.
     pub fn move_word_right(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.next_visual_word(&self.editor.layout, false));
+        self.request_apply_layout();
     }
 
     /// Select the whole buffer.
     pub fn select_all(&mut self) {
-        self.refresh_layout();
         self.editor.set_selection(
             Selection::from_byte_index(&self.editor.layout, 0_usize, Affinity::default()).move_lines(
                 &self.editor.layout,
@@ -525,112 +522,111 @@ impl PlainEditorDriver<'_> {
                 true,
             ),
         );
+        self.request_apply_layout();
+    }
+
+    fn request_apply_layout(&self) {
+        if let Some(taffy_id) = self.editor.taffy_id {
+            request_apply_layout(taffy_id);
+        }
     }
 
     /// Collapse selection into caret.
     pub fn collapse_selection(&mut self) {
         self.editor.set_selection(self.editor.selection.collapse());
+        self.request_apply_layout();
     }
 
     /// Move the selection focus point to the start of the buffer.
     pub fn select_to_text_start(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.move_lines(&self.editor.layout, isize::MIN, true));
+        self.request_apply_layout();
     }
 
     /// Move the selection focus point to the start of the physical line.
     pub fn select_to_line_start(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.line_start(&self.editor.layout, true));
+        self.request_apply_layout();
     }
 
     /// Move the selection focus point to the end of the buffer.
     pub fn select_to_text_end(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.move_lines(&self.editor.layout, isize::MAX, true));
+        self.request_apply_layout();
     }
 
     /// Move the selection focus point to the end of the physical line.
     pub fn select_to_line_end(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.line_end(&self.editor.layout, true));
+        self.request_apply_layout();
     }
 
     /// Move the selection focus point up to the nearest cluster boundary on the previous line, preserving the horizontal position for repeated movements.
     pub fn select_up(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.previous_line(&self.editor.layout, true));
+        self.request_apply_layout();
     }
 
     /// Move the selection focus point down to the nearest cluster boundary on the next line, preserving the horizontal position for repeated movements.
     pub fn select_down(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.next_line(&self.editor.layout, true));
+        self.request_apply_layout();
     }
 
     /// Move the selection focus point to the next cluster left in visual order.
     pub fn select_left(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.previous_visual(&self.editor.layout, true));
+        self.request_apply_layout();
     }
 
     /// Move the selection focus point to the next cluster right in visual order.
     pub fn select_right(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.next_visual(&self.editor.layout, true));
+        self.request_apply_layout();
     }
 
     /// Move the selection focus point to the next word boundary left.
     pub fn select_word_left(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.previous_visual_word(&self.editor.layout, true));
+        self.request_apply_layout();
     }
 
     /// Move the selection focus point to the next word boundary right.
     pub fn select_word_right(&mut self) {
-        self.refresh_layout();
         self.editor
             .set_selection(self.editor.selection.next_visual_word(&self.editor.layout, true));
-        if let Some(taffy_id) = self.editor.taffy_id {
-            request_layout(taffy_id);
-        }
+        self.request_apply_layout();
     }
 
     /// Select the word at the point.
     pub fn select_word_at_point(&mut self, x: f32, y: f32) {
-        self.refresh_layout();
         self.editor
             .set_selection(Selection::word_from_point(&self.editor.layout, x, y));
-        if let Some(taffy_id) = self.editor.taffy_id {
-            request_layout(taffy_id);
-        }
+        self.request_apply_layout();
     }
 
     /// Select the physical line at the point.
     pub fn select_line_at_point(&mut self, x: f32, y: f32) {
-        self.refresh_layout();
         let line = Selection::line_from_point(&self.editor.layout, x, y);
         self.editor.set_selection(line);
-        if let Some(taffy_id) = self.editor.taffy_id {
-            request_layout(taffy_id);
-        }
+        self.request_apply_layout();
     }
 
     /// Move the selection focus point to the cluster boundary closest to point.
     pub fn extend_selection_to_point(&mut self, x: f32, y: f32) {
-        self.refresh_layout();
         // FIXME: This is usually the wrong way to handle selection extension for mouse moves, but not a regression.
         self.editor
             .set_selection(self.editor.selection.extend_to_point(&self.editor.layout, x, y));
+        self.request_apply_layout();
     }
 
     /// Move the selection focus point to a byte index.
@@ -639,9 +635,9 @@ impl PlainEditorDriver<'_> {
     #[allow(dead_code)]
     pub fn extend_selection_to_byte(&mut self, index: usize) {
         if self.editor.buffer.is_char_boundary(index) {
-            self.refresh_layout();
             self.editor
                 .set_selection(self.editor.selection.extend(self.editor.cursor_at(index)));
+            self.request_apply_layout();
         }
     }
 
@@ -651,9 +647,9 @@ impl PlainEditorDriver<'_> {
     #[allow(dead_code)]
     pub fn select_byte_range(&mut self, start: usize, end: usize) {
         if self.editor.buffer.is_char_boundary(start) && self.editor.buffer.is_char_boundary(end) {
-            self.refresh_layout();
             self.editor
                 .set_selection(Selection::new(self.editor.cursor_at(start), self.editor.cursor_at(end)));
+            self.request_apply_layout();
         }
     }
 
@@ -1123,4 +1119,4 @@ impl PlainEditor {
         }
         node.add_action(accesskit::Action::SetTextSelection);
     }
-}
+}
\ No newline at end of file

From b601f4ce1a92019764caa3e666dff44683d411cc Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 7 Mar 2026 17:14:00 -0500
Subject: [PATCH 066/143] Add window title.

---
 crates/craft_retained/src/elements/window.rs    | 15 +++++++++------
 crates/craft_retained/src/options.rs            | 10 +++++-----
 crates/craft_retained/src/text/parley_editor.rs |  2 +-
 crates/craft_retained/tests/counter.rs          |  2 +-
 examples/counter_retained/main.rs               |  2 +-
 examples/jsframeworkbench/main.rs               |  2 +-
 examples/multiwindow/main.rs                    |  2 +-
 examples/pointer_events/main.rs                 |  2 +-
 examples/text/main.rs                           |  2 +-
 9 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 6ddfdf57..972eb92f 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -64,11 +64,13 @@ pub struct WindowInternal {
     pub(crate) accesskit_adapter: Option<Adapter>,
 
     advanced_window_fn: Option<WindowConstructor>,
+
+    title: Option<String>,
 }
 
 impl Default for Window {
     fn default() -> Self {
-        Self::new()
+        Self::new("Craft")
     }
 }
 
@@ -77,13 +79,13 @@ impl Window {
     where
         F: FnMut(&ActiveEventLoop) -> WinitWindow + 'static,
     {
-        let inner = WindowInternal::new(Some(f));
+        let inner = WindowInternal::new(Some(f), None);
 
         Window { inner }
     }
 
-    pub fn new() -> Self {
-        let inner = WindowInternal::new(None::<fn(&ActiveEventLoop) -> WinitWindow>);
+    pub fn new(title: &str) -> Self {
+        let inner = WindowInternal::new(None::<fn(&ActiveEventLoop) -> WinitWindow>, Some(title));
 
         Window { inner }
     }
@@ -173,7 +175,7 @@ impl Window {
 }
 
 impl WindowInternal {
-    pub fn new<F>(f: Option<F>) -> Rc<RefCell<Self>>
+    pub fn new<F>(f: Option<F>, title: Option<&str>) -> Rc<RefCell<Self>>
     where
         F: FnMut(&ActiveEventLoop) -> WinitWindow + 'static,
     {
@@ -190,6 +192,7 @@ impl WindowInternal {
                 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
                 accesskit_adapter: None,
                 advanced_window_fn: f.map(|f| Box::new(f) as WindowConstructor),
+                title: title.map(|title| title.to_string()),
             })
         });
 
@@ -367,7 +370,7 @@ impl WindowInternal {
             (*window_fn)(event_loop)
         } else {
             event_loop
-                .create_window(WindowAttributes::default().with_visible(false))
+                .create_window(WindowAttributes::default().with_title(self.title.as_ref().unwrap()).with_visible(false))
                 .expect("Failed to create window")
         });
         self.set_winit_window(Some(winit_window.clone()));
diff --git a/crates/craft_retained/src/options.rs b/crates/craft_retained/src/options.rs
index c4710dcc..24242f47 100644
--- a/crates/craft_retained/src/options.rs
+++ b/crates/craft_retained/src/options.rs
@@ -18,7 +18,7 @@ pub struct CraftOptions {
     /// The title of the application window.
     ///
     /// Defaults to `"craft"`.
-    pub window_title: String,
+    pub app_name: String,
     /// The initial size of the window.
     pub window_size: Option<Size<f32>>,
     pub craft_callback: Option<CraftCallback>,
@@ -28,7 +28,7 @@ impl Default for CraftOptions {
     fn default() -> Self {
         Self {
             renderer: RendererType::default(),
-            window_title: "craft".to_string(),
+            app_name: "craft".to_string(),
             window_size: None,
             craft_callback: None,
         }
@@ -36,10 +36,10 @@ impl Default for CraftOptions {
 }
 
 impl CraftOptions {
-    pub fn basic(title: &str) -> Self {
+    pub fn basic(app_name: &str) -> Self {
         Self {
             renderer: RendererType::default(),
-            window_title: title.to_string(),
+            app_name: app_name.to_string(),
             window_size: None,
             craft_callback: None,
         }
@@ -51,7 +51,7 @@ impl CraftOptions {
             renderer: RendererType::VelloCPU,
             #[cfg(not(feature = "vello_cpu_renderer"))]
             renderer: RendererType::default(),
-            window_title: title.to_string(),
+            app_name: title.to_string(),
             window_size: None,
             craft_callback: Some(callback),
         }
diff --git a/crates/craft_retained/src/text/parley_editor.rs b/crates/craft_retained/src/text/parley_editor.rs
index b1a38e98..65fe9a7e 100644
--- a/crates/craft_retained/src/text/parley_editor.rs
+++ b/crates/craft_retained/src/text/parley_editor.rs
@@ -18,7 +18,7 @@ use craft_primitives::ColorBrush;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use parley::layout::LayoutAccessibility;
 
-use crate::app::{request_layout, request_apply_layout};
+use crate::app::{request_apply_layout};
 use crate::text::RangedStyles;
 
 /// Opaque representation of a generation.
diff --git a/crates/craft_retained/tests/counter.rs b/crates/craft_retained/tests/counter.rs
index 8ac73794..4ee0f95c 100644
--- a/crates/craft_retained/tests/counter.rs
+++ b/crates/craft_retained/tests/counter.rs
@@ -41,7 +41,7 @@ fn counter() {
 
     let add_button = create_button("+", rgb(76, 175, 80), 1, count.clone(), count_text.clone());
 
-    let window = Window::new()
+    let window = Window::new("Counter")
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::Center))
         .align_items(Some(AlignItems::Center))
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index 5ea3e831..6cd02ae5 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -34,7 +34,7 @@ fn main() {
     let count = Rc::new(RefCell::new(0));
     let count_text = Text::new(&format!("Count: {}", count.borrow()));
 
-    Window::new()
+    Window::new("Counter")
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::Center))
         .align_items(Some(AlignItems::Center))
diff --git a/examples/jsframeworkbench/main.rs b/examples/jsframeworkbench/main.rs
index 11f6c909..5ccb5bb9 100644
--- a/examples/jsframeworkbench/main.rs
+++ b/examples/jsframeworkbench/main.rs
@@ -273,7 +273,7 @@ fn main() {
     let state = Rc::new(RefCell::new(State::new(data_list.clone())));
 
     let body = build_body(state);
-    Window::new()
+    Window::new("JsFrameworkBench")
         .width(Unit::Percentage(100.0))
         .height(Unit::Percentage(100.0))
         .push(body);
diff --git a/examples/multiwindow/main.rs b/examples/multiwindow/main.rs
index 29c2747a..01290d6b 100644
--- a/examples/multiwindow/main.rs
+++ b/examples/multiwindow/main.rs
@@ -77,7 +77,7 @@ pub fn counter() -> Window {
             count_text.clone(),
         ));
 
-    Window::new()
+    Window::new("MultiWindow")
         .display(Display::Flex)
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::Center))
diff --git a/examples/pointer_events/main.rs b/examples/pointer_events/main.rs
index a42f2594..df6e3a11 100644
--- a/examples/pointer_events/main.rs
+++ b/examples/pointer_events/main.rs
@@ -154,7 +154,7 @@ fn main() {
     let pointer_capture_event_log = Text::new("");
     let pointer_capture_draggable_container = Text::new("Draggable");
 
-    Window::new()
+    Window::new("Pointer Events")
         .display(Display::Flex)
         .flex_direction(FlexDirection::Column)
         .overflow(Overflow::Visible, Overflow::Scroll)
diff --git a/examples/text/main.rs b/examples/text/main.rs
index 05c2318c..97241629 100644
--- a/examples/text/main.rs
+++ b/examples/text/main.rs
@@ -3,7 +3,7 @@ use craft_retained::rgb;
 use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Unit};
 
 fn main() {
-    let root = Window::new();
+    let root = Window::new("Text");
     root.push(
         Container::new()
             .display(Display::Flex)

From 0ae702905176a6ed9667d43443fe929ad2b175f9 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 14 Mar 2026 09:32:44 -0400
Subject: [PATCH 067/143] Move scroll state -> layout

Layout has a scroll state
---
 crates/craft_retained/src/elements/container.rs  |  6 +++---
 .../craft_retained/src/elements/element_data.rs  | 14 ++++----------
 crates/craft_retained/src/elements/mod.rs        |  4 +++-
 crates/craft_retained/src/elements/scrollable.rs |  6 +++---
 .../src/elements/text_input/mod.rs               |  6 +++---
 .../src/elements/traits/element_internals.rs     |  2 +-
 crates/craft_retained/src/elements/window.rs     |  6 +++---
 crates/craft_retained/src/layout/layout_item.rs  | 16 ++++++++++++++++
 8 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 697d809b..0dc91cee 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -93,14 +93,14 @@ impl ElementInternals for ContainerInner {
             // For scroll changes from taffy;
             self.element_data.apply_scroll(layout);
             self.apply_clip(clip_bounds);
-            self.element_data.scroll_state.mark_old();
+            self.element_data.layout_item.scroll_state.mark_old();
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.scroll_state.is_new()
+        if !dirty && self.element_data.layout_item.scroll_state.is_new()
         {
             self.element_data.apply_scroll(layout);
-            self.element_data.scroll_state.mark_old();
+            self.element_data.layout_item.scroll_state.mark_old();
         }
 
         if has_new_layout {
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index e72a31c6..b9ed1187 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -36,10 +36,6 @@ pub struct ElementData {
     /// A unique id for this element. Within a craft app the id will be unique even across windows.
     pub(crate) internal_id: u64,
 
-    /// Scrollbar state for elements that may have a scrollbar.
-    pub(super) scroll_state: ScrollState,
-    pub(super) is_scrollable: bool,
-
     // Events:
     pub on_slider_value_changed: Vec<SliderValueChangedHandler>,
     pub on_pointer_enter: Vec<PointerEnterHandler>,
@@ -54,17 +50,15 @@ pub struct ElementData {
 }
 
 impl ElementData {
-    pub fn new(me: Weak<RefCell<dyn ElementInternals>>, scrollable: bool) -> Self {
+    pub fn new(me: Weak<RefCell<dyn ElementInternals>>, is_scrollable: bool) -> Self {
         let default = Self {
             me,
             parent: None,
             style: Style::new(),
-            layout_item: Default::default(),
+            layout_item: LayoutItem::new(is_scrollable),
             children: Default::default(),
             id: None,
             internal_id: create_unique_element_id(),
-            scroll_state: ScrollState::default(),
-            is_scrollable: scrollable,
             on_slider_value_changed: Vec::new(),
             on_pointer_enter: Vec::new(),
             on_pointer_leave: Vec::new(),
@@ -103,13 +97,13 @@ impl ElementData {
     }
 
     pub(crate) fn scroll(&self) -> ScrollState {
-        self.scroll_state
+        self.layout_item.scroll_state
     }
 }
 
 impl ElementData {
     pub fn is_scrollable(&self) -> bool {
-        self.style.get_overflow()[1] == Overflow::Scroll && self.is_scrollable
+        self.style.get_overflow()[1] == Overflow::Scroll && self.layout_item.is_scrollable()
     }
 
     pub fn current_style(&self) -> &Style {
diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index d635f672..4861e05f 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -6,13 +6,15 @@ mod text;
 mod element_id;
 mod element_id_map;
 mod image;
-mod scrollable;
+pub(crate) mod scrollable;
 mod slider;
 mod text_input;
 mod window;
+mod dropdown;
 
 pub use traits::{ElementInternals, ElementData, Element, AsElement, resolve_clip_for_scrollable};
 pub use container::{Container, ContainerInner};
+pub use dropdown::{Dropdown, DropdownInner};
 pub use element_id_map::ElementIdMap;
 pub use image::Image;
 pub use slider::{Slider, SliderDirection, SliderInner};
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 8e45ab64..8495a71c 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -109,7 +109,7 @@ pub(crate) fn scroll_to(data: &mut ElementData, y: f32) {
         return;
     }
 
-    data.scroll_state.set_scroll_y(f32::max(0.0, y));
+    data.layout_item.scroll_state.set_scroll_y(f32::max(0.0, y));
     let new_event = Event::new(data.me.upgrade().unwrap().clone());
     request_apply_layout(data.layout_item.taffy_node_id.unwrap());
     queue_event(new_event, CraftMessage::Scroll());
@@ -164,7 +164,7 @@ pub(crate) fn scroll_to_child_by_id_with_options(data: &mut ElementData, id: &st
 pub(crate) fn apply_scroll_layout(element: &mut ElementData, layout: &Layout) {
     element.layout_item.scrollbar_size = Size::new(layout.scrollbar_size.width, layout.scrollbar_size.height);
     element.layout_item.computed_scrollbar_size = Size::new(layout.scroll_width(), layout.scroll_height());
-    let state = &mut element.scroll_state;
+    let state = &mut element.layout_item.scroll_state;
 
     if element.style.get_overflow()[1] != Overflow::Scroll {
         return;
@@ -231,7 +231,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
     let element_data = element.element_data_mut();
 
     if element_data.is_scrollable() {
-        let state = &mut element_data.scroll_state;
+        let state = &mut element_data.layout_item.scroll_state;
         match message {
             CraftMessage::PointerScroll(mouse_wheel) => {
                 let delta = match mouse_wheel.delta {
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 4f34acab..09be14af 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -175,7 +175,7 @@ impl ElementInternals for TextInputInner {
             self.apply_borders(scale_factor);
 
             self.element_data.apply_scroll(result);
-            self.element_data.scroll_state.mark_old();
+            self.element_data.layout_item.scroll_state.mark_old();
 
             let text_position = self.computed_box().content_rectangle();
             self.state.set_origin(&text_position.position());
@@ -184,11 +184,11 @@ impl ElementInternals for TextInputInner {
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.scroll_state.is_new()
+        if !dirty && self.element_data.layout_item.scroll_state.is_new()
         {
             let result = taffy_tree.layout(node);
             self.element_data.apply_scroll(result);
-            self.element_data.scroll_state.mark_old();
+            self.element_data.layout_item.scroll_state.mark_old();
         }
 
         if has_new_layout {
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index 22fda066..d5917c31 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -638,7 +638,7 @@ pub trait ElementInternals: ElementData + Any {
     }
 
     fn get_scroll_state(&self) -> ScrollState {
-        self.element_data().scroll_state
+        self.element_data().layout_item.scroll_state
     }
 
     /// Returns the element's [`ElementBox`].
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 972eb92f..fb77521c 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -530,14 +530,14 @@ impl ElementInternals for WindowInternal {
             // For scroll changes from taffy;
             self.element_data.apply_scroll(layout);
             self.apply_clip(clip_bounds);
-            self.element_data.scroll_state.mark_old();
+            self.element_data.layout_item.scroll_state.mark_old();
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.scroll_state.is_new()
+        if !dirty && self.element_data.layout_item.scroll_state.is_new()
         {
             self.element_data.apply_scroll(layout);
-            self.element_data.scroll_state.mark_old();
+            self.element_data.layout_item.scroll_state.mark_old();
         }
 
         if has_new_layout {
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index 650dcb3a..160874f1 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -5,6 +5,7 @@ use kurbo::{Affine, BezPath, Shape, Vec2};
 use peniko::Color;
 use taffy::NodeId;
 use craft_renderer::renderer::BoxShadowCmd;
+use crate::elements::scrollable::ScrollState;
 use crate::style::{BoxShadow, Position, Style};
 
 impl CssComputedBorder {
@@ -63,9 +64,24 @@ pub struct LayoutItem {
     pub has_new_layout: bool,
     transform: Affine,
     pub position: Point,
+
+    /// Scrollbar state for elements that may have a scrollbar.
+    pub scroll_state: ScrollState,
+    is_scrollable: bool,
 }
 
 impl LayoutItem {
+    pub(crate) fn new(is_scrollable: bool) -> Self {
+        Self {
+            is_scrollable,
+            ..Default::default()
+        }
+    }
+
+    pub(crate) fn is_scrollable(&self) -> bool {
+        self.is_scrollable
+    }
+
     pub(crate) fn get_transform(&self) -> Affine {
         self.transform
     }

From af4f1be683d7c01634e9bcf1bb6d7d18761f3d48 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 14 Mar 2026 09:36:14 -0400
Subject: [PATCH 068/143] Rename LayoutItem -> Layout

---
 .../craft_retained/src/elements/container.rs  | 18 ++---
 .../src/elements/element_data.rs              | 15 ++--
 crates/craft_retained/src/elements/image.rs   |  4 +-
 .../craft_retained/src/elements/scrollable.rs | 77 +++++++++----------
 .../src/elements/slider/slider_draw.rs        |  2 +-
 .../src/elements/slider/slider_element.rs     | 12 +--
 crates/craft_retained/src/elements/text.rs    | 10 +--
 .../src/elements/text_input/mod.rs            | 22 +++---
 .../src/elements/traits/element_internals.rs  | 64 +++++++--------
 crates/craft_retained/src/elements/window.rs  | 24 +++---
 .../src/layout/{layout_item.rs => layout.rs}  |  4 +-
 crates/craft_retained/src/layout/mod.rs       |  2 +-
 12 files changed, 126 insertions(+), 128 deletions(-)
 rename crates/craft_retained/src/layout/{layout_item.rs => layout.rs} (99%)

diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 0dc91cee..a84fde8e 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -78,14 +78,14 @@ impl ElementInternals for ContainerInner {
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
     ) {
-        let node = self.element_data.layout_item.taffy_node_id.unwrap();
+        let node = self.element_data.layout.taffy_node_id.unwrap();
         let layout = taffy_tree.layout(node);
         let has_new_layout = taffy_tree.get_has_new_layout(node);
 
         let dirty = has_new_layout
-            || transform != self.element_data.layout_item.get_transform()
-            || position != self.element_data.layout_item.position;
-        self.element_data.layout_item.has_new_layout = has_new_layout;
+            || transform != self.element_data.layout.get_transform()
+            || position != self.element_data.layout.position;
+        self.element_data.layout.has_new_layout = has_new_layout;
 
         if dirty {
             self.resolve_box(position, transform, layout, z_index);
@@ -93,14 +93,14 @@ impl ElementInternals for ContainerInner {
             // For scroll changes from taffy;
             self.element_data.apply_scroll(layout);
             self.apply_clip(clip_bounds);
-            self.element_data.layout_item.scroll_state.mark_old();
+            self.element_data.layout.scroll_state.mark_old();
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.layout_item.scroll_state.is_new()
+        if !dirty && self.element_data.layout.scroll_state.is_new()
         {
             self.element_data.apply_scroll(layout);
-            self.element_data.layout_item.scroll_state.mark_old();
+            self.element_data.layout.scroll_state.mark_old();
         }
 
         if has_new_layout {
@@ -168,8 +168,8 @@ impl ElementInternals for ContainerInner {
 
         // Add the children's taffy node.
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
-            let child_id = child.borrow().element_data().layout_item.taffy_node_id;
+            let parent_id = self.element_data.layout.taffy_node_id.unwrap();
+            let child_id = child.borrow().element_data().layout.taffy_node_id;
             if let Some(child_id) = child_id {
                 taffy_tree.add_child(parent_id, child_id);
             }
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index b9ed1187..80f685e5 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -1,7 +1,6 @@
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 use smol_str::SmolStr;
-use taffy::Layout;
 
 use crate::app::{ELEMENTS, TAFFY_TREE};
 use crate::elements::ElementInternals;
@@ -9,7 +8,7 @@ use crate::elements::element_id::create_unique_element_id;
 use crate::elements::scrollable::{apply_scroll_layout, ScrollState};
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::layout::layout_context::LayoutContext;
-use crate::layout::layout_item::LayoutItem;
+use crate::layout::layout::Layout;
 use crate::style::{Overflow, Style};
 
 /// Stores common data to most elements.
@@ -25,7 +24,7 @@ pub struct ElementData {
     pub style: Box<Style>,
 
     /// Stores the layout data for an element.
-    pub layout_item: LayoutItem,
+    pub layout: Layout,
 
     /// The children of the element.
     pub children: Vec<Rc<RefCell<dyn ElementInternals>>>,
@@ -55,7 +54,7 @@ impl ElementData {
             me,
             parent: None,
             style: Style::new(),
-            layout_item: LayoutItem::new(is_scrollable),
+            layout: Layout::new(is_scrollable),
             children: Default::default(),
             id: None,
             internal_id: create_unique_element_id(),
@@ -87,23 +86,23 @@ impl ElementData {
             } else {
                 taffy_tree.new_leaf(style)
             };
-            self.layout_item.taffy_node_id = Some(node_id);
+            self.layout.taffy_node_id = Some(node_id);
         });
     }
 
     /// Computes the scrollbar's tack and thumb layout.
-    pub(crate) fn apply_scroll(&mut self, layout: &Layout) {
+    pub(crate) fn apply_scroll(&mut self, layout: &taffy::Layout) {
        apply_scroll_layout(self, layout);
     }
 
     pub(crate) fn scroll(&self) -> ScrollState {
-        self.layout_item.scroll_state
+        self.layout.scroll_state
     }
 }
 
 impl ElementData {
     pub fn is_scrollable(&self) -> bool {
-        self.style.get_overflow()[1] == Overflow::Scroll && self.layout_item.is_scrollable()
+        self.style.get_overflow()[1] == Overflow::Scroll && self.layout.is_scrollable()
     }
 
     pub fn current_style(&self) -> &Style {
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 2d5cca49..e5345251 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -57,7 +57,7 @@ impl Image {
             let context = LayoutContext::Image(ImageContext::new(resource_identifier));
             let node = self
                 .element_data
-                .layout_item
+                .layout
                 .taffy_node_id
                 .expect("Failed to get Image node");
             taffy_tree.set_node_context(node, Some(context));
@@ -94,7 +94,7 @@ impl ElementInternals for Image {
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
     ) {
-        let layout = taffy_tree.layout(self.element_data.layout_item.taffy_node_id.unwrap());
+        let layout = taffy_tree.layout(self.element_data.layout.taffy_node_id.unwrap());
         self.resolve_box(position, transform, layout, z_index);
 
         self.apply_borders(scale_factor);
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 8495a71c..278af4f6 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -2,7 +2,6 @@ use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::rc::Rc;
 use kurbo::Point;
-use taffy::Layout;
 use ui_events::ScrollDelta;
 use ui_events::pointer::{PointerId, PointerType};
 use craft_primitives::geometry::{Rectangle, Size};
@@ -94,7 +93,7 @@ impl ScrollState {
 }
 
 pub(crate) fn scroll_to_bottom(data: &mut ElementData) {
-    let bottom_y = data.layout_item.max_scroll_y;
+    let bottom_y = data.layout.max_scroll_y;
     scroll_to(data, bottom_y);
 }
 
@@ -109,9 +108,9 @@ pub(crate) fn scroll_to(data: &mut ElementData, y: f32) {
         return;
     }
 
-    data.layout_item.scroll_state.set_scroll_y(f32::max(0.0, y));
+    data.layout.scroll_state.set_scroll_y(f32::max(0.0, y));
     let new_event = Event::new(data.me.upgrade().unwrap().clone());
-    request_apply_layout(data.layout_item.taffy_node_id.unwrap());
+    request_apply_layout(data.layout.taffy_node_id.unwrap());
     queue_event(new_event, CraftMessage::Scroll());
 }
 
@@ -132,17 +131,17 @@ pub(crate) fn scroll_to_child_by_id_with_options(data: &mut ElementData, id: &st
         queue.push_back(child.clone());
     }
 
-    let top_py = data.layout_item.computed_box.padding_rectangle().top();
+    let top_py = data.layout.computed_box.padding_rectangle().top();
 
     while let Some(child) = queue.pop_front().clone() {
         let child = child.borrow();
         let element_data = child.element_data();
         if let Some(child_id) = element_data.id.as_ref() && child_id.as_str() == id {
             let box_model_selected = match options.to {
-                ScrollToBox::BorderBox => element_data.layout_item.computed_box.border_rectangle(),
-                ScrollToBox::MarginBox => element_data.layout_item.computed_box.margin_rectangle(),
-                ScrollToBox::PaddingBox => element_data.layout_item.computed_box.padding_rectangle(),
-                ScrollToBox::ContentBox => element_data.layout_item.computed_box.content_rectangle()
+                ScrollToBox::BorderBox => element_data.layout.computed_box.border_rectangle(),
+                ScrollToBox::MarginBox => element_data.layout.computed_box.margin_rectangle(),
+                ScrollToBox::PaddingBox => element_data.layout.computed_box.padding_rectangle(),
+                ScrollToBox::ContentBox => element_data.layout.computed_box.content_rectangle()
             };
             let distance_from_parent = box_model_selected.y - top_py;
             child_y = Some(distance_from_parent);
@@ -161,21 +160,21 @@ pub(crate) fn scroll_to_child_by_id_with_options(data: &mut ElementData, id: &st
 }
 
 /// Computes the scrollbar's tack and thumb layout.
-pub(crate) fn apply_scroll_layout(element: &mut ElementData, layout: &Layout) {
-    element.layout_item.scrollbar_size = Size::new(layout.scrollbar_size.width, layout.scrollbar_size.height);
-    element.layout_item.computed_scrollbar_size = Size::new(layout.scroll_width(), layout.scroll_height());
-    let state = &mut element.layout_item.scroll_state;
+pub(crate) fn apply_scroll_layout(element: &mut ElementData, layout: &taffy::Layout) {
+    element.layout.scrollbar_size = Size::new(layout.scrollbar_size.width, layout.scrollbar_size.height);
+    element.layout.computed_scrollbar_size = Size::new(layout.scroll_width(), layout.scroll_height());
+    let state = &mut element.layout.scroll_state;
 
     if element.style.get_overflow()[1] != Overflow::Scroll {
         return;
     }
 
-    let box_transformed = element.layout_item.computed_box_transformed;
+    let box_transformed = element.layout.computed_box_transformed;
 
     // Client Height = padding box height.
     let client_height = box_transformed.padding_rectangle().height;
 
-    let mut content_height = element.layout_item.content_size.height;
+    let mut content_height = element.layout.content_size.height;
     // Taffy is adding the top border and padding height to the content size.
     content_height -= box_transformed.border.top;
     content_height -= box_transformed.padding.top;
@@ -184,19 +183,19 @@ pub(crate) fn apply_scroll_layout(element: &mut ElementData, layout: &Layout) {
     // Scroll Height = Content Size
     let scroll_height =
         (content_height + box_transformed.padding.bottom + box_transformed.padding.top).max(1.0);
-    let scroll_track_width = element.layout_item.scrollbar_size.width;
+    let scroll_track_width = element.layout.scrollbar_size.width;
 
     // The scroll track height is the height of the padding box.
     let scroll_track_height = client_height;
 
     let max_scroll_y = (scroll_height - client_height).max(0.0);
-    element.layout_item.max_scroll_y = max_scroll_y;
+    element.layout.max_scroll_y = max_scroll_y;
     // The scroll amount can be updated by the user, but it should be clamped here when
     // the computed max scroll height is calculated.
     state.set_scroll_y(state.scroll_y().min(max_scroll_y));
     state.mark_old();
 
-    element.layout_item.computed_scroll_track = Rectangle::new(
+    element.layout.computed_scroll_track = Rectangle::new(
         box_transformed.padding_rectangle().right() - scroll_track_width,
         box_transformed.padding_rectangle().top(),
         scroll_track_width,
@@ -217,11 +216,11 @@ pub(crate) fn apply_scroll_layout(element: &mut ElementData, layout: &Layout) {
     let scroll_thumb_width = scroll_track_width - (thumb_margin.left + thumb_margin.right);
     let scroll_thumb_height = (scroll_thumb_height - (thumb_margin.top + thumb_margin.bottom)).max(0.0);
 
-    element.layout_item.computed_scroll_thumb = element.layout_item.computed_scroll_track;
-    element.layout_item.computed_scroll_thumb.x += thumb_margin.left;
-    element.layout_item.computed_scroll_thumb.y += scroll_thumb_offset + thumb_margin.top;
-    element.layout_item.computed_scroll_thumb.width = scroll_thumb_width;
-    element.layout_item.computed_scroll_thumb.height = scroll_thumb_height;
+    element.layout.computed_scroll_thumb = element.layout.computed_scroll_track;
+    element.layout.computed_scroll_thumb.x += thumb_margin.left;
+    element.layout.computed_scroll_thumb.y += scroll_thumb_offset + thumb_margin.top;
+    element.layout.computed_scroll_thumb.width = scroll_thumb_width;
+    element.layout.computed_scroll_thumb.height = scroll_thumb_height;
 }
 
 
@@ -231,7 +230,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
     let element_data = element.element_data_mut();
 
     if element_data.is_scrollable() {
-        let state = &mut element_data.layout_item.scroll_state;
+        let state = &mut element_data.layout.scroll_state;
         match message {
             CraftMessage::PointerScroll(mouse_wheel) => {
                 let delta = match mouse_wheel.delta {
@@ -243,11 +242,11 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
                 };
                 let delta = -delta;
                 // Todo: Scroll physics
-                let max_scroll_y = element_data.layout_item.max_scroll_y;
+                let max_scroll_y = element_data.layout.max_scroll_y;
 
                 let current_scroll_y = state.scroll_y();
                 state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-                request_apply_layout(element_data.layout_item.taffy_node_id.unwrap());
+                request_apply_layout(element_data.layout.taffy_node_id.unwrap());
 
                 event.prevent_propagate();
                 event.prevent_defaults();
@@ -256,10 +255,10 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
                 if pointer_button.button == Some(ui_events::pointer::PointerButton::Primary) {
                     // DEVICE(TOUCH): Handle scrolling within the content area on touch based input devices.
                     if pointer_button.pointer.pointer_type == PointerType::Touch {
-                        let container_rectangle = element_data.layout_item.computed_box_transformed.padding_rectangle();
+                        let container_rectangle = element_data.layout.computed_box_transformed.padding_rectangle();
 
                         let in_scroll_bar = element_data
-                            .layout_item
+                            .layout
                             .computed_scroll_thumb
                             .contains(&pointer_button.state.logical_point());
 
@@ -272,7 +271,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
                             event.prevent_defaults();
                         }
                     } else if element_data
-                        .layout_item
+                        .layout
                         .computed_scroll_thumb
                         .contains(&pointer_button.state.logical_point())
                     {
@@ -287,18 +286,18 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
                         event.prevent_propagate();
                         event.prevent_defaults();
                     } else if element_data
-                        .layout_item
+                        .layout
                         .computed_scroll_track
                         .contains(&pointer_button.state.logical_point())
                     {
                         let offset_y =
-                            pointer_button.state.position.y as f32 - element_data.layout_item.computed_scroll_track.y;
+                            pointer_button.state.position.y as f32 - element_data.layout.computed_scroll_track.y;
 
-                        let percent = offset_y / element_data.layout_item.computed_scroll_track.height;
-                        let scroll_y = percent * element_data.layout_item.max_scroll_y;
+                        let percent = offset_y / element_data.layout.computed_scroll_track.height;
+                        let scroll_y = percent * element_data.layout.max_scroll_y;
 
-                        state.set_scroll_y(scroll_y.clamp(0.0, element_data.layout_item.max_scroll_y));
-                        request_apply_layout(element_data.layout_item.taffy_node_id.unwrap());
+                        state.set_scroll_y(scroll_y.clamp(0.0, element_data.layout.max_scroll_y));
+                        request_apply_layout(element_data.layout.taffy_node_id.unwrap());
 
                         event.prevent_propagate();
                         event.prevent_defaults();
@@ -319,10 +318,10 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
                     // Todo: Translate scroll wheel pixel to scroll position for diff.
                     let delta = (pointer_motion.current.position.y - click.y) as f32;
 
-                    let max_scroll_y = element_data.layout_item.max_scroll_y;
+                    let max_scroll_y = element_data.layout.max_scroll_y;
 
-                    let click_y_offset = element_data.layout_item.computed_scroll_track.height
-                        - element_data.layout_item.computed_scroll_thumb.height;
+                    let click_y_offset = element_data.layout.computed_scroll_track.height
+                        - element_data.layout.computed_scroll_thumb.height;
                     if click_y_offset <= 0.0 {
                         return;
                     }
@@ -335,7 +334,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
 
                     let current_scroll_y = state.scroll_y();
                     state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-                    request_apply_layout(element_data.layout_item.taffy_node_id.unwrap());
+                    request_apply_layout(element_data.layout.taffy_node_id.unwrap());
                     state.scroll_click = Some(Point::new(click.x, pointer_motion.current.position.y));
                     event.prevent_propagate();
                     event.prevent_defaults();
diff --git a/crates/craft_retained/src/elements/slider/slider_draw.rs b/crates/craft_retained/src/elements/slider/slider_draw.rs
index 6a616d18..d1500525 100644
--- a/crates/craft_retained/src/elements/slider/slider_draw.rs
+++ b/crates/craft_retained/src/elements/slider/slider_draw.rs
@@ -6,7 +6,7 @@ use kurbo::Vec2;
 use crate::elements::slider::slider_element::SliderDirection;
 use crate::elements::{SliderInner};
 use crate::elements::ElementInternals;
-use crate::layout::layout_item::{CssComputedBorder, draw_borders_generic};
+use crate::layout::layout::{CssComputedBorder, draw_borders_generic};
 
 fn border_radius_to_vec_radius(border_radius: [(f32, f32); 4]) -> [Vec2; 4] {
     let br = border_radius;
diff --git a/crates/craft_retained/src/elements/slider/slider_element.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
index 6dcd89d0..c84627ad 100644
--- a/crates/craft_retained/src/elements/slider/slider_element.rs
+++ b/crates/craft_retained/src/elements/slider/slider_element.rs
@@ -331,14 +331,14 @@ impl ElementInternals for SliderInner {
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
     ) {
-        let node = self.element_data.layout_item.taffy_node_id.unwrap();
+        let node = self.element_data.layout.taffy_node_id.unwrap();
         let layout = taffy_tree.layout(node);
         let has_new_layout = taffy_tree.get_has_new_layout(node);
 
         let dirty = has_new_layout
-            || transform != self.element_data.layout_item.get_transform()
-            || position != self.element_data.layout_item.position;
-        self.element_data.layout_item.has_new_layout = has_new_layout;
+            || transform != self.element_data.layout.get_transform()
+            || position != self.element_data.layout.position;
+        self.element_data.layout.has_new_layout = has_new_layout;
 
         if dirty {
             self.resolve_box(position, transform, layout, z_index);
@@ -449,7 +449,7 @@ impl ElementInternals for SliderInner {
 
     fn in_bounds(&self, point: Point) -> bool {
         let element_data = &self.element_data;
-        let rect = element_data.layout_item.computed_box_transformed.border_rectangle();
+        let rect = element_data.layout.computed_box_transformed.border_rectangle();
 
         let thumb_pos = self.thumb_position(self.get_value());
         let thumb_size = self.get_thumb_size();
@@ -464,7 +464,7 @@ impl ElementInternals for SliderInner {
             return true;
         }
 
-        if let Some(clip) = element_data.layout_item.clip_bounds {
+        if let Some(clip) = element_data.layout.clip_bounds {
             match rect.intersection(&clip) {
                 Some(bounds) => bounds.contains(&point),
                 None => false,
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index bfd54ba9..642e3975 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -209,14 +209,14 @@ impl ElementInternals for TextInner {
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
     ) {
-        let node = self.element_data.layout_item.taffy_node_id.unwrap();
+        let node = self.element_data.layout.taffy_node_id.unwrap();
         let result = taffy_tree.layout(node);
         let has_new_layout = taffy_tree.get_has_new_layout(node);
 
         let dirty = has_new_layout
-            || transform != self.element_data.layout_item.get_transform()
-            || position != self.element_data.layout_item.position;
-        self.element_data.layout_item.has_new_layout = has_new_layout;
+            || transform != self.element_data.layout.get_transform()
+            || position != self.element_data.layout.position;
+        self.element_data.layout.has_new_layout = has_new_layout;
         if dirty {
             self.resolve_box(position, transform, result, z_index);
             self.apply_clip(clip_bounds);
@@ -272,7 +272,7 @@ impl ElementInternals for TextInner {
     ) {
         let padding_box = self
             .element_data
-            .layout_item
+            .layout
             .computed_box_transformed
             .padding_rectangle()
             .scale(scale_factor);
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 09be14af..3ef56004 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -84,7 +84,7 @@ impl TextInput {
         }));
         inner.borrow_mut().element_data.create_layout_node(context);
 
-        let taffy_id = inner.borrow().element_data.layout_item.taffy_node_id;
+        let taffy_id = inner.borrow().element_data.layout.taffy_node_id;
         inner.borrow_mut().state.taffy_id = taffy_id;
         inner.borrow_mut().state.editor.taffy_id = taffy_id;
 
@@ -160,13 +160,13 @@ impl ElementInternals for TextInputInner {
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
     ) {
-        let node = self.element_data.layout_item.taffy_node_id.unwrap();
+        let node = self.element_data.layout.taffy_node_id.unwrap();
         let has_new_layout = taffy_tree.get_has_new_layout(node);
 
         let dirty = has_new_layout
-            || transform != self.element_data.layout_item.get_transform()
-            || position != self.element_data.layout_item.position;
-        self.element_data.layout_item.has_new_layout = has_new_layout;
+            || transform != self.element_data.layout.get_transform()
+            || position != self.element_data.layout.position;
+        self.element_data.layout.has_new_layout = has_new_layout;
 
         if dirty {
             let result = taffy_tree.layout(node);
@@ -175,7 +175,7 @@ impl ElementInternals for TextInputInner {
             self.apply_borders(scale_factor);
 
             self.element_data.apply_scroll(result);
-            self.element_data.layout_item.scroll_state.mark_old();
+            self.element_data.layout.scroll_state.mark_old();
 
             let text_position = self.computed_box().content_rectangle();
             self.state.set_origin(&text_position.position());
@@ -184,11 +184,11 @@ impl ElementInternals for TextInputInner {
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.layout_item.scroll_state.is_new()
+        if !dirty && self.element_data.layout.scroll_state.is_new()
         {
             let result = taffy_tree.layout(node);
             self.element_data.apply_scroll(result);
-            self.element_data.layout_item.scroll_state.mark_old();
+            self.element_data.layout.scroll_state.mark_old();
         }
 
         if has_new_layout {
@@ -227,13 +227,13 @@ impl ElementInternals for TextInputInner {
         let is_scrollable = self.element_data.is_scrollable();
 
         let element_data = &self.element_data;
-        let padding_rectangle = element_data.layout_item.computed_box_transformed.padding_rectangle();
+        let padding_rectangle = element_data.layout.computed_box_transformed.padding_rectangle();
         renderer.push_layer(padding_rectangle.scale(scale_factor));
 
         let text_scroll = if is_scrollable {
             Some(TextScroll::new(
                 self.element_data.scroll().scroll_y(),
-                self.element_data.layout_item.computed_scroll_track.height,
+                self.element_data.layout.computed_scroll_track.height,
             ))
         } else {
             None
@@ -271,7 +271,7 @@ impl ElementInternals for TextInputInner {
         let mut current_node = accesskit::Node::new(accesskit::Role::TextInput);
         let padding_box = self
             .element_data
-            .layout_item
+            .layout
             .computed_box_transformed
             .padding_rectangle()
             .scale(scale_factor);
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index d5917c31..dca0ef9c 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -17,7 +17,7 @@ use crate::elements::{ElementData, ElementIdMap, ScrollOptions, WindowInternal};
 use crate::elements::scrollable::ScrollState;
 use crate::events::{CraftMessage, Event, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::layout::TaffyTree;
-use crate::layout::layout_item::{CssComputedBorder, LayoutItem, draw_borders_generic};
+use crate::layout::layout::{CssComputedBorder, Layout, draw_borders_generic};
 use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Style, Underline, Unit};
 use crate::text::text_context::TextContext;
 
@@ -56,12 +56,12 @@ pub trait ElementInternals: ElementData + Any {
         for child in &self.element_data().children {
             child.borrow_mut().apply_layout(
                 taffy_tree,
-                self.element_data().layout_item.computed_box.position,
+                self.element_data().layout.computed_box.position,
                 z_index,
                 transform,
                 pointer,
                 text_context,
-                self.element_data().layout_item.clip_bounds,
+                self.element_data().layout.clip_bounds,
                 scale_factor,
             );
         }
@@ -90,7 +90,7 @@ pub trait ElementInternals: ElementData + Any {
     fn apply_style_to_layout_node_if_dirty(&mut self, taffy_tree: &mut TaffyTree) {
         let element_data = self.element_data_mut();
         if element_data.style.is_dirty {
-            let node_id = element_data.layout_item.taffy_node_id.unwrap();
+            let node_id = element_data.layout.taffy_node_id.unwrap();
             let style: taffy::Style = element_data.style.to_taffy_style();
             taffy_tree.set_style(node_id, style);
             element_data.style.is_dirty = false;
@@ -168,7 +168,7 @@ pub trait ElementInternals: ElementData + Any {
 
         let padding_box = self
             .element_data()
-            .layout_item
+            .layout
             .computed_box_transformed
             .padding_rectangle()
             .scale(scale_factor);
@@ -215,7 +215,7 @@ pub trait ElementInternals: ElementData + Any {
         layout_order: &mut u32,
     ) {
         let position = self.element_data().style.get_position();
-        self.element_data_mut().layout_item.resolve_box(
+        self.element_data_mut().layout.resolve_box(
             relative_position,
             scroll_transform,
             result,
@@ -226,7 +226,7 @@ pub trait ElementInternals: ElementData + Any {
 
     /// Computes this element's clip box.
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
-        self.element_data_mut().layout_item.resolve_clip(clip_bounds);
+        self.element_data_mut().layout.resolve_clip(clip_bounds);
     }
 
     fn apply_borders(&mut self, scale_factor: f64) {
@@ -237,16 +237,16 @@ pub trait ElementInternals: ElementData + Any {
         let box_shadows = current_style.get_box_shadows();
 
         self.element_data_mut()
-            .layout_item
+            .layout
             .apply_borders(has_border, border_radius, scale_factor, border_color, box_shadows);
     }
 
     /// A bit of a hack to reset the layout item of an element recursively.
-    fn reset_layout_item(&mut self) {
-        self.element_data_mut().layout_item = LayoutItem::default();
+    fn reset_layout(&mut self) {
+        self.element_data_mut().layout = Layout::default();
 
         for child in self.element_data_mut().children.iter_mut() {
-            child.borrow_mut().reset_layout_item();
+            child.borrow_mut().reset_layout();
         }
     }
 
@@ -266,7 +266,7 @@ pub trait ElementInternals: ElementData + Any {
             renderer.push_hit_testable(
                 id,
                 self.element_data()
-                    .layout_item
+                    .layout
                     .computed_box_transformed
                     .padding_rectangle()
                     .scale(scale_factor),
@@ -278,14 +278,14 @@ pub trait ElementInternals: ElementData + Any {
         let current_style = self.element_data().current_style();
 
         self.element_data()
-            .layout_item
+            .layout
             .draw_borders(renderer, current_style, scale_factor);
     }
 
     fn maybe_start_layer(&self, renderer: &mut RenderList, scale_factor: f64) {
         let element_data = self.element_data();
         let padding_rectangle = element_data
-            .layout_item
+            .layout
             .computed_box_transformed
             .padding_rectangle()
             .scale(scale_factor);
@@ -316,12 +316,12 @@ pub trait ElementInternals: ElementData + Any {
         // let scrollbar_thumb_radius = self.element_data().current_style().
         let track_rect = self
             .element_data_mut()
-            .layout_item
+            .layout
             .computed_scroll_track
             .scale(scale_factor);
         let thumb_rect = self
             .element_data_mut()
-            .layout_item
+            .layout
             .computed_scroll_thumb
             .scale(scale_factor);
 
@@ -346,7 +346,7 @@ pub trait ElementInternals: ElementData + Any {
 
     /// Returns the element's [`ElementBox`] without any transforms applied.
     fn computed_box(&self) -> ElementBox {
-        self.element_data().layout_item.computed_box
+        self.element_data().layout.computed_box
     }
 
     /// Gets
@@ -359,7 +359,7 @@ pub trait ElementInternals: ElementData + Any {
 
     /// Mark layout node dirty.
     fn mark_dirty(&mut self) {
-        let id = self.element_data().layout_item.taffy_node_id;
+        let id = self.element_data().layout.taffy_node_id;
         if let Some(id) = id {
             TAFFY_TREE.with_borrow_mut(|taffy_tree| {
                 taffy_tree.mark_dirty(id);
@@ -369,7 +369,7 @@ pub trait ElementInternals: ElementData + Any {
 
     /// Updates taffy's style to reflect craft's style struct.
     fn update_taffy_style(&mut self) {
-        let id = self.element_data().layout_item.taffy_node_id;
+        let id = self.element_data().layout.taffy_node_id;
         if let Some(id) = id {
             TAFFY_TREE.with_borrow_mut(|taffy_tree| {
                 taffy_tree.set_style(id, self.element_data().style.to_taffy_style());
@@ -448,9 +448,9 @@ pub trait ElementInternals: ElementData + Any {
 
         // Swap the children's taffy nodes.
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let parent_id = self.element_data().layout_item.taffy_node_id;
-            let child_1_id = child_1.borrow().element_data().layout_item.taffy_node_id;
-            let child_2_id = child_2.borrow().element_data().layout_item.taffy_node_id;
+            let parent_id = self.element_data().layout.taffy_node_id;
+            let child_1_id = child_1.borrow().element_data().layout.taffy_node_id;
+            let child_2_id = child_2.borrow().element_data().layout.taffy_node_id;
 
             if let Some(parent_id) = parent_id
                 && let Some(child_1_id) = child_1_id
@@ -511,13 +511,13 @@ pub trait ElementInternals: ElementData + Any {
         child.borrow_mut().element_data_mut().parent = None;
 
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let child_id = child.borrow().element_data().layout_item.taffy_node_id;
+            let child_id = child.borrow().element_data().layout.taffy_node_id;
 
             if let Some(child_id) = child_id {
                 taffy_tree.remove_subtree(child_id);
             }
 
-            let parent_id = self.element_data().layout_item.taffy_node_id;
+            let parent_id = self.element_data().layout.taffy_node_id;
             taffy_tree.mark_dirty(parent_id.unwrap());
         });
 
@@ -638,12 +638,12 @@ pub trait ElementInternals: ElementData + Any {
     }
 
     fn get_scroll_state(&self) -> ScrollState {
-        self.element_data().layout_item.scroll_state
+        self.element_data().layout.scroll_state
     }
 
     /// Returns the element's [`ElementBox`].
     fn get_computed_box_transformed(&self) -> ElementBox {
-        self.element_data().layout_item.computed_box_transformed
+        self.element_data().layout.computed_box_transformed
     }
 
     /// Returns a shared reference to the element's [`Style`].
@@ -661,9 +661,9 @@ pub trait ElementInternals: ElementData + Any {
     /// Visual order and visibility shall not be accounted for.
     fn in_bounds(&self, point: Point) -> bool {
         let element_data = self.element_data();
-        let rect = element_data.layout_item.computed_box_transformed.border_rectangle();
+        let rect = element_data.layout.computed_box_transformed.border_rectangle();
 
-        if let Some(clip) = element_data.layout_item.clip_bounds {
+        if let Some(clip) = element_data.layout.clip_bounds {
             match rect.intersection(&clip) {
                 Some(bounds) => bounds.contains(&point),
                 None => false,
@@ -993,13 +993,13 @@ pub trait ElementInternals: ElementData + Any {
 pub fn resolve_clip_for_scrollable(element: &mut dyn ElementInternals, clip_bounds: Option<Rectangle>) {
     let element_data = element.element_data_mut();
     if element_data.is_scrollable() {
-        let scroll_clip_bounds = element_data.layout_item.computed_box_transformed.padding_rectangle();
+        let scroll_clip_bounds = element_data.layout.computed_box_transformed.padding_rectangle();
         if let Some(clip_bounds) = clip_bounds {
-            element_data.layout_item.clip_bounds = scroll_clip_bounds.intersection(&clip_bounds);
+            element_data.layout.clip_bounds = scroll_clip_bounds.intersection(&clip_bounds);
         } else {
-            element_data.layout_item.clip_bounds = Some(scroll_clip_bounds);
+            element_data.layout.clip_bounds = Some(scroll_clip_bounds);
         }
     } else {
-        element_data.layout_item.clip_bounds = clip_bounds;
+        element_data.layout.clip_bounds = clip_bounds;
     }
 }
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index fb77521c..3248b194 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -246,7 +246,7 @@ impl WindowInternal {
 
     pub(crate) fn on_resize(&mut self, new_size: Size<f32>) {
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            taffy_tree.mark_dirty(self.element_data.layout_item.taffy_node_id.unwrap());
+            taffy_tree.mark_dirty(self.element_data.layout.taffy_node_id.unwrap());
         });
         if let Some(renderer) = self.renderer.as_mut() {
             renderer.resize_surface(new_size.width.max(1.0), new_size.height.max(1.0));
@@ -289,7 +289,7 @@ impl WindowInternal {
     fn layout_window(&mut self, text_context: &mut TextContext, resource_manager: Arc<ResourceManager>) -> NodeId {
         let root_node = self
             .element_data
-            .layout_item
+            .layout
             .taffy_node_id
             .expect("A root element must have a layout node.");
 
@@ -515,14 +515,14 @@ impl ElementInternals for WindowInternal {
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
     ) {
-        let node = self.element_data.layout_item.taffy_node_id.unwrap();
+        let node = self.element_data.layout.taffy_node_id.unwrap();
         let layout = taffy_tree.layout(node);
         let has_new_layout = taffy_tree.get_has_new_layout(node);
 
         let dirty = has_new_layout
-            || transform != self.element_data.layout_item.get_transform()
-            || position != self.element_data.layout_item.position;
-        self.element_data.layout_item.has_new_layout = has_new_layout;
+            || transform != self.element_data.layout.get_transform()
+            || position != self.element_data.layout.position;
+        self.element_data.layout.has_new_layout = has_new_layout;
 
         if dirty {
             self.resolve_box(position, transform, layout, z_index);
@@ -530,14 +530,14 @@ impl ElementInternals for WindowInternal {
             // For scroll changes from taffy;
             self.element_data.apply_scroll(layout);
             self.apply_clip(clip_bounds);
-            self.element_data.layout_item.scroll_state.mark_old();
+            self.element_data.layout.scroll_state.mark_old();
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.layout_item.scroll_state.is_new()
+        if !dirty && self.element_data.layout.scroll_state.is_new()
         {
             self.element_data.apply_scroll(layout);
-            self.element_data.layout_item.scroll_state.mark_old();
+            self.element_data.layout.scroll_state.mark_old();
         }
 
         if has_new_layout {
@@ -601,7 +601,7 @@ impl ElementInternals for WindowInternal {
 
         let padding_box = self
             .element_data
-            .layout_item
+            .layout
             .computed_box_transformed
             .padding_rectangle()
             .scale(scale_factor);
@@ -650,8 +650,8 @@ impl ElementInternals for WindowInternal {
 
         // Add the children's taffy node.
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
-            let child_id = child.borrow().element_data().layout_item.taffy_node_id;
+            let parent_id = self.element_data.layout.taffy_node_id.unwrap();
+            let child_id = child.borrow().element_data().layout.taffy_node_id;
             if let Some(child_id) = child_id {
                 taffy_tree.add_child(parent_id, child_id);
             }
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout.rs
similarity index 99%
rename from crates/craft_retained/src/layout/layout_item.rs
rename to crates/craft_retained/src/layout/layout.rs
index 160874f1..f171d8a9 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout.rs
@@ -37,7 +37,7 @@ impl CssComputedBorder {
 }
 
 #[derive(Clone, Default)]
-pub struct LayoutItem {
+pub struct Layout {
     /// The taffy node id after this element is laid out.
     /// This may be None if this is a non-visual element like Font.
     pub taffy_node_id: Option<NodeId>,
@@ -70,7 +70,7 @@ pub struct LayoutItem {
     is_scrollable: bool,
 }
 
-impl LayoutItem {
+impl Layout {
     pub(crate) fn new(is_scrollable: bool) -> Self {
         Self {
             is_scrollable,
diff --git a/crates/craft_retained/src/layout/mod.rs b/crates/craft_retained/src/layout/mod.rs
index c659c0c8..1bb94acd 100644
--- a/crates/craft_retained/src/layout/mod.rs
+++ b/crates/craft_retained/src/layout/mod.rs
@@ -1,5 +1,5 @@
 pub mod layout_context;
-pub mod layout_item;
+pub mod layout;
 mod taffy_tree;
 
 pub(crate) use taffy_tree::TaffyTree;

From 6cfc128de573992867de5557bc9e1a4d11c35a70 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 14 Mar 2026 11:05:57 -0400
Subject: [PATCH 069/143] Add resolved thumb_margin and thumb_radius
 (scrollbar) to Layout

---
 .../craft_retained/src/elements/container.rs  |  4 +-
 .../src/elements/element_data.rs              |  2 +-
 crates/craft_retained/src/elements/image.rs   |  2 +-
 .../craft_retained/src/elements/scrollable.rs | 38 ++++++++++---------
 .../src/elements/slider/slider_element.rs     |  4 +-
 crates/craft_retained/src/elements/text.rs    |  4 +-
 .../src/elements/text_input/mod.rs            |  6 +--
 .../src/elements/traits/element_internals.rs  | 12 +-----
 crates/craft_retained/src/elements/window.rs  |  4 +-
 crates/craft_retained/src/layout/layout.rs    | 32 +++++++++++++++-
 .../craft_retained/src/layout/taffy_tree.rs   |  4 +-
 11 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index a84fde8e..4c288f03 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -79,8 +79,8 @@ impl ElementInternals for ContainerInner {
         scale_factor: f64,
     ) {
         let node = self.element_data.layout.taffy_node_id.unwrap();
-        let layout = taffy_tree.layout(node);
-        let has_new_layout = taffy_tree.get_has_new_layout(node);
+        let layout = taffy_tree.get_layout(node);
+        let has_new_layout = taffy_tree.has_new_layout(node);
 
         let dirty = has_new_layout
             || transform != self.element_data.layout.get_transform()
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index 80f685e5..e270528b 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -92,7 +92,7 @@ impl ElementData {
 
     /// Computes the scrollbar's tack and thumb layout.
     pub(crate) fn apply_scroll(&mut self, layout: &taffy::Layout) {
-       apply_scroll_layout(self, layout);
+       apply_scroll_layout(&self.style, &mut self.layout, layout);
     }
 
     pub(crate) fn scroll(&self) -> ScrollState {
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index e5345251..8e79ad1b 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -94,7 +94,7 @@ impl ElementInternals for Image {
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
     ) {
-        let layout = taffy_tree.layout(self.element_data.layout.taffy_node_id.unwrap());
+        let layout = taffy_tree.get_layout(self.element_data.layout.taffy_node_id.unwrap());
         self.resolve_box(position, transform, layout, z_index);
 
         self.apply_borders(scale_factor);
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 278af4f6..37612b45 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -9,7 +9,8 @@ use crate::app::{queue_event, request_apply_layout};
 use crate::elements::element_data::ElementData;
 use crate::elements::ElementInternals;
 use crate::events::{CraftMessage, Event};
-use crate::style::Overflow;
+use crate::layout::layout::Layout;
+use crate::style::{Overflow, Style};
 
 /**
 
@@ -160,21 +161,24 @@ pub(crate) fn scroll_to_child_by_id_with_options(data: &mut ElementData, id: &st
 }
 
 /// Computes the scrollbar's tack and thumb layout.
-pub(crate) fn apply_scroll_layout(element: &mut ElementData, layout: &taffy::Layout) {
-    element.layout.scrollbar_size = Size::new(layout.scrollbar_size.width, layout.scrollbar_size.height);
-    element.layout.computed_scrollbar_size = Size::new(layout.scroll_width(), layout.scroll_height());
-    let state = &mut element.layout.scroll_state;
+pub(crate) fn apply_scroll_layout(style: &Style, layout: &mut Layout, taffy_layout: &taffy::Layout) {
+    layout.scrollbar_thumb_margin = style.get_scrollbar_thumb_margin();
+    layout.scrollbar_thumb_radius = style.get_scrollbar_thumb_radius();
 
-    if element.style.get_overflow()[1] != Overflow::Scroll {
+    layout.scrollbar_size = Size::new(layout.scrollbar_size.width, layout.scrollbar_size.height);
+    layout.computed_scrollbar_size = Size::new(taffy_layout.scroll_width(), taffy_layout.scroll_height());
+    let state = &mut layout.scroll_state;
+
+    if style.get_overflow()[1] != Overflow::Scroll {
         return;
     }
 
-    let box_transformed = element.layout.computed_box_transformed;
+    let box_transformed = layout.computed_box_transformed;
 
     // Client Height = padding box height.
     let client_height = box_transformed.padding_rectangle().height;
 
-    let mut content_height = element.layout.content_size.height;
+    let mut content_height = layout.content_size.height;
     // Taffy is adding the top border and padding height to the content size.
     content_height -= box_transformed.border.top;
     content_height -= box_transformed.padding.top;
@@ -183,19 +187,19 @@ pub(crate) fn apply_scroll_layout(element: &mut ElementData, layout: &taffy::Lay
     // Scroll Height = Content Size
     let scroll_height =
         (content_height + box_transformed.padding.bottom + box_transformed.padding.top).max(1.0);
-    let scroll_track_width = element.layout.scrollbar_size.width;
+    let scroll_track_width = layout.scrollbar_size.width;
 
     // The scroll track height is the height of the padding box.
     let scroll_track_height = client_height;
 
     let max_scroll_y = (scroll_height - client_height).max(0.0);
-    element.layout.max_scroll_y = max_scroll_y;
+    layout.max_scroll_y = max_scroll_y;
     // The scroll amount can be updated by the user, but it should be clamped here when
     // the computed max scroll height is calculated.
     state.set_scroll_y(state.scroll_y().min(max_scroll_y));
     state.mark_old();
 
-    element.layout.computed_scroll_track = Rectangle::new(
+    layout.computed_scroll_track = Rectangle::new(
         box_transformed.padding_rectangle().right() - scroll_track_width,
         box_transformed.padding_rectangle().top(),
         scroll_track_width,
@@ -212,15 +216,15 @@ pub(crate) fn apply_scroll_layout(element: &mut ElementData, layout: &taffy::Lay
         0.0
     };
 
-    let thumb_margin = element.style.get_scrollbar_thumb_margin();
+    let thumb_margin = layout.scrollbar_thumb_margin;
     let scroll_thumb_width = scroll_track_width - (thumb_margin.left + thumb_margin.right);
     let scroll_thumb_height = (scroll_thumb_height - (thumb_margin.top + thumb_margin.bottom)).max(0.0);
 
-    element.layout.computed_scroll_thumb = element.layout.computed_scroll_track;
-    element.layout.computed_scroll_thumb.x += thumb_margin.left;
-    element.layout.computed_scroll_thumb.y += scroll_thumb_offset + thumb_margin.top;
-    element.layout.computed_scroll_thumb.width = scroll_thumb_width;
-    element.layout.computed_scroll_thumb.height = scroll_thumb_height;
+    layout.computed_scroll_thumb = layout.computed_scroll_track;
+    layout.computed_scroll_thumb.x += thumb_margin.left;
+    layout.computed_scroll_thumb.y += scroll_thumb_offset + thumb_margin.top;
+    layout.computed_scroll_thumb.width = scroll_thumb_width;
+    layout.computed_scroll_thumb.height = scroll_thumb_height;
 }
 
 
diff --git a/crates/craft_retained/src/elements/slider/slider_element.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
index c84627ad..8ca135ed 100644
--- a/crates/craft_retained/src/elements/slider/slider_element.rs
+++ b/crates/craft_retained/src/elements/slider/slider_element.rs
@@ -332,8 +332,8 @@ impl ElementInternals for SliderInner {
         scale_factor: f64,
     ) {
         let node = self.element_data.layout.taffy_node_id.unwrap();
-        let layout = taffy_tree.layout(node);
-        let has_new_layout = taffy_tree.get_has_new_layout(node);
+        let layout = taffy_tree.get_layout(node);
+        let has_new_layout = taffy_tree.has_new_layout(node);
 
         let dirty = has_new_layout
             || transform != self.element_data.layout.get_transform()
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 642e3975..a88c15fe 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -210,8 +210,8 @@ impl ElementInternals for TextInner {
         scale_factor: f64,
     ) {
         let node = self.element_data.layout.taffy_node_id.unwrap();
-        let result = taffy_tree.layout(node);
-        let has_new_layout = taffy_tree.get_has_new_layout(node);
+        let result = taffy_tree.get_layout(node);
+        let has_new_layout = taffy_tree.has_new_layout(node);
 
         let dirty = has_new_layout
             || transform != self.element_data.layout.get_transform()
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 3ef56004..2383677e 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -161,7 +161,7 @@ impl ElementInternals for TextInputInner {
         scale_factor: f64,
     ) {
         let node = self.element_data.layout.taffy_node_id.unwrap();
-        let has_new_layout = taffy_tree.get_has_new_layout(node);
+        let has_new_layout = taffy_tree.has_new_layout(node);
 
         let dirty = has_new_layout
             || transform != self.element_data.layout.get_transform()
@@ -169,7 +169,7 @@ impl ElementInternals for TextInputInner {
         self.element_data.layout.has_new_layout = has_new_layout;
 
         if dirty {
-            let result = taffy_tree.layout(node);
+            let result = taffy_tree.get_layout(node);
             self.resolve_box(position, transform, result, z_index);
             self.apply_clip(clip_bounds);
             self.apply_borders(scale_factor);
@@ -186,7 +186,7 @@ impl ElementInternals for TextInputInner {
         // For manual scroll updates.
         if !dirty && self.element_data.layout.scroll_state.is_new()
         {
-            let result = taffy_tree.layout(node);
+            let result = taffy_tree.get_layout(node);
             self.element_data.apply_scroll(result);
             self.element_data.layout.scroll_state.mark_old();
         }
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index dca0ef9c..2623f4d7 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -991,15 +991,5 @@ pub trait ElementInternals: ElementData + Any {
 }
 
 pub fn resolve_clip_for_scrollable(element: &mut dyn ElementInternals, clip_bounds: Option<Rectangle>) {
-    let element_data = element.element_data_mut();
-    if element_data.is_scrollable() {
-        let scroll_clip_bounds = element_data.layout.computed_box_transformed.padding_rectangle();
-        if let Some(clip_bounds) = clip_bounds {
-            element_data.layout.clip_bounds = scroll_clip_bounds.intersection(&clip_bounds);
-        } else {
-            element_data.layout.clip_bounds = Some(scroll_clip_bounds);
-        }
-    } else {
-        element_data.layout.clip_bounds = clip_bounds;
-    }
+    element.element_data_mut().layout.resolve_clip_for_scrollable(clip_bounds);
 }
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 3248b194..9237c651 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -516,8 +516,8 @@ impl ElementInternals for WindowInternal {
         scale_factor: f64,
     ) {
         let node = self.element_data.layout.taffy_node_id.unwrap();
-        let layout = taffy_tree.layout(node);
-        let has_new_layout = taffy_tree.get_has_new_layout(node);
+        let layout = taffy_tree.get_layout(node);
+        let has_new_layout = taffy_tree.has_new_layout(node);
 
         let dirty = has_new_layout
             || transform != self.element_data.layout.get_transform()
diff --git a/crates/craft_retained/src/layout/layout.rs b/crates/craft_retained/src/layout/layout.rs
index f171d8a9..678c8c63 100644
--- a/crates/craft_retained/src/layout/layout.rs
+++ b/crates/craft_retained/src/layout/layout.rs
@@ -6,7 +6,7 @@ use peniko::Color;
 use taffy::NodeId;
 use craft_renderer::renderer::BoxShadowCmd;
 use crate::elements::scrollable::ScrollState;
-use crate::style::{BoxShadow, Position, Style};
+use crate::style::{BoxShadow, Overflow, Position, Style};
 
 impl CssComputedBorder {
     pub(crate) fn scale(&mut self, scale_factor: f64) {
@@ -68,6 +68,9 @@ pub struct Layout {
     /// Scrollbar state for elements that may have a scrollbar.
     pub scroll_state: ScrollState,
     is_scrollable: bool,
+    
+    pub scrollbar_thumb_margin: TrblRectangle<f32>,
+    pub scrollbar_thumb_radius: [(f32, f32); 4],
 }
 
 impl Layout {
@@ -78,6 +81,20 @@ impl Layout {
         }
     }
 
+    pub fn is_dirty(&self, transform: Affine, position: Point) -> bool {
+        self.has_new_layout
+            || transform != self.get_transform()
+            || position != self.position
+    }
+
+    pub fn taffy_node_id(&self) -> NodeId {
+        self.taffy_node_id.unwrap()
+    }
+
+    pub fn taffy_node_id_mut(&mut self) -> &mut NodeId {
+        self.taffy_node_id.as_mut().unwrap()
+    }
+
     pub(crate) fn is_scrollable(&self) -> bool {
         self.is_scrollable
     }
@@ -343,6 +360,19 @@ impl Layout {
             }
         }
     }
+
+    pub fn resolve_clip_for_scrollable(&mut self, clip_bounds: Option<Rectangle>) {
+        if self.is_scrollable() {
+            let scroll_clip_bounds = self.computed_box_transformed.padding_rectangle();
+            if let Some(clip_bounds) = clip_bounds {
+                self.clip_bounds = scroll_clip_bounds.intersection(&clip_bounds);
+            } else {
+                self.clip_bounds = Some(scroll_clip_bounds);
+            }
+        } else {
+            self.clip_bounds = clip_bounds;
+        }
+    }
 }
 
 pub(crate) fn draw_borders_generic(
diff --git a/crates/craft_retained/src/layout/taffy_tree.rs b/crates/craft_retained/src/layout/taffy_tree.rs
index d566bc93..f078f63b 100644
--- a/crates/craft_retained/src/layout/taffy_tree.rs
+++ b/crates/craft_retained/src/layout/taffy_tree.rs
@@ -107,12 +107,12 @@ impl TaffyTree {
 
     /// Return this node layout relative to its parent
     #[inline]
-    pub fn layout(&self, node: NodeId) -> &Layout {
+    pub fn get_layout(&self, node: NodeId) -> &Layout {
         self.inner.layout(node).unwrap()
     }
 
     #[inline(always)]
-    pub fn get_has_new_layout(&self, node_id: NodeId) -> bool {
+    pub fn has_new_layout(&self, node_id: NodeId) -> bool {
         self.inner.get_has_new_layout(node_id)
     }
 

From 7d27baa9555c2225c8507f51df3897f095e6c3d0 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sun, 15 Mar 2026 10:33:09 -0400
Subject: [PATCH 070/143] polonius?

---
 .cargo/config.toml                            |   5 +-
 .../craft_retained/src/elements/container.rs  |   2 +-
 .../craft_retained/src/elements/dropdown.rs   | 325 ++++++++++++++++++
 .../craft_retained/src/elements/scrollable.rs |  44 ++-
 .../src/elements/text_input/mod.rs            |   2 +-
 crates/craft_retained/src/elements/window.rs  |   2 +-
 examples/counter_retained/main.rs             |  69 +---
 7 files changed, 370 insertions(+), 79 deletions(-)
 create mode 100644 crates/craft_retained/src/elements/dropdown.rs

diff --git a/.cargo/config.toml b/.cargo/config.toml
index feeb78fc..15614255 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,2 +1,5 @@
 [alias]
-xtask = "run --release --package xtask --"
\ No newline at end of file
+xtask = "run --release --package xtask --"
+
+[build]
+rustflags = ["-Zpolonius"]
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 4c288f03..6eceb497 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -154,7 +154,7 @@ impl ElementInternals for ContainerInner {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        scrollable::on_scroll_events(self, message, event);
+        scrollable::on_scroll_events(self, self.style(), &mut self.element_data.layout, message, event);
     }
 
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
new file mode 100644
index 00000000..99bc5ff9
--- /dev/null
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -0,0 +1,325 @@
+use std::any::Any;
+use std::cell::RefCell;
+use std::rc::{Rc, Weak};
+
+use craft_primitives::geometry::{Rectangle, TrblRectangle};
+use craft_renderer::RenderList;
+use kurbo::{Affine, Point};
+
+use crate::app::TAFFY_TREE;
+use crate::elements::{resolve_clip_for_scrollable, ElementInternals, AsElement, Element};
+use crate::elements::element_data::ElementData;
+use crate::elements::{scrollable};
+use crate::elements::scrollable::apply_scroll_layout;
+use crate::events::{CraftMessage, Event};
+use crate::layout::layout::Layout;
+use crate::layout::TaffyTree;
+use crate::{px, rgb, rgba};
+use crate::style::{BoxShadow, Display, FlexDirection, Overflow, Position, Style};
+use crate::text::text_context::TextContext;
+
+#[derive(Clone)]
+pub struct Dropdown {
+    pub inner: Rc<RefCell<DropdownInner>>,
+}
+
+pub struct Shape {
+    pub layout: Layout,
+    pub style: Box<Style>,
+}
+
+impl Shape {
+    pub fn new(is_scrollable: bool) -> Self {
+        let layout = Layout::new(is_scrollable);
+        let style = Style::new();
+
+        Self {
+            layout,
+            style
+        }
+    }
+
+    pub fn create_taffy_node(&mut self) {
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let style = self.style.to_taffy_style();
+            let node_id = taffy_tree.new_leaf(style);
+            self.layout.taffy_node_id = Some(node_id);
+        });
+    }
+
+    pub fn apply_simple_layout(&mut self, taffy_tree: &mut TaffyTree, transform: Affine, position: Point, z_index: &mut u32, scale_factor: f64, clip_bounds: Option<Rectangle>,) {
+        let node = self.layout.taffy_node_id();
+        let taffy_layout = taffy_tree.get_layout(node);
+        self.layout.has_new_layout = taffy_tree.has_new_layout(node);
+        let dirty = self.layout.is_dirty(transform, position);
+
+        if dirty {
+            self.layout.resolve_box(position, transform, taffy_layout, z_index, self.style.get_position());
+
+            // Refactor START
+            let current_style = &self.style;
+            let has_border = current_style.has_border();
+            let border_radius = current_style.get_border_radius();
+            let border_color = &current_style.get_border_color();
+            let box_shadows = current_style.get_box_shadows();
+            self.layout.apply_borders(has_border, border_radius, scale_factor, border_color, box_shadows);
+            // Refactor END
+
+            // For scroll changes from taffy;
+            apply_scroll_layout(&self.style, &mut self.layout, taffy_layout);
+            self.layout.resolve_clip_for_scrollable(clip_bounds); // self.apply_clip
+            self.layout.scroll_state.mark_old();
+        }
+
+        // For manual scroll updates.
+        if !dirty && self.layout.scroll_state.is_new()
+        {
+            apply_scroll_layout(&self.style, &mut self.layout, taffy_layout);
+            self.layout.scroll_state.mark_old();
+        }
+
+        taffy_tree.mark_seen(node);
+    }
+}
+
+/// Stores one or more elements.
+///
+/// If overflow is set to scroll, it will become scrollable.
+pub struct DropdownInner {
+    element_data: ElementData,
+    floating_window: Shape,
+    is_floating_window_hidden: bool,
+}
+
+impl Default for Dropdown {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Dropdown {
+    pub fn new() -> Self {
+        let inner = Rc::new_cyclic(|me: &Weak<RefCell<DropdownInner>>| {
+            RefCell::new(DropdownInner {
+                element_data: ElementData::new(me.clone(), true),
+                floating_window: Shape::new(true),
+                is_floating_window_hidden: true,
+            })
+        });
+
+        inner.borrow_mut().element_data.create_layout_node(None);
+
+        //inner.borrow_mut().floating_window.style.set_position(Position::Absolute);
+        inner.borrow_mut().floating_window.style.set_display(Display::Flex);
+        inner.borrow_mut().floating_window.style.set_flex_direction(FlexDirection::Column);
+
+        inner.borrow_mut().floating_window.style.set_box_shadows(vec![
+            BoxShadow::new(false, 0.0, 0.0, 10.0, 1.0, rgba(0, 0, 0, 30)),
+            BoxShadow::new(false, 0.0, 8.0, 16.0, -2.0, rgba(0, 0, 0, 50)),
+            BoxShadow::new(true, 0.0, 1.0, 1.0, 0.0, rgba(255, 255, 255, 30)),
+        ]);
+        let border_color = rgba(0, 0, 0, 20); // Very faint black
+        inner.borrow_mut().floating_window.style.set_overflow([Overflow::Visible, Overflow::Scroll]);
+        inner.borrow_mut().floating_window.style.set_border_color(TrblRectangle::new_all(border_color));
+        inner.borrow_mut().floating_window.style.set_height(px(100.0));
+        inner.borrow_mut().floating_window.style.set_max_height(px(100.0));
+        inner.borrow_mut().floating_window.style.set_border_width(TrblRectangle::new_all(px(1)));
+
+        inner.borrow_mut().floating_window.create_taffy_node();
+
+        // Set the floating window's parent to the Dropdown element.
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let parent_id = inner.borrow_mut().element_data.layout.taffy_node_id();
+            let child_id = inner.borrow_mut().floating_window.layout.taffy_node_id();
+            taffy_tree.add_child(parent_id, child_id);
+        });
+
+        Self { inner }
+    }
+}
+
+impl Element for Dropdown {}
+
+impl AsElement for Dropdown {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        self.inner.clone()
+    }
+}
+
+impl crate::elements::ElementData for DropdownInner {
+    fn element_data(&self) -> &ElementData {
+        &self.element_data
+    }
+
+    fn element_data_mut(&mut self) -> &mut ElementData {
+        &mut self.element_data
+    }
+}
+
+impl ElementInternals for DropdownInner {
+    fn apply_layout(
+        &mut self,
+        taffy_tree: &mut TaffyTree,
+        position: Point,
+        z_index: &mut u32,
+        transform: Affine,
+        pointer: Option<Point>,
+        text_context: &mut TextContext,
+        clip_bounds: Option<Rectangle>,
+        scale_factor: f64,
+    ) {
+        let node = self.element_data.layout.taffy_node_id();
+        let layout = taffy_tree.get_layout(node);
+        self.element_data.layout.has_new_layout = taffy_tree.has_new_layout(node);
+        let dirty = self.element_data.layout.is_dirty(transform, position);
+
+        if dirty {
+            self.resolve_box(position, transform, layout, z_index);
+            self.apply_borders(scale_factor);
+            self.apply_clip(clip_bounds);
+            self.element_data.layout.scroll_state.mark_old();
+        }
+        taffy_tree.mark_seen(node);
+
+
+        // Position the floating window below the dropdown with a gap.
+        let floating_window_position = Point::new(
+            self.element_data.layout.computed_box.position.x,
+            self.element_data.layout.computed_box.position.y + self.element_data.layout.computed_box.size.height as f64
+        );
+
+        self.floating_window.apply_simple_layout(taffy_tree, transform, floating_window_position, z_index, scale_factor, None /*clip_bounds*/);
+        let scroll_y = self.floating_window.layout.scroll_state.scroll_y() as f64;
+        let child_transform = Affine::translate((0.0, -scroll_y));
+
+        for child in &self.element_data.children {
+            child.borrow_mut().apply_layout(
+                taffy_tree,
+                floating_window_position,
+                z_index,
+                transform * child_transform,
+                pointer,
+                text_context,
+                self.floating_window.layout.clip_bounds,
+                scale_factor,
+            );
+        }
+    }
+
+    fn in_bounds(&self, point: Point) -> bool {
+        let element_data = &self.element_data;
+        let rect = element_data.layout.computed_box_transformed.border_rectangle();
+        let floating_window_rect = self.floating_window.layout.computed_box_transformed.border_rectangle();
+
+        if floating_window_rect.contains(&point) {
+            return true;
+        }
+
+        if let Some(clip) = element_data.layout.clip_bounds {
+            let rect_intersection = match rect.intersection(&clip) {
+                Some(bounds) => bounds.contains(&point),
+                None => false,
+            };
+
+            rect_intersection
+        } else {
+            rect.contains(&point)
+        }
+    }
+
+    fn draw(
+        &mut self,
+        renderer: &mut RenderList,
+        text_context: &mut TextContext,
+        pointer: Option<Point>,
+        scale_factor: f64,
+    ) {
+        if !self.is_visible() {
+            return;
+        }
+        self.add_hit_testable(renderer, true, scale_factor);
+
+        // We draw the borders before we start any layers, so that we don't clip the borders.
+        self.draw_borders(renderer, scale_factor);
+
+        /*if self.element_data.layout_item.has_new_layout {
+            renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 5.0);
+        }*/
+
+        if true || !self.is_floating_window_hidden {
+            renderer.start_overlay();
+            self.draw_borders(renderer, scale_factor);
+
+            let current_style = self.floating_window.style.as_ref();
+            self.floating_window.layout.draw_borders(renderer, current_style, scale_factor);
+
+            self.maybe_start_layer(renderer, scale_factor);
+            self.draw_children(renderer, text_context, pointer, scale_factor);
+            self.maybe_end_layer(renderer);
+            renderer.end_overlay();
+        }
+    }
+
+    fn on_event(
+        &mut self,
+        message: &CraftMessage,
+        _text_context: &mut TextContext,
+        event: &mut Event,
+        _target: Option<Rc<RefCell<dyn ElementInternals>>>,
+    ) {
+        let mut element_data = self.element_data;
+        scrollable::on_scroll_events(
+            self,
+            &element_data.style,
+            &mut element_data.layout,
+            message,
+            event
+        );
+
+        let pb = match message {
+            CraftMessage::PointerButtonUp(pb) => Some(pb),
+            _ => None
+        };
+
+        // if self.is_floating_window_hidden {
+        //     return;
+        // }
+
+        let floating_window_rect = self.floating_window.layout.computed_box_transformed.border_rectangle();
+
+        //let scroll_result = scrollable::on_scroll_events_no_pointer_advance(&self.floating_window.style, &mut self.floating_window.layout, message, event);
+        //scrollable::on_scroll_events_handle_advance_result(self, scroll_result);
+
+
+        if let Some(pb) = pb {
+            self.is_floating_window_hidden = !self.is_floating_window_hidden;
+        }
+
+
+    }
+
+    fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
+        resolve_clip_for_scrollable(self, clip_bounds);
+    }
+
+    fn push(&mut self, child: Rc<RefCell<dyn ElementInternals>>) {
+        let me: Weak<RefCell<dyn ElementInternals>> = self.element_data.me.clone();
+        child.borrow_mut().element_data_mut().parent = Some(me);
+        self.element_data.children.push(child.clone());
+
+        // Add the children to the floating window layout.
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let parent_id = self.floating_window.layout.taffy_node_id.unwrap();
+            let child_id = child.borrow().element_data().layout.taffy_node_id();
+            taffy_tree.add_child(parent_id, child_id);
+        });
+    }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
+}
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 37612b45..8c43b9f0 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -165,7 +165,7 @@ pub(crate) fn apply_scroll_layout(style: &Style, layout: &mut Layout, taffy_layo
     layout.scrollbar_thumb_margin = style.get_scrollbar_thumb_margin();
     layout.scrollbar_thumb_radius = style.get_scrollbar_thumb_radius();
 
-    layout.scrollbar_size = Size::new(layout.scrollbar_size.width, layout.scrollbar_size.height);
+    layout.scrollbar_size = Size::new(taffy_layout.scrollbar_size.width, taffy_layout.scrollbar_size.height);
     layout.computed_scrollbar_size = Size::new(taffy_layout.scroll_width(), taffy_layout.scroll_height());
     let state = &mut layout.scroll_state;
 
@@ -230,27 +230,26 @@ pub(crate) fn apply_scroll_layout(style: &Style, layout: &mut Layout, taffy_layo
 
 /// Updates the scroll state when an event occurs.
 #[allow(clippy::too_many_arguments)]
-pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &CraftMessage, event: &mut Event) {
-    let element_data = element.element_data_mut();
+pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, style: &Style, layout: &mut Layout, message: &CraftMessage, event: &mut Event) {
 
-    if element_data.is_scrollable() {
-        let state = &mut element_data.layout.scroll_state;
+    if layout.is_scrollable() {
+        let state = &mut layout.scroll_state;
         match message {
             CraftMessage::PointerScroll(mouse_wheel) => {
                 let delta = match mouse_wheel.delta {
                     ScrollDelta::LineDelta(_x, y) => {
-                        y * element_data.style.get_font_size().max(12.0) * element_data.style.get_line_height()
+                        y * style.get_font_size().max(12.0) * style.get_line_height()
                     }
                     ScrollDelta::PixelDelta(physical) => physical.y as f32,
                     ScrollDelta::PageDelta(_x, y) => y,
                 };
                 let delta = -delta;
                 // Todo: Scroll physics
-                let max_scroll_y = element_data.layout.max_scroll_y;
+                let max_scroll_y = layout.max_scroll_y;
 
                 let current_scroll_y = state.scroll_y();
                 state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-                request_apply_layout(element_data.layout.taffy_node_id.unwrap());
+                request_apply_layout(layout.taffy_node_id.unwrap());
 
                 event.prevent_propagate();
                 event.prevent_defaults();
@@ -259,10 +258,9 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
                 if pointer_button.button == Some(ui_events::pointer::PointerButton::Primary) {
                     // DEVICE(TOUCH): Handle scrolling within the content area on touch based input devices.
                     if pointer_button.pointer.pointer_type == PointerType::Touch {
-                        let container_rectangle = element_data.layout.computed_box_transformed.padding_rectangle();
+                        let container_rectangle = layout.computed_box_transformed.padding_rectangle();
 
-                        let in_scroll_bar = element_data
-                            .layout
+                        let in_scroll_bar = layout
                             .computed_scroll_thumb
                             .contains(&pointer_button.state.logical_point());
 
@@ -274,8 +272,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
                             event.prevent_propagate();
                             event.prevent_defaults();
                         }
-                    } else if element_data
-                        .layout
+                    } else if layout
                         .computed_scroll_thumb
                         .contains(&pointer_button.state.logical_point())
                     {
@@ -289,19 +286,18 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
 
                         event.prevent_propagate();
                         event.prevent_defaults();
-                    } else if element_data
-                        .layout
+                    } else if layout
                         .computed_scroll_track
                         .contains(&pointer_button.state.logical_point())
                     {
                         let offset_y =
-                            pointer_button.state.position.y as f32 - element_data.layout.computed_scroll_track.y;
+                            pointer_button.state.position.y as f32 - layout.computed_scroll_track.y;
 
-                        let percent = offset_y / element_data.layout.computed_scroll_track.height;
-                        let scroll_y = percent * element_data.layout.max_scroll_y;
+                        let percent = offset_y / layout.computed_scroll_track.height;
+                        let scroll_y = percent * layout.max_scroll_y;
 
-                        state.set_scroll_y(scroll_y.clamp(0.0, element_data.layout.max_scroll_y));
-                        request_apply_layout(element_data.layout.taffy_node_id.unwrap());
+                        state.set_scroll_y(scroll_y.clamp(0.0, layout.max_scroll_y));
+                        request_apply_layout(layout.taffy_node_id.unwrap());
 
                         event.prevent_propagate();
                         event.prevent_defaults();
@@ -322,10 +318,10 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
                     // Todo: Translate scroll wheel pixel to scroll position for diff.
                     let delta = (pointer_motion.current.position.y - click.y) as f32;
 
-                    let max_scroll_y = element_data.layout.max_scroll_y;
+                    let max_scroll_y = layout.max_scroll_y;
 
-                    let click_y_offset = element_data.layout.computed_scroll_track.height
-                        - element_data.layout.computed_scroll_thumb.height;
+                    let click_y_offset = layout.computed_scroll_track.height
+                        - layout.computed_scroll_thumb.height;
                     if click_y_offset <= 0.0 {
                         return;
                     }
@@ -338,7 +334,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
 
                     let current_scroll_y = state.scroll_y();
                     state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-                    request_apply_layout(element_data.layout.taffy_node_id.unwrap());
+                    request_apply_layout(layout.taffy_node_id.unwrap());
                     state.scroll_click = Some(Point::new(click.x, pointer_motion.current.position.y));
                     event.prevent_propagate();
                     event.prevent_defaults();
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 2383677e..8065fa1d 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -308,7 +308,7 @@ impl ElementInternals for TextInputInner {
     ) {
         self.state.is_active = true;
 
-        scrollable::on_scroll_events(self, message, event);
+        scrollable::on_scroll_events(self, self.style(), &mut self.element_data.layout, message, event);
 
         if !event.propagate {
             return;
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 9237c651..229a4748 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -636,7 +636,7 @@ impl ElementInternals for WindowInternal {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        scrollable::on_scroll_events(self, message, event);
+        scrollable::on_scroll_events(self, self.style(), &mut self.element_data.layout, message, event);
     }
 
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index 6cd02ae5..23751349 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -1,38 +1,8 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use craft_retained::elements::{Container, Element, Text, Window};
-use craft_retained::events::ui_events::pointer::PointerButton;
-use craft_retained::style::{AlignItems, BoxShadow, FlexDirection, JustifyContent};
-use craft_retained::{Color, CraftOptions, pct, px, rgb, rgba};
-
-fn create_button(label: &str, base_color: Color, delta: i64, state: Rc<RefCell<i64>>, count_text: Text) -> Container {
-    let border_color = rgb(0, 0, 0);
-    Container::new()
-        .box_shadows(vec![
-            BoxShadow::new(false, 0.0, 5.0, 5.0, 0.0, rgba(0, 0, 0, 200)),
-            BoxShadow::new(false, 0.0, 25.0, 35.0, 0.0, rgba(0, 0, 0, 150)),
-            BoxShadow::new(true, 0.0, 4.0, 4.0, 0.0, rgba(255, 255, 255, 120)),
-        ])
-        .border_width(px(0), px(0), px(0), px(0))
-        .border_color(border_color, border_color, border_color, border_color)
-        .border_radius((8.0, 8.0), (8.0, 8.0), (8.0, 8.0), (8.0, 8.0))
-        .padding(px(15), px(30), px(15), px(30))
-        .justify_content(Some(JustifyContent::Center))
-        .background_color(base_color)
-        .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {
-            if pointer_button_event.button == Some(PointerButton::Primary) {
-                *state.borrow_mut() += delta;
-                count_text.clone().text(&format!("Count: {}", state.borrow()));
-                event.prevent_propagate();
-            }
-        }))
-        .push(Text::new(label).font_size(24.0).color(Color::WHITE).selectable(false))
-}
+use craft_retained::elements::{Dropdown, Element, Text, Window};
+use craft_retained::style::{AlignItems, FlexDirection, JustifyContent, Unit};
+use craft_retained::{pct, px, Color, CraftOptions};
 
 fn main() {
-    let count = Rc::new(RefCell::new(0));
-    let count_text = Text::new(&format!("Count: {}", count.borrow()));
 
     Window::new("Counter")
         .flex_direction(FlexDirection::Column)
@@ -41,25 +11,22 @@ fn main() {
         .width(pct(100))
         .height(pct(100))
         .gap(px(20), px(20))
-        .push(count_text.clone())
         .push({
-            Container::new()
-                .gap(px(20), px(20))
-                .push(create_button(
-                    "-",
-                    rgb(244, 63, 94),
-                    -1,
-                    count.clone(),
-                    count_text.clone(),
-                ))
-                .push(create_button(
-                    "+",
-                    rgb(16, 185, 129),
-                    1,
-                    count.clone(),
-                    count_text.clone(),
-                ))
+            Dropdown::new()
+                .background_color(Color::from_rgb8(150, 150, 152))
+                .width(Unit::Px(100.0))
+                .height(Unit::Px(30.0))
+                .push(Text::new("Item 1").selectable(true))
+                .push(Text::new("Item 2").selectable(true))
+                .push(Text::new("Item 3").selectable(true))
+                .push(Text::new("Item 4").selectable(true))
+                .push(Text::new("Item 5").selectable(true))
+                .push(Text::new("Item 6").selectable(true))
+                .push(Text::new("Item 7").selectable(true))
+                .push(Text::new("Item 8").selectable(true))
+                .push(Text::new("Item 9").selectable(true))
+                .push(Text::new("Item 10").selectable(true))
         });
 
-    craft_retained::craft_main(CraftOptions::basic("Counter"));
+    craft_retained::craft_main(CraftOptions::basic("Dropdown example"));
 }

From 2f4798c2ec6334953c05937f1286c23c27d63254 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@protonmail.com>
Date: Sun, 15 Mar 2026 11:21:49 -0400
Subject: [PATCH 071/143] use nightly

---
 .cargo/config.toml  | 5 ++++-
 rust-toolchain.toml | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 rust-toolchain.toml

diff --git a/.cargo/config.toml b/.cargo/config.toml
index feeb78fc..db0c44de 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,2 +1,5 @@
 [alias]
-xtask = "run --release --package xtask --"
\ No newline at end of file
+xtask = "run --release --package xtask --"
+
+[build]
+rustflags = ["-Zpolonius=next"]
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 00000000..61c7f525
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2026-03-15"
+components = ["rust-src", "rust-analyzer", "clippy"]
\ No newline at end of file

From 8f84432394820b9e32b78c4f8912e9a4729adde1 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 15 Mar 2026 11:39:31 -0400
Subject: [PATCH 072/143] Update rust-toolchain.toml

---
 rust-toolchain.toml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 61c7f525..19799ac2 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,4 @@
 [toolchain]
-channel = "nightly-2026-03-15"
-components = ["rust-src", "rust-analyzer", "clippy"]
\ No newline at end of file
+channel = "nightly-2026-03-14"
+components = ["rustc", "cargo", "rust-std", "rust-src", "rust-analyzer", "clippy", "rustfmt"]
+targets = ["x86_64-pc-windows-msvc"]

From 3e9f446bc50893115306ef57b29b277ec5104d14 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sun, 15 Mar 2026 15:53:44 -0400
Subject: [PATCH 073/143] A very basic drop down

I need to deep clone the taffy layout nodes when an element is selected. TODO!
---
 .cargo/config.toml                            |   2 +-
 .../craft_retained/src/elements/container.rs  |   8 +-
 .../craft_retained/src/elements/dropdown.rs   | 119 ++++++++++++------
 .../src/elements/element_data.rs              |   6 +-
 crates/craft_retained/src/elements/image.rs   |   6 +
 .../craft_retained/src/elements/scrollable.rs |  92 ++++++++++++--
 .../src/elements/slider/slider_element.rs     |   6 +
 crates/craft_retained/src/elements/text.rs    |   5 +
 .../src/elements/text_input/mod.rs            |   7 +-
 .../src/elements/traits/deep_clone.rs         |  42 +++++++
 .../src/elements/traits/element.rs            |   7 +-
 .../src/elements/traits/element_internals.rs  |  44 ++-----
 .../craft_retained/src/elements/traits/mod.rs |   2 +
 crates/craft_retained/src/elements/window.rs  |  13 +-
 crates/craft_retained/src/layout/layout.rs    |  11 +-
 examples/counter_retained/main.rs             |  16 ++-
 16 files changed, 275 insertions(+), 111 deletions(-)
 create mode 100644 crates/craft_retained/src/elements/traits/deep_clone.rs

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 15614255..3868cc01 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -2,4 +2,4 @@
 xtask = "run --release --package xtask --"
 
 [build]
-rustflags = ["-Zpolonius"]
\ No newline at end of file
+rustflags = ["-Zpolonius=next"]
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 6eceb497..87d85f20 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -12,6 +12,7 @@ use crate::app::TAFFY_TREE;
 use crate::elements::{resolve_clip_for_scrollable, ElementInternals, AsElement, Element};
 use crate::elements::element_data::ElementData;
 use crate::elements::{scrollable};
+use crate::elements::traits::DeepClone;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
@@ -24,6 +25,7 @@ pub struct Container {
 /// Stores one or more elements.
 ///
 /// If overflow is set to scroll, it will become scrollable.
+#[derive(Clone)]
 pub struct ContainerInner {
     element_data: ElementData,
 }
@@ -67,6 +69,10 @@ impl crate::elements::ElementData for ContainerInner {
 }
 
 impl ElementInternals for ContainerInner {
+    fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        self.deep_clone_internal()
+    }
+    
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
@@ -154,7 +160,7 @@ impl ElementInternals for ContainerInner {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        scrollable::on_scroll_events(self, self.style(), &mut self.element_data.layout, message, event);
+        scrollable::handle_scroll_logic(self, message, event);
     }
 
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index 99bc5ff9..60b032a0 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -5,17 +5,18 @@ use std::rc::{Rc, Weak};
 use craft_primitives::geometry::{Rectangle, TrblRectangle};
 use craft_renderer::RenderList;
 use kurbo::{Affine, Point};
-
-use crate::app::TAFFY_TREE;
-use crate::elements::{resolve_clip_for_scrollable, ElementInternals, AsElement, Element};
-use crate::elements::element_data::ElementData;
+use ui_events::pointer::PointerId;
+use crate::app::{request_apply_layout, TAFFY_TREE};
+use crate::elements::{resolve_clip_for_scrollable, ElementInternals, AsElement, Element, ElementData};
+use crate::elements::element_data::ElementData as ElementDataStruct;
 use crate::elements::{scrollable};
-use crate::elements::scrollable::apply_scroll_layout;
+use crate::elements::scrollable::{apply_scroll_layout, draw_scrollbar, handle_scroll_logic_advance};
 use crate::events::{CraftMessage, Event};
 use crate::layout::layout::Layout;
 use crate::layout::TaffyTree;
 use crate::{px, rgb, rgba};
-use crate::style::{BoxShadow, Display, FlexDirection, Overflow, Position, Style};
+use crate::elements::traits::DeepClone;
+use crate::style::{BoxShadow, Display, FlexDirection, Overflow, Position, Style, Unit};
 use crate::text::text_context::TextContext;
 
 #[derive(Clone)]
@@ -23,6 +24,7 @@ pub struct Dropdown {
     pub inner: Rc<RefCell<DropdownInner>>,
 }
 
+#[derive(Clone)]
 pub struct Shape {
     pub layout: Layout,
     pub style: Box<Style>,
@@ -47,11 +49,14 @@ impl Shape {
         });
     }
 
-    pub fn apply_simple_layout(&mut self, taffy_tree: &mut TaffyTree, transform: Affine, position: Point, z_index: &mut u32, scale_factor: f64, clip_bounds: Option<Rectangle>,) {
+    pub fn apply_simple_layout(&mut self, taffy_tree: &mut TaffyTree, transform: Affine, position: Point, z_index: &mut u32, scale_factor: f64, clip_bounds: Option<Rectangle>) {
         let node = self.layout.taffy_node_id();
         let taffy_layout = taffy_tree.get_layout(node);
         self.layout.has_new_layout = taffy_tree.has_new_layout(node);
-        let dirty = self.layout.is_dirty(transform, position);
+
+        let dirty = self.layout.has_new_layout
+            || transform != self.layout.get_transform()
+            || position != self.layout.position;
 
         if dirty {
             self.layout.resolve_box(position, transform, taffy_layout, z_index, self.style.get_position());
@@ -85,10 +90,12 @@ impl Shape {
 /// Stores one or more elements.
 ///
 /// If overflow is set to scroll, it will become scrollable.
+#[derive(Clone)]
 pub struct DropdownInner {
-    element_data: ElementData,
+    element_data: ElementDataStruct,
     floating_window: Shape,
     is_floating_window_hidden: bool,
+    selected_element: Option<Rc<RefCell<dyn ElementInternals>>>
 }
 
 impl Default for Dropdown {
@@ -101,9 +108,10 @@ impl Dropdown {
     pub fn new() -> Self {
         let inner = Rc::new_cyclic(|me: &Weak<RefCell<DropdownInner>>| {
             RefCell::new(DropdownInner {
-                element_data: ElementData::new(me.clone(), true),
+                element_data: ElementDataStruct::new(me.clone(), true),
                 floating_window: Shape::new(true),
                 is_floating_window_hidden: true,
+                selected_element: None,
             })
         });
 
@@ -114,11 +122,13 @@ impl Dropdown {
         inner.borrow_mut().floating_window.style.set_flex_direction(FlexDirection::Column);
 
         inner.borrow_mut().floating_window.style.set_box_shadows(vec![
-            BoxShadow::new(false, 0.0, 0.0, 10.0, 1.0, rgba(0, 0, 0, 30)),
-            BoxShadow::new(false, 0.0, 8.0, 16.0, -2.0, rgba(0, 0, 0, 50)),
-            BoxShadow::new(true, 0.0, 1.0, 1.0, 0.0, rgba(255, 255, 255, 30)),
+            BoxShadow::new(false, 0.0, 4.0, 16.0, 0.0, rgba(0, 0, 0, 140)), // 0.55
+            BoxShadow::new(false, 0.0, 20.0, 60.0, 0.0, rgba(0, 0, 0, 90)),  // 0.35
         ]);
-        let border_color = rgba(0, 0, 0, 20); // Very faint black
+
+        let border_color = rgba(0, 0, 0, 64);
+        inner.borrow_mut().floating_window.style.set_padding(TrblRectangle::new_all(px(2.0)));
+        inner.borrow_mut().floating_window.style.set_width(Unit::Percentage(100.0));
         inner.borrow_mut().floating_window.style.set_overflow([Overflow::Visible, Overflow::Scroll]);
         inner.borrow_mut().floating_window.style.set_border_color(TrblRectangle::new_all(border_color));
         inner.borrow_mut().floating_window.style.set_height(px(100.0));
@@ -147,16 +157,20 @@ impl AsElement for Dropdown {
 }
 
 impl crate::elements::ElementData for DropdownInner {
-    fn element_data(&self) -> &ElementData {
+    fn element_data(&self) -> &ElementDataStruct {
         &self.element_data
     }
 
-    fn element_data_mut(&mut self) -> &mut ElementData {
+    fn element_data_mut(&mut self) -> &mut ElementDataStruct {
         &mut self.element_data
     }
 }
 
 impl ElementInternals for DropdownInner {
+    fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        self.deep_clone_internal()
+    }
+
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
@@ -171,7 +185,9 @@ impl ElementInternals for DropdownInner {
         let node = self.element_data.layout.taffy_node_id();
         let layout = taffy_tree.get_layout(node);
         self.element_data.layout.has_new_layout = taffy_tree.has_new_layout(node);
-        let dirty = self.element_data.layout.is_dirty(transform, position);
+        let dirty = self.element_data.layout.has_new_layout
+            || transform != self.element_data.layout.get_transform()
+            || position != self.element_data.layout.position;
 
         if dirty {
             self.resolve_box(position, transform, layout, z_index);
@@ -188,7 +204,7 @@ impl ElementInternals for DropdownInner {
             self.element_data.layout.computed_box.position.y + self.element_data.layout.computed_box.size.height as f64
         );
 
-        self.floating_window.apply_simple_layout(taffy_tree, transform, floating_window_position, z_index, scale_factor, None /*clip_bounds*/);
+        self.floating_window.apply_simple_layout(taffy_tree, transform, floating_window_position, z_index, scale_factor, None);
         let scroll_y = self.floating_window.layout.scroll_state.scroll_y() as f64;
         let child_transform = Affine::translate((0.0, -scroll_y));
 
@@ -242,21 +258,24 @@ impl ElementInternals for DropdownInner {
         // We draw the borders before we start any layers, so that we don't clip the borders.
         self.draw_borders(renderer, scale_factor);
 
-        /*if self.element_data.layout_item.has_new_layout {
-            renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 5.0);
-        }*/
+        if let Some(selected_element) = &self.selected_element {
+            let mut binding = selected_element.borrow_mut();
+            binding.element_data_mut().layout.computed_box_transformed = self.element_data.layout.computed_box_transformed.clone();
+            binding.draw(renderer, text_context, pointer, scale_factor);
+        }
 
-        if true || !self.is_floating_window_hidden {
-            renderer.start_overlay();
-            self.draw_borders(renderer, scale_factor);
+        if !self.is_floating_window_hidden {
+            //renderer.start_overlay();
 
             let current_style = self.floating_window.style.as_ref();
             self.floating_window.layout.draw_borders(renderer, current_style, scale_factor);
 
-            self.maybe_start_layer(renderer, scale_factor);
+            renderer.push_layer(self.floating_window.layout.computed_box_transformed.padding_rectangle().scale(scale_factor));
             self.draw_children(renderer, text_context, pointer, scale_factor);
-            self.maybe_end_layer(renderer);
-            renderer.end_overlay();
+            renderer.pop_layer();
+
+            draw_scrollbar(&self.floating_window.style, &self.floating_window.layout, renderer, scale_factor);
+           // renderer.end_overlay();
         }
     }
 
@@ -267,11 +286,8 @@ impl ElementInternals for DropdownInner {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        let mut element_data = self.element_data;
-        scrollable::on_scroll_events(
+        scrollable::handle_scroll_logic(
             self,
-            &element_data.style,
-            &mut element_data.layout,
             message,
             event
         );
@@ -281,19 +297,44 @@ impl ElementInternals for DropdownInner {
             _ => None
         };
 
-        // if self.is_floating_window_hidden {
-        //     return;
-        // }
+        if let Some(pb) = pb {
+            // TODO Should pb.state.position be in logical coordinates?
+            let pointer_position = Point::new(pb.state.position.x, pb.state.position.y);
+
+            if self.element_data.layout.computed_box_transformed.border_rectangle().contains(&pointer_position) {
+                self.is_floating_window_hidden = !self.is_floating_window_hidden;
+            }
+
+            if !self.floating_window.layout.computed_box_transformed.border_rectangle().contains(&pointer_position) || self.is_floating_window_hidden {
+                return;
+            }
+
+            for (child_index, child) in self.children().iter().map(|r| r.clone()).enumerate() {
+                let contains = child.borrow().element_data().layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
+
+                if contains {
+                    self.is_floating_window_hidden = !self.is_floating_window_hidden.clone();
+                    self.selected_element = Some(child.clone().borrow().deep_clone());
+                    break;
+                }
+            }
+        }
 
-        let floating_window_rect = self.floating_window.layout.computed_box_transformed.border_rectangle();
+        let mut floating_window = &mut self.floating_window;
 
-        //let scroll_result = scrollable::on_scroll_events_no_pointer_advance(&self.floating_window.style, &mut self.floating_window.layout, message, event);
-        //scrollable::on_scroll_events_handle_advance_result(self, scroll_result);
+        // Clean this up soon!
+        let result = handle_scroll_logic_advance(&*floating_window.style, &mut floating_window.layout, message, event);
 
+        if result.request_apply_layout {
+            request_apply_layout(self.element_data.layout.taffy_node_id.unwrap());
+        }
 
-        if let Some(pb) = pb {
-            self.is_floating_window_hidden = !self.is_floating_window_hidden;
+        if result.set_pointer_capture {
+            self.set_pointer_capture(PointerId::new(1).unwrap())
+        } else if result.release_pointer_capture {
+            self.release_pointer_capture(PointerId::new(1).unwrap());
         }
+        // ---
 
 
     }
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index e270528b..ee9a88a8 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -91,8 +91,8 @@ impl ElementData {
     }
 
     /// Computes the scrollbar's tack and thumb layout.
-    pub(crate) fn apply_scroll(&mut self, layout: &taffy::Layout) {
-       apply_scroll_layout(&self.style, &mut self.layout, layout);
+    pub(crate) fn apply_scroll(&mut self, taffy_layout: &taffy::Layout) {
+       apply_scroll_layout(&self.style, &mut self.layout, taffy_layout);
     }
 
     pub(crate) fn scroll(&self) -> ScrollState {
@@ -102,7 +102,7 @@ impl ElementData {
 
 impl ElementData {
     pub fn is_scrollable(&self) -> bool {
-        self.style.get_overflow()[1] == Overflow::Scroll && self.layout.is_scrollable()
+        self.style.get_overflow()[1] == Overflow::Scroll && self.layout.is_scrollable_layout()
     }
 
     pub fn current_style(&self) -> &Style {
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 8e79ad1b..fb43aac5 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -14,11 +14,13 @@ use kurbo::{Affine, Point};
 use crate::app::{ELEMENTS, PENDING_RESOURCES, TAFFY_TREE};
 use crate::elements::ElementInternals;
 use crate::elements::element_data::ElementData;
+use crate::elements::traits::DeepClone;
 use crate::layout::TaffyTree;
 use crate::layout::layout_context::{ImageContext, LayoutContext};
 use crate::text::text_context::TextContext;
 
 /// Displays an image.
+#[derive(Clone)]
 pub struct Image {
     is_image_dirty: bool,
     resource_identifier: ResourceIdentifier,
@@ -83,6 +85,10 @@ impl crate::elements::ElementData for Image {
 
 
 impl ElementInternals for Image {
+    fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        self.deep_clone_internal()
+    }
+
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 8c43b9f0..47f70ff7 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -1,15 +1,17 @@
 use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::rc::Rc;
-use kurbo::Point;
+use kurbo::{Point, Vec2};
 use ui_events::ScrollDelta;
 use ui_events::pointer::{PointerId, PointerType};
 use craft_primitives::geometry::{Rectangle, Size};
+use craft_primitives::geometry::borders::CssRoundedRect;
+use craft_renderer::RenderList;
 use crate::app::{queue_event, request_apply_layout};
 use crate::elements::element_data::ElementData;
 use crate::elements::ElementInternals;
 use crate::events::{CraftMessage, Event};
-use crate::layout::layout::Layout;
+use crate::layout::layout::{draw_borders_generic, CssComputedBorder, Layout};
 use crate::style::{Overflow, Style};
 
 /**
@@ -227,12 +229,38 @@ pub(crate) fn apply_scroll_layout(style: &Style, layout: &mut Layout, taffy_layo
     layout.computed_scroll_thumb.height = scroll_thumb_height;
 }
 
+pub struct HandleScrollLogicResult {
+    pub request_apply_layout: bool,
+    pub release_pointer_capture: bool,
+    pub set_pointer_capture: bool,
+}
+
+pub(crate) fn handle_scroll_logic(element: &mut dyn ElementInternals, message: &CraftMessage, event: &mut Event) {
+    let mut element_data  = element.element_data_mut();
+    let result = handle_scroll_logic_advance(&*element_data.style, &mut element_data.layout, message, event);
+
+    if result.request_apply_layout {
+        request_apply_layout(element.element_data().layout.taffy_node_id());
+    }
+
+    if result.set_pointer_capture {
+        element.set_pointer_capture(PointerId::new(1).unwrap())
+    }
+
+    if result.release_pointer_capture {
+        element.release_pointer_capture(PointerId::new(1).unwrap());
+    }
+}
 
-/// Updates the scroll state when an event occurs.
 #[allow(clippy::too_many_arguments)]
-pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, style: &Style, layout: &mut Layout, message: &CraftMessage, event: &mut Event) {
+pub(crate) fn handle_scroll_logic_advance(style: &Style, layout: &mut Layout, message: &CraftMessage, event: &mut Event) -> HandleScrollLogicResult {
+    let mut result = HandleScrollLogicResult {
+        request_apply_layout: false,
+        release_pointer_capture: false,
+        set_pointer_capture: false,
+    };
 
-    if layout.is_scrollable() {
+    if layout.is_scrollable_layout() && style.get_overflow()[1] == Overflow::Scroll {
         let state = &mut layout.scroll_state;
         match message {
             CraftMessage::PointerScroll(mouse_wheel) => {
@@ -249,7 +277,8 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, style: &Style
 
                 let current_scroll_y = state.scroll_y();
                 state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-                request_apply_layout(layout.taffy_node_id.unwrap());
+
+                result.request_apply_layout = true;
 
                 event.prevent_propagate();
                 event.prevent_defaults();
@@ -282,10 +311,12 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, style: &Style
                         ));
 
                         // FIXME: Turn pointer capture on with the correct device id.
-                        element.set_pointer_capture(PointerId::new(1).unwrap());
+                        //element.set_pointer_capture(PointerId::new(1).unwrap());
 
                         event.prevent_propagate();
                         event.prevent_defaults();
+
+                        result.set_pointer_capture = true;
                     } else if layout
                         .computed_scroll_track
                         .contains(&pointer_button.state.logical_point())
@@ -297,7 +328,8 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, style: &Style
                         let scroll_y = percent * layout.max_scroll_y;
 
                         state.set_scroll_y(scroll_y.clamp(0.0, layout.max_scroll_y));
-                        request_apply_layout(layout.taffy_node_id.unwrap());
+
+                        result.request_apply_layout = true;
 
                         event.prevent_propagate();
                         event.prevent_defaults();
@@ -307,10 +339,10 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, style: &Style
             CraftMessage::PointerButtonUp(_pointer_button) => {
                 if state.scroll_click.is_some() {
                     state.scroll_click = None;
-                    // FIXME: Turn pointer capture off with the correct device id.
-                    element.release_pointer_capture(PointerId::new(1).unwrap());
                     event.prevent_propagate();
                     event.prevent_defaults();
+
+                    result.release_pointer_capture = true;
                 }
             }
             CraftMessage::PointerMovedEvent(pointer_motion) => {
@@ -323,7 +355,7 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, style: &Style
                     let click_y_offset = layout.computed_scroll_track.height
                         - layout.computed_scroll_thumb.height;
                     if click_y_offset <= 0.0 {
-                        return;
+                        return result;
                     }
                     let mut delta = max_scroll_y * (delta / (click_y_offset));
 
@@ -334,7 +366,8 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, style: &Style
 
                     let current_scroll_y = state.scroll_y();
                     state.set_scroll_y((current_scroll_y + delta).clamp(0.0, max_scroll_y));
-                    request_apply_layout(layout.taffy_node_id.unwrap());
+                    result.request_apply_layout = true;
+
                     state.scroll_click = Some(Point::new(click.x, pointer_motion.current.position.y));
                     event.prevent_propagate();
                     event.prevent_defaults();
@@ -342,5 +375,38 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, style: &Style
             }
             _ => {}
         }
-    }
+    };
+
+    result
 }
+
+pub fn draw_scrollbar(style: &Style, layout: &Layout, renderer: &mut RenderList, scale_factor: f64) {
+    if !(layout.is_scrollable_layout() && style.get_overflow()[1] == Overflow::Scroll) {
+        return;
+    }
+
+    let border_color = style.get_border_color();
+    let scrollbar_color = style.get_scrollbar_color();
+    let scrollbar_thumb_radius = style
+        .get_scrollbar_thumb_radius()
+        .map(|radii| Vec2::new(radii.0 as f64, radii.1 as f64));
+    // let scrollbar_thumb_radius = self.element_data().current_style().
+    let track_rect = layout
+        .computed_scroll_track
+        .scale(scale_factor);
+    let thumb_rect = layout
+        .computed_scroll_thumb
+        .scale(scale_factor);
+
+    let border_spec = CssRoundedRect::new(thumb_rect.to_kurbo(), [0.0, 0.0, 0.0, 0.0], scrollbar_thumb_radius);
+    let mut computed_border_spec = CssComputedBorder::new(border_spec);
+    computed_border_spec.scale(scale_factor);
+
+    renderer.draw_rect(track_rect, scrollbar_color.track_color);
+    draw_borders_generic(
+        renderer,
+        &computed_border_spec,
+        border_color.to_array(),
+        scrollbar_color.thumb_color,
+    );
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/slider/slider_element.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
index 8ca135ed..acbb2d12 100644
--- a/crates/craft_retained/src/elements/slider/slider_element.rs
+++ b/crates/craft_retained/src/elements/slider/slider_element.rs
@@ -13,6 +13,7 @@ use crate::app::queue_event;
 use crate::elements::{ElementInternals, AsElement};
 use crate::elements::element_data::ElementData;
 use crate::elements::{Element};
+use crate::elements::traits::DeepClone;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::palette;
@@ -31,6 +32,7 @@ pub struct Slider {
     pub inner: Rc<RefCell<SliderInner>>,
 }
 
+#[derive(Clone)]
 pub struct SliderInner {
     element_data: ElementData,
 
@@ -320,6 +322,10 @@ impl crate::elements::ElementData for SliderInner {
 }
 
 impl ElementInternals for SliderInner {
+    fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        self.deep_clone_internal()
+    }
+
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index a88c15fe..e20dd898 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -41,6 +41,7 @@ use crate::elements::AsElement;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::elements::element_id::create_unique_element_id;
 use crate::elements::{Element};
+use crate::elements::traits::DeepClone;
 use crate::layout::TaffyTree;
 
 #[derive(Clone)]
@@ -198,6 +199,10 @@ impl crate::elements::ElementData for TextInner {
 }
 
 impl ElementInternals for TextInner {
+    fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        self.deep_clone_internal()
+    }
+
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 8065fa1d..3ddfaa06 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -21,6 +21,7 @@ use crate::elements::element_data::ElementData;
 use crate::elements::element_id::create_unique_element_id;
 use crate::elements::text_input::text_input_state::TextInputState;
 use crate::elements::{Element, scrollable};
+use crate::elements::traits::DeepClone;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::layout::layout_context::{LayoutContext, TaffyTextInputContext};
@@ -149,6 +150,10 @@ impl crate::elements::ElementData for TextInputInner {
 }
 
 impl ElementInternals for TextInputInner {
+    fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        self.deep_clone_internal()
+    }
+
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
@@ -308,7 +313,7 @@ impl ElementInternals for TextInputInner {
     ) {
         self.state.is_active = true;
 
-        scrollable::on_scroll_events(self, self.style(), &mut self.element_data.layout, message, event);
+        scrollable::handle_scroll_logic(self, message, event);
 
         if !event.propagate {
             return;
diff --git a/crates/craft_retained/src/elements/traits/deep_clone.rs b/crates/craft_retained/src/elements/traits/deep_clone.rs
new file mode 100644
index 00000000..e44a177c
--- /dev/null
+++ b/crates/craft_retained/src/elements/traits/deep_clone.rs
@@ -0,0 +1,42 @@
+use crate::elements::ElementInternals;
+use std::cell::RefCell;
+use std::rc::Rc;
+
+pub trait DeepClone {
+    fn deep_clone_internal(&self) -> Rc<RefCell<dyn ElementInternals>>;
+}
+
+impl<T> DeepClone for T where T: ElementInternals + Clone + 'static {
+    fn deep_clone_internal(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        let mut new_element = Rc::new(RefCell::new(self.clone()));
+        let new_element: Rc<RefCell<dyn ElementInternals>> = new_element;
+
+        {
+            let mut new_data_binding = new_element.borrow_mut();
+            let new_data = new_data_binding.element_data_mut();
+            new_data.me = Rc::downgrade(&new_element);
+            new_data.parent = None;
+
+
+
+            // TODO: Clone the layout nodes?
+            // if let Some(node_id) = new_data.layout.taffy_node_id_mut() {
+            //
+            //     TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            //     });
+            //
+            //     new_data.layout.taffy_node_id_mut();
+            //     request_apply_layout(node_id);
+            //     request_layout(node_id);
+            // }
+
+            let mut new_children = Vec::new();
+            for child in &new_data.children {
+                let new_child = child.borrow().deep_clone();
+                new_children.push(new_child);
+            }
+        }
+
+        new_element
+    }
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/traits/element.rs b/crates/craft_retained/src/elements/traits/element.rs
index 5a0c8cc6..6eb6a549 100644
--- a/crates/craft_retained/src/elements/traits/element.rs
+++ b/crates/craft_retained/src/elements/traits/element.rs
@@ -1,5 +1,5 @@
 use std::cell::RefCell;
-use std::rc::Rc;
+use std::rc::{Rc, Weak};
 
 use craft_primitives::geometry::ElementBox;
 use craft_primitives::Color;
@@ -9,11 +9,12 @@ use winit::event::WindowEvent::{CursorMoved, MouseInput};
 use winit::event::{DeviceId, ElementState, MouseButton};
 
 use crate::app::queue_window_event;
-use crate::elements::{AsElement, ElementInternals};
+use crate::elements::{AsElement, ContainerInner, ElementInternals};
 use crate::elements::scrollable::{ScrollOptions, ScrollState};
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler};
 use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Underline, Unit};
 use crate::CraftError;
+use crate::elements::element_data::ElementData;
 
 /// Exposes a fluent/builder-pattern like API for elements.
 /// Setters in this trait return Self and have no prefix.
@@ -428,4 +429,4 @@ pub trait Element: Clone + AsElement {
         queue_window_event(window_id, mouse_down);
         queue_window_event(window_id, mouse_up);
     }
-}
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index 2623f4d7..b74b4e5f 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -13,8 +13,8 @@ use ui_events::pointer::PointerId;
 use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
 use crate::CraftError;
 use crate::document::Document;
-use crate::elements::{ElementData, ElementIdMap, ScrollOptions, WindowInternal};
-use crate::elements::scrollable::ScrollState;
+use crate::elements::{AsElement, ElementData, ElementIdMap, ScrollOptions, WindowInternal};
+use crate::elements::scrollable::{draw_scrollbar, ScrollState};
 use crate::events::{CraftMessage, Event, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::layout::TaffyTree;
 use crate::layout::layout::{CssComputedBorder, Layout, draw_borders_generic};
@@ -23,6 +23,8 @@ use crate::text::text_context::TextContext;
 
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
 pub trait ElementInternals: ElementData + Any {
+    fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>>;
+
     fn position_in_parent(&self) -> Option<usize> {
         let parent = self.parent();
 
@@ -302,40 +304,8 @@ pub trait ElementInternals: ElementData + Any {
     }
 
     fn draw_scrollbar(&mut self, renderer: &mut RenderList, scale_factor: f64) {
-        if !self.element_data().is_scrollable() {
-            return;
-        }
-
-        let border_color = self.element_data().current_style().get_border_color();
-        let scrollbar_color = self.element_data().current_style().get_scrollbar_color();
-        let scrollbar_thumb_radius = self
-            .element_data()
-            .current_style()
-            .get_scrollbar_thumb_radius()
-            .map(|radii| Vec2::new(radii.0 as f64, radii.1 as f64));
-        // let scrollbar_thumb_radius = self.element_data().current_style().
-        let track_rect = self
-            .element_data_mut()
-            .layout
-            .computed_scroll_track
-            .scale(scale_factor);
-        let thumb_rect = self
-            .element_data_mut()
-            .layout
-            .computed_scroll_thumb
-            .scale(scale_factor);
-
-        let border_spec = CssRoundedRect::new(thumb_rect.to_kurbo(), [0.0, 0.0, 0.0, 0.0], scrollbar_thumb_radius);
-        let mut computed_border_spec = CssComputedBorder::new(border_spec);
-        computed_border_spec.scale(scale_factor);
-
-        renderer.draw_rect(track_rect, scrollbar_color.track_color);
-        draw_borders_generic(
-            renderer,
-            &computed_border_spec,
-            border_color.to_array(),
-            scrollbar_color.thumb_color,
-        );
+        let element_data = self.element_data();
+        draw_scrollbar(&element_data.style, &element_data.layout, renderer, scale_factor);
     }
 
     fn should_start_new_layer(&self) -> bool {
@@ -992,4 +962,4 @@ pub trait ElementInternals: ElementData + Any {
 
 pub fn resolve_clip_for_scrollable(element: &mut dyn ElementInternals, clip_bounds: Option<Rectangle>) {
     element.element_data_mut().layout.resolve_clip_for_scrollable(clip_bounds);
-}
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/traits/mod.rs b/crates/craft_retained/src/elements/traits/mod.rs
index 7c0e9348..8a08c3d2 100644
--- a/crates/craft_retained/src/elements/traits/mod.rs
+++ b/crates/craft_retained/src/elements/traits/mod.rs
@@ -2,7 +2,9 @@ mod element_data;
 mod element_internals;
 mod as_element;
 mod element;
+mod deep_clone;
 
+pub use deep_clone::DeepClone;
 pub use element_data::ElementData;
 pub use as_element::AsElement;
 pub use element::Element;
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 229a4748..eeb62544 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -30,6 +30,7 @@ use crate::app::{App, TAFFY_TREE, WINDOW_MANAGER, queue_window_event};
 use crate::elements::{AsElement, ElementInternals, resolve_clip_for_scrollable};
 use crate::elements::element_data::ElementData;
 use crate::elements::{Element, scrollable};
+use crate::elements::traits::DeepClone;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
@@ -68,6 +69,12 @@ pub struct WindowInternal {
     title: Option<String>,
 }
 
+impl Clone for WindowInternal {
+    fn clone(&self) -> Self {
+        todo!()
+    }
+}
+
 impl Default for Window {
     fn default() -> Self {
         Self::new("Craft")
@@ -504,6 +511,10 @@ impl crate::elements::ElementData for WindowInternal {
 }
 
 impl ElementInternals for WindowInternal {
+    fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        self.deep_clone_internal()
+    }
+
     fn apply_layout(
         &mut self,
         taffy_tree: &mut TaffyTree,
@@ -636,7 +647,7 @@ impl ElementInternals for WindowInternal {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        scrollable::on_scroll_events(self, self.style(), &mut self.element_data.layout, message, event);
+        scrollable::handle_scroll_logic(self, message, event);
     }
 
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
diff --git a/crates/craft_retained/src/layout/layout.rs b/crates/craft_retained/src/layout/layout.rs
index 678c8c63..8117ad5a 100644
--- a/crates/craft_retained/src/layout/layout.rs
+++ b/crates/craft_retained/src/layout/layout.rs
@@ -81,12 +81,6 @@ impl Layout {
         }
     }
 
-    pub fn is_dirty(&self, transform: Affine, position: Point) -> bool {
-        self.has_new_layout
-            || transform != self.get_transform()
-            || position != self.position
-    }
-
     pub fn taffy_node_id(&self) -> NodeId {
         self.taffy_node_id.unwrap()
     }
@@ -95,7 +89,8 @@ impl Layout {
         self.taffy_node_id.as_mut().unwrap()
     }
 
-    pub(crate) fn is_scrollable(&self) -> bool {
+    /// This only returns if an element is a scrollable, not if Overflow[1] == true.
+    pub(crate) fn is_scrollable_layout(&self) -> bool {
         self.is_scrollable
     }
 
@@ -362,7 +357,7 @@ impl Layout {
     }
 
     pub fn resolve_clip_for_scrollable(&mut self, clip_bounds: Option<Rectangle>) {
-        if self.is_scrollable() {
+        if self.is_scrollable_layout() {
             let scroll_clip_bounds = self.computed_box_transformed.padding_rectangle();
             if let Some(clip_bounds) = clip_bounds {
                 self.clip_bounds = scroll_clip_bounds.intersection(&clip_bounds);
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index 23751349..a713cd56 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -1,19 +1,27 @@
 use craft_retained::elements::{Dropdown, Element, Text, Window};
-use craft_retained::style::{AlignItems, FlexDirection, JustifyContent, Unit};
-use craft_retained::{pct, px, Color, CraftOptions};
+use craft_retained::style::{AlignItems, BoxShadow, FlexDirection, JustifyContent, Overflow, Unit};
+use craft_retained::{pct, px, rgba, Color, CraftOptions};
 
 fn main() {
-
+    let border_color = rgba(0, 0, 0, 255);
     Window::new("Counter")
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::Center))
         .align_items(Some(AlignItems::Center))
+        .background_color(Color::WHITE)
         .width(pct(100))
         .height(pct(100))
         .gap(px(20), px(20))
         .push({
             Dropdown::new()
-                .background_color(Color::from_rgb8(150, 150, 152))
+                .box_shadows(vec![
+                    BoxShadow::new(true, 0.0, 20.0, 16.0, 0.0, rgba(0, 0, 0, 50)),  // 0.35
+                ])
+                .overflow(Default::default(), Overflow::Scroll)
+                .border_color(border_color, border_color, border_color, border_color)
+                .border_width(px(1), px(1), px(1), px(1))
+                .border_radius((6.0, 6.0), (6.0, 6.0), (6.0, 6.0), (6.0, 6.0))
+
                 .width(Unit::Px(100.0))
                 .height(Unit::Px(30.0))
                 .push(Text::new("Item 1").selectable(true))

From 750083acf484cf16a680ce4e3317e8766029b5af Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 15 Mar 2026 23:09:42 -0400
Subject: [PATCH 074/143] Start undo/redo. (#19)

* Start undo/redo.

* Fix version for craft undo
---
 Cargo.lock                                    |   5 +
 Cargo.toml                                    |   9 +-
 crates/craft_retained/Cargo.toml              |   1 +
 .../src/elements/text_input/mod.rs            |   9 +-
 .../elements/text_input/text_input_state.rs   | 135 ++++++---
 crates/craft_retained/src/text/mod.rs         |   1 +
 .../craft_retained/src/text/parley_editor.rs  | 272 ++++++++++++++++--
 .../craft_retained/src/text/text_commands.rs  | 112 ++++++++
 crates/craft_undo/Cargo.toml                  |   7 +
 crates/craft_undo/src/command.rs              |  45 +++
 crates/craft_undo/src/lib.rs                  |   9 +
 crates/craft_undo/src/undo_manager.rs         |  59 ++++
 crates/craft_undo/tests/undo.rs               |  34 +++
 examples/text/Cargo.toml                      |   2 +-
 examples/text/main.rs                         |  12 +-
 15 files changed, 640 insertions(+), 72 deletions(-)
 create mode 100644 crates/craft_retained/src/text/text_commands.rs
 create mode 100644 crates/craft_undo/Cargo.toml
 create mode 100644 crates/craft_undo/src/command.rs
 create mode 100644 crates/craft_undo/src/lib.rs
 create mode 100644 crates/craft_undo/src/undo_manager.rs
 create mode 100644 crates/craft_undo/tests/undo.rs

diff --git a/Cargo.lock b/Cargo.lock
index f7fbf0cc..559b9176 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1032,6 +1032,7 @@ dependencies = [
  "craft_renderer",
  "craft_resource_manager",
  "craft_runtime",
+ "craft_undo",
  "image",
  "kurbo",
  "libtest-mimic-collect",
@@ -1063,6 +1064,10 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
+[[package]]
+name = "craft_undo"
+version = "0.1.1"
+
 [[package]]
 name = "crc32fast"
 version = "1.5.0"
diff --git a/Cargo.toml b/Cargo.toml
index c9894b6d..8dad7f12 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,12 @@ members = [
     "examples/pointer_events",
     "examples/text",
     "examples/jsframeworkbench",
-    "crates/syntect_dumper", "crates/craft_renderer", "crates/craft_primitives", "crates/craft_resource_manager", "crates/craft_runtime",
+    "crates/syntect_dumper",
+    "crates/craft_renderer",
+    "crates/craft_primitives",
+    "crates/craft_resource_manager",
+    "crates/craft_runtime",
+    "crates/craft_undo",
 ]
 
 [workspace.package]
@@ -75,4 +80,4 @@ version = "1.0.1"
 [workspace.dependencies.winit]
 version = "0.30.13"
 default-features = false
-features = []
\ No newline at end of file
+features = []
diff --git a/crates/craft_retained/Cargo.toml b/crates/craft_retained/Cargo.toml
index 295312b3..32c07ac1 100644
--- a/crates/craft_retained/Cargo.toml
+++ b/crates/craft_retained/Cargo.toml
@@ -31,6 +31,7 @@ default = ["clipboard", "accesskit"]
 
 [dependencies]
 craft_logging = { path = "../craft_logger", version = "0.1.0" }
+craft_undo = {path = "../craft_undo", version = "0.1.1"}
 
 smol_str = "0.3.4"
 
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 4f34acab..28136f14 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -15,12 +15,11 @@ use ui_events::pointer::PointerButton;
 use winit::event::Ime;
 
 use crate::app::ELEMENTS;
-use crate::elements::{ElementInternals, resolve_clip_for_scrollable, AsElement};
 use crate::elements::element_data::ElementData;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::elements::element_id::create_unique_element_id;
 use crate::elements::text_input::text_input_state::TextInputState;
-use crate::elements::{Element, scrollable};
+use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scrollable, scrollable};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::layout::layout_context::{LayoutContext, TaffyTextInputContext};
@@ -184,8 +183,7 @@ impl ElementInternals for TextInputInner {
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.scroll_state.is_new()
-        {
+        if !dirty && self.element_data.scroll_state.is_new() {
             let result = taffy_tree.layout(node);
             self.element_data.apply_scroll(result);
             self.element_data.scroll_state.mark_old();
@@ -349,6 +347,7 @@ impl ElementInternals for TextInputInner {
                 if self.disabled || !keyboard_event.state.is_down() || !focused {
                     return;
                 }
+
                 self.state.key_press(text_context, keyboard_event);
             }
             CraftMessage::PointerButtonDown(pointer_button) => {
@@ -471,4 +470,4 @@ fn parley_box_to_rect(bounding_box: BoundingBox) -> Rectangle {
         bounding_box.width() as f32,
         bounding_box.height() as f32,
     )
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index c1281b65..dcdd7237 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -304,7 +304,7 @@ impl TextInputState {
         });
     }
 
-    fn driver<'a>(&'a mut self, text_context: &'a mut TextContext) -> PlainEditorDriver<'a> {
+    pub(crate) fn driver<'a>(&'a mut self, text_context: &'a mut TextContext) -> PlainEditorDriver<'a> {
         self.editor
             .driver(&mut text_context.font_context, &mut text_context.layout_context)
     }
@@ -363,7 +363,7 @@ impl TextInputState {
     ///
     /// This requires a relayout.
     pub fn insert_or_replace_selection(&mut self, text_context: &mut TextContext, text: &str) {
-        self.driver(text_context).insert_or_replace_selection(text);
+        self.driver(text_context).insert_or_replace_selection(text, true);
         self.clear_cache();
     }
 
@@ -376,24 +376,34 @@ impl TextInputState {
 
         self.modifiers = Some(keyboard_event.modifiers);
 
-        #[allow(unused)]
-        let (shift, action_mod) = self
-            .modifiers
-            .map(|mods| {
-                (
-                    mods.shift(),
-                    if cfg!(target_os = "macos") {
-                        mods.meta()
-                    } else {
-                        mods.ctrl()
-                    },
-                )
-            })
-            .unwrap_or_default();
+        const IS_MAC: bool = if cfg!(target_os = "macos") {true} else {false};
+
+        let (shift, action_mod, word_mod) = self.modifiers.map(|mods| {
+            if IS_MAC {
+                // mac: cmd for actions, alt for words
+                (mods.shift(), mods.meta(), mods.alt())
+            } else {
+                // windows/linux: Ctrl for both
+                (mods.shift(), mods.ctrl(), mods.ctrl())
+            }
+        }).unwrap_or_default();
 
         let mut driver = self.driver(text_context);
 
         match &keyboard_event.key {
+            #[cfg(target_os = "windows")]
+            Key::Character(c) if action_mod && c.to_lowercase() == "y" => {
+                driver.redo();
+                self.clear_cache();
+            }
+            Key::Character(c) if action_mod && c.to_lowercase() == "z" => {
+                if shift {
+                    driver.redo();
+                } else {
+                    driver.undo();
+                }
+                self.clear_cache();
+            }
             Key::Character(c) if action_mod && matches!(c.as_str(), "c" | "x" | "v") => {
                 match c.to_lowercase().as_str() {
                     "c" => copy(&mut driver),
@@ -418,12 +428,12 @@ impl TextInputState {
                 }
             }
             Key::Named(NamedKey::ArrowLeft) => {
-                if action_mod {
-                    if shift {
-                        driver.select_word_left();
-                    } else {
-                        driver.move_word_left();
-                    }
+                if IS_MAC && action_mod {
+                    // mac: Cmd + Left = Line Start
+                    if shift { driver.select_to_line_start(); } else { driver.move_to_line_start(); }
+                } else if word_mod {
+                    // windows: ctrl + left | mac: alt + left = word left
+                    if shift { driver.select_word_left(); } else { driver.move_word_left(); }
                 } else if shift {
                     driver.select_left();
                 } else {
@@ -431,7 +441,15 @@ impl TextInputState {
                 }
             }
             Key::Named(NamedKey::ArrowRight) => {
-                if action_mod {
+                if IS_MAC && action_mod {
+                    // mac: cmd + right = end of line
+                    if shift {
+                        driver.select_to_line_end();
+                    } else {
+                        driver.move_to_line_end();
+                    }
+                } else if word_mod {
+                    // windows/linux: ctrl + right | mac: alt + right = word right
                     if shift {
                         driver.select_word_right();
                     } else {
@@ -444,14 +462,44 @@ impl TextInputState {
                 }
             }
             Key::Named(NamedKey::ArrowUp) => {
-                if shift {
+                if IS_MAC && action_mod {
+                    // mac: cmd + up = document start
+                    if shift {
+                        driver.select_to_text_start();
+                    } else {
+                        driver.move_to_text_start();
+                    }
+                }  else if word_mod {
+                    if shift {
+                        driver.select_left();
+                        driver.select_to_hard_line_start();
+                    } else {
+                        driver.move_left();
+                        driver.move_to_hard_line_start();
+                    }
+                } else if shift {
                     driver.select_up();
                 } else {
                     driver.move_up();
                 }
             }
             Key::Named(NamedKey::ArrowDown) => {
-                if shift {
+                if IS_MAC && action_mod {
+                    // mac: cmd + down = end of document
+                    if shift {
+                        driver.select_to_text_end();
+                    } else {
+                        driver.move_to_text_end();
+                    }
+                } else if word_mod {
+                    if shift {
+                        driver.select_to_hard_line_end();
+                        driver.select_right();
+                    } else {
+                        driver.move_to_hard_line_end();
+                        driver.move_right();
+                    }
+                } else if shift {
                     driver.select_down();
                 } else {
                     driver.move_down();
@@ -486,32 +534,39 @@ impl TextInputState {
                 }
             }
             Key::Named(NamedKey::Delete) => {
-                if action_mod {
-                    driver.delete_word();
-                    self.clear_cache();
+                if word_mod {
+                    driver.delete_word(true);
                 } else {
-                    driver.delete();
-                    self.clear_cache();
+                    driver.delete(true);
                 }
+                self.clear_cache();
                 //generate_text_changed_event(&mut self.state.editor);
             }
             Key::Named(NamedKey::Backspace) => {
-                if action_mod {
-                    driver.backdelete_word();
-                    self.clear_cache();
+                if IS_MAC && action_mod {
+                    driver.move_anchor_to_line_start();
+                    driver.insert_or_replace_selection("", true);
+                } else if word_mod {
+                    if IS_MAC {
+                        driver.move_anchor_word_left();
+                        self.insert_or_replace_selection(text_context, "");
+                    } else {
+                        driver.backdelete_word(true);
+                    }
                 } else {
-                    driver.backdelete();
-                    self.clear_cache();
+                    driver.backdelete(true);
                 }
+
+                self.clear_cache();
                 //generate_text_changed_event(&mut self.state.editor);
             }
             Key::Named(NamedKey::Enter) => {
-                driver.insert_or_replace_selection("\n");
+                driver.insert_or_replace_selection("\n", true);
                 self.clear_cache();
                 //generate_text_changed_event(&mut self.state.editor);
             }
-            Key::Character(s) => {
-                driver.insert_or_replace_selection(s);
+            Key::Character(character) => {
+                driver.insert_or_replace_selection(character, true);
                 self.clear_cache();
                 //generate_text_changed_event(&mut self.state.editor);
             }
@@ -663,7 +718,7 @@ fn paste(drv: &mut PlainEditorDriver) {
     use clipboard_rs::{Clipboard, ClipboardContext};
     let cb = ClipboardContext::new().unwrap();
     let text = cb.get_text().unwrap_or_default();
-    drv.insert_or_replace_selection(&text);
+    drv.insert_or_replace_selection(&text, true);
 }
 
 #[cfg(not(all(
@@ -681,7 +736,7 @@ fn cut(drv: &mut PlainEditorDriver) {
     if let Some(text) = drv.editor.selected_text() {
         let cb = ClipboardContext::new().unwrap();
         cb.set_text(text.to_owned()).ok();
-        drv.delete_selection();
+        drv.delete_selection(true);
     }
 }
 
diff --git a/crates/craft_retained/src/text/mod.rs b/crates/craft_retained/src/text/mod.rs
index 5cd75f40..3e6f6d25 100644
--- a/crates/craft_retained/src/text/mod.rs
+++ b/crates/craft_retained/src/text/mod.rs
@@ -1,6 +1,7 @@
 pub(crate) mod parley_editor;
 pub mod text_context;
 pub(crate) mod text_render_data;
+pub mod text_commands;
 
 use std::ops::Range;
 
diff --git a/crates/craft_retained/src/text/parley_editor.rs b/crates/craft_retained/src/text/parley_editor.rs
index 65fe9a7e..d43c0068 100644
--- a/crates/craft_retained/src/text/parley_editor.rs
+++ b/crates/craft_retained/src/text/parley_editor.rs
@@ -2,6 +2,8 @@
 use parley::layout::{Affinity, Alignment, AlignmentOptions, Layout};
 use parley::{BoundingBox, Cursor, FontContext, LayoutContext, Selection, StyleProperty, StyleSet};
 
+use crate::text::text_commands::{Backspace, Delete, TextInsertion, TextReplace};
+
 extern crate alloc;
 use alloc::borrow::ToOwned;
 use alloc::string::String;
@@ -15,11 +17,13 @@ use core::ops::Range;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::{Node, NodeId, TreeUpdate};
 use craft_primitives::ColorBrush;
+use craft_undo::UndoManager;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use parley::layout::LayoutAccessibility;
 
-use crate::app::{request_apply_layout};
+use crate::app::{request_apply_layout, request_layout};
 use crate::text::RangedStyles;
+use crate::text::text_commands::TextCommand;
 
 /// Opaque representation of a generation.
 ///
@@ -124,6 +128,7 @@ pub struct PlainEditor {
     // alignment_dirty: bool,
     alignment: Alignment,
     generation: Generation,
+    undo_manager: UndoManager<TextCommand>,
 }
 
 impl Default for PlainEditor {
@@ -145,6 +150,7 @@ impl Default for PlainEditor {
             layout_dirty: false,
             alignment: Default::default(),
             generation: Default::default(),
+            undo_manager: UndoManager::new(),
         }
     }
 }
@@ -172,6 +178,91 @@ impl PlainEditor {
             // to redraw if they haven't already.
             generation: Generation(1),
             ranged_styles: RangedStyles::new(vec![]),
+            undo_manager: UndoManager::new(),
+        }
+    }
+
+    pub fn undo(&mut self, font_cx: &mut FontContext, layout_cx: &mut LayoutContext<ColorBrush>) -> bool {
+        let command = self.undo_manager.undo_command();
+        if command.is_none() {
+            return false;
+        }
+        let command = command.unwrap();
+        match command {
+            TextCommand::TextInsertion(text_insertion) => {
+                let start = Cursor::from_byte_index(&self.layout, text_insertion.range.start, text_insertion.affinity);
+                let end = Cursor::from_byte_index(
+                    &self.layout,
+                    text_insertion.range.start + text_insertion.str.len(),
+                    Affinity::Downstream,
+                );
+                self.set_selection(Selection::new(start, end));
+                self.replace_selection(font_cx, layout_cx, "", false);
+                true
+            }
+            TextCommand::Backspace(backspace) => {
+                let text = backspace.str.clone();
+                let start = Cursor::from_byte_index(&self.layout, backspace.range.start, backspace.affinity);
+                self.set_selection(Selection::new(start, start));
+                self.replace_selection(font_cx, layout_cx, &text, false);
+                false
+            }
+            TextCommand::Delete(delete) => {
+                let text = delete.str.clone();
+                let start = Cursor::from_byte_index(&self.layout, delete.range.start, delete.affinity);
+                self.set_selection(Selection::new(start, start));
+                self.replace_selection(font_cx, layout_cx, &text, false);
+                self.set_selection(Selection::new(start, start));
+                false
+            }
+            TextCommand::TextReplace(text_replace) => {
+                let selection = text_replace.selection;
+                let old_str = text_replace.old_str.clone();
+                let range = text_replace.selection.text_range();
+                let new_start = Cursor::from_byte_index(&self.layout, range.start, Affinity::Downstream);
+                let new_end = Cursor::from_byte_index(
+                    &self.layout,
+                    range.start + text_replace.new_str.len(),
+                    Affinity::Downstream,
+                );
+                self.set_selection(Selection::new(new_start, new_end));
+                self.replace_selection(font_cx, layout_cx, &old_str, false);
+                self.set_selection(selection);
+                false
+            }
+        }
+    }
+
+    pub fn redo(&mut self, font_cx: &mut FontContext, layout_cx: &mut LayoutContext<ColorBrush>) -> bool {
+        let command = self.undo_manager.redo_command();
+        if command.is_none() {
+            return false;
+        }
+        let command = command.unwrap().clone();
+        match command {
+            TextCommand::TextInsertion(text_insertion) => {
+                let start = Cursor::from_byte_index(&self.layout, text_insertion.range.start, text_insertion.affinity);
+                self.set_selection(Selection::new(start, start));
+                self.replace_selection(font_cx, layout_cx, &text_insertion.str, false);
+                true
+            }
+            TextCommand::Backspace(backspace) => {
+                let start = Cursor::from_byte_index(&self.layout, backspace.range.start, backspace.affinity);
+                self.set_selection(Selection::new(start, start));
+                self.driver(font_cx, layout_cx).backdelete(false);
+                true
+            }
+            TextCommand::Delete(delete) => {
+                let start = Cursor::from_byte_index(&self.layout, delete.range.start, delete.affinity);
+                self.set_selection(Selection::new(start, start));
+                self.driver(font_cx, layout_cx).backdelete(false);
+                true
+            }
+            TextCommand::TextReplace(text_replace) => {
+                self.set_selection(text_replace.selection);
+                self.replace_selection(font_cx, layout_cx, &text_replace.new_str, false);
+                true
+            }
         }
     }
 }
@@ -187,15 +278,30 @@ pub struct PlainEditorDriver<'a> {
 }
 
 impl PlainEditorDriver<'_> {
+    pub fn undo(&mut self) {
+        if self.editor.undo(self.font_cx, self.layout_cx) {
+            self.refresh_layout();
+            self.request_layout();
+        }
+    }
+
+    pub fn redo(&mut self) {
+        if self.editor.redo(self.font_cx, self.layout_cx) {
+            self.refresh_layout();
+            self.request_layout();
+        }
+    }
+
     // --- MARK: Forced relayout ---
     /// Insert at cursor, or replace selection.
-    pub fn insert_or_replace_selection(&mut self, s: &str) {
-        self.editor.replace_selection(self.font_cx, self.layout_cx, s);
+    pub fn insert_or_replace_selection(&mut self, s: &str, manage_commands: bool) {
+        self.editor
+            .replace_selection(self.font_cx, self.layout_cx, s, manage_commands);
     }
 
     /// Delete the selection.
-    pub fn delete_selection(&mut self) {
-        self.insert_or_replace_selection("");
+    pub fn delete_selection(&mut self, manage_commands: bool) {
+        self.insert_or_replace_selection("", manage_commands);
     }
 
     /// Delete the specified numbers of bytes before the selection.
@@ -240,9 +346,9 @@ impl PlainEditorDriver<'_> {
         let selection_range = self.editor.selection.text_range();
         let range = selection_range.end
             ..selection_range
-            .end
-            .saturating_add(len.get())
-            .min(self.editor.buffer.len());
+                .end
+                .saturating_add(len.get())
+                .min(self.editor.buffer.len());
         if range.is_empty() || !self.editor.buffer.is_char_boundary(range.end) {
             return;
         }
@@ -252,7 +358,7 @@ impl PlainEditorDriver<'_> {
     }
 
     /// Delete the selection or the next cluster (typical ‘delete’ behavior).
-    pub fn delete(&mut self) {
+    pub fn delete(&mut self, manage_commands: bool) {
         if self.editor.selection.is_collapsed() {
             // Upstream cluster range
             if let Some(range) = self.editor.selection.focus().logical_clusters(&self.editor.layout)[1]
@@ -260,22 +366,38 @@ impl PlainEditorDriver<'_> {
                 .map(|cluster| cluster.text_range())
                 .and_then(|range| (!range.is_empty()).then_some(range))
             {
+                if manage_commands && let Some(text) = self.editor.buffer.get(range.clone()) {
+                    let command = TextCommand::Delete(Delete::new(
+                        text.to_string(),
+                        range.clone(),
+                        self.editor.selection.focus().affinity(),
+                    ));
+                    self.editor.undo_manager.execute_command(command);
+                }
                 self.editor.buffer.replace_range(range.clone(), "");
                 self.editor.update_compose_for_replaced_range(range, 0);
                 self.update_layout();
             }
         } else {
-            self.delete_selection();
+            self.delete_selection(manage_commands);
         }
     }
 
     /// Delete the selection or up to the next word boundary (typical ‘ctrl + delete’ behavior).
-    pub fn delete_word(&mut self) {
+    pub fn delete_word(&mut self, manage_commands: bool) {
         if self.editor.selection.is_collapsed() {
             let focus = self.editor.selection.focus();
             let start = focus.index();
             let end = focus.next_logical_word(&self.editor.layout).index();
-            if self.editor.buffer.get(start..end).is_some() {
+            if let Some(word) = self.editor.buffer.get(start..end) {
+                if manage_commands {
+                    let command = TextCommand::Delete(Delete::new(
+                        word.to_string(),
+                        start..end,
+                        self.editor.selection.focus().affinity(),
+                    ));
+                    self.editor.undo_manager.execute_command(command);
+                }
                 self.editor.buffer.replace_range(start..end, "");
                 self.editor.update_compose_for_replaced_range(start..end, 0);
                 self.update_layout();
@@ -283,12 +405,12 @@ impl PlainEditorDriver<'_> {
                     .set_selection(Cursor::from_byte_index(&self.editor.layout, start, Affinity::Downstream).into());
             }
         } else {
-            self.delete_selection();
+            self.delete_selection(manage_commands);
         }
     }
 
     /// Delete the selection or the previous cluster (typical ‘backspace’ behavior).
-    pub fn backdelete(&mut self) {
+    pub fn backdelete(&mut self, manage_commands: bool) {
         if self.editor.selection.is_collapsed() {
             // Upstream cluster
             if let Some(cluster) = self.editor.selection.focus().logical_clusters(&self.editor.layout)[0] {
@@ -309,6 +431,16 @@ impl PlainEditorDriver<'_> {
                     };
                     start
                 };
+                if manage_commands {
+                    if let Some(text) = self.editor.buffer.get(range.clone()) {
+                        let command = TextCommand::Backspace(Backspace::new(
+                            text.to_string(),
+                            range.clone(),
+                            self.editor.selection.focus().affinity(),
+                        ));
+                        self.editor.undo_manager.execute_command(command);
+                    }
+                }
                 self.editor.buffer.replace_range(start..end, "");
                 self.editor.update_compose_for_replaced_range(start..end, 0);
                 self.update_layout();
@@ -316,17 +448,25 @@ impl PlainEditorDriver<'_> {
                     .set_selection(Cursor::from_byte_index(&self.editor.layout, start, Affinity::Downstream).into());
             }
         } else {
-            self.delete_selection();
+            self.delete_selection(manage_commands);
         }
     }
 
     /// Delete the selection or back to the previous word boundary (typical ‘ctrl + backspace’ behavior).
-    pub fn backdelete_word(&mut self) {
+    pub fn backdelete_word(&mut self, manage_commands: bool) {
         if self.editor.selection.is_collapsed() {
             let focus = self.editor.selection.focus();
             let end = focus.index();
             let start = focus.previous_logical_word(&self.editor.layout).index();
-            if self.editor.buffer.get(start..end).is_some() {
+            if let Some(word) = self.editor.buffer.get(start..end) {
+                if manage_commands {
+                    let command = TextCommand::Backspace(Backspace::new(
+                        word.to_string(),
+                        start..end,
+                        self.editor.selection.focus().affinity(),
+                    ));
+                    self.editor.undo_manager.execute_command(command);
+                }
                 self.editor.buffer.replace_range(start..end, "");
                 self.editor.update_compose_for_replaced_range(start..end, 0);
                 self.update_layout();
@@ -334,7 +474,7 @@ impl PlainEditorDriver<'_> {
                     .set_selection(Cursor::from_byte_index(&self.editor.layout, start, Affinity::Downstream).into());
             }
         } else {
-            self.delete_selection();
+            self.delete_selection(manage_commands);
         }
     }
 
@@ -450,6 +590,13 @@ impl PlainEditorDriver<'_> {
         self.request_apply_layout();
     }
 
+    /// Move the cursor to just after the previous hard line break (such as `\n`).
+    pub fn move_to_hard_line_start(&mut self) {
+        self.editor
+            .set_selection(self.editor.selection.hard_line_start(&self.editor.layout, false));
+        self.request_apply_layout();
+    }
+
     /// Move the cursor to the start of the physical line.
     pub fn move_to_line_start(&mut self) {
         self.editor
@@ -464,6 +611,13 @@ impl PlainEditorDriver<'_> {
         self.request_apply_layout();
     }
 
+    /// Move the cursor to just before the next hard line break (such as `\n`).
+    pub fn move_to_hard_line_end(&mut self) {
+        self.editor
+            .set_selection(self.editor.selection.hard_line_end(&self.editor.layout, false));
+        self.request_apply_layout();
+    }
+
     /// Move the cursor to the end of the physical line.
     pub fn move_to_line_end(&mut self) {
         self.editor
@@ -531,6 +685,12 @@ impl PlainEditorDriver<'_> {
         }
     }
 
+    fn request_layout(&self) {
+        if let Some(taffy_id) = self.editor.taffy_id {
+            request_layout(taffy_id);
+        }
+    }
+
     /// Collapse selection into caret.
     pub fn collapse_selection(&mut self) {
         self.editor.set_selection(self.editor.selection.collapse());
@@ -551,6 +711,21 @@ impl PlainEditorDriver<'_> {
         self.request_apply_layout();
     }
 
+    /// Move the selection focus point to the start of the physical line.
+    pub fn select_to_hard_line_start(&mut self) {
+        self.editor
+            .set_selection(self.editor.selection.hard_line_start(&self.editor.layout, true));
+        self.request_apply_layout();
+    }
+
+    /// Move the anchor to the line start.
+    pub fn move_anchor_to_line_start(&mut self) {
+        let anchor = self.editor.selection.line_start(&self.editor.layout, true).focus();
+        let focus = self.editor.selection.focus();
+        self.editor.set_selection(Selection::new(anchor, focus));
+        self.request_apply_layout();
+    }
+
     /// Move the selection focus point to the end of the buffer.
     pub fn select_to_text_end(&mut self) {
         self.editor
@@ -565,6 +740,13 @@ impl PlainEditorDriver<'_> {
         self.request_apply_layout();
     }
 
+    /// Move the selection focus point to the end of the physical line.
+    pub fn select_to_hard_line_end(&mut self) {
+        self.editor
+            .set_selection(self.editor.selection.hard_line_end(&self.editor.layout, true));
+        self.request_apply_layout();
+    }
+
     /// Move the selection focus point up to the nearest cluster boundary on the previous line, preserving the horizontal position for repeated movements.
     pub fn select_up(&mut self) {
         self.editor
@@ -600,6 +782,19 @@ impl PlainEditorDriver<'_> {
         self.request_apply_layout();
     }
 
+    /// Move the selection anchor point to the next word boundary left.
+    pub fn move_anchor_word_left(&mut self) {
+        let anchor = self
+            .editor
+            .selection
+            .previous_visual_word(&self.editor.layout, true)
+            .focus();
+        let focus = self.editor.selection.focus();
+        let new_selection = Selection::new(anchor, focus);
+        self.editor.set_selection(new_selection);
+        self.request_apply_layout();
+    }
+
     /// Move the selection focus point to the next word boundary right.
     pub fn select_word_right(&mut self) {
         self.editor
@@ -1031,15 +1226,25 @@ impl PlainEditor {
         }
     }
 
-    fn replace_selection(&mut self, font_cx: &mut FontContext, layout_cx: &mut LayoutContext<ColorBrush>, s: &str) {
+    fn replace_selection(
+        &mut self,
+        font_cx: &mut FontContext,
+        layout_cx: &mut LayoutContext<ColorBrush>,
+        s: &str,
+        manage_commands: bool,
+    ) {
         let range = self.selection.text_range();
-        let start = range.start;
-        if self.selection.is_collapsed() {
+        let selection = self.selection;
+        let start = range.clone().start;
+        let is_collapsed = self.selection.is_collapsed();
+        let mut old_str = None;
+        if is_collapsed {
             self.buffer.insert_str(start, s);
         } else {
+            old_str = Some(self.buffer.get(range.clone()).unwrap().to_string());
             self.buffer.replace_range(range.clone(), s);
         }
-        self.update_compose_for_replaced_range(range, s.len());
+        self.update_compose_for_replaced_range(range.clone(), s.len());
 
         self.update_layout(font_cx, layout_cx);
         let new_index = start.saturating_add(s.len());
@@ -1049,6 +1254,27 @@ impl PlainEditor {
             Affinity::Upstream
         };
         self.set_selection(Cursor::from_byte_index(&self.layout, new_index, affinity).into());
+
+        if manage_commands {
+            if is_collapsed {
+                self.undo_manager
+                    .execute_command(TextCommand::TextInsertion(TextInsertion::new(
+                        s.to_string(),
+                        range.clone(),
+                        self.selection.focus().affinity(),
+                    )));
+                self.undo_manager.merge();
+            } else {
+                self.undo_manager
+                    .execute_command(TextCommand::TextReplace(TextReplace::new(
+                        s.to_string(),
+                        old_str.unwrap(),
+                        selection,
+                        self.selection.focus().affinity(),
+                        self.selection,
+                    )));
+            }
+        }
     }
 
     /// Update the selection, and nudge the `Generation` if something other than `h_pos` changed.
@@ -1119,4 +1345,4 @@ impl PlainEditor {
         }
         node.add_action(accesskit::Action::SetTextSelection);
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/text/text_commands.rs b/crates/craft_retained/src/text/text_commands.rs
new file mode 100644
index 00000000..e7961197
--- /dev/null
+++ b/crates/craft_retained/src/text/text_commands.rs
@@ -0,0 +1,112 @@
+use std::ops::Range;
+use parley::{Affinity, Selection};
+use craft_undo::Command;
+
+#[derive(Clone)]
+pub struct TextInsertion {
+    pub str: String,
+    pub range: Range<usize>,
+    pub affinity: Affinity,
+}
+
+impl TextInsertion {
+
+    pub fn new(str: String, range: Range<usize>, affinity: Affinity,) -> Self {
+        Self {
+            str,
+            range,
+            affinity,
+        }
+    }
+
+}
+
+#[derive(Clone)]
+pub struct TextReplace {
+    pub new_str: String,
+    pub old_str: String,
+    pub selection: Selection,
+    pub affinity: Affinity,
+    pub new_selection: Selection,
+}
+
+impl TextReplace {
+
+    pub fn new(new_str: String, old_str: String, selection: Selection, affinity: Affinity, new_selection: Selection) -> Self {
+        Self {
+            new_str,
+            old_str,
+            selection,
+            affinity,
+            new_selection,
+        }
+    }
+
+}
+
+#[derive(Clone)]
+pub struct Backspace {
+    pub str: String,
+    pub range: Range<usize>,
+    pub affinity: Affinity,
+}
+
+impl Backspace {
+
+    pub fn new(str: String, range: Range<usize>, affinity: Affinity,) -> Self {
+        Self {
+            str,
+            range,
+            affinity,
+        }
+    }
+
+}
+
+#[derive(Clone)]
+pub struct Delete {
+    pub str: String,
+    pub range: Range<usize>,
+    pub affinity: Affinity,
+}
+
+impl Delete {
+
+    pub fn new(str: String, range: Range<usize>, affinity: Affinity,) -> Self {
+        Self {
+            str,
+            range,
+            affinity,
+        }
+    }
+
+}
+
+#[derive(Clone)]
+pub enum TextCommand {
+    TextInsertion(TextInsertion),
+    TextReplace(TextReplace),
+    Backspace(Backspace),
+    Delete(Delete),
+}
+
+impl Command for TextCommand {
+    fn merge(&mut self, other: &Self) -> bool {
+        match (self, other) {
+            (TextCommand::TextInsertion(left), TextCommand::TextInsertion(right)) => {
+                if right.str.eq(" ") || right.str.eq("\n") || right.str.eq(".") || left.str.eq(" ") || left.str.eq("\n") || left.str.eq("."){
+                    return false;
+                }
+
+                if left.range.start + left.str.len() == right.range.start {
+                    left.str.push_str(&right.str);
+                    left.range.end = right.range.end;
+                    true
+                } else {
+                    false
+                }
+            }
+            _ => false,
+        }
+    }
+}
\ No newline at end of file
diff --git a/crates/craft_undo/Cargo.toml b/crates/craft_undo/Cargo.toml
new file mode 100644
index 00000000..cd4b3161
--- /dev/null
+++ b/crates/craft_undo/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "craft_undo"
+version = "0.1.1"
+edition.workspace = true
+
+[dependencies]
+
diff --git a/crates/craft_undo/src/command.rs b/crates/craft_undo/src/command.rs
new file mode 100644
index 00000000..cb363eb6
--- /dev/null
+++ b/crates/craft_undo/src/command.rs
@@ -0,0 +1,45 @@
+pub trait Command {
+    fn merge(&mut self, other: &Self) -> bool;
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Command;
+    use alloc::string::{String, ToString};
+
+    enum TextCommand {
+        Insert(String),
+        Delete,
+    }
+
+    impl Command for TextCommand {
+        fn merge(&mut self, other: &Self) -> bool {
+            match self {
+                TextCommand::Insert(left) => {
+                    if let TextCommand::Insert(right) = other {
+                        left.push_str(&right);
+                        return true;
+                    }
+                }
+                _ => {}
+            }
+            false
+        }
+    }
+
+    #[test]
+    fn test_mergeable_commands_is_true() {
+        let mut insert_a = TextCommand::Insert("a".to_string());
+        let insert_b = TextCommand::Insert("a".to_string());
+
+        assert!(insert_a.merge(&insert_b))
+    }
+
+    #[test]
+    fn test_non_mergeable_commands_is_false() {
+        let mut insert_a = TextCommand::Insert("a".to_string());
+        let delete = TextCommand::Delete;
+
+        assert!(!insert_a.merge(&delete))
+    }
+}
diff --git a/crates/craft_undo/src/lib.rs b/crates/craft_undo/src/lib.rs
new file mode 100644
index 00000000..3da547c0
--- /dev/null
+++ b/crates/craft_undo/src/lib.rs
@@ -0,0 +1,9 @@
+#![no_std]
+
+mod command;
+mod undo_manager;
+
+extern crate alloc;
+
+pub use crate::command::Command;
+pub use crate::undo_manager::UndoManager;
\ No newline at end of file
diff --git a/crates/craft_undo/src/undo_manager.rs b/crates/craft_undo/src/undo_manager.rs
new file mode 100644
index 00000000..ee8ac9e6
--- /dev/null
+++ b/crates/craft_undo/src/undo_manager.rs
@@ -0,0 +1,59 @@
+use crate::Command;
+use alloc::vec::Vec;
+
+#[derive(Default, Clone)]
+pub struct UndoManager<T: Command> {
+    undo_stack: Vec<T>,
+    redo_stack: Vec<T>,
+}
+
+impl<T: Command> UndoManager<T> {
+    pub fn new() -> Self {
+        Self {
+            undo_stack: Vec::new(),
+            redo_stack: Vec::new(),
+        }
+    }
+
+    pub fn undo_command(&mut self) -> Option<&T> {
+        if let Some(command) = self.undo_stack.pop() {
+            self.redo_stack.push(command);
+            self.redo_stack.last()
+        } else {
+            None
+        }
+    }
+
+    pub fn execute_command(&mut self, command: T) {
+        self.redo_stack.clear();
+        self.undo_stack.push(command);
+    }
+
+    pub fn redo_command(&mut self) -> Option<&T> {
+        if let Some(command) = self.redo_stack.pop() {
+            self.undo_stack.push(command);
+            self.undo_stack.last()
+        } else {
+            None
+        }
+    }
+
+    pub fn merge(&mut self) {
+        let len = self.undo_stack.len();
+        if len < 2 {
+            return;
+        }
+        let [c1, c2] = self.undo_stack.get_disjoint_mut([len - 2, len - 1]).unwrap();
+        if c1.merge(c2) {
+            self.undo_stack.pop();
+        }
+    }
+
+    pub fn undo_commands(&self) -> &[T] {
+        &self.undo_stack
+    }
+
+    pub fn redo_commands(&self) -> &[T] {
+        &self.redo_stack
+    }
+}
diff --git a/crates/craft_undo/tests/undo.rs b/crates/craft_undo/tests/undo.rs
new file mode 100644
index 00000000..8feb26d0
--- /dev/null
+++ b/crates/craft_undo/tests/undo.rs
@@ -0,0 +1,34 @@
+use craft_undo::{Command, UndoManager};
+
+#[derive(Debug, PartialEq)]
+enum TextCommand {
+    Insert(String),
+    Delete,
+}
+
+impl Command for TextCommand {
+    fn merge(&mut self, other: &Self) -> bool {
+        match self {
+            TextCommand::Insert(left) => {
+                if let TextCommand::Insert(right) = other {
+                    left.push_str(&right);
+                    return true;
+                }
+            }
+            _ => {}
+        }
+        false
+    }
+}
+
+#[test]
+fn test_merge() {
+    let mut x = UndoManager::<TextCommand>::new();
+    x.execute_command(TextCommand::Insert("a".to_string()));
+    x.execute_command(TextCommand::Insert("b".to_string()));
+    x.execute_command(TextCommand::Insert("c".to_string()));
+    x.merge();
+    x.merge();
+    let foo = x.undo_commands().last();
+    assert_eq!(foo, Some(&TextCommand::Insert("abc".to_string())))
+}
diff --git a/examples/text/Cargo.toml b/examples/text/Cargo.toml
index 35e9c5a6..479eb788 100644
--- a/examples/text/Cargo.toml
+++ b/examples/text/Cargo.toml
@@ -14,7 +14,7 @@ util = { path = "../util" }
 [dependencies.craft_retained]
 path = "../../crates/craft_retained"
 default-features = false
-features = ["accesskit", "system_fonts"]
+features = ["accesskit", "system_fonts", "clipboard"]
 
 [dependencies.craft_renderer]
 path = "../../crates/craft_renderer"
diff --git a/examples/text/main.rs b/examples/text/main.rs
index 97241629..9ea47738 100644
--- a/examples/text/main.rs
+++ b/examples/text/main.rs
@@ -2,6 +2,16 @@ use craft_retained::elements::{Container, Element, TextInput, Window};
 use craft_retained::rgb;
 use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Unit};
 
+const LOREM_IPSUM: &'static str = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In dolor tortor, congue eu lacus eget, faucibus aliquet nunc. Suspendisse aliquet ullamcorper fermentum. Pellentesque eu nibh sit amet nisi maximus pulvinar quis eget lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur efficitur metus maximus libero maximus pharetra. Sed fringilla ac velit nec hendrerit. Mauris vulputate ante non tempor iaculis. In a diam eros. Mauris vehicula, lacus rhoncus consequat laoreet, lectus ligula venenatis leo, a aliquam odio ex ut lorem. Phasellus quis fermentum erat, ut pellentesque diam. Suspendisse pulvinar eros magna, vel ultricies metus luctus at. Pellentesque consequat a magna ut cursus. Nunc nisl velit, maximus blandit mauris quis, convallis cursus leo. Donec ut ultrices dui, a efficitur sem. Cras ac diam non orci sagittis tincidunt. Etiam auctor ultrices leo vitae vestibulum.
+
+Nunc malesuada eleifend magna eget sollicitudin. Phasellus non posuere justo. Ut viverra posuere molestie. Aenean diam orci, dignissim eu diam vel, viverra suscipit libero. Nam convallis sed arcu porttitor aliquet. Pellentesque urna risus, consectetur bibendum metus vel, laoreet fringilla sapien. Curabitur justo turpis, auctor vel quam quis, volutpat scelerisque magna. Proin ornare, turpis ac eleifend consequat, augue nulla interdum nulla, a scelerisque mi tortor a nulla. Aenean ut sollicitudin quam.
+
+Ut ac magna dolor. Etiam tempor varius arcu. Sed sit amet convallis quam. Phasellus varius vestibulum condimentum. Sed felis nulla, vehicula tempor fringilla eget, cursus sit amet metus. Nunc imperdiet metus nec ante porttitor tristique. In venenatis tortor sed aliquam dignissim. Donec tempus mollis enim in volutpat. Nam tincidunt sed mauris ut facilisis. Pellentesque tempus dolor at maximus vehicula. Sed nec facilisis nibh. Praesent molestie porttitor sem scelerisque malesuada. In pulvinar malesuada elit, ut ultricies nunc faucibus vel.
+
+Morbi tincidunt porta scelerisque. Etiam sodales, leo eget molestie imperdiet, libero enim ullamcorper erat, eget iaculis nisi purus a metus. Proin ante elit, eleifend at gravida vel, accumsan vitae felis. Nullam id dolor vel felis faucibus aliquam vitae et purus. Curabitur malesuada, sapien vitae rutrum imperdiet, orci lorem imperdiet metus, at consequat justo libero non dui. Nam ac orci turpis. Aenean tristique urna velit. Vivamus laoreet ex sed dapibus mollis. Integer ante lorem, tincidunt nec pulvinar eu, auctor vel sem. Nulla non ex vitae dui viverra ultrices. In quis est enim. Duis consectetur mauris tortor, non consectetur metus aliquam sit amet. Vestibulum auctor tincidunt luctus. Aliquam aliquet dictum diam, in volutpat nunc egestas eget. Praesent dui leo, posuere in fringilla quis, congue nec nunc.
+
+Nunc tellus magna, varius eu ornare et, sodales hendrerit quam. Praesent nec magna finibus, elementum orci nec, facilisis nisi. Duis ligula mi, dapibus eget nibh a, posuere viverra ante. Aliquam efficitur mauris id quam faucibus, eget posuere turpis imperdiet. Nam vulputate sed urna vitae tincidunt. Nulla ligula urna, iaculis id urna sit amet, porta iaculis ligula. Maecenas volutpat odio at pretium commodo. Nullam faucibus efficitur neque, vitae elementum sem sollicitudin eu. Nullam rutrum nulla eu erat dignissim varius. ";
+
 fn main() {
     let root = Window::new("Text");
     root.push(
@@ -16,7 +26,7 @@ fn main() {
             .font_size(72.0)
             .color(rgb(50, 50, 50))
             .push(
-                TextInput::new(include_str!("../counter_retained/main.rs"))
+                TextInput::new(LOREM_IPSUM)
                     .overflow(Overflow::Visible, Overflow::Scroll)
                     .width(Unit::Px(600.0))
                     .height(Unit::Px(600.0))

From da9b8aedc97f1267b599031097bf5896b23ba7f7 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Mon, 16 Mar 2026 21:40:15 -0400
Subject: [PATCH 075/143] Add basic scroll with focus and fix text input bug.

---
 .../src/elements/text_input/mod.rs            |  6 ++-
 .../elements/text_input/text_input_state.rs   | 52 +++++++++++++++++--
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 28136f14..4c567bdd 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -178,6 +178,9 @@ impl ElementInternals for TextInputInner {
 
             let text_position = self.computed_box().content_rectangle();
             self.state.set_origin(&text_position.position());
+            if self.is_focused() {
+                self.state.maybe_scroll_to_cursor(&mut self.element_data);
+            }
 
             self.state.is_layout_dirty = false;
         }
@@ -347,8 +350,7 @@ impl ElementInternals for TextInputInner {
                 if self.disabled || !keyboard_event.state.is_down() || !focused {
                     return;
                 }
-
-                self.state.key_press(text_context, keyboard_event);
+                self.state.key_press(text_context, keyboard_event, &mut self.element_data);
             }
             CraftMessage::PointerButtonDown(pointer_button) => {
                 if pointer_button.button == Some(PointerButton::Primary) {
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index dcdd7237..d191af7d 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -16,7 +16,8 @@ use ui_events::pointer::PointerUpdate;
 use web_time::{Duration, Instant};
 use winit::dpi;
 
-use crate::app::{TAFFY_TREE, request_layout};
+use crate::app::{TAFFY_TREE, request_apply_layout};
+use crate::elements::element_data::ElementData;
 use crate::elements::TextInputInner;
 use crate::elements::ElementInternals;
 use crate::elements::text_input::parley_box_to_rect;
@@ -128,11 +129,37 @@ impl TextInputState {
             self.driver(text_context)
                 .extend_selection_to_point(cursor_pos.x as f32, cursor_pos.y as f32);
             if let Some(taffy_id) = self.taffy_id {
-                request_layout(taffy_id);
+                request_apply_layout(taffy_id);
             }
         }
     }
 
+    /// Returns a suggested scroll offset (y) to ensure the cursor is visible
+    /// within a viewport of the given height.
+    pub fn calculate_scroll_to_cursor(&self, viewport_height: f32, current_scroll_y: f32) -> f32 {
+        // TODO: Rewrite this function. It is likely incorrect.
+        let cursor_rect = if let Some(r) = self.editor.cursor_geometry(1.0) {
+            parley_box_to_rect(r)
+        } else {
+            return current_scroll_y;
+        };
+
+        let margin = 2.0;
+        let cursor_top = cursor_rect.top() as f32 - margin;
+        let cursor_bottom = cursor_rect.bottom() as f32 + margin;
+
+        let mut new_scroll = current_scroll_y;
+
+        if cursor_top < current_scroll_y {
+            new_scroll = cursor_top;
+        }
+        else if cursor_bottom > current_scroll_y + viewport_height {
+            new_scroll = cursor_bottom - viewport_height;
+        }
+
+        new_scroll.max(0.0)
+    }
+
     /// Set the origin of the text input state.
     ///
     /// The point should be relative to the top left of the window.
@@ -213,9 +240,11 @@ impl TextInputState {
             })
             .map(|width| {
                 let width: f32 = dpi::PhysicalUnit::from_logical::<f32, f32>(width, self.scale_factor).0;
+                // TODO: Ignored old comment. Does this issue still happen?
                 // Taffy may give a min width > max_width.
                 // Min-width is preserved in this scenario to ensure text is readable.
-                width.clamp(content_widths.min, content_widths.max.max(content_widths.min))
+                //width.clamp(content_widths.min, content_widths.max.max(content_widths.min))
+                width
             });
 
         let _height_constraint: Option<f32> = known_dimensions
@@ -359,6 +388,15 @@ impl TextInputState {
         self.reset_blink();
     }
 
+    pub fn maybe_scroll_to_cursor(&mut self, element_data: &mut ElementData) {
+        let height = element_data.layout_item.computed_box_transformed.padding_rectangle_size().height;
+        let x = self.calculate_scroll_to_cursor(height, element_data.scroll_state.scroll_y());
+        if x < 0.0 {
+            return;
+        }
+        element_data.scroll_state.set_scroll_y(x);
+    }
+
     /// Insert at cursor, or replace selection.
     ///
     /// This requires a relayout.
@@ -371,7 +409,7 @@ impl TextInputState {
         self.pointer_down
     }
 
-    pub fn key_press(&mut self, text_context: &mut TextContext, keyboard_event: &KeyboardEvent) {
+    pub fn key_press(&mut self, text_context: &mut TextContext, keyboard_event: &KeyboardEvent, element_data: &mut ElementData) {
         // TODO: self.reset_blink();
 
         self.modifiers = Some(keyboard_event.modifiers);
@@ -439,6 +477,7 @@ impl TextInputState {
                 } else {
                     driver.move_left();
                 }
+                self.maybe_scroll_to_cursor(element_data);
             }
             Key::Named(NamedKey::ArrowRight) => {
                 if IS_MAC && action_mod {
@@ -460,6 +499,7 @@ impl TextInputState {
                 } else {
                     driver.move_right();
                 }
+                self.maybe_scroll_to_cursor(element_data);
             }
             Key::Named(NamedKey::ArrowUp) => {
                 if IS_MAC && action_mod {
@@ -482,6 +522,7 @@ impl TextInputState {
                 } else {
                     driver.move_up();
                 }
+                self.maybe_scroll_to_cursor(element_data);
             }
             Key::Named(NamedKey::ArrowDown) => {
                 if IS_MAC && action_mod {
@@ -504,6 +545,7 @@ impl TextInputState {
                 } else {
                     driver.move_down();
                 }
+                self.maybe_scroll_to_cursor(element_data);
             }
             Key::Named(NamedKey::Home) => {
                 if action_mod {
@@ -517,6 +559,7 @@ impl TextInputState {
                 } else {
                     driver.move_to_line_start();
                 }
+                self.maybe_scroll_to_cursor(element_data);
             }
             Key::Named(NamedKey::End) => {
                 let mut drv = self.driver(text_context);
@@ -532,6 +575,7 @@ impl TextInputState {
                 } else {
                     drv.move_to_line_end();
                 }
+                self.maybe_scroll_to_cursor(element_data);
             }
             Key::Named(NamedKey::Delete) => {
                 if word_mod {

From dbdf81e8a96012c71a8e996125811f80b73fa07e Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Wed, 18 Mar 2026 19:36:40 -0400
Subject: [PATCH 076/143] Add clone_node for taffy, and add_child_at_index

---
 .../craft_retained/src/elements/dropdown.rs   | 64 +++++++++++++++----
 .../src/elements/slider/slider_logic.rs       |  6 +-
 .../src/elements/traits/deep_clone.rs         | 33 ++++++----
 crates/craft_retained/src/layout/layout.rs    |  5 ++
 .../src/layout/layout_context.rs              |  5 ++
 .../craft_retained/src/layout/taffy_tree.rs   | 19 ++++++
 examples/counter_retained/main.rs             | 19 +++++-
 7 files changed, 117 insertions(+), 34 deletions(-)

diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index 60b032a0..23bfd928 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -14,9 +14,9 @@ use crate::elements::scrollable::{apply_scroll_layout, draw_scrollbar, handle_sc
 use crate::events::{CraftMessage, Event};
 use crate::layout::layout::Layout;
 use crate::layout::TaffyTree;
-use crate::{px, rgb, rgba};
+use crate::{px, rgb, rgba, CraftError};
 use crate::elements::traits::DeepClone;
-use crate::style::{BoxShadow, Display, FlexDirection, Overflow, Position, Style, Unit};
+use crate::style::{AlignItems, BoxShadow, Display, FlexDirection, JustifyContent, Overflow, Position, Style, Unit};
 use crate::text::text_context::TextContext;
 
 #[derive(Clone)]
@@ -116,8 +116,11 @@ impl Dropdown {
         });
 
         inner.borrow_mut().element_data.create_layout_node(None);
+        inner.borrow_mut().element_data.style.set_display(Display::Flex);
+        inner.borrow_mut().element_data.style.set_justify_content(Some(JustifyContent::Center));
+        inner.borrow_mut().element_data.style.set_align_items(Some(AlignItems::Center));
 
-        //inner.borrow_mut().floating_window.style.set_position(Position::Absolute);
+        inner.borrow_mut().floating_window.style.set_position(Position::Absolute);
         inner.borrow_mut().floating_window.style.set_display(Display::Flex);
         inner.borrow_mut().floating_window.style.set_flex_direction(FlexDirection::Column);
 
@@ -166,6 +169,28 @@ impl crate::elements::ElementData for DropdownInner {
     }
 }
 
+impl DropdownInner {
+    fn set_selected_element(&mut self, child_index: usize) {
+        // Remove the old selected element from the layout tree.
+        if let Some(old_selected_element) = &self.selected_element {
+            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+                taffy_tree.remove_subtree(old_selected_element.borrow().element_data().layout.taffy_node_id());
+            });
+        }
+
+        let child = self.element_data.children.get(child_index).expect("There is no child at this index.");
+        self.selected_element = Some(child.clone().borrow().deep_clone());
+        let selected_element_id = self.selected_element.as_ref().unwrap().borrow().element_data().layout.taffy_node_id();
+
+        // Add the selected element to the parent's layout tree at index 1.
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let parent_id = self.element_data.layout.taffy_node_id.unwrap();
+            taffy_tree.add_child_at_index(parent_id, selected_element_id, 1);
+        });
+
+    }
+}
+
 impl ElementInternals for DropdownInner {
     fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.deep_clone_internal()
@@ -197,6 +222,19 @@ impl ElementInternals for DropdownInner {
         }
         taffy_tree.mark_seen(node);
 
+        if let Some(selected_element) = &self.selected_element {
+            selected_element.borrow_mut().apply_layout(
+                taffy_tree,
+                self.element_data().layout.computed_box.position,
+                z_index,
+                transform,
+                pointer,
+                text_context,
+                self.element_data().layout.clip_bounds,
+                scale_factor,
+            );
+            taffy_tree.mark_seen(selected_element.borrow().element_data().layout.taffy_node_id());
+        }
 
         // Position the floating window below the dropdown with a gap.
         let floating_window_position = Point::new(
@@ -204,7 +242,10 @@ impl ElementInternals for DropdownInner {
             self.element_data.layout.computed_box.position.y + self.element_data.layout.computed_box.size.height as f64
         );
 
+
         self.floating_window.apply_simple_layout(taffy_tree, transform, floating_window_position, z_index, scale_factor, None);
+
+
         let scroll_y = self.floating_window.layout.scroll_state.scroll_y() as f64;
         let child_transform = Affine::translate((0.0, -scroll_y));
 
@@ -260,7 +301,6 @@ impl ElementInternals for DropdownInner {
 
         if let Some(selected_element) = &self.selected_element {
             let mut binding = selected_element.borrow_mut();
-            binding.element_data_mut().layout.computed_box_transformed = self.element_data.layout.computed_box_transformed.clone();
             binding.draw(renderer, text_context, pointer, scale_factor);
         }
 
@@ -275,7 +315,7 @@ impl ElementInternals for DropdownInner {
             renderer.pop_layer();
 
             draw_scrollbar(&self.floating_window.style, &self.floating_window.layout, renderer, scale_factor);
-           // renderer.end_overlay();
+           //renderer.end_overlay();
         }
     }
 
@@ -286,12 +326,6 @@ impl ElementInternals for DropdownInner {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        scrollable::handle_scroll_logic(
-            self,
-            message,
-            event
-        );
-
         let pb = match message {
             CraftMessage::PointerButtonUp(pb) => Some(pb),
             _ => None
@@ -314,15 +348,17 @@ impl ElementInternals for DropdownInner {
 
                 if contains {
                     self.is_floating_window_hidden = !self.is_floating_window_hidden.clone();
-                    self.selected_element = Some(child.clone().borrow().deep_clone());
+                    self.set_selected_element(child_index);
                     break;
                 }
             }
         }
 
-        let mut floating_window = &mut self.floating_window;
+        if self.is_floating_window_hidden {
+            return;
+        }
 
-        // Clean this up soon!
+        let floating_window = &mut self.floating_window;
         let result = handle_scroll_logic_advance(&*floating_window.style, &mut floating_window.layout, message, event);
 
         if result.request_apply_layout {
diff --git a/crates/craft_retained/src/elements/slider/slider_logic.rs b/crates/craft_retained/src/elements/slider/slider_logic.rs
index d15210d6..0c846b8c 100644
--- a/crates/craft_retained/src/elements/slider/slider_logic.rs
+++ b/crates/craft_retained/src/elements/slider/slider_logic.rs
@@ -1,6 +1,6 @@
 use kurbo::Point;
 
-use crate::elements::SliderInner;
+use crate::elements::{ElementData, SliderInner};
 use crate::elements::ElementInternals;
 use crate::elements::slider::slider_element::SliderDirection;
 
@@ -18,7 +18,7 @@ impl SliderInner {
     }
 
     pub(super) fn compute_slider_value(&self, pointer_position: &Point) -> f64 {
-        let content_rectangle = self.computed_box().content_rectangle();
+        let content_rectangle = self.element_data().layout.computed_box_transformed.content_rectangle();
         let start = if self.get_direction() == SliderDirection::Horizontal {
             content_rectangle.left() as f64
         } else {
@@ -49,7 +49,7 @@ impl SliderInner {
     }
 
     pub(super) fn thumb_position(&self, thumb_value: f64) -> Point {
-        let content_rectangle = self.computed_box().content_rectangle();
+        let content_rectangle = self.element_data().layout.computed_box_transformed.content_rectangle();
 
         let mut normalized_value = thumb_value / self.get_max();
         normalized_value = normalized_value.clamp(0.0, 1.0);
diff --git a/crates/craft_retained/src/elements/traits/deep_clone.rs b/crates/craft_retained/src/elements/traits/deep_clone.rs
index e44a177c..a33b0960 100644
--- a/crates/craft_retained/src/elements/traits/deep_clone.rs
+++ b/crates/craft_retained/src/elements/traits/deep_clone.rs
@@ -1,6 +1,8 @@
 use crate::elements::ElementInternals;
 use std::cell::RefCell;
 use std::rc::Rc;
+use crate::app::{request_apply_layout, request_layout, TAFFY_TREE};
+use crate::elements::element_id::create_unique_element_id;
 
 pub trait DeepClone {
     fn deep_clone_internal(&self) -> Rc<RefCell<dyn ElementInternals>>;
@@ -8,33 +10,36 @@ pub trait DeepClone {
 
 impl<T> DeepClone for T where T: ElementInternals + Clone + 'static {
     fn deep_clone_internal(&self) -> Rc<RefCell<dyn ElementInternals>> {
-        let mut new_element = Rc::new(RefCell::new(self.clone()));
+        let new_element = Rc::new(RefCell::new(self.clone()));
         let new_element: Rc<RefCell<dyn ElementInternals>> = new_element;
 
         {
             let mut new_data_binding = new_element.borrow_mut();
             let new_data = new_data_binding.element_data_mut();
+            new_data.internal_id = create_unique_element_id();
             new_data.me = Rc::downgrade(&new_element);
             new_data.parent = None;
 
-
-
-            // TODO: Clone the layout nodes?
-            // if let Some(node_id) = new_data.layout.taffy_node_id_mut() {
-            //
-            //     TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            //     });
-            //
-            //     new_data.layout.taffy_node_id_mut();
-            //     request_apply_layout(node_id);
-            //     request_layout(node_id);
-            // }
+            // Clone the layout node
+           let node_id = new_data.layout.taffy_node_id_mut();
+           TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+               *node_id = taffy_tree.clone_node(*node_id)
+           });
+           request_apply_layout(*node_id);
+           request_layout(*node_id);
 
             let mut new_children = Vec::new();
             for child in &new_data.children {
                 let new_child = child.borrow().deep_clone();
-                new_children.push(new_child);
+                new_children.push(new_child.clone());
+
+                let new_child_copy = new_child.clone();
+                let node_id_copy = node_id.clone();
+                TAFFY_TREE.with_borrow_mut(move |taffy_tree| {
+                    taffy_tree.add_child(node_id_copy, new_child_copy.borrow().element_data().layout.taffy_node_id.unwrap());
+                });
             }
+            new_data.children = new_children;
         }
 
         new_element
diff --git a/crates/craft_retained/src/layout/layout.rs b/crates/craft_retained/src/layout/layout.rs
index 8117ad5a..620e711e 100644
--- a/crates/craft_retained/src/layout/layout.rs
+++ b/crates/craft_retained/src/layout/layout.rs
@@ -368,6 +368,11 @@ impl Layout {
             self.clip_bounds = clip_bounds;
         }
     }
+
+    pub fn reset_border_cache(&mut self) {
+        self.cache_border_spec = None;
+        self.cache_box_shadows = None;
+    }
 }
 
 pub(crate) fn draw_borders_generic(
diff --git a/crates/craft_retained/src/layout/layout_context.rs b/crates/craft_retained/src/layout/layout_context.rs
index 00809e46..aae9e1e2 100644
--- a/crates/craft_retained/src/layout/layout_context.rs
+++ b/crates/craft_retained/src/layout/layout_context.rs
@@ -9,10 +9,12 @@ use taffy::{AvailableSpace, Size};
 use crate::elements::{TextInner, TextInputInner};
 use crate::text::text_context::TextContext;
 
+#[derive(Clone)]
 pub struct TaffyTextContext {
     pub element: Weak<RefCell<TextInner>>,
 }
 
+#[derive(Clone)]
 pub struct TaffyTextInputContext {
     pub element: Weak<RefCell<TextInputInner>>,
 }
@@ -37,6 +39,7 @@ pub enum AvailableSpaceKey {
 
 impl TaffyTextContext {}
 
+#[derive(Clone)]
 pub struct ImageContext {
     pub(crate) resource_identifier: ResourceIdentifier,
 }
@@ -88,6 +91,7 @@ pub type LayoutFn = fn(
     text_context: &mut TextContext,
 ) -> Size<f32>;
 
+#[derive(Clone)]
 pub enum LayoutContext {
     Text(TaffyTextContext),
     TextInput(TaffyTextInputContext),
@@ -140,6 +144,7 @@ impl TextHashKey {
     }
 }
 
+#[derive(Clone)]
 pub struct TinyVgContext {
     pub(crate) resource_identifier: ResourceIdentifier,
 }
diff --git a/crates/craft_retained/src/layout/taffy_tree.rs b/crates/craft_retained/src/layout/taffy_tree.rs
index f078f63b..f625fab2 100644
--- a/crates/craft_retained/src/layout/taffy_tree.rs
+++ b/crates/craft_retained/src/layout/taffy_tree.rs
@@ -23,6 +23,20 @@ impl TaffyTree {
         }
     }
 
+    pub fn clone_node(&mut self, src: NodeId) -> NodeId {
+        let style = self.inner.style(src).unwrap();
+        let context = self.inner.get_node_context(src);
+
+        match context {
+            None => {
+                self.inner.new_leaf(style.clone()).unwrap()
+            }
+            Some(ctx) => {
+                self.inner.new_leaf_with_context(style.clone(), ctx.clone()).unwrap()
+            }
+        }
+    }
+
     pub fn new_leaf(&mut self, layout: Style) -> NodeId {
         self.inner.new_leaf(layout).unwrap()
     }
@@ -32,6 +46,11 @@ impl TaffyTree {
         self.request_layout();
     }
 
+    pub fn add_child_at_index(&mut self, parent: NodeId, child: NodeId, index: usize) {
+        self.inner.insert_child_at_index(parent, index, child).unwrap();
+        self.request_layout();
+    }
+
     pub fn mark_dirty(&mut self, node: NodeId) {
         self.inner.mark_dirty(node).unwrap();
         self.request_layout();
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index a713cd56..e0a85013 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -1,6 +1,8 @@
-use craft_retained::elements::{Dropdown, Element, Text, Window};
+use std::path::PathBuf;
+use std::str::FromStr;
+use craft_retained::elements::{Dropdown, Element, Image, Slider, Text, TextInput, Window};
 use craft_retained::style::{AlignItems, BoxShadow, FlexDirection, JustifyContent, Overflow, Unit};
-use craft_retained::{pct, px, rgba, Color, CraftOptions};
+use craft_retained::{pct, px, rgba, Color, CraftOptions, ResourceIdentifier};
 
 fn main() {
     let border_color = rgba(0, 0, 0, 255);
@@ -26,9 +28,20 @@ fn main() {
                 .height(Unit::Px(30.0))
                 .push(Text::new("Item 1").selectable(true))
                 .push(Text::new("Item 2").selectable(true))
-                .push(Text::new("Item 3").selectable(true))
+                .push(Text::new("Item 3")
+                    .border_color(border_color, border_color, border_color, border_color)
+                    .border_width(px(1), px(1), px(1), px(1))
+                    .border_radius((6.0, 6.0), (6.0, 6.0), (6.0, 6.0), (6.0, 6.0))
+                    .selectable(true))
                 .push(Text::new("Item 4").selectable(true))
                 .push(Text::new("Item 5").selectable(true))
+                .push(
+                    Slider::new(20.0)
+                        .min_width(Unit::Px(200.0))
+                        .width(Unit::Px(200.0))
+                        .height(Unit::Px(20.0))
+                        .min_height(Unit::Px(20.0))
+                )
                 .push(Text::new("Item 6").selectable(true))
                 .push(Text::new("Item 7").selectable(true))
                 .push(Text::new("Item 8").selectable(true))

From 0eaf79e87ec5295dd2da572369d6a841793188bc Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Wed, 18 Mar 2026 19:59:56 -0400
Subject: [PATCH 077/143] Update vello and use hybrid for counter.

---
 Cargo.lock                                    | 16 ++---
 crates/craft_renderer/Cargo.toml              |  8 +--
 crates/craft_renderer/src/vello_cpu/mod.rs    |  4 --
 crates/craft_renderer/src/vello_hybrid/mod.rs | 61 ++++++++++++++++++-
 examples/counter_retained/Cargo.toml          |  2 +-
 5 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 559b9176..173c19d3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5096,7 +5096,7 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 [[package]]
 name = "vello"
 version = "0.7.0"
-source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
+source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
 dependencies = [
  "bytemuck",
  "futures-intrusive",
@@ -5114,7 +5114,7 @@ dependencies = [
 [[package]]
 name = "vello_api"
 version = "0.7.0"
-source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
+source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
 dependencies = [
  "bytemuck",
  "peniko",
@@ -5123,7 +5123,7 @@ dependencies = [
 [[package]]
 name = "vello_common"
 version = "0.0.6"
-source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
+source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
 dependencies = [
  "bytemuck",
  "fearless_simd",
@@ -5139,7 +5139,7 @@ dependencies = [
 [[package]]
 name = "vello_cpu"
 version = "0.0.6"
-source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
+source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
 dependencies = [
  "bytemuck",
  "hashbrown 0.16.1",
@@ -5150,7 +5150,7 @@ dependencies = [
 [[package]]
 name = "vello_encoding"
 version = "0.7.0"
-source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
+source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
 dependencies = [
  "bytemuck",
  "guillotiere",
@@ -5162,7 +5162,7 @@ dependencies = [
 [[package]]
 name = "vello_hybrid"
 version = "0.0.6"
-source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
+source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
 dependencies = [
  "bytemuck",
  "hashbrown 0.16.1",
@@ -5177,7 +5177,7 @@ dependencies = [
 [[package]]
 name = "vello_shaders"
 version = "0.7.0"
-source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
+source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
 dependencies = [
  "bytemuck",
  "log",
@@ -5189,7 +5189,7 @@ dependencies = [
 [[package]]
 name = "vello_sparse_shaders"
 version = "0.0.6"
-source = "git+https://github.com/linebender/vello.git?rev=ea2a935ec79206fb5dd3d367ac8feb79bffc905b#ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
+source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
 
 [[package]]
 name = "version_check"
diff --git a/crates/craft_renderer/Cargo.toml b/crates/craft_renderer/Cargo.toml
index 8de06bd8..3819f58e 100644
--- a/crates/craft_renderer/Cargo.toml
+++ b/crates/craft_renderer/Cargo.toml
@@ -13,27 +13,27 @@ vello_hybrid_renderer_webgl = ["wgpu/webgl"]
 
 [dependencies.vello]
 git = "https://github.com/linebender/vello.git"
-rev = "ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
+rev = "3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
 default-features = false
 features = ["wgpu"]
 optional = true
 
 [dependencies.vello_cpu]
 git = "https://github.com/linebender/vello.git"
-rev = "ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
+rev = "3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
 optional = true
 features = []
 
 [dependencies.vello_hybrid]
 git = "https://github.com/linebender/vello.git"
-rev = "ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
+rev = "3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
 default-features = false
 features = ["default"]
 optional = true
 
 [dependencies.vello_common]
 git = "https://github.com/linebender/vello.git"
-rev = "ea2a935ec79206fb5dd3d367ac8feb79bffc905b"
+rev = "3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
 optional = true
 
 [dependencies.softbuffer]
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index 23e91b5d..84ca2d7b 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -432,10 +432,6 @@ impl VelloCpuRenderer {
 
             self.render_context.pop_layer();
         }
-
-        //self.render_context.set_paint(Color::from_rgb8(0, 0, 255));
-        //self.render_context.set_stroke(Stroke::new(5.0));
-        //self.render_context.stroke_path(&box_shadow.outline.to_path(0.1));
     }
 }
 
diff --git a/crates/craft_renderer/src/vello_hybrid/mod.rs b/crates/craft_renderer/src/vello_hybrid/mod.rs
index d1e68c5a..bd7b68d3 100644
--- a/crates/craft_renderer/src/vello_hybrid/mod.rs
+++ b/crates/craft_renderer/src/vello_hybrid/mod.rs
@@ -11,18 +11,20 @@ use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::resource::Resource;
 use craft_resource_manager::{ResourceIdentifier, ResourceManager};
 use kurbo::{Affine, Stroke};
+use peniko::{BlendMode, Compose, Fill, Mix};
 use peniko::kurbo::Shape;
 use vello_common::color::PremulRgba8;
 use vello_common::glyph::Glyph;
 use vello_common::paint::{ImageId, ImageSource, PaintType};
 use vello_common::pixmap::Pixmap;
 use vello_common::{kurbo, peniko};
+use vello_common::filter_effects::{Filter, FilterFunction};
 use vello_hybrid::{RenderSize, RenderTargetConfig, Renderer, Scene};
 use wgpu::TextureFormat;
 use winit::window::Window;
 
 use crate::Brush;
-use crate::renderer::{RenderCommand, RenderList, Renderer as CraftRenderer, SortedCommands, TextScroll};
+use crate::renderer::{BoxShadowCmd, RenderCommand, RenderList, Renderer as CraftRenderer, SortedCommands, TextScroll};
 use crate::text_renderer_data::TextRenderLine;
 use crate::vello_hybrid::render_context::{RenderContext, RenderSurface};
 use crate::vello_hybrid::tinyvg::draw_tiny_vg;
@@ -118,6 +120,7 @@ impl VelloHybridRenderer {
 
         vello_renderer
     }
+
 }
 
 fn vello_draw_rect(scene: &mut Scene, rectangle: Rectangle, fill_color: Color) {
@@ -125,6 +128,55 @@ fn vello_draw_rect(scene: &mut Scene, rectangle: Rectangle, fill_color: Color) {
     scene.fill_rect(&rectangle.to_kurbo());
 }
 
+fn draw_box_shadow(scene: &mut Scene, box_shadow: &BoxShadowCmd) {
+    let radius = box_shadow.blur_radius / 2.0;
+    let filter = Some(Filter::from_function(FilterFunction::Blur {
+        radius: box_shadow.blur_radius as f32,
+    }));
+
+    if box_shadow.inset {
+        let mut clip_path = kurbo::BezPath::new();
+        let outline_rect = box_shadow.border_box.expand((radius * 3.0) as f32).to_kurbo();
+        clip_path.extend(&outline_rect.to_path(0.1));
+        clip_path.extend(&box_shadow.path);
+        scene.push_layer(
+            Some(&box_shadow.outline),
+            None,
+            None,
+            None,
+            filter,
+        );
+        scene.set_fill_rule(Fill::EvenOdd);
+        scene.set_paint(box_shadow.color);
+        scene.fill_path(&clip_path);
+        scene.pop_layer();
+        scene.set_fill_rule(Fill::NonZero);
+    } else {
+        scene.push_layer(
+            None,
+            Some(BlendMode::new(Mix::Normal, Compose::SrcOver)),
+            None,
+            None,
+            filter,
+        );
+
+        scene.set_transform(Affine::translate(box_shadow.offset));
+
+        scene.set_paint(box_shadow.color);
+        scene.fill_path(&box_shadow.path);
+
+        scene.set_transform(Affine::IDENTITY);
+
+        scene.set_blend_mode(BlendMode::new(Mix::Normal, Compose::DestOut));
+        scene.set_paint(Color::WHITE);
+        scene.fill_path(&box_shadow.outline);
+
+        scene.set_blend_mode(BlendMode::new(Mix::Normal, Compose::SrcOver));
+
+        scene.pop_layer();
+    }
+}
+
 impl CraftRenderer for VelloHybridRenderer {
     fn surface_width(&self) -> f32 {
         match &self.state {
@@ -413,7 +465,12 @@ impl CraftRenderer for VelloHybridRenderer {
                     scene.set_paint(brush_to_paint(brush));
                     scene.fill_path(path);
                 }
-                _ => {}
+
+                RenderCommand::StartOverlay => {}
+                RenderCommand::EndOverlay => {}
+                RenderCommand::BoxShadowCmd(box_shadow) => {
+                    draw_box_shadow(scene, box_shadow)
+                }
             }
         });
 
diff --git a/examples/counter_retained/Cargo.toml b/examples/counter_retained/Cargo.toml
index 81629871..b97c6aff 100644
--- a/examples/counter_retained/Cargo.toml
+++ b/examples/counter_retained/Cargo.toml
@@ -23,7 +23,7 @@ features = ["accesskit", "system_fonts"]
 
 [target.'cfg(not(target_os = "android"))'.dependencies.craft_renderer]
 path = "../../crates/craft_renderer"
-features = ["vello_cpu_renderer"]
+features = ["vello_hybrid_renderer"]
 
 [target.'cfg(target_os = "android")'.dependencies.craft_renderer]
 path = "../../crates/craft_renderer"

From 111337c99aef2ecade5d72abdd50eecb84c6d5f7 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Wed, 18 Mar 2026 20:10:52 -0400
Subject: [PATCH 078/143] Fix zoom bug with +/=.

---
 crates/craft_retained/src/app.rs             |  4 ----
 crates/craft_retained/src/elements/window.rs | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 86bebb51..daa9ec77 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -236,10 +236,6 @@ impl App {
             } else {
                 window.zoom_in();
             }
-            let scale_factor = window.effective_scale_factor();
-            window.inner.borrow_mut().set_scale_factor(scale_factor);
-            window.inner.borrow_mut().mark_dirty();
-            //style_root_element(window.borrow_mut().deref_mut(), window.borrow().window_size());
             self.request_redraw(RedrawFlags::new(true));
             return;
         }
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 972eb92f..fd37ba29 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -207,6 +207,12 @@ impl WindowInternal {
         inner
     }
 
+    pub fn request_redraw(&self) {
+        if let Some(winit_window) = &self.winit_window {
+            winit_window.request_redraw();
+        }
+    }
+
     pub fn winit_window(&self) -> Option<Arc<winit::window::Window>> {
         self.winit_window.clone()
     }
@@ -230,10 +236,19 @@ impl WindowInternal {
 
     pub(crate) fn zoom_in(&mut self) {
         self.zoom_scale_factor += 0.01;
+        self.update_zoom();
     }
 
     pub(crate) fn zoom_out(&mut self) {
         self.zoom_scale_factor = (self.zoom_scale_factor - 0.01).max(1.0);
+        self.update_zoom();
+    }
+
+    pub fn update_zoom(&mut self) {
+        let scale_factor = self.effective_scale_factor();
+        self.set_scale_factor(scale_factor);
+        self.mark_dirty();
+        self.request_redraw();
     }
 
     pub(crate) fn zoom_scale_factor(&self) -> f64 {

From 30e14f8b2bec89129d9468385b1bdc6681d93621 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 19 Mar 2026 00:07:47 -0400
Subject: [PATCH 079/143] Begin fixing wasm.

---
 crates/craft_retained/src/app.rs              |  2 +
 .../craft_retained/src/craft_winit_state.rs   | 14 +++---
 crates/craft_retained/src/elements/window.rs  | 46 +++++++++++++++----
 crates/craft_retained/src/window_manager.rs   |  1 -
 examples/counter_retained/main.rs             |  2 +
 5 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index daa9ec77..5ca72b8a 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -143,6 +143,8 @@ impl App {
             window_manager.on_about_to_wait(self, event_loop);
         });
 
+        // TODO: Allow on wasm
+        #[cfg(not(target_arch = "wasm32"))]
         if let Some(callback) = self.craft_options.craft_callback.take() {
             let future = callback.call();
             self.runtime.spawn_current_thread(future);
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index e2be1e43..9261be55 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -193,7 +193,6 @@ impl ApplicationHandler for CraftWinitState {
                             }
                             #[cfg(target_arch = "wasm32")]
                             InternalMessage::RendererCreated(window, renderer) => {
-                                craft_state.craft_app.on_resume(window, renderer);
                             }
                         }
                     }
@@ -206,11 +205,14 @@ impl ApplicationHandler for CraftWinitState {
                                 craft_state.craft_app.on_resource_event(resource_event);
                             }
                             #[cfg(target_arch = "wasm32")]
-                            InternalMessage::RendererCreated(window, renderer) => {
-                                craft_state.craft_app.on_resume(window, renderer, event_loop);
-                                if let Some(window) = craft_state.craft_app.window.as_ref() {
-                                    window.request_redraw();
-                                }
+                            InternalMessage::RendererCreated(winit_window, renderer) => {
+                                WINDOW_MANAGER.with_borrow_mut(|window_manager| {
+                                    let window = window_manager.get_window_by_id(winit_window.id());
+                                    window.clone().unwrap().inner.borrow_mut().renderer = Some(renderer);
+                                    let sz = Size::new(winit_window.inner_size().width as f32, winit_window.inner_size().height as f32);
+                                    window.unwrap().on_resize(sz);
+                                    window_manager.redraw_all(&mut craft_state.craft_app);
+                                });
                             }
                         }
                     });
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index fd37ba29..9ac232d5 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -21,6 +21,8 @@ use winit::window::{Window as WinitWindow, WindowAttributes};
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use {accesskit::{Action, Role}, accesskit_winit::Adapter};
 
+use craft_logging::info;
+
 use crate::RendererBox;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::accessibility::{access_handler::CraftAccessHandler, activation_handler::CraftActivationHandler, deactivation_handler::CraftDeactivationHandler};
@@ -34,6 +36,17 @@ use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
 
+#[cfg(target_arch = "wasm32")]
+use crate::events::internal::InternalMessage;
+#[cfg(target_arch = "wasm32")]
+use crate::wasm_queue::WASM_QUEUE;
+
+#[cfg(target_arch = "wasm32")]
+use {
+    wasm_bindgen::JsCast,
+    winit::platform::web::WindowAttributesExtWebSys,
+};
+
 #[derive(Clone)]
 pub struct Window {
     pub inner: Rc<RefCell<WindowInternal>>,
@@ -384,8 +397,23 @@ impl WindowInternal {
         let winit_window: Arc<WinitWindow> = Arc::new(if let Some(window_fn) = &mut self.advanced_window_fn {
             (*window_fn)(event_loop)
         } else {
+            let window_attributes = WindowAttributes::default().with_title(self.title.as_ref().unwrap()).with_visible(false);
+            #[cfg(target_arch = "wasm32")]
+            let window_attributes = {
+                let canvas = web_sys::window()
+                    .unwrap()
+                    .document()
+                    .unwrap()
+                    .get_element_by_id("canvas")
+                    .unwrap()
+                    .dyn_into::<web_sys::HtmlCanvasElement>()
+                    .unwrap();
+
+                window_attributes.with_canvas(Some(canvas))
+            };
+
             event_loop
-                .create_window(WindowAttributes::default().with_title(self.title.as_ref().unwrap()).with_visible(false))
+                .create_window(window_attributes)
                 .expect("Failed to create window")
         });
         self.set_winit_window(Some(winit_window.clone()));
@@ -400,15 +428,15 @@ impl WindowInternal {
                     renderer
                 });
                 self.renderer = Some(renderer);
+                info!("RENDERER CREATED")
             } else {
-                let app_sender = craft_state.app_sender.clone();
-                let window_copy_2 = window_copy.clone();
-                craft_state.runtime.spawn(async move {
-                    let renderer: Box<dyn Renderer> = renderer_type.create(window_copy).await;
-                    app_sender
-                        .send(InternalMessage::RendererCreated(window_copy_2, renderer))
-                        .await
-                        .expect("Failed to send RendererCreated message");
+                let window_copy_2 = winit_window.clone();
+                craft_app.runtime.spawn(async move {
+                    let renderer: Box<dyn Renderer> = renderer_type.create(window_copy_2.clone()).await;
+                    WASM_QUEUE.with_borrow_mut(|wasm_queue| {
+                        wasm_queue.push(InternalMessage::RendererCreated(window_copy_2, renderer));
+                    });
+                    info!("RENDERER CREATED")
                 });
             }
         }
diff --git a/crates/craft_retained/src/window_manager.rs b/crates/craft_retained/src/window_manager.rs
index 55016ced..8c03cd56 100644
--- a/crates/craft_retained/src/window_manager.rs
+++ b/crates/craft_retained/src/window_manager.rs
@@ -2,7 +2,6 @@ use std::rc::Rc;
 
 use winit::event_loop::ActiveEventLoop;
 use winit::window::WindowId;
-
 use crate::app::App;
 use crate::elements::Window;
 
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index 6cd02ae5..dc2535a7 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -5,6 +5,7 @@ use craft_retained::elements::{Container, Element, Text, Window};
 use craft_retained::events::ui_events::pointer::PointerButton;
 use craft_retained::style::{AlignItems, BoxShadow, FlexDirection, JustifyContent};
 use craft_retained::{Color, CraftOptions, pct, px, rgb, rgba};
+use util::setup_logging;
 
 fn create_button(label: &str, base_color: Color, delta: i64, state: Rc<RefCell<i64>>, count_text: Text) -> Container {
     let border_color = rgb(0, 0, 0);
@@ -31,6 +32,7 @@ fn create_button(label: &str, base_color: Color, delta: i64, state: Rc<RefCell<i
 }
 
 fn main() {
+    setup_logging();
     let count = Rc::new(RefCell::new(0));
     let count_text = Text::new(&format!("Count: {}", count.borrow()));
 

From 8bd4eaa11ab4b6c37361aed1d678d4e73fc688df Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 19 Mar 2026 06:48:49 -0400
Subject: [PATCH 080/143] Fix lints and format.

---
 .../craft_primitives/src/geometry/borders.rs  |  14 +--
 .../src/geometry/rectangle.rs                 |   7 +-
 crates/craft_renderer/src/renderer.rs         |  12 +-
 crates/craft_renderer/src/vello_cpu/mod.rs    |  27 ++--
 crates/craft_renderer/src/vello_hybrid/mod.rs |  17 +--
 crates/craft_retained/src/app.rs              |   3 +-
 crates/craft_retained/src/document/core.rs    |   1 +
 .../craft_retained/src/elements/container.rs  |   6 +-
 .../src/elements/element_data.rs              |   5 +-
 crates/craft_retained/src/elements/image.rs   |   1 -
 crates/craft_retained/src/elements/mod.rs     |   6 +-
 .../craft_retained/src/elements/scrollable.rs | 118 +++++++++---------
 .../src/elements/slider/slider_draw.rs        |   3 +-
 .../src/elements/slider/slider_element.rs     |   3 +-
 .../src/elements/slider/slider_logic.rs       |   3 +-
 crates/craft_retained/src/elements/text.rs    |  72 +++++------
 .../src/elements/text_input/mod.rs            |  19 ++-
 .../elements/text_input/text_input_state.rs   |  60 +++++----
 .../src/elements/traits/as_element.rs         |   3 +-
 .../src/elements/traits/element.rs            |  39 +++---
 .../src/elements/traits/element_data.rs       |   1 +
 .../src/elements/traits/element_internals.rs  |  16 ++-
 .../craft_retained/src/elements/traits/mod.rs |   8 +-
 crates/craft_retained/src/elements/window.rs  |  26 ++--
 .../src/events/event_dispatch.rs              |   5 +-
 crates/craft_retained/src/events/helpers.rs   |   4 +-
 .../craft_retained/src/layout/layout_item.rs  |  41 +++---
 crates/craft_retained/src/lib.rs              |   3 +-
 crates/craft_retained/src/style/mod.rs        |   7 +-
 crates/craft_retained/src/style/styles.rs     |   2 +-
 crates/craft_retained/src/text/mod.rs         |   2 +-
 .../craft_retained/src/text/parley_editor.rs  |  16 ++-
 .../craft_retained/src/text/text_commands.rs  |  35 +++---
 crates/craft_retained/src/window_manager.rs   |   1 +
 crates/craft_undo/src/command.rs              |   3 +-
 crates/craft_undo/src/lib.rs                  |   2 +-
 crates/craft_undo/src/undo_manager.rs         |   3 +-
 examples/text/main.rs                         |   2 +-
 38 files changed, 293 insertions(+), 303 deletions(-)

diff --git a/crates/craft_primitives/src/geometry/borders.rs b/crates/craft_primitives/src/geometry/borders.rs
index 047f4dd7..8c3b7e21 100644
--- a/crates/craft_primitives/src/geometry/borders.rs
+++ b/crates/craft_primitives/src/geometry/borders.rs
@@ -182,10 +182,7 @@ impl CssRoundedRect {
             let outer_radius = self.outer_radii[corner];
             let radius_sign = CORNER_RADIUS_SIGN[corner];
 
-            let outer_radius = Vec2::new(
-                radius_sign.x * outer_radius.x,
-                radius_sign.y * outer_radius.y,
-            );
+            let outer_radius = Vec2::new(radius_sign.x * outer_radius.x, radius_sign.y * outer_radius.y);
 
             if is_outer_radius_sharp(outer_radius) {
                 continue;
@@ -195,8 +192,7 @@ impl CssRoundedRect {
 
             let box_shadow_arc = Arc::new(
                 center,
-                self.outer_radii[corner]
-                    + Vec2::new(radius, radius),
+                self.outer_radii[corner] + Vec2::new(radius, radius),
                 CORNER_START_ANGLES[corner],
                 FRAC_PI_2,
                 0.0,
@@ -219,11 +215,7 @@ impl CssRoundedRect {
             } else {
                 // If there is no arc (sharp corner), move or line to the corner point
                 let sign = CORNER_RADIUS_SIGN[corner];
-                let p = self.corners[corner]
-                    + Vec2::new(
-                    -sign.x * radius,
-                    -sign.y * radius,
-                );
+                let p = self.corners[corner] + Vec2::new(-sign.x * radius, -sign.y * radius);
                 if corner == TOP_LEFT {
                     outline_path.move_to(p);
                 } else {
diff --git a/crates/craft_primitives/src/geometry/rectangle.rs b/crates/craft_primitives/src/geometry/rectangle.rs
index 38862649..3f16b1c3 100644
--- a/crates/craft_primitives/src/geometry/rectangle.rs
+++ b/crates/craft_primitives/src/geometry/rectangle.rs
@@ -128,7 +128,12 @@ impl Rectangle {
     }
 
     pub fn expand(&self, radius: f32) -> Self {
-        Rectangle::new(self.x - radius, self.y - radius, self.width + radius, self.height + radius)
+        Rectangle::new(
+            self.x - radius,
+            self.y - radius,
+            self.width + radius,
+            self.height + radius,
+        )
     }
 }
 
diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index 2bf5e48d..01e6855d 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -8,6 +8,7 @@ use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::{ResourceIdentifier, ResourceManager};
 use peniko::kurbo::{BezPath, Shape, Vec2};
 use peniko::{BrushRef, Gradient};
+
 use crate::text_renderer_data::TextData;
 
 #[derive(Clone)]
@@ -22,7 +23,7 @@ pub enum RenderCommand {
     FillBezPath(BezPath, Brush),
     StartOverlay,
     EndOverlay,
-    BoxShadowCmd(BoxShadowCmd)
+    BoxShadowCmd(BoxShadowCmd),
 }
 
 #[derive(Clone)]
@@ -236,13 +237,12 @@ impl RenderList {
         box_shadow: BoxShadowCmd,
         //rectangle: Rectangle,
     ) {
-/*        if let Some(cull) = &self.cull
+        /*        if let Some(cull) = &self.cull
             && !cull.intersects(&rectangle)
         {
             return;
         }*/
-        self.commands
-            .push(RenderCommand::BoxShadowCmd(box_shadow));
+        self.commands.push(RenderCommand::BoxShadowCmd(box_shadow));
     }
 
     pub fn set_cull(&mut self, cull: Option<Rectangle>) {
@@ -277,13 +277,13 @@ pub trait Renderer: Any {
                 | RenderCommand::DrawTinyVg(rect, _, _)
                 | RenderCommand::DrawText(_, rect, _, _) => *rect,
                 RenderCommand::FillBezPath(path, _) => Rectangle::from_kurbo(path.bounding_box()),
-                | RenderCommand::BoxShadowCmd(box_shadow) => {
+                RenderCommand::BoxShadowCmd(box_shadow) => {
                     let bounding_box = box_shadow.path.bounding_box();
                     Rectangle::new(
                         (bounding_box.x0 + box_shadow.offset.x) as f32,
                         (bounding_box.y0 + box_shadow.offset.y) as f32,
                         (bounding_box.x1 + box_shadow.offset.x) as f32,
-                        (bounding_box.y1 + box_shadow.offset.y) as f32
+                        (bounding_box.y1 + box_shadow.offset.y) as f32,
                     )
                 }
                 _ => unreachable!("Cannot compute the bounding rect of this render command."),
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index 84ca2d7b..a47d1945 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -1,10 +1,5 @@
 pub(crate) mod tinyvg;
 
-use vello_common::filter_effects::FilterFunction;
-use vello_common::filter_effects::Filter;
-use peniko::Compose;
-use peniko::Mix;
-use peniko::BlendMode;
 use std::any::Any;
 use std::num::{NonZero, NonZeroU32};
 use std::ops::{Deref, DerefMut};
@@ -14,8 +9,9 @@ use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::ResourceManager;
 use craft_resource_manager::resource::Resource;
 use peniko::kurbo::{Affine, Shape};
-use peniko::{Blob, Color, Fill, ImageAlphaType, kurbo};
+use peniko::{BlendMode, Blob, Color, Compose, Fill, ImageAlphaType, Mix, kurbo};
 use softbuffer::Buffer;
+use vello_common::filter_effects::{Filter, FilterFunction};
 use vello_common::glyph::Glyph;
 use vello_common::kurbo::Stroke;
 use vello_common::paint::PaintType;
@@ -343,9 +339,7 @@ impl Renderer for VelloCpuRenderer {
                 }
                 RenderCommand::StartOverlay => {}
                 RenderCommand::EndOverlay => {}
-                RenderCommand::BoxShadowCmd(box_shadow) => {
-                    self.draw_box_shadow(box_shadow)
-                }
+                RenderCommand::BoxShadowCmd(box_shadow) => self.draw_box_shadow(box_shadow),
             }
         });
     }
@@ -396,13 +390,8 @@ impl VelloCpuRenderer {
             let outline_rect = box_shadow.border_box.expand((radius * 3.0) as f32).to_kurbo();
             clip_path.extend(&outline_rect.to_path(0.1));
             clip_path.extend(&box_shadow.path);
-            self.render_context.push_layer(
-                Some(&box_shadow.outline),
-                None,
-                None,
-                None,
-                filter,
-            );
+            self.render_context
+                .push_layer(Some(&box_shadow.outline), None, None, None, filter);
             self.render_context.set_fill_rule(Fill::EvenOdd);
             self.render_context.set_paint(box_shadow.color);
             self.render_context.fill_path(&clip_path);
@@ -424,11 +413,13 @@ impl VelloCpuRenderer {
 
             self.render_context.set_transform(Affine::IDENTITY);
 
-            self.render_context.set_blend_mode(BlendMode::new(Mix::Normal, Compose::DestOut));
+            self.render_context
+                .set_blend_mode(BlendMode::new(Mix::Normal, Compose::DestOut));
             self.render_context.set_paint(Color::WHITE);
             self.render_context.fill_path(&box_shadow.outline);
 
-            self.render_context.set_blend_mode(BlendMode::new(Mix::Normal, Compose::SrcOver));
+            self.render_context
+                .set_blend_mode(BlendMode::new(Mix::Normal, Compose::SrcOver));
 
             self.render_context.pop_layer();
         }
diff --git a/crates/craft_renderer/src/vello_hybrid/mod.rs b/crates/craft_renderer/src/vello_hybrid/mod.rs
index bd7b68d3..a51217f0 100644
--- a/crates/craft_renderer/src/vello_hybrid/mod.rs
+++ b/crates/craft_renderer/src/vello_hybrid/mod.rs
@@ -11,14 +11,14 @@ use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::resource::Resource;
 use craft_resource_manager::{ResourceIdentifier, ResourceManager};
 use kurbo::{Affine, Stroke};
-use peniko::{BlendMode, Compose, Fill, Mix};
 use peniko::kurbo::Shape;
+use peniko::{BlendMode, Compose, Fill, Mix};
 use vello_common::color::PremulRgba8;
+use vello_common::filter_effects::{Filter, FilterFunction};
 use vello_common::glyph::Glyph;
 use vello_common::paint::{ImageId, ImageSource, PaintType};
 use vello_common::pixmap::Pixmap;
 use vello_common::{kurbo, peniko};
-use vello_common::filter_effects::{Filter, FilterFunction};
 use vello_hybrid::{RenderSize, RenderTargetConfig, Renderer, Scene};
 use wgpu::TextureFormat;
 use winit::window::Window;
@@ -120,7 +120,6 @@ impl VelloHybridRenderer {
 
         vello_renderer
     }
-
 }
 
 fn vello_draw_rect(scene: &mut Scene, rectangle: Rectangle, fill_color: Color) {
@@ -139,13 +138,7 @@ fn draw_box_shadow(scene: &mut Scene, box_shadow: &BoxShadowCmd) {
         let outline_rect = box_shadow.border_box.expand((radius * 3.0) as f32).to_kurbo();
         clip_path.extend(&outline_rect.to_path(0.1));
         clip_path.extend(&box_shadow.path);
-        scene.push_layer(
-            Some(&box_shadow.outline),
-            None,
-            None,
-            None,
-            filter,
-        );
+        scene.push_layer(Some(&box_shadow.outline), None, None, None, filter);
         scene.set_fill_rule(Fill::EvenOdd);
         scene.set_paint(box_shadow.color);
         scene.fill_path(&clip_path);
@@ -468,9 +461,7 @@ impl CraftRenderer for VelloHybridRenderer {
 
                 RenderCommand::StartOverlay => {}
                 RenderCommand::EndOverlay => {}
-                RenderCommand::BoxShadowCmd(box_shadow) => {
-                    draw_box_shadow(scene, box_shadow)
-                }
+                RenderCommand::BoxShadowCmd(box_shadow) => draw_box_shadow(scene, box_shadow),
             }
         });
 
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 5ca72b8a..76038bd0 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -25,8 +25,7 @@ use winit::window::WindowId;
 
 use crate::CraftOptions;
 use crate::document::DocumentManager;
-use crate::elements::ElementInternals;
-use crate::elements::{ElementIdMap, Window};
+use crate::elements::{ElementIdMap, ElementInternals, Window};
 use crate::events::internal::InternalMessage;
 use crate::events::{CraftMessage, Event, EventDispatcher};
 use crate::layout::TaffyTree;
diff --git a/crates/craft_retained/src/document/core.rs b/crates/craft_retained/src/document/core.rs
index d92faee2..4332b1a8 100644
--- a/crates/craft_retained/src/document/core.rs
+++ b/crates/craft_retained/src/document/core.rs
@@ -3,6 +3,7 @@ use std::collections::HashMap;
 use std::rc::Weak;
 
 use ui_events::pointer::PointerId;
+
 use crate::elements::ElementInternals;
 
 /// Stores window specific information like pointer captures, focus (soon), etc.
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 697d809b..597a39af 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -9,9 +9,8 @@ use craft_renderer::RenderList;
 use kurbo::{Affine, Point};
 
 use crate::app::TAFFY_TREE;
-use crate::elements::{resolve_clip_for_scrollable, ElementInternals, AsElement, Element};
 use crate::elements::element_data::ElementData;
-use crate::elements::{scrollable};
+use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scrollable, scrollable};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
@@ -97,8 +96,7 @@ impl ElementInternals for ContainerInner {
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.scroll_state.is_new()
-        {
+        if !dirty && self.element_data.scroll_state.is_new() {
             self.element_data.apply_scroll(layout);
             self.element_data.scroll_state.mark_old();
         }
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index e72a31c6..cbd3e47f 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -1,12 +1,13 @@
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
+
 use smol_str::SmolStr;
 use taffy::Layout;
 
 use crate::app::{ELEMENTS, TAFFY_TREE};
 use crate::elements::ElementInternals;
 use crate::elements::element_id::create_unique_element_id;
-use crate::elements::scrollable::{apply_scroll_layout, ScrollState};
+use crate::elements::scrollable::{ScrollState, apply_scroll_layout};
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::layout::layout_context::LayoutContext;
 use crate::layout::layout_item::LayoutItem;
@@ -99,7 +100,7 @@ impl ElementData {
 
     /// Computes the scrollbar's tack and thumb layout.
     pub(crate) fn apply_scroll(&mut self, layout: &Layout) {
-       apply_scroll_layout(self, layout);
+        apply_scroll_layout(self, layout);
     }
 
     pub(crate) fn scroll(&self) -> ScrollState {
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 2d5cca49..e9633d23 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -81,7 +81,6 @@ impl crate::elements::ElementData for Image {
     }
 }
 
-
 impl ElementInternals for Image {
     fn apply_layout(
         &mut self,
diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index d635f672..d3d99d84 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -1,7 +1,7 @@
 mod container;
-mod traits;
 mod element_data;
 mod text;
+mod traits;
 
 mod element_id;
 mod element_id_map;
@@ -11,12 +11,12 @@ mod slider;
 mod text_input;
 mod window;
 
-pub use traits::{ElementInternals, ElementData, Element, AsElement, resolve_clip_for_scrollable};
 pub use container::{Container, ContainerInner};
 pub use element_id_map::ElementIdMap;
 pub use image::Image;
+pub use scrollable::{ScrollOptions, ScrollToBox};
 pub use slider::{Slider, SliderDirection, SliderInner};
 pub use text::{Text, TextInner};
 pub use text_input::{TextInput, TextInputInner};
+pub use traits::{AsElement, Element, ElementData, ElementInternals, resolve_clip_for_scrollable};
 pub use window::{Window, WindowInternal};
-pub use scrollable::{ScrollToBox, ScrollOptions};
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 8e45ab64..d1d5f6bc 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -1,14 +1,16 @@
 use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::rc::Rc;
+
+use craft_primitives::geometry::{Rectangle, Size};
 use kurbo::Point;
 use taffy::Layout;
 use ui_events::ScrollDelta;
 use ui_events::pointer::{PointerId, PointerType};
-use craft_primitives::geometry::{Rectangle, Size};
+
 use crate::app::{queue_event, request_apply_layout};
-use crate::elements::element_data::ElementData;
 use crate::elements::ElementInternals;
+use crate::elements::element_data::ElementData;
 use crate::events::{CraftMessage, Event};
 use crate::style::Overflow;
 
@@ -48,7 +50,10 @@ pub struct ScrollOptions {
 
 impl ScrollOptions {
     pub fn new(to: ScrollToBox, offset: Point) -> Self {
-        ScrollOptions { to , offset: Some(offset) }
+        ScrollOptions {
+            to,
+            offset: Some(offset),
+        }
     }
 }
 
@@ -102,7 +107,6 @@ pub(crate) fn scroll_to_top(data: &mut ElementData) {
     scroll_to(data, 0.0);
 }
 
-
 /// Scroll to y. A valid y is in the interval [0, max_scroll_y].
 pub(crate) fn scroll_to(data: &mut ElementData, y: f32) {
     if !data.is_scrollable() {
@@ -116,7 +120,7 @@ pub(crate) fn scroll_to(data: &mut ElementData, y: f32) {
 }
 
 /// Scroll an amount y from the current scroll position.
-pub (crate) fn scroll_by(data: &mut ElementData, y: f32) {
+pub(crate) fn scroll_by(data: &mut ElementData, y: f32) {
     scroll_to(data, data.scroll().scroll_y() + y);
 }
 
@@ -137,12 +141,14 @@ pub(crate) fn scroll_to_child_by_id_with_options(data: &mut ElementData, id: &st
     while let Some(child) = queue.pop_front().clone() {
         let child = child.borrow();
         let element_data = child.element_data();
-        if let Some(child_id) = element_data.id.as_ref() && child_id.as_str() == id {
+        if let Some(child_id) = element_data.id.as_ref()
+            && child_id.as_str() == id
+        {
             let box_model_selected = match options.to {
                 ScrollToBox::BorderBox => element_data.layout_item.computed_box.border_rectangle(),
                 ScrollToBox::MarginBox => element_data.layout_item.computed_box.margin_rectangle(),
                 ScrollToBox::PaddingBox => element_data.layout_item.computed_box.padding_rectangle(),
-                ScrollToBox::ContentBox => element_data.layout_item.computed_box.content_rectangle()
+                ScrollToBox::ContentBox => element_data.layout_item.computed_box.content_rectangle(),
             };
             let distance_from_parent = box_model_selected.y - top_py;
             child_y = Some(distance_from_parent);
@@ -182,8 +188,7 @@ pub(crate) fn apply_scroll_layout(element: &mut ElementData, layout: &Layout) {
 
     // Content Size = overflowed content size + padding
     // Scroll Height = Content Size
-    let scroll_height =
-        (content_height + box_transformed.padding.bottom + box_transformed.padding.top).max(1.0);
+    let scroll_height = (content_height + box_transformed.padding.bottom + box_transformed.padding.top).max(1.0);
     let scroll_track_width = element.layout_item.scrollbar_size.width;
 
     // The scroll track height is the height of the padding box.
@@ -224,7 +229,6 @@ pub(crate) fn apply_scroll_layout(element: &mut ElementData, layout: &Layout) {
     element.layout_item.computed_scroll_thumb.height = scroll_thumb_height;
 }
 
-
 /// Updates the scroll state when an event occurs.
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &CraftMessage, event: &mut Event) {
@@ -252,68 +256,66 @@ pub(crate) fn on_scroll_events(element: &mut dyn ElementInternals, message: &Cra
                 event.prevent_propagate();
                 event.prevent_defaults();
             }
-            CraftMessage::PointerButtonDown(pointer_button) => {
-                if pointer_button.button == Some(ui_events::pointer::PointerButton::Primary) {
-                    // DEVICE(TOUCH): Handle scrolling within the content area on touch based input devices.
-                    if pointer_button.pointer.pointer_type == PointerType::Touch {
-                        let container_rectangle = element_data.layout_item.computed_box_transformed.padding_rectangle();
-
-                        let in_scroll_bar = element_data
-                            .layout_item
-                            .computed_scroll_thumb
-                            .contains(&pointer_button.state.logical_point());
-
-                        if container_rectangle.contains(&pointer_button.state.logical_point()) && !in_scroll_bar {
-                            state.scroll_click = Some(Point::new(
-                                pointer_button.state.logical_point().x,
-                                pointer_button.state.logical_point().y,
-                            ));
-                            event.prevent_propagate();
-                            event.prevent_defaults();
-                        }
-                    } else if element_data
+            CraftMessage::PointerButtonDown(pointer_button)
+                if pointer_button.button == Some(ui_events::pointer::PointerButton::Primary) =>
+            {
+                // DEVICE(TOUCH): Handle scrolling within the content area on touch based input devices.
+                if pointer_button.pointer.pointer_type == PointerType::Touch {
+                    let container_rectangle = element_data.layout_item.computed_box_transformed.padding_rectangle();
+
+                    let in_scroll_bar = element_data
                         .layout_item
                         .computed_scroll_thumb
-                        .contains(&pointer_button.state.logical_point())
-                    {
+                        .contains(&pointer_button.state.logical_point());
+
+                    if container_rectangle.contains(&pointer_button.state.logical_point()) && !in_scroll_bar {
                         state.scroll_click = Some(Point::new(
                             pointer_button.state.logical_point().x,
                             pointer_button.state.logical_point().y,
                         ));
-
-                        // FIXME: Turn pointer capture on with the correct device id.
-                        element.set_pointer_capture(PointerId::new(1).unwrap());
-
                         event.prevent_propagate();
                         event.prevent_defaults();
-                    } else if element_data
-                        .layout_item
-                        .computed_scroll_track
-                        .contains(&pointer_button.state.logical_point())
-                    {
-                        let offset_y =
-                            pointer_button.state.position.y as f32 - element_data.layout_item.computed_scroll_track.y;
-
-                        let percent = offset_y / element_data.layout_item.computed_scroll_track.height;
-                        let scroll_y = percent * element_data.layout_item.max_scroll_y;
+                    }
+                } else if element_data
+                    .layout_item
+                    .computed_scroll_thumb
+                    .contains(&pointer_button.state.logical_point())
+                {
+                    state.scroll_click = Some(Point::new(
+                        pointer_button.state.logical_point().x,
+                        pointer_button.state.logical_point().y,
+                    ));
+
+                    // FIXME: Turn pointer capture on with the correct device id.
+                    element.set_pointer_capture(PointerId::new(1).unwrap());
 
-                        state.set_scroll_y(scroll_y.clamp(0.0, element_data.layout_item.max_scroll_y));
-                        request_apply_layout(element_data.layout_item.taffy_node_id.unwrap());
+                    event.prevent_propagate();
+                    event.prevent_defaults();
+                } else if element_data
+                    .layout_item
+                    .computed_scroll_track
+                    .contains(&pointer_button.state.logical_point())
+                {
+                    let offset_y =
+                        pointer_button.state.position.y as f32 - element_data.layout_item.computed_scroll_track.y;
+
+                    let percent = offset_y / element_data.layout_item.computed_scroll_track.height;
+                    let scroll_y = percent * element_data.layout_item.max_scroll_y;
+
+                    state.set_scroll_y(scroll_y.clamp(0.0, element_data.layout_item.max_scroll_y));
+                    request_apply_layout(element_data.layout_item.taffy_node_id.unwrap());
 
-                        event.prevent_propagate();
-                        event.prevent_defaults();
-                    }
-                }
-            }
-            CraftMessage::PointerButtonUp(_pointer_button) => {
-                if state.scroll_click.is_some() {
-                    state.scroll_click = None;
-                    // FIXME: Turn pointer capture off with the correct device id.
-                    element.release_pointer_capture(PointerId::new(1).unwrap());
                     event.prevent_propagate();
                     event.prevent_defaults();
                 }
             }
+            CraftMessage::PointerButtonUp(_pointer_button) if state.scroll_click.is_some() => {
+                state.scroll_click = None;
+                // FIXME: Turn pointer capture off with the correct device id.
+                element.release_pointer_capture(PointerId::new(1).unwrap());
+                event.prevent_propagate();
+                event.prevent_defaults();
+            }
             CraftMessage::PointerMovedEvent(pointer_motion) => {
                 if let Some(click) = state.scroll_click {
                     // Todo: Translate scroll wheel pixel to scroll position for diff.
diff --git a/crates/craft_retained/src/elements/slider/slider_draw.rs b/crates/craft_retained/src/elements/slider/slider_draw.rs
index 6a616d18..f2924fbb 100644
--- a/crates/craft_retained/src/elements/slider/slider_draw.rs
+++ b/crates/craft_retained/src/elements/slider/slider_draw.rs
@@ -4,8 +4,7 @@ use craft_renderer::RenderList;
 use kurbo::Vec2;
 
 use crate::elements::slider::slider_element::SliderDirection;
-use crate::elements::{SliderInner};
-use crate::elements::ElementInternals;
+use crate::elements::{ElementInternals, SliderInner};
 use crate::layout::layout_item::{CssComputedBorder, draw_borders_generic};
 
 fn border_radius_to_vec_radius(border_radius: [(f32, f32); 4]) -> [Vec2; 4] {
diff --git a/crates/craft_retained/src/elements/slider/slider_element.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
index 6dcd89d0..03ee37d1 100644
--- a/crates/craft_retained/src/elements/slider/slider_element.rs
+++ b/crates/craft_retained/src/elements/slider/slider_element.rs
@@ -10,9 +10,8 @@ use ui_events::keyboard::{Code, KeyState};
 use ui_events::pointer::PointerId;
 
 use crate::app::queue_event;
-use crate::elements::{ElementInternals, AsElement};
 use crate::elements::element_data::ElementData;
-use crate::elements::{Element};
+use crate::elements::{AsElement, Element, ElementInternals};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::palette;
diff --git a/crates/craft_retained/src/elements/slider/slider_logic.rs b/crates/craft_retained/src/elements/slider/slider_logic.rs
index d15210d6..d8941c17 100644
--- a/crates/craft_retained/src/elements/slider/slider_logic.rs
+++ b/crates/craft_retained/src/elements/slider/slider_logic.rs
@@ -1,8 +1,7 @@
 use kurbo::Point;
 
-use crate::elements::SliderInner;
-use crate::elements::ElementInternals;
 use crate::elements::slider::slider_element::SliderDirection;
+use crate::elements::{ElementInternals, SliderInner};
 
 impl SliderInner {
     pub(super) fn compute_step(&self, by: i32, current_value: f64) -> f64 {
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index bfd54ba9..50ea461e 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -36,11 +36,9 @@ use ui_events::pointer::{PointerButton, PointerId};
 use web_time as time;
 use winit::dpi;
 
-use crate::elements::ElementInternals;
-use crate::elements::AsElement;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::elements::element_id::create_unique_element_id;
-use crate::elements::{Element};
+use crate::elements::{AsElement, Element, ElementInternals};
 use crate::layout::TaffyTree;
 
 #[derive(Clone)]
@@ -338,51 +336,39 @@ impl ElementInternals for TextInner {
 
             let state: &mut TextState = &mut self.state;
             match message {
-                CraftMessage::PointerButtonDown(pointer_button) => {
-                    if pointer_button
-                        .button
-                        .map(|button| button == PointerButton::Primary)
-                        .unwrap_or_default()
-                    {
-                        state.update_text_selection(self.element_data.style.get_selection_color());
-                        state.pointer_down = true;
-                        state.cursor_reset();
-                        let now = Instant::now();
-                        if let Some(last) = state.last_click_time.take() {
-                            if now.duration_since(last).as_secs_f64() < 0.25 {
-                                state.click_count = (state.click_count + 1) % 4;
-                            } else {
-                                state.click_count = 1;
-                            }
+                CraftMessage::PointerButtonDown(pb) if pb.button == Some(PointerButton::Primary) => {
+                    state.update_text_selection(self.element_data.style.get_selection_color());
+                    state.pointer_down = true;
+                    state.cursor_reset();
+                    let now = Instant::now();
+                    if let Some(last) = state.last_click_time.take() {
+                        if now.duration_since(last).as_secs_f64() < 0.25 {
+                            state.click_count = (state.click_count + 1) % 4;
                         } else {
                             state.click_count = 1;
                         }
-                        state.last_click_time = Some(now);
-                        let click_count = state.click_count;
-                        let cursor_pos = state.cursor_pos;
-                        match click_count {
-                            2 => state.select_word_at_point(cursor_pos),
-                            3 => state.select_line_at_point(cursor_pos),
-                            _ => state.move_to_point(cursor_pos),
-                        }
-                        if click_count == 1 {
-                            self.set_pointer_capture(PointerId::new(1).unwrap());
-                        }
-                        event.prevent_defaults();
+                    } else {
+                        state.click_count = 1;
                     }
-                }
-                CraftMessage::PointerButtonUp(pointer_button) => {
-                    if pointer_button
-                        .button
-                        .map(|button| button == PointerButton::Primary)
-                        .unwrap_or_default()
-                    {
-                        state.update_text_selection(self.element_data.style.get_selection_color());
-                        state.pointer_down = false;
-                        state.cursor_reset();
-                        self.release_pointer_capture(PointerId::new(1).unwrap());
-                        event.prevent_defaults();
+                    state.last_click_time = Some(now);
+                    let click_count = state.click_count;
+                    let cursor_pos = state.cursor_pos;
+                    match click_count {
+                        2 => state.select_word_at_point(cursor_pos),
+                        3 => state.select_line_at_point(cursor_pos),
+                        _ => state.move_to_point(cursor_pos),
+                    }
+                    if click_count == 1 {
+                        self.set_pointer_capture(PointerId::new(1).unwrap());
                     }
+                    event.prevent_defaults();
+                }
+                CraftMessage::PointerButtonUp(pb) if pb.button == Some(PointerButton::Primary) => {
+                    state.update_text_selection(self.element_data.style.get_selection_color());
+                    state.pointer_down = false;
+                    state.cursor_reset();
+                    self.release_pointer_capture(PointerId::new(1).unwrap());
+                    event.prevent_defaults();
                 }
                 CraftMessage::PointerMovedEvent(pointer_moved) => {
                     let prev_pos = state.cursor_pos;
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 4c567bdd..6fd31c68 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -350,18 +350,17 @@ impl ElementInternals for TextInputInner {
                 if self.disabled || !keyboard_event.state.is_down() || !focused {
                     return;
                 }
-                self.state.key_press(text_context, keyboard_event, &mut self.element_data);
+                self.state
+                    .key_press(text_context, keyboard_event, &mut self.element_data);
             }
-            CraftMessage::PointerButtonDown(pointer_button) => {
-                if pointer_button.button == Some(PointerButton::Primary) {
-                    self.focus();
-                    self.state.pointer_down(text_context);
-                }
+            CraftMessage::PointerButtonDown(pointer_button)
+                if pointer_button.button == Some(PointerButton::Primary) =>
+            {
+                self.focus();
+                self.state.pointer_down(text_context);
             }
-            CraftMessage::PointerButtonUp(pointer_button) => {
-                if pointer_button.button == Some(PointerButton::Primary) {
-                    self.state.pointer_up();
-                }
+            CraftMessage::PointerButtonUp(pointer_button) if pointer_button.button == Some(PointerButton::Primary) => {
+                self.state.pointer_up();
             }
             CraftMessage::PointerMovedEvent(pointer_moved) => {
                 self.state.move_pointer(text_context, pointer_moved, scroll_y);
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index d191af7d..27321c21 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -18,9 +18,8 @@ use winit::dpi;
 
 use crate::app::{TAFFY_TREE, request_apply_layout};
 use crate::elements::element_data::ElementData;
-use crate::elements::TextInputInner;
-use crate::elements::ElementInternals;
 use crate::elements::text_input::parley_box_to_rect;
+use crate::elements::{ElementInternals, TextInputInner};
 use crate::layout::layout_context::TextHashKey;
 use crate::style::{Style, TextStyleProperty};
 use crate::text::parley_editor::{PlainEditor, PlainEditorDriver};
@@ -145,15 +144,14 @@ impl TextInputState {
         };
 
         let margin = 2.0;
-        let cursor_top = cursor_rect.top() as f32 - margin;
-        let cursor_bottom = cursor_rect.bottom() as f32 + margin;
+        let cursor_top = cursor_rect.top() - margin;
+        let cursor_bottom = cursor_rect.bottom() + margin;
 
         let mut new_scroll = current_scroll_y;
 
         if cursor_top < current_scroll_y {
             new_scroll = cursor_top;
-        }
-        else if cursor_bottom > current_scroll_y + viewport_height {
+        } else if cursor_bottom > current_scroll_y + viewport_height {
             new_scroll = cursor_bottom - viewport_height;
         }
 
@@ -389,7 +387,11 @@ impl TextInputState {
     }
 
     pub fn maybe_scroll_to_cursor(&mut self, element_data: &mut ElementData) {
-        let height = element_data.layout_item.computed_box_transformed.padding_rectangle_size().height;
+        let height = element_data
+            .layout_item
+            .computed_box_transformed
+            .padding_rectangle_size()
+            .height;
         let x = self.calculate_scroll_to_cursor(height, element_data.scroll_state.scroll_y());
         if x < 0.0 {
             return;
@@ -409,22 +411,30 @@ impl TextInputState {
         self.pointer_down
     }
 
-    pub fn key_press(&mut self, text_context: &mut TextContext, keyboard_event: &KeyboardEvent, element_data: &mut ElementData) {
+    pub fn key_press(
+        &mut self,
+        text_context: &mut TextContext,
+        keyboard_event: &KeyboardEvent,
+        element_data: &mut ElementData,
+    ) {
         // TODO: self.reset_blink();
 
         self.modifiers = Some(keyboard_event.modifiers);
 
-        const IS_MAC: bool = if cfg!(target_os = "macos") {true} else {false};
+        const IS_MAC: bool = cfg!(target_os = "macos");
 
-        let (shift, action_mod, word_mod) = self.modifiers.map(|mods| {
-            if IS_MAC {
-                // mac: cmd for actions, alt for words
-                (mods.shift(), mods.meta(), mods.alt())
-            } else {
-                // windows/linux: Ctrl for both
-                (mods.shift(), mods.ctrl(), mods.ctrl())
-            }
-        }).unwrap_or_default();
+        let (shift, action_mod, word_mod) = self
+            .modifiers
+            .map(|mods| {
+                if IS_MAC {
+                    // mac: cmd for actions, alt for words
+                    (mods.shift(), mods.meta(), mods.alt())
+                } else {
+                    // windows/linux: Ctrl for both
+                    (mods.shift(), mods.ctrl(), mods.ctrl())
+                }
+            })
+            .unwrap_or_default();
 
         let mut driver = self.driver(text_context);
 
@@ -468,10 +478,18 @@ impl TextInputState {
             Key::Named(NamedKey::ArrowLeft) => {
                 if IS_MAC && action_mod {
                     // mac: Cmd + Left = Line Start
-                    if shift { driver.select_to_line_start(); } else { driver.move_to_line_start(); }
+                    if shift {
+                        driver.select_to_line_start();
+                    } else {
+                        driver.move_to_line_start();
+                    }
                 } else if word_mod {
                     // windows: ctrl + left | mac: alt + left = word left
-                    if shift { driver.select_word_left(); } else { driver.move_word_left(); }
+                    if shift {
+                        driver.select_word_left();
+                    } else {
+                        driver.move_word_left();
+                    }
                 } else if shift {
                     driver.select_left();
                 } else {
@@ -509,7 +527,7 @@ impl TextInputState {
                     } else {
                         driver.move_to_text_start();
                     }
-                }  else if word_mod {
+                } else if word_mod {
                     if shift {
                         driver.select_left();
                         driver.select_to_hard_line_start();
diff --git a/crates/craft_retained/src/elements/traits/as_element.rs b/crates/craft_retained/src/elements/traits/as_element.rs
index 67a82fa0..42b2a9d6 100644
--- a/crates/craft_retained/src/elements/traits/as_element.rs
+++ b/crates/craft_retained/src/elements/traits/as_element.rs
@@ -1,9 +1,10 @@
 use std::cell::RefCell;
 use std::rc::Rc;
+
 use crate::elements::ElementInternals;
 
 /// Used as a super trait in `Element`, so that
 /// the internal element can be retrieved.
 pub trait AsElement {
     fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>>;
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/elements/traits/element.rs b/crates/craft_retained/src/elements/traits/element.rs
index 5a0c8cc6..36fea0a8 100644
--- a/crates/craft_retained/src/elements/traits/element.rs
+++ b/crates/craft_retained/src/elements/traits/element.rs
@@ -1,19 +1,19 @@
 use std::cell::RefCell;
 use std::rc::Rc;
 
-use craft_primitives::geometry::ElementBox;
 use craft_primitives::Color;
+use craft_primitives::geometry::ElementBox;
 use ui_events::pointer::PointerId;
 use winit::dpi::PhysicalPosition;
 use winit::event::WindowEvent::{CursorMoved, MouseInput};
 use winit::event::{DeviceId, ElementState, MouseButton};
 
+use crate::CraftError;
 use crate::app::queue_window_event;
-use crate::elements::{AsElement, ElementInternals};
 use crate::elements::scrollable::{ScrollOptions, ScrollState};
+use crate::elements::{AsElement, ElementInternals};
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler};
 use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Underline, Unit};
-use crate::CraftError;
 
 /// Exposes a fluent/builder-pattern like API for elements.
 /// Setters in this trait return Self and have no prefix.
@@ -48,7 +48,10 @@ pub trait Element: Clone + AsElement {
         self.as_element_rc().borrow().get_last_child()
     }
 
-    fn remove_child(&self, child: Rc<RefCell<dyn ElementInternals>>) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
+    fn remove_child(
+        &self,
+        child: Rc<RefCell<dyn ElementInternals>>,
+    ) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
         self.as_element_rc().borrow_mut().remove_child(child)
     }
 
@@ -81,9 +84,7 @@ pub trait Element: Clone + AsElement {
     }
 
     fn id(self, id: &str) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .set_id(id);
+        self.as_element_rc().borrow_mut().set_id(id);
         self
     }
 
@@ -126,9 +127,7 @@ pub trait Element: Clone + AsElement {
     }
 
     fn on_scroll(self, on_scroll: ScrollHandler) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .on_scroll(on_scroll);
+        self.as_element_rc().borrow_mut().on_scroll(on_scroll);
         self
     }
 
@@ -146,37 +145,27 @@ pub trait Element: Clone + AsElement {
         self
     }
     fn scroll_to(self, y: f32) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .scroll_to(y);
+        self.as_element_rc().borrow_mut().scroll_to(y);
         self
     }
 
     fn scroll_to_top(self) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .scroll_to_top();
+        self.as_element_rc().borrow_mut().scroll_to_top();
         self
     }
 
     fn scroll_to_bottom(self) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .scroll_to_bottom();
+        self.as_element_rc().borrow_mut().scroll_to_bottom();
         self
     }
 
     fn scroll_by(self, y: f32) -> Self {
-        self.as_element_rc()
-            .borrow_mut()
-            .scroll_by(y);
+        self.as_element_rc().borrow_mut().scroll_by(y);
         self
     }
 
     fn get_scroll_state(&self) -> ScrollState {
-        self.as_element_rc()
-            .borrow_mut()
-            .get_scroll_state()
+        self.as_element_rc().borrow_mut().get_scroll_state()
     }
 
     fn display(self, display: Display) -> Self {
diff --git a/crates/craft_retained/src/elements/traits/element_data.rs b/crates/craft_retained/src/elements/traits/element_data.rs
index 04a659c1..2c8d6382 100644
--- a/crates/craft_retained/src/elements/traits/element_data.rs
+++ b/crates/craft_retained/src/elements/traits/element_data.rs
@@ -1,5 +1,6 @@
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
+
 use crate::elements::ElementInternals;
 
 /// Used as a super trait and forces implementations to
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index 22fda066..cd46a707 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -2,6 +2,7 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 use std::sync::Arc;
+
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::{Action, Role};
 use craft_primitives::geometry::borders::CssRoundedRect;
@@ -10,11 +11,12 @@ use craft_renderer::RenderList;
 use kurbo::{Affine, Point, Vec2};
 use peniko::Color;
 use ui_events::pointer::PointerId;
-use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
+
 use crate::CraftError;
+use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
 use crate::document::Document;
-use crate::elements::{ElementData, ElementIdMap, ScrollOptions, WindowInternal};
 use crate::elements::scrollable::ScrollState;
+use crate::elements::{ElementData, ElementIdMap, ScrollOptions, WindowInternal};
 use crate::events::{CraftMessage, Event, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::layout::TaffyTree;
 use crate::layout::layout_item::{CssComputedBorder, LayoutItem, draw_borders_generic};
@@ -236,9 +238,13 @@ pub trait ElementInternals: ElementData + Any {
         let border_color = &current_style.get_border_color();
         let box_shadows = current_style.get_box_shadows();
 
-        self.element_data_mut()
-            .layout_item
-            .apply_borders(has_border, border_radius, scale_factor, border_color, box_shadows);
+        self.element_data_mut().layout_item.apply_borders(
+            has_border,
+            border_radius,
+            scale_factor,
+            border_color,
+            box_shadows,
+        );
     }
 
     /// A bit of a hack to reset the layout item of an element recursively.
diff --git a/crates/craft_retained/src/elements/traits/mod.rs b/crates/craft_retained/src/elements/traits/mod.rs
index 7c0e9348..d805f251 100644
--- a/crates/craft_retained/src/elements/traits/mod.rs
+++ b/crates/craft_retained/src/elements/traits/mod.rs
@@ -1,10 +1,10 @@
-mod element_data;
-mod element_internals;
 mod as_element;
 mod element;
+mod element_data;
+mod element_internals;
 
-pub use element_data::ElementData;
 pub use as_element::AsElement;
 pub use element::Element;
+pub use element_data::ElementData;
 /// Note: this could be hidden behind a custom elements feature.
-pub use element_internals::{ElementInternals, resolve_clip_for_scrollable};
\ No newline at end of file
+pub use element_internals::{ElementInternals, resolve_clip_for_scrollable};
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 9ac232d5..869841ba 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -8,6 +8,7 @@ use std::sync::Arc;
 
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::TreeUpdate;
+use craft_logging::info;
 use craft_primitives::geometry::{Rectangle, Size};
 use craft_renderer::RenderList;
 use craft_renderer::renderer::{Renderer, Screenshot};
@@ -20,8 +21,8 @@ use winit::event_loop::ActiveEventLoop;
 use winit::window::{Window as WinitWindow, WindowAttributes};
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use {accesskit::{Action, Role}, accesskit_winit::Adapter};
-
-use craft_logging::info;
+#[cfg(target_arch = "wasm32")]
+use {wasm_bindgen::JsCast, winit::platform::web::WindowAttributesExtWebSys};
 
 use crate::RendererBox;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
@@ -29,24 +30,16 @@ use crate::accessibility::{access_handler::CraftAccessHandler, activation_handle
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::app::FOCUS;
 use crate::app::{App, TAFFY_TREE, WINDOW_MANAGER, queue_window_event};
-use crate::elements::{AsElement, ElementInternals, resolve_clip_for_scrollable};
 use crate::elements::element_data::ElementData;
-use crate::elements::{Element, scrollable};
+use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scrollable, scrollable};
+#[cfg(target_arch = "wasm32")]
+use crate::events::internal::InternalMessage;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
-
-#[cfg(target_arch = "wasm32")]
-use crate::events::internal::InternalMessage;
 #[cfg(target_arch = "wasm32")]
 use crate::wasm_queue::WASM_QUEUE;
 
-#[cfg(target_arch = "wasm32")]
-use {
-    wasm_bindgen::JsCast,
-    winit::platform::web::WindowAttributesExtWebSys,
-};
-
 #[derive(Clone)]
 pub struct Window {
     pub inner: Rc<RefCell<WindowInternal>>,
@@ -397,7 +390,9 @@ impl WindowInternal {
         let winit_window: Arc<WinitWindow> = Arc::new(if let Some(window_fn) = &mut self.advanced_window_fn {
             (*window_fn)(event_loop)
         } else {
-            let window_attributes = WindowAttributes::default().with_title(self.title.as_ref().unwrap()).with_visible(false);
+            let window_attributes = WindowAttributes::default()
+                .with_title(self.title.as_ref().unwrap())
+                .with_visible(false);
             #[cfg(target_arch = "wasm32")]
             let window_attributes = {
                 let canvas = web_sys::window()
@@ -577,8 +572,7 @@ impl ElementInternals for WindowInternal {
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.scroll_state.is_new()
-        {
+        if !dirty && self.element_data.scroll_state.is_new() {
             self.element_data.apply_scroll(layout);
             self.element_data.scroll_state.mark_old();
         }
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index 334d4c45..cfc726fa 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -12,7 +12,10 @@ use crate::events::pointer_capture::maybe_handle_implicit_pointer_capture_releas
 use crate::events::{CraftMessage, Event, FocusAction};
 use crate::text::text_context::TextContext;
 
-pub(super) fn dispatch_capturing_event(_message: &CraftMessage, _targets: &mut VecDeque<Rc<RefCell<dyn ElementInternals>>>) {
+pub(super) fn dispatch_capturing_event(
+    _message: &CraftMessage,
+    _targets: &mut VecDeque<Rc<RefCell<dyn ElementInternals>>>,
+) {
 }
 
 /// Dispatches 1 event to many elements.
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index ae1e65ac..72bae1d7 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -11,7 +11,9 @@ use crate::events::pointer_capture::find_pointer_capture_target;
 use crate::events::{CraftMessage, Event};
 use crate::text::text_context::TextContext;
 
-pub(super) fn freeze_target_list(target: Rc<RefCell<dyn ElementInternals>>) -> VecDeque<Rc<RefCell<dyn ElementInternals>>> {
+pub(super) fn freeze_target_list(
+    target: Rc<RefCell<dyn ElementInternals>>,
+) -> VecDeque<Rc<RefCell<dyn ElementInternals>>> {
     let mut current_target = Some(Rc::clone(&target));
 
     // Gather and "freeze" the elements we will visit.
diff --git a/crates/craft_retained/src/layout/layout_item.rs b/crates/craft_retained/src/layout/layout_item.rs
index 650dcb3a..0b5ffeec 100644
--- a/crates/craft_retained/src/layout/layout_item.rs
+++ b/crates/craft_retained/src/layout/layout_item.rs
@@ -1,10 +1,11 @@
 use craft_primitives::geometry::borders::{BOTTOM, CssRoundedRect, LEFT, RIGHT, TOP};
 use craft_primitives::geometry::{Border, ElementBox, Margin, Padding, Point, Rectangle, Size, TrblRectangle};
+use craft_renderer::renderer::BoxShadowCmd;
 use craft_renderer::{Brush, RenderList};
 use kurbo::{Affine, BezPath, Shape, Vec2};
 use peniko::Color;
 use taffy::NodeId;
-use craft_renderer::renderer::BoxShadowCmd;
+
 use crate::style::{BoxShadow, Position, Style};
 
 impl CssComputedBorder {
@@ -170,16 +171,16 @@ impl LayoutItem {
 
         let mut computed = CssComputedBorder::new(border_spec);
         computed.scale(scale_factor);
-        self.computed_border = ComputedBorder::CssComputedBorder(computed);
+        self.computed_border = ComputedBorder::CssComputed(Box::new(computed));
 
         self.apply_box_shadows(scale_factor, border_radius);
     }
 
-    fn apply_box_shadows(&mut self, scale_factor: f64, border_radius: [(f32, f32); 4],) {
+    fn apply_box_shadows(&mut self, scale_factor: f64, border_radius: [(f32, f32); 4]) {
         let scale_transform = Affine::scale(scale_factor);
         let box_shadows = &self.cache_border_spec.as_ref().unwrap().box_shadows;
         match &self.computed_border {
-            ComputedBorder::CssComputedBorder(css_rect) => {
+            ComputedBorder::CssComputed(css_rect) => {
                 let mut outline = css_rect.css_rect.get_outline();
                 let mut inline = css_rect.css_rect.get_inline();
                 outline.apply_affine(scale_transform);
@@ -197,14 +198,22 @@ impl LayoutItem {
                         let element_rect = self.computed_box_transformed;
                         let borders = element_rect.border;
                         let inset_css_rect = CssRoundedRect::new(
-                            element_rect.border_rectangle().to_kurbo().inflate(-box_shadow.spread_radius, -box_shadow.spread_radius),
+                            element_rect
+                                .border_rectangle()
+                                .to_kurbo()
+                                .inflate(-box_shadow.spread_radius, -box_shadow.spread_radius),
                             [
                                 borders.top as f64,
                                 borders.right as f64,
                                 borders.bottom as f64,
                                 borders.left as f64,
                             ],
-                            border_radius.map(|radii| Vec2::new((radii.0 as f64 - box_shadow.spread_radius).max(0.0), (radii.1 as f64 - box_shadow.spread_radius).max(0.0))),
+                            border_radius.map(|radii| {
+                                Vec2::new(
+                                    (radii.0 as f64 - box_shadow.spread_radius).max(0.0),
+                                    (radii.1 as f64 - box_shadow.spread_radius).max(0.0),
+                                )
+                            }),
                         );
                         let mut inset_rect_outline = inset_css_rect.get_outline();
                         inset_rect_outline.apply_affine(Affine::translate(offset));
@@ -242,11 +251,15 @@ impl LayoutItem {
                     border_box: self.computed_box_transformed.border_rectangle().scale(scale_factor),
                 };
                 for box_shadow in box_shadows {
-                    let radius_modifier = if box_shadow.inset {-1.0} else {1.0};
+                    let radius_modifier = if box_shadow.inset { -1.0 } else { 1.0 };
                     let offset = Vec2::new(box_shadow.offset_x, box_shadow.offset_y);
                     cache_box_shadows.box_shadows.push(ComputedBoxShadow {
                         inset: box_shadow.inset,
-                        shape: BezPathOrRect::Rect(outline.expand((box_shadow.spread_radius * radius_modifier) as f32).scale(scale_factor)),
+                        shape: BezPathOrRect::Rect(
+                            outline
+                                .expand((box_shadow.spread_radius * radius_modifier) as f32)
+                                .scale(scale_factor),
+                        ),
                         offset: offset * scale_factor,
                         blur_radius: box_shadow.blur_radius * scale_factor,
                         color: box_shadow.color,
@@ -299,7 +312,7 @@ impl LayoutItem {
                     renderer.draw_rect_outline(border_rect, border_color, thickness as f64);
                 }
             }
-            ComputedBorder::CssComputedBorder(computed_border) => {
+            ComputedBorder::CssComputed(computed_border) => {
                 draw_borders_generic(
                     renderer,
                     computed_border,
@@ -357,16 +370,12 @@ enum BezPathOrRect {
 }
 
 impl BezPathOrRect {
-
     pub fn to_path(&self) -> BezPath {
         match self {
-            BezPathOrRect::Rect(rect) => {
-                rect.to_kurbo().to_path(0.1)
-            }
-            BezPathOrRect::BezPath(path) => {path.clone()}
+            BezPathOrRect::Rect(rect) => rect.to_kurbo().to_path(0.1),
+            BezPathOrRect::BezPath(path) => path.clone(),
         }
     }
-
 }
 
 #[derive(Clone)]
@@ -404,7 +413,7 @@ struct BorderSpec {
 
 #[derive(Clone, Default)]
 pub(crate) enum ComputedBorder {
-    CssComputedBorder(CssComputedBorder),
+    CssComputed(Box<CssComputedBorder>),
     Simple,
     #[default]
     None,
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index cde906ec..c22e7171 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -63,7 +63,8 @@ pub type FutureAny = dyn Future<Output = Box<dyn CloneableAny + Send + Sync>> +
 
 pub type PinnedFutureAny = Pin<Box<FutureAny>>;
 
-pub use {craft_runtime, image};
+pub use craft_runtime;
+pub use image;
 
 #[cfg(not(target_arch = "wasm32"))]
 type RendererBox = Box<dyn Renderer>;
diff --git a/crates/craft_retained/src/style/mod.rs b/crates/craft_retained/src/style/mod.rs
index eb5d76e7..455c80b1 100644
--- a/crates/craft_retained/src/style/mod.rs
+++ b/crates/craft_retained/src/style/mod.rs
@@ -1,14 +1,13 @@
+mod box_shadow;
 mod styles;
 mod taffy_conversions;
-mod box_shadow;
 
 use std::borrow::Cow;
 use std::fmt;
 use std::fmt::Debug;
 
-use craft_primitives::ColorBrush;
-use craft_primitives::Color;
 pub use box_shadow::BoxShadow;
+use craft_primitives::{Color, ColorBrush};
 pub use styles::*;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -38,7 +37,7 @@ impl Unit {
         match self {
             Unit::Px(px) => *px,
             Unit::Percentage(pct) => *pct,
-            Unit::Auto => 0.0
+            Unit::Auto => 0.0,
         }
     }
 }
diff --git a/crates/craft_retained/src/style/styles.rs b/crates/craft_retained/src/style/styles.rs
index ba0ec908..2b1dc95a 100644
--- a/crates/craft_retained/src/style/styles.rs
+++ b/crates/craft_retained/src/style/styles.rs
@@ -4,8 +4,8 @@ use std::fmt::Debug;
 use craft_primitives::geometry::TrblRectangle;
 use craft_primitives::{Color, ColorBrush};
 
-use crate::style::*;
 use crate::style::box_shadow::BoxShadow;
+use crate::style::*;
 
 #[derive(Clone, Debug)]
 pub struct Style {
diff --git a/crates/craft_retained/src/text/mod.rs b/crates/craft_retained/src/text/mod.rs
index 3e6f6d25..6af3c9cf 100644
--- a/crates/craft_retained/src/text/mod.rs
+++ b/crates/craft_retained/src/text/mod.rs
@@ -1,7 +1,7 @@
 pub(crate) mod parley_editor;
+pub mod text_commands;
 pub mod text_context;
 pub(crate) mod text_render_data;
-pub mod text_commands;
 
 use std::ops::Range;
 
diff --git a/crates/craft_retained/src/text/parley_editor.rs b/crates/craft_retained/src/text/parley_editor.rs
index d43c0068..d842a8b5 100644
--- a/crates/craft_retained/src/text/parley_editor.rs
+++ b/crates/craft_retained/src/text/parley_editor.rs
@@ -431,15 +431,13 @@ impl PlainEditorDriver<'_> {
                     };
                     start
                 };
-                if manage_commands {
-                    if let Some(text) = self.editor.buffer.get(range.clone()) {
-                        let command = TextCommand::Backspace(Backspace::new(
-                            text.to_string(),
-                            range.clone(),
-                            self.editor.selection.focus().affinity(),
-                        ));
-                        self.editor.undo_manager.execute_command(command);
-                    }
+                if manage_commands && let Some(text) = self.editor.buffer.get(range.clone()) {
+                    let command = TextCommand::Backspace(Backspace::new(
+                        text.to_string(),
+                        range.clone(),
+                        self.editor.selection.focus().affinity(),
+                    ));
+                    self.editor.undo_manager.execute_command(command);
                 }
                 self.editor.buffer.replace_range(start..end, "");
                 self.editor.update_compose_for_replaced_range(start..end, 0);
diff --git a/crates/craft_retained/src/text/text_commands.rs b/crates/craft_retained/src/text/text_commands.rs
index e7961197..b53ba0d5 100644
--- a/crates/craft_retained/src/text/text_commands.rs
+++ b/crates/craft_retained/src/text/text_commands.rs
@@ -1,6 +1,7 @@
 use std::ops::Range;
-use parley::{Affinity, Selection};
+
 use craft_undo::Command;
+use parley::{Affinity, Selection};
 
 #[derive(Clone)]
 pub struct TextInsertion {
@@ -10,15 +11,13 @@ pub struct TextInsertion {
 }
 
 impl TextInsertion {
-
-    pub fn new(str: String, range: Range<usize>, affinity: Affinity,) -> Self {
+    pub fn new(str: String, range: Range<usize>, affinity: Affinity) -> Self {
         Self {
             str,
             range,
             affinity,
         }
     }
-
 }
 
 #[derive(Clone)]
@@ -31,8 +30,13 @@ pub struct TextReplace {
 }
 
 impl TextReplace {
-
-    pub fn new(new_str: String, old_str: String, selection: Selection, affinity: Affinity, new_selection: Selection) -> Self {
+    pub fn new(
+        new_str: String,
+        old_str: String,
+        selection: Selection,
+        affinity: Affinity,
+        new_selection: Selection,
+    ) -> Self {
         Self {
             new_str,
             old_str,
@@ -41,7 +45,6 @@ impl TextReplace {
             new_selection,
         }
     }
-
 }
 
 #[derive(Clone)]
@@ -52,15 +55,13 @@ pub struct Backspace {
 }
 
 impl Backspace {
-
-    pub fn new(str: String, range: Range<usize>, affinity: Affinity,) -> Self {
+    pub fn new(str: String, range: Range<usize>, affinity: Affinity) -> Self {
         Self {
             str,
             range,
             affinity,
         }
     }
-
 }
 
 #[derive(Clone)]
@@ -71,15 +72,13 @@ pub struct Delete {
 }
 
 impl Delete {
-
-    pub fn new(str: String, range: Range<usize>, affinity: Affinity,) -> Self {
+    pub fn new(str: String, range: Range<usize>, affinity: Affinity) -> Self {
         Self {
             str,
             range,
             affinity,
         }
     }
-
 }
 
 #[derive(Clone)]
@@ -94,7 +93,13 @@ impl Command for TextCommand {
     fn merge(&mut self, other: &Self) -> bool {
         match (self, other) {
             (TextCommand::TextInsertion(left), TextCommand::TextInsertion(right)) => {
-                if right.str.eq(" ") || right.str.eq("\n") || right.str.eq(".") || left.str.eq(" ") || left.str.eq("\n") || left.str.eq("."){
+                if right.str.eq(" ")
+                    || right.str.eq("\n")
+                    || right.str.eq(".")
+                    || left.str.eq(" ")
+                    || left.str.eq("\n")
+                    || left.str.eq(".")
+                {
                     return false;
                 }
 
@@ -109,4 +114,4 @@ impl Command for TextCommand {
             _ => false,
         }
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/window_manager.rs b/crates/craft_retained/src/window_manager.rs
index 8c03cd56..55016ced 100644
--- a/crates/craft_retained/src/window_manager.rs
+++ b/crates/craft_retained/src/window_manager.rs
@@ -2,6 +2,7 @@ use std::rc::Rc;
 
 use winit::event_loop::ActiveEventLoop;
 use winit::window::WindowId;
+
 use crate::app::App;
 use crate::elements::Window;
 
diff --git a/crates/craft_undo/src/command.rs b/crates/craft_undo/src/command.rs
index cb363eb6..73241a34 100644
--- a/crates/craft_undo/src/command.rs
+++ b/crates/craft_undo/src/command.rs
@@ -4,9 +4,10 @@ pub trait Command {
 
 #[cfg(test)]
 mod tests {
-    use super::Command;
     use alloc::string::{String, ToString};
 
+    use super::Command;
+
     enum TextCommand {
         Insert(String),
         Delete,
diff --git a/crates/craft_undo/src/lib.rs b/crates/craft_undo/src/lib.rs
index 3da547c0..91eeca9a 100644
--- a/crates/craft_undo/src/lib.rs
+++ b/crates/craft_undo/src/lib.rs
@@ -6,4 +6,4 @@ mod undo_manager;
 extern crate alloc;
 
 pub use crate::command::Command;
-pub use crate::undo_manager::UndoManager;
\ No newline at end of file
+pub use crate::undo_manager::UndoManager;
diff --git a/crates/craft_undo/src/undo_manager.rs b/crates/craft_undo/src/undo_manager.rs
index ee8ac9e6..85562d9b 100644
--- a/crates/craft_undo/src/undo_manager.rs
+++ b/crates/craft_undo/src/undo_manager.rs
@@ -1,6 +1,7 @@
-use crate::Command;
 use alloc::vec::Vec;
 
+use crate::Command;
+
 #[derive(Default, Clone)]
 pub struct UndoManager<T: Command> {
     undo_stack: Vec<T>,
diff --git a/examples/text/main.rs b/examples/text/main.rs
index 9ea47738..d0835208 100644
--- a/examples/text/main.rs
+++ b/examples/text/main.rs
@@ -2,7 +2,7 @@ use craft_retained::elements::{Container, Element, TextInput, Window};
 use craft_retained::rgb;
 use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Unit};
 
-const LOREM_IPSUM: &'static str = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In dolor tortor, congue eu lacus eget, faucibus aliquet nunc. Suspendisse aliquet ullamcorper fermentum. Pellentesque eu nibh sit amet nisi maximus pulvinar quis eget lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur efficitur metus maximus libero maximus pharetra. Sed fringilla ac velit nec hendrerit. Mauris vulputate ante non tempor iaculis. In a diam eros. Mauris vehicula, lacus rhoncus consequat laoreet, lectus ligula venenatis leo, a aliquam odio ex ut lorem. Phasellus quis fermentum erat, ut pellentesque diam. Suspendisse pulvinar eros magna, vel ultricies metus luctus at. Pellentesque consequat a magna ut cursus. Nunc nisl velit, maximus blandit mauris quis, convallis cursus leo. Donec ut ultrices dui, a efficitur sem. Cras ac diam non orci sagittis tincidunt. Etiam auctor ultrices leo vitae vestibulum.
+const LOREM_IPSUM: &str = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In dolor tortor, congue eu lacus eget, faucibus aliquet nunc. Suspendisse aliquet ullamcorper fermentum. Pellentesque eu nibh sit amet nisi maximus pulvinar quis eget lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur efficitur metus maximus libero maximus pharetra. Sed fringilla ac velit nec hendrerit. Mauris vulputate ante non tempor iaculis. In a diam eros. Mauris vehicula, lacus rhoncus consequat laoreet, lectus ligula venenatis leo, a aliquam odio ex ut lorem. Phasellus quis fermentum erat, ut pellentesque diam. Suspendisse pulvinar eros magna, vel ultricies metus luctus at. Pellentesque consequat a magna ut cursus. Nunc nisl velit, maximus blandit mauris quis, convallis cursus leo. Donec ut ultrices dui, a efficitur sem. Cras ac diam non orci sagittis tincidunt. Etiam auctor ultrices leo vitae vestibulum.
 
 Nunc malesuada eleifend magna eget sollicitudin. Phasellus non posuere justo. Ut viverra posuere molestie. Aenean diam orci, dignissim eu diam vel, viverra suscipit libero. Nam convallis sed arcu porttitor aliquet. Pellentesque urna risus, consectetur bibendum metus vel, laoreet fringilla sapien. Curabitur justo turpis, auctor vel quam quis, volutpat scelerisque magna. Proin ornare, turpis ac eleifend consequat, augue nulla interdum nulla, a scelerisque mi tortor a nulla. Aenean ut sollicitudin quam.
 

From 5a25e32e8b7858208f92f48f97fb02c3ca51feae Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 19 Mar 2026 07:56:59 -0400
Subject: [PATCH 081/143] Fix lints and format.

---
 crates/craft_undo/src/command.rs | 16 +++++++---------
 crates/craft_undo/tests/undo.rs  | 14 +++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/crates/craft_undo/src/command.rs b/crates/craft_undo/src/command.rs
index 73241a34..ed34ea10 100644
--- a/crates/craft_undo/src/command.rs
+++ b/crates/craft_undo/src/command.rs
@@ -15,16 +15,14 @@ mod tests {
 
     impl Command for TextCommand {
         fn merge(&mut self, other: &Self) -> bool {
-            match self {
-                TextCommand::Insert(left) => {
-                    if let TextCommand::Insert(right) = other {
-                        left.push_str(&right);
-                        return true;
-                    }
-                }
-                _ => {}
+            if let TextCommand::Insert(left) = self
+                && let TextCommand::Insert(right) = other
+            {
+                left.push_str(right);
+                true
+            } else {
+                false
             }
-            false
         }
     }
 
diff --git a/crates/craft_undo/tests/undo.rs b/crates/craft_undo/tests/undo.rs
index 8feb26d0..bd5f09d8 100644
--- a/crates/craft_undo/tests/undo.rs
+++ b/crates/craft_undo/tests/undo.rs
@@ -3,19 +3,15 @@ use craft_undo::{Command, UndoManager};
 #[derive(Debug, PartialEq)]
 enum TextCommand {
     Insert(String),
-    Delete,
 }
 
 impl Command for TextCommand {
     fn merge(&mut self, other: &Self) -> bool {
-        match self {
-            TextCommand::Insert(left) => {
-                if let TextCommand::Insert(right) = other {
-                    left.push_str(&right);
-                    return true;
-                }
-            }
-            _ => {}
+        if let TextCommand::Insert(left) = self
+            && let TextCommand::Insert(right) = other
+        {
+            left.push_str(right);
+            return true;
         }
         false
     }

From 3755bd7290b55fe245898bd69406a5abe8e0f3f2 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 19 Mar 2026 08:04:28 -0400
Subject: [PATCH 082/143] Add missing targets

---
 rust-toolchain.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 19799ac2..71313236 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
 channel = "nightly-2026-03-14"
 components = ["rustc", "cargo", "rust-std", "rust-src", "rust-analyzer", "clippy", "rustfmt"]
-targets = ["x86_64-pc-windows-msvc"]
+targets = ["x86_64-pc-windows-msvc", "aarch64-apple-ios", "aarch64-linux-android"]

From e2a7f86b599828dab3e2e3aa5c515324020a1758 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 19 Mar 2026 09:23:53 -0400
Subject: [PATCH 083/143] Simplify android and move style helpers to utils.

---
 crates/craft_retained/src/app.rs              |   2 -
 .../craft_retained/src/craft_winit_state.rs   |   2 -
 crates/craft_retained/src/elements/window.rs  |   4 +-
 crates/craft_retained/src/lib.rs              | 101 +++++-------------
 crates/craft_retained/src/utils/mod.rs        |   1 +
 .../craft_retained/src/utils/style_helpers.rs |  28 +++++
 crates/craft_retained/tests/counter.rs        |   2 +-
 examples/counter_retained/counter_android.rs  |  11 +-
 examples/counter_retained/main.rs             |   2 +-
 9 files changed, 64 insertions(+), 89 deletions(-)
 create mode 100644 crates/craft_retained/src/utils/style_helpers.rs

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 76038bd0..9233f8b9 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -17,8 +17,6 @@ use ui_events::ScrollDelta;
 use ui_events::ScrollDelta::PixelDelta;
 use ui_events::keyboard::{KeyboardEvent, Modifiers, NamedKey};
 use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
-#[cfg(target_arch = "wasm32")]
-use web_time as time;
 use winit::event::{Ime, WindowEvent};
 use winit::event_loop::ActiveEventLoop;
 use winit::window::WindowId;
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index 9261be55..f181b77c 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -14,8 +14,6 @@ use winit::event_loop::{ActiveEventLoop, ControlFlow};
 use winit::window::WindowId;
 #[cfg(target_arch = "wasm32")]
 use {crate::wasm_queue::WASM_QUEUE, crate::wasm_queue::WasmQueue};
-#[cfg(target_arch = "wasm32")]
-use {wasm_bindgen::JsCast, winit::platform::web::WindowAttributesExtWebSys};
 
 use crate::CraftOptions;
 use crate::app::{App, CURRENT_WINDOW_ID, DOCUMENTS, WINDOW_MANAGER, dequeue_window_event};
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 869841ba..d2b10112 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -423,7 +423,7 @@ impl WindowInternal {
                     renderer
                 });
                 self.renderer = Some(renderer);
-                info!("RENDERER CREATED")
+                info!("Created renderer")
             } else {
                 let window_copy_2 = winit_window.clone();
                 craft_app.runtime.spawn(async move {
@@ -431,7 +431,7 @@ impl WindowInternal {
                     WASM_QUEUE.with_borrow_mut(|wasm_queue| {
                         wasm_queue.push(InternalMessage::RendererCreated(window_copy_2, renderer));
                     });
-                    info!("RENDERER CREATED")
+                    info!("Created renderer")
                 });
             }
         }
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index c22e7171..bab4f5b3 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -25,6 +25,8 @@ use std::future::Future;
 use std::pin::Pin;
 use std::sync::Arc;
 
+pub use crate::utils::style_helpers::{rgb, rgba, px, pct, auto};
+
 use app::App;
 use cfg_if::cfg_if;
 use craft_logging::info;
@@ -39,18 +41,16 @@ pub use craftcallback::CraftCallback;
 use events::internal::InternalMessage;
 pub use options::CraftOptions;
 pub use utils::craft_error::CraftError;
-#[cfg(target_arch = "wasm32")]
-use web_time as time;
 #[cfg(target_os = "android")]
 pub use winit::platform::android::activity::*;
 pub use winit::window::{Cursor, CursorIcon, WindowAttributes};
 #[cfg(target_os = "android")]
-use {winit::event_loop::EventLoopBuilder, winit::platform::android::EventLoopBuilderExtAndroid};
+use {winit::platform::android::EventLoopBuilderExtAndroid};
+use winit::event_loop::EventLoopBuilder;
 
 use crate::app::RedrawFlags;
 use crate::craft_winit_state::CraftWinitState;
 use crate::events::EventDispatcher;
-use crate::style::Unit;
 use crate::utils::cloneable_any::CloneableAny;
 #[cfg(target_arch = "wasm32")]
 use crate::wasm_queue::WASM_QUEUE;
@@ -66,26 +66,35 @@ pub type PinnedFutureAny = Pin<Box<FutureAny>>;
 pub use craft_runtime;
 pub use image;
 
+#[cfg(target_os = "android")]
+use std::cell::RefCell;
+
+#[cfg(target_os = "android")]
+thread_local! {
+    static ANDROID_APP: RefCell<Option<AndroidApp>> = const { RefCell::new(None) };
+}
+
 #[cfg(not(target_arch = "wasm32"))]
 type RendererBox = Box<dyn Renderer>;
 #[cfg(target_arch = "wasm32")]
 type RendererBox = Box<dyn Renderer>;
 
-#[cfg(target_os = "android")]
 pub fn internal_craft_main_with_options(
-    root: Rc<RefCell<dyn Element>>,
     options: Option<CraftOptions>,
-    app: AndroidApp,
 ) {
     info!("Craft started");
 
-    let event_loop = EventLoopBuilder::default()
-        .with_android_app(app)
-        .build()
-        .expect("Failed to create winit event loop.");
+    let mut event_loop_builder = EventLoopBuilder::default();
+
+    #[cfg(target_os = "android")]
+    {
+        let app = ANDROID_APP.take().expect("craft_set_android_app must be called.");
+        event_loop_builder.with_android_app(app);
+    }
+    let event_loop = event_loop_builder.build().expect("Failed to create winit event loop.");
     info!("Created winit event loop.");
 
-    let craft_state = setup_craft(root, options);
+    let craft_state = setup_craft(options);
     let mut winit_craft_state = CraftWinitState::new(craft_state);
     event_loop.run_app(&mut winit_craft_state).expect("run_app failed");
 }
@@ -99,48 +108,11 @@ pub fn internal_craft_main_with_options(
 ///
 /// # Parameters
 ///
-/// * `root` - The root element.
 /// * `options` - An optional [`CraftOptions`] configuration. If `None` is provided, default options will be applied.
-#[cfg(not(target_os = "android"))]
 pub fn craft_main(options: CraftOptions) {
     internal_craft_main_with_options(Some(options));
 }
 
-#[cfg(not(target_os = "android"))]
-pub fn craft_test(options: CraftOptions) {
-    internal_craft_main_with_options(Some(options));
-}
-
-/// Starts the Craft application with the provided component specification, global state, and configuration options.
-///
-/// This function serves as the main entry point for launching a Craft application. It accepts a component
-/// specification, a boxed global state, and optional configuration options, then delegates to the internal
-/// launcher [`internal_craft_main_with_options`]. This abstraction allows users to configure their application
-/// behavior via [`CraftOptions`] without interacting directly with lower-level details.
-///
-/// # Parameters
-///
-/// * `root` - The root element.
-/// * `options` - An optional [`CraftOptions`] configuration. If `None` is provided, default options will be applied.
-/// * `android_app` - The Android application instance.
-#[cfg(target_os = "android")]
-pub fn craft_main(root: Rc<RefCell<dyn Element>>, options: CraftOptions, android_app: AndroidApp) {
-    internal_craft_main_with_options(root, Some(options), android_app);
-}
-
-#[cfg(not(target_os = "android"))]
-fn internal_craft_main_with_options(options: Option<CraftOptions>) {
-    use winit::event_loop::EventLoop;
-
-    info!("Craft started");
-    let event_loop = EventLoop::new().expect("Failed to create winit event loop.");
-    info!("Created winit event loop.");
-
-    let craft_state = setup_craft(options);
-    let mut winit_craft_state = CraftWinitState::new(craft_state);
-    event_loop.run_app(&mut winit_craft_state).expect("run_app failed");
-}
-
 pub fn setup_craft(craft_options: Option<CraftOptions>) -> CraftState {
     let craft_options = craft_options.unwrap_or_default();
 
@@ -220,28 +192,9 @@ async fn async_main(mut app_receiver: Receiver<InternalMessage>, winit_sender: S
     }
 }
 
-pub fn rgb(r: u8, g: u8, b: u8) -> Color {
-    Color::from_rgb8(r, g, b)
-}
-
-pub fn rgba(r: u8, g: u8, b: u8, a: u8) -> Color {
-    Color::from_rgba8(r, g, b, a)
-}
-
-pub fn px<U>(val: U) -> Unit
-where
-    U: Into<f64>,
-{
-    Unit::Px(val.into() as f32)
-}
-
-pub fn pct<U>(val: U) -> Unit
-where
-    U: Into<f64>,
-{
-    Unit::Percentage(val.into() as f32)
-}
-
-pub const fn auto() -> Unit {
-    Unit::Auto
-}
+#[cfg(target_os = "android")]
+pub fn craft_set_android_app(app: AndroidApp) {
+    ANDROID_APP.with_borrow_mut(|android_app| {
+        *android_app = Some(app);
+    })
+}
\ No newline at end of file
diff --git a/crates/craft_retained/src/utils/mod.rs b/crates/craft_retained/src/utils/mod.rs
index b63c749e..f5d44ab5 100644
--- a/crates/craft_retained/src/utils/mod.rs
+++ b/crates/craft_retained/src/utils/mod.rs
@@ -1,2 +1,3 @@
 pub mod cloneable_any;
 pub(crate) mod craft_error;
+pub mod style_helpers;
diff --git a/crates/craft_retained/src/utils/style_helpers.rs b/crates/craft_retained/src/utils/style_helpers.rs
new file mode 100644
index 00000000..7c92ae59
--- /dev/null
+++ b/crates/craft_retained/src/utils/style_helpers.rs
@@ -0,0 +1,28 @@
+use crate::Color;
+use crate::style::Unit;
+
+pub fn rgb(r: u8, g: u8, b: u8) -> Color {
+    Color::from_rgb8(r, g, b)
+}
+
+pub fn rgba(r: u8, g: u8, b: u8, a: u8) -> Color {
+    Color::from_rgba8(r, g, b, a)
+}
+
+pub fn px<U>(val: U) -> Unit
+where
+    U: Into<f64>,
+{
+    Unit::Px(val.into() as f32)
+}
+
+pub fn pct<U>(val: U) -> Unit
+where
+    U: Into<f64>,
+{
+    Unit::Percentage(val.into() as f32)
+}
+
+pub const fn auto() -> Unit {
+    Unit::Auto
+}
diff --git a/crates/craft_retained/tests/counter.rs b/crates/craft_retained/tests/counter.rs
index 4ee0f95c..4b26b5d6 100644
--- a/crates/craft_retained/tests/counter.rs
+++ b/crates/craft_retained/tests/counter.rs
@@ -88,7 +88,7 @@ fn counter() {
             window.close();
         }
     }));
-    craft_retained::craft_test(CraftOptions::test("counter_test", cb));
+    craft_retained::craft_main(CraftOptions::test("counter_test", cb));
     test_utils::check_snapshot(result_image.take().unwrap(), "counter.png");
 }
 
diff --git a/examples/counter_retained/counter_android.rs b/examples/counter_retained/counter_android.rs
index 55cd7eb7..a3d7cd65 100644
--- a/examples/counter_retained/counter_android.rs
+++ b/examples/counter_retained/counter_android.rs
@@ -1,17 +1,14 @@
 #![cfg(target_os = "android")]
 
-use craft_retained::{AndroidApp, CraftOptions, craft_main};
-use util::setup_logging;
+use craft_retained::{AndroidApp, craft_set_android_app};
 
-use crate::counter::counter;
+use crate::counter::main;
 
 #[path = "main.rs"]
 mod counter;
 
 #[unsafe(no_mangle)]
 pub unsafe fn android_main(app: AndroidApp) {
-    let counter = counter();
-
-    setup_logging();
-    craft_main(counter, CraftOptions::basic("Counter"), app);
+    craft_set_android_app(app);
+    main();
 }
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index dc2535a7..1efb691f 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -31,7 +31,7 @@ fn create_button(label: &str, base_color: Color, delta: i64, state: Rc<RefCell<i
         .push(Text::new(label).font_size(24.0).color(Color::WHITE).selectable(false))
 }
 
-fn main() {
+pub(crate) fn main() {
     setup_logging();
     let count = Rc::new(RefCell::new(0));
     let count_text = Text::new(&format!("Count: {}", count.borrow()));

From f3eee465e470146ae43ed63564a2b300f8c2a956 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 19 Mar 2026 11:38:58 -0400
Subject: [PATCH 084/143] Move window level settings to window.

---
 crates/craft_renderer/src/renderer_type.rs   |  6 +--
 crates/craft_retained/Cargo.toml             |  3 +-
 crates/craft_retained/src/elements/window.rs | 41 ++++++++++++----
 crates/craft_retained/src/lib.rs             | 50 +++++++++-----------
 crates/craft_retained/src/options.rs         | 19 --------
 crates/craft_retained/tests/counter.rs       |  3 +-
 examples/counter_retained/main.rs            |  4 +-
 7 files changed, 61 insertions(+), 65 deletions(-)

diff --git a/crates/craft_renderer/src/renderer_type.rs b/crates/craft_renderer/src/renderer_type.rs
index e3a8ac91..df7cac12 100644
--- a/crates/craft_renderer/src/renderer_type.rs
+++ b/crates/craft_renderer/src/renderer_type.rs
@@ -32,10 +32,10 @@ pub enum RendererType {
 impl Default for RendererType {
     fn default() -> Self {
         cfg_if::cfg_if! {
-            if #[cfg(feature = "vello_renderer")] {
-                RendererType::Vello
-            } else if #[cfg(feature = "vello_hybrid_renderer")]{
+            if #[cfg(feature = "vello_hybrid_renderer")] {
                 RendererType::VelloHybrid
+            } else if #[cfg(feature = "vello_renderer")]{
+                RendererType::Vello
             } else if #[cfg(feature = "vello_cpu_renderer")]{
                 RendererType::VelloCPU
             } else {
diff --git a/crates/craft_retained/Cargo.toml b/crates/craft_retained/Cargo.toml
index 32c07ac1..0fa988d6 100644
--- a/crates/craft_retained/Cargo.toml
+++ b/crates/craft_retained/Cargo.toml
@@ -26,8 +26,7 @@ markdown = ["dep:pulldown-cmark", "code_highlighting", "link"]
 code_highlighting = ["dep:syntect"]
 link = ["dep:open"]
 
-default = ["clipboard", "accesskit"]
-
+default = ["vello_hybrid_renderer", "clipboard", "accesskit"]
 
 [dependencies]
 craft_logging = { path = "../craft_logger", version = "0.1.0" }
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index d2b10112..981846d8 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -10,8 +10,8 @@ use std::sync::Arc;
 use accesskit::TreeUpdate;
 use craft_logging::info;
 use craft_primitives::geometry::{Rectangle, Size};
-use craft_renderer::RenderList;
 use craft_renderer::renderer::{Renderer, Screenshot};
+use craft_renderer::{RenderList, RendererType};
 use craft_resource_manager::ResourceManager;
 use kurbo::{Affine, Point};
 use peniko::Color;
@@ -24,7 +24,11 @@ use {accesskit::{Action, Role}, accesskit_winit::Adapter};
 #[cfg(target_arch = "wasm32")]
 use {wasm_bindgen::JsCast, winit::platform::web::WindowAttributesExtWebSys};
 
-use crate::RendererBox;
+#[cfg(not(target_arch = "wasm32"))]
+type RendererBox = Box<dyn Renderer>;
+#[cfg(target_arch = "wasm32")]
+type RendererBox = Box<dyn Renderer>;
+
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::accessibility::{access_handler::CraftAccessHandler, activation_handler::CraftActivationHandler, deactivation_handler::CraftDeactivationHandler};
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
@@ -72,6 +76,12 @@ pub struct WindowInternal {
     advanced_window_fn: Option<WindowConstructor>,
 
     title: Option<String>,
+
+    /// The type of renderer to use.
+    ///
+    /// The renderer is chosen based on the features enabled at compile time.
+    /// See [`RendererType`] for details.
+    renderer_type: RendererType,
 }
 
 impl Default for Window {
@@ -81,17 +91,27 @@ impl Default for Window {
 }
 
 impl Window {
-    pub fn new_advanced<F>(f: F) -> Self
+    pub fn new_advanced<F>(window_fn: F, renderer_type: RendererType) -> Self
     where
         F: FnMut(&ActiveEventLoop) -> WinitWindow + 'static,
     {
-        let inner = WindowInternal::new(Some(f), None);
+        let inner = WindowInternal::new(Some(window_fn), None, renderer_type);
 
         Window { inner }
     }
 
     pub fn new(title: &str) -> Self {
-        let inner = WindowInternal::new(None::<fn(&ActiveEventLoop) -> WinitWindow>, Some(title));
+        let inner = WindowInternal::new(
+            None::<fn(&ActiveEventLoop) -> WinitWindow>,
+            Some(title),
+            RendererType::default(),
+        );
+
+        Window { inner }
+    }
+
+    pub fn new_with_renderer(title: &str, renderer_type: RendererType) -> Self {
+        let inner = WindowInternal::new(None::<fn(&ActiveEventLoop) -> WinitWindow>, Some(title), renderer_type);
 
         Window { inner }
     }
@@ -181,7 +201,7 @@ impl Window {
 }
 
 impl WindowInternal {
-    pub fn new<F>(f: Option<F>, title: Option<&str>) -> Rc<RefCell<Self>>
+    pub fn new<F>(f: Option<F>, title: Option<&str>, renderer_type: RendererType) -> Rc<RefCell<Self>>
     where
         F: FnMut(&ActiveEventLoop) -> WinitWindow + 'static,
     {
@@ -199,6 +219,7 @@ impl WindowInternal {
                 accesskit_adapter: None,
                 advanced_window_fn: f.map(|f| Box::new(f) as WindowConstructor),
                 title: title.map(|title| title.to_string()),
+                renderer_type,
             })
         });
 
@@ -414,7 +435,7 @@ impl WindowInternal {
         self.set_winit_window(Some(winit_window.clone()));
         self.on_scale_factor_changed(winit_window.scale_factor());
 
-        let renderer_type = craft_app.craft_options.renderer;
+        let renderer_type = self.renderer_type;
 
         cfg_if::cfg_if! {
             if #[cfg(not(target_arch = "wasm32"))] {
@@ -425,11 +446,11 @@ impl WindowInternal {
                 self.renderer = Some(renderer);
                 info!("Created renderer")
             } else {
-                let window_copy_2 = winit_window.clone();
+                let winit_window = winit_window.clone();
                 craft_app.runtime.spawn(async move {
-                    let renderer: Box<dyn Renderer> = renderer_type.create(window_copy_2.clone()).await;
+                    let renderer: Box<dyn Renderer> = renderer_type.create(winit_window.clone()).await;
                     WASM_QUEUE.with_borrow_mut(|wasm_queue| {
-                        wasm_queue.push(InternalMessage::RendererCreated(window_copy_2, renderer));
+                        wasm_queue.push(InternalMessage::RendererCreated(winit_window, renderer));
                     });
                     info!("Created renderer")
                 });
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index bab4f5b3..58de442f 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -25,14 +25,11 @@ use std::future::Future;
 use std::pin::Pin;
 use std::sync::Arc;
 
-pub use crate::utils::style_helpers::{rgb, rgba, px, pct, auto};
-
 use app::App;
 use cfg_if::cfg_if;
 use craft_logging::info;
 pub use craft_primitives::{Color, palette};
 pub use craft_renderer::RendererType;
-use craft_renderer::renderer::Renderer;
 pub use craft_resource_manager::ResourceIdentifier;
 use craft_resource_manager::ResourceManager;
 use craft_runtime::{CraftRuntimeHandle, Receiver, Sender, channel};
@@ -41,17 +38,18 @@ pub use craftcallback::CraftCallback;
 use events::internal::InternalMessage;
 pub use options::CraftOptions;
 pub use utils::craft_error::CraftError;
+use winit::event_loop::EventLoopBuilder;
+#[cfg(target_os = "android")]
+use winit::platform::android::EventLoopBuilderExtAndroid;
 #[cfg(target_os = "android")]
 pub use winit::platform::android::activity::*;
 pub use winit::window::{Cursor, CursorIcon, WindowAttributes};
-#[cfg(target_os = "android")]
-use {winit::platform::android::EventLoopBuilderExtAndroid};
-use winit::event_loop::EventLoopBuilder;
 
 use crate::app::RedrawFlags;
 use crate::craft_winit_state::CraftWinitState;
 use crate::events::EventDispatcher;
 use crate::utils::cloneable_any::CloneableAny;
+pub use crate::utils::style_helpers::{auto, pct, px, rgb, rgba};
 #[cfg(target_arch = "wasm32")]
 use crate::wasm_queue::WASM_QUEUE;
 
@@ -63,25 +61,18 @@ pub type FutureAny = dyn Future<Output = Box<dyn CloneableAny + Send + Sync>> +
 
 pub type PinnedFutureAny = Pin<Box<FutureAny>>;
 
-pub use craft_runtime;
-pub use image;
-
 #[cfg(target_os = "android")]
 use std::cell::RefCell;
 
+pub use craft_runtime;
+pub use image;
+
 #[cfg(target_os = "android")]
 thread_local! {
     static ANDROID_APP: RefCell<Option<AndroidApp>> = const { RefCell::new(None) };
 }
 
-#[cfg(not(target_arch = "wasm32"))]
-type RendererBox = Box<dyn Renderer>;
-#[cfg(target_arch = "wasm32")]
-type RendererBox = Box<dyn Renderer>;
-
-pub fn internal_craft_main_with_options(
-    options: Option<CraftOptions>,
-) {
+fn craft_main_internal(options: Option<CraftOptions>) {
     info!("Craft started");
 
     let mut event_loop_builder = EventLoopBuilder::default();
@@ -99,21 +90,24 @@ pub fn internal_craft_main_with_options(
     event_loop.run_app(&mut winit_craft_state).expect("run_app failed");
 }
 
-/// Starts the Craft application with the provided component specification, global state, and configuration options.
+/// Starts the Craft application.
 ///
-/// This function serves as the main entry point for launching a Craft application. It accepts a component
-/// specification, a boxed global state, and optional configuration options, then delegates to the internal
-/// launcher [`internal_craft_main_with_options`]. This abstraction allows users to configure their application
-/// behavior via [`CraftOptions`] without interacting directly with lower-level details.
+/// This will block the current thread until all [`crate::elements::Window`] instances have been closed.
+/// # Example
+/// ```no_run
+/// use craft_retained::{craft_main, CraftOptions};
+/// use craft_retained::elements::Window;
 ///
-/// # Parameters
-///
-/// * `options` - An optional [`CraftOptions`] configuration. If `None` is provided, default options will be applied.
+/// fn main() {
+///     Window::new("Craft");
+///     craft_main(CraftOptions::default());
+/// }
+/// ```
 pub fn craft_main(options: CraftOptions) {
-    internal_craft_main_with_options(Some(options));
+    craft_main_internal(Some(options));
 }
 
-pub fn setup_craft(craft_options: Option<CraftOptions>) -> CraftState {
+fn setup_craft(craft_options: Option<CraftOptions>) -> CraftState {
     let craft_options = craft_options.unwrap_or_default();
 
     let (app_sender, app_receiver) = channel::<InternalMessage>(100);
@@ -197,4 +191,4 @@ pub fn craft_set_android_app(app: AndroidApp) {
     ANDROID_APP.with_borrow_mut(|android_app| {
         *android_app = Some(app);
     })
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/options.rs b/crates/craft_retained/src/options.rs
index 24242f47..9aa2c404 100644
--- a/crates/craft_retained/src/options.rs
+++ b/crates/craft_retained/src/options.rs
@@ -1,6 +1,3 @@
-use craft_primitives::geometry::Size;
-use craft_renderer::RendererType;
-
 use crate::craftcallback::CraftCallback;
 
 /// Configuration options for the Craft application.
@@ -10,26 +7,17 @@ use crate::craftcallback::CraftCallback;
 /// sets the default window title.
 #[derive(Clone)]
 pub struct CraftOptions {
-    /// The type of renderer to use.
-    ///
-    /// The renderer is chosen based on the features enabled at compile time.
-    /// See [`RendererType`] for details.
-    pub renderer: RendererType,
     /// The title of the application window.
     ///
     /// Defaults to `"craft"`.
     pub app_name: String,
-    /// The initial size of the window.
-    pub window_size: Option<Size<f32>>,
     pub craft_callback: Option<CraftCallback>,
 }
 
 impl Default for CraftOptions {
     fn default() -> Self {
         Self {
-            renderer: RendererType::default(),
             app_name: "craft".to_string(),
-            window_size: None,
             craft_callback: None,
         }
     }
@@ -38,21 +26,14 @@ impl Default for CraftOptions {
 impl CraftOptions {
     pub fn basic(app_name: &str) -> Self {
         Self {
-            renderer: RendererType::default(),
             app_name: app_name.to_string(),
-            window_size: None,
             craft_callback: None,
         }
     }
 
     pub fn test(title: &str, callback: CraftCallback) -> Self {
         Self {
-            #[cfg(feature = "vello_cpu_renderer")]
-            renderer: RendererType::VelloCPU,
-            #[cfg(not(feature = "vello_cpu_renderer"))]
-            renderer: RendererType::default(),
             app_name: title.to_string(),
-            window_size: None,
             craft_callback: Some(callback),
         }
     }
diff --git a/crates/craft_retained/tests/counter.rs b/crates/craft_retained/tests/counter.rs
index 4b26b5d6..6ebfe2b7 100644
--- a/crates/craft_retained/tests/counter.rs
+++ b/crates/craft_retained/tests/counter.rs
@@ -4,6 +4,7 @@ extern crate libtest_mimic_collect;
 use std::cell::RefCell;
 use std::rc::Rc;
 
+use craft_renderer::RendererType;
 use craft_retained::elements::{Container, Element, Text, Window};
 use craft_retained::events::ui_events::pointer::PointerButton;
 use craft_retained::style::{AlignItems, FlexDirection, JustifyContent};
@@ -41,7 +42,7 @@ fn counter() {
 
     let add_button = create_button("+", rgb(76, 175, 80), 1, count.clone(), count_text.clone());
 
-    let window = Window::new("Counter")
+    let window = Window::new_with_renderer("Counter", RendererType::VelloCPU)
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::Center))
         .align_items(Some(AlignItems::Center))
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index 1efb691f..469df1d9 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -4,7 +4,7 @@ use std::rc::Rc;
 use craft_retained::elements::{Container, Element, Text, Window};
 use craft_retained::events::ui_events::pointer::PointerButton;
 use craft_retained::style::{AlignItems, BoxShadow, FlexDirection, JustifyContent};
-use craft_retained::{Color, CraftOptions, pct, px, rgb, rgba};
+use craft_retained::{Color, CraftOptions, craft_main, pct, px, rgb, rgba};
 use util::setup_logging;
 
 fn create_button(label: &str, base_color: Color, delta: i64, state: Rc<RefCell<i64>>, count_text: Text) -> Container {
@@ -63,5 +63,5 @@ pub(crate) fn main() {
                 ))
         });
 
-    craft_retained::craft_main(CraftOptions::basic("Counter"));
+    craft_main(CraftOptions::basic("Counter"));
 }

From 23dc711854f6de024b45e4db3ca404c15661c235 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 19 Mar 2026 11:46:39 -0400
Subject: [PATCH 085/143] Fix docs

---
 crates/craft_retained/src/lib.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 58de442f..7f119588 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -92,8 +92,10 @@ fn craft_main_internal(options: Option<CraftOptions>) {
 
 /// Starts the Craft application.
 ///
-/// This will block the current thread until all [`crate::elements::Window`] instances have been closed.
+/// This will block the current thread until all [`Window`](elements::Window) instances have been closed.
+///
 /// # Example
+///
 /// ```no_run
 /// use craft_retained::{craft_main, CraftOptions};
 /// use craft_retained::elements::Window;

From fe68f773bae8607d02b23569bc2d15f020ecdc1a Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Thu, 19 Mar 2026 21:53:20 -0400
Subject: [PATCH 086/143] Add hovered and selected styles

Hack in is_hovered from pointer_enter and pointer_leave. We probably need to do this another way.
---
 .../craft_retained/src/elements/dropdown.rs   | 41 +++++++++++++++----
 .../src/elements/element_data.rs              |  2 +
 .../src/events/event_dispatch.rs              |  2 +-
 crates/craft_retained/src/events/helpers.rs   |  6 ++-
 examples/counter_retained/Cargo.toml          |  2 +-
 5 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index 23bfd928..10c5e1b1 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -5,9 +5,10 @@ use std::rc::{Rc, Weak};
 use craft_primitives::geometry::{Rectangle, TrblRectangle};
 use craft_renderer::RenderList;
 use kurbo::{Affine, Point};
+use peniko::Color;
 use ui_events::pointer::PointerId;
-use crate::app::{request_apply_layout, TAFFY_TREE};
-use crate::elements::{resolve_clip_for_scrollable, ElementInternals, AsElement, Element, ElementData};
+use crate::app::{request_apply_layout, CURRENT_WINDOW_ID, TAFFY_TREE, WINDOW_MANAGER};
+use crate::elements::{resolve_clip_for_scrollable, ElementInternals, AsElement, Element, ElementData, Window};
 use crate::elements::element_data::ElementData as ElementDataStruct;
 use crate::elements::{scrollable};
 use crate::elements::scrollable::{apply_scroll_layout, draw_scrollbar, handle_scroll_logic_advance};
@@ -15,6 +16,7 @@ use crate::events::{CraftMessage, Event};
 use crate::layout::layout::Layout;
 use crate::layout::TaffyTree;
 use crate::{px, rgb, rgba, CraftError};
+use crate::document::DocumentManager;
 use crate::elements::traits::DeepClone;
 use crate::style::{AlignItems, BoxShadow, Display, FlexDirection, JustifyContent, Overflow, Position, Style, Unit};
 use crate::text::text_context::TextContext;
@@ -95,7 +97,10 @@ pub struct DropdownInner {
     element_data: ElementDataStruct,
     floating_window: Shape,
     is_floating_window_hidden: bool,
-    selected_element: Option<Rc<RefCell<dyn ElementInternals>>>
+    selected_element: Option<Rc<RefCell<dyn ElementInternals>>>,
+    selected_element_index: Option<usize>,
+    selected_bg_color: Option<Color>,
+    hovered_bg_color: Option<Color>,
 }
 
 impl Default for Dropdown {
@@ -112,6 +117,9 @@ impl Dropdown {
                 floating_window: Shape::new(true),
                 is_floating_window_hidden: true,
                 selected_element: None,
+                selected_element_index: None,
+                selected_bg_color: Some(Color::from_rgba8(109, 113, 228, 100)),
+                hovered_bg_color: Some(Color::from_rgba8(100, 100, 100, 100)),
             })
         });
 
@@ -180,6 +188,7 @@ impl DropdownInner {
 
         let child = self.element_data.children.get(child_index).expect("There is no child at this index.");
         self.selected_element = Some(child.clone().borrow().deep_clone());
+        self.selected_element_index = Some(child_index);
         let selected_element_id = self.selected_element.as_ref().unwrap().borrow().element_data().layout.taffy_node_id();
 
         // Add the selected element to the parent's layout tree at index 1.
@@ -311,7 +320,23 @@ impl ElementInternals for DropdownInner {
             self.floating_window.layout.draw_borders(renderer, current_style, scale_factor);
 
             renderer.push_layer(self.floating_window.layout.computed_box_transformed.padding_rectangle().scale(scale_factor));
-            self.draw_children(renderer, text_context, pointer, scale_factor);
+
+            for (index, child) in self.children().iter().enumerate() {
+                let mut child_rect = child.borrow_mut().element_data().layout.computed_box_transformed.border_rectangle();
+                child_rect.x = self.floating_window.layout.computed_box_transformed.position.x as f32;
+                child_rect.width = self.floating_window.layout.computed_box_transformed.size.width as f32;
+
+
+
+                if let Some(selected_index) = self.selected_element_index && index == selected_index {
+                    renderer.draw_rect(child_rect, self.selected_bg_color.unwrap());
+                } else if child.borrow_mut().element_data().is_hovered {
+                    renderer.draw_rect(child_rect, self.hovered_bg_color.unwrap());
+                }
+
+                child.borrow_mut().draw(renderer, text_context, pointer, scale_factor);
+            }
+
             renderer.pop_layer();
 
             draw_scrollbar(&self.floating_window.style, &self.floating_window.layout, renderer, scale_factor);
@@ -326,6 +351,10 @@ impl ElementInternals for DropdownInner {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
+        if self.is_floating_window_hidden {
+            self.release_pointer_capture(PointerId::new(1).unwrap());
+        }
+
         let pb = match message {
             CraftMessage::PointerButtonUp(pb) => Some(pb),
             _ => None
@@ -354,10 +383,6 @@ impl ElementInternals for DropdownInner {
             }
         }
 
-        if self.is_floating_window_hidden {
-            return;
-        }
-
         let floating_window = &mut self.floating_window;
         let result = handle_scroll_logic_advance(&*floating_window.style, &mut floating_window.layout, message, event);
 
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index ee9a88a8..2b2bf0a9 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -46,6 +46,7 @@ pub struct ElementData {
     pub on_pointer_moved: Vec<PointerUpdateHandler>,
     pub on_keyboard_input: Vec<KeyboardInputHandler>,
     pub on_scroll: Vec<ScrollHandler>,
+    pub is_hovered: bool
 }
 
 impl ElementData {
@@ -68,6 +69,7 @@ impl ElementData {
             on_pointer_moved: Vec::new(),
             on_keyboard_input: Vec::new(),
             on_scroll: Vec::new(),
+            is_hovered: false,
         };
 
         ELEMENTS.with_borrow_mut(|elements| {
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index 334d4c45..9857269c 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -25,7 +25,7 @@ pub(super) fn dispatch_bubbling_event(
     let mut base_event = Event::new(target.clone());
 
     // Call the callback handlers.
-    for current_target in targets.iter() {
+    for current_target in targets.iter_mut() {
         call_user_event_handlers(&mut base_event, current_target, message);
         if !base_event.propagate {
             break;
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index ae1e65ac..7a24e888 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -68,14 +68,16 @@ pub(super) fn call_user_event_handlers(
 ) {
     match message {
         CraftMessage::PointerEnter() => {
-            let element_data = current_target.borrow().element_data().clone();
+            current_target.borrow_mut().element_data_mut().is_hovered = true;
+            let mut element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_pointer_enter {
                 (*handler)(event);
             }
         }
         CraftMessage::PointerLeave() => {
-            let element_data = current_target.borrow().element_data().clone();
+            current_target.borrow_mut().element_data_mut().is_hovered = false;
+            let mut element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_pointer_leave {
                 (*handler)(event);
diff --git a/examples/counter_retained/Cargo.toml b/examples/counter_retained/Cargo.toml
index 81629871..2e73f028 100644
--- a/examples/counter_retained/Cargo.toml
+++ b/examples/counter_retained/Cargo.toml
@@ -23,7 +23,7 @@ features = ["accesskit", "system_fonts"]
 
 [target.'cfg(not(target_os = "android"))'.dependencies.craft_renderer]
 path = "../../crates/craft_renderer"
-features = ["vello_cpu_renderer"]
+features = ["vello_renderer"]
 
 [target.'cfg(target_os = "android")'.dependencies.craft_renderer]
 path = "../../crates/craft_renderer"

From 508e86e38dfd86f2118e4fe030e22bb5dc95223c Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 19 Mar 2026 15:54:21 -0400
Subject: [PATCH 087/143] New style.

---
 STYLE_GUIDE.md                               | 110 ++++++++++++
 crates/craft_retained/src/elements/window.rs |   6 +-
 crates/craft_retained/src/lib.rs             | 178 ++++++++++---------
 crates/craft_retained/src/spatial/mod.rs     |   1 -
 rustfmt.toml                                 |   2 +-
 5 files changed, 205 insertions(+), 92 deletions(-)
 create mode 100644 STYLE_GUIDE.md
 delete mode 100644 crates/craft_retained/src/spatial/mod.rs

diff --git a/STYLE_GUIDE.md b/STYLE_GUIDE.md
new file mode 100644
index 00000000..08092ea5
--- /dev/null
+++ b/STYLE_GUIDE.md
@@ -0,0 +1,110 @@
+# Order Within a File
+
+```rust
+//! Module documentation
+
+// Extern crates (rare in modern Rust)
+extern crate some_extern_crate;
+
+// Re-exports and imports.
+// Grouped by visibility and crate.
+// Sorted alphabetically.
+pub use crate::somecrate::*;
+pub(crate) use crate::foo::bar;
+
+use std::fmt;
+
+use third_party::crate;
+
+use crate::foo::bar;
+
+use super::baz;
+
+// Module declarations
+mod internal;
+pub mod public_api;
+
+// Constants / statics.
+pub const MAX: usize = 100;
+pub(crate) const INTERNAL_MAX: usize = 50;
+
+// Type aliases
+type MyType = u32;
+
+// Structs / Enums
+
+pub struct PublicStruct {
+    pub field: u32,
+    pub(crate) crate_field: u32,
+    pub(super) super_field: u32,
+    private_field: u32,
+}
+
+pub(crate) struct CrateStruct {
+    pub field: u32,
+    pub(crate) crate_field: u32,
+    pub(super) super_field: u32,
+    private_field: u32,
+}
+
+struct PrivateStruct {
+    pub field: u32,
+    pub(crate) crate_field: u32,
+    pub(super) super_field: u32,
+    private_field: u32,
+}
+
+// Traits
+
+pub trait MyTrait {
+    fn do_something(&self);
+}
+
+// Impls
+
+impl MyTrait for PublicStruct {
+    fn do_something(&self) {
+        // ...
+    }
+}
+
+impl PublicStruct {
+
+    pub fn new() -> Self {
+        Self {
+            field: 0,
+            crate_field: 0,
+            super_field: 0,
+            private_field: 0,
+        }
+    }
+
+    pub(crate) fn crate_only(&self) {}
+
+    pub(super) fn super_only(&self) {}
+
+    fn private_helper(&self) {}
+}
+
+/// Functions
+
+pub fn public_function() {}
+
+pub(crate) fn crate_function() {}
+
+pub(super) fn super_function() {}
+
+fn private_function() {}
+
+// Tests
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_works() {
+        assert_eq!(2 + 2, 4);
+    }
+}
+```
\ No newline at end of file
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 981846d8..fc3b5bb3 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -446,11 +446,11 @@ impl WindowInternal {
                 self.renderer = Some(renderer);
                 info!("Created renderer")
             } else {
-                let winit_window = winit_window.clone();
+                let window_copy_2 = winit_window.clone();
                 craft_app.runtime.spawn(async move {
-                    let renderer: Box<dyn Renderer> = renderer_type.create(winit_window.clone()).await;
+                    let renderer: Box<dyn Renderer> = renderer_type.create(window_copy_2.clone()).await;
                     WASM_QUEUE.with_borrow_mut(|wasm_queue| {
-                        wasm_queue.push(InternalMessage::RendererCreated(winit_window, renderer));
+                        wasm_queue.push(InternalMessage::RendererCreated(window_copy_2.clone(), renderer));
                     });
                     info!("Created renderer")
                 });
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 7f119588..5201dcfe 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -1,58 +1,71 @@
-#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-pub mod accessibility;
-pub mod craft_winit_state;
-pub mod document;
-pub mod elements;
-pub mod events;
-mod options;
-pub mod style;
-#[cfg(test)]
-mod tests;
-pub mod text;
+//! A retained GUI.
 
-mod app;
-pub use craft_primitives::geometry;
-pub mod layout;
-pub use craft_runtime::CraftRuntime;
-mod craftcallback;
-pub mod spatial;
-mod utils;
-#[cfg(target_arch = "wasm32")]
-pub mod wasm_queue;
-mod window_manager;
+pub use craft_primitives::{Color, geometry, palette};
+
+pub use craft_renderer::RendererType;
+
+pub use craft_resource_manager::ResourceIdentifier;
+
+pub use craft_runtime::{self, CraftRuntime};
+
+pub use image;
+
+#[cfg(target_os = "android")]
+pub use winit::platform::android::activity::*;
+pub use winit::window::{Cursor, CursorIcon, WindowAttributes};
+
+pub use crate::craftcallback::CraftCallback;
+pub use crate::options::CraftOptions;
+pub use crate::utils::craft_error::CraftError;
+pub use crate::utils::style_helpers::{auto, pct, px, rgb, rgba};
 
+#[cfg(target_os = "android")]
+use std::cell::RefCell;
 use std::future::Future;
 use std::pin::Pin;
 use std::sync::Arc;
 
-use app::App;
-use cfg_if::cfg_if;
 use craft_logging::info;
-pub use craft_primitives::{Color, palette};
-pub use craft_renderer::RendererType;
-pub use craft_resource_manager::ResourceIdentifier;
+
 use craft_resource_manager::ResourceManager;
+
 use craft_runtime::{CraftRuntimeHandle, Receiver, Sender, channel};
-use craft_winit_state::CraftState;
-pub use craftcallback::CraftCallback;
-use events::internal::InternalMessage;
-pub use options::CraftOptions;
-pub use utils::craft_error::CraftError;
+
 use winit::event_loop::EventLoopBuilder;
 #[cfg(target_os = "android")]
 use winit::platform::android::EventLoopBuilderExtAndroid;
-#[cfg(target_os = "android")]
-pub use winit::platform::android::activity::*;
-pub use winit::window::{Cursor, CursorIcon, WindowAttributes};
 
 use crate::app::RedrawFlags;
 use crate::craft_winit_state::CraftWinitState;
 use crate::events::EventDispatcher;
 use crate::utils::cloneable_any::CloneableAny;
-pub use crate::utils::style_helpers::{auto, pct, px, rgb, rgba};
 #[cfg(target_arch = "wasm32")]
 use crate::wasm_queue::WASM_QUEUE;
 
+use crate::app::App;
+use crate::craft_winit_state::CraftState;
+use crate::events::internal::InternalMessage;
+
+#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+pub mod accessibility;
+pub mod craft_winit_state;
+pub mod document;
+pub mod elements;
+pub mod events;
+pub mod layout;
+pub mod style;
+pub mod text;
+#[cfg(target_arch = "wasm32")]
+pub mod wasm_queue;
+
+mod app;
+mod craftcallback;
+mod options;
+#[cfg(test)]
+mod tests;
+mod utils;
+mod window_manager;
+
 #[cfg(target_arch = "wasm32")]
 pub type FutureAny = dyn Future<Output = Box<dyn CloneableAny>> + 'static;
 
@@ -61,38 +74,15 @@ pub type FutureAny = dyn Future<Output = Box<dyn CloneableAny + Send + Sync>> +
 
 pub type PinnedFutureAny = Pin<Box<FutureAny>>;
 
-#[cfg(target_os = "android")]
-use std::cell::RefCell;
-
-pub use craft_runtime;
-pub use image;
-
 #[cfg(target_os = "android")]
 thread_local! {
     static ANDROID_APP: RefCell<Option<AndroidApp>> = const { RefCell::new(None) };
 }
 
-fn craft_main_internal(options: Option<CraftOptions>) {
-    info!("Craft started");
-
-    let mut event_loop_builder = EventLoopBuilder::default();
-
-    #[cfg(target_os = "android")]
-    {
-        let app = ANDROID_APP.take().expect("craft_set_android_app must be called.");
-        event_loop_builder.with_android_app(app);
-    }
-    let event_loop = event_loop_builder.build().expect("Failed to create winit event loop.");
-    info!("Created winit event loop.");
-
-    let craft_state = setup_craft(options);
-    let mut winit_craft_state = CraftWinitState::new(craft_state);
-    event_loop.run_app(&mut winit_craft_state).expect("run_app failed");
-}
-
 /// Starts the Craft application.
 ///
 /// This will block the current thread until all [`Window`](elements::Window) instances have been closed.
+/// On Android, [`craft_set_android_app`] must be called prior.
 ///
 /// # Example
 ///
@@ -109,6 +99,32 @@ pub fn craft_main(options: CraftOptions) {
     craft_main_internal(Some(options));
 }
 
+/// Sets the [`AndroidApp`] for craft to use.
+#[cfg(target_os = "android")]
+pub fn craft_set_android_app(app: AndroidApp) {
+    ANDROID_APP.with_borrow_mut(|android_app| {
+        *android_app = Some(app);
+    })
+}
+
+fn craft_main_internal(options: Option<CraftOptions>) {
+    info!("Craft started");
+
+    let mut event_loop_builder = EventLoopBuilder::default();
+
+    #[cfg(target_os = "android")]
+    {
+        let app = ANDROID_APP.take().expect("craft_set_android_app must be called.");
+        event_loop_builder.with_android_app(app);
+    }
+    let event_loop = event_loop_builder.build().expect("Failed to create winit event loop.");
+    info!("Created winit event loop.");
+
+    let craft_state = setup_craft(options);
+    let mut winit_craft_state = CraftWinitState::new(craft_state);
+    event_loop.run_app(&mut winit_craft_state).expect("run_app failed");
+}
+
 fn setup_craft(craft_options: Option<CraftOptions>) -> CraftState {
     let craft_options = craft_options.unwrap_or_default();
 
@@ -117,32 +133,29 @@ fn setup_craft(craft_options: Option<CraftOptions>) -> CraftState {
     let (winit_sender, winit_receiver) = channel::<InternalMessage>(100);
 
     let winit_sender_copy = winit_sender.clone();
-    cfg_if! {
-        if #[cfg(not(target_arch = "wasm32"))] {
-            std::thread::spawn(move || {
-                let runtime = CraftRuntime::new();
-                runtime_sender.blocking_send(runtime.handle()).expect("Failed to send runtime handle");
-                info!("Created async runtime");
 
-                let future = async_main(app_receiver, winit_sender_copy);
+    let setup_runtime = move || {
+        let runtime = CraftRuntime::new();
+        runtime_sender
+            .blocking_send(runtime.handle())
+            .expect("Failed to send runtime handle");
 
-                runtime.maybe_block_on(future);
-            });
-        } else {
-            let runtime = CraftRuntime::new();
-            runtime_sender.blocking_send(runtime.handle()).expect("Failed to send runtime handle");
-            info!("Created async runtime");
+        info!("Created async runtime");
 
-            let future = crate::async_main(app_receiver, winit_sender_copy);
+        let future = async_main(app_receiver, winit_sender_copy);
+        runtime.maybe_block_on(future);
+    };
 
-            runtime.maybe_block_on(future);
-        }
-    }
+    #[cfg(not(target_arch = "wasm32"))]
+    std::thread::spawn(setup_runtime);
+
+    #[cfg(target_arch = "wasm32")]
+    setup_runtime();
 
     let runtime = runtime_receiver
         .blocking_recv()
         .expect("Failed to receive runtime handle");
-    let runtime_copy = runtime.clone();
+
     #[allow(clippy::arc_with_non_send_sync)]
     let resource_manager = Arc::new(ResourceManager::new(runtime.clone()));
 
@@ -152,12 +165,10 @@ fn setup_craft(craft_options: Option<CraftOptions>) -> CraftState {
         text_context: None,
         resource_manager,
         reload_fonts: false,
-
-        runtime: runtime_copy,
+        runtime: runtime.clone(),
         modifiers: Default::default(),
         redraw_flags: RedrawFlags::new(true),
         target_scratch: Vec::new(),
-
         craft_options: craft_options.clone(),
         active: false,
     });
@@ -187,10 +198,3 @@ async fn async_main(mut app_receiver: Receiver<InternalMessage>, winit_sender: S
         }
     }
 }
-
-#[cfg(target_os = "android")]
-pub fn craft_set_android_app(app: AndroidApp) {
-    ANDROID_APP.with_borrow_mut(|android_app| {
-        *android_app = Some(app);
-    })
-}
diff --git a/crates/craft_retained/src/spatial/mod.rs b/crates/craft_retained/src/spatial/mod.rs
deleted file mode 100644
index 8b137891..00000000
--- a/crates/craft_retained/src/spatial/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/rustfmt.toml b/rustfmt.toml
index 2d878d1d..8c1bbdfa 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -24,7 +24,7 @@ where_single_line = false
 imports_indent = "Visual"
 imports_layout = "Horizontal"
 imports_granularity = "Module"
-group_imports = "StdExternalCrate"
+group_imports = "Preserve"
 reorder_imports = true
 reorder_modules = true
 reorder_impl_items = true

From 743a855f7c513cf86dbc95420b279479a6870dc3 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 21 Mar 2026 10:33:15 -0400
Subject: [PATCH 088/143] Move pointer capture into window. (#20)

* Move pointer capture into window.

* Remove current window.
---
 crates/craft_retained/src/app.rs              |  19 +-
 .../craft_retained/src/craft_winit_state.rs   |  42 +-
 crates/craft_retained/src/document/core.rs    |  30 -
 .../src/document/document_manager.rs          |  32 -
 crates/craft_retained/src/document/mod.rs     |   6 -
 .../craft_retained/src/elements/container.rs  |   3 +
 .../src/elements/element_data.rs              |   7 +-
 .../src/elements/traits/element_internals.rs  | 121 ++--
 crates/craft_retained/src/elements/window.rs  | 657 +++++++++---------
 .../src/events/event_dispatch.rs              |  24 +-
 crates/craft_retained/src/events/helpers.rs   |   5 +-
 crates/craft_retained/src/events/mod.rs       |  75 +-
 .../src/events/pointer_capture.rs             | 191 ++---
 crates/craft_retained/src/lib.rs              |   1 -
 14 files changed, 598 insertions(+), 615 deletions(-)
 delete mode 100644 crates/craft_retained/src/document/core.rs
 delete mode 100644 crates/craft_retained/src/document/document_manager.rs
 delete mode 100644 crates/craft_retained/src/document/mod.rs

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 9233f8b9..cc6315be 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -1,4 +1,4 @@
-use std::cell::{Cell, RefCell};
+use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::ops::DerefMut;
 use std::rc::{Rc, Weak};
@@ -22,7 +22,6 @@ use winit::event_loop::ActiveEventLoop;
 use winit::window::WindowId;
 
 use crate::CraftOptions;
-use crate::document::DocumentManager;
 use crate::elements::{ElementIdMap, ElementInternals, Window};
 use crate::events::internal::InternalMessage;
 use crate::events::{CraftMessage, Event, EventDispatcher};
@@ -31,10 +30,6 @@ use crate::text::text_context::TextContext;
 use crate::window_manager::WindowManager;
 
 thread_local! {
-    /// The most recently recorded window id. This is set every time a windows event occurs.
-    pub static CURRENT_WINDOW_ID : Cell<Option<WindowId>> = const { Cell::new(None) };
-    /// Records document-level state (focus, pointer captures, etc.) for internal use.
-    pub static DOCUMENTS: RefCell<DocumentManager> = RefCell::new(DocumentManager::new());
     pub(crate) static ELEMENTS: RefCell<ElementIdMap> = RefCell::new(ElementIdMap::new());
     pub(crate) static PENDING_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = const { RefCell::new(VecDeque::new()) };
     pub(crate) static IN_PROGRESS_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = const { RefCell::new(VecDeque::new()) };
@@ -242,7 +237,7 @@ impl App {
         let event = CraftMessage::PointerScroll(pointer_scroll_update);
         let message = event;
 
-        self.dispatch_event(window, &message, false);
+        self.dispatch_event(window, &message);
         self.request_redraw(RedrawFlags::new(true));
     }
 
@@ -257,7 +252,7 @@ impl App {
         let message = event;
         window.set_mouse_position(Some(Point::new(cursor_position.x, cursor_position.y)));
 
-        self.dispatch_event(window.clone(), &message, true);
+        self.dispatch_event(window.clone(), &message);
 
         self.request_redraw(RedrawFlags::new(true));
     }
@@ -267,7 +262,7 @@ impl App {
 
         let message = CraftMessage::PointerMovedEvent(mouse_moved);
 
-        self.dispatch_event(window.clone(), &message, true);
+        self.dispatch_event(window.clone(), &message);
 
         self.request_redraw(RedrawFlags::new(true));
     }
@@ -276,12 +271,12 @@ impl App {
         let event = CraftMessage::ImeEvent(ime);
         let message = event;
 
-        self.dispatch_event(window.clone(), &message, false);
+        self.dispatch_event(window.clone(), &message);
 
         self.request_redraw(RedrawFlags::new(true));
     }
 
-    fn dispatch_event(&mut self, window: Window, message: &CraftMessage, _is_style: bool) {
+    fn dispatch_event(&mut self, window: Window, message: &CraftMessage) {
         let mouse_pos = window.mouse_position();
         let render_list = window.inner.borrow().render_list.clone();
         self.event_dispatcher.dispatch_event(
@@ -315,7 +310,7 @@ impl App {
         let keyboard_event = CraftMessage::KeyboardInputEvent(keyboard_input.clone());
         let message = keyboard_event;
 
-        self.dispatch_event(window.clone(), &message, false);
+        self.dispatch_event(window.clone(), &message);
 
         self.request_redraw(RedrawFlags::new(true));
     }
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index f181b77c..67494ec1 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -1,24 +1,30 @@
+//! Integration with the winit event loop.
+
 #[cfg(not(target_arch = "wasm32"))]
 use std::time;
 
 use craft_logging::info;
+
 use craft_primitives::geometry::Size;
+
 use craft_runtime::{CraftRuntimeHandle, Receiver, Sender, pop_gui_thread_work};
+
 use ui_events::pointer::PointerEvent;
+
 use ui_events_winit::{WindowEventReducer, WindowEventTranslation};
+
 #[cfg(target_arch = "wasm32")]
 use web_time as time;
 use winit::application::ApplicationHandler;
 use winit::event::{StartCause, WindowEvent};
 use winit::event_loop::{ActiveEventLoop, ControlFlow};
 use winit::window::WindowId;
-#[cfg(target_arch = "wasm32")]
-use {crate::wasm_queue::WASM_QUEUE, crate::wasm_queue::WasmQueue};
 
 use crate::CraftOptions;
-use crate::app::{App, CURRENT_WINDOW_ID, DOCUMENTS, WINDOW_MANAGER, dequeue_window_event};
-use crate::document::Document;
+use crate::app::{App, WINDOW_MANAGER, dequeue_window_event};
 use crate::events::internal::InternalMessage;
+#[cfg(target_arch = "wasm32")]
+use {crate::wasm_queue::WASM_QUEUE, crate::wasm_queue::WasmQueue};
 
 const WAIT_TIME: time::Duration = time::Duration::from_millis(15);
 
@@ -43,12 +49,6 @@ pub(crate) struct CraftWinitState {
     craft_state: CraftState,
 }
 
-impl CraftWinitState {
-    pub(crate) fn new(craft_state: CraftState) -> Self {
-        Self { craft_state }
-    }
-}
-
 impl ApplicationHandler for CraftWinitState {
     fn new_events(&mut self, _event_loop: &ActiveEventLoop, cause: StartCause) {
         self.craft_state.wait_cancelled = matches!(cause, StartCause::WaitCancelled { .. })
@@ -58,10 +58,6 @@ impl ApplicationHandler for CraftWinitState {
         self.craft_state.craft_app.on_resume(event_loop);
     }
 
-    fn suspended(&mut self, event_loop: &ActiveEventLoop) {
-        self.craft_state.craft_app.on_suspended(event_loop);
-    }
-
     fn window_event(&mut self, event_loop: &ActiveEventLoop, window_id: WindowId, event: WindowEvent) {
         let window: Option<crate::elements::Window> =
             WINDOW_MANAGER.with_borrow_mut(|window_manager| window_manager.get_window_by_id(window_id));
@@ -70,14 +66,6 @@ impl ApplicationHandler for CraftWinitState {
 
         let craft_state = &mut self.craft_state;
 
-        CURRENT_WINDOW_ID.set(Some(window_id));
-        // Create a new document if there is none for the current window.
-        DOCUMENTS.with_borrow_mut(|docs| {
-            if docs.get_document_by_window_id(window_id).is_none() {
-                docs.add_document(window_id, Document::new());
-            }
-        });
-
         /*#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
         if let Some(accesskit_adapter) = &mut craft_state.craft_app.accesskit_adapter {
             accesskit_adapter.process_event(craft_state.craft_app.window.as_ref().unwrap(), &event);
@@ -242,6 +230,16 @@ impl ApplicationHandler for CraftWinitState {
 
         event_loop.set_control_flow(ControlFlow::WaitUntil(time::Instant::now() + WAIT_TIME));
     }
+
+    fn suspended(&mut self, event_loop: &ActiveEventLoop) {
+        self.craft_state.craft_app.on_suspended(event_loop);
+    }
+}
+
+impl CraftWinitState {
+    pub(crate) fn new(craft_state: CraftState) -> Self {
+        Self { craft_state }
+    }
 }
 
 impl CraftState {
diff --git a/crates/craft_retained/src/document/core.rs b/crates/craft_retained/src/document/core.rs
deleted file mode 100644
index 4332b1a8..00000000
--- a/crates/craft_retained/src/document/core.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::rc::Weak;
-
-use ui_events::pointer::PointerId;
-
-use crate::elements::ElementInternals;
-
-/// Stores window specific information like pointer captures, focus (soon), etc.
-pub struct Document {
-    /// Tracks elements that are *currently* pointer captured.
-    pub(crate) pointer_captures: HashMap<PointerId, Weak<RefCell<dyn ElementInternals>>>,
-    /// Tracks elements that *should* be pointer captured.
-    pub(crate) pending_pointer_captures: HashMap<PointerId, Weak<RefCell<dyn ElementInternals>>>,
-}
-
-impl Default for Document {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Document {
-    pub fn new() -> Self {
-        Self {
-            pointer_captures: Default::default(),
-            pending_pointer_captures: Default::default(),
-        }
-    }
-}
diff --git a/crates/craft_retained/src/document/document_manager.rs b/crates/craft_retained/src/document/document_manager.rs
deleted file mode 100644
index 5fbc8af0..00000000
--- a/crates/craft_retained/src/document/document_manager.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use std::collections::HashMap;
-
-use winit::window::WindowId;
-
-use crate::app::CURRENT_WINDOW_ID;
-use crate::document::Document;
-
-/// A wrapper to get a document with a window id or the current document.
-pub struct DocumentManager {
-    documents: HashMap<WindowId, Document>,
-}
-
-impl DocumentManager {
-    pub(crate) fn new() -> Self {
-        Self {
-            documents: HashMap::new(),
-        }
-    }
-
-    pub(crate) fn add_document(&mut self, window_id: WindowId, document: Document) {
-        self.documents.insert(window_id, document);
-    }
-
-    pub fn get_current_document(&mut self) -> &mut Document {
-        let window_id_key = &CURRENT_WINDOW_ID.get().unwrap();
-        self.documents.get_mut(window_id_key).unwrap()
-    }
-
-    pub fn get_document_by_window_id(&mut self, window_id: WindowId) -> Option<&mut Document> {
-        self.documents.get_mut(&window_id)
-    }
-}
diff --git a/crates/craft_retained/src/document/mod.rs b/crates/craft_retained/src/document/mod.rs
deleted file mode 100644
index ce254da5..00000000
--- a/crates/craft_retained/src/document/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod core;
-pub mod document_manager;
-
-pub use core::Document;
-
-pub use document_manager::DocumentManager;
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 597a39af..a964b7d8 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -161,7 +161,10 @@ impl ElementInternals for ContainerInner {
 
     fn push(&mut self, child: Rc<RefCell<dyn ElementInternals>>) {
         let me: Weak<RefCell<dyn ElementInternals>> = self.element_data.me.clone();
+        let me_window = self.element_data.window.clone();
         child.borrow_mut().element_data_mut().parent = Some(me);
+        child.borrow_mut().element_data_mut().window = me_window;
+        child.borrow_mut().propagate_window_down();
         self.element_data.children.push(child.clone());
 
         // Add the children's taffy node.
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index cbd3e47f..42b8e5e5 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -2,12 +2,13 @@ use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 
 use smol_str::SmolStr;
+
 use taffy::Layout;
 
 use crate::app::{ELEMENTS, TAFFY_TREE};
-use crate::elements::ElementInternals;
 use crate::elements::element_id::create_unique_element_id;
 use crate::elements::scrollable::{ScrollState, apply_scroll_layout};
+use crate::elements::{ElementInternals, WindowInternal};
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::layout::layout_context::LayoutContext;
 use crate::layout::layout_item::LayoutItem;
@@ -22,6 +23,9 @@ pub struct ElementData {
     /// The Element's parent.
     pub(crate) parent: Option<Weak<RefCell<dyn ElementInternals>>>,
 
+    /// A pointer to the owning window.
+    pub(crate) window: Option<Weak<RefCell<WindowInternal>>>,
+
     /// The style of the element.
     pub style: Box<Style>,
 
@@ -59,6 +63,7 @@ impl ElementData {
         let default = Self {
             me,
             parent: None,
+            window: None,
             style: Style::new(),
             layout_item: Default::default(),
             children: Default::default(),
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index cd46a707..9d28c56e 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -5,18 +5,23 @@ use std::sync::Arc;
 
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::{Action, Role};
+
+use kurbo::{Affine, Point, Vec2};
+
+use ui_events::pointer::PointerId;
+
 use craft_primitives::geometry::borders::CssRoundedRect;
 use craft_primitives::geometry::{ElementBox, Rectangle, TrblRectangle};
+
 use craft_renderer::RenderList;
-use kurbo::{Affine, Point, Vec2};
-use peniko::Color;
-use ui_events::pointer::PointerId;
+
+use crate::Color;
 
 use crate::CraftError;
-use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
-use crate::document::Document;
+use crate::app::{ELEMENTS, FOCUS, TAFFY_TREE};
 use crate::elements::scrollable::ScrollState;
 use crate::elements::{ElementData, ElementIdMap, ScrollOptions, WindowInternal};
+use crate::events::pointer_capture::PointerCapture;
 use crate::events::{CraftMessage, Event, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::layout::TaffyTree;
 use crate::layout::layout_item::{CssComputedBorder, LayoutItem, draw_borders_generic};
@@ -513,8 +518,9 @@ pub trait ElementInternals: ElementData + Any {
         children.remove(position);
 
         // Remove the parent reference.
-
         child.borrow_mut().element_data_mut().parent = None;
+        child.borrow_mut().element_data_mut().window = None;
+        child.borrow_mut().propagate_window_down();
 
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let child_id = child.borrow().element_data().layout_item.taffy_node_id;
@@ -530,25 +536,18 @@ pub trait ElementInternals: ElementData + Any {
         // TODO: Move to document
         fn remove_element_from_document(
             node: Rc<RefCell<dyn ElementInternals>>,
-            document: &mut Document,
+            pointer_capture: &mut PointerCapture,
             elements: &mut ElementIdMap,
         ) {
             elements.remove_id(node.borrow().element_data().internal_id);
-            document
-                .pointer_captures
-                .retain(|_, v| !Weak::ptr_eq(v, &node.borrow().element_data().me));
-            document
-                .pending_pointer_captures
-                .retain(|_, v| !Weak::ptr_eq(v, &node.borrow().element_data().me));
+            pointer_capture.remove_element(&node);
             for child in node.borrow().children() {
-                remove_element_from_document(child.clone(), document, elements);
+                remove_element_from_document(child.clone(), pointer_capture, elements);
             }
         }
 
-        DOCUMENTS.with_borrow_mut(|documents| {
-            ELEMENTS.with_borrow_mut(|elements| {
-                remove_element_from_document(child.clone(), documents.get_current_document(), elements);
-            });
+        ELEMENTS.with_borrow_mut(|elements| {
+            remove_element_from_document(child.clone(), &mut self.pointer_capture().borrow_mut(), elements);
         });
 
         child.borrow_mut().unfocus();
@@ -679,58 +678,68 @@ pub trait ElementInternals: ElementData + Any {
         }
     }
 
+    fn pointer_capture(&self) -> Rc<RefCell<PointerCapture>> {
+        let element_data = self.element_data();
+        let window = element_data.window.clone().unwrap().upgrade().unwrap();
+        window.borrow().pointer_capture.clone()
+    }
+
+    fn propagate_window_down(&mut self) {
+        let window = self.element_data().window.clone();
+        for child in &self.element_data().children {
+            let mut child_borrow = child.borrow_mut();
+            child_borrow.element_data_mut().window = window.clone();
+            child_borrow.propagate_window_down();
+        }
+    }
+
     fn set_pointer_capture(&self, pointer_id: PointerId) {
         // 9.2 Setting pointer capture
         // https://w3c.github.io/pointerevents/#setting-pointer-capture
 
-        DOCUMENTS.with_borrow_mut(|docs| {
-            let current_doc = docs.get_current_document();
-
-            // 1. If the pointerId provided as the method's argument does not match any of the active pointers, then throw a "NotFoundError" DOMException.
-            // TODO (POINTER CAPTURE)
-            // 2. Let the pointer be the active pointer specified by the given pointerId.
-            // 3. If the element is not connected [DOM], throw an "InvalidStateError" DOMException.
-            // TODO (POINTER CAPTURE)
-            // 4. If this method is invoked while the element's node document [DOM] has a locked element ([PointerLock] pointerLockElement), throw an "InvalidStateError" DOMException.
-            // TODO (POINTER CAPTURE)
-            // 5. If the pointer is not in the active buttons state or the element's node document is not the active document of the pointer, then terminate these steps.
-            // TODO (POINTER CAPTURE)
-            // 6. For the specified pointerId, set the pending pointer capture target override to the Element on which this method was invoked.
-            current_doc
-                .pending_pointer_captures
-                .insert(pointer_id, self.element_data().me.clone());
-        });
+        // 1. If the pointerId provided as the method's argument does not match any of the active pointers, then throw a "NotFoundError" DOMException.
+        // TODO (POINTER CAPTURE)
+        // 2. Let the pointer be the active pointer specified by the given pointerId.
+        // 3. If the element is not connected [DOM], throw an "InvalidStateError" DOMException.
+        // TODO (POINTER CAPTURE)
+        // 4. If this method is invoked while the element's node document [DOM] has a locked element ([PointerLock] pointerLockElement), throw an "InvalidStateError" DOMException.
+        // TODO (POINTER CAPTURE)
+        // 5. If the pointer is not in the active buttons state or the element's node document is not the active document of the pointer, then terminate these steps.
+        // TODO (POINTER CAPTURE)
+        // 6. For the specified pointerId, set the pending pointer capture target override to the Element on which this method was invoked.
+        self.pointer_capture()
+            .borrow_mut()
+            .pending_pointer_captures
+            .insert(pointer_id, self.element_data().me.clone());
     }
 
     fn release_pointer_capture(&self, pointer_id: PointerId) {
         // 9.3 Releasing pointer capture
         // https://w3c.github.io/pointerevents/#releasing-pointer-capture
         let has_pointer_capture = self.has_pointer_capture(pointer_id);
-        DOCUMENTS.with_borrow_mut(|docs| {
-            let current_doc = docs.get_current_document();
-
-            // 1. If the pointerId provided as the method's argument does not match any of the active pointers and these steps are not being invoked as a result of the implicit release of pointer capture, then throw a "NotFoundError" DOMException.
-            // TODO (POINTER CAPTURE)
-            // 2. If hasPointerCapture is false for the Element with the specified pointerId, then terminate these steps.
-            if !has_pointer_capture {
-                return;
-            }
-            // 3. For the specified pointerId, clear the pending pointer capture target override, if set.
-            let _ = current_doc.pending_pointer_captures.remove(&pointer_id);
-        });
+        // 1. If the pointerId provided as the method's argument does not match any of the active pointers and these steps are not being invoked as a result of the implicit release of pointer capture, then throw a "NotFoundError" DOMException.
+        // TODO (POINTER CAPTURE)
+        // 2. If hasPointerCapture is false for the Element with the specified pointerId, then terminate these steps.
+        if !has_pointer_capture {
+            return;
+        }
+        // 3. For the specified pointerId, clear the pending pointer capture target override, if set.
+        let _ = self
+            .pointer_capture()
+            .borrow_mut()
+            .pending_pointer_captures
+            .remove(&pointer_id);
     }
 
     fn has_pointer_capture(&self, pointer_id: PointerId) -> bool {
         // https://w3c.github.io/pointerevents/#dom-element-haspointercapture
-        DOCUMENTS.with_borrow_mut(|docs| {
-            let current_doc = docs.get_current_document();
-            current_doc
-                .pending_pointer_captures
-                .get(&pointer_id)
-                .cloned()
-                .map(|w| w.as_ptr())
-                == Some(self.element_data().me.clone().as_ptr())
-        })
+        self.pointer_capture()
+            .borrow()
+            .pending_pointer_captures
+            .get(&pointer_id)
+            .cloned()
+            .map(|w| w.as_ptr())
+            == Some(self.element_data().me.clone().as_ptr())
     }
 
     fn as_any(&self) -> &dyn Any;
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index fc3b5bb3..ed9d7a8e 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -7,27 +7,29 @@ use std::rc::{Rc, Weak};
 use std::sync::Arc;
 
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-use accesskit::TreeUpdate;
+use {accesskit::{Action, Role, TreeUpdate}, accesskit_winit::Adapter};
+
 use craft_logging::info;
+
 use craft_primitives::geometry::{Rectangle, Size};
+
 use craft_renderer::renderer::{Renderer, Screenshot};
 use craft_renderer::{RenderList, RendererType};
+
 use craft_resource_manager::ResourceManager;
+
 use kurbo::{Affine, Point};
+
 use peniko::Color;
+
 use taffy::{AvailableSpace, NodeId};
+
 use winit::event::WindowEvent;
 use winit::event_loop::ActiveEventLoop;
 use winit::window::{Window as WinitWindow, WindowAttributes};
-#[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-use {accesskit::{Action, Role}, accesskit_winit::Adapter};
-#[cfg(target_arch = "wasm32")]
-use {wasm_bindgen::JsCast, winit::platform::web::WindowAttributesExtWebSys};
 
-#[cfg(not(target_arch = "wasm32"))]
-type RendererBox = Box<dyn Renderer>;
 #[cfg(target_arch = "wasm32")]
-type RendererBox = Box<dyn Renderer>;
+use {wasm_bindgen::JsCast, winit::platform::web::WindowAttributesExtWebSys};
 
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::accessibility::{access_handler::CraftAccessHandler, activation_handler::CraftActivationHandler, deactivation_handler::CraftDeactivationHandler};
@@ -38,31 +40,31 @@ use crate::elements::element_data::ElementData;
 use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scrollable, scrollable};
 #[cfg(target_arch = "wasm32")]
 use crate::events::internal::InternalMessage;
+use crate::events::pointer_capture::PointerCapture;
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
 #[cfg(target_arch = "wasm32")]
 use crate::wasm_queue::WASM_QUEUE;
 
+pub type WindowConstructor = Box<dyn FnMut(&ActiveEventLoop) -> WinitWindow>;
+
+#[cfg(not(target_arch = "wasm32"))]
+type RendererBox = Box<dyn Renderer>;
+#[cfg(target_arch = "wasm32")]
+type RendererBox = Box<dyn Renderer>;
+
 #[derive(Clone)]
 pub struct Window {
     pub inner: Rc<RefCell<WindowInternal>>,
 }
 
-pub type WindowConstructor = Box<dyn FnMut(&ActiveEventLoop) -> WinitWindow>;
-
 /// Stores one or more elements.
 ///
 /// If overflow is set to scroll, it will become scrollable.
 pub struct WindowInternal {
-    element_data: ElementData,
     /// The physical window size from winit.
     pub(crate) window_size: Size<f32>,
-    /// The window's scale factor from winit.
-    scale_factor: f64,
-    /// Zoom scale factor.
-    zoom_scale_factor: f64,
-    mouse_positon: Option<Point>,
     pub(crate) renderer: Option<RendererBox>,
     pub(crate) render_list: Rc<RefCell<RenderList>>,
 
@@ -72,16 +74,21 @@ pub struct WindowInternal {
     // Will be empty when paused.
     #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     pub(crate) accesskit_adapter: Option<Adapter>,
+    pub(crate) pointer_capture: Rc<RefCell<PointerCapture>>,
 
     advanced_window_fn: Option<WindowConstructor>,
-
     title: Option<String>,
-
     /// The type of renderer to use.
     ///
     /// The renderer is chosen based on the features enabled at compile time.
     /// See [`RendererType`] for details.
     renderer_type: RendererType,
+    /// The window's scale factor from winit.
+    scale_factor: f64,
+    /// Zoom scale factor.
+    zoom_scale_factor: f64,
+    mouse_positon: Option<Point>,
+    element_data: ElementData,
 }
 
 impl Default for Window {
@@ -90,6 +97,189 @@ impl Default for Window {
     }
 }
 
+impl Element for Window {}
+
+impl AsElement for Window {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        self.inner.clone()
+    }
+}
+
+impl crate::elements::ElementData for WindowInternal {
+    fn element_data(&self) -> &ElementData {
+        &self.element_data
+    }
+
+    fn element_data_mut(&mut self) -> &mut ElementData {
+        &mut self.element_data
+    }
+}
+
+impl ElementInternals for WindowInternal {
+    fn pointer_capture(&self) -> Rc<RefCell<PointerCapture>> {
+        self.pointer_capture.clone()
+    }
+
+    fn apply_layout(
+        &mut self,
+        taffy_tree: &mut TaffyTree,
+        position: Point,
+        z_index: &mut u32,
+        transform: Affine,
+        pointer: Option<Point>,
+        text_context: &mut TextContext,
+        clip_bounds: Option<Rectangle>,
+        scale_factor: f64,
+    ) {
+        let node = self.element_data.layout_item.taffy_node_id.unwrap();
+        let layout = taffy_tree.layout(node);
+        let has_new_layout = taffy_tree.get_has_new_layout(node);
+
+        let dirty = has_new_layout
+            || transform != self.element_data.layout_item.get_transform()
+            || position != self.element_data.layout_item.position;
+        self.element_data.layout_item.has_new_layout = has_new_layout;
+
+        if dirty {
+            self.resolve_box(position, transform, layout, z_index);
+            self.apply_borders(scale_factor);
+            // For scroll changes from taffy;
+            self.element_data.apply_scroll(layout);
+            self.apply_clip(clip_bounds);
+            self.element_data.scroll_state.mark_old();
+        }
+
+        // For manual scroll updates.
+        if !dirty && self.element_data.scroll_state.is_new() {
+            self.element_data.apply_scroll(layout);
+            self.element_data.scroll_state.mark_old();
+        }
+
+        if has_new_layout {
+            taffy_tree.mark_seen(node);
+        }
+
+        let scroll_y = self.element_data.scroll().scroll_y() as f64;
+        let child_transform = Affine::translate((0.0, -scroll_y));
+
+        self.apply_layout_children(
+            taffy_tree,
+            z_index,
+            transform * child_transform,
+            pointer,
+            text_context,
+            scale_factor,
+            false,
+        )
+    }
+
+    fn draw(
+        &mut self,
+        renderer: &mut RenderList,
+        text_context: &mut TextContext,
+        pointer: Option<Point>,
+        scale_factor: f64,
+    ) {
+        if !self.is_visible() {
+            return;
+        }
+        self.add_hit_testable(renderer, true, scale_factor);
+
+        // We draw the borders before we start any layers, so that we don't clip the borders.
+        self.draw_borders(renderer, scale_factor);
+
+        /*if self.element_data.layout_item.has_new_layout {
+            renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 5.0);
+        }*/
+
+        self.maybe_start_layer(renderer, scale_factor);
+        self.draw_children(renderer, text_context, pointer, scale_factor);
+        self.maybe_end_layer(renderer);
+
+        self.draw_scrollbar(renderer, scale_factor);
+    }
+
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+    fn compute_accessibility_tree(&mut self, tree: &mut TreeUpdate, parent_index: Option<usize>, scale_factor: f64) {
+        let current_node_id = accesskit::NodeId(self.element_data.internal_id);
+
+        let mut current_node = accesskit::Node::new(Role::Window);
+        if !self.element_data.on_pointer_button_up.is_empty() {
+            current_node.set_role(Role::Button);
+            current_node.add_action(Action::Click);
+        }
+
+        let padding_box = self
+            .element_data
+            .layout_item
+            .computed_box_transformed
+            .padding_rectangle()
+            .scale(scale_factor);
+
+        current_node.set_bounds(accesskit::Rect {
+            x0: padding_box.left() as f64,
+            y0: padding_box.top() as f64,
+            x1: padding_box.right() as f64,
+            y1: padding_box.bottom() as f64,
+        });
+
+        let current_index = tree.nodes.len(); // The current node is the last one added.
+
+        if let Some(parent_index) = parent_index {
+            let parent_node = tree.nodes.get_mut(parent_index).unwrap();
+            parent_node.1.push_child(current_node_id);
+        }
+
+        tree.nodes.push((current_node_id, current_node));
+
+        for child in self.element_data.children.iter_mut() {
+            child
+                .borrow_mut()
+                .compute_accessibility_tree(tree, Some(current_index), scale_factor);
+        }
+    }
+
+    fn on_event(
+        &mut self,
+        message: &CraftMessage,
+        _text_context: &mut TextContext,
+        event: &mut Event,
+        _target: Option<Rc<RefCell<dyn ElementInternals>>>,
+    ) {
+        scrollable::on_scroll_events(self, message, event);
+    }
+
+    fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
+        resolve_clip_for_scrollable(self, clip_bounds);
+    }
+
+    fn push(&mut self, child: Rc<RefCell<dyn ElementInternals>>) {
+        let me: Weak<RefCell<dyn ElementInternals>> = self.element_data.me.clone();
+        let me_window = self.element_data.window.clone();
+        child.borrow_mut().element_data_mut().parent = Some(me);
+        child.borrow_mut().element_data_mut().window = me_window;
+        child.borrow_mut().propagate_window_down();
+        self.element_data.children.push(child.clone());
+
+        // Add the children's taffy node.
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
+            let child_id = child.borrow().element_data().layout_item.taffy_node_id;
+            if let Some(child_id) = child_id {
+                taffy_tree.add_child(parent_id, child_id);
+            }
+        });
+    }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
+}
+
 impl Window {
     pub fn new_advanced<F>(window_fn: F, renderer_type: RendererType) -> Self
     where
@@ -146,6 +336,22 @@ impl Window {
         self.inner.borrow().window_size()
     }
 
+    pub fn zoom_scale_factor(&self) -> f64 {
+        self.inner.borrow().zoom_scale_factor()
+    }
+
+    /// Updates the reactive tree, layouts the elements, and draws the view.
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+    pub fn on_request_redraw(&self, craft_app: &mut App) -> Option<TreeUpdate> {
+        self.inner.borrow_mut().on_request_redraw(craft_app)
+    }
+
+    /// Updates the reactive tree, layouts the elements, and draws the view.
+    #[cfg(any(not(feature = "accesskit"), target_arch = "wasm32"))]
+    pub fn on_request_redraw(&self, craft_app: &mut App) {
+        self.inner.borrow_mut().on_request_redraw(craft_app)
+    }
+
     pub(crate) fn zoom_in(&self) {
         self.inner.borrow_mut().zoom_in()
     }
@@ -154,10 +360,6 @@ impl Window {
         self.inner.borrow_mut().zoom_out()
     }
 
-    pub fn zoom_scale_factor(&self) -> f64 {
-        self.inner.borrow().zoom_scale_factor()
-    }
-
     pub(crate) fn mouse_position(&self) -> Option<Point> {
         self.inner.borrow().mouse_position()
     }
@@ -174,23 +376,11 @@ impl Window {
         self.inner.borrow_mut().on_redraw(text_context, resource_manager)
     }
 
-    /// Updates the reactive tree, layouts the elements, and draws the view.
-    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-    pub fn on_request_redraw(&self, craft_app: &mut App) -> Option<TreeUpdate> {
-        self.inner.borrow_mut().on_request_redraw(craft_app)
-    }
-
     #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     pub(crate) fn compute_accessibility_tree_window(&self) -> TreeUpdate {
         self.inner.borrow_mut().compute_accessibility_tree_window()
     }
 
-    /// Updates the reactive tree, layouts the elements, and draws the view.
-    #[cfg(any(not(feature = "accesskit"), target_arch = "wasm32"))]
-    pub fn on_request_redraw(&self, craft_app: &mut App) {
-        self.inner.borrow_mut().on_request_redraw(craft_app)
-    }
-
     pub(crate) fn create(&self, craft_app: &mut App, event_loop: &ActiveEventLoop) {
         self.inner.borrow_mut().create(craft_app, event_loop)
     }
@@ -220,11 +410,15 @@ impl WindowInternal {
                 advanced_window_fn: f.map(|f| Box::new(f) as WindowConstructor),
                 title: title.map(|title| title.to_string()),
                 renderer_type,
+                pointer_capture: Default::default(),
             })
         });
 
         inner.borrow_mut().element_data.create_layout_node(None);
 
+        let me = Rc::downgrade(&inner);
+        inner.borrow_mut().element_data.window = Some(me);
+
         WINDOW_MANAGER.with_borrow_mut(|window_manager| {
             window_manager.add_window(Window {
                 inner: inner.clone(),
@@ -261,21 +455,47 @@ impl WindowInternal {
         )
     }
 
-    pub(crate) fn zoom_in(&mut self) {
-        self.zoom_scale_factor += 0.01;
-        self.update_zoom();
+    pub fn update_zoom(&mut self) {
+        let scale_factor = self.effective_scale_factor();
+        self.set_scale_factor(scale_factor);
+        self.mark_dirty();
+        self.request_redraw();
     }
 
-    pub(crate) fn zoom_out(&mut self) {
-        self.zoom_scale_factor = (self.zoom_scale_factor - 0.01).max(1.0);
+    /// Updates the reactive tree, layouts the elements, and draws the view.
+    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
+    pub fn on_request_redraw(&mut self, craft_app: &mut App) -> Option<TreeUpdate> {
+        self.on_redraw(
+            craft_app.text_context.as_mut().unwrap(),
+            craft_app.resource_manager.clone(),
+        );
+
+        let tree_update = self.compute_accessibility_tree_window();
+        if let Some(accesskit_adapter) = &mut self.accesskit_adapter {
+            accesskit_adapter.update_if_active(|| tree_update);
+            None
+        } else {
+            Some(tree_update)
+        }
+    }
+
+    /// Updates the reactive tree, layouts the elements, and draws the view.
+    #[cfg(any(not(feature = "accesskit"), target_arch = "wasm32"))]
+    pub fn on_request_redraw(&mut self, craft_app: &mut App) {
+        self.on_redraw(
+            craft_app.text_context.as_mut().unwrap(),
+            craft_app.resource_manager.clone(),
+        );
+    }
+
+    pub(crate) fn zoom_in(&mut self) {
+        self.zoom_scale_factor += 0.01;
         self.update_zoom();
     }
 
-    pub fn update_zoom(&mut self) {
-        let scale_factor = self.effective_scale_factor();
-        self.set_scale_factor(scale_factor);
-        self.mark_dirty();
-        self.request_redraw();
+    pub(crate) fn zoom_out(&mut self) {
+        self.zoom_scale_factor = (self.zoom_scale_factor - 0.01).max(1.0);
+        self.update_zoom();
     }
 
     pub(crate) fn zoom_scale_factor(&self) -> f64 {
@@ -328,85 +548,6 @@ impl WindowInternal {
         self.on_resize(self.window_size);
     }
 
-    fn layout_window(&mut self, text_context: &mut TextContext, resource_manager: Arc<ResourceManager>) -> NodeId {
-        let root_node = self
-            .element_data
-            .layout_item
-            .taffy_node_id
-            .expect("A root element must have a layout node.");
-
-        let window_size = self.window_size();
-        let available_space: taffy::Size<AvailableSpace> = taffy::Size {
-            width: AvailableSpace::Definite(window_size.width),
-            height: AvailableSpace::Definite(window_size.height),
-        };
-
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let root_dirty = taffy_tree.is_layout_dirty(root_node);
-
-            if root_dirty {
-                /*let span = span!(Level::INFO, "layout(taffy)");
-                let _enter = span.enter();*/
-                taffy_tree.compute_layout(root_node, available_space, text_context, resource_manager.clone());
-            }
-
-            //if self.taffy_tree.borrow().is_apply_layout_dirty() {
-            /*let span = span!(Level::INFO, "layout(apply)");
-            let _enter = span.enter();*/
-
-            if root_dirty || taffy_tree.is_apply_layout_dirty(&root_node) {
-                // TODO: move into taffy_tree
-                let mut layout_order: u32 = 0;
-                let sf = self.effective_scale_factor();
-                self.apply_layout(
-                    taffy_tree,
-                    Point::new(0.0, 0.0),
-                    &mut layout_order,
-                    Affine::IDENTITY,
-                    None,
-                    text_context,
-                    None,
-                    sf,
-                );
-                taffy_tree.apply_layout(root_node);
-            }
-            //}
-        });
-
-        root_node
-    }
-
-    fn draw_window(&mut self, text_context: &mut TextContext, resource_manager: Arc<ResourceManager>) {
-        let render_list = self.render_list.clone();
-        render_list.borrow_mut().deref_mut().clear();
-        self.draw(
-            render_list.borrow_mut().deref_mut(),
-            text_context,
-            None,
-            self.effective_scale_factor(),
-        );
-
-        self.winit_window.clone().unwrap().pre_present_notify();
-        self.renderer
-            .as_mut()
-            .unwrap()
-            .sort_and_cull_render_list(render_list.borrow_mut().deref_mut());
-
-        let window = Rectangle {
-            x: 0.0,
-            y: 0.0,
-            width: self.renderer.as_mut().unwrap().surface_width(),
-            height: self.renderer.as_mut().unwrap().surface_height(),
-        };
-        self.renderer.as_mut().unwrap().prepare_render_list(
-            self.render_list.borrow_mut().deref_mut(),
-            resource_manager.clone(),
-            window,
-        );
-
-        self.renderer.as_mut().unwrap().submit(resource_manager.clone());
-    }
-
     pub(crate) fn create(&mut self, craft_app: &mut App, event_loop: &ActiveEventLoop) {
         let winit_window: Arc<WinitWindow> = Arc::new(if let Some(window_fn) = &mut self.advanced_window_fn {
             (*window_fn)(event_loop)
@@ -477,23 +618,6 @@ impl WindowInternal {
         winit_window.set_visible(true);
     }
 
-    /// Updates the reactive tree, layouts the elements, and draws the view.
-    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-    pub fn on_request_redraw(&mut self, craft_app: &mut App) -> Option<TreeUpdate> {
-        self.on_redraw(
-            craft_app.text_context.as_mut().unwrap(),
-            craft_app.resource_manager.clone(),
-        );
-
-        let tree_update = self.compute_accessibility_tree_window();
-        if let Some(accesskit_adapter) = &mut self.accesskit_adapter {
-            accesskit_adapter.update_if_active(|| tree_update);
-            None
-        } else {
-            Some(tree_update)
-        }
-    }
-
     #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     pub(crate) fn compute_accessibility_tree_window(&mut self) -> TreeUpdate {
         let window_accesskit_id = self.element_data.internal_id;
@@ -524,203 +648,92 @@ impl WindowInternal {
         tree_update
     }
 
-    /// Updates the reactive tree, layouts the elements, and draws the view.
-    #[cfg(any(not(feature = "accesskit"), target_arch = "wasm32"))]
-    pub fn on_request_redraw(&mut self, craft_app: &mut App) {
-        self.on_redraw(
-            craft_app.text_context.as_mut().unwrap(),
-            craft_app.resource_manager.clone(),
-        );
-    }
-
-    fn screenshot(&self) -> Screenshot {
-        self.renderer.as_ref().unwrap().screenshot()
-    }
-
-    fn close(&self) {
-        if let Some(winit_window) = &self.winit_window {
-            queue_window_event(winit_window.id(), WindowEvent::CloseRequested);
-        }
-    }
-}
-
-impl Element for Window {}
-
-impl AsElement for Window {
-    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
-        self.inner.clone()
-    }
-}
-
-impl crate::elements::ElementData for WindowInternal {
-    fn element_data(&self) -> &ElementData {
-        &self.element_data
-    }
-
-    fn element_data_mut(&mut self) -> &mut ElementData {
-        &mut self.element_data
-    }
-}
-
-impl ElementInternals for WindowInternal {
-    fn apply_layout(
-        &mut self,
-        taffy_tree: &mut TaffyTree,
-        position: Point,
-        z_index: &mut u32,
-        transform: Affine,
-        pointer: Option<Point>,
-        text_context: &mut TextContext,
-        clip_bounds: Option<Rectangle>,
-        scale_factor: f64,
-    ) {
-        let node = self.element_data.layout_item.taffy_node_id.unwrap();
-        let layout = taffy_tree.layout(node);
-        let has_new_layout = taffy_tree.get_has_new_layout(node);
-
-        let dirty = has_new_layout
-            || transform != self.element_data.layout_item.get_transform()
-            || position != self.element_data.layout_item.position;
-        self.element_data.layout_item.has_new_layout = has_new_layout;
-
-        if dirty {
-            self.resolve_box(position, transform, layout, z_index);
-            self.apply_borders(scale_factor);
-            // For scroll changes from taffy;
-            self.element_data.apply_scroll(layout);
-            self.apply_clip(clip_bounds);
-            self.element_data.scroll_state.mark_old();
-        }
-
-        // For manual scroll updates.
-        if !dirty && self.element_data.scroll_state.is_new() {
-            self.element_data.apply_scroll(layout);
-            self.element_data.scroll_state.mark_old();
-        }
-
-        if has_new_layout {
-            taffy_tree.mark_seen(node);
-        }
-
-        let scroll_y = self.element_data.scroll().scroll_y() as f64;
-        let child_transform = Affine::translate((0.0, -scroll_y));
-
-        self.apply_layout_children(
-            taffy_tree,
-            z_index,
-            transform * child_transform,
-            pointer,
-            text_context,
-            scale_factor,
-            false,
-        )
-    }
-
-    fn draw(
-        &mut self,
-        renderer: &mut RenderList,
-        text_context: &mut TextContext,
-        pointer: Option<Point>,
-        scale_factor: f64,
-    ) {
-        if !self.is_visible() {
-            return;
-        }
-        self.add_hit_testable(renderer, true, scale_factor);
-
-        // We draw the borders before we start any layers, so that we don't clip the borders.
-        self.draw_borders(renderer, scale_factor);
-
-        /*if self.element_data.layout_item.has_new_layout {
-            renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 5.0);
-        }*/
-
-        self.maybe_start_layer(renderer, scale_factor);
-        self.draw_children(renderer, text_context, pointer, scale_factor);
-        self.maybe_end_layer(renderer);
-
-        self.draw_scrollbar(renderer, scale_factor);
-    }
-
-    #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-    fn compute_accessibility_tree(
-        &mut self,
-        tree: &mut accesskit::TreeUpdate,
-        parent_index: Option<usize>,
-        scale_factor: f64,
-    ) {
-        let current_node_id = accesskit::NodeId(self.element_data.internal_id);
-
-        let mut current_node = accesskit::Node::new(Role::Window);
-        if !self.element_data.on_pointer_button_up.is_empty() {
-            current_node.set_role(Role::Button);
-            current_node.add_action(Action::Click);
-        }
-
-        let padding_box = self
+    fn layout_window(&mut self, text_context: &mut TextContext, resource_manager: Arc<ResourceManager>) -> NodeId {
+        let root_node = self
             .element_data
             .layout_item
-            .computed_box_transformed
-            .padding_rectangle()
-            .scale(scale_factor);
+            .taffy_node_id
+            .expect("A root element must have a layout node.");
 
-        current_node.set_bounds(accesskit::Rect {
-            x0: padding_box.left() as f64,
-            y0: padding_box.top() as f64,
-            x1: padding_box.right() as f64,
-            y1: padding_box.bottom() as f64,
-        });
+        let window_size = self.window_size();
+        let available_space: taffy::Size<AvailableSpace> = taffy::Size {
+            width: AvailableSpace::Definite(window_size.width),
+            height: AvailableSpace::Definite(window_size.height),
+        };
 
-        let current_index = tree.nodes.len(); // The current node is the last one added.
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let root_dirty = taffy_tree.is_layout_dirty(root_node);
 
-        if let Some(parent_index) = parent_index {
-            let parent_node = tree.nodes.get_mut(parent_index).unwrap();
-            parent_node.1.push_child(current_node_id);
-        }
+            if root_dirty {
+                /*let span = span!(Level::INFO, "layout(taffy)");
+                let _enter = span.enter();*/
+                taffy_tree.compute_layout(root_node, available_space, text_context, resource_manager.clone());
+            }
 
-        tree.nodes.push((current_node_id, current_node));
+            //if self.taffy_tree.borrow().is_apply_layout_dirty() {
+            /*let span = span!(Level::INFO, "layout(apply)");
+            let _enter = span.enter();*/
 
-        for child in self.element_data.children.iter_mut() {
-            child
-                .borrow_mut()
-                .compute_accessibility_tree(tree, Some(current_index), scale_factor);
-        }
-    }
+            if root_dirty || taffy_tree.is_apply_layout_dirty(&root_node) {
+                // TODO: move into taffy_tree
+                let mut layout_order: u32 = 0;
+                let sf = self.effective_scale_factor();
+                self.apply_layout(
+                    taffy_tree,
+                    Point::new(0.0, 0.0),
+                    &mut layout_order,
+                    Affine::IDENTITY,
+                    None,
+                    text_context,
+                    None,
+                    sf,
+                );
+                taffy_tree.apply_layout(root_node);
+            }
+            //}
+        });
 
-    fn on_event(
-        &mut self,
-        message: &CraftMessage,
-        _text_context: &mut TextContext,
-        event: &mut Event,
-        _target: Option<Rc<RefCell<dyn ElementInternals>>>,
-    ) {
-        scrollable::on_scroll_events(self, message, event);
+        root_node
     }
 
-    fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
-        resolve_clip_for_scrollable(self, clip_bounds);
-    }
+    fn draw_window(&mut self, text_context: &mut TextContext, resource_manager: Arc<ResourceManager>) {
+        let render_list = self.render_list.clone();
+        render_list.borrow_mut().deref_mut().clear();
+        self.draw(
+            render_list.borrow_mut().deref_mut(),
+            text_context,
+            None,
+            self.effective_scale_factor(),
+        );
 
-    fn push(&mut self, child: Rc<RefCell<dyn ElementInternals>>) {
-        let me: Weak<RefCell<dyn ElementInternals>> = self.element_data.me.clone();
-        child.borrow_mut().element_data_mut().parent = Some(me);
-        self.element_data.children.push(child.clone());
+        self.winit_window.clone().unwrap().pre_present_notify();
+        self.renderer
+            .as_mut()
+            .unwrap()
+            .sort_and_cull_render_list(render_list.borrow_mut().deref_mut());
 
-        // Add the children's taffy node.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
-            let child_id = child.borrow().element_data().layout_item.taffy_node_id;
-            if let Some(child_id) = child_id {
-                taffy_tree.add_child(parent_id, child_id);
-            }
-        });
+        let window = Rectangle {
+            x: 0.0,
+            y: 0.0,
+            width: self.renderer.as_mut().unwrap().surface_width(),
+            height: self.renderer.as_mut().unwrap().surface_height(),
+        };
+        self.renderer.as_mut().unwrap().prepare_render_list(
+            self.render_list.borrow_mut().deref_mut(),
+            resource_manager.clone(),
+            window,
+        );
+
+        self.renderer.as_mut().unwrap().submit(resource_manager.clone());
     }
 
-    fn as_any(&self) -> &dyn Any {
-        self
+    fn screenshot(&self) -> Screenshot {
+        self.renderer.as_ref().unwrap().screenshot()
     }
 
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
+    fn close(&self) {
+        if let Some(winit_window) = &self.winit_window {
+            queue_window_event(winit_window.id(), WindowEvent::CloseRequested);
+        }
     }
 }
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index cfc726fa..2891d5aa 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -8,7 +8,6 @@ use craft_renderer::RenderList;
 use crate::app::dequeue_event;
 use crate::elements::ElementInternals;
 use crate::events::helpers::{call_default_element_event_handler, call_user_event_handlers, find_target, freeze_target_list};
-use crate::events::pointer_capture::maybe_handle_implicit_pointer_capture_release;
 use crate::events::{CraftMessage, Event, FocusAction};
 use crate::text::text_context::TextContext;
 
@@ -156,6 +155,15 @@ impl EventDispatcher {
         render_list: &mut RenderList,
         target_scratch: &mut Vec<Rc<RefCell<dyn ElementInternals>>>,
     ) {
+        let pointer_capture = root
+            .borrow()
+            .element_data()
+            .window
+            .as_ref()
+            .and_then(|w| w.upgrade())
+            .map(|w| w.borrow().pointer_capture.clone())
+            .unwrap();
+
         let mut _focus = FocusAction::None;
         /*let span = span!(Level::INFO, "dispatch event");
         let _enter = span.enter();*/
@@ -165,8 +173,14 @@ impl EventDispatcher {
         }*/
 
         // Find the target and freeze the list, so the same set of elements are visited across sub event dispatches.
-        let target: Rc<RefCell<dyn ElementInternals>> =
-            find_target(&root, mouse_position, message, render_list, target_scratch);
+        let target: Rc<RefCell<dyn ElementInternals>> = find_target(
+            &root,
+            mouse_position,
+            message,
+            render_list,
+            target_scratch,
+            &pointer_capture.borrow(),
+        );
         let mut targets: VecDeque<Rc<RefCell<dyn ElementInternals>>> = freeze_target_list(target);
 
         self.maybe_dispatch_pointer_leave(text_context, &targets);
@@ -196,7 +210,9 @@ impl EventDispatcher {
         // - pointer_event(capture), pointer_event(bubble) (Executed above)
         // - lostpointercapture(capture), lostpointercapture(bubble)
         // - gotpointercapture(capture), gotpointercapture(bubble)
-        maybe_handle_implicit_pointer_capture_release(message);
+        pointer_capture
+            .borrow_mut()
+            .maybe_handle_implicit_pointer_capture_release(message);
 
         // Drain the event dispatch queue and invoke user callbacks.
         while let Some((event, message)) = dequeue_event() {
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index 72bae1d7..a5875a46 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -7,7 +7,7 @@ use kurbo::Point;
 
 use crate::app::ELEMENTS;
 use crate::elements::ElementInternals;
-use crate::events::pointer_capture::find_pointer_capture_target;
+use crate::events::pointer_capture::PointerCapture;
 use crate::events::{CraftMessage, Event};
 use crate::text::text_context::TextContext;
 
@@ -33,8 +33,9 @@ pub(super) fn find_target(
     message: &CraftMessage,
     render_list: &mut RenderList,
     target_scratch: &mut Vec<Rc<RefCell<dyn ElementInternals>>>,
+    pointer_capture: &PointerCapture,
 ) -> Rc<RefCell<dyn ElementInternals>> {
-    let mut target = find_pointer_capture_target(message);
+    let mut target = pointer_capture.find_pointer_capture_target(message);
     if let Some(target) = target {
         return target;
     }
diff --git a/crates/craft_retained/src/events/mod.rs b/crates/craft_retained/src/events/mod.rs
index aa8036d9..4fa7b5ca 100644
--- a/crates/craft_retained/src/events/mod.rs
+++ b/crates/craft_retained/src/events/mod.rs
@@ -1,38 +1,40 @@
-mod mouse_wheel;
-
-mod event_dispatch;
-mod helpers;
-pub mod internal;
-mod pointer_capture;
-//#[cfg(test)]
-//mod tests;
-
 use std::any::Any;
 use std::cell::RefCell;
 use std::rc::Rc;
 use std::sync::Arc;
 
-pub(crate) use event_dispatch::EventDispatcher;
-pub use mouse_wheel::MouseWheel;
 pub use ui_events;
+
+pub use winit::event::{ElementState, Ime, Modifiers, MouseButton};
+
+pub use crate::events::mouse_wheel::MouseWheel;
+
+pub(crate) use event_dispatch::EventDispatcher;
+
 use ui_events::keyboard::KeyboardEvent;
 use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
-pub use winit::event::{ElementState, Ime, Modifiers, MouseButton};
 
 use crate::PinnedFutureAny;
 use crate::elements::ElementInternals;
 use crate::utils::cloneable_any::CloneableAny;
 
+pub mod internal;
+
+pub(crate) mod pointer_capture;
+
+mod event_dispatch;
+mod helpers;
+mod mouse_wheel;
+
 pub type PointerEventHandler = Rc<dyn Fn(&mut Event, &PointerButtonEvent)>;
 pub type PointerCaptureHandler = Rc<dyn Fn(&mut Event)>;
 pub type SliderValueChangedHandler = Rc<dyn Fn(&mut Event, f64)>;
 pub type PointerEnterHandler = Rc<dyn Fn(&mut Event)>;
 pub type PointerLeaveHandler = Rc<dyn Fn(&mut Event)>;
-
 pub type PointerUpdateHandler = Rc<dyn Fn(&mut Event, &PointerUpdate)>;
-
 pub type KeyboardInputHandler = Rc<dyn Fn(&mut Event, &KeyboardEvent)>;
 pub type ScrollHandler = Rc<dyn Fn(&mut Event)>;
+pub type UserMessage = dyn CloneableAny;
 
 #[derive(Clone)]
 pub enum EventDispatchType {
@@ -65,6 +67,26 @@ pub enum CraftMessage {
     ElementMessage(Arc<UserMessage>),
 }
 
+/// The result of an update.
+pub struct Event {
+    pub target: Rc<RefCell<dyn ElementInternals>>,
+    /// Propagate craft_events to the next element. True by default.
+    pub propagate: bool,
+    /// A future that will produce a message when complete. The message will be sent to the origin component.
+    pub future: Option<PinnedFutureAny>,
+    /// Prevent default event handlers from running when an craft_event is not explicitly handled.
+    /// False by default.
+    pub prevent_defaults: bool,
+}
+
+#[derive(Debug, Clone, Copy, Default)]
+pub enum FocusAction {
+    #[default]
+    None,
+    Set(u64),
+    Unset,
+}
+
 impl CraftMessage {
     pub(super) fn is_pointer_event(&self) -> bool {
         matches!(
@@ -92,27 +114,6 @@ impl CraftMessage {
         Self::ElementMessage(Arc::new(data))
     }
 }
-pub type UserMessage = dyn CloneableAny;
-
-/// The result of an update.
-pub struct Event {
-    pub target: Rc<RefCell<dyn ElementInternals>>,
-    /// Propagate craft_events to the next element. True by default.
-    pub propagate: bool,
-    /// A future that will produce a message when complete. The message will be sent to the origin component.
-    pub future: Option<PinnedFutureAny>,
-    /// Prevent default event handlers from running when an craft_event is not explicitly handled.
-    /// False by default.
-    pub prevent_defaults: bool,
-}
-
-#[derive(Debug, Clone, Copy, Default)]
-pub enum FocusAction {
-    #[default]
-    None,
-    Set(u64),
-    Unset,
-}
 
 impl Event {
     #[cfg(not(target_arch = "wasm32"))]
@@ -134,9 +135,7 @@ impl Event {
     pub fn async_no_result() -> Box<dyn Any + 'static> {
         Box::new(())
     }
-}
 
-impl Event {
     pub fn new(target: Rc<RefCell<dyn ElementInternals>>) -> Self {
         Event {
             target,
@@ -145,9 +144,7 @@ impl Event {
             prevent_defaults: false,
         }
     }
-}
 
-impl Event {
     pub fn pinned_future(&mut self, future: PinnedFutureAny) {
         self.future = Some(future);
     }
diff --git a/crates/craft_retained/src/events/pointer_capture.rs b/crates/craft_retained/src/events/pointer_capture.rs
index e97f0f1b..92dde48c 100644
--- a/crates/craft_retained/src/events/pointer_capture.rs
+++ b/crates/craft_retained/src/events/pointer_capture.rs
@@ -1,116 +1,131 @@
 use std::cell::RefCell;
-use std::collections::VecDeque;
+use std::collections::{HashMap, VecDeque};
 use std::rc::{Rc, Weak};
 
 use ui_events::pointer::PointerId;
 
-use crate::app::DOCUMENTS;
 use crate::elements::ElementInternals;
 use crate::events::CraftMessage;
 use crate::events::event_dispatch::{dispatch_bubbling_event, dispatch_capturing_event};
 
-/// Returns the currently pointer captured element or None.
-pub(super) fn find_pointer_capture_target(message: &CraftMessage) -> Option<Rc<RefCell<dyn ElementInternals>>> {
-    // 9.4 Implicit pointer capture
-    // https://w3c.github.io/pointerevents/#implicit-pointer-capture
-    //
-    let pointer_capture_element_id: Option<Weak<RefCell<dyn ElementInternals>>> = DOCUMENTS.with_borrow_mut(|docs| {
-        let key = &PointerId::new(1).unwrap();
-        if matches!(message, CraftMessage::GotPointerCapture()) {
-            // Check pending (step 2):
-            // https://w3c.github.io/pointerevents/#process-pending-pointer-capture
-            docs.get_current_document().pending_pointer_captures.get(key).cloned()
-        } else {
-            docs.get_current_document().pointer_captures.get(key).cloned()
-        }
-    });
-
-    pointer_capture_element_id.map(|element| element.upgrade().expect("Pointer captured element should exist."))
+/// Stores window specific information like pointer captures, focus (soon), etc.
+#[derive(Default, Clone)]
+pub struct PointerCapture {
+    /// Tracks elements that are *currently* pointer captured.
+    pub(crate) pointer_captures: HashMap<PointerId, Weak<RefCell<dyn ElementInternals>>>,
+    /// Tracks elements that *should* be pointer captured.
+    pub(crate) pending_pointer_captures: HashMap<PointerId, Weak<RefCell<dyn ElementInternals>>>,
 }
 
-/// Checks if Got or Lost events need to be dispatched and updates the current pointer capture.
-pub(super) fn process_pending_pointer_capture() {
-    // 4.1.3.2 Process pending pointer capture
-    let key = &PointerId::new(1).unwrap();
-    let (pointer_capture_val, pending_pointer_capture_val) = DOCUMENTS.with_borrow_mut(|docs| {
-        let current_doc = docs.get_current_document();
-        let pointer_capture_val = current_doc.pointer_captures.get(key);
-        let pending_pointer_capture_val = current_doc.pending_pointer_captures.get(key);
-
-        (pointer_capture_val.cloned(), pending_pointer_capture_val.cloned())
-    });
-
-    // 1. If the pointer capture target override for this pointer is set and is not equal to the pending pointer capture target override,
-    // then fire a pointer event named lostpointercapture at the pointer capture target override node.
-    if let Some(pointer_capture_val) = pointer_capture_val.clone()
-        && Some(pointer_capture_val.as_ptr()) != pending_pointer_capture_val.clone().map(|w| w.as_ptr())
-    {
-        let msg = CraftMessage::LostPointerCapture();
-        let target = find_pointer_capture_target(&msg);
-
-        if let Some(target) = target {
-            let mut targets: VecDeque<Rc<RefCell<dyn ElementInternals>>> = VecDeque::new();
-            let mut current_target = Some(Rc::clone(&target));
-            while let Some(node) = current_target {
-                targets.push_back(Rc::clone(&node));
-                current_target = node.borrow().parent().as_ref().and_then(|p| p.upgrade());
+impl PointerCapture {
+    /// Remove an element from pointer capture.
+    pub fn remove_element(&mut self, element: &Rc<RefCell<dyn ElementInternals>>) {
+        let element_weak = element.borrow().element_data().me.clone();
+        self.pointer_captures.retain(|_, v| !Weak::ptr_eq(v, &element_weak));
+        self.pending_pointer_captures
+            .retain(|_, v| !Weak::ptr_eq(v, &element_weak));
+    }
+
+    /// Returns the currently pointer captured element or None.
+    pub(super) fn find_pointer_capture_target(
+        &self,
+        message: &CraftMessage,
+    ) -> Option<Rc<RefCell<dyn ElementInternals>>> {
+        // 9.4 Implicit pointer capture
+        // https://w3c.github.io/pointerevents/#implicit-pointer-capture
+        //
+        let pointer_capture_element_id: Option<Weak<RefCell<dyn ElementInternals>>> = {
+            let key = &PointerId::new(1).unwrap();
+            if matches!(message, CraftMessage::GotPointerCapture()) {
+                // Check pending (step 2):
+                // https://w3c.github.io/pointerevents/#process-pending-pointer-capture
+                self.pending_pointer_captures.get(key).cloned()
+            } else {
+                self.pointer_captures.get(key).cloned()
             }
+        };
 
-            dispatch_capturing_event(&msg, &mut targets);
-            dispatch_bubbling_event(&msg, &mut targets);
-        }
+        pointer_capture_element_id.map(|element| element.upgrade().expect("Pointer captured element should exist."))
     }
 
-    // 2. If the pending pointer capture target override for this pointer is set and is not equal to the pointer capture target override,
-    // then fire a pointer event named gotpointercapture at the pending pointer capture target override.
-    if let Some(pending_pointer_capture_val) = pending_pointer_capture_val.clone()
-        && Some(pending_pointer_capture_val.as_ptr()) != pointer_capture_val.map(|w| w.as_ptr())
-    {
-        let msg = CraftMessage::GotPointerCapture();
-        let target = find_pointer_capture_target(&msg);
-
-        if let Some(target) = target {
-            let mut targets: VecDeque<Rc<RefCell<dyn ElementInternals>>> = VecDeque::new();
-            let mut current_target = Some(Rc::clone(&target));
-            while let Some(node) = current_target {
-                targets.push_back(Rc::clone(&node));
-                current_target = node.borrow().parent().as_ref().and_then(|p| p.upgrade());
+    /// Checks if Got or Lost events need to be dispatched and updates the current pointer capture.
+    pub(super) fn process_pending_pointer_capture(&mut self) {
+        // 4.1.3.2 Process pending pointer capture
+        let key = &PointerId::new(1).unwrap();
+        let (pointer_capture_val, pending_pointer_capture_val) = {
+            let pointer_capture_val = self.pointer_captures.get(key);
+            let pending_pointer_capture_val = self.pending_pointer_captures.get(key);
+
+            (pointer_capture_val.cloned(), pending_pointer_capture_val.cloned())
+        };
+
+        // 1. If the pointer capture target override for this pointer is set and is not equal to the pending pointer capture target override,
+        // then fire a pointer event named lostpointercapture at the pointer capture target override node.
+        if let Some(pointer_capture_val) = pointer_capture_val.clone()
+            && Some(pointer_capture_val.as_ptr()) != pending_pointer_capture_val.clone().map(|w| w.as_ptr())
+        {
+            let msg = CraftMessage::LostPointerCapture();
+            let target = self.find_pointer_capture_target(&msg);
+
+            if let Some(target) = target {
+                let mut targets: VecDeque<Rc<RefCell<dyn ElementInternals>>> = VecDeque::new();
+                let mut current_target = Some(Rc::clone(&target));
+                while let Some(node) = current_target {
+                    targets.push_back(Rc::clone(&node));
+                    current_target = node.borrow().parent().as_ref().and_then(|p| p.upgrade());
+                }
+
+                dispatch_capturing_event(&msg, &mut targets);
+                dispatch_bubbling_event(&msg, &mut targets);
             }
+        }
 
-            dispatch_capturing_event(&msg, &mut targets);
-            dispatch_bubbling_event(&msg, &mut targets);
+        // 2. If the pending pointer capture target override for this pointer is set and is not equal to the pointer capture target override,
+        // then fire a pointer event named gotpointercapture at the pending pointer capture target override.
+        if let Some(pending_pointer_capture_val) = pending_pointer_capture_val.clone()
+            && Some(pending_pointer_capture_val.as_ptr()) != pointer_capture_val.map(|w| w.as_ptr())
+        {
+            let msg = CraftMessage::GotPointerCapture();
+            let target = self.find_pointer_capture_target(&msg);
+
+            if let Some(target) = target {
+                let mut targets: VecDeque<Rc<RefCell<dyn ElementInternals>>> = VecDeque::new();
+                let mut current_target = Some(Rc::clone(&target));
+                while let Some(node) = current_target {
+                    targets.push_back(Rc::clone(&node));
+                    current_target = node.borrow().parent().as_ref().and_then(|p| p.upgrade());
+                }
+
+                dispatch_capturing_event(&msg, &mut targets);
+                dispatch_bubbling_event(&msg, &mut targets);
+            }
         }
-    }
 
-    // 3. Set the pointer capture target override to the pending pointer capture target override, if set.
-    // Otherwise, clear the pointer capture target override.
-    DOCUMENTS.with_borrow_mut(|docs| {
-        let current_doc = docs.get_current_document();
+        // 3. Set the pointer capture target override to the pending pointer capture target override, if set.
+        // Otherwise, clear the pointer capture target override.
 
         if let Some(pending_pointer_capture_val) = pending_pointer_capture_val {
-            current_doc.pointer_captures.insert(*key, pending_pointer_capture_val);
+            self.pointer_captures.insert(*key, pending_pointer_capture_val);
         } else {
-            current_doc.pointer_captures.remove(key);
+            self.pointer_captures.remove(key);
         }
-    });
-}
+    }
 
-pub(super) fn maybe_handle_implicit_pointer_capture_release(message: &CraftMessage) {
-    // 9.5 Implicit release of pointer capture
-    // https://w3c.github.io/pointerevents/#implicit-release-of-pointer-capture
-    let is_pointer_up_event = matches!(message, CraftMessage::PointerButtonUp(_));
-    if is_pointer_up_event
-    /* || is_pointer_canceled */
-    {
-        // Immediately after firing the pointerup or pointercancel events, the user agent MUST clear the pending pointer capture target override
-        // for the pointerId of the pointerup or pointercancel event that was just dispatched
-        DOCUMENTS.with_borrow_mut(|docs| {
+    pub(super) fn maybe_handle_implicit_pointer_capture_release(&mut self, message: &CraftMessage) {
+        // 9.5 Implicit release of pointer capture
+        // https://w3c.github.io/pointerevents/#implicit-release-of-pointer-capture
+        let is_pointer_up_event = matches!(message, CraftMessage::PointerButtonUp(_));
+        if is_pointer_up_event
+        /* || is_pointer_canceled */
+        {
+            // Immediately after firing the pointerup or pointercancel events, the user agent MUST clear the pending pointer capture target override
+            // for the pointerId of the pointerup or pointercancel event that was just dispatched
             let key = &PointerId::new(1).unwrap();
-            let _ = docs.get_current_document().pending_pointer_captures.remove(key);
-        });
+            let _ = self.pending_pointer_captures.remove(key);
 
-        process_pending_pointer_capture();
-    } else if message.is_pointer_event() && !message.is_got_or_lost_pointer_capture() {
-        process_pending_pointer_capture();
+            self.process_pending_pointer_capture();
+        } else if message.is_pointer_event() && !message.is_got_or_lost_pointer_capture() {
+            self.process_pending_pointer_capture();
+        }
     }
 }
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 5201dcfe..8e925a4c 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -49,7 +49,6 @@ use crate::events::internal::InternalMessage;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 pub mod accessibility;
 pub mod craft_winit_state;
-pub mod document;
 pub mod elements;
 pub mod events;
 pub mod layout;

From e0871242d22e944616bba9689f33bc4573edbc19 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 21 Mar 2026 13:15:22 -0400
Subject: [PATCH 089/143] Split about_to_wait into functions.

---
 crates/craft_retained/src/app.rs              |   2 +-
 .../craft_retained/src/craft_winit_state.rs   | 136 +++++++++---------
 2 files changed, 73 insertions(+), 65 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index cc6315be..3d06030f 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -85,12 +85,12 @@ pub struct App {
     pub(crate) resource_manager: Arc<ResourceManager>,
 
     pub(crate) app_sender: Sender<InternalMessage>,
-    #[allow(dead_code)]
     pub(crate) runtime: CraftRuntimeHandle,
     pub(crate) modifiers: Modifiers,
     pub redraw_flags: RedrawFlags,
 
     pub(super) target_scratch: Vec<Rc<RefCell<dyn ElementInternals>>>,
+    #[allow(dead_code)]
     pub(crate) craft_options: CraftOptions,
 
     /// True if the winit app is active.
diff --git a/crates/craft_retained/src/craft_winit_state.rs b/crates/craft_retained/src/craft_winit_state.rs
index 67494ec1..42314fc2 100644
--- a/crates/craft_retained/src/craft_winit_state.rs
+++ b/crates/craft_retained/src/craft_winit_state.rs
@@ -22,11 +22,12 @@ use winit::window::WindowId;
 
 use crate::CraftOptions;
 use crate::app::{App, WINDOW_MANAGER, dequeue_window_event};
+use crate::elements::Window;
 use crate::events::internal::InternalMessage;
 #[cfg(target_arch = "wasm32")]
 use {crate::wasm_queue::WASM_QUEUE, crate::wasm_queue::WasmQueue};
 
-const WAIT_TIME: time::Duration = time::Duration::from_millis(15);
+const WAIT_TIME: time::Duration = time::Duration::from_millis(10);
 
 /// Stores state related to Winit.
 ///
@@ -122,13 +123,7 @@ impl ApplicationHandler for CraftWinitState {
 
         match event {
             WindowEvent::CloseRequested => {
-                WINDOW_MANAGER.with_borrow_mut(|window_manager| {
-                    window_manager.close_window(&window);
-                    if window_manager.is_empty() {
-                        craft_state.close_requested = true;
-                        craft_state.craft_app.on_close_requested();
-                    }
-                });
+                self.on_close_requested(&window);
             }
             WindowEvent::ScaleFactorChanged { scale_factor, .. } => {
                 craft_state.craft_app.on_scale_factor_changed(window, scale_factor);
@@ -157,55 +152,65 @@ impl ApplicationHandler for CraftWinitState {
         if event_loop.exiting() {
             return;
         }
+        self.craft_state.runtime.update_local_set();
+        self.process_non_winit_window_events(event_loop);
+        self.process_craft_messages();
+        self.process_external_work();
+        self.craft_state.craft_app.on_about_to_wait(event_loop);
+        self.maybe_exit(event_loop);
+        event_loop.set_control_flow(ControlFlow::WaitUntil(time::Instant::now() + WAIT_TIME));
+    }
 
-        {
-            let craft_state = &mut self.craft_state;
-            craft_state.runtime.update_local_set();
-        }
-
-        while let Some((window_id, event)) = dequeue_window_event() {
-            self.window_event(event_loop, window_id, event);
-        }
+    fn suspended(&mut self, event_loop: &ActiveEventLoop) {
+        self.craft_state.craft_app.on_suspended(event_loop);
+    }
+}
 
-        let craft_state = &mut self.craft_state;
+impl CraftWinitState {
+    pub(crate) fn new(craft_state: CraftState) -> Self {
+        Self { craft_state }
+    }
 
-        cfg_if::cfg_if! {
-            if #[cfg(not(target_arch = "wasm32"))] {
-                    craft_state.runtime.borrow_tokio_runtime().block_on(async {
-                    while let Ok(message) = craft_state.winit_receiver.try_recv() {
-                        match message {
-                            InternalMessage::ResourceEvent(resource_event) => {
-                                craft_state.craft_app.on_resource_event(resource_event);
-                            }
-                            #[cfg(target_arch = "wasm32")]
-                            InternalMessage::RendererCreated(window, renderer) => {
-                            }
-                        }
+    #[cfg(not(target_arch = "wasm32"))]
+    fn process_craft_messages(&mut self) {
+        self.craft_state.runtime.borrow_tokio_runtime().block_on(async {
+            while let Ok(message) = self.craft_state.winit_receiver.try_recv() {
+                match message {
+                    InternalMessage::ResourceEvent(resource_event) => {
+                        self.craft_state.craft_app.on_resource_event(resource_event);
                     }
-                });
-            } else {
-                WASM_QUEUE.with_borrow_mut(|wasm_queue: &mut WasmQueue| {
-                    wasm_queue.drain(|message| {
-                        match message {
-                            InternalMessage::ResourceEvent(resource_event) => {
-                                craft_state.craft_app.on_resource_event(resource_event);
-                            }
-                            #[cfg(target_arch = "wasm32")]
-                            InternalMessage::RendererCreated(winit_window, renderer) => {
-                                WINDOW_MANAGER.with_borrow_mut(|window_manager| {
-                                    let window = window_manager.get_window_by_id(winit_window.id());
-                                    window.clone().unwrap().inner.borrow_mut().renderer = Some(renderer);
-                                    let sz = Size::new(winit_window.inner_size().width as f32, winit_window.inner_size().height as f32);
-                                    window.unwrap().on_resize(sz);
-                                    window_manager.redraw_all(&mut craft_state.craft_app);
-                                });
-                            }
-                        }
-                    });
-                });
+                    #[cfg(target_arch = "wasm32")]
+                    InternalMessage::RendererCreated(window, renderer) => {}
+                }
             }
-        }
+        });
+    }
 
+    #[cfg(target_arch = "wasm32")]
+    fn process_craft_messages(&mut self) {
+        WASM_QUEUE.with_borrow_mut(|wasm_queue: &mut WasmQueue| {
+            wasm_queue.drain(|message| match message {
+                InternalMessage::ResourceEvent(resource_event) => {
+                    self.craft_state.craft_app.on_resource_event(resource_event);
+                }
+                #[cfg(target_arch = "wasm32")]
+                InternalMessage::RendererCreated(winit_window, renderer) => {
+                    WINDOW_MANAGER.with_borrow_mut(|window_manager| {
+                        let window = window_manager.get_window_by_id(winit_window.id());
+                        window.clone().unwrap().inner.borrow_mut().renderer = Some(renderer);
+                        let sz = Size::new(
+                            winit_window.inner_size().width as f32,
+                            winit_window.inner_size().height as f32,
+                        );
+                        window.unwrap().on_resize(sz);
+                        window_manager.redraw_all(&mut self.craft_state.craft_app);
+                    });
+                }
+            });
+        });
+    }
+
+    fn process_external_work(&mut self) {
         // Do work sent from other threads and update all the windows.
         let mut work_done = false;
         while let Some(work) = pop_gui_thread_work() {
@@ -215,30 +220,33 @@ impl ApplicationHandler for CraftWinitState {
 
         if work_done {
             WINDOW_MANAGER.with_borrow_mut(|window_manager| {
-                window_manager.redraw_all(&mut craft_state.craft_app);
+                window_manager.redraw_all(&mut self.craft_state.craft_app);
             });
         }
+    }
 
-        craft_state.craft_app.on_about_to_wait(event_loop);
-
-        if craft_state.close_requested {
+    fn maybe_exit(&mut self, event_loop: &ActiveEventLoop) {
+        if self.craft_state.close_requested {
             info!("Exiting winit event loop");
 
             event_loop.exit();
-            return;
         }
-
-        event_loop.set_control_flow(ControlFlow::WaitUntil(time::Instant::now() + WAIT_TIME));
     }
 
-    fn suspended(&mut self, event_loop: &ActiveEventLoop) {
-        self.craft_state.craft_app.on_suspended(event_loop);
+    fn process_non_winit_window_events(&mut self, event_loop: &ActiveEventLoop) {
+        while let Some((window_id, event)) = dequeue_window_event() {
+            self.window_event(event_loop, window_id, event);
+        }
     }
-}
 
-impl CraftWinitState {
-    pub(crate) fn new(craft_state: CraftState) -> Self {
-        Self { craft_state }
+    fn on_close_requested(&mut self, window: &Window) {
+        WINDOW_MANAGER.with_borrow_mut(|window_manager| {
+            window_manager.close_window(window);
+            if window_manager.is_empty() {
+                self.craft_state.close_requested = true;
+                self.craft_state.craft_app.on_close_requested();
+            }
+        });
     }
 }
 

From 142051bac9a4b1cabe300235ec5f29aa54180ac4 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 21 Mar 2026 15:05:36 -0400
Subject: [PATCH 090/143] Add back basic focus + handle overlay ordering

---
 crates/craft_renderer/src/renderer.rs         |  26 ++++-
 .../craft_retained/src/elements/dropdown.rs   | 109 +++++++++++++++---
 .../elements/text_input/text_input_state.rs   |   6 +-
 .../src/events/event_dispatch.rs              |  37 ++++--
 crates/craft_retained/src/events/helpers.rs   |   6 +-
 crates/craft_retained/src/events/mod.rs       |   8 ++
 crates/craft_retained/src/layout/layout.rs    |   1 +
 examples/counter_retained/main.rs             |   7 +-
 8 files changed, 167 insertions(+), 33 deletions(-)

diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index 01e6855d..d8c0227b 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -105,8 +105,26 @@ impl SortedCommands {
     }
 }
 
+#[derive(Debug)]
+pub struct TargetItem {
+    pub custom_id: u64,
+    pub rectangle: Rectangle,
+    pub overlay_depth: u64
+}
+
+impl TargetItem {
+    pub fn new(custom_id: u64, rectangle: Rectangle, overlay_depth: u64) -> Self {
+        Self {
+            custom_id,
+            rectangle,
+            overlay_depth
+        }
+    }
+}
+
 pub struct RenderList {
-    pub targets: Vec<(u64, Rectangle)>,
+    current_overlay_depth: u64,
+    pub targets: Vec<TargetItem>,
     pub commands: Vec<RenderCommand>,
     /// Stores a sorted list of render command handles. This gets set in `Renderer::sort_render_list`.
     pub overlay: SortedCommands,
@@ -122,6 +140,7 @@ impl Default for RenderList {
 impl RenderList {
     pub fn new() -> Self {
         Self {
+            current_overlay_depth: 0,
             targets: Vec::new(),
             commands: Vec::new(),
             overlay: SortedCommands { children: vec![] },
@@ -152,7 +171,7 @@ impl RenderList {
         {
             return;
         }
-        self.targets.push((id, bounding_box));
+        self.targets.push(TargetItem::new(id, bounding_box, self.current_overlay_depth));
     }
 
     #[inline(always)]
@@ -225,10 +244,13 @@ impl RenderList {
 
     pub fn start_overlay(&mut self) {
         self.commands.push(RenderCommand::StartOverlay);
+        self.current_overlay_depth += 1;
     }
 
     pub fn end_overlay(&mut self) {
         self.commands.push(RenderCommand::EndOverlay);
+        self.current_overlay_depth -= 1;
+        assert!(self.current_overlay_depth >= 0)
     }
 
     #[inline(always)]
diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index 10c5e1b1..c57842fd 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -157,6 +157,17 @@ impl Dropdown {
 
         Self { inner }
     }
+
+    pub fn selected_item(self, index: usize) -> Self {
+        let binding = self.inner.clone();
+        let mut inner = binding.borrow_mut();
+        inner.set_selected_element(index);
+        self
+    }
+
+    pub fn get_selected_item(self) -> usize {
+        self.inner.borrow().selected_element_index.unwrap()
+    }
 }
 
 impl Element for Dropdown {}
@@ -277,7 +288,7 @@ impl ElementInternals for DropdownInner {
         let rect = element_data.layout.computed_box_transformed.border_rectangle();
         let floating_window_rect = self.floating_window.layout.computed_box_transformed.border_rectangle();
 
-        if floating_window_rect.contains(&point) {
+        if !self.is_floating_window_hidden && floating_window_rect.contains(&point) {
             return true;
         }
 
@@ -314,7 +325,7 @@ impl ElementInternals for DropdownInner {
         }
 
         if !self.is_floating_window_hidden {
-            //renderer.start_overlay();
+            renderer.start_overlay();
 
             let current_style = self.floating_window.style.as_ref();
             self.floating_window.layout.draw_borders(renderer, current_style, scale_factor);
@@ -340,7 +351,7 @@ impl ElementInternals for DropdownInner {
             renderer.pop_layer();
 
             draw_scrollbar(&self.floating_window.style, &self.floating_window.layout, renderer, scale_factor);
-           //renderer.end_overlay();
+           renderer.end_overlay();
         }
     }
 
@@ -351,37 +362,98 @@ impl ElementInternals for DropdownInner {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        if self.is_floating_window_hidden {
-            self.release_pointer_capture(PointerId::new(1).unwrap());
-        }
-
         let pb = match message {
-            CraftMessage::PointerButtonUp(pb) => Some(pb),
-            _ => None
+            CraftMessage::PointerButtonUp(pb) => pb,
+            _ => return
         };
+        let is_pointer_up = true;
+
+
+        // TODO Should pb.state.position be in logical coordinates?
+        let pointer_position = Point::new(pb.state.position.x, pb.state.position.y);
+        let is_pointer_in_select_box = self.element_data.layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
+        let is_pointer_in_window = self.floating_window.layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
+        let is_pointer_in_scrollbar = self.floating_window.layout.computed_scroll_track.contains(&pointer_position);
 
-        if let Some(pb) = pb {
-            // TODO Should pb.state.position be in logical coordinates?
-            let pointer_position = Point::new(pb.state.position.x, pb.state.position.y);
+        // Toggle the visibility of the floating window by the clicking of the dropdown select box.
+        if is_pointer_in_select_box && is_pointer_up {
+            self.is_floating_window_hidden = !self.is_floating_window_hidden;
 
-            if self.element_data.layout.computed_box_transformed.border_rectangle().contains(&pointer_position) {
-                self.is_floating_window_hidden = !self.is_floating_window_hidden;
+            if self.is_floating_window_hidden {
+                self.unfocus();
+                self.release_pointer_capture(PointerId::new(1).unwrap());
+            } else {
+                self.focus();
             }
 
-            if !self.floating_window.layout.computed_box_transformed.border_rectangle().contains(&pointer_position) || self.is_floating_window_hidden {
+            println!("HERE 1");
+            return;
+        }
+
+
+        if is_pointer_in_window && !is_pointer_in_scrollbar && is_pointer_up {
+            for (child_index, child) in self.children().iter().map(|r| r.clone()).enumerate() {
+                let contains = child.borrow().element_data().layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
+
+                if contains {
+                    self.is_floating_window_hidden = true;
+                    self.set_selected_element(child_index);
+                    self.unfocus();
+                    self.release_pointer_capture(PointerId::new(1).unwrap());
+                    println!("HERE 2");
+                    return;
+                }
+            }
+        }
+
+        if !is_pointer_in_window && is_pointer_up && self.is_focused() {
+            self.unfocus();
+            self.release_pointer_capture(PointerId::new(1).unwrap());
+            println!("HERE 3");
+            return;
+        } else if !is_pointer_in_window && is_pointer_up {
+            self.is_floating_window_hidden = true;
+            self.unfocus();
+            self.release_pointer_capture(PointerId::new(1).unwrap());
+            println!("HERE 4");
+            return;
+        }
+
+        return;
+
+        // ---
+        if is_pointer_in_select_box {
+            if self.is_floating_window_hidden {
+                self.focus();
+                self.set_pointer_capture(PointerId::new(1).unwrap());
+            } else {
+                self.unfocus();
+                self.release_pointer_capture(PointerId::new(1).unwrap());
+            }
+
+            self.is_floating_window_hidden = !self.is_floating_window_hidden;
+        } else {
+
+            if !self.is_floating_window_hidden && self.is_focused() {
+                self.is_floating_window_hidden = true;
                 return;
             }
 
+        }
+
+        if is_pointer_in_window && !self.has_pointer_capture(PointerId::new(1).unwrap()) {
             for (child_index, child) in self.children().iter().map(|r| r.clone()).enumerate() {
                 let contains = child.borrow().element_data().layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
 
                 if contains {
-                    self.is_floating_window_hidden = !self.is_floating_window_hidden.clone();
+                    self.is_floating_window_hidden = true;
                     self.set_selected_element(child_index);
-                    break;
+                    self.unfocus();
+                    return;
                 }
             }
         }
+        // ---
 
         let floating_window = &mut self.floating_window;
         let result = handle_scroll_logic_advance(&*floating_window.style, &mut floating_window.layout, message, event);
@@ -398,6 +470,9 @@ impl ElementInternals for DropdownInner {
         // ---
 
 
+        println!("Pointer Capture? {}", self.has_pointer_capture(PointerId::new(1).unwrap()));
+        println!("Focused? {}", self.is_focused())
+
     }
 
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
diff --git a/crates/craft_retained/src/elements/text_input/text_input_state.rs b/crates/craft_retained/src/elements/text_input/text_input_state.rs
index 27321c21..87f8139c 100644
--- a/crates/craft_retained/src/elements/text_input/text_input_state.rs
+++ b/crates/craft_retained/src/elements/text_input/text_input_state.rs
@@ -388,15 +388,15 @@ impl TextInputState {
 
     pub fn maybe_scroll_to_cursor(&mut self, element_data: &mut ElementData) {
         let height = element_data
-            .layout_item
+            .layout
             .computed_box_transformed
             .padding_rectangle_size()
             .height;
-        let x = self.calculate_scroll_to_cursor(height, element_data.scroll_state.scroll_y());
+        let x = self.calculate_scroll_to_cursor(height, element_data.layout.scroll_state.scroll_y());
         if x < 0.0 {
             return;
         }
-        element_data.scroll_state.set_scroll_y(x);
+        element_data.layout.scroll_state.set_scroll_y(x);
     }
 
     /// Insert at cursor, or replace selection.
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index f49a9d68..0f24c52e 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -5,7 +5,7 @@ use std::rc::{Rc, Weak};
 use craft_primitives::geometry::Point;
 use craft_renderer::RenderList;
 
-use crate::app::dequeue_event;
+use crate::app::{dequeue_event, FOCUS};
 use crate::elements::ElementInternals;
 use crate::events::helpers::{call_default_element_event_handler, call_user_event_handlers, find_target, freeze_target_list};
 use crate::events::pointer_capture::maybe_handle_implicit_pointer_capture_release;
@@ -164,13 +164,32 @@ impl EventDispatcher {
             println!("target: {}", node);
         }*/
 
-        // Find the target and freeze the list, so the same set of elements are visited across sub event dispatches.
-        let target: Rc<RefCell<dyn ElementInternals>> =
-            find_target(&root, mouse_position, message, render_list, target_scratch);
-        let mut targets: VecDeque<Rc<RefCell<dyn ElementInternals>>> = freeze_target_list(target);
+        let mut targets: VecDeque<Rc<RefCell<dyn ElementInternals>>> = VecDeque::new();
+
+        if message.is_pointer_event() {
+            // Find the target and freeze the list, so the same set of elements are visited across sub event dispatches.
+            let target: Rc<RefCell<dyn ElementInternals>> =
+                find_target(&root, mouse_position, message, render_list, target_scratch);
+            targets = freeze_target_list(target);
+        } else if message.is_keyboard_event() {
+            FOCUS.with(|f| {
+                let focus_ref = f.borrow();
+                if let Some(focus_ref) = focus_ref.clone() && let Some(focus) = focus_ref.upgrade() {
+                    targets.clear();
+                    targets.push_back(focus)
+                }
+            });
+        }
+
+        if targets.is_empty() {
+            targets.push_back(root.clone());
+        }
 
-        self.maybe_dispatch_pointer_leave(text_context, &targets);
-        self.maybe_dispatch_pointer_enter(text_context, &targets);
+
+        if message.is_pointer_event() {
+            self.maybe_dispatch_pointer_leave(text_context, &targets);
+            self.maybe_dispatch_pointer_enter(text_context, &targets);
+        }
 
         // Handle capturing
         dispatch_capturing_event(message, &mut targets);
@@ -196,7 +215,9 @@ impl EventDispatcher {
         // - pointer_event(capture), pointer_event(bubble) (Executed above)
         // - lostpointercapture(capture), lostpointercapture(bubble)
         // - gotpointercapture(capture), gotpointercapture(bubble)
-        maybe_handle_implicit_pointer_capture_release(message);
+        if message.is_pointer_event() {
+            maybe_handle_implicit_pointer_capture_release(message);
+        }
 
         // Drain the event dispatch queue and invoke user callbacks.
         while let Some((event, message)) = dequeue_event() {
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index bad331c5..cd71cb31 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -39,11 +39,12 @@ pub(super) fn find_target(
         return target;
     }
 
+    render_list.targets.sort_by_key(|r| r.overlay_depth);
     ELEMENTS.with_borrow_mut(|elements| {
-        target_scratch.extend(render_list.targets.iter().rev().filter_map(|(id, _)| {
+        target_scratch.extend(render_list.targets.iter().rev().filter_map(|target_item| {
             // When an element is removed from the dom, we do not remove it from targets.
             // So we must handle it here.
-            elements.get(*id).and_then(|target| target.upgrade())
+            elements.get(target_item.custom_id).and_then(|target| target.upgrade())
         }));
     });
 
@@ -57,6 +58,7 @@ pub(super) fn find_target(
         // The first element to pass the hit test should be the target.
         if should_pass_hit_test && target.is_none() {
             target = Some(Rc::clone(&node));
+            break;
         }
     }
 
diff --git a/crates/craft_retained/src/events/mod.rs b/crates/craft_retained/src/events/mod.rs
index aa8036d9..873dde81 100644
--- a/crates/craft_retained/src/events/mod.rs
+++ b/crates/craft_retained/src/events/mod.rs
@@ -78,6 +78,14 @@ impl CraftMessage {
         )
     }
 
+    pub(super) fn is_keyboard_event(&self) -> bool {
+        matches!(
+            self,
+            CraftMessage::KeyboardInputEvent(_)
+                | CraftMessage::ImeEvent(_)
+        )
+    }
+
     pub(super) fn is_got_or_lost_pointer_capture(&self) -> bool {
         matches!(
             self,
diff --git a/crates/craft_retained/src/layout/layout.rs b/crates/craft_retained/src/layout/layout.rs
index 3cc421f9..47f3bd73 100644
--- a/crates/craft_retained/src/layout/layout.rs
+++ b/crates/craft_retained/src/layout/layout.rs
@@ -1,3 +1,4 @@
+use crate::elements::scrollable::ScrollState;
 use craft_primitives::geometry::borders::{BOTTOM, CssRoundedRect, LEFT, RIGHT, TOP};
 use craft_primitives::geometry::{Border, ElementBox, Margin, Padding, Point, Rectangle, Size, TrblRectangle};
 use craft_renderer::renderer::BoxShadowCmd;
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index bd76078f..3ecb322d 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -50,7 +50,12 @@ fn main() {
                 .push(Text::new("Item 8").selectable(true))
                 .push(Text::new("Item 9").selectable(true))
                 .push(Text::new("Item 10").selectable(true))
-        });
+                .selected_item(6)
+        })
+        .push(Text::new("Sample text, this is sample text, hello!!!!!!!!!!!!!!!!!"))
+        .push(Text::new("Sample text, this is sample text, hello!!!!!!!!!!!!!!!!!"))
+        .push(Text::new("Sample text, this is sample text, hello!!!!!!!!!!!!!!!!!"))
+    ;
 
     craft_main(CraftOptions::basic("Counter"));
 }

From 2c51f5f9ee2e3492ca152e23e1c08961796418f8 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 21 Mar 2026 15:11:55 -0400
Subject: [PATCH 091/143] Fix focus for the slider

---
 crates/craft_retained/src/elements/slider/slider_element.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/crates/craft_retained/src/elements/slider/slider_element.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
index 3e1648f3..69e5533a 100644
--- a/crates/craft_retained/src/elements/slider/slider_element.rs
+++ b/crates/craft_retained/src/elements/slider/slider_element.rs
@@ -378,12 +378,9 @@ impl ElementInternals for SliderInner {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        // @HARDCODED
-        let focused = true;
-
         match message {
             CraftMessage::KeyboardInputEvent(key) => {
-                if key.state != KeyState::Down || !focused {
+                if key.state != KeyState::Down || !self.is_focused() {
                     return;
                 }
 
@@ -405,6 +402,7 @@ impl ElementInternals for SliderInner {
                 }
             }
             CraftMessage::PointerButtonUp(pointer_button_update) => {
+                self.focus();
                 self.dragging = false;
                 // FIXME: Turn pointer capture on with the correct device id.
                 self.release_pointer_capture(PointerId::new(1).unwrap());

From ce998bf7c2d1e02124cd23a4c526d87d9053c0fd Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 21 Mar 2026 18:23:43 -0400
Subject: [PATCH 092/143] Make hit_testable after start_overlay, so sorting is
 correct

---
 crates/craft_renderer/src/renderer.rs         |   8 +-
 .../craft_retained/src/elements/dropdown.rs   | 125 ++++++------------
 .../src/events/event_dispatch.rs              |   2 +-
 crates/craft_retained/src/events/helpers.rs   |   8 +-
 examples/counter_retained/main.rs             |   1 +
 5 files changed, 53 insertions(+), 91 deletions(-)

diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index d8c0227b..97aedcee 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -120,6 +120,13 @@ impl TargetItem {
             overlay_depth
         }
     }
+
+    // Sorts the items by the overlay depth and in ascending order.
+    pub fn sort_items_by_overlay_depth(targets: &mut Vec<TargetItem>) {
+        targets.sort_by(|t1, t2| {
+            t1.overlay_depth.cmp(&t2.overlay_depth)
+        });
+    }
 }
 
 pub struct RenderList {
@@ -250,7 +257,6 @@ impl RenderList {
     pub fn end_overlay(&mut self) {
         self.commands.push(RenderCommand::EndOverlay);
         self.current_overlay_depth -= 1;
-        assert!(self.current_overlay_depth >= 0)
     }
 
     #[inline(always)]
diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index c57842fd..51dfdc86 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -286,9 +286,9 @@ impl ElementInternals for DropdownInner {
     fn in_bounds(&self, point: Point) -> bool {
         let element_data = &self.element_data;
         let rect = element_data.layout.computed_box_transformed.border_rectangle();
-        let floating_window_rect = self.floating_window.layout.computed_box_transformed.border_rectangle();
+        //let floating_window_rect = self.floating_window.layout.computed_box_transformed.border_rectangle();
 
-        if !self.is_floating_window_hidden && floating_window_rect.contains(&point) {
+        if !self.is_floating_window_hidden {
             return true;
         }
 
@@ -314,7 +314,6 @@ impl ElementInternals for DropdownInner {
         if !self.is_visible() {
             return;
         }
-        self.add_hit_testable(renderer, true, scale_factor);
 
         // We draw the borders before we start any layers, so that we don't clip the borders.
         self.draw_borders(renderer, scale_factor);
@@ -324,8 +323,13 @@ impl ElementInternals for DropdownInner {
             binding.draw(renderer, text_context, pointer, scale_factor);
         }
 
+        if self.is_floating_window_hidden {
+            self.add_hit_testable(renderer, true, scale_factor);
+        }
+
         if !self.is_floating_window_hidden {
             renderer.start_overlay();
+            self.add_hit_testable(renderer, true, scale_factor);
 
             let current_style = self.floating_window.style.as_ref();
             self.floating_window.layout.draw_borders(renderer, current_style, scale_factor);
@@ -362,116 +366,69 @@ impl ElementInternals for DropdownInner {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        let pb = match message {
-            CraftMessage::PointerButtonUp(pb) => pb,
-            _ => return
-        };
-        let is_pointer_up = true;
-
-
-        // TODO Should pb.state.position be in logical coordinates?
-        let pointer_position = Point::new(pb.state.position.x, pb.state.position.y);
-        let is_pointer_in_select_box = self.element_data.layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
-        let is_pointer_in_window = self.floating_window.layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
-        let is_pointer_in_scrollbar = self.floating_window.layout.computed_scroll_track.contains(&pointer_position);
-
-        // Toggle the visibility of the floating window by the clicking of the dropdown select box.
-        if is_pointer_in_select_box && is_pointer_up {
-            self.is_floating_window_hidden = !self.is_floating_window_hidden;
-
-            if self.is_floating_window_hidden {
-                self.unfocus();
-                self.release_pointer_capture(PointerId::new(1).unwrap());
-            } else {
-                self.focus();
-            }
-
-            println!("HERE 1");
-            return;
+        if let CraftMessage::PointerButtonDown(pb) = message {
+            self.focus();
         }
 
+        if let CraftMessage::PointerButtonUp(pb) = message {
 
-        if is_pointer_in_window && !is_pointer_in_scrollbar && is_pointer_up {
-            for (child_index, child) in self.children().iter().map(|r| r.clone()).enumerate() {
-                let contains = child.borrow().element_data().layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
+            // TODO Should pb.state.position be in logical coordinates?
+            let pointer_position = Point::new(pb.state.position.x, pb.state.position.y);
+            let is_pointer_in_select_box = self.element_data.layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
+            let is_pointer_in_window = self.floating_window.layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
+            let is_pointer_in_scrollbar = self.floating_window.layout.computed_scroll_track.contains(&pointer_position);
 
-                if contains {
-                    self.is_floating_window_hidden = true;
-                    self.set_selected_element(child_index);
-                    self.unfocus();
-                    self.release_pointer_capture(PointerId::new(1).unwrap());
-                    println!("HERE 2");
-                    return;
-                }
+            if !self.is_floating_window_hidden && !is_pointer_in_window && !is_pointer_in_select_box {
+                self.is_floating_window_hidden = true;
             }
-        }
 
-        if !is_pointer_in_window && is_pointer_up && self.is_focused() {
-            self.unfocus();
-            self.release_pointer_capture(PointerId::new(1).unwrap());
-            println!("HERE 3");
-            return;
-        } else if !is_pointer_in_window && is_pointer_up {
-            self.is_floating_window_hidden = true;
-            self.unfocus();
-            self.release_pointer_capture(PointerId::new(1).unwrap());
-            println!("HERE 4");
-            return;
-        }
+            // Toggle the visibility of the floating window by the clicking of the dropdown select box.
+            if is_pointer_in_select_box {
+                self.is_floating_window_hidden = !self.is_floating_window_hidden;
 
-        return;
+                if self.is_floating_window_hidden {
+                    self.release_pointer_capture(PointerId::new(1).unwrap());
+                }
 
-        // ---
-        if is_pointer_in_select_box {
-            if self.is_floating_window_hidden {
-                self.focus();
-                self.set_pointer_capture(PointerId::new(1).unwrap());
-            } else {
-                self.unfocus();
-                self.release_pointer_capture(PointerId::new(1).unwrap());
+               //println!("HERE 1");
+                //return;
             }
 
-            self.is_floating_window_hidden = !self.is_floating_window_hidden;
-        } else {
-
-            if !self.is_floating_window_hidden && self.is_focused() {
-                self.is_floating_window_hidden = true;
-                return;
-            }
 
-        }
+            if is_pointer_in_window && !is_pointer_in_scrollbar {
+                let mut contained_one = false;
+                for (child_index, child) in self.children().iter().map(|r| r.clone()).enumerate() {
+                    let contains = child.borrow().element_data().layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
 
-        if is_pointer_in_window && !self.has_pointer_capture(PointerId::new(1).unwrap()) {
-            for (child_index, child) in self.children().iter().map(|r| r.clone()).enumerate() {
-                let contains = child.borrow().element_data().layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
+                    if contains {
+                        contained_one = true;
+                        self.set_selected_element(child_index);
+                        self.release_pointer_capture(PointerId::new(1).unwrap());
+                        //println!("HERE 2");
+                        break;
+                    }
+                }
 
-                if contains {
+                if contained_one {
                     self.is_floating_window_hidden = true;
-                    self.set_selected_element(child_index);
-                    self.unfocus();
-                    return;
                 }
             }
         }
-        // ---
+
 
         let floating_window = &mut self.floating_window;
         let result = handle_scroll_logic_advance(&*floating_window.style, &mut floating_window.layout, message, event);
-
         if result.request_apply_layout {
             request_apply_layout(self.element_data.layout.taffy_node_id.unwrap());
         }
-
         if result.set_pointer_capture {
             self.set_pointer_capture(PointerId::new(1).unwrap())
         } else if result.release_pointer_capture {
             self.release_pointer_capture(PointerId::new(1).unwrap());
         }
-        // ---
-
 
-        println!("Pointer Capture? {}", self.has_pointer_capture(PointerId::new(1).unwrap()));
-        println!("Focused? {}", self.is_focused())
+        //println!("Pointer Capture? {}", self.has_pointer_capture(PointerId::new(1).unwrap()));
+        //println!("Focused? {}", self.is_focused())
 
     }
 
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index 0f24c52e..f545942f 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -176,7 +176,7 @@ impl EventDispatcher {
                 let focus_ref = f.borrow();
                 if let Some(focus_ref) = focus_ref.clone() && let Some(focus) = focus_ref.upgrade() {
                     targets.clear();
-                    targets.push_back(focus)
+                    targets.push_back(focus);
                 }
             });
         }
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index cd71cb31..c46d116f 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -4,7 +4,7 @@ use std::rc::Rc;
 
 use craft_renderer::RenderList;
 use kurbo::Point;
-
+use craft_renderer::renderer::TargetItem;
 use crate::app::ELEMENTS;
 use crate::elements::ElementInternals;
 use crate::events::pointer_capture::find_pointer_capture_target;
@@ -38,9 +38,9 @@ pub(super) fn find_target(
     if let Some(target) = target {
         return target;
     }
-
-    render_list.targets.sort_by_key(|r| r.overlay_depth);
+    
     ELEMENTS.with_borrow_mut(|elements| {
+        TargetItem::sort_items_by_overlay_depth(&mut render_list.targets);
         target_scratch.extend(render_list.targets.iter().rev().filter_map(|target_item| {
             // When an element is removed from the dom, we do not remove it from targets.
             // So we must handle it here.
@@ -50,8 +50,6 @@ pub(super) fn find_target(
 
     // Otherwise do hit-testing:
 
-    //println!("targets: {}", target_scratch.len());
-
     for node in target_scratch.drain(..) {
         let should_pass_hit_test = mouse_position.is_some() && node.borrow().in_bounds(mouse_position.unwrap());
 
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index 3ecb322d..d8625004 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -55,6 +55,7 @@ fn main() {
         .push(Text::new("Sample text, this is sample text, hello!!!!!!!!!!!!!!!!!"))
         .push(Text::new("Sample text, this is sample text, hello!!!!!!!!!!!!!!!!!"))
         .push(Text::new("Sample text, this is sample text, hello!!!!!!!!!!!!!!!!!"))
+        .push(Slider::new(20.0))
     ;
 
     craft_main(CraftOptions::basic("Counter"));

From 18c527c60a87e66f436026c38631dde12b457a2a Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 21 Mar 2026 19:10:10 -0400
Subject: [PATCH 093/143] Improve box shadow colors

---
 .../craft_retained/src/elements/dropdown.rs   | 26 +++++++++----------
 examples/counter_retained/main.rs             | 13 +---------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index 51dfdc86..280eafe0 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -99,7 +99,6 @@ pub struct DropdownInner {
     is_floating_window_hidden: bool,
     selected_element: Option<Rc<RefCell<dyn ElementInternals>>>,
     selected_element_index: Option<usize>,
-    selected_bg_color: Option<Color>,
     hovered_bg_color: Option<Color>,
 }
 
@@ -118,33 +117,35 @@ impl Dropdown {
                 is_floating_window_hidden: true,
                 selected_element: None,
                 selected_element_index: None,
-                selected_bg_color: Some(Color::from_rgba8(109, 113, 228, 100)),
-                hovered_bg_color: Some(Color::from_rgba8(100, 100, 100, 100)),
+                hovered_bg_color: Some(Color::from_rgba8(213, 213, 215, 255)),
             })
         });
 
         inner.borrow_mut().element_data.create_layout_node(None);
         inner.borrow_mut().element_data.style.set_display(Display::Flex);
-        inner.borrow_mut().element_data.style.set_justify_content(Some(JustifyContent::Center));
+        //inner.borrow_mut().element_data.style.set_justify_content(Some(JustifyContent::Center));
         inner.borrow_mut().element_data.style.set_align_items(Some(AlignItems::Center));
+        inner.borrow_mut().element_data.style.set_box_shadows(vec![
+            BoxShadow::new(true, 0.0, 4.0, 8.0, 1.0, rgba(0, 0, 0, 255)),
+        ]);
+        inner.borrow_mut().element_data.style.set_padding(TrblRectangle::new_all(px(6.0)));
 
+        inner.borrow_mut().floating_window.style.set_background_color(Color::WHITE);
         inner.borrow_mut().floating_window.style.set_position(Position::Absolute);
         inner.borrow_mut().floating_window.style.set_display(Display::Flex);
         inner.borrow_mut().floating_window.style.set_flex_direction(FlexDirection::Column);
-
         inner.borrow_mut().floating_window.style.set_box_shadows(vec![
-            BoxShadow::new(false, 0.0, 4.0, 16.0, 0.0, rgba(0, 0, 0, 140)), // 0.55
-            BoxShadow::new(false, 0.0, 20.0, 60.0, 0.0, rgba(0, 0, 0, 90)),  // 0.35
+            BoxShadow::new(false, 0.0, 4.0, 8.0, 1.0, rgba(0, 0, 0, 255)),
         ]);
-
         let border_color = rgba(0, 0, 0, 64);
-        inner.borrow_mut().floating_window.style.set_padding(TrblRectangle::new_all(px(2.0)));
+        inner.borrow_mut().floating_window.style.set_padding(TrblRectangle::new_all(px(6.0)));
         inner.borrow_mut().floating_window.style.set_width(Unit::Percentage(100.0));
         inner.borrow_mut().floating_window.style.set_overflow([Overflow::Visible, Overflow::Scroll]);
         inner.borrow_mut().floating_window.style.set_border_color(TrblRectangle::new_all(border_color));
         inner.borrow_mut().floating_window.style.set_height(px(100.0));
         inner.borrow_mut().floating_window.style.set_max_height(px(100.0));
         inner.borrow_mut().floating_window.style.set_border_width(TrblRectangle::new_all(px(1)));
+        inner.borrow_mut().floating_window.style.set_border_radius([(5.0, 5.0); 4]);
 
         inner.borrow_mut().floating_window.create_taffy_node();
 
@@ -341,11 +342,8 @@ impl ElementInternals for DropdownInner {
                 child_rect.x = self.floating_window.layout.computed_box_transformed.position.x as f32;
                 child_rect.width = self.floating_window.layout.computed_box_transformed.size.width as f32;
 
-
-
-                if let Some(selected_index) = self.selected_element_index && index == selected_index {
-                    renderer.draw_rect(child_rect, self.selected_bg_color.unwrap());
-                } else if child.borrow_mut().element_data().is_hovered {
+                let is_selected = self.selected_element_index == Some(index);
+                if is_selected || child.borrow_mut().element_data().is_hovered {
                     renderer.draw_rect(child_rect, self.hovered_bg_color.unwrap());
                 }
 
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index d8625004..affcf11a 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -31,20 +31,9 @@ fn main() {
                 .height(Unit::Px(30.0))
                 .push(Text::new("Item 1").selectable(true))
                 .push(Text::new("Item 2").selectable(true))
-                .push(Text::new("Item 3")
-                    .border_color(border_color, border_color, border_color, border_color)
-                    .border_width(px(1), px(1), px(1), px(1))
-                    .border_radius((6.0, 6.0), (6.0, 6.0), (6.0, 6.0), (6.0, 6.0))
-                    .selectable(true))
+                .push(Text::new("Item 3").selectable(true))
                 .push(Text::new("Item 4").selectable(true))
                 .push(Text::new("Item 5").selectable(true))
-                .push(
-                    Slider::new(20.0)
-                        .min_width(Unit::Px(200.0))
-                        .width(Unit::Px(200.0))
-                        .height(Unit::Px(20.0))
-                        .min_height(Unit::Px(20.0))
-                )
                 .push(Text::new("Item 6").selectable(true))
                 .push(Text::new("Item 7").selectable(true))
                 .push(Text::new("Item 8").selectable(true))

From c32d007ca9cebc48681657b936f7980beaf56c11 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 21 Mar 2026 20:58:24 -0400
Subject: [PATCH 094/143] Improve the styling some more

---
 .../craft_retained/src/elements/dropdown.rs   | 122 ++++++++++++------
 examples/counter_retained/main.rs             |  31 ++---
 2 files changed, 97 insertions(+), 56 deletions(-)

diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index 280eafe0..3988d2d1 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -2,24 +2,22 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 
-use craft_primitives::geometry::{Rectangle, TrblRectangle};
-use craft_renderer::RenderList;
-use kurbo::{Affine, Point};
-use peniko::Color;
-use ui_events::pointer::PointerId;
-use crate::app::{request_apply_layout, CURRENT_WINDOW_ID, TAFFY_TREE, WINDOW_MANAGER};
-use crate::elements::{resolve_clip_for_scrollable, ElementInternals, AsElement, Element, ElementData, Window};
+use crate::app::{request_apply_layout, TAFFY_TREE};
 use crate::elements::element_data::ElementData as ElementDataStruct;
-use crate::elements::{scrollable};
 use crate::elements::scrollable::{apply_scroll_layout, draw_scrollbar, handle_scroll_logic_advance};
+use crate::elements::traits::DeepClone;
+use crate::elements::{resolve_clip_for_scrollable, AsElement, Element, ElementData, ElementInternals};
 use crate::events::{CraftMessage, Event};
 use crate::layout::layout::Layout;
 use crate::layout::TaffyTree;
-use crate::{px, rgb, rgba, CraftError};
-use crate::document::DocumentManager;
-use crate::elements::traits::DeepClone;
 use crate::style::{AlignItems, BoxShadow, Display, FlexDirection, JustifyContent, Overflow, Position, Style, Unit};
 use crate::text::text_context::TextContext;
+use crate::{px, rgba};
+use craft_primitives::geometry::{Rectangle, TrblRectangle};
+use craft_renderer::{Brush, RenderList};
+use kurbo::{Affine, Point, Vec2};
+use peniko::Color;
+use ui_events::pointer::PointerId;
 
 #[derive(Clone)]
 pub struct Dropdown {
@@ -96,9 +94,11 @@ impl Shape {
 pub struct DropdownInner {
     element_data: ElementDataStruct,
     floating_window: Shape,
+    arrow: Shape,
     is_floating_window_hidden: bool,
     selected_element: Option<Rc<RefCell<dyn ElementInternals>>>,
     selected_element_index: Option<usize>,
+    currently_hovered_element: Option<usize>,
     hovered_bg_color: Option<Color>,
 }
 
@@ -114,21 +114,28 @@ impl Dropdown {
             RefCell::new(DropdownInner {
                 element_data: ElementDataStruct::new(me.clone(), true),
                 floating_window: Shape::new(true),
+                arrow: Shape::new(false),
                 is_floating_window_hidden: true,
                 selected_element: None,
                 selected_element_index: None,
+                currently_hovered_element: None,
                 hovered_bg_color: Some(Color::from_rgba8(213, 213, 215, 255)),
             })
         });
 
+
+        let border_color = rgba(0, 0, 0, 64);
+        let border_width = px(1.0);
+        let border_radius = [(5.0, 5.0); 4];
+
         inner.borrow_mut().element_data.create_layout_node(None);
         inner.borrow_mut().element_data.style.set_display(Display::Flex);
-        //inner.borrow_mut().element_data.style.set_justify_content(Some(JustifyContent::Center));
+        inner.borrow_mut().element_data.style.set_justify_content(Some(JustifyContent::SpaceBetween));
         inner.borrow_mut().element_data.style.set_align_items(Some(AlignItems::Center));
-        inner.borrow_mut().element_data.style.set_box_shadows(vec![
-            BoxShadow::new(true, 0.0, 4.0, 8.0, 1.0, rgba(0, 0, 0, 255)),
-        ]);
-        inner.borrow_mut().element_data.style.set_padding(TrblRectangle::new_all(px(6.0)));
+        inner.borrow_mut().element_data.style.set_padding(TrblRectangle::new(px(2.5), px(0.0), px(2.5), px(6.0)));
+        inner.borrow_mut().element_data.style.set_border_width(TrblRectangle::new_all(border_width));
+        inner.borrow_mut().element_data.style.set_border_radius(border_radius);
+        inner.borrow_mut().element_data.style.set_border_color(TrblRectangle::new_all(border_color));
 
         inner.borrow_mut().floating_window.style.set_background_color(Color::WHITE);
         inner.borrow_mut().floating_window.style.set_position(Position::Absolute);
@@ -137,23 +144,28 @@ impl Dropdown {
         inner.borrow_mut().floating_window.style.set_box_shadows(vec![
             BoxShadow::new(false, 0.0, 4.0, 8.0, 1.0, rgba(0, 0, 0, 255)),
         ]);
-        let border_color = rgba(0, 0, 0, 64);
-        inner.borrow_mut().floating_window.style.set_padding(TrblRectangle::new_all(px(6.0)));
+        inner.borrow_mut().floating_window.style.set_padding(TrblRectangle::new(px(2.5), px(0.0), px(2.5), px(6.0)));
         inner.borrow_mut().floating_window.style.set_width(Unit::Percentage(100.0));
         inner.borrow_mut().floating_window.style.set_overflow([Overflow::Visible, Overflow::Scroll]);
-        inner.borrow_mut().floating_window.style.set_border_color(TrblRectangle::new_all(border_color));
-        inner.borrow_mut().floating_window.style.set_height(px(100.0));
+        inner.borrow_mut().floating_window.style.set_height(px(120.0));
         inner.borrow_mut().floating_window.style.set_max_height(px(100.0));
-        inner.borrow_mut().floating_window.style.set_border_width(TrblRectangle::new_all(px(1)));
-        inner.borrow_mut().floating_window.style.set_border_radius([(5.0, 5.0); 4]);
-
+        inner.borrow_mut().floating_window.style.set_border_width(TrblRectangle::new_all(border_width));
+        inner.borrow_mut().floating_window.style.set_border_radius(border_radius);
+        inner.borrow_mut().floating_window.style.set_border_color(TrblRectangle::new_all(border_color));
         inner.borrow_mut().floating_window.create_taffy_node();
 
-        // Set the floating window's parent to the Dropdown element.
+        inner.borrow_mut().arrow.style.set_width(px(12.0));
+        inner.borrow_mut().arrow.style.set_height(px(6.0));
+        inner.borrow_mut().arrow.style.set_margin(TrblRectangle::new(px(0.0), px(8.0), px(0.0), px(0.0)));
+        inner.borrow_mut().arrow.create_taffy_node();
+
+        // Set the floating window's parent and the arrow to the Dropdown element.
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let parent_id = inner.borrow_mut().element_data.layout.taffy_node_id();
-            let child_id = inner.borrow_mut().floating_window.layout.taffy_node_id();
-            taffy_tree.add_child(parent_id, child_id);
+            let floating_window_child_id = inner.borrow_mut().floating_window.layout.taffy_node_id();
+            let arrow_child_id = inner.borrow_mut().arrow.layout.taffy_node_id();
+            taffy_tree.add_child(parent_id, floating_window_child_id);
+            taffy_tree.add_child(parent_id, arrow_child_id);
         });
 
         Self { inner }
@@ -265,6 +277,7 @@ impl ElementInternals for DropdownInner {
 
 
         self.floating_window.apply_simple_layout(taffy_tree, transform, floating_window_position, z_index, scale_factor, None);
+        self.arrow.apply_simple_layout(taffy_tree, transform, self.element_data().layout.computed_box.position, z_index, scale_factor, self.element_data().layout.clip_bounds);
 
 
         let scroll_y = self.floating_window.layout.scroll_state.scroll_y() as f64;
@@ -328,6 +341,27 @@ impl ElementInternals for DropdownInner {
             self.add_hit_testable(renderer, true, scale_factor);
         }
 
+        // Draw the arrow
+        let arrow_rect = self.arrow.layout.computed_box_transformed.border_rectangle();
+        let thickness = 2.0 * scale_factor;
+        let mut path = kurbo::BezPath::new();
+        let left_x = arrow_rect.x as f64;
+        let right_x = (arrow_rect.x + arrow_rect.width) as f64;
+        let center_x = (arrow_rect.x + arrow_rect.width / 2.0) as f64;
+        let top_y = arrow_rect.y as f64;
+        let bottom_y = (arrow_rect.y + arrow_rect.height) as f64;
+        path.move_to(Point::new(left_x, top_y));
+        path.line_to(Point::new(center_x, bottom_y));
+        path.line_to(Point::new(right_x, top_y));
+        path.line_to(Point::new(right_x - thickness, top_y));
+        path.line_to(Point::new(center_x, bottom_y - thickness));
+        path.line_to(Point::new(left_x + thickness, top_y));
+        path.close_path();
+
+        path.apply_affine((Affine::IDENTITY).then_translate(Vec2::new(0.0, arrow_rect.height as f64 / 4.0)));
+        let arrow_color = Color::from_rgba8(75, 75, 77, 255);
+        renderer.fill_bez_path(path, Brush::Color(arrow_color));
+
         if !self.is_floating_window_hidden {
             renderer.start_overlay();
             self.add_hit_testable(renderer, true, scale_factor);
@@ -342,8 +376,8 @@ impl ElementInternals for DropdownInner {
                 child_rect.x = self.floating_window.layout.computed_box_transformed.position.x as f32;
                 child_rect.width = self.floating_window.layout.computed_box_transformed.size.width as f32;
 
-                let is_selected = self.selected_element_index == Some(index);
-                if is_selected || child.borrow_mut().element_data().is_hovered {
+                let is_hovered = self.currently_hovered_element == Some(index);
+                if is_hovered {
                     renderer.draw_rect(child_rect, self.hovered_bg_color.unwrap());
                 }
 
@@ -368,6 +402,29 @@ impl ElementInternals for DropdownInner {
             self.focus();
         }
 
+        // Refactor this!
+        if let CraftMessage::PointerMovedEvent(pb) = message {
+            let pointer_position = Point::new(pb.current.position.x, pb.current.position.y);
+            let is_pointer_in_window = self.floating_window.layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
+            let is_pointer_in_scrollbar = self.floating_window.layout.computed_scroll_track.contains(&pointer_position);
+
+            if is_pointer_in_window && !is_pointer_in_scrollbar {
+                let mut hovered_child = None;
+                for (child_index, child) in self.children().iter().map(|r| r.clone()).enumerate() {
+                    let contains = child.borrow().element_data().layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
+
+                    if contains {
+                        hovered_child = Some(child_index);
+                        break;
+                    }
+                }
+
+                if let Some(hovered_child) = hovered_child {
+                    self.currently_hovered_element = Some(hovered_child);
+                }
+            }
+        }
+
         if let CraftMessage::PointerButtonUp(pb) = message {
 
             // TODO Should pb.state.position be in logical coordinates?
@@ -383,13 +440,11 @@ impl ElementInternals for DropdownInner {
             // Toggle the visibility of the floating window by the clicking of the dropdown select box.
             if is_pointer_in_select_box {
                 self.is_floating_window_hidden = !self.is_floating_window_hidden;
+                self.currently_hovered_element = self.selected_element_index;
 
                 if self.is_floating_window_hidden {
                     self.release_pointer_capture(PointerId::new(1).unwrap());
                 }
-
-               //println!("HERE 1");
-                //return;
             }
 
 
@@ -402,7 +457,6 @@ impl ElementInternals for DropdownInner {
                         contained_one = true;
                         self.set_selected_element(child_index);
                         self.release_pointer_capture(PointerId::new(1).unwrap());
-                        //println!("HERE 2");
                         break;
                     }
                 }
@@ -424,10 +478,6 @@ impl ElementInternals for DropdownInner {
         } else if result.release_pointer_capture {
             self.release_pointer_capture(PointerId::new(1).unwrap());
         }
-
-        //println!("Pointer Capture? {}", self.has_pointer_capture(PointerId::new(1).unwrap()));
-        //println!("Focused? {}", self.is_focused())
-
     }
 
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index affcf11a..4e8cb915 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -19,27 +19,18 @@ fn main() {
         .gap(px(20), px(20))
         .push({
             Dropdown::new()
-                .box_shadows(vec![
-                    BoxShadow::new(true, 0.0, 20.0, 16.0, 0.0, rgba(0, 0, 0, 50)),  // 0.35
-                ])
-                .overflow(Default::default(), Overflow::Scroll)
-                .border_color(border_color, border_color, border_color, border_color)
-                .border_width(px(1), px(1), px(1), px(1))
-                .border_radius((6.0, 6.0), (6.0, 6.0), (6.0, 6.0), (6.0, 6.0))
-
                 .width(Unit::Px(100.0))
-                .height(Unit::Px(30.0))
-                .push(Text::new("Item 1").selectable(true))
-                .push(Text::new("Item 2").selectable(true))
-                .push(Text::new("Item 3").selectable(true))
-                .push(Text::new("Item 4").selectable(true))
-                .push(Text::new("Item 5").selectable(true))
-                .push(Text::new("Item 6").selectable(true))
-                .push(Text::new("Item 7").selectable(true))
-                .push(Text::new("Item 8").selectable(true))
-                .push(Text::new("Item 9").selectable(true))
-                .push(Text::new("Item 10").selectable(true))
-                .selected_item(6)
+                .push(Text::new("Item 1").font_size(20.0).selectable(true))
+                .push(Text::new("Item 2").font_size(20.0).selectable(true))
+                .push(Text::new("Item 3").font_size(20.0).selectable(true))
+                .push(Text::new("Item 4").font_size(20.0).selectable(true))
+                .push(Text::new("Item 5").font_size(20.0).selectable(true))
+                .push(Text::new("Item 6").font_size(20.0).selectable(true))
+                .push(Text::new("Item 7").font_size(20.0).selectable(true))
+                .push(Text::new("Item 8").font_size(20.0).selectable(true))
+                .push(Text::new("Item 9").font_size(20.0).selectable(true))
+                .push(Text::new("Item 10").font_size(20.0).selectable(true))
+                .selected_item(2)
         })
         .push(Text::new("Sample text, this is sample text, hello!!!!!!!!!!!!!!!!!"))
         .push(Text::new("Sample text, this is sample text, hello!!!!!!!!!!!!!!!!!"))

From c8eec2e7e85b48d2850c88516f966bf661965b4f Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 21 Mar 2026 21:07:12 -0400
Subject: [PATCH 095/143] Finish initial dropdown impl

needs a lot lot of refactoring soon
---
 .../craft_retained/src/elements/dropdown.rs   | 12 ++-
 .../src/elements/element_data.rs              |  6 +-
 .../src/elements/traits/element.rs            |  5 +-
 .../src/elements/traits/element_internals.rs  | 20 +++--
 crates/craft_retained/src/events/helpers.rs   | 10 ++-
 crates/craft_retained/src/events/mod.rs       |  1 +
 examples/counter_retained/main.rs             | 79 ++++++++++++-------
 7 files changed, 87 insertions(+), 46 deletions(-)

diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index 3988d2d1..ef1a7b53 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -2,7 +2,7 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 
-use crate::app::{request_apply_layout, TAFFY_TREE};
+use crate::app::{queue_event, request_apply_layout, TAFFY_TREE};
 use crate::elements::element_data::ElementData as ElementDataStruct;
 use crate::elements::scrollable::{apply_scroll_layout, draw_scrollbar, handle_scroll_logic_advance};
 use crate::elements::traits::DeepClone;
@@ -449,19 +449,23 @@ impl ElementInternals for DropdownInner {
 
 
             if is_pointer_in_window && !is_pointer_in_scrollbar {
-                let mut contained_one = false;
+                let mut should_hide_window = false;
                 for (child_index, child) in self.children().iter().map(|r| r.clone()).enumerate() {
                     let contains = child.borrow().element_data().layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
 
                     if contains {
-                        contained_one = true;
+                        should_hide_window = true;
                         self.set_selected_element(child_index);
                         self.release_pointer_capture(PointerId::new(1).unwrap());
+
+                        let new_event = Event::new(event.target.clone());
+                        queue_event(new_event, CraftMessage::DropdownItemSelected(child_index));
+                        
                         break;
                     }
                 }
 
-                if contained_one {
+                if should_hide_window {
                     self.is_floating_window_hidden = true;
                 }
             }
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index c095cabe..e6d26477 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -7,7 +7,7 @@ use crate::app::{ELEMENTS, TAFFY_TREE};
 use crate::elements::ElementInternals;
 use crate::elements::element_id::create_unique_element_id;
 use crate::elements::scrollable::{ScrollState, apply_scroll_layout};
-use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
+use crate::events::{DropdownItemSelectedHandler, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::layout::layout_context::LayoutContext;
 use crate::layout::layout::Layout;
 use crate::style::{Overflow, Style};
@@ -37,6 +37,7 @@ pub struct ElementData {
     pub(crate) internal_id: u64,
 
     // Events:
+    pub on_dropdown_item_selected: Vec<DropdownItemSelectedHandler>,
     pub on_slider_value_changed: Vec<SliderValueChangedHandler>,
     pub on_pointer_enter: Vec<PointerEnterHandler>,
     pub on_pointer_leave: Vec<PointerLeaveHandler>,
@@ -47,7 +48,6 @@ pub struct ElementData {
     pub on_pointer_moved: Vec<PointerUpdateHandler>,
     pub on_keyboard_input: Vec<KeyboardInputHandler>,
     pub on_scroll: Vec<ScrollHandler>,
-    pub is_hovered: bool
 }
 
 impl ElementData {
@@ -60,6 +60,7 @@ impl ElementData {
             children: Default::default(),
             id: None,
             internal_id: create_unique_element_id(),
+            on_dropdown_item_selected: Vec::new(),
             on_slider_value_changed: Vec::new(),
             on_pointer_enter: Vec::new(),
             on_pointer_leave: Vec::new(),
@@ -70,7 +71,6 @@ impl ElementData {
             on_pointer_moved: Vec::new(),
             on_keyboard_input: Vec::new(),
             on_scroll: Vec::new(),
-            is_hovered: false,
         };
 
         ELEMENTS.with_borrow_mut(|elements| {
diff --git a/crates/craft_retained/src/elements/traits/element.rs b/crates/craft_retained/src/elements/traits/element.rs
index 2cd600a1..a0590e55 100644
--- a/crates/craft_retained/src/elements/traits/element.rs
+++ b/crates/craft_retained/src/elements/traits/element.rs
@@ -1,5 +1,5 @@
 use std::cell::RefCell;
-use std::rc::{Rc, Weak};
+use std::rc::Rc;
 
 use craft_primitives::geometry::ElementBox;
 use craft_primitives::Color;
@@ -9,12 +9,11 @@ use winit::event::WindowEvent::{CursorMoved, MouseInput};
 use winit::event::{DeviceId, ElementState, MouseButton};
 
 use crate::app::queue_window_event;
-use crate::elements::{AsElement, ContainerInner, ElementInternals};
 use crate::elements::scrollable::{ScrollOptions, ScrollState};
+use crate::elements::{AsElement, ElementInternals};
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler};
 use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Underline, Unit};
 use crate::CraftError;
-use crate::elements::element_data::ElementData;
 
 /// Exposes a fluent/builder-pattern like API for elements.
 /// Setters in this trait return Self and have no prefix.
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index f7d71130..c48b3f5c 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -5,24 +5,22 @@ use std::sync::Arc;
 
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::{Action, Role};
-use craft_primitives::geometry::borders::CssRoundedRect;
 use craft_primitives::geometry::{ElementBox, Rectangle, TrblRectangle};
 use craft_renderer::RenderList;
-use kurbo::{Affine, Point, Vec2};
+use kurbo::{Affine, Point};
 use peniko::Color;
 use ui_events::pointer::PointerId;
 
-use crate::CraftError;
 use crate::app::{DOCUMENTS, ELEMENTS, FOCUS, TAFFY_TREE};
 use crate::document::Document;
-use crate::elements::{AsElement};
 use crate::elements::scrollable::{draw_scrollbar, ScrollState};
 use crate::elements::{ElementData, ElementIdMap, ScrollOptions, WindowInternal};
-use crate::events::{CraftMessage, Event, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
+use crate::events::{CraftMessage, DropdownItemSelectedHandler, Event, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
+use crate::layout::layout::Layout;
 use crate::layout::TaffyTree;
-use crate::layout::layout::{CssComputedBorder, Layout, draw_borders_generic};
 use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Style, Underline, Unit};
 use crate::text::text_context::TextContext;
+use crate::CraftError;
 
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
 pub trait ElementInternals: ElementData + Any {
@@ -538,6 +536,16 @@ pub trait ElementInternals: ElementData + Any {
         self.element_data_mut().on_pointer_enter.push(on_pointer_enter);
     }
 
+    fn on_dropdown_item_selected(&mut self, on_dropdown_item_selected: DropdownItemSelectedHandler) -> &mut Self
+    where
+        Self: Sized,
+    {
+        self.element_data_mut()
+            .on_dropdown_item_selected
+            .push(on_dropdown_item_selected);
+        self
+    }
+
     fn on_slider_value_changed(&mut self, on_slider_value_changed: SliderValueChangedHandler) -> &mut Self
     where
         Self: Sized,
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index c46d116f..6df02abb 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -70,7 +70,6 @@ pub(super) fn call_user_event_handlers(
 ) {
     match message {
         CraftMessage::PointerEnter() => {
-            current_target.borrow_mut().element_data_mut().is_hovered = true;
             let mut element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_pointer_enter {
@@ -78,7 +77,6 @@ pub(super) fn call_user_event_handlers(
             }
         }
         CraftMessage::PointerLeave() => {
-            current_target.borrow_mut().element_data_mut().is_hovered = false;
             let mut element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_pointer_leave {
@@ -118,7 +116,13 @@ pub(super) fn call_user_event_handlers(
         CraftMessage::TextInputChanged(_) => {}
         CraftMessage::LinkClicked(_) => {}
         CraftMessage::DropdownToggled(_) => {}
-        CraftMessage::DropdownItemSelected(_) => {}
+        CraftMessage::DropdownItemSelected(item) => {
+            let element_data = current_target.borrow().element_data().clone();
+
+            for handler in &element_data.on_dropdown_item_selected {
+                (*handler)(event, *item);
+            }
+        }
         CraftMessage::SwitchToggled(_) => {}
         CraftMessage::SliderValueChanged(slider_value) => {
             let element_data = current_target.borrow().element_data().clone();
diff --git a/crates/craft_retained/src/events/mod.rs b/crates/craft_retained/src/events/mod.rs
index 873dde81..731e6307 100644
--- a/crates/craft_retained/src/events/mod.rs
+++ b/crates/craft_retained/src/events/mod.rs
@@ -25,6 +25,7 @@ use crate::utils::cloneable_any::CloneableAny;
 
 pub type PointerEventHandler = Rc<dyn Fn(&mut Event, &PointerButtonEvent)>;
 pub type PointerCaptureHandler = Rc<dyn Fn(&mut Event)>;
+pub type DropdownItemSelectedHandler = Rc<dyn Fn(&mut Event, usize)>;
 pub type SliderValueChangedHandler = Rc<dyn Fn(&mut Event, f64)>;
 pub type PointerEnterHandler = Rc<dyn Fn(&mut Event)>;
 pub type PointerLeaveHandler = Rc<dyn Fn(&mut Event)>;
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index 4e8cb915..469df1d9 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -1,42 +1,67 @@
-use std::path::PathBuf;
-use std::str::FromStr;
-use craft_retained::elements::{Dropdown, Element, Image, Slider, Text, TextInput, Window};
-use craft_retained::style::{AlignItems, BoxShadow, FlexDirection, JustifyContent, Overflow, Unit};
-use craft_retained::{craft_main, pct, px, rgba, Color, CraftOptions, ResourceIdentifier};
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use craft_retained::elements::{Container, Element, Text, Window};
+use craft_retained::events::ui_events::pointer::PointerButton;
+use craft_retained::style::{AlignItems, BoxShadow, FlexDirection, JustifyContent};
+use craft_retained::{Color, CraftOptions, craft_main, pct, px, rgb, rgba};
 use util::setup_logging;
 
-fn main() {
+fn create_button(label: &str, base_color: Color, delta: i64, state: Rc<RefCell<i64>>, count_text: Text) -> Container {
+    let border_color = rgb(0, 0, 0);
+    Container::new()
+        .box_shadows(vec![
+            BoxShadow::new(false, 0.0, 5.0, 5.0, 0.0, rgba(0, 0, 0, 200)),
+            BoxShadow::new(false, 0.0, 25.0, 35.0, 0.0, rgba(0, 0, 0, 150)),
+            BoxShadow::new(true, 0.0, 4.0, 4.0, 0.0, rgba(255, 255, 255, 120)),
+        ])
+        .border_width(px(0), px(0), px(0), px(0))
+        .border_color(border_color, border_color, border_color, border_color)
+        .border_radius((8.0, 8.0), (8.0, 8.0), (8.0, 8.0), (8.0, 8.0))
+        .padding(px(15), px(30), px(15), px(30))
+        .justify_content(Some(JustifyContent::Center))
+        .background_color(base_color)
+        .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {
+            if pointer_button_event.button == Some(PointerButton::Primary) {
+                *state.borrow_mut() += delta;
+                count_text.clone().text(&format!("Count: {}", state.borrow()));
+                event.prevent_propagate();
+            }
+        }))
+        .push(Text::new(label).font_size(24.0).color(Color::WHITE).selectable(false))
+}
+
+pub(crate) fn main() {
     setup_logging();
+    let count = Rc::new(RefCell::new(0));
+    let count_text = Text::new(&format!("Count: {}", count.borrow()));
 
-    let border_color = rgba(0, 0, 0, 255);
     Window::new("Counter")
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::Center))
         .align_items(Some(AlignItems::Center))
-        .background_color(Color::WHITE)
         .width(pct(100))
         .height(pct(100))
         .gap(px(20), px(20))
+        .push(count_text.clone())
         .push({
-            Dropdown::new()
-                .width(Unit::Px(100.0))
-                .push(Text::new("Item 1").font_size(20.0).selectable(true))
-                .push(Text::new("Item 2").font_size(20.0).selectable(true))
-                .push(Text::new("Item 3").font_size(20.0).selectable(true))
-                .push(Text::new("Item 4").font_size(20.0).selectable(true))
-                .push(Text::new("Item 5").font_size(20.0).selectable(true))
-                .push(Text::new("Item 6").font_size(20.0).selectable(true))
-                .push(Text::new("Item 7").font_size(20.0).selectable(true))
-                .push(Text::new("Item 8").font_size(20.0).selectable(true))
-                .push(Text::new("Item 9").font_size(20.0).selectable(true))
-                .push(Text::new("Item 10").font_size(20.0).selectable(true))
-                .selected_item(2)
-        })
-        .push(Text::new("Sample text, this is sample text, hello!!!!!!!!!!!!!!!!!"))
-        .push(Text::new("Sample text, this is sample text, hello!!!!!!!!!!!!!!!!!"))
-        .push(Text::new("Sample text, this is sample text, hello!!!!!!!!!!!!!!!!!"))
-        .push(Slider::new(20.0))
-    ;
+            Container::new()
+                .gap(px(20), px(20))
+                .push(create_button(
+                    "-",
+                    rgb(244, 63, 94),
+                    -1,
+                    count.clone(),
+                    count_text.clone(),
+                ))
+                .push(create_button(
+                    "+",
+                    rgb(16, 185, 129),
+                    1,
+                    count.clone(),
+                    count_text.clone(),
+                ))
+        });
 
     craft_main(CraftOptions::basic("Counter"));
 }

From e3e78e69289403a84b952173fda2294bf95bf20e Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 21 Mar 2026 21:21:46 -0400
Subject: [PATCH 096/143] Fix window merge conflict bugs

---
 crates/craft_retained/src/elements/window.rs | 32 +++++++++++---------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 7870b2cf..32ba284c 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -137,14 +137,14 @@ impl ElementInternals for WindowInternal {
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
     ) {
-        let node = self.element_data.layout_item.taffy_node_id.unwrap();
-        let layout = taffy_tree.layout(node);
-        let has_new_layout = taffy_tree.get_has_new_layout(node);
+        let node = self.element_data.layout.taffy_node_id.unwrap();
+        let layout = taffy_tree.get_layout(node);
+        let has_new_layout = taffy_tree.has_new_layout(node);
 
         let dirty = has_new_layout
-            || transform != self.element_data.layout_item.get_transform()
-            || position != self.element_data.layout_item.position;
-        self.element_data.layout_item.has_new_layout = has_new_layout;
+            || transform != self.element_data.layout.get_transform()
+            || position != self.element_data.layout.position;
+        self.element_data.layout.has_new_layout = has_new_layout;
 
         if dirty {
             self.resolve_box(position, transform, layout, z_index);
@@ -152,13 +152,13 @@ impl ElementInternals for WindowInternal {
             // For scroll changes from taffy;
             self.element_data.apply_scroll(layout);
             self.apply_clip(clip_bounds);
-            self.element_data.scroll_state.mark_old();
+            self.element_data.layout.scroll_state.mark_old();
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.scroll_state.is_new() {
+        if !dirty && self.element_data.layout.scroll_state.is_new() {
             self.element_data.apply_scroll(layout);
-            self.element_data.scroll_state.mark_old();
+            self.element_data.layout.scroll_state.mark_old();
         }
 
         if has_new_layout {
@@ -217,7 +217,7 @@ impl ElementInternals for WindowInternal {
 
         let padding_box = self
             .element_data
-            .layout_item
+            .layout
             .computed_box_transformed
             .padding_rectangle()
             .scale(scale_factor);
@@ -252,7 +252,7 @@ impl ElementInternals for WindowInternal {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        scrollable::on_scroll_events(self, message, event);
+        scrollable::handle_scroll_logic(self, message, event);
     }
 
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
@@ -269,8 +269,8 @@ impl ElementInternals for WindowInternal {
 
         // Add the children's taffy node.
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let parent_id = self.element_data.layout_item.taffy_node_id.unwrap();
-            let child_id = child.borrow().element_data().layout_item.taffy_node_id;
+            let parent_id = self.element_data.layout.taffy_node_id.unwrap();
+            let child_id = child.borrow().element_data().layout.taffy_node_id;
             if let Some(child_id) = child_id {
                 taffy_tree.add_child(parent_id, child_id);
             }
@@ -284,6 +284,10 @@ impl ElementInternals for WindowInternal {
     fn as_any_mut(&mut self) -> &mut dyn Any {
         self
     }
+
+    fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        todo!()
+    }
 }
 
 impl Window {
@@ -657,7 +661,7 @@ impl WindowInternal {
     fn layout_window(&mut self, text_context: &mut TextContext, resource_manager: Arc<ResourceManager>) -> NodeId {
         let root_node = self
             .element_data
-            .layout_item
+            .layout
             .taffy_node_id
             .expect("A root element must have a layout node.");
 

From bc250548ff4f3cda56b62cabe13b9993bad07ea8 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 21 Mar 2026 21:26:21 -0400
Subject: [PATCH 097/143] Rearrange imports

---
 crates/craft_retained/src/elements/traits/element.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/craft_retained/src/elements/traits/element.rs b/crates/craft_retained/src/elements/traits/element.rs
index a0590e55..63e178d9 100644
--- a/crates/craft_retained/src/elements/traits/element.rs
+++ b/crates/craft_retained/src/elements/traits/element.rs
@@ -3,17 +3,18 @@ use std::rc::Rc;
 
 use craft_primitives::geometry::ElementBox;
 use craft_primitives::Color;
+
 use ui_events::pointer::PointerId;
 use winit::dpi::PhysicalPosition;
 use winit::event::WindowEvent::{CursorMoved, MouseInput};
 use winit::event::{DeviceId, ElementState, MouseButton};
 
+use crate::CraftError;
 use crate::app::queue_window_event;
 use crate::elements::scrollable::{ScrollOptions, ScrollState};
 use crate::elements::{AsElement, ElementInternals};
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler};
 use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Underline, Unit};
-use crate::CraftError;
 
 /// Exposes a fluent/builder-pattern like API for elements.
 /// Setters in this trait return Self and have no prefix.

From ae08bf5c3d23f5a41e58f6ec703410058f639e87 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 21 Mar 2026 21:32:47 -0400
Subject: [PATCH 098/143] Fix linting warnings

---
 crates/craft_renderer/src/renderer.rs                       | 2 +-
 crates/craft_retained/src/elements/dropdown.rs              | 4 ++--
 crates/craft_retained/src/elements/scrollable.rs            | 2 +-
 crates/craft_retained/src/elements/slider/slider_logic.rs   | 2 +-
 .../craft_retained/src/elements/traits/element_internals.rs | 6 ++----
 crates/craft_retained/src/events/event_dispatch.rs          | 2 +-
 crates/craft_retained/src/events/helpers.rs                 | 4 ++--
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index 97aedcee..a360fbf5 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -122,7 +122,7 @@ impl TargetItem {
     }
 
     // Sorts the items by the overlay depth and in ascending order.
-    pub fn sort_items_by_overlay_depth(targets: &mut Vec<TargetItem>) {
+    pub fn sort_items_by_overlay_depth(targets: &mut [TargetItem]) {
         targets.sort_by(|t1, t2| {
             t1.overlay_depth.cmp(&t2.overlay_depth)
         });
diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index ef1a7b53..5a6397dc 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -398,7 +398,7 @@ impl ElementInternals for DropdownInner {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        if let CraftMessage::PointerButtonDown(pb) = message {
+        if let CraftMessage::PointerButtonDown(_pb) = message {
             self.focus();
         }
 
@@ -460,7 +460,7 @@ impl ElementInternals for DropdownInner {
 
                         let new_event = Event::new(event.target.clone());
                         queue_event(new_event, CraftMessage::DropdownItemSelected(child_index));
-                        
+
                         break;
                     }
                 }
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 6345f0b4..b6d9f02c 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -241,7 +241,7 @@ pub struct HandleScrollLogicResult {
 }
 
 pub(crate) fn handle_scroll_logic(element: &mut dyn ElementInternals, message: &CraftMessage, event: &mut Event) {
-    let mut element_data  = element.element_data_mut();
+    let element_data  = element.element_data_mut();
     let result = handle_scroll_logic_advance(&*element_data.style, &mut element_data.layout, message, event);
 
     if result.request_apply_layout {
diff --git a/crates/craft_retained/src/elements/slider/slider_logic.rs b/crates/craft_retained/src/elements/slider/slider_logic.rs
index 8b080c8a..5e1249b9 100644
--- a/crates/craft_retained/src/elements/slider/slider_logic.rs
+++ b/crates/craft_retained/src/elements/slider/slider_logic.rs
@@ -2,7 +2,7 @@ use kurbo::Point;
 
 use crate::elements::{ElementData};
 use crate::elements::slider::slider_element::SliderDirection;
-use crate::elements::{ElementInternals, SliderInner};
+use crate::elements::SliderInner;
 
 impl SliderInner {
     pub(super) fn compute_step(&self, by: i32, current_value: f64) -> f64 {
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index d5743d69..c6016c97 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -6,17 +6,15 @@ use std::sync::Arc;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::{Action, Role};
 
-use kurbo::{Affine, Point, Vec2};
+use kurbo::{Affine, Point};
 
 use ui_events::pointer::PointerId;
 
-use craft_primitives::geometry::borders::CssRoundedRect;
 use craft_primitives::geometry::{ElementBox, Rectangle, TrblRectangle};
 
 use craft_renderer::RenderList;
 
 use crate::Color;
-
 use crate::CraftError;
 use crate::app::{ELEMENTS, FOCUS, TAFFY_TREE};
 use crate::elements::scrollable::{draw_scrollbar, ScrollState};
@@ -24,7 +22,7 @@ use crate::elements::{ElementData, ElementIdMap, ScrollOptions, WindowInternal};
 use crate::events::pointer_capture::PointerCapture;
 use crate::events::{CraftMessage, DropdownItemSelectedHandler, Event, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::layout::TaffyTree;
-use crate::layout::layout::{CssComputedBorder, Layout, draw_borders_generic};
+use crate::layout::layout::Layout;
 use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Style, Underline, Unit};
 use crate::text::text_context::TextContext;
 
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index 927d2522..4d404e2a 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -8,7 +8,7 @@ use craft_renderer::RenderList;
 use crate::app::{dequeue_event, FOCUS};
 use crate::elements::ElementInternals;
 use crate::events::helpers::{call_default_element_event_handler, call_user_event_handlers, find_target, freeze_target_list};
-use crate::events::{CraftMessage, Event, FocusAction};
+use crate::events::{CraftMessage, Event};
 use crate::text::text_context::TextContext;
 
 pub(super) fn dispatch_capturing_event(
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index 29cc1e36..821a6d5e 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -71,14 +71,14 @@ pub(super) fn call_user_event_handlers(
 ) {
     match message {
         CraftMessage::PointerEnter() => {
-            let mut element_data = current_target.borrow().element_data().clone();
+            let element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_pointer_enter {
                 (*handler)(event);
             }
         }
         CraftMessage::PointerLeave() => {
-            let mut element_data = current_target.borrow().element_data().clone();
+            let element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_pointer_leave {
                 (*handler)(event);

From 8c471c72262a60db385ff4813f8c052720c1621f Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 21 Mar 2026 21:50:04 -0400
Subject: [PATCH 099/143] Fix linting warnings

---
 crates/craft_retained/src/elements/dropdown.rs     | 14 ++++++--------
 crates/craft_retained/src/elements/scrollable.rs   | 12 +++++-------
 .../src/elements/traits/deep_clone.rs              |  2 +-
 crates/craft_retained/src/layout/mod.rs            |  1 +
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index 5a6397dc..358cc627 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -307,12 +307,10 @@ impl ElementInternals for DropdownInner {
         }
 
         if let Some(clip) = element_data.layout.clip_bounds {
-            let rect_intersection = match rect.intersection(&clip) {
+            match rect.intersection(&clip) {
                 Some(bounds) => bounds.contains(&point),
                 None => false,
-            };
-
-            rect_intersection
+            }
         } else {
             rect.contains(&point)
         }
@@ -374,7 +372,7 @@ impl ElementInternals for DropdownInner {
             for (index, child) in self.children().iter().enumerate() {
                 let mut child_rect = child.borrow_mut().element_data().layout.computed_box_transformed.border_rectangle();
                 child_rect.x = self.floating_window.layout.computed_box_transformed.position.x as f32;
-                child_rect.width = self.floating_window.layout.computed_box_transformed.size.width as f32;
+                child_rect.width = self.floating_window.layout.computed_box_transformed.size.width;
 
                 let is_hovered = self.currently_hovered_element == Some(index);
                 if is_hovered {
@@ -410,7 +408,7 @@ impl ElementInternals for DropdownInner {
 
             if is_pointer_in_window && !is_pointer_in_scrollbar {
                 let mut hovered_child = None;
-                for (child_index, child) in self.children().iter().map(|r| r.clone()).enumerate() {
+                for (child_index, child) in self.children().iter().cloned().enumerate() {
                     let contains = child.borrow().element_data().layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
 
                     if contains {
@@ -450,7 +448,7 @@ impl ElementInternals for DropdownInner {
 
             if is_pointer_in_window && !is_pointer_in_scrollbar {
                 let mut should_hide_window = false;
-                for (child_index, child) in self.children().iter().map(|r| r.clone()).enumerate() {
+                for (child_index, child) in self.children().iter().cloned().enumerate() {
                     let contains = child.borrow().element_data().layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
 
                     if contains {
@@ -473,7 +471,7 @@ impl ElementInternals for DropdownInner {
 
 
         let floating_window = &mut self.floating_window;
-        let result = handle_scroll_logic_advance(&*floating_window.style, &mut floating_window.layout, message, event);
+        let result = handle_scroll_logic_advance(&floating_window.style, &mut floating_window.layout, message, event);
         if result.request_apply_layout {
             request_apply_layout(self.element_data.layout.taffy_node_id.unwrap());
         }
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index b6d9f02c..1930575a 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -242,7 +242,7 @@ pub struct HandleScrollLogicResult {
 
 pub(crate) fn handle_scroll_logic(element: &mut dyn ElementInternals, message: &CraftMessage, event: &mut Event) {
     let element_data  = element.element_data_mut();
-    let result = handle_scroll_logic_advance(&*element_data.style, &mut element_data.layout, message, event);
+    let result = handle_scroll_logic_advance(&element_data.style, &mut element_data.layout, message, event);
 
     if result.request_apply_layout {
         request_apply_layout(element.element_data().layout.taffy_node_id());
@@ -288,8 +288,8 @@ pub(crate) fn handle_scroll_logic_advance(style: &Style, layout: &mut Layout, me
                 event.prevent_propagate();
                 event.prevent_defaults();
             }
-            CraftMessage::PointerButtonDown(pointer_button) => {
-                if pointer_button.button == Some(ui_events::pointer::PointerButton::Primary) {
+            CraftMessage::PointerButtonDown(pointer_button)
+                if pointer_button.button == Some(ui_events::pointer::PointerButton::Primary) => {
                     // DEVICE(TOUCH): Handle scrolling within the content area on touch based input devices.
                     if pointer_button.pointer.pointer_type == PointerType::Touch {
                         let container_rectangle = layout.computed_box_transformed.padding_rectangle();
@@ -339,17 +339,15 @@ pub(crate) fn handle_scroll_logic_advance(style: &Style, layout: &mut Layout, me
                         event.prevent_propagate();
                         event.prevent_defaults();
                     }
-                }
             }
-            CraftMessage::PointerButtonUp(_pointer_button) => {
-                if state.scroll_click.is_some() {
+            CraftMessage::PointerButtonUp(_pointer_button)
+                if state.scroll_click.is_some() => {
                     state.scroll_click = None;
                     event.prevent_propagate();
                     event.prevent_defaults();
 
                     result.release_pointer_capture = true;
                 }
-            }
             CraftMessage::PointerMovedEvent(pointer_motion) => {
                 if let Some(click) = state.scroll_click {
                     // Todo: Translate scroll wheel pixel to scroll position for diff.
diff --git a/crates/craft_retained/src/elements/traits/deep_clone.rs b/crates/craft_retained/src/elements/traits/deep_clone.rs
index a33b0960..0c1d3d60 100644
--- a/crates/craft_retained/src/elements/traits/deep_clone.rs
+++ b/crates/craft_retained/src/elements/traits/deep_clone.rs
@@ -28,13 +28,13 @@ impl<T> DeepClone for T where T: ElementInternals + Clone + 'static {
            request_apply_layout(*node_id);
            request_layout(*node_id);
 
+            let node_id_copy = *node_id;
             let mut new_children = Vec::new();
             for child in &new_data.children {
                 let new_child = child.borrow().deep_clone();
                 new_children.push(new_child.clone());
 
                 let new_child_copy = new_child.clone();
-                let node_id_copy = node_id.clone();
                 TAFFY_TREE.with_borrow_mut(move |taffy_tree| {
                     taffy_tree.add_child(node_id_copy, new_child_copy.borrow().element_data().layout.taffy_node_id.unwrap());
                 });
diff --git a/crates/craft_retained/src/layout/mod.rs b/crates/craft_retained/src/layout/mod.rs
index 1bb94acd..93eeb0be 100644
--- a/crates/craft_retained/src/layout/mod.rs
+++ b/crates/craft_retained/src/layout/mod.rs
@@ -1,4 +1,5 @@
 pub mod layout_context;
+#[allow(clippy::module_inception)]
 pub mod layout;
 mod taffy_tree;
 

From 7b067a5df8bae0532edec1e2b8a7d32f44c6506e Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 00:09:38 -0400
Subject: [PATCH 100/143] Add example and organize file.

---
 .../craft_retained/src/elements/dropdown.rs   | 573 +++++++++++-------
 1 file changed, 369 insertions(+), 204 deletions(-)

diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index 358cc627..803780b2 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -1,24 +1,51 @@
+//! An element to select a single item from a collapsable vertical list of options.
+
 use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 
-use crate::app::{queue_event, request_apply_layout, TAFFY_TREE};
+use craft_primitives::geometry::{Rectangle, TrblRectangle};
+
+use craft_renderer::{Brush, RenderList};
+
+use kurbo::{Affine, Point, Vec2};
+
+use peniko::Color;
+
+use ui_events::pointer::PointerId;
+
+use crate::app::{TAFFY_TREE, queue_event, request_apply_layout};
 use crate::elements::element_data::ElementData as ElementDataStruct;
 use crate::elements::scrollable::{apply_scroll_layout, draw_scrollbar, handle_scroll_logic_advance};
 use crate::elements::traits::DeepClone;
-use crate::elements::{resolve_clip_for_scrollable, AsElement, Element, ElementData, ElementInternals};
+use crate::elements::{AsElement, Element, ElementData, ElementInternals, resolve_clip_for_scrollable};
 use crate::events::{CraftMessage, Event};
-use crate::layout::layout::Layout;
 use crate::layout::TaffyTree;
+use crate::layout::layout::Layout;
 use crate::style::{AlignItems, BoxShadow, Display, FlexDirection, JustifyContent, Overflow, Position, Style, Unit};
 use crate::text::text_context::TextContext;
 use crate::{px, rgba};
-use craft_primitives::geometry::{Rectangle, TrblRectangle};
-use craft_renderer::{Brush, RenderList};
-use kurbo::{Affine, Point, Vec2};
-use peniko::Color;
-use ui_events::pointer::PointerId;
 
+/// An element to select a single item from a collapsable vertical list of options.
+///
+/// # Example
+///
+/// ```no_run
+/// use craft_retained::elements::{Dropdown, Element, Text, Window};
+/// use craft_retained::{CraftOptions, craft_main, px};
+///
+/// fn main() {
+///     Window::new("Dropdown").push(
+///         Dropdown::new()
+///             .width(px(100))
+///             .push(Text::new("Item 1").font_size(20.0).selectable(false))
+///             .push(Text::new("Item 2").font_size(20.0).selectable(false))
+///             .push(Text::new("Item 3").font_size(20.0).selectable(false))
+///             .selected_item(0),
+///     );
+///     craft_main(CraftOptions::basic("Dropdown"));
+/// }
+/// ```
 #[derive(Clone)]
 pub struct Dropdown {
     pub inner: Rc<RefCell<DropdownInner>>,
@@ -30,63 +57,6 @@ pub struct Shape {
     pub style: Box<Style>,
 }
 
-impl Shape {
-    pub fn new(is_scrollable: bool) -> Self {
-        let layout = Layout::new(is_scrollable);
-        let style = Style::new();
-
-        Self {
-            layout,
-            style
-        }
-    }
-
-    pub fn create_taffy_node(&mut self) {
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let style = self.style.to_taffy_style();
-            let node_id = taffy_tree.new_leaf(style);
-            self.layout.taffy_node_id = Some(node_id);
-        });
-    }
-
-    pub fn apply_simple_layout(&mut self, taffy_tree: &mut TaffyTree, transform: Affine, position: Point, z_index: &mut u32, scale_factor: f64, clip_bounds: Option<Rectangle>) {
-        let node = self.layout.taffy_node_id();
-        let taffy_layout = taffy_tree.get_layout(node);
-        self.layout.has_new_layout = taffy_tree.has_new_layout(node);
-
-        let dirty = self.layout.has_new_layout
-            || transform != self.layout.get_transform()
-            || position != self.layout.position;
-
-        if dirty {
-            self.layout.resolve_box(position, transform, taffy_layout, z_index, self.style.get_position());
-
-            // Refactor START
-            let current_style = &self.style;
-            let has_border = current_style.has_border();
-            let border_radius = current_style.get_border_radius();
-            let border_color = &current_style.get_border_color();
-            let box_shadows = current_style.get_box_shadows();
-            self.layout.apply_borders(has_border, border_radius, scale_factor, border_color, box_shadows);
-            // Refactor END
-
-            // For scroll changes from taffy;
-            apply_scroll_layout(&self.style, &mut self.layout, taffy_layout);
-            self.layout.resolve_clip_for_scrollable(clip_bounds); // self.apply_clip
-            self.layout.scroll_state.mark_old();
-        }
-
-        // For manual scroll updates.
-        if !dirty && self.layout.scroll_state.is_new()
-        {
-            apply_scroll_layout(&self.style, &mut self.layout, taffy_layout);
-            self.layout.scroll_state.mark_old();
-        }
-
-        taffy_tree.mark_seen(node);
-    }
-}
-
 /// Stores one or more elements.
 ///
 /// If overflow is set to scroll, it will become scrollable.
@@ -108,81 +78,6 @@ impl Default for Dropdown {
     }
 }
 
-impl Dropdown {
-    pub fn new() -> Self {
-        let inner = Rc::new_cyclic(|me: &Weak<RefCell<DropdownInner>>| {
-            RefCell::new(DropdownInner {
-                element_data: ElementDataStruct::new(me.clone(), true),
-                floating_window: Shape::new(true),
-                arrow: Shape::new(false),
-                is_floating_window_hidden: true,
-                selected_element: None,
-                selected_element_index: None,
-                currently_hovered_element: None,
-                hovered_bg_color: Some(Color::from_rgba8(213, 213, 215, 255)),
-            })
-        });
-
-
-        let border_color = rgba(0, 0, 0, 64);
-        let border_width = px(1.0);
-        let border_radius = [(5.0, 5.0); 4];
-
-        inner.borrow_mut().element_data.create_layout_node(None);
-        inner.borrow_mut().element_data.style.set_display(Display::Flex);
-        inner.borrow_mut().element_data.style.set_justify_content(Some(JustifyContent::SpaceBetween));
-        inner.borrow_mut().element_data.style.set_align_items(Some(AlignItems::Center));
-        inner.borrow_mut().element_data.style.set_padding(TrblRectangle::new(px(2.5), px(0.0), px(2.5), px(6.0)));
-        inner.borrow_mut().element_data.style.set_border_width(TrblRectangle::new_all(border_width));
-        inner.borrow_mut().element_data.style.set_border_radius(border_radius);
-        inner.borrow_mut().element_data.style.set_border_color(TrblRectangle::new_all(border_color));
-
-        inner.borrow_mut().floating_window.style.set_background_color(Color::WHITE);
-        inner.borrow_mut().floating_window.style.set_position(Position::Absolute);
-        inner.borrow_mut().floating_window.style.set_display(Display::Flex);
-        inner.borrow_mut().floating_window.style.set_flex_direction(FlexDirection::Column);
-        inner.borrow_mut().floating_window.style.set_box_shadows(vec![
-            BoxShadow::new(false, 0.0, 4.0, 8.0, 1.0, rgba(0, 0, 0, 255)),
-        ]);
-        inner.borrow_mut().floating_window.style.set_padding(TrblRectangle::new(px(2.5), px(0.0), px(2.5), px(6.0)));
-        inner.borrow_mut().floating_window.style.set_width(Unit::Percentage(100.0));
-        inner.borrow_mut().floating_window.style.set_overflow([Overflow::Visible, Overflow::Scroll]);
-        inner.borrow_mut().floating_window.style.set_height(px(120.0));
-        inner.borrow_mut().floating_window.style.set_max_height(px(100.0));
-        inner.borrow_mut().floating_window.style.set_border_width(TrblRectangle::new_all(border_width));
-        inner.borrow_mut().floating_window.style.set_border_radius(border_radius);
-        inner.borrow_mut().floating_window.style.set_border_color(TrblRectangle::new_all(border_color));
-        inner.borrow_mut().floating_window.create_taffy_node();
-
-        inner.borrow_mut().arrow.style.set_width(px(12.0));
-        inner.borrow_mut().arrow.style.set_height(px(6.0));
-        inner.borrow_mut().arrow.style.set_margin(TrblRectangle::new(px(0.0), px(8.0), px(0.0), px(0.0)));
-        inner.borrow_mut().arrow.create_taffy_node();
-
-        // Set the floating window's parent and the arrow to the Dropdown element.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let parent_id = inner.borrow_mut().element_data.layout.taffy_node_id();
-            let floating_window_child_id = inner.borrow_mut().floating_window.layout.taffy_node_id();
-            let arrow_child_id = inner.borrow_mut().arrow.layout.taffy_node_id();
-            taffy_tree.add_child(parent_id, floating_window_child_id);
-            taffy_tree.add_child(parent_id, arrow_child_id);
-        });
-
-        Self { inner }
-    }
-
-    pub fn selected_item(self, index: usize) -> Self {
-        let binding = self.inner.clone();
-        let mut inner = binding.borrow_mut();
-        inner.set_selected_element(index);
-        self
-    }
-
-    pub fn get_selected_item(self) -> usize {
-        self.inner.borrow().selected_element_index.unwrap()
-    }
-}
-
 impl Element for Dropdown {}
 
 impl AsElement for Dropdown {
@@ -191,7 +86,7 @@ impl AsElement for Dropdown {
     }
 }
 
-impl crate::elements::ElementData for DropdownInner {
+impl ElementData for DropdownInner {
     fn element_data(&self) -> &ElementDataStruct {
         &self.element_data
     }
@@ -201,29 +96,6 @@ impl crate::elements::ElementData for DropdownInner {
     }
 }
 
-impl DropdownInner {
-    fn set_selected_element(&mut self, child_index: usize) {
-        // Remove the old selected element from the layout tree.
-        if let Some(old_selected_element) = &self.selected_element {
-            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-                taffy_tree.remove_subtree(old_selected_element.borrow().element_data().layout.taffy_node_id());
-            });
-        }
-
-        let child = self.element_data.children.get(child_index).expect("There is no child at this index.");
-        self.selected_element = Some(child.clone().borrow().deep_clone());
-        self.selected_element_index = Some(child_index);
-        let selected_element_id = self.selected_element.as_ref().unwrap().borrow().element_data().layout.taffy_node_id();
-
-        // Add the selected element to the parent's layout tree at index 1.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let parent_id = self.element_data.layout.taffy_node_id.unwrap();
-            taffy_tree.add_child_at_index(parent_id, selected_element_id, 1);
-        });
-
-    }
-}
-
 impl ElementInternals for DropdownInner {
     fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.deep_clone_internal()
@@ -272,13 +144,25 @@ impl ElementInternals for DropdownInner {
         // Position the floating window below the dropdown with a gap.
         let floating_window_position = Point::new(
             self.element_data.layout.computed_box.position.x,
-            self.element_data.layout.computed_box.position.y + self.element_data.layout.computed_box.size.height as f64
+            self.element_data.layout.computed_box.position.y + self.element_data.layout.computed_box.size.height as f64,
         );
 
-
-        self.floating_window.apply_simple_layout(taffy_tree, transform, floating_window_position, z_index, scale_factor, None);
-        self.arrow.apply_simple_layout(taffy_tree, transform, self.element_data().layout.computed_box.position, z_index, scale_factor, self.element_data().layout.clip_bounds);
-
+        self.floating_window.apply_simple_layout(
+            taffy_tree,
+            transform,
+            floating_window_position,
+            z_index,
+            scale_factor,
+            None,
+        );
+        self.arrow.apply_simple_layout(
+            taffy_tree,
+            transform,
+            self.element_data().layout.computed_box.position,
+            z_index,
+            scale_factor,
+            self.element_data().layout.clip_bounds,
+        );
 
         let scroll_y = self.floating_window.layout.scroll_state.scroll_y() as f64;
         let child_transform = Affine::translate((0.0, -scroll_y));
@@ -297,25 +181,6 @@ impl ElementInternals for DropdownInner {
         }
     }
 
-    fn in_bounds(&self, point: Point) -> bool {
-        let element_data = &self.element_data;
-        let rect = element_data.layout.computed_box_transformed.border_rectangle();
-        //let floating_window_rect = self.floating_window.layout.computed_box_transformed.border_rectangle();
-
-        if !self.is_floating_window_hidden {
-            return true;
-        }
-
-        if let Some(clip) = element_data.layout.clip_bounds {
-            match rect.intersection(&clip) {
-                Some(bounds) => bounds.contains(&point),
-                None => false,
-            }
-        } else {
-            rect.contains(&point)
-        }
-    }
-
     fn draw(
         &mut self,
         renderer: &mut RenderList,
@@ -365,12 +230,25 @@ impl ElementInternals for DropdownInner {
             self.add_hit_testable(renderer, true, scale_factor);
 
             let current_style = self.floating_window.style.as_ref();
-            self.floating_window.layout.draw_borders(renderer, current_style, scale_factor);
-
-            renderer.push_layer(self.floating_window.layout.computed_box_transformed.padding_rectangle().scale(scale_factor));
+            self.floating_window
+                .layout
+                .draw_borders(renderer, current_style, scale_factor);
+
+            renderer.push_layer(
+                self.floating_window
+                    .layout
+                    .computed_box_transformed
+                    .padding_rectangle()
+                    .scale(scale_factor),
+            );
 
             for (index, child) in self.children().iter().enumerate() {
-                let mut child_rect = child.borrow_mut().element_data().layout.computed_box_transformed.border_rectangle();
+                let mut child_rect = child
+                    .borrow_mut()
+                    .element_data()
+                    .layout
+                    .computed_box_transformed
+                    .border_rectangle();
                 child_rect.x = self.floating_window.layout.computed_box_transformed.position.x as f32;
                 child_rect.width = self.floating_window.layout.computed_box_transformed.size.width;
 
@@ -384,8 +262,13 @@ impl ElementInternals for DropdownInner {
 
             renderer.pop_layer();
 
-            draw_scrollbar(&self.floating_window.style, &self.floating_window.layout, renderer, scale_factor);
-           renderer.end_overlay();
+            draw_scrollbar(
+                &self.floating_window.style,
+                &self.floating_window.layout,
+                renderer,
+                scale_factor,
+            );
+            renderer.end_overlay();
         }
     }
 
@@ -403,13 +286,28 @@ impl ElementInternals for DropdownInner {
         // Refactor this!
         if let CraftMessage::PointerMovedEvent(pb) = message {
             let pointer_position = Point::new(pb.current.position.x, pb.current.position.y);
-            let is_pointer_in_window = self.floating_window.layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
-            let is_pointer_in_scrollbar = self.floating_window.layout.computed_scroll_track.contains(&pointer_position);
+            let is_pointer_in_window = self
+                .floating_window
+                .layout
+                .computed_box_transformed
+                .border_rectangle()
+                .contains(&pointer_position);
+            let is_pointer_in_scrollbar = self
+                .floating_window
+                .layout
+                .computed_scroll_track
+                .contains(&pointer_position);
 
             if is_pointer_in_window && !is_pointer_in_scrollbar {
                 let mut hovered_child = None;
                 for (child_index, child) in self.children().iter().cloned().enumerate() {
-                    let contains = child.borrow().element_data().layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
+                    let contains = child
+                        .borrow()
+                        .element_data()
+                        .layout
+                        .computed_box_transformed
+                        .border_rectangle()
+                        .contains(&pointer_position);
 
                     if contains {
                         hovered_child = Some(child_index);
@@ -424,12 +322,25 @@ impl ElementInternals for DropdownInner {
         }
 
         if let CraftMessage::PointerButtonUp(pb) = message {
-
             // TODO Should pb.state.position be in logical coordinates?
             let pointer_position = Point::new(pb.state.position.x, pb.state.position.y);
-            let is_pointer_in_select_box = self.element_data.layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
-            let is_pointer_in_window = self.floating_window.layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
-            let is_pointer_in_scrollbar = self.floating_window.layout.computed_scroll_track.contains(&pointer_position);
+            let is_pointer_in_select_box = self
+                .element_data
+                .layout
+                .computed_box_transformed
+                .border_rectangle()
+                .contains(&pointer_position);
+            let is_pointer_in_window = self
+                .floating_window
+                .layout
+                .computed_box_transformed
+                .border_rectangle()
+                .contains(&pointer_position);
+            let is_pointer_in_scrollbar = self
+                .floating_window
+                .layout
+                .computed_scroll_track
+                .contains(&pointer_position);
 
             if !self.is_floating_window_hidden && !is_pointer_in_window && !is_pointer_in_select_box {
                 self.is_floating_window_hidden = true;
@@ -445,11 +356,16 @@ impl ElementInternals for DropdownInner {
                 }
             }
 
-
             if is_pointer_in_window && !is_pointer_in_scrollbar {
                 let mut should_hide_window = false;
                 for (child_index, child) in self.children().iter().cloned().enumerate() {
-                    let contains = child.borrow().element_data().layout.computed_box_transformed.border_rectangle().contains(&pointer_position);
+                    let contains = child
+                        .borrow()
+                        .element_data()
+                        .layout
+                        .computed_box_transformed
+                        .border_rectangle()
+                        .contains(&pointer_position);
 
                     if contains {
                         should_hide_window = true;
@@ -469,7 +385,6 @@ impl ElementInternals for DropdownInner {
             }
         }
 
-
         let floating_window = &mut self.floating_window;
         let result = handle_scroll_logic_advance(&floating_window.style, &mut floating_window.layout, message, event);
         if result.request_apply_layout {
@@ -499,6 +414,25 @@ impl ElementInternals for DropdownInner {
         });
     }
 
+    fn in_bounds(&self, point: Point) -> bool {
+        let element_data = &self.element_data;
+        let rect = element_data.layout.computed_box_transformed.border_rectangle();
+        //let floating_window_rect = self.floating_window.layout.computed_box_transformed.border_rectangle();
+
+        if !self.is_floating_window_hidden {
+            return true;
+        }
+
+        if let Some(clip) = element_data.layout.clip_bounds {
+            match rect.intersection(&clip) {
+                Some(bounds) => bounds.contains(&point),
+                None => false,
+            }
+        } else {
+            rect.contains(&point)
+        }
+    }
+
     fn as_any(&self) -> &dyn Any {
         self
     }
@@ -507,3 +441,234 @@ impl ElementInternals for DropdownInner {
         self
     }
 }
+
+impl Shape {
+    pub fn new(is_scrollable: bool) -> Self {
+        let layout = Layout::new(is_scrollable);
+        let style = Style::new();
+
+        Self { layout, style }
+    }
+
+    pub fn create_taffy_node(&mut self) {
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let style = self.style.to_taffy_style();
+            let node_id = taffy_tree.new_leaf(style);
+            self.layout.taffy_node_id = Some(node_id);
+        });
+    }
+
+    pub fn apply_simple_layout(
+        &mut self,
+        taffy_tree: &mut TaffyTree,
+        transform: Affine,
+        position: Point,
+        z_index: &mut u32,
+        scale_factor: f64,
+        clip_bounds: Option<Rectangle>,
+    ) {
+        let node = self.layout.taffy_node_id();
+        let taffy_layout = taffy_tree.get_layout(node);
+        self.layout.has_new_layout = taffy_tree.has_new_layout(node);
+
+        let dirty =
+            self.layout.has_new_layout || transform != self.layout.get_transform() || position != self.layout.position;
+
+        if dirty {
+            self.layout
+                .resolve_box(position, transform, taffy_layout, z_index, self.style.get_position());
+
+            // Refactor START
+            let current_style = &self.style;
+            let has_border = current_style.has_border();
+            let border_radius = current_style.get_border_radius();
+            let border_color = &current_style.get_border_color();
+            let box_shadows = current_style.get_box_shadows();
+            self.layout
+                .apply_borders(has_border, border_radius, scale_factor, border_color, box_shadows);
+            // Refactor END
+
+            // For scroll changes from taffy;
+            apply_scroll_layout(&self.style, &mut self.layout, taffy_layout);
+            self.layout.resolve_clip_for_scrollable(clip_bounds); // self.apply_clip
+            self.layout.scroll_state.mark_old();
+        }
+
+        // For manual scroll updates.
+        if !dirty && self.layout.scroll_state.is_new() {
+            apply_scroll_layout(&self.style, &mut self.layout, taffy_layout);
+            self.layout.scroll_state.mark_old();
+        }
+
+        taffy_tree.mark_seen(node);
+    }
+}
+
+impl Dropdown {
+    pub fn new() -> Self {
+        let inner = Rc::new_cyclic(|me: &Weak<RefCell<DropdownInner>>| {
+            RefCell::new(DropdownInner {
+                element_data: ElementDataStruct::new(me.clone(), true),
+                floating_window: Shape::new(true),
+                arrow: Shape::new(false),
+                is_floating_window_hidden: true,
+                selected_element: None,
+                selected_element_index: None,
+                currently_hovered_element: None,
+                hovered_bg_color: Some(Color::from_rgba8(213, 213, 215, 255)),
+            })
+        });
+
+        let border_color = rgba(0, 0, 0, 64);
+        let border_width = px(1.0);
+        let border_radius = [(5.0, 5.0); 4];
+
+        inner.borrow_mut().element_data.create_layout_node(None);
+        inner.borrow_mut().element_data.style.set_display(Display::Flex);
+        inner
+            .borrow_mut()
+            .element_data
+            .style
+            .set_justify_content(Some(JustifyContent::SpaceBetween));
+        inner
+            .borrow_mut()
+            .element_data
+            .style
+            .set_align_items(Some(AlignItems::Center));
+        inner
+            .borrow_mut()
+            .element_data
+            .style
+            .set_padding(TrblRectangle::new(px(2.5), px(0.0), px(2.5), px(6.0)));
+        inner
+            .borrow_mut()
+            .element_data
+            .style
+            .set_border_width(TrblRectangle::new_all(border_width));
+        inner.borrow_mut().element_data.style.set_border_radius(border_radius);
+        inner
+            .borrow_mut()
+            .element_data
+            .style
+            .set_border_color(TrblRectangle::new_all(border_color));
+
+        inner
+            .borrow_mut()
+            .floating_window
+            .style
+            .set_background_color(Color::WHITE);
+        inner
+            .borrow_mut()
+            .floating_window
+            .style
+            .set_position(Position::Absolute);
+        inner.borrow_mut().floating_window.style.set_display(Display::Flex);
+        inner
+            .borrow_mut()
+            .floating_window
+            .style
+            .set_flex_direction(FlexDirection::Column);
+        inner
+            .borrow_mut()
+            .floating_window
+            .style
+            .set_box_shadows(vec![BoxShadow::new(false, 0.0, 4.0, 8.0, 1.0, rgba(0, 0, 0, 255))]);
+        inner
+            .borrow_mut()
+            .floating_window
+            .style
+            .set_padding(TrblRectangle::new(px(2.5), px(0.0), px(2.5), px(6.0)));
+        inner
+            .borrow_mut()
+            .floating_window
+            .style
+            .set_width(Unit::Percentage(100.0));
+        inner
+            .borrow_mut()
+            .floating_window
+            .style
+            .set_overflow([Overflow::Visible, Overflow::Scroll]);
+        inner.borrow_mut().floating_window.style.set_height(px(120.0));
+        inner.borrow_mut().floating_window.style.set_max_height(px(100.0));
+        inner
+            .borrow_mut()
+            .floating_window
+            .style
+            .set_border_width(TrblRectangle::new_all(border_width));
+        inner
+            .borrow_mut()
+            .floating_window
+            .style
+            .set_border_radius(border_radius);
+        inner
+            .borrow_mut()
+            .floating_window
+            .style
+            .set_border_color(TrblRectangle::new_all(border_color));
+        inner.borrow_mut().floating_window.create_taffy_node();
+
+        inner.borrow_mut().arrow.style.set_width(px(12.0));
+        inner.borrow_mut().arrow.style.set_height(px(6.0));
+        inner
+            .borrow_mut()
+            .arrow
+            .style
+            .set_margin(TrblRectangle::new(px(0.0), px(8.0), px(0.0), px(0.0)));
+        inner.borrow_mut().arrow.create_taffy_node();
+
+        // Set the floating window's parent and the arrow to the Dropdown element.
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let parent_id = inner.borrow_mut().element_data.layout.taffy_node_id();
+            let floating_window_child_id = inner.borrow_mut().floating_window.layout.taffy_node_id();
+            let arrow_child_id = inner.borrow_mut().arrow.layout.taffy_node_id();
+            taffy_tree.add_child(parent_id, floating_window_child_id);
+            taffy_tree.add_child(parent_id, arrow_child_id);
+        });
+
+        Self { inner }
+    }
+
+    pub fn selected_item(self, index: usize) -> Self {
+        let binding = self.inner.clone();
+        let mut inner = binding.borrow_mut();
+        inner.set_selected_element(index);
+        self
+    }
+
+    pub fn get_selected_item(self) -> usize {
+        self.inner.borrow().selected_element_index.unwrap()
+    }
+}
+
+impl DropdownInner {
+    fn set_selected_element(&mut self, child_index: usize) {
+        // Remove the old selected element from the layout tree.
+        if let Some(old_selected_element) = &self.selected_element {
+            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+                taffy_tree.remove_subtree(old_selected_element.borrow().element_data().layout.taffy_node_id());
+            });
+        }
+
+        let child = self
+            .element_data
+            .children
+            .get(child_index)
+            .expect("There is no child at this index.");
+        self.selected_element = Some(child.clone().borrow().deep_clone());
+        self.selected_element_index = Some(child_index);
+        let selected_element_id = self
+            .selected_element
+            .as_ref()
+            .unwrap()
+            .borrow()
+            .element_data()
+            .layout
+            .taffy_node_id();
+
+        // Add the selected element to the parent's layout tree at index 1.
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let parent_id = self.element_data.layout.taffy_node_id.unwrap();
+            taffy_tree.add_child_at_index(parent_id, selected_element_id, 1);
+        });
+    }
+}

From adcaa75cb16ceb1825201b44b595698a66bdfa4f Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 00:09:59 -0400
Subject: [PATCH 101/143] organize imports

---
 crates/craft_retained/src/app.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 3d06030f..bf54e4ea 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -6,17 +6,24 @@ use std::sync::Arc;
 
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::TreeUpdate;
+
 use craft_logging::info;
+
 use craft_primitives::geometry::{Point, Size};
+
 use craft_resource_manager::resource_event::ResourceEvent;
 use craft_resource_manager::resource_type::ResourceType;
 use craft_resource_manager::{ResourceIdentifier, ResourceManager};
+
 use craft_runtime::{CraftRuntimeHandle, Sender};
+
 use taffy::NodeId;
+
 use ui_events::ScrollDelta;
 use ui_events::ScrollDelta::PixelDelta;
 use ui_events::keyboard::{KeyboardEvent, Modifiers, NamedKey};
 use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
+
 use winit::event::{Ime, WindowEvent};
 use winit::event_loop::ActiveEventLoop;
 use winit::window::WindowId;

From 1db20d0b340f25edf2ad5d8ea2d78458f19af892 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 00:11:45 -0400
Subject: [PATCH 102/143] fmt

---
 crates/craft_renderer/src/renderer.rs         |  11 +-
 .../craft_retained/src/elements/container.rs  |   6 +-
 .../src/elements/element_data.rs              |   4 +-
 crates/craft_retained/src/elements/mod.rs     |   2 +-
 .../craft_retained/src/elements/scrollable.rs | 128 +++++++++---------
 .../src/elements/slider/slider_logic.rs       |   3 +-
 .../src/elements/text_input/mod.rs            |   3 +-
 .../src/elements/traits/deep_clone.rs         |  26 ++--
 .../src/elements/traits/element.rs            |   2 +-
 .../src/elements/traits/element_internals.rs  |  32 +++--
 .../craft_retained/src/elements/traits/mod.rs |   4 +-
 .../src/events/event_dispatch.rs              |   7 +-
 crates/craft_retained/src/events/helpers.rs   |   8 +-
 crates/craft_retained/src/events/mod.rs       |   6 +-
 crates/craft_retained/src/layout/mod.rs       |   2 +-
 .../craft_retained/src/layout/taffy_tree.rs   |   8 +-
 16 files changed, 121 insertions(+), 131 deletions(-)

diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index a360fbf5..21c436b0 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -109,7 +109,7 @@ impl SortedCommands {
 pub struct TargetItem {
     pub custom_id: u64,
     pub rectangle: Rectangle,
-    pub overlay_depth: u64
+    pub overlay_depth: u64,
 }
 
 impl TargetItem {
@@ -117,15 +117,13 @@ impl TargetItem {
         Self {
             custom_id,
             rectangle,
-            overlay_depth
+            overlay_depth,
         }
     }
 
     // Sorts the items by the overlay depth and in ascending order.
     pub fn sort_items_by_overlay_depth(targets: &mut [TargetItem]) {
-        targets.sort_by(|t1, t2| {
-            t1.overlay_depth.cmp(&t2.overlay_depth)
-        });
+        targets.sort_by(|t1, t2| t1.overlay_depth.cmp(&t2.overlay_depth));
     }
 }
 
@@ -178,7 +176,8 @@ impl RenderList {
         {
             return;
         }
-        self.targets.push(TargetItem::new(id, bounding_box, self.current_overlay_depth));
+        self.targets
+            .push(TargetItem::new(id, bounding_box, self.current_overlay_depth));
     }
 
     #[inline(always)]
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index b0af7abb..20e47903 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -9,10 +9,9 @@ use craft_renderer::RenderList;
 use kurbo::{Affine, Point};
 
 use crate::app::TAFFY_TREE;
-use crate::elements::{resolve_clip_for_scrollable, ElementInternals, AsElement, Element};
 use crate::elements::element_data::ElementData;
-use crate::elements::{scrollable};
 use crate::elements::traits::DeepClone;
+use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scrollable, scrollable};
 use crate::events::{CraftMessage, Event};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
@@ -103,8 +102,7 @@ impl ElementInternals for ContainerInner {
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.layout.scroll_state.is_new()
-        {
+        if !dirty && self.element_data.layout.scroll_state.is_new() {
             self.element_data.apply_scroll(layout);
             self.element_data.layout.scroll_state.mark_old();
         }
diff --git a/crates/craft_retained/src/elements/element_data.rs b/crates/craft_retained/src/elements/element_data.rs
index 221d5b1e..ce9b5f23 100644
--- a/crates/craft_retained/src/elements/element_data.rs
+++ b/crates/craft_retained/src/elements/element_data.rs
@@ -8,8 +8,8 @@ use crate::elements::element_id::create_unique_element_id;
 use crate::elements::scrollable::{ScrollState, apply_scroll_layout};
 use crate::elements::{ElementInternals, WindowInternal};
 use crate::events::{DropdownItemSelectedHandler, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
-use crate::layout::layout_context::LayoutContext;
 use crate::layout::layout::Layout;
+use crate::layout::layout_context::LayoutContext;
 use crate::style::{Overflow, Style};
 
 /// Stores common data to most elements.
@@ -99,7 +99,7 @@ impl ElementData {
 
     /// Computes the scrollbar's tack and thumb layout.
     pub(crate) fn apply_scroll(&mut self, taffy_layout: &taffy::Layout) {
-       apply_scroll_layout(&self.style, &mut self.layout, taffy_layout);
+        apply_scroll_layout(&self.style, &mut self.layout, taffy_layout);
     }
 
     pub(crate) fn scroll(&self) -> ScrollState {
diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index 3b4799b2..2d442780 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -3,6 +3,7 @@ mod element_data;
 mod text;
 mod traits;
 
+mod dropdown;
 mod element_id;
 mod element_id_map;
 mod image;
@@ -10,7 +11,6 @@ pub(crate) mod scrollable;
 mod slider;
 mod text_input;
 mod window;
-mod dropdown;
 
 pub use container::{Container, ContainerInner};
 pub use dropdown::{Dropdown, DropdownInner};
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 1930575a..6beee1bf 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -1,19 +1,19 @@
+use kurbo::{Point, Vec2};
 use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::rc::Rc;
-use kurbo::{Point, Vec2};
 use ui_events::ScrollDelta;
 use ui_events::pointer::{PointerId, PointerType};
 
-use craft_primitives::geometry::{Rectangle, Size};
-use craft_primitives::geometry::borders::CssRoundedRect;
-use craft_renderer::RenderList;
 use crate::app::{queue_event, request_apply_layout};
 use crate::elements::ElementInternals;
 use crate::elements::element_data::ElementData;
 use crate::events::{CraftMessage, Event};
-use crate::layout::layout::{draw_borders_generic, CssComputedBorder, Layout};
+use crate::layout::layout::{CssComputedBorder, Layout, draw_borders_generic};
 use crate::style::{Overflow, Style};
+use craft_primitives::geometry::borders::CssRoundedRect;
+use craft_primitives::geometry::{Rectangle, Size};
+use craft_renderer::RenderList;
 
 /**
 
@@ -149,7 +149,7 @@ pub(crate) fn scroll_to_child_by_id_with_options(data: &mut ElementData, id: &st
                 ScrollToBox::BorderBox => element_data.layout.computed_box.border_rectangle(),
                 ScrollToBox::MarginBox => element_data.layout.computed_box.margin_rectangle(),
                 ScrollToBox::PaddingBox => element_data.layout.computed_box.padding_rectangle(),
-                ScrollToBox::ContentBox => element_data.layout.computed_box.content_rectangle()
+                ScrollToBox::ContentBox => element_data.layout.computed_box.content_rectangle(),
             };
             let distance_from_parent = box_model_selected.y - top_py;
             child_y = Some(distance_from_parent);
@@ -192,8 +192,7 @@ pub(crate) fn apply_scroll_layout(style: &Style, layout: &mut Layout, taffy_layo
 
     // Content Size = overflowed content size + padding
     // Scroll Height = Content Size
-    let scroll_height =
-        (content_height + box_transformed.padding.bottom + box_transformed.padding.top).max(1.0);
+    let scroll_height = (content_height + box_transformed.padding.bottom + box_transformed.padding.top).max(1.0);
     let scroll_track_width = layout.scrollbar_size.width;
 
     // The scroll track height is the height of the padding box.
@@ -241,7 +240,7 @@ pub struct HandleScrollLogicResult {
 }
 
 pub(crate) fn handle_scroll_logic(element: &mut dyn ElementInternals, message: &CraftMessage, event: &mut Event) {
-    let element_data  = element.element_data_mut();
+    let element_data = element.element_data_mut();
     let result = handle_scroll_logic_advance(&element_data.style, &mut element_data.layout, message, event);
 
     if result.request_apply_layout {
@@ -258,7 +257,12 @@ pub(crate) fn handle_scroll_logic(element: &mut dyn ElementInternals, message: &
 }
 
 #[allow(clippy::too_many_arguments)]
-pub(crate) fn handle_scroll_logic_advance(style: &Style, layout: &mut Layout, message: &CraftMessage, event: &mut Event) -> HandleScrollLogicResult {
+pub(crate) fn handle_scroll_logic_advance(
+    style: &Style,
+    layout: &mut Layout,
+    message: &CraftMessage,
+    event: &mut Event,
+) -> HandleScrollLogicResult {
     let mut result = HandleScrollLogicResult {
         request_apply_layout: false,
         release_pointer_capture: false,
@@ -270,9 +274,7 @@ pub(crate) fn handle_scroll_logic_advance(style: &Style, layout: &mut Layout, me
         match message {
             CraftMessage::PointerScroll(mouse_wheel) => {
                 let delta = match mouse_wheel.delta {
-                    ScrollDelta::LineDelta(_x, y) => {
-                        y * style.get_font_size().max(12.0) * style.get_line_height()
-                    }
+                    ScrollDelta::LineDelta(_x, y) => y * style.get_font_size().max(12.0) * style.get_line_height(),
                     ScrollDelta::PixelDelta(physical) => physical.y as f32,
                     ScrollDelta::PageDelta(_x, y) => y,
                 };
@@ -289,65 +291,64 @@ pub(crate) fn handle_scroll_logic_advance(style: &Style, layout: &mut Layout, me
                 event.prevent_defaults();
             }
             CraftMessage::PointerButtonDown(pointer_button)
-                if pointer_button.button == Some(ui_events::pointer::PointerButton::Primary) => {
-                    // DEVICE(TOUCH): Handle scrolling within the content area on touch based input devices.
-                    if pointer_button.pointer.pointer_type == PointerType::Touch {
-                        let container_rectangle = layout.computed_box_transformed.padding_rectangle();
-
-                        let in_scroll_bar = layout
-                            .computed_scroll_thumb
-                            .contains(&pointer_button.state.logical_point());
-
-                        if container_rectangle.contains(&pointer_button.state.logical_point()) && !in_scroll_bar {
-                            state.scroll_click = Some(Point::new(
-                                pointer_button.state.logical_point().x,
-                                pointer_button.state.logical_point().y,
-                            ));
-                            event.prevent_propagate();
-                            event.prevent_defaults();
-                        }
-                    } else if layout
+                if pointer_button.button == Some(ui_events::pointer::PointerButton::Primary) =>
+            {
+                // DEVICE(TOUCH): Handle scrolling within the content area on touch based input devices.
+                if pointer_button.pointer.pointer_type == PointerType::Touch {
+                    let container_rectangle = layout.computed_box_transformed.padding_rectangle();
+
+                    let in_scroll_bar = layout
                         .computed_scroll_thumb
-                        .contains(&pointer_button.state.logical_point())
-                    {
+                        .contains(&pointer_button.state.logical_point());
+
+                    if container_rectangle.contains(&pointer_button.state.logical_point()) && !in_scroll_bar {
                         state.scroll_click = Some(Point::new(
                             pointer_button.state.logical_point().x,
                             pointer_button.state.logical_point().y,
                         ));
-
-                        // FIXME: Turn pointer capture on with the correct device id.
-                        //element.set_pointer_capture(PointerId::new(1).unwrap());
-
                         event.prevent_propagate();
                         event.prevent_defaults();
+                    }
+                } else if layout
+                    .computed_scroll_thumb
+                    .contains(&pointer_button.state.logical_point())
+                {
+                    state.scroll_click = Some(Point::new(
+                        pointer_button.state.logical_point().x,
+                        pointer_button.state.logical_point().y,
+                    ));
+
+                    // FIXME: Turn pointer capture on with the correct device id.
+                    //element.set_pointer_capture(PointerId::new(1).unwrap());
 
-                        result.set_pointer_capture = true;
-                    } else if layout
-                        .computed_scroll_track
-                        .contains(&pointer_button.state.logical_point())
-                    {
-                        let offset_y =
-                            pointer_button.state.position.y as f32 - layout.computed_scroll_track.y;
+                    event.prevent_propagate();
+                    event.prevent_defaults();
 
-                        let percent = offset_y / layout.computed_scroll_track.height;
-                        let scroll_y = percent * layout.max_scroll_y;
+                    result.set_pointer_capture = true;
+                } else if layout
+                    .computed_scroll_track
+                    .contains(&pointer_button.state.logical_point())
+                {
+                    let offset_y = pointer_button.state.position.y as f32 - layout.computed_scroll_track.y;
 
-                        state.set_scroll_y(scroll_y.clamp(0.0, layout.max_scroll_y));
+                    let percent = offset_y / layout.computed_scroll_track.height;
+                    let scroll_y = percent * layout.max_scroll_y;
 
-                        result.request_apply_layout = true;
+                    state.set_scroll_y(scroll_y.clamp(0.0, layout.max_scroll_y));
+
+                    result.request_apply_layout = true;
 
-                        event.prevent_propagate();
-                        event.prevent_defaults();
-                    }
-            }
-            CraftMessage::PointerButtonUp(_pointer_button)
-                if state.scroll_click.is_some() => {
-                    state.scroll_click = None;
                     event.prevent_propagate();
                     event.prevent_defaults();
-
-                    result.release_pointer_capture = true;
                 }
+            }
+            CraftMessage::PointerButtonUp(_pointer_button) if state.scroll_click.is_some() => {
+                state.scroll_click = None;
+                event.prevent_propagate();
+                event.prevent_defaults();
+
+                result.release_pointer_capture = true;
+            }
             CraftMessage::PointerMovedEvent(pointer_motion) => {
                 if let Some(click) = state.scroll_click {
                     // Todo: Translate scroll wheel pixel to scroll position for diff.
@@ -355,8 +356,7 @@ pub(crate) fn handle_scroll_logic_advance(style: &Style, layout: &mut Layout, me
 
                     let max_scroll_y = layout.max_scroll_y;
 
-                    let click_y_offset = layout.computed_scroll_track.height
-                        - layout.computed_scroll_thumb.height;
+                    let click_y_offset = layout.computed_scroll_track.height - layout.computed_scroll_thumb.height;
                     if click_y_offset <= 0.0 {
                         return result;
                     }
@@ -394,12 +394,8 @@ pub fn draw_scrollbar(style: &Style, layout: &Layout, renderer: &mut RenderList,
         .get_scrollbar_thumb_radius()
         .map(|radii| Vec2::new(radii.0 as f64, radii.1 as f64));
     // let scrollbar_thumb_radius = self.element_data().current_style().
-    let track_rect = layout
-        .computed_scroll_track
-        .scale(scale_factor);
-    let thumb_rect = layout
-        .computed_scroll_thumb
-        .scale(scale_factor);
+    let track_rect = layout.computed_scroll_track.scale(scale_factor);
+    let thumb_rect = layout.computed_scroll_thumb.scale(scale_factor);
 
     let border_spec = CssRoundedRect::new(thumb_rect.to_kurbo(), [0.0, 0.0, 0.0, 0.0], scrollbar_thumb_radius);
     let mut computed_border_spec = CssComputedBorder::new(border_spec);
@@ -412,4 +408,4 @@ pub fn draw_scrollbar(style: &Style, layout: &Layout, renderer: &mut RenderList,
         border_color.to_array(),
         scrollbar_color.thumb_color,
     );
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/elements/slider/slider_logic.rs b/crates/craft_retained/src/elements/slider/slider_logic.rs
index 5e1249b9..41497613 100644
--- a/crates/craft_retained/src/elements/slider/slider_logic.rs
+++ b/crates/craft_retained/src/elements/slider/slider_logic.rs
@@ -1,8 +1,7 @@
 use kurbo::Point;
 
-use crate::elements::{ElementData};
 use crate::elements::slider::slider_element::SliderDirection;
-use crate::elements::SliderInner;
+use crate::elements::{ElementData, SliderInner};
 
 impl SliderInner {
     pub(super) fn compute_step(&self, by: i32, current_value: f64) -> f64 {
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 18738849..2bc0f937 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -191,8 +191,7 @@ impl ElementInternals for TextInputInner {
         }
 
         // For manual scroll updates.
-        if !dirty && self.element_data.layout.scroll_state.is_new()
-        {
+        if !dirty && self.element_data.layout.scroll_state.is_new() {
             let result = taffy_tree.get_layout(node);
             self.element_data.apply_scroll(result);
             self.element_data.layout.scroll_state.mark_old();
diff --git a/crates/craft_retained/src/elements/traits/deep_clone.rs b/crates/craft_retained/src/elements/traits/deep_clone.rs
index 0c1d3d60..9bcce251 100644
--- a/crates/craft_retained/src/elements/traits/deep_clone.rs
+++ b/crates/craft_retained/src/elements/traits/deep_clone.rs
@@ -1,14 +1,17 @@
+use crate::app::{TAFFY_TREE, request_apply_layout, request_layout};
 use crate::elements::ElementInternals;
+use crate::elements::element_id::create_unique_element_id;
 use std::cell::RefCell;
 use std::rc::Rc;
-use crate::app::{request_apply_layout, request_layout, TAFFY_TREE};
-use crate::elements::element_id::create_unique_element_id;
 
 pub trait DeepClone {
     fn deep_clone_internal(&self) -> Rc<RefCell<dyn ElementInternals>>;
 }
 
-impl<T> DeepClone for T where T: ElementInternals + Clone + 'static {
+impl<T> DeepClone for T
+where
+    T: ElementInternals + Clone + 'static,
+{
     fn deep_clone_internal(&self) -> Rc<RefCell<dyn ElementInternals>> {
         let new_element = Rc::new(RefCell::new(self.clone()));
         let new_element: Rc<RefCell<dyn ElementInternals>> = new_element;
@@ -21,12 +24,10 @@ impl<T> DeepClone for T where T: ElementInternals + Clone + 'static {
             new_data.parent = None;
 
             // Clone the layout node
-           let node_id = new_data.layout.taffy_node_id_mut();
-           TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-               *node_id = taffy_tree.clone_node(*node_id)
-           });
-           request_apply_layout(*node_id);
-           request_layout(*node_id);
+            let node_id = new_data.layout.taffy_node_id_mut();
+            TAFFY_TREE.with_borrow_mut(|taffy_tree| *node_id = taffy_tree.clone_node(*node_id));
+            request_apply_layout(*node_id);
+            request_layout(*node_id);
 
             let node_id_copy = *node_id;
             let mut new_children = Vec::new();
@@ -36,7 +37,10 @@ impl<T> DeepClone for T where T: ElementInternals + Clone + 'static {
 
                 let new_child_copy = new_child.clone();
                 TAFFY_TREE.with_borrow_mut(move |taffy_tree| {
-                    taffy_tree.add_child(node_id_copy, new_child_copy.borrow().element_data().layout.taffy_node_id.unwrap());
+                    taffy_tree.add_child(
+                        node_id_copy,
+                        new_child_copy.borrow().element_data().layout.taffy_node_id.unwrap(),
+                    );
                 });
             }
             new_data.children = new_children;
@@ -44,4 +48,4 @@ impl<T> DeepClone for T where T: ElementInternals + Clone + 'static {
 
         new_element
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_retained/src/elements/traits/element.rs b/crates/craft_retained/src/elements/traits/element.rs
index 63e178d9..474689be 100644
--- a/crates/craft_retained/src/elements/traits/element.rs
+++ b/crates/craft_retained/src/elements/traits/element.rs
@@ -1,8 +1,8 @@
 use std::cell::RefCell;
 use std::rc::Rc;
 
-use craft_primitives::geometry::ElementBox;
 use craft_primitives::Color;
+use craft_primitives::geometry::ElementBox;
 
 use ui_events::pointer::PointerId;
 use winit::dpi::PhysicalPosition;
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index c6016c97..92d8d0d5 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -14,10 +14,8 @@ use craft_primitives::geometry::{ElementBox, Rectangle, TrblRectangle};
 
 use craft_renderer::RenderList;
 
-use crate::Color;
-use crate::CraftError;
 use crate::app::{ELEMENTS, FOCUS, TAFFY_TREE};
-use crate::elements::scrollable::{draw_scrollbar, ScrollState};
+use crate::elements::scrollable::{ScrollState, draw_scrollbar};
 use crate::elements::{ElementData, ElementIdMap, ScrollOptions, WindowInternal};
 use crate::events::pointer_capture::PointerCapture;
 use crate::events::{CraftMessage, DropdownItemSelectedHandler, Event, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
@@ -25,6 +23,7 @@ use crate::layout::TaffyTree;
 use crate::layout::layout::Layout;
 use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Style, Underline, Unit};
 use crate::text::text_context::TextContext;
+use crate::{Color, CraftError};
 
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
 pub trait ElementInternals: ElementData + Any {
@@ -222,13 +221,9 @@ pub trait ElementInternals: ElementData + Any {
         layout_order: &mut u32,
     ) {
         let position = self.element_data().style.get_position();
-        self.element_data_mut().layout.resolve_box(
-            relative_position,
-            scroll_transform,
-            result,
-            layout_order,
-            position,
-        );
+        self.element_data_mut()
+            .layout
+            .resolve_box(relative_position, scroll_transform, result, layout_order, position);
     }
 
     /// Computes this element's clip box.
@@ -243,9 +238,13 @@ pub trait ElementInternals: ElementData + Any {
         let border_color = &current_style.get_border_color();
         let box_shadows = current_style.get_box_shadows();
 
-        self.element_data_mut()
-            .layout
-            .apply_borders(has_border, border_radius, scale_factor, border_color, box_shadows);
+        self.element_data_mut().layout.apply_borders(
+            has_border,
+            border_radius,
+            scale_factor,
+            border_color,
+            box_shadows,
+        );
     }
 
     /// A bit of a hack to reset the layout item of an element recursively.
@@ -980,5 +979,8 @@ pub trait ElementInternals: ElementData + Any {
 }
 
 pub fn resolve_clip_for_scrollable(element: &mut dyn ElementInternals, clip_bounds: Option<Rectangle>) {
-    element.element_data_mut().layout.resolve_clip_for_scrollable(clip_bounds);
-}
\ No newline at end of file
+    element
+        .element_data_mut()
+        .layout
+        .resolve_clip_for_scrollable(clip_bounds);
+}
diff --git a/crates/craft_retained/src/elements/traits/mod.rs b/crates/craft_retained/src/elements/traits/mod.rs
index 0e2567c4..7fed785e 100644
--- a/crates/craft_retained/src/elements/traits/mod.rs
+++ b/crates/craft_retained/src/elements/traits/mod.rs
@@ -1,11 +1,11 @@
 mod as_element;
-mod element;
 mod deep_clone;
+mod element;
 mod element_data;
 mod element_internals;
 
-pub use deep_clone::DeepClone;
 pub use as_element::AsElement;
+pub use deep_clone::DeepClone;
 pub use element::Element;
 pub use element_data::ElementData;
 /// Note: this could be hidden behind a custom elements feature.
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index 4d404e2a..c5323b36 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -5,7 +5,7 @@ use std::rc::{Rc, Weak};
 use craft_primitives::geometry::Point;
 use craft_renderer::RenderList;
 
-use crate::app::{dequeue_event, FOCUS};
+use crate::app::{FOCUS, dequeue_event};
 use crate::elements::ElementInternals;
 use crate::events::helpers::{call_default_element_event_handler, call_user_event_handlers, find_target, freeze_target_list};
 use crate::events::{CraftMessage, Event};
@@ -180,7 +180,9 @@ impl EventDispatcher {
         } else if message.is_keyboard_event() {
             FOCUS.with(|f| {
                 let focus_ref = f.borrow();
-                if let Some(focus_ref) = focus_ref.clone() && let Some(focus) = focus_ref.upgrade() {
+                if let Some(focus_ref) = focus_ref.clone()
+                    && let Some(focus) = focus_ref.upgrade()
+                {
                     targets.clear();
                     targets.push_back(focus);
                 }
@@ -191,7 +193,6 @@ impl EventDispatcher {
             targets.push_back(root.clone());
         }
 
-
         if message.is_pointer_event() {
             self.maybe_dispatch_pointer_leave(text_context, &targets);
             self.maybe_dispatch_pointer_enter(text_context, &targets);
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index 821a6d5e..0389ce32 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -2,14 +2,14 @@ use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::rc::Rc;
 
-use craft_renderer::RenderList;
-use kurbo::Point;
-use craft_renderer::renderer::TargetItem;
 use crate::app::ELEMENTS;
 use crate::elements::ElementInternals;
 use crate::events::pointer_capture::PointerCapture;
 use crate::events::{CraftMessage, Event};
 use crate::text::text_context::TextContext;
+use craft_renderer::RenderList;
+use craft_renderer::renderer::TargetItem;
+use kurbo::Point;
 
 pub(super) fn freeze_target_list(
     target: Rc<RefCell<dyn ElementInternals>>,
@@ -39,7 +39,7 @@ pub(super) fn find_target(
     if let Some(target) = target {
         return target;
     }
-    
+
     ELEMENTS.with_borrow_mut(|elements| {
         TargetItem::sort_items_by_overlay_depth(&mut render_list.targets);
         target_scratch.extend(render_list.targets.iter().rev().filter_map(|target_item| {
diff --git a/crates/craft_retained/src/events/mod.rs b/crates/craft_retained/src/events/mod.rs
index 0960d3a7..ba17f398 100644
--- a/crates/craft_retained/src/events/mod.rs
+++ b/crates/craft_retained/src/events/mod.rs
@@ -102,11 +102,7 @@ impl CraftMessage {
     }
 
     pub(super) fn is_keyboard_event(&self) -> bool {
-        matches!(
-            self,
-            CraftMessage::KeyboardInputEvent(_)
-                | CraftMessage::ImeEvent(_)
-        )
+        matches!(self, CraftMessage::KeyboardInputEvent(_) | CraftMessage::ImeEvent(_))
     }
 
     pub(super) fn is_got_or_lost_pointer_capture(&self) -> bool {
diff --git a/crates/craft_retained/src/layout/mod.rs b/crates/craft_retained/src/layout/mod.rs
index 93eeb0be..e9b03903 100644
--- a/crates/craft_retained/src/layout/mod.rs
+++ b/crates/craft_retained/src/layout/mod.rs
@@ -1,6 +1,6 @@
-pub mod layout_context;
 #[allow(clippy::module_inception)]
 pub mod layout;
+pub mod layout_context;
 mod taffy_tree;
 
 pub(crate) use taffy_tree::TaffyTree;
diff --git a/crates/craft_retained/src/layout/taffy_tree.rs b/crates/craft_retained/src/layout/taffy_tree.rs
index f625fab2..32daa9d0 100644
--- a/crates/craft_retained/src/layout/taffy_tree.rs
+++ b/crates/craft_retained/src/layout/taffy_tree.rs
@@ -28,12 +28,8 @@ impl TaffyTree {
         let context = self.inner.get_node_context(src);
 
         match context {
-            None => {
-                self.inner.new_leaf(style.clone()).unwrap()
-            }
-            Some(ctx) => {
-                self.inner.new_leaf_with_context(style.clone(), ctx.clone()).unwrap()
-            }
+            None => self.inner.new_leaf(style.clone()).unwrap(),
+            Some(ctx) => self.inner.new_leaf_with_context(style.clone(), ctx.clone()).unwrap(),
         }
     }
 

From 0e760faed18857aff3cc2aea6432d1c6f96b64e7 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 00:40:11 -0400
Subject: [PATCH 103/143] Move modifiers to window.

---
 crates/craft_retained/src/app.rs             | 246 +++++++------------
 crates/craft_retained/src/elements/window.rs |  50 +++-
 crates/craft_retained/src/lib.rs             |   3 -
 3 files changed, 140 insertions(+), 159 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index bf54e4ea..ff217568 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -19,9 +19,7 @@ use craft_runtime::{CraftRuntimeHandle, Sender};
 
 use taffy::NodeId;
 
-use ui_events::ScrollDelta;
-use ui_events::ScrollDelta::PixelDelta;
-use ui_events::keyboard::{KeyboardEvent, Modifiers, NamedKey};
+use ui_events::keyboard::KeyboardEvent;
 use ui_events::pointer::{PointerButtonEvent, PointerScrollEvent, PointerUpdate};
 
 use winit::event::{Ime, WindowEvent};
@@ -41,44 +39,12 @@ thread_local! {
     pub(crate) static PENDING_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = const { RefCell::new(VecDeque::new()) };
     pub(crate) static IN_PROGRESS_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = const { RefCell::new(VecDeque::new()) };
     pub(crate) static FOCUS: RefCell<Option<Weak<RefCell<dyn ElementInternals>>>> = RefCell::new(None);
+    pub(crate) static WINDOW_MANAGER: RefCell<WindowManager> = RefCell::new(WindowManager::new());
+    pub(crate) static TAFFY_TREE: RefCell<TaffyTree> = RefCell::new(TaffyTree::new());
     /// An event queue that users or elements can manipulate. Cleared at the start and end of every event dispatch.
     static EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(Event, CraftMessage)>> = RefCell::new(VecDeque::with_capacity(10));
-
     /// An event queue for capturing window events not generated by winit.
-    static WINDOW_EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(winit::window::WindowId, winit::event::WindowEvent)>> = RefCell::new(VecDeque::with_capacity(10));
-
-    pub(crate) static WINDOW_MANAGER: RefCell<WindowManager> = RefCell::new(WindowManager::new());
-    pub(crate) static TAFFY_TREE: RefCell<TaffyTree> = RefCell::new(TaffyTree::new());
-}
-
-/// Enqueues an event at the back of the dispatch queue.
-///
-/// This does **not** invoke any element `on_event` handlers.
-/// Only user-registered event callbacks will be dispatched.
-pub fn queue_event(event: Event, message: CraftMessage) {
-    EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| {
-        event_queue.push_back((event, message));
-    });
-}
-
-/// Pops from the front of the event dispatch queue and returns the result.
-pub(crate) fn dequeue_event() -> Option<(Event, CraftMessage)> {
-    EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| event_queue.pop_front())
-}
-
-/// Enqueues an event at the back of the dispatch queue.
-///
-/// This does **not** invoke any element `on_event` handlers.
-/// Only user-registered event callbacks will be dispatched.
-pub fn queue_window_event(window_id: WindowId, event: WindowEvent) {
-    WINDOW_EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| {
-        event_queue.push_back((window_id, event));
-    });
-}
-
-/// Pops from the front of the event dispatch queue and returns the result.
-pub(crate) fn dequeue_window_event() -> Option<(WindowId, WindowEvent)> {
-    WINDOW_EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| event_queue.pop_front())
+    static WINDOW_EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(WindowId, WindowEvent)>> = RefCell::new(VecDeque::with_capacity(10));
 }
 
 pub struct App {
@@ -93,8 +59,6 @@ pub struct App {
 
     pub(crate) app_sender: Sender<InternalMessage>,
     pub(crate) runtime: CraftRuntimeHandle,
-    pub(crate) modifiers: Modifiers,
-    pub redraw_flags: RedrawFlags,
 
     pub(super) target_scratch: Vec<Rc<RefCell<dyn ElementInternals>>>,
     #[allow(dead_code)]
@@ -104,21 +68,6 @@ pub struct App {
     pub(crate) active: bool,
 }
 
-#[derive(Debug)]
-pub struct RedrawFlags {
-    rebuild_layout: bool,
-}
-
-impl RedrawFlags {
-    pub fn new(rebuild_layout: bool) -> Self {
-        Self { rebuild_layout }
-    }
-
-    pub fn should_rebuild_layout(&self) -> bool {
-        self.rebuild_layout
-    }
-}
-
 impl App {
     pub fn on_close_requested(&mut self) {
         info!("Craft application is closing.");
@@ -159,43 +108,6 @@ impl App {
         window.on_resize(new_size);
     }
 
-    /// Initialize any data needed to layout/render text.
-    fn setup_text_context(&mut self) {
-        if self.text_context.is_none() {
-            #[cfg(any(target_arch = "wasm32", not(feature = "system_fonts")))]
-            let mut text_context = TextContext::new();
-            #[cfg(all(not(target_arch = "wasm32"), feature = "system_fonts"))]
-            let text_context = TextContext::new();
-
-            #[cfg(any(target_arch = "wasm32", not(feature = "system_fonts")))]
-            {
-                let regular = include_bytes!("../../../fonts/Roboto-Regular.ttf");
-                let bold = include_bytes!("../../../fonts/Roboto-Bold.ttf");
-                let semi_bold = include_bytes!("../../../fonts/Roboto-SemiBold.ttf");
-                let medium = include_bytes!("../../../fonts/Roboto-Medium.ttf");
-
-                fn register_and_append(font_data: &'static [u8], text_context: &mut TextContext) {
-                    let blob = peniko::Blob::new(Arc::new(font_data));
-                    let fonts = text_context.font_context.collection.register_fonts(blob, None);
-
-                    // Register all the Roboto families under parley::GenericFamily::SystemUi.
-                    // This will become the fallback font for platforms like WASM.
-                    text_context
-                        .font_context
-                        .collection
-                        .append_generic_families(parley::GenericFamily::SystemUi, fonts.iter().map(|f| f.0));
-                }
-
-                register_and_append(regular, &mut text_context);
-                register_and_append(bold, &mut text_context);
-                register_and_append(semi_bold, &mut text_context);
-                register_and_append(medium, &mut text_context);
-            }
-
-            self.text_context = Some(text_context);
-        }
-    }
-
     /// Updates the reactive tree, layouts the elements, and draws the view.
     #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
     pub fn on_request_redraw(&mut self, window: Window) -> Option<TreeUpdate> {
@@ -218,26 +130,8 @@ impl App {
 
     pub fn on_move(&mut self, _window: Window) {}
 
-    fn on_request_redraw_internal(&mut self, window: Window) {
-        self.update_resources();
-
-        window.on_redraw(self.text_context.as_mut().unwrap(), self.resource_manager.clone());
-    }
-
     pub fn on_pointer_scroll(&mut self, window: Window, pointer_scroll_update: PointerScrollEvent) {
-        if self.modifiers.ctrl() && pointer_scroll_update.pointer.pointer_type == ui_events::pointer::PointerType::Mouse
-        {
-            let y: f32 = match pointer_scroll_update.delta {
-                ScrollDelta::PageDelta(_, y) => y,
-                ScrollDelta::LineDelta(_, y) => y,
-                PixelDelta(physical) => physical.y as f32,
-            };
-            if y < 0.0 {
-                window.zoom_out();
-            } else {
-                window.zoom_in();
-            }
-            self.request_redraw(RedrawFlags::new(true));
+        if window.inner.borrow_mut().maybe_zoom(&pointer_scroll_update) {
             return;
         }
 
@@ -245,7 +139,6 @@ impl App {
         let message = event;
 
         self.dispatch_event(window, &message);
-        self.request_redraw(RedrawFlags::new(true));
     }
 
     pub fn on_pointer_button(&mut self, window: Window, pointer_event: PointerButtonEvent, is_up: bool) {
@@ -260,8 +153,6 @@ impl App {
         window.set_mouse_position(Some(Point::new(cursor_position.x, cursor_position.y)));
 
         self.dispatch_event(window.clone(), &message);
-
-        self.request_redraw(RedrawFlags::new(true));
     }
 
     pub fn on_pointer_moved(&mut self, window: Window, mouse_moved: PointerUpdate) {
@@ -270,8 +161,6 @@ impl App {
         let message = CraftMessage::PointerMovedEvent(mouse_moved);
 
         self.dispatch_event(window.clone(), &message);
-
-        self.request_redraw(RedrawFlags::new(true));
     }
 
     pub fn on_ime(&mut self, window: Window, ime: Ime) {
@@ -279,47 +168,18 @@ impl App {
         let message = event;
 
         self.dispatch_event(window.clone(), &message);
-
-        self.request_redraw(RedrawFlags::new(true));
-    }
-
-    fn dispatch_event(&mut self, window: Window, message: &CraftMessage) {
-        let mouse_pos = window.mouse_position();
-        let render_list = window.inner.borrow().render_list.clone();
-        self.event_dispatcher.dispatch_event(
-            message,
-            mouse_pos,
-            window.inner.clone(),
-            &mut self.text_context,
-            render_list.borrow_mut().deref_mut(),
-            &mut self.target_scratch,
-        );
-        window.winit_window().unwrap().request_redraw();
     }
 
     pub fn on_keyboard_input(&mut self, window: Window, keyboard_input: KeyboardEvent) {
-        self.modifiers = keyboard_input.modifiers;
-        if keyboard_input.key == ui_events::keyboard::Key::Named(NamedKey::Control) && keyboard_input.state.is_up() {
-            self.modifiers.set(Modifiers::CONTROL, false);
-        }
-        if keyboard_input.modifiers.ctrl() {
-            if keyboard_input.key == ui_events::keyboard::Key::Character("=".to_string()) {
-                window.zoom_in();
-                self.request_redraw(RedrawFlags::new(true));
-                return;
-            } else if keyboard_input.key == ui_events::keyboard::Key::Character("-".to_string()) {
-                window.zoom_out();
-                self.request_redraw(RedrawFlags::new(true));
-                return;
-            }
+        window.inner.borrow_mut().update_modifiers(&keyboard_input);
+        if window.inner.borrow_mut().maybe_zoom_keyboard(&keyboard_input) {
+            return;
         }
 
         let keyboard_event = CraftMessage::KeyboardInputEvent(keyboard_input.clone());
         let message = keyboard_event;
 
         self.dispatch_event(window.clone(), &message);
-
-        self.request_redraw(RedrawFlags::new(true));
     }
 
     pub fn on_resource_event(&mut self, resource_event: ResourceEvent) {
@@ -344,11 +204,24 @@ impl App {
         }
     }
 
-    pub(crate) fn request_redraw(&mut self, redraw_flags: RedrawFlags) {
-        self.redraw_flags = redraw_flags;
-        /*if let Some(window) = &self.window {
-            window.request_redraw();
-        }*/
+    fn on_request_redraw_internal(&mut self, window: Window) {
+        self.update_resources();
+
+        window.on_redraw(self.text_context.as_mut().unwrap(), self.resource_manager.clone());
+    }
+
+    fn dispatch_event(&mut self, window: Window, message: &CraftMessage) {
+        let mouse_pos = window.mouse_position();
+        let render_list = window.inner.borrow().render_list.clone();
+        self.event_dispatcher.dispatch_event(
+            message,
+            mouse_pos,
+            window.inner.clone(),
+            &mut self.text_context,
+            render_list.borrow_mut().deref_mut(),
+            &mut self.target_scratch,
+        );
+        window.winit_window().unwrap().request_redraw();
     }
 
     fn update_resources(&mut self) {
@@ -371,6 +244,73 @@ impl App {
             });
         });
     }
+
+    /// Initialize any data needed to layout/render text.
+    fn setup_text_context(&mut self) {
+        if self.text_context.is_none() {
+            #[cfg(any(target_arch = "wasm32", not(feature = "system_fonts")))]
+            let mut text_context = TextContext::new();
+            #[cfg(all(not(target_arch = "wasm32"), feature = "system_fonts"))]
+            let text_context = TextContext::new();
+
+            #[cfg(any(target_arch = "wasm32", not(feature = "system_fonts")))]
+            {
+                let regular = include_bytes!("../../../fonts/Roboto-Regular.ttf");
+                let bold = include_bytes!("../../../fonts/Roboto-Bold.ttf");
+                let semi_bold = include_bytes!("../../../fonts/Roboto-SemiBold.ttf");
+                let medium = include_bytes!("../../../fonts/Roboto-Medium.ttf");
+
+                fn register_and_append(font_data: &'static [u8], text_context: &mut TextContext) {
+                    let blob = peniko::Blob::new(Arc::new(font_data));
+                    let fonts = text_context.font_context.collection.register_fonts(blob, None);
+
+                    // Register all the Roboto families under parley::GenericFamily::SystemUi.
+                    // This will become the fallback font for platforms like WASM.
+                    text_context
+                        .font_context
+                        .collection
+                        .append_generic_families(parley::GenericFamily::SystemUi, fonts.iter().map(|f| f.0));
+                }
+
+                register_and_append(regular, &mut text_context);
+                register_and_append(bold, &mut text_context);
+                register_and_append(semi_bold, &mut text_context);
+                register_and_append(medium, &mut text_context);
+            }
+
+            self.text_context = Some(text_context);
+        }
+    }
+}
+
+/// Enqueues an event at the back of the dispatch queue.
+///
+/// This does **not** invoke any element `on_event` handlers.
+/// Only user-registered event callbacks will be dispatched.
+pub fn queue_event(event: Event, message: CraftMessage) {
+    EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| {
+        event_queue.push_back((event, message));
+    });
+}
+
+/// Pops from the front of the event dispatch queue and returns the result.
+pub(crate) fn dequeue_event() -> Option<(Event, CraftMessage)> {
+    EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| event_queue.pop_front())
+}
+
+/// Enqueues an event at the back of the dispatch queue.
+///
+/// This does **not** invoke any element `on_event` handlers.
+/// Only user-registered event callbacks will be dispatched.
+pub fn queue_window_event(window_id: WindowId, event: WindowEvent) {
+    WINDOW_EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| {
+        event_queue.push_back((window_id, event));
+    });
+}
+
+/// Pops from the front of the event dispatch queue and returns the result.
+pub(crate) fn dequeue_window_event() -> Option<(WindowId, WindowEvent)> {
+    WINDOW_EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| event_queue.pop_front())
 }
 
 #[inline]
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 32ba284c..1134fb8f 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -23,7 +23,10 @@ use kurbo::{Affine, Point};
 use peniko::Color;
 
 use taffy::{AvailableSpace, NodeId};
-
+use ui_events::keyboard::{KeyboardEvent, Modifiers, NamedKey};
+use ui_events::pointer::PointerScrollEvent;
+use ui_events::ScrollDelta;
+use ui_events::ScrollDelta::PixelDelta;
 use winit::event::WindowEvent;
 use winit::event_loop::ActiveEventLoop;
 use winit::window::{Window as WinitWindow, WindowAttributes};
@@ -89,6 +92,7 @@ pub struct WindowInternal {
     zoom_scale_factor: f64,
     mouse_positon: Option<Point>,
     element_data: ElementData,
+    pub(crate) modifiers: Modifiers,
 }
 
 impl Clone for WindowInternal {
@@ -362,11 +366,11 @@ impl Window {
         self.inner.borrow_mut().on_request_redraw(craft_app)
     }
 
-    pub(crate) fn zoom_in(&self) {
+    pub fn zoom_in(&self) {
         self.inner.borrow_mut().zoom_in()
     }
 
-    pub(crate) fn zoom_out(&self) {
+    pub fn zoom_out(&self) {
         self.inner.borrow_mut().zoom_out()
     }
 
@@ -421,6 +425,7 @@ impl WindowInternal {
                 title: title.map(|title| title.to_string()),
                 renderer_type,
                 pointer_capture: Default::default(),
+                modifiers: Default::default(),
             })
         });
 
@@ -508,6 +513,45 @@ impl WindowInternal {
         self.update_zoom();
     }
 
+    pub(crate) fn maybe_zoom(&mut self, pointer_scroll_update: &PointerScrollEvent) -> bool {
+        if self.modifiers.ctrl() && pointer_scroll_update.pointer.pointer_type == ui_events::pointer::PointerType::Mouse
+        {
+            let y: f32 = match pointer_scroll_update.delta {
+                ScrollDelta::PageDelta(_, y) => y,
+                ScrollDelta::LineDelta(_, y) => y,
+                PixelDelta(physical) => physical.y as f32,
+            };
+            if y < 0.0 {
+                self.zoom_out();
+            } else {
+                self.zoom_in();
+            }
+            true
+        } else {
+            false
+        }
+    }
+
+    pub(crate) fn maybe_zoom_keyboard(&mut self, keyboard_input: &KeyboardEvent) -> bool {
+        if keyboard_input.modifiers.ctrl() {
+            if keyboard_input.key == ui_events::keyboard::Key::Character("=".to_string()) {
+                self.zoom_in();
+                return true
+            } else if keyboard_input.key == ui_events::keyboard::Key::Character("-".to_string()) {
+                self.zoom_out();
+                return true
+            }
+        }
+        false
+    }
+
+    pub(crate) fn update_modifiers(&mut self, keyboard_input: &KeyboardEvent) {
+        self.modifiers = keyboard_input.modifiers;
+        if keyboard_input.key == ui_events::keyboard::Key::Named(NamedKey::Control) && keyboard_input.state.is_up() {
+            self.modifiers.set(Modifiers::CONTROL, false);
+        }
+    }
+
     pub(crate) fn zoom_scale_factor(&self) -> f64 {
         self.zoom_scale_factor
     }
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 8e925a4c..76b32bec 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -35,7 +35,6 @@ use winit::event_loop::EventLoopBuilder;
 #[cfg(target_os = "android")]
 use winit::platform::android::EventLoopBuilderExtAndroid;
 
-use crate::app::RedrawFlags;
 use crate::craft_winit_state::CraftWinitState;
 use crate::events::EventDispatcher;
 use crate::utils::cloneable_any::CloneableAny;
@@ -165,8 +164,6 @@ fn setup_craft(craft_options: Option<CraftOptions>) -> CraftState {
         resource_manager,
         reload_fonts: false,
         runtime: runtime.clone(),
-        modifiers: Default::default(),
-        redraw_flags: RedrawFlags::new(true),
         target_scratch: Vec::new(),
         craft_options: craft_options.clone(),
         active: false,

From ccc4e4f79a38bddc12aa19a847054c870854127e Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 01:58:54 -0400
Subject: [PATCH 104/143] Fix lint

---
 crates/craft_renderer/src/renderer.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index 21c436b0..fcb6de07 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -123,7 +123,7 @@ impl TargetItem {
 
     // Sorts the items by the overlay depth and in ascending order.
     pub fn sort_items_by_overlay_depth(targets: &mut [TargetItem]) {
-        targets.sort_by(|t1, t2| t1.overlay_depth.cmp(&t2.overlay_depth));
+        targets.sort_by_key(|t1| t1.overlay_depth);
     }
 }
 

From 033cc6a19f2faa892c7eace940c43ef67761713e Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 11:45:10 -0400
Subject: [PATCH 105/143] Rename CraftMessage to EventKind.

---
 crates/craft_retained/src/app.rs              | 40 +++++------------
 .../craft_retained/src/elements/container.rs  |  4 +-
 .../craft_retained/src/elements/dropdown.rs   | 12 ++---
 .../craft_retained/src/elements/scrollable.rs | 16 +++----
 .../src/elements/slider/slider_element.rs     | 20 ++++-----
 crates/craft_retained/src/elements/text.rs    | 10 ++---
 .../src/elements/text_input/mod.rs            | 22 +++++-----
 .../src/elements/traits/element_internals.rs  |  4 +-
 crates/craft_retained/src/elements/window.rs  | 12 ++---
 .../src/events/event_dispatch.rs              | 14 +++---
 crates/craft_retained/src/events/helpers.rs   | 44 +++++++++----------
 crates/craft_retained/src/events/mod.rs       | 25 +++++------
 .../src/events/pointer_capture.rs             | 17 +++----
 13 files changed, 108 insertions(+), 132 deletions(-)

diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index ff217568..825157d4 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -29,7 +29,7 @@ use winit::window::WindowId;
 use crate::CraftOptions;
 use crate::elements::{ElementIdMap, ElementInternals, Window};
 use crate::events::internal::InternalMessage;
-use crate::events::{CraftMessage, Event, EventDispatcher};
+use crate::events::{Event, EventDispatcher, EventKind};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
 use crate::window_manager::WindowManager;
@@ -42,7 +42,7 @@ thread_local! {
     pub(crate) static WINDOW_MANAGER: RefCell<WindowManager> = RefCell::new(WindowManager::new());
     pub(crate) static TAFFY_TREE: RefCell<TaffyTree> = RefCell::new(TaffyTree::new());
     /// An event queue that users or elements can manipulate. Cleared at the start and end of every event dispatch.
-    static EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(Event, CraftMessage)>> = RefCell::new(VecDeque::with_capacity(10));
+    static EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(Event, EventKind)>> = RefCell::new(VecDeque::with_capacity(10));
     /// An event queue for capturing window events not generated by winit.
     static WINDOW_EVENT_DISPATCH_QUEUE: RefCell<VecDeque<(WindowId, WindowEvent)>> = RefCell::new(VecDeque::with_capacity(10));
 }
@@ -134,40 +134,29 @@ impl App {
         if window.inner.borrow_mut().maybe_zoom(&pointer_scroll_update) {
             return;
         }
-
-        let event = CraftMessage::PointerScroll(pointer_scroll_update);
-        let message = event;
-
-        self.dispatch_event(window, &message);
+        self.dispatch_event(window, &EventKind::PointerScroll(pointer_scroll_update));
     }
 
     pub fn on_pointer_button(&mut self, window: Window, pointer_event: PointerButtonEvent, is_up: bool) {
         let cursor_position = pointer_event.state.logical_point();
 
         let event = if is_up {
-            CraftMessage::PointerButtonUp(pointer_event)
+            EventKind::PointerButtonUp(pointer_event)
         } else {
-            CraftMessage::PointerButtonDown(pointer_event)
+            EventKind::PointerButtonDown(pointer_event)
         };
-        let message = event;
         window.set_mouse_position(Some(Point::new(cursor_position.x, cursor_position.y)));
 
-        self.dispatch_event(window.clone(), &message);
+        self.dispatch_event(window.clone(), &event);
     }
 
     pub fn on_pointer_moved(&mut self, window: Window, mouse_moved: PointerUpdate) {
         window.set_mouse_position(Some(mouse_moved.current.logical_point()));
-
-        let message = CraftMessage::PointerMovedEvent(mouse_moved);
-
-        self.dispatch_event(window.clone(), &message);
+        self.dispatch_event(window.clone(), &EventKind::PointerMovedEvent(mouse_moved));
     }
 
     pub fn on_ime(&mut self, window: Window, ime: Ime) {
-        let event = CraftMessage::ImeEvent(ime);
-        let message = event;
-
-        self.dispatch_event(window.clone(), &message);
+        self.dispatch_event(window.clone(), &EventKind::ImeEvent(ime));
     }
 
     pub fn on_keyboard_input(&mut self, window: Window, keyboard_input: KeyboardEvent) {
@@ -175,11 +164,7 @@ impl App {
         if window.inner.borrow_mut().maybe_zoom_keyboard(&keyboard_input) {
             return;
         }
-
-        let keyboard_event = CraftMessage::KeyboardInputEvent(keyboard_input.clone());
-        let message = keyboard_event;
-
-        self.dispatch_event(window.clone(), &message);
+        self.dispatch_event(window.clone(), &EventKind::KeyboardInputEvent(keyboard_input));
     }
 
     pub fn on_resource_event(&mut self, resource_event: ResourceEvent) {
@@ -206,11 +191,10 @@ impl App {
 
     fn on_request_redraw_internal(&mut self, window: Window) {
         self.update_resources();
-
         window.on_redraw(self.text_context.as_mut().unwrap(), self.resource_manager.clone());
     }
 
-    fn dispatch_event(&mut self, window: Window, message: &CraftMessage) {
+    fn dispatch_event(&mut self, window: Window, message: &EventKind) {
         let mouse_pos = window.mouse_position();
         let render_list = window.inner.borrow().render_list.clone();
         self.event_dispatcher.dispatch_event(
@@ -287,14 +271,14 @@ impl App {
 ///
 /// This does **not** invoke any element `on_event` handlers.
 /// Only user-registered event callbacks will be dispatched.
-pub fn queue_event(event: Event, message: CraftMessage) {
+pub fn queue_event(event: Event, message: EventKind) {
     EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| {
         event_queue.push_back((event, message));
     });
 }
 
 /// Pops from the front of the event dispatch queue and returns the result.
-pub(crate) fn dequeue_event() -> Option<(Event, CraftMessage)> {
+pub(crate) fn dequeue_event() -> Option<(Event, EventKind)> {
     EVENT_DISPATCH_QUEUE.with_borrow_mut(|event_queue| event_queue.pop_front())
 }
 
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 20e47903..a880b5ab 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -12,7 +12,7 @@ use crate::app::TAFFY_TREE;
 use crate::elements::element_data::ElementData;
 use crate::elements::traits::DeepClone;
 use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scrollable, scrollable};
-use crate::events::{CraftMessage, Event};
+use crate::events::{Event, EventKind};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
 
@@ -153,7 +153,7 @@ impl ElementInternals for ContainerInner {
 
     fn on_event(
         &mut self,
-        message: &CraftMessage,
+        message: &EventKind,
         _text_context: &mut TextContext,
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index 803780b2..4352fbcf 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -19,7 +19,7 @@ use crate::elements::element_data::ElementData as ElementDataStruct;
 use crate::elements::scrollable::{apply_scroll_layout, draw_scrollbar, handle_scroll_logic_advance};
 use crate::elements::traits::DeepClone;
 use crate::elements::{AsElement, Element, ElementData, ElementInternals, resolve_clip_for_scrollable};
-use crate::events::{CraftMessage, Event};
+use crate::events::{Event, EventKind};
 use crate::layout::TaffyTree;
 use crate::layout::layout::Layout;
 use crate::style::{AlignItems, BoxShadow, Display, FlexDirection, JustifyContent, Overflow, Position, Style, Unit};
@@ -274,17 +274,17 @@ impl ElementInternals for DropdownInner {
 
     fn on_event(
         &mut self,
-        message: &CraftMessage,
+        message: &EventKind,
         _text_context: &mut TextContext,
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
-        if let CraftMessage::PointerButtonDown(_pb) = message {
+        if let EventKind::PointerButtonDown(_pb) = message {
             self.focus();
         }
 
         // Refactor this!
-        if let CraftMessage::PointerMovedEvent(pb) = message {
+        if let EventKind::PointerMovedEvent(pb) = message {
             let pointer_position = Point::new(pb.current.position.x, pb.current.position.y);
             let is_pointer_in_window = self
                 .floating_window
@@ -321,7 +321,7 @@ impl ElementInternals for DropdownInner {
             }
         }
 
-        if let CraftMessage::PointerButtonUp(pb) = message {
+        if let EventKind::PointerButtonUp(pb) = message {
             // TODO Should pb.state.position be in logical coordinates?
             let pointer_position = Point::new(pb.state.position.x, pb.state.position.y);
             let is_pointer_in_select_box = self
@@ -373,7 +373,7 @@ impl ElementInternals for DropdownInner {
                         self.release_pointer_capture(PointerId::new(1).unwrap());
 
                         let new_event = Event::new(event.target.clone());
-                        queue_event(new_event, CraftMessage::DropdownItemSelected(child_index));
+                        queue_event(new_event, EventKind::DropdownItemSelected(child_index));
 
                         break;
                     }
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 6beee1bf..937497ad 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -8,7 +8,7 @@ use ui_events::pointer::{PointerId, PointerType};
 use crate::app::{queue_event, request_apply_layout};
 use crate::elements::ElementInternals;
 use crate::elements::element_data::ElementData;
-use crate::events::{CraftMessage, Event};
+use crate::events::{Event, EventKind};
 use crate::layout::layout::{CssComputedBorder, Layout, draw_borders_generic};
 use crate::style::{Overflow, Style};
 use craft_primitives::geometry::borders::CssRoundedRect;
@@ -117,7 +117,7 @@ pub(crate) fn scroll_to(data: &mut ElementData, y: f32) {
     data.layout.scroll_state.set_scroll_y(f32::max(0.0, y));
     let new_event = Event::new(data.me.upgrade().unwrap().clone());
     request_apply_layout(data.layout.taffy_node_id.unwrap());
-    queue_event(new_event, CraftMessage::Scroll());
+    queue_event(new_event, EventKind::Scroll());
 }
 
 /// Scroll an amount y from the current scroll position.
@@ -239,7 +239,7 @@ pub struct HandleScrollLogicResult {
     pub set_pointer_capture: bool,
 }
 
-pub(crate) fn handle_scroll_logic(element: &mut dyn ElementInternals, message: &CraftMessage, event: &mut Event) {
+pub(crate) fn handle_scroll_logic(element: &mut dyn ElementInternals, message: &EventKind, event: &mut Event) {
     let element_data = element.element_data_mut();
     let result = handle_scroll_logic_advance(&element_data.style, &mut element_data.layout, message, event);
 
@@ -260,7 +260,7 @@ pub(crate) fn handle_scroll_logic(element: &mut dyn ElementInternals, message: &
 pub(crate) fn handle_scroll_logic_advance(
     style: &Style,
     layout: &mut Layout,
-    message: &CraftMessage,
+    message: &EventKind,
     event: &mut Event,
 ) -> HandleScrollLogicResult {
     let mut result = HandleScrollLogicResult {
@@ -272,7 +272,7 @@ pub(crate) fn handle_scroll_logic_advance(
     if layout.is_scrollable_layout() && style.get_overflow()[1] == Overflow::Scroll {
         let state = &mut layout.scroll_state;
         match message {
-            CraftMessage::PointerScroll(mouse_wheel) => {
+            EventKind::PointerScroll(mouse_wheel) => {
                 let delta = match mouse_wheel.delta {
                     ScrollDelta::LineDelta(_x, y) => y * style.get_font_size().max(12.0) * style.get_line_height(),
                     ScrollDelta::PixelDelta(physical) => physical.y as f32,
@@ -290,7 +290,7 @@ pub(crate) fn handle_scroll_logic_advance(
                 event.prevent_propagate();
                 event.prevent_defaults();
             }
-            CraftMessage::PointerButtonDown(pointer_button)
+            EventKind::PointerButtonDown(pointer_button)
                 if pointer_button.button == Some(ui_events::pointer::PointerButton::Primary) =>
             {
                 // DEVICE(TOUCH): Handle scrolling within the content area on touch based input devices.
@@ -342,14 +342,14 @@ pub(crate) fn handle_scroll_logic_advance(
                     event.prevent_defaults();
                 }
             }
-            CraftMessage::PointerButtonUp(_pointer_button) if state.scroll_click.is_some() => {
+            EventKind::PointerButtonUp(_pointer_button) if state.scroll_click.is_some() => {
                 state.scroll_click = None;
                 event.prevent_propagate();
                 event.prevent_defaults();
 
                 result.release_pointer_capture = true;
             }
-            CraftMessage::PointerMovedEvent(pointer_motion) => {
+            EventKind::PointerMovedEvent(pointer_motion) => {
                 if let Some(click) = state.scroll_click {
                     // Todo: Translate scroll wheel pixel to scroll position for diff.
                     let delta = (pointer_motion.current.position.y - click.y) as f32;
diff --git a/crates/craft_retained/src/elements/slider/slider_element.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
index 69e5533a..f2b775d0 100644
--- a/crates/craft_retained/src/elements/slider/slider_element.rs
+++ b/crates/craft_retained/src/elements/slider/slider_element.rs
@@ -13,7 +13,7 @@ use crate::app::queue_event;
 use crate::elements::element_data::ElementData;
 use crate::elements::traits::DeepClone;
 use crate::elements::{AsElement, Element, ElementInternals};
-use crate::events::{CraftMessage, Event};
+use crate::events::{Event, EventKind};
 use crate::layout::TaffyTree;
 use crate::palette;
 use crate::style::Unit;
@@ -373,13 +373,13 @@ impl ElementInternals for SliderInner {
 
     fn on_event(
         &mut self,
-        message: &CraftMessage,
+        message: &EventKind,
         _text_context: &mut TextContext,
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
         match message {
-            CraftMessage::KeyboardInputEvent(key) => {
+            EventKind::KeyboardInputEvent(key) => {
                 if key.state != KeyState::Down || !self.is_focused() {
                     return;
                 }
@@ -398,10 +398,10 @@ impl ElementInternals for SliderInner {
                     self.value = new_value;
 
                     let new_event = Event::new(event.target.clone());
-                    queue_event(new_event, CraftMessage::SliderValueChanged(self.value));
+                    queue_event(new_event, EventKind::SliderValueChanged(self.value));
                 }
             }
-            CraftMessage::PointerButtonUp(pointer_button_update) => {
+            EventKind::PointerButtonUp(pointer_button_update) => {
                 self.focus();
                 self.dragging = false;
                 // FIXME: Turn pointer capture on with the correct device id.
@@ -414,9 +414,9 @@ impl ElementInternals for SliderInner {
                 self.value = value;
 
                 let new_event = Event::new(event.target.clone());
-                queue_event(new_event, CraftMessage::SliderValueChanged(self.value));
+                queue_event(new_event, EventKind::SliderValueChanged(self.value));
             }
-            CraftMessage::PointerButtonDown(pointer_button_update) => {
+            EventKind::PointerButtonDown(pointer_button_update) => {
                 self.dragging = true;
                 // FIXME: Turn pointer capture on with the correct device id.
                 self.set_pointer_capture(PointerId::new(1).unwrap());
@@ -428,9 +428,9 @@ impl ElementInternals for SliderInner {
                 self.value = value;
 
                 let new_event = Event::new(event.target.clone());
-                queue_event(new_event, CraftMessage::SliderValueChanged(self.value));
+                queue_event(new_event, EventKind::SliderValueChanged(self.value));
             }
-            CraftMessage::PointerMovedEvent(pointer_update) => {
+            EventKind::PointerMovedEvent(pointer_update) => {
                 if !self.dragging {
                     return;
                 }
@@ -442,7 +442,7 @@ impl ElementInternals for SliderInner {
                 self.value = value;
 
                 let new_event = Event::new(event.target.clone());
-                queue_event(new_event, CraftMessage::SliderValueChanged(self.value));
+                queue_event(new_event, EventKind::SliderValueChanged(self.value));
             }
             _ => {}
         }
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 7002e8f4..cb699846 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -10,7 +10,7 @@ use parley::LayoutAccessibility;
 use parley::{Alignment, AlignmentOptions, ContentWidths, Selection};
 
 use crate::elements::element_data::ElementData;
-use crate::events::{CraftMessage, Event};
+use crate::events::{Event, EventKind};
 use crate::layout::layout_context::{LayoutContext, TaffyTextContext, TextHashKey};
 use crate::style::Style;
 use crate::text::text_context::TextContext;
@@ -324,7 +324,7 @@ impl ElementInternals for TextInner {
 
     fn on_event(
         &mut self,
-        message: &CraftMessage,
+        message: &EventKind,
         _text_context: &mut TextContext,
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
@@ -341,7 +341,7 @@ impl ElementInternals for TextInner {
 
             let state: &mut TextState = &mut self.state;
             match message {
-                CraftMessage::PointerButtonDown(pb) if pb.button == Some(PointerButton::Primary) => {
+                EventKind::PointerButtonDown(pb) if pb.button == Some(PointerButton::Primary) => {
                     state.update_text_selection(self.element_data.style.get_selection_color());
                     state.pointer_down = true;
                     state.cursor_reset();
@@ -368,14 +368,14 @@ impl ElementInternals for TextInner {
                     }
                     event.prevent_defaults();
                 }
-                CraftMessage::PointerButtonUp(pb) if pb.button == Some(PointerButton::Primary) => {
+                EventKind::PointerButtonUp(pb) if pb.button == Some(PointerButton::Primary) => {
                     state.update_text_selection(self.element_data.style.get_selection_color());
                     state.pointer_down = false;
                     state.cursor_reset();
                     self.release_pointer_capture(PointerId::new(1).unwrap());
                     event.prevent_defaults();
                 }
-                CraftMessage::PointerMovedEvent(pointer_moved) => {
+                EventKind::PointerMovedEvent(pointer_moved) => {
                     let prev_pos = state.cursor_pos;
                     // NOTE: Cursor position should be relative to the top left of the text box.
                     state.cursor_pos = pointer_moved.current.logical_point()
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 2bc0f937..93b37531 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -21,7 +21,7 @@ use crate::elements::element_id::create_unique_element_id;
 use crate::elements::text_input::text_input_state::TextInputState;
 use crate::elements::traits::DeepClone;
 use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scrollable, scrollable};
-use crate::events::{CraftMessage, Event};
+use crate::events::{Event, EventKind};
 use crate::layout::TaffyTree;
 use crate::layout::layout_context::{LayoutContext, TaffyTextInputContext};
 use crate::style::{Display, Style, Unit};
@@ -307,7 +307,7 @@ impl ElementInternals for TextInputInner {
 
     fn on_event(
         &mut self,
-        message: &CraftMessage,
+        message: &EventKind,
         text_context: &mut TextContext,
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
@@ -324,7 +324,7 @@ impl ElementInternals for TextInputInner {
 
         let focused = self.is_focused();
 
-        if let CraftMessage::ElementMessage(msg) = message
+        if let EventKind::ElementMessage(msg) = message
             && let Some(msg) = msg.as_any().downcast_ref::<TextInputMessage>()
         {
             match msg {
@@ -351,33 +351,31 @@ impl ElementInternals for TextInputInner {
         }
 
         match message {
-            CraftMessage::KeyboardInputEvent(keyboard_event) if !self.state.editor().is_composing() => {
+            EventKind::KeyboardInputEvent(keyboard_event) if !self.state.editor().is_composing() => {
                 if self.disabled || !keyboard_event.state.is_down() || !focused {
                     return;
                 }
                 self.state
                     .key_press(text_context, keyboard_event, &mut self.element_data);
             }
-            CraftMessage::PointerButtonDown(pointer_button)
-                if pointer_button.button == Some(PointerButton::Primary) =>
-            {
+            EventKind::PointerButtonDown(pointer_button) if pointer_button.button == Some(PointerButton::Primary) => {
                 self.focus();
                 self.state.pointer_down(text_context);
             }
-            CraftMessage::PointerButtonUp(pointer_button) if pointer_button.button == Some(PointerButton::Primary) => {
+            EventKind::PointerButtonUp(pointer_button) if pointer_button.button == Some(PointerButton::Primary) => {
                 self.state.pointer_up();
             }
-            CraftMessage::PointerMovedEvent(pointer_moved) => {
+            EventKind::PointerMovedEvent(pointer_moved) => {
                 self.state.move_pointer(text_context, pointer_moved, scroll_y);
             }
-            CraftMessage::ImeEvent(Ime::Disabled) => {
+            EventKind::ImeEvent(Ime::Disabled) => {
                 self.state.disable_ime(text_context);
             }
-            CraftMessage::ImeEvent(Ime::Commit(text)) => {
+            EventKind::ImeEvent(Ime::Commit(text)) => {
                 self.state.insert_or_replace_selection(text_context, text);
                 //generate_text_changed_event(&mut self.state.editor);
             }
-            CraftMessage::ImeEvent(Ime::Preedit(text, cursor)) => {
+            EventKind::ImeEvent(Ime::Preedit(text, cursor)) => {
                 self.state.ime_pre_edit(text_context, text, cursor);
             }
             _ => {}
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index 92d8d0d5..c82e7578 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -18,7 +18,7 @@ use crate::app::{ELEMENTS, FOCUS, TAFFY_TREE};
 use crate::elements::scrollable::{ScrollState, draw_scrollbar};
 use crate::elements::{ElementData, ElementIdMap, ScrollOptions, WindowInternal};
 use crate::events::pointer_capture::PointerCapture;
-use crate::events::{CraftMessage, DropdownItemSelectedHandler, Event, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
+use crate::events::{DropdownItemSelectedHandler, Event, EventKind, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::layout::TaffyTree;
 use crate::layout::layout::Layout;
 use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Style, Underline, Unit};
@@ -205,7 +205,7 @@ pub trait ElementInternals: ElementData + Any {
     /// Handles default events.
     fn on_event(
         &mut self,
-        _message: &CraftMessage,
+        _message: &EventKind,
         _text_context: &mut TextContext,
         _event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 1134fb8f..a71052f8 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -23,10 +23,10 @@ use kurbo::{Affine, Point};
 use peniko::Color;
 
 use taffy::{AvailableSpace, NodeId};
-use ui_events::keyboard::{KeyboardEvent, Modifiers, NamedKey};
-use ui_events::pointer::PointerScrollEvent;
 use ui_events::ScrollDelta;
 use ui_events::ScrollDelta::PixelDelta;
+use ui_events::keyboard::{KeyboardEvent, Modifiers, NamedKey};
+use ui_events::pointer::PointerScrollEvent;
 use winit::event::WindowEvent;
 use winit::event_loop::ActiveEventLoop;
 use winit::window::{Window as WinitWindow, WindowAttributes};
@@ -44,7 +44,7 @@ use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scr
 #[cfg(target_arch = "wasm32")]
 use crate::events::internal::InternalMessage;
 use crate::events::pointer_capture::PointerCapture;
-use crate::events::{CraftMessage, Event};
+use crate::events::{Event, EventKind};
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
 #[cfg(target_arch = "wasm32")]
@@ -251,7 +251,7 @@ impl ElementInternals for WindowInternal {
 
     fn on_event(
         &mut self,
-        message: &CraftMessage,
+        message: &EventKind,
         _text_context: &mut TextContext,
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
@@ -536,10 +536,10 @@ impl WindowInternal {
         if keyboard_input.modifiers.ctrl() {
             if keyboard_input.key == ui_events::keyboard::Key::Character("=".to_string()) {
                 self.zoom_in();
-                return true
+                return true;
             } else if keyboard_input.key == ui_events::keyboard::Key::Character("-".to_string()) {
                 self.zoom_out();
-                return true
+                return true;
             }
         }
         false
diff --git a/crates/craft_retained/src/events/event_dispatch.rs b/crates/craft_retained/src/events/event_dispatch.rs
index c5323b36..e3f41f30 100644
--- a/crates/craft_retained/src/events/event_dispatch.rs
+++ b/crates/craft_retained/src/events/event_dispatch.rs
@@ -8,11 +8,11 @@ use craft_renderer::RenderList;
 use crate::app::{FOCUS, dequeue_event};
 use crate::elements::ElementInternals;
 use crate::events::helpers::{call_default_element_event_handler, call_user_event_handlers, find_target, freeze_target_list};
-use crate::events::{CraftMessage, Event};
+use crate::events::{Event, EventKind};
 use crate::text::text_context::TextContext;
 
 pub(super) fn dispatch_capturing_event(
-    _message: &CraftMessage,
+    _message: &EventKind,
     _targets: &mut VecDeque<Rc<RefCell<dyn ElementInternals>>>,
 ) {
 }
@@ -20,7 +20,7 @@ pub(super) fn dispatch_capturing_event(
 /// Dispatches 1 event to many elements.
 /// The first dispatch happens at the top-most visual element.
 pub(super) fn dispatch_bubbling_event(
-    message: &CraftMessage,
+    message: &EventKind,
     targets: &mut VecDeque<Rc<RefCell<dyn ElementInternals>>>,
 ) -> Event {
     let target = targets[0].clone();
@@ -56,7 +56,7 @@ impl EventDispatcher {
     /// NOTE: This calls the user callbacks + the default event handler (if prevent_default() is not called).
     pub(super) fn dispatch_once(
         &self,
-        message: &CraftMessage,
+        message: &EventKind,
         text_context: &mut Option<TextContext>,
         target: &Rc<RefCell<dyn ElementInternals>>,
     ) {
@@ -103,7 +103,7 @@ impl EventDispatcher {
 
             // We had a prev target, but we don't in the new list. (PointerLeave)
             if !found {
-                self.dispatch_once(&CraftMessage::PointerLeave(), text_context, &prev_target.clone());
+                self.dispatch_once(&EventKind::PointerLeave(), text_context, &prev_target.clone());
             }
         }
     }
@@ -138,7 +138,7 @@ impl EventDispatcher {
 
             // We weren't in the prev target list, but we are in the new list. (PointerEnter)
             if !found {
-                self.dispatch_once(&CraftMessage::PointerEnter(), text_context, &target.clone());
+                self.dispatch_once(&EventKind::PointerEnter(), text_context, &target.clone());
             }
         }
     }
@@ -148,7 +148,7 @@ impl EventDispatcher {
     #[allow(clippy::too_many_arguments)]
     pub fn dispatch_event(
         &mut self,
-        message: &CraftMessage,
+        message: &EventKind,
         mouse_position: Option<Point>,
         root: Rc<RefCell<dyn ElementInternals>>,
         text_context: &mut Option<TextContext>,
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index 0389ce32..005ee937 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -5,7 +5,7 @@ use std::rc::Rc;
 use crate::app::ELEMENTS;
 use crate::elements::ElementInternals;
 use crate::events::pointer_capture::PointerCapture;
-use crate::events::{CraftMessage, Event};
+use crate::events::{Event, EventKind};
 use crate::text::text_context::TextContext;
 use craft_renderer::RenderList;
 use craft_renderer::renderer::TargetItem;
@@ -30,7 +30,7 @@ pub(super) fn freeze_target_list(
 pub(super) fn find_target(
     root: &Rc<RefCell<dyn ElementInternals>>,
     mouse_position: Option<Point>,
-    message: &CraftMessage,
+    message: &EventKind,
     render_list: &mut RenderList,
     target_scratch: &mut Vec<Rc<RefCell<dyn ElementInternals>>>,
     pointer_capture: &PointerCapture,
@@ -67,87 +67,87 @@ pub(super) fn find_target(
 pub(super) fn call_user_event_handlers(
     event: &mut Event,
     current_target: &Rc<RefCell<dyn ElementInternals>>,
-    message: &CraftMessage,
+    message: &EventKind,
 ) {
     match message {
-        CraftMessage::PointerEnter() => {
+        EventKind::PointerEnter() => {
             let element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_pointer_enter {
                 (*handler)(event);
             }
         }
-        CraftMessage::PointerLeave() => {
+        EventKind::PointerLeave() => {
             let element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_pointer_leave {
                 (*handler)(event);
             }
         }
-        CraftMessage::PointerButtonUp(e) => {
+        EventKind::PointerButtonUp(e) => {
             let element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_pointer_button_up {
                 (*handler)(event, e);
             }
         }
-        CraftMessage::PointerButtonDown(e) => {
+        EventKind::PointerButtonDown(e) => {
             let len = current_target.borrow().element_data().on_pointer_button_down.len();
             for i in 0..len {
                 let handler = current_target.borrow().element_data().on_pointer_button_down[i].clone();
                 (*handler)(event, e);
             }
         }
-        CraftMessage::KeyboardInputEvent(e) => {
+        EventKind::KeyboardInputEvent(e) => {
             let element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_keyboard_input {
                 (*handler)(event, e);
             }
         }
-        CraftMessage::PointerMovedEvent(e) => {
+        EventKind::PointerMovedEvent(e) => {
             let element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_pointer_moved {
                 (*handler)(event, e);
             }
         }
-        CraftMessage::PointerScroll(_) => {}
-        CraftMessage::ImeEvent(_) => {}
-        CraftMessage::TextInputChanged(_) => {}
-        CraftMessage::LinkClicked(_) => {}
-        CraftMessage::DropdownToggled(_) => {}
-        CraftMessage::DropdownItemSelected(item) => {
+        EventKind::PointerScroll(_) => {}
+        EventKind::ImeEvent(_) => {}
+        EventKind::TextInputChanged(_) => {}
+        EventKind::LinkClicked(_) => {}
+        EventKind::DropdownToggled(_) => {}
+        EventKind::DropdownItemSelected(item) => {
             let element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_dropdown_item_selected {
                 (*handler)(event, *item);
             }
         }
-        CraftMessage::SwitchToggled(_) => {}
-        CraftMessage::SliderValueChanged(slider_value) => {
+        EventKind::SwitchToggled(_) => {}
+        EventKind::SliderValueChanged(slider_value) => {
             let element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_slider_value_changed {
                 (*handler)(event, *slider_value);
             }
         }
-        CraftMessage::ElementMessage(_) => {}
-        CraftMessage::GotPointerCapture() => {
+        EventKind::ElementMessage(_) => {}
+        EventKind::GotPointerCapture() => {
             let element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_got_pointer_capture {
                 (*handler)(event);
             }
         }
-        CraftMessage::LostPointerCapture() => {
+        EventKind::LostPointerCapture() => {
             let element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_lost_pointer_capture {
                 (*handler)(event);
             }
         }
-        CraftMessage::Scroll() => {
+        EventKind::Scroll() => {
             let element_data = current_target.borrow().element_data().clone();
 
             for handler in &element_data.on_scroll {
@@ -162,7 +162,7 @@ pub(super) fn call_default_element_event_handler(
     current_target: &Rc<RefCell<dyn ElementInternals>>,
     target: &Rc<RefCell<dyn ElementInternals>>,
     text_context: &mut Option<TextContext>,
-    message: &CraftMessage,
+    message: &EventKind,
 ) {
     current_target
         .borrow_mut()
diff --git a/crates/craft_retained/src/events/mod.rs b/crates/craft_retained/src/events/mod.rs
index ba17f398..e4a4f3f6 100644
--- a/crates/craft_retained/src/events/mod.rs
+++ b/crates/craft_retained/src/events/mod.rs
@@ -43,7 +43,7 @@ pub enum EventDispatchType {
 }
 
 #[derive(Clone)]
-pub enum CraftMessage {
+pub enum EventKind {
     GotPointerCapture(),
     LostPointerCapture(),
     PointerEnter(),
@@ -88,31 +88,28 @@ pub enum FocusAction {
     Unset,
 }
 
-impl CraftMessage {
+impl EventKind {
     pub(super) fn is_pointer_event(&self) -> bool {
         matches!(
             self,
-            CraftMessage::PointerMovedEvent(_)
-                | CraftMessage::PointerButtonUp(_)
-                | CraftMessage::PointerButtonDown(_)
-                | CraftMessage::GotPointerCapture()
-                | CraftMessage::LostPointerCapture()
-                | CraftMessage::PointerScroll(_)
+            EventKind::PointerMovedEvent(_)
+                | EventKind::PointerButtonUp(_)
+                | EventKind::PointerButtonDown(_)
+                | EventKind::GotPointerCapture()
+                | EventKind::LostPointerCapture()
+                | EventKind::PointerScroll(_)
         )
     }
 
     pub(super) fn is_keyboard_event(&self) -> bool {
-        matches!(self, CraftMessage::KeyboardInputEvent(_) | CraftMessage::ImeEvent(_))
+        matches!(self, EventKind::KeyboardInputEvent(_) | EventKind::ImeEvent(_))
     }
 
     pub(super) fn is_got_or_lost_pointer_capture(&self) -> bool {
-        matches!(
-            self,
-            CraftMessage::GotPointerCapture() | CraftMessage::LostPointerCapture()
-        )
+        matches!(self, EventKind::GotPointerCapture() | EventKind::LostPointerCapture())
     }
 
-    pub fn new_element_message<T>(data: T) -> CraftMessage
+    pub fn new_element_message<T>(data: T) -> EventKind
     where
         T: Any + Send + Sync + Clone,
     {
diff --git a/crates/craft_retained/src/events/pointer_capture.rs b/crates/craft_retained/src/events/pointer_capture.rs
index 92dde48c..2a1c091d 100644
--- a/crates/craft_retained/src/events/pointer_capture.rs
+++ b/crates/craft_retained/src/events/pointer_capture.rs
@@ -5,7 +5,7 @@ use std::rc::{Rc, Weak};
 use ui_events::pointer::PointerId;
 
 use crate::elements::ElementInternals;
-use crate::events::CraftMessage;
+use crate::events::EventKind;
 use crate::events::event_dispatch::{dispatch_bubbling_event, dispatch_capturing_event};
 
 /// Stores window specific information like pointer captures, focus (soon), etc.
@@ -27,16 +27,13 @@ impl PointerCapture {
     }
 
     /// Returns the currently pointer captured element or None.
-    pub(super) fn find_pointer_capture_target(
-        &self,
-        message: &CraftMessage,
-    ) -> Option<Rc<RefCell<dyn ElementInternals>>> {
+    pub(super) fn find_pointer_capture_target(&self, message: &EventKind) -> Option<Rc<RefCell<dyn ElementInternals>>> {
         // 9.4 Implicit pointer capture
         // https://w3c.github.io/pointerevents/#implicit-pointer-capture
         //
         let pointer_capture_element_id: Option<Weak<RefCell<dyn ElementInternals>>> = {
             let key = &PointerId::new(1).unwrap();
-            if matches!(message, CraftMessage::GotPointerCapture()) {
+            if matches!(message, EventKind::GotPointerCapture()) {
                 // Check pending (step 2):
                 // https://w3c.github.io/pointerevents/#process-pending-pointer-capture
                 self.pending_pointer_captures.get(key).cloned()
@@ -64,7 +61,7 @@ impl PointerCapture {
         if let Some(pointer_capture_val) = pointer_capture_val.clone()
             && Some(pointer_capture_val.as_ptr()) != pending_pointer_capture_val.clone().map(|w| w.as_ptr())
         {
-            let msg = CraftMessage::LostPointerCapture();
+            let msg = EventKind::LostPointerCapture();
             let target = self.find_pointer_capture_target(&msg);
 
             if let Some(target) = target {
@@ -85,7 +82,7 @@ impl PointerCapture {
         if let Some(pending_pointer_capture_val) = pending_pointer_capture_val.clone()
             && Some(pending_pointer_capture_val.as_ptr()) != pointer_capture_val.map(|w| w.as_ptr())
         {
-            let msg = CraftMessage::GotPointerCapture();
+            let msg = EventKind::GotPointerCapture();
             let target = self.find_pointer_capture_target(&msg);
 
             if let Some(target) = target {
@@ -111,10 +108,10 @@ impl PointerCapture {
         }
     }
 
-    pub(super) fn maybe_handle_implicit_pointer_capture_release(&mut self, message: &CraftMessage) {
+    pub(super) fn maybe_handle_implicit_pointer_capture_release(&mut self, message: &EventKind) {
         // 9.5 Implicit release of pointer capture
         // https://w3c.github.io/pointerevents/#implicit-release-of-pointer-capture
-        let is_pointer_up_event = matches!(message, CraftMessage::PointerButtonUp(_));
+        let is_pointer_up_event = matches!(message, EventKind::PointerButtonUp(_));
         if is_pointer_up_event
         /* || is_pointer_canceled */
         {

From 6e7ef1f65e369c6f9f719dc7386af771b78bca88 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 12:24:17 -0400
Subject: [PATCH 106/143] Remove unused pointer param from draw.

---
 .../craft_retained/src/elements/container.rs  | 20 ++++------
 .../craft_retained/src/elements/dropdown.rs   | 40 ++++++++-----------
 crates/craft_retained/src/elements/image.rs   | 14 ++-----
 .../src/elements/slider/slider_element.rs     | 16 +++-----
 crates/craft_retained/src/elements/text.rs    | 14 ++-----
 .../src/elements/text_input/mod.rs            | 22 ++++------
 .../src/elements/traits/element_internals.rs  | 19 ++-------
 crates/craft_retained/src/elements/window.rs  | 21 ++++------
 8 files changed, 55 insertions(+), 111 deletions(-)

diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index a880b5ab..ec030ad1 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -125,30 +125,24 @@ impl ElementInternals for ContainerInner {
         )
     }
 
-    fn draw(
-        &mut self,
-        renderer: &mut RenderList,
-        text_context: &mut TextContext,
-        pointer: Option<Point>,
-        scale_factor: f64,
-    ) {
+    fn draw(&mut self, _renderer: &mut RenderList, _text_context: &mut TextContext, _scale_factor: f64) {
         if !self.is_visible() {
             return;
         }
-        self.add_hit_testable(renderer, true, scale_factor);
+        self.add_hit_testable(_renderer, true, _scale_factor);
 
         // We draw the borders before we start any layers, so that we don't clip the borders.
-        self.draw_borders(renderer, scale_factor);
+        self.draw_borders(_renderer, _scale_factor);
 
         /*if self.element_data.layout_item.has_new_layout {
             renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 5.0);
         }*/
 
-        self.maybe_start_layer(renderer, scale_factor);
-        self.draw_children(renderer, text_context, pointer, scale_factor);
-        self.maybe_end_layer(renderer);
+        self.maybe_start_layer(_renderer, _scale_factor);
+        self.draw_children(_renderer, _text_context, _scale_factor);
+        self.maybe_end_layer(_renderer);
 
-        self.draw_scrollbar(renderer, scale_factor);
+        self.draw_scrollbar(_renderer, _scale_factor);
     }
 
     fn on_event(
diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index 4352fbcf..faf060d8 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -181,32 +181,26 @@ impl ElementInternals for DropdownInner {
         }
     }
 
-    fn draw(
-        &mut self,
-        renderer: &mut RenderList,
-        text_context: &mut TextContext,
-        pointer: Option<Point>,
-        scale_factor: f64,
-    ) {
+    fn draw(&mut self, _renderer: &mut RenderList, _text_context: &mut TextContext, _scale_factor: f64) {
         if !self.is_visible() {
             return;
         }
 
         // We draw the borders before we start any layers, so that we don't clip the borders.
-        self.draw_borders(renderer, scale_factor);
+        self.draw_borders(_renderer, _scale_factor);
 
         if let Some(selected_element) = &self.selected_element {
             let mut binding = selected_element.borrow_mut();
-            binding.draw(renderer, text_context, pointer, scale_factor);
+            binding.draw(_renderer, _text_context, _scale_factor);
         }
 
         if self.is_floating_window_hidden {
-            self.add_hit_testable(renderer, true, scale_factor);
+            self.add_hit_testable(_renderer, true, _scale_factor);
         }
 
         // Draw the arrow
         let arrow_rect = self.arrow.layout.computed_box_transformed.border_rectangle();
-        let thickness = 2.0 * scale_factor;
+        let thickness = 2.0 * _scale_factor;
         let mut path = kurbo::BezPath::new();
         let left_x = arrow_rect.x as f64;
         let right_x = (arrow_rect.x + arrow_rect.width) as f64;
@@ -223,23 +217,23 @@ impl ElementInternals for DropdownInner {
 
         path.apply_affine((Affine::IDENTITY).then_translate(Vec2::new(0.0, arrow_rect.height as f64 / 4.0)));
         let arrow_color = Color::from_rgba8(75, 75, 77, 255);
-        renderer.fill_bez_path(path, Brush::Color(arrow_color));
+        _renderer.fill_bez_path(path, Brush::Color(arrow_color));
 
         if !self.is_floating_window_hidden {
-            renderer.start_overlay();
-            self.add_hit_testable(renderer, true, scale_factor);
+            _renderer.start_overlay();
+            self.add_hit_testable(_renderer, true, _scale_factor);
 
             let current_style = self.floating_window.style.as_ref();
             self.floating_window
                 .layout
-                .draw_borders(renderer, current_style, scale_factor);
+                .draw_borders(_renderer, current_style, _scale_factor);
 
-            renderer.push_layer(
+            _renderer.push_layer(
                 self.floating_window
                     .layout
                     .computed_box_transformed
                     .padding_rectangle()
-                    .scale(scale_factor),
+                    .scale(_scale_factor),
             );
 
             for (index, child) in self.children().iter().enumerate() {
@@ -254,21 +248,21 @@ impl ElementInternals for DropdownInner {
 
                 let is_hovered = self.currently_hovered_element == Some(index);
                 if is_hovered {
-                    renderer.draw_rect(child_rect, self.hovered_bg_color.unwrap());
+                    _renderer.draw_rect(child_rect, self.hovered_bg_color.unwrap());
                 }
 
-                child.borrow_mut().draw(renderer, text_context, pointer, scale_factor);
+                child.borrow_mut().draw(_renderer, _text_context, _scale_factor);
             }
 
-            renderer.pop_layer();
+            _renderer.pop_layer();
 
             draw_scrollbar(
                 &self.floating_window.style,
                 &self.floating_window.layout,
-                renderer,
-                scale_factor,
+                _renderer,
+                _scale_factor,
             );
-            renderer.end_overlay();
+            _renderer.end_overlay();
         }
     }
 
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 8686d6e5..0688be1d 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -106,25 +106,19 @@ impl ElementInternals for Image {
         self.apply_clip(clip_bounds);
     }
 
-    fn draw(
-        &mut self,
-        renderer: &mut RenderList,
-        _text_context: &mut TextContext,
-        _pointer: Option<Point>,
-        scale_factor: f64,
-    ) {
+    fn draw(&mut self, _renderer: &mut RenderList, _text_context: &mut TextContext, _scale_factor: f64) {
         if !self.is_visible() {
             return;
         }
 
         // We draw the borders before we start any layers, so that we don't clip the borders.
-        self.draw_borders(renderer, scale_factor);
+        self.draw_borders(_renderer, _scale_factor);
 
         let computed_box_transformed = self.get_computed_box_transformed();
         let content_rectangle = computed_box_transformed.content_rectangle();
-        self.draw_borders(renderer, scale_factor);
+        self.draw_borders(_renderer, _scale_factor);
 
-        renderer.draw_image(content_rectangle.scale(scale_factor), self.resource_identifier.clone());
+        _renderer.draw_image(content_rectangle.scale(_scale_factor), self.resource_identifier.clone());
     }
 
     fn as_any(&self) -> &dyn Any {
diff --git a/crates/craft_retained/src/elements/slider/slider_element.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
index f2b775d0..cd590595 100644
--- a/crates/craft_retained/src/elements/slider/slider_element.rs
+++ b/crates/craft_retained/src/elements/slider/slider_element.rs
@@ -353,22 +353,16 @@ impl ElementInternals for SliderInner {
         }
     }
 
-    fn draw(
-        &mut self,
-        renderer: &mut RenderList,
-        _text_context: &mut TextContext,
-        _pointer: Option<Point>,
-        scale_factor: f64,
-    ) {
+    fn draw(&mut self, _renderer: &mut RenderList, _text_context: &mut TextContext, _scale_factor: f64) {
         if !self.is_visible() {
             return;
         }
 
-        self.add_hit_testable(renderer, true, scale_factor);
+        self.add_hit_testable(_renderer, true, _scale_factor);
 
-        self.draw_borders(renderer, scale_factor);
-        self.draw_track(renderer, scale_factor);
-        self.draw_thumb(renderer);
+        self.draw_borders(_renderer, _scale_factor);
+        self.draw_track(_renderer, _scale_factor);
+        self.draw_thumb(_renderer);
     }
 
     fn on_event(
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index cb699846..5ccfdb26 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -242,28 +242,22 @@ impl ElementInternals for TextInner {
         state.try_update_text_render(text_context, self.element_data.style.get_selection_color());
     }
 
-    fn draw(
-        &mut self,
-        renderer: &mut RenderList,
-        _text_context: &mut TextContext,
-        _pointer: Option<Point>,
-        scale_factor: f64,
-    ) {
+    fn draw(&mut self, _renderer: &mut RenderList, _text_context: &mut TextContext, _scale_factor: f64) {
         if !self.is_visible() {
             return;
         }
-        self.add_hit_testable(renderer, true, scale_factor);
+        self.add_hit_testable(_renderer, true, _scale_factor);
 
         let computed_box_transformed = self.get_computed_box_transformed();
         let content_rectangle = computed_box_transformed.content_rectangle();
 
-        self.draw_borders(renderer, scale_factor);
+        self.draw_borders(_renderer, _scale_factor);
 
         /*if self.element_data.layout_item.has_new_layout {
             renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 1.0);
         }*/
 
-        renderer.draw_text(self.me.clone(), content_rectangle.scale(scale_factor), None, false);
+        _renderer.draw_text(self.me.clone(), content_rectangle.scale(_scale_factor), None, false);
     }
 
     #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 93b37531..e0346832 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -212,29 +212,23 @@ impl ElementInternals for TextInputInner {
             .render_text(self.is_focused(), self.element_data.current_style());
     }
 
-    fn draw(
-        &mut self,
-        renderer: &mut RenderList,
-        _text_context: &mut TextContext,
-        _pointer: Option<Point>,
-        scale_factor: f64,
-    ) {
+    fn draw(&mut self, _renderer: &mut RenderList, _text_context: &mut TextContext, _scale_factor: f64) {
         if !self.is_visible() {
             return;
         }
 
-        self.add_hit_testable(renderer, true, scale_factor);
+        self.add_hit_testable(_renderer, true, _scale_factor);
 
         let computed_box_transformed = self.computed_box();
         let content_rectangle = computed_box_transformed.content_rectangle();
 
-        self.draw_borders(renderer, scale_factor);
+        self.draw_borders(_renderer, _scale_factor);
 
         let is_scrollable = self.element_data.is_scrollable();
 
         let element_data = &self.element_data;
         let padding_rectangle = element_data.layout.computed_box_transformed.padding_rectangle();
-        renderer.push_layer(padding_rectangle.scale(scale_factor));
+        _renderer.push_layer(padding_rectangle.scale(_scale_factor));
 
         let text_scroll = if is_scrollable {
             Some(TextScroll::new(
@@ -246,17 +240,17 @@ impl ElementInternals for TextInputInner {
         };
 
         if self.state.text_render.as_ref().is_some() {
-            renderer.draw_text(
+            _renderer.draw_text(
                 self.me.clone(),
-                content_rectangle.scale(scale_factor),
+                content_rectangle.scale(_scale_factor),
                 text_scroll,
                 self.is_focused(),
             );
         }
 
-        renderer.pop_layer();
+        _renderer.pop_layer();
 
-        self.draw_scrollbar(renderer, scale_factor);
+        self.draw_scrollbar(_renderer, _scale_factor);
     }
 
     #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index c82e7578..b45d0b73 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -80,15 +80,9 @@ pub trait ElementInternals: ElementData + Any {
     }
 
     /// A helper to draw all children.
-    fn draw_children(
-        &mut self,
-        renderer: &mut RenderList,
-        text_context: &mut TextContext,
-        pointer: Option<Point>,
-        scale_factor: f64,
-    ) {
+    fn draw_children(&mut self, renderer: &mut RenderList, text_context: &mut TextContext, scale_factor: f64) {
         for child in self.children() {
-            child.borrow_mut().draw(renderer, text_context, pointer, scale_factor);
+            child.borrow_mut().draw(renderer, text_context, scale_factor);
         }
     }
 
@@ -147,14 +141,7 @@ pub trait ElementInternals: ElementData + Any {
     /// - `pointer`: optional pointer position for hover effects.
     /// - `window`: optional window handle.
     /// - `scale_factor`: scale factor.
-    fn draw(
-        &mut self,
-        _renderer: &mut RenderList,
-        _text_context: &mut TextContext,
-        _pointer: Option<Point>,
-        _scale_factor: f64,
-    ) {
-    }
+    fn draw(&mut self, _renderer: &mut RenderList, _text_context: &mut TextContext, _scale_factor: f64) {}
 
     /// Computes a [`TreeUpdate`] reflecting any accessibility changes.
     #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index a71052f8..2a5c2ca2 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -183,30 +183,24 @@ impl ElementInternals for WindowInternal {
         )
     }
 
-    fn draw(
-        &mut self,
-        renderer: &mut RenderList,
-        text_context: &mut TextContext,
-        pointer: Option<Point>,
-        scale_factor: f64,
-    ) {
+    fn draw(&mut self, _renderer: &mut RenderList, _text_context: &mut TextContext, _scale_factor: f64) {
         if !self.is_visible() {
             return;
         }
-        self.add_hit_testable(renderer, true, scale_factor);
+        self.add_hit_testable(_renderer, true, _scale_factor);
 
         // We draw the borders before we start any layers, so that we don't clip the borders.
-        self.draw_borders(renderer, scale_factor);
+        self.draw_borders(_renderer, _scale_factor);
 
         /*if self.element_data.layout_item.has_new_layout {
             renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 5.0);
         }*/
 
-        self.maybe_start_layer(renderer, scale_factor);
-        self.draw_children(renderer, text_context, pointer, scale_factor);
-        self.maybe_end_layer(renderer);
+        self.maybe_start_layer(_renderer, _scale_factor);
+        self.draw_children(_renderer, _text_context, _scale_factor);
+        self.maybe_end_layer(_renderer);
 
-        self.draw_scrollbar(renderer, scale_factor);
+        self.draw_scrollbar(_renderer, _scale_factor);
     }
 
     #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
@@ -756,7 +750,6 @@ impl WindowInternal {
         self.draw(
             render_list.borrow_mut().deref_mut(),
             text_context,
-            None,
             self.effective_scale_factor(),
         );
 

From 18cc3c94ba945980f6f76a879ffc68f9bd13585a Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 12:30:48 -0400
Subject: [PATCH 107/143] Remove _ from used params.

---
 .../craft_retained/src/elements/container.rs  | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index ec030ad1..00755a56 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -125,24 +125,16 @@ impl ElementInternals for ContainerInner {
         )
     }
 
-    fn draw(&mut self, _renderer: &mut RenderList, _text_context: &mut TextContext, _scale_factor: f64) {
+    fn draw(&mut self, renderer: &mut RenderList, text_context: &mut TextContext, scale_factor: f64) {
         if !self.is_visible() {
             return;
         }
-        self.add_hit_testable(_renderer, true, _scale_factor);
-
-        // We draw the borders before we start any layers, so that we don't clip the borders.
-        self.draw_borders(_renderer, _scale_factor);
-
-        /*if self.element_data.layout_item.has_new_layout {
-            renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 5.0);
-        }*/
-
-        self.maybe_start_layer(_renderer, _scale_factor);
-        self.draw_children(_renderer, _text_context, _scale_factor);
-        self.maybe_end_layer(_renderer);
-
-        self.draw_scrollbar(_renderer, _scale_factor);
+        self.add_hit_testable(renderer, true, scale_factor);
+        self.draw_borders(renderer, scale_factor);
+        self.maybe_start_layer(renderer, scale_factor);
+        self.draw_children(renderer, text_context, scale_factor);
+        self.maybe_end_layer(renderer);
+        self.draw_scrollbar(renderer, scale_factor);
     }
 
     fn on_event(

From 906b2c25c63b24caebb744bb81124f7f553ac589 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 12:30:58 -0400
Subject: [PATCH 108/143] Remove dead code.

---
 .../src/elements/traits/element_internals.rs  | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index b45d0b73..aa68d9a9 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -20,7 +20,6 @@ use crate::elements::{ElementData, ElementIdMap, ScrollOptions, WindowInternal};
 use crate::events::pointer_capture::PointerCapture;
 use crate::events::{DropdownItemSelectedHandler, Event, EventKind, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::layout::TaffyTree;
-use crate::layout::layout::Layout;
 use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Style, Underline, Unit};
 use crate::text::text_context::TextContext;
 use crate::{Color, CraftError};
@@ -234,26 +233,7 @@ pub trait ElementInternals: ElementData + Any {
         );
     }
 
-    /// A bit of a hack to reset the layout item of an element recursively.
-    fn reset_layout(&mut self) {
-        self.element_data_mut().layout = Layout::default();
-
-        for child in self.element_data_mut().children.iter_mut() {
-            child.borrow_mut().reset_layout();
-        }
-    }
-
     fn add_hit_testable(&mut self, renderer: &mut RenderList, hit_testable: bool, scale_factor: f64) {
-        /*let ed = self.element_data().borrow();
-        let has_events =
-            !ed.on_pointer_button_up.is_empty() ||
-            !ed.on_pointer_moved.is_empty() ||
-            !ed.on_keyboard_input.is_empty() ||
-            !ed.on_pointer_button_down.is_empty() ||
-            !ed.on_got_pointer_capture.is_empty() ||
-            !ed.on_pointer_enter.is_empty() ||
-            !ed.on_pointer_leave.is_empty() ||
-            !ed.on_lost_pointer_capture;*/
         if hit_testable {
             let id = self.element_data().internal_id;
             renderer.push_hit_testable(

From 1d8b70ddc74b05249452686784caab3071e6c348 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 12:31:44 -0400
Subject: [PATCH 109/143] Add missing linebreak

---
 crates/craft_retained/src/elements/container.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 00755a56..eb7275c3 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -6,6 +6,7 @@ use std::rc::{Rc, Weak};
 
 use craft_primitives::geometry::Rectangle;
 use craft_renderer::RenderList;
+
 use kurbo::{Affine, Point};
 
 use crate::app::TAFFY_TREE;

From 0e94b30fc1b3a727e77430ffd6cf9f4b2539d8b0 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 12:52:38 -0400
Subject: [PATCH 110/143] Add push_child helper and set window on dropdown
 children.

---
 .../craft_retained/src/elements/container.rs  | 44 ++++++-------------
 .../craft_retained/src/elements/dropdown.rs   |  4 ++
 .../src/elements/internal_helpers.rs          | 25 +++++++++++
 crates/craft_retained/src/elements/mod.rs     | 33 +++++++-------
 crates/craft_retained/src/elements/window.rs  | 19 ++------
 5 files changed, 64 insertions(+), 61 deletions(-)
 create mode 100644 crates/craft_retained/src/elements/internal_helpers.rs

diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index eb7275c3..aa6b7891 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -9,8 +9,8 @@ use craft_renderer::RenderList;
 
 use kurbo::{Affine, Point};
 
-use crate::app::TAFFY_TREE;
 use crate::elements::element_data::ElementData;
+use crate::elements::internal_helpers::push_child_to_element;
 use crate::elements::traits::DeepClone;
 use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scrollable, scrollable};
 use crate::events::{Event, EventKind};
@@ -36,20 +36,6 @@ impl Default for Container {
     }
 }
 
-impl Container {
-    pub fn new() -> Self {
-        let inner = Rc::new_cyclic(|me: &Weak<RefCell<ContainerInner>>| {
-            RefCell::new(ContainerInner {
-                element_data: ElementData::new(me.clone(), true),
-            })
-        });
-
-        inner.borrow_mut().element_data.create_layout_node(None);
-
-        Self { inner }
-    }
-}
-
 impl Element for Container {}
 
 impl AsElement for Container {
@@ -153,21 +139,7 @@ impl ElementInternals for ContainerInner {
     }
 
     fn push(&mut self, child: Rc<RefCell<dyn ElementInternals>>) {
-        let me: Weak<RefCell<dyn ElementInternals>> = self.element_data.me.clone();
-        let me_window = self.element_data.window.clone();
-        child.borrow_mut().element_data_mut().parent = Some(me);
-        child.borrow_mut().element_data_mut().window = me_window;
-        child.borrow_mut().propagate_window_down();
-        self.element_data.children.push(child.clone());
-
-        // Add the children's taffy node.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let parent_id = self.element_data.layout.taffy_node_id.unwrap();
-            let child_id = child.borrow().element_data().layout.taffy_node_id;
-            if let Some(child_id) = child_id {
-                taffy_tree.add_child(parent_id, child_id);
-            }
-        });
+        push_child_to_element(self, child);
     }
 
     fn as_any(&self) -> &dyn Any {
@@ -178,3 +150,15 @@ impl ElementInternals for ContainerInner {
         self
     }
 }
+
+impl Container {
+    pub fn new() -> Self {
+        let inner = Rc::new_cyclic(|me: &Weak<RefCell<ContainerInner>>| {
+            RefCell::new(ContainerInner {
+                element_data: ElementData::new(me.clone(), true),
+            })
+        });
+        inner.borrow_mut().element_data.create_layout_node(None);
+        Self { inner }
+    }
+}
diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index faf060d8..f26b4341 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -16,6 +16,7 @@ use ui_events::pointer::PointerId;
 
 use crate::app::{TAFFY_TREE, queue_event, request_apply_layout};
 use crate::elements::element_data::ElementData as ElementDataStruct;
+use crate::elements::internal_helpers::push_child_to_element;
 use crate::elements::scrollable::{apply_scroll_layout, draw_scrollbar, handle_scroll_logic_advance};
 use crate::elements::traits::DeepClone;
 use crate::elements::{AsElement, Element, ElementData, ElementInternals, resolve_clip_for_scrollable};
@@ -397,8 +398,11 @@ impl ElementInternals for DropdownInner {
 
     fn push(&mut self, child: Rc<RefCell<dyn ElementInternals>>) {
         let me: Weak<RefCell<dyn ElementInternals>> = self.element_data.me.clone();
+        let me_window = self.element_data.window.clone();
         child.borrow_mut().element_data_mut().parent = Some(me);
         self.element_data.children.push(child.clone());
+        child.borrow_mut().element_data_mut().window = me_window;
+        child.borrow_mut().propagate_window_down();
 
         // Add the children to the floating window layout.
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
diff --git a/crates/craft_retained/src/elements/internal_helpers.rs b/crates/craft_retained/src/elements/internal_helpers.rs
new file mode 100644
index 00000000..ce99660c
--- /dev/null
+++ b/crates/craft_retained/src/elements/internal_helpers.rs
@@ -0,0 +1,25 @@
+use std::cell::RefCell;
+use std::rc::{Rc, Weak};
+
+use crate::app::TAFFY_TREE;
+use crate::elements::ElementInternals;
+
+/// A helper to push children.
+pub fn push_child_to_element(parent: &mut dyn ElementInternals, child: Rc<RefCell<dyn ElementInternals>>) {
+    let element_data = parent.element_data_mut();
+    let me: Weak<RefCell<dyn ElementInternals>> = element_data.me.clone();
+    let me_window = element_data.window.clone();
+    child.borrow_mut().element_data_mut().parent = Some(me);
+    child.borrow_mut().element_data_mut().window = me_window;
+    child.borrow_mut().propagate_window_down();
+    element_data.children.push(child.clone());
+
+    // Add the children's taffy node.
+    TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+        let parent_id = element_data.layout.taffy_node_id.unwrap();
+        let child_id = child.borrow().element_data().layout.taffy_node_id;
+        if let Some(child_id) = child_id {
+            taffy_tree.add_child(parent_id, child_id);
+        }
+    });
+}
diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index 2d442780..ca14bd61 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -1,24 +1,25 @@
-mod container;
-mod element_data;
-mod text;
-mod traits;
+pub use crate::elements::container::{Container, ContainerInner};
+pub use crate::elements::dropdown::{Dropdown, DropdownInner};
+pub use crate::elements::element_id_map::ElementIdMap;
+pub use crate::elements::image::Image;
+pub use crate::elements::scrollable::{ScrollOptions, ScrollToBox};
+pub use crate::elements::slider::{Slider, SliderDirection, SliderInner};
+pub use crate::elements::text::{Text, TextInner};
+pub use crate::elements::text_input::{TextInput, TextInputInner};
+pub use crate::elements::traits::{AsElement, Element, ElementData, ElementInternals, resolve_clip_for_scrollable};
+pub use crate::elements::window::{Window, WindowInternal};
+
+pub(crate) mod internal_helpers;
+pub(crate) mod scrollable;
 
+mod container;
 mod dropdown;
+mod element_data;
 mod element_id;
 mod element_id_map;
 mod image;
-pub(crate) mod scrollable;
 mod slider;
+mod text;
 mod text_input;
+mod traits;
 mod window;
-
-pub use container::{Container, ContainerInner};
-pub use dropdown::{Dropdown, DropdownInner};
-pub use element_id_map::ElementIdMap;
-pub use image::Image;
-pub use scrollable::{ScrollOptions, ScrollToBox};
-pub use slider::{Slider, SliderDirection, SliderInner};
-pub use text::{Text, TextInner};
-pub use text_input::{TextInput, TextInputInner};
-pub use traits::{AsElement, Element, ElementData, ElementInternals, resolve_clip_for_scrollable};
-pub use window::{Window, WindowInternal};
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 2a5c2ca2..e32df9e1 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -23,10 +23,12 @@ use kurbo::{Affine, Point};
 use peniko::Color;
 
 use taffy::{AvailableSpace, NodeId};
+
 use ui_events::ScrollDelta;
 use ui_events::ScrollDelta::PixelDelta;
 use ui_events::keyboard::{KeyboardEvent, Modifiers, NamedKey};
 use ui_events::pointer::PointerScrollEvent;
+
 use winit::event::WindowEvent;
 use winit::event_loop::ActiveEventLoop;
 use winit::window::{Window as WinitWindow, WindowAttributes};
@@ -40,6 +42,7 @@ use crate::accessibility::{access_handler::CraftAccessHandler, activation_handle
 use crate::app::FOCUS;
 use crate::app::{App, TAFFY_TREE, WINDOW_MANAGER, queue_window_event};
 use crate::elements::element_data::ElementData;
+use crate::elements::internal_helpers::push_child_to_element;
 use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scrollable, scrollable};
 #[cfg(target_arch = "wasm32")]
 use crate::events::internal::InternalMessage;
@@ -258,21 +261,7 @@ impl ElementInternals for WindowInternal {
     }
 
     fn push(&mut self, child: Rc<RefCell<dyn ElementInternals>>) {
-        let me: Weak<RefCell<dyn ElementInternals>> = self.element_data.me.clone();
-        let me_window = self.element_data.window.clone();
-        child.borrow_mut().element_data_mut().parent = Some(me);
-        child.borrow_mut().element_data_mut().window = me_window;
-        child.borrow_mut().propagate_window_down();
-        self.element_data.children.push(child.clone());
-
-        // Add the children's taffy node.
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let parent_id = self.element_data.layout.taffy_node_id.unwrap();
-            let child_id = child.borrow().element_data().layout.taffy_node_id;
-            if let Some(child_id) = child_id {
-                taffy_tree.add_child(parent_id, child_id);
-            }
-        });
+        push_child_to_element(self, child);
     }
 
     fn as_any(&self) -> &dyn Any {

From 9ae387e9f7195d36b71079f4225fbf6d1ddb1933 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 12:59:17 -0400
Subject: [PATCH 111/143] Remove unused param.

---
 crates/craft_retained/src/elements/container.rs       |  2 --
 crates/craft_retained/src/elements/dropdown.rs        |  4 ----
 crates/craft_retained/src/elements/image.rs           |  1 -
 .../src/elements/slider/slider_element.rs             |  1 -
 crates/craft_retained/src/elements/text.rs            |  1 -
 crates/craft_retained/src/elements/text_input/mod.rs  |  1 -
 .../src/elements/traits/element_internals.rs          |  3 ---
 crates/craft_retained/src/elements/window.rs          | 11 -----------
 8 files changed, 24 deletions(-)

diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index aa6b7891..d7506c16 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -65,7 +65,6 @@ impl ElementInternals for ContainerInner {
         position: Point,
         z_index: &mut u32,
         transform: Affine,
-        pointer: Option<Point>,
         text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
@@ -105,7 +104,6 @@ impl ElementInternals for ContainerInner {
             taffy_tree,
             z_index,
             transform * child_transform,
-            pointer,
             text_context,
             scale_factor,
             false,
diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index f26b4341..1740ab93 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -16,7 +16,6 @@ use ui_events::pointer::PointerId;
 
 use crate::app::{TAFFY_TREE, queue_event, request_apply_layout};
 use crate::elements::element_data::ElementData as ElementDataStruct;
-use crate::elements::internal_helpers::push_child_to_element;
 use crate::elements::scrollable::{apply_scroll_layout, draw_scrollbar, handle_scroll_logic_advance};
 use crate::elements::traits::DeepClone;
 use crate::elements::{AsElement, Element, ElementData, ElementInternals, resolve_clip_for_scrollable};
@@ -108,7 +107,6 @@ impl ElementInternals for DropdownInner {
         position: Point,
         z_index: &mut u32,
         transform: Affine,
-        pointer: Option<Point>,
         text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
@@ -134,7 +132,6 @@ impl ElementInternals for DropdownInner {
                 self.element_data().layout.computed_box.position,
                 z_index,
                 transform,
-                pointer,
                 text_context,
                 self.element_data().layout.clip_bounds,
                 scale_factor,
@@ -174,7 +171,6 @@ impl ElementInternals for DropdownInner {
                 floating_window_position,
                 z_index,
                 transform * child_transform,
-                pointer,
                 text_context,
                 self.floating_window.layout.clip_bounds,
                 scale_factor,
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 0688be1d..306a39c5 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -94,7 +94,6 @@ impl ElementInternals for Image {
         position: Point,
         z_index: &mut u32,
         transform: Affine,
-        _pointer: Option<Point>,
         _text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
diff --git a/crates/craft_retained/src/elements/slider/slider_element.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
index cd590595..5df9c1da 100644
--- a/crates/craft_retained/src/elements/slider/slider_element.rs
+++ b/crates/craft_retained/src/elements/slider/slider_element.rs
@@ -331,7 +331,6 @@ impl ElementInternals for SliderInner {
         position: Point,
         z_index: &mut u32,
         transform: Affine,
-        _pointer: Option<Point>,
         _text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 5ccfdb26..83ca5d98 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -207,7 +207,6 @@ impl ElementInternals for TextInner {
         position: Point,
         z_index: &mut u32,
         transform: Affine,
-        _pointer: Option<Point>,
         text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index e0346832..9495c620 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -159,7 +159,6 @@ impl ElementInternals for TextInputInner {
         position: Point,
         z_index: &mut u32,
         transform: Affine,
-        _pointer: Option<Point>,
         text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index aa68d9a9..5449d339 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -53,7 +53,6 @@ pub trait ElementInternals: ElementData + Any {
         taffy_tree: &mut TaffyTree,
         z_index: &mut u32,
         transform: Affine,
-        pointer: Option<Point>,
         text_context: &mut TextContext,
         scale_factor: f64,
         _dirty: bool,
@@ -64,7 +63,6 @@ pub trait ElementInternals: ElementData + Any {
                 self.element_data().layout.computed_box.position,
                 z_index,
                 transform,
-                pointer,
                 text_context,
                 self.element_data().layout.clip_bounds,
                 scale_factor,
@@ -124,7 +122,6 @@ pub trait ElementInternals: ElementData + Any {
         position: Point,
         z_index: &mut u32,
         transform: Affine,
-        pointer: Option<Point>,
         text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index e32df9e1..5f7223b5 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -139,7 +139,6 @@ impl ElementInternals for WindowInternal {
         position: Point,
         z_index: &mut u32,
         transform: Affine,
-        pointer: Option<Point>,
         text_context: &mut TextContext,
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
@@ -179,7 +178,6 @@ impl ElementInternals for WindowInternal {
             taffy_tree,
             z_index,
             transform * child_transform,
-            pointer,
             text_context,
             scale_factor,
             false,
@@ -191,18 +189,10 @@ impl ElementInternals for WindowInternal {
             return;
         }
         self.add_hit_testable(_renderer, true, _scale_factor);
-
-        // We draw the borders before we start any layers, so that we don't clip the borders.
         self.draw_borders(_renderer, _scale_factor);
-
-        /*if self.element_data.layout_item.has_new_layout {
-            renderer.draw_rect_outline(self.element_data.layout_item.computed_box_transformed.padding_rectangle(), rgba(255, 0, 0, 100), 5.0);
-        }*/
-
         self.maybe_start_layer(_renderer, _scale_factor);
         self.draw_children(_renderer, _text_context, _scale_factor);
         self.maybe_end_layer(_renderer);
-
         self.draw_scrollbar(_renderer, _scale_factor);
     }
 
@@ -720,7 +710,6 @@ impl WindowInternal {
                     Point::new(0.0, 0.0),
                     &mut layout_order,
                     Affine::IDENTITY,
-                    None,
                     text_context,
                     None,
                     sf,

From e1c0e54e0f0d95ae96e562cd4e6d6a92432f9f60 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 13:01:53 -0400
Subject: [PATCH 112/143] Remove unused enum.

---
 crates/craft_retained/src/events/mod.rs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/crates/craft_retained/src/events/mod.rs b/crates/craft_retained/src/events/mod.rs
index e4a4f3f6..73289d96 100644
--- a/crates/craft_retained/src/events/mod.rs
+++ b/crates/craft_retained/src/events/mod.rs
@@ -80,14 +80,6 @@ pub struct Event {
     pub prevent_defaults: bool,
 }
 
-#[derive(Debug, Clone, Copy, Default)]
-pub enum FocusAction {
-    #[default]
-    None,
-    Set(u64),
-    Unset,
-}
-
 impl EventKind {
     pub(super) fn is_pointer_event(&self) -> bool {
         matches!(

From 1786433527773bb4bd83c6fcd4142a32df632e0e Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 13:19:05 -0400
Subject: [PATCH 113/143] Move duplicated code to helper function.

---
 .../craft_retained/src/elements/container.rs  | 53 ++-----------
 .../src/elements/internal_helpers.rs          | 78 ++++++++++++++++++-
 crates/craft_retained/src/elements/window.rs  | 55 +++----------
 3 files changed, 92 insertions(+), 94 deletions(-)

diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index d7506c16..59078c12 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -10,7 +10,7 @@ use craft_renderer::RenderList;
 use kurbo::{Affine, Point};
 
 use crate::elements::element_data::ElementData;
-use crate::elements::internal_helpers::push_child_to_element;
+use crate::elements::internal_helpers::{apply_generic_container_layout, draw_generic_container, push_child_to_element};
 use crate::elements::traits::DeepClone;
 use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scrollable, scrollable};
 use crate::events::{Event, EventKind};
@@ -69,57 +69,20 @@ impl ElementInternals for ContainerInner {
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
     ) {
-        let node = self.element_data.layout.taffy_node_id.unwrap();
-        let layout = taffy_tree.get_layout(node);
-        let has_new_layout = taffy_tree.has_new_layout(node);
-
-        let dirty = has_new_layout
-            || transform != self.element_data.layout.get_transform()
-            || position != self.element_data.layout.position;
-        self.element_data.layout.has_new_layout = has_new_layout;
-
-        if dirty {
-            self.resolve_box(position, transform, layout, z_index);
-            self.apply_borders(scale_factor);
-            // For scroll changes from taffy;
-            self.element_data.apply_scroll(layout);
-            self.apply_clip(clip_bounds);
-            self.element_data.layout.scroll_state.mark_old();
-        }
-
-        // For manual scroll updates.
-        if !dirty && self.element_data.layout.scroll_state.is_new() {
-            self.element_data.apply_scroll(layout);
-            self.element_data.layout.scroll_state.mark_old();
-        }
-
-        if has_new_layout {
-            taffy_tree.mark_seen(node);
-        }
-
-        let scroll_y = self.element_data.scroll().scroll_y() as f64;
-        let child_transform = Affine::translate((0.0, -scroll_y));
-
-        self.apply_layout_children(
+        apply_generic_container_layout(
+            self,
             taffy_tree,
+            position,
             z_index,
-            transform * child_transform,
+            transform,
             text_context,
+            clip_bounds,
             scale_factor,
-            false,
-        )
+        );
     }
 
     fn draw(&mut self, renderer: &mut RenderList, text_context: &mut TextContext, scale_factor: f64) {
-        if !self.is_visible() {
-            return;
-        }
-        self.add_hit_testable(renderer, true, scale_factor);
-        self.draw_borders(renderer, scale_factor);
-        self.maybe_start_layer(renderer, scale_factor);
-        self.draw_children(renderer, text_context, scale_factor);
-        self.maybe_end_layer(renderer);
-        self.draw_scrollbar(renderer, scale_factor);
+        draw_generic_container(self, renderer, text_context, scale_factor);
     }
 
     fn on_event(
diff --git a/crates/craft_retained/src/elements/internal_helpers.rs b/crates/craft_retained/src/elements/internal_helpers.rs
index ce99660c..c55ad88c 100644
--- a/crates/craft_retained/src/elements/internal_helpers.rs
+++ b/crates/craft_retained/src/elements/internal_helpers.rs
@@ -1,8 +1,12 @@
-use std::cell::RefCell;
-use std::rc::{Rc, Weak};
-
 use crate::app::TAFFY_TREE;
 use crate::elements::ElementInternals;
+use crate::layout::TaffyTree;
+use crate::text::text_context::TextContext;
+use craft_primitives::geometry::Rectangle;
+use craft_renderer::RenderList;
+use kurbo::{Affine, Point};
+use std::cell::RefCell;
+use std::rc::{Rc, Weak};
 
 /// A helper to push children.
 pub fn push_child_to_element(parent: &mut dyn ElementInternals, child: Rc<RefCell<dyn ElementInternals>>) {
@@ -23,3 +27,71 @@ pub fn push_child_to_element(parent: &mut dyn ElementInternals, child: Rc<RefCel
         }
     });
 }
+
+#[allow(clippy::too_many_arguments)]
+pub fn apply_generic_container_layout(
+    element: &mut dyn ElementInternals,
+    taffy_tree: &mut TaffyTree,
+    position: Point,
+    z_index: &mut u32,
+    transform: Affine,
+    text_context: &mut TextContext,
+    clip_bounds: Option<Rectangle>,
+    scale_factor: f64,
+) {
+    let node = element.element_data_mut().layout.taffy_node_id.unwrap();
+    let layout = taffy_tree.get_layout(node);
+    let has_new_layout = taffy_tree.has_new_layout(node);
+
+    let dirty = has_new_layout
+        || transform != element.element_data_mut().layout.get_transform()
+        || position != element.element_data_mut().layout.position;
+    element.element_data_mut().layout.has_new_layout = has_new_layout;
+    if dirty {
+        element.resolve_box(position, transform, layout, z_index);
+        element.apply_borders(scale_factor);
+        // For scroll changes from taffy;
+        element.element_data_mut().apply_scroll(layout);
+        element.apply_clip(clip_bounds);
+        element.element_data_mut().layout.scroll_state.mark_old();
+    }
+
+    // For manual scroll updates.
+    if !dirty && element.element_data_mut().layout.scroll_state.is_new() {
+        element.element_data_mut().apply_scroll(layout);
+        element.element_data_mut().layout.scroll_state.mark_old();
+    }
+
+    if has_new_layout {
+        taffy_tree.mark_seen(node);
+    }
+
+    let scroll_y = element.element_data_mut().scroll().scroll_y() as f64;
+    let child_transform = Affine::translate((0.0, -scroll_y));
+
+    element.apply_layout_children(
+        taffy_tree,
+        z_index,
+        transform * child_transform,
+        text_context,
+        scale_factor,
+        false,
+    )
+}
+
+pub fn draw_generic_container(
+    element: &mut dyn ElementInternals,
+    renderer: &mut RenderList,
+    text_context: &mut TextContext,
+    scale_factor: f64,
+) {
+    if !element.is_visible() {
+        return;
+    }
+    element.add_hit_testable(renderer, true, scale_factor);
+    element.draw_borders(renderer, scale_factor);
+    element.maybe_start_layer(renderer, scale_factor);
+    element.draw_children(renderer, text_context, scale_factor);
+    element.maybe_end_layer(renderer);
+    element.draw_scrollbar(renderer, scale_factor);
+}
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 5f7223b5..a1fab3ff 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -42,7 +42,7 @@ use crate::accessibility::{access_handler::CraftAccessHandler, activation_handle
 use crate::app::FOCUS;
 use crate::app::{App, TAFFY_TREE, WINDOW_MANAGER, queue_window_event};
 use crate::elements::element_data::ElementData;
-use crate::elements::internal_helpers::push_child_to_element;
+use crate::elements::internal_helpers::{apply_generic_container_layout, draw_generic_container, push_child_to_element};
 use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scrollable, scrollable};
 #[cfg(target_arch = "wasm32")]
 use crate::events::internal::InternalMessage;
@@ -143,57 +143,20 @@ impl ElementInternals for WindowInternal {
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
     ) {
-        let node = self.element_data.layout.taffy_node_id.unwrap();
-        let layout = taffy_tree.get_layout(node);
-        let has_new_layout = taffy_tree.has_new_layout(node);
-
-        let dirty = has_new_layout
-            || transform != self.element_data.layout.get_transform()
-            || position != self.element_data.layout.position;
-        self.element_data.layout.has_new_layout = has_new_layout;
-
-        if dirty {
-            self.resolve_box(position, transform, layout, z_index);
-            self.apply_borders(scale_factor);
-            // For scroll changes from taffy;
-            self.element_data.apply_scroll(layout);
-            self.apply_clip(clip_bounds);
-            self.element_data.layout.scroll_state.mark_old();
-        }
-
-        // For manual scroll updates.
-        if !dirty && self.element_data.layout.scroll_state.is_new() {
-            self.element_data.apply_scroll(layout);
-            self.element_data.layout.scroll_state.mark_old();
-        }
-
-        if has_new_layout {
-            taffy_tree.mark_seen(node);
-        }
-
-        let scroll_y = self.element_data.scroll().scroll_y() as f64;
-        let child_transform = Affine::translate((0.0, -scroll_y));
-
-        self.apply_layout_children(
+        apply_generic_container_layout(
+            self,
             taffy_tree,
+            position,
             z_index,
-            transform * child_transform,
+            transform,
             text_context,
+            clip_bounds,
             scale_factor,
-            false,
-        )
+        );
     }
 
-    fn draw(&mut self, _renderer: &mut RenderList, _text_context: &mut TextContext, _scale_factor: f64) {
-        if !self.is_visible() {
-            return;
-        }
-        self.add_hit_testable(_renderer, true, _scale_factor);
-        self.draw_borders(_renderer, _scale_factor);
-        self.maybe_start_layer(_renderer, _scale_factor);
-        self.draw_children(_renderer, _text_context, _scale_factor);
-        self.maybe_end_layer(_renderer);
-        self.draw_scrollbar(_renderer, _scale_factor);
+    fn draw(&mut self, renderer: &mut RenderList, text_context: &mut TextContext, scale_factor: f64) {
+        draw_generic_container(self, renderer, text_context, scale_factor);
     }
 
     #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]

From 41619988072d96ef699ab1d0c62ee9fc1ffe299c Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 15:14:40 -0400
Subject: [PATCH 114/143] Ensure craft_retained does not depend directly on
 kurbo types.

---
 Cargo.lock                                    |   1 -
 crates/craft_primitives/src/geometry/mod.rs   |  17 +-
 .../src/geometry/rectangle.rs                 |   1 -
 crates/craft_primitives/src/lib.rs            |  12 +-
 crates/craft_retained/Cargo.toml              |   4 +-
 .../craft_retained/src/elements/container.rs  |   4 +-
 .../craft_retained/src/elements/dropdown.rs   |   6 +-
 crates/craft_retained/src/elements/image.rs   |   3 +-
 .../src/elements/internal_helpers.rs          |   5 +-
 .../craft_retained/src/elements/scrollable.rs |   4 +-
 .../src/elements/slider/slider_draw.rs        |   3 +-
 .../src/elements/slider/slider_element.rs     |   5 +-
 .../src/elements/slider/slider_logic.rs       |   2 +-
 crates/craft_retained/src/elements/text.rs    | 310 +++++++++---------
 .../src/elements/text_input/mod.rs            |   7 +-
 .../src/elements/traits/element_internals.rs  |   4 +-
 crates/craft_retained/src/elements/window.rs  |   4 +-
 crates/craft_retained/src/events/helpers.rs   |   8 +-
 crates/craft_retained/src/layout/layout.rs    | 158 ++++-----
 19 files changed, 283 insertions(+), 275 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 173c19d3..0a05221f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1034,7 +1034,6 @@ dependencies = [
  "craft_runtime",
  "craft_undo",
  "image",
- "kurbo",
  "libtest-mimic-collect",
  "open",
  "parley",
diff --git a/crates/craft_primitives/src/geometry/mod.rs b/crates/craft_primitives/src/geometry/mod.rs
index 521950e3..ffead4b9 100644
--- a/crates/craft_primitives/src/geometry/mod.rs
+++ b/crates/craft_primitives/src/geometry/mod.rs
@@ -1,18 +1,19 @@
+pub use kurbo::{Affine, BezPath, Shape, Vec2};
+
+pub use crate::geometry::element_box::ElementBox;
+pub use crate::geometry::point::{Point, PointConverter};
+pub use crate::geometry::rectangle::Rectangle;
+pub use crate::geometry::size::Size;
+pub use crate::geometry::trblrectangle::TrblRectangle;
+
 pub mod borders;
+
 mod element_box;
 mod point;
 mod rectangle;
 mod size;
 mod trblrectangle;
 
-pub use element_box::ElementBox;
-pub use point::{Point, PointConverter};
-pub use rectangle::Rectangle;
-pub use size::Size;
-pub use trblrectangle::TrblRectangle;
-
 pub type Border = TrblRectangle<f32>;
 pub type Padding = TrblRectangle<f32>;
 pub type Margin = TrblRectangle<f32>;
-
-pub use kurbo::Affine;
diff --git a/crates/craft_primitives/src/geometry/rectangle.rs b/crates/craft_primitives/src/geometry/rectangle.rs
index 3f16b1c3..bfd9df63 100644
--- a/crates/craft_primitives/src/geometry/rectangle.rs
+++ b/crates/craft_primitives/src/geometry/rectangle.rs
@@ -1,5 +1,4 @@
 use dpi;
-use peniko::kurbo;
 
 use crate::geometry::Point;
 
diff --git a/crates/craft_primitives/src/lib.rs b/crates/craft_primitives/src/lib.rs
index 534279bf..640f43b2 100644
--- a/crates/craft_primitives/src/lib.rs
+++ b/crates/craft_primitives/src/lib.rs
@@ -1,9 +1,9 @@
-mod color;
-
-mod color_brush;
-pub mod geometry;
-mod hit_testable;
-
 pub use color::{Color, palette};
 pub use color_brush::ColorBrush;
 pub use hit_testable::HitTestable;
+
+pub mod geometry;
+
+mod color;
+mod color_brush;
+mod hit_testable;
diff --git a/crates/craft_retained/Cargo.toml b/crates/craft_retained/Cargo.toml
index 0fa988d6..29a86cac 100644
--- a/crates/craft_retained/Cargo.toml
+++ b/crates/craft_retained/Cargo.toml
@@ -52,8 +52,8 @@ optional = true
 version = "2.10.0"
 features = ["std"]
 
-[dependencies.kurbo]
-workspace = true
+#[dependencies.kurbo]
+#workspace = true
 
 [dependencies.smallvec]
 version = "1.15.1"
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index 59078c12..ab6fa18c 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -4,11 +4,9 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 
-use craft_primitives::geometry::Rectangle;
+use craft_primitives::geometry::{Affine, Point, Rectangle};
 use craft_renderer::RenderList;
 
-use kurbo::{Affine, Point};
-
 use crate::elements::element_data::ElementData;
 use crate::elements::internal_helpers::{apply_generic_container_layout, draw_generic_container, push_child_to_element};
 use crate::elements::traits::DeepClone;
diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index 1740ab93..df501fbe 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -4,11 +4,11 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 
-use craft_primitives::geometry::{Rectangle, TrblRectangle};
+use craft_primitives::geometry::{BezPath, Rectangle, TrblRectangle};
 
 use craft_renderer::{Brush, RenderList};
 
-use kurbo::{Affine, Point, Vec2};
+use craft_primitives::geometry::{Affine, Point, Vec2};
 
 use peniko::Color;
 
@@ -198,7 +198,7 @@ impl ElementInternals for DropdownInner {
         // Draw the arrow
         let arrow_rect = self.arrow.layout.computed_box_transformed.border_rectangle();
         let thickness = 2.0 * _scale_factor;
-        let mut path = kurbo::BezPath::new();
+        let mut path = BezPath::new();
         let left_x = arrow_rect.x as f64;
         let right_x = (arrow_rect.x + arrow_rect.width) as f64;
         let center_x = (arrow_rect.x + arrow_rect.width / 2.0) as f64;
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 306a39c5..d7947b84 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -9,7 +9,8 @@ use craft_primitives::geometry::Rectangle;
 use craft_renderer::RenderList;
 use craft_resource_manager::ResourceIdentifier;
 use craft_resource_manager::resource_type::ResourceType;
-use kurbo::{Affine, Point};
+
+use craft_primitives::geometry::{Affine, Point};
 
 use crate::app::{ELEMENTS, PENDING_RESOURCES, TAFFY_TREE};
 use crate::elements::ElementInternals;
diff --git a/crates/craft_retained/src/elements/internal_helpers.rs b/crates/craft_retained/src/elements/internal_helpers.rs
index c55ad88c..2826346c 100644
--- a/crates/craft_retained/src/elements/internal_helpers.rs
+++ b/crates/craft_retained/src/elements/internal_helpers.rs
@@ -2,9 +2,10 @@ use crate::app::TAFFY_TREE;
 use crate::elements::ElementInternals;
 use crate::layout::TaffyTree;
 use crate::text::text_context::TextContext;
-use craft_primitives::geometry::Rectangle;
+
+use craft_primitives::geometry::{Affine, Point, Rectangle};
 use craft_renderer::RenderList;
-use kurbo::{Affine, Point};
+
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 
diff --git a/crates/craft_retained/src/elements/scrollable.rs b/crates/craft_retained/src/elements/scrollable.rs
index 937497ad..a653a1cf 100644
--- a/crates/craft_retained/src/elements/scrollable.rs
+++ b/crates/craft_retained/src/elements/scrollable.rs
@@ -1,7 +1,9 @@
-use kurbo::{Point, Vec2};
 use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::rc::Rc;
+
+use craft_primitives::geometry::{Point, Vec2};
+
 use ui_events::ScrollDelta;
 use ui_events::pointer::{PointerId, PointerType};
 
diff --git a/crates/craft_retained/src/elements/slider/slider_draw.rs b/crates/craft_retained/src/elements/slider/slider_draw.rs
index 51dca740..17f474f1 100644
--- a/crates/craft_retained/src/elements/slider/slider_draw.rs
+++ b/crates/craft_retained/src/elements/slider/slider_draw.rs
@@ -1,7 +1,6 @@
-use craft_primitives::geometry::Rectangle;
 use craft_primitives::geometry::borders::CssRoundedRect;
+use craft_primitives::geometry::{Rectangle, Vec2};
 use craft_renderer::RenderList;
-use kurbo::Vec2;
 
 use crate::elements::slider::slider_element::SliderDirection;
 use crate::elements::{ElementInternals, SliderInner};
diff --git a/crates/craft_retained/src/elements/slider/slider_element.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
index 5df9c1da..da28520f 100644
--- a/crates/craft_retained/src/elements/slider/slider_element.rs
+++ b/crates/craft_retained/src/elements/slider/slider_element.rs
@@ -2,10 +2,11 @@ use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 
-use craft_primitives::geometry::Rectangle;
+use craft_primitives::geometry::{Affine, Point, Rectangle};
 use craft_renderer::RenderList;
-use kurbo::{Affine, Point};
+
 use peniko::Color;
+
 use ui_events::keyboard::{Code, KeyState};
 use ui_events::pointer::PointerId;
 
diff --git a/crates/craft_retained/src/elements/slider/slider_logic.rs b/crates/craft_retained/src/elements/slider/slider_logic.rs
index 41497613..161ff0e5 100644
--- a/crates/craft_retained/src/elements/slider/slider_logic.rs
+++ b/crates/craft_retained/src/elements/slider/slider_logic.rs
@@ -1,4 +1,4 @@
-use kurbo::Point;
+use craft_primitives::geometry::Point;
 
 use crate::elements::slider::slider_element::SliderDirection;
 use crate::elements::{ElementData, SliderInner};
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 83ca5d98..b3475dc7 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -1,46 +1,52 @@
 use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
+#[cfg(not(target_arch = "wasm32"))]
+use std::time;
 
-use craft_primitives::Color;
-use craft_primitives::geometry::{Point, Rectangle};
-use craft_renderer::renderer::RenderList;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-use parley::LayoutAccessibility;
-use parley::{Alignment, AlignmentOptions, ContentWidths, Selection};
+use accesskit::{Action, Role};
 
-use crate::elements::element_data::ElementData;
-use crate::events::{Event, EventKind};
-use crate::layout::layout_context::{LayoutContext, TaffyTextContext, TextHashKey};
-use crate::style::Style;
-use crate::text::text_context::TextContext;
-use crate::text::text_render_data;
-use crate::text::text_render_data::TextRender;
+use craft_renderer::text_renderer_data::TextData;
 
-const MAX_CACHE_SIZE: usize = 16;
+use craft_primitives::geometry::{Affine, Point, Rectangle, Vec2};
+use craft_primitives::{Color, ColorBrush};
 
-#[cfg(not(target_arch = "wasm32"))]
-use std::time;
+use craft_renderer::renderer::RenderList;
 
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
-use accesskit::{Action, Role};
-use craft_primitives::ColorBrush;
-use craft_renderer::text_renderer_data::TextData;
-use kurbo::Affine;
+use parley::LayoutAccessibility;
+use parley::{Alignment, AlignmentOptions, ContentWidths, Selection};
+
 use rustc_hash::FxHashMap;
+
 use smol_str::{SmolStr, ToSmolStr};
+
 use taffy::{AvailableSpace, Size};
+
 use time::{Duration, Instant};
+
 use ui_events::pointer::{PointerButton, PointerId};
+
 #[cfg(target_arch = "wasm32")]
 use web_time as time;
+
 use winit::dpi;
 
+use crate::elements::element_data::ElementData;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use crate::elements::element_id::create_unique_element_id;
 use crate::elements::traits::DeepClone;
 use crate::elements::{AsElement, Element, ElementInternals};
+use crate::events::{Event, EventKind};
 use crate::layout::TaffyTree;
+use crate::layout::layout_context::{LayoutContext, TaffyTextContext, TextHashKey};
+use crate::style::Style;
+use crate::text::text_context::TextContext;
+use crate::text::text_render_data;
+use crate::text::text_render_data::TextRender;
+
+const MAX_CACHE_SIZE: usize = 16;
 
 #[derive(Clone)]
 pub struct Text {
@@ -58,126 +64,30 @@ pub struct TextInner {
 
 #[derive(Clone)]
 pub struct TextState {
+    pub(crate) text_render: Option<TextRender>,
+    pub(crate) last_click_time: Option<Instant>,
+    pub(crate) click_count: u32,
+    pub(crate) pointer_down: bool,
+    pub(crate) start_time: Option<Instant>,
+    pub(crate) blink_period: Duration,
     text: SmolStr,
     scale_factor: f64,
     selection: Selection,
-    pub(crate) text_render: Option<TextRender>,
     layout: Option<parley::Layout<ColorBrush>>,
     cache: FxHashMap<TextHashKey, Size<f32>>,
     current_layout_key: Option<TextHashKey>,
     last_requested_measure_key: Option<TextHashKey>,
     current_render_key: Option<TextHashKey>,
     content_widths: Option<ContentWidths>,
-
-    pub(crate) last_click_time: Option<Instant>,
-    pub(crate) click_count: u32,
-    pub(crate) pointer_down: bool,
     /// The last known cursor position.
     ///
     /// The cursor is assumed to start at (0.0, 0.0). The cursor_pos may return points
     /// outside the text input.
     cursor_pos: Point,
-    pub(crate) start_time: Option<Instant>,
-    pub(crate) blink_period: Duration,
-
     is_layout_dirty: bool,
     is_render_dirty: bool,
 }
 
-impl Text {
-    pub fn new(text: &str) -> Self {
-        let inner = Rc::new_cyclic(|me: &Weak<RefCell<TextInner>>| {
-            RefCell::new(TextInner {
-                element_data: ElementData::new(me.clone(), false),
-                selectable: true,
-                state: TextState::default(),
-                me: me.clone(),
-            })
-        });
-
-        let text_context = Some(LayoutContext::Text(TaffyTextContext {
-            element: inner.borrow().me.clone(),
-        }));
-        inner.borrow_mut().element_data.create_layout_node(text_context);
-
-        inner.borrow_mut().set_text(text);
-
-        Text { inner }
-    }
-
-    pub fn get_selectable(&self) -> bool {
-        self.inner.borrow().selectable
-    }
-
-    pub fn selectable(self, selectable: bool) -> Self {
-        self.inner.borrow_mut().set_selectable(selectable);
-        self
-    }
-
-    pub fn get_text(&self) -> String {
-        self.inner.borrow().get_text().to_owned()
-    }
-
-    pub fn text(self, text: &str) -> Self {
-        self.inner.borrow_mut().set_text(text);
-        self
-    }
-
-    pub fn set_text_smol_str(self, text: SmolStr) -> Self {
-        self.inner.borrow_mut().set_text_smol_str(text);
-        self
-    }
-}
-
-impl TextInner {
-    pub fn get_selectable(&self) -> bool {
-        self.selectable
-    }
-
-    pub fn set_selectable(&mut self, selectable: bool) -> &mut Self {
-        self.selectable = selectable;
-        self
-    }
-
-    pub fn get_text(&self) -> &str {
-        &self.state.text
-    }
-
-    /// Set the text.
-    ///
-    /// Updates the text content immediately. Mark layout and render caches as dirty. Layout and
-    /// render caches will be computed in the next layout/render pass.
-    pub fn set_text(&mut self, text: &str) -> &mut Self {
-        self.set_text_smol_str(text.to_smolstr());
-        self
-    }
-
-    /// Set the text.
-    ///
-    /// Updates the text content immediately. Mark layout and render caches as dirty. Layout and
-    /// render caches will be computed in the next layout/render pass.
-    pub fn set_text_smol_str(&mut self, text: SmolStr) {
-        self.state.text = text;
-        self.state.is_layout_dirty = true;
-        self.state.is_render_dirty = true;
-        self.mark_dirty();
-    }
-
-    pub(crate) fn measure(
-        &mut self,
-        known_dimensions: Size<Option<f32>>,
-        available_space: Size<AvailableSpace>,
-        text_context: &mut TextContext,
-    ) -> Size<f32> {
-        self.state.measure(
-            &self.element_data.style,
-            known_dimensions,
-            available_space,
-            text_context,
-        )
-    }
-}
-
 impl Element for Text {}
 
 impl AsElement for Text {
@@ -196,6 +106,37 @@ impl crate::elements::ElementData for TextInner {
     }
 }
 
+impl TextData for TextInner {
+    fn get_text_renderer(&self) -> Option<&TextRender> {
+        self.state.text_render.as_ref()
+    }
+}
+
+impl Default for TextState {
+    fn default() -> Self {
+        Self {
+            text: SmolStr::new(""),
+            scale_factor: 1.0,
+            selection: Selection::default(),
+            text_render: None,
+            layout: None,
+            cache: Default::default(),
+            current_layout_key: None,
+            last_requested_measure_key: None,
+            current_render_key: None,
+            content_widths: None,
+            last_click_time: None,
+            click_count: 0,
+            pointer_down: false,
+            cursor_pos: Point::new(0.0, 0.0),
+            start_time: None,
+            blink_period: Default::default(),
+            is_layout_dirty: false,
+            is_render_dirty: false,
+        }
+    }
+}
+
 impl ElementInternals for TextInner {
     fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.deep_clone_internal()
@@ -372,7 +313,7 @@ impl ElementInternals for TextInner {
                     let prev_pos = state.cursor_pos;
                     // NOTE: Cursor position should be relative to the top left of the text box.
                     state.cursor_pos = pointer_moved.current.logical_point()
-                        - kurbo::Vec2::new(text_position.x as f64, text_position.y as f64);
+                        - Vec2::new(text_position.x as f64, text_position.y as f64);
                     state.cursor_pos.x /= state.scale_factor;
                     state.cursor_pos.y /= state.scale_factor;
                     // macOS seems to generate a spurious move after selecting word?
@@ -406,6 +347,100 @@ impl ElementInternals for TextInner {
     }
 }
 
+impl Text {
+    pub fn new(text: &str) -> Self {
+        let inner = Rc::new_cyclic(|me: &Weak<RefCell<TextInner>>| {
+            RefCell::new(TextInner {
+                element_data: ElementData::new(me.clone(), false),
+                selectable: true,
+                state: TextState::default(),
+                me: me.clone(),
+            })
+        });
+
+        let text_context = Some(LayoutContext::Text(TaffyTextContext {
+            element: inner.borrow().me.clone(),
+        }));
+        inner.borrow_mut().element_data.create_layout_node(text_context);
+
+        inner.borrow_mut().set_text(text);
+
+        Text { inner }
+    }
+
+    pub fn get_selectable(&self) -> bool {
+        self.inner.borrow().selectable
+    }
+
+    pub fn selectable(self, selectable: bool) -> Self {
+        self.inner.borrow_mut().set_selectable(selectable);
+        self
+    }
+
+    pub fn get_text(&self) -> String {
+        self.inner.borrow().get_text().to_owned()
+    }
+
+    pub fn text(self, text: &str) -> Self {
+        self.inner.borrow_mut().set_text(text);
+        self
+    }
+
+    pub fn set_text_smol_str(self, text: SmolStr) -> Self {
+        self.inner.borrow_mut().set_text_smol_str(text);
+        self
+    }
+}
+
+impl TextInner {
+    pub fn get_selectable(&self) -> bool {
+        self.selectable
+    }
+
+    pub fn set_selectable(&mut self, selectable: bool) -> &mut Self {
+        self.selectable = selectable;
+        self
+    }
+
+    pub fn get_text(&self) -> &str {
+        &self.state.text
+    }
+
+    /// Set the text.
+    ///
+    /// Updates the text content immediately. Mark layout and render caches as dirty. Layout and
+    /// render caches will be computed in the next layout/render pass.
+    pub fn set_text(&mut self, text: &str) -> &mut Self {
+        self.set_text_smol_str(text.to_smolstr());
+        self
+    }
+
+    /// Set the text.
+    ///
+    /// Updates the text content immediately. Mark layout and render caches as dirty. Layout and
+    /// render caches will be computed in the next layout/render pass.
+    pub fn set_text_smol_str(&mut self, text: SmolStr) {
+        self.state.text = text;
+        self.state.is_layout_dirty = true;
+        self.state.is_render_dirty = true;
+        self.mark_dirty();
+    }
+
+    pub(crate) fn measure(
+        &mut self,
+        known_dimensions: Size<Option<f32>>,
+        available_space: Size<AvailableSpace>,
+        text_context: &mut TextContext,
+    ) -> Size<f32> {
+        self.state.measure(
+            &self.element_data.style,
+            known_dimensions,
+            available_space,
+            text_context,
+        )
+    }
+}
+
 impl TextState {
     pub fn measure(
         &mut self,
@@ -559,34 +594,3 @@ impl TextState {
         }
     }
 }
-
-impl TextData for TextInner {
-    fn get_text_renderer(&self) -> Option<&TextRender> {
-        self.state.text_render.as_ref()
-    }
-}
-
-impl Default for TextState {
-    fn default() -> Self {
-        Self {
-            text: SmolStr::new(""),
-            scale_factor: 1.0,
-            selection: Selection::default(),
-            text_render: None,
-            layout: None,
-            cache: Default::default(),
-            current_layout_key: None,
-            last_requested_measure_key: None,
-            current_render_key: None,
-            content_widths: None,
-            last_click_time: None,
-            click_count: 0,
-            pointer_down: false,
-            cursor_pos: Point::new(0.0, 0.0),
-            start_time: None,
-            blink_period: Default::default(),
-            is_layout_dirty: false,
-            is_render_dirty: false,
-        }
-    }
-}
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 9495c620..b2646c65 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -6,12 +6,15 @@ use std::ops::Deref;
 use std::rc::{Rc, Weak};
 
 use craft_primitives::Color;
-use craft_primitives::geometry::{Point, Rectangle, TrblRectangle};
+use craft_primitives::geometry::{Affine, Point, Rectangle, TrblRectangle};
+
 use craft_renderer::renderer::{RenderList, TextScroll};
 use craft_renderer::text_renderer_data::TextData;
-use kurbo::Affine;
+
 use parley::BoundingBox;
+
 use ui_events::pointer::PointerButton;
+
 use winit::event::Ime;
 
 use crate::app::ELEMENTS;
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index 5449d339..0029f722 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -6,11 +6,9 @@ use std::sync::Arc;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::{Action, Role};
 
-use kurbo::{Affine, Point};
-
 use ui_events::pointer::PointerId;
 
-use craft_primitives::geometry::{ElementBox, Rectangle, TrblRectangle};
+use craft_primitives::geometry::{Affine, ElementBox, Point, Rectangle, TrblRectangle};
 
 use craft_renderer::RenderList;
 
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index a1fab3ff..1129c730 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -11,15 +11,13 @@ use {accesskit::{Action, Role, TreeUpdate}, accesskit_winit::Adapter};
 
 use craft_logging::info;
 
-use craft_primitives::geometry::{Rectangle, Size};
+use craft_primitives::geometry::{Affine, Point, Rectangle, Size};
 
 use craft_renderer::renderer::{Renderer, Screenshot};
 use craft_renderer::{RenderList, RendererType};
 
 use craft_resource_manager::ResourceManager;
 
-use kurbo::{Affine, Point};
-
 use peniko::Color;
 
 use taffy::{AvailableSpace, NodeId};
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index 005ee937..9c7c49dd 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -2,14 +2,16 @@ use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::rc::Rc;
 
+use craft_primitives::geometry::Point;
+
+use craft_renderer::RenderList;
+use craft_renderer::renderer::TargetItem;
+
 use crate::app::ELEMENTS;
 use crate::elements::ElementInternals;
 use crate::events::pointer_capture::PointerCapture;
 use crate::events::{Event, EventKind};
 use crate::text::text_context::TextContext;
-use craft_renderer::RenderList;
-use craft_renderer::renderer::TargetItem;
-use kurbo::Point;
 
 pub(super) fn freeze_target_list(
     target: Rc<RefCell<dyn ElementInternals>>,
diff --git a/crates/craft_retained/src/layout/layout.rs b/crates/craft_retained/src/layout/layout.rs
index 47f3bd73..6f7f5461 100644
--- a/crates/craft_retained/src/layout/layout.rs
+++ b/crates/craft_retained/src/layout/layout.rs
@@ -1,42 +1,16 @@
-use crate::elements::scrollable::ScrollState;
 use craft_primitives::geometry::borders::{BOTTOM, CssRoundedRect, LEFT, RIGHT, TOP};
-use craft_primitives::geometry::{Border, ElementBox, Margin, Padding, Point, Rectangle, Size, TrblRectangle};
+use craft_primitives::geometry::{Affine, BezPath, Border, ElementBox, Margin, Padding, Point, Rectangle, Shape, Size, TrblRectangle, Vec2};
+
 use craft_renderer::renderer::BoxShadowCmd;
 use craft_renderer::{Brush, RenderList};
-use kurbo::{Affine, BezPath, Shape, Vec2};
+
 use peniko::Color;
+
 use taffy::NodeId;
 
+use crate::elements::scrollable::ScrollState;
 use crate::style::{BoxShadow, Position, Style};
 
-impl CssComputedBorder {
-    pub(crate) fn scale(&mut self, scale_factor: f64) {
-        let scale_factor = Affine::scale(scale_factor);
-
-        self.background.apply_affine(scale_factor);
-
-        for side in self.sides.iter_mut().flatten() {
-            side.apply_affine(scale_factor);
-        }
-    }
-}
-
-impl CssComputedBorder {
-    pub(crate) fn new(css_rect: CssRoundedRect) -> Self {
-        let top = css_rect.get_side(TOP);
-        let right = css_rect.get_side(RIGHT);
-        let bottom = css_rect.get_side(BOTTOM);
-        let left = css_rect.get_side(LEFT);
-        let background = css_rect.to_path(0.1f64);
-
-        Self {
-            css_rect,
-            sides: [top, right, bottom, left],
-            background,
-        }
-    }
-}
-
 #[derive(Clone, Default)]
 pub struct Layout {
     /// The taffy node id after this element is laid out.
@@ -74,6 +48,81 @@ pub struct Layout {
     pub scrollbar_thumb_radius: [(f32, f32); 4],
 }
 
+#[derive(Clone)]
+enum BezPathOrRect {
+    Rect(Rectangle),
+    BezPath(BezPath),
+}
+
+#[derive(Clone)]
+struct ComputedBoxShadow {
+    pub inset: bool,
+    pub shape: BezPathOrRect,
+    pub offset: Vec2,
+    pub blur_radius: f64,
+    pub color: Color,
+}
+
+#[derive(Clone)]
+pub(crate) struct ComputedBoxShadows {
+    outline: BezPathOrRect,
+    inline: BezPathOrRect,
+    box_shadows: Vec<ComputedBoxShadow>,
+    border_box: Rectangle,
+}
+
+#[derive(Clone)]
+pub(crate) struct CssComputedBorder {
+    css_rect: CssRoundedRect,
+    sides: [Option<BezPath>; 4],
+    background: BezPath,
+}
+
+#[derive(Clone, PartialEq)]
+struct BorderSpec {
+    rect: Rectangle,
+    width: TrblRectangle<f32>,
+    radii: [(f32, f32); 4],
+    scale_factor: f64,
+    box_shadows: Vec<BoxShadow>,
+}
+
+#[derive(Clone, Default)]
+pub(crate) enum ComputedBorder {
+    CssComputed(Box<CssComputedBorder>),
+    Simple,
+    #[default]
+    None,
+}
+
+impl CssComputedBorder {
+    pub(crate) fn scale(&mut self, scale_factor: f64) {
+        let scale_factor = Affine::scale(scale_factor);
+
+        self.background.apply_affine(scale_factor);
+
+        for side in self.sides.iter_mut().flatten() {
+            side.apply_affine(scale_factor);
+        }
+    }
+}
+
+impl CssComputedBorder {
+    pub(crate) fn new(css_rect: CssRoundedRect) -> Self {
+        let top = css_rect.get_side(TOP);
+        let right = css_rect.get_side(RIGHT);
+        let bottom = css_rect.get_side(BOTTOM);
+        let left = css_rect.get_side(LEFT);
+        let background = css_rect.to_path(0.1f64);
+
+        Self {
+            css_rect,
+            sides: [top, right, bottom, left],
+            background,
+        }
+    }
+}
+
 impl Layout {
     pub(crate) fn new(is_scrollable: bool) -> Self {
         Self {
@@ -409,12 +458,6 @@ pub(crate) fn draw_borders_generic(
     }
 }
 
-#[derive(Clone)]
-enum BezPathOrRect {
-    Rect(Rectangle),
-    BezPath(BezPath),
-}
-
 impl BezPathOrRect {
     pub fn to_path(&self) -> BezPath {
         match self {
@@ -424,47 +467,6 @@ impl BezPathOrRect {
     }
 }
 
-#[derive(Clone)]
-struct ComputedBoxShadow {
-    pub inset: bool,
-    pub shape: BezPathOrRect,
-    pub offset: Vec2,
-    pub blur_radius: f64,
-    pub color: Color,
-}
-
-#[derive(Clone)]
-pub(crate) struct ComputedBoxShadows {
-    outline: BezPathOrRect,
-    inline: BezPathOrRect,
-    box_shadows: Vec<ComputedBoxShadow>,
-    border_box: Rectangle,
-}
-
-#[derive(Clone)]
-pub(crate) struct CssComputedBorder {
-    css_rect: CssRoundedRect,
-    sides: [Option<BezPath>; 4],
-    background: BezPath,
-}
-
-#[derive(Clone, PartialEq)]
-struct BorderSpec {
-    rect: Rectangle,
-    width: TrblRectangle<f32>,
-    radii: [(f32, f32); 4],
-    scale_factor: f64,
-    box_shadows: Vec<BoxShadow>,
-}
-
-#[derive(Clone, Default)]
-pub(crate) enum ComputedBorder {
-    CssComputed(Box<CssComputedBorder>),
-    Simple,
-    #[default]
-    None,
-}
-
 #[inline(always)]
 fn from_taffy_point(p: taffy::Point<f32>) -> Point {
     Point {

From bccdd740a01ae21d2b44e56ac22a8a68184513b6 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 22 Mar 2026 20:41:22 -0400
Subject: [PATCH 115/143] Fix images.

---
 crates/craft_retained/Cargo.toml              |   1 +
 crates/craft_retained/src/app.rs              |   4 +
 crates/craft_retained/src/elements/image.rs   | 135 ++++++++++--------
 .../src/elements/internal_helpers.rs          |  30 ++++
 crates/craft_retained/src/elements/mod.rs     |   2 +-
 .../src/layout/layout_context.rs              |   2 +-
 .../craft_retained/src/layout/taffy_tree.rs   |  18 +++
 crates/craft_retained/src/window_manager.rs   |  28 +++-
 8 files changed, 160 insertions(+), 60 deletions(-)

diff --git a/crates/craft_retained/Cargo.toml b/crates/craft_retained/Cargo.toml
index 29a86cac..97155ac0 100644
--- a/crates/craft_retained/Cargo.toml
+++ b/crates/craft_retained/Cargo.toml
@@ -14,6 +14,7 @@ clipboard = ["dep:clipboard-rs"]
 vello_cpu_renderer = ["craft_renderer/vello_cpu_renderer"]
 vello_hybrid_renderer = ["craft_renderer/vello_hybrid_renderer"]
 vello_renderer = ["craft_renderer/vello_renderer"]
+http_client = ["craft_resource_manager/http_client"]
 
 system_fonts = ["parley/system"]
 
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 825157d4..9bc55568 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -184,6 +184,10 @@ impl App {
                 } else if resource_type == ResourceType::Image || resource_type == ResourceType::TinyVg {
                     self.resource_manager.insert(resource_identifier, Arc::new(resource));
                 }
+                // TODO: Only mark dirty affected nodes.
+                WINDOW_MANAGER.with_borrow_mut(|window_manager| {
+                    window_manager.dirty_and_redraw_all_windows(self);
+                });
             }
             ResourceEvent::UnLoaded(_) => {}
         }
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index d7947b84..19de6ad2 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -2,20 +2,22 @@
 
 use std::any::Any;
 use std::cell::RefCell;
-use std::ops::Deref;
 use std::rc::{Rc, Weak};
 
 use craft_primitives::geometry::Rectangle;
+
 use craft_renderer::RenderList;
+
 use craft_resource_manager::ResourceIdentifier;
 use craft_resource_manager::resource_type::ResourceType;
 
 use craft_primitives::geometry::{Affine, Point};
 
-use crate::app::{ELEMENTS, PENDING_RESOURCES, TAFFY_TREE};
-use crate::elements::ElementInternals;
+use crate::app::{PENDING_RESOURCES, TAFFY_TREE};
 use crate::elements::element_data::ElementData;
+use crate::elements::internal_helpers::apply_generic_leaf_layout;
 use crate::elements::traits::DeepClone;
+use crate::elements::{AsElement, Element, ElementInternals};
 use crate::layout::TaffyTree;
 use crate::layout::layout_context::{ImageContext, LayoutContext};
 use crate::text::text_context::TextContext;
@@ -23,58 +25,17 @@ use crate::text::text_context::TextContext;
 /// Displays an image.
 #[derive(Clone)]
 pub struct Image {
+    pub inner: Rc<RefCell<ImageInner>>,
+}
+
+#[derive(Clone)]
+pub struct ImageInner {
     is_image_dirty: bool,
     resource_identifier: ResourceIdentifier,
     element_data: ElementData,
 }
 
-impl Image {
-    pub fn new(resource_identifier: ResourceIdentifier) -> Rc<RefCell<Self>> {
-        let me = Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
-            RefCell::new(Self {
-                is_image_dirty: false,
-                resource_identifier: resource_identifier.clone(),
-                element_data: ElementData::new(me.clone(), false),
-            })
-        });
-
-        let layout_context = Some(LayoutContext::Image(ImageContext::new(resource_identifier.clone())));
-        me.borrow_mut().element_data.create_layout_node(layout_context);
-
-        PENDING_RESOURCES.with_borrow_mut(|pending_resources| {
-            pending_resources.push_back((resource_identifier, ResourceType::Image));
-        });
-
-        ELEMENTS.with_borrow_mut(|elements| {
-            elements.insert(me.borrow().deref());
-        });
-
-        me
-    }
-
-    pub fn image(&mut self, resource_identifier: ResourceIdentifier) -> &mut Self {
-        self.is_image_dirty = true;
-        self.resource_identifier = resource_identifier.clone();
-
-        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let context = LayoutContext::Image(ImageContext::new(resource_identifier));
-            let node = self
-                .element_data
-                .layout
-                .taffy_node_id
-                .expect("Failed to get Image node");
-            taffy_tree.set_node_context(node, Some(context));
-        });
-
-        self
-    }
-
-    pub fn get_image(&self) -> &ResourceIdentifier {
-        &self.resource_identifier
-    }
-}
-
-impl crate::elements::ElementData for Image {
+impl crate::elements::ElementData for ImageInner {
     fn element_data(&self) -> &ElementData {
         &self.element_data
     }
@@ -84,7 +45,15 @@ impl crate::elements::ElementData for Image {
     }
 }
 
-impl ElementInternals for Image {
+impl Element for Image {}
+
+impl AsElement for Image {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        self.inner.clone()
+    }
+}
+
+impl ElementInternals for ImageInner {
     fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.deep_clone_internal()
     }
@@ -99,11 +68,15 @@ impl ElementInternals for Image {
         clip_bounds: Option<Rectangle>,
         scale_factor: f64,
     ) {
-        let layout = taffy_tree.get_layout(self.element_data.layout.taffy_node_id.unwrap());
-        self.resolve_box(position, transform, layout, z_index);
-
-        self.apply_borders(scale_factor);
-        self.apply_clip(clip_bounds);
+        apply_generic_leaf_layout(
+            self,
+            taffy_tree,
+            position,
+            z_index,
+            transform,
+            clip_bounds,
+            scale_factor,
+        );
     }
 
     fn draw(&mut self, _renderer: &mut RenderList, _text_context: &mut TextContext, _scale_factor: f64) {
@@ -129,3 +102,53 @@ impl ElementInternals for Image {
         self
     }
 }
+
+impl Image {
+    pub fn new(resource_identifier: ResourceIdentifier) -> Self {
+        let inner = Rc::new_cyclic(|me: &Weak<RefCell<ImageInner>>| {
+            RefCell::new(ImageInner {
+                is_image_dirty: false,
+                resource_identifier: resource_identifier.clone(),
+                element_data: ElementData::new(me.clone(), false),
+            })
+        });
+        let layout_context = Some(LayoutContext::Image(ImageContext::new(resource_identifier.clone())));
+        inner.borrow_mut().element_data.create_layout_node(layout_context);
+
+        PENDING_RESOURCES.with_borrow_mut(|pending_resources| {
+            pending_resources.push_back((resource_identifier, ResourceType::Image));
+        });
+
+        Self { inner }
+    }
+
+    pub fn image(self, resource_identifier: ResourceIdentifier) -> Self {
+        self.inner.borrow_mut().image(resource_identifier);
+        self
+    }
+
+    pub fn get_image(&self) -> ResourceIdentifier {
+        self.inner.borrow().get_image().clone()
+    }
+}
+
+impl ImageInner {
+    pub fn image(&mut self, resource_identifier: ResourceIdentifier) {
+        self.is_image_dirty = true;
+        self.resource_identifier = resource_identifier.clone();
+
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let context = LayoutContext::Image(ImageContext::new(resource_identifier));
+            let node = self
+                .element_data
+                .layout
+                .taffy_node_id
+                .expect("Failed to get Image node");
+            taffy_tree.set_node_context(node, Some(context));
+        });
+    }
+
+    pub fn get_image(&self) -> &ResourceIdentifier {
+        &self.resource_identifier
+    }
+}
diff --git a/crates/craft_retained/src/elements/internal_helpers.rs b/crates/craft_retained/src/elements/internal_helpers.rs
index 2826346c..e1d349cf 100644
--- a/crates/craft_retained/src/elements/internal_helpers.rs
+++ b/crates/craft_retained/src/elements/internal_helpers.rs
@@ -80,6 +80,36 @@ pub fn apply_generic_container_layout(
     )
 }
 
+#[allow(clippy::too_many_arguments)]
+pub fn apply_generic_leaf_layout(
+    element: &mut dyn ElementInternals,
+    taffy_tree: &mut TaffyTree,
+    position: Point,
+    z_index: &mut u32,
+    transform: Affine,
+    clip_bounds: Option<Rectangle>,
+    scale_factor: f64,
+) {
+    let node = element.element_data_mut().layout.taffy_node_id.unwrap();
+    let layout = taffy_tree.get_layout(node);
+    let has_new_layout = taffy_tree.has_new_layout(node);
+
+    let dirty = has_new_layout
+        || transform != element.element_data_mut().layout.get_transform()
+        || position != element.element_data_mut().layout.position;
+    element.element_data_mut().layout.has_new_layout = has_new_layout;
+    if dirty {
+        element.resolve_box(position, transform, layout, z_index);
+        element.apply_borders(scale_factor);
+        element.apply_clip(clip_bounds);
+        element.element_data_mut().layout.scroll_state.mark_old();
+    }
+
+    if has_new_layout {
+        taffy_tree.mark_seen(node);
+    }
+}
+
 pub fn draw_generic_container(
     element: &mut dyn ElementInternals,
     renderer: &mut RenderList,
diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index ca14bd61..69841400 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -1,7 +1,7 @@
 pub use crate::elements::container::{Container, ContainerInner};
 pub use crate::elements::dropdown::{Dropdown, DropdownInner};
 pub use crate::elements::element_id_map::ElementIdMap;
-pub use crate::elements::image::Image;
+pub use crate::elements::image::{Image, ImageInner};
 pub use crate::elements::scrollable::{ScrollOptions, ScrollToBox};
 pub use crate::elements::slider::{Slider, SliderDirection, SliderInner};
 pub use crate::elements::text::{Text, TextInner};
diff --git a/crates/craft_retained/src/layout/layout_context.rs b/crates/craft_retained/src/layout/layout_context.rs
index aae9e1e2..334a5ca2 100644
--- a/crates/craft_retained/src/layout/layout_context.rs
+++ b/crates/craft_retained/src/layout/layout_context.rs
@@ -54,7 +54,7 @@ impl ImageContext {
     pub fn measure(
         &mut self,
         known_dimensions: Size<Option<f32>>,
-        _available_space: Size<taffy::AvailableSpace>,
+        _available_space: Size<AvailableSpace>,
         resource_manager: Arc<ResourceManager>,
         _style: &taffy::Style,
     ) -> Size<f32> {
diff --git a/crates/craft_retained/src/layout/taffy_tree.rs b/crates/craft_retained/src/layout/taffy_tree.rs
index 32daa9d0..9f6d7192 100644
--- a/crates/craft_retained/src/layout/taffy_tree.rs
+++ b/crates/craft_retained/src/layout/taffy_tree.rs
@@ -52,6 +52,24 @@ impl TaffyTree {
         self.request_layout();
     }
 
+    pub fn mark_node_and_leaves_dirty(&mut self, node: NodeId) {
+        self.inner.mark_dirty(node).ok();
+        self.mark_leaves_dirty(node);
+        self.request_layout();
+    }
+
+    fn mark_leaves_dirty(&mut self, parent: NodeId) {
+        let children = self.inner.children(parent).unwrap_or_default();
+
+        if children.is_empty() {
+            self.inner.mark_dirty(parent).ok();
+        } else {
+            for child in children {
+                self.mark_leaves_dirty(child);
+            }
+        }
+    }
+
     pub fn children(&self, parent: NodeId) -> Vec<NodeId> {
         self.inner.children(parent).unwrap()
     }
diff --git a/crates/craft_retained/src/window_manager.rs b/crates/craft_retained/src/window_manager.rs
index 55016ced..e9714572 100644
--- a/crates/craft_retained/src/window_manager.rs
+++ b/crates/craft_retained/src/window_manager.rs
@@ -3,8 +3,8 @@ use std::rc::Rc;
 use winit::event_loop::ActiveEventLoop;
 use winit::window::WindowId;
 
-use crate::app::App;
-use crate::elements::Window;
+use crate::app::{App, TAFFY_TREE};
+use crate::elements::{ElementData, Window};
 
 pub(crate) struct WindowManager {
     windows: Vec<Window>,
@@ -46,6 +46,30 @@ impl WindowManager {
         }
     }
 
+    /// Dirties all taffy nodes and redraws each window.
+    pub(crate) fn dirty_and_redraw_all_windows(&mut self, craft_app: &mut App) {
+        if !craft_app.active {
+            return;
+        }
+
+        // Create windows that were created during the program run.
+        for window_element in &self.windows {
+            if let Some(winit_window) = window_element.winit_window() {
+                let id = window_element
+                    .inner
+                    .borrow_mut()
+                    .element_data()
+                    .layout
+                    .taffy_node_id
+                    .unwrap();
+                TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+                    taffy_tree.mark_node_and_leaves_dirty(id);
+                });
+                winit_window.request_redraw();
+            }
+        }
+    }
+
     pub(crate) fn on_resume(&mut self, craft_app: &mut App, event_loop: &ActiveEventLoop) {
         for window_element in &self.windows {
             window_element.create(craft_app, event_loop);

From ef5e037bf74c4c863f50cc17589915e13a6ac890 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sun, 22 Mar 2026 21:09:53 -0400
Subject: [PATCH 116/143] Abstract the dropdown code a little bit (just put
 things into methods)

---
 .../craft_retained/src/elements/dropdown.rs   | 250 ++++++++++--------
 1 file changed, 135 insertions(+), 115 deletions(-)

diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index df501fbe..b810a871 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -178,26 +178,22 @@ impl ElementInternals for DropdownInner {
         }
     }
 
-    fn draw(&mut self, _renderer: &mut RenderList, _text_context: &mut TextContext, _scale_factor: f64) {
+    fn draw(&mut self, renderer: &mut RenderList, text_context: &mut TextContext, scale_factor: f64) {
         if !self.is_visible() {
             return;
         }
 
         // We draw the borders before we start any layers, so that we don't clip the borders.
-        self.draw_borders(_renderer, _scale_factor);
-
-        if let Some(selected_element) = &self.selected_element {
-            let mut binding = selected_element.borrow_mut();
-            binding.draw(_renderer, _text_context, _scale_factor);
-        }
-
+        self.draw_borders(renderer, scale_factor);
         if self.is_floating_window_hidden {
-            self.add_hit_testable(_renderer, true, _scale_factor);
+            self.add_hit_testable(renderer, true, scale_factor);
         }
 
+        self.draw_selected_element(renderer, text_context, scale_factor);
+
         // Draw the arrow
         let arrow_rect = self.arrow.layout.computed_box_transformed.border_rectangle();
-        let thickness = 2.0 * _scale_factor;
+        let thickness = 2.0 * scale_factor;
         let mut path = BezPath::new();
         let left_x = arrow_rect.x as f64;
         let right_x = (arrow_rect.x + arrow_rect.width) as f64;
@@ -211,55 +207,40 @@ impl ElementInternals for DropdownInner {
         path.line_to(Point::new(center_x, bottom_y - thickness));
         path.line_to(Point::new(left_x + thickness, top_y));
         path.close_path();
-
         path.apply_affine((Affine::IDENTITY).then_translate(Vec2::new(0.0, arrow_rect.height as f64 / 4.0)));
         let arrow_color = Color::from_rgba8(75, 75, 77, 255);
-        _renderer.fill_bez_path(path, Brush::Color(arrow_color));
+        renderer.fill_bez_path(path, Brush::Color(arrow_color));
 
         if !self.is_floating_window_hidden {
-            _renderer.start_overlay();
-            self.add_hit_testable(_renderer, true, _scale_factor);
+            renderer.start_overlay();
+            // If the dropdown menu is open, then we must add a hit testable after we start
+            // an overlay, so that it is properly sorted in the event target selection phase.
+            self.add_hit_testable(renderer, true, scale_factor);
 
             let current_style = self.floating_window.style.as_ref();
             self.floating_window
                 .layout
-                .draw_borders(_renderer, current_style, _scale_factor);
+                .draw_borders(renderer, current_style, scale_factor);
 
-            _renderer.push_layer(
+            renderer.push_layer(
                 self.floating_window
                     .layout
                     .computed_box_transformed
                     .padding_rectangle()
-                    .scale(_scale_factor),
+                    .scale(scale_factor),
             );
 
-            for (index, child) in self.children().iter().enumerate() {
-                let mut child_rect = child
-                    .borrow_mut()
-                    .element_data()
-                    .layout
-                    .computed_box_transformed
-                    .border_rectangle();
-                child_rect.x = self.floating_window.layout.computed_box_transformed.position.x as f32;
-                child_rect.width = self.floating_window.layout.computed_box_transformed.size.width;
-
-                let is_hovered = self.currently_hovered_element == Some(index);
-                if is_hovered {
-                    _renderer.draw_rect(child_rect, self.hovered_bg_color.unwrap());
-                }
-
-                child.borrow_mut().draw(_renderer, _text_context, _scale_factor);
-            }
+            self.draw_children(renderer, text_context, scale_factor);
 
-            _renderer.pop_layer();
+            renderer.pop_layer();
 
             draw_scrollbar(
                 &self.floating_window.style,
                 &self.floating_window.layout,
-                _renderer,
-                _scale_factor,
+                renderer,
+                scale_factor,
             );
-            _renderer.end_overlay();
+            renderer.end_overlay();
         }
     }
 
@@ -270,47 +251,16 @@ impl ElementInternals for DropdownInner {
         event: &mut Event,
         _target: Option<Rc<RefCell<dyn ElementInternals>>>,
     ) {
+        // Take focus if clicked.
         if let EventKind::PointerButtonDown(_pb) = message {
             self.focus();
         }
 
-        // Refactor this!
-        if let EventKind::PointerMovedEvent(pb) = message {
-            let pointer_position = Point::new(pb.current.position.x, pb.current.position.y);
-            let is_pointer_in_window = self
-                .floating_window
-                .layout
-                .computed_box_transformed
-                .border_rectangle()
-                .contains(&pointer_position);
-            let is_pointer_in_scrollbar = self
-                .floating_window
-                .layout
-                .computed_scroll_track
-                .contains(&pointer_position);
-
-            if is_pointer_in_window && !is_pointer_in_scrollbar {
-                let mut hovered_child = None;
-                for (child_index, child) in self.children().iter().cloned().enumerate() {
-                    let contains = child
-                        .borrow()
-                        .element_data()
-                        .layout
-                        .computed_box_transformed
-                        .border_rectangle()
-                        .contains(&pointer_position);
-
-                    if contains {
-                        hovered_child = Some(child_index);
-                        break;
-                    }
-                }
+        let list_layout = &self.floating_window.layout;
+        let list_box = list_layout.computed_box_transformed.border_rectangle();
+        let list_scroll_box = list_layout.computed_scroll_track;
 
-                if let Some(hovered_child) = hovered_child {
-                    self.currently_hovered_element = Some(hovered_child);
-                }
-            }
-        }
+        self.update_most_recently_hovered_child(message, list_box, list_scroll_box);
 
         if let EventKind::PointerButtonUp(pb) = message {
             // TODO Should pb.state.position be in logical coordinates?
@@ -333,49 +283,13 @@ impl ElementInternals for DropdownInner {
                 .computed_scroll_track
                 .contains(&pointer_position);
 
-            if !self.is_floating_window_hidden && !is_pointer_in_window && !is_pointer_in_select_box {
-                self.is_floating_window_hidden = true;
-            }
-
-            // Toggle the visibility of the floating window by the clicking of the dropdown select box.
-            if is_pointer_in_select_box {
-                self.is_floating_window_hidden = !self.is_floating_window_hidden;
-                self.currently_hovered_element = self.selected_element_index;
-
-                if self.is_floating_window_hidden {
-                    self.release_pointer_capture(PointerId::new(1).unwrap());
-                }
-            }
-
-            if is_pointer_in_window && !is_pointer_in_scrollbar {
-                let mut should_hide_window = false;
-                for (child_index, child) in self.children().iter().cloned().enumerate() {
-                    let contains = child
-                        .borrow()
-                        .element_data()
-                        .layout
-                        .computed_box_transformed
-                        .border_rectangle()
-                        .contains(&pointer_position);
-
-                    if contains {
-                        should_hide_window = true;
-                        self.set_selected_element(child_index);
-                        self.release_pointer_capture(PointerId::new(1).unwrap());
-
-                        let new_event = Event::new(event.target.clone());
-                        queue_event(new_event, EventKind::DropdownItemSelected(child_index));
-
-                        break;
-                    }
-                }
-
-                if should_hide_window {
-                    self.is_floating_window_hidden = true;
-                }
-            }
+            self.handle_click_outside_menu(is_pointer_in_select_box, is_pointer_in_window);
+            self.handle_click_in_select_box(is_pointer_in_select_box);
+            self.handle_child_click(event, &pointer_position, is_pointer_in_window, is_pointer_in_scrollbar);
         }
 
+        // Handle updating the scroll state.
+        // TODO: The dropdown scroll logic needs refactoring.
         let floating_window = &mut self.floating_window;
         let result = handle_scroll_logic_advance(&floating_window.style, &mut floating_window.layout, message, event);
         if result.request_apply_layout {
@@ -408,6 +322,28 @@ impl ElementInternals for DropdownInner {
         });
     }
 
+    fn draw_children(&mut self, renderer: &mut RenderList, text_context: &mut TextContext, scale_factor: f64) {
+        for (index, child) in self.children().iter().enumerate() {
+            let floating_window_box = &self.floating_window.layout.computed_box_transformed;
+            let mut child_rect = child
+                .borrow_mut()
+                .element_data()
+                .layout
+                .computed_box_transformed
+                .border_rectangle();
+
+            child_rect.x = floating_window_box.position.x as f32;
+            child_rect.width = floating_window_box.size.width;
+
+            let is_hovered = self.currently_hovered_element == Some(index);
+            if is_hovered {
+                renderer.draw_rect(child_rect, self.hovered_bg_color.unwrap());
+            }
+
+            child.borrow_mut().draw(renderer, text_context, scale_factor);
+        }
+    }
+
     fn in_bounds(&self, point: Point) -> bool {
         let element_data = &self.element_data;
         let rect = element_data.layout.computed_box_transformed.border_rectangle();
@@ -635,6 +571,13 @@ impl Dropdown {
 }
 
 impl DropdownInner {
+    fn draw_selected_element(&mut self, renderer: &mut RenderList, text_context: &mut TextContext, scale_factor: f64) {
+        if let Some(selected_element) = &self.selected_element {
+            let mut binding = selected_element.borrow_mut();
+            binding.draw(renderer, text_context, scale_factor);
+        }
+    }
+
     fn set_selected_element(&mut self, child_index: usize) {
         // Remove the old selected element from the layout tree.
         if let Some(old_selected_element) = &self.selected_element {
@@ -665,4 +608,81 @@ impl DropdownInner {
             taffy_tree.add_child_at_index(parent_id, selected_element_id, 1);
         });
     }
+
+    fn update_most_recently_hovered_child(&mut self, message: &EventKind, list_box: Rectangle, list_scroll_box: Rectangle) {
+        if let EventKind::PointerMovedEvent(pb) = message {
+            let pointer_position = Point::new(pb.current.position.x, pb.current.position.y);
+            let is_pointer_in_list = list_box.contains(&pointer_position);
+            let is_pointer_in_scrollbar = list_scroll_box.contains(&pointer_position);
+
+            if is_pointer_in_list && !is_pointer_in_scrollbar {
+                let hovered_child = self.children().iter().enumerate().find_map(|(index, child)| {
+                    let contains = child
+                        .borrow()
+                        .element_data()
+                        .layout
+                        .computed_box_transformed
+                        .border_rectangle()
+                        .contains(&pointer_position);
+
+                    if contains {
+                        return Some(index);
+                    }
+
+                    None
+                });
+
+                if let Some(hovered_child) = hovered_child {
+                    self.currently_hovered_element = Some(hovered_child);
+                }
+            }
+        }
+    }
+
+    fn handle_click_in_select_box(&mut self, is_pointer_in_select_box: bool) {
+        if is_pointer_in_select_box {
+            self.is_floating_window_hidden = !self.is_floating_window_hidden;
+            self.currently_hovered_element = self.selected_element_index;
+
+            if self.is_floating_window_hidden {
+                self.release_pointer_capture(PointerId::new(1).unwrap());
+            }
+        }
+    }
+
+    fn handle_click_outside_menu(&mut self, is_pointer_in_select_box: bool, is_pointer_in_window: bool) {
+        if !self.is_floating_window_hidden && !is_pointer_in_window && !is_pointer_in_select_box {
+            self.is_floating_window_hidden = true;
+        }
+    }
+
+    fn handle_child_click(&mut self, event: &mut Event, pointer_position: &Point, is_pointer_in_window: bool, is_pointer_in_scrollbar: bool) {
+        if is_pointer_in_window && !is_pointer_in_scrollbar {
+            let mut should_hide_window = false;
+            for (child_index, child) in self.children().iter().cloned().enumerate() {
+                let contains = child
+                    .borrow()
+                    .element_data()
+                    .layout
+                    .computed_box_transformed
+                    .border_rectangle()
+                    .contains(pointer_position);
+
+                if contains {
+                    should_hide_window = true;
+                    self.set_selected_element(child_index);
+                    self.release_pointer_capture(PointerId::new(1).unwrap());
+
+                    let new_event = Event::new(event.target.clone());
+                    queue_event(new_event, EventKind::DropdownItemSelected(child_index));
+
+                    break;
+                }
+            }
+
+            if should_hide_window {
+                self.is_floating_window_hidden = true;
+            }
+        }
+    }
 }

From 449e70dc839e6d48e5c7a513f280b9f9030f64a8 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 28 Mar 2026 00:16:44 -0400
Subject: [PATCH 117/143] Put rendercmd enum members in a struct

---
 crates/craft_renderer/src/lib.rs              |   5 +-
 crates/craft_renderer/src/render_command.rs   |  83 ++++++++++++
 crates/craft_renderer/src/renderer.rs         | 124 +++++++++---------
 crates/craft_renderer/src/vello/mod.rs        | 113 ++++++++--------
 crates/craft_renderer/src/vello_cpu/mod.rs    |  95 +++++++-------
 crates/craft_renderer/src/vello_hybrid/mod.rs |  79 +++++------
 crates/craft_retained/src/layout/layout.rs    |   2 +-
 7 files changed, 297 insertions(+), 204 deletions(-)
 create mode 100644 crates/craft_renderer/src/render_command.rs

diff --git a/crates/craft_renderer/src/lib.rs b/crates/craft_renderer/src/lib.rs
index d9d370a5..96edcbf7 100644
--- a/crates/craft_renderer/src/lib.rs
+++ b/crates/craft_renderer/src/lib.rs
@@ -11,11 +11,14 @@ pub mod vello_cpu;
 
 pub mod blank_renderer;
 mod image_adapter;
+pub mod render_command;
 mod renderer_type;
 pub mod text_renderer_data;
 pub(crate) mod tinyvg_helpers;
 #[cfg(feature = "vello_hybrid_renderer")]
 pub mod vello_hybrid;
 
-pub use renderer::{Brush, RenderCommand, RenderList};
+
+pub use render_command::RenderCommand;
+pub use renderer::{Brush, RenderList};
 pub use renderer_type::RendererType;
diff --git a/crates/craft_renderer/src/render_command.rs b/crates/craft_renderer/src/render_command.rs
new file mode 100644
index 00000000..7f369073
--- /dev/null
+++ b/crates/craft_renderer/src/render_command.rs
@@ -0,0 +1,83 @@
+use std::cell::RefCell;
+use std::rc::Weak;
+
+use peniko::Color;
+
+use craft_primitives::geometry::{BezPath, Rectangle, Vec2};
+
+use craft_resource_manager::ResourceIdentifier;
+
+use crate::Brush;
+use crate::renderer::{TextScroll};
+use crate::text_renderer_data::TextData;
+
+#[derive(Clone)]
+pub enum RenderCommand {
+    DrawRect(DrawRectCmd),
+    DrawRectOutline(DrawRectOutlineCmd),
+    DrawImage(DrawImageCmd),
+    DrawTinyVg(DrawTinyVgCmd),
+    DrawText(DrawTextCmd),
+    PushLayer(PushLayerCmd),
+    PopLayer,
+    FillBezPath(FillBezPathCmd),
+    StartOverlay,
+    EndOverlay,
+    BoxShadowCmd(BoxShadowCmd),
+}
+
+#[derive(Clone)]
+pub struct DrawRectCmd {
+    pub rect: Rectangle,
+    pub color: Color
+}
+
+#[derive(Clone)]
+pub struct DrawRectOutlineCmd {
+    pub rect: Rectangle,
+    pub outline_color: Color,
+    pub thickness: f64
+}
+
+#[derive(Clone)]
+pub struct DrawImageCmd {
+    pub rect: Rectangle,
+    pub resource_id: ResourceIdentifier
+}
+
+#[derive(Clone)]
+pub struct DrawTinyVgCmd {
+    pub rect: Rectangle,
+    pub resource_id: ResourceIdentifier,
+    pub override_color: Option<Color>
+}
+
+#[derive(Clone)]
+pub struct DrawTextCmd {
+    pub rect: Rectangle,
+    pub data: Weak<RefCell<dyn TextData>>,
+    pub text_scroll: Option<TextScroll>,
+    pub show_cursor: bool
+}
+
+#[derive(Clone)]
+pub struct PushLayerCmd {
+    pub rect: Rectangle
+}
+
+#[derive(Clone)]
+pub struct FillBezPathCmd {
+    pub path: BezPath,
+    pub brush: Brush
+}
+
+#[derive(Clone)]
+pub struct BoxShadowCmd {
+    pub inset: bool,
+    pub offset: Vec2,
+    pub outline: BezPath,
+    pub path: BezPath,
+    pub blur_radius: f64,
+    pub color: Color,
+    pub border_box: Rectangle,
+}
\ No newline at end of file
diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index fcb6de07..8c1cf76f 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -3,39 +3,16 @@ use std::cell::RefCell;
 use std::rc::Weak;
 use std::sync::Arc;
 
-use craft_primitives::Color;
+use peniko::kurbo::{BezPath, Shape};
+use peniko::{BrushRef, Gradient};
+
 use craft_primitives::geometry::Rectangle;
+use craft_primitives::Color;
 use craft_resource_manager::{ResourceIdentifier, ResourceManager};
-use peniko::kurbo::{BezPath, Shape, Vec2};
-use peniko::{BrushRef, Gradient};
 
+use crate::render_command::{BoxShadowCmd, DrawImageCmd, DrawRectCmd, DrawRectOutlineCmd, DrawTextCmd, DrawTinyVgCmd, FillBezPathCmd, PushLayerCmd};
 use crate::text_renderer_data::TextData;
-
-#[derive(Clone)]
-pub enum RenderCommand {
-    DrawRect(Rectangle, Color),
-    DrawRectOutline(Rectangle, Color, f64),
-    DrawImage(Rectangle, ResourceIdentifier),
-    DrawTinyVg(Rectangle, ResourceIdentifier, Option<Color>),
-    DrawText(Weak<RefCell<dyn TextData>>, Rectangle, Option<TextScroll>, bool),
-    PushLayer(Rectangle),
-    PopLayer,
-    FillBezPath(BezPath, Brush),
-    StartOverlay,
-    EndOverlay,
-    BoxShadowCmd(BoxShadowCmd),
-}
-
-#[derive(Clone)]
-pub struct BoxShadowCmd {
-    pub inset: bool,
-    pub offset: Vec2,
-    pub outline: BezPath,
-    pub path: BezPath,
-    pub blur_radius: f64,
-    pub color: Color,
-    pub border_box: Rectangle,
-}
+use crate::RenderCommand;
 
 #[derive(Clone, Debug)]
 pub enum Brush {
@@ -160,13 +137,15 @@ impl RenderList {
     }
 
     #[inline(always)]
-    pub fn draw_rect(&mut self, rectangle: Rectangle, fill_color: Color) {
+    pub fn draw_rect(&mut self, rect: Rectangle, color: Color) {
         if let Some(cull) = &self.cull
-            && !cull.intersects(&rectangle)
+            && !cull.intersects(&rect)
         {
             return;
         }
-        self.commands.push(RenderCommand::DrawRect(rectangle, fill_color));
+        self.commands.push(
+            RenderCommand::DrawRect(DrawRectCmd { rect, color })
+        );
     }
 
     #[inline(always)]
@@ -181,14 +160,15 @@ impl RenderList {
     }
 
     #[inline(always)]
-    pub fn draw_rect_outline(&mut self, rectangle: Rectangle, outline_color: Color, thickness: f64) {
+    pub fn draw_rect_outline(&mut self, rect: Rectangle, outline_color: Color, thickness: f64) {
         if let Some(cull) = &self.cull
-            && !cull.intersects(&rectangle)
+            && !cull.intersects(&rect)
         {
             return;
         }
-        self.commands
-            .push(RenderCommand::DrawRectOutline(rectangle, outline_color, thickness));
+        self.commands.push(
+            RenderCommand::DrawRectOutline(DrawRectOutlineCmd { rect, outline_color, thickness })
+        );
     }
 
     #[inline(always)]
@@ -198,49 +178,65 @@ impl RenderList {
         {
             return;
         }
-        self.commands.push(RenderCommand::FillBezPath(path, brush));
+        self.commands.push(
+            RenderCommand::FillBezPath(FillBezPathCmd { path, brush })
+        );
     }
 
     #[inline(always)]
     pub fn draw_text(
         &mut self,
-        component: Weak<RefCell<dyn TextData>>,
-        rectangle: Rectangle,
+        data: Weak<RefCell<dyn TextData>>,
+        rect: Rectangle,
         text_scroll: Option<TextScroll>,
         show_cursor: bool,
     ) {
         if let Some(cull) = &self.cull
-            && !cull.intersects(&rectangle)
+            && !cull.intersects(&rect)
         {
             return;
         }
-        self.commands
-            .push(RenderCommand::DrawText(component, rectangle, text_scroll, show_cursor));
+        self.commands.push(
+                RenderCommand::DrawText(DrawTextCmd{ rect, data, text_scroll, show_cursor})
+        );
     }
 
     #[inline(always)]
-    pub fn draw_image(&mut self, rectangle: Rectangle, resource_identifier: ResourceIdentifier) {
-        self.commands
-            .push(RenderCommand::DrawImage(rectangle, resource_identifier));
+    pub fn draw_image(&mut self, rect: Rectangle, resource_id: ResourceIdentifier) {
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&rect)
+        {
+            return;
+        }
+        self.commands.push(
+            RenderCommand::DrawImage(DrawImageCmd { rect, resource_id })
+        );
     }
 
     #[inline(always)]
     pub fn draw_tiny_vg(
         &mut self,
-        rectangle: Rectangle,
-        resource_identifier: ResourceIdentifier,
+        rect: Rectangle,
+        resource_id: ResourceIdentifier,
         override_color: Option<Color>,
     ) {
-        self.commands.push(RenderCommand::DrawTinyVg(
-            rectangle,
-            resource_identifier,
-            override_color,
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&rect)
+        {
+            return;
+        }
+        self.commands.push(
+            RenderCommand::DrawTinyVg(DrawTinyVgCmd {
+                rect,
+                resource_id,
+                override_color,
+            }
         ));
     }
 
     #[inline(always)]
     pub fn push_layer(&mut self, rect: Rectangle) {
-        self.commands.push(RenderCommand::PushLayer(rect));
+        self.commands.push(RenderCommand::PushLayer(PushLayerCmd{ rect }));
     }
 
     #[inline(always)]
@@ -298,19 +294,19 @@ pub trait Renderer: Any {
 
         fn bounding_rect(render_command: &RenderCommand) -> Rectangle {
             match render_command {
-                RenderCommand::DrawRect(rect, _)
-                | RenderCommand::DrawRectOutline(rect, _, _)
-                | RenderCommand::DrawImage(rect, _)
-                | RenderCommand::DrawTinyVg(rect, _, _)
-                | RenderCommand::DrawText(_, rect, _, _) => *rect,
-                RenderCommand::FillBezPath(path, _) => Rectangle::from_kurbo(path.bounding_box()),
-                RenderCommand::BoxShadowCmd(box_shadow) => {
-                    let bounding_box = box_shadow.path.bounding_box();
+                RenderCommand::DrawRect(cmd) => cmd.rect,
+                RenderCommand::DrawRectOutline(cmd) => cmd.rect,
+                RenderCommand::DrawImage(cmd) => cmd.rect,
+                RenderCommand::DrawTinyVg(cmd) => cmd.rect,
+                RenderCommand::DrawText(cmd) => cmd.rect,
+                RenderCommand::FillBezPath(cmd) => Rectangle::from_kurbo(cmd.path.bounding_box()),
+                RenderCommand::BoxShadowCmd(cmd) => {
+                    let bounding_box = cmd.path.bounding_box();
                     Rectangle::new(
-                        (bounding_box.x0 + box_shadow.offset.x) as f32,
-                        (bounding_box.y0 + box_shadow.offset.y) as f32,
-                        (bounding_box.x1 + box_shadow.offset.x) as f32,
-                        (bounding_box.y1 + box_shadow.offset.y) as f32,
+                        (bounding_box.x0 + cmd.offset.x) as f32,
+                        (bounding_box.y0 + cmd.offset.y) as f32,
+                        (bounding_box.x1 + cmd.offset.x) as f32,
+                        (bounding_box.y1 + cmd.offset.y) as f32,
                     )
                 }
                 _ => unreachable!("Cannot compute the bounding rect of this render command."),
diff --git a/crates/craft_renderer/src/vello/mod.rs b/crates/craft_renderer/src/vello/mod.rs
index c0ed9150..6919163f 100644
--- a/crates/craft_renderer/src/vello/mod.rs
+++ b/crates/craft_renderer/src/vello/mod.rs
@@ -7,16 +7,21 @@ use craft_primitives::Color;
 use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::ResourceManager;
 use craft_resource_manager::resource::Resource;
+
 use peniko::{BrushRef, ImageAlphaType};
+
 use vello::kurbo::{Affine, Rect, Stroke};
 use vello::peniko::{BlendMode, Blob, Fill};
 use vello::{AaConfig, Error, Glyph, RendererOptions, Scene, kurbo, peniko};
+
 use wgpu::util::TextureBlitter;
 use wgpu::{Adapter, Device, Instance, Limits, MemoryHints, Queue, Surface, SurfaceConfiguration, SurfaceError, SurfaceTexture, Texture, TextureFormat, TextureView};
+
 use winit::window::Window;
 
 use crate::image_adapter::ImageAdapter;
-use crate::renderer::{RenderCommand, RenderList, Renderer, SortedCommands, TextScroll};
+use crate::RenderCommand;
+use crate::renderer::{RenderList, Renderer, SortedCommands, TextScroll};
 use crate::text_renderer_data::TextRenderLine;
 use crate::vello::tinyvg::draw_tiny_vg;
 
@@ -27,6 +32,25 @@ pub struct RenderSurface {
     pub surface_view: wgpu::TextureView,
 }
 
+pub struct VelloRenderer {
+    pub device: Device,
+    #[allow(dead_code)]
+    pub adapter: Adapter,
+    pub queue: Queue,
+    #[allow(dead_code)]
+    pub instance: Instance,
+    pub render_surface: RenderSurface,
+    pub texture_blitter: TextureBlitter,
+    pub renderer: vello::Renderer,
+
+    // A vello Scene which is a data structure which allows one to build up a
+    // description a scene to be drawn (with paths, fills, images, text, etc)
+    // which is then passed to a renderer for rendering
+    scene: Scene,
+    pub surface_clear_color: Color,
+    pub render_into_texture: bool,
+}
+
 impl RenderSurface {
     pub fn create_surface_textures(device: &Device, surface_width: u32, surface_height: u32) -> (Texture, TextureView) {
         let surface_texture = device.create_texture(&wgpu::TextureDescriptor {
@@ -132,25 +156,6 @@ impl RenderSurface {
     }
 }
 
-pub struct VelloRenderer {
-    pub device: Device,
-    #[allow(dead_code)]
-    pub adapter: Adapter,
-    pub queue: Queue,
-    #[allow(dead_code)]
-    pub instance: Instance,
-    pub render_surface: RenderSurface,
-    pub texture_blitter: TextureBlitter,
-    pub renderer: vello::Renderer,
-
-    // A vello Scene which is a data structure which allows one to build up a
-    // description a scene to be drawn (with paths, fills, images, text, etc)
-    // which is then passed to a renderer for rendering
-    scene: Scene,
-    pub surface_clear_color: Color,
-    pub render_into_texture: bool,
-}
-
 fn create_vello_renderer(device: &Device) -> vello::Renderer {
     vello::Renderer::new(
         device,
@@ -277,20 +282,20 @@ impl Renderer for VelloRenderer {
             let scene = &mut self.scene;
 
             match command {
-                RenderCommand::DrawRect(rectangle, fill_color) => {
-                    vello_draw_rect(scene, *rectangle, *fill_color);
+                RenderCommand::DrawRect(cmd) => {
+                    vello_draw_rect(scene, cmd.rect, cmd.color);
                 }
-                RenderCommand::DrawRectOutline(rectangle, outline_color, thickness) => {
+                RenderCommand::DrawRectOutline(cmd) => {
                     self.scene.stroke(
-                        &Stroke::new(*thickness),
+                        &Stroke::new(cmd.thickness),
                         Affine::IDENTITY,
-                        outline_color,
+                        cmd.outline_color,
                         None,
-                        &rectangle.to_kurbo(),
+                        &cmd.rect.to_kurbo(),
                     );
                 }
-                RenderCommand::DrawImage(rectangle, resource_identifier) => {
-                    let resource = resource_manager.get(resource_identifier);
+                RenderCommand::DrawImage(cmd) => {
+                    let resource = resource_manager.get(&cmd.resource_id);
                     if let Some(resource) = resource
                         && let Resource::Image(resource) = resource.as_ref()
                     {
@@ -309,21 +314,21 @@ impl Renderer for VelloRenderer {
 
                         let mut transform = Affine::IDENTITY;
                         transform =
-                            transform.with_translation(kurbo::Vec2::new(rectangle.x as f64, rectangle.y as f64));
+                            transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
                         transform = transform.pre_scale_non_uniform(
-                            rectangle.width as f64 / image.width() as f64,
-                            rectangle.height as f64 / image.height() as f64,
+                            cmd.rect.width as f64 / image.width() as f64,
+                            cmd.rect.height as f64 / image.height() as f64,
                         );
                         scene.draw_image(&vello_image, transform);
                     }
                 }
-                RenderCommand::DrawText(text_render, rect, text_scroll, show_cursor) => {
+                RenderCommand::DrawText(cmd) => {
                     let text_transform =
-                        Affine::default().with_translation(kurbo::Vec2::new(rect.x as f64, rect.y as f64));
-                    let scroll = text_scroll.unwrap_or(TextScroll::default()).scroll_y;
+                        Affine::default().with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
+                    let scroll = cmd.text_scroll.unwrap_or(TextScroll::default()).scroll_y;
                     let text_transform = text_transform.then_translate(kurbo::Vec2::new(0.0, -scroll as f64));
 
-                    let c = text_render.upgrade();
+                    let c = cmd.data.upgrade();
                     if c.is_none() {
                         return;
                     }
@@ -346,7 +351,7 @@ impl Renderer for VelloRenderer {
                             for item in &line.items {
                                 if let Some(first_glyph) = item.glyphs.first() {
                                     // Cull the glyphs vertically that are outside the window
-                                    let gy = first_glyph.y + rect.y - scroll;
+                                    let gy = first_glyph.y + cmd.rect.y - scroll;
                                     if gy < window.y {
                                         skip_line = true;
                                         break;
@@ -364,8 +369,8 @@ impl Renderer for VelloRenderer {
                     cull_and_process(&mut |line: &TextRenderLine| {
                         for (background, color) in &line.backgrounds {
                             let background_rect = Rectangle {
-                                x: background.x + rect.x,
-                                y: -scroll + background.y + rect.y,
+                                x: background.x + cmd.rect.x,
+                                y: -scroll + background.y + cmd.rect.y,
                                 width: background.width,
                                 height: background.height,
                             };
@@ -374,8 +379,8 @@ impl Renderer for VelloRenderer {
 
                         for (selection, selection_color) in &line.selections {
                             let selection_rect = Rectangle {
-                                x: selection.x + rect.x,
-                                y: -scroll + selection.y + rect.y,
+                                x: selection.x + cmd.rect.x,
+                                y: -scroll + selection.y + cmd.rect.y,
                                 width: selection.width,
                                 height: selection.height,
                             };
@@ -417,39 +422,39 @@ impl Renderer for VelloRenderer {
                         }
                     });
 
-                    if *show_cursor && let Some((cursor, cursor_color)) = &text_render.cursor {
+                    if cmd.show_cursor && let Some((cursor, cursor_color)) = &text_render.cursor {
                         let cursor_rect = Rectangle {
-                            x: cursor.x + rect.x,
-                            y: -scroll + cursor.y + rect.y,
+                            x: cursor.x + cmd.rect.x,
+                            y: -scroll + cursor.y + cmd.rect.y,
                             width: cursor.width,
                             height: cursor.height,
                         };
                         vello_draw_rect(scene, cursor_rect, *cursor_color);
                     }
                 }
-                RenderCommand::DrawTinyVg(rectangle, resource_identifier, override_color) => {
+                RenderCommand::DrawTinyVg(cmd) => {
                     draw_tiny_vg(
                         scene,
-                        *rectangle,
+                        cmd.rect,
                         resource_manager.clone(),
-                        resource_identifier.clone(),
-                        override_color,
+                        cmd.resource_id.clone(),
+                        &cmd.override_color,
                     );
                 }
-                RenderCommand::PushLayer(rect) => {
+                RenderCommand::PushLayer(cmd) => {
                     let clip = Rect::new(
-                        rect.x as f64,
-                        rect.y as f64,
-                        (rect.x + rect.width) as f64,
-                        (rect.y + rect.height) as f64,
+                        cmd.rect.x as f64,
+                        cmd.rect.y as f64,
+                        (cmd.rect.x + cmd.rect.width) as f64,
+                        (cmd.rect.y + cmd.rect.height) as f64,
                     );
                     scene.push_layer(Fill::NonZero, BlendMode::default(), 1.0, Affine::IDENTITY, &clip);
                 }
                 RenderCommand::PopLayer => {
                     scene.pop_layer();
                 }
-                RenderCommand::FillBezPath(path, brush) => {
-                    scene.fill(Fill::NonZero, Affine::IDENTITY, brush, None, &path);
+                RenderCommand::FillBezPath(cmd) => {
+                    scene.fill(Fill::NonZero, Affine::IDENTITY, &cmd.brush, None, &cmd.path);
                 }
                 _ => {}
             }
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index a47d1945..abe27843 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -8,21 +8,35 @@ use std::sync::Arc;
 use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::ResourceManager;
 use craft_resource_manager::resource::Resource;
+
 use peniko::kurbo::{Affine, Shape};
 use peniko::{BlendMode, Blob, Color, Compose, Fill, ImageAlphaType, Mix, kurbo};
+
 use softbuffer::Buffer;
+
 use vello_common::filter_effects::{Filter, FilterFunction};
 use vello_common::glyph::Glyph;
 use vello_common::kurbo::Stroke;
 use vello_common::paint::PaintType;
 use vello_cpu::{Pixmap, RenderContext};
+
 use winit::window::Window;
 
 use crate::image_adapter::ImageAdapter;
-use crate::renderer::{BoxShadowCmd, RenderList, Renderer, Screenshot, SortedCommands, TextScroll};
+use crate::renderer::{RenderList, Renderer, Screenshot, SortedCommands, TextScroll};
 use crate::text_renderer_data::TextRenderLine;
 use crate::vello_cpu::tinyvg::draw_tiny_vg;
 use crate::{Brush, RenderCommand};
+use crate::render_command::BoxShadowCmd;
+
+pub(crate) struct VelloCpuRenderer {
+    render_context: RenderContext,
+    pixmap: Pixmap,
+    surface: Surface,
+    clear_color: Color,
+    window_width: u16,
+    window_height: u16,
+}
 
 pub struct Surface {
     inner_surface: softbuffer::Surface<Arc<Window>, Arc<Window>>,
@@ -62,15 +76,6 @@ fn vello_draw_rect(scene: &mut RenderContext, rectangle: Rectangle, fill_color:
     scene.fill_rect(&rectangle.to_kurbo());
 }
 
-pub(crate) struct VelloCpuRenderer {
-    render_context: RenderContext,
-    pixmap: Pixmap,
-    surface: Surface,
-    clear_color: Color,
-    window_width: u16,
-    window_height: u16,
-}
-
 impl VelloCpuRenderer {
     pub fn new(window: Arc<Window>) -> Self {
         let width = window.inner_size().width as u16;
@@ -151,17 +156,17 @@ impl Renderer for VelloCpuRenderer {
 
         SortedCommands::draw(render_list, &render_list.overlay, &mut |command: &RenderCommand| {
             match command {
-                RenderCommand::DrawRect(rectangle, fill_color) => {
-                    self.render_context.set_paint(PaintType::Solid(*fill_color));
-                    self.render_context.fill_rect(&rectangle.to_kurbo());
+                RenderCommand::DrawRect(cmd) => {
+                    self.render_context.set_paint(PaintType::Solid(cmd.color));
+                    self.render_context.fill_rect(&cmd.rect.to_kurbo());
                 }
-                RenderCommand::DrawRectOutline(rectangle, outline_color, thickness) => {
-                    self.render_context.set_stroke(Stroke::new(*thickness));
-                    self.render_context.set_paint(PaintType::Solid(*outline_color));
-                    self.render_context.stroke_rect(&rectangle.to_kurbo());
+                RenderCommand::DrawRectOutline(cmd) => {
+                    self.render_context.set_stroke(Stroke::new(cmd.thickness));
+                    self.render_context.set_paint(PaintType::Solid(cmd.outline_color));
+                    self.render_context.stroke_rect(&cmd.rect.to_kurbo());
                 }
-                RenderCommand::DrawImage(rectangle, resource_identifier) => {
-                    let resource = resource_manager.get(resource_identifier);
+                RenderCommand::DrawImage(cmd) => {
+                    let resource = resource_manager.get(&cmd.resource_id);
 
                     if let Some(resource) = resource
                         && let Resource::Image(resource) = resource.as_ref()
@@ -179,10 +184,10 @@ impl Renderer for VelloCpuRenderer {
 
                         let mut transform = Affine::IDENTITY;
                         transform =
-                            transform.with_translation(kurbo::Vec2::new(rectangle.x as f64, rectangle.y as f64));
+                            transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
                         transform = transform.pre_scale_non_uniform(
-                            rectangle.width as f64 / image.width() as f64,
-                            rectangle.height as f64 / image.height() as f64,
+                            cmd.rect.width as f64 / image.width() as f64,
+                            cmd.rect.height as f64 / image.height() as f64,
                         );
                         self.render_context.set_transform(transform);
 
@@ -204,13 +209,13 @@ impl Renderer for VelloCpuRenderer {
                         self.render_context.reset_transform();
                     }
                 }
-                RenderCommand::DrawText(text_render, rect, text_scroll, show_cursor) => {
+                RenderCommand::DrawText(cmd) => {
                     let text_transform =
-                        kurbo::Affine::default().with_translation(kurbo::Vec2::new(rect.x as f64, rect.y as f64));
-                    let scroll = text_scroll.unwrap_or(TextScroll::default()).scroll_y;
+                        kurbo::Affine::default().with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
+                    let scroll = cmd.text_scroll.unwrap_or(TextScroll::default()).scroll_y;
                     let text_transform = text_transform.then_translate(kurbo::Vec2::new(0.0, -scroll as f64));
 
-                    let c = text_render.upgrade();
+                    let c = cmd.data.upgrade();
                     if c.is_none() {
                         return;
                     }
@@ -233,7 +238,7 @@ impl Renderer for VelloCpuRenderer {
                             for item in &line.items {
                                 if let Some(first_glyph) = item.glyphs.first() {
                                     // Cull the glyphs vertically that are outside the window
-                                    let gy = first_glyph.y + rect.y - scroll;
+                                    let gy = first_glyph.y + cmd.rect.y - scroll;
                                     if gy < window.y {
                                         skip_line = true;
                                         break;
@@ -251,8 +256,8 @@ impl Renderer for VelloCpuRenderer {
                     cull_and_process(&mut |line: &TextRenderLine| {
                         for (background, color) in &line.backgrounds {
                             let background_rect = Rectangle {
-                                x: background.x + rect.x,
-                                y: -scroll + background.y + rect.y,
+                                x: background.x + cmd.rect.x,
+                                y: -scroll + background.y + cmd.rect.y,
                                 width: background.width,
                                 height: background.height,
                             };
@@ -261,8 +266,8 @@ impl Renderer for VelloCpuRenderer {
 
                         for (selection, selection_color) in &line.selections {
                             let selection_rect = Rectangle {
-                                x: selection.x + rect.x,
-                                y: -scroll + selection.y + rect.y,
+                                x: selection.x + cmd.rect.x,
+                                y: -scroll + selection.y + cmd.rect.y,
                                 width: selection.width,
                                 height: selection.height,
                             };
@@ -300,21 +305,21 @@ impl Renderer for VelloCpuRenderer {
                         }
                     });
 
-                    if *show_cursor && let Some((cursor, cursor_color)) = &text_render.cursor {
+                    if cmd.show_cursor && let Some((cursor, cursor_color)) = &text_render.cursor {
                         let cursor_rect = Rectangle {
-                            x: cursor.x + rect.x,
-                            y: -scroll + cursor.y + rect.y,
+                            x: cursor.x + cmd.rect.x,
+                            y: -scroll + cursor.y + cmd.rect.y,
                             width: cursor.width,
                             height: cursor.height,
                         };
                         vello_draw_rect(&mut self.render_context, cursor_rect, *cursor_color);
                     }
                 }
-                RenderCommand::PushLayer(rect) => {
+                RenderCommand::PushLayer(cmd) => {
                     let clip_path = Some(
                         peniko::kurbo::Rect::from_origin_size(
-                            peniko::kurbo::Point::new(rect.x as f64, rect.y as f64),
-                            peniko::kurbo::Size::new(rect.width as f64, rect.height as f64),
+                            peniko::kurbo::Point::new(cmd.rect.x as f64, cmd.rect.y as f64),
+                            peniko::kurbo::Size::new(cmd.rect.width as f64, cmd.rect.height as f64),
                         )
                         .into_path(0.1),
                     );
@@ -324,22 +329,22 @@ impl Renderer for VelloCpuRenderer {
                 RenderCommand::PopLayer => {
                     self.render_context.pop_layer();
                 }
-                RenderCommand::FillBezPath(path, brush) => {
-                    self.render_context.set_paint(brush_to_paint(brush));
-                    self.render_context.fill_path(path);
+                RenderCommand::FillBezPath(cmd) => {
+                    self.render_context.set_paint(brush_to_paint(&cmd.brush));
+                    self.render_context.fill_path(&cmd.path);
                 }
-                RenderCommand::DrawTinyVg(rectangle, resource_identifier, override_color) => {
+                RenderCommand::DrawTinyVg(cmd) => {
                     draw_tiny_vg(
                         &mut self.render_context,
-                        *rectangle,
+                        cmd.rect,
                         &resource_manager,
-                        resource_identifier.clone(),
-                        override_color,
+                        cmd.resource_id.clone(),
+                        &cmd.override_color,
                     );
                 }
                 RenderCommand::StartOverlay => {}
                 RenderCommand::EndOverlay => {}
-                RenderCommand::BoxShadowCmd(box_shadow) => self.draw_box_shadow(box_shadow),
+                RenderCommand::BoxShadowCmd(cmd) => self.draw_box_shadow(cmd),
             }
         });
     }
diff --git a/crates/craft_renderer/src/vello_hybrid/mod.rs b/crates/craft_renderer/src/vello_hybrid/mod.rs
index a51217f0..b5eace54 100644
--- a/crates/craft_renderer/src/vello_hybrid/mod.rs
+++ b/crates/craft_renderer/src/vello_hybrid/mod.rs
@@ -23,8 +23,9 @@ use vello_hybrid::{RenderSize, RenderTargetConfig, Renderer, Scene};
 use wgpu::TextureFormat;
 use winit::window::Window;
 
-use crate::Brush;
-use crate::renderer::{BoxShadowCmd, RenderCommand, RenderList, Renderer as CraftRenderer, SortedCommands, TextScroll};
+use crate::{Brush, RenderCommand};
+use crate::render_command::BoxShadowCmd;
+use crate::renderer::{RenderList, Renderer as CraftRenderer, SortedCommands, TextScroll};
 use crate::text_renderer_data::TextRenderLine;
 use crate::vello_hybrid::render_context::{RenderContext, RenderSurface};
 use crate::vello_hybrid::tinyvg::draw_tiny_vg;
@@ -245,16 +246,16 @@ impl CraftRenderer for VelloHybridRenderer {
             let scene = &mut self.scene;
 
             match command {
-                RenderCommand::DrawRect(rectangle, fill_color) => {
-                    vello_draw_rect(scene, *rectangle, *fill_color);
+                RenderCommand::DrawRect(cmd) => {
+                    vello_draw_rect(scene, cmd.rect, cmd.color);
                 }
-                RenderCommand::DrawRectOutline(rectangle, outline_color, thickness) => {
-                    self.scene.set_stroke(Stroke::new(*thickness));
-                    self.scene.set_paint(PaintType::from(*outline_color));
-                    self.scene.stroke_rect(&rectangle.to_kurbo());
+                RenderCommand::DrawRectOutline(cmd) => {
+                    self.scene.set_stroke(Stroke::new(cmd.thickness));
+                    self.scene.set_paint(PaintType::from(cmd.outline_color));
+                    self.scene.stroke_rect(&cmd.rect.to_kurbo());
                 }
-                RenderCommand::DrawImage(rectangle, resource_identifier) => {
-                    let resource = resource_manager.get(resource_identifier);
+                RenderCommand::DrawImage(cmd) => {
+                    let resource = resource_manager.get(&cmd.resource_id);
 
                     if let Some(resource) = resource
                         && let Resource::Image(resource) = resource.as_ref()
@@ -264,13 +265,13 @@ impl CraftRenderer for VelloHybridRenderer {
                         let image = &resource.image;
 
                         // There is an image, and it hasn't expired.
-                        let image_id = if let Some(stored_image) = self.images.get(resource_identifier)
+                        let image_id = if let Some(stored_image) = self.images.get(&cmd.resource_id)
                             && stored_image.1 == expiration_time
                         {
                             stored_image.0
                         } else {
                             // There is an image, but it expired.
-                            if let Some(stored_image) = self.images.get(resource_identifier) {
+                            if let Some(stored_image) = self.images.get(&cmd.resource_id) {
                                 expired_images.insert(stored_image.0);
                             }
 
@@ -300,7 +301,7 @@ impl CraftRenderer for VelloHybridRenderer {
                                 &pixmap,
                             );
                             self.images
-                                .insert(resource_identifier.clone(), (image_id, expiration_time));
+                                .insert(cmd.resource_id.clone(), (image_id, expiration_time));
 
                             image_id
                         };
@@ -308,10 +309,10 @@ impl CraftRenderer for VelloHybridRenderer {
 
                         let mut transform = Affine::IDENTITY;
                         transform =
-                            transform.with_translation(kurbo::Vec2::new(rectangle.x as f64, rectangle.y as f64));
+                            transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
                         transform = transform.pre_scale_non_uniform(
-                            rectangle.width as f64 / image.width() as f64,
-                            rectangle.height as f64 / image.height() as f64,
+                            cmd.rect.width as f64 / image.width() as f64,
+                            cmd.rect.height as f64 / image.height() as f64,
                         );
                         scene.set_transform(transform);
 
@@ -327,13 +328,13 @@ impl CraftRenderer for VelloHybridRenderer {
                         scene.reset_transform();
                     }
                 }
-                RenderCommand::DrawText(text_render, rect, text_scroll, show_cursor) => {
+                RenderCommand::DrawText(cmd) => {
                     let text_transform =
-                        Affine::default().with_translation(kurbo::Vec2::new(rect.x as f64, rect.y as f64));
-                    let scroll = text_scroll.unwrap_or(TextScroll::default()).scroll_y;
+                        Affine::default().with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
+                    let scroll = cmd.text_scroll.unwrap_or(TextScroll::default()).scroll_y;
                     let text_transform = text_transform.then_translate(kurbo::Vec2::new(0.0, -scroll as f64));
 
-                    let c = text_render.upgrade();
+                    let c = cmd.data.upgrade();
                     if c.is_none() {
                         return;
                     }
@@ -356,7 +357,7 @@ impl CraftRenderer for VelloHybridRenderer {
                             for item in &line.items {
                                 if let Some(first_glyph) = item.glyphs.first() {
                                     // Cull the glyphs vertically that are outside the window
-                                    let gy = first_glyph.y + rect.y - scroll;
+                                    let gy = first_glyph.y + cmd.rect.y - scroll;
                                     if gy < window.y {
                                         skip_line = true;
                                         break;
@@ -374,8 +375,8 @@ impl CraftRenderer for VelloHybridRenderer {
                     cull_and_process(&mut |line: &TextRenderLine| {
                         for (background, color) in &line.backgrounds {
                             let background_rect = Rectangle {
-                                x: background.x + rect.x,
-                                y: -scroll + background.y + rect.y,
+                                x: background.x + cmd.rect.x,
+                                y: -scroll + background.y + cmd.rect.y,
                                 width: background.width,
                                 height: background.height,
                             };
@@ -384,8 +385,8 @@ impl CraftRenderer for VelloHybridRenderer {
 
                         for (selection, selection_color) in &line.selections {
                             let selection_rect = Rectangle {
-                                x: selection.x + rect.x,
-                                y: -scroll + selection.y + rect.y,
+                                x: selection.x + cmd.rect.x,
+                                y: -scroll + selection.y + cmd.rect.y,
                                 width: selection.width,
                                 height: selection.height,
                             };
@@ -422,30 +423,30 @@ impl CraftRenderer for VelloHybridRenderer {
                         }
                     });
 
-                    if *show_cursor && let Some((cursor, cursor_color)) = &text_render.cursor {
+                    if cmd.show_cursor && let Some((cursor, cursor_color)) = &text_render.cursor {
                         let cursor_rect = Rectangle {
-                            x: cursor.x + rect.x,
-                            y: -scroll + cursor.y + rect.y,
+                            x: cursor.x + cmd.rect.x,
+                            y: -scroll + cursor.y + cmd.rect.y,
                             width: cursor.width,
                             height: cursor.height,
                         };
                         vello_draw_rect(scene, cursor_rect, *cursor_color);
                     }
                 }
-                RenderCommand::DrawTinyVg(rectangle, resource_identifier, override_color) => {
+                RenderCommand::DrawTinyVg(cmd) => {
                     draw_tiny_vg(
                         scene,
-                        *rectangle,
+                        cmd.rect,
                         &resource_manager,
-                        resource_identifier.clone(),
-                        override_color,
+                        cmd.resource_id.clone(),
+                        &cmd.override_color,
                     );
                 }
-                RenderCommand::PushLayer(rect) => {
+                RenderCommand::PushLayer(cmd) => {
                     let clip_path = Some(
                         kurbo::Rect::from_origin_size(
-                            kurbo::Point::new(rect.x as f64, rect.y as f64),
-                            kurbo::Size::new(rect.width as f64, rect.height as f64),
+                            kurbo::Point::new(cmd.rect.x as f64, cmd.rect.y as f64),
+                            kurbo::Size::new(cmd.rect.width as f64, cmd.rect.height as f64),
                         )
                         .into_path(0.1),
                     );
@@ -454,14 +455,14 @@ impl CraftRenderer for VelloHybridRenderer {
                 RenderCommand::PopLayer => {
                     scene.pop_layer();
                 }
-                RenderCommand::FillBezPath(path, brush) => {
-                    scene.set_paint(brush_to_paint(brush));
-                    scene.fill_path(path);
+                RenderCommand::FillBezPath(cmd) => {
+                    scene.set_paint(brush_to_paint(&cmd.brush));
+                    scene.fill_path(&cmd.path);
                 }
 
                 RenderCommand::StartOverlay => {}
                 RenderCommand::EndOverlay => {}
-                RenderCommand::BoxShadowCmd(box_shadow) => draw_box_shadow(scene, box_shadow),
+                RenderCommand::BoxShadowCmd(cmd) => draw_box_shadow(scene, cmd),
             }
         });
 
diff --git a/crates/craft_retained/src/layout/layout.rs b/crates/craft_retained/src/layout/layout.rs
index 6f7f5461..428016c5 100644
--- a/crates/craft_retained/src/layout/layout.rs
+++ b/crates/craft_retained/src/layout/layout.rs
@@ -1,7 +1,7 @@
 use craft_primitives::geometry::borders::{BOTTOM, CssRoundedRect, LEFT, RIGHT, TOP};
 use craft_primitives::geometry::{Affine, BezPath, Border, ElementBox, Margin, Padding, Point, Rectangle, Shape, Size, TrblRectangle, Vec2};
 
-use craft_renderer::renderer::BoxShadowCmd;
+use craft_renderer::render_command::BoxShadowCmd;
 use craft_renderer::{Brush, RenderList};
 
 use peniko::Color;

From 865ec5fa6a4b0de143ae4c92e2d43d84d3b60844 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 28 Mar 2026 00:46:29 -0400
Subject: [PATCH 118/143] Split renderer structs into indiv. files

---
 crates/craft_renderer/src/blank_renderer.rs   |   3 +-
 crates/craft_renderer/src/brush.rs            |  16 +
 crates/craft_renderer/src/color.rs            |   1 -
 crates/craft_renderer/src/helpers.rs          |  14 +
 crates/craft_renderer/src/lib.rs              |  13 +-
 crates/craft_renderer/src/render_command.rs   |   3 +-
 crates/craft_renderer/src/render_list.rs      | 183 +++++++++
 crates/craft_renderer/src/renderer.rs         | 357 +-----------------
 crates/craft_renderer/src/screenshot.rs       |   5 +
 crates/craft_renderer/src/sort_commands.rs    | 119 ++++++
 crates/craft_renderer/src/target_item.rs      |  23 ++
 .../craft_renderer/src/text_renderer_data.rs  |  15 +
 crates/craft_renderer/src/tinyvg_helpers.rs   |   2 +-
 crates/craft_renderer/src/vello/mod.rs        |   6 +-
 crates/craft_renderer/src/vello_cpu/mod.rs    |  29 +-
 crates/craft_renderer/src/vello_cpu/tinyvg.rs |   2 +-
 crates/craft_renderer/src/vello_hybrid/mod.rs |   6 +-
 .../craft_renderer/src/vello_hybrid/tinyvg.rs |   2 +-
 crates/craft_retained/src/elements/text.rs    |   3 +-
 .../src/elements/text_input/mod.rs            |   4 +-
 crates/craft_retained/src/events/helpers.rs   |   2 +-
 21 files changed, 420 insertions(+), 388 deletions(-)
 create mode 100644 crates/craft_renderer/src/brush.rs
 delete mode 100644 crates/craft_renderer/src/color.rs
 create mode 100644 crates/craft_renderer/src/helpers.rs
 create mode 100644 crates/craft_renderer/src/render_list.rs
 create mode 100644 crates/craft_renderer/src/screenshot.rs
 create mode 100644 crates/craft_renderer/src/sort_commands.rs
 create mode 100644 crates/craft_renderer/src/target_item.rs

diff --git a/crates/craft_renderer/src/blank_renderer.rs b/crates/craft_renderer/src/blank_renderer.rs
index 2be78695..c28731f5 100644
--- a/crates/craft_renderer/src/blank_renderer.rs
+++ b/crates/craft_renderer/src/blank_renderer.rs
@@ -5,7 +5,8 @@ use craft_primitives::Color;
 use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::ResourceManager;
 
-use crate::renderer::{RenderList, Renderer};
+use crate::render_list::RenderList;
+use crate::renderer::Renderer;
 
 pub struct BlankRenderer;
 
diff --git a/crates/craft_renderer/src/brush.rs b/crates/craft_renderer/src/brush.rs
new file mode 100644
index 00000000..137e0865
--- /dev/null
+++ b/crates/craft_renderer/src/brush.rs
@@ -0,0 +1,16 @@
+use peniko::{BrushRef, Color, Gradient};
+
+#[derive(Clone, Debug)]
+pub enum Brush {
+    Color(Color),
+    Gradient(Gradient),
+}
+
+impl<'a> From<&'a Brush> for BrushRef<'a> {
+    fn from(brush: &'a Brush) -> Self {
+        match brush {
+            Brush::Color(color) => Self::Solid(*color),
+            Brush::Gradient(gradient) => Self::Gradient(gradient),
+        }
+    }
+}
diff --git a/crates/craft_renderer/src/color.rs b/crates/craft_renderer/src/color.rs
deleted file mode 100644
index 8b137891..00000000
--- a/crates/craft_renderer/src/color.rs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/crates/craft_renderer/src/helpers.rs b/crates/craft_renderer/src/helpers.rs
new file mode 100644
index 00000000..c6aa8863
--- /dev/null
+++ b/crates/craft_renderer/src/helpers.rs
@@ -0,0 +1,14 @@
+use vello_common::paint::PaintType;
+use crate::Brush;
+
+#[cfg(any(feature = "vello_cpu_renderer", feature = "vello_hybrid_renderer", feature = "vello_hybrid_renderer_webgl"))]
+pub(crate) fn brush_to_paint(brush: &Brush) -> PaintType {
+    match brush {
+        Brush::Color(color) => PaintType::Solid(*color),
+        Brush::Gradient(gradient) => PaintType::Gradient(gradient.clone()),
+    }
+}
+
+pub const fn rgba_to_encoded_u32(r: u32, g: u32, b: u32, a: u32) -> u32 {
+    b | (g << 8) | (r << 16) | (a << 24)
+}
diff --git a/crates/craft_renderer/src/lib.rs b/crates/craft_renderer/src/lib.rs
index 96edcbf7..150e807d 100644
--- a/crates/craft_renderer/src/lib.rs
+++ b/crates/craft_renderer/src/lib.rs
@@ -1,4 +1,4 @@
-pub mod color;
+pub mod brush;
 
 #[allow(clippy::module_inception)]
 pub mod renderer;
@@ -17,8 +17,15 @@ pub mod text_renderer_data;
 pub(crate) mod tinyvg_helpers;
 #[cfg(feature = "vello_hybrid_renderer")]
 pub mod vello_hybrid;
-
+pub(crate) mod helpers;
+mod render_list;
+mod sort_commands;
+mod screenshot;
+mod target_item;
 
 pub use render_command::RenderCommand;
-pub use renderer::{Brush, RenderList};
+pub use render_list::RenderList;
+pub use brush::Brush;
+pub use screenshot::Screenshot;
+pub use target_item::TargetItem;
 pub use renderer_type::RendererType;
diff --git a/crates/craft_renderer/src/render_command.rs b/crates/craft_renderer/src/render_command.rs
index 7f369073..a3500d67 100644
--- a/crates/craft_renderer/src/render_command.rs
+++ b/crates/craft_renderer/src/render_command.rs
@@ -8,8 +8,7 @@ use craft_primitives::geometry::{BezPath, Rectangle, Vec2};
 use craft_resource_manager::ResourceIdentifier;
 
 use crate::Brush;
-use crate::renderer::{TextScroll};
-use crate::text_renderer_data::TextData;
+use crate::text_renderer_data::{TextData, TextScroll};
 
 #[derive(Clone)]
 pub enum RenderCommand {
diff --git a/crates/craft_renderer/src/render_list.rs b/crates/craft_renderer/src/render_list.rs
new file mode 100644
index 00000000..a4794b3b
--- /dev/null
+++ b/crates/craft_renderer/src/render_list.rs
@@ -0,0 +1,183 @@
+use std::cell::RefCell;
+use std::rc::Weak;
+
+use peniko::Color;
+
+use craft_primitives::geometry::{BezPath, Rectangle, Shape};
+use craft_resource_manager::ResourceIdentifier;
+
+use crate::Brush;
+use crate::render_command::{BoxShadowCmd, DrawImageCmd, DrawRectCmd, DrawRectOutlineCmd, DrawTextCmd, DrawTinyVgCmd, FillBezPathCmd, PushLayerCmd};
+use crate::{RenderCommand};
+use crate::{TargetItem};
+use crate::sort_commands::SortedCommands;
+use crate::text_renderer_data::{TextScroll, TextData};
+
+pub struct RenderList {
+    current_overlay_depth: u64,
+    pub targets: Vec<TargetItem>,
+    pub commands: Vec<RenderCommand>,
+    /// Stores a sorted list of render command handles. This gets set in `Renderer::sort_render_list`.
+    pub overlay: SortedCommands,
+    cull: Option<Rectangle>,
+}
+
+impl Default for RenderList {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl RenderList {
+    pub fn new() -> Self {
+        Self {
+            current_overlay_depth: 0,
+            targets: Vec::new(),
+            commands: Vec::new(),
+            overlay: SortedCommands { children: vec![] },
+            cull: None,
+        }
+    }
+
+    pub fn clear(&mut self) {
+        self.targets.clear();
+        self.commands.clear();
+        self.overlay.children.clear();
+    }
+
+    #[inline(always)]
+    pub fn draw_rect(&mut self, rect: Rectangle, color: Color) {
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&rect)
+        {
+            return;
+        }
+        self.commands.push(
+            RenderCommand::DrawRect(DrawRectCmd { rect, color })
+        );
+    }
+
+    #[inline(always)]
+    pub fn push_hit_testable(&mut self, id: u64, bounding_box: Rectangle) {
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&bounding_box)
+        {
+            return;
+        }
+        self.targets
+            .push(TargetItem::new(id, bounding_box, self.current_overlay_depth));
+    }
+
+    #[inline(always)]
+    pub fn draw_rect_outline(&mut self, rect: Rectangle, outline_color: Color, thickness: f64) {
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&rect)
+        {
+            return;
+        }
+        self.commands.push(
+            RenderCommand::DrawRectOutline(DrawRectOutlineCmd { rect, outline_color, thickness })
+        );
+    }
+
+    #[inline(always)]
+    pub fn fill_bez_path(&mut self, path: BezPath, brush: Brush) {
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&Rectangle::from_kurbo(path.bounding_box()))
+        {
+            return;
+        }
+        self.commands.push(
+            RenderCommand::FillBezPath(FillBezPathCmd { path, brush })
+        );
+    }
+
+    #[inline(always)]
+    pub fn draw_text(
+        &mut self,
+        data: Weak<RefCell<dyn TextData>>,
+        rect: Rectangle,
+        text_scroll: Option<TextScroll>,
+        show_cursor: bool,
+    ) {
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&rect)
+        {
+            return;
+        }
+        self.commands.push(
+            RenderCommand::DrawText(DrawTextCmd{ rect, data, text_scroll, show_cursor})
+        );
+    }
+
+    #[inline(always)]
+    pub fn draw_image(&mut self, rect: Rectangle, resource_id: ResourceIdentifier) {
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&rect)
+        {
+            return;
+        }
+        self.commands.push(
+            RenderCommand::DrawImage(DrawImageCmd { rect, resource_id })
+        );
+    }
+
+    #[inline(always)]
+    pub fn draw_tiny_vg(
+        &mut self,
+        rect: Rectangle,
+        resource_id: ResourceIdentifier,
+        override_color: Option<Color>,
+    ) {
+        if let Some(cull) = &self.cull
+            && !cull.intersects(&rect)
+        {
+            return;
+        }
+        self.commands.push(
+            RenderCommand::DrawTinyVg(DrawTinyVgCmd {
+                rect,
+                resource_id,
+                override_color,
+            }
+            ));
+    }
+
+    #[inline(always)]
+    pub fn push_layer(&mut self, rect: Rectangle) {
+        self.commands.push(RenderCommand::PushLayer(PushLayerCmd{ rect }));
+    }
+
+    #[inline(always)]
+    pub fn pop_layer(&mut self) {
+        self.commands.push(RenderCommand::PopLayer);
+    }
+
+    pub fn start_overlay(&mut self) {
+        self.commands.push(RenderCommand::StartOverlay);
+        self.current_overlay_depth += 1;
+    }
+
+    pub fn end_overlay(&mut self) {
+        self.commands.push(RenderCommand::EndOverlay);
+        self.current_overlay_depth -= 1;
+    }
+
+    #[inline(always)]
+    pub fn draw_outset_box_shadow(
+        &mut self,
+        box_shadow: BoxShadowCmd,
+        //rectangle: Rectangle,
+    ) {
+        /*        if let Some(cull) = &self.cull
+            && !cull.intersects(&rectangle)
+        {
+            return;
+        }*/
+        self.commands.push(RenderCommand::BoxShadowCmd(box_shadow));
+    }
+
+    pub fn set_cull(&mut self, cull: Option<Rectangle>) {
+        self.cull = cull;
+    }
+}
\ No newline at end of file
diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index 8c1cf76f..b53e3fda 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -1,277 +1,14 @@
 use std::any::Any;
-use std::cell::RefCell;
-use std::rc::Weak;
 use std::sync::Arc;
 
-use peniko::kurbo::{BezPath, Shape};
-use peniko::{BrushRef, Gradient};
-
 use craft_primitives::geometry::Rectangle;
 use craft_primitives::Color;
-use craft_resource_manager::{ResourceIdentifier, ResourceManager};
-
-use crate::render_command::{BoxShadowCmd, DrawImageCmd, DrawRectCmd, DrawRectOutlineCmd, DrawTextCmd, DrawTinyVgCmd, FillBezPathCmd, PushLayerCmd};
-use crate::text_renderer_data::TextData;
-use crate::RenderCommand;
-
-#[derive(Clone, Debug)]
-pub enum Brush {
-    Color(Color),
-    Gradient(Gradient),
-}
-
-impl<'a> From<&'a Brush> for BrushRef<'a> {
-    fn from(brush: &'a Brush) -> Self {
-        match brush {
-            Brush::Color(color) => Self::Solid(*color),
-            Brush::Gradient(gradient) => Self::Gradient(gradient),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default)]
-pub struct TextScroll {
-    pub scroll_y: f32,
-    pub scroll_height: f32,
-}
-
-impl TextScroll {
-    pub fn new(scroll_y: f32, scroll_height: f32) -> Self {
-        Self {
-            scroll_y,
-            scroll_height,
-        }
-    }
-}
-
-#[derive(Debug)]
-enum SortedItem {
-    Overlay(SortedCommands),
-    Other(u32),
-}
-
-#[derive(Debug)]
-pub struct SortedCommands {
-    children: Vec<SortedItem>,
-}
-
-impl SortedCommands {
-    pub fn draw(render_list: &RenderList, overlay_render: &SortedCommands, on_draw: &mut dyn FnMut(&RenderCommand)) {
-        let mut others = Vec::new();
-        let mut overlays = Vec::new();
-
-        for child in &overlay_render.children {
-            match child {
-                SortedItem::Other(_) => others.push(child),
-                SortedItem::Overlay(_) => overlays.push(child),
-            }
-        }
-
-        for child in others {
-            if let SortedItem::Other(command_index) = child {
-                let command = render_list.commands.get(*command_index as usize).unwrap();
-                on_draw(command);
-            }
-        }
-
-        for child in overlays {
-            if let SortedItem::Overlay(overlay) = child {
-                Self::draw(render_list, overlay, on_draw);
-            }
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct TargetItem {
-    pub custom_id: u64,
-    pub rectangle: Rectangle,
-    pub overlay_depth: u64,
-}
-
-impl TargetItem {
-    pub fn new(custom_id: u64, rectangle: Rectangle, overlay_depth: u64) -> Self {
-        Self {
-            custom_id,
-            rectangle,
-            overlay_depth,
-        }
-    }
-
-    // Sorts the items by the overlay depth and in ascending order.
-    pub fn sort_items_by_overlay_depth(targets: &mut [TargetItem]) {
-        targets.sort_by_key(|t1| t1.overlay_depth);
-    }
-}
-
-pub struct RenderList {
-    current_overlay_depth: u64,
-    pub targets: Vec<TargetItem>,
-    pub commands: Vec<RenderCommand>,
-    /// Stores a sorted list of render command handles. This gets set in `Renderer::sort_render_list`.
-    pub overlay: SortedCommands,
-    cull: Option<Rectangle>,
-}
-
-impl Default for RenderList {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl RenderList {
-    pub fn new() -> Self {
-        Self {
-            current_overlay_depth: 0,
-            targets: Vec::new(),
-            commands: Vec::new(),
-            overlay: SortedCommands { children: vec![] },
-            cull: None,
-        }
-    }
-
-    pub fn clear(&mut self) {
-        self.targets.clear();
-        self.commands.clear();
-        self.overlay.children.clear();
-    }
-
-    #[inline(always)]
-    pub fn draw_rect(&mut self, rect: Rectangle, color: Color) {
-        if let Some(cull) = &self.cull
-            && !cull.intersects(&rect)
-        {
-            return;
-        }
-        self.commands.push(
-            RenderCommand::DrawRect(DrawRectCmd { rect, color })
-        );
-    }
-
-    #[inline(always)]
-    pub fn push_hit_testable(&mut self, id: u64, bounding_box: Rectangle) {
-        if let Some(cull) = &self.cull
-            && !cull.intersects(&bounding_box)
-        {
-            return;
-        }
-        self.targets
-            .push(TargetItem::new(id, bounding_box, self.current_overlay_depth));
-    }
-
-    #[inline(always)]
-    pub fn draw_rect_outline(&mut self, rect: Rectangle, outline_color: Color, thickness: f64) {
-        if let Some(cull) = &self.cull
-            && !cull.intersects(&rect)
-        {
-            return;
-        }
-        self.commands.push(
-            RenderCommand::DrawRectOutline(DrawRectOutlineCmd { rect, outline_color, thickness })
-        );
-    }
-
-    #[inline(always)]
-    pub fn fill_bez_path(&mut self, path: BezPath, brush: Brush) {
-        if let Some(cull) = &self.cull
-            && !cull.intersects(&Rectangle::from_kurbo(path.bounding_box()))
-        {
-            return;
-        }
-        self.commands.push(
-            RenderCommand::FillBezPath(FillBezPathCmd { path, brush })
-        );
-    }
-
-    #[inline(always)]
-    pub fn draw_text(
-        &mut self,
-        data: Weak<RefCell<dyn TextData>>,
-        rect: Rectangle,
-        text_scroll: Option<TextScroll>,
-        show_cursor: bool,
-    ) {
-        if let Some(cull) = &self.cull
-            && !cull.intersects(&rect)
-        {
-            return;
-        }
-        self.commands.push(
-                RenderCommand::DrawText(DrawTextCmd{ rect, data, text_scroll, show_cursor})
-        );
-    }
-
-    #[inline(always)]
-    pub fn draw_image(&mut self, rect: Rectangle, resource_id: ResourceIdentifier) {
-        if let Some(cull) = &self.cull
-            && !cull.intersects(&rect)
-        {
-            return;
-        }
-        self.commands.push(
-            RenderCommand::DrawImage(DrawImageCmd { rect, resource_id })
-        );
-    }
-
-    #[inline(always)]
-    pub fn draw_tiny_vg(
-        &mut self,
-        rect: Rectangle,
-        resource_id: ResourceIdentifier,
-        override_color: Option<Color>,
-    ) {
-        if let Some(cull) = &self.cull
-            && !cull.intersects(&rect)
-        {
-            return;
-        }
-        self.commands.push(
-            RenderCommand::DrawTinyVg(DrawTinyVgCmd {
-                rect,
-                resource_id,
-                override_color,
-            }
-        ));
-    }
-
-    #[inline(always)]
-    pub fn push_layer(&mut self, rect: Rectangle) {
-        self.commands.push(RenderCommand::PushLayer(PushLayerCmd{ rect }));
-    }
 
-    #[inline(always)]
-    pub fn pop_layer(&mut self) {
-        self.commands.push(RenderCommand::PopLayer);
-    }
-
-    pub fn start_overlay(&mut self) {
-        self.commands.push(RenderCommand::StartOverlay);
-        self.current_overlay_depth += 1;
-    }
-
-    pub fn end_overlay(&mut self) {
-        self.commands.push(RenderCommand::EndOverlay);
-        self.current_overlay_depth -= 1;
-    }
+use craft_resource_manager::ResourceManager;
 
-    #[inline(always)]
-    pub fn draw_outset_box_shadow(
-        &mut self,
-        box_shadow: BoxShadowCmd,
-        //rectangle: Rectangle,
-    ) {
-        /*        if let Some(cull) = &self.cull
-            && !cull.intersects(&rectangle)
-        {
-            return;
-        }*/
-        self.commands.push(RenderCommand::BoxShadowCmd(box_shadow));
-    }
-
-    pub fn set_cull(&mut self, cull: Option<Rectangle>) {
-        self.cull = cull;
-    }
-}
+use crate::render_list::RenderList;
+pub use crate::screenshot::Screenshot;
+use crate::sort_commands::sort_and_cull_render_list_internal;
 
 pub trait Renderer: Any {
     // Surface Functions
@@ -285,89 +22,13 @@ pub trait Renderer: Any {
     fn as_any_mut(&mut self) -> &mut dyn Any;
 
     fn sort_and_cull_render_list(&mut self, render_list: &mut RenderList) {
-        fn should_cull(rectangle: &Rectangle, window_height: f32) -> bool {
-            let cull_top = (rectangle.y + rectangle.height) < 0.0;
-            let cull_bottom = rectangle.y > window_height;
-
-            cull_top || cull_bottom
-        }
-
-        fn bounding_rect(render_command: &RenderCommand) -> Rectangle {
-            match render_command {
-                RenderCommand::DrawRect(cmd) => cmd.rect,
-                RenderCommand::DrawRectOutline(cmd) => cmd.rect,
-                RenderCommand::DrawImage(cmd) => cmd.rect,
-                RenderCommand::DrawTinyVg(cmd) => cmd.rect,
-                RenderCommand::DrawText(cmd) => cmd.rect,
-                RenderCommand::FillBezPath(cmd) => Rectangle::from_kurbo(cmd.path.bounding_box()),
-                RenderCommand::BoxShadowCmd(cmd) => {
-                    let bounding_box = cmd.path.bounding_box();
-                    Rectangle::new(
-                        (bounding_box.x0 + cmd.offset.x) as f32,
-                        (bounding_box.y0 + cmd.offset.y) as f32,
-                        (bounding_box.x1 + cmd.offset.x) as f32,
-                        (bounding_box.y1 + cmd.offset.y) as f32,
-                    )
-                }
-                _ => unreachable!("Cannot compute the bounding rect of this render command."),
-            }
-        }
-
-        let window_height = self.surface_height();
-
-        let mut current: *mut SortedCommands = &mut render_list.overlay;
-        let mut stack: Vec<*mut SortedCommands> = vec![current];
-
-        for (index, command) in render_list.commands.iter().enumerate() {
-            match &command {
-                RenderCommand::StartOverlay => {
-                    // Overlay Start
-                    unsafe {
-                        (*current)
-                            .children
-                            .push(SortedItem::Overlay(SortedCommands { children: vec![] }));
-                        match (*current).children.last_mut() {
-                            Some(SortedItem::Overlay(overlay)) => {
-                                stack.push(overlay);
-                            }
-                            _ => {
-                                panic!("OverlayRender stack corrupted");
-                            }
-                        }
-                        current = *stack.last_mut().unwrap();
-                    }
-                }
-                RenderCommand::EndOverlay => {
-                    // Overlay End
-                    stack.pop();
-                    current = *stack.last_mut().unwrap();
-                }
-
-                // FIXME: If this is a clipping layer, and it is not in bounds we should discard all commands in the clip.
-                RenderCommand::PushLayer(_) | RenderCommand::PopLayer => {
-                    // Normal Draw Command
-                    unsafe {
-                        (*current).children.push(SortedItem::Other(index as u32));
-                    }
-                }
-
-                _ => {
-                    let bounding_rect = bounding_rect(command);
-                    if !should_cull(&bounding_rect, window_height) {
-                        unsafe {
-                            (*current).children.push(SortedItem::Other(index as u32));
-                        }
-                    }
-                }
-            }
-        }
+        sort_and_cull_render_list_internal(self.surface_height(), render_list);
     }
     fn prepare_render_list<'a>(
         &'a mut self,
         render_list: &'a mut RenderList,
         resource_manager: Arc<ResourceManager>,
         window: Rectangle,
-        //get_text_renderer: Box<dyn Fn(u64) -> Option<&'a TextRender> + 'a>,
     );
 
     fn submit(&mut self, resource_manager: Arc<ResourceManager>);
@@ -379,10 +40,4 @@ pub trait Renderer: Any {
             pixels: Vec::new(),
         }
     }
-}
-
-pub struct Screenshot {
-    pub width: u16,
-    pub height: u16,
-    pub pixels: Vec<u8>,
-}
+}
\ No newline at end of file
diff --git a/crates/craft_renderer/src/screenshot.rs b/crates/craft_renderer/src/screenshot.rs
new file mode 100644
index 00000000..570cb866
--- /dev/null
+++ b/crates/craft_renderer/src/screenshot.rs
@@ -0,0 +1,5 @@
+pub struct Screenshot {
+    pub width: u16,
+    pub height: u16,
+    pub pixels: Vec<u8>,
+}
\ No newline at end of file
diff --git a/crates/craft_renderer/src/sort_commands.rs b/crates/craft_renderer/src/sort_commands.rs
new file mode 100644
index 00000000..3e927fa3
--- /dev/null
+++ b/crates/craft_renderer/src/sort_commands.rs
@@ -0,0 +1,119 @@
+use craft_primitives::geometry::{Rectangle, Shape};
+use crate::{RenderCommand, RenderList};
+
+#[derive(Debug)]
+pub enum SortedItem {
+    Overlay(SortedCommands),
+    Other(u32),
+}
+
+#[derive(Debug)]
+pub struct SortedCommands {
+    pub children: Vec<SortedItem>,
+}
+
+impl SortedCommands {
+    pub fn draw(render_list: &RenderList, overlay_render: &SortedCommands, on_draw: &mut dyn FnMut(&RenderCommand)) {
+        let mut others = Vec::new();
+        let mut overlays = Vec::new();
+
+        for child in &overlay_render.children {
+            match child {
+                SortedItem::Other(_) => others.push(child),
+                SortedItem::Overlay(_) => overlays.push(child),
+            }
+        }
+
+        for child in others {
+            if let SortedItem::Other(command_index) = child {
+                let command = render_list.commands.get(*command_index as usize).unwrap();
+                on_draw(command);
+            }
+        }
+
+        for child in overlays {
+            if let SortedItem::Overlay(overlay) = child {
+                Self::draw(render_list, overlay, on_draw);
+            }
+        }
+    }
+}
+
+pub(crate) fn sort_and_cull_render_list_internal(surface_height: f32, render_list: &mut RenderList) {
+    fn should_cull(rectangle: &Rectangle, window_height: f32) -> bool {
+        let cull_top = (rectangle.y + rectangle.height) < 0.0;
+        let cull_bottom = rectangle.y > window_height;
+
+        cull_top || cull_bottom
+    }
+
+    fn bounding_rect(render_command: &RenderCommand) -> Rectangle {
+        match render_command {
+            RenderCommand::DrawRect(cmd) => cmd.rect,
+            RenderCommand::DrawRectOutline(cmd) => cmd.rect,
+            RenderCommand::DrawImage(cmd) => cmd.rect,
+            RenderCommand::DrawTinyVg(cmd) => cmd.rect,
+            RenderCommand::DrawText(cmd) => cmd.rect,
+            RenderCommand::FillBezPath(cmd) => Rectangle::from_kurbo(cmd.path.bounding_box()),
+            RenderCommand::BoxShadowCmd(cmd) => {
+                let bounding_box = cmd.path.bounding_box();
+                Rectangle::new(
+                    (bounding_box.x0 + cmd.offset.x) as f32,
+                    (bounding_box.y0 + cmd.offset.y) as f32,
+                    (bounding_box.x1 + cmd.offset.x) as f32,
+                    (bounding_box.y1 + cmd.offset.y) as f32,
+                )
+            }
+            _ => unreachable!("Cannot compute the bounding rect of this render command."),
+        }
+    }
+
+    let window_height = surface_height;
+
+    let mut current: *mut SortedCommands = &mut render_list.overlay;
+    let mut stack: Vec<*mut SortedCommands> = vec![current];
+
+    for (index, command) in render_list.commands.iter().enumerate() {
+        match &command {
+            RenderCommand::StartOverlay => {
+                // Overlay Start
+                unsafe {
+                    (*current)
+                        .children
+                        .push(SortedItem::Overlay(SortedCommands { children: vec![] }));
+                    match (*current).children.last_mut() {
+                        Some(SortedItem::Overlay(overlay)) => {
+                            stack.push(overlay);
+                        }
+                        _ => {
+                            panic!("OverlayRender stack corrupted");
+                        }
+                    }
+                    current = *stack.last_mut().unwrap();
+                }
+            }
+            RenderCommand::EndOverlay => {
+                // Overlay End
+                stack.pop();
+                current = *stack.last_mut().unwrap();
+            }
+
+            // FIXME: If this is a clipping layer, and it is not in bounds we should discard all commands in the clip.
+            RenderCommand::PushLayer(_) | RenderCommand::PopLayer => {
+                // Normal Draw Command
+                unsafe {
+                    (*current).children.push(SortedItem::Other(index as u32));
+                }
+            }
+
+            _ => {
+                let bounding_rect = bounding_rect(command);
+                if !should_cull(&bounding_rect, window_height) {
+                    unsafe {
+                        (*current).children.push(SortedItem::Other(index as u32));
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/crates/craft_renderer/src/target_item.rs b/crates/craft_renderer/src/target_item.rs
new file mode 100644
index 00000000..60d1df14
--- /dev/null
+++ b/crates/craft_renderer/src/target_item.rs
@@ -0,0 +1,23 @@
+use craft_primitives::geometry::Rectangle;
+
+#[derive(Debug)]
+pub struct TargetItem {
+    pub custom_id: u64,
+    pub rectangle: Rectangle,
+    pub overlay_depth: u64,
+}
+
+impl TargetItem {
+    pub fn new(custom_id: u64, rectangle: Rectangle, overlay_depth: u64) -> Self {
+        Self {
+            custom_id,
+            rectangle,
+            overlay_depth,
+        }
+    }
+
+    // Sorts the items by the overlay depth and in ascending order.
+    pub fn sort_items_by_overlay_depth(targets: &mut [TargetItem]) {
+        targets.sort_by_key(|t1| t1.overlay_depth);
+    }
+}
\ No newline at end of file
diff --git a/crates/craft_renderer/src/text_renderer_data.rs b/crates/craft_renderer/src/text_renderer_data.rs
index c9c9fdcc..42eaee1a 100644
--- a/crates/craft_renderer/src/text_renderer_data.rs
+++ b/crates/craft_renderer/src/text_renderer_data.rs
@@ -3,6 +3,21 @@ use craft_primitives::geometry::Rectangle;
 use peniko::Color;
 use peniko::kurbo::{Affine, Line};
 
+#[derive(Debug, Clone, Copy, Default)]
+pub struct TextScroll {
+    pub scroll_y: f32,
+    pub scroll_height: f32,
+}
+
+impl TextScroll {
+    pub fn new(scroll_y: f32, scroll_height: f32) -> Self {
+        Self {
+            scroll_y,
+            scroll_height,
+        }
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct TextRender {
     pub lines: Vec<TextRenderLine>,
diff --git a/crates/craft_renderer/src/tinyvg_helpers.rs b/crates/craft_renderer/src/tinyvg_helpers.rs
index f85e6fa9..cfd83e7f 100644
--- a/crates/craft_renderer/src/tinyvg_helpers.rs
+++ b/crates/craft_renderer/src/tinyvg_helpers.rs
@@ -4,7 +4,7 @@ use peniko::{Color, Gradient, kurbo};
 use tinyvg_rs::color_table::ColorTable;
 use tinyvg_rs::commands::{Path, PathCommand, Point, Style};
 
-use crate::renderer::Brush;
+use crate::Brush;
 
 #[allow(clippy::wrong_self_convention)]
 /// Convert the TinyVG point to a kurbo color.
diff --git a/crates/craft_renderer/src/vello/mod.rs b/crates/craft_renderer/src/vello/mod.rs
index 6919163f..f3c054c3 100644
--- a/crates/craft_renderer/src/vello/mod.rs
+++ b/crates/craft_renderer/src/vello/mod.rs
@@ -21,9 +21,11 @@ use winit::window::Window;
 
 use crate::image_adapter::ImageAdapter;
 use crate::RenderCommand;
-use crate::renderer::{RenderList, Renderer, SortedCommands, TextScroll};
-use crate::text_renderer_data::TextRenderLine;
+use crate::renderer::{Renderer};
+use crate::text_renderer_data::{TextRenderLine, TextScroll};
 use crate::vello::tinyvg::draw_tiny_vg;
+use crate::render_list::RenderList;
+use crate::sort_commands::SortedCommands;
 
 pub struct RenderSurface {
     pub surface: Surface<'static>,
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index abe27843..6b93705f 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -6,11 +6,11 @@ use std::ops::{Deref, DerefMut};
 use std::sync::Arc;
 
 use craft_primitives::geometry::Rectangle;
-use craft_resource_manager::ResourceManager;
 use craft_resource_manager::resource::Resource;
+use craft_resource_manager::ResourceManager;
 
 use peniko::kurbo::{Affine, Shape};
-use peniko::{BlendMode, Blob, Color, Compose, Fill, ImageAlphaType, Mix, kurbo};
+use peniko::{kurbo, BlendMode, Blob, Color, Compose, Fill, ImageAlphaType, Mix};
 
 use softbuffer::Buffer;
 
@@ -22,12 +22,16 @@ use vello_cpu::{Pixmap, RenderContext};
 
 use winit::window::Window;
 
+use crate::helpers::{brush_to_paint, rgba_to_encoded_u32};
 use crate::image_adapter::ImageAdapter;
-use crate::renderer::{RenderList, Renderer, Screenshot, SortedCommands, TextScroll};
-use crate::text_renderer_data::TextRenderLine;
-use crate::vello_cpu::tinyvg::draw_tiny_vg;
-use crate::{Brush, RenderCommand};
 use crate::render_command::BoxShadowCmd;
+use crate::render_list::RenderList;
+use crate::renderer::{Renderer};
+use crate::text_renderer_data::{TextRenderLine, TextScroll};
+use crate::vello_cpu::tinyvg::draw_tiny_vg;
+use crate::RenderCommand;
+use crate::sort_commands::SortedCommands;
+use crate::screenshot::Screenshot;
 
 pub(crate) struct VelloCpuRenderer {
     render_context: RenderContext,
@@ -429,15 +433,4 @@ impl VelloCpuRenderer {
             self.render_context.pop_layer();
         }
     }
-}
-
-fn brush_to_paint(brush: &Brush) -> PaintType {
-    match brush {
-        Brush::Color(color) => PaintType::Solid(*color),
-        Brush::Gradient(gradient) => PaintType::Gradient(gradient.clone()),
-    }
-}
-
-const fn rgba_to_encoded_u32(r: u32, g: u32, b: u32, a: u32) -> u32 {
-    b | (g << 8) | (r << 16) | (a << 24)
-}
+}
\ No newline at end of file
diff --git a/crates/craft_renderer/src/vello_cpu/tinyvg.rs b/crates/craft_renderer/src/vello_cpu/tinyvg.rs
index 1af8e95d..e22308e2 100644
--- a/crates/craft_renderer/src/vello_cpu/tinyvg.rs
+++ b/crates/craft_renderer/src/vello_cpu/tinyvg.rs
@@ -10,8 +10,8 @@ use tinyvg_rs::commands::{DrawCommand, Path, PathCommand, Segment, Style};
 use tinyvg_rs::common::Unit;
 use vello_cpu::RenderContext;
 
-use crate::vello_cpu::brush_to_paint;
 use crate::{Brush, tinyvg_helpers};
+use crate::helpers::brush_to_paint;
 
 fn stroke_path(scene: &mut RenderContext, bez_path: &BezPath, affine: &Affine, line_width: f64, brush: &Brush) {
     scene.set_stroke(Stroke::new(line_width));
diff --git a/crates/craft_renderer/src/vello_hybrid/mod.rs b/crates/craft_renderer/src/vello_hybrid/mod.rs
index b5eace54..06e29642 100644
--- a/crates/craft_renderer/src/vello_hybrid/mod.rs
+++ b/crates/craft_renderer/src/vello_hybrid/mod.rs
@@ -25,10 +25,12 @@ use winit::window::Window;
 
 use crate::{Brush, RenderCommand};
 use crate::render_command::BoxShadowCmd;
-use crate::renderer::{RenderList, Renderer as CraftRenderer, SortedCommands, TextScroll};
-use crate::text_renderer_data::TextRenderLine;
+use crate::render_list::RenderList;
+use crate::renderer::{Renderer as CraftRenderer};
+use crate::text_renderer_data::{TextRenderLine, TextScroll};
 use crate::vello_hybrid::render_context::{RenderContext, RenderSurface};
 use crate::vello_hybrid::tinyvg::draw_tiny_vg;
+use crate::sort_commands::SortedCommands;
 
 pub struct ActiveRenderState {
     // The fields MUST be in this order, so that the surface is dropped before the window
diff --git a/crates/craft_renderer/src/vello_hybrid/tinyvg.rs b/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
index 8fec49a2..341b7b43 100644
--- a/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
+++ b/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
@@ -11,7 +11,7 @@ use tinyvg_rs::commands::{DrawCommand, Path, PathCommand, Segment, Style};
 use tinyvg_rs::common::Unit;
 use vello_hybrid::Scene;
 
-use crate::renderer::Brush;
+use crate::Brush;
 use crate::tinyvg_helpers;
 use crate::vello_hybrid::brush_to_paint;
 
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index b3475dc7..70e7b083 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -8,12 +8,11 @@ use std::time;
 use accesskit::{Action, Role};
 
 use craft_renderer::text_renderer_data::TextData;
+use craft_renderer::RenderList;
 
 use craft_primitives::geometry::{Affine, Point, Rectangle, Vec2};
 use craft_primitives::{Color, ColorBrush};
 
-use craft_renderer::renderer::RenderList;
-
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use parley::LayoutAccessibility;
 use parley::{Alignment, AlignmentOptions, ContentWidths, Selection};
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index b2646c65..2cf2fd5c 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -8,8 +8,8 @@ use std::rc::{Rc, Weak};
 use craft_primitives::Color;
 use craft_primitives::geometry::{Affine, Point, Rectangle, TrblRectangle};
 
-use craft_renderer::renderer::{RenderList, TextScroll};
-use craft_renderer::text_renderer_data::TextData;
+use craft_renderer::text_renderer_data::{TextData, TextScroll};
+use craft_renderer::RenderList;
 
 use parley::BoundingBox;
 
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index 9c7c49dd..7c2edbb0 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -5,7 +5,7 @@ use std::rc::Rc;
 use craft_primitives::geometry::Point;
 
 use craft_renderer::RenderList;
-use craft_renderer::renderer::TargetItem;
+use craft_renderer::TargetItem;
 
 use crate::app::ELEMENTS;
 use crate::elements::ElementInternals;

From 4af00fb72f55f4a3a71c0dce73b415af29d5ae03 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 28 Mar 2026 00:49:40 -0400
Subject: [PATCH 119/143] feature gate vello common import

---
 crates/craft_renderer/src/helpers.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/craft_renderer/src/helpers.rs b/crates/craft_renderer/src/helpers.rs
index c6aa8863..fd2d2f45 100644
--- a/crates/craft_renderer/src/helpers.rs
+++ b/crates/craft_renderer/src/helpers.rs
@@ -1,4 +1,6 @@
+#[cfg(any(feature = "vello_cpu_renderer", feature = "vello_hybrid_renderer", feature = "vello_hybrid_renderer_webgl"))]
 use vello_common::paint::PaintType;
+
 use crate::Brush;
 
 #[cfg(any(feature = "vello_cpu_renderer", feature = "vello_hybrid_renderer", feature = "vello_hybrid_renderer_webgl"))]

From 9830b081e35dcfead7696ed80c873f83f5b1d8ef Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 28 Mar 2026 01:10:01 -0400
Subject: [PATCH 120/143] Add support for pushing layers with bez path

---
 crates/craft_renderer/src/render_command.rs   |  5 +++--
 crates/craft_renderer/src/render_list.rs      |  6 +++++-
 crates/craft_renderer/src/vello/mod.rs        | 16 +++++++++-------
 crates/craft_renderer/src/vello_cpu/mod.rs    | 16 +++++++---------
 crates/craft_renderer/src/vello_hybrid/mod.rs | 16 +++++++---------
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/crates/craft_renderer/src/render_command.rs b/crates/craft_renderer/src/render_command.rs
index a3500d67..9a07b383 100644
--- a/crates/craft_renderer/src/render_command.rs
+++ b/crates/craft_renderer/src/render_command.rs
@@ -60,8 +60,9 @@ pub struct DrawTextCmd {
 }
 
 #[derive(Clone)]
-pub struct PushLayerCmd {
-    pub rect: Rectangle
+pub enum PushLayerCmd {
+    BezPath(BezPath),
+    Rect(Rectangle)
 }
 
 #[derive(Clone)]
diff --git a/crates/craft_renderer/src/render_list.rs b/crates/craft_renderer/src/render_list.rs
index a4794b3b..205c2350 100644
--- a/crates/craft_renderer/src/render_list.rs
+++ b/crates/craft_renderer/src/render_list.rs
@@ -145,7 +145,11 @@ impl RenderList {
 
     #[inline(always)]
     pub fn push_layer(&mut self, rect: Rectangle) {
-        self.commands.push(RenderCommand::PushLayer(PushLayerCmd{ rect }));
+        self.commands.push(RenderCommand::PushLayer(PushLayerCmd::Rect(rect)));
+    }
+
+    pub fn push_layer_with_bez_path(&mut self, path: BezPath) {
+        self.commands.push(RenderCommand::PushLayer(PushLayerCmd::BezPath(path)));
     }
 
     #[inline(always)]
diff --git a/crates/craft_renderer/src/vello/mod.rs b/crates/craft_renderer/src/vello/mod.rs
index f3c054c3..635cb2b2 100644
--- a/crates/craft_renderer/src/vello/mod.rs
+++ b/crates/craft_renderer/src/vello/mod.rs
@@ -20,6 +20,7 @@ use wgpu::{Adapter, Device, Instance, Limits, MemoryHints, Queue, Surface, Surfa
 use winit::window::Window;
 
 use crate::image_adapter::ImageAdapter;
+use crate::render_command::PushLayerCmd;
 use crate::RenderCommand;
 use crate::renderer::{Renderer};
 use crate::text_renderer_data::{TextRenderLine, TextScroll};
@@ -444,13 +445,14 @@ impl Renderer for VelloRenderer {
                     );
                 }
                 RenderCommand::PushLayer(cmd) => {
-                    let clip = Rect::new(
-                        cmd.rect.x as f64,
-                        cmd.rect.y as f64,
-                        (cmd.rect.x + cmd.rect.width) as f64,
-                        (cmd.rect.y + cmd.rect.height) as f64,
-                    );
-                    scene.push_layer(Fill::NonZero, BlendMode::default(), 1.0, Affine::IDENTITY, &clip);
+                    match cmd {
+                        PushLayerCmd::BezPath(p) => {
+                            scene.push_layer(Fill::NonZero, BlendMode::default(), 1.0, Affine::IDENTITY, p);
+                        }
+                        PushLayerCmd::Rect(r) => {
+                            scene.push_layer(Fill::NonZero, BlendMode::default(), 1.0, Affine::IDENTITY, &r.to_kurbo());
+                        }
+                    };
                 }
                 RenderCommand::PopLayer => {
                     scene.pop_layer();
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index 6b93705f..420441a2 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -24,7 +24,7 @@ use winit::window::Window;
 
 use crate::helpers::{brush_to_paint, rgba_to_encoded_u32};
 use crate::image_adapter::ImageAdapter;
-use crate::render_command::BoxShadowCmd;
+use crate::render_command::{BoxShadowCmd, PushLayerCmd};
 use crate::render_list::RenderList;
 use crate::renderer::{Renderer};
 use crate::text_renderer_data::{TextRenderLine, TextScroll};
@@ -320,15 +320,13 @@ impl Renderer for VelloCpuRenderer {
                     }
                 }
                 RenderCommand::PushLayer(cmd) => {
-                    let clip_path = Some(
-                        peniko::kurbo::Rect::from_origin_size(
-                            peniko::kurbo::Point::new(cmd.rect.x as f64, cmd.rect.y as f64),
-                            peniko::kurbo::Size::new(cmd.rect.width as f64, cmd.rect.height as f64),
-                        )
-                        .into_path(0.1),
-                    );
+                    let clip_path = match cmd {
+                        PushLayerCmd::BezPath(path) => path,
+                        PushLayerCmd::Rect(rect) => &rect.to_kurbo().into_path(0.1)
+                    };
+
                     self.render_context
-                        .push_layer(clip_path.as_ref(), None, None, None, None);
+                        .push_layer(Some(clip_path), None, None, None, None);
                 }
                 RenderCommand::PopLayer => {
                     self.render_context.pop_layer();
diff --git a/crates/craft_renderer/src/vello_hybrid/mod.rs b/crates/craft_renderer/src/vello_hybrid/mod.rs
index 06e29642..3b430b1d 100644
--- a/crates/craft_renderer/src/vello_hybrid/mod.rs
+++ b/crates/craft_renderer/src/vello_hybrid/mod.rs
@@ -24,7 +24,7 @@ use wgpu::TextureFormat;
 use winit::window::Window;
 
 use crate::{Brush, RenderCommand};
-use crate::render_command::BoxShadowCmd;
+use crate::render_command::{BoxShadowCmd, PushLayerCmd};
 use crate::render_list::RenderList;
 use crate::renderer::{Renderer as CraftRenderer};
 use crate::text_renderer_data::{TextRenderLine, TextScroll};
@@ -445,14 +445,12 @@ impl CraftRenderer for VelloHybridRenderer {
                     );
                 }
                 RenderCommand::PushLayer(cmd) => {
-                    let clip_path = Some(
-                        kurbo::Rect::from_origin_size(
-                            kurbo::Point::new(cmd.rect.x as f64, cmd.rect.y as f64),
-                            kurbo::Size::new(cmd.rect.width as f64, cmd.rect.height as f64),
-                        )
-                        .into_path(0.1),
-                    );
-                    scene.push_layer(clip_path.as_ref(), None, None, None, None);
+                    let clip_path = match cmd {
+                        PushLayerCmd::BezPath(path) => path,
+                        PushLayerCmd::Rect(rect) => &rect.to_kurbo().into_path(0.1)
+                    };
+
+                    scene.push_layer(Some(clip_path), None, None, None, None);
                 }
                 RenderCommand::PopLayer => {
                     scene.pop_layer();

From 585b4542afcd14457f0807f16ad6a7c10e7e7901 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sat, 28 Mar 2026 12:59:40 -0400
Subject: [PATCH 121/143] Feature/website (#22)

* Start website

* Improve behavior when removing nodes.

* Work on navigation.
---
 Cargo.lock                                    |  19 ++
 Cargo.toml                                    |   1 +
 .../craft_retained/src/elements/container.rs  |   6 +
 .../craft_retained/src/elements/dropdown.rs   |  23 ++-
 crates/craft_retained/src/elements/image.rs   |   6 +
 .../src/elements/slider/slider_element.rs     |   6 +
 crates/craft_retained/src/elements/text.rs    |   6 +
 .../src/elements/text_input/mod.rs            |   6 +
 .../src/elements/traits/element_internals.rs  |  50 +++--
 crates/craft_retained/src/elements/window.rs  |   6 +
 .../craft_retained/src/layout/taffy_tree.rs   |  21 ++-
 crates/craft_retained/src/lib.rs              |   2 +-
 website/Cargo.toml                            |  54 ++++++
 ...24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg | Bin 0 -> 285 bytes
 ...24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg | Bin 0 -> 101 bytes
 ...24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg | Bin 0 -> 364 bytes
 ...24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg | Bin 0 -> 117 bytes
 ...24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg | Bin 0 -> 133 bytes
 website/index.html                            |  40 ++++
 website/src/docs.rs                           |  19 ++
 website/src/index.rs                          | 177 ++++++++++++++++++
 website/src/link.rs                           |  18 ++
 website/src/main.rs                           | 100 ++++++++++
 website/src/navbar.rs                         |  69 +++++++
 website/src/router.rs                         |  76 ++++++++
 website/src/theme.rs                          |  33 ++++
 website/src/web_link.rs                       |  26 +++
 website/wasm-build.sh                         |  12 ++
 28 files changed, 755 insertions(+), 21 deletions(-)
 create mode 100644 website/Cargo.toml
 create mode 100644 website/assets/brush_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg
 create mode 100644 website/assets/code_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg
 create mode 100644 website/assets/devices_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg
 create mode 100644 website/assets/electric_bolt_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg
 create mode 100644 website/assets/view_comfy_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg
 create mode 100644 website/index.html
 create mode 100644 website/src/docs.rs
 create mode 100644 website/src/index.rs
 create mode 100644 website/src/link.rs
 create mode 100644 website/src/main.rs
 create mode 100644 website/src/navbar.rs
 create mode 100644 website/src/router.rs
 create mode 100644 website/src/theme.rs
 create mode 100644 website/src/web_link.rs
 create mode 100644 website/wasm-build.sh

diff --git a/Cargo.lock b/Cargo.lock
index 0a05221f..5ed88dea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3909,6 +3909,8 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "rustls-platform-verifier",
+ "serde",
+ "serde_json",
  "sync_wrapper",
  "tokio",
  "tokio-native-tls",
@@ -5470,6 +5472,23 @@ dependencies = [
  "rustls-pki-types",
 ]
 
+[[package]]
+name = "website"
+version = "0.1.0"
+dependencies = [
+ "console_error_panic_hook",
+ "craft_retained",
+ "open",
+ "reqwest 0.13.2",
+ "serde",
+ "serde_json",
+ "tracing",
+ "tracing-subscriber",
+ "tracing-web",
+ "util",
+ "web-sys",
+]
+
 [[package]]
 name = "weezl"
 version = "0.1.12"
diff --git a/Cargo.toml b/Cargo.toml
index 8dad7f12..435fdb17 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,6 +17,7 @@ members = [
     "crates/craft_resource_manager",
     "crates/craft_runtime",
     "crates/craft_undo",
+    "website",
 ]
 
 [workspace.package]
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index ab6fa18c..ac5e0967 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -36,6 +36,12 @@ impl Default for Container {
 
 impl Element for Container {}
 
+impl Drop for ContainerInner {
+    fn drop(&mut self) {
+        ElementInternals::drop(self)
+    }
+}
+
 impl AsElement for Container {
     fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.inner.clone()
diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index b810a871..4aab5daf 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -80,6 +80,12 @@ impl Default for Dropdown {
 
 impl Element for Dropdown {}
 
+impl Drop for DropdownInner {
+    fn drop(&mut self) {
+        ElementInternals::drop(self)
+    }
+}
+
 impl AsElement for Dropdown {
     fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.inner.clone()
@@ -582,7 +588,7 @@ impl DropdownInner {
         // Remove the old selected element from the layout tree.
         if let Some(old_selected_element) = &self.selected_element {
             TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-                taffy_tree.remove_subtree(old_selected_element.borrow().element_data().layout.taffy_node_id());
+                taffy_tree.unparent_node(old_selected_element.borrow().element_data().layout.taffy_node_id());
             });
         }
 
@@ -609,7 +615,12 @@ impl DropdownInner {
         });
     }
 
-    fn update_most_recently_hovered_child(&mut self, message: &EventKind, list_box: Rectangle, list_scroll_box: Rectangle) {
+    fn update_most_recently_hovered_child(
+        &mut self,
+        message: &EventKind,
+        list_box: Rectangle,
+        list_scroll_box: Rectangle,
+    ) {
         if let EventKind::PointerMovedEvent(pb) = message {
             let pointer_position = Point::new(pb.current.position.x, pb.current.position.y);
             let is_pointer_in_list = list_box.contains(&pointer_position);
@@ -656,7 +667,13 @@ impl DropdownInner {
         }
     }
 
-    fn handle_child_click(&mut self, event: &mut Event, pointer_position: &Point, is_pointer_in_window: bool, is_pointer_in_scrollbar: bool) {
+    fn handle_child_click(
+        &mut self,
+        event: &mut Event,
+        pointer_position: &Point,
+        is_pointer_in_window: bool,
+        is_pointer_in_scrollbar: bool,
+    ) {
         if is_pointer_in_window && !is_pointer_in_scrollbar {
             let mut should_hide_window = false;
             for (child_index, child) in self.children().iter().cloned().enumerate() {
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 19de6ad2..8a573206 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -47,6 +47,12 @@ impl crate::elements::ElementData for ImageInner {
 
 impl Element for Image {}
 
+impl Drop for ImageInner {
+    fn drop(&mut self) {
+        ElementInternals::drop(self)
+    }
+}
+
 impl AsElement for Image {
     fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.inner.clone()
diff --git a/crates/craft_retained/src/elements/slider/slider_element.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
index da28520f..d06b1caa 100644
--- a/crates/craft_retained/src/elements/slider/slider_element.rs
+++ b/crates/craft_retained/src/elements/slider/slider_element.rs
@@ -305,6 +305,12 @@ impl SliderInner {
 
 impl Element for Slider {}
 
+impl Drop for SliderInner {
+    fn drop(&mut self) {
+        ElementInternals::drop(self)
+    }
+}
+
 impl AsElement for Slider {
     fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.inner.clone()
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 70e7b083..52fe90f3 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -89,6 +89,12 @@ pub struct TextState {
 
 impl Element for Text {}
 
+impl Drop for TextInner {
+    fn drop(&mut self) {
+        ElementInternals::drop(self)
+    }
+}
+
 impl AsElement for Text {
     fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.inner.clone()
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index 2cf2fd5c..f9e1a420 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -135,6 +135,12 @@ impl TextInput {
 
 impl Element for TextInput {}
 
+impl Drop for TextInputInner {
+    fn drop(&mut self) {
+        ElementInternals::drop(self)
+    }
+}
+
 impl AsElement for TextInput {
     fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.inner.clone()
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index 0029f722..a6991e39 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -14,7 +14,7 @@ use craft_renderer::RenderList;
 
 use crate::app::{ELEMENTS, FOCUS, TAFFY_TREE};
 use crate::elements::scrollable::{ScrollState, draw_scrollbar};
-use crate::elements::{ElementData, ElementIdMap, ScrollOptions, WindowInternal};
+use crate::elements::{ElementData, ScrollOptions, WindowInternal};
 use crate::events::pointer_capture::PointerCapture;
 use crate::events::{DropdownItemSelectedHandler, Event, EventKind, KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::layout::TaffyTree;
@@ -23,7 +23,10 @@ use crate::text::text_context::TextContext;
 use crate::{Color, CraftError};
 
 /// Internal element methods that should typically be ignored by users. Public for custom elements.
-pub trait ElementInternals: ElementData + Any {
+///
+/// Drop is required to clean up any taffy nodes allocated by the element.
+#[allow(drop_bounds)]
+pub trait ElementInternals: ElementData + Any + Drop {
     fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>>;
 
     fn position_in_parent(&self) -> Option<usize> {
@@ -444,14 +447,14 @@ pub trait ElementInternals: ElementData + Any {
 
         // Remove the parent reference.
         child.borrow_mut().element_data_mut().parent = None;
-        child.borrow_mut().element_data_mut().window = None;
+        //child.borrow_mut().element_data_mut().window = None;
         child.borrow_mut().propagate_window_down();
 
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
             let child_id = child.borrow().element_data().layout.taffy_node_id;
 
             if let Some(child_id) = child_id {
-                taffy_tree.remove_subtree(child_id);
+                taffy_tree.unparent_node(child_id);
             }
 
             let parent_id = self.element_data().layout.taffy_node_id;
@@ -459,21 +462,14 @@ pub trait ElementInternals: ElementData + Any {
         });
 
         // TODO: Move to document
-        fn remove_element_from_document(
-            node: Rc<RefCell<dyn ElementInternals>>,
-            pointer_capture: &mut PointerCapture,
-            elements: &mut ElementIdMap,
-        ) {
-            elements.remove_id(node.borrow().element_data().internal_id);
+        fn remove_element_from_document(node: Rc<RefCell<dyn ElementInternals>>, pointer_capture: &mut PointerCapture) {
             pointer_capture.remove_element(&node);
             for child in node.borrow().children() {
-                remove_element_from_document(child.clone(), pointer_capture, elements);
+                remove_element_from_document(child.clone(), pointer_capture);
             }
         }
 
-        ELEMENTS.with_borrow_mut(|elements| {
-            remove_element_from_document(child.clone(), &mut self.pointer_capture().borrow_mut(), elements);
-        });
+        remove_element_from_document(child.clone(), &mut self.pointer_capture().borrow_mut());
 
         child.borrow_mut().unfocus();
 
@@ -938,6 +934,32 @@ pub trait ElementInternals: ElementData + Any {
             .winit_window
             .clone()
     }
+
+    /// Recursively prints the IDs of this element and all of its descendants.
+    fn print_tree_ids(&self, depth: usize) {
+        let indent = "  ".repeat(depth);
+
+        // Access the ID from element_data.
+        // If it's None, we can print "Unnamed Element" or the internal_id.
+        let id_label = self.element_data().internal_id.to_string();
+
+        println!("{}└─ {}: {}", indent, id_label, self.element_data().window.is_some());
+
+        for child in self.children() {
+            child.borrow().print_tree_ids(depth + 1);
+        }
+    }
+
+    fn drop(&mut self) {
+        if let Some(taffy_node) = self.element_data().layout.taffy_node_id {
+            TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+                taffy_tree.remove_node(taffy_node);
+            });
+        }
+        ELEMENTS.with_borrow_mut(|elements| {
+            elements.remove_id(self.element_data().internal_id);
+        });
+    }
 }
 
 pub fn resolve_clip_for_scrollable(element: &mut dyn ElementInternals, clip_bounds: Option<Rectangle>) {
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 1129c730..42ffab8c 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -110,6 +110,12 @@ impl Default for Window {
 
 impl Element for Window {}
 
+impl Drop for WindowInternal {
+    fn drop(&mut self) {
+        ElementInternals::drop(self)
+    }
+}
+
 impl AsElement for Window {
     fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
         self.inner.clone()
diff --git a/crates/craft_retained/src/layout/taffy_tree.rs b/crates/craft_retained/src/layout/taffy_tree.rs
index 9f6d7192..5790e918 100644
--- a/crates/craft_retained/src/layout/taffy_tree.rs
+++ b/crates/craft_retained/src/layout/taffy_tree.rs
@@ -105,7 +105,7 @@ impl TaffyTree {
         self.is_layout_dirty = false;
     }
 
-    /// Remove the entire layout subtree.
+    /// Remove a specific `node` and its ancestors from the tree and drop it
     pub fn remove_subtree(&mut self, node: NodeId) {
         // Can we avoid this allocation?
         let children = self.inner.children(node).unwrap();
@@ -113,8 +113,23 @@ impl TaffyTree {
         for child in children {
             self.remove_subtree(child);
         }
+        self.remove_node(node);
+        self.request_layout();
+    }
+
+    /// Removes the `node`.
+    ///
+    /// The `node` is not removed from the tree entirely, it is simply no longer attached to its previous parent.
+    pub fn unparent_node(&mut self, node: NodeId) {
+        if let Some(parent) = self.inner.parent(node) {
+            self.inner.remove_child(parent, node).unwrap();
+            self.request_layout();
+        }
+    }
 
-        self.inner.remove(node).map(|_| ()).unwrap();
+    /// Remove a specific node from the tree and drop it
+    pub fn remove_node(&mut self, node: NodeId) {
+        self.inner.remove(node).unwrap();
         self.request_layout();
     }
 
@@ -158,7 +173,7 @@ impl TaffyTree {
     #[inline(always)]
     pub fn request_layout(&mut self) {
         self.is_layout_dirty = true;
-        self.is_apply_layout_dirty = Vec::new();
+        self.is_apply_layout_dirty.clear();
     }
 
     #[inline(always)]
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 76b32bec..397ac743 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -12,7 +12,7 @@ pub use image;
 
 #[cfg(target_os = "android")]
 pub use winit::platform::android::activity::*;
-pub use winit::window::{Cursor, CursorIcon, WindowAttributes};
+pub use winit::window::{Cursor, CursorIcon, Window as WinitWindow, WindowAttributes};
 
 pub use crate::craftcallback::CraftCallback;
 pub use crate::options::CraftOptions;
diff --git a/website/Cargo.toml b/website/Cargo.toml
new file mode 100644
index 00000000..0d897a2d
--- /dev/null
+++ b/website/Cargo.toml
@@ -0,0 +1,54 @@
+[package]
+name = "website"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+
+tracing-subscriber = "0.3.19"
+tracing = "0.1.41"
+
+util = { path = "../examples/util" }
+
+serde = { version = "1.0.213", features = ["derive"] }
+serde_json = "1.0.133"
+web-sys = { version = "0.3.77", features = ["Window", "Location", "History"] }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies.craft_retained]
+path = "../crates/craft_retained"
+default-features = false
+features = [
+    "vello_hybrid_renderer",
+    "vello_hybrid_renderer",
+    "http_client",
+    "png",
+    "jpeg",
+    "accesskit",
+    "system_fonts",
+    "markdown"
+]
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies.craft_retained]
+path = "../crates/craft_retained"
+default-features = false
+features = [
+    "vello_renderer",
+    "http_client",
+    "png",
+    "jpeg",
+    "accesskit",
+    "system_fonts",
+    "markdown"
+]
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+tracing-web = "0.1.3"
+console_error_panic_hook = "0.1.7"
+
+[dependencies.reqwest]
+workspace = true
+default-features = false
+features = ["rustls", "json"]
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+open = "5"
\ No newline at end of file
diff --git a/website/assets/brush_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg b/website/assets/brush_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg
new file mode 100644
index 0000000000000000000000000000000000000000..d037aba6273f7cfa697df83f8bc430eed1511ba6
GIT binary patch
literal 285
zcmY*UQA)!=5PhYPDIvjPF-fB>5lboli0n^5A!#Y5#vO_!c!VB6FR&Nz0(*d7py${N
zcz|5M3po4fzzoBiH}B1Sehlt2WEkLIm})pg7>*#Lj?4sIe&OEf9NIlb&}2hsj(=YX
z<G#TdTWL_4iFqQVC~<?5aEsC`JhDP1DV&vU`HuHw=jgn0AVm{jL!V|R5i7Vs;fV!r
ze&)+HooA>;tR~J;FQ<Ya<Be<yC*zl|RPCrw@)n7EBa=XjyY@%x01tQu7I=hfR80LY
jkG|VDBBc=>S;cS%dr9b=Ja@d32B|x!41O;V&uxG|6*e!N

literal 0
HcmV?d00001

diff --git a/website/assets/code_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg b/website/assets/code_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg
new file mode 100644
index 0000000000000000000000000000000000000000..d982515b7c2bd86e39d0c79a2f0af7a07ba5d9e4
GIT binary patch
literal 101
zcmXR4W7LvhkYHeBKmiT*%!~|dYzztv9t;c|3<eB9mIT9Q)y=XDzQR%l46{_zoIqk8
kYzz)SCB9a^P7IrUp6N5BS<RAV0E$U4Fhqc~0cF`306shoY5)KL

literal 0
HcmV?d00001

diff --git a/website/assets/devices_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg b/website/assets/devices_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg
new file mode 100644
index 0000000000000000000000000000000000000000..57018bd90dee21b6036edaab95bfb1ad3c50244c
GIT binary patch
literal 364
zcmY+9O-jR19K?Uc@?ICU1j(YfiWGvB6l1$dQEY@nYMN-2Qc92E338fVAQ$KbynqMj
zIh+?)W-(+w{xiI<U2i&OOpkwGv$`<Qzw8eO5HmFls1d9k?VzKz!6&n=M|Kz;pDn{`
z#gIn?W3kphj1E`M_Z0M?#Iw~q-tj{++tz2Rb$K1=E_TN;nbR_(QH|ByLiz_CT^pXL
zZSz2VTBdK7q$x=#5QL6RPRrAc^8*C~_$08+mLT0pX5UQM6Cx-aE7P4y<kt%7UFtU4
zo!jb_d01TETQ-ZB4R`u!XJPRZIV(~ovfnR6=UfVTJ0o|Qd=Z~>UCEle9#@taegSXp
BHlhFk

literal 0
HcmV?d00001

diff --git a/website/assets/electric_bolt_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg b/website/assets/electric_bolt_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg
new file mode 100644
index 0000000000000000000000000000000000000000..cb71bf7b43245a297fdfd99c874f27126e7c643b
GIT binary patch
literal 117
zcmY+4K?*=X000NIIe35r<seEco0TM`<mx7Qfd_cO{>eLh!#micIm~6|+?*mL#Nme-
yJr`d<#14`k0$LdGVYX_>V5NZ6F5f3~y^Ji=Q*q=*a+P<&6>Ej*jK)@hLJ3}wT@MEU

literal 0
HcmV?d00001

diff --git a/website/assets/view_comfy_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg b/website/assets/view_comfy_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg
new file mode 100644
index 0000000000000000000000000000000000000000..c517937804f27335830af5b88e94413ee7f76950
GIT binary patch
literal 133
zcmY+4Ar62r5Co?wxgaYmk%Uy@v6WQ~@8AVIo$XbzVv?QRr-vhx3H<V2F|sJEG=v2A
ggx6-$1tBBt@LG(WItIsys-v2Ia@&Ml8iSni0em$Hwg3PC

literal 0
HcmV?d00001

diff --git a/website/index.html b/website/index.html
new file mode 100644
index 00000000..4bdd505f
--- /dev/null
+++ b/website/index.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+    <link rel="modulepreload" href="/website.js"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta content="text/html;charset=utf-8" http-equiv="Content-Type"/>
+    <style>
+      body, html {
+        margin: 0;
+        padding: 0;
+      }
+
+      * {
+        box-sizing: border-box;
+      }
+
+      #canvas {
+        width: 100vw;
+        height: 100vh;
+        display: block;
+        border: none;
+      }
+    </style>
+</head>
+
+<body>
+<canvas class="main-canvas" id="canvas"></canvas>
+<script type="module">
+    import init from '/website.js';
+
+    async function run() {
+        await init();
+    }
+
+    await run();
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/website/src/docs.rs b/website/src/docs.rs
new file mode 100644
index 00000000..d23db73f
--- /dev/null
+++ b/website/src/docs.rs
@@ -0,0 +1,19 @@
+use craft_retained::elements::{Container, Element};
+use craft_retained::pct;
+use craft_retained::style::{Display, FlexDirection, Overflow, Unit};
+
+use crate::router::NavigateFn;
+
+pub(crate) fn docs(_navigate_fn: NavigateFn) -> Container {
+    Container::new()
+        .width(pct(100))
+        .overflow(Overflow::Visible, Overflow::Scroll)
+        .push(
+            Container::new()
+                .display(Display::Flex)
+                .width(pct(100))
+                .margin(Unit::Px(0.0), Unit::Auto, Unit::Px(0.0), Unit::Auto)
+                .flex_direction(FlexDirection::Column)
+                .flex_grow(1.0),
+        )
+}
diff --git a/website/src/index.rs b/website/src/index.rs
new file mode 100644
index 00000000..bc74c7d3
--- /dev/null
+++ b/website/src/index.rs
@@ -0,0 +1,177 @@
+use craft_retained::elements::{Container, Element, Text};
+use craft_retained::style::{AlignItems, Display, FlexDirection, FlexWrap, FontWeight, JustifyContent, Overflow, Unit};
+use craft_retained::{Color, ResourceIdentifier, WinitWindow, palette, pct, px, rgb};
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use crate::link::Link;
+use crate::router::{NavigateFn, Router};
+use crate::theme::{WRAPPER_PADDING_LEFT, WRAPPER_PADDING_RIGHT, wrapper};
+use crate::web_link::WebLink;
+
+fn hero_intro(navigate_fn: NavigateFn) -> Container {
+    let bg_wrapper = Container::new().width(pct(100)).background_color(rgb(45, 48, 53));
+
+    let inner_wrapper = wrapper()
+        .display(Display::Flex)
+        .flex_direction(FlexDirection::Column)
+        .padding(
+            Unit::Px(100.0),
+            WRAPPER_PADDING_RIGHT,
+            Unit::Px(100.0),
+            WRAPPER_PADDING_LEFT,
+        );
+
+    let inner_wrapper = inner_wrapper
+        .push(
+            Text::new("A Reactive GUI Framework for Rust")
+                .color(Color::WHITE)
+                /*.font_size(if window_ctx.inner_size().width <= MOBILE_MEDIA_QUERY_WIDTH {
+                    36.0
+                } else {
+                    56.0
+                })*/
+                .font_size(56.0)
+                .line_height(1.0)
+                .max_width(px(680))
+                .font_weight(FontWeight::BOLD)
+                .margin(px(0), px(0), px(32), px(0)),
+        )
+        .push(
+            Text::new("Build your UI with regular Rust code.")
+                .line_height(1.0)
+                .color(Color::WHITE)
+                .font_size(20.0),
+        );
+
+    let github_button = Text::new("GitHub")
+        .display(Display::Flex)
+        .align_items(Some(AlignItems::Center))
+        .justify_content(Some(JustifyContent::Center))
+        .font_size(22.0)
+        .min_width(px(100))
+        .border_width(px(1), px(1), px(1), px(1))
+        .border_radius((8.0, 8.0), (8.0, 8.0), (8.0, 8.0), (8.0, 8.0))
+        .padding(px(8), px(20), px(8), px(20))
+        .border_color(
+            palette::css::WHITE,
+            palette::css::WHITE,
+            palette::css::WHITE,
+            palette::css::WHITE,
+        )
+        .color(palette::css::WHITE);
+
+    let craft_button = Text::new("Learn Craft")
+        .id("xxx")
+        .display(Display::Flex)
+        .align_items(Some(AlignItems::Center))
+        .justify_content(Some(JustifyContent::Center))
+        .font_size(22.0)
+        .min_width(px(100))
+        .border_radius((8.0, 8.0), (8.0, 8.0), (8.0, 8.0), (8.0, 8.0))
+        .padding(px(8), px(20), px(8), px(20))
+        .background_color(rgb(69, 117, 230))
+        .color(palette::css::WHITE);
+
+    let buttons = Container::new()
+        .display(Display::Flex)
+        .wrap(FlexWrap::Wrap)
+        .gap(px(17), px(17))
+        .margin(px(40), px(0), px(0), px(0))
+        .push(Link("/docs", move || navigate_fn("/docs")).push(craft_button))
+        .push(WebLink("https://github.com/craft-gui/craft").push(github_button));
+
+    let inner_wrapper = inner_wrapper.push(buttons);
+
+    bg_wrapper.push(inner_wrapper)
+}
+
+fn hero_features() -> Container {
+    fn hero_item(title: &str, text: &str, icon: ResourceIdentifier) -> Container {
+        let sub_title_color = Color::from_rgb8(70, 70, 70);
+
+        let icon_title = Container::new()
+            //    .push(TinyVg::new(icon))
+            .push(
+                Text::new(title)
+                    .font_weight(FontWeight::MEDIUM)
+                    .font_size(24.0)
+                    .margin(px(0), px(0), px(0), px(10)),
+            );
+
+        Container::new()
+            .gap(px(10), px(10))
+            .flex_grow(1.0)
+            .flex_shrink(1.0)
+            .min_width(px(320))
+            .flex_basis(pct(50))
+            .display(Display::Flex)
+            .flex_direction(FlexDirection::Column)
+            .push(icon_title)
+            .push(Text::new(text).font_size(18.0).color(sub_title_color))
+    }
+
+    Container::new()
+        .background_color(rgb(247, 247, 247))
+        .width(pct(100))
+        .push(
+            wrapper()
+                .padding(Unit::Px(100.0), WRAPPER_PADDING_LEFT, Unit::Px(100.0), WRAPPER_PADDING_RIGHT)
+                .display(Display::Flex)
+                .wrap(FlexWrap::Wrap)
+                .gap(px(0), px(50))
+                .push(Text::new("Features").width(pct(100)).font_size(36.0).font_weight(FontWeight::SEMIBOLD))
+                .push(
+                    hero_item(
+                        "Reactive",
+                        "When your data changes, we automatically re-run your view function.",
+                        ResourceIdentifier::Bytes(include_bytes!("../assets/electric_bolt_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
+                    )
+                )
+                .push(
+                    hero_item(
+                        "Components",
+                        "Components are reusable blocks that manage their own state and define both how they are rendered and how they respond to updates.",
+                        ResourceIdentifier::Bytes(include_bytes!("../assets/view_comfy_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
+                    )
+                )
+                .push(
+                    hero_item(
+                        "Pure Rust without macros",
+                        "No macros.",
+                        ResourceIdentifier::Bytes(include_bytes!("../assets/code_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
+                    )
+                )
+                .push(
+                    hero_item(
+                        "Web-like styling",
+                        "We use Taffy, an implementation of the CSS flexbox, block, and grid layout algorithms, for simple and familiar styling.",
+                        ResourceIdentifier::Bytes(include_bytes!("../assets/brush_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
+                    )
+                )
+                .push(
+                    hero_item(
+                        "Cross Platform",
+                        "Currently we support Windows, macOS, Linux, Web, and Android.",
+                        ResourceIdentifier::Bytes(include_bytes!("../assets/devices_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
+                    )
+                )
+
+        )
+}
+
+pub(crate) fn index_page(navigate_fn: NavigateFn) -> Container {
+    Container::new()
+        .width(pct(100))
+        .overflow(Overflow::Visible, Overflow::Scroll)
+        .push(
+            Container::new()
+                .display(Display::Flex)
+                .width(pct(100))
+                .margin(Unit::Px(0.0), Unit::Auto, Unit::Px(0.0), Unit::Auto)
+                .flex_direction(FlexDirection::Column)
+                .flex_grow(1.0)
+                .push(hero_intro(navigate_fn))
+                .push(hero_features()),
+        )
+}
diff --git a/website/src/link.rs b/website/src/link.rs
new file mode 100644
index 00000000..46a27bf2
--- /dev/null
+++ b/website/src/link.rs
@@ -0,0 +1,18 @@
+use std::rc::Rc;
+
+use craft_retained::elements::{Container, Element};
+use craft_retained::events::ui_events::pointer::PointerButton;
+
+#[allow(non_snake_case)]
+pub fn Link<F>(href: &str, on_click: F) -> Container
+where
+    F: Fn() + 'static,
+{
+    let on_click = Rc::new(on_click);
+
+    Container::new().on_pointer_button_up(Rc::new(move |_event, pointer_button_event| {
+        if pointer_button_event.button == Some(PointerButton::Primary) {
+            on_click();
+        }
+    }))
+}
diff --git a/website/src/main.rs b/website/src/main.rs
new file mode 100644
index 00000000..204acafd
--- /dev/null
+++ b/website/src/main.rs
@@ -0,0 +1,100 @@
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use craft_retained::elements::{Container, Element, ElementInternals, Window};
+use craft_retained::{CraftOptions, craft_main, pct};
+
+use crate::router::Router;
+
+mod docs;
+mod index;
+mod link;
+mod navbar;
+mod router;
+mod theme;
+mod web_link;
+
+pub(crate) struct WebsiteGlobalState {
+    /// The current route that we are viewing.
+    route: String,
+}
+
+impl WebsiteGlobalState {
+    pub(crate) fn get_route(&self) -> String {
+        #[cfg(target_arch = "wasm32")]
+        let path: String;
+        #[cfg(target_arch = "wasm32")]
+        {
+            let window = web_sys::window().expect("No window available.");
+            path = window
+                .location()
+                .pathname()
+                .map(|s| {
+                    let trimmed_path = s.trim_end_matches('/');
+                    if trimmed_path.is_empty() {
+                        "/".to_string()
+                    } else {
+                        trimmed_path.to_string()
+                    }
+                })
+                .unwrap_or("/".to_string());
+        }
+        #[cfg(not(target_arch = "wasm32"))]
+        let path = self.route.clone();
+        path
+    }
+
+    pub(crate) fn set_route(&mut self, route: &str) {
+        self.route = route.to_string();
+
+        #[cfg(target_arch = "wasm32")]
+        {
+            let window = web_sys::window().unwrap();
+            let history = window.history().unwrap();
+
+            history
+                .push_state_with_url(&web_sys::wasm_bindgen::JsValue::NULL, "", Some(route))
+                .unwrap();
+        }
+    }
+
+    pub fn load_route(&mut self) {
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            // NOTE: In Git Bash, use `cargo run -- //examples`.
+            let route = std::env::args().nth(1).unwrap_or_else(|| "/".to_string());
+            self.set_route(route.as_str());
+        }
+    }
+}
+
+impl Default for WebsiteGlobalState {
+    fn default() -> Self {
+        WebsiteGlobalState {
+            route: "/".to_string(),
+        }
+    }
+}
+
+fn main() {
+    let options = CraftOptions {
+        ..Default::default()
+    };
+
+    #[allow(unused_mut)]
+    let mut global_state = Rc::new(RefCell::new(WebsiteGlobalState::default()));
+
+    util::setup_logging();
+
+    global_state.borrow_mut().load_route();
+
+    let page_wrapper = Router::new(global_state.clone());
+
+    /*    let root = page_wrapper.borrow().root.clone();
+
+        root.inner.borrow().print_tree_ids(4);
+    */
+    page_wrapper.borrow().navigate();
+
+    craft_main(options);
+}
diff --git a/website/src/navbar.rs b/website/src/navbar.rs
new file mode 100644
index 00000000..6ce616e5
--- /dev/null
+++ b/website/src/navbar.rs
@@ -0,0 +1,69 @@
+use crate::link::Link;
+use crate::router::NavigateFn;
+use crate::theme::{NAVBAR_BACKGROUND_COLOR, NAVBAR_TEXT_COLOR, wrapper};
+use craft_retained::elements::{Container, Element, Text};
+use craft_retained::style::{AlignItems, Display, FontWeight, JustifyContent, Unit};
+use craft_retained::{pct, px, rgb};
+
+pub const NAVBAR_HEIGHT: f32 = 60.0;
+
+fn create_link(navigate_fn: NavigateFn, label: &str, route: &str) -> Container {
+    let route_owned = route.to_string();
+    let nav = navigate_fn.clone();
+    Link(route, move || {
+        nav(&route_owned);
+    })
+    .push(
+        Text::new(label)
+            .id(format!("route_{route}").as_str())
+            .margin(px(0), px(12), px(0), px(0))
+            .font_size(16.0)
+            .selectable(false)
+            .color(NAVBAR_TEXT_COLOR),
+    )
+    /*.hovered()
+    .color(NAVBAR_TEXT_HOVERED_COLOR)
+    .underline(1.0, Color::BLACK, None)
+    .margin(px(0), "12px", px(0), px(0))
+    .font_size(16.5)
+    .disable_selection()
+    .normal()*/
+}
+
+pub fn navbar(navigate_fn: NavigateFn) -> Container {
+    let border_color = rgb(240, 240, 240);
+    let container = Container::new()
+        .width(pct(100))
+        .height(Unit::Px(NAVBAR_HEIGHT))
+        .min_height(Unit::Px(NAVBAR_HEIGHT))
+        .max_height(Unit::Px(NAVBAR_HEIGHT))
+        .border_width(px(0), px(0), px(2), px(0))
+        .border_color(border_color, border_color, border_color, border_color)
+        .background_color(NAVBAR_BACKGROUND_COLOR);
+
+    let wrapper = wrapper()
+        .display(Display::Flex)
+        .justify_content(Some(JustifyContent::SpaceBetween))
+        .align_items(Some(AlignItems::Center))
+        // Left
+        .push(
+            Container::new()
+                .display(Display::Flex)
+                .justify_content(Some(JustifyContent::Center))
+                .align_items(Some(AlignItems::Center))
+                .push(
+                    create_link(navigate_fn.clone(), "Craft", "/")
+                        .font_size(32.0)
+                        .font_weight(FontWeight::BOLD)
+                        .margin(px(0), px(24), px(0), px(0)), /*.hovered()
+                                                              .font_size(32.0)
+                                                              .font_weight(Weight::BOLD)
+                                                              .margin(px(0), "24px", px(0), px(0)),*/
+                )
+                .push(create_link(navigate_fn.clone(), "Home", "/").margin(px(0), px(12), px(0), px(0)))
+                .push(create_link(navigate_fn.clone(), "Docs", "/docs").margin(px(0), px(12), px(0), px(0)))
+                .push(create_link(navigate_fn.clone(), "Examples", "/examples").margin(px(0), px(12), px(0), px(0))),
+        );
+
+    container.push(wrapper)
+}
diff --git a/website/src/router.rs b/website/src/router.rs
new file mode 100644
index 00000000..f0f3dc44
--- /dev/null
+++ b/website/src/router.rs
@@ -0,0 +1,76 @@
+use craft_retained::elements::{Container, Element, Window};
+use craft_retained::pct;
+use craft_retained::style::{Display, FlexDirection};
+use std::cell::RefCell;
+use std::rc::{Rc, Weak};
+use std::sync::Arc;
+
+use crate::docs::docs;
+use crate::index::index_page;
+use crate::navbar::navbar;
+use crate::theme::BODY_BACKGROUND_COLOR;
+use crate::{WebsiteGlobalState, docs, index};
+
+#[derive(Clone)]
+pub struct Router {
+    pub root: Window,
+    global_state: Rc<RefCell<WebsiteGlobalState>>,
+    index: Container,
+    docs: Container,
+}
+
+pub type NavigateFn = Rc<dyn Fn(&str) + 'static>;
+
+impl Router {
+    pub fn new(global_state: Rc<RefCell<WebsiteGlobalState>>) -> Rc<RefCell<Self>> {
+        let state = global_state.clone();
+        Rc::new_cyclic(|me: &Weak<RefCell<Self>>| {
+            let me = me.clone();
+
+            let navigate_logic: NavigateFn = Rc::new(move |route| {
+                state.borrow_mut().set_route(route);
+                if let Some(router) = me.upgrade() {
+                    router.borrow().navigate();
+                }
+            });
+
+            let window = Window::new("Craft Gui")
+                .display(Display::Flex)
+                .flex_direction(FlexDirection::Column)
+                .width(pct(100))
+                .height(pct(100))
+                .push(navbar(navigate_logic.clone()))
+                .background_color(BODY_BACKGROUND_COLOR);
+
+            RefCell::new(Self {
+                root: window.clone(),
+                index: index_page(navigate_logic.clone()),
+                docs: docs(navigate_logic.clone()),
+                global_state: global_state.clone(),
+            })
+        })
+    }
+
+    fn set_content(&self, container: Container) {
+        if let Some(current_content) = self.root.get_children().get(1) {
+            self.root
+                .remove_child(current_content.clone())
+                .expect("Failed to remove child");
+        }
+        self.root.clone().push(container);
+    }
+
+    pub fn navigate(&self) {
+        let page = match self.global_state.borrow().route.as_str() {
+            "/" => self.index.clone(),
+            "/docs" => self.docs.clone(),
+            _ => self.index.clone(),
+        };
+
+        self.set_content(page);
+    }
+
+    /*pub fn window(&self) -> Arc<craft_retained::WinitWindow> {
+        self.root.inner.borrow().winit_window().expect("No widow")
+    }*/
+}
diff --git a/website/src/theme.rs b/website/src/theme.rs
new file mode 100644
index 00000000..17456eb1
--- /dev/null
+++ b/website/src/theme.rs
@@ -0,0 +1,33 @@
+use craft_retained::elements::{Container, Element};
+use craft_retained::style::Unit;
+use craft_retained::{Color, pct};
+
+pub(crate) const BODY_BACKGROUND_COLOR: Color = Color::from_rgb8(255, 255, 255);
+
+pub(crate) const NAVBAR_BACKGROUND_COLOR: Color = Color::from_rgb8(255, 255, 255);
+pub(crate) const NAVBAR_TEXT_COLOR: Color = Color::from_rgb8(50, 50, 50);
+//pub(crate) const NAVBAR_TEXT_HOVERED_COLOR: Color = Color::from_rgb8(0, 0, 0);
+
+//pub(crate) const ACTIVE_LINK_COLOR: Color = Color::from_rgb8(42, 108, 200);
+//pub(crate) const DEFAULT_LINK_COLOR: Color = Color::from_rgb8(102, 102, 102);
+
+pub(crate) const WRAPPER_MAX_WIDTH: Unit = Unit::Px(1300.0);
+pub(crate) const WRAPPER_MARGIN_LEFT: Unit = Unit::Auto;
+pub(crate) const WRAPPER_MARGIN_RIGHT: Unit = Unit::Auto;
+pub(crate) const WRAPPER_PADDING_LEFT: Unit = Unit::Px(20.0);
+pub(crate) const WRAPPER_PADDING_RIGHT: Unit = Unit::Px(20.0);
+
+//pub(crate) const MOBILE_MEDIA_QUERY_WIDTH: u32 = 850;
+
+pub(crate) fn wrapper() -> Container {
+    Container::new()
+        .margin(Unit::Px(0.0), WRAPPER_MARGIN_RIGHT, Unit::Px(0.0), WRAPPER_MARGIN_LEFT)
+        .padding(
+            Unit::Px(0.0),
+            WRAPPER_PADDING_RIGHT,
+            Unit::Px(0.0),
+            WRAPPER_PADDING_LEFT,
+        )
+        .width(pct(100))
+        .max_width(WRAPPER_MAX_WIDTH)
+}
diff --git a/website/src/web_link.rs b/website/src/web_link.rs
new file mode 100644
index 00000000..564fbdc6
--- /dev/null
+++ b/website/src/web_link.rs
@@ -0,0 +1,26 @@
+use std::rc::Rc;
+
+use craft_retained::elements::{Container, Element};
+use craft_retained::events::ui_events::pointer::PointerButton;
+
+#[allow(non_snake_case)]
+pub fn WebLink(href: &str) -> Container {
+    let href = href.to_string();
+
+    Container::new().on_pointer_button_up(Rc::new(move |_event, pointer_button_event| {
+        if pointer_button_event.button == Some(PointerButton::Primary) {
+            #[cfg(target_arch = "wasm32")]
+            {
+                if let Some(win) = web_sys::window() {
+                    // Use the captured owned string
+                    let _ = win.open_with_url(&href);
+                }
+            }
+
+            #[cfg(not(target_arch = "wasm32"))]
+            {
+                open::that(&href).unwrap();
+            }
+        }
+    }))
+}
diff --git a/website/wasm-build.sh b/website/wasm-build.sh
new file mode 100644
index 00000000..07fb3318
--- /dev/null
+++ b/website/wasm-build.sh
@@ -0,0 +1,12 @@
+set -e
+
+
+#rustup target add wasm32-unknown-unknown
+#cargo install -f wasm-bindgen-cli
+#cargo install simple-http-server
+
+cargo build --target wasm32-unknown-unknown --release
+
+wasm-bindgen ../target/wasm32-unknown-unknown/release/website.wasm --target web --no-typescript --out-dir dist --out-name website
+cp index.html dist/index.html
+simple-http-server dist -c wasm,html,js --try-file dist/index.html -i --coep --coop --ip 0.0.0.0
\ No newline at end of file

From 1d6b8273ece6481c3ea6b5ec756894c45f84a7ae Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 29 Mar 2026 00:33:37 -0400
Subject: [PATCH 122/143] Maybe fix hit test with scrollable

---
 crates/craft_renderer/src/helpers.rs          | 12 +++-
 crates/craft_renderer/src/lib.rs              | 14 ++---
 crates/craft_renderer/src/render_command.rs   | 16 ++---
 crates/craft_renderer/src/render_list.rs      | 61 ++++++++-----------
 crates/craft_renderer/src/renderer.rs         |  4 +-
 crates/craft_renderer/src/screenshot.rs       |  2 +-
 crates/craft_renderer/src/sort_commands.rs    |  4 +-
 crates/craft_renderer/src/target_item.rs      |  2 +-
 crates/craft_renderer/src/vello/mod.rs        | 23 ++++---
 crates/craft_renderer/src/vello_cpu/mod.rs    | 30 ++++-----
 crates/craft_renderer/src/vello_cpu/tinyvg.rs |  2 +-
 crates/craft_renderer/src/vello_hybrid/mod.rs | 18 +++---
 .../craft_renderer/src/vello_hybrid/tinyvg.rs |  3 +-
 .../craft_retained/src/elements/container.rs  |  8 ++-
 .../craft_retained/src/elements/dropdown.rs   |  4 +-
 .../src/elements/internal_helpers.rs          | 10 ++-
 .../src/elements/slider/slider_element.rs     |  4 +-
 crates/craft_retained/src/elements/text.rs    |  7 ++-
 .../src/elements/text_input/mod.rs            |  6 +-
 .../src/elements/traits/element_internals.rs  |  6 +-
 crates/craft_retained/src/elements/window.rs  | 15 ++++-
 crates/craft_retained/src/events/helpers.rs   |  3 +-
 crates/craft_retained/src/layout/layout.rs    | 11 ++--
 website/src/index.rs                          |  3 +-
 24 files changed, 152 insertions(+), 116 deletions(-)

diff --git a/crates/craft_renderer/src/helpers.rs b/crates/craft_renderer/src/helpers.rs
index fd2d2f45..efa7a9bb 100644
--- a/crates/craft_renderer/src/helpers.rs
+++ b/crates/craft_renderer/src/helpers.rs
@@ -1,9 +1,17 @@
-#[cfg(any(feature = "vello_cpu_renderer", feature = "vello_hybrid_renderer", feature = "vello_hybrid_renderer_webgl"))]
+#[cfg(any(
+    feature = "vello_cpu_renderer",
+    feature = "vello_hybrid_renderer",
+    feature = "vello_hybrid_renderer_webgl"
+))]
 use vello_common::paint::PaintType;
 
 use crate::Brush;
 
-#[cfg(any(feature = "vello_cpu_renderer", feature = "vello_hybrid_renderer", feature = "vello_hybrid_renderer_webgl"))]
+#[cfg(any(
+    feature = "vello_cpu_renderer",
+    feature = "vello_hybrid_renderer",
+    feature = "vello_hybrid_renderer_webgl"
+))]
 pub(crate) fn brush_to_paint(brush: &Brush) -> PaintType {
     match brush {
         Brush::Color(color) => PaintType::Solid(*color),
diff --git a/crates/craft_renderer/src/lib.rs b/crates/craft_renderer/src/lib.rs
index 150e807d..8220d85d 100644
--- a/crates/craft_renderer/src/lib.rs
+++ b/crates/craft_renderer/src/lib.rs
@@ -10,22 +10,22 @@ pub mod vello;
 pub mod vello_cpu;
 
 pub mod blank_renderer;
+pub(crate) mod helpers;
 mod image_adapter;
 pub mod render_command;
+mod render_list;
 mod renderer_type;
+mod screenshot;
+mod sort_commands;
+mod target_item;
 pub mod text_renderer_data;
 pub(crate) mod tinyvg_helpers;
 #[cfg(feature = "vello_hybrid_renderer")]
 pub mod vello_hybrid;
-pub(crate) mod helpers;
-mod render_list;
-mod sort_commands;
-mod screenshot;
-mod target_item;
 
+pub use brush::Brush;
 pub use render_command::RenderCommand;
 pub use render_list::RenderList;
-pub use brush::Brush;
+pub use renderer_type::RendererType;
 pub use screenshot::Screenshot;
 pub use target_item::TargetItem;
-pub use renderer_type::RendererType;
diff --git a/crates/craft_renderer/src/render_command.rs b/crates/craft_renderer/src/render_command.rs
index 9a07b383..c9296dec 100644
--- a/crates/craft_renderer/src/render_command.rs
+++ b/crates/craft_renderer/src/render_command.rs
@@ -28,27 +28,27 @@ pub enum RenderCommand {
 #[derive(Clone)]
 pub struct DrawRectCmd {
     pub rect: Rectangle,
-    pub color: Color
+    pub color: Color,
 }
 
 #[derive(Clone)]
 pub struct DrawRectOutlineCmd {
     pub rect: Rectangle,
     pub outline_color: Color,
-    pub thickness: f64
+    pub thickness: f64,
 }
 
 #[derive(Clone)]
 pub struct DrawImageCmd {
     pub rect: Rectangle,
-    pub resource_id: ResourceIdentifier
+    pub resource_id: ResourceIdentifier,
 }
 
 #[derive(Clone)]
 pub struct DrawTinyVgCmd {
     pub rect: Rectangle,
     pub resource_id: ResourceIdentifier,
-    pub override_color: Option<Color>
+    pub override_color: Option<Color>,
 }
 
 #[derive(Clone)]
@@ -56,19 +56,19 @@ pub struct DrawTextCmd {
     pub rect: Rectangle,
     pub data: Weak<RefCell<dyn TextData>>,
     pub text_scroll: Option<TextScroll>,
-    pub show_cursor: bool
+    pub show_cursor: bool,
 }
 
 #[derive(Clone)]
 pub enum PushLayerCmd {
     BezPath(BezPath),
-    Rect(Rectangle)
+    Rect(Rectangle),
 }
 
 #[derive(Clone)]
 pub struct FillBezPathCmd {
     pub path: BezPath,
-    pub brush: Brush
+    pub brush: Brush,
 }
 
 #[derive(Clone)]
@@ -80,4 +80,4 @@ pub struct BoxShadowCmd {
     pub blur_radius: f64,
     pub color: Color,
     pub border_box: Rectangle,
-}
\ No newline at end of file
+}
diff --git a/crates/craft_renderer/src/render_list.rs b/crates/craft_renderer/src/render_list.rs
index 205c2350..448622c3 100644
--- a/crates/craft_renderer/src/render_list.rs
+++ b/crates/craft_renderer/src/render_list.rs
@@ -6,12 +6,10 @@ use peniko::Color;
 use craft_primitives::geometry::{BezPath, Rectangle, Shape};
 use craft_resource_manager::ResourceIdentifier;
 
-use crate::Brush;
 use crate::render_command::{BoxShadowCmd, DrawImageCmd, DrawRectCmd, DrawRectOutlineCmd, DrawTextCmd, DrawTinyVgCmd, FillBezPathCmd, PushLayerCmd};
-use crate::{RenderCommand};
-use crate::{TargetItem};
 use crate::sort_commands::SortedCommands;
-use crate::text_renderer_data::{TextScroll, TextData};
+use crate::text_renderer_data::{TextData, TextScroll};
+use crate::{Brush, RenderCommand, TargetItem};
 
 pub struct RenderList {
     current_overlay_depth: u64,
@@ -52,9 +50,7 @@ impl RenderList {
         {
             return;
         }
-        self.commands.push(
-            RenderCommand::DrawRect(DrawRectCmd { rect, color })
-        );
+        self.commands.push(RenderCommand::DrawRect(DrawRectCmd { rect, color }));
     }
 
     #[inline(always)]
@@ -75,9 +71,11 @@ impl RenderList {
         {
             return;
         }
-        self.commands.push(
-            RenderCommand::DrawRectOutline(DrawRectOutlineCmd { rect, outline_color, thickness })
-        );
+        self.commands.push(RenderCommand::DrawRectOutline(DrawRectOutlineCmd {
+            rect,
+            outline_color,
+            thickness,
+        }));
     }
 
     #[inline(always)]
@@ -87,9 +85,8 @@ impl RenderList {
         {
             return;
         }
-        self.commands.push(
-            RenderCommand::FillBezPath(FillBezPathCmd { path, brush })
-        );
+        self.commands
+            .push(RenderCommand::FillBezPath(FillBezPathCmd { path, brush }));
     }
 
     #[inline(always)]
@@ -105,9 +102,12 @@ impl RenderList {
         {
             return;
         }
-        self.commands.push(
-            RenderCommand::DrawText(DrawTextCmd{ rect, data, text_scroll, show_cursor})
-        );
+        self.commands.push(RenderCommand::DrawText(DrawTextCmd {
+            rect,
+            data,
+            text_scroll,
+            show_cursor,
+        }));
     }
 
     #[inline(always)]
@@ -117,30 +117,22 @@ impl RenderList {
         {
             return;
         }
-        self.commands.push(
-            RenderCommand::DrawImage(DrawImageCmd { rect, resource_id })
-        );
+        self.commands
+            .push(RenderCommand::DrawImage(DrawImageCmd { rect, resource_id }));
     }
 
     #[inline(always)]
-    pub fn draw_tiny_vg(
-        &mut self,
-        rect: Rectangle,
-        resource_id: ResourceIdentifier,
-        override_color: Option<Color>,
-    ) {
+    pub fn draw_tiny_vg(&mut self, rect: Rectangle, resource_id: ResourceIdentifier, override_color: Option<Color>) {
         if let Some(cull) = &self.cull
             && !cull.intersects(&rect)
         {
             return;
         }
-        self.commands.push(
-            RenderCommand::DrawTinyVg(DrawTinyVgCmd {
-                rect,
-                resource_id,
-                override_color,
-            }
-            ));
+        self.commands.push(RenderCommand::DrawTinyVg(DrawTinyVgCmd {
+            rect,
+            resource_id,
+            override_color,
+        }));
     }
 
     #[inline(always)]
@@ -149,7 +141,8 @@ impl RenderList {
     }
 
     pub fn push_layer_with_bez_path(&mut self, path: BezPath) {
-        self.commands.push(RenderCommand::PushLayer(PushLayerCmd::BezPath(path)));
+        self.commands
+            .push(RenderCommand::PushLayer(PushLayerCmd::BezPath(path)));
     }
 
     #[inline(always)]
@@ -184,4 +177,4 @@ impl RenderList {
     pub fn set_cull(&mut self, cull: Option<Rectangle>) {
         self.cull = cull;
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_renderer/src/renderer.rs b/crates/craft_renderer/src/renderer.rs
index b53e3fda..63f56e40 100644
--- a/crates/craft_renderer/src/renderer.rs
+++ b/crates/craft_renderer/src/renderer.rs
@@ -1,8 +1,8 @@
 use std::any::Any;
 use std::sync::Arc;
 
-use craft_primitives::geometry::Rectangle;
 use craft_primitives::Color;
+use craft_primitives::geometry::Rectangle;
 
 use craft_resource_manager::ResourceManager;
 
@@ -40,4 +40,4 @@ pub trait Renderer: Any {
             pixels: Vec::new(),
         }
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_renderer/src/screenshot.rs b/crates/craft_renderer/src/screenshot.rs
index 570cb866..20a58b2c 100644
--- a/crates/craft_renderer/src/screenshot.rs
+++ b/crates/craft_renderer/src/screenshot.rs
@@ -2,4 +2,4 @@ pub struct Screenshot {
     pub width: u16,
     pub height: u16,
     pub pixels: Vec<u8>,
-}
\ No newline at end of file
+}
diff --git a/crates/craft_renderer/src/sort_commands.rs b/crates/craft_renderer/src/sort_commands.rs
index 3e927fa3..80fd57c4 100644
--- a/crates/craft_renderer/src/sort_commands.rs
+++ b/crates/craft_renderer/src/sort_commands.rs
@@ -1,5 +1,5 @@
-use craft_primitives::geometry::{Rectangle, Shape};
 use crate::{RenderCommand, RenderList};
+use craft_primitives::geometry::{Rectangle, Shape};
 
 #[derive(Debug)]
 pub enum SortedItem {
@@ -116,4 +116,4 @@ pub(crate) fn sort_and_cull_render_list_internal(surface_height: f32, render_lis
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_renderer/src/target_item.rs b/crates/craft_renderer/src/target_item.rs
index 60d1df14..2431fbc1 100644
--- a/crates/craft_renderer/src/target_item.rs
+++ b/crates/craft_renderer/src/target_item.rs
@@ -20,4 +20,4 @@ impl TargetItem {
     pub fn sort_items_by_overlay_depth(targets: &mut [TargetItem]) {
         targets.sort_by_key(|t1| t1.overlay_depth);
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_renderer/src/vello/mod.rs b/crates/craft_renderer/src/vello/mod.rs
index 635cb2b2..386f705f 100644
--- a/crates/craft_renderer/src/vello/mod.rs
+++ b/crates/craft_renderer/src/vello/mod.rs
@@ -19,14 +19,14 @@ use wgpu::{Adapter, Device, Instance, Limits, MemoryHints, Queue, Surface, Surfa
 
 use winit::window::Window;
 
+use crate::RenderCommand;
 use crate::image_adapter::ImageAdapter;
 use crate::render_command::PushLayerCmd;
-use crate::RenderCommand;
-use crate::renderer::{Renderer};
-use crate::text_renderer_data::{TextRenderLine, TextScroll};
-use crate::vello::tinyvg::draw_tiny_vg;
 use crate::render_list::RenderList;
+use crate::renderer::Renderer;
 use crate::sort_commands::SortedCommands;
+use crate::text_renderer_data::{TextRenderLine, TextScroll};
+use crate::vello::tinyvg::draw_tiny_vg;
 
 pub struct RenderSurface {
     pub surface: Surface<'static>,
@@ -316,8 +316,7 @@ impl Renderer for VelloRenderer {
                         let vello_image = vello::peniko::ImageBrush::new(vello_image);
 
                         let mut transform = Affine::IDENTITY;
-                        transform =
-                            transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
+                        transform = transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
                         transform = transform.pre_scale_non_uniform(
                             cmd.rect.width as f64 / image.width() as f64,
                             cmd.rect.height as f64 / image.height() as f64,
@@ -425,7 +424,9 @@ impl Renderer for VelloRenderer {
                         }
                     });
 
-                    if cmd.show_cursor && let Some((cursor, cursor_color)) = &text_render.cursor {
+                    if cmd.show_cursor
+                        && let Some((cursor, cursor_color)) = &text_render.cursor
+                    {
                         let cursor_rect = Rectangle {
                             x: cursor.x + cmd.rect.x,
                             y: -scroll + cursor.y + cmd.rect.y,
@@ -450,7 +451,13 @@ impl Renderer for VelloRenderer {
                             scene.push_layer(Fill::NonZero, BlendMode::default(), 1.0, Affine::IDENTITY, p);
                         }
                         PushLayerCmd::Rect(r) => {
-                            scene.push_layer(Fill::NonZero, BlendMode::default(), 1.0, Affine::IDENTITY, &r.to_kurbo());
+                            scene.push_layer(
+                                Fill::NonZero,
+                                BlendMode::default(),
+                                1.0,
+                                Affine::IDENTITY,
+                                &r.to_kurbo(),
+                            );
                         }
                     };
                 }
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index 420441a2..cf3d5001 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -6,11 +6,11 @@ use std::ops::{Deref, DerefMut};
 use std::sync::Arc;
 
 use craft_primitives::geometry::Rectangle;
-use craft_resource_manager::resource::Resource;
 use craft_resource_manager::ResourceManager;
+use craft_resource_manager::resource::Resource;
 
 use peniko::kurbo::{Affine, Shape};
-use peniko::{kurbo, BlendMode, Blob, Color, Compose, Fill, ImageAlphaType, Mix};
+use peniko::{BlendMode, Blob, Color, Compose, Fill, ImageAlphaType, Mix, kurbo};
 
 use softbuffer::Buffer;
 
@@ -22,16 +22,16 @@ use vello_cpu::{Pixmap, RenderContext};
 
 use winit::window::Window;
 
+use crate::RenderCommand;
 use crate::helpers::{brush_to_paint, rgba_to_encoded_u32};
 use crate::image_adapter::ImageAdapter;
 use crate::render_command::{BoxShadowCmd, PushLayerCmd};
 use crate::render_list::RenderList;
-use crate::renderer::{Renderer};
+use crate::renderer::Renderer;
+use crate::screenshot::Screenshot;
+use crate::sort_commands::SortedCommands;
 use crate::text_renderer_data::{TextRenderLine, TextScroll};
 use crate::vello_cpu::tinyvg::draw_tiny_vg;
-use crate::RenderCommand;
-use crate::sort_commands::SortedCommands;
-use crate::screenshot::Screenshot;
 
 pub(crate) struct VelloCpuRenderer {
     render_context: RenderContext,
@@ -187,8 +187,7 @@ impl Renderer for VelloCpuRenderer {
                         };
 
                         let mut transform = Affine::IDENTITY;
-                        transform =
-                            transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
+                        transform = transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
                         transform = transform.pre_scale_non_uniform(
                             cmd.rect.width as f64 / image.width() as f64,
                             cmd.rect.height as f64 / image.height() as f64,
@@ -214,8 +213,8 @@ impl Renderer for VelloCpuRenderer {
                     }
                 }
                 RenderCommand::DrawText(cmd) => {
-                    let text_transform =
-                        kurbo::Affine::default().with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
+                    let text_transform = kurbo::Affine::default()
+                        .with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
                     let scroll = cmd.text_scroll.unwrap_or(TextScroll::default()).scroll_y;
                     let text_transform = text_transform.then_translate(kurbo::Vec2::new(0.0, -scroll as f64));
 
@@ -309,7 +308,9 @@ impl Renderer for VelloCpuRenderer {
                         }
                     });
 
-                    if cmd.show_cursor && let Some((cursor, cursor_color)) = &text_render.cursor {
+                    if cmd.show_cursor
+                        && let Some((cursor, cursor_color)) = &text_render.cursor
+                    {
                         let cursor_rect = Rectangle {
                             x: cursor.x + cmd.rect.x,
                             y: -scroll + cursor.y + cmd.rect.y,
@@ -322,11 +323,10 @@ impl Renderer for VelloCpuRenderer {
                 RenderCommand::PushLayer(cmd) => {
                     let clip_path = match cmd {
                         PushLayerCmd::BezPath(path) => path,
-                        PushLayerCmd::Rect(rect) => &rect.to_kurbo().into_path(0.1)
+                        PushLayerCmd::Rect(rect) => &rect.to_kurbo().into_path(0.1),
                     };
 
-                    self.render_context
-                        .push_layer(Some(clip_path), None, None, None, None);
+                    self.render_context.push_layer(Some(clip_path), None, None, None, None);
                 }
                 RenderCommand::PopLayer => {
                     self.render_context.pop_layer();
@@ -431,4 +431,4 @@ impl VelloCpuRenderer {
             self.render_context.pop_layer();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/crates/craft_renderer/src/vello_cpu/tinyvg.rs b/crates/craft_renderer/src/vello_cpu/tinyvg.rs
index e22308e2..0af9a402 100644
--- a/crates/craft_renderer/src/vello_cpu/tinyvg.rs
+++ b/crates/craft_renderer/src/vello_cpu/tinyvg.rs
@@ -10,8 +10,8 @@ use tinyvg_rs::commands::{DrawCommand, Path, PathCommand, Segment, Style};
 use tinyvg_rs::common::Unit;
 use vello_cpu::RenderContext;
 
-use crate::{Brush, tinyvg_helpers};
 use crate::helpers::brush_to_paint;
+use crate::{Brush, tinyvg_helpers};
 
 fn stroke_path(scene: &mut RenderContext, bez_path: &BezPath, affine: &Affine, line_width: f64, brush: &Brush) {
     scene.set_stroke(Stroke::new(line_width));
diff --git a/crates/craft_renderer/src/vello_hybrid/mod.rs b/crates/craft_renderer/src/vello_hybrid/mod.rs
index 3b430b1d..853e0021 100644
--- a/crates/craft_renderer/src/vello_hybrid/mod.rs
+++ b/crates/craft_renderer/src/vello_hybrid/mod.rs
@@ -23,14 +23,14 @@ use vello_hybrid::{RenderSize, RenderTargetConfig, Renderer, Scene};
 use wgpu::TextureFormat;
 use winit::window::Window;
 
-use crate::{Brush, RenderCommand};
 use crate::render_command::{BoxShadowCmd, PushLayerCmd};
 use crate::render_list::RenderList;
-use crate::renderer::{Renderer as CraftRenderer};
+use crate::renderer::Renderer as CraftRenderer;
+use crate::sort_commands::SortedCommands;
 use crate::text_renderer_data::{TextRenderLine, TextScroll};
 use crate::vello_hybrid::render_context::{RenderContext, RenderSurface};
 use crate::vello_hybrid::tinyvg::draw_tiny_vg;
-use crate::sort_commands::SortedCommands;
+use crate::{Brush, RenderCommand};
 
 pub struct ActiveRenderState {
     // The fields MUST be in this order, so that the surface is dropped before the window
@@ -302,16 +302,14 @@ impl CraftRenderer for VelloHybridRenderer {
                                 &mut encoder,
                                 &pixmap,
                             );
-                            self.images
-                                .insert(cmd.resource_id.clone(), (image_id, expiration_time));
+                            self.images.insert(cmd.resource_id.clone(), (image_id, expiration_time));
 
                             image_id
                         };
                         seen_images.insert(image_id);
 
                         let mut transform = Affine::IDENTITY;
-                        transform =
-                            transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
+                        transform = transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
                         transform = transform.pre_scale_non_uniform(
                             cmd.rect.width as f64 / image.width() as f64,
                             cmd.rect.height as f64 / image.height() as f64,
@@ -425,7 +423,9 @@ impl CraftRenderer for VelloHybridRenderer {
                         }
                     });
 
-                    if cmd.show_cursor && let Some((cursor, cursor_color)) = &text_render.cursor {
+                    if cmd.show_cursor
+                        && let Some((cursor, cursor_color)) = &text_render.cursor
+                    {
                         let cursor_rect = Rectangle {
                             x: cursor.x + cmd.rect.x,
                             y: -scroll + cursor.y + cmd.rect.y,
@@ -447,7 +447,7 @@ impl CraftRenderer for VelloHybridRenderer {
                 RenderCommand::PushLayer(cmd) => {
                     let clip_path = match cmd {
                         PushLayerCmd::BezPath(path) => path,
-                        PushLayerCmd::Rect(rect) => &rect.to_kurbo().into_path(0.1)
+                        PushLayerCmd::Rect(rect) => &rect.to_kurbo().into_path(0.1),
                     };
 
                     scene.push_layer(Some(clip_path), None, None, None, None);
diff --git a/crates/craft_renderer/src/vello_hybrid/tinyvg.rs b/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
index 341b7b43..f4ebd20a 100644
--- a/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
+++ b/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
@@ -11,9 +11,8 @@ use tinyvg_rs::commands::{DrawCommand, Path, PathCommand, Segment, Style};
 use tinyvg_rs::common::Unit;
 use vello_hybrid::Scene;
 
-use crate::Brush;
-use crate::tinyvg_helpers;
 use crate::vello_hybrid::brush_to_paint;
+use crate::{Brush, tinyvg_helpers};
 
 fn stroke_path(scene: &mut Scene, bez_path: &BezPath, affine: &Affine, line_width: f64, brush: &Brush) {
     scene.set_stroke(Stroke::new(line_width));
diff --git a/crates/craft_retained/src/elements/container.rs b/crates/craft_retained/src/elements/container.rs
index ac5e0967..ebf218c1 100644
--- a/crates/craft_retained/src/elements/container.rs
+++ b/crates/craft_retained/src/elements/container.rs
@@ -13,6 +13,7 @@ use crate::elements::traits::DeepClone;
 use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scrollable, scrollable};
 use crate::events::{Event, EventKind};
 use crate::layout::TaffyTree;
+use crate::style::Overflow;
 use crate::text::text_context::TextContext;
 
 #[derive(Clone)]
@@ -100,7 +101,12 @@ impl ElementInternals for ContainerInner {
     }
 
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
-        resolve_clip_for_scrollable(self, clip_bounds);
+        let overflow = self.style().get_overflow();
+        if overflow[0] == Overflow::Scroll || overflow[1] == Overflow::Scroll {
+            resolve_clip_for_scrollable(self, clip_bounds);
+        } else {
+            self.element_data.layout.resolve_clip(clip_bounds);
+        }
     }
 
     fn push(&mut self, child: Rc<RefCell<dyn ElementInternals>>) {
diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index 4aab5daf..ba938858 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -122,12 +122,14 @@ impl ElementInternals for DropdownInner {
         self.element_data.layout.has_new_layout = taffy_tree.has_new_layout(node);
         let dirty = self.element_data.layout.has_new_layout
             || transform != self.element_data.layout.get_transform()
-            || position != self.element_data.layout.position;
+            || position != self.element_data.layout.position
+            || clip_bounds != self.element_data.layout.parent_clip;
 
         if dirty {
             self.resolve_box(position, transform, layout, z_index);
             self.apply_borders(scale_factor);
             self.apply_clip(clip_bounds);
+            self.element_data.layout.parent_clip = clip_bounds;
             self.element_data.layout.scroll_state.mark_old();
         }
         taffy_tree.mark_seen(node);
diff --git a/crates/craft_retained/src/elements/internal_helpers.rs b/crates/craft_retained/src/elements/internal_helpers.rs
index e1d349cf..54034286 100644
--- a/crates/craft_retained/src/elements/internal_helpers.rs
+++ b/crates/craft_retained/src/elements/internal_helpers.rs
@@ -46,7 +46,8 @@ pub fn apply_generic_container_layout(
 
     let dirty = has_new_layout
         || transform != element.element_data_mut().layout.get_transform()
-        || position != element.element_data_mut().layout.position;
+        || position != element.element_data_mut().layout.position
+        || clip_bounds != element.element_data().layout.parent_clip;
     element.element_data_mut().layout.has_new_layout = has_new_layout;
     if dirty {
         element.resolve_box(position, transform, layout, z_index);
@@ -54,6 +55,7 @@ pub fn apply_generic_container_layout(
         // For scroll changes from taffy;
         element.element_data_mut().apply_scroll(layout);
         element.apply_clip(clip_bounds);
+        element.element_data_mut().layout.parent_clip = clip_bounds;
         element.element_data_mut().layout.scroll_state.mark_old();
     }
 
@@ -76,7 +78,7 @@ pub fn apply_generic_container_layout(
         transform * child_transform,
         text_context,
         scale_factor,
-        false,
+        element.element_data().layout.clip_bounds,
     )
 }
 
@@ -96,12 +98,14 @@ pub fn apply_generic_leaf_layout(
 
     let dirty = has_new_layout
         || transform != element.element_data_mut().layout.get_transform()
-        || position != element.element_data_mut().layout.position;
+        || position != element.element_data_mut().layout.position
+        || clip_bounds != element.element_data().layout.parent_clip;
     element.element_data_mut().layout.has_new_layout = has_new_layout;
     if dirty {
         element.resolve_box(position, transform, layout, z_index);
         element.apply_borders(scale_factor);
         element.apply_clip(clip_bounds);
+        element.element_data_mut().layout.parent_clip = clip_bounds;
         element.element_data_mut().layout.scroll_state.mark_old();
     }
 
diff --git a/crates/craft_retained/src/elements/slider/slider_element.rs b/crates/craft_retained/src/elements/slider/slider_element.rs
index d06b1caa..410ffa1e 100644
--- a/crates/craft_retained/src/elements/slider/slider_element.rs
+++ b/crates/craft_retained/src/elements/slider/slider_element.rs
@@ -348,7 +348,8 @@ impl ElementInternals for SliderInner {
 
         let dirty = has_new_layout
             || transform != self.element_data.layout.get_transform()
-            || position != self.element_data.layout.position;
+            || position != self.element_data.layout.position
+            || clip_bounds != self.element_data.layout.parent_clip;
         self.element_data.layout.has_new_layout = has_new_layout;
 
         if dirty {
@@ -356,6 +357,7 @@ impl ElementInternals for SliderInner {
 
             self.apply_borders(scale_factor);
             self.apply_clip(clip_bounds);
+            self.element_data.layout.parent_clip = clip_bounds;
         }
     }
 
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 52fe90f3..441eacfd 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -7,8 +7,8 @@ use std::time;
 #[cfg(all(feature = "accesskit", not(target_arch = "wasm32")))]
 use accesskit::{Action, Role};
 
-use craft_renderer::text_renderer_data::TextData;
 use craft_renderer::RenderList;
+use craft_renderer::text_renderer_data::TextData;
 
 use craft_primitives::geometry::{Affine, Point, Rectangle, Vec2};
 use craft_primitives::{Color, ColorBrush};
@@ -163,12 +163,13 @@ impl ElementInternals for TextInner {
 
         let dirty = has_new_layout
             || transform != self.element_data.layout.get_transform()
-            || position != self.element_data.layout.position;
+            || position != self.element_data.layout.position
+            || clip_bounds != self.element_data.layout.parent_clip;
         self.element_data.layout.has_new_layout = has_new_layout;
         if dirty {
             self.resolve_box(position, transform, result, z_index);
             self.apply_clip(clip_bounds);
-
+            self.element_data.layout.parent_clip = clip_bounds;
             self.apply_borders(scale_factor);
         }
 
diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index f9e1a420..f55fe972 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -8,8 +8,8 @@ use std::rc::{Rc, Weak};
 use craft_primitives::Color;
 use craft_primitives::geometry::{Affine, Point, Rectangle, TrblRectangle};
 
-use craft_renderer::text_renderer_data::{TextData, TextScroll};
 use craft_renderer::RenderList;
+use craft_renderer::text_renderer_data::{TextData, TextScroll};
 
 use parley::BoundingBox;
 
@@ -177,13 +177,15 @@ impl ElementInternals for TextInputInner {
 
         let dirty = has_new_layout
             || transform != self.element_data.layout.get_transform()
-            || position != self.element_data.layout.position;
+            || position != self.element_data.layout.position
+            || clip_bounds != self.element_data.layout.parent_clip;
         self.element_data.layout.has_new_layout = has_new_layout;
 
         if dirty {
             let result = taffy_tree.get_layout(node);
             self.resolve_box(position, transform, result, z_index);
             self.apply_clip(clip_bounds);
+            self.element_data.layout.parent_clip = clip_bounds;
             self.apply_borders(scale_factor);
 
             self.element_data.apply_scroll(result);
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index a6991e39..1649631c 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -56,7 +56,7 @@ pub trait ElementInternals: ElementData + Any + Drop {
         transform: Affine,
         text_context: &mut TextContext,
         scale_factor: f64,
-        _dirty: bool,
+        clip_bounds: Option<Rectangle>,
     ) {
         for child in &self.element_data().children {
             child.borrow_mut().apply_layout(
@@ -65,7 +65,7 @@ pub trait ElementInternals: ElementData + Any + Drop {
                 z_index,
                 transform,
                 text_context,
-                self.element_data().layout.clip_bounds,
+                clip_bounds,
                 scale_factor,
             );
         }
@@ -605,7 +605,7 @@ pub trait ElementInternals: ElementData + Any + Drop {
                 None => false,
             }
         } else {
-            rect.contains(&point)
+            false
         }
     }
 
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 42ffab8c..9bf4f818 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -47,6 +47,7 @@ use crate::events::internal::InternalMessage;
 use crate::events::pointer_capture::PointerCapture;
 use crate::events::{Event, EventKind};
 use crate::layout::TaffyTree;
+use crate::style::Overflow;
 use crate::text::text_context::TextContext;
 #[cfg(target_arch = "wasm32")]
 use crate::wasm_queue::WASM_QUEUE;
@@ -214,7 +215,12 @@ impl ElementInternals for WindowInternal {
     }
 
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
-        resolve_clip_for_scrollable(self, clip_bounds);
+        let overflow = self.style().get_overflow();
+        if overflow[0] == Overflow::Scroll || overflow[1] == Overflow::Scroll {
+            resolve_clip_for_scrollable(self, clip_bounds);
+        } else {
+            self.element_data.layout.resolve_clip(clip_bounds);
+        }
     }
 
     fn push(&mut self, child: Rc<RefCell<dyn ElementInternals>>) {
@@ -678,7 +684,12 @@ impl WindowInternal {
                     &mut layout_order,
                     Affine::IDENTITY,
                     text_context,
-                    None,
+                    Some(Rectangle::new(
+                        0.0,
+                        0.0,
+                        self.window_size.width,
+                        self.window_size.height,
+                    )),
                     sf,
                 );
                 taffy_tree.apply_layout(root_node);
diff --git a/crates/craft_retained/src/events/helpers.rs b/crates/craft_retained/src/events/helpers.rs
index 7c2edbb0..0c247e82 100644
--- a/crates/craft_retained/src/events/helpers.rs
+++ b/crates/craft_retained/src/events/helpers.rs
@@ -4,8 +4,7 @@ use std::rc::Rc;
 
 use craft_primitives::geometry::Point;
 
-use craft_renderer::RenderList;
-use craft_renderer::TargetItem;
+use craft_renderer::{RenderList, TargetItem};
 
 use crate::app::ELEMENTS;
 use crate::elements::ElementInternals;
diff --git a/crates/craft_retained/src/layout/layout.rs b/crates/craft_retained/src/layout/layout.rs
index 428016c5..8efa0099 100644
--- a/crates/craft_retained/src/layout/layout.rs
+++ b/crates/craft_retained/src/layout/layout.rs
@@ -30,6 +30,7 @@ pub struct Layout {
 
     pub layout_order: u32,
     pub clip_bounds: Option<Rectangle>,
+    pub parent_clip: Option<Rectangle>,
 
     //cache_border_spec: Option<(CssRoundedRect, f64)>, // f64 for scale factor
     cache_border_spec: Option<BorderSpec>,
@@ -419,13 +420,13 @@ impl Layout {
     }
 
     pub fn resolve_clip_for_scrollable(&mut self, clip_bounds: Option<Rectangle>) {
+        if clip_bounds.is_none() {
+            self.clip_bounds = None;
+            return;
+        }
         if self.is_scrollable_layout() {
             let scroll_clip_bounds = self.computed_box_transformed.padding_rectangle();
-            if let Some(clip_bounds) = clip_bounds {
-                self.clip_bounds = scroll_clip_bounds.intersection(&clip_bounds);
-            } else {
-                self.clip_bounds = Some(scroll_clip_bounds);
-            }
+            self.clip_bounds = scroll_clip_bounds.intersection(&clip_bounds.unwrap());
         } else {
             self.clip_bounds = clip_bounds;
         }
diff --git a/website/src/index.rs b/website/src/index.rs
index bc74c7d3..37a5e30a 100644
--- a/website/src/index.rs
+++ b/website/src/index.rs
@@ -45,6 +45,7 @@ fn hero_intro(navigate_fn: NavigateFn) -> Container {
         );
 
     let github_button = Text::new("GitHub")
+        .selectable(false)
         .display(Display::Flex)
         .align_items(Some(AlignItems::Center))
         .justify_content(Some(JustifyContent::Center))
@@ -62,7 +63,7 @@ fn hero_intro(navigate_fn: NavigateFn) -> Container {
         .color(palette::css::WHITE);
 
     let craft_button = Text::new("Learn Craft")
-        .id("xxx")
+        .selectable(false)
         .display(Display::Flex)
         .align_items(Some(AlignItems::Center))
         .justify_content(Some(JustifyContent::Center))

From cb5e6084cecc477dc3d1e5fba9b26586f12adbe7 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 29 Mar 2026 00:47:06 -0400
Subject: [PATCH 123/143] Maybe fix hit test with scrollable

---
 crates/craft_retained/src/elements/text_input/mod.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/crates/craft_retained/src/elements/text_input/mod.rs b/crates/craft_retained/src/elements/text_input/mod.rs
index f55fe972..b366f672 100644
--- a/crates/craft_retained/src/elements/text_input/mod.rs
+++ b/crates/craft_retained/src/elements/text_input/mod.rs
@@ -27,7 +27,7 @@ use crate::elements::{AsElement, Element, ElementInternals, resolve_clip_for_scr
 use crate::events::{Event, EventKind};
 use crate::layout::TaffyTree;
 use crate::layout::layout_context::{LayoutContext, TaffyTextInputContext};
-use crate::style::{Display, Style, Unit};
+use crate::style::{Display, Overflow, Style, Unit};
 use crate::text::RangedStyles;
 use crate::text::text_context::TextContext;
 use crate::text::text_render_data::TextRender;
@@ -391,7 +391,12 @@ impl ElementInternals for TextInputInner {
     }
 
     fn apply_clip(&mut self, clip_bounds: Option<Rectangle>) {
-        resolve_clip_for_scrollable(self, clip_bounds);
+        let overflow = self.style().get_overflow();
+        if overflow[0] == Overflow::Scroll || overflow[1] == Overflow::Scroll {
+            resolve_clip_for_scrollable(self, clip_bounds);
+        } else {
+            self.element_data.layout.resolve_clip(clip_bounds);
+        }
     }
 
     fn get_default_style() -> Box<Style>

From cfd0bdfc77427e49f981331e91c5579495cac770 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 29 Mar 2026 07:48:35 -0400
Subject: [PATCH 124/143] Re-add tinyvg element.

---
 crates/craft_retained/src/elements/mod.rs     |   2 +
 crates/craft_retained/src/elements/tinyvg.rs  | 169 ++++++++++++++++++
 .../src/layout/layout_context.rs              |   6 +
 website/src/index.rs                          |  16 +-
 4 files changed, 184 insertions(+), 9 deletions(-)
 create mode 100644 crates/craft_retained/src/elements/tinyvg.rs

diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index 69841400..7a7660d0 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -6,6 +6,7 @@ pub use crate::elements::scrollable::{ScrollOptions, ScrollToBox};
 pub use crate::elements::slider::{Slider, SliderDirection, SliderInner};
 pub use crate::elements::text::{Text, TextInner};
 pub use crate::elements::text_input::{TextInput, TextInputInner};
+pub use crate::elements::tinyvg::{TinyVg, TinyVgInner};
 pub use crate::elements::traits::{AsElement, Element, ElementData, ElementInternals, resolve_clip_for_scrollable};
 pub use crate::elements::window::{Window, WindowInternal};
 
@@ -21,5 +22,6 @@ mod image;
 mod slider;
 mod text;
 mod text_input;
+mod tinyvg;
 mod traits;
 mod window;
diff --git a/crates/craft_retained/src/elements/tinyvg.rs b/crates/craft_retained/src/elements/tinyvg.rs
new file mode 100644
index 00000000..6a62872a
--- /dev/null
+++ b/crates/craft_retained/src/elements/tinyvg.rs
@@ -0,0 +1,169 @@
+//! Displays an TinyVg.
+
+use std::any::Any;
+use std::cell::RefCell;
+use std::rc::{Rc, Weak};
+
+use craft_primitives::geometry::Rectangle;
+
+use craft_renderer::RenderList;
+
+use craft_resource_manager::ResourceIdentifier;
+use craft_resource_manager::resource_type::ResourceType;
+
+use craft_primitives::geometry::{Affine, Point};
+
+use crate::app::{PENDING_RESOURCES, TAFFY_TREE};
+use crate::elements::element_data::ElementData;
+use crate::elements::internal_helpers::apply_generic_leaf_layout;
+use crate::elements::traits::DeepClone;
+use crate::elements::{AsElement, Element, ElementInternals};
+use crate::layout::TaffyTree;
+use crate::layout::layout_context::{LayoutContext, TinyVgContext};
+use crate::rgba;
+use crate::text::text_context::TextContext;
+
+/// Displays an TinyVg.
+#[derive(Clone)]
+pub struct TinyVg {
+    pub inner: Rc<RefCell<TinyVgInner>>,
+}
+
+#[derive(Clone)]
+pub struct TinyVgInner {
+    is_TinyVg_dirty: bool,
+    resource_identifier: ResourceIdentifier,
+    element_data: ElementData,
+}
+
+impl crate::elements::ElementData for TinyVgInner {
+    fn element_data(&self) -> &ElementData {
+        &self.element_data
+    }
+
+    fn element_data_mut(&mut self) -> &mut ElementData {
+        &mut self.element_data
+    }
+}
+
+impl Element for TinyVg {}
+
+impl Drop for TinyVgInner {
+    fn drop(&mut self) {
+        ElementInternals::drop(self)
+    }
+}
+
+impl AsElement for TinyVg {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        self.inner.clone()
+    }
+}
+
+impl ElementInternals for TinyVgInner {
+    fn deep_clone(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        self.deep_clone_internal()
+    }
+
+    fn apply_layout(
+        &mut self,
+        taffy_tree: &mut TaffyTree,
+        position: Point,
+        z_index: &mut u32,
+        transform: Affine,
+        _text_context: &mut TextContext,
+        clip_bounds: Option<Rectangle>,
+        scale_factor: f64,
+    ) {
+        apply_generic_leaf_layout(
+            self,
+            taffy_tree,
+            position,
+            z_index,
+            transform,
+            clip_bounds,
+            scale_factor,
+        );
+    }
+
+    fn draw(&mut self, _renderer: &mut RenderList, _text_context: &mut TextContext, _scale_factor: f64) {
+        if !self.is_visible() {
+            return;
+        }
+
+        // We draw the borders before we start any layers, so that we don't clip the borders.
+        self.draw_borders(_renderer, _scale_factor);
+
+        let computed_box_transformed = self.get_computed_box_transformed();
+        let content_rectangle = computed_box_transformed.content_rectangle();
+        self.draw_borders(_renderer, _scale_factor);
+
+        let mut color = None;
+        if self.style().get_color() != rgba(0, 0, 0, 0) {
+            color = Some(self.style().get_color());
+        }
+        _renderer.draw_tiny_vg(
+            content_rectangle.scale(_scale_factor),
+            self.resource_identifier.clone(),
+            color,
+        );
+    }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
+}
+
+impl TinyVg {
+    pub fn new(resource_identifier: ResourceIdentifier) -> Self {
+        let inner = Rc::new_cyclic(|me: &Weak<RefCell<TinyVgInner>>| {
+            RefCell::new(TinyVgInner {
+                is_TinyVg_dirty: false,
+                resource_identifier: resource_identifier.clone(),
+                element_data: ElementData::new(me.clone(), false),
+            })
+        });
+        let layout_context = Some(LayoutContext::TinyVg(TinyVgContext::new(resource_identifier.clone())));
+        inner.borrow_mut().element_data.create_layout_node(layout_context);
+
+        PENDING_RESOURCES.with_borrow_mut(|pending_resources| {
+            pending_resources.push_back((resource_identifier, ResourceType::TinyVg));
+        });
+
+        Self { inner }
+    }
+
+    pub fn TinyVg(self, resource_identifier: ResourceIdentifier) -> Self {
+        self.inner.borrow_mut().TinyVg(resource_identifier);
+        self
+    }
+
+    pub fn get_TinyVg(&self) -> ResourceIdentifier {
+        self.inner.borrow().get_TinyVg().clone()
+    }
+}
+
+impl TinyVgInner {
+    pub fn TinyVg(&mut self, resource_identifier: ResourceIdentifier) {
+        self.is_TinyVg_dirty = true;
+        self.resource_identifier = resource_identifier.clone();
+
+        TAFFY_TREE.with_borrow_mut(|taffy_tree| {
+            let context = LayoutContext::TinyVg(TinyVgContext::new(resource_identifier));
+            let node = self
+                .element_data
+                .layout
+                .taffy_node_id
+                .expect("Failed to get TinyVg node");
+            taffy_tree.set_node_context(node, Some(context));
+        });
+    }
+
+    pub fn get_TinyVg(&self) -> &ResourceIdentifier {
+        &self.resource_identifier
+    }
+}
diff --git a/crates/craft_retained/src/layout/layout_context.rs b/crates/craft_retained/src/layout/layout_context.rs
index 334a5ca2..56be421b 100644
--- a/crates/craft_retained/src/layout/layout_context.rs
+++ b/crates/craft_retained/src/layout/layout_context.rs
@@ -196,6 +196,12 @@ pub fn measure_content(
 }
 
 impl TinyVgContext {
+    pub fn new(resource_identifier: ResourceIdentifier) -> Self {
+        Self {
+            resource_identifier,
+        }
+    }
+
     pub fn measure(
         &mut self,
         known_dimensions: Size<Option<f32>>,
diff --git a/website/src/index.rs b/website/src/index.rs
index 37a5e30a..ac3cddcc 100644
--- a/website/src/index.rs
+++ b/website/src/index.rs
@@ -1,4 +1,4 @@
-use craft_retained::elements::{Container, Element, Text};
+use craft_retained::elements::{Container, Element, Text, TinyVg};
 use craft_retained::style::{AlignItems, Display, FlexDirection, FlexWrap, FontWeight, JustifyContent, Overflow, Unit};
 use craft_retained::{Color, ResourceIdentifier, WinitWindow, palette, pct, px, rgb};
 use std::cell::RefCell;
@@ -91,14 +91,12 @@ fn hero_features() -> Container {
     fn hero_item(title: &str, text: &str, icon: ResourceIdentifier) -> Container {
         let sub_title_color = Color::from_rgb8(70, 70, 70);
 
-        let icon_title = Container::new()
-            //    .push(TinyVg::new(icon))
-            .push(
-                Text::new(title)
-                    .font_weight(FontWeight::MEDIUM)
-                    .font_size(24.0)
-                    .margin(px(0), px(0), px(0), px(10)),
-            );
+        let icon_title = Container::new().push(TinyVg::new(icon)).push(
+            Text::new(title)
+                .font_weight(FontWeight::MEDIUM)
+                .font_size(24.0)
+                .margin(px(0), px(0), px(0), px(10)),
+        );
 
         Container::new()
             .gap(px(10), px(10))

From ea796f01dc8ae5f9412a758051460561c0702ccb Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 29 Mar 2026 09:30:50 -0400
Subject: [PATCH 125/143] Update deps

---
 Cargo.lock                                    | 859 +++++++++---------
 Cargo.toml                                    |   4 +-
 crates/craft_renderer/Cargo.toml              |   8 +-
 crates/craft_retained/Cargo.toml              |  14 +-
 crates/craft_retained/src/elements/text.rs    |   1 +
 crates/craft_retained/src/elements/window.rs  |   1 +
 crates/craft_retained/src/style/mod.rs        |  16 +-
 crates/craft_retained/src/style/styles.rs     |  26 +-
 .../craft_retained/src/text/parley_editor.rs  |   1 +
 .../craft_retained/src/text/text_context.rs   |   2 +-
 10 files changed, 458 insertions(+), 474 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5ed88dea..f63e951a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,43 +20,46 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
 
 [[package]]
 name = "accesskit"
-version = "0.21.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf203f9d3bd8f29f98833d1fbef628df18f759248a547e7e01cfbf63cda36a99"
+checksum = "5351dcebb14b579ccab05f288596b2ae097005be7ee50a7c3d4ca9d0d5a66f6a"
+dependencies = [
+ "uuid",
+]
 
 [[package]]
 name = "accesskit_atspi_common"
-version = "0.14.2"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "890d241cf51fc784f0ac5ac34dfc847421f8d39da6c7c91a0fcc987db62a8267"
+checksum = "842fd8203e6dfcf531d24f5bac792088edfba7d6b35844fead191603fb32a260"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
  "atspi-common",
+ "phf",
  "serde",
- "thiserror 1.0.69",
  "zvariant",
 ]
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.31.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db81010a6895d8707f9072e6ce98070579b43b717193d2614014abd5cb17dd43"
+checksum = "53cf47daed85312e763fbf85ceca136e0d7abc68e0a7e12abe11f48172bc3b10"
 dependencies = [
  "accesskit",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.22.2"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0089e5c0ac0ca281e13ea374773898d9354cc28d15af9f0f7394d44a495b575"
+checksum = "534bc3fdc89a64a1db3c46b33c198fde2b7c3c7d094e5809c8c8bf2970c18243"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
  "objc2 0.5.2",
  "objc2-app-kit 0.2.2",
  "objc2-foundation 0.2.2",
@@ -64,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "accesskit_unix"
-version = "0.17.2"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301e55b39cfc15d9c48943ce5f572204a551646700d0e8efa424585f94fec528"
+checksum = "90e549dd7c6562b6a2ea807b44726e6241707db054a817dc4c7e2b8d3b39bfac"
 dependencies = [
  "accesskit",
  "accesskit_atspi_common",
@@ -80,23 +83,23 @@ dependencies = [
 
 [[package]]
 name = "accesskit_windows"
-version = "0.29.2"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d63dd5041e49c363d83f5419a896ecb074d309c414036f616dc0b04faca971"
+checksum = "eff7009f1a532e917d66970a1e80c965140c6cfbbabbdde3d64e5431e6c78e21"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
  "static_assertions",
- "windows 0.61.3",
- "windows-core 0.61.2",
+ "windows 0.62.2",
+ "windows-core 0.62.2",
 ]
 
 [[package]]
 name = "accesskit_winit"
-version = "0.29.2"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8cfabe59d0eaca7412bfb1f70198dd31e3b0496fee7e15b066f9c36a1a140a0"
+checksum = "1fe9a94394896352cc4660ca2288bd4ef883d83238853c038b44070c8f134313"
 dependencies = [
  "accesskit",
  "accesskit_macos",
@@ -142,23 +145,21 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "android-activity"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
+checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd"
 dependencies = [
  "android-properties",
  "bitflags 2.11.0",
  "cc",
- "cesu8",
- "jni",
- "jni-sys",
+ "jni 0.22.4",
  "libc",
  "log",
  "ndk",
  "ndk-context",
  "ndk-sys",
  "num_enum",
- "thiserror 1.0.69",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -178,9 +179,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.21"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -193,15 +194,15 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.7"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
 dependencies = [
  "utf8parse",
 ]
@@ -398,20 +399,19 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "atspi"
-version = "0.25.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c83247582e7508838caf5f316c00791eee0e15c0bf743e6880585b867e16815c"
+checksum = "c77886257be21c9cd89a4ae7e64860c6f0eefca799bb79127913052bd0eefb3d"
 dependencies = [
  "atspi-common",
- "atspi-connection",
  "atspi-proxies",
 ]
 
 [[package]]
 name = "atspi-common"
-version = "0.9.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33dfc05e7cdf90988a197803bf24f5788f94f7c94a69efa95683e8ffe76cfdfb"
+checksum = "20c5617155740c98003016429ad13fe43ce7a77b007479350a9f8bf95a29f63d"
 dependencies = [
  "enumflags2",
  "serde",
@@ -423,23 +423,11 @@ dependencies = [
  "zvariant",
 ]
 
-[[package]]
-name = "atspi-connection"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4193d51303d8332304056ae0004714256b46b6635a5c556109b319c0d3784938"
-dependencies = [
- "atspi-common",
- "atspi-proxies",
- "futures-lite",
- "zbus",
-]
-
 [[package]]
 name = "atspi-proxies"
-version = "0.9.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2eebcb9e7e76f26d0bcfd6f0295e1cd1e6f33bedbc5698a971db8dc43d7751c"
+checksum = "2230e48787ed3eb4088996eab66a32ca20c0b67bbd4fd6cdfe79f04f1f04c9fc"
 dependencies = [
  "atspi-common",
  "serde",
@@ -454,9 +442,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.16.1"
+version = "1.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bffc006df10ac2a68c83692d734a465f8ee6c5b384d8545a636f81d858f4bf"
+checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc"
 dependencies = [
  "aws-lc-sys",
  "zeroize",
@@ -464,9 +452,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.38.0"
+version = "0.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4321e568ed89bb5a7d291a7f37997c2c0df89809d7b6d12062c81ddb54aa782e"
+checksum = "83a25cf98105baa966497416dbd42565ce3a8cf8dbfd59803ec9ad46f3126399"
 dependencies = [
  "cc",
  "cmake",
@@ -619,10 +607,11 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f"
+checksum = "cfd1e3f8955a5d7de9fab72fc8373fade9fb8a703968cb200ae3dc6cf08e185a"
 dependencies = [
+ "bytes",
  "cfg_aliases",
 ]
 
@@ -698,9 +687,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.56"
+version = "1.2.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
+checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -741,9 +730,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.60"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a"
+checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -751,9 +740,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.60"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -763,9 +752,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.55"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
+checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -775,9 +764,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
 [[package]]
 name = "clipboard-rs"
@@ -807,9 +796,9 @@ dependencies = [
 
 [[package]]
 name = "cmake"
-version = "0.1.57"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
+checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678"
 dependencies = [
  "cc",
 ]
@@ -845,9 +834,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
 
 [[package]]
 name = "combine"
@@ -1039,7 +1028,7 @@ dependencies = [
  "parley",
  "peniko",
  "pulldown-cmark",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
  "smallvec",
  "smol_str 0.3.6",
  "syntect",
@@ -1206,17 +1195,16 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
 [[package]]
 name = "drm"
-version = "0.14.2"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5b71449a23fe79542d6527ca572844b2016abf9573c49e43144d546b1735aec"
+checksum = "80bc8c5c6c2941f70a55c15f8d9f00f9710ebda3ffda98075f996a0e6c92756f"
 dependencies = [
  "bitflags 2.11.0",
  "bytemuck",
- "bytemuck_derive",
  "drm-ffi",
  "drm-fourcc",
  "libc",
- "rustix 1.1.4",
+ "rustix 0.38.44",
 ]
 
 [[package]]
@@ -1329,9 +1317,9 @@ checksum = "5692dd7b5a1978a5aeb0ce83b7655c58ca8efdcb79d21036ea249da95afec2c6"
 
 [[package]]
 name = "euclid"
-version = "0.22.13"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df61bf483e837f88d5c2291dcf55c67be7e676b3a51acc48db3a7b163b91ed63"
+checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06"
 dependencies = [
  "num-traits",
 ]
@@ -1456,42 +1444,32 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
 [[package]]
 name = "font-types"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39a654f404bbcbd48ea58c617c2993ee91d1cb63727a37bf2323a4edeed1b8c5"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "font-types"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e4d2d0cf79d38430cc9dc9aadec84774bff2e1ba30ae2bf6c16cfce9385a23"
+checksum = "73829a7b5c91198af28a99159b7ae4afbb252fb906159ff7f189f3a2ceaa3df2"
 dependencies = [
  "bytemuck",
 ]
 
 [[package]]
 name = "fontique"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bbc252c93499b6d3635d692f892a637db0dbb130ce9b32bf20b28e0dcc470b"
+checksum = "23358480a54a886d51b306718d5ca743fdfe238e5df38ef650f4e72f29c5d9e9"
 dependencies = [
- "bytemuck",
  "hashbrown 0.16.1",
- "icu_locale_core",
  "linebender_resource_handle",
  "memmap2",
  "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-core-text",
  "objc2-foundation 0.3.2",
- "read-fonts 0.35.0",
+ "parlance",
+ "read-fonts",
  "roxmltree",
  "smallvec",
- "windows 0.58.0",
- "windows-core 0.58.0",
+ "windows 0.62.2",
+ "windows-core 0.62.2",
  "yeslogic-fontconfig-sys",
 ]
 
@@ -1755,9 +1733,9 @@ checksum = "f9e2d4c0a8296178d8802098410ca05d86b17a10bb5ab559b3fb404c1f948220"
 
 [[package]]
 name = "guillotiere"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782"
+checksum = "6b17e70c989c36bad147b27a58d148c0741c51448aa5653436547323e524d0ab"
 dependencies = [
  "euclid",
  "svg_fmt",
@@ -1796,14 +1774,14 @@ dependencies = [
 
 [[package]]
 name = "harfrust"
-version = "0.3.2"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92c020db12c71d8a12a3fe7607873cade3a01a6287e29d540c8723276221b9d8"
+checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9"
 dependencies = [
  "bitflags 2.11.0",
  "bytemuck",
  "core_maths",
- "read-fonts 0.35.0",
+ "read-fonts",
  "smallvec",
 ]
 
@@ -2022,6 +2000,21 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "icu_locale"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "532b11722e350ab6bf916ba6eb0efe3ee54b932666afec989465f9243fe6dd60"
+dependencies = [
+ "icu_collections",
+ "icu_locale_core",
+ "icu_locale_data",
+ "icu_provider",
+ "potential_utf",
+ "tinystr",
+ "zerovec",
+]
+
 [[package]]
 name = "icu_locale_core"
 version = "2.1.1"
@@ -2036,6 +2029,12 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "icu_locale_data"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c5f1d16b4c3a2642d3a719f18f6b06070ab0aef246a6418130c955ae08aa831"
+
 [[package]]
 name = "icu_normalizer"
 version = "2.1.1"
@@ -2084,6 +2083,8 @@ checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
+ "serde",
+ "stable_deref_trait",
  "writeable",
  "yoke",
  "zerofrom",
@@ -2091,6 +2092,27 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "icu_segmenter"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a807a7488f3f758629ae86d99d9d30dce24da2fb2945d74c80a4f4a62c71db73"
+dependencies = [
+ "icu_collections",
+ "icu_locale",
+ "icu_provider",
+ "icu_segmenter_data",
+ "potential_utf",
+ "utf8_iter",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_segmenter_data"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ebbb7321d9e21d25f5660366cb6c08201d0175898a3a6f7a41ee9685af21c80"
+
 [[package]]
 name = "id-arena"
 version = "2.3.0"
@@ -2120,9 +2142,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.25.9"
+version = "0.25.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a"
+checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -2130,8 +2152,8 @@ dependencies = [
  "num-traits",
  "png 0.18.1",
  "tiff",
- "zune-core 0.5.1",
- "zune-jpeg 0.5.12",
+ "zune-core",
+ "zune-jpeg",
 ]
 
 [[package]]
@@ -2174,9 +2196,9 @@ checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
 
 [[package]]
 name = "iri-string"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a"
+checksum = "d8e7418f59cc01c88316161279a7f665217ae316b388e58a0d10e29f54f1e5eb"
 dependencies = [
  "memchr",
  "serde",
@@ -2209,9 +2231,9 @@ checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
 [[package]]
 name = "itoa"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "jni"
@@ -2222,18 +2244,70 @@ dependencies = [
  "cesu8",
  "cfg-if",
  "combine",
- "jni-sys",
+ "jni-sys 0.3.1",
  "log",
  "thiserror 1.0.69",
  "walkdir",
  "windows-sys 0.45.0",
 ]
 
+[[package]]
+name = "jni"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
+dependencies = [
+ "cfg-if",
+ "combine",
+ "jni-macros",
+ "jni-sys 0.4.1",
+ "log",
+ "simd_cesu8",
+ "thiserror 2.0.18",
+ "walkdir",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "jni-macros"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "simd_cesu8",
+ "syn",
+]
+
 [[package]]
 name = "jni-sys"
-version = "0.3.0"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn",
+]
 
 [[package]]
 name = "jobserver"
@@ -2247,10 +2321,12 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.91"
+version = "0.3.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
+checksum = "cc4c90f45aa2e6eacbe8645f77fdea542ac97a494bcd117a67df9ff4d611f995"
 dependencies = [
+ "cfg-if",
+ "futures-util",
  "once_cell",
  "wasm-bindgen",
 ]
@@ -2362,9 +2438,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 
 [[package]]
 name = "libc"
-version = "0.2.182"
+version = "0.2.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
+checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
 
 [[package]]
 name = "libdeflate-sys"
@@ -2402,9 +2478,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
+checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08"
 dependencies = [
  "bitflags 2.11.0",
  "libc",
@@ -2414,9 +2490,9 @@ dependencies = [
 
 [[package]]
 name = "libtest-mimic"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5297962ef19edda4ce33aaa484386e0a5b3d7f2f4e037cbeee00503ef6b29d33"
+checksum = "14e6ba06f0ade6e504aff834d7c34298e5155c6baca353cc6a4aaff2f9fd7f33"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2603,9 +2679,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
+checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
 dependencies = [
  "libc",
  "wasi",
@@ -2614,9 +2690,9 @@ dependencies = [
 
 [[package]]
 name = "moxcms"
-version = "0.7.11"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
 dependencies = [
  "num-traits",
  "pxfm",
@@ -2681,7 +2757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
  "bitflags 2.11.0",
- "jni-sys",
+ "jni-sys 0.3.1",
  "log",
  "ndk-sys",
  "num_enum",
@@ -2701,7 +2777,7 @@ version = "0.6.0+11769913"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
 dependencies = [
- "jni-sys",
+ "jni-sys 0.3.1",
 ]
 
 [[package]]
@@ -2715,9 +2791,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
+checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967"
 
 [[package]]
 name = "num-traits"
@@ -2731,9 +2807,9 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c"
+checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26"
 dependencies = [
  "num_enum_derive",
  "rustversion",
@@ -2741,9 +2817,9 @@ dependencies = [
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
+checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -3159,9 +3235,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "once_cell_polyfill"
@@ -3204,9 +3280,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.75"
+version = "0.10.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
+checksum = "951c002c75e16ea2c65b8c7e4d3d51d5530d8dfa7d060b4776828c88cfb18ecf"
 dependencies = [
  "bitflags 2.11.0",
  "cfg-if",
@@ -3236,9 +3312,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.111"
+version = "0.9.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
+checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb"
 dependencies = [
  "cc",
  "libc",
@@ -3248,9 +3324,9 @@ dependencies = [
 
 [[package]]
 name = "orbclient"
-version = "0.3.50"
+version = "0.3.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ad2c6bae700b7aa5d1cc30c59bdd3a1c180b09dbaea51e2ae2b8e1cf211fdd"
+checksum = "59aed3b33578edcfa1bc96a321d590d31832b6ad55a26f0313362ce687e9abd6"
 dependencies = [
  "libc",
  "libredox",
@@ -3258,9 +3334,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "5.1.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4779c6901a562440c3786d08192c6fbda7c1c2060edd10006b05ee35d10f2d"
+checksum = "b7d950ca161dc355eaf28f82b11345ed76c6e1f6eb1f4f4479e0323b9e2fbd0e"
 dependencies = [
  "num-traits",
 ]
@@ -3298,7 +3374,7 @@ dependencies = [
  "log",
  "rayon",
  "rgb",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
  "zopfli",
 ]
 
@@ -3331,19 +3407,38 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
+[[package]]
+name = "parlance"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b6937eda350acc1a5d05872c3cbf99fe78619c269096e2be3d4a350058639d5"
+
 [[package]]
 name = "parley"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ada5338c3a9794af7342e6f765b6e78740db37378aced034d7bf72c96b94ed94"
+checksum = "d6c00ec192e1a402861526eff91a4b4690a2e5a17a4ae2deb772d72b49daf868"
 dependencies = [
  "accesskit",
  "fontique",
  "harfrust",
  "hashbrown 0.16.1",
+ "icu_normalizer",
+ "icu_properties",
+ "icu_segmenter",
  "linebender_resource_handle",
- "skrifa 0.37.0",
- "swash",
+ "parlance",
+ "parley_data",
+ "skrifa",
+]
+
+[[package]]
+name = "parley_data"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "232313eddc02ac27f015e8f8eeb7facce8a896116df7e3eda1bfd9f600a9a39d"
+dependencies = [
+ "icu_properties",
 ]
 
 [[package]]
@@ -3377,6 +3472,49 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
+[[package]]
+name = "phf"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+ "serde",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
+dependencies = [
+ "fastrand",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "pin-project"
 version = "1.1.11"
@@ -3502,9 +3640,9 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "portable-atomic-util"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5"
+checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3"
 dependencies = [
  "portable-atomic",
 ]
@@ -3515,6 +3653,8 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
 dependencies = [
+ "serde_core",
+ "writeable",
  "zerovec",
 ]
 
@@ -3587,9 +3727,9 @@ checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
 
 [[package]]
 name = "pulldown-cmark"
-version = "0.13.1"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c41efbf8f90ac44de7f3a868f0867851d261b56291732d0cbf7cceaaeb55a6"
+checksum = "7c3a14896dfa883796f1cb410461aef38810ea05f2b2c33c5aded3649095fdad"
 dependencies = [
  "bitflags 2.11.0",
  "memchr",
@@ -3638,7 +3778,7 @@ dependencies = [
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
  "rustls",
  "socket2",
  "thiserror 2.0.18",
@@ -3649,9 +3789,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.13"
+version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
+checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
 dependencies = [
  "aws-lc-rs",
  "bytes",
@@ -3659,7 +3799,7 @@ dependencies = [
  "lru-slab",
  "rand",
  "ring",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
  "rustls",
  "rustls-pki-types",
  "slab",
@@ -3771,17 +3911,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "read-fonts"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358"
-dependencies = [
- "bytemuck",
- "core_maths",
- "font-types 0.10.1",
-]
-
 [[package]]
 name = "read-fonts"
 version = "0.37.0"
@@ -3789,7 +3918,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5"
 dependencies = [
  "bytemuck",
- "font-types 0.11.0",
+ "core_maths",
+ "font-types",
 ]
 
 [[package]]
@@ -3964,9 +4094,18 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
 
 [[package]]
 name = "rustix"
@@ -4038,7 +4177,7 @@ checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784"
 dependencies = [
  "core-foundation 0.10.1",
  "core-foundation-sys",
- "jni",
+ "jni 0.21.1",
  "log",
  "once_cell",
  "rustls",
@@ -4059,9 +4198,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.9"
+version = "0.103.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
+checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -4092,9 +4231,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.28"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
 dependencies = [
  "windows-sys 0.61.2",
 ]
@@ -4257,20 +4396,32 @@ dependencies = [
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
 
 [[package]]
-name = "skrifa"
-version = "0.37.0"
+name = "simd_cesu8"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841"
+checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
 dependencies = [
- "bytemuck",
- "read-fonts 0.35.0",
+ "rustc_version",
+ "simdutf8",
 ]
 
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
+[[package]]
+name = "siphasher"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
+
 [[package]]
 name = "skrifa"
 version = "0.40.0"
@@ -4278,7 +4429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac"
 dependencies = [
  "bytemuck",
- "read-fonts 0.37.0",
+ "read-fonts",
 ]
 
 [[package]]
@@ -4433,17 +4584,6 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb"
 
-[[package]]
-name = "swash"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47846491253e976bdd07d0f9cc24b7daf24720d11309302ccbbc6e6b6e53550a"
-dependencies = [
- "skrifa 0.37.0",
- "yazi",
- "zeno",
-]
-
 [[package]]
 name = "syn"
 version = "2.0.117"
@@ -4545,9 +4685,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.26.0"
+version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
  "getrandom 0.4.2",
@@ -4625,16 +4765,16 @@ dependencies = [
 
 [[package]]
 name = "tiff"
-version = "0.10.3"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f"
+checksum = "b63feaf3343d35b6ca4d50483f94843803b0f51634937cc2ec519fc32232bc52"
 dependencies = [
  "fax",
  "flate2",
  "half",
  "quick-error",
  "weezl",
- "zune-jpeg 0.4.21",
+ "zune-jpeg",
 ]
 
 [[package]]
@@ -4719,9 +4859,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -4813,32 +4953,32 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "1.0.0+spec-1.1.0"
+version = "1.1.0+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32c2555c699578a4f59f0cc68e5116c8d7cabbd45e1409b989d4be085b53f13e"
+checksum = "97251a7c317e03ad83774a8752a7e81fb6067740609f75ea2b585b569a59198f"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.25.4+spec-1.1.0"
+version = "0.25.8+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7193cbd0ce53dc966037f54351dbbcf0d5a642c7f0038c382ef9e677ce8c13f2"
+checksum = "16bff38f1d86c47f9ff0647e6838d7bb362522bdf44006c7068c2b1e606f1f3c"
 dependencies = [
  "indexmap",
  "toml_datetime",
  "toml_parser",
- "winnow",
+ "winnow 1.0.0",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.9+spec-1.1.0"
+version = "1.1.0+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4"
+checksum = "2334f11ee363607eb04df9b8fc8a13ca1715a72ba8662a26ac285c98aabb4011"
 dependencies = [
- "winnow",
+ "winnow 1.0.0",
 ]
 
 [[package]]
@@ -4933,9 +5073,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.22"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
 dependencies = [
  "nu-ansi-term",
  "sharded-slab",
@@ -4972,9 +5112,9 @@ checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
 
 [[package]]
 name = "uds_windows"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b70b87d15e91f553711b40df3048faf27a7a04e01e0ddc0cf9309f0af7c2ca"
+checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
 dependencies = [
  "memoffset",
  "tempfile",
@@ -4983,8 +5123,8 @@ dependencies = [
 
 [[package]]
 name = "ui-events"
-version = "0.2.0"
-source = "git+https://github.com/AustinMReppert/ui-events?rev=7bc839dff9548883b0e0aaea85e48ab5f74caf05#7bc839dff9548883b0e0aaea85e48ab5f74caf05"
+version = "0.3.0"
+source = "git+https://github.com/endoli/ui-events?rev=d2dc8ba005a21870c5e4a7221cadf08fbf5f9ae7#d2dc8ba005a21870c5e4a7221cadf08fbf5f9ae7"
 dependencies = [
  "dpi",
  "keyboard-types",
@@ -4993,8 +5133,8 @@ dependencies = [
 
 [[package]]
 name = "ui-events-winit"
-version = "0.2.0"
-source = "git+https://github.com/AustinMReppert/ui-events?rev=7bc839dff9548883b0e0aaea85e48ab5f74caf05#7bc839dff9548883b0e0aaea85e48ab5f74caf05"
+version = "0.3.0"
+source = "git+https://github.com/endoli/ui-events?rev=d2dc8ba005a21870c5e4a7221cadf08fbf5f9ae7#d2dc8ba005a21870c5e4a7221cadf08fbf5f9ae7"
 dependencies = [
  "ui-events",
  "web-time",
@@ -5015,9 +5155,9 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.12.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
 
 [[package]]
 name = "unicode-width"
@@ -5073,9 +5213,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.22.0"
+version = "1.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37"
+checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9"
 dependencies = [
  "js-sys",
  "serde_core",
@@ -5096,15 +5236,15 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "vello"
-version = "0.7.0"
-source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
+version = "0.8.0"
+source = "git+https://github.com/linebender/vello.git?rev=5796226bfafd75fb121e938536ff74bb80a6114f#5796226bfafd75fb121e938536ff74bb80a6114f"
 dependencies = [
  "bytemuck",
  "futures-intrusive",
  "log",
  "peniko",
- "png 0.17.16",
- "skrifa 0.40.0",
+ "png 0.18.1",
+ "skrifa",
  "static_assertions",
  "thiserror 2.0.18",
  "vello_encoding",
@@ -5114,8 +5254,8 @@ dependencies = [
 
 [[package]]
 name = "vello_api"
-version = "0.7.0"
-source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
+version = "0.0.7"
+source = "git+https://github.com/linebender/vello.git?rev=5796226bfafd75fb121e938536ff74bb80a6114f#5796226bfafd75fb121e938536ff74bb80a6114f"
 dependencies = [
  "bytemuck",
  "peniko",
@@ -5123,24 +5263,25 @@ dependencies = [
 
 [[package]]
 name = "vello_common"
-version = "0.0.6"
-source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
+version = "0.0.7"
+source = "git+https://github.com/linebender/vello.git?rev=5796226bfafd75fb121e938536ff74bb80a6114f#5796226bfafd75fb121e938536ff74bb80a6114f"
 dependencies = [
  "bytemuck",
  "fearless_simd",
+ "guillotiere",
  "hashbrown 0.16.1",
  "log",
  "peniko",
- "png 0.17.16",
- "skrifa 0.40.0",
+ "png 0.18.1",
+ "skrifa",
  "smallvec",
  "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "vello_cpu"
-version = "0.0.6"
-source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
+version = "0.0.7"
+source = "git+https://github.com/linebender/vello.git?rev=5796226bfafd75fb121e938536ff74bb80a6114f#5796226bfafd75fb121e938536ff74bb80a6114f"
 dependencies = [
  "bytemuck",
  "hashbrown 0.16.1",
@@ -5150,20 +5291,20 @@ dependencies = [
 
 [[package]]
 name = "vello_encoding"
-version = "0.7.0"
-source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
+version = "0.8.0"
+source = "git+https://github.com/linebender/vello.git?rev=5796226bfafd75fb121e938536ff74bb80a6114f#5796226bfafd75fb121e938536ff74bb80a6114f"
 dependencies = [
  "bytemuck",
  "guillotiere",
  "peniko",
- "skrifa 0.40.0",
+ "skrifa",
  "smallvec",
 ]
 
 [[package]]
 name = "vello_hybrid"
-version = "0.0.6"
-source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
+version = "0.0.7"
+source = "git+https://github.com/linebender/vello.git?rev=5796226bfafd75fb121e938536ff74bb80a6114f#5796226bfafd75fb121e938536ff74bb80a6114f"
 dependencies = [
  "bytemuck",
  "hashbrown 0.16.1",
@@ -5177,8 +5318,8 @@ dependencies = [
 
 [[package]]
 name = "vello_shaders"
-version = "0.7.0"
-source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
+version = "0.8.0"
+source = "git+https://github.com/linebender/vello.git?rev=5796226bfafd75fb121e938536ff74bb80a6114f#5796226bfafd75fb121e938536ff74bb80a6114f"
 dependencies = [
  "bytemuck",
  "log",
@@ -5189,8 +5330,8 @@ dependencies = [
 
 [[package]]
 name = "vello_sparse_shaders"
-version = "0.0.6"
-source = "git+https://github.com/linebender/vello.git?rev=3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e#3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
+version = "0.0.7"
+source = "git+https://github.com/linebender/vello.git?rev=5796226bfafd75fb121e938536ff74bb80a6114f#5796226bfafd75fb121e938536ff74bb80a6114f"
 
 [[package]]
 name = "version_check"
@@ -5243,9 +5384,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.114"
+version = "0.2.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
+checksum = "6523d69017b7633e396a89c5efab138161ed5aafcbc8d3e5c5a42ae38f50495a"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -5256,23 +5397,19 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.64"
+version = "0.4.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
+checksum = "2d1faf851e778dfa54db7cd438b70758eba9755cb47403f3496edd7c8fc212f0"
 dependencies = [
- "cfg-if",
- "futures-util",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.114"
+version = "0.2.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
+checksum = "4e3a6c758eb2f701ed3d052ff5737f5bfe6614326ea7f3bbac7156192dc32e67"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5280,9 +5417,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.114"
+version = "0.2.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
+checksum = "921de2737904886b52bcbb237301552d05969a6f9c40d261eb0533c8b055fedf"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -5293,9 +5430,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.114"
+version = "0.2.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
+checksum = "a93e946af942b58934c604527337bad9ae33ba1d5c6900bbb41c2c07c2364a93"
 dependencies = [
  "unicode-ident",
 ]
@@ -5445,9 +5582,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.91"
+version = "0.3.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
+checksum = "84cde8507f4d7cfcb1185b8cb5890c494ffea65edbe1ba82cfd63661c805ed94"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5664,16 +5801,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "windows"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
-dependencies = [
- "windows-core 0.58.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.59.0"
@@ -5684,38 +5811,16 @@ dependencies = [
  "windows-targets 0.53.5",
 ]
 
-[[package]]
-name = "windows"
-version = "0.61.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
-dependencies = [
- "windows-collections 0.2.0",
- "windows-core 0.61.2",
- "windows-future 0.2.1",
- "windows-link 0.1.3",
- "windows-numerics 0.2.0",
-]
-
 [[package]]
 name = "windows"
 version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
 dependencies = [
- "windows-collections 0.3.2",
+ "windows-collections",
  "windows-core 0.62.2",
- "windows-future 0.3.2",
- "windows-numerics 0.3.1",
-]
-
-[[package]]
-name = "windows-collections"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
-dependencies = [
- "windows-core 0.61.2",
+ "windows-future",
+ "windows-numerics",
 ]
 
 [[package]]
@@ -5727,19 +5832,6 @@ dependencies = [
  "windows-core 0.62.2",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
-dependencies = [
- "windows-implement 0.58.0",
- "windows-interface 0.58.0",
- "windows-result 0.2.0",
- "windows-strings 0.1.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.59.0"
@@ -5747,25 +5839,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce"
 dependencies = [
  "windows-implement 0.59.0",
- "windows-interface 0.59.3",
+ "windows-interface",
  "windows-result 0.3.4",
  "windows-strings 0.3.1",
  "windows-targets 0.53.5",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.61.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
-dependencies = [
- "windows-implement 0.60.2",
- "windows-interface 0.59.3",
- "windows-link 0.1.3",
- "windows-result 0.3.4",
- "windows-strings 0.4.2",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.62.2"
@@ -5773,23 +5852,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
  "windows-implement 0.60.2",
- "windows-interface 0.59.3",
+ "windows-interface",
  "windows-link 0.2.1",
  "windows-result 0.4.1",
  "windows-strings 0.5.1",
 ]
 
-[[package]]
-name = "windows-future"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
-dependencies = [
- "windows-core 0.61.2",
- "windows-link 0.1.3",
- "windows-threading 0.1.0",
-]
-
 [[package]]
 name = "windows-future"
 version = "0.3.2"
@@ -5798,18 +5866,7 @@ checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
 dependencies = [
  "windows-core 0.62.2",
  "windows-link 0.2.1",
- "windows-threading 0.2.1",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "windows-threading",
 ]
 
 [[package]]
@@ -5834,17 +5891,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "windows-interface"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "windows-interface"
 version = "0.59.3"
@@ -5868,16 +5914,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
-[[package]]
-name = "windows-numerics"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
-dependencies = [
- "windows-core 0.61.2",
- "windows-link 0.1.3",
-]
-
 [[package]]
 name = "windows-numerics"
 version = "0.3.1"
@@ -5899,15 +5935,6 @@ dependencies = [
  "windows-strings 0.5.1",
 ]
 
-[[package]]
-name = "windows-result"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-result"
 version = "0.3.4"
@@ -5926,16 +5953,6 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result 0.2.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-strings"
 version = "0.3.1"
@@ -5945,15 +5962,6 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
-[[package]]
-name = "windows-strings"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
-dependencies = [
- "windows-link 0.1.3",
-]
-
 [[package]]
 name = "windows-strings"
 version = "0.5.1"
@@ -6056,15 +6064,6 @@ dependencies = [
  "windows_x86_64_msvc 0.53.1",
 ]
 
-[[package]]
-name = "windows-threading"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
-dependencies = [
- "windows-link 0.1.3",
-]
-
 [[package]]
 name = "windows-threading"
 version = "0.2.1"
@@ -6282,6 +6281,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "wit-bindgen"
 version = "0.51.0"
@@ -6466,12 +6474,6 @@ dependencies = [
  "linked-hash-map",
 ]
 
-[[package]]
-name = "yazi"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5"
-
 [[package]]
 name = "yeslogic-fontconfig-sys"
 version = "6.0.0"
@@ -6535,7 +6537,7 @@ dependencies = [
  "uds_windows",
  "uuid",
  "windows-sys 0.61.2",
- "winnow",
+ "winnow 0.7.15",
  "zbus_macros",
  "zbus_names",
  "zvariant",
@@ -6587,7 +6589,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f"
 dependencies = [
  "serde",
- "winnow",
+ "winnow 0.7.15",
  "zvariant",
 ]
 
@@ -6603,26 +6605,20 @@ dependencies = [
  "zvariant",
 ]
 
-[[package]]
-name = "zeno"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
-
 [[package]]
 name = "zerocopy"
-version = "0.8.40"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a789c6e490b576db9f7e6b6d661bcc9799f7c0ac8352f56ea20193b2681532e5"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.40"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f65c489a7071a749c849713807783f70672b28094011623e200cb86dcb835953"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6708,12 +6704,6 @@ dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "zune-core"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
-
 [[package]]
 name = "zune-core"
 version = "0.5.1"
@@ -6722,20 +6712,11 @@ checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9"
 
 [[package]]
 name = "zune-jpeg"
-version = "0.4.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713"
-dependencies = [
- "zune-core 0.4.12",
-]
-
-[[package]]
-name = "zune-jpeg"
-version = "0.5.12"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "410e9ecef634c709e3831c2cfdb8d9c32164fae1c67496d5b68fff728eec37fe"
+checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
 dependencies = [
- "zune-core 0.5.1",
+ "zune-core",
 ]
 
 [[package]]
@@ -6747,7 +6728,7 @@ dependencies = [
  "endi",
  "enumflags2",
  "serde",
- "winnow",
+ "winnow 0.7.15",
  "zvariant_derive",
  "zvariant_utils",
 ]
@@ -6775,5 +6756,5 @@ dependencies = [
  "quote",
  "serde",
  "syn",
- "winnow",
+ "winnow 0.7.15",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 435fdb17..1495f77b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,7 +61,7 @@ default-features = false
 features = ["sync", "time"]
 
 [workspace.dependencies.image]
-version = "0.25.9"
+version = "0.25.10"
 default-features = false
 features = []
 
@@ -76,7 +76,7 @@ default-features = false
 features = ["std"]
 
 [workspace.dependencies.cfg-if]
-version = "1.0.1"
+version = "1.0.4"
 
 [workspace.dependencies.winit]
 version = "0.30.13"
diff --git a/crates/craft_renderer/Cargo.toml b/crates/craft_renderer/Cargo.toml
index 3819f58e..cd4686b9 100644
--- a/crates/craft_renderer/Cargo.toml
+++ b/crates/craft_renderer/Cargo.toml
@@ -13,27 +13,27 @@ vello_hybrid_renderer_webgl = ["wgpu/webgl"]
 
 [dependencies.vello]
 git = "https://github.com/linebender/vello.git"
-rev = "3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
+rev = "5796226bfafd75fb121e938536ff74bb80a6114f"
 default-features = false
 features = ["wgpu"]
 optional = true
 
 [dependencies.vello_cpu]
 git = "https://github.com/linebender/vello.git"
-rev = "3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
+rev = "5796226bfafd75fb121e938536ff74bb80a6114f"
 optional = true
 features = []
 
 [dependencies.vello_hybrid]
 git = "https://github.com/linebender/vello.git"
-rev = "3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
+rev = "5796226bfafd75fb121e938536ff74bb80a6114f"
 default-features = false
 features = ["default"]
 optional = true
 
 [dependencies.vello_common]
 git = "https://github.com/linebender/vello.git"
-rev = "3a0908d63ffbd1c1c020a1d5f05da0119ec5c25e"
+rev = "5796226bfafd75fb121e938536ff74bb80a6114f"
 optional = true
 
 [dependencies.softbuffer]
diff --git a/crates/craft_retained/Cargo.toml b/crates/craft_retained/Cargo.toml
index 97155ac0..87975f13 100644
--- a/crates/craft_retained/Cargo.toml
+++ b/crates/craft_retained/Cargo.toml
@@ -39,13 +39,13 @@ smol_str = "0.3.4"
 workspace = true
 
 [dependencies.accesskit_winit]
-version = "0.29.2"
+version = "0.32.2"
 default-features = false
 features = ["tokio", "rwh_06", "accesskit_unix"]
 optional = true
 
 [dependencies.accesskit]
-version = "0.21.1"
+version = "0.24.0"
 default-features = false
 optional = true
 
@@ -109,17 +109,17 @@ workspace = true
 features = ["android-native-activity"]
 
 [dependencies.ui-events]
-git = "https://github.com/AustinMReppert/ui-events"
-rev = "7bc839dff9548883b0e0aaea85e48ab5f74caf05"
+git = "https://github.com/endoli/ui-events"
+rev = "d2dc8ba005a21870c5e4a7221cadf08fbf5f9ae7"
 features = ["kurbo"]
 
 [dependencies.ui-events-winit]
-git = "https://github.com/AustinMReppert/ui-events"
-rev = "7bc839dff9548883b0e0aaea85e48ab5f74caf05"
+git = "https://github.com/endoli/ui-events"
+rev = "d2dc8ba005a21870c5e4a7221cadf08fbf5f9ae7"
 features = []
 
 [dependencies.parley]
-version = "0.7.0"
+version = "0.8.0"
 default-features = false
 features = ["std"]
 
diff --git a/crates/craft_retained/src/elements/text.rs b/crates/craft_retained/src/elements/text.rs
index 441eacfd..96366018 100644
--- a/crates/craft_retained/src/elements/text.rs
+++ b/crates/craft_retained/src/elements/text.rs
@@ -251,6 +251,7 @@ impl ElementInternals for TextInner {
                 || accesskit::NodeId(create_unique_element_id()),
                 padding_box.x as f64,
                 padding_box.y as f64,
+                |_, _| {},
             );
         }
 
diff --git a/crates/craft_retained/src/elements/window.rs b/crates/craft_retained/src/elements/window.rs
index 9bf4f818..3347e43d 100644
--- a/crates/craft_retained/src/elements/window.rs
+++ b/crates/craft_retained/src/elements/window.rs
@@ -639,6 +639,7 @@ impl WindowInternal {
         let mut tree_update = TreeUpdate {
             nodes: vec![],
             tree: Some(tree),
+            tree_id: accesskit::TreeId::ROOT,
             focus: accesskit::NodeId(focus_id),
         };
 
diff --git a/crates/craft_retained/src/style/mod.rs b/crates/craft_retained/src/style/mod.rs
index 455c80b1..e9914ade 100644
--- a/crates/craft_retained/src/style/mod.rs
+++ b/crates/craft_retained/src/style/mod.rs
@@ -2,12 +2,12 @@ mod box_shadow;
 mod styles;
 mod taffy_conversions;
 
+pub use box_shadow::BoxShadow;
+use craft_primitives::{Color, ColorBrush};
+use parley::GenericFamily;
 use std::borrow::Cow;
 use std::fmt;
 use std::fmt::Debug;
-
-pub use box_shadow::BoxShadow;
-use craft_primitives::{Color, ColorBrush};
 pub use styles::*;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -237,16 +237,16 @@ where
 }
 
 impl TextStyleProperty {
-    pub(crate) fn to_parley_style_property(&self) -> Option<parley::StyleProperty<'static, ColorBrush>> {
+    pub(crate) fn to_parley_style_property(&self) -> Option<parley::StyleProperty<'_, ColorBrush>> {
         match self {
             TextStyleProperty::FontFamily(font_family) => {
                 let font_stack_cow_list = Cow::Owned(vec![
-                    parley::FontFamily::Named(Cow::Owned(font_family.to_string())),
-                    parley::FontFamily::Generic(parley::GenericFamily::SystemUi),
+                    parley::FontFamilyName::named(font_family),
+                    parley::FontFamilyName::Generic(GenericFamily::SystemUi),
                 ]);
-                let font_stack = parley::FontStack::List(font_stack_cow_list);
+                let font_stack = parley::FontFamily::List(font_stack_cow_list);
 
-                Some(parley::StyleProperty::FontStack(font_stack))
+                Some(parley::StyleProperty::FontFamily(font_stack))
             }
 
             TextStyleProperty::FontSize(font_size) => Some(parley::StyleProperty::FontSize(*font_size)),
diff --git a/crates/craft_retained/src/style/styles.rs b/crates/craft_retained/src/style/styles.rs
index 2b1dc95a..f6fffaf7 100644
--- a/crates/craft_retained/src/style/styles.rs
+++ b/crates/craft_retained/src/style/styles.rs
@@ -491,7 +491,7 @@ impl Style {
     }
 
     #[allow(clippy::wrong_self_convention)]
-    pub fn to_text_style(&'_ self) -> parley::TextStyle<'_, ColorBrush> {
+    pub fn to_text_style(&'_ self) -> parley::TextStyle<'_, '_, ColorBrush> {
         let font_size = self.get_font_size();
         let line_height = self.get_line_height();
         let font_weight = parley::FontWeight::new(self.get_font_weight().0 as f32);
@@ -508,12 +508,12 @@ impl Style {
         let font_stack_cow_list = if let Some(font_family) = self.get_font_family().name() {
             // Use the user-provided font and fallback to system UI fonts as needed.
             Cow::Owned(vec![
-                parley::FontFamily::Named(Cow::Owned(font_family.to_string())),
-                parley::FontFamily::Generic(parley::GenericFamily::SystemUi),
+                parley::FontFamilyName::named(font_family).into_owned(),
+                parley::FontFamilyName::Generic(GenericFamily::SystemUi),
             ])
         } else {
             // Just default to system UI fonts.
-            Cow::Owned(vec![parley::FontFamily::Generic(parley::GenericFamily::SystemUi)])
+            Cow::Owned(vec![parley::FontFamilyName::Generic(GenericFamily::SystemUi)])
         };
 
         let underline = self.get_underline();
@@ -530,15 +530,15 @@ impl Style {
             });
         }
 
-        let font_stack = parley::FontStack::List(font_stack_cow_list);
+        let font_family = parley::FontFamily::List(font_stack_cow_list);
         parley::TextStyle {
-            font_stack,
+            font_family,
             font_size,
             font_width: Default::default(),
             font_style,
             font_weight,
-            font_variations: parley::FontSettings::List(Cow::Borrowed(&[])),
-            font_features: parley::FontSettings::List(Cow::Borrowed(&[])),
+            font_variations: parley::FontVariations::List(Cow::Borrowed(&[])),
+            font_features: parley::FontFeatures::List(Cow::Borrowed(&[])),
             locale: Default::default(),
             brush,
             has_underline,
@@ -558,7 +558,7 @@ impl Style {
         }
     }
 
-    pub fn add_styles_to_style_set(&self, style_set: &mut parley::StyleSet<ColorBrush>) {
+    pub fn add_styles_to_style_set<'a>(&'a self, style_set: &'a mut parley::StyleSet<ColorBrush>) {
         let font_size = self.get_font_size();
         let line_height = self.get_line_height();
         let font_weight = parley::FontWeight::new(self.get_font_weight().0 as f32);
@@ -590,15 +590,15 @@ impl Style {
         let font_stack_cow_list = if let Some(font_family) = font_family.name() {
             // Use the user-provided font and fallback to system UI fonts as needed.
             Cow::Owned(vec![
-                parley::FontFamily::Named(Cow::Owned(font_family.to_string())),
-                parley::FontFamily::Generic(parley::GenericFamily::SystemUi),
+                parley::FontFamilyName::named(font_family).into_owned(),
+                parley::FontFamilyName::Generic(GenericFamily::SystemUi),
             ])
         } else {
             // Just default to system UI fonts.
-            Cow::Owned(vec![parley::FontFamily::Generic(parley::GenericFamily::SystemUi)])
+            Cow::Owned(vec![parley::FontFamilyName::Generic(parley::GenericFamily::SystemUi)])
         };
 
-        style_set.insert(parley::StyleProperty::from(parley::FontStack::List(
+        style_set.insert(parley::StyleProperty::from(parley::FontFamily::List(
             font_stack_cow_list,
         )));
         style_set.insert(parley::StyleProperty::FontSize(font_size));
diff --git a/crates/craft_retained/src/text/parley_editor.rs b/crates/craft_retained/src/text/parley_editor.rs
index d842a8b5..7b12b08f 100644
--- a/crates/craft_retained/src/text/parley_editor.rs
+++ b/crates/craft_retained/src/text/parley_editor.rs
@@ -1333,6 +1333,7 @@ impl PlainEditor {
             next_node_id,
             x_offset,
             y_offset,
+            |_, _| {},
         );
         if self.show_cursor {
             if let Some(selection) = self.selection.to_access_selection(&self.layout, &self.layout_access) {
diff --git a/crates/craft_retained/src/text/text_context.rs b/crates/craft_retained/src/text/text_context.rs
index db8bd4e1..392162a2 100644
--- a/crates/craft_retained/src/text/text_context.rs
+++ b/crates/craft_retained/src/text/text_context.rs
@@ -23,7 +23,7 @@ impl TextContext {
     pub fn tree_builder<'a>(
         &'a mut self,
         scale: f32,
-        raw_style: &TextStyle<'_, ColorBrush>,
+        raw_style: &TextStyle<'_, '_, ColorBrush>,
     ) -> TreeBuilder<'a, ColorBrush> {
         self.layout_context
             .tree_builder(&mut self.font_context, scale, true, raw_style)

From c75bc54527f455acbe088cd07f7a205d6483133c Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 29 Mar 2026 11:16:27 -0400
Subject: [PATCH 126/143] Begin adding examples to website.

---
 .../src/elements/traits/element.rs            |  10 +-
 .../src/elements/traits/element_internals.rs  |   4 +
 examples/counter_retained/main.rs             |  13 +-
 examples/pointer_events/main.rs               |  25 ++-
 website/src/examples.rs                       | 188 ++++++++++++++++++
 website/src/main.rs                           |   1 +
 website/src/router.rs                         |  15 +-
 website/src/theme.rs                          |   6 +-
 8 files changed, 239 insertions(+), 23 deletions(-)
 create mode 100644 website/src/examples.rs

diff --git a/crates/craft_retained/src/elements/traits/element.rs b/crates/craft_retained/src/elements/traits/element.rs
index 474689be..006ceb4f 100644
--- a/crates/craft_retained/src/elements/traits/element.rs
+++ b/crates/craft_retained/src/elements/traits/element.rs
@@ -1,8 +1,8 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-
 use craft_primitives::Color;
 use craft_primitives::geometry::ElementBox;
+use smol_str::SmolStr;
+use std::cell::RefCell;
+use std::rc::Rc;
 
 use ui_events::pointer::PointerId;
 use winit::dpi::PhysicalPosition;
@@ -89,6 +89,10 @@ pub trait Element: Clone + AsElement {
         self
     }
 
+    fn get_id(&self) -> Option<SmolStr> {
+        self.as_element_rc().borrow_mut().get_id()
+    }
+
     fn on_pointer_button_down(self, on_pointer_button_down: PointerEventHandler) -> Self {
         self.as_element_rc()
             .borrow_mut()
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index 1649631c..c19d7422 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -527,6 +527,10 @@ pub trait ElementInternals: ElementData + Any + Drop {
             .push(on_lost_pointer_capture);
     }
 
+    fn get_id(&self) -> Option<smol_str::SmolStr> {
+        self.element_data().id.clone()
+    }
+
     fn set_id(&mut self, id: &str) {
         self.element_data_mut().id = Some(id.into());
     }
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index 469df1d9..03f58cca 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -31,12 +31,11 @@ fn create_button(label: &str, base_color: Color, delta: i64, state: Rc<RefCell<i
         .push(Text::new(label).font_size(24.0).color(Color::WHITE).selectable(false))
 }
 
-pub(crate) fn main() {
-    setup_logging();
+pub fn counter() -> Container {
     let count = Rc::new(RefCell::new(0));
     let count_text = Text::new(&format!("Count: {}", count.borrow()));
 
-    Window::new("Counter")
+    Container::new()
         .flex_direction(FlexDirection::Column)
         .justify_content(Some(JustifyContent::Center))
         .align_items(Some(AlignItems::Center))
@@ -61,7 +60,13 @@ pub(crate) fn main() {
                     count.clone(),
                     count_text.clone(),
                 ))
-        });
+        })
+}
+
+pub(crate) fn main() {
+    setup_logging();
+
+    Window::new("Counter").width(pct(100)).height(pct(100)).push(counter());
 
     craft_main(CraftOptions::basic("Counter"));
 }
diff --git a/examples/pointer_events/main.rs b/examples/pointer_events/main.rs
index df6e3a11..3b125175 100644
--- a/examples/pointer_events/main.rs
+++ b/examples/pointer_events/main.rs
@@ -1,10 +1,10 @@
 use std::rc::Rc;
 
-use craft_retained::Color;
 use craft_retained::elements::{Container, Element, Text, Window};
 use craft_retained::events::Event;
 use craft_retained::events::ui_events::pointer::PointerId;
 use craft_retained::style::{AlignItems, Display, FlexDirection, JustifyContent, Overflow, Position, Unit};
+use craft_retained::{Color, pct};
 
 fn title(txt: &str) -> Text {
     Text::new(txt)
@@ -147,21 +147,26 @@ fn pointer_enter_leave_example() -> Container {
         .push(event_log)
 }
 
-#[allow(unused)]
-#[cfg(not(target_os = "android"))]
-fn main() {
-    let pointer_capture_container = Container::new();
-    let pointer_capture_event_log = Text::new("");
-    let pointer_capture_draggable_container = Text::new("Draggable");
-
-    Window::new("Pointer Events")
+pub fn pointer_events() -> Container {
+    Container::new()
         .display(Display::Flex)
         .flex_direction(FlexDirection::Column)
         .overflow(Overflow::Visible, Overflow::Scroll)
         .max_height(Unit::Percentage(100.0))
+        .width(pct(100))
+        .height(pct(100))
         .gap(Unit::Px(50.0), Unit::Px(50.0))
         .push(pointer_capture_example())
-        .push(pointer_enter_leave_example());
+        .push(pointer_enter_leave_example())
+}
+
+#[allow(unused)]
+#[cfg(not(target_os = "android"))]
+fn main() {
+    Window::new("Pointer Events")
+        .width(pct(100))
+        .height(pct(100))
+        .push(pointer_events());
 
     use craft_retained::CraftOptions;
     //util::setup_logging();
diff --git a/website/src/examples.rs b/website/src/examples.rs
new file mode 100644
index 00000000..8340e06c
--- /dev/null
+++ b/website/src/examples.rs
@@ -0,0 +1,188 @@
+#[path = "../../examples/counter_retained/main.rs"]
+pub mod counter_retained;
+
+#[path = "../../examples/text/main.rs"]
+mod text;
+
+#[path = "../../examples/pointer_events/main.rs"]
+mod pointer_events;
+
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use craft_retained::elements::{Container, Dropdown, Element, Text};
+use craft_retained::events::ui_events::pointer::PointerButton;
+use craft_retained::style::Display::Flex;
+use craft_retained::style::{FlexDirection, FontWeight, Overflow, Unit};
+use craft_retained::{palette, pct, px};
+
+use util::ExampleProps;
+
+use crate::WebsiteGlobalState;
+use crate::examples::counter_retained::counter;
+use crate::examples::pointer_events::pointer_events;
+use crate::navbar::NAVBAR_HEIGHT;
+use crate::router::NavigateFn;
+use crate::theme::{ACTIVE_LINK_COLOR, DEFAULT_LINK_COLOR, MOBILE_MEDIA_QUERY_WIDTH, WRAPPER_PADDING_LEFT, WRAPPER_PADDING_RIGHT, wrapper};
+
+const COUNTER_EXAMPLE_LINK: &str = "/examples/counter";
+const POINTER_EVENTS_EXAMPLE_LINK: &str = "/examples/pointer-events";
+
+fn create_examples_link(
+    label: &str,
+    example_link: &str,
+    example_to_show: &str,
+    context: Rc<RefCell<WebsiteGlobalState>>,
+    navigate_fn: NavigateFn,
+    example_container: Container,
+    examples: Vec<Container>,
+) -> Text {
+    let example_link_captured = example_link.to_string();
+    let mut text = Text::new(label)
+        .color(DEFAULT_LINK_COLOR)
+        .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {
+            let context = context.clone();
+            if pointer_button_event.button == Some(PointerButton::Primary) {
+                //navigate_fn(example_link_captured.as_str());
+                update_active_example(example_link_captured.as_str(), example_container.clone(), &examples)
+            }
+        }))
+        .id(example_link)
+        .selectable(false);
+    if example_to_show == example_link {
+        text = text.color(ACTIVE_LINK_COLOR);
+    }
+    text
+}
+
+fn examples_sidebar(
+    example_to_show: &str,
+    context: Rc<RefCell<WebsiteGlobalState>>,
+    navigate_fn: NavigateFn,
+    example_container: Container,
+    examples: Vec<Container>,
+) -> Container {
+    let mut links = vec![
+        create_examples_link(
+            "Counter",
+            COUNTER_EXAMPLE_LINK,
+            example_to_show,
+            context.clone(),
+            navigate_fn.clone(),
+            example_container.clone(),
+            examples.clone(),
+        ),
+        create_examples_link(
+            "Pointer Events",
+            POINTER_EVENTS_EXAMPLE_LINK,
+            example_to_show,
+            context.clone(),
+            navigate_fn.clone(),
+            example_container.clone(),
+            examples.clone(),
+        ),
+    ];
+
+    if true
+    /*window.window_width() <= MOBILE_MEDIA_QUERY_WIDTH*/
+    {
+        let container = Container::new()
+            .display(Flex)
+            .flex_direction(FlexDirection::Column)
+            .gap(px(12), px(12))
+            .push(
+                Text::new("Examples")
+                    .selectable(false)
+                    .font_weight(FontWeight::MEDIUM)
+                    .font_size(18.0),
+            );
+
+        let mut dropdown = Container::new()
+            .display(Flex)
+            .flex_direction(FlexDirection::Column)
+            .min_width(px(200))
+            .width(px(200))
+            .max_width(px(300));
+
+        for (index, link) in links.drain(..).enumerate() {
+            let is_selected = link.get_id().map(|id| id == example_to_show).unwrap_or(false);
+            if is_selected {
+                //dropdown = dropdown.selected_item(index);
+            }
+            dropdown = dropdown.push(link);
+        }
+
+        container.push(dropdown)
+    } else {
+        let mut container = Container::new()
+            .display(Flex)
+            .flex_direction(FlexDirection::Column)
+            .gap(px(15), px(15))
+            .min_width(px(200))
+            .padding(px(0), px(20), px(20), px(0))
+            .height(pct(100))
+            .push(Text::new("Examples").font_weight(FontWeight::MEDIUM).font_size(24.0));
+
+        for link in links.drain(..) {
+            container = container.push(link);
+        }
+
+        container
+    }
+}
+
+pub fn examples(context: Rc<RefCell<WebsiteGlobalState>>, navigate_fn: NavigateFn) -> Container {
+    let route = context.borrow().get_route();
+
+    let examples = vec![
+        counter().id(COUNTER_EXAMPLE_LINK),
+        pointer_events().id(POINTER_EVENTS_EXAMPLE_LINK),
+    ];
+
+    let container_height = 600.0; //(context.window().window_height() - NAVBAR_HEIGHT - vertical_padding * 2.0).max(0.0);
+
+    let example_container = Container::new()
+        .width(pct(100))
+        .height(px(container_height))
+        .background_color(palette::css::WHITE)
+        .push(examples[0].clone());
+
+    let vertical_padding = 50.0;
+    let wrapper = wrapper()
+        .padding(
+            Unit::Px(vertical_padding),
+            WRAPPER_PADDING_RIGHT,
+            Unit::Px(vertical_padding),
+            WRAPPER_PADDING_LEFT,
+        )
+        .push(examples_sidebar(
+            &route,
+            context.clone(),
+            navigate_fn.clone(),
+            example_container.clone(),
+            examples.clone(),
+        ));
+
+    /*if context.window().window_width() <= MOBILE_MEDIA_QUERY_WIDTH {
+        wrapper = wrapper.flex_direction(FlexDirection::Column);
+        wrapper = wrapper.gap(px(20), px(20));
+    }*/
+
+    let wrapper = wrapper.push(example_container.clone());
+
+    update_active_example(&route, example_container.clone(), &examples);
+
+    Container::new()
+        .overflow(Overflow::Visible, Overflow::Scroll)
+        .push(wrapper)
+}
+
+fn update_active_example(active: &str, example_container: Container, examples: &[Container]) {
+    for example in examples {
+        if example.get_id().unwrap() == active {
+            example_container.remove_all_children();
+            example_container.push(example.clone());
+            return;
+        }
+    }
+}
diff --git a/website/src/main.rs b/website/src/main.rs
index 204acafd..6a4f01dd 100644
--- a/website/src/main.rs
+++ b/website/src/main.rs
@@ -7,6 +7,7 @@ use craft_retained::{CraftOptions, craft_main, pct};
 use crate::router::Router;
 
 mod docs;
+mod examples;
 mod index;
 mod link;
 mod navbar;
diff --git a/website/src/router.rs b/website/src/router.rs
index f0f3dc44..0ac797fb 100644
--- a/website/src/router.rs
+++ b/website/src/router.rs
@@ -6,6 +6,7 @@ use std::rc::{Rc, Weak};
 use std::sync::Arc;
 
 use crate::docs::docs;
+use crate::examples::examples;
 use crate::index::index_page;
 use crate::navbar::navbar;
 use crate::theme::BODY_BACKGROUND_COLOR;
@@ -17,6 +18,7 @@ pub struct Router {
     global_state: Rc<RefCell<WebsiteGlobalState>>,
     index: Container,
     docs: Container,
+    examples: Container,
 }
 
 pub type NavigateFn = Rc<dyn Fn(&str) + 'static>;
@@ -46,6 +48,7 @@ impl Router {
                 root: window.clone(),
                 index: index_page(navigate_logic.clone()),
                 docs: docs(navigate_logic.clone()),
+                examples: examples(global_state.clone(), navigate_logic.clone()),
                 global_state: global_state.clone(),
             })
         })
@@ -61,9 +64,15 @@ impl Router {
     }
 
     pub fn navigate(&self) {
-        let page = match self.global_state.borrow().route.as_str() {
-            "/" => self.index.clone(),
-            "/docs" => self.docs.clone(),
+        let global_state = self.global_state.borrow();
+        let full_route = global_state.route.as_str();
+
+        let base_route = full_route.split('/').find(|s| !s.is_empty()).unwrap_or("");
+
+        let page = match base_route {
+            "" => self.index.clone(),
+            "docs" => self.docs.clone(),
+            "examples" => self.examples.clone(),
             _ => self.index.clone(),
         };
 
diff --git a/website/src/theme.rs b/website/src/theme.rs
index 17456eb1..d34ce50b 100644
--- a/website/src/theme.rs
+++ b/website/src/theme.rs
@@ -8,8 +8,8 @@ pub(crate) const NAVBAR_BACKGROUND_COLOR: Color = Color::from_rgb8(255, 255, 255
 pub(crate) const NAVBAR_TEXT_COLOR: Color = Color::from_rgb8(50, 50, 50);
 //pub(crate) const NAVBAR_TEXT_HOVERED_COLOR: Color = Color::from_rgb8(0, 0, 0);
 
-//pub(crate) const ACTIVE_LINK_COLOR: Color = Color::from_rgb8(42, 108, 200);
-//pub(crate) const DEFAULT_LINK_COLOR: Color = Color::from_rgb8(102, 102, 102);
+pub(crate) const ACTIVE_LINK_COLOR: Color = Color::from_rgb8(42, 108, 200);
+pub(crate) const DEFAULT_LINK_COLOR: Color = Color::from_rgb8(102, 102, 102);
 
 pub(crate) const WRAPPER_MAX_WIDTH: Unit = Unit::Px(1300.0);
 pub(crate) const WRAPPER_MARGIN_LEFT: Unit = Unit::Auto;
@@ -17,7 +17,7 @@ pub(crate) const WRAPPER_MARGIN_RIGHT: Unit = Unit::Auto;
 pub(crate) const WRAPPER_PADDING_LEFT: Unit = Unit::Px(20.0);
 pub(crate) const WRAPPER_PADDING_RIGHT: Unit = Unit::Px(20.0);
 
-//pub(crate) const MOBILE_MEDIA_QUERY_WIDTH: u32 = 850;
+pub(crate) const MOBILE_MEDIA_QUERY_WIDTH: u32 = 850;
 
 pub(crate) fn wrapper() -> Container {
     Container::new()

From bb373f7f4ca470813b00b04b5203d9b045676783 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Mon, 30 Mar 2026 13:23:16 -0400
Subject: [PATCH 127/143] Start adding transform support

---
 crates/craft_renderer/src/render_command.rs   |  8 +++-
 crates/craft_renderer/src/render_list.rs      |  2 +-
 crates/craft_renderer/src/vello/mod.rs        | 47 +++++++++++--------
 crates/craft_renderer/src/vello/tinyvg.rs     |  4 ++
 crates/craft_renderer/src/vello_cpu/mod.rs    |  3 ++
 crates/craft_renderer/src/vello_hybrid/mod.rs |  3 ++
 6 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/crates/craft_renderer/src/render_command.rs b/crates/craft_renderer/src/render_command.rs
index 9a07b383..021d0c4d 100644
--- a/crates/craft_renderer/src/render_command.rs
+++ b/crates/craft_renderer/src/render_command.rs
@@ -3,7 +3,7 @@ use std::rc::Weak;
 
 use peniko::Color;
 
-use craft_primitives::geometry::{BezPath, Rectangle, Vec2};
+use craft_primitives::geometry::{Affine, BezPath, Rectangle, Vec2};
 
 use craft_resource_manager::ResourceIdentifier;
 
@@ -12,6 +12,7 @@ use crate::text_renderer_data::{TextData, TextScroll};
 
 #[derive(Clone)]
 pub enum RenderCommand {
+    SetTransform(SetTransformCmd),
     DrawRect(DrawRectCmd),
     DrawRectOutline(DrawRectOutlineCmd),
     DrawImage(DrawImageCmd),
@@ -25,6 +26,11 @@ pub enum RenderCommand {
     BoxShadowCmd(BoxShadowCmd),
 }
 
+#[derive(Clone)]
+pub struct SetTransformCmd {
+    pub transform: Affine,
+}
+
 #[derive(Clone)]
 pub struct DrawRectCmd {
     pub rect: Rectangle,
diff --git a/crates/craft_renderer/src/render_list.rs b/crates/craft_renderer/src/render_list.rs
index 205c2350..6fb75fb9 100644
--- a/crates/craft_renderer/src/render_list.rs
+++ b/crates/craft_renderer/src/render_list.rs
@@ -3,7 +3,7 @@ use std::rc::Weak;
 
 use peniko::Color;
 
-use craft_primitives::geometry::{BezPath, Rectangle, Shape};
+use craft_primitives::geometry::{Affine, BezPath, Rectangle, Shape};
 use craft_resource_manager::ResourceIdentifier;
 
 use crate::Brush;
diff --git a/crates/craft_renderer/src/vello/mod.rs b/crates/craft_renderer/src/vello/mod.rs
index 635cb2b2..0de26c7e 100644
--- a/crates/craft_renderer/src/vello/mod.rs
+++ b/crates/craft_renderer/src/vello/mod.rs
@@ -1,6 +1,7 @@
 mod tinyvg;
 
 use std::any::Any;
+use std::ops::Mul;
 use std::sync::Arc;
 
 use craft_primitives::Color;
@@ -8,7 +9,7 @@ use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::ResourceManager;
 use craft_resource_manager::resource::Resource;
 
-use peniko::{BrushRef, ImageAlphaType};
+use peniko::{BrushRef, ImageAlphaType, ImageBrushRef};
 
 use vello::kurbo::{Affine, Rect, Stroke};
 use vello::peniko::{BlendMode, Blob, Fill};
@@ -52,6 +53,8 @@ pub struct VelloRenderer {
     scene: Scene,
     pub surface_clear_color: Color,
     pub render_into_texture: bool,
+
+    transform: Affine
 }
 
 impl RenderSurface {
@@ -240,18 +243,19 @@ impl VelloRenderer {
             scene: Scene::new(),
             surface_clear_color: Color::WHITE,
             render_into_texture,
+            transform: Affine::IDENTITY,
         }
     }
 }
 
-fn vello_draw_rect(scene: &mut Scene, rectangle: Rectangle, fill_color: Color) {
+fn vello_draw_rect(scene: &mut Scene, rectangle: Rectangle, fill_color: Color, transform: &Affine) {
     let rect = Rect::new(
         rectangle.x as f64,
         rectangle.y as f64,
         (rectangle.x + rectangle.width) as f64,
         (rectangle.y + rectangle.height) as f64,
     );
-    scene.fill(Fill::NonZero, Affine::IDENTITY, fill_color, None, &rect);
+    scene.fill(Fill::NonZero, *transform, fill_color, None, &rect);
 }
 
 impl Renderer for VelloRenderer {
@@ -285,13 +289,16 @@ impl Renderer for VelloRenderer {
             let scene = &mut self.scene;
 
             match command {
+                RenderCommand::SetTransform(cmd) => {
+                    self.transform = cmd.transform;
+                }
                 RenderCommand::DrawRect(cmd) => {
-                    vello_draw_rect(scene, cmd.rect, cmd.color);
+                    vello_draw_rect(scene, cmd.rect, cmd.color, &self.transform);
                 }
                 RenderCommand::DrawRectOutline(cmd) => {
                     self.scene.stroke(
                         &Stroke::new(cmd.thickness),
-                        Affine::IDENTITY,
+                        self.transform,
                         cmd.outline_color,
                         None,
                         &cmd.rect.to_kurbo(),
@@ -312,24 +319,23 @@ impl Renderer for VelloRenderer {
                             width: image.width(),
                             height: image.height(),
                         };
-
-                        let vello_image = vello::peniko::ImageBrush::new(vello_image);
-
-                        let mut transform = Affine::IDENTITY;
-                        transform =
-                            transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
-                        transform = transform.pre_scale_non_uniform(
-                            cmd.rect.width as f64 / image.width() as f64,
-                            cmd.rect.height as f64 / image.height() as f64,
+                        let brush_ref: ImageBrushRef = (&vello_image).into();
+                        let rect = Rect::new(
+                            cmd.rect.x as f64,
+                            cmd.rect.y as f64,
+                            cmd.rect.width as f64,
+                            cmd.rect.height as f64,
                         );
-                        scene.draw_image(&vello_image, transform);
+
+                        scene.fill(Fill::NonZero, self.transform, brush_ref, None, &rect);
                     }
                 }
                 RenderCommand::DrawText(cmd) => {
                     let text_transform =
                         Affine::default().with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
                     let scroll = cmd.text_scroll.unwrap_or(TextScroll::default()).scroll_y;
-                    let text_transform = text_transform.then_translate(kurbo::Vec2::new(0.0, -scroll as f64));
+                    let mut text_transform = text_transform.then_translate(kurbo::Vec2::new(0.0, -scroll as f64));
+                    text_transform = self.transform.mul(text_transform);
 
                     let c = cmd.data.upgrade();
                     if c.is_none() {
@@ -377,7 +383,7 @@ impl Renderer for VelloRenderer {
                                 width: background.width,
                                 height: background.height,
                             };
-                            vello_draw_rect(scene, background_rect, *color);
+                            vello_draw_rect(scene, background_rect, *color, &self.transform);
                         }
 
                         for (selection, selection_color) in &line.selections {
@@ -387,7 +393,7 @@ impl Renderer for VelloRenderer {
                                 width: selection.width,
                                 height: selection.height,
                             };
-                            vello_draw_rect(scene, selection_rect, *selection_color);
+                            vello_draw_rect(scene, selection_rect, *selection_color, &self.transform);
                         }
                     });
 
@@ -432,7 +438,7 @@ impl Renderer for VelloRenderer {
                             width: cursor.width,
                             height: cursor.height,
                         };
-                        vello_draw_rect(scene, cursor_rect, *cursor_color);
+                        vello_draw_rect(scene, cursor_rect, *cursor_color, &self.transform);
                     }
                 }
                 RenderCommand::DrawTinyVg(cmd) => {
@@ -442,6 +448,7 @@ impl Renderer for VelloRenderer {
                         resource_manager.clone(),
                         cmd.resource_id.clone(),
                         &cmd.override_color,
+                        &self.transform
                     );
                 }
                 RenderCommand::PushLayer(cmd) => {
@@ -458,7 +465,7 @@ impl Renderer for VelloRenderer {
                     scene.pop_layer();
                 }
                 RenderCommand::FillBezPath(cmd) => {
-                    scene.fill(Fill::NonZero, Affine::IDENTITY, &cmd.brush, None, &cmd.path);
+                    scene.fill(Fill::NonZero, self.transform, &cmd.brush, None, &cmd.path);
                 }
                 _ => {}
             }
diff --git a/crates/craft_renderer/src/vello/tinyvg.rs b/crates/craft_renderer/src/vello/tinyvg.rs
index bd0ea5b6..1aa6ef89 100644
--- a/crates/craft_renderer/src/vello/tinyvg.rs
+++ b/crates/craft_renderer/src/vello/tinyvg.rs
@@ -1,3 +1,4 @@
+use std::ops::Mul;
 use std::sync::Arc;
 
 use craft_primitives::geometry::Rectangle;
@@ -36,6 +37,7 @@ pub(crate) fn draw_tiny_vg(
     resource_manager: Arc<ResourceManager>,
     resource_identifier: ResourceIdentifier,
     override_color: &Option<Color>,
+    transform: &Affine
 ) {
     let resource = resource_manager.get(&resource_identifier);
     if let Some(resource) = resource
@@ -63,6 +65,8 @@ pub(crate) fn draw_tiny_vg(
             rectangle.width as f64 / svg_width as f64,
             rectangle.height as f64 / svg_height as f64,
         );
+        
+        affine = transform.mul(affine);
 
         for command in &tiny_vg.draw_commands {
             match command {
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index 420441a2..c79bcdb1 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -160,6 +160,9 @@ impl Renderer for VelloCpuRenderer {
 
         SortedCommands::draw(render_list, &render_list.overlay, &mut |command: &RenderCommand| {
             match command {
+                RenderCommand::SetTransform(cmd) => {
+                    self.render_context.set_transform(cmd.transform);
+                }
                 RenderCommand::DrawRect(cmd) => {
                     self.render_context.set_paint(PaintType::Solid(cmd.color));
                     self.render_context.fill_rect(&cmd.rect.to_kurbo());
diff --git a/crates/craft_renderer/src/vello_hybrid/mod.rs b/crates/craft_renderer/src/vello_hybrid/mod.rs
index 3b430b1d..f7817cab 100644
--- a/crates/craft_renderer/src/vello_hybrid/mod.rs
+++ b/crates/craft_renderer/src/vello_hybrid/mod.rs
@@ -248,6 +248,9 @@ impl CraftRenderer for VelloHybridRenderer {
             let scene = &mut self.scene;
 
             match command {
+                RenderCommand::SetTransform(cmd) => {
+                    self.scene.set_transform(cmd.transform);
+                }
                 RenderCommand::DrawRect(cmd) => {
                     vello_draw_rect(scene, cmd.rect, cmd.color);
                 }

From f50ef4d7e55444a595df84d9c7d9b31b55ce1b1f Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Fri, 3 Apr 2026 19:36:34 -0400
Subject: [PATCH 128/143] Switch to local_runtime

---
 Cargo.lock                      |  8 ++--
 Cargo.toml                      |  2 +-
 crates/craft_runtime/src/lib.rs | 85 +++++----------------------------
 3 files changed, 17 insertions(+), 78 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f63e951a..e792d5f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4883,9 +4883,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.50.0"
+version = "1.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
+checksum = "2bd1c4c0fc4a7ab90fc15ef6daaa3ec3b893f004f915f2392557ed23237820cd"
 dependencies = [
  "bytes",
  "libc",
@@ -4898,9 +4898,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.6.1"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 1495f77b..1d940009 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,7 +56,7 @@ default-features = false
 features = []
 
 [workspace.dependencies.tokio]
-version = "1.50.0"
+version = "1.51.0"
 default-features = false
 features = ["sync", "time"]
 
diff --git a/crates/craft_runtime/src/lib.rs b/crates/craft_runtime/src/lib.rs
index 60b3bfb0..c3ca05f6 100644
--- a/crates/craft_runtime/src/lib.rs
+++ b/crates/craft_runtime/src/lib.rs
@@ -9,18 +9,18 @@ pub use tokio::*;
 
 thread_local! {
     #[cfg(not(target_arch = "wasm32"))]
-    pub(crate) static LOCAL_SET: tokio::task::LocalSet = tokio::task::LocalSet::new();
+    pub(crate) static LOCAL_SET: task::LocalSet = task::LocalSet::new();
 }
 
 pub struct CraftRuntime {
     #[cfg(not(target_arch = "wasm32"))]
-    tokio_runtime: tokio::runtime::Runtime,
+    tokio_runtime: runtime::LocalRuntime,
 }
 
 #[derive(Clone)]
 pub struct CraftRuntimeHandle {
     #[cfg(not(target_arch = "wasm32"))]
-    tokio_runtime: tokio::runtime::Handle,
+    tokio_runtime: runtime::Handle,
 }
 
 #[allow(clippy::derivable_impls)]
@@ -31,7 +31,7 @@ impl Default for CraftRuntime {
                 Self { }
             } else {
                 Self {
-                    tokio_runtime: tokio::runtime::Builder::new_current_thread().enable_all().build().expect("Failed to create tokio runtime."),
+                    tokio_runtime: runtime::LocalRuntime::new().expect("Failed to create tokio runtime."),
                 }
             }
         }
@@ -52,7 +52,7 @@ impl CraftRuntime {
                 Self { }
             } else {
                 Self {
-                    tokio_runtime: tokio::runtime::Builder::new_current_thread().enable_all().build().expect("Failed to create tokio runtime."),
+                    tokio_runtime: runtime::LocalRuntime::new().expect("Failed to create tokio runtime."),
                 }
             }
         }
@@ -85,48 +85,23 @@ impl CraftRuntime {
     where
         F: Future<Output = ()> + 'static + Send,
     {
-        tokio::spawn(future);
-    }
-
-    #[allow(dead_code)]
-    #[cfg(target_arch = "wasm32")]
-    pub(crate) fn runtime_spawn<F>(&self, future: F)
-    where
-        F: Future<Output = ()> + 'static,
-    {
-        wasm_bindgen_futures::spawn_local(future)
+        spawn(future);
     }
 
     #[cfg(not(target_arch = "wasm32"))]
     pub fn runtime_spawn<F>(&self, future: F)
-    where
-        F: Future<Output = ()> + 'static + Send,
-    {
-        self.tokio_runtime.spawn(future);
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    pub fn borrow_tokio_runtime(&mut self) -> &mut tokio::runtime::Runtime {
-        &mut self.tokio_runtime
-    }
-
-    /// Match the underlying runtime's type.
-    #[allow(dead_code)]
-    #[cfg(target_arch = "wasm32")]
-    pub fn native_spawn<F>(future: F)
     where
         F: Future<Output = ()> + 'static,
     {
+        #[cfg(not(target_arch = "wasm32"))]
+        self.tokio_runtime.spawn_local(future);
+        #[cfg(target_arch = "wasm32")]
         wasm_bindgen_futures::spawn_local(future)
     }
 
-    #[allow(dead_code)]
     #[cfg(not(target_arch = "wasm32"))]
-    pub fn native_spawn<F>(future: F)
-    where
-        F: Future<Output = ()> + Send + 'static,
-    {
-        tokio::spawn(future);
+    pub fn borrow_tokio_runtime(&mut self) -> &mut runtime::LocalRuntime {
+        &mut self.tokio_runtime
     }
 
     /// Block on or spawn a future on if blocking is not supported by the runtime.
@@ -192,47 +167,11 @@ impl CraftRuntimeHandle {
         self.tokio_runtime.spawn(future);
     }
 
-    #[allow(dead_code)]
-    #[cfg(target_arch = "wasm32")]
-    pub(crate) fn runtime_spawn<F>(&self, future: F)
-    where
-        F: Future<Output = ()> + 'static,
-    {
-        wasm_bindgen_futures::spawn_local(future)
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    pub fn runtime_spawn<F>(&self, future: F)
-    where
-        F: Future<Output = ()> + 'static + Send,
-    {
-        self.tokio_runtime.spawn(future);
-    }
-
     #[cfg(not(target_arch = "wasm32"))]
-    pub fn borrow_tokio_runtime(&mut self) -> &mut tokio::runtime::Handle {
+    pub fn borrow_tokio_runtime(&mut self) -> &mut runtime::Handle {
         &mut self.tokio_runtime
     }
 
-    /// Match the underlying runtime's type.
-    #[allow(dead_code)]
-    #[cfg(target_arch = "wasm32")]
-    pub fn native_spawn<F>(future: F)
-    where
-        F: Future<Output = ()> + 'static,
-    {
-        wasm_bindgen_futures::spawn_local(future)
-    }
-
-    #[allow(dead_code)]
-    #[cfg(not(target_arch = "wasm32"))]
-    pub fn native_spawn<F>(future: F)
-    where
-        F: Future<Output = ()> + Send + 'static,
-    {
-        tokio::spawn(future);
-    }
-
     /// Block on or spawn a future on if blocking is not supported by the runtime.
     #[allow(dead_code)]
     #[cfg(target_arch = "wasm32")]

From dc0294c3057af33c60f8461830c32064da956d2f Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Fri, 3 Apr 2026 20:31:48 -0400
Subject: [PATCH 129/143] Update taffy

---
 Cargo.lock                       | 4 ++--
 crates/craft_retained/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e792d5f8..19f54330 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4668,8 +4668,8 @@ dependencies = [
 
 [[package]]
 name = "taffy"
-version = "0.9.2"
-source = "git+https://github.com/AustinMReppert/taffy?rev=c99a8e60bf43ea695abda49a4be2b07baf683934#c99a8e60bf43ea695abda49a4be2b07baf683934"
+version = "0.10.0"
+source = "git+https://github.com/AustinMReppert/taffy?rev=41af7ddf5806dcf67a3d702fcbe37b340a5cc8b8#41af7ddf5806dcf67a3d702fcbe37b340a5cc8b8"
 dependencies = [
  "arrayvec",
  "grid",
diff --git a/crates/craft_retained/Cargo.toml b/crates/craft_retained/Cargo.toml
index 87975f13..26d40a29 100644
--- a/crates/craft_retained/Cargo.toml
+++ b/crates/craft_retained/Cargo.toml
@@ -93,7 +93,7 @@ workspace = true
 [dependencies.taffy]
 #version = "0.9.2"
 git = "https://github.com/AustinMReppert/taffy"
-rev = "c99a8e60bf43ea695abda49a4be2b07baf683934"
+rev = "41af7ddf5806dcf67a3d702fcbe37b340a5cc8b8"
 default-features = false
 features = ["std", "taffy_tree", "flexbox", "content_size", "block_layout"]
 

From 135b18234b363d86728a27f65a2d74c4b5988240 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Fri, 3 Apr 2026 20:44:33 -0400
Subject: [PATCH 130/143] Preserve route on refresh.

---
 website/src/main.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/website/src/main.rs b/website/src/main.rs
index 6a4f01dd..e92c88fa 100644
--- a/website/src/main.rs
+++ b/website/src/main.rs
@@ -66,6 +66,8 @@ impl WebsiteGlobalState {
             let route = std::env::args().nth(1).unwrap_or_else(|| "/".to_string());
             self.set_route(route.as_str());
         }
+        #[cfg(target_arch = "wasm32")]
+        self.set_route(&self.get_route());
     }
 }
 

From adacb5a3eb5c6d3282cdab62f87ee88e1f1663b6 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 4 Apr 2026 01:18:18 -0400
Subject: [PATCH 131/143] Fix tinyvg override color

---
 crates/craft_retained/src/elements/tinyvg.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/craft_retained/src/elements/tinyvg.rs b/crates/craft_retained/src/elements/tinyvg.rs
index 6a62872a..a985aaaa 100644
--- a/crates/craft_retained/src/elements/tinyvg.rs
+++ b/crates/craft_retained/src/elements/tinyvg.rs
@@ -3,7 +3,7 @@
 use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
-
+use peniko::Color;
 use craft_primitives::geometry::Rectangle;
 
 use craft_renderer::RenderList;
@@ -129,6 +129,7 @@ impl TinyVg {
         });
         let layout_context = Some(LayoutContext::TinyVg(TinyVgContext::new(resource_identifier.clone())));
         inner.borrow_mut().element_data.create_layout_node(layout_context);
+        inner.borrow_mut().style_mut().set_color(Color::TRANSPARENT);
 
         PENDING_RESOURCES.with_borrow_mut(|pending_resources| {
             pending_resources.push_back((resource_identifier, ResourceType::TinyVg));

From e75f42982b5712a2dc9938d64d0b39cf1e025c2c Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 4 Apr 2026 01:52:45 -0400
Subject: [PATCH 132/143] Add transforms at the renderer api level

---
 crates/craft_renderer/src/render_list.rs      |  7 +++-
 crates/craft_renderer/src/sort_commands.rs    |  6 +++
 crates/craft_renderer/src/vello/mod.rs        | 34 ++++++++-------
 crates/craft_renderer/src/vello/tinyvg.rs     | 37 ++++++++--------
 crates/craft_renderer/src/vello_cpu/mod.rs    | 31 ++++++++------
 crates/craft_renderer/src/vello_cpu/tinyvg.rs | 42 ++++++++-----------
 crates/craft_renderer/src/vello_hybrid/mod.rs | 26 ++++++++----
 .../craft_renderer/src/vello_hybrid/tinyvg.rs | 42 ++++++++-----------
 8 files changed, 122 insertions(+), 103 deletions(-)

diff --git a/crates/craft_renderer/src/render_list.rs b/crates/craft_renderer/src/render_list.rs
index 03c839fb..c630604e 100644
--- a/crates/craft_renderer/src/render_list.rs
+++ b/crates/craft_renderer/src/render_list.rs
@@ -6,7 +6,7 @@ use peniko::Color;
 use craft_primitives::geometry::{Affine, BezPath, Rectangle, Shape};
 use craft_resource_manager::ResourceIdentifier;
 
-use crate::render_command::{BoxShadowCmd, DrawImageCmd, DrawRectCmd, DrawRectOutlineCmd, DrawTextCmd, DrawTinyVgCmd, FillBezPathCmd, PushLayerCmd};
+use crate::render_command::{BoxShadowCmd, DrawImageCmd, DrawRectCmd, DrawRectOutlineCmd, DrawTextCmd, DrawTinyVgCmd, FillBezPathCmd, PushLayerCmd, SetTransformCmd};
 use crate::sort_commands::SortedCommands;
 use crate::text_renderer_data::{TextData, TextScroll};
 use crate::{Brush, RenderCommand, TargetItem};
@@ -43,6 +43,11 @@ impl RenderList {
         self.overlay.children.clear();
     }
 
+    #[inline(always)]
+    pub fn set_transform(&mut self, transform: Affine) {
+        self.commands.push(RenderCommand::SetTransform(SetTransformCmd { transform }));
+    }
+
     #[inline(always)]
     pub fn draw_rect(&mut self, rect: Rectangle, color: Color) {
         if let Some(cull) = &self.cull
diff --git a/crates/craft_renderer/src/sort_commands.rs b/crates/craft_renderer/src/sort_commands.rs
index 80fd57c4..9f74ae3d 100644
--- a/crates/craft_renderer/src/sort_commands.rs
+++ b/crates/craft_renderer/src/sort_commands.rs
@@ -106,6 +106,12 @@ pub(crate) fn sort_and_cull_render_list_internal(surface_height: f32, render_lis
                 }
             }
 
+            RenderCommand::SetTransform(_) => {
+                unsafe {
+                    (*current).children.push(SortedItem::Other(index as u32));
+                }
+            }
+
             _ => {
                 let bounding_rect = bounding_rect(command);
                 if !should_cull(&bounding_rect, window_height) {
diff --git a/crates/craft_renderer/src/vello/mod.rs b/crates/craft_renderer/src/vello/mod.rs
index 100f9d36..be7a40f7 100644
--- a/crates/craft_renderer/src/vello/mod.rs
+++ b/crates/craft_renderer/src/vello/mod.rs
@@ -1,7 +1,6 @@
 mod tinyvg;
 
 use std::any::Any;
-use std::ops::Mul;
 use std::sync::Arc;
 
 use craft_primitives::Color;
@@ -9,7 +8,7 @@ use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::ResourceManager;
 use craft_resource_manager::resource::Resource;
 
-use peniko::{BrushRef, ImageAlphaType, ImageBrushRef};
+use peniko::{BrushRef, ImageAlphaType};
 
 use vello::kurbo::{Affine, Rect, Stroke};
 use vello::peniko::{BlendMode, Blob, Fill};
@@ -243,18 +242,19 @@ impl VelloRenderer {
             scene: Scene::new(),
             surface_clear_color: Color::WHITE,
             render_into_texture,
+            transform: Default::default(),
         }
     }
 }
 
-fn vello_draw_rect(scene: &mut Scene, rectangle: Rectangle, fill_color: Color) {
+fn vello_draw_rect(scene: &mut Scene, rectangle: Rectangle, fill_color: Color, transform: &Affine) {
     let rect = Rect::new(
         rectangle.x as f64,
         rectangle.y as f64,
         (rectangle.x + rectangle.width) as f64,
         (rectangle.y + rectangle.height) as f64,
     );
-    scene.fill(Fill::NonZero, Affine::IDENTITY, fill_color, None, &rect);
+    scene.fill(Fill::NonZero, *transform, fill_color, None, &rect);
 }
 
 impl Renderer for VelloRenderer {
@@ -284,12 +284,17 @@ impl Renderer for VelloRenderer {
         resource_manager: Arc<ResourceManager>,
         window: Rectangle,
     ) {
+        self.transform = Affine::IDENTITY;
+
         SortedCommands::draw(render_list, &render_list.overlay, &mut |command: &RenderCommand| {
             let scene = &mut self.scene;
 
             match command {
+                RenderCommand::SetTransform(cmd) => {
+                    self.transform = cmd.transform;
+                }
                 RenderCommand::DrawRect(cmd) => {
-                    vello_draw_rect(scene, cmd.rect, cmd.color);
+                    vello_draw_rect(scene, cmd.rect, cmd.color, &self.transform);
                 }
                 RenderCommand::DrawRectOutline(cmd) => {
                     self.scene.stroke(
@@ -315,15 +320,16 @@ impl Renderer for VelloRenderer {
                             width: image.width(),
                             height: image.height(),
                         };
-                        let brush_ref: ImageBrushRef = (&vello_image).into();
-                        let rect = Rect::new(
-                            cmd.rect.x as f64,
-                            cmd.rect.y as f64,
-                            cmd.rect.width as f64,
-                            cmd.rect.height as f64,
-                        );
+                        let vello_image = vello::peniko::ImageBrush::new(vello_image);
 
-                        scene.fill(Fill::NonZero, self.transform, brush_ref, None, &rect);
+                        let mut image_transform = Affine::IDENTITY;
+                        image_transform = image_transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
+                        image_transform = image_transform.pre_scale_non_uniform(
+                            cmd.rect.width as f64 / image.width() as f64,
+                            cmd.rect.height as f64 / image.height() as f64,
+                        );
+                        image_transform = self.transform * image_transform;
+                        scene.draw_image(&vello_image, image_transform);
                     }
                 }
                 RenderCommand::DrawText(cmd) => {
@@ -331,7 +337,7 @@ impl Renderer for VelloRenderer {
                         Affine::default().with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
                     let scroll = cmd.text_scroll.unwrap_or(TextScroll::default()).scroll_y;
                     let mut text_transform = text_transform.then_translate(kurbo::Vec2::new(0.0, -scroll as f64));
-                    text_transform = self.transform.mul(text_transform);
+                    text_transform = self.transform * text_transform;
 
                     let c = cmd.data.upgrade();
                     if c.is_none() {
diff --git a/crates/craft_renderer/src/vello/tinyvg.rs b/crates/craft_renderer/src/vello/tinyvg.rs
index 1aa6ef89..37a527b9 100644
--- a/crates/craft_renderer/src/vello/tinyvg.rs
+++ b/crates/craft_renderer/src/vello/tinyvg.rs
@@ -1,4 +1,3 @@
-use std::ops::Mul;
 use std::sync::Arc;
 
 use craft_primitives::geometry::Rectangle;
@@ -48,7 +47,7 @@ pub(crate) fn draw_tiny_vg(
         }
         let tiny_vg = resource.tinyvg.as_ref().unwrap();
 
-        let mut affine = Affine::IDENTITY;
+        let mut vg_transform = Affine::IDENTITY;
         let mut svg_width = tiny_vg.header.width as f32;
         let mut svg_height = tiny_vg.header.height as f32;
 
@@ -60,13 +59,13 @@ pub(crate) fn draw_tiny_vg(
             svg_height = rectangle.height;
         }
 
-        affine = affine.with_translation(kurbo::Vec2::new(rectangle.x as f64, rectangle.y as f64));
-        affine = affine.pre_scale_non_uniform(
+        vg_transform = vg_transform.with_translation(kurbo::Vec2::new(rectangle.x as f64, rectangle.y as f64));
+        vg_transform = vg_transform.pre_scale_non_uniform(
             rectangle.width as f64 / svg_width as f64,
             rectangle.height as f64 / svg_height as f64,
         );
-        
-        affine = transform.mul(affine);
+
+        vg_transform = *transform * vg_transform;
 
         for command in &tiny_vg.draw_commands {
             match command {
@@ -89,7 +88,7 @@ pub(crate) fn draw_tiny_vg(
                         &data.style,
                         None,
                         &tiny_vg.color_table,
-                        &affine,
+                        &vg_transform,
                         override_color,
                     );
                 }
@@ -98,7 +97,7 @@ pub(crate) fn draw_tiny_vg(
                     for rectangle in &data.rectangles {
                         let rectangle =
                             kurbo::Rect::new(rectangle.x.0, rectangle.y.0, rectangle.height.0, rectangle.height.0);
-                        scene.fill(Fill::EvenOdd, affine, &brush, None, &rectangle);
+                        scene.fill(Fill::EvenOdd, vg_transform, &brush, None, &rectangle);
                     }
                 }
                 DrawCommand::FillPath(data) => {
@@ -108,7 +107,7 @@ pub(crate) fn draw_tiny_vg(
                         &data.style,
                         None,
                         &tiny_vg.color_table,
-                        &affine,
+                        &vg_transform,
                         override_color,
                     );
                 }
@@ -120,7 +119,7 @@ pub(crate) fn draw_tiny_vg(
                             tinyvg_helpers::to_kurbo_point(line.start),
                             tinyvg_helpers::to_kurbo_point(line.end),
                         );
-                        scene.stroke(&Stroke::new(data.line_width.0), affine, &brush, None, &line);
+                        scene.stroke(&Stroke::new(data.line_width.0), vg_transform, &brush, None, &line);
                     }
                 }
                 DrawCommand::DrawLineLoop(data) => {
@@ -132,7 +131,7 @@ pub(crate) fn draw_tiny_vg(
                             tinyvg_helpers::to_kurbo_point(start),
                             tinyvg_helpers::to_kurbo_point(*point),
                         );
-                        scene.stroke(&Stroke::new(data.line_width.0), affine, &brush, None, &line);
+                        scene.stroke(&Stroke::new(data.line_width.0), vg_transform, &brush, None, &line);
                         start = *point;
                     }
                 }
@@ -145,7 +144,7 @@ pub(crate) fn draw_tiny_vg(
                             tinyvg_helpers::to_kurbo_point(start),
                             tinyvg_helpers::to_kurbo_point(*point),
                         );
-                        scene.stroke(&Stroke::new(data.line_width.0), affine, &brush, None, &line);
+                        scene.stroke(&Stroke::new(data.line_width.0), vg_transform, &brush, None, &line);
                         start = *point;
                     }
                 }
@@ -156,7 +155,7 @@ pub(crate) fn draw_tiny_vg(
                         &data.style,
                         Some(&data.line_width),
                         &tiny_vg.color_table,
-                        &affine,
+                        &vg_transform,
                         override_color,
                     );
                 }
@@ -179,7 +178,7 @@ pub(crate) fn draw_tiny_vg(
                         &data.fill_style,
                         None,
                         &tiny_vg.color_table,
-                        &affine,
+                        &vg_transform,
                         override_color,
                     );
                     draw_path(
@@ -188,7 +187,7 @@ pub(crate) fn draw_tiny_vg(
                         &data.line_style,
                         Some(&data.line_width),
                         &tiny_vg.color_table,
-                        &affine,
+                        &vg_transform,
                         override_color,
                     );
                 }
@@ -198,8 +197,8 @@ pub(crate) fn draw_tiny_vg(
                     for rectangle in &data.rectangles {
                         let rectangle =
                             kurbo::Rect::new(rectangle.x.0, rectangle.y.0, rectangle.height.0, rectangle.height.0);
-                        scene.fill(Fill::EvenOdd, affine, &fill_brush, None, &rectangle);
-                        scene.stroke(&Stroke::new(data.line_width.0), affine, &line_brush, None, &rectangle);
+                        scene.fill(Fill::EvenOdd, vg_transform, &fill_brush, None, &rectangle);
+                        scene.stroke(&Stroke::new(data.line_width.0), vg_transform, &line_brush, None, &rectangle);
                     }
                 }
                 DrawCommand::OutlineFillPath(data) => {
@@ -209,7 +208,7 @@ pub(crate) fn draw_tiny_vg(
                         &data.fill_style,
                         None,
                         &tiny_vg.color_table,
-                        &affine,
+                        &vg_transform,
                         override_color,
                     );
                     draw_path(
@@ -218,7 +217,7 @@ pub(crate) fn draw_tiny_vg(
                         &data.line_style,
                         Some(&data.line_width),
                         &tiny_vg.color_table,
-                        &affine,
+                        &vg_transform,
                         override_color,
                     );
                 }
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index 7344dfd3..bf56686b 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -144,9 +144,9 @@ impl Renderer for VelloCpuRenderer {
         &'a mut self,
         render_list: &'a mut RenderList,
         resource_manager: Arc<ResourceManager>,
-        window: Rectangle,
-        //get_text_renderer: Box<dyn Fn(u64) -> Option<&'a TextRender> + 'a>,
+        window: Rectangle
     ) {
+
         vello_draw_rect(
             &mut self.render_context,
             Rectangle::new(0.0, 0.0, self.window_width as f32, self.window_height as f32),
@@ -189,13 +189,14 @@ impl Renderer for VelloCpuRenderer {
                             height: image.height(),
                         };
 
-                        let mut transform = Affine::IDENTITY;
-                        transform = transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
-                        transform = transform.pre_scale_non_uniform(
+                        let scene_state = self.render_context.save_current_state();
+                        let mut image_transform = Affine::IDENTITY;
+                        image_transform = image_transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
+                        image_transform = image_transform.pre_scale_non_uniform(
                             cmd.rect.width as f64 / image.width() as f64,
                             cmd.rect.height as f64 / image.height() as f64,
                         );
-                        self.render_context.set_transform(transform);
+                        self.render_context.set_transform(scene_state.transform * image_transform);
 
                         let is = vello_common::paint::ImageSource::from_peniko_image_data(&id);
 
@@ -212,7 +213,7 @@ impl Renderer for VelloCpuRenderer {
                             image.width() as f64,
                             image.height() as f64,
                         ));
-                        self.render_context.reset_transform();
+                        self.render_context.restore_state(scene_state);
                     }
                 }
                 RenderCommand::DrawText(cmd) => {
@@ -281,10 +282,11 @@ impl Renderer for VelloCpuRenderer {
                         }
                     });
 
+                    let scene_state = self.render_context.save_current_state();
+                    self.render_context.set_transform(scene_state.transform * text_transform);
                     cull_and_process(&mut |line: &TextRenderLine| {
                         for item in &line.items {
                             if let Some(underline) = &item.underline {
-                                self.render_context.set_transform(text_transform);
                                 self.render_context.set_stroke(Stroke::new(underline.width.into()));
                                 self.render_context.set_paint(PaintType::from(underline.brush.color));
                                 self.render_context.stroke_path(&underline.line.to_path(0.1));
@@ -296,13 +298,11 @@ impl Renderer for VelloCpuRenderer {
                                     .map(|b| b.color)
                                     .unwrap_or_else(|| item.brush.color),
                             ));
-                            self.render_context.reset_transform();
 
                             let glyph_run_builder = self
                                 .render_context
                                 .glyph_run(&item.font)
-                                .font_size(item.font_size)
-                                .glyph_transform(text_transform);
+                                .font_size(item.font_size);
                             glyph_run_builder.fill_glyphs(item.glyphs.iter().map(|glyph| Glyph {
                                 id: glyph.id,
                                 x: glyph.x,
@@ -310,6 +310,7 @@ impl Renderer for VelloCpuRenderer {
                             }));
                         }
                     });
+                    self.render_context.restore_state(scene_state);
 
                     if cmd.show_cursor
                         && let Some((cursor, cursor_color)) = &text_render.cursor
@@ -390,6 +391,7 @@ impl VelloCpuRenderer {
     }
 
     pub fn draw_box_shadow(&mut self, box_shadow: &BoxShadowCmd) {
+        let scene_state = self.render_context.save_current_state();
         let radius = box_shadow.blur_radius / 2.0;
         let filter = Some(Filter::from_function(FilterFunction::Blur {
             radius: box_shadow.blur_radius as f32,
@@ -416,12 +418,12 @@ impl VelloCpuRenderer {
                 filter,
             );
 
-            self.render_context.set_transform(Affine::translate(box_shadow.offset));
+            self.render_context.set_transform(scene_state.transform * Affine::translate(box_shadow.offset));
 
             self.render_context.set_paint(box_shadow.color);
             self.render_context.fill_path(&box_shadow.path);
 
-            self.render_context.set_transform(Affine::IDENTITY);
+            self.render_context.set_transform(scene_state.transform);
 
             self.render_context
                 .set_blend_mode(BlendMode::new(Mix::Normal, Compose::DestOut));
@@ -432,6 +434,9 @@ impl VelloCpuRenderer {
                 .set_blend_mode(BlendMode::new(Mix::Normal, Compose::SrcOver));
 
             self.render_context.pop_layer();
+
+
+            self.render_context.restore_state(scene_state);
         }
     }
 }
diff --git a/crates/craft_renderer/src/vello_cpu/tinyvg.rs b/crates/craft_renderer/src/vello_cpu/tinyvg.rs
index 0af9a402..94b5877a 100644
--- a/crates/craft_renderer/src/vello_cpu/tinyvg.rs
+++ b/crates/craft_renderer/src/vello_cpu/tinyvg.rs
@@ -13,15 +13,13 @@ use vello_cpu::RenderContext;
 use crate::helpers::brush_to_paint;
 use crate::{Brush, tinyvg_helpers};
 
-fn stroke_path(scene: &mut RenderContext, bez_path: &BezPath, affine: &Affine, line_width: f64, brush: &Brush) {
+fn stroke_path(scene: &mut RenderContext, bez_path: &BezPath, line_width: f64, brush: &Brush) {
     scene.set_stroke(Stroke::new(line_width));
-    scene.set_transform(*affine);
     scene.set_paint(brush_to_paint(brush));
     scene.stroke_path(bez_path);
 }
 
-fn fill_path(scene: &mut RenderContext, bez_path: &BezPath, affine: &Affine, brush: &Brush) {
-    scene.set_transform(*affine);
+fn fill_path(scene: &mut RenderContext, bez_path: &BezPath, brush: &Brush) {
     scene.set_paint(brush_to_paint(brush));
     scene.set_fill_rule(Fill::EvenOdd);
     scene.fill_path(bez_path);
@@ -33,15 +31,14 @@ pub(crate) fn draw_path(
     fill_style: &Style,
     line_width: Option<&Unit>,
     color_table: &ColorTable,
-    affine: &Affine,
     override_color: &Option<Color>,
 ) {
     let (bezier_path, brush) = tinyvg_helpers::assemble_path(path, fill_style, color_table, override_color);
 
     if let Some(line_width) = line_width {
-        stroke_path(scene, &bezier_path, affine, line_width.0, &brush);
+        stroke_path(scene, &bezier_path, line_width.0, &brush);
     } else {
-        fill_path(scene, &bezier_path, affine, &brush);
+        fill_path(scene, &bezier_path, &brush);
     }
 }
 
@@ -64,7 +61,7 @@ pub(crate) fn draw_tiny_vg(
         }
         let tiny_vg = resource.tinyvg.as_ref().unwrap();
 
-        let mut affine = Affine::IDENTITY;
+        let vg_transform = Affine::IDENTITY;
         let mut svg_width = tiny_vg.header.width as f32;
         let mut svg_height = tiny_vg.header.height as f32;
 
@@ -76,12 +73,15 @@ pub(crate) fn draw_tiny_vg(
             svg_height = rectangle.height;
         }
 
-        affine = affine.with_translation(kurbo::Vec2::new(rectangle.x as f64, rectangle.y as f64));
-        affine = affine.pre_scale_non_uniform(
+        let vg_transform = vg_transform.with_translation(kurbo::Vec2::new(rectangle.x as f64, rectangle.y as f64));
+        let vg_transform = vg_transform.pre_scale_non_uniform(
             rectangle.width as f64 / svg_width as f64,
             rectangle.height as f64 / svg_height as f64,
         );
 
+        let scene_state = scene.save_current_state();
+        scene.set_transform(scene_state.transform * vg_transform);
+
         for command in &tiny_vg.draw_commands {
             match command {
                 DrawCommand::FillPolygon(data) => {
@@ -103,7 +103,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.style,
                         None,
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                 }
@@ -112,7 +111,7 @@ pub(crate) fn draw_tiny_vg(
                     for rectangle in &data.rectangles {
                         let rectangle =
                             kurbo::Rect::new(rectangle.x.0, rectangle.y.0, rectangle.height.0, rectangle.height.0);
-                        fill_path(scene, &rectangle.into_path(0.1), &affine, &brush);
+                        fill_path(scene, &rectangle.into_path(0.1), &brush);
                     }
                 }
                 DrawCommand::FillPath(data) => {
@@ -122,7 +121,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.style,
                         None,
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                 }
@@ -134,7 +132,7 @@ pub(crate) fn draw_tiny_vg(
                             tinyvg_helpers::to_kurbo_point(line.start),
                             tinyvg_helpers::to_kurbo_point(line.end),
                         );
-                        stroke_path(scene, &line.into_path(0.1), &affine, data.line_width.0, &brush);
+                        stroke_path(scene, &line.into_path(0.1), data.line_width.0, &brush);
                     }
                 }
                 DrawCommand::DrawLineLoop(data) => {
@@ -146,7 +144,7 @@ pub(crate) fn draw_tiny_vg(
                             tinyvg_helpers::to_kurbo_point(start),
                             tinyvg_helpers::to_kurbo_point(*point),
                         );
-                        stroke_path(scene, &line.into_path(0.1), &affine, data.line_width.0, &brush);
+                        stroke_path(scene, &line.into_path(0.1), data.line_width.0, &brush);
                         start = *point;
                     }
                 }
@@ -159,7 +157,7 @@ pub(crate) fn draw_tiny_vg(
                             tinyvg_helpers::to_kurbo_point(start),
                             tinyvg_helpers::to_kurbo_point(*point),
                         );
-                        stroke_path(scene, &line.into_path(0.1), &affine, data.line_width.0, &brush);
+                        stroke_path(scene, &line.into_path(0.1), data.line_width.0, &brush);
                         start = *point;
                     }
                 }
@@ -170,7 +168,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.style,
                         Some(&data.line_width),
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                 }
@@ -193,7 +190,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.fill_style,
                         None,
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                     draw_path(
@@ -202,7 +198,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.line_style,
                         Some(&data.line_width),
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                 }
@@ -213,8 +208,8 @@ pub(crate) fn draw_tiny_vg(
                         let rectangle =
                             kurbo::Rect::new(rectangle.x.0, rectangle.y.0, rectangle.height.0, rectangle.height.0);
                         let rec_bez_path = rectangle.into_path(0.1);
-                        fill_path(scene, &rec_bez_path, &affine, &fill_brush);
-                        stroke_path(scene, &rec_bez_path, &affine, data.line_width.0, &line_brush);
+                        fill_path(scene, &rec_bez_path, &fill_brush);
+                        stroke_path(scene, &rec_bez_path, data.line_width.0, &line_brush);
                     }
                 }
                 DrawCommand::OutlineFillPath(data) => {
@@ -224,7 +219,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.fill_style,
                         None,
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                     draw_path(
@@ -233,7 +227,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.line_style,
                         Some(&data.line_width),
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                 }
@@ -243,6 +236,7 @@ pub(crate) fn draw_tiny_vg(
                 DrawCommand::TextHint(_data) => {}
             }
         }
-        scene.reset_transform();
+
+        scene.restore_state(scene_state);
     }
 }
diff --git a/crates/craft_renderer/src/vello_hybrid/mod.rs b/crates/craft_renderer/src/vello_hybrid/mod.rs
index 96892795..2402a129 100644
--- a/crates/craft_renderer/src/vello_hybrid/mod.rs
+++ b/crates/craft_renderer/src/vello_hybrid/mod.rs
@@ -131,6 +131,8 @@ fn vello_draw_rect(scene: &mut Scene, rectangle: Rectangle, fill_color: Color) {
 }
 
 fn draw_box_shadow(scene: &mut Scene, box_shadow: &BoxShadowCmd) {
+    let scene_state = scene.save_current_state();
+
     let radius = box_shadow.blur_radius / 2.0;
     let filter = Some(Filter::from_function(FilterFunction::Blur {
         radius: box_shadow.blur_radius as f32,
@@ -156,12 +158,12 @@ fn draw_box_shadow(scene: &mut Scene, box_shadow: &BoxShadowCmd) {
             filter,
         );
 
-        scene.set_transform(Affine::translate(box_shadow.offset));
+        scene.set_transform(scene_state.transform * Affine::translate(box_shadow.offset));
 
         scene.set_paint(box_shadow.color);
         scene.fill_path(&box_shadow.path);
 
-        scene.set_transform(Affine::IDENTITY);
+        scene.set_transform(scene_state.transform);
 
         scene.set_blend_mode(BlendMode::new(Mix::Normal, Compose::DestOut));
         scene.set_paint(Color::WHITE);
@@ -171,6 +173,8 @@ fn draw_box_shadow(scene: &mut Scene, box_shadow: &BoxShadowCmd) {
 
         scene.pop_layer();
     }
+
+    scene.restore_state(scene_state);
 }
 
 impl CraftRenderer for VelloHybridRenderer {
@@ -226,6 +230,8 @@ impl CraftRenderer for VelloHybridRenderer {
         let width = surface.config.width;
         let height = surface.config.height;
 
+        self.scene.set_transform(Affine::IDENTITY);
+
         vello_draw_rect(
             &mut self.scene,
             Rectangle::new(0.0, 0.0, width as f32, height as f32),
@@ -311,13 +317,14 @@ impl CraftRenderer for VelloHybridRenderer {
                         };
                         seen_images.insert(image_id);
 
+                        let scene_state = scene.save_current_state();
                         let mut transform = Affine::IDENTITY;
                         transform = transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
                         transform = transform.pre_scale_non_uniform(
                             cmd.rect.width as f64 / image.width() as f64,
                             cmd.rect.height as f64 / image.height() as f64,
                         );
-                        scene.set_transform(transform);
+                        scene.set_transform(scene_state.transform * transform);
 
                         scene.set_paint(PaintType::Image(vello_common::paint::Image {
                             image: ImageSource::OpaqueId {
@@ -328,7 +335,8 @@ impl CraftRenderer for VelloHybridRenderer {
                         }));
 
                         scene.fill_rect(&kurbo::Rect::new(0.0, 0.0, image.width() as f64, image.height() as f64));
-                        scene.reset_transform();
+
+                        scene.restore_state(scene_state);
                     }
                 }
                 RenderCommand::DrawText(cmd) => {
@@ -397,10 +405,12 @@ impl CraftRenderer for VelloHybridRenderer {
                         }
                     });
 
+                    let scene_state = scene.save_current_state();
+                    scene.set_transform(scene_state.transform * text_transform);
+
                     cull_and_process(&mut |line: &TextRenderLine| {
                         for item in &line.items {
                             if let Some(underline) = &item.underline {
-                                scene.set_transform(text_transform);
                                 scene.set_stroke(Stroke::new(underline.width.into()));
                                 scene.set_paint(PaintType::from(underline.brush.color));
                                 scene.stroke_path(&underline.line.to_path(0.1));
@@ -412,12 +422,10 @@ impl CraftRenderer for VelloHybridRenderer {
                                     .map(|b| b.color)
                                     .unwrap_or_else(|| item.brush.color),
                             ));
-                            scene.reset_transform();
 
                             let glyph_run_builder = scene
                                 .glyph_run(&item.font)
-                                .font_size(item.font_size)
-                                .glyph_transform(text_transform);
+                                .font_size(item.font_size);
                             glyph_run_builder.fill_glyphs(item.glyphs.iter().map(|glyph| Glyph {
                                 id: glyph.id,
                                 x: glyph.x,
@@ -426,6 +434,8 @@ impl CraftRenderer for VelloHybridRenderer {
                         }
                     });
 
+                    scene.restore_state(scene_state);
+
                     if cmd.show_cursor
                         && let Some((cursor, cursor_color)) = &text_render.cursor
                     {
diff --git a/crates/craft_renderer/src/vello_hybrid/tinyvg.rs b/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
index f4ebd20a..4a38ea62 100644
--- a/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
+++ b/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
@@ -14,15 +14,13 @@ use vello_hybrid::Scene;
 use crate::vello_hybrid::brush_to_paint;
 use crate::{Brush, tinyvg_helpers};
 
-fn stroke_path(scene: &mut Scene, bez_path: &BezPath, affine: &Affine, line_width: f64, brush: &Brush) {
+fn stroke_path(scene: &mut Scene, bez_path: &BezPath, line_width: f64, brush: &Brush) {
     scene.set_stroke(Stroke::new(line_width));
-    scene.set_transform(*affine);
     scene.set_paint(brush_to_paint(brush));
     scene.stroke_path(bez_path);
 }
 
-fn fill_path(scene: &mut Scene, bez_path: &BezPath, affine: &Affine, brush: &Brush) {
-    scene.set_transform(*affine);
+fn fill_path(scene: &mut Scene, bez_path: &BezPath, brush: &Brush) {
     scene.set_paint(brush_to_paint(brush));
     scene.set_fill_rule(Fill::EvenOdd);
     scene.fill_path(bez_path);
@@ -34,15 +32,14 @@ pub(crate) fn draw_path(
     fill_style: &Style,
     line_width: Option<&Unit>,
     color_table: &ColorTable,
-    affine: &Affine,
     override_color: &Option<Color>,
 ) {
     let (bezier_path, brush) = tinyvg_helpers::assemble_path(path, fill_style, color_table, override_color);
 
     if let Some(line_width) = line_width {
-        stroke_path(scene, &bezier_path, affine, line_width.0, &brush);
+        stroke_path(scene, &bezier_path, line_width.0, &brush);
     } else {
-        fill_path(scene, &bezier_path, affine, &brush);
+        fill_path(scene, &bezier_path, &brush);
     }
 }
 
@@ -65,7 +62,9 @@ pub(crate) fn draw_tiny_vg(
         }
         let tiny_vg = resource.tinyvg.as_ref().unwrap();
 
-        let mut affine = Affine::IDENTITY;
+        let scene_state = scene.save_current_state();
+
+        let vg_transform = Affine::IDENTITY;
         let mut svg_width = tiny_vg.header.width as f32;
         let mut svg_height = tiny_vg.header.height as f32;
 
@@ -77,12 +76,14 @@ pub(crate) fn draw_tiny_vg(
             svg_height = rectangle.height;
         }
 
-        affine = affine.with_translation(kurbo::Vec2::new(rectangle.x as f64, rectangle.y as f64));
-        affine = affine.pre_scale_non_uniform(
+        let vg_transform = vg_transform.with_translation(kurbo::Vec2::new(rectangle.x as f64, rectangle.y as f64));
+        let vg_transform = vg_transform.pre_scale_non_uniform(
             rectangle.width as f64 / svg_width as f64,
             rectangle.height as f64 / svg_height as f64,
         );
 
+        scene.set_transform(scene_state.transform * vg_transform);
+
         for command in &tiny_vg.draw_commands {
             match command {
                 DrawCommand::FillPolygon(data) => {
@@ -104,7 +105,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.style,
                         None,
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                 }
@@ -113,7 +113,7 @@ pub(crate) fn draw_tiny_vg(
                     for rectangle in &data.rectangles {
                         let rectangle =
                             kurbo::Rect::new(rectangle.x.0, rectangle.y.0, rectangle.height.0, rectangle.height.0);
-                        fill_path(scene, &rectangle.into_path(0.1), &affine, &brush);
+                        fill_path(scene, &rectangle.into_path(0.1), &brush);
                     }
                 }
                 DrawCommand::FillPath(data) => {
@@ -123,7 +123,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.style,
                         None,
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                 }
@@ -135,7 +134,7 @@ pub(crate) fn draw_tiny_vg(
                             tinyvg_helpers::to_kurbo_point(line.start),
                             tinyvg_helpers::to_kurbo_point(line.end),
                         );
-                        stroke_path(scene, &line.into_path(0.1), &affine, data.line_width.0, &brush);
+                        stroke_path(scene, &line.into_path(0.1), data.line_width.0, &brush);
                     }
                 }
                 DrawCommand::DrawLineLoop(data) => {
@@ -147,7 +146,7 @@ pub(crate) fn draw_tiny_vg(
                             tinyvg_helpers::to_kurbo_point(start),
                             tinyvg_helpers::to_kurbo_point(*point),
                         );
-                        stroke_path(scene, &line.into_path(0.1), &affine, data.line_width.0, &brush);
+                        stroke_path(scene, &line.into_path(0.1), data.line_width.0, &brush);
                         start = *point;
                     }
                 }
@@ -160,7 +159,7 @@ pub(crate) fn draw_tiny_vg(
                             tinyvg_helpers::to_kurbo_point(start),
                             tinyvg_helpers::to_kurbo_point(*point),
                         );
-                        stroke_path(scene, &line.into_path(0.1), &affine, data.line_width.0, &brush);
+                        stroke_path(scene, &line.into_path(0.1), data.line_width.0, &brush);
                         start = *point;
                     }
                 }
@@ -171,7 +170,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.style,
                         Some(&data.line_width),
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                 }
@@ -194,7 +192,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.fill_style,
                         None,
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                     draw_path(
@@ -203,7 +200,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.line_style,
                         Some(&data.line_width),
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                 }
@@ -214,8 +210,8 @@ pub(crate) fn draw_tiny_vg(
                         let rectangle =
                             kurbo::Rect::new(rectangle.x.0, rectangle.y.0, rectangle.height.0, rectangle.height.0);
                         let rec_bez_path = rectangle.into_path(0.1);
-                        fill_path(scene, &rec_bez_path, &affine, &fill_brush);
-                        stroke_path(scene, &rec_bez_path, &affine, data.line_width.0, &line_brush);
+                        fill_path(scene, &rec_bez_path, &fill_brush);
+                        stroke_path(scene, &rec_bez_path, data.line_width.0, &line_brush);
                     }
                 }
                 DrawCommand::OutlineFillPath(data) => {
@@ -225,7 +221,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.fill_style,
                         None,
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                     draw_path(
@@ -234,7 +229,6 @@ pub(crate) fn draw_tiny_vg(
                         &data.line_style,
                         Some(&data.line_width),
                         &tiny_vg.color_table,
-                        &affine,
                         override_color,
                     );
                 }
@@ -245,6 +239,6 @@ pub(crate) fn draw_tiny_vg(
             }
         }
 
-        scene.reset_transform();
+        scene.restore_state(scene_state);
     }
 }

From 4f23ffbe82e4d20045fc32a3d9b06ede5cd43637 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 5 Apr 2026 09:29:53 -0400
Subject: [PATCH 133/143] Fix command

---
 crates/craft_retained/tests/test_utils.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/craft_retained/tests/test_utils.rs b/crates/craft_retained/tests/test_utils.rs
index 3bbbf2b6..f68ed364 100644
--- a/crates/craft_retained/tests/test_utils.rs
+++ b/crates/craft_retained/tests/test_utils.rs
@@ -42,7 +42,7 @@ pub fn check_snapshot(image: RgbImage, image_name: &str) {
     if let Ok(snapshot) = snapshot {
         if snapshot != image {
             image.save(current_dir().join(image_name)).unwrap();
-            panic!("Snapshot is different; run 'cargo xtask-test report' for report")
+            panic!("Snapshot is different; run 'cargo xtask report' for report")
         }
     } else {
         println!("writing test to {}", current_dir().join(image_name).display());

From f5ba4193ba8b27eb0d51862fd6c679a7c9300dc9 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 5 Apr 2026 14:40:12 -0400
Subject: [PATCH 134/143] Rename ResourceIdentifier to ResourceId

---
 crates/craft_renderer/src/render_command.rs   |  6 +-
 crates/craft_renderer/src/render_list.rs      |  6 +-
 crates/craft_renderer/src/vello/tinyvg.rs     |  6 +-
 crates/craft_renderer/src/vello_cpu/tinyvg.rs |  6 +-
 crates/craft_renderer/src/vello_hybrid/mod.rs |  6 +-
 .../craft_renderer/src/vello_hybrid/tinyvg.rs |  6 +-
 .../craft_resource_manager/src/identifier.rs  | 12 ++--
 crates/craft_resource_manager/src/lib.rs      | 72 +++++++++----------
 .../src/resource_data.rs                      |  8 +--
 .../src/resource_event.rs                     |  6 +-
 crates/craft_retained/src/app.rs              | 14 ++--
 crates/craft_retained/src/elements/image.rs   | 30 ++++----
 crates/craft_retained/src/elements/tinyvg.rs  | 32 ++++-----
 .../src/layout/layout_context.rs              | 18 ++---
 crates/craft_retained/src/lib.rs              |  2 +-
 website/src/index.rs                          | 14 ++--
 16 files changed, 122 insertions(+), 122 deletions(-)

diff --git a/crates/craft_renderer/src/render_command.rs b/crates/craft_renderer/src/render_command.rs
index e102e17c..cbabf051 100644
--- a/crates/craft_renderer/src/render_command.rs
+++ b/crates/craft_renderer/src/render_command.rs
@@ -5,7 +5,7 @@ use peniko::Color;
 
 use craft_primitives::geometry::{Affine, BezPath, Rectangle, Vec2};
 
-use craft_resource_manager::ResourceIdentifier;
+use craft_resource_manager::ResourceId;
 
 use crate::Brush;
 use crate::text_renderer_data::{TextData, TextScroll};
@@ -47,13 +47,13 @@ pub struct DrawRectOutlineCmd {
 #[derive(Clone)]
 pub struct DrawImageCmd {
     pub rect: Rectangle,
-    pub resource_id: ResourceIdentifier,
+    pub resource_id: ResourceId,
 }
 
 #[derive(Clone)]
 pub struct DrawTinyVgCmd {
     pub rect: Rectangle,
-    pub resource_id: ResourceIdentifier,
+    pub resource_id: ResourceId,
     pub override_color: Option<Color>,
 }
 
diff --git a/crates/craft_renderer/src/render_list.rs b/crates/craft_renderer/src/render_list.rs
index c630604e..96517a88 100644
--- a/crates/craft_renderer/src/render_list.rs
+++ b/crates/craft_renderer/src/render_list.rs
@@ -4,7 +4,7 @@ use std::rc::Weak;
 use peniko::Color;
 
 use craft_primitives::geometry::{Affine, BezPath, Rectangle, Shape};
-use craft_resource_manager::ResourceIdentifier;
+use craft_resource_manager::ResourceId;
 
 use crate::render_command::{BoxShadowCmd, DrawImageCmd, DrawRectCmd, DrawRectOutlineCmd, DrawTextCmd, DrawTinyVgCmd, FillBezPathCmd, PushLayerCmd, SetTransformCmd};
 use crate::sort_commands::SortedCommands;
@@ -116,7 +116,7 @@ impl RenderList {
     }
 
     #[inline(always)]
-    pub fn draw_image(&mut self, rect: Rectangle, resource_id: ResourceIdentifier) {
+    pub fn draw_image(&mut self, rect: Rectangle, resource_id: ResourceId) {
         if let Some(cull) = &self.cull
             && !cull.intersects(&rect)
         {
@@ -127,7 +127,7 @@ impl RenderList {
     }
 
     #[inline(always)]
-    pub fn draw_tiny_vg(&mut self, rect: Rectangle, resource_id: ResourceIdentifier, override_color: Option<Color>) {
+    pub fn draw_tiny_vg(&mut self, rect: Rectangle, resource_id: ResourceId, override_color: Option<Color>) {
         if let Some(cull) = &self.cull
             && !cull.intersects(&rect)
         {
diff --git a/crates/craft_renderer/src/vello/tinyvg.rs b/crates/craft_renderer/src/vello/tinyvg.rs
index 37a527b9..2d85b1ef 100644
--- a/crates/craft_renderer/src/vello/tinyvg.rs
+++ b/crates/craft_renderer/src/vello/tinyvg.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::resource::Resource;
-use craft_resource_manager::{ResourceIdentifier, ResourceManager};
+use craft_resource_manager::{ResourceId, ResourceManager};
 use peniko::kurbo::{Affine, Line, Stroke};
 use peniko::{Color, Fill, kurbo};
 use tinyvg_rs::color_table::ColorTable;
@@ -34,11 +34,11 @@ pub(crate) fn draw_tiny_vg(
     scene: &mut Scene,
     rectangle: Rectangle,
     resource_manager: Arc<ResourceManager>,
-    resource_identifier: ResourceIdentifier,
+    resource_id: ResourceId,
     override_color: &Option<Color>,
     transform: &Affine
 ) {
-    let resource = resource_manager.get(&resource_identifier);
+    let resource = resource_manager.get(&resource_id);
     if let Some(resource) = resource
         && let Resource::TinyVg(resource) = resource.as_ref()
     {
diff --git a/crates/craft_renderer/src/vello_cpu/tinyvg.rs b/crates/craft_renderer/src/vello_cpu/tinyvg.rs
index 94b5877a..9e2af5f6 100644
--- a/crates/craft_renderer/src/vello_cpu/tinyvg.rs
+++ b/crates/craft_renderer/src/vello_cpu/tinyvg.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::resource::Resource;
-use craft_resource_manager::{ResourceIdentifier, ResourceManager};
+use craft_resource_manager::{ResourceId, ResourceManager};
 use peniko::kurbo::{Affine, BezPath, Line, Shape, Stroke};
 use peniko::{Color, Fill, kurbo};
 use tinyvg_rs::color_table::ColorTable;
@@ -46,10 +46,10 @@ pub(crate) fn draw_tiny_vg(
     scene: &mut RenderContext,
     rectangle: Rectangle,
     resource_manager: &Arc<ResourceManager>,
-    resource_identifier: ResourceIdentifier,
+    resource_id: ResourceId,
     override_color: &Option<Color>,
 ) {
-    let resource = resource_manager.get(&resource_identifier);
+    let resource = resource_manager.get(&resource_id);
     if resource.is_none() {
         return;
     }
diff --git a/crates/craft_renderer/src/vello_hybrid/mod.rs b/crates/craft_renderer/src/vello_hybrid/mod.rs
index 2402a129..0552f73d 100644
--- a/crates/craft_renderer/src/vello_hybrid/mod.rs
+++ b/crates/craft_renderer/src/vello_hybrid/mod.rs
@@ -9,7 +9,7 @@ use chrono::{DateTime, Utc};
 use craft_primitives::Color;
 use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::resource::Resource;
-use craft_resource_manager::{ResourceIdentifier, ResourceManager};
+use craft_resource_manager::{ResourceId, ResourceManager};
 use kurbo::{Affine, Stroke};
 use peniko::kurbo::Shape;
 use peniko::{BlendMode, Compose, Fill, Mix};
@@ -63,7 +63,7 @@ pub struct VelloHybridRenderer {
     scene: Scene,
     surface_clear_color: Color,
 
-    images: HashMap<ResourceIdentifier, (ImageId, Option<DateTime<Utc>>)>,
+    images: HashMap<ResourceId, (ImageId, Option<DateTime<Utc>>)>,
 }
 
 fn create_vello_renderer(render_cx: &RenderContext, surface: &RenderSurface) -> Renderer {
@@ -479,7 +479,7 @@ impl CraftRenderer for VelloHybridRenderer {
             }
         });
 
-        let mut to_remove: Vec<ResourceIdentifier> = Vec::new();
+        let mut to_remove: Vec<ResourceId> = Vec::new();
 
         for expired_image_id in &expired_images {
             // Note: Expired images will have an entry in the images hashmap, but with a new ImageId.
diff --git a/crates/craft_renderer/src/vello_hybrid/tinyvg.rs b/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
index 4a38ea62..ef5cde83 100644
--- a/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
+++ b/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use craft_primitives::Color;
 use craft_primitives::geometry::Rectangle;
 use craft_resource_manager::resource::Resource;
-use craft_resource_manager::{ResourceIdentifier, ResourceManager};
+use craft_resource_manager::{ResourceId, ResourceManager};
 use peniko::kurbo::{Affine, BezPath, Line, Shape, Stroke};
 use peniko::{Fill, kurbo};
 use tinyvg_rs::color_table::ColorTable;
@@ -47,10 +47,10 @@ pub(crate) fn draw_tiny_vg(
     scene: &mut Scene,
     rectangle: Rectangle,
     resource_manager: &Arc<ResourceManager>,
-    resource_identifier: ResourceIdentifier,
+    resource_id: ResourceId,
     override_color: &Option<Color>,
 ) {
-    let resource = resource_manager.get(&resource_identifier);
+    let resource = resource_manager.get(&resource_id);
     if resource.is_none() {
         return;
     }
diff --git a/crates/craft_resource_manager/src/identifier.rs b/crates/craft_resource_manager/src/identifier.rs
index 6d590ea7..52336c7f 100644
--- a/crates/craft_resource_manager/src/identifier.rs
+++ b/crates/craft_resource_manager/src/identifier.rs
@@ -3,18 +3,18 @@ use std::path::PathBuf;
 use std::{fmt, fs};
 
 #[cfg(feature = "http_client")]
-use crate::ResourceIdentifier::Url;
-use crate::ResourceIdentifier::{Bytes, File};
+use crate::ResourceId::Url;
+use crate::ResourceId::{Bytes, File};
 
 #[derive(Clone, Debug, Hash, Eq, PartialEq)]
-pub enum ResourceIdentifier {
+pub enum ResourceId {
     #[cfg(feature = "http_client")]
     Url(String),
     File(PathBuf),
     Bytes(&'static [u8]),
 }
 
-impl Display for ResourceIdentifier {
+impl Display for ResourceId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             #[cfg(feature = "http_client")]
@@ -25,8 +25,8 @@ impl Display for ResourceIdentifier {
     }
 }
 
-impl ResourceIdentifier {
-    pub async fn fetch_data_from_resource_identifier(&self) -> Option<Vec<u8>> {
+impl ResourceId {
+    pub async fn fetch_data_from_resource_id(&self) -> Option<Vec<u8>> {
         match self {
             #[cfg(feature = "http_client")]
             Url(url) => {
diff --git a/crates/craft_resource_manager/src/lib.rs b/crates/craft_resource_manager/src/lib.rs
index 4065b83a..4f7732d4 100644
--- a/crates/craft_resource_manager/src/lib.rs
+++ b/crates/craft_resource_manager/src/lib.rs
@@ -18,7 +18,7 @@ use ::image::ImageReader;
 use craft_logging::info;
 use craft_runtime::{CraftRuntimeHandle, Sender};
 
-pub use crate::identifier::ResourceIdentifier;
+pub use crate::identifier::ResourceId;
 use crate::image::ImageResource;
 use crate::lock_free_map::LockFreeMap;
 use crate::resource::Resource;
@@ -30,7 +30,7 @@ use crate::tinyvg_resource::TinyVgResource;
 pub type ResourceFuture = Pin<Box<dyn Future<Output = Box<dyn Any + Send + Sync>> + Send + Sync>>;
 
 pub struct ResourceManager {
-    resources: LockFreeMap<ResourceIdentifier, Resource>,
+    resources: LockFreeMap<ResourceId, Resource>,
     pub(crate) runtime: CraftRuntimeHandle,
 }
 
@@ -47,18 +47,18 @@ impl ResourceManager {
     pub fn async_download_resource_and_send_message_on_finish<Message: From<ResourceEvent> + 'static>(
         &self,
         app_sender: Sender<Message>,
-        resource_identifier: ResourceIdentifier,
+        resource_id: ResourceId,
         resource_type: ResourceType,
     ) {
-        let resource_identifier_copy = resource_identifier.clone();
+        let resource_id_copy = resource_id.clone();
         let resource_type_copy = resource_type;
 
         match &resource_type_copy {
             ResourceType::Image => {
-                let resource_identifier = resource_identifier.clone();
+                let resource_id = resource_id.clone();
                 let app_sender_copy = app_sender.clone();
                 let f = async move {
-                    let image = resource_identifier.fetch_data_from_resource_identifier().await;
+                    let image = resource_id.fetch_data_from_resource_id().await;
 
                     if let Some(image_resource) = &image {
                         let bytes = image_resource;
@@ -68,7 +68,7 @@ impl ResourceManager {
                             .expect("Failed to guess format");
                         let size = reader.into_dimensions().unwrap_or_default();
                         let generic_resource = ResourceData::new(
-                            resource_identifier.clone(),
+                            resource_id.clone(),
                             Some(bytes.to_vec()),
                             None,
                             ResourceType::Image,
@@ -77,7 +77,7 @@ impl ResourceManager {
 
                         let resource = Resource::Image(Arc::new(ImageResource::new(size.0, size.1, generic_resource)));
                         app_sender_copy
-                            .send(ResourceEvent::Loaded(resource_identifier_copy, ResourceType::Image, resource).into())
+                            .send(ResourceEvent::Loaded(resource_id_copy, ResourceType::Image, resource).into())
                             .await
                             .expect("Failed to send added resource event");
                     }
@@ -85,19 +85,19 @@ impl ResourceManager {
                 self.runtime.spawn(f);
             }
             ResourceType::Font => {
-                let resource = resource_identifier.clone();
+                let resource = resource_id.clone();
                 let app_sender_copy = app_sender.clone();
                 let f = async move {
-                    let mut bytes = resource.clone().fetch_data_from_resource_identifier().await;
+                    let mut bytes = resource.clone().fetch_data_from_resource_id().await;
 
                     if let Some(font_bytes) = bytes.take() {
                         let generic_resource =
-                            ResourceData::new(resource_identifier.clone(), Some(font_bytes), None, ResourceType::Font);
+                            ResourceData::new(resource_id.clone(), Some(font_bytes), None, ResourceType::Font);
                         info!("Font downloaded");
                         let resource = Resource::Font(generic_resource);
 
                         app_sender_copy
-                            .send(ResourceEvent::Loaded(resource_identifier_copy, ResourceType::Font, resource).into())
+                            .send(ResourceEvent::Loaded(resource_id_copy, ResourceType::Font, resource).into())
                             .await
                             .expect("Failed to send added resource event");
                     }
@@ -105,14 +105,14 @@ impl ResourceManager {
                 self.runtime.spawn(f);
             }
             ResourceType::TinyVg => {
-                let resource = resource_identifier.clone();
+                let resource = resource_id.clone();
                 let app_sender_copy = app_sender.clone();
                 let f = async move {
-                    let bytes = resource.clone().fetch_data_from_resource_identifier().await;
+                    let bytes = resource.clone().fetch_data_from_resource_id().await;
 
                     if let Some(bytes) = bytes {
                         let generic_resource = ResourceData::new(
-                            resource_identifier.clone(),
+                            resource_id.clone(),
                             Some(bytes.to_vec()),
                             None,
                             ResourceType::TinyVg,
@@ -121,7 +121,7 @@ impl ResourceManager {
                         info!("TinyVG downloaded");
                         app_sender_copy
                             .send(
-                                ResourceEvent::Loaded(resource_identifier_copy, ResourceType::TinyVg, resource).into(),
+                                ResourceEvent::Loaded(resource_id_copy, ResourceType::TinyVg, resource).into(),
                             )
                             .await
                             .expect("Failed to send added resource event");
@@ -136,18 +136,18 @@ impl ResourceManager {
     pub fn async_download_resource_and_send_message_on_finish<Message: From<ResourceEvent> + Send + 'static>(
         &self,
         app_sender: Sender<Message>,
-        resource_identifier: ResourceIdentifier,
+        resource_id: ResourceId,
         resource_type: ResourceType,
     ) {
-        let resource_identifier_copy = resource_identifier.clone();
+        let resource_id_copy = resource_id.clone();
         let resource_type_copy = resource_type;
 
         match &resource_type_copy {
             ResourceType::Image => {
-                let resource_identifier = resource_identifier.clone();
+                let resource_id = resource_id.clone();
                 let app_sender_copy = app_sender.clone();
                 let f = async move {
-                    let image = resource_identifier.fetch_data_from_resource_identifier().await;
+                    let image = resource_id.fetch_data_from_resource_id().await;
 
                     if let Some(image_resource) = &image {
                         let bytes = image_resource;
@@ -157,7 +157,7 @@ impl ResourceManager {
                             .expect("Failed to guess format");
                         let size = reader.into_dimensions().unwrap_or_default();
                         let generic_resource = ResourceData::new(
-                            resource_identifier.clone(),
+                            resource_id.clone(),
                             Some(bytes.to_vec()),
                             None,
                             ResourceType::Image,
@@ -166,7 +166,7 @@ impl ResourceManager {
 
                         let resource = Resource::Image(Arc::new(ImageResource::new(size.0, size.1, generic_resource)));
                         app_sender_copy
-                            .send(ResourceEvent::Loaded(resource_identifier_copy, ResourceType::Image, resource).into())
+                            .send(ResourceEvent::Loaded(resource_id_copy, ResourceType::Image, resource).into())
                             .await
                             .expect("Failed to send added resource event");
                     }
@@ -174,19 +174,19 @@ impl ResourceManager {
                 self.runtime.spawn(f);
             }
             ResourceType::Font => {
-                let resource = resource_identifier.clone();
+                let resource = resource_id.clone();
                 let app_sender_copy = app_sender.clone();
                 let f = async move {
-                    let mut bytes = resource.clone().fetch_data_from_resource_identifier().await;
+                    let mut bytes = resource.clone().fetch_data_from_resource_id().await;
 
                     if let Some(font_bytes) = bytes.take() {
                         let generic_resource =
-                            ResourceData::new(resource_identifier.clone(), Some(font_bytes), None, ResourceType::Font);
+                            ResourceData::new(resource_id.clone(), Some(font_bytes), None, ResourceType::Font);
                         info!("Font downloaded");
                         let resource = Resource::Font(generic_resource);
 
                         app_sender_copy
-                            .send(ResourceEvent::Loaded(resource_identifier_copy, ResourceType::Font, resource).into())
+                            .send(ResourceEvent::Loaded(resource_id_copy, ResourceType::Font, resource).into())
                             .await
                             .expect("Failed to send added resource event");
                     }
@@ -194,14 +194,14 @@ impl ResourceManager {
                 self.runtime.spawn(f);
             }
             ResourceType::TinyVg => {
-                let resource = resource_identifier.clone();
+                let resource = resource_id.clone();
                 let app_sender_copy = app_sender.clone();
                 let f = async move {
-                    let bytes = resource.clone().fetch_data_from_resource_identifier().await;
+                    let bytes = resource.clone().fetch_data_from_resource_id().await;
 
                     if let Some(bytes) = bytes {
                         let generic_resource = ResourceData::new(
-                            resource_identifier.clone(),
+                            resource_id.clone(),
                             Some(bytes.to_vec()),
                             None,
                             ResourceType::TinyVg,
@@ -210,7 +210,7 @@ impl ResourceManager {
                         info!("TinyVG downloaded");
                         app_sender_copy
                             .send(
-                                ResourceEvent::Loaded(resource_identifier_copy, ResourceType::TinyVg, resource).into(),
+                                ResourceEvent::Loaded(resource_id_copy, ResourceType::TinyVg, resource).into(),
                             )
                             .await
                             .expect("Failed to send added resource event");
@@ -221,15 +221,15 @@ impl ResourceManager {
         }
     }
 
-    pub fn contains(&self, resource_identifier: &ResourceIdentifier) -> bool {
-        self.resources.contains(resource_identifier)
+    pub fn contains(&self, resource_id: &ResourceId) -> bool {
+        self.resources.contains(resource_id)
     }
 
-    pub fn get(&self, resource_identifier: &ResourceIdentifier) -> Option<Arc<Resource>> {
-        self.resources.get(resource_identifier)
+    pub fn get(&self, resource_id: &ResourceId) -> Option<Arc<Resource>> {
+        self.resources.get(resource_id)
     }
 
-    pub fn insert(&self, resource_identifier: ResourceIdentifier, resource: Arc<Resource>) {
-        self.resources.insert(resource_identifier, resource);
+    pub fn insert(&self, resource_id: ResourceId, resource: Arc<Resource>) {
+        self.resources.insert(resource_id, resource);
     }
 }
diff --git a/crates/craft_resource_manager/src/resource_data.rs b/crates/craft_resource_manager/src/resource_data.rs
index dde9ca83..d96f19fc 100644
--- a/crates/craft_resource_manager/src/resource_data.rs
+++ b/crates/craft_resource_manager/src/resource_data.rs
@@ -1,12 +1,12 @@
 use chrono::{DateTime, Utc};
 
-use crate::identifier::ResourceIdentifier;
+use crate::identifier::ResourceId;
 use crate::resource_type::ResourceType;
 
 #[allow(dead_code)]
 #[derive(Debug)]
 pub struct ResourceData {
-    pub(crate) resource_identifier: ResourceIdentifier,
+    pub(crate) resource_id: ResourceId,
     pub(crate) data: Option<Vec<u8>>,
     pub(crate) resource_type: ResourceType,
     pub(crate) expiration_time: Option<DateTime<Utc>>,
@@ -14,13 +14,13 @@ pub struct ResourceData {
 
 impl ResourceData {
     pub(crate) fn new(
-        resource_identifier: ResourceIdentifier,
+        resource_id: ResourceId,
         data: Option<Vec<u8>>,
         expiration_time: Option<DateTime<Utc>>,
         resource_type: ResourceType,
     ) -> Self {
         ResourceData {
-            resource_identifier,
+            resource_id,
             expiration_time,
             data,
             resource_type,
diff --git a/crates/craft_resource_manager/src/resource_event.rs b/crates/craft_resource_manager/src/resource_event.rs
index a4a5af4e..b72f62fa 100644
--- a/crates/craft_resource_manager/src/resource_event.rs
+++ b/crates/craft_resource_manager/src/resource_event.rs
@@ -1,10 +1,10 @@
-use crate::ResourceIdentifier;
+use crate::ResourceId;
 use crate::resource::Resource;
 use crate::resource_type::ResourceType;
 
 #[derive(Debug)]
 pub enum ResourceEvent {
-    Loaded(ResourceIdentifier, ResourceType, Resource),
+    Loaded(ResourceId, ResourceType, Resource),
     #[allow(dead_code)]
-    UnLoaded(ResourceIdentifier),
+    UnLoaded(ResourceId),
 }
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 9bc55568..2b251fe1 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -13,7 +13,7 @@ use craft_primitives::geometry::{Point, Size};
 
 use craft_resource_manager::resource_event::ResourceEvent;
 use craft_resource_manager::resource_type::ResourceType;
-use craft_resource_manager::{ResourceIdentifier, ResourceManager};
+use craft_resource_manager::{ResourceId, ResourceManager};
 
 use craft_runtime::{CraftRuntimeHandle, Sender};
 
@@ -36,8 +36,8 @@ use crate::window_manager::WindowManager;
 
 thread_local! {
     pub(crate) static ELEMENTS: RefCell<ElementIdMap> = RefCell::new(ElementIdMap::new());
-    pub(crate) static PENDING_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = const { RefCell::new(VecDeque::new()) };
-    pub(crate) static IN_PROGRESS_RESOURCES: RefCell<VecDeque<(ResourceIdentifier, ResourceType)>> = const { RefCell::new(VecDeque::new()) };
+    pub(crate) static PENDING_RESOURCES: RefCell<VecDeque<(ResourceId, ResourceType)>> = const { RefCell::new(VecDeque::new()) };
+    pub(crate) static IN_PROGRESS_RESOURCES: RefCell<VecDeque<(ResourceId, ResourceType)>> = const { RefCell::new(VecDeque::new()) };
     pub(crate) static FOCUS: RefCell<Option<Weak<RefCell<dyn ElementInternals>>>> = RefCell::new(None);
     pub(crate) static WINDOW_MANAGER: RefCell<WindowManager> = RefCell::new(WindowManager::new());
     pub(crate) static TAFFY_TREE: RefCell<TaffyTree> = RefCell::new(TaffyTree::new());
@@ -169,9 +169,9 @@ impl App {
 
     pub fn on_resource_event(&mut self, resource_event: ResourceEvent) {
         match resource_event {
-            ResourceEvent::Loaded(resource_identifier, resource_type, resource) => {
+            ResourceEvent::Loaded(resource_id, resource_type, resource) => {
                 IN_PROGRESS_RESOURCES.with_borrow_mut(|in_progress| {
-                    in_progress.retain_mut(|(resource, _resource_type)| *resource != resource_identifier);
+                    in_progress.retain_mut(|(resource, _resource_type)| *resource != resource_id);
                 });
                 if let Some(_text_context) = self.text_context.as_mut()
                     && resource_type == ResourceType::Font
@@ -179,10 +179,10 @@ impl App {
                 {
                     // Todo: Load the font into the text context.
                     self.resource_manager
-                        .insert(resource_identifier.clone(), Arc::new(resource));
+                        .insert(resource_id.clone(), Arc::new(resource));
                     self.reload_fonts = true;
                 } else if resource_type == ResourceType::Image || resource_type == ResourceType::TinyVg {
-                    self.resource_manager.insert(resource_identifier, Arc::new(resource));
+                    self.resource_manager.insert(resource_id, Arc::new(resource));
                 }
                 // TODO: Only mark dirty affected nodes.
                 WINDOW_MANAGER.with_borrow_mut(|window_manager| {
diff --git a/crates/craft_retained/src/elements/image.rs b/crates/craft_retained/src/elements/image.rs
index 8a573206..0947662e 100644
--- a/crates/craft_retained/src/elements/image.rs
+++ b/crates/craft_retained/src/elements/image.rs
@@ -8,7 +8,7 @@ use craft_primitives::geometry::Rectangle;
 
 use craft_renderer::RenderList;
 
-use craft_resource_manager::ResourceIdentifier;
+use craft_resource_manager::ResourceId;
 use craft_resource_manager::resource_type::ResourceType;
 
 use craft_primitives::geometry::{Affine, Point};
@@ -31,7 +31,7 @@ pub struct Image {
 #[derive(Clone)]
 pub struct ImageInner {
     is_image_dirty: bool,
-    resource_identifier: ResourceIdentifier,
+    resource_id: ResourceId,
     element_data: ElementData,
 }
 
@@ -97,7 +97,7 @@ impl ElementInternals for ImageInner {
         let content_rectangle = computed_box_transformed.content_rectangle();
         self.draw_borders(_renderer, _scale_factor);
 
-        _renderer.draw_image(content_rectangle.scale(_scale_factor), self.resource_identifier.clone());
+        _renderer.draw_image(content_rectangle.scale(_scale_factor), self.resource_id.clone());
     }
 
     fn as_any(&self) -> &dyn Any {
@@ -110,41 +110,41 @@ impl ElementInternals for ImageInner {
 }
 
 impl Image {
-    pub fn new(resource_identifier: ResourceIdentifier) -> Self {
+    pub fn new(resource_id: ResourceId) -> Self {
         let inner = Rc::new_cyclic(|me: &Weak<RefCell<ImageInner>>| {
             RefCell::new(ImageInner {
                 is_image_dirty: false,
-                resource_identifier: resource_identifier.clone(),
+                resource_id: resource_id.clone(),
                 element_data: ElementData::new(me.clone(), false),
             })
         });
-        let layout_context = Some(LayoutContext::Image(ImageContext::new(resource_identifier.clone())));
+        let layout_context = Some(LayoutContext::Image(ImageContext::new(resource_id.clone())));
         inner.borrow_mut().element_data.create_layout_node(layout_context);
 
         PENDING_RESOURCES.with_borrow_mut(|pending_resources| {
-            pending_resources.push_back((resource_identifier, ResourceType::Image));
+            pending_resources.push_back((resource_id, ResourceType::Image));
         });
 
         Self { inner }
     }
 
-    pub fn image(self, resource_identifier: ResourceIdentifier) -> Self {
-        self.inner.borrow_mut().image(resource_identifier);
+    pub fn image(self, resource_id: ResourceId) -> Self {
+        self.inner.borrow_mut().image(resource_id);
         self
     }
 
-    pub fn get_image(&self) -> ResourceIdentifier {
+    pub fn get_image(&self) -> ResourceId {
         self.inner.borrow().get_image().clone()
     }
 }
 
 impl ImageInner {
-    pub fn image(&mut self, resource_identifier: ResourceIdentifier) {
+    pub fn image(&mut self, resource_id: ResourceId) {
         self.is_image_dirty = true;
-        self.resource_identifier = resource_identifier.clone();
+        self.resource_id = resource_id.clone();
 
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let context = LayoutContext::Image(ImageContext::new(resource_identifier));
+            let context = LayoutContext::Image(ImageContext::new(resource_id));
             let node = self
                 .element_data
                 .layout
@@ -154,7 +154,7 @@ impl ImageInner {
         });
     }
 
-    pub fn get_image(&self) -> &ResourceIdentifier {
-        &self.resource_identifier
+    pub fn get_image(&self) -> &ResourceId {
+        &self.resource_id
     }
 }
diff --git a/crates/craft_retained/src/elements/tinyvg.rs b/crates/craft_retained/src/elements/tinyvg.rs
index a985aaaa..921b12d6 100644
--- a/crates/craft_retained/src/elements/tinyvg.rs
+++ b/crates/craft_retained/src/elements/tinyvg.rs
@@ -8,7 +8,7 @@ use craft_primitives::geometry::Rectangle;
 
 use craft_renderer::RenderList;
 
-use craft_resource_manager::ResourceIdentifier;
+use craft_resource_manager::ResourceId;
 use craft_resource_manager::resource_type::ResourceType;
 
 use craft_primitives::geometry::{Affine, Point};
@@ -32,7 +32,7 @@ pub struct TinyVg {
 #[derive(Clone)]
 pub struct TinyVgInner {
     is_TinyVg_dirty: bool,
-    resource_identifier: ResourceIdentifier,
+    resource_id: ResourceId,
     element_data: ElementData,
 }
 
@@ -104,7 +104,7 @@ impl ElementInternals for TinyVgInner {
         }
         _renderer.draw_tiny_vg(
             content_rectangle.scale(_scale_factor),
-            self.resource_identifier.clone(),
+            self.resource_id.clone(),
             color,
         );
     }
@@ -119,42 +119,42 @@ impl ElementInternals for TinyVgInner {
 }
 
 impl TinyVg {
-    pub fn new(resource_identifier: ResourceIdentifier) -> Self {
+    pub fn new(resource_id: ResourceId) -> Self {
         let inner = Rc::new_cyclic(|me: &Weak<RefCell<TinyVgInner>>| {
             RefCell::new(TinyVgInner {
                 is_TinyVg_dirty: false,
-                resource_identifier: resource_identifier.clone(),
+                resource_id: resource_id.clone(),
                 element_data: ElementData::new(me.clone(), false),
             })
         });
-        let layout_context = Some(LayoutContext::TinyVg(TinyVgContext::new(resource_identifier.clone())));
+        let layout_context = Some(LayoutContext::TinyVg(TinyVgContext::new(resource_id.clone())));
         inner.borrow_mut().element_data.create_layout_node(layout_context);
         inner.borrow_mut().style_mut().set_color(Color::TRANSPARENT);
 
         PENDING_RESOURCES.with_borrow_mut(|pending_resources| {
-            pending_resources.push_back((resource_identifier, ResourceType::TinyVg));
+            pending_resources.push_back((resource_id, ResourceType::TinyVg));
         });
 
         Self { inner }
     }
 
-    pub fn TinyVg(self, resource_identifier: ResourceIdentifier) -> Self {
-        self.inner.borrow_mut().TinyVg(resource_identifier);
+    pub fn TinyVg(self, resource_id: ResourceId) -> Self {
+        self.inner.borrow_mut().TinyVg(resource_id);
         self
     }
 
-    pub fn get_TinyVg(&self) -> ResourceIdentifier {
-        self.inner.borrow().get_TinyVg().clone()
+    pub fn get_TinyVg(&self) -> ResourceId {
+        self.inner.borrow().get_resource_id().clone()
     }
 }
 
 impl TinyVgInner {
-    pub fn TinyVg(&mut self, resource_identifier: ResourceIdentifier) {
+    pub fn TinyVg(&mut self, resource_id: ResourceId) {
         self.is_TinyVg_dirty = true;
-        self.resource_identifier = resource_identifier.clone();
+        self.resource_id = resource_id.clone();
 
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
-            let context = LayoutContext::TinyVg(TinyVgContext::new(resource_identifier));
+            let context = LayoutContext::TinyVg(TinyVgContext::new(resource_id));
             let node = self
                 .element_data
                 .layout
@@ -164,7 +164,7 @@ impl TinyVgInner {
         });
     }
 
-    pub fn get_TinyVg(&self) -> &ResourceIdentifier {
-        &self.resource_identifier
+    pub fn get_resource_id(&self) -> &ResourceId {
+        &self.resource_id
     }
 }
diff --git a/crates/craft_retained/src/layout/layout_context.rs b/crates/craft_retained/src/layout/layout_context.rs
index 56be421b..7fdd3937 100644
--- a/crates/craft_retained/src/layout/layout_context.rs
+++ b/crates/craft_retained/src/layout/layout_context.rs
@@ -3,7 +3,7 @@ use std::rc::Weak;
 use std::sync::Arc;
 
 use craft_resource_manager::resource::Resource;
-use craft_resource_manager::{ResourceIdentifier, ResourceManager};
+use craft_resource_manager::{ResourceId, ResourceManager};
 use taffy::{AvailableSpace, Size};
 
 use crate::elements::{TextInner, TextInputInner};
@@ -41,13 +41,13 @@ impl TaffyTextContext {}
 
 #[derive(Clone)]
 pub struct ImageContext {
-    pub(crate) resource_identifier: ResourceIdentifier,
+    pub(crate) resource_id: ResourceId,
 }
 
 impl ImageContext {
-    pub(crate) fn new(resource_identifier: ResourceIdentifier) -> Self {
+    pub(crate) fn new(resource_id: ResourceId) -> Self {
         Self {
-            resource_identifier,
+            resource_id,
         }
     }
 
@@ -60,7 +60,7 @@ impl ImageContext {
     ) -> Size<f32> {
         let mut original_image_width: f32 = 0.0;
         let mut original_image_height: f32 = 0.0;
-        if let Some(resource) = resource_manager.get(&self.resource_identifier)
+        if let Some(resource) = resource_manager.get(&self.resource_id)
             && let Resource::Image(image_data) = resource.as_ref()
         {
             original_image_width = image_data.width as f32;
@@ -146,7 +146,7 @@ impl TextHashKey {
 
 #[derive(Clone)]
 pub struct TinyVgContext {
-    pub(crate) resource_identifier: ResourceIdentifier,
+    pub(crate) resource_id: ResourceId,
 }
 
 pub fn measure_content(
@@ -196,9 +196,9 @@ pub fn measure_content(
 }
 
 impl TinyVgContext {
-    pub fn new(resource_identifier: ResourceIdentifier) -> Self {
+    pub fn new(resource_id: ResourceId) -> Self {
         Self {
-            resource_identifier,
+            resource_id,
         }
     }
 
@@ -212,7 +212,7 @@ impl TinyVgContext {
         let mut original_image_width: f32 = 0.0;
         let mut original_image_height: f32 = 0.0;
 
-        if let Some(resource) = resource_manager.get(&self.resource_identifier)
+        if let Some(resource) = resource_manager.get(&self.resource_id)
             && let Resource::TinyVg(resource) = resource.as_ref()
             && let Some(tinyvg) = &resource.tinyvg
         {
diff --git a/crates/craft_retained/src/lib.rs b/crates/craft_retained/src/lib.rs
index 397ac743..5cf56ab7 100644
--- a/crates/craft_retained/src/lib.rs
+++ b/crates/craft_retained/src/lib.rs
@@ -4,7 +4,7 @@ pub use craft_primitives::{Color, geometry, palette};
 
 pub use craft_renderer::RendererType;
 
-pub use craft_resource_manager::ResourceIdentifier;
+pub use craft_resource_manager::ResourceId;
 
 pub use craft_runtime::{self, CraftRuntime};
 
diff --git a/website/src/index.rs b/website/src/index.rs
index ac3cddcc..a3d07122 100644
--- a/website/src/index.rs
+++ b/website/src/index.rs
@@ -1,6 +1,6 @@
 use craft_retained::elements::{Container, Element, Text, TinyVg};
 use craft_retained::style::{AlignItems, Display, FlexDirection, FlexWrap, FontWeight, JustifyContent, Overflow, Unit};
-use craft_retained::{Color, ResourceIdentifier, WinitWindow, palette, pct, px, rgb};
+use craft_retained::{Color, ResourceId, WinitWindow, palette, pct, px, rgb};
 use std::cell::RefCell;
 use std::rc::Rc;
 
@@ -88,7 +88,7 @@ fn hero_intro(navigate_fn: NavigateFn) -> Container {
 }
 
 fn hero_features() -> Container {
-    fn hero_item(title: &str, text: &str, icon: ResourceIdentifier) -> Container {
+    fn hero_item(title: &str, text: &str, icon: ResourceId) -> Container {
         let sub_title_color = Color::from_rgb8(70, 70, 70);
 
         let icon_title = Container::new().push(TinyVg::new(icon)).push(
@@ -124,35 +124,35 @@ fn hero_features() -> Container {
                     hero_item(
                         "Reactive",
                         "When your data changes, we automatically re-run your view function.",
-                        ResourceIdentifier::Bytes(include_bytes!("../assets/electric_bolt_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
+                        ResourceId::Bytes(include_bytes!("../assets/electric_bolt_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
                     )
                 )
                 .push(
                     hero_item(
                         "Components",
                         "Components are reusable blocks that manage their own state and define both how they are rendered and how they respond to updates.",
-                        ResourceIdentifier::Bytes(include_bytes!("../assets/view_comfy_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
+                        ResourceId::Bytes(include_bytes!("../assets/view_comfy_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
                     )
                 )
                 .push(
                     hero_item(
                         "Pure Rust without macros",
                         "No macros.",
-                        ResourceIdentifier::Bytes(include_bytes!("../assets/code_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
+                        ResourceId::Bytes(include_bytes!("../assets/code_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
                     )
                 )
                 .push(
                     hero_item(
                         "Web-like styling",
                         "We use Taffy, an implementation of the CSS flexbox, block, and grid layout algorithms, for simple and familiar styling.",
-                        ResourceIdentifier::Bytes(include_bytes!("../assets/brush_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
+                        ResourceId::Bytes(include_bytes!("../assets/brush_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
                     )
                 )
                 .push(
                     hero_item(
                         "Cross Platform",
                         "Currently we support Windows, macOS, Linux, Web, and Android.",
-                        ResourceIdentifier::Bytes(include_bytes!("../assets/devices_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
+                        ResourceId::Bytes(include_bytes!("../assets/devices_24dp_000000_FILL0_wght400_GRAD0_opsz24.tvg"))
                     )
                 )
 

From dddd6bd4a3f5decb07b1b036c1856df3547df619 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 5 Apr 2026 16:36:04 -0400
Subject: [PATCH 135/143] Fix warnings.

---
 crates/craft_renderer/src/helpers.rs          |  6 +++
 crates/craft_renderer/src/render_list.rs      |  3 +-
 crates/craft_renderer/src/sort_commands.rs    |  8 ++--
 crates/craft_renderer/src/vello/mod.rs        |  7 +--
 crates/craft_renderer/src/vello/tinyvg.rs     | 10 ++++-
 crates/craft_renderer/src/vello_cpu/mod.rs    | 21 +++++----
 crates/craft_renderer/src/vello_cpu/tinyvg.rs |  9 +---
 crates/craft_renderer/src/vello_hybrid/mod.rs | 22 ++--------
 .../craft_renderer/src/vello_hybrid/tinyvg.rs |  9 +---
 crates/craft_resource_manager/src/lib.rs      | 40 +++++------------
 crates/craft_retained/src/app.rs              |  3 +-
 crates/craft_retained/src/elements/tinyvg.rs  | 24 +++++-----
 .../src/layout/layout_context.rs              |  8 +---
 examples/counter_retained/main.rs             |  2 +-
 examples/text/main.rs                         | 42 +++++++++---------
 website/Cargo.toml                            |  1 -
 website/src/examples.rs                       | 44 +++++++++++--------
 website/src/index.rs                          |  8 ++--
 website/src/link.rs                           |  2 +-
 website/src/main.rs                           | 22 ++--------
 website/src/navbar.rs                         |  2 +-
 website/src/router.rs                         |  3 +-
 website/src/theme.rs                          |  2 +-
 website/wasm-build.sh                         |  2 +-
 24 files changed, 121 insertions(+), 179 deletions(-)

diff --git a/crates/craft_renderer/src/helpers.rs b/crates/craft_renderer/src/helpers.rs
index efa7a9bb..343bceed 100644
--- a/crates/craft_renderer/src/helpers.rs
+++ b/crates/craft_renderer/src/helpers.rs
@@ -5,6 +5,11 @@
 ))]
 use vello_common::paint::PaintType;
 
+#[cfg(any(
+    feature = "vello_cpu_renderer",
+    feature = "vello_hybrid_renderer",
+    feature = "vello_hybrid_renderer_webgl"
+))]
 use crate::Brush;
 
 #[cfg(any(
@@ -19,6 +24,7 @@ pub(crate) fn brush_to_paint(brush: &Brush) -> PaintType {
     }
 }
 
+#[cfg(feature = "vello_cpu_renderer")]
 pub const fn rgba_to_encoded_u32(r: u32, g: u32, b: u32, a: u32) -> u32 {
     b | (g << 8) | (r << 16) | (a << 24)
 }
diff --git a/crates/craft_renderer/src/render_list.rs b/crates/craft_renderer/src/render_list.rs
index 96517a88..cc4dfe55 100644
--- a/crates/craft_renderer/src/render_list.rs
+++ b/crates/craft_renderer/src/render_list.rs
@@ -45,7 +45,8 @@ impl RenderList {
 
     #[inline(always)]
     pub fn set_transform(&mut self, transform: Affine) {
-        self.commands.push(RenderCommand::SetTransform(SetTransformCmd { transform }));
+        self.commands
+            .push(RenderCommand::SetTransform(SetTransformCmd { transform }));
     }
 
     #[inline(always)]
diff --git a/crates/craft_renderer/src/sort_commands.rs b/crates/craft_renderer/src/sort_commands.rs
index 9f74ae3d..6c6ce90d 100644
--- a/crates/craft_renderer/src/sort_commands.rs
+++ b/crates/craft_renderer/src/sort_commands.rs
@@ -106,11 +106,9 @@ pub(crate) fn sort_and_cull_render_list_internal(surface_height: f32, render_lis
                 }
             }
 
-            RenderCommand::SetTransform(_) => {
-                unsafe {
-                    (*current).children.push(SortedItem::Other(index as u32));
-                }
-            }
+            RenderCommand::SetTransform(_) => unsafe {
+                (*current).children.push(SortedItem::Other(index as u32));
+            },
 
             _ => {
                 let bounding_rect = bounding_rect(command);
diff --git a/crates/craft_renderer/src/vello/mod.rs b/crates/craft_renderer/src/vello/mod.rs
index be7a40f7..170682f2 100644
--- a/crates/craft_renderer/src/vello/mod.rs
+++ b/crates/craft_renderer/src/vello/mod.rs
@@ -53,7 +53,7 @@ pub struct VelloRenderer {
     pub surface_clear_color: Color,
     pub render_into_texture: bool,
 
-    transform: Affine
+    transform: Affine,
 }
 
 impl RenderSurface {
@@ -323,7 +323,8 @@ impl Renderer for VelloRenderer {
                         let vello_image = vello::peniko::ImageBrush::new(vello_image);
 
                         let mut image_transform = Affine::IDENTITY;
-                        image_transform = image_transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
+                        image_transform =
+                            image_transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
                         image_transform = image_transform.pre_scale_non_uniform(
                             cmd.rect.width as f64 / image.width() as f64,
                             cmd.rect.height as f64 / image.height() as f64,
@@ -452,7 +453,7 @@ impl Renderer for VelloRenderer {
                         resource_manager.clone(),
                         cmd.resource_id.clone(),
                         &cmd.override_color,
-                        &self.transform
+                        &self.transform,
                     );
                 }
                 RenderCommand::PushLayer(cmd) => {
diff --git a/crates/craft_renderer/src/vello/tinyvg.rs b/crates/craft_renderer/src/vello/tinyvg.rs
index 2d85b1ef..9c6f318d 100644
--- a/crates/craft_renderer/src/vello/tinyvg.rs
+++ b/crates/craft_renderer/src/vello/tinyvg.rs
@@ -36,7 +36,7 @@ pub(crate) fn draw_tiny_vg(
     resource_manager: Arc<ResourceManager>,
     resource_id: ResourceId,
     override_color: &Option<Color>,
-    transform: &Affine
+    transform: &Affine,
 ) {
     let resource = resource_manager.get(&resource_id);
     if let Some(resource) = resource
@@ -198,7 +198,13 @@ pub(crate) fn draw_tiny_vg(
                         let rectangle =
                             kurbo::Rect::new(rectangle.x.0, rectangle.y.0, rectangle.height.0, rectangle.height.0);
                         scene.fill(Fill::EvenOdd, vg_transform, &fill_brush, None, &rectangle);
-                        scene.stroke(&Stroke::new(data.line_width.0), vg_transform, &line_brush, None, &rectangle);
+                        scene.stroke(
+                            &Stroke::new(data.line_width.0),
+                            vg_transform,
+                            &line_brush,
+                            None,
+                            &rectangle,
+                        );
                     }
                 }
                 DrawCommand::OutlineFillPath(data) => {
diff --git a/crates/craft_renderer/src/vello_cpu/mod.rs b/crates/craft_renderer/src/vello_cpu/mod.rs
index bf56686b..e5e732c1 100644
--- a/crates/craft_renderer/src/vello_cpu/mod.rs
+++ b/crates/craft_renderer/src/vello_cpu/mod.rs
@@ -144,9 +144,8 @@ impl Renderer for VelloCpuRenderer {
         &'a mut self,
         render_list: &'a mut RenderList,
         resource_manager: Arc<ResourceManager>,
-        window: Rectangle
+        window: Rectangle,
     ) {
-
         vello_draw_rect(
             &mut self.render_context,
             Rectangle::new(0.0, 0.0, self.window_width as f32, self.window_height as f32),
@@ -191,12 +190,14 @@ impl Renderer for VelloCpuRenderer {
 
                         let scene_state = self.render_context.save_current_state();
                         let mut image_transform = Affine::IDENTITY;
-                        image_transform = image_transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
+                        image_transform =
+                            image_transform.with_translation(kurbo::Vec2::new(cmd.rect.x as f64, cmd.rect.y as f64));
                         image_transform = image_transform.pre_scale_non_uniform(
                             cmd.rect.width as f64 / image.width() as f64,
                             cmd.rect.height as f64 / image.height() as f64,
                         );
-                        self.render_context.set_transform(scene_state.transform * image_transform);
+                        self.render_context
+                            .set_transform(scene_state.transform * image_transform);
 
                         let is = vello_common::paint::ImageSource::from_peniko_image_data(&id);
 
@@ -283,7 +284,8 @@ impl Renderer for VelloCpuRenderer {
                     });
 
                     let scene_state = self.render_context.save_current_state();
-                    self.render_context.set_transform(scene_state.transform * text_transform);
+                    self.render_context
+                        .set_transform(scene_state.transform * text_transform);
                     cull_and_process(&mut |line: &TextRenderLine| {
                         for item in &line.items {
                             if let Some(underline) = &item.underline {
@@ -299,10 +301,7 @@ impl Renderer for VelloCpuRenderer {
                                     .unwrap_or_else(|| item.brush.color),
                             ));
 
-                            let glyph_run_builder = self
-                                .render_context
-                                .glyph_run(&item.font)
-                                .font_size(item.font_size);
+                            let glyph_run_builder = self.render_context.glyph_run(&item.font).font_size(item.font_size);
                             glyph_run_builder.fill_glyphs(item.glyphs.iter().map(|glyph| Glyph {
                                 id: glyph.id,
                                 x: glyph.x,
@@ -418,7 +417,8 @@ impl VelloCpuRenderer {
                 filter,
             );
 
-            self.render_context.set_transform(scene_state.transform * Affine::translate(box_shadow.offset));
+            self.render_context
+                .set_transform(scene_state.transform * Affine::translate(box_shadow.offset));
 
             self.render_context.set_paint(box_shadow.color);
             self.render_context.fill_path(&box_shadow.path);
@@ -435,7 +435,6 @@ impl VelloCpuRenderer {
 
             self.render_context.pop_layer();
 
-
             self.render_context.restore_state(scene_state);
         }
     }
diff --git a/crates/craft_renderer/src/vello_cpu/tinyvg.rs b/crates/craft_renderer/src/vello_cpu/tinyvg.rs
index 9e2af5f6..45962e47 100644
--- a/crates/craft_renderer/src/vello_cpu/tinyvg.rs
+++ b/crates/craft_renderer/src/vello_cpu/tinyvg.rs
@@ -97,14 +97,7 @@ pub(crate) fn draw_tiny_vg(
                     let path = Path {
                         segments: vec![segment],
                     };
-                    draw_path(
-                        scene,
-                        &path,
-                        &data.style,
-                        None,
-                        &tiny_vg.color_table,
-                        override_color,
-                    );
+                    draw_path(scene, &path, &data.style, None, &tiny_vg.color_table, override_color);
                 }
                 DrawCommand::FillRectangles(data) => {
                     let brush = tinyvg_helpers::get_brush(&data.style, &tiny_vg.color_table, override_color);
diff --git a/crates/craft_renderer/src/vello_hybrid/mod.rs b/crates/craft_renderer/src/vello_hybrid/mod.rs
index 0552f73d..282415d4 100644
--- a/crates/craft_renderer/src/vello_hybrid/mod.rs
+++ b/crates/craft_renderer/src/vello_hybrid/mod.rs
@@ -23,6 +23,8 @@ use vello_hybrid::{RenderSize, RenderTargetConfig, Renderer, Scene};
 use wgpu::TextureFormat;
 use winit::window::Window;
 
+use crate::RenderCommand;
+use crate::helpers::brush_to_paint;
 use crate::render_command::{BoxShadowCmd, PushLayerCmd};
 use crate::render_list::RenderList;
 use crate::renderer::Renderer as CraftRenderer;
@@ -30,7 +32,6 @@ use crate::sort_commands::SortedCommands;
 use crate::text_renderer_data::{TextRenderLine, TextScroll};
 use crate::vello_hybrid::render_context::{RenderContext, RenderSurface};
 use crate::vello_hybrid::tinyvg::draw_tiny_vg;
-use crate::{Brush, RenderCommand};
 
 pub struct ActiveRenderState {
     // The fields MUST be in this order, so that the surface is dropped before the window
@@ -423,9 +424,7 @@ impl CraftRenderer for VelloHybridRenderer {
                                     .unwrap_or_else(|| item.brush.color),
                             ));
 
-                            let glyph_run_builder = scene
-                                .glyph_run(&item.font)
-                                .font_size(item.font_size);
+                            let glyph_run_builder = scene.glyph_run(&item.font).font_size(item.font_size);
                             glyph_run_builder.fill_glyphs(item.glyphs.iter().map(|glyph| Glyph {
                                 id: glyph.id,
                                 x: glyph.x,
@@ -574,18 +573,3 @@ impl CraftRenderer for VelloHybridRenderer {
         self.scene.reset();
     }
 }
-
-fn brush_to_paint(brush: &Brush) -> PaintType {
-    match brush {
-        Brush::Color(color) => PaintType::from(*color),
-        Brush::Gradient(gradient) => {
-            // Paint::Gradient does not exist yet, so we need to come back and fix this later.
-            let color = gradient
-                .stops
-                .first()
-                .map(|c| c.color.to_alpha_color())
-                .unwrap_or(Color::BLACK);
-            PaintType::from(color)
-        }
-    }
-}
diff --git a/crates/craft_renderer/src/vello_hybrid/tinyvg.rs b/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
index ef5cde83..52b7697d 100644
--- a/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
+++ b/crates/craft_renderer/src/vello_hybrid/tinyvg.rs
@@ -99,14 +99,7 @@ pub(crate) fn draw_tiny_vg(
                     let path = Path {
                         segments: vec![segment],
                     };
-                    draw_path(
-                        scene,
-                        &path,
-                        &data.style,
-                        None,
-                        &tiny_vg.color_table,
-                        override_color,
-                    );
+                    draw_path(scene, &path, &data.style, None, &tiny_vg.color_table, override_color);
                 }
                 DrawCommand::FillRectangles(data) => {
                     let brush = tinyvg_helpers::get_brush(&data.style, &tiny_vg.color_table, override_color);
diff --git a/crates/craft_resource_manager/src/lib.rs b/crates/craft_resource_manager/src/lib.rs
index 4f7732d4..83fd9923 100644
--- a/crates/craft_resource_manager/src/lib.rs
+++ b/crates/craft_resource_manager/src/lib.rs
@@ -67,12 +67,8 @@ impl ResourceManager {
                             .with_guessed_format()
                             .expect("Failed to guess format");
                         let size = reader.into_dimensions().unwrap_or_default();
-                        let generic_resource = ResourceData::new(
-                            resource_id.clone(),
-                            Some(bytes.to_vec()),
-                            None,
-                            ResourceType::Image,
-                        );
+                        let generic_resource =
+                            ResourceData::new(resource_id.clone(), Some(bytes.to_vec()), None, ResourceType::Image);
                         info!("Image downloaded");
 
                         let resource = Resource::Image(Arc::new(ImageResource::new(size.0, size.1, generic_resource)));
@@ -111,18 +107,12 @@ impl ResourceManager {
                     let bytes = resource.clone().fetch_data_from_resource_id().await;
 
                     if let Some(bytes) = bytes {
-                        let generic_resource = ResourceData::new(
-                            resource_id.clone(),
-                            Some(bytes.to_vec()),
-                            None,
-                            ResourceType::TinyVg,
-                        );
+                        let generic_resource =
+                            ResourceData::new(resource_id.clone(), Some(bytes.to_vec()), None, ResourceType::TinyVg);
                         let resource = Resource::TinyVg(TinyVgResource::new(generic_resource));
                         info!("TinyVG downloaded");
                         app_sender_copy
-                            .send(
-                                ResourceEvent::Loaded(resource_id_copy, ResourceType::TinyVg, resource).into(),
-                            )
+                            .send(ResourceEvent::Loaded(resource_id_copy, ResourceType::TinyVg, resource).into())
                             .await
                             .expect("Failed to send added resource event");
                     }
@@ -156,12 +146,8 @@ impl ResourceManager {
                             .with_guessed_format()
                             .expect("Failed to guess format");
                         let size = reader.into_dimensions().unwrap_or_default();
-                        let generic_resource = ResourceData::new(
-                            resource_id.clone(),
-                            Some(bytes.to_vec()),
-                            None,
-                            ResourceType::Image,
-                        );
+                        let generic_resource =
+                            ResourceData::new(resource_id.clone(), Some(bytes.to_vec()), None, ResourceType::Image);
                         info!("Image downloaded");
 
                         let resource = Resource::Image(Arc::new(ImageResource::new(size.0, size.1, generic_resource)));
@@ -200,18 +186,12 @@ impl ResourceManager {
                     let bytes = resource.clone().fetch_data_from_resource_id().await;
 
                     if let Some(bytes) = bytes {
-                        let generic_resource = ResourceData::new(
-                            resource_id.clone(),
-                            Some(bytes.to_vec()),
-                            None,
-                            ResourceType::TinyVg,
-                        );
+                        let generic_resource =
+                            ResourceData::new(resource_id.clone(), Some(bytes.to_vec()), None, ResourceType::TinyVg);
                         let resource = Resource::TinyVg(TinyVgResource::new(generic_resource));
                         info!("TinyVG downloaded");
                         app_sender_copy
-                            .send(
-                                ResourceEvent::Loaded(resource_id_copy, ResourceType::TinyVg, resource).into(),
-                            )
+                            .send(ResourceEvent::Loaded(resource_id_copy, ResourceType::TinyVg, resource).into())
                             .await
                             .expect("Failed to send added resource event");
                     }
diff --git a/crates/craft_retained/src/app.rs b/crates/craft_retained/src/app.rs
index 2b251fe1..5a1f1dc8 100644
--- a/crates/craft_retained/src/app.rs
+++ b/crates/craft_retained/src/app.rs
@@ -178,8 +178,7 @@ impl App {
                     && resource.data().is_some()
                 {
                     // Todo: Load the font into the text context.
-                    self.resource_manager
-                        .insert(resource_id.clone(), Arc::new(resource));
+                    self.resource_manager.insert(resource_id.clone(), Arc::new(resource));
                     self.reload_fonts = true;
                 } else if resource_type == ResourceType::Image || resource_type == ResourceType::TinyVg {
                     self.resource_manager.insert(resource_id, Arc::new(resource));
diff --git a/crates/craft_retained/src/elements/tinyvg.rs b/crates/craft_retained/src/elements/tinyvg.rs
index 921b12d6..122abc19 100644
--- a/crates/craft_retained/src/elements/tinyvg.rs
+++ b/crates/craft_retained/src/elements/tinyvg.rs
@@ -1,10 +1,10 @@
 //! Displays an TinyVg.
 
+use craft_primitives::geometry::Rectangle;
+use peniko::Color;
 use std::any::Any;
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
-use peniko::Color;
-use craft_primitives::geometry::Rectangle;
 
 use craft_renderer::RenderList;
 
@@ -31,7 +31,7 @@ pub struct TinyVg {
 
 #[derive(Clone)]
 pub struct TinyVgInner {
-    is_TinyVg_dirty: bool,
+    is_tiny_vg_dirty: bool,
     resource_id: ResourceId,
     element_data: ElementData,
 }
@@ -102,11 +102,7 @@ impl ElementInternals for TinyVgInner {
         if self.style().get_color() != rgba(0, 0, 0, 0) {
             color = Some(self.style().get_color());
         }
-        _renderer.draw_tiny_vg(
-            content_rectangle.scale(_scale_factor),
-            self.resource_id.clone(),
-            color,
-        );
+        _renderer.draw_tiny_vg(content_rectangle.scale(_scale_factor), self.resource_id.clone(), color);
     }
 
     fn as_any(&self) -> &dyn Any {
@@ -122,7 +118,7 @@ impl TinyVg {
     pub fn new(resource_id: ResourceId) -> Self {
         let inner = Rc::new_cyclic(|me: &Weak<RefCell<TinyVgInner>>| {
             RefCell::new(TinyVgInner {
-                is_TinyVg_dirty: false,
+                is_tiny_vg_dirty: false,
                 resource_id: resource_id.clone(),
                 element_data: ElementData::new(me.clone(), false),
             })
@@ -138,19 +134,19 @@ impl TinyVg {
         Self { inner }
     }
 
-    pub fn TinyVg(self, resource_id: ResourceId) -> Self {
-        self.inner.borrow_mut().TinyVg(resource_id);
+    pub fn set_resource_id(self, resource_id: ResourceId) -> Self {
+        self.inner.borrow_mut().set_resource_id(resource_id);
         self
     }
 
-    pub fn get_TinyVg(&self) -> ResourceId {
+    pub fn get_resource_id(&self) -> ResourceId {
         self.inner.borrow().get_resource_id().clone()
     }
 }
 
 impl TinyVgInner {
-    pub fn TinyVg(&mut self, resource_id: ResourceId) {
-        self.is_TinyVg_dirty = true;
+    pub fn set_resource_id(&mut self, resource_id: ResourceId) {
+        self.is_tiny_vg_dirty = true;
         self.resource_id = resource_id.clone();
 
         TAFFY_TREE.with_borrow_mut(|taffy_tree| {
diff --git a/crates/craft_retained/src/layout/layout_context.rs b/crates/craft_retained/src/layout/layout_context.rs
index 7fdd3937..d679fa37 100644
--- a/crates/craft_retained/src/layout/layout_context.rs
+++ b/crates/craft_retained/src/layout/layout_context.rs
@@ -46,9 +46,7 @@ pub struct ImageContext {
 
 impl ImageContext {
     pub(crate) fn new(resource_id: ResourceId) -> Self {
-        Self {
-            resource_id,
-        }
+        Self { resource_id }
     }
 
     pub fn measure(
@@ -197,9 +195,7 @@ pub fn measure_content(
 
 impl TinyVgContext {
     pub fn new(resource_id: ResourceId) -> Self {
-        Self {
-            resource_id,
-        }
+        Self { resource_id }
     }
 
     pub fn measure(
diff --git a/examples/counter_retained/main.rs b/examples/counter_retained/main.rs
index 03f58cca..97182ca0 100644
--- a/examples/counter_retained/main.rs
+++ b/examples/counter_retained/main.rs
@@ -63,7 +63,7 @@ pub fn counter() -> Container {
         })
 }
 
-pub(crate) fn main() {
+pub fn main() {
     setup_logging();
 
     Window::new("Counter").width(pct(100)).height(pct(100)).push(counter());
diff --git a/examples/text/main.rs b/examples/text/main.rs
index d0835208..4d6d352d 100644
--- a/examples/text/main.rs
+++ b/examples/text/main.rs
@@ -12,28 +12,28 @@ Morbi tincidunt porta scelerisque. Etiam sodales, leo eget molestie imperdiet, l
 
 Nunc tellus magna, varius eu ornare et, sodales hendrerit quam. Praesent nec magna finibus, elementum orci nec, facilisis nisi. Duis ligula mi, dapibus eget nibh a, posuere viverra ante. Aliquam efficitur mauris id quam faucibus, eget posuere turpis imperdiet. Nam vulputate sed urna vitae tincidunt. Nulla ligula urna, iaculis id urna sit amet, porta iaculis ligula. Maecenas volutpat odio at pretium commodo. Nullam faucibus efficitur neque, vitae elementum sem sollicitudin eu. Nullam rutrum nulla eu erat dignissim varius. ";
 
-fn main() {
-    let root = Window::new("Text");
-    root.push(
-        Container::new()
-            .display(Display::Flex)
-            .flex_direction(FlexDirection::Column)
-            .justify_content(Some(JustifyContent::Center))
-            .align_items(Some(AlignItems::Center))
-            .width(Unit::Percentage(100.0))
-            .height(Unit::Percentage(100.0))
-            .gap(Unit::Px(20.0), Unit::Px(20.0))
-            .font_size(72.0)
-            .color(rgb(50, 50, 50))
-            .push(
-                TextInput::new(LOREM_IPSUM)
-                    .overflow(Overflow::Visible, Overflow::Scroll)
-                    .width(Unit::Px(600.0))
-                    .height(Unit::Px(600.0))
-                    .display(Display::Block),
-            ),
-    );
+pub fn text() -> Container {
+    Container::new()
+        .display(Display::Flex)
+        .flex_direction(FlexDirection::Column)
+        .justify_content(Some(JustifyContent::Center))
+        .align_items(Some(AlignItems::Center))
+        .width(Unit::Percentage(100.0))
+        .height(Unit::Percentage(100.0))
+        .gap(Unit::Px(20.0), Unit::Px(20.0))
+        .font_size(72.0)
+        .color(rgb(50, 50, 50))
+        .push(
+            TextInput::new(LOREM_IPSUM)
+                .overflow(Overflow::Visible, Overflow::Scroll)
+                .width(Unit::Px(600.0))
+                .height(Unit::Px(600.0))
+                .display(Display::Block),
+        )
+}
 
+pub fn main() {
+    Window::new("Text").push(text());
     use craft_retained::CraftOptions;
     util::setup_logging();
     craft_retained::craft_main(CraftOptions::basic("text"));
diff --git a/website/Cargo.toml b/website/Cargo.toml
index 0d897a2d..5ffd2cb4 100644
--- a/website/Cargo.toml
+++ b/website/Cargo.toml
@@ -18,7 +18,6 @@ web-sys = { version = "0.3.77", features = ["Window", "Location", "History"] }
 path = "../crates/craft_retained"
 default-features = false
 features = [
-    "vello_hybrid_renderer",
     "vello_hybrid_renderer",
     "http_client",
     "png",
diff --git a/website/src/examples.rs b/website/src/examples.rs
index 8340e06c..7cab0c18 100644
--- a/website/src/examples.rs
+++ b/website/src/examples.rs
@@ -1,38 +1,39 @@
+#[allow(dead_code)]
 #[path = "../../examples/counter_retained/main.rs"]
 pub mod counter_retained;
 
+#[allow(dead_code)]
 #[path = "../../examples/text/main.rs"]
 mod text;
 
+#[allow(dead_code)]
 #[path = "../../examples/pointer_events/main.rs"]
 mod pointer_events;
 
 use std::cell::RefCell;
 use std::rc::Rc;
 
-use craft_retained::elements::{Container, Dropdown, Element, Text};
+use craft_retained::elements::{Container, Element, Text};
 use craft_retained::events::ui_events::pointer::PointerButton;
 use craft_retained::style::Display::Flex;
 use craft_retained::style::{FlexDirection, FontWeight, Overflow, Unit};
 use craft_retained::{palette, pct, px};
 
-use util::ExampleProps;
-
 use crate::WebsiteGlobalState;
 use crate::examples::counter_retained::counter;
 use crate::examples::pointer_events::pointer_events;
-use crate::navbar::NAVBAR_HEIGHT;
+use crate::examples::text::text;
 use crate::router::NavigateFn;
-use crate::theme::{ACTIVE_LINK_COLOR, DEFAULT_LINK_COLOR, MOBILE_MEDIA_QUERY_WIDTH, WRAPPER_PADDING_LEFT, WRAPPER_PADDING_RIGHT, wrapper};
+use crate::theme::{ACTIVE_LINK_COLOR, DEFAULT_LINK_COLOR, WRAPPER_PADDING_LEFT, WRAPPER_PADDING_RIGHT, wrapper};
 
 const COUNTER_EXAMPLE_LINK: &str = "/examples/counter";
 const POINTER_EVENTS_EXAMPLE_LINK: &str = "/examples/pointer-events";
+const TEXT_EXAMPLE_LINK: &str = "/examples/text";
 
 fn create_examples_link(
     label: &str,
     example_link: &str,
     example_to_show: &str,
-    context: Rc<RefCell<WebsiteGlobalState>>,
     navigate_fn: NavigateFn,
     example_container: Container,
     examples: Vec<Container>,
@@ -40,11 +41,10 @@ fn create_examples_link(
     let example_link_captured = example_link.to_string();
     let mut text = Text::new(label)
         .color(DEFAULT_LINK_COLOR)
-        .on_pointer_button_up(Rc::new(move |event, pointer_button_event| {
-            let context = context.clone();
+        .on_pointer_button_up(Rc::new(move |_event, pointer_button_event| {
             if pointer_button_event.button == Some(PointerButton::Primary) {
-                //navigate_fn(example_link_captured.as_str());
-                update_active_example(example_link_captured.as_str(), example_container.clone(), &examples)
+                update_active_example(example_link_captured.as_str(), example_container.clone(), &examples);
+                navigate_fn(example_link_captured.as_str());
             }
         }))
         .id(example_link)
@@ -57,7 +57,6 @@ fn create_examples_link(
 
 fn examples_sidebar(
     example_to_show: &str,
-    context: Rc<RefCell<WebsiteGlobalState>>,
     navigate_fn: NavigateFn,
     example_container: Container,
     examples: Vec<Container>,
@@ -67,7 +66,6 @@ fn examples_sidebar(
             "Counter",
             COUNTER_EXAMPLE_LINK,
             example_to_show,
-            context.clone(),
             navigate_fn.clone(),
             example_container.clone(),
             examples.clone(),
@@ -76,7 +74,14 @@ fn examples_sidebar(
             "Pointer Events",
             POINTER_EVENTS_EXAMPLE_LINK,
             example_to_show,
-            context.clone(),
+            navigate_fn.clone(),
+            example_container.clone(),
+            examples.clone(),
+        ),
+        create_examples_link(
+            "Text",
+            TEXT_EXAMPLE_LINK,
+            example_to_show,
             navigate_fn.clone(),
             example_container.clone(),
             examples.clone(),
@@ -104,7 +109,7 @@ fn examples_sidebar(
             .width(px(200))
             .max_width(px(300));
 
-        for (index, link) in links.drain(..).enumerate() {
+        for link in links.drain(..) {
             let is_selected = link.get_id().map(|id| id == example_to_show).unwrap_or(false);
             if is_selected {
                 //dropdown = dropdown.selected_item(index);
@@ -137,15 +142,21 @@ pub fn examples(context: Rc<RefCell<WebsiteGlobalState>>, navigate_fn: NavigateF
     let examples = vec![
         counter().id(COUNTER_EXAMPLE_LINK),
         pointer_events().id(POINTER_EVENTS_EXAMPLE_LINK),
+        text().id(TEXT_EXAMPLE_LINK),
     ];
 
     let container_height = 600.0; //(context.window().window_height() - NAVBAR_HEIGHT - vertical_padding * 2.0).max(0.0);
 
+    let current_index = examples
+        .iter()
+        .position(|ex| ex.get_id().as_deref() == Some(route.as_str()))
+        .unwrap_or(0);
+
     let example_container = Container::new()
         .width(pct(100))
         .height(px(container_height))
         .background_color(palette::css::WHITE)
-        .push(examples[0].clone());
+        .push(examples[current_index].clone());
 
     let vertical_padding = 50.0;
     let wrapper = wrapper()
@@ -157,7 +168,6 @@ pub fn examples(context: Rc<RefCell<WebsiteGlobalState>>, navigate_fn: NavigateF
         )
         .push(examples_sidebar(
             &route,
-            context.clone(),
             navigate_fn.clone(),
             example_container.clone(),
             examples.clone(),
@@ -170,8 +180,6 @@ pub fn examples(context: Rc<RefCell<WebsiteGlobalState>>, navigate_fn: NavigateF
 
     let wrapper = wrapper.push(example_container.clone());
 
-    update_active_example(&route, example_container.clone(), &examples);
-
     Container::new()
         .overflow(Overflow::Visible, Overflow::Scroll)
         .push(wrapper)
diff --git a/website/src/index.rs b/website/src/index.rs
index a3d07122..b71fb0d0 100644
--- a/website/src/index.rs
+++ b/website/src/index.rs
@@ -1,11 +1,9 @@
 use craft_retained::elements::{Container, Element, Text, TinyVg};
 use craft_retained::style::{AlignItems, Display, FlexDirection, FlexWrap, FontWeight, JustifyContent, Overflow, Unit};
-use craft_retained::{Color, ResourceId, WinitWindow, palette, pct, px, rgb};
-use std::cell::RefCell;
-use std::rc::Rc;
+use craft_retained::{Color, ResourceId, palette, pct, px, rgb};
 
 use crate::link::Link;
-use crate::router::{NavigateFn, Router};
+use crate::router::NavigateFn;
 use crate::theme::{WRAPPER_PADDING_LEFT, WRAPPER_PADDING_RIGHT, wrapper};
 use crate::web_link::WebLink;
 
@@ -79,7 +77,7 @@ fn hero_intro(navigate_fn: NavigateFn) -> Container {
         .wrap(FlexWrap::Wrap)
         .gap(px(17), px(17))
         .margin(px(40), px(0), px(0), px(0))
-        .push(Link("/docs", move || navigate_fn("/docs")).push(craft_button))
+        .push(Link(move || navigate_fn("/docs")).push(craft_button))
         .push(WebLink("https://github.com/craft-gui/craft").push(github_button));
 
     let inner_wrapper = inner_wrapper.push(buttons);
diff --git a/website/src/link.rs b/website/src/link.rs
index 46a27bf2..519d0250 100644
--- a/website/src/link.rs
+++ b/website/src/link.rs
@@ -4,7 +4,7 @@ use craft_retained::elements::{Container, Element};
 use craft_retained::events::ui_events::pointer::PointerButton;
 
 #[allow(non_snake_case)]
-pub fn Link<F>(href: &str, on_click: F) -> Container
+pub fn Link<F>(on_click: F) -> Container
 where
     F: Fn() + 'static,
 {
diff --git a/website/src/main.rs b/website/src/main.rs
index e92c88fa..2bb7851c 100644
--- a/website/src/main.rs
+++ b/website/src/main.rs
@@ -1,8 +1,7 @@
 use std::cell::RefCell;
 use std::rc::Rc;
 
-use craft_retained::elements::{Container, Element, ElementInternals, Window};
-use craft_retained::{CraftOptions, craft_main, pct};
+use craft_retained::{CraftOptions, craft_main};
 
 use crate::router::Router;
 
@@ -80,24 +79,11 @@ impl Default for WebsiteGlobalState {
 }
 
 fn main() {
-    let options = CraftOptions {
-        ..Default::default()
-    };
-
-    #[allow(unused_mut)]
-    let mut global_state = Rc::new(RefCell::new(WebsiteGlobalState::default()));
-
     util::setup_logging();
 
+    let global_state = Rc::new(RefCell::new(WebsiteGlobalState::default()));
     global_state.borrow_mut().load_route();
-
-    let page_wrapper = Router::new(global_state.clone());
-
-    /*    let root = page_wrapper.borrow().root.clone();
-
-        root.inner.borrow().print_tree_ids(4);
-    */
+    let page_wrapper = Router::new(global_state);
     page_wrapper.borrow().navigate();
-
-    craft_main(options);
+    craft_main(CraftOptions::default());
 }
diff --git a/website/src/navbar.rs b/website/src/navbar.rs
index 6ce616e5..8512cdf4 100644
--- a/website/src/navbar.rs
+++ b/website/src/navbar.rs
@@ -10,7 +10,7 @@ pub const NAVBAR_HEIGHT: f32 = 60.0;
 fn create_link(navigate_fn: NavigateFn, label: &str, route: &str) -> Container {
     let route_owned = route.to_string();
     let nav = navigate_fn.clone();
-    Link(route, move || {
+    Link(move || {
         nav(&route_owned);
     })
     .push(
diff --git a/website/src/router.rs b/website/src/router.rs
index 0ac797fb..9f0c85c2 100644
--- a/website/src/router.rs
+++ b/website/src/router.rs
@@ -3,14 +3,13 @@ use craft_retained::pct;
 use craft_retained::style::{Display, FlexDirection};
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
-use std::sync::Arc;
 
+use crate::WebsiteGlobalState;
 use crate::docs::docs;
 use crate::examples::examples;
 use crate::index::index_page;
 use crate::navbar::navbar;
 use crate::theme::BODY_BACKGROUND_COLOR;
-use crate::{WebsiteGlobalState, docs, index};
 
 #[derive(Clone)]
 pub struct Router {
diff --git a/website/src/theme.rs b/website/src/theme.rs
index d34ce50b..3a95bfd9 100644
--- a/website/src/theme.rs
+++ b/website/src/theme.rs
@@ -17,7 +17,7 @@ pub(crate) const WRAPPER_MARGIN_RIGHT: Unit = Unit::Auto;
 pub(crate) const WRAPPER_PADDING_LEFT: Unit = Unit::Px(20.0);
 pub(crate) const WRAPPER_PADDING_RIGHT: Unit = Unit::Px(20.0);
 
-pub(crate) const MOBILE_MEDIA_QUERY_WIDTH: u32 = 850;
+//pub(crate) const MOBILE_MEDIA_QUERY_WIDTH: u32 = 850;
 
 pub(crate) fn wrapper() -> Container {
     Container::new()
diff --git a/website/wasm-build.sh b/website/wasm-build.sh
index 07fb3318..901b25f1 100644
--- a/website/wasm-build.sh
+++ b/website/wasm-build.sh
@@ -7,6 +7,6 @@ set -e
 
 cargo build --target wasm32-unknown-unknown --release
 
-wasm-bindgen ../target/wasm32-unknown-unknown/release/website.wasm --target web --no-typescript --out-dir dist --out-name website
+wasm-bindgen ../target/wasm32-unknown-unknown/release/website.wasm --target web --no-typescript --out-dir dist --out-name website --debug --keep-debug
 cp index.html dist/index.html
 simple-http-server dist -c wasm,html,js --try-file dist/index.html -i --coep --coop --ip 0.0.0.0
\ No newline at end of file

From 2b952d7d2eb87acd07694507690414ee0b1ece27 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 5 Apr 2026 16:48:47 -0400
Subject: [PATCH 136/143] Try to fix ios ci

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 109d9a73..da79b3b5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -110,6 +110,8 @@ jobs:
 
   build-ios:
     runs-on: macos-latest
+    env:
+      IPHONEOS_DEPLOYMENT_TARGET: "13.0"
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4

From fdbda55ab0527c172eb01ab76f22ee34f499dcc4 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 5 Apr 2026 16:52:01 -0400
Subject: [PATCH 137/143] Update counter test.

---
 .../tests/snapshots/counter.png               | Bin 4725 -> 4795 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/crates/craft_retained/tests/snapshots/counter.png b/crates/craft_retained/tests/snapshots/counter.png
index 175767d80f6ea902fdb1a3d85268e31ecc322ce5..fe00b0f3b6bd7cab666461f9e841543b11f6a85f 100644
GIT binary patch
literal 4795
zcmcIoc|4SB8-6WCCNYFmq)8-95{k)EO+t!@Y*~{mLzE>oW32`mO_C&(?8^*IWDG*K
zqM3w3X6(s!DrAZH-VxuK?|hx(^!?5^|GdBFd9M4qujjt+_j&JU!VHfe;pN%L0{{T8
zt`5=&05~K7fZdFn9h?zbFC+~B0>Qe-11J63N7{Dt0>Ikmd6AkQamXk!m2jOn05B}j
zT@3_^2dx4m@&F+5f-W0S%qa{6ma_x=W*`#;0G8IkS>{m7mJQ&R1At!zF>O|4VgW6A
z|B1VwgP8JJH2pK6W$#PESv0Y@V*#;*jXAp_h$SLS)1Nc_8t84lWi2!LK*(IKpiJoL
z?5rVM6BDtVtgH|d6YspNEHyI|6Rsb#%;7pyla`7sRuFUeE1+fKzhwGV(6YoO;Vhb1
zm{>te-j{^03}T50X!<8itf04?e*?u5H>NF%C>AOf5K9J_vnzsl5L3c0=eN{)&Xpbu
z&4H>mPaVYG<lfp>Nxms7a;WHh-OOrZielJ(xK+{Cl!mPX*mgZ`)%7B9Pdifn9rIi5
z-Qz^(XLAz+PXlJYx-N7Mdy=zThCj41lCFW}2P_sKz%1J?4@bqgVhTl2Q1I$OI|~bo
zQ>S8IoUspR@9417*1l%A<3@P+(8!2VoW2<k^PuS3+;H}Ssp%cV9V4To^w!pogM(0>
ztM>V=ZYreCuAZJ?>}|d6vu_$2ZfHr|)JvsMC=Lz|FnmT?nYaTR^H{n6ysu9(surQ9
zX75v9Uypo3B8_u#$nM!g%E-XB>82V51O#NagqJQJBF80UWMmMC+2_@Uk^%(<1-m!p
zn#u}Cgailg!)0e>y&3-6aQ4cT``E<9L`H1W<fMv&J`5jv{rWC>`ReNGOaA_8DJfRg
z)`~S=US4%@Ma5gYef<3`tgYv#r|Zfj@j6HtzS_RRdhryL?gBT&U{E#els2m3BBG*f
z%+1ZMtZv|N>v(z5moCjX+CooQS#?xaR*sCg+1lEAc_}*Rr#GS8-1r-tn{S(DJKlIj
zqj9ZXZEa&i3b+9N&YxFMQ0VIJ-mRz@od07(<>!<H8oRnAW<&L*#wRA42QM~gry7xq
zizlb15CUeJnBk$};ok8XB9Vwo<Q}af6cufV>R@9Y4GYobFR4_xoZQ@JwU?7GP6f3z
zHXcAW9EZmW;`LI!6!I9CF&IWi$He%!U_^B*WHDVz(v{!_Cd05;?9h<Q<Z*CMZf+yH
zIO^ZOpFLy??stBm{P8AH(e5vP8zWa=W-EW%D+rYPLLd+X0`bVV;q17jHxydyIW;vk
zfzy7}y$^?-zM=vBzOT<*PWW-}7e9A*_s-evq7Hm~e4xuRF)+ntHph-d8fETRSKm%4
zC{PZmFf=sOLJkfN>ZKYH-$lQo)9Lf`7=M2?=qgT5e!NAlRD5Zvx>ul<gaj<RMbCz3
z&6>>I-0hU{@e4s({KCT5mWts)axzR_UViUhUt8O*(I{<Ml##J<SVloXOKq*Rre**d
zjrR6d*3?YuEvl)}hUw|(d>$KfL80jF?Hk3#-JPAca&dBTjnB-H$z(eHG)zrZH8Ue4
zPkq&_uA^grRTa{}fW}}jK7P#5mvVJ?_wn_uT`rBDo@B!vLqkJp>FGz09u?v_?Bp~s
zJw5$?)$98D;pyppl9DL|0^#Aqtx{4SK7al!fAI<$-S0)V$c4+u#3dzd*|cdJm!F?s
z-I>Q=U8bc;!HSEEjdrYG9TJ3*iqYfZ;_COhWNpoO{rV;nHaI$3Z3cWsbm0-;n>zQL
zT6)dYyq0bALPFCADx476Mqs2BHZ*&+G{Z^Gx~VZI&WZ5&Z*8M+2M?JbePxTmXv>^V
zc|2Tf2-Pjs-MJ$pW9>1RGDNRFLoCWQM_g23eFEvT>J^PSYjxt}+@<;6`b+ZzU6!H$
z{_3yzHT#86ULeP)*ap8DLW@YlC)Kn9vYo!;=8kpsCJ9QOb1%yn1MZa6n>0S$y`WMK
zUrkTinxh78!!BElPYF3kyVf1kI6GD;6k$pvZ?mbpOg&)BwvhBR3FGo5WsS7bTUsWO
zQb_9keu;!JZ@!>F`w%@aL5suCZ{rTh?!<YZFugBoxsFtPd-v9tn(*f08RO^8H3Xq1
zkq*+i!SVVx%IWI<H6_Cao4@tSy2`#k`-FJeIU!w)Q&?eWQix}YSdya{ABp|#Tl;AG
z=2)b@+J|ArZ?aNPs01PfQ$2HNO3@5<6@9hd!z?DZP8<3BNljCd)ji3h7EWL8?Loxq
zqwc=(>y8oOr6)*l0Xf47s#7ByRC1;Eu9wv<N^ye^pTl9}ca_=ZA*q($n6=p`;wHUl
zNn;~TK@kHS_9&sOIhv0hvO)gSvo}ev&e*p;+LOM$^j2A0LEgZVv}@RpHsf`+jn?Ra
z7JU`L=fy-dcxJTM-R-o*rVhFQ)b$<l>s&}VyB_f-jppGRW;aUStqI?+F&J}_T0<r&
z#_9Wx7r|&H1CSY<d9Q<+xAE6oPE_5Y6#cUmbjWq#tgl#8Ck7br)Tsvfz1ltZsJN7q
zM*Aabm627DY!5NHN)%tGco?C-DH<-5Ju`kN2l0;KD57O?hC?UJcdr|^>V&s49#e05
z57tvXANz=V6QhkkEI)ea(Pr-nToiUb_S-1C4kTz*=9d?-@vuho(?WxL3#3G#Ngizi
zho{F#yI?1pEH?FL6z0NVDjw}_B4F2~H_|kUfbGuIXV2aVQyHDp2+teMM&UD@2{N>D
z7h(i9!SWdiA|ZdjBDfg~z2%^vnY6()%Tafod`$Or6fYI*)BFx||5C@>?`r+NW8RUb
z={Ll2hy6dh!g+Hk#TFqlUJ%M<mDylwu>*W7<}4j*Z=n4Li@#rJ$v>rybRc;4Rhy7b
zEiMK;vTqyfDCLW~uWxzXk&WN1JRlb3u6m}X0WV0t@7SiEH=83urEBg*l_<jszduIz
zRnKaSW%HKX?380ucvF68iZ{}Gv01l<vM;vgB`{8~Kv13gE@siy0F8>Dweo+r-84!r
zl@bXP<CxK*^uaB>OiqN}^DMwmf3NLKo|Bw1p_`!=bCBcI6RLA%Zk&k6Z24Xy4a2#(
zM#A(HRb>PyDxbo~qB~B_KJlS|4Z5MdI>{-LJ4YRlAui;}!p{1Li66d;9%;n4mZt9K
za2?=6z>-~SpgwHeau2Hf{Y8*H`6$g1nUM&k+4ED0N6P4;&{8z|L?~mX6hHkTH}`5M
z&k1YHx1sc04~!TT4f!_0t`m7+IwS#MhJuB&D_oI^lRV_we$RQ&I_H}y+Y9YCZfoA>
zB4W><$wq-jG$y;BL{<ey_{i)K5b|z}(dM^Wj~8y<NyiFz6y;e~)EXYND-u1l)!;Sm
zV&#J8mM%H!)c{X2H#Snc*YL4TJ0UgqnKU2QL=M6srq3Pf>2{P%c)BVw@>+pM)DuT3
zQcQm)PE}g?rOyjt{7KAf6Zlhrn};33eapt?S(W!`6<%*q$fG#T14pypmeY<X(!29S
zBiB|XYig8D6}q9&@^6Ij$LN!U%2)P|GSl7#O3FUpAGm*POuXCZnsdd{Zh?&*5@=)H
zS-cf?+@_>u2h2$2vIvCSSsQ^U$+i$IlkfXL%6x?Obf)Y@Q{PKH-O>rgS7l^wD#l7i
zyq&hnw9*tSBDlQTuMr^Wi;>Llyj?it7W0Y=ygX^R>@<ldKe(>6M)6pa_{sEmy-V+r
z$}Rn5*@x$K)FRTHV}GM&q}h)%1$@F_=KEUja2l6s=Fg2?9SCXpl$|;E;9_{t!!zi7
zY9R-waNxob@^6&uQ%=$bF{I1#+oTZjq7iqDCaWE&*QJ&FixWMp`rlfst6eBiwA#3?
zhju?-d>dLq-P5OMFy5)eg{cTwta0WYZ?R?i(W^4cc=4LGSonWHEZ$y!M}RNlLTj!A
zv(M$Un>0Z27jjzxf#BPr0A6%ggBRV9Re&vci(CtO0Egw^!LR{z3l4t?#I#wFi3POe
z{U`2z4qB49tm&TtEqh-Q&Z3FM9SdmL`%;`%1hGVfY5H>}7LXQ05?Ia)6TG5>AE2($
zw?SZffk26X;REn+K#TdO0GL_k5eTLQd@Ri{A4@ZTxd0mfHwV+=rwjix`5)x0ME-ZS
m^gGA@f&5Pc`MXz^n78tLxnTfjbMBxqbEA9sIFfMCHuztHX$0T^

literal 4725
zcmb_fc|25m8$VR0Xe?#9O|O)0Y22|~Vj@ck88Ma^!`Mq{EQ2g#S6VEg8j`38iL%{N
zmM}M4CA%TZgj{R(DcQZ}xO(q-KUcSUKkxiApYxpW^Zh;N`8{i>KK>|@6U7Mt01~IA
zZU_MDb^-u9aU(k@5#SdP1Ar|`IQ7Fu)b^3KUy%T?xhy9_budyrN?1NjD-Hnk^KcwM
z(2jE(fSox2aOW(J4JceM2n5mD0bU}=#03DW??5T^c*vR!*oXmu9|b`=-(-S;R!?8!
zxV1r$`7oRQKcFwCuNn@s33eO|1aliC{U!+J5lD4yrXK^f<dUkO%LjrNGPj~HSUk)a
zwl+2vew2|BY;5e2laZlFG&V;3DTN-n3C4`yGvFZT@kc;ki2sr4M?qgqTs0hK6O0KC
zT0MQ$@Na`)9syOq!UPAktp5%a%x{n`%qSQY3<SFYNcv3>XVLT)&P5d6b-|USC9A$y
z+ZiXx7luR|@^hiXugU$kZO<>!5y!^JIak#}FB)Dqm(|G9Fx4^KyA2usD)m<z=eqQU
z<_=%Y1HuE(k9XC13bL}h`a4)kP;NtEwi1CWi4Vo@LK0q2k3shE@hMbG+P80?{h2el
zW|>oga*B#(1_peBf;SQpl%%EUnm|BEDG(%5&tzH<i8tfo6jW6yGI5%kn$FJ77{TzF
zZ80%1va+)8Wx2Sx$a!Yjt<Umxb#-(3gYMEd2?hmr4G)v`_3L|jk`}Vd%gc3ibY70{
z!(bkzr`uovb3XP7BpQuIMQ8@l``mQ#`2PNWasIFi7cR`r&CSpI4z<+R>zkUQl|4N@
zFYpS6YiKJdD`y&}*VfjCg@r|H+YtyY@7~>sb~|z6$bzk(-@??CjHKk)qRH$eHs$_(
zZY1(oL9nm|@lbtyrdTYJrR5C~dkV!Q-N?eiqP4a4@#Dv)rl#KB-uN_D6P=TrTM~^1
z1q~lQ+1c66&dyru<!t6SVs75Kv{dr3^3>zeu`zipcA&rimd@U3b}*$U*boSWS_q4E
zb||9Fk(-lqcxY%g^B#dfP(fmLl~-0?awl0?@od~E9beN`DB9WHzQs8-G&DXw{>lch
zDs*q(%n{6M>+4JMNp2dtz$+vq)L7QzqOPv~ae6ucMbu7h>~Yb;K4c6JWlAA#42<LP
zc+mCtl9NG(HZJg5>4<!D$%|?YZEfgcQxb{AVigq@&gD@>ckc!*OO1|*h)7LMZ5&;^
zIs6PuY%Cjc=iJrO(y}zU`*TlE51mdQ7&yIm-O85;3kxSDC4pX<qBv71>)6@B8%V7h
z8_VKVOKZZRFJHP8t)0qrj&(*w^oO4l5E02{ko&wal9C(<M2DmNsy`?cN<~G5cnq0L
z9tMAtldcp>HfYk=7+$-rxtU);fYI7|dOr$uqMMuB>+0&%j)sP7rKN!+QhbAbLPCNL
z4mWFS&1h*M7#S%kDQTglq@;>f+^mSiLD2g@Z6-W4PHWn;XV01asLGWq*l-6xZQt%&
z_vr0gVxCzhgKTAG)iu5z{CqGjkEp3NHa41(NLH4XDOKg=>Y)3mRI0Ht0~8Cb`!F+;
zpPx@mH>$0x3*;yI6qjUWNy^C?C+VL&ecB<<tcY1_xY80=x+PS{*T^N{F9g)4V2Bk3
zs8g&UmTX%CENPLw2O>*LWw5cfVSNj^5+0(0+m6eBerS%S-D(Wu$hv2JxuH;l*C?$a
zDMZ8Za#qb@CnLhuyu@Sm64R>X&ceF~|M0Rxs-!U)WhQrcECXK*AnVEyD`!A0=FbFQ
zu>xw7e>eMpeJNpn!Oz1+RC$C|SeR+M<*1W#8e%@S)=ovq-*(U^*@--#m)H7%R)G%0
z)Q=AGHT_oLnAD^HG@2x#+Jw9v%LBH`_P+TJ?CgnkH0RTeLsVYwu}HC{zQ+4+vt?hA
zWtOD3D0MRAhFJj}J`DTd*R9%A%zK3~S7gD7)R~VySu>N@aoESMHhy;EgfP-5VL6mO
zo#ymT6|~<zx6tM}(d>yCM)bN{d*EGRgC5(GQ9HwD2*0$1$e2byrZh^zwmE_nbwk2J
zkk3_vIq)n@{J5gc?381^^dDjQ+3yNYH6xwbK!-eevsf*p5xV0yP+y#&^SmO_M16;q
zmHm^KF@4?!BWy=YlpZ#wB+K9A34Iyii!Fc>vL01rl_99R)vouXkz828XKehP$$a$`
zvw$}H_Sz`nntP$w3lH84OKBodRR?rGg}yvxM+=88w?@X@|3#OWHoaw0>|h3};^Vx+
zjr#o(eael0-1TDC2Zsh2_$U`&^g5fNrRdV+V5-~Xx7=26S11mQhF&REa-8XPh8e-B
zgI}B5O`l&#A<ol$n&+zO3j>3Iioovf5$Wm!iksbBu5#HPEh@lNwi&#fwsX^;6YpA_
zrhZiMj~buTsViX(6;WQ__TnWTGWC+Q((YLpap&9Tar5}Wr+ZBE1Ns~`nNTc_*^DnN
zi5?wRcqo<Y+*vYYeyAdoN8c%GevzO13f6Ep>!8^6&QYe`rp2R+{7>IF>SpSSbkS10
zvIjuqCd`9Eq3~e-Q`o3fO|uAHoTZdh+Jy=eilM!Z+;N8*i(cFfj$^eOHewQ^W5-of
zq>n$NqmIe^6rjE77m5i8k~egyVfNxKjjJdM>AQ|uA7<F8yZWZ9&_tFP0eG*2c_OOJ
zZf<Z!E#1iWWk`j>8jA1L2@rZ*odBWq`rF(_Z}%GOZnI2t;Q9OOrORcs%RaZq>f#*o
zXjfDUs2|Tuu(5N^*p=mOtwHDo#(Q*#IdXJUoSv{-Gh)SfRPQR;@&rye&O9%6IrUK%
zc{X$UvzYukYVe;U^?E@%)^oHgFH}0RcLs4wq_zBQOY?nP=B<o$hI}sPwUBa-gSbnQ
z=a<igh2$$L79DV>ozD+BvLQD(<esob`g_rRWWLns^SUP@2VE=msq{t88sTxFI*|!K
zo|1`v>dK@J08yQ6)<sNj)m9Zh1hDWsSc3jjQC8CXA8QV*9zZhys4x+u^X7W)RF#4C
zO;<yL(T?)DUYUSpM{)X_Af`WaWCQ5miIjXVVr5ZbCg4q?Xer*>5sjFy`uysFe-;`<
z#RYGhW(Q568otq65F#QsyrkvbN}253<$YDv;A-w<>it6`|6)<J*U9K&=%()QSD!xF
zIiK6&vMkQ~&T)T#Nw&7QiTG5axp?)=v}2o7A?JfndLOFwO0{o^>*Wd^N^@Wvbkyxo
zQK^^eeeW{d+IFw2&Jb-SJV-OrPBX7M<86%{Z5~X#GE#7DxGb*w_UjS%xszs%_2oON
zJl=98mhlmTc>Ji7N_?DWn$F#nJ9r~=UOuxOTk3yc`}nZ7=8K}_YbH@5c}gU6v&~g6
z+WGay_nF5%szp4=>OVad8+q{&Sp1uZa|JCWbNIj(Ywgfk>|<(}j%~ni#WlUUGk>wO
zs)-gblre2A!taLFyoCR>_hjdDmy$e<EM}qPnO36A$;A@`OU7HSya2cZ&5Vv83EV_W
z{8`k^o|ooA3*khCW6~uL+vgN-+)b8>N1@JNN}OOfD@uw=W^@Y=CMwkl{EK_wVwVeb
z`I!4De|eMYSX9SihjHNLItyov$RnLccunCxavKJW@51{6YQ=8*6Li$q?YgFA9?L`8
z^`z+MCoj&7VicmUaOe$G;w8nC1m3WN8Ce}rqQZ6dvBBMHyzX;V<)^-hvrHYkf#h?t
z#rvD6PSoX{IYE}2To*jg8Z+C(B_!Pm?$hU9HC*!}k5L~_xSH^|c8<jzDE~Cj!DJQd
zs5G^5DIBe;YIGQSA27Mp_j|VIYAV8Z8Yn)$<m+nsLZH?3T}|q5gJ3xhsjkiR7pQck
zB^L~JfW9;EgF2^8D|`X^t}V$UXYYd_T9cqP3^wk=wz9RCo3C$WUs-Oz{cdfhuPis<
z68IG+*xK@4AlTaSUAq))0fJOv$HACjAeh^}YfDlj#&~`>1YPf;tEHcI3TXg4!H7B!
z7Gx-}z|H}+2XF{mm4JV%l7D=$CI_Uk=8ONG{J+il7Wwyl5{%==$X&Kd9LuqLZl1t`
OoQc!Gt7oZMpZ_<DVOXI6


From 2939f5398a5e66cb90c2ac842051d161dbf62e1f Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Sun, 5 Apr 2026 22:13:12 -0400
Subject: [PATCH 138/143] Add DynElement

---
 .../src/elements/dyn_element.rs               | 25 ++++++++
 crates/craft_retained/src/elements/mod.rs     |  2 +
 .../src/elements/traits/element.rs            | 63 +++++++++++--------
 examples/jsframeworkbench/main.rs             |  2 +-
 4 files changed, 65 insertions(+), 27 deletions(-)
 create mode 100644 crates/craft_retained/src/elements/dyn_element.rs

diff --git a/crates/craft_retained/src/elements/dyn_element.rs b/crates/craft_retained/src/elements/dyn_element.rs
new file mode 100644
index 00000000..60cd7993
--- /dev/null
+++ b/crates/craft_retained/src/elements/dyn_element.rs
@@ -0,0 +1,25 @@
+//! Stores a generic Element.
+
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use crate::elements::{AsElement, Element, ElementInternals};
+
+#[derive(Clone)]
+pub struct DynElement {
+    pub inner: Rc<RefCell<dyn ElementInternals>>,
+}
+
+impl Element for DynElement {}
+
+impl AsElement for DynElement {
+    fn as_element_rc(&self) -> Rc<RefCell<dyn ElementInternals>> {
+        self.inner.clone()
+    }
+}
+
+impl DynElement {
+    pub const fn new(inner: Rc<RefCell<dyn ElementInternals>>) -> DynElement {
+        Self { inner }
+    }
+}
diff --git a/crates/craft_retained/src/elements/mod.rs b/crates/craft_retained/src/elements/mod.rs
index 7a7660d0..f6646cc3 100644
--- a/crates/craft_retained/src/elements/mod.rs
+++ b/crates/craft_retained/src/elements/mod.rs
@@ -1,5 +1,6 @@
 pub use crate::elements::container::{Container, ContainerInner};
 pub use crate::elements::dropdown::{Dropdown, DropdownInner};
+pub use crate::elements::dyn_element::DynElement;
 pub use crate::elements::element_id_map::ElementIdMap;
 pub use crate::elements::image::{Image, ImageInner};
 pub use crate::elements::scrollable::{ScrollOptions, ScrollToBox};
@@ -15,6 +16,7 @@ pub(crate) mod scrollable;
 
 mod container;
 mod dropdown;
+mod dyn_element;
 mod element_data;
 mod element_id;
 mod element_id_map;
diff --git a/crates/craft_retained/src/elements/traits/element.rs b/crates/craft_retained/src/elements/traits/element.rs
index 006ceb4f..88a2b396 100644
--- a/crates/craft_retained/src/elements/traits/element.rs
+++ b/crates/craft_retained/src/elements/traits/element.rs
@@ -1,8 +1,6 @@
 use craft_primitives::Color;
 use craft_primitives::geometry::ElementBox;
 use smol_str::SmolStr;
-use std::cell::RefCell;
-use std::rc::Rc;
 
 use ui_events::pointer::PointerId;
 use winit::dpi::PhysicalPosition;
@@ -12,7 +10,7 @@ use winit::event::{DeviceId, ElementState, MouseButton};
 use crate::CraftError;
 use crate::app::queue_window_event;
 use crate::elements::scrollable::{ScrollOptions, ScrollState};
-use crate::elements::{AsElement, ElementInternals};
+use crate::elements::{AsElement, DynElement};
 use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler};
 use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Underline, Unit};
 
@@ -20,52 +18,59 @@ use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, Fle
 /// Setters in this trait return Self and have no prefix.
 /// Getters in this trait return specific data and have a get prefix.
 pub trait Element: Clone + AsElement {
-    fn get_children(&self) -> Vec<Rc<RefCell<dyn ElementInternals>>> {
-        self.as_element_rc().borrow().children().to_vec()
+    fn get_children(&self) -> Vec<DynElement> {
+        self.as_element_rc()
+            .borrow()
+            .children()
+            .iter()
+            .cloned()
+            .map(DynElement::new)
+            .collect()
     }
 
-    fn get_previous_sibling(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
-        self.as_element_rc().borrow().get_previous_sibling()
+    fn get_previous_sibling(&self) -> Result<DynElement, CraftError> {
+        self.as_element_rc()
+            .borrow()
+            .get_previous_sibling()
+            .map(DynElement::new)
     }
 
-    fn get_next_sibling(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
-        self.as_element_rc().borrow().get_next_sibling()
+    fn get_next_sibling(&self) -> Result<DynElement, CraftError> {
+        self.as_element_rc().borrow().get_next_sibling().map(DynElement::new)
     }
 
-    fn get_parent(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
+    fn get_parent(&self) -> Result<DynElement, CraftError> {
         let parent = self.as_element_rc().borrow().parent();
         if let Some(parent) = parent {
-            parent.upgrade().ok_or(CraftError::ElementNotFound)
+            parent.upgrade().ok_or(CraftError::ElementNotFound).map(DynElement::new)
         } else {
             Err(CraftError::ElementNotFound)
         }
     }
 
-    fn get_first_child(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
-        self.as_element_rc().borrow().get_first_child()
+    fn get_first_child(&self) -> Result<DynElement, CraftError> {
+        self.as_element_rc().borrow().get_first_child().map(DynElement::new)
     }
 
-    fn get_last_child(&self) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
-        self.as_element_rc().borrow().get_last_child()
+    fn get_last_child(&self) -> Result<DynElement, CraftError> {
+        self.as_element_rc().borrow().get_last_child().map(DynElement::new)
     }
 
-    fn remove_child(
-        &self,
-        child: Rc<RefCell<dyn ElementInternals>>,
-    ) -> Result<Rc<RefCell<dyn ElementInternals>>, CraftError> {
-        self.as_element_rc().borrow_mut().remove_child(child)
+    fn remove_child(&self, child: DynElement) -> Result<DynElement, CraftError> {
+        self.as_element_rc()
+            .borrow_mut()
+            .remove_child(child.inner)
+            .map(DynElement::new)
     }
 
     fn remove_all_children(&self) {
         self.as_element_rc().borrow_mut().remove_all_children()
     }
 
-    fn swap_child(
-        &self,
-        child_1: Rc<RefCell<dyn ElementInternals>>,
-        child_2: Rc<RefCell<dyn ElementInternals>>,
-    ) -> Result<(), CraftError> {
-        self.as_element_rc().borrow_mut().swap_child(child_1, child_2)
+    fn swap_child(&self, child_1: DynElement, child_2: DynElement) -> Result<(), CraftError> {
+        self.as_element_rc()
+            .borrow_mut()
+            .swap_child(child_1.inner, child_2.inner)
     }
 
     fn push(self, child: impl AsElement) -> Self {
@@ -422,4 +427,10 @@ pub trait Element: Clone + AsElement {
         queue_window_event(window_id, mouse_down);
         queue_window_event(window_id, mouse_up);
     }
+
+    fn as_dyn_element(&self) -> DynElement {
+        DynElement {
+            inner: self.as_element_rc(),
+        }
+    }
 }
diff --git a/examples/jsframeworkbench/main.rs b/examples/jsframeworkbench/main.rs
index 5ccb5bb9..39c20dd0 100644
--- a/examples/jsframeworkbench/main.rs
+++ b/examples/jsframeworkbench/main.rs
@@ -170,7 +170,7 @@ impl State {
         for (index, data) in self.store.data.iter().enumerate().step_by(10) {
             let container = self.rows[index].clone();
             let text = container.get_children()[1].clone();
-            if let Some(text) = text.borrow_mut().as_any_mut().downcast_mut::<TextInner>() {
+            if let Some(text) = text.inner.borrow_mut().as_any_mut().downcast_mut::<TextInner>() {
                 text.set_text(&data.label);
             }
         }

From d10314e82fb5a58dca54ca865e7d8fca8a79bfcd Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sat, 18 Apr 2026 10:08:22 -0400
Subject: [PATCH 139/143] Make rgb helpers const functions

---
 crates/craft_retained/src/utils/style_helpers.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/craft_retained/src/utils/style_helpers.rs b/crates/craft_retained/src/utils/style_helpers.rs
index 7c92ae59..fd6e616f 100644
--- a/crates/craft_retained/src/utils/style_helpers.rs
+++ b/crates/craft_retained/src/utils/style_helpers.rs
@@ -1,11 +1,11 @@
 use crate::Color;
 use crate::style::Unit;
 
-pub fn rgb(r: u8, g: u8, b: u8) -> Color {
+pub const fn rgb(r: u8, g: u8, b: u8) -> Color {
     Color::from_rgb8(r, g, b)
 }
 
-pub fn rgba(r: u8, g: u8, b: u8, a: u8) -> Color {
+pub const fn rgba(r: u8, g: u8, b: u8, a: u8) -> Color {
     Color::from_rgba8(r, g, b, a)
 }
 

From 93d8c3e76fa139bede27e5ee09c38b95a8bb6e47 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sun, 19 Apr 2026 02:33:27 -0400
Subject: [PATCH 140/143] Use margin left auto for the dropdown arrow instead
 of space-between in the parent

---
 crates/craft_retained/src/elements/dropdown.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index ba938858..a8e69838 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -24,7 +24,7 @@ use crate::layout::TaffyTree;
 use crate::layout::layout::Layout;
 use crate::style::{AlignItems, BoxShadow, Display, FlexDirection, JustifyContent, Overflow, Position, Style, Unit};
 use crate::text::text_context::TextContext;
-use crate::{px, rgba};
+use crate::{auto, px, rgba};
 
 /// An element to select a single item from a collapsable vertical list of options.
 ///
@@ -463,11 +463,7 @@ impl Dropdown {
 
         inner.borrow_mut().element_data.create_layout_node(None);
         inner.borrow_mut().element_data.style.set_display(Display::Flex);
-        inner
-            .borrow_mut()
-            .element_data
-            .style
-            .set_justify_content(Some(JustifyContent::SpaceBetween));
+   
         inner
             .borrow_mut()
             .element_data
@@ -551,7 +547,7 @@ impl Dropdown {
             .borrow_mut()
             .arrow
             .style
-            .set_margin(TrblRectangle::new(px(0.0), px(8.0), px(0.0), px(0.0)));
+            .set_margin(TrblRectangle::new(px(0.0), px(8.0), px(0.0), auto()));
         inner.borrow_mut().arrow.create_taffy_node();
 
         // Set the floating window's parent and the arrow to the Dropdown element.

From 6eb660a2cfe7f9abbfc183184ce335c492d9a550 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sun, 19 Apr 2026 02:34:45 -0400
Subject: [PATCH 141/143] Add a gallery example

---
 Cargo.lock                  |   9 ++
 Cargo.toml                  |   1 +
 examples/gallery/Cargo.toml |  31 +++++
 examples/gallery/main.rs    | 265 ++++++++++++++++++++++++++++++++++++
 examples/gallery/tiger.tvg  | Bin 0 -> 27522 bytes
 5 files changed, 306 insertions(+)
 create mode 100644 examples/gallery/Cargo.toml
 create mode 100644 examples/gallery/main.rs
 create mode 100644 examples/gallery/tiger.tvg

diff --git a/Cargo.lock b/Cargo.lock
index 19f54330..db556814 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1609,6 +1609,15 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "gallery"
+version = "0.1.0"
+dependencies = [
+ "craft_renderer",
+ "craft_retained",
+ "util",
+]
+
 [[package]]
 name = "gethostname"
 version = "1.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 1d940009..2f5a0d24 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,7 @@ members = [
     "examples/pointer_events",
     "examples/text",
     "examples/jsframeworkbench",
+    "examples/gallery",
     "crates/syntect_dumper",
     "crates/craft_renderer",
     "crates/craft_primitives",
diff --git a/examples/gallery/Cargo.toml b/examples/gallery/Cargo.toml
new file mode 100644
index 00000000..1924b417
--- /dev/null
+++ b/examples/gallery/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "gallery"
+version = "0.1.0"
+edition = "2024"
+
+[[bin]]
+name = "gallery"
+path = "main.rs"
+
+[dependencies]
+util = { path = "../util" }
+
+[dependencies.craft_retained]
+path = "../../crates/craft_retained"
+default-features = false
+features = [
+    "accesskit",
+    "system_fonts",
+    "http_client",
+    "jpeg",
+    "png",
+    "clipboard"
+]
+
+[target.'cfg(not(target_os = "android"))'.dependencies.craft_renderer]
+path = "../../crates/craft_renderer"
+features = ["vello_hybrid_renderer"]
+
+[target.'cfg(target_os = "android")'.dependencies.craft_renderer]
+path = "../../crates/craft_renderer"
+features = ["vello_hybrid_renderer"]
\ No newline at end of file
diff --git a/examples/gallery/main.rs b/examples/gallery/main.rs
new file mode 100644
index 00000000..58a42a68
--- /dev/null
+++ b/examples/gallery/main.rs
@@ -0,0 +1,265 @@
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use craft_retained::elements::{Container, Dropdown, Element, Image, Slider, SliderDirection, Text, TextInput, TinyVg, Window};
+use craft_retained::events::ui_events::pointer::PointerButton;
+use craft_retained::style::{AlignItems, BoxShadow, Display, FlexDirection, FlexWrap, FontStyle, FontWeight, JustifyContent, Overflow, Underline};
+use craft_retained::{Color, CraftOptions, craft_main, pct, px, rgb, rgba, auto, ResourceId};
+use util::setup_logging;
+
+pub fn title(str: &str) -> Text {
+    Text::new(str)
+        .font_weight(FontWeight::BOLD)
+        .font_size(20.0)
+        .margin(px(0.0), px(0.0), px(5.0), px(0.0))
+}
+
+pub fn text_input() -> Container {
+    let container = Container::new();
+
+    let text_input = TextInput::new("An element for text input")
+        .width(px(200.0))
+        .height(px(200.0));
+
+    container
+        .display(Display::Block)
+        .push(title("Text Input"))
+        .push(text_input)
+}
+
+pub fn dropdown() -> Container {
+    let container = Container::new();
+
+
+    let dropdown = Dropdown::new()
+        .width(px(100.0))
+        .push(Text::new("Cat"))
+        .push(Text::new("Dog"))
+        .selected_item(0)
+        ;
+
+    container
+        .min_width(px(200.0))
+        .display(Display::Block)
+        .push(title("Dropdown"))
+        .push(dropdown)
+}
+
+pub fn text() -> Container {
+    let container = Container::new();
+
+    let normal_text = Text::new("Normal Text with a Color").color(Color::from_rgb8(0, 0, 255));
+    let bold_text = Text::new("Bold Text").font_weight(FontWeight::BOLD);
+    let italic_text = Text::new("Italic Text").font_style(FontStyle::Italic);
+    let bold_and_italic_text = Text::new("Bold & Italic Text")
+        .font_weight(FontWeight::BOLD)
+        .font_style(FontStyle::Italic);
+
+    let underlined_text = Text::new("Underlined Text")
+        .underline(Some(Underline {
+            thickness: Some(2.0),
+            color: Color::from_rgb8(0, 255, 0),
+            offset: None,
+        }));
+
+    container
+        .display(Display::Block)
+        .push(title("Text"))
+        .push(normal_text)
+        .push(bold_text)
+        .push(italic_text)
+        .push(bold_and_italic_text)
+        .push(underlined_text)
+}
+
+pub fn tinyvg() -> Container {
+    let container = Container::new();
+
+
+    let tinyvg = TinyVg::new(ResourceId::Bytes(include_bytes!("tiger.tvg")))
+        .width(px(250.0))
+        .height(px(250.0))
+        ;
+
+    container
+        .display(Display::Block)
+        .push(title("TinyVG"))
+        .push(tinyvg)
+}
+
+pub fn images() -> Container {
+    let container = Container::new();
+
+
+    let image = Image::new(ResourceId::Url("https://picsum.photos/300/200".to_string()))
+        .width(px(300.0))
+        .height(px(200.0))
+        ;
+
+    container
+        .display(Display::Block)
+        .push(title("Image"))
+        .push(image)
+}
+
+pub fn box_shadows() -> Container {
+    let container = Container::new();
+    let border_color = rgb(0, 0, 0);
+
+    let dropshadow_box = Container::new()
+        .box_shadows(vec![
+            BoxShadow::new(false, 0.0, 5.0, 5.0, 0.0, rgba(0, 0, 0, 200)),
+            BoxShadow::new(false, 0.0, 25.0, 35.0, 0.0, rgba(0, 0, 0, 150)),
+            BoxShadow::new(true, 0.0, 4.0, 4.0, 0.0, rgba(255, 255, 255, 120)),
+        ])
+        .border_width(px(0), px(0), px(0), px(0))
+        .border_color(border_color, border_color, border_color, border_color)
+        .border_radius((8.0, 8.0), (8.0, 8.0), (8.0, 8.0), (8.0, 8.0))
+        .padding(px(15), px(30), px(15), px(30))
+        .justify_content(Some(JustifyContent::Center))
+        .background_color(Color::from_rgb8(255, 0, 0));
+
+    container
+        .display(Display::Block)
+        .push(title("Box Shadows"))
+        .push(dropshadow_box)
+}
+
+pub fn multiple_windows() -> Container {
+    let container = Container::new();
+    let border_radius = (1.0, 1.0);
+    let border_color = Color::BLACK;
+    let border_width = px(1.0);
+
+    let open_new_window_btn = Text::new("Open a new window")
+        .padding(px(5.0), px(15.0), px(5.0), px(15.0))
+        .border_radius(border_radius, border_radius, border_radius, border_radius)
+        .border_color(border_color, border_color, border_color, border_color)
+        .border_width(border_width, border_width, border_width, border_width)
+        ;
+
+    open_new_window_btn.clone().on_pointer_button_down(Rc::new(|e, pb| {
+        Window::new("A new window!")
+            .push(
+                Text::new("Hi!")
+                    .font_size(32.0)
+                    .font_weight(FontWeight::BOLD)
+            );
+    }));
+    container
+        .display(Display::Block)
+        .push(title("Multiple Windows"))
+        .push(open_new_window_btn)
+}
+
+pub fn sliders() -> Container {
+    let container = Container::new();
+
+
+    let slider_1 = Slider::new(20.0)
+        .value(70.0)
+        .width(px(100.0))
+        .height(px(10.0))
+        ;
+
+    let br = (0.0, 0.0);
+    let slider_2 = Slider::new(14.0)
+        .value(20.0)
+        .width(px(100.0))
+        .height(px(10.0))
+        .track_color(Color::from_rgb8(120, 150, 0))
+        .border_radius(br, br, br, br)
+        .thumb_border_radius(br, br, br, br)
+        ;
+
+    let slider_3 = Slider::new(20.0)
+        .value(70.0)
+        .width(px(10.0))
+        .height(px(100.0))
+        .direction(SliderDirection::Vertical)
+        ;
+
+    container
+        .display(Display::Flex)
+        .flex_direction(FlexDirection::Column)
+        .gap(px(15.0), px(15.0))
+        .push(title("Sliders"))
+        .push(slider_1)
+        .push(slider_2)
+        .push(slider_3)
+}
+
+pub fn scrollable() -> Container {
+    let container = Container::new();
+
+    let border_radius = (1.0, 1.0);
+    let border_color = Color::BLACK;
+    let border_width = px(1.0);
+
+    let scrollable_container = Container::new().display(Display::Block)
+        .overflow(Overflow::Clip, Overflow::Scroll) // Enable vertical scrolling.
+        .width(px(200.0))
+        .max_height(px(150.0))
+        .padding(px(5.0), px(15.0), px(5.0), px(15.0))
+        .border_radius(border_radius, border_radius, border_radius, border_radius)
+        .border_color(border_color, border_color, border_color, border_color)
+        .border_width(border_width, border_width, border_width, border_width)
+
+        .push(Text::new("The Start"))
+        .push(Text::new("The Middle")
+            .margin(px(50.0), px(0.0), px(250.0), px(0.0)))
+        .push(Text::new("The End")
+            .padding(px(0.0), px(0.0), px(10.0), px(0.0))
+        );
+
+    container
+        .display(Display::Block)
+        .push(title("Scrollable"))
+        .push(scrollable_container.clone())
+        .push(
+            Text::new("Scroll to the top")
+                .width(px(120.0))
+                .background_color(Color::from_rgb8(35, 127, 183))
+                .color(Color::WHITE)
+                .font_size(14.0)
+                .padding(px(3.0), px(5.0), px(3.0), px(5.0))
+                .on_pointer_button_down(Rc::new(move |e, pb| {
+                    scrollable_container.clone().scroll_to_top();
+                }))
+        )
+}
+
+pub fn main() {
+    setup_logging();
+
+    let window = Window::new("Gallery")
+        .display(Display::Flex)
+        .justify_content(Some(JustifyContent::Center))
+        .align_items(Some(AlignItems::Center))
+        .overflow(Overflow::Clip, Overflow::Scroll)
+        .width(pct(100))
+        .height(pct(100));
+
+    let wrapper = Container::new()
+        .display(Display::Flex)
+        .wrap(FlexWrap::Wrap)
+        .padding(px(10.0), px(10.0), px(10.0), px(10.0))
+        .gap(px(40.0), px(50.0))
+        .width(pct(100))
+        .height(pct(100))
+        .max_width(px(1200.0))
+        .push(text_input())
+        .push(dropdown())
+        .push(text())
+        .push(tinyvg())
+        .push(images())
+        .push(box_shadows())
+        .push(multiple_windows())
+        .push(sliders())
+        .push(scrollable())
+    ;
+
+    window.push(wrapper);
+
+    craft_main(CraftOptions::basic("Gallery"));
+}
diff --git a/examples/gallery/tiger.tvg b/examples/gallery/tiger.tvg
new file mode 100644
index 0000000000000000000000000000000000000000..a3d3bd960a9f9500fe9952e7b3fea9e1aa98416f
GIT binary patch
literal 27522
zcmce;X?!bX8Sp*lT<7E@lT5bBOp-}v$u`-WwCS3j(-XELNCAx^MwYNuT*_7itRP`A
ziV#_f3I!x86cH+T3IYKnY!%@Y!MI=qtpX8&3K#^Q3iP?IsK58a`{n)g9)ABnndIJP
zpSkY)?iojH*?#2KBezC3@gKu5n|sgDH(xnFzxnEAQ=6|}d)($fZvN8dTYJ8-*?s8x
z&42B^bMw9D9^2e_`S+Xe|MRuYy?gg=zC3-|=AMC1Z{DmQvblN2`B=){&Aq!1*}U1S
zZ|>Q%XY=Kk_iVoUt&eTK@#Awh-(LCA=KuL?YxCN@1DhvZ%WS^(?V~pTdGA%5?>+y-
z=D@(f=JfRR=C#*eyLqk7Y#xGbc^N<NIq9TL7MLvt2Jqj{OqYauYM53+H<}&~!Pih{
z?RZ3fc^j($N!g*wl*|xiV<8}k?D3%wOrH+HOQyp@TiAE}=kF-_fz&Zg_$h_qyWDIH
zNKbKB#U9{piNO;0VC)+^LeWnfPK^WUR|aR4QW$n|jX03b;a1|Ob8B(<9QS|X{Eib7
zONO^nKsv_otpueouv`Aq@}F5uaUi{6QQ|LIhU4%D%c1d$4Nt|I+xJZZ>8b7Q7^N_j
z&5!6n`lk6G`j^a`Ivi)VNB_S4H=*#hpGAPQbNiJcN?~A`Uiqi6ABh6#2KLnGH`xoL
za1Q(J=<VA+3~OME0_i<?I!q}H|Ifzsu}?*TbQt?ubT`YyAj1kVaoeH#@3&qV1JW@t
zs#6NXtoct-AbrPdi&e~W3_fp8#y)G<FZ{V}e~SR=vF)#hD1~9eSO^1&GtGs&#!494
z#%g$S`=q+IHLn3_Wm{9B6b8FVjQ}ZQDn{I<V<W(rz7Q#Ivj=u<y)X!*75I@xDgL*z
z7SnAJAZ1O@M<mm$5dhPBkuBTo!L3`DLqIwP?g>zeUKWk{)Z@m#M&NhGoAiGf&x)o^
z?I@5M#_4#=#3g~WV(KP0Or;c%=Gf^pZ?2@_a`U&-w^-gy|CI~(0m)$RWa_p`Kal2a
zwVY;a=72PBFAbD!vx7{_x;hLbgHsyh?bE~f&Egn-vp6>CD2<fu)1%CWtuh9rvLFpt
z9jjwNsya(!Jij~!q;<YF*5aF(5tVmv<16;kE+DlW(#{#j>@H@`(U}0!h9kFg-O(uk
zspwjqSaTNk*;?8U)|{pNR$Np2Z1A0Zfs_|k_i4D6_XASh#T<|p7WM;D+P$)SM&$Mb
zQc;{eU|qytNE>2jf6cRc0FXA^v%BZL-TfF|VkUt!BenN0OS%1ll=tiVmVLPcfHWzW
z_FeNc`vYm+$4qMeg-IagmBPMdh1(ZMno>G&PHpcCq_kGrzomBe2U1Jx?AOpL*jm(7
zU~b>VKze^5tp!R4@WJl>K$;JB4{QXb1Aw$1oZin6?Ct|3Em+%UCBW?iq`6RYzxkkE
z0MbTC-$x7U`v7SsSeU4W+7m!p3)XgN5pFk-v=Fze7%5Busi<?i%aPSxK$;J&j^h{j
z3u+}Q71pA&1t8V+)t$UPyAw!Sv@<f9YL5X)OEWu{(zt_3lbO!wQns`cNa_B?Jl{W+
z2hw`~Y`#Scq`6!>U(Yr3K$;s|7_ScM<3L&(s*KMJapOR$4l}#vhw-3T8(tn~v=MG6
zkcuPHcz&dt$A#5=V+@;|pPpdm^Rv5wR2*N}rHxCwfV486+tnIx?gCPAXFJ~*m-0ZG
z+{xr;cFyLv*2Z9FXKk#wYY{1p0cmYldsLg49Rt$*PHt#zVs->bE4x=mi@RrsaX}g^
zPjqq{6YU(3_}$aF)<iA`^Aikyo9ltU<Z|=7mvieA-7JtAyY>G31fGYa`H5VbpU_i4
z;&(5nW_DLnKq~K^N^MN6Cb59k<mAq7xHYjH1=68~lj0ZdzElU&F%y@D&Ysv3V(4;!
zmxirdG$wKOgfRq{PFO>~o)`#iOiYKckm*oscQc&cJsSj)VWO>Qy9*kS)^_WGx!toW
zd^j;JFHJ1?2_R{OoV>EL;9=HwEqj18Gv4GIqY}?FMoLZ~Rd+6M>v_fmBtBm<u8meq
zK;lOwwm8x;0ckGBv3UeG1~|6fH@$sEU)TYpl}LL>KC-+6NbAAn?Ja-J2&8%6s<Dhf
z8r6~z?}7<ho@sW)Q(>!~Wfn+tqGVYUauy)XxEOAYFIbrwe%cD8JU?Yi^RqS}%{x1`
zIp=~MNM%RKG2`esfRuOCoSH-Dft0s5`J!EN0jX?j3su{)2&9H}Q7l`#B9JDnH8*cv
za098qHQfel!2_fgx8PafRy{yk<8*J4YkPrIwdDLOmbM>AEz7JtXIYeiWUwsAJSV9@
zN^=Eu#Zpr-Sxv38j8<g1Adu?DPN;6Ig`sZzefU=6c;q4DuOdKNGPZTi($!(!#zpBU
zAPm54b=25a1ZH-0w7jVsC9tGIsw&l@1d!^PX2{TA2*J!iGgzFcg$Sm;Yc>GYp+%pT
zt0^=6oC1wZO*UkkN<Gt7AfM?f#YEdzjdy*}h;jbQBZ7A(%E>Sjp9*MNH(*d|8m#+t
zbzNx(3CIUZk#&C|L_poM7^n;Fa9-$!q2=NtdDm=2b1jC!;A)3N{?UMD<04SE;6;Zm
zhY5yO2G<H4cgB-`cqw*(|K7-y_q)*pWcYFXw!pz!GMH5!*TC&RMs=%>5CJC!u8g?l
zb3z0>>G@OONx>00K}bg61J?nO6I{1N4tD)13|W^Wyg$zb54If;fge~-i+0(E!vu2~
zyIqGb?l1=qGkr2fz{%_nQg=#^M+qQ3nRzdi?Z@)JJMdocxQRzX1as%EYXb1yp}oF?
zbB`<E?LR<)moksb+3b7DlNpB!CuWlBc?pM~RtDE<o1+~+!4F*gJpVh9bG;8o&y(R7
zaR{ENoe(T3A84?T|2yhF>Omm_YJp!y_L1)l5%9K048AQK6sZX(L?9}h7pb{kjGXBb
zBT#Z36h4EW2%c#>F9J7P9*S<V!3cqCHLSx`JB|pPV7ezpz<KPpbX)o$N&xBYOg3EV
z$MPQ@$c9dxc&`WZ@UEW+;Fh7cd}ro9P#*3-PXR9bfn3UF)weSTsZh(Dpx%-=$WJSS
zYqj06EpeS6M&ft*HGSFpYV<A{wk4*6HSO}?#mZm+KJR~8{k(cXh`=YEE&Au>S3(3R
z-a~_mctPYI;kpQXOt>p@kIScj&vj@7E_PiIuJd0Be$RGS1a7g|VrKKj5rVmtJz0lm
zcRU?9$K;6<a20z}dYf-BMgU34o*cfoAIpDj;N;MG6X`I)JiF_~0NgVq`oEVORA1}A
zOM#K>pmK5cWL3#tpu#<w>(plx7x-yqaIFlEzC_Cp$Hiawm-LssuGs4`;5Wf1v{vvZ
z$`=E0wcns!t=<<R;4gtO{c2ea6YvplHTV(nzQ|t$JTbo_ydL?BtEfNWsz%@^uKU7I
z^Y;dyu)Q9ETP?@N+~$`f1oKVyS{)q5-NBk^E>6HL>@U)NzAwfIAblizWB4ciSiUQF
zW9ZU}6T$@ZmtDpnJTWxxe<Jrq)iv<C0>@>)sQe^*qxzBTeJcDV(^CJPxX({3gKM?J
zab$v(;nH|mK13guCSqX)Zccm{d`n|P&nY(r;OG7c?dR%SAp*?7)AgUrp9&Ljy7%Y7
z)5W(UW|7t5W+AMbg>UL_xqcpj=Ui`vKj8lre9IQr;daX%v5<LECvdHv)Zt*`O~D_S
zo{tmo02}W+(sxsg0MZ%R--n;;$MPp~zYkqIaZQ+D{<$k1gy)8i^Zzq<lR7aFR^ig@
zP0DlG->YY2-%`PxWwl81EkCUcu9eYoVPany?v5WNe_lURIyrWf0{==J74il44Q*AQ
z55Oz_v$R*#c$k2p;H~;A^5tOyuJgVVyiSbkL*l+V{7N`V9}*tXeZo5t*eb*$N!LKg
zXFp1ZpIAPOWzDzf1ak@dz7CfdheP+6CK3cZ%U;@dq3`(^0i^4)w#e22EdS)3Equ$w
z(><826U89BGF0{Z2A@|?9ym&cyR*+LTl;O=b=kNEL)m?`!;*2CRtDF~<hVUCC&QoP
zSIf8?q^n|AEAa8;*Fy&c=0Yje6$Gceq&c<Y!UP-}{EO~Xei0_%ac?^GxOkj?tT?B`
zd&1TFvBHLafRNT9B^(#|wCl9c0rsnPxD#LMcAAY*0@o@Xg$In^5A8MGm>{6TzTS7c
z&lM+t^mz8bNNNDfzbbcN`0j~q5rT0}oD+oihHmp8FzC{*8n{}8KWANPs{cUk@$7LL
z9Gjif&Pg68)5_plv5wy*_Q+sL?3J(6-;o}O?N#91<U^rT1A9V8sD}h$r~I<EQ@bWi
zz$HOXbf>ZzCg2V4Nuf8yYxGORJvs!%z4|4>K=f4MBpr?ru8DlzwG=wlzE_83%lG0R
zF@G*fFyCO0jlyq@&hTGMTapC)n>{r1JKrI30!VLU&yO52faO1sJ3svB#8`x2f)h6c
z!8H7g|J1=lv<C+Es$l9rL_MPaeC>_wH5y!!-J|^=d5ugfgKK4WY$jfnA(z;uJgY~2
zo!B-N7L#)L+Q6%!^VN%kFfGf0Y3-RX0n5R|qtnVrgaEH}L&)oXMqd_R)!`6vTXb3Y
zeDqr31|7~9o{8M;dNp*deOnanwyeiLVSXw~;96Y~g;$JMgx@ipkR-rvzB9AwyEsk&
z$=iQV<op3FzmvNs{OrW35rWB0JQ4)&@H_r%2QSt-1KTvn^<S)>-+zzh?SDpt<?O54
z-sCeftqiV}#Su>i6*xLEuE^0TpFKXV!q1Z54nG<QhHq8x55g7lCj(b##s~o~1iulz
zLOC@;z<$ziL;Jan(HF#E6wVUIqb~?Qh(0R(R)<>!qyC~R8h+G19))`>yAsElQ!#@1
zI{Qcz){TD*o7u;c1VqfvY}|i;oB+~({cl8W9l-MKgKvcYJaJQmVD_7MB?$3hpZw_H
z{hB>DuEEj$_p7(|zoG5dZw$Z-*<j$Eq*0-j!L?!>RTdwT){VJ{#_A~o^5)rW(cg^|
zK$_{-_13^*1oDG=WPPIDgDFmMA;=FG<n_U>me0*<Q0?!kt$sZ)(_aXHp}!Q+QU#@$
zEGbY;%qqu5zwFD$@#%X@>hqEB2cqGY+6_WOt_2!eAwqy5)QmQi#Rvg25*MCv7orAt
zDGGIQHfj*t(RG2tw*#S|JA{+M>-O0wG%U5mjJXyg7+M)zt1a6bw&f&{T2?(h<5=y(
zN8i=H1;<8T$u`>uq<L$uuWaq4@Bz1zTH#8mG`E<9c}q7z`3NkDGvotJTyfNCAt`=z
zXgLnK5R*)Ya;f>yGKL&N_+}F+^%FocL@>CZH&Z||#F~j}1mjaAEr5@ISP(Uk%R9LY
zkm`Il({i+POx;<_0jcWj4r<QA5M$umgFveD?IDfFmoZXam>toC!YGi|g~G^;fWNG}
z7KaQjeOPm0Q3k$184H6AUe7i7(g4$NE)D?cR@WyoMPARqJl0M169(AMQHT!QlcL@a
zq`J6}ofMbxT~1id8ZhG|wh>74_ywgf%)9jgAg#L>`sdxt{g8LB_80lZ+`JPTPFfRJ
z@fUr-koOj{K$`b1XY$_F46J!NnGIL7Kkw=e0I7;!Pzpm)Tpj{aQS1(G2;30V1${{C
z#b0WpP`1}b>p}^CT^=&biKRgx)x~CRQp6_WQIcyor-n8hm0=()39C6uVOVla<?(H)
zfG^#s1}>$A**peNX7fc?dpz%|?8Jstc2<Q>J}=^XH!1CA#?x+m(<iODx$#MlG!CR0
zPX`y8J8_}8bH%edKIvs}0mVzr@eOZo7mzl*m5DVk#wSSgQf+)qs*D3^%~u+q^JA=m
zwBf6a&-<I>Kw6i(<3(k4Cy?gksqwV3JPss-x;&m%v7w~ArthB9O1ptnRTp<Q5FpK|
z`naYs7#lz})WZ0TRvHH_Fgv~!Sl-zPPGd6EdPv%p4rAPlHcjuaoD`P(fTX#*Y0Zxd
zB!k@STay>l&`@eAKDd}%3wDwWA6`x|>2Ny*q((&VTZu>+Xhpc}Mu;0;338(_AK>z3
zZDD)^R{}`*nww91aDh~HN#ki31}a*-G&V2fMhGBjqCUJK;J$4MwShH(%TSxJg;s;X
z)9nM^Tj(zf(-?xA#@L0hF!nF;Gx@xS%fmI^d&lZZAx~iKQ={onbASNST)3H;43;v$
zYu!F7sRuB&?T@>k8Gx*3r2hoZgPC3(q?X#u<O6yd9u6c@3n3<33+4KOwB%!Q_?F(!
zP)2N+-CXqGK~I|ZG>0ZVg<(7}3d6joG`#Mf#uF69d)mV-4>y9Z_S^{XT^K2Q7e`>p
zyF4-}O^>cfcv4ULq|qh+!UzGRvYZ>4Q!p86MX8On6fEFH<*eaJl^L$8%^_G(D?=Mv
zC)d*O_+QdibJPj~10@a&l&~vqya1AB@JwyF@lufYEax;&H)rt74r0@~gL9tTaN64)
zW|kx!D@M)xmxmiN)<yb*GCDG;mWF_|rq%{mwA>&p1@LkZT<pU`B8?k+F}0#fsTG;S
z%6v?=>g%MbQf!5Di=ElN;nqiiwC3)N6y5C+AXQz{BXf9t15(|o52g8qVGLm`49~gr
zv7&&%R#Mr`<S8$1YJSIifoK-EU?TI;p!+|S9}r+uy85&Kcjdj+zTACT_Ez`aejpY7
zrR<EK>jzTZznEQ-7x6NuEM^}MT#%)rvB6th1!l{<zte~3W2Y}IS27JhUJOa=((*vs
zH#_*BwSsvOTSzj9oe|C5#OpGu;bz9>-8l@oxu?e(VrQ(E;=fr2-566QJtiJIdb67w
z15(cOnXxUN&yB&U?yK;_OJkJczuOL;rYxkR-N%mZ_Fxv$Q=U(aT}N3mo~!V~OJkJc
ze_6ioSsDXUzvrY;r<WfC()YZ_jGf{=bqs9YtMJ3CW0c~5Sx)!<cnsfdemur_PZ<4+
z*D(g9qon=Ec1bg1pi1At53h_-ivMMqlrYRqTJq*bTM~mYZ`6#hFgEF<xS|gu=RPh^
zDX>Rni@m^X-P#cG*d~=dg%OQT0n(axb;KYwM<6XNkIYMpJvO9eJZ4aHer9Atu8lxj
z`SVCanZ?sU8o|BR9PTRl;d!+^^xvaQlb7*6iK_ccLzDh4o_W67Xw}Dz6@3)-L=}BZ
zzU=Rg0jVK(##ZDSwp-4P)#c_0<^69{8D>qvrjm;4)JR>O9l2Aj4FQSM-W*)iem4k=
zux&-q^FT6qYWaCj39me;C2uKT_bg!a7iDlGBHnID^RDJtFFCuVcV=v_x+{G^YIrMs
z8{UOJymc(}tx2;3GtzVpABCoKxCL|TUM>fuy1Uz#cjMK$CC>JhF(2hMyvQZ`fW+9!
zee-twnUr?m1BpW#z?<RnKo#K~r2(khnSm8+AzQUBXJFE*XDA=>-yOT{Mth?VNJlze
z@B6YNmw{^?U(S5o@nR344+D;=ti@r>!prtYGMCs_`zSfxMvQf;oP>2{st8tI${3u7
zWXjHR2D;8lrsFJR8vJwytgf>%WmhTFa8>ZSEG%Z`gj%L9Ol5G3a+$JN?IVD+;%fHI
zxZ3zIhpIc63{`>qiZ<dl$cflu(n&%hbEI%q20ki0nqkCzmH^U`;%fE_VkHY-6?54s
zaix!v8!mR7oB`5_&Zo0qaN+{#Jm>Dr{s>&?*qK>&+}B4b{&(1a&Usn}NT20@m;E?D
zlL1nZKOy7ekIBGA&W~lj<!ts*ivMLfoIgDSq{Cc~XY;Ph@$nC}%XM<b=)x?Q@gK>2
zjbH1d6#vVTa?NId6c=934hpwtfb=<`lIa(|oPo1l$7QZ?wfZQ90k(+Sx8GuWDZ}ic
zU3!d_&-ko|_7OnpSWoFY%l<?kkgl>1WFE1<o?$41;g{~iGH|tfv+r~6U-W&_ja%_;
z@w~n-yD#ax0Rhq--b?yk^ZuX@Nbh_9-shB#$N=eA9w9>o;C|m~JXgV<+-~3!B^(i?
zqauIyz_%l}x<3|9iv)Zn{G_lJGP*`WYfku9@LtE2+V34@<z5Gz<iFk_N>$hE-iKW9
zu=ib8Rcd;FDxEFCAEiEDRr-oTz|+c+@^;^4GS!0>x{V;UT<{04S-4Jm(EFHlx&;4_
zBEIXS;}rt#R3>G&?`-+2%G)x$95_wc5wS}Xku?vT6}i(r8Xgx3I4;~4ei_nSq0k3T
zI4}4|$2YYN#|g?G9dNq;AxBEO-bM9bg&w0Mz2btmyozv#biemG=?fBU@%epsNCztf
zT(3mrxbFnHqP!r(?*pGwUJY9$E%H|nd@6E}TL~W|5^!MnRbfwP)MX3#c=%%QL&t@h
z-+7Yqp##qIzv$Rc+T)^nutKk~U;4lWCTT!;OuE<mx^$8RE}zr)nAEQjaE4-+clr*K
zFI0XZ!!H99%4*msZH>I>fzim%-P^;T5(#`l+Yqh`9q#&faFmD71Ov`FZNho75^%yd
z{08Tzr6*ie4^}7{50ab$1f@ygIq7HKO{pwF)MxTNCwUbDKB4^Ef2eO<zF4_ahWi7$
za%Xs(^iud`4|pRh?$<*ni3IRrR=hZLvg>cbBY5~|aDV5lR(5_~+24t=!npG^=>-?n
zgB3Eys<I&CqXehShZ$)l-0{Fhc-7qs&58uRVM*dlsN!k`XL-m6r=4HWE^^K&(@v=S
zr<_%(>ncmS0C}k-;H}xq`$`hzeT;8iViW>oW!+!)=`z)W6>{5(;SzRHpxWA$G_6V!
zkY?mbZ_&^A@s*eHulYLuI_AN?&}o^H5}0|5X*JAyfs_s`Nb71%0@9ki;cfX>eb}9|
z>Ra)3dlh14UB(-Ztohr1W=5`HZvkpjT~_9_Wj{W)FZ(yNDc^?1`Cvm^mFgi$YK1rn
z47erQ;W;nWgSGm$ttnSvAQ|<ZUqGh(@Sgu`zHQ0_(i#E}s1Hb|Xvg?Y(R4qYqW#1F
zfO>^Yc`&no+ZUCu_~2RjDqo-ch%YPO?}Ovzs4xA$%%8)|FRJfL3GFB!kSglOe3S<>
zGh5fySs$+AtgozcNYMwRmb&JnFKLr(T~f~WZ{Knyb0rQ!SyGPhZO2dl`Fu9TS+{aa
zj#UXrlMdZ8@4$W}(z>%Gt~omb_H=iImUEF`a@KgLI%oNL$Fj3!ukb*s+L}V$Rui|b
zir90%DlS=@;+&On1F2|Tbf>M$ZXmTd#=~1n9_*zmVaL>BuRn@<@V(T7@8xZ?z8SmZ
z2czRe|BR#NqZZLRay7?Q5|H{G8P8dcpSppx<h)Y+zB4WY={wGlYu0IT!N;6$^Jh6e
z!vE6FxPWwn%^==odq~{+o(Ol@-V@u_b@6tq?gr8&)(70v)+gLR60Mx)FzeACAc@u=
zdIDC_%e-&B#0#WhTMXOxpby@&GybAuw~tzc?UT9hIdA9TT<4YiWsc{Z&)VxekS??R
zTDaMEt+@3$5pK3UC*Es)N~~I0H;|6A-tHc^-s=X^OB{HD*3Wo=^b&Wo=S?o?WnQq}
z=mnDBR>q3K58E6c^-nv#?7P|Va|uZMIO3km95=dw^n&xV;xo>71t2}<e4M9dVfz&B
z3g=!PPIunHU+nn6`80MZ0_iH-i^7j>i{jQ7MfkDpMe$MV@5Fg4k2@cAiuI@NgRKv`
zf%G<K@bp`c@&M^=?k3L`tKwx|v0mc^QrI?y?R(t^jAOuGc1-(jaNHpQX{RIUx!7^D
z8}HsXyH}lG5+8ONMIhbfe2J%KVf$3>Lg(u|Oykmdju5}szQzOT8r#2wJ8XNzt?MG(
zVOtlUw*FPT(JH%vbguOt_mS2|-9XxIWjzIIA8EVwCXd4^d6|D&ukZpXZ5zk-{l*9H
z+r9ph<Kw<>JH9UgY1onWoaeaB4WtL17l}W0dPE@I?A+#}X8rg0yPS@{%m2R|f1h!_
z`v1@Iw-b-Q%jx*zAmLc?_H>rD;wf3DJwQ6oHsk#c0(YV)34!UifWgLidn!6+y+sEj
zLD6xv^ihY|U$?h?*lSz!8SG6jCByVS;O%qXo(3GZ{wMvkBPX5f*yUTbmwhm9KhO8J
zZCIjY_?)vPVQxuJDe$N?j~DoB6x~-<VA?l}m-!9ZAY&)9CKu%uWvvJ9e|&FHrxXHo
zZC2UPDm`E_P*;`%8$EFNNI}E+ol3xbw5qi9vY&uiz2Ix>Es20Ny(FzfbsqszY{{34
zP5BAP#h2xk*qo1m)mX_l8|z53v8DvGu>~m~OZR|wwCUAjYaRm1G2Jc2$~~YP)!nQ5
zw1<GI-tw$O3|<0eA_XrK;d{VR*x=m=b$Z}kY|UE_&q(XxS-k5-=A_w(E-glQ3EB}x
z%IS?BP|!JFEwb1HDv`W@Dq`pX>*20%B|PI_3^OuR!}Br|uJ?e|P)%73rF%d<G$*eG
za|(f>qgh1{rhC9tU|n7aEcJj^U|P<HmU=)1^HhQxegbBKO@A$z>wz)<RbMS6^?*jW
zE0x2|9<YFSz_lRfBVZxe^37<=GJ#`?G)31Y<wX@2bX=JCGco}IU)%qr^lRnQ(kTj%
z48E_bbc7hvIfez&MusuhGbIj4#Z1n=){oB*r1kzBpB`A?fwa+|a}@^*H0UGe#6cf9
zXLYpWNRO@Bp*6N_YmAq;$?+Tuq?z$m<5Iq91X6vhW^B-K5Yifs0+}Can;5E@&IiMm
z{F(_!`{y4u-a2-)2}n<jy4dGNTr7}`!=GWlGPK14r1uApvTY3Ub|8Iw7#wGfWbE*%
z(W7h!=D%&Gg0NW4@UOAgO+XsW{|1}zMH7%78P(X|k7z8AY{Mt9UmMzH0g`d(Fx!@4
zumkDZ;eXiA9#QP@iP6Js`TR9zDhP`W82&!?t_euV{L9AgjD5ufqz6Zn?C(aBERfv8
zr?Qt187x2&hW53YhW}~99-@ERzBl{_ES9sw;iLQ7()sJnR1g*$G`uhdERfXvyT;ns
zB_<%<J37q%c4U|Zk}~{d_Szw%1xSIRL7QXvFE$|kaQHF%IV11eU}|*Grsi)nQ$biP
zXLxqZ$^wbc8%-CDU1I{$p3!~T-;C_b0x2?l5&Od-)&ivTP}Jrbe%1!09}VAO|MJLd
zHaK`RYIEj)Xr_X&SjO=9n8X6fke5tzV~ZvrEsajGt&u4fNa^7kyEMdEfRrDSY}#<s
z2Bf9o1^e7c+Xj=Pl5Kl_(cCKtn2@`uRzg5p@k;>=k_9MI7MOEaw7Sp?VxYSjY`JsV
zq_3l4D6pep96>X<n;MYTT}`dQSAtBLmqI{V;|qbbSkZuF@OIR)gbSo4_o6x@c2pb^
z*iq}w1=Zl_1c6j_NP#k+!(=F4kkq;xJ7q{S-nPn1x&{qtR-2b3t?I3)Kx%mk3h&12
zC#m6RDl>K*Q$^C8ZDoe9C>T?(D0vZ|Zr%7aPby0deE7}F7;?$W>)y6plnQw5kQSAB
z--0^tYvN_r*HIUg9|t*gIK<FaF~Bwsw!=24XE78`y0b4kf<x~xq=PDFnbBvm7}zB}
zldX(X3PWZ1&YeKY=AIc^%VHdtbog*(<jvt{@(eRl8E5LlSu78A#qi-fDXrm(UG-rg
zHHWg9D~8tkfTZoxMk>4Pqd+R`dUKdk7#Q8Y6G*4Ut{8eIQ62@-ovHd*J;h*r2c@O5
zV{7rk7?3K_wNXlLcxIQD0#bJLidbQ!9D|i1SM0Q1Ov*lScp6BDPcUgpK{vKt+C~C{
zW~6F5H&*T|jWX+ftD}t8&kQp2{fpSEf-2`$2PSi?{dj3x&8`h%fE)qR%AnN0G}P_K
zL$cdn9%8aH!wd#GQU0Ov^!mtb7V4vgetvX1O8}`gIGw1D<WfLd87al<Bdal(8!5!{
zBeRkE@G1^b8rH*0!`)DMWFZWsjiH4=eFP6eQhFp8s1LU_+`esXeP~%}jc^*CA)Gcj
zQc>21B?U+`LyJ;zxZtBvjz0Wm*=HE;dRxO42}|L8^%15AE-=20!M0c(;k?);&U?Y|
zVQzjH-vmjGT!*g?ExQ<PxZ}c;t>ZEbE%Jszd^a@Y3Vd;J)~O9GJ7ImO>%<E&PXK9d
ztRQZTP2u|_YHp+?<VQ;)knjxmXk(lQNafM4XJZs!!AQ3aH{I3IuEdnb@IFH-4tKnb
zkwrh=92Wg+V+*R5UsR!-Usl)is~W+S^EHhzj4xsrD5^fDYvufEfZ@j%LO`mHwzYg7
zhqaN?qn*&?7^ee?ALC-$*m4ZgW2Ja;40|O<J2-xFw9{7|o9bT~!#!@uPYulF7jxyY
z$^c$nO8u=-Zh#-tb5I;B4D$Kh@WxmN`@K-DF>YjL3}fk}`H^OBWduW)r20s0I6s16
zS5j-38EXx9uulRtGrT&)4>yOQF@${*L$jmngBZ}BALPc?bGhM_TxA4ElLOtMrG93V
z$!D?4g_O=#Mh#g!{7I8|KF~32Skl{gbwuSOZF3{sF+)DwHK${%Y%yK10%<+HU@iC6
ztUy}nYg=dfrffherYjgu#6gQBLx0m*%q}{BwA8OVH~JTyFgc*}+Q6cd08+8P>6p(-
z4j`>(+V=U(stpJ4HLdG?6>csgaX{MWTjcnR&Oth}XsKs%mR3f$VACZFKcKPe13U|)
zmHq-d-H&%tLqEeVr{|5`)Qk~G?Zm>4QmVZJNUdzqDCIUxK*|lQ8#@`!2qY~%XK2Kv
z9XMi8+ELLfJF1b!4(tnV?8rqHcW9A?9l%9uJLW?(22GpVfxUH8I~Zkc$GU&c2qc5A
zZk(44CLk3&ZI<zLS!lXBb5Ue0c@b|uq$zLSyx?7Dq2sNyynl)<`{!8fJz8WN@;qC`
z{{v|wQnB!Q(*kLo;b^xIc(>bXUdSw)fmG~UVR-~v=@oV|RWUV_H525M3#R3G$vCN(
zO+d=&nrTtTc9CYIO=BgxWCW5Sp&Qo|3)p-VpISGzQ_ChG75XH0u@5&BshKITs~K!0
zshVxGQ`xi`NTqDK*BrbRYz+%;<2G~OX=VubU2Hy}@9X9x`@V0+L*+K}r~2+TPxakr
zhGgHPW>ept=9kltn&G+hljcX$kD2$RA2P#v>7SbSOW$ec(ko_IP5r=pVd`%4?$o!<
zuq$=7c{p{Wc`)@oGyFO^XZ}p`A~ToFo8h5E%6w)*G3yDV8D5XS$37H)j=ePgAiI6*
zEdGZRTVmg2;j!4c>?N`D*+XKdvT#uB6n4MZm)U({=ddswJCjYvj%TB>6Il3X^h_MZ
z@kzE8Ewk|1=op)g?!$hl;{#+}ceCSqfo<cc3piST+0@l7?3bcXnxGlI$t1*{Fnu<5
zhY8M(-DaxAZZa*z8YcK&>~7Odv7eY0>6f=-zcEe3-#2|LuCQ=TJjC7__p^KAK^FcR
zKZw;5lk8MthJ}j~N3#zmKF7YD_#_MOBtF4@m^hZ*OdP{PC^^Y~BzYKnQu5O*oSHm}
z{aW%w_FKu%valz48vAtee72kX8Vm2DK1j~7o5`<Wp427m0jY1WrPLA&$E1G5o{;)J
zJDvIg3tz`?u1h`6K9t(a!qcf|*uSP;V&6{vorQhUTg>OC2h5M84>dzOeWdxFblFV1
z)Noe#M<&q2r<>ZLLrs^31QWi3*-djH(R60WY1+=*wf(N`4C4v?&Img~zcjuceA4)Q
z@L?ld8ob6h6090KfwB?a4;*6Df<<F4m^Z>$a6jWd!9$FP1SgGfVK8odFc>y=gHa>I
zLkVL!lrvr%+G&Izh9-=+h7L8}75bPF{vG<P@gw0QjF*N_H^R@uUo*ZLzR~E3JYmEs
z1kV`7NZZIo){Ge2e8CuuylBMnFGh$({$-3sKEwq)1A-B|$s6HKTm;u(E$qXEH;h{&
z9~hw>cAMS`?{8{{XH4*H__L;8hRYZ}ESlgq;S)^{<F^ll&o;pw;cuDd!w;Bfdl;s*
zc^0;4b8KDxD!W_7y|zpJ1UsxA%MPlz*No~%+1Hd5`-Ea<;Wp(Trn8iPo2Hc4Ot7Ew
zH`6ZV_okfkI}=!xXHEZ*_n21Yx(PhW*G(rW-!LsJ_#}T1>H+0zrX~W9p?;}+)wHV2
z;b?Q^BGU^>&Ga(;@{V$*$*9hmBo*^0sG#~ala4?VmBBA^^vft}Cw@_&U-m~Gq<+;j
zh56tFb>4KodVy&{{kjS6SHER?R9!Z8)CWv(p4KsK2_)HC0FTe_1kPY@2+Xkyfhr3>
zK;0g=nB5cj20ph3Ze;%z_$g}%{)WYgB7bI$!PnU>!B<(B4Lr$qwR>3FREFCW$qwfz
zUE4{@9@{?3m+@k+oMPKgIng$y9A|@Lm7{E@DPORCRXM{3cPlkpN4eXks|_1Qe7D&D
zp>p;&)Hyr6p?=%`uzHStS)I4TN$RZKqn>5os~l*DdzEqfqe|LN^%(NLZ<t^LrTQ;7
zDgJpA$o?Bly6@*E$#<U#1m8WTu(XZUB!-2!^uDPdlTseM#BMoEmzyk*Fy6~HCCv;u
zY0|vr&RZ((ISY_lg3c}Ti#8xFy7IPl*P0ba_N-a!;uN<a);S<)o|=X8v@Af9d^6^@
z)WUNMRg(*5j4+!i%xqp!Im?X7TY$8zU_I&*)`Q~JJU6X0EZDQ3w@6CGGAGw9K+@%g
zW!|5+V6S)HvgTVfuSk*wNL_J>TNaxfkP4z??Fx9)Cglam)^<(WfK=ccc8TxUfrRl~
z$Gmd^@5ZPyuQ}@cnjJ`GjOcP=)dr*mQOEfP8&)iO1LI3A&fslvKuSw<);VbbZ`!Dw
zugrCPRSrlPbK!FSbqkQD{mYiBKh5DyF3olQb*?6tIUsRLiCdKyIUp5e&AQ^#t@z5N
zTk}%hn)ak|vIJ_@HD{mVR~$g9IM<vlhXI4nD9NGmB|GN=(!8U{FFT7okaE0%Z#d_8
z991>PPdaB@b52RX*%p#8?Q9BD&aMEYqNC<6I@)fGfa#t&N7-A&kQj!)tKMlx!Mo<D
zd7<QNdzYP@wCbFepyO;xHD|+HbymDkaZY+S9Ayvh<T0p?$~kkMDQDS(MVCE!=M*kr
z(WGf-&OPtM5P8!%EiycgljB<g?uCXR@r*FZ7X=27DuE6yp@d6yo)d6aa6*MIxf;B|
z1*8SnhI7@`c4DV?!`X7J^uXx~E6#bL;A~?A9QX39v*cQIZt(cbMKbUmXO%BIX(EGT
zQb;?RLe9aog=q&<a7!5cbLSjD;@xSC`fCoHi^e<Jo`S>RH8>#WUA5P}OZIth+m7#=
z21ms^*#qc<Ce`em)WS%JS8{YcO~;C->STDS;$W&07Dd{Suqq!`V(>AJ1>dB->6^0S
zQBt(){tcVv#{~%kkDNT^Ab>P0^NzY)aNvP4<0vXCR)U!g%yLXeH*m~KIBj9*Y{jnF
zEnyrBGNaZ*cqY|DHMtt7_;UduwWN~PbQc5vO(gjZ0j$dq=z0wJ+Kv-KNDbGjw!~M1
z|4FoU(YK}nsp{QOm)y%LkQRipTIDBk5G9In8UjVf)c<m<_|`Q%XxFv2x286{Wfe$m
z52NJWT^UE+b>*6i!yYkC#VgG%TW;{Js_?Y$eKoBvgb0`qrDMF-2@#;FQ=tvHs}VTr
zVL@xC?EnFJoX4^rD1`~&16+71(CvW}@^X>+upTAA5Lt{?BkdkA8O=rK^mdGZ6@58A
z7cImHSc~DXQGK=t@S#;bA6yL+upX#{4WZQ@*i*<wv|u4bV3@EFnh!}~0`I1Uh!$ab
zKsnk8Eydbl0@h<VfhN|8%*1Ls)ML45KHiKG_)9mo5t~X7z$bI*wRks0z<Ly4sN(H3
z0qKO)H<@HI1U{;^`x*%x;)6gj$z(SY3q2s8XlD5YzAz)0tT3<?pXvcxqCHTJmj(%}
zv^1#2xFG^&Vv9psv@}fMG{V~Oj6OX=U>H{))gpSHz>PRN-UzqH%aMg~FzBW6^~mZN
zfzuV+BTI?)5CQ4r;t)2n2UL^X5C$8D37Ah$kJQtJVFFgtt3&f?t_KwRN(1w$T0ep7
zQ%dvc={^Ex(o$xnui1miXK-|ZA=B>Tvr-S3$>Lb2{!W^JdVf2S&Ml@0Sjw%YTDfkL
zfXTtd1b&DSxX_8s4K2nAXbt7!OM_B0Jv1G~7{qckKiug7#o@&$KP2e{&VX!2)^fQJ
z0V{)xp=z!fAfTEn1ttf(Dgo(12|wsPpguUI)`u$U%HXmB>$#4+HaOJ-r%-nNjT|Er
zz~^TDTCR)JxVk>j26O)6z_er-=z5{iU-7OFv^@mA(oTD{9Mc0QadIBRz_Lid%0N?`
zADHa{>-|$=BU=#&de0S>vU(3pHYKDp9iD)6w!`C#tdqd`q0`RE^sIw`YHHQKp6uEP
zSW8aZCX=gH0$Op2)8cv$Jc*VqIQ6s#W6&^A-SBs<%QAL^B2ZE4&P7%4fhTF%u@u0!
zU<BW%IcF!d;2<z~Zg9*83ietcjhE7ZWS`NNYy@yx)mBl<Rstlo%khCFD*@};s<j=M
zvJu$roVJxBRXYL8`hv5e&pQa<qto_<NRuOAF;c<T$D);hw$59-`f3l@&?Vb!RKjuD
z_*k|YZ8!?CRXf47VjB)%;#1B-tiThHk1g=U*gRj4R$Z{J&j}?Q;Y~m~+7>5ct36;L
z#=8yi{{V$}(OruddO$P2B32UyHv!9uhS*3h^?-J=BzBUzSWNMFLrgK^QoL>_U@lR$
z&&D^b1f=7-bs@1~TTAG6(33^`WOBjIC-E6@Em5=MF>Y@q@TSBh*X;FF)5)drE;*N;
z67qek0+XrXv67i`FJ+1nfn5tTzH+wdCopuGm!)h)C7_*IQ4QI(9-wCp8q>cNAYdiC
z7|8caK?1uY+Cjd5t_Q|BCWE>D3XU|zfN`n65z1%v9>8b#P!&hm60p#}7EWi2J@5ry
z3NzVm517vCk=lSkCtzWqqUQ&+D1lLvdXyR9Vg$7N`S?nIx(5{cbMaz!Jwbq!EhJlg
z%@hIief4xP)kqOgN$TllvXLTSIXRn}N-ZY|NT<umcFK?-pp<UMyU9v?BUy?Algh;#
zDMJrvq*r3;^jr^+(i_pa^kffM?@QwcJwkw%%7vNKT!_HS-E6Ry!iackR%4o}DH$rM
zs$WaBBm$;WX{nfA@DO+k@}8BxIUExwxgp=z5DV#U51h%pB9>A!ZUXdF&CR9K9s=G;
zCcW)Mw+GC|8`44|?<1g;<osHK?*YwN+qV+eWCFBgLun>>m4LZ;PUVs%jQ~<NAz?hX
zsNn%r)5=LcFqbR_U_Ln?;FAkI@Ss}_=Hrt+7(;w22(4H#I1|kWm-TJ{HX=&_?Z4pr
z=u)5_?gW-XYXR(n!&`PB7bGAZ(1V5GLSQmj55QD#F~Een8uqvZaJ23?cF%QH0+!?z
zwIt8<z^9b7T9r360)Np17`g9(vvc^sjDK1qfcGD${mmz9^hklPG2!iX4^HPG@e-#_
z<LDV^NKJLlpAHZ>lsz3-#V3_H-?9d}Z%$kF&Z-2Eir!^~@?uH8ZDq%-1fO@DDwP}_
zspv3BFyOeu%iAkGz+%7M%i90!wc2?JNVnP_lPC{n_G9K52|ngHLps(WU;&tUte5#b
z%zT~~Gye!PKaZL1l-VwQ$9@-Pp25spw`^l<Ejx}BdkA%heG1VexWnG{K4kxuw}rsp
zQ19Xw@6s>tVv@gMQp#g!;Wq}&ysQIh2B(`;xm*-TlQ<W7-qzG{+DTh~+&&W398*!6
zfe<zD1)ZQN8TtbMX1I&Ml<UoKhYv*vAo2XPuJH?4GzwoN;&b*~97tcXemq{catR<c
zY|XgAjtiu+gGrR_s|luRD_{g4b*b&a)TDJP1su1QeAK*Of&kLvrZZyHYTSSk%La?h
zCN<dUSkWfoL}}C-lD6Y7_&yZfa4bgi&Po)gsZ^pxM=ri*W8y%{TXXSA>uMYaj;_X6
ztjmeAjY$HjVVg=W(cGK5O-fDLrcwsmbP86iIMLrKrP2s&a8hdBGL<Y_mJ`r2ONkYB
zA=Y9GF@~Chjnge<^YL+5Hm}7c%XFfbjxtcjUI|nb71=ABDxu1HwNmxej9z;_wEilw
zXgxM@rd3D)Y0f&GXmR*lnC5bcs-+z-T4v**S-5!1+>9A4xV7_^#dy^sB^nkz0qd4r
zV$D)Y%v&(eq@|EpH|G*%b1jaI4Dp;9_cdwK%tdhaQ5Z-?^Kz(ePKRLKyckSd)&eyP
zzALO-s#@1#&}O-o3SF+QE?a8~XPd!s3mB*<+opTq7Mxb{_L_ekUsUk#fpBuiw(MVX
zRI$4RHR<@V?@q^)61?LWlsXR1SG8CDK<d~Q<brKOh6QU$k+{6twJhTqXGv?*mX4-d
zqyTixQ-PYf6{wgCK_HdP&0yM$eS(ac3vIBo2>u0@4YnI<uv6hCi#<K0HoKv(viT@O
zYl`cQ!}v`_JaSMCla7Cor4z+J$kK_5tRW?`*o#EUvu`HtESrRmDU^5;Lzo0Zd1%X-
zmn_)#N19`Gt;(*3m>IUC18EW)p|N<&+b~Uq=GabvXBUG&DjKITbcVCPNEeyTiiS)t
z>Oi`}cz9&lco9w|L^X`N!tWSg3;~H{XM$xm6a>-&dxTcC+=(5Us9oGN211&2P1_<#
z%A6ZA$|>$X<uLa?%E35VOWE!If`X%f6mY{e${)n<DL)eLRL&9MKIM3^q3n+feIk5Q
z`Ll4Qa-}e->?go3Wk?uOd_tdM6hKv;cfBh=;Cf!Z%7yP(7rS1Rr(JvH6I^hoTy|X`
zAL^QuPjSI#<%eBgmz~0*Toy23ah7n6e6?_ce7gX5$(mS`FBQKeZ-{WF{DFAByv_Yp
z+2G#JJh|=3Z4C1d|2uB@onQ1c{5j8${h#!}js8<SSNUt61^<!<QhtN?CEo?!D}3*J
z;R2siy3{u+UGLjRf}i;gm453>OE2M<@TTwI-uHcf^P2s?_JZBN>Sg^8d9D8Yy>Pt$
zH19Qjr?=x@@jyg=z;lFrz2{r<xgNMiKFf2f{8i5$`5X_tDu3Mbs_gKr%fE5M8}dEw
zf5|mBZBPTi76*Tzyy<^U1dv}5KlJ}m+#>%*1cUrbk(VD8J@S1b_~kvKTV51>^7lo&
z^%TWZ<bMiN^1J}2$ma{E$)6IAmv;(qpuAlu$WOQe@^@Td#7*~G|D@|y|7k9`-hZC!
zO8<9UxYo3=$F=DHnd@f%eJ=RE|54W!{-+QeBYe3Zgwy;v;bQ+W!gi))Dw!B&)sGLG
zH~SA3SNzwA-}3(!cc}jl;y3*rTzFlC@A}^tZ}OYmcln)ed>$9wE6842_><q@e$D@`
zNb6?!L-_jwY>%`BYh+Md4VOjuQ}{{o;K-$7Eixy<C6O8N%E<BJ0s{A=o{j7yb|aG_
zY|#aASpQHsSpT&E7wAU`r|2!0U;ly&1pNg3@Nt(%KhTBOLk1_7zr$A|IBu;JIgvjg
z@}d*3I8OLO_$23};k5Ibu;_%D@TTK4;Q{B-;i40c4wsx?2p{L14r8(t!e=-?6aEr1
z=Y-FMzv?_bd?Ef)b;3d6?>qhBJDtw(Z=LXV=%f5(_zwOnVbKNO3g=yChfi=F6TZX+
zhllH~PlO+H9UcC&3%(Ri2tNuRC(vpe2DNoJY|~<%@2X$%ysh4gLwD5&F!u3)$D-lF
zAzIaQnf5tPTl<s;{-hn@`I~l<r>h<7foR|$&u0T4_0$5I2et>Jp0k7Cc`1m&EK}$y
z_dw`A_mQDnaadpIyYAaUUv@to`lK6Lp~KyO3KiWQ1YQn}y0?V~-IlQC23y$UX2TY@
zHEhH{TlhEPY2mBIkA@EvVc+nOm=6cUXxJ&j_VB-izlQ8$Glcv7ejHYOQ%DfM8}f;8
zZYVB(EaVo4LlF_!(75>5U_rb)c!&tM1rHOi!Vk3|?$}F$M~N2)KOt6vpA=!g;PIj_
zc(V9b;6@St5%{6F7PvwDV*n512LkttcLZJ(FALz1&}!g)aW3$#cxK?=A{-kqxjzw*
z-Ma%RHw*=G?pPr1jt6iR`U8IzCj+;NxxkDFX9fJ?O5jfd6RZk2bY>sH9em%#2OBPo
zgx}>d1+RB)4_@hle+SNTd4ivCeGu5?f@cGw>z2TPs}?A`;NyWWy6l0ATrX&!alwPy
zzOLJ}i0euXTyTcg=Fin`=g-$Lba}q^CH_m=>BtNZU(!y-UryvJTA7E>X@~H~;X^MD
z@ZjNK?E~ka_7|r|`@IvMQy+HzQ2o$}0dyXYKpm*AIS16=IU%h6%4t=fc5bDG*OiX*
z56Y{~hm|*-P*Xm1o~Q))A!Qd2+m$2vzsXhpG5Jm&7UkdaKahj2U&#Y5V3h-1gUVa{
ztnzOj&Qm_%FIINADhls{%M`b3Ua`3r6nq7{TZy{b%7E)V<xm&6)i1aXQ;&9?rk;mq
zyt?GNTm@lOO$#^=@>9YsYDKtST@qkk{f)4!ZU}!+as295?QMb8o);vofg|0uM}&TD
zuaMO+UK-F;k<pG7|EVsC@TPhXj-7c>Y^x0so>C{=2dS63-&5Xn!)prTc~yyd-cyD=
zxZ1~iPEfNR91Gxqy83_I52$~1|4n@XFNdgi)V=O48V&%qXpg%6+Eea`_Lv)v(!S@u
zMEi>SVGWP#UucKBf2|$i{)6^$H@v7#x&N*e+;3~+ZrIcY-8%xi++1MN4e#O4?`fyG
zU)Iic!>V?^`+n^T_sv)kT(8~a{<?O(`y%ZJZa59=IaqtvO{b<|(%W?4l+>m}^_=Ly
z8CMwPMa_r>K@%~e(Gr@%j4LOmUCSb~=A=J;glgcDCQOSsv2t3}#FEeuaw3p6_?laD
zVKNd9_>qb{4sRqCg{D{+7DSvbJS+0zthg?8@cmdQxf{Z?w=CcgY*Ja2aEdWTSx8GF
zj>r%@BGVE(9;WQZ=r@UXGu}xz=f*)qoZH}T3RU+k-ZVVAJMZlv6%S4%u6X7>Q{s$!
zSzy+&HfBY{CX$MxB(CB5(ZoAf**(<*%bjwiJvpI_0LdT~Txn?v$Bm;5zKXEsU3B3T
z-9?wdGmS}`Ji~i&3}Dq;a}>Ru9&|_Bw%ue{5m$MvYn4w6tNe;<*2Sz*WSwLXr(IRC
z;KI1C<f0^mVa0(Po>X--U2_iXCYW)|3Yw!L<Q;7Rdj@jiyrY6JBK8bagcV0YSfgYc
zj;<^1oOV%O!;-y#f2;~sw>5ov91@L#+S}4!t>^nDt+PJ3lsn0{#7%n%Ce7g_2$F%*
z{RS(JxxL7Gmv711@!_C(KR&kO>z_^cx2z?cg<!4uC+!{IhAk&ERK7v7;h#SurMU&{
zCYqLUlKr%-S(fE#3$Ngl+pN;ERC)k?sBnwQ4A)ek#I+TUn^XyW|Cm&Z)~Z4U;ov4l
zG%Y4uQMfkgiJg$_kLk(D82mjE`@cn<3wRsVmB*EwFo}~W9$A{VW;C*`k#t9scM7pJ
zBl%GiSe#^IXp2+81=c{oA;slovOy$Z$hPhVM1hJ&RZ0y73@l!n)P-UmRUqIJa7by|
zfHt(IWf4u+(55brJx5>N`uooBlXcEKG`cf$=iGb#O5DL-jCV6G0jIOS#8<M9<8fAw
zgUnuto9zC$z;217f=*Aol3X31PIB1WWXG*68?{!j0SlI~E37EH%!;$GS?Kwabu!z4
z-VO`W>|gMoP1b5O%+{{A8d;N-V2%aN?9Z|5SS2>hf)+f^=2*|N`PKyEEO>=|6nl%k
z8+(Txj=>+<ld%T-aLl!zkHLBNL$Mp|TVoH{Ka9cK_RnLX)CaNV6l%P5rabGc)J0ZT
zYS4mBsk<#J^`DlO8o{T%)bFg8)Ss=hQ_(n_mrBLIoLUp_Os$PWCgsMh)X8x>^~E@x
zo_ZwyfA({6IyziG>tN8&YFU>3GTF<DNw}0fki48dlI%x=YY^M<jU0KNVDF(S%Sp_%
zdl*FQt?X0wO{UsKhUu$U*xO99$61#Rcd^s$E0||@GRKCmV9=RtKf9dW%V0aZnf0>^
z(K;A*g#G>z!Ab(**5IYAOUNZ~_F!jxL@HQhI8ITpW@NwBr%c80Tp5p*G&SagQML-_
z;l@gOuCZwNVkiZeiw&55iwtXAFdpB<+V2<)>V;S_JQOQy)3^czr{=7pg3nP+iZ5P~
z`V(VPH;N@l*+fZNm8eKZ;t-T`@kyyOJ}IgRykJcwX#dEl>t0h3FG}E`=tYVBV#zuz
z{mlZxQTZxsjdHRDgth7%>jJeBgD1m>8+RKQ#qKuRV(_RDiJ4KbZja*ER*c?moncPK
z#K;{n@EaGzy0!aapDG(HxKF`pJM!B2GI>oL-j-IzX<KA;ylPCbU<08k)M?|D$41!#
z)y~UD7+ySZ_yJK;{Yg{9=jH)zI?)vICpseI_zV;2kK@x|yvZDjL!UVu?=mOiGZB22
zDn@*XG0o2^Dz3m(yV;1`X$R$g8wR9;P1_>lpk_`@Rk49^t31N0*dg7<Zk4a0f3T$}
zi&#Z@Dv1T7PbFVfBgq*R^`YWgU2-aXPofh3Mgpe8oryKkF$=}VP-(RO!uY%9()i<%
zpT^<F$ZPR++WpCQR9wN;>dVP}N(bAboXtQ}`fwW~RYM7gX@(LI)2vCJVnG=XKt<}b
zi_)s9`N+eKh?Wh6E=jc=bmPS_XOD@!Rr8UD>k+y!e}Le`PP;7RP`g7IwflrZ)qGV?
zUkDEZAt?0Pl@K2JQfR^+2#r?FM;?@!$WdF$StYchf@zuoWy%UFn50JYk%ya+DD#0h
zApg-Ckh}5QkcZ+}2wycHdAPhd5yztLiFlJV9uG>>sE{IBiK6JQnvXnOQ5Z_#gx#S;
zhnP#4B2L?zskY7uY@rhgA9=V^2u~<NpP(i?gig#h2)X2B2*pd$eB|MPoAdW?@<+;a
z5(tCpv1FHu83<F|!p4+!Rr8UD`?HG4RKlcoTC%7OC81AyJvm={ylOu3a2vunfs^3q
zPbX%=*!cE`+mk)v`l|WJ!`-8=N&sQNs85_~^d=x^Je(NOZ>gG(JX})6)0Dtz$6}MJ
zg(r%-#WL0NtLCeEF2R}tAasPc$AV$hN-1metTVMwVq`w@aCvzMTL}V>Kb{$*m|4N*
zQj{mE<|7Z@AQ}MrYAu{dj3_V3MzCZnLUmh_3g$|Jm?nWHypxcZj5GaH5g?2$9*ve3
zqh=tXxVT{A{RyWqFYYwSOGfAFys_H6=o_t_5q*8NSUg5p70AmSI1-PtCWA^(ASY7{
z&BIk|*78q_VDpcOEBQOc82@b%7V$g84g7ZTR357vn|V)cL34S5{+TPT=MM^-`R4`L
z&3{`sk6$k2`OiXdFaL4qNBp~?C;7u6*w60`Rrm)(ivmOVgcrCmR2$e5iUuwV!6|`l
zp&op3Zs6t+Y!18<S{|4y%nzI_fEZYhFU}V}<G+EuHU1^xSA2tbi2rvH4)Hnh0KW_E
zM)9P%hu{#VX66OXk$?|ehdO|FN{xZ1B!~xIkyzk&k{<X(g7X4r%WDE7a(BQ`;A?@E
z%AJ92$}NE{3huxLWp$ucSsGwe=OZeS!27ZsI4t81ye{*B@5oC6x5{vo|Ds$II9)!<
ze=cFd^bgV=z9e17e;@NDd_npTewTC;zg>d!`7X)jo1}I8BAlDRe=PnhKPl1y<w~{F
z*h@o9)=o$!?~`!~`6{`CSLJf;G#2#XyT#hks$l|gRO+Z5m-4k3R<6y;UHp)2qCus0
zNS?t`x*4kbn_1E=9l^pfG9Y}q<Qegf+HnyGFVr3uX?r+|k7Y?d7^&@0s<>xKMebaT
zWuSzuen~0S_Fw`eaEn4AWV4GLuWeU=@cSi)<l7eGoMggY|GV;h9v3+y@PI;Ive`wF
z{HY2MSnUh)>x&P{K=`ZwY1!j1RInE8IfcArRh4PnG1$bfSE{(W_C<NK|NAl!dY3#X
zpU>krbZy|ULLp?_PmS-XK)BZ!RUa_Et>RR$i`A9&&&xloKOh6)sPT1`B4&4KJw^gy
zrEx(0g7E+r3mH4qd!u<dP=A{Ygg#@JN)fY*{7!#I1;Q)(3H4R|4Hf4~Jffaz{#3pp
zdc6#UY-E>05wnZz)-??XU)NV?SLjPL%v^n-J{DQ3ylkG3f$+R>OrePC{WGr=P&WiI
zB6T_?MRkC{g^%FK4oyf$G#P$7Z(w%0Vob9cGsn0n-C3hk$;oIT$<>cy&bEFc*;GHx
z%2CvV9*kPH6Y-~d3|v88?@r<T4`)#8cc7vc9NHFHweK)mUrAsoQUym`%%oF~sbE4+
zw8RP#>?#q)!kwvcZ72nVpz1i55_Euo3P6ru>2!dQ*ZhtzJek6giOJNo?xebmBQ}g0
zgZ7L$#j??1hWpja#_PM2v^@?M%wF;VzN#HfRWUDoIQ5P;-+?i0t#hfSSItLm?kaVG
z0|Z^0<D5`eIViGmp>vbEu4+E=a0z9(1BBO<r1P+{*}-R*Z#gF`+p6Xx54T!wb%5||
zx!L)#e3^qCh5MW~d1uvp<l*}C<9M4zoMF6YYeq7KDZWcnJN1sLVHNXno7-!k${OLS
z$Y0sNMeerYtC5QRs<E$XKJswCiPYFYc+R|y?KWF%d@|i*ACH_{H6MAn#nG({2zN!_
zNRCAxWUxPaf|=15tL7sQw>g|k0b#CwZR%+F;S}r(|0cC1JYF>)d1jm6FU&3-2z$*-
z&^mP3Yc}dr_1m>MjT<x|d=`y|DS{fn0w;=nQbMIcO$1|jJ0~<*)5)<I9%Dimsv1=q
zhp_n}x?;VFN<%N+z7XYlmK<roAp=6Nu|H`xX0Zh|`jburj$%jgwpcdC8))@pv-?<9
z@U~7kqEwPWm1EGUVxGmCVjROs7X(y(wJBnD5l1WFiV>F9lkCw3l2Fj{$&pllvbYTO
zl?mlkH=_t{;oRzV4zM;}O;%9|mlKoWnFLOI3MR)^_Qz3r8vA32fz_P}3ggN;_Vfuy
z^o~T(=t)4QF_6eRI4@)QC=PBRP;R4<BDkW6JvBl>H0?>T$p*jFWp^kAdr-mZ5<*eN
z?jJ_X?*E{G$B&Q`y6iEb&&FwkgZ3Eq4SOUM0wWAcy*5SsbN>gagGb1PdhD^#04@~D
z+huXs?h^W!q9joN(m}D`rU>rqYOMu?3)BtP?P|h;JHod&{?I&GFT{6+f$)0$=O_+Q
zYjMBS-i!g^QSI^Adm2iuHiU1EtzcJ&)n!-dK-g;!hACop|I-S}krGnMtJVd|qo_!&
z)}UPDG2>!$%mBjX@VjA(m|f&q@vm_p+#@z5eoap<4f65$L3Mxqx#pGzAe<NeUX&tc
z7qRFGgRoe>FuqRS7>Aw8@2!}2W^}K4%*2*_%<K>UHbN1zi@Yt|n*hS|!n28wgnbG4
zO#DtFsa)Lnkp91oK)6i3x`84%`so0=&j7q1!X6~yKxljN)6g|Z*ePsHepxvK>qFCV
zoSBx6$57CLBDlNtb7DZaQeP1p)nhUEldi<(JID0WiXAA~jJRcKy+ILNpVI39p;vL7
zqSE2O5v9i|;ib1pCGj^zpO$qfg2S>@Jiid5>P)Jl(lu4XxdVE?Q`9?AoCYx#_B#|Y
z`(g8%5APL-A+3}uX=S?D&ZL47Tw8rV7RDg*`jHex{Ntv2bNJa55Uvg1oceM2yD9iT
zyny5)TT^X~sOCi2VVsqs2=0)+G6jT^K4Z@{7N;O%7^y=2V<|p~Vo`(xk(X?W_-89E
z$>R(N<MJSzk@3-cl`_W4I1gZ?0jFCLHb&Ol6v5$BEw*SxPU5ijo7keICY#fS?HL^f
zTL^=SYEuNaJn}so2u9>$`>T;FZTN0vr~OI8xcw~q!7{8;_`$M;(J$K+@sAJdnwxAO
z*rsM*Y$j|NHrLn-V*U23HfpsHSpBDrBDihQCm9gVjb6v@iQdBCSJCgVblkN2S8iDb
zgmW6sVHAPdfPcSP4F>5vMmV9I&Eazwro5)?d~l*_KJsvwXmcpr=5TV>DNFtMEla~r
zpEOi8O!A?p1E*qO0x;`T#8pm7#8y)j3r?4qtD28I+~$QP8wj7^P~!fDp%e-mpOV^y
zgN$T8@^E)A%rhXQ7d^w~FZv$_Z!A2?zHQ+oBlD4m`|ldO!V<o;a5;-EJd?o(HTY;;
z(@`}ac{mXKFn@l{Neku$=HdB)g(vgo(hC>~qV^JD0BxpjcoiuquIdV?tBX8Jp%I)q
zYc)l14;X**;2{Gt4;z8ZC>p$E1T)8taOMMJK?Ytoc6d)2Wp}wT>_XVM*Zoj`#Qi|u
z@4|cf3HP^pgZH7n$%DV>*L!Ir=XD!h9!_iD?cHR&=+UaV7CoPVv-R=JS^D2HJ9U2+
z3c8eiQ$LY;Nq;i~kD>d1{fx|&dR+!C*K0CY>nFS`^bb8aSKse7>5qGUeawSDgngMM
zdV40LUzdS4J(uzHZ)IrJ+<Lj<!Rd0@J57GW+aT}vFikq_T`TYOw#w&waDkllGIEE<
z<ga*`i@nA>Nq*A%P<q>g-%Ia%?@OO}zmaM(Fd>PVpGl`?o|n$fzzfm^nP;S8_UF=F
zS$IpjA=@OMmPyM_20U5FoF#J^+9;<AK@YYHFSz@K3*DaxAEx0c;TP%c!aM1!gqbv)
zBW!iU!i(<9A>M;sp-tYpke<QhZ3ccEy2<-I<ao3K?xNtCE?g5_=WY$Ib*~IAb>a5l
z=jmsHZ>4`0ET-XS!8_AW28YrQ25(QpeZfLHAG|NUC-{RjYzY1-T_5alKdLLb@L}Df
z?t!|rcc?Do!LRFDy}IDjt`gkmLQC*|w>5aVOWWbD7fKlz5+2SxE9}ZVEnJj=eZpy(
z{eqTxSXhyP8-xv+pm1Ggp|B<k3x!j&mk58#&@x=7gd6FWzUgk03hwpNt+<!cP40uz
zH{Ab{&U4|Qq`C{_a@sHF({NPkP4AZ;N{>pVH0+jcOJ5@WBAt=mPJ=7Glm3EqD7{*G
zGYw0mche_C&V5Ua;IBW34Q@%)-RH!57akSYxI<#by-_^Ng|CT^x}OMtbjO9V2d@gB
zdK<+>UXS>(3)hLSxjRJWJtztu{74LWkBeasM*uwdi70vFBJWLz_zg{nocA)uza}1c
z;V<Gr_apH!*Dnpapy7vdrQI%lIId*$wF6-^Qf{##16i!qAIRoSr_E>P+p%gr-;T38
z+xjEJtw5MIvh5VkRl;gJ*1W0h1>M(H2#;a|N94lUwqdP^KOBPS)74gr;6}6~Z9o{-
zx?4uInJf^RG=JN)l5GdVxHjHO5!`@!1O+k?P1;b)jDiaiN@`cDqxQF8{=dH^r*bV6
z!3E`sHcU89v`tG#S{yl#Zp13Nl(pnx{3HkzmC20A6Imb}kxMPBl<ro%>UXyeD_mPq
znQQ|>kL=IVinyZGoyFqn?(Bp(+L9N8?U+^yw)cviZDldn0)$>EpP>kDDm2*&gh9b-
z9Tf&!fMAJ3nQoz&1p*dMv~-7tT2bkKsC7D&ZKZI|39V`c0uB>oM?;ki5GtWuCLfy0
z0AV25**a5a;-^Q<1ZP?(oa+yoSs+Y>x?HDjC<}z4ApY_PzR3*+I`MZ^5N6$UbAR1T
zGZ0Xyv1z!@NdsXj(BsYo3LcJC6uhZGuS?<F!KQK=2piWHn|*7s_L}fSQ_g*&smB9?
zuX&qG5nQg>Yyv|0l<X<nPT6=e5XPH*&Ew5`nt^bzd0P`ja7DL_NhpMwF2{~Hn-&nT
zPTSh!`Vv^q?Mw8amm;_)yyMG#xispu5z5}46~{e(rH|gm-q0M>#iYNt{N_^MUHrbK
vW~iqX$F+J|`Oxu}<8|4#gCSoV5O`sEYc@3Ax<}*NfiSK;(YjIH*zWs(xq`EH

literal 0
HcmV?d00001


From bc5d8327d143e29ced05c2d128a594abfdf2272d Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sun, 19 Apr 2026 03:49:02 -0400
Subject: [PATCH 142/143] Make the dropdown when vertical start from the bottom
 of the rect

---
 .../craft_retained/src/elements/dropdown.rs   |  4 ++--
 .../src/elements/slider/slider_draw.rs        | 24 +++++++------------
 .../src/elements/slider/slider_logic.rs       |  6 ++---
 .../src/elements/traits/element.rs            |  9 +++++--
 .../src/elements/traits/element_internals.rs  | 12 ++--------
 5 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/crates/craft_retained/src/elements/dropdown.rs b/crates/craft_retained/src/elements/dropdown.rs
index a8e69838..84a35ce5 100644
--- a/crates/craft_retained/src/elements/dropdown.rs
+++ b/crates/craft_retained/src/elements/dropdown.rs
@@ -22,7 +22,7 @@ use crate::elements::{AsElement, Element, ElementData, ElementInternals, resolve
 use crate::events::{Event, EventKind};
 use crate::layout::TaffyTree;
 use crate::layout::layout::Layout;
-use crate::style::{AlignItems, BoxShadow, Display, FlexDirection, JustifyContent, Overflow, Position, Style, Unit};
+use crate::style::{AlignItems, BoxShadow, Display, FlexDirection, Overflow, Position, Style, Unit};
 use crate::text::text_context::TextContext;
 use crate::{auto, px, rgba};
 
@@ -463,7 +463,7 @@ impl Dropdown {
 
         inner.borrow_mut().element_data.create_layout_node(None);
         inner.borrow_mut().element_data.style.set_display(Display::Flex);
-   
+
         inner
             .borrow_mut()
             .element_data
diff --git a/crates/craft_retained/src/elements/slider/slider_draw.rs b/crates/craft_retained/src/elements/slider/slider_draw.rs
index 17f474f1..9bb4887a 100644
--- a/crates/craft_retained/src/elements/slider/slider_draw.rs
+++ b/crates/craft_retained/src/elements/slider/slider_draw.rs
@@ -19,25 +19,17 @@ fn border_radius_to_vec_radius(border_radius: [(f32, f32); 4]) -> [Vec2; 4] {
 impl SliderInner {
     pub(super) fn draw_track(&mut self, renderer: &mut RenderList, scale_factor: f64) {
         if let Some(track_color) = self.get_track_color() {
-            let mut element_rect = self.get_computed_box_transformed();
-            let thumb_pos = self.thumb_position(self.get_value());
+            let mut track_box = self.get_computed_box_transformed();
 
-            if self.get_direction() == SliderDirection::Horizontal {
-                element_rect.size.width = (thumb_pos.x - self.get_computed_box_transformed().position.x) as f32;
+            let computed_element_rect = self.get_computed_box_transformed().border_rectangle();
+            let normalized_value = (self.get_value() / self.get_max()) as f32;
 
-                // HACK: When the value track is visible add some extra width to make sure there are no gaps in the value track color.
-                // The background track may show through on the left edge if the thumb is round.
-                if element_rect.size.width > 0.0001 {
-                    element_rect.size.width += self.get_thumb_size() as f32 / 2.0;
-                }
+            if self.get_direction() == SliderDirection::Horizontal {
+                track_box.size.width = normalized_value * computed_element_rect.width;
             } else {
-                element_rect.size.height = (thumb_pos.y - self.get_computed_box_transformed().position.y) as f32;
+                track_box.size.height = normalized_value * computed_element_rect.height;
 
-                // HACK: When the value track is visible add some extra height to make sure there are no gaps in the value track color.
-                // The background track may show through on the top edge if the thumb is round.
-                if element_rect.size.height > 0.0001 {
-                    element_rect.size.height += self.get_thumb_size() as f32 / 2.0;
-                }
+                track_box.position.y = computed_element_rect.bottom() as f64 - track_box.size.height as f64;
             }
 
             // Use the specified border radius or default to the slider's border radius.
@@ -48,7 +40,7 @@ impl SliderInner {
             };
 
             let css_rounded_rect = CssRoundedRect::new(
-                element_rect.border_rectangle().to_kurbo(),
+                track_box.border_rectangle().to_kurbo(),
                 [0.0, 0.0, 0.0, 0.0],
                 thumb_radii,
             );
diff --git a/crates/craft_retained/src/elements/slider/slider_logic.rs b/crates/craft_retained/src/elements/slider/slider_logic.rs
index 161ff0e5..0c7b8f45 100644
--- a/crates/craft_retained/src/elements/slider/slider_logic.rs
+++ b/crates/craft_retained/src/elements/slider/slider_logic.rs
@@ -21,12 +21,12 @@ impl SliderInner {
         let start = if self.get_direction() == SliderDirection::Horizontal {
             content_rectangle.left() as f64
         } else {
-            content_rectangle.top() as f64
+            content_rectangle.bottom() as f64
         };
         let end = if self.get_direction() == SliderDirection::Horizontal {
             content_rectangle.right() as f64
         } else {
-            content_rectangle.bottom() as f64
+            content_rectangle.top() as f64
         };
 
         let pointer_position_component = if self.get_direction() == SliderDirection::Horizontal {
@@ -74,7 +74,7 @@ impl SliderInner {
             content_rectangle.top() + content_rectangle.height / 2.0 - thumb_offset
         } else {
             f32::clamp(
-                content_rectangle.top() + value as f32 - thumb_offset,
+                content_rectangle.bottom() - value as f32 - thumb_offset,
                 content_rectangle.top(),
                 content_rectangle.bottom() - self.get_thumb_size() as f32,
             )
diff --git a/crates/craft_retained/src/elements/traits/element.rs b/crates/craft_retained/src/elements/traits/element.rs
index 88a2b396..8937cbfb 100644
--- a/crates/craft_retained/src/elements/traits/element.rs
+++ b/crates/craft_retained/src/elements/traits/element.rs
@@ -11,7 +11,7 @@ use crate::CraftError;
 use crate::app::queue_window_event;
 use crate::elements::scrollable::{ScrollOptions, ScrollState};
 use crate::elements::{AsElement, DynElement};
-use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler};
+use crate::events::{KeyboardInputHandler, PointerCaptureHandler, PointerEnterHandler, PointerEventHandler, PointerLeaveHandler, PointerUpdateHandler, ScrollHandler, SliderValueChangedHandler};
 use crate::style::{AlignItems, BoxShadow, BoxSizing, Display, FlexDirection, FlexWrap, FontFamily, FontStyle, FontWeight, JustifyContent, Overflow, Position, ScrollbarColor, Underline, Unit};
 
 /// Exposes a fluent/builder-pattern like API for elements.
@@ -97,7 +97,7 @@ pub trait Element: Clone + AsElement {
     fn get_id(&self) -> Option<SmolStr> {
         self.as_element_rc().borrow_mut().get_id()
     }
-
+    
     fn on_pointer_button_down(self, on_pointer_button_down: PointerEventHandler) -> Self {
         self.as_element_rc()
             .borrow_mut()
@@ -135,6 +135,11 @@ pub trait Element: Clone + AsElement {
         self.as_element_rc().borrow_mut().on_keyboard_input(on_keyboard_input);
         self
     }
+    
+    fn on_slider_value_changed(self, on_slider_value_changed: SliderValueChangedHandler) -> Self {
+        self.as_element_rc().borrow_mut().on_slider_value_changed(on_slider_value_changed);
+        self
+    }
 
     fn on_scroll(self, on_scroll: ScrollHandler) -> Self {
         self.as_element_rc().borrow_mut().on_scroll(on_scroll);
diff --git a/crates/craft_retained/src/elements/traits/element_internals.rs b/crates/craft_retained/src/elements/traits/element_internals.rs
index c19d7422..8b4c16c4 100644
--- a/crates/craft_retained/src/elements/traits/element_internals.rs
+++ b/crates/craft_retained/src/elements/traits/element_internals.rs
@@ -491,24 +491,16 @@ pub trait ElementInternals: ElementData + Any + Drop {
         self.element_data_mut().on_pointer_enter.push(on_pointer_enter);
     }
 
-    fn on_dropdown_item_selected(&mut self, on_dropdown_item_selected: DropdownItemSelectedHandler) -> &mut Self
-    where
-        Self: Sized,
-    {
+    fn on_dropdown_item_selected(&mut self, on_dropdown_item_selected: DropdownItemSelectedHandler) {
         self.element_data_mut()
             .on_dropdown_item_selected
             .push(on_dropdown_item_selected);
-        self
     }
 
-    fn on_slider_value_changed(&mut self, on_slider_value_changed: SliderValueChangedHandler) -> &mut Self
-    where
-        Self: Sized,
-    {
+    fn on_slider_value_changed(&mut self, on_slider_value_changed: SliderValueChangedHandler) {
         self.element_data_mut()
             .on_slider_value_changed
             .push(on_slider_value_changed);
-        self
     }
 
     fn on_pointer_leave(&mut self, on_pointer_leave: PointerLeaveHandler) {

From 349c713079ff7d5967edcbcab986088285a89168 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@gmail.com>
Date: Sun, 19 Apr 2026 04:02:09 -0400
Subject: [PATCH 143/143] Fix clippy warnings

---
 examples/gallery/main.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/examples/gallery/main.rs b/examples/gallery/main.rs
index 58a42a68..805a7e07 100644
--- a/examples/gallery/main.rs
+++ b/examples/gallery/main.rs
@@ -1,10 +1,8 @@
-use std::cell::RefCell;
 use std::rc::Rc;
 
 use craft_retained::elements::{Container, Dropdown, Element, Image, Slider, SliderDirection, Text, TextInput, TinyVg, Window};
-use craft_retained::events::ui_events::pointer::PointerButton;
 use craft_retained::style::{AlignItems, BoxShadow, Display, FlexDirection, FlexWrap, FontStyle, FontWeight, JustifyContent, Overflow, Underline};
-use craft_retained::{Color, CraftOptions, craft_main, pct, px, rgb, rgba, auto, ResourceId};
+use craft_retained::{craft_main, pct, px, rgb, rgba, Color, CraftOptions, ResourceId};
 use util::setup_logging;
 
 pub fn title(str: &str) -> Text {
@@ -138,7 +136,7 @@ pub fn multiple_windows() -> Container {
         .border_width(border_width, border_width, border_width, border_width)
         ;
 
-    open_new_window_btn.clone().on_pointer_button_down(Rc::new(|e, pb| {
+    open_new_window_btn.clone().on_pointer_button_down(Rc::new(|_e, _pb| {
         Window::new("A new window!")
             .push(
                 Text::new("Hi!")
@@ -223,7 +221,7 @@ pub fn scrollable() -> Container {
                 .color(Color::WHITE)
                 .font_size(14.0)
                 .padding(px(3.0), px(5.0), px(3.0), px(5.0))
-                .on_pointer_button_down(Rc::new(move |e, pb| {
+                .on_pointer_button_down(Rc::new(move |_e, _pb| {
                     scrollable_container.clone().scroll_to_top();
                 }))
         )