diff --git a/src/Fabulous.Avalonia/ComponentViews/Collections/Carousel.fs b/src/Fabulous.Avalonia/ComponentViews/Collections/Carousel.fs
new file mode 100644
index 00000000..ca23362b
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Collections/Carousel.fs
@@ -0,0 +1,20 @@
+namespace Fabulous.Avalonia.Components
+
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentCarousel =
+    inherit IFabComponentSelectingItemsControl
+    inherit IFabCarousel
+
+[<AutoOpen>]
+module CarouselBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a Carousel widget.</summary>
+        /// <param name="items">The items to display.</param>
+        /// <param name="template">The template to use to render each item.</param>
+        static member Carousel<'msg, 'itemData, 'itemMarker when 'itemMarker :> IFabComponentControl>
+            (items: seq<'itemData>, template: 'itemData -> WidgetBuilder<'msg, 'itemMarker>)
+            =
+            WidgetHelpers.buildItems<'msg, IFabComponentCarousel, 'itemData, 'itemMarker> Carousel.WidgetKey ItemsControl.ItemsSourceTemplate items template
diff --git a/src/Fabulous.Avalonia/ComponentViews/Collections/ListBox.fs b/src/Fabulous.Avalonia/ComponentViews/Collections/ListBox.fs
new file mode 100644
index 00000000..f3f46644
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Collections/ListBox.fs
@@ -0,0 +1,24 @@
+namespace Fabulous.Avalonia.Components
+
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentListBox =
+    inherit IFabComponentSelectingItemsControl
+    inherit IFabListBox
+
+[<AutoOpen>]
+module ListBoxBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ListBox widget.</summary>
+        /// <param name="items">The items to display.</param>
+        /// <param name="template">The template to use to render each item.</param>
+        static member ListBox<'msg, 'itemData, 'itemMarker when 'itemMarker :> IFabControl>
+            (items: seq<'itemData>, template: 'itemData -> WidgetBuilder<'msg, 'itemMarker>)
+            =
+            WidgetHelpers.buildItems<'msg, IFabComponentListBox, 'itemData, 'itemMarker> ListBox.WidgetKey ItemsControl.ItemsSourceTemplate items template
+
+        /// <summary>Creates a ListBox widget.</summary>
+        static member ListBox() =
+            CollectionBuilder<'msg, IFabComponentListBox, IFabComponentListBoxItem>(ListBox.WidgetKey, ComponentItemsControl.Items)
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/Collections/TabControl.fs b/src/Fabulous.Avalonia/ComponentViews/Collections/TabControl.fs
new file mode 100644
index 00000000..3705e577
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Collections/TabControl.fs
@@ -0,0 +1,25 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Layout
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentTabControl =
+    inherit IFabComponentSelectingItemsControl
+    inherit IFabTabControl
+
+[<AutoOpen>]
+module ComponentTabControlBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a TabControl widget.</summary>
+        /// <param name="placement">The placement of the tab strip.</param>
+        static member TabControl(placement: Dock) =
+            CollectionBuilder<unit, IFabComponentTabControl, IFabComponentTabItem>(TabControl.WidgetKey, ComponentItemsControl.Items, TabControl.TabStripPlacement.WithValue(placement))
+
+        /// <summary>Creates a TabControl widget.</summary>
+        static member TabControl() =
+            CollectionBuilder<unit, IFabComponentTabControl, IFabComponentTabItem>(TabControl.WidgetKey, ComponentItemsControl.Items, TabControl.TabStripPlacement.WithValue(Dock.Top))
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/Collections/TreeView.fs b/src/Fabulous.Avalonia/ComponentViews/Collections/TreeView.fs
new file mode 100644
index 00000000..d9d689c3
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Collections/TreeView.fs
@@ -0,0 +1,50 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Collections
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentTreeView =
+    inherit IFabComponentItemsControl
+    inherit IFabTreeView
+
+type ComponentTreeWidgetItems =
+    { Nodes: IEnumerable
+      SubNodesFn: obj -> IEnumerable
+      Template: obj -> Widget }
+
+module ComponentTreeView =
+    let SelectionChanged =
+        ComponentAttributes.defineEvent "TreeView_SelectionChanged" (fun target -> (target :?> TreeView).SelectionChanged)
+
+[<AutoOpen>]
+module ComponentTreeViewBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a TreeView widget.</summary>
+        /// <param name="nodes">The root nodes used to populate the TreeView.</param>
+        /// <param name="subNodes">The sub nodes used to populate the children of each node.</param>
+        /// <param name="template">The template used to render each node.</param>
+        static member TreeView<'msg, 'itemData, 'itemMarker when 'itemMarker :> IFabComponentControl>
+            (nodes: seq<'itemData>, subNodes: 'itemData -> seq<'itemData>, template: 'itemData -> WidgetBuilder<unit, 'itemMarker>)
+            =
+            let template (item: obj) =
+                let item = unbox<'itemData> item
+                (template item).Compile()
+
+            let data: TreeWidgetItems =
+                { Nodes = nodes
+                  SubNodesFn = (fun subNode -> subNodes(unbox subNode) :> IEnumerable)
+                  Template = template }
+
+            WidgetBuilder<'msg, IFabComponentTreeView>(TreeView.WidgetKey, TreeView.ItemsSource.WithValue(data))
+
+type ComponentTreeViewModifiers =
+    /// <summary>Listens to the TreeView SelectionChanged event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the TreeView SelectionChanged event is fired.</param>
+    [<Extension>]
+    static member inline onSelectionChanged(this: WidgetBuilder<unit, #IFabComponentTreeView>, fn: SelectionChangedEventArgs -> unit) =
+        this.AddScalar(ComponentTreeView.SelectionChanged.WithValue(fn))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/AutoCompleteBox.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/AutoCompleteBox.fs
new file mode 100644
index 00000000..93a5ce05
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/AutoCompleteBox.fs
@@ -0,0 +1,237 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Runtime.CompilerServices
+open System.Threading
+open System.Threading.Tasks
+open Avalonia.Controls
+open Fabulous
+
+type IFabAutoCompleteBox =
+    inherit IFabTemplatedControl
+
+module AutoCompleteBox =
+    let WidgetKey = Widgets.register<AutoCompleteBox>()
+
+    let Watermark =
+        Attributes.defineAvaloniaPropertyWithEquality AutoCompleteBox.WatermarkProperty
+
+    let MinimumPrefixLength =
+        Attributes.defineAvaloniaPropertyWithEquality AutoCompleteBox.MinimumPrefixLengthProperty
+
+    let MinimumPopulateDelay =
+        Attributes.defineAvaloniaPropertyWithEquality AutoCompleteBox.MinimumPopulateDelayProperty
+
+    let MaxDropDownHeight =
+        Attributes.defineAvaloniaPropertyWithEquality AutoCompleteBox.MaxDropDownHeightProperty
+
+    let IsTextCompletionEnabled =
+        Attributes.defineAvaloniaPropertyWithEquality AutoCompleteBox.IsTextCompletionEnabledProperty
+
+    let FilterMode =
+        Attributes.defineAvaloniaPropertyWithEquality AutoCompleteBox.FilterModeProperty
+
+    let ItemFilter =
+        Attributes.defineAvaloniaPropertyWithEquality AutoCompleteBox.ItemFilterProperty
+
+    let TextFilter =
+        Attributes.defineAvaloniaPropertyWithEquality AutoCompleteBox.TextFilterProperty
+
+    let ItemSelector =
+        Attributes.defineAvaloniaPropertyWithEquality AutoCompleteBox.ItemSelectorProperty
+
+    let TextSelector =
+        Attributes.defineAvaloniaPropertyWithEquality AutoCompleteBox.TextSelectorProperty
+
+    let ItemsSource =
+        Attributes.defineAvaloniaPropertyWithEquality AutoCompleteBox.ItemsSourceProperty
+
+    let AsyncPopulator =
+        Attributes.defineAvaloniaPropertyWithEquality AutoCompleteBox.AsyncPopulatorProperty
+
+    let Text =
+        Attributes.defineAvaloniaPropertyWithChangedEvent' "AutoCompleteBox_TextChanged" AutoCompleteBox.TextProperty
+
+    let Populating =
+        Attributes.defineEvent<PopulatingEventArgs> "AutoCompleteBox_Populating" (fun target -> (target :?> AutoCompleteBox).Populating)
+
+    let Populated =
+        Attributes.defineEvent<PopulatedEventArgs> "AutoCompleteBox_Populated" (fun target -> (target :?> AutoCompleteBox).Populated)
+
+    let DropDownOpened =
+        Attributes.defineAvaloniaPropertyWithChangedEvent' "AutoCompleteBox_onDropDownOpened" AutoCompleteBox.IsDropDownOpenProperty
+
+    let SelectionChanged =
+        Attributes.defineEvent<SelectionChangedEventArgs> "AutoCompleteBox_SelectionChanged" (fun target -> (target :?> AutoCompleteBox).SelectionChanged)
+
+    /// Allows multi-binding the ValueMemberBinding on an AutoCompleteBox
+    let MultiValueBinding =
+        Attributes.defineSimpleScalar<string * string array>
+            "AutoCompleteBox_MultiValueBinding"
+            ScalarAttributeComparers.equalityCompare
+            (fun _ newValueOpt node ->
+                if newValueOpt.IsSome then
+                    let format, propertyNames = newValueOpt.Value
+                    let target = node.Target :?> AutoCompleteBox
+
+                    let rec bindAndCleanUp _ _ =
+                        target.multiBind<AutoCompleteBox>((fun (box: AutoCompleteBox) -> box.ValueMemberBinding), format, propertyNames)
+                        target.Loaded.RemoveHandler(bindAndCleanUp) // to clean up
+
+                    target.Loaded.AddHandler(bindAndCleanUp))
+
+    /// Allows setting the ItemTemplate on an AutoCompleteBox
+    let ItemTemplate =
+        Attributes.defineSimpleScalar<obj -> Widget> "AutoCompleteBox_ItemTemplate" ScalarAttributeComparers.physicalEqualityCompare (fun _ newValueOpt node ->
+            let autoComplete = node.Target :?> AutoCompleteBox
+
+            match newValueOpt with
+            | ValueNone -> autoComplete.ClearValue(AutoCompleteBox.ItemTemplateProperty)
+            | ValueSome template ->
+                autoComplete.SetValue(AutoCompleteBox.ItemTemplateProperty, WidgetDataTemplate(node, template))
+                |> ignore)
+
+[<AutoOpen>]
+module AutoCompleteBoxBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates an AutoCompleteBox widget.</summary>
+        /// <param name="items">The items to display.</param>
+        static member AutoCompleteBox(items: seq<_>) =
+            WidgetBuilder<'msg, IFabAutoCompleteBox>(AutoCompleteBox.WidgetKey, AutoCompleteBox.ItemsSource.WithValue(items))
+
+        /// <summary>Creates an AutoCompleteBox widget.</summary>
+        /// <param name="populator">The function to populate the items.</param>
+        static member AutoCompleteBox(populator: string -> CancellationToken -> Task<seq<_>>) =
+            WidgetBuilder<'msg, IFabAutoCompleteBox>(AutoCompleteBox.WidgetKey, AutoCompleteBox.AsyncPopulator.WithValue(populator))
+
+type AutoCompleteBoxModifiers =
+    /// <summary>Sets the MinimumPrefixLength property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The MinimumPrefixLength value.</param>
+    [<Extension>]
+    static member inline minimumPrefixLength(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, value: int) =
+        this.AddScalar(AutoCompleteBox.MinimumPrefixLength.WithValue(value))
+
+    /// <summary>Sets the MinimumPopulateDelay property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The MinimumPopulateDelay value.</param>
+    [<Extension>]
+    static member inline minimumPopulateDelay(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, value: TimeSpan) =
+        this.AddScalar(AutoCompleteBox.MinimumPopulateDelay.WithValue(value))
+
+    /// <summary>Sets the MaxDropDownHeight property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The MaxDropDownHeight value.</param>
+    [<Extension>]
+    static member inline maxDropDownHeight(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, value: float) =
+        this.AddScalar(AutoCompleteBox.MaxDropDownHeight.WithValue(value))
+
+    /// <summary>Sets the IsTextCompletionEnabled property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsTextCompletionEnabled value.</param>
+    [<Extension>]
+    static member inline isTextCompletionEnabled(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, value: bool) =
+        this.AddScalar(AutoCompleteBox.IsTextCompletionEnabled.WithValue(value))
+
+    /// <summary>Sets the Watermark property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Watermark value.</param>
+    [<Extension>]
+    static member inline watermark(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, value: string) =
+        this.AddScalar(AutoCompleteBox.Watermark.WithValue(value))
+
+    /// <summary>Sets the FilterMode property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The FilterMode value.</param>
+    [<Extension>]
+    static member inline filterMode(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, value: AutoCompleteFilterMode) =
+        this.AddScalar(AutoCompleteBox.FilterMode.WithValue(value))
+
+    /// <summary>Sets the ItemFilter property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">The ItemFilter value.</param>
+    [<Extension>]
+    static member inline itemFilter(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, fn: string -> obj -> bool) =
+        this.AddScalar(AutoCompleteBox.ItemFilter.WithValue(fn))
+
+    /// <summary>Sets the ItemTemplate property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="template">The template to render the items with.</param>
+    [<Extension>]
+    static member inline itemTemplate(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, template: 'item -> WidgetBuilder<'msg, #IFabControl>) =
+        this.AddScalar(AutoCompleteBox.ItemTemplate.WithValue(WidgetHelpers.compileTemplate template))
+
+    /// <summary>Sets the TextFilter property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The TextFilter value.</param>
+    [<Extension>]
+    static member inline textFilter(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, value: string -> string -> bool) =
+        this.AddScalar(AutoCompleteBox.TextFilter.WithValue(value))
+
+    /// <summary>Binds the AutoCompleteBox.TextProperty.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The value to bind.</param>
+    /// <param name="fn">A function mapping the updated text to a 'msg to raise on user change.</param>
+    [<Extension>]
+    static member inline onTextChanged(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, value: string, fn: string -> 'msg) =
+        this.AddScalar(AutoCompleteBox.Text.WithValue(ValueEventData.create value fn))
+
+    /// <summary>Sets the AutoCompleteBox.ItemSelector property to a custom method that combines the user-entered text
+    /// and the selected item to return the new text input value.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">A custom method receiving the entered text as the first
+    /// and the selected item as the second argument and returns the updated text of the input after selection.</param>
+    [<Extension>]
+    static member inline itemSelector(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, value: string -> obj -> string) =
+        this.AddScalar(AutoCompleteBox.ItemSelector.WithValue(value))
+
+    /// <summary>Sets the AutoCompleteBox.TextSelector property to a custom method that combines the user-entered text
+    /// and the selected item's text to return the new text input value.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">A custom method receiving the entered text as the first
+    /// and the text of the selected item as the second argument and returns the updated text of the input after selection.</param>
+    [<Extension>]
+    static member inline textSelector(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, value: string -> string -> string) =
+        this.AddScalar(AutoCompleteBox.TextSelector.WithValue(value))
+
+    [<Extension>]
+    static member inline onPopulating(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, fn: PopulatingEventArgs -> 'msg) =
+        this.AddScalar(AutoCompleteBox.Populating.WithValue(fn))
+
+    /// <summary>Listens to the AutoCompleteBox Populated event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the AutoCompleteBox Populated event is fired.</param>
+    [<Extension>]
+    static member inline onPopulated(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, fn: PopulatedEventArgs -> 'msg) =
+        this.AddScalar(AutoCompleteBox.Populated.WithValue(fn))
+
+    /// <summary>Listens to the AutoCompleteBox DropDownOpened event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="isOpen">The IsOpen value.</param>
+    /// <param name="fn">Raised when the AutoCompleteBox DropDownOpened event is fired.</param>
+    [<Extension>]
+    static member inline onDropDownOpened(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, isOpen: bool, fn: bool -> 'msg) =
+        this.AddScalar(AutoCompleteBox.DropDownOpened.WithValue(ValueEventData.create isOpen fn))
+
+    /// <summary>Listens to the AutoCompleteBox SelectionChanged event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the AutoCompleteBox SelectionChanged event is fired.</param>
+    [<Extension>]
+    static member inline onSelectionChanged(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, fn: SelectionChangedEventArgs -> 'msg) =
+        this.AddScalar(AutoCompleteBox.SelectionChanged.WithValue(fn))
+
+    /// <summary>Link a ViewRef to access the direct AutoCompleteBox control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabAutoCompleteBox>, value: ViewRef<AutoCompleteBox>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+    /// <Summary>Allows multi-binding the ValueMemberBinding on an AutoCompleteBox.</Summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="format">The format string to use.</param>
+    /// <param name="propertyNames">The property names to bind.</param>
+    [<Extension>]
+    static member inline multiBindValue(this: WidgetBuilder<'msg, #IFabAutoCompleteBox>, format: string, [<ParamArray>] propertyNames: string array) =
+        this.AddScalar(AutoCompleteBox.MultiValueBinding.WithValue((format, propertyNames)))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Border.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Border.fs
new file mode 100644
index 00000000..745c1cbe
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Border.fs
@@ -0,0 +1,26 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Controls
+open Avalonia.Media
+open Avalonia.Media.Immutable
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentBorder =
+    inherit IFabComponentDecorator
+    inherit IFabBorder
+
+[<AutoOpen>]
+module ComponentBorderBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a Border widget.</summary>
+        /// <param name="content">The content of the Border.</param>
+        static member Border(content: WidgetBuilder<unit, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentBorder>(
+                Border.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| Decorator.ChildWidget.WithValue(content.Compile()) |], ValueNone)
+            )
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/Button.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/Button.fs
new file mode 100644
index 00000000..ffadbf3f
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/Button.fs
@@ -0,0 +1,95 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Input
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabButton =
+    inherit IFabContentControl
+
+module Button =
+    let WidgetKey = Widgets.register<Button>()
+
+    let ClickMode =
+        Attributes.defineAvaloniaPropertyWithEquality Button.ClickModeProperty
+
+    let Clicked =
+        Attributes.defineEvent "Button_Clicked" (fun target -> (target :?> Button).Click)
+
+    let HotKey = Attributes.defineAvaloniaPropertyWithEquality Button.HotKeyProperty
+
+    let IsDefault =
+        Attributes.defineAvaloniaPropertyWithEquality Button.IsDefaultProperty
+
+    let IsCancel = Attributes.defineAvaloniaPropertyWithEquality Button.IsCancelProperty
+
+    let Flyout = Attributes.defineAvaloniaPropertyWidget Button.FlyoutProperty
+
+[<AutoOpen>]
+module ButtonBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Button widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="fn">Raised when the button is clicked.</param>
+        static member Button(text: string, fn: 'msg) =
+            WidgetBuilder<'msg, IFabButton>(Button.WidgetKey, ContentControl.ContentString.WithValue(text), Button.Clicked.WithValue(fun _ -> box fn))
+
+        /// <summary>Creates a Button widget.</summary>
+        /// <param name="fn">Raised when the button is clicked.</param>
+        /// <param name="content">The content to display.</param>
+        static member Button(fn: 'msg, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabButton>(
+                Button.WidgetKey,
+                AttributesBundle(
+                    StackList.one(Button.Clicked.WithValue(fun _ -> box fn)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+
+            )
+
+type ButtonModifiers =
+    /// <summary>Sets the ClickMode property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ClickMode value.</param>
+    [<Extension>]
+    static member inline clickMode(this: WidgetBuilder<'msg, #IFabButton>, value: ClickMode) =
+        this.AddScalar(Button.ClickMode.WithValue(value))
+
+    /// <summary>Sets the HotKey property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The HotKey value.</param>
+    [<Extension>]
+    static member inline hotKey(this: WidgetBuilder<'msg, #IFabButton>, value: KeyGesture) =
+        this.AddScalar(Button.HotKey.WithValue(value))
+
+    /// <summary>Sets the IsDefault property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsDefault value.</param>
+    [<Extension>]
+    static member inline isDefault(this: WidgetBuilder<'msg, #IFabButton>, value: bool) =
+        this.AddScalar(Button.IsDefault.WithValue(value))
+
+    /// <summary>Sets the IsCancel property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsCancel value.</param>
+    [<Extension>]
+    static member inline isCancel(this: WidgetBuilder<'msg, #IFabButton>, value: bool) =
+        this.AddScalar(Button.IsCancel.WithValue(value))
+
+    /// <summary>Sets the Flyout property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Flyout value.</param>
+    [<Extension>]
+    static member inline flyout(this: WidgetBuilder<'msg, #IFabButton>, value: WidgetBuilder<'msg, #IFabFlyoutBase>) =
+        this.AddWidget(Button.Flyout.WithValue(value.Compile()))
+
+    /// <summary>Link a ViewRef to access the direct Button control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabButton>, value: ViewRef<Button>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/ButtonSpinner.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/ButtonSpinner.fs
new file mode 100644
index 00000000..6fc45baa
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/ButtonSpinner.fs
@@ -0,0 +1,60 @@
+namespace Fabulous.Avalonia.Components
+
+open Avalonia.Controls
+open Fabulous
+open System.Runtime.CompilerServices
+
+type IFabButtonSpinner =
+    inherit IFabSpinner
+
+module ButtonSpinner =
+    let WidgetKey = Widgets.register<ButtonSpinner>()
+
+    let AllowSpin =
+        Attributes.defineAvaloniaPropertyWithEquality ButtonSpinner.AllowSpinProperty
+
+    let ButtonSpinnerLocation =
+        Attributes.defineAvaloniaPropertyWithEquality ButtonSpinner.ButtonSpinnerLocationProperty
+
+    let ShowButtonSpinner =
+        Attributes.defineAvaloniaPropertyWithEquality ButtonSpinner.ShowButtonSpinnerProperty
+
+[<AutoOpen>]
+module ButtonSpinnerBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a ButtonSpinner widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="fn">Raised when the ButtonSpinner is clicked.</param>
+        static member ButtonSpinner(text: string, fn: SpinEventArgs -> 'msg) =
+            WidgetBuilder<'msg, IFabButtonSpinner>(ButtonSpinner.WidgetKey, ContentControl.ContentString.WithValue(text), Spinner.Spin.WithValue(fn))
+
+type ButtonSpinnerModifiers =
+
+    /// <summary>Sets the AllowSpin property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The AllowSpin value.</param>
+    [<Extension>]
+    static member inline allowSpin(this: WidgetBuilder<'msg, #IFabButtonSpinner>, value: bool) =
+        this.AddScalar(ButtonSpinner.AllowSpin.WithValue(value))
+
+    /// <summary>Sets the ButtonSpinnerLocation property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ButtonSpinnerLocation value.</param>
+    [<Extension>]
+    static member inline buttonSpinnerLocation(this: WidgetBuilder<'msg, #IFabButtonSpinner>, value: Location) =
+        this.AddScalar(ButtonSpinner.ButtonSpinnerLocation.WithValue(value))
+
+    /// <summary>Sets the ShowButtonSpinner property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ShowButtonSpinner value.</param>
+    [<Extension>]
+    static member inline showButtonSpinner(this: WidgetBuilder<'msg, #IFabButtonSpinner>, value: bool) =
+        this.AddScalar(ButtonSpinner.ShowButtonSpinner.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct ButtonSpinner control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabButtonSpinner>, value: ViewRef<ButtonSpinner>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/DropDownButton.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/DropDownButton.fs
new file mode 100644
index 00000000..5795b7e5
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/DropDownButton.fs
@@ -0,0 +1,48 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.StackAllocatedCollections
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabDropDownButton =
+    inherit IFabButton
+
+module DropDownButton =
+    let WidgetKey = Widgets.register<DropDownButton>()
+
+[<AutoOpen>]
+module DropDownButtonBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a DropDownButton widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="msg">Raised when the DropDownButton is clicked.</param>
+        static member DropDownButton(text: string, msg: 'msg) =
+            WidgetBuilder<'msg, IFabDropDownButton>(
+                DropDownButton.WidgetKey,
+                ContentControl.ContentString.WithValue(text),
+                Button.Clicked.WithValue(fun _ -> box msg)
+            )
+
+        /// <summary>Creates a DropDownButton widget.</summary>
+        /// <param name="msg">Raised when the DropDownButton is clicked.</param>
+        /// <param name="content">The content of the DropDownButton.</param>
+        static member DropDownButton(msg: 'msg, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabDropDownButton>(
+                DropDownButton.WidgetKey,
+                AttributesBundle(
+                    StackList.one(Button.Clicked.WithValue(fun _ -> box msg)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+type DropDownButtonModifiers =
+    /// <summary>Link a ViewRef to access the direct DropDownButton control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabDropDownButton>, value: ViewRef<DropDownButton>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/HyperlinkButton.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/HyperlinkButton.fs
new file mode 100644
index 00000000..3952c987
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/HyperlinkButton.fs
@@ -0,0 +1,147 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabHyperlinkButton =
+    inherit IFabButton
+
+module HyperlinkButton =
+    let WidgetKey = Widgets.register<HyperlinkButton>()
+
+    let NavigateUri =
+        Attributes.defineAvaloniaPropertyWithEquality HyperlinkButton.NavigateUriProperty
+
+    let IsVisited =
+        Attributes.defineAvaloniaPropertyWithEquality HyperlinkButton.IsVisitedProperty
+
+    let IsVisitedChanged =
+        Attributes.defineAvaloniaPropertyWithChangedEvent' "HyperlinkButton_VisitedChanged" HyperlinkButton.IsVisitedProperty
+
+[<AutoOpen>]
+module HyperlinkButtonBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a HyperlinkButton widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="uri">The Uri to navigate to when the HyperlinkButton is clicked.</param>
+        static member HyperlinkButton(text: string, uri: Uri) =
+            WidgetBuilder<'msg, IFabHyperlinkButton>(
+                HyperlinkButton.WidgetKey,
+                ContentControl.ContentString.WithValue(text),
+                HyperlinkButton.NavigateUri.WithValue(uri)
+            )
+
+        /// <summary>Creates a HyperlinkButton widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="uri">The Uri to navigate to when the HyperlinkButton is clicked.</param>
+        /// <param name="isVisited">Whether the HyperlinkButton is visited.</param>
+        /// <param name="fn">Raised when the IsVisited value changes.</param>
+        static member HyperlinkButton(text: string, uri: Uri, isVisited: bool, fn: bool -> 'msg) =
+            WidgetBuilder<'msg, IFabHyperlinkButton>(
+                HyperlinkButton.WidgetKey,
+                ContentControl.ContentString.WithValue(text),
+                HyperlinkButton.NavigateUri.WithValue(uri),
+                HyperlinkButton.IsVisitedChanged.WithValue(ValueEventData.create isVisited fn)
+            )
+
+        /// <summary>Creates a HyperlinkButton widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="uri">The Uri to navigate to when the HyperlinkButton is clicked.</param>
+        static member HyperlinkButton(text: string, uri: string) =
+            WidgetBuilder<'msg, IFabHyperlinkButton>(
+                HyperlinkButton.WidgetKey,
+                ContentControl.ContentString.WithValue(text),
+                HyperlinkButton.NavigateUri.WithValue(Uri(uri))
+            )
+
+        /// <summary>Creates a HyperlinkButton widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="uri">The Uri to navigate to when the HyperlinkButton is clicked.</param>
+        /// <param name="isVisited">Whether the HyperlinkButton is visited.</param>
+        /// <param name="fn">Raised when the IsVisited value changes.</param>
+        static member HyperlinkButton(text: string, uri: string, isVisited: bool, fn: bool -> 'msg) =
+            WidgetBuilder<'msg, IFabHyperlinkButton>(
+                HyperlinkButton.WidgetKey,
+                ContentControl.ContentString.WithValue(text),
+                HyperlinkButton.NavigateUri.WithValue(Uri(uri)),
+                HyperlinkButton.IsVisitedChanged.WithValue(ValueEventData.create isVisited fn)
+            )
+
+        /// <summary>Creates a HyperlinkButton widget.</summary>
+        /// <param name="uri">The Uri to navigate to when the HyperlinkButton is clicked.</param>
+        /// <param name="content">The content of the HyperlinkButton.</param>
+        static member HyperlinkButton(uri: Uri, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabHyperlinkButton>(
+                HyperlinkButton.WidgetKey,
+                AttributesBundle(
+                    StackList.one(HyperlinkButton.NavigateUri.WithValue(uri)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a HyperlinkButton widget.</summary>
+        /// <param name="uri">The Uri to navigate to when the HyperlinkButton is clicked.</param>
+        /// <param name="content">The content of the HyperlinkButton.</param>
+        /// <param name="isVisited">Whether the HyperlinkButton is visited.</param>
+        /// <param name="fn">Raised when the IsVisited value changes.</param>
+        static member HyperlinkButton(uri: Uri, isVisited: bool, fn: bool -> 'msg, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabHyperlinkButton>(
+                HyperlinkButton.WidgetKey,
+                AttributesBundle(
+                    StackList.two(HyperlinkButton.NavigateUri.WithValue(uri), HyperlinkButton.IsVisitedChanged.WithValue(ValueEventData.create isVisited fn)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a HyperlinkButton widget.</summary>
+        /// <param name="uri">The Uri to navigate to when the HyperlinkButton is clicked.</param>
+        /// <param name="content">The content of the HyperlinkButton.</param>
+        static member HyperlinkButton(uri: string, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabHyperlinkButton>(
+                HyperlinkButton.WidgetKey,
+                AttributesBundle(
+                    StackList.one(HyperlinkButton.NavigateUri.WithValue(Uri(uri))),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        // <summary>Creates a HyperlinkButton widget.</summary>
+        /// <param name="uri">The Uri to navigate to when the HyperlinkButton is clicked.</param>
+        /// <param name="content">The content of the HyperlinkButton.</param>
+        /// <param name="isVisited">Whether the HyperlinkButton is visited.</param>
+        /// <param name="fn">Raised when the IsVisited value changes.</param>
+        static member HyperlinkButton(uri: string, isVisited: bool, fn: bool -> 'msg, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabHyperlinkButton>(
+                HyperlinkButton.WidgetKey,
+                AttributesBundle(
+                    StackList.two(
+                        HyperlinkButton.NavigateUri.WithValue(Uri(uri)),
+                        HyperlinkButton.IsVisitedChanged.WithValue(ValueEventData.create isVisited fn)
+                    ),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+type HyperlinkButtonModifiers =
+
+    /// <summary>Sets the IsVisited property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsVisited value.</param>
+    [<Extension>]
+    static member inline isVisited(this: WidgetBuilder<'msg, #IFabHyperlinkButton>, value: bool) =
+        this.AddScalar(HyperlinkButton.IsVisited.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct HyperlinkButton control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabHyperlinkButton>, value: ViewRef<HyperlinkButton>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/RadioButton.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/RadioButton.fs
new file mode 100644
index 00000000..5c06bfd1
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/RadioButton.fs
@@ -0,0 +1,90 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabRadioButton =
+    inherit IFabToggleButton
+
+module RadioButton =
+    let WidgetKey = Widgets.register<RadioButton>()
+
+    let GroupName =
+        Attributes.defineAvaloniaPropertyWithEquality RadioButton.GroupNameProperty
+
+[<AutoOpen>]
+module RadioButtonBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a RadioButton widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="isChecked">Whether the RadioButton is checked.</param>
+        /// <param name="fn">Raised when the RadioButton is clicked.</param>
+        static member RadioButton(text: string, isChecked: bool, fn: bool -> 'msg) =
+            WidgetBuilder<'msg, IFabRadioButton>(
+                RadioButton.WidgetKey,
+                ContentControl.ContentString.WithValue(text),
+                ToggleButton.CheckedChanged.WithValue(ValueEventData.create isChecked fn)
+            )
+
+        /// <summary>Creates a ThreeStateRadioButton widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="isChecked">Whether the ThreeStateRadioButton is checked.</param>
+        /// <param name="fn">Raised when the ThreeStateRadioButton is clicked.</param>
+        static member ThreeStateRadioButton(text: string, isChecked: bool option, fn: bool option -> 'msg) =
+            WidgetBuilder<'msg, IFabRadioButton>(
+                RadioButton.WidgetKey,
+                ToggleButton.IsThreeState.WithValue(true),
+                ContentControl.ContentString.WithValue(text),
+                ToggleButton.ThreeStateCheckedChanged.WithValue(ValueEventData.createVOption (ThreeState.fromOption(isChecked)) (ThreeState.toOption >> fn))
+            )
+
+        /// <summary>Creates a RadioButton widget.</summary>
+        /// <param name="isChecked">Whether the RadioButton is checked.</param>
+        /// <param name="fn">Raised when the RadioButton is clicked.</param>
+        /// <param name="content">The content of the RadioButton.</param>
+        static member RadioButton(isChecked: bool, fn: bool -> 'msg, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabRadioButton>(
+                RadioButton.WidgetKey,
+                AttributesBundle(
+                    StackList.one(ToggleButton.CheckedChanged.WithValue(ValueEventData.create isChecked fn)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a ThreeStateRadioButton widget.</summary>
+        /// <param name="isChecked">Whether the ThreeStateRadioButton is checked.</param>
+        /// <param name="fn">Raised when the ThreeStateRadioButton is clicked.</param>
+        /// <param name="content">The content of the ThreeStateRadioButton.</param>
+        static member ThreeStateRadioButton(isChecked: bool option, fn: bool option -> 'msg, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabRadioButton>(
+                RadioButton.WidgetKey,
+                AttributesBundle(
+                    StackList.two(
+                        ToggleButton.ThreeStateCheckedChanged.WithValue(
+                            ValueEventData.createVOption (ThreeState.fromOption(isChecked)) (ThreeState.toOption >> fn)
+                        ),
+                        ToggleButton.IsThreeState.WithValue(true)
+                    ),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+type RadioButtonAttachedModifiers =
+    /// <summary>Sets the GroupName property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The GroupName value.</param>
+    [<Extension>]
+    static member inline groupName(this: WidgetBuilder<'msg, #IFabControl>, value: string) =
+        this.AddScalar(RadioButton.GroupName.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct RadioButton control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabRadioButton>, value: ViewRef<RadioButton>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/RepeatButton.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/RepeatButton.fs
new file mode 100644
index 00000000..581c0a4f
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/RepeatButton.fs
@@ -0,0 +1,66 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabRepeatButton =
+    inherit IFabButton
+
+module RepeatButton =
+    let WidgetKey = Widgets.register<RepeatButton>()
+
+    let Delay = Attributes.defineAvaloniaPropertyWithEquality RepeatButton.DelayProperty
+
+    let Interval =
+        Attributes.defineAvaloniaPropertyWithEquality RepeatButton.IntervalProperty
+
+[<AutoOpen>]
+module RepeatButtonBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a RepeatButton widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="msg">Raised when the button is clicked.</param>
+        static member RepeatButton(text: string, msg: 'msg) =
+            WidgetBuilder<'msg, IFabRepeatButton>(
+                RepeatButton.WidgetKey,
+                ContentControl.ContentString.WithValue(text),
+                Button.Clicked.WithValue(fun _ -> box msg)
+            )
+
+        /// <summary>Creates a RepeatButton widget.</summary>
+        /// <param name="content">The content to display.</param>
+        /// M<param name="fn">Raised when the button is clicked.</param>
+        static member RepeatButton(fn: 'msg, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabRepeatButton>(
+                RepeatButton.WidgetKey,
+                AttributesBundle(
+                    StackList.one(Button.Clicked.WithValue(fun _ -> box fn)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+type RepeatButtonModifiers =
+    /// <summary>Sets the Delay property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Delay value.</param>
+    [<Extension>]
+    static member inline delay(this: WidgetBuilder<'msg, #IFabRepeatButton>, value: int) =
+        this.AddScalar(RepeatButton.Delay.WithValue(value))
+
+    /// <summary>Sets the Interval property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Interval value.</param>
+    [<Extension>]
+    static member inline interval(this: WidgetBuilder<'msg, #IFabRepeatButton>, value: int) =
+        this.AddScalar(RepeatButton.Interval.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct RepeatButton control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabRepeatButton>, value: ViewRef<RepeatButton>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/SplitButton.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/SplitButton.fs
new file mode 100644
index 00000000..509bc7d6
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/SplitButton.fs
@@ -0,0 +1,59 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabSplitButton =
+    inherit IFabContentControl
+
+module SplitButton =
+    let WidgetKey = Widgets.register<SplitButton>()
+
+    let Clicked =
+        Attributes.defineEvent "SplitButton_Clicked" (fun target -> (target :?> SplitButton).Click)
+
+    let Flyout = Attributes.defineAvaloniaPropertyWidget SplitButton.FlyoutProperty
+
+[<AutoOpen>]
+module SplitButtonBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a SplitButton widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="fn">Raised when the SplitButton is clicked.</param>
+        static member SplitButton(text: string, fn: 'msg) =
+            WidgetBuilder<'msg, IFabSplitButton>(
+                SplitButton.WidgetKey,
+                ContentControl.ContentString.WithValue(text),
+                SplitButton.Clicked.WithValue(fun _ -> box fn)
+            )
+
+        /// <summary>Creates a SplitButton widget.</summary>
+        /// <param name="fn">Raised when the SplitButton is clicked.</param>
+        /// <param name="content">The content to display in the flyout.</param>
+        static member SplitButton(fn: 'msg, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabSplitButton>(
+                SplitButton.WidgetKey,
+                AttributesBundle(
+                    StackList.one(SplitButton.Clicked.WithValue(fun _ -> box fn)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+type SplitButtonModifiers =
+    /// <summary>Sets the Flyout property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Flyout value.</param>
+    [<Extension>]
+    static member inline flyout(this: WidgetBuilder<'msg, #IFabSplitButton>, value: WidgetBuilder<'msg, #IFabFlyoutBase>) =
+        this.AddWidget(SplitButton.Flyout.WithValue(value.Compile()))
+
+    /// <summary>Link a ViewRef to access the direct SplitButton control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabSplitButton>, value: ViewRef<SplitButton>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/ToggleButton.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/ToggleButton.fs
new file mode 100644
index 00000000..01af21cb
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/ToggleButton.fs
@@ -0,0 +1,105 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Primitives
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabToggleButton =
+    inherit IFabButton
+
+module ThreeState =
+    let inline fromOption (value: bool option) =
+        match value with
+        | Some true -> ValueSome(Nullable(true))
+        | Some false -> ValueSome(Nullable(false))
+        | None -> ValueNone
+
+    let inline fromOption' (value: bool option) =
+        match value with
+        | Some true -> Nullable(true)
+        | Some false -> Nullable(false)
+        | None -> Nullable()
+
+    let inline toOption (value: Nullable<bool>) = Option.ofNullable value
+
+module ToggleButton =
+    let WidgetKey = Widgets.register<ToggleButton>()
+
+    let CheckedChanged =
+        Attributes.defineAvaloniaPropertyWithChangedEvent "ToggleButton_IsCheckedChanged" ToggleButton.IsCheckedProperty Nullable Nullable.op_Explicit
+
+    let IsThreeState =
+        Attributes.defineAvaloniaPropertyWithEquality ToggleButton.IsThreeStateProperty
+
+    let ThreeStateCheckedChanged =
+        Attributes.defineAvaloniaPropertyWithChangedEvent' "ToggleButton_CheckedChanged" ToggleButton.IsCheckedProperty
+
+[<AutoOpen>]
+module ToggleButtonBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a ToggleButton widget.</summary>
+        /// <param name="text">The text of the ToggleButton.</param>
+        /// <param name="isChecked">Whether the ToggleButton is checked.</param>
+        /// <param name="fn">Raised when the ToggleButton is clicked.</param>
+        static member ToggleButton(text: string, isChecked: bool, fn: bool -> 'msg) =
+            WidgetBuilder<'msg, IFabToggleButton>(
+                ToggleButton.WidgetKey,
+                ContentControl.ContentString.WithValue(text),
+                ToggleButton.CheckedChanged.WithValue(ValueEventData.create isChecked fn)
+            )
+
+        /// <summary>Creates a ThreeStateToggleButton widget.</summary>
+        /// <param name="text">The text of the ThreeStateToggleButton.</param>
+        /// <param name="isChecked">Whether the ThreeStateToggleButton is checked.</param>
+        /// <param name="fn">Raised when the ThreeStateToggleButton is clicked.</param>
+        static member ThreeStateToggleButton(text: string, isChecked: bool option, fn: bool option -> 'msg) =
+            WidgetBuilder<'msg, IFabToggleButton>(
+                ToggleButton.WidgetKey,
+                ContentControl.ContentString.WithValue(text),
+                ToggleButton.IsThreeState.WithValue(true),
+                ToggleButton.ThreeStateCheckedChanged.WithValue(ValueEventData.createVOption (ThreeState.fromOption(isChecked)) (ThreeState.toOption >> fn))
+            )
+
+        /// <summary>Creates a ToggleButton widget.</summary>
+        /// <param name="isChecked">Whether the ToggleButton is checked.</param>
+        /// <param name="fn">Raised when the ToggleButton is clicked.</param>
+        /// <param name="content">The content of the ToggleButton.</param>
+        static member ToggleButton(isChecked: bool, fn: bool -> 'msg, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabToggleButton>(
+                ToggleButton.WidgetKey,
+                AttributesBundle(
+                    StackList.one(ToggleButton.CheckedChanged.WithValue(ValueEventData.create isChecked fn)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a ThreeStateToggleButton widget.</summary>
+        /// <param name="isChecked">Whether the ThreeStateToggleButton is checked.</param>
+        /// <param name="fn">Raised when the ThreeStateToggleButton is clicked.</param>
+        /// <param name="content">The content of the ThreeStateToggleButton.</param>
+        static member ThreeStateToggleButton(isChecked: bool option, fn: bool option -> 'msg, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabToggleButton>(
+                ToggleButton.WidgetKey,
+                AttributesBundle(
+                    StackList.two(
+                        ToggleButton.ThreeStateCheckedChanged.WithValue(
+                            ValueEventData.createVOption (ThreeState.fromOption(isChecked)) (ThreeState.toOption >> fn)
+                        ),
+                        ToggleButton.IsThreeState.WithValue(true)
+                    ),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+type ToggleButtonModifiers =
+    /// <summary>Link a ViewRef to access the direct ToggleButton control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabToggleButton>, value: ViewRef<ToggleButton>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/ToggleSplitButton.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/ToggleSplitButton.fs
new file mode 100644
index 00000000..d216016f
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Buttons/ToggleSplitButton.fs
@@ -0,0 +1,52 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabToggleSplitButton =
+    inherit IFabSplitButton
+
+module ToggleSplitButton =
+    let WidgetKey = Widgets.register<ToggleSplitButton>()
+
+    let CheckedChanged =
+        Attributes.defineAvaloniaPropertyWithChangedEvent' "ToggleSplitButton_CheckedChanged" ToggleSplitButton.IsCheckedProperty
+
+[<AutoOpen>]
+module ToggleSplitButtonBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a ToggleSplitButton widget.</summary>
+        /// <param name="text">The text of the ToggleSplitButton.</param>
+        /// <param name="isChecked">Whether the ToggleSplitButton is checked.</param>
+        /// <param name="fn">Raised when the ToggleSplitButton is checked or unchecked.</param>
+        static member ToggleSplitButton(text: string, isChecked: bool, fn: bool -> 'msg) =
+            WidgetBuilder<'msg, IFabToggleSplitButton>(
+                ToggleSplitButton.WidgetKey,
+                ContentControl.ContentString.WithValue(text),
+                ToggleSplitButton.CheckedChanged.WithValue(ValueEventData.create isChecked fn)
+            )
+
+        /// <summary>Creates a ToggleSplitButton widget.</summary>
+        /// <param name="isChecked">Whether the ToggleSplitButton is checked.</param>
+        /// <param name="fn">Raised when the ToggleSplitButton is checked or unchecked.</param>
+        /// <param name="content">The content of the ToggleSplitButton.</param>
+        static member ToggleSplitButton(isChecked: bool, fn: bool -> 'msg, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabToggleSplitButton>(
+                ToggleSplitButton.WidgetKey,
+                AttributesBundle(
+                    StackList.one(ToggleSplitButton.CheckedChanged.WithValue(ValueEventData.create isChecked fn)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+type ToggleSplitButtonModifiers =
+    /// <summary>Link a ViewRef to access the direct ToggleSplitButton control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabToggleSplitButton>, value: ViewRef<ToggleSplitButton>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Calendar.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Calendar.fs
new file mode 100644
index 00000000..7097cf23
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Calendar.fs
@@ -0,0 +1,168 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Media
+open Avalonia.Media.Immutable
+open Fabulous
+
+type IFabCalendar =
+    inherit IFabTemplatedControl
+
+module Calendar =
+    let WidgetKey = Widgets.register<Calendar>()
+
+    let FirstDayOfWeek =
+        Attributes.defineAvaloniaPropertyWithEquality Calendar.FirstDayOfWeekProperty
+
+    let IsTodayHighlighted =
+        Attributes.defineAvaloniaPropertyWithEquality Calendar.IsTodayHighlightedProperty
+
+    let HeaderBackgroundWidget =
+        Attributes.defineAvaloniaPropertyWidget Calendar.HeaderBackgroundProperty
+
+    let HeaderBackground =
+        Attributes.defineAvaloniaPropertyWithEquality Calendar.HeaderBackgroundProperty
+
+    let DisplayMode =
+        Attributes.defineAvaloniaPropertyWithEquality Calendar.DisplayModeProperty
+
+    let SelectionMode =
+        Attributes.defineAvaloniaPropertyWithEquality Calendar.SelectionModeProperty
+
+    let SelectedDateChanged =
+        Attributes.defineAvaloniaPropertyWithChangedEvent "Calendar_SelectedDateChanged" Calendar.SelectedDateProperty Option.toNullable Option.ofNullable
+
+    let DisplayDate =
+        Attributes.defineAvaloniaPropertyWithEquality Calendar.DisplayDateProperty
+
+    let DisplayDateStart =
+        Attributes.defineAvaloniaPropertyWithEquality Calendar.DisplayDateStartProperty
+
+    let DisplayDateEnd =
+        Attributes.defineAvaloniaPropertyWithEquality Calendar.DisplayDateEndProperty
+
+    let DisplayDateChanged =
+        Attributes.defineEvent "Calendar_DisplayDateChanged" (fun target -> (target :?> Calendar).DisplayDateChanged)
+
+    let DisplayModeChanged =
+        Attributes.defineEvent "Calendar_DisplayModeChanged" (fun target -> (target :?> Calendar).DisplayModeChanged)
+
+[<AutoOpen>]
+module CalendarBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Calendar widget.</summary>
+        /// <param name="date">The date to display.</param>
+        /// <param name="fn">Raised when the date changes.</param>
+        static member Calendar(date: DateTime option, fn: DateTime option -> 'msg) =
+            WidgetBuilder<'msg, IFabCalendar>(
+                Calendar.WidgetKey,
+                Calendar.SelectionMode.WithValue(CalendarSelectionMode.SingleDate),
+                Calendar.SelectedDateChanged.WithValue(ValueEventData.create date fn)
+            )
+
+        /// <summary>Creates a Calendar widget.</summary>
+        /// <param name="date">The date to display.</param>
+        /// <param name="fn">Raised when the date changes.</param>
+        /// <param name="mode">The selection mode.</param>
+        static member Calendar(date: DateTime option, fn: DateTime option -> 'msg, mode: CalendarSelectionMode) =
+            WidgetBuilder<'msg, IFabCalendar>(
+                Calendar.WidgetKey,
+                Calendar.SelectionMode.WithValue(mode),
+                Calendar.SelectedDateChanged.WithValue(ValueEventData.create date fn)
+            )
+
+type CalendarModifiers =
+    /// <summary>Sets the FirstDayOfWeek property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The FirstDayOfWeek value.</param>
+    [<Extension>]
+    static member inline firstDayOfWeek(this: WidgetBuilder<'msg, #IFabCalendar>, value: DayOfWeek) =
+        this.AddScalar(Calendar.FirstDayOfWeek.WithValue(value))
+
+    /// <summary>Sets the IsTodayHighlighted property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsTodayHighlighted value.</param>
+    [<Extension>]
+    static member inline isTodayHighlighted(this: WidgetBuilder<'msg, #IFabCalendar>, value: bool) =
+        this.AddScalar(Calendar.IsTodayHighlighted.WithValue(value))
+
+    /// <summary>Sets the HeaderBackground property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The HeaderBackground value.</param>
+    [<Extension>]
+    static member inline headerBackground(this: WidgetBuilder<'msg, #IFabCalendar>, value: WidgetBuilder<'msg, #IFabBrush>) =
+        this.AddWidget(Calendar.HeaderBackgroundWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the HeaderBackground property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The HeaderBackground value.</param>
+    [<Extension>]
+    static member inline headerBackground(this: WidgetBuilder<'msg, #IFabCalendar>, value: IBrush) =
+        this.AddScalar(Calendar.HeaderBackground.WithValue(value))
+
+    /// <summary>Sets the DisplayMode property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The DisplayMode value.</param>
+    [<Extension>]
+    static member inline displayMode(this: WidgetBuilder<'msg, #IFabCalendar>, value: CalendarMode) =
+        this.AddScalar(Calendar.DisplayMode.WithValue(value))
+
+    /// <summary>Sets the DisplayDate property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The DisplayDate value.</param>
+    [<Extension>]
+    static member inline displayDate(this: WidgetBuilder<'msg, #IFabCalendar>, value: DateTime) =
+        this.AddScalar(Calendar.DisplayDate.WithValue(value))
+
+    /// <summary>Sets the DisplayDateStart property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The DisplayDateStart value.</param>
+    [<Extension>]
+    static member inline displayDateStart(this: WidgetBuilder<'msg, #IFabCalendar>, value: DateTime) =
+        this.AddScalar(Calendar.DisplayDateStart.WithValue(value))
+
+    /// <summary>Sets the DisplayDateEnd property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The DisplayDateEnd value.</param>
+    [<Extension>]
+    static member inline displayDateEnd(this: WidgetBuilder<'msg, #IFabCalendar>, value: DateTime) =
+        this.AddScalar(Calendar.DisplayDateEnd.WithValue(value))
+
+    /// <summary>Listens to the Calendar DisplayDateChanged event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the DisplayDateChanged event is fired.</param>
+    [<Extension>]
+    static member inline onDisplayDateChanged(this: WidgetBuilder<'msg, #IFabCalendar>, fn: CalendarDateChangedEventArgs -> 'msg) =
+        this.AddScalar(Calendar.DisplayDateChanged.WithValue(fn))
+
+    /// <summary>Listens to the Calendar DisplayModeChanged event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the DisplayModeChanged event is fired.</param>
+    [<Extension>]
+    static member inline onDisplayModeChanged(this: WidgetBuilder<'msg, #IFabCalendar>, fn: CalendarModeChangedEventArgs -> 'msg) =
+        this.AddScalar(Calendar.DisplayModeChanged.WithValue(fn))
+
+    /// <summary>Link a ViewRef to access the direct Calendar control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabCalendar>, value: ViewRef<Calendar>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type CalendarExtraModifiers =
+    /// <summary>Sets the HeaderBackground property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The HeaderBackground value.</param>
+    [<Extension>]
+    static member inline headerBackground(this: WidgetBuilder<'msg, #IFabCalendar>, value: Color) =
+        CalendarModifiers.headerBackground(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the HeaderBackground property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The HeaderBackground value.</param>
+    [<Extension>]
+    static member inline headerBackground(this: WidgetBuilder<'msg, #IFabCalendar>, value: string) =
+        CalendarModifiers.headerBackground(this, View.SolidColorBrush(value))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/CalendarDatePicker.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/CalendarDatePicker.fs
new file mode 100644
index 00000000..8d8c54a3
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/CalendarDatePicker.fs
@@ -0,0 +1,201 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Layout
+open Fabulous
+
+type IFabCalendarDatePicker =
+    inherit IFabTemplatedControl
+
+module CalendarDatePicker =
+    let WidgetKey = Widgets.register<CalendarDatePicker>()
+
+    let DisplayDate =
+        Attributes.defineAvaloniaPropertyWithEquality CalendarDatePicker.DisplayDateProperty
+
+    let DisplayDateStart =
+        Attributes.defineAvaloniaPropertyWithEqualityConverter CalendarDatePicker.DisplayDateStartProperty Option.toNullable
+
+    let DisplayDateEnd =
+        Attributes.defineAvaloniaPropertyWithEqualityConverter CalendarDatePicker.DisplayDateEndProperty Option.toNullable
+
+    let FirstDayOfWeek =
+        Attributes.defineAvaloniaPropertyWithEquality CalendarDatePicker.FirstDayOfWeekProperty
+
+    let IsDropDownOpen =
+        Attributes.defineAvaloniaPropertyWithEquality CalendarDatePicker.IsDropDownOpenProperty
+
+    let IsTodayHighlighted =
+        Attributes.defineAvaloniaPropertyWithEquality CalendarDatePicker.IsTodayHighlightedProperty
+
+    let SelectedDateChanged =
+        Attributes.defineAvaloniaPropertyWithChangedEvent
+            "CalendarDatePicker_SelectedDateChanged"
+            CalendarDatePicker.SelectedDateProperty
+            Option.toNullable
+            Option.ofNullable
+
+    let SelectedDateFormat =
+        Attributes.defineAvaloniaPropertyWithEquality CalendarDatePicker.SelectedDateFormatProperty
+
+    let CustomDateFormatString =
+        Attributes.defineAvaloniaPropertyWithEquality CalendarDatePicker.CustomDateFormatStringProperty
+
+    let Text =
+        Attributes.defineAvaloniaPropertyWithEquality CalendarDatePicker.TextProperty
+
+    let Watermark =
+        Attributes.defineAvaloniaPropertyWithEquality CalendarDatePicker.WatermarkProperty
+
+    let UseFloatingWatermark =
+        Attributes.defineAvaloniaPropertyWithEquality CalendarDatePicker.UseFloatingWatermarkProperty
+
+    let HorizontalContentAlignment =
+        Attributes.defineAvaloniaPropertyWithEquality CalendarDatePicker.HorizontalContentAlignmentProperty
+
+    let VerticalContentAlignment =
+        Attributes.defineAvaloniaPropertyWithEquality CalendarDatePicker.VerticalContentAlignmentProperty
+
+    let DateValidationError =
+        Attributes.defineEvent "CalendarDatePicker_DateValidationError" (fun target -> (target :?> CalendarDatePicker).DateValidationError)
+
+    let CalendarClosed =
+        Attributes.defineEventNoArg "CalendarDatePicker_CalendarClosed" (fun target -> (target :?> CalendarDatePicker).CalendarClosed)
+
+    let CalendarOpened =
+        Attributes.defineEventNoArg "CalendarDatePicker_CalendarOpened" (fun target -> (target :?> CalendarDatePicker).CalendarOpened)
+
+[<AutoOpen>]
+module CalendarDatePickerBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a CalendarDatePicker widget.</summary>
+        /// <param name="date">The selected date.</param>
+        /// <param name="fn">Raised when the selected date changes.</param>
+        static member CalendarDatePicker(date: DateTime option, fn: DateTime option -> 'msg) =
+            WidgetBuilder<'msg, IFabCalendarDatePicker>(
+                CalendarDatePicker.WidgetKey,
+                CalendarDatePicker.SelectedDateChanged.WithValue(ValueEventData.create date fn)
+            )
+
+type CalendarDatePickerModifiers =
+    /// <summary>Sets the DisplayDate property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The DisplayDate value.</param>
+    [<Extension>]
+    static member inline displayDate(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, value: DateTime) =
+        this.AddScalar(CalendarDatePicker.DisplayDate.WithValue(value))
+
+    /// <summary>Sets the DisplayDateStart property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The DisplayDateStart value.</param>
+    [<Extension>]
+    static member inline displayDateStart(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, value: DateTime option) =
+        this.AddScalar(CalendarDatePicker.DisplayDateStart.WithValue(value))
+
+    /// <summary>Sets the DisplayDateEnd property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The DisplayDateEnd value.</param>
+    [<Extension>]
+    static member inline displayDateEnd(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, value: DateTime option) =
+        this.AddScalar(CalendarDatePicker.DisplayDateEnd.WithValue(value))
+
+    /// <summary>Sets the FirstDayOfWeek property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The FirstDayOfWeek value.</param>
+    [<Extension>]
+    static member inline firstDayOfWeek(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, value: DayOfWeek) =
+        this.AddScalar(CalendarDatePicker.FirstDayOfWeek.WithValue(value))
+
+    /// <summary>Sets the IsDropDownOpen property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsDropDownOpen value.</param>
+    [<Extension>]
+    static member inline isDropDownOpen(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, value: bool) =
+        this.AddScalar(CalendarDatePicker.IsDropDownOpen.WithValue(value))
+
+    /// <summary>Sets the IsTodayHighlighted property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsTodayHighlighted value.</param>
+    [<Extension>]
+    static member inline isTodayHighlighted(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, value: bool) =
+        this.AddScalar(CalendarDatePicker.IsTodayHighlighted.WithValue(value))
+
+    /// <summary>Sets the SelectedDateFormat property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectedDateFormat value.</param>
+    [<Extension>]
+    static member inline selectedDateFormat(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, value: CalendarDatePickerFormat) =
+        this.AddScalar(CalendarDatePicker.SelectedDateFormat.WithValue(value))
+
+    /// <summary>Sets the CustomDateFormatString property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The CustomDateFormatString value.</param>
+    [<Extension>]
+    static member inline customDateFormatString(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, value: string) =
+        this.AddScalar(CalendarDatePicker.CustomDateFormatString.WithValue(value))
+
+    /// <summary>Sets the Text property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Text value.</param>
+    [<Extension>]
+    static member inline text(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, value: string) =
+        this.AddScalar(CalendarDatePicker.Text.WithValue(value))
+
+    /// <summary>Sets the Watermark property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Watermark value.</param>
+    [<Extension>]
+    static member inline watermark(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, value: string) =
+        this.AddScalar(CalendarDatePicker.Watermark.WithValue(value))
+
+    /// <summary>Sets the UseFloatingWatermark property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The UseFloatingWatermark value.</param>
+    [<Extension>]
+    static member inline useFloatingWatermark(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, value: bool) =
+        this.AddScalar(CalendarDatePicker.UseFloatingWatermark.WithValue(value))
+
+    /// <summary>Sets the HorizontalContentAlignment property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The HorizontalContentAlignment value.</param>
+    [<Extension>]
+    static member inline horizontalContentAlignment(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, value: HorizontalAlignment) =
+        this.AddScalar(CalendarDatePicker.HorizontalContentAlignment.WithValue(value))
+
+    /// <summary>Sets the VerticalContentAlignment property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The VerticalContentAlignment value.</param>
+    [<Extension>]
+    static member inline verticalContentAlignment(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, value: VerticalAlignment) =
+        this.AddScalar(CalendarDatePicker.VerticalContentAlignment.WithValue(value))
+
+    /// <summary>Listens to the CalendarDatePicker DateValidationError event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the DatePicker detects a format error.</param>
+    [<Extension>]
+    static member inline onDateValidationError(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, fn: CalendarDatePickerDateValidationErrorEventArgs -> 'msg) =
+        this.AddScalar(CalendarDatePicker.DateValidationError.WithValue(fn))
+
+    /// <summary>Listens to the CalendarDatePicker CalendarClosed event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="msg">Raised when the DatePicker closes its calendar.</param>
+    [<Extension>]
+    static member inline onCalendarClosed(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, msg: 'msg) =
+        this.AddScalar(CalendarDatePicker.CalendarClosed.WithValue(MsgValue msg))
+
+    /// <summary>Listens to the CalendarDatePicker CalendarOpened event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="msg">Raised when the DatePicker opens its calendar.</param>
+    [<Extension>]
+    static member inline onCalendarOpened(this: WidgetBuilder<'msg, #IFabCalendarDatePicker>, msg: 'msg) =
+        this.AddScalar(CalendarDatePicker.CalendarOpened.WithValue(MsgValue msg))
+
+    /// <summary>Link a ViewRef to access the direct CalendarDatePicker control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabCalendarDatePicker>, value: ViewRef<CalendarDatePicker>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/CheckBox.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/CheckBox.fs
new file mode 100644
index 00000000..129c37c0
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/CheckBox.fs
@@ -0,0 +1,98 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.StackAllocatedCollections
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabCheckBox =
+    inherit IFabToggleButton
+
+module CheckBox =
+    let WidgetKey = Widgets.register<CheckBox>()
+
+[<AutoOpen>]
+module CheckBoxBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a CheckBox widget.</summary>
+        /// <param name="isChecked">Whether the CheckBox is checked.</param>
+        /// <param name="fn">Raised when the CheckBox is clicked.</param>
+        static member CheckBox(isChecked: bool, fn: bool -> 'msg) =
+            WidgetBuilder<'msg, IFabCheckBox>(CheckBox.WidgetKey, ToggleButton.CheckedChanged.WithValue(ValueEventData.create isChecked fn))
+
+        /// <summary>Creates a CheckBox widget.</summary>
+        /// <param name="text">The CheckBox text.</param>
+        /// <param name="isChecked">Whether the CheckBox is checked.</param>
+        /// <param name="fn">Raised when the CheckBox is clicked.</param>
+        static member CheckBox(text: string, isChecked: bool, fn: bool -> 'msg) =
+            WidgetBuilder<'msg, IFabCheckBox>(
+                CheckBox.WidgetKey,
+                ContentControl.ContentString.WithValue(text),
+                ToggleButton.CheckedChanged.WithValue(ValueEventData.create isChecked fn)
+            )
+
+        /// <summary>Creates a CheckBox widget</summary>
+        /// <param name="isChecked">Whether the CheckBox is checked.</param>
+        /// <param name="fn">Raised when the CheckBox is clicked.</param>
+        /// <param name="content">The CheckBox content.</param>
+        static member CheckBox(isChecked: bool, fn: bool -> 'msg, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabCheckBox>(
+                CheckBox.WidgetKey,
+                AttributesBundle(
+                    StackList.one(ToggleButton.CheckedChanged.WithValue(ValueEventData.create isChecked fn)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a ThreeStateCheckBox widget.</summary>
+        /// <param name="isChecked">Whether the ThreeStateCheckBox is checked.</param>
+        /// <param name="fn">Raised when the ThreeStateCheckBox is clicked.</param>
+        static member inline ThreeStateCheckBox(isChecked: bool option, fn: bool option -> 'msg) =
+            WidgetBuilder<'msg, IFabCheckBox>(
+                CheckBox.WidgetKey,
+                ToggleButton.IsThreeState.WithValue(true),
+                ToggleButton.ThreeStateCheckedChanged.WithValue(ValueEventData.createVOption (ThreeState.fromOption(isChecked)) (ThreeState.toOption >> fn))
+            )
+
+        /// <summary>Creates a ThreeStateCheckBox widget.</summary>
+        /// <param name="text">The ThreeStateCheckBox text.</param>
+        /// <param name="isChecked">Whether the ThreeStateCheckBox is checked.</param>
+        /// <param name="fn">Raised when the ThreeStateCheckBox is clicked.</param>
+        static member inline ThreeStateCheckBox(text: string, isChecked: bool option, fn: bool option -> 'msg) =
+            WidgetBuilder<'msg, IFabCheckBox>(
+                CheckBox.WidgetKey,
+                ToggleButton.IsThreeState.WithValue(true),
+                ContentControl.ContentString.WithValue(text),
+                ToggleButton.ThreeStateCheckedChanged.WithValue(ValueEventData.createVOption (ThreeState.fromOption(isChecked)) (ThreeState.toOption >> fn))
+            )
+
+        /// <summary>Creates a ThreeStateCheckBox widget.</summary>
+        /// <param name="isChecked">Whether the ThreeStateCheckBox is checked.</param>
+        /// <param name="fn">Raised when the ThreeStateCheckBox is clicked.</param>
+        /// <param name="content">The ThreeStateCheckBox content.</param>
+        static member inline ThreeStateCheckBox(isChecked: bool option, fn: bool option -> 'msg, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabCheckBox>(
+                CheckBox.WidgetKey,
+                AttributesBundle(
+                    StackList.two(
+                        ToggleButton.ThreeStateCheckedChanged.WithValue(
+                            ValueEventData.createVOption (ThreeState.fromOption(isChecked)) (ThreeState.toOption >> fn)
+                        ),
+                        ToggleButton.IsThreeState.WithValue(true)
+                    ),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+type CheckBoxModifiers =
+    /// <summary>Link a ViewRef to access the direct CheckBox control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabCheckBox>, value: ViewRef<CheckBox>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/DataValidationErrors.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/DataValidationErrors.fs
new file mode 100644
index 00000000..2f87c9c2
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/DataValidationErrors.fs
@@ -0,0 +1,7 @@
+namespace Fabulous.Avalonia.Components
+
+open Fabulous.Avalonia
+
+type IFabComponentDataValidationErrors =
+    inherit IFabComponentContentControl
+    inherit IFabDataValidationErrors
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/DatePicker.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/DatePicker.fs
new file mode 100644
index 00000000..2a482f44
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/DatePicker.fs
@@ -0,0 +1,113 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+
+type IFabDatePicker =
+    inherit IFabTemplatedControl
+
+module DatePicker =
+    let WidgetKey = Widgets.register<DatePicker>()
+
+    let DayVisible =
+        Attributes.defineAvaloniaPropertyWithEquality DatePicker.DayVisibleProperty
+
+    let MonthVisible =
+        Attributes.defineAvaloniaPropertyWithEquality DatePicker.MonthVisibleProperty
+
+    let YearVisible =
+        Attributes.defineAvaloniaPropertyWithEquality DatePicker.YearVisibleProperty
+
+    let DayFormat =
+        Attributes.defineAvaloniaPropertyWithEquality DatePicker.DayFormatProperty
+
+    let MonthFormat =
+        Attributes.defineAvaloniaPropertyWithEquality DatePicker.MonthFormatProperty
+
+    let YearFormat =
+        Attributes.defineAvaloniaPropertyWithEquality DatePicker.YearFormatProperty
+
+    let MinYear =
+        Attributes.defineAvaloniaPropertyWithEquality DatePicker.MinYearProperty
+
+    let MaxYear =
+        Attributes.defineAvaloniaPropertyWithEquality DatePicker.MaxYearProperty
+
+    let SelectedDateChanged =
+        Attributes.defineAvaloniaPropertyWithChangedEvent "DatePicker_SelectedDateChanged" DatePicker.SelectedDateProperty Nullable Nullable.op_Explicit
+
+[<AutoOpen>]
+module DatePickerBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a DatePicker widget.</summary>
+        /// <param name="date">The initial date.</param>
+        /// <param name="fn">Raised when the selected date changes.</param>
+        static member DatePicker(date: DateTimeOffset, fn: DateTimeOffset -> 'msg) =
+            WidgetBuilder<'msg, IFabDatePicker>(DatePicker.WidgetKey, DatePicker.SelectedDateChanged.WithValue(ValueEventData.create date fn))
+
+type DatePickerModifiers =
+    /// <summary>Sets the DayVisible property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The DayVisible value.</param>
+    [<Extension>]
+    static member inline dayVisible(this: WidgetBuilder<'msg, #IFabDatePicker>, value: bool) =
+        this.AddScalar(DatePicker.DayVisible.WithValue(value))
+
+    /// <summary>Sets the MonthVisible property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The MonthVisible value.</param>
+    [<Extension>]
+    static member inline monthVisible(this: WidgetBuilder<'msg, #IFabDatePicker>, value: bool) =
+        this.AddScalar(DatePicker.MonthVisible.WithValue(value))
+
+    /// <summary>Sets the YearVisible property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The YearVisible value.</param>
+    [<Extension>]
+    static member inline yearVisible(this: WidgetBuilder<'msg, #IFabDatePicker>, value: bool) =
+        this.AddScalar(DatePicker.YearVisible.WithValue(value))
+
+    /// <summary>Sets the DayFormat property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The DayFormat value.</param>
+    [<Extension>]
+    static member inline dayFormat(this: WidgetBuilder<'msg, #IFabDatePicker>, value: string) =
+        this.AddScalar(DatePicker.DayFormat.WithValue(value))
+
+    /// <summary>Sets the MonthFormat property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The MonthFormat value.</param>
+    [<Extension>]
+    static member inline monthFormat(this: WidgetBuilder<'msg, #IFabDatePicker>, value: string) =
+        this.AddScalar(DatePicker.MonthFormat.WithValue(value))
+
+    /// <summary>Sets the YearFormat property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The YearFormat value.</param>
+    [<Extension>]
+    static member inline yearFormat(this: WidgetBuilder<'msg, #IFabDatePicker>, value: string) =
+        this.AddScalar(DatePicker.YearFormat.WithValue(value))
+
+    /// <summary>Sets the MinYear property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The MinYear value.</param>
+    [<Extension>]
+    static member inline minYear(this: WidgetBuilder<'msg, #IFabDatePicker>, value: DateTimeOffset) =
+        this.AddScalar(DatePicker.MinYear.WithValue(value))
+
+    /// <summary>Sets the MaxYear property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The MaxYear value.</param>
+    [<Extension>]
+    static member inline maxYear(this: WidgetBuilder<'msg, #IFabDatePicker>, value: DateTimeOffset) =
+        this.AddScalar(DatePicker.MaxYear.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct DatePicker control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabDatePicker>, value: ViewRef<DatePicker>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Bold.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Bold.fs
new file mode 100644
index 00000000..ba24859e
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Bold.fs
@@ -0,0 +1,32 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Documents
+open Fabulous
+
+type IFabBold =
+    inherit IFabSpan
+
+module Bold =
+    let WidgetKey = Widgets.register<Bold>()
+
+[<AutoOpen>]
+module BoldBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Bold widget.</summary>
+        static member private Bold() =
+            CollectionBuilder<'msg, IFabBold, IFabInline>(Bold.WidgetKey, Span.Inlines)
+
+        /// <summary>Creates a Bold widget.</summary>
+        /// <param name="text">The text to display.</param>
+        static member Bold(text: string) =
+            View.Bold<'msg>() { View.Run<'msg>(text) }
+
+type BoldModifiers =
+    /// <summary>Link a ViewRef to access the direct Bold control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabBold>, value: ViewRef<Bold>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/InlineUIContainer.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/InlineUIContainer.fs
new file mode 100644
index 00000000..a4a87cbd
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/InlineUIContainer.fs
@@ -0,0 +1,35 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Documents
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabInlineUIContainer =
+    inherit IFabInline
+
+module InlineUIContainer =
+    let WidgetKey = Widgets.register<InlineUIContainer>()
+
+    let Children =
+        Attributes.defineAvaloniaPropertyWidget InlineUIContainer.ChildProperty
+
+[<AutoOpen>]
+module InlineUIContainerBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a InlineUIContainer widget.</summary>
+        /// <param name="content">The content of the InlineUIContainer.</param>
+        static member InlineUIContainer(content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabInlineUIContainer>(
+                InlineUIContainer.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| InlineUIContainer.Children.WithValue(content.Compile()) |], ValueNone)
+            )
+
+type InlineUIContainerModifiers =
+    /// <summary>Link a ViewRef to access the direct InlineUIContainer control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabInlineUIContainer>, value: ViewRef<InlineUIContainer>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Italic.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Italic.fs
new file mode 100644
index 00000000..b9262f2c
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Italic.fs
@@ -0,0 +1,32 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Documents
+open Fabulous
+
+type IFabItalic =
+    inherit IFabSpan
+
+module Italic =
+    let WidgetKey = Widgets.register<Italic>()
+
+[<AutoOpen>]
+module ItalicBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Italic widget.</summary>
+        static member private Italic() =
+            CollectionBuilder<'msg, IFabItalic, IFabInline>(Italic.WidgetKey, Span.Inlines)
+
+        /// <summary>Creates a Italic widget.</summary>
+        /// <param name="text">Text to display.</param>
+        static member Italic(text: string) =
+            View.Italic<'msg>() { View.Run<'msg>(text) }
+
+type ItalicModifiers =
+    /// <summary>Link a ViewRef to access the direct Italic control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabItalic>, value: ViewRef<Italic>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/LineBreak.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/LineBreak.fs
new file mode 100644
index 00000000..3b4bb02a
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/LineBreak.fs
@@ -0,0 +1,28 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Documents
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabLineBreak =
+    inherit IFabInline
+
+module LineBreak =
+    let WidgetKey = Widgets.register<LineBreak>()
+
+[<AutoOpen>]
+module LineBreakBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a LineBreak widget.</summary>
+        static member LineBreak() =
+            WidgetBuilder<'msg, IFabLineBreak>(LineBreak.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+type LineBreakModifiers =
+    /// <summary>Link a ViewRef to access the direct LineBreak control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabLineBreak>, value: ViewRef<LineBreak>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Run.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Run.fs
new file mode 100644
index 00000000..d9dc5095
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Run.fs
@@ -0,0 +1,30 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Documents
+open Fabulous
+
+type IFabRun =
+    inherit IFabInline
+
+module Run =
+    let WidgetKey = Widgets.register<Run>()
+
+    let Text = Attributes.defineAvaloniaPropertyWithEquality Run.TextProperty
+
+[<AutoOpen>]
+module RunBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Run widget.</summary>
+        /// <param name="text">The text to display.</param>
+        static member Run(text: string) =
+            WidgetBuilder<'msg, IFabRun>(Run.WidgetKey, Run.Text.WithValue(text))
+
+type RunModifiers =
+    /// <summary>Link a ViewRef to access the direct Run control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabRun>, value: ViewRef<Run>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Span.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Span.fs
new file mode 100644
index 00000000..61bba92a
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Span.fs
@@ -0,0 +1,44 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Documents
+open Fabulous
+open Fabulous.StackAllocatedCollections
+
+type IFabSpan =
+    inherit IFabInline
+
+module Span =
+    let WidgetKey = Widgets.register<Span>()
+
+    let Inlines =
+        Attributes.defineAvaloniaListWidgetCollection "Span_Inlines" (fun target -> (target :?> Span).Inlines)
+
+[<AutoOpen>]
+module SpanBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Span widget.</summary>
+        static member Span() =
+            CollectionBuilder<'msg, IFabSpan, IFabInline>(Span.WidgetKey, Span.Inlines)
+
+type SpanModifiers =
+    /// <summary>Link a ViewRef to access the direct Span control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabSpan>, value: ViewRef<Span>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type SpanCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabInline>
+        (_: CollectionBuilder<'msg, 'marker, IFabInline>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabInline>
+        (_: CollectionBuilder<'msg, 'marker, IFabInline>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/TextDecoration.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/TextDecoration.fs
new file mode 100644
index 00000000..007c2d48
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/TextDecoration.fs
@@ -0,0 +1,147 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Collections
+open Avalonia.Media
+open Avalonia.Media.Immutable
+open Fabulous
+
+type IFabTextDecoration =
+    inherit IFabElement
+
+module TextDecoration =
+    let WidgetKey = Widgets.register<TextDecoration>()
+
+    let Location =
+        Attributes.defineAvaloniaPropertyWithEquality TextDecoration.LocationProperty
+
+    let StrokeWidget =
+        Attributes.defineAvaloniaPropertyWidget TextDecoration.StrokeProperty
+
+    let Stroke =
+        Attributes.defineAvaloniaPropertyWithEquality TextDecoration.StrokeProperty
+
+    let StrokeThicknessUnit =
+        Attributes.defineAvaloniaPropertyWithEquality TextDecoration.StrokeThicknessUnitProperty
+
+    let StrokeDashArray =
+        Attributes.defineSimpleScalarWithEquality<float list> "TextDecoration_StrokeDashArray" (fun _ newValueOpt node ->
+            let target = node.Target :?> AvaloniaObject
+
+            match newValueOpt with
+            | ValueNone -> target.ClearValue(TextDecoration.StrokeDashArrayProperty)
+            | ValueSome points ->
+                let coll = AvaloniaList<float>()
+                points |> List.iter coll.Add
+                target.SetValue(TextDecoration.StrokeDashArrayProperty, coll) |> ignore)
+
+    let StrokeDashOffset =
+        Attributes.defineAvaloniaPropertyWithEquality TextDecoration.StrokeDashOffsetProperty
+
+    let StrokeThickness =
+        Attributes.defineAvaloniaPropertyWithEquality TextDecoration.StrokeThicknessProperty
+
+    let StrokeLineCap =
+        Attributes.defineAvaloniaPropertyWithEquality TextDecoration.StrokeLineCapProperty
+
+    let StrokeOffset =
+        Attributes.defineAvaloniaPropertyWithEquality TextDecoration.StrokeOffsetProperty
+
+    let StrokeOffsetUnit =
+        Attributes.defineAvaloniaPropertyWithEquality TextDecoration.StrokeOffsetUnitProperty
+
+[<AutoOpen>]
+module TextDecorationBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a TextDecoration widget.</summary>
+        /// <param name="location">The location of the TextDecoration.</param>
+        static member inline TextDecoration(location: TextDecorationLocation) =
+            WidgetBuilder<'msg, IFabTextDecoration>(TextDecoration.WidgetKey, TextDecoration.Location.WithValue(location))
+
+type TextDecorationModifiers =
+    /// <summary>Sets the Stroke property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StrokeWidget value.</param>
+    [<Extension>]
+    static member inline stroke(this: WidgetBuilder<'msg, #IFabTextDecoration>, value: WidgetBuilder<'msg, #IFabBrush>) =
+        this.AddWidget(TextDecoration.StrokeWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the Stroke property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Stroke value.</param>
+    [<Extension>]
+    static member inline stroke(this: WidgetBuilder<'msg, #IFabTextDecoration>, value: IBrush) =
+        this.AddScalar(TextDecoration.Stroke.WithValue(value))
+
+    /// <summary>Sets the StrokeThicknessUnit property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StrokeThicknessUnit value.</param>
+    [<Extension>]
+    static member inline strokeThicknessUnit(this: WidgetBuilder<'msg, #IFabTextDecoration>, value: TextDecorationUnit) =
+        this.AddScalar(TextDecoration.StrokeThicknessUnit.WithValue(value))
+
+    /// <summary>Sets the StrokeDashArray property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StrokeDashArray value.</param>
+    [<Extension>]
+    static member inline strokeDashArray(this: WidgetBuilder<'msg, #IFabTextDecoration>, value: float list) =
+        this.AddScalar(TextDecoration.StrokeDashArray.WithValue(value))
+
+    /// <summary>Sets the StrokeDashOffset property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StrokeDashOffset value.</param>
+    [<Extension>]
+    static member inline strokeDashOffset(this: WidgetBuilder<'msg, #IFabTextDecoration>, value: float) =
+        this.AddScalar(TextDecoration.StrokeDashOffset.WithValue(value))
+
+    /// <summary>Sets the StrokeThickness property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StrokeThickness value.</param>
+    [<Extension>]
+    static member inline strokeThickness(this: WidgetBuilder<'msg, #IFabTextDecoration>, value: float) =
+        this.AddScalar(TextDecoration.StrokeThickness.WithValue(value))
+
+    /// <summary>Sets the StrokeLineCap property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StrokeLineCap value.</param>
+    [<Extension>]
+    static member inline strokeLineCap(this: WidgetBuilder<'msg, #IFabTextDecoration>, value: PenLineCap) =
+        this.AddScalar(TextDecoration.StrokeLineCap.WithValue(value))
+
+    /// <summary>Sets the StrokeOffset property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StrokeOffset value.</param>
+    [<Extension>]
+    static member inline strokeOffset(this: WidgetBuilder<'msg, #IFabTextDecoration>, value: float) =
+        this.AddScalar(TextDecoration.StrokeOffset.WithValue(value))
+
+    /// <summary>Sets the StrokeOffsetUnit property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StrokeOffsetUnit value.</param>
+    [<Extension>]
+    static member inline strokeOffsetUnit(this: WidgetBuilder<'msg, #IFabTextDecoration>, value: TextDecorationUnit) =
+        this.AddScalar(TextDecoration.StrokeOffsetUnit.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct TextDecoration control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabTextDecoration>, value: ViewRef<TextDecoration>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type TextDecorationExtraModifiers =
+    /// <summary>Sets the Stroke property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Stroke value.</param>
+    [<Extension>]
+    static member inline stroke(this: WidgetBuilder<'msg, #IFabTextDecoration>, value: Color) =
+        TextDecorationModifiers.stroke(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the Stroke property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Stroke value.</param>
+    [<Extension>]
+    static member inline stroke(this: WidgetBuilder<'msg, #IFabTextDecoration>, value: string) =
+        TextDecorationModifiers.stroke(this, View.SolidColorBrush(value))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Underline.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Underline.fs
new file mode 100644
index 00000000..3156274b
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/Underline.fs
@@ -0,0 +1,31 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Documents
+open Fabulous
+
+type IFabUnderline =
+    inherit IFabSpan
+
+module Underline =
+    let WidgetKey = Widgets.register<Underline>()
+
+[<AutoOpen>]
+module UnderlineBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Underline widget.</summary>
+        static member private Underline() =
+            CollectionBuilder<'msg, IFabUnderline, IFabInline>(Underline.WidgetKey, Span.Inlines)
+
+        /// <summary>Creates a Underline widget.</summary>
+        /// <param name="text">The text to display.</param>
+        static member Underline(text: string) = View.Underline() { View.Run(text) }
+
+type UnderlineModifiers =
+    /// <summary>Link a ViewRef to access the direct Underline control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabUnderline>, value: ViewRef<Underline>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/_Inline.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/_Inline.fs
new file mode 100644
index 00000000..87da9946
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Documents/_Inline.fs
@@ -0,0 +1,32 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Documents
+open Avalonia.Media
+open Fabulous
+
+type IFabInline =
+    inherit IFabTextElement
+
+module Inline =
+    let TextDecorations =
+        Attributes.defineAvaloniaListWidgetCollection "Inline_TextDecorations" (fun target ->
+            let target = target :?> Inline
+
+            if target.TextDecorations = null then
+                let newColl = TextDecorationCollection()
+                target.TextDecorations <- newColl
+                newColl
+            else
+                target.TextDecorations)
+
+    let BaselineAlignment =
+        Attributes.defineAvaloniaPropertyWithEquality Inline.BaselineAlignmentProperty
+
+type InlineModifiers =
+    /// <summary>Sets the BaselineAlignment property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The BaselineAlignment value.</param>
+    [<Extension>]
+    static member inline baselineAlignment(this: WidgetBuilder<'msg, #IFabInline>, value: BaselineAlignment) =
+        this.AddScalar(Inline.BaselineAlignment.WithValue(value))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Expander.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Expander.fs
new file mode 100644
index 00000000..88dc7738
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Expander.fs
@@ -0,0 +1,138 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Animation
+open Avalonia.Controls
+open Avalonia.Interactivity
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabExpander =
+    inherit IFabHeaderedContentControl
+
+module Expander =
+    let WidgetKey = Widgets.register<Expander>()
+
+    let ContentTransition =
+        Attributes.defineAvaloniaPropertyWithEquality Expander.ContentTransitionProperty
+
+    let ExpandDirection =
+        Attributes.defineAvaloniaPropertyWithEquality Expander.ExpandDirectionProperty
+
+    let IsExpanded =
+        Attributes.defineAvaloniaPropertyWithEquality Expander.IsExpandedProperty
+
+    let ExpandedChanged =
+        Attributes.defineAvaloniaPropertyWithChangedEvent' "Expander_IsExpandedChanged" Expander.IsExpandedProperty
+
+    let Collapsing =
+        Attributes.defineEvent "Expander_Collapsing" (fun target -> (target :?> Expander).Collapsing)
+
+    let Expanding =
+        Attributes.defineEvent "Expander_Expanding" (fun target -> (target :?> Expander).Expanding)
+
+[<AutoOpen>]
+module ExpanderBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Expander widget.</summary>
+        /// <param name="header">The header of the expander.</param>
+        /// <param name="content">The content of the expander.</param>
+        static member Expander(header: string, content: string) =
+            WidgetBuilder<'msg, IFabExpander>(
+                Expander.WidgetKey,
+                HeaderedContentControl.HeaderString.WithValue(header),
+                ContentControl.ContentString.WithValue(content)
+            )
+
+        /// <summary>Creates a Expander widget.</summary>
+        /// <param name="header">The header of the expander.</param>
+        /// <param name="content">The content of the expander.</param>
+        static member Expander(header: WidgetBuilder<'msg, #IFabControl>, content: string) =
+            WidgetBuilder<'msg, IFabExpander>(
+                Expander.WidgetKey,
+                AttributesBundle(
+                    StackList.one(ContentControl.ContentString.WithValue(content)),
+                    ValueSome [| HeaderedContentControl.HeaderWidget.WithValue(header.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a Expander widget.</summary>
+        /// <param name="header">The header of the expander.</param>
+        /// <param name="content">The content of the expander.</param>
+        static member Expander(header: string, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabExpander>(
+                Expander.WidgetKey,
+                AttributesBundle(
+                    StackList.one(HeaderedContentControl.HeaderString.WithValue(header)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a Expander widget.</summary>
+        /// <param name="header">The header of the expander.</param>
+        /// <param name="content">The content of the expander.</param>
+        static member Expander(header: WidgetBuilder<'msg, #IFabControl>, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabExpander>(
+                Expander.WidgetKey,
+                AttributesBundle(
+                    StackList.empty(),
+                    ValueSome
+                        [| HeaderedContentControl.HeaderWidget.WithValue(header.Compile())
+                           ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+type ExpanderModifiers =
+    /// <summary>Sets the ContentTransition property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ContentTransition value.</param>
+    [<Extension>]
+    static member inline contentTransition(this: WidgetBuilder<'msg, #IFabExpander>, value: IPageTransition) =
+        this.AddScalar(Expander.ContentTransition.WithValue(value))
+
+    /// <summary>Sets the ExpandDirection property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ExpandDirection value.</param>
+    [<Extension>]
+    static member inline expandDirection(this: WidgetBuilder<'msg, #IFabExpander>, value: ExpandDirection) =
+        this.AddScalar(Expander.ExpandDirection.WithValue(value))
+
+    /// <summary>Sets the IsExpanded property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsExpanded value.</param>
+    [<Extension>]
+    static member inline isExpanded(this: WidgetBuilder<'msg, #IFabExpander>, value: bool) =
+        this.AddScalar(Expander.IsExpanded.WithValue(value))
+
+    /// <summary>Listens to the Expander ExpandedChanged event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="isExpanded">The IsExpanded value.</param>
+    /// <param name="fn">Raised when the ExpandedChanged event fires.</param>
+    [<Extension>]
+    static member inline onExpandedChanged(this: WidgetBuilder<'msg, #IFabExpander>, isExpanded: bool, fn: bool -> 'msg) =
+        this.AddScalar(Expander.ExpandedChanged.WithValue(ValueEventData.create isExpanded fn))
+
+    /// <summary>Listens to the Expander Collapsing event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the Collapsing event fires.</param>
+    [<Extension>]
+    static member inline onCollapsing(this: WidgetBuilder<'msg, #IFabExpander>, fn: CancelRoutedEventArgs -> 'msg) =
+        this.AddScalar(Expander.Collapsing.WithValue(fn))
+
+    /// <summary>Listens to the Expander Expanding event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the Expanding event fires.</param>
+    [<Extension>]
+    static member inline onExpanding(this: WidgetBuilder<'msg, #IFabExpander>, fn: CancelRoutedEventArgs -> 'msg) =
+        this.AddScalar(Expander.Expanding.WithValue(fn))
+
+    /// <summary>Link a ViewRef to access the direct Expander control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabExpander>, value: ViewRef<Expander>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/ExperimentalAcrylicBorder.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/ExperimentalAcrylicBorder.fs
new file mode 100644
index 00000000..40b6c2af
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/ExperimentalAcrylicBorder.fs
@@ -0,0 +1,31 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Controls
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentExperimentalAcrylicBorder =
+    inherit IFabComponentDecorator
+    inherit IFabExperimentalAcrylicBorder
+
+[<AutoOpen>]
+module ComponentExperimentalAcrylicBorderBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ExperimentalAcrylicBorder widget.</summary>
+        /// <param name="content">The content of the ExperimentalAcrylicBorder.</param>
+        static member ExperimentalAcrylicBorder(content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentExperimentalAcrylicBorder>(
+                ExperimentalAcrylicBorder.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| Decorator.ChildWidget.WithValue(content.Compile()) |], ValueNone)
+            )
+
+        /// <summary>Creates a ExperimentalAcrylicBorder widget.</summary>
+        static member ExperimentalAcrylicBorder() =
+            WidgetBuilder<unit, IFabComponentExperimentalAcrylicBorder>(
+                ExperimentalAcrylicBorder.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueNone, ValueNone)
+            )
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/ExperimentalAcrylicMaterial.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/ExperimentalAcrylicMaterial.fs
new file mode 100644
index 00000000..1cd02326
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/ExperimentalAcrylicMaterial.fs
@@ -0,0 +1,34 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentExperimentalAcrylicMaterial =
+    inherit IFabComponentElement
+    inherit IFabExperimentalAcrylicMaterial
+
+module ComponentExperimentalAcrylicMaterial =
+    let Invalidated =
+        ComponentAttributes.defineEventNoArg "ExperimentalAcrylicMaterial_Invalidated" (fun target -> (target :?> ExperimentalAcrylicMaterial).Invalidated)
+
+[<AutoOpen>]
+module ComponentExperimentalAcrylicMaterialBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ExperimentalAcrylicMaterial widget.</summary>
+        static member ExperimentalAcrylicMaterial() =
+            WidgetBuilder<unit, IFabExperimentalAcrylicMaterial>(
+                ExperimentalAcrylicMaterial.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueNone, ValueNone)
+            )
+
+type ComponentExperimentalAcrylicMaterialModifiers =
+    /// <summary>Listens the ExperimentalAcrylicMaterial Invalidated event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the ExperimentalAcrylicMaterial is invalidated.</param>
+    [<Extension>]
+    static member inline onInvalidated(this: WidgetBuilder<unit, #IFabComponentExperimentalAcrylicMaterial>, fn: unit -> unit) =
+        this.AddScalar(ComponentExperimentalAcrylicMaterial.Invalidated.WithValue(fn))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/GridSplitter.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/GridSplitter.fs
new file mode 100644
index 00000000..1242c526
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/GridSplitter.fs
@@ -0,0 +1,77 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabGridSplitter =
+    inherit IFabTemplatedControl
+
+module GridSplitter =
+    let WidgetKey = Widgets.register<GridSplitter>()
+
+    let ResizeDirection =
+        Attributes.defineAvaloniaPropertyWithEquality GridSplitter.ResizeDirectionProperty
+
+    let ResizeBehavior =
+        Attributes.defineAvaloniaPropertyWithEquality GridSplitter.ResizeBehaviorProperty
+
+    let ShowsPreview =
+        Attributes.defineAvaloniaPropertyWithEquality GridSplitter.ShowsPreviewProperty
+
+    let KeyboardIncrement =
+        Attributes.defineAvaloniaPropertyWithEquality GridSplitter.KeyboardIncrementProperty
+
+    let DragIncrement =
+        Attributes.defineAvaloniaPropertyWithEquality GridSplitter.DragIncrementProperty
+
+
+[<AutoOpen>]
+module GridSplitterBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a GridSplitter widget.</summary>
+        static member GridSplitter() =
+            WidgetBuilder<'msg, IFabGridSplitter>(GridSplitter.WidgetKey, GridSplitter.ResizeDirection.WithValue(GridResizeDirection.Auto))
+
+        /// <summary>Creates a GridSplitter widget.</summary>
+        /// <param name="resizeDirection">The direction in which the GridSplitter can be resized.</param>
+        static member GridSplitter(resizeDirection: GridResizeDirection) =
+            WidgetBuilder<'msg, IFabGridSplitter>(GridSplitter.WidgetKey, GridSplitter.ResizeDirection.WithValue(resizeDirection))
+
+type GridSplitterModifiers =
+    /// <summary>Sets the ResizeBehavior property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ResizeBehavior value.</param>
+    [<Extension>]
+    static member inline resizeBehavior(this: WidgetBuilder<'msg, #IFabGridSplitter>, value: GridResizeBehavior) =
+        this.AddScalar(GridSplitter.ResizeBehavior.WithValue(value))
+
+    /// <summary>Sets the ShowsPreview property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ShowsPreview value.</param>
+    [<Extension>]
+    static member inline showsPreview(this: WidgetBuilder<'msg, #IFabGridSplitter>, value: bool) =
+        this.AddScalar(GridSplitter.ShowsPreview.WithValue(value))
+
+    /// <summary>Sets the KeyboardIncrement property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The KeyboardIncrement value.</param>
+    [<Extension>]
+    static member inline keyboardIncrement(this: WidgetBuilder<'msg, #IFabGridSplitter>, value: float) =
+        this.AddScalar(GridSplitter.KeyboardIncrement.WithValue(value))
+
+    /// <summary>Sets the DragIncrement property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The DragIncrement value.</param>
+    [<Extension>]
+    static member inline dragIncrement(this: WidgetBuilder<'msg, #IFabGridSplitter>, value: float) =
+        this.AddScalar(GridSplitter.DragIncrement.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct GridSplitter control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabGridSplitter>, value: ViewRef<GridSplitter>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/HeaderedContentControl.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/HeaderedContentControl.fs
new file mode 100644
index 00000000..6b8e2902
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/HeaderedContentControl.fs
@@ -0,0 +1,51 @@
+namespace Fabulous.Avalonia.Components
+
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentHeaderedContentControl =
+    inherit IFabComponentContentControl
+    inherit IFabHeaderedContentControl
+
+[<AutoOpen>]
+module ComponentHeaderedContentControlBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a HeaderedContentControl widget.</summary>
+        /// <param name="header">The header string.</param>
+        /// <param name="content">The content widget.</param>
+        static member HeaderedContentControl(header: string, content: WidgetBuilder<unit, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentHeaderedContentControl>(
+                HeaderedContentControl.WidgetKey,
+                AttributesBundle(
+                    StackList.one(HeaderedContentControl.HeaderString.WithValue(header)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a HeaderedContentControl widget.</summary>
+        /// <param name="header">The header widget.</param>
+        /// <param name="content">The content widget.</param>
+        static member HeaderedContentControl(header: WidgetBuilder<unit, #IFabControl>, content: WidgetBuilder<unit, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentHeaderedContentControl>(
+                HeaderedContentControl.WidgetKey,
+                AttributesBundle(
+                    StackList.empty(),
+                    ValueSome
+                        [| HeaderedContentControl.HeaderWidget.WithValue(header.Compile())
+                           ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a HeaderedContentControl widget.</summary>
+        /// <param name="header">The header string.</param>
+        /// <param name="content">The content string.</param>
+        static member HeaderedContentControl(header: string, content: string) =
+            WidgetBuilder<unit, IFabComponentHeaderedContentControl>(
+                HeaderedContentControl.WidgetKey,
+                HeaderedContentControl.HeaderString.WithValue(header),
+                ContentControl.ContentString.WithValue(content)
+            )
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Label.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Label.fs
new file mode 100644
index 00000000..2a71bad5
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Label.fs
@@ -0,0 +1,50 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Input
+open Fabulous
+open Fabulous.StackAllocatedCollections
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabLabel =
+    inherit IFabContentControl
+
+module Label =
+    let WidgetKey = Widgets.register<Label>()
+
+    let Target = Attributes.defineAvaloniaPropertyWithEquality Label.TargetProperty
+
+[<AutoOpen>]
+module LabelBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Label widget.</summary>
+        /// <param name="text">The text to display.</param>
+        static member inline Label(text: string) =
+            WidgetBuilder<'msg, IFabLabel>(Label.WidgetKey, ContentControl.ContentString.WithValue(text))
+
+        /// <summary>Creates a Label widget.</summary>
+        /// <param name="content">The content to display.</param>
+        static member inline Label(content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabLabel>(
+                Label.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
+            )
+
+type LabelModifiers =
+    /// <summary>Sets the Target property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Target value.</param>
+    [<Extension>]
+    static member inline target(this: WidgetBuilder<'msg, IFabLabel>, value: ViewRef<#IInputElement>) =
+        match value.TryValue with
+        | None -> this
+        | Some value -> this.AddScalar(Label.Target.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct Label control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabLabel>, value: ViewRef<Label>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/LayoutTransformControl.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/LayoutTransformControl.fs
new file mode 100644
index 00000000..6aa0154d
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/LayoutTransformControl.fs
@@ -0,0 +1,24 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentLayoutTransformControl =
+    inherit IFabComponentDecorator
+    inherit IFabLayoutTransformControl
+
+[<AutoOpen>]
+module ComponentLayoutTransformControlBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a LayoutTransformControl widget.</summary>
+        /// <param name="content">The content of the LayoutTransformControl.</param>
+        static member LayoutTransformControl(content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentLayoutTransformControl>(
+                LayoutTransformControl.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| Decorator.ChildWidget.WithValue(content.Compile()) |], ValueNone)
+            )
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/MaskedTextBox.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/MaskedTextBox.fs
new file mode 100644
index 00000000..21a3dc87
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/MaskedTextBox.fs
@@ -0,0 +1,110 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Globalization
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+
+type IFabMaskedTextBox =
+    inherit IFabTextBox
+
+module MaskedTextBox =
+    let WidgetKey = Widgets.register<MaskedTextBox>()
+
+    let AsciiOnly =
+        Attributes.defineAvaloniaPropertyWithEquality MaskedTextBox.AsciiOnlyProperty
+
+    let Culture =
+        Attributes.defineAvaloniaPropertyWithEquality MaskedTextBox.CultureProperty
+
+    let HidePromptOnLeave =
+        Attributes.defineAvaloniaPropertyWithEquality MaskedTextBox.HidePromptOnLeaveProperty
+
+    let Mask = Attributes.defineAvaloniaPropertyWithEquality MaskedTextBox.MaskProperty
+
+    let PasswordChar =
+        Attributes.defineAvaloniaPropertyWithEquality MaskedTextBox.PasswordCharProperty
+
+    let PromptChar =
+        Attributes.defineAvaloniaPropertyWithEquality MaskedTextBox.PromptCharProperty
+
+    let ResetOnPrompt =
+        Attributes.defineAvaloniaPropertyWithEquality MaskedTextBox.ResetOnPromptProperty
+
+    let ResetOnSpace =
+        Attributes.defineAvaloniaPropertyWithEquality MaskedTextBox.ResetOnSpaceProperty
+
+    let TextChanged =
+        Attributes.defineAvaloniaPropertyWithChangedEvent' "MaskedTextBox_TextChanged" MaskedTextBox.TextProperty
+
+[<AutoOpen>]
+module MaskedTextBoxBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a MaskedTextBox widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="mask">The mask to apply.</param>
+        /// <param name="fn">Raised when the text changes.</param>
+        static member inline MaskedTextBox(text: string, mask: string, fn: string -> 'msg) =
+            WidgetBuilder<'msg, IFabMaskedTextBox>(
+                MaskedTextBox.WidgetKey,
+                MaskedTextBox.Mask.WithValue(mask),
+                MaskedTextBox.TextChanged.WithValue(ValueEventData.create text fn)
+            )
+
+type MaskedTextBoxModifiers =
+    /// <summary>Sets the AsciiOnly property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The AsciiOnly value.</param>
+    [<Extension>]
+    static member inline asciiOnly(this: WidgetBuilder<'msg, #IFabMaskedTextBox>, value: bool) =
+        this.AddScalar(MaskedTextBox.AsciiOnly.WithValue(value))
+
+    /// <summary>Sets the Culture property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Culture value.</param>
+    [<Extension>]
+    static member inline culture(this: WidgetBuilder<'msg, #IFabMaskedTextBox>, value: CultureInfo) =
+        this.AddScalar(MaskedTextBox.Culture.WithValue(value))
+
+    /// <summary>Sets the HidePromptOnLeave property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The HidePromptOnLeave value.</param>
+    [<Extension>]
+    static member inline hidePromptOnLeave(this: WidgetBuilder<'msg, #IFabMaskedTextBox>, value: bool) =
+        this.AddScalar(MaskedTextBox.HidePromptOnLeave.WithValue(value))
+
+    /// <summary>Sets the PasswordChar property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The PasswordChar value.</param>
+    [<Extension>]
+    static member inline passwordChar(this: WidgetBuilder<'msg, #IFabMaskedTextBox>, value: char) =
+        this.AddScalar(MaskedTextBox.PasswordChar.WithValue(value))
+
+    /// <summary>Sets the PromptChar property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The PromptChar value.</param>
+    [<Extension>]
+    static member inline promptChar(this: WidgetBuilder<'msg, #IFabMaskedTextBox>, value: char) =
+        this.AddScalar(MaskedTextBox.PromptChar.WithValue(value))
+
+    /// <summary>Sets the ResetOnPrompt property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ResetOnPrompt value.</param>
+    [<Extension>]
+    static member inline resetOnPrompt(this: WidgetBuilder<'msg, #IFabMaskedTextBox>, value: bool) =
+        this.AddScalar(MaskedTextBox.ResetOnPrompt.WithValue(value))
+
+    /// <summary>Sets the ResetOnSpace property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ResetOnSpace value.</param>
+    [<Extension>]
+    static member inline resetOnSpace(this: WidgetBuilder<'msg, #IFabMaskedTextBox>, value: bool) =
+        this.AddScalar(MaskedTextBox.ResetOnSpace.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct MaskedTextBox control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabMaskedTextBox>, value: ViewRef<MaskedTextBox>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Notifications/NotificationCard.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Notifications/NotificationCard.fs
new file mode 100644
index 00000000..8fe346e9
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Notifications/NotificationCard.fs
@@ -0,0 +1,84 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Notifications
+open Avalonia.Interactivity
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabNotificationCard =
+    inherit IFabContentControl
+
+module NotificationCard =
+    let WidgetKey = Widgets.register<NotificationCard>()
+
+    let NotificationType =
+        Attributes.defineAvaloniaPropertyWithEquality NotificationCard.NotificationTypeProperty
+
+    let IsClosed =
+        Attributes.defineAvaloniaPropertyWithEquality NotificationCard.IsClosedProperty
+
+    let CloseOnClick =
+        Attributes.defineAvaloniaPropertyWithEquality NotificationCard.CloseOnClickProperty
+
+    let NotificationClosed =
+        Attributes.defineEvent "NotificationCard_NotificationClosed" (fun target -> (target :?> NotificationCard).NotificationClosed)
+
+[<AutoOpen>]
+module NotificationCardBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a NotificationCard widget.</summary>
+        /// <param name="isClosed">Whether the NotificationCard is closed.</param>
+        /// <param name="content">The content of the NotificationCard.</param>
+        static member NotificationCard(isClosed: bool, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabNotificationCard>(
+                NotificationCard.WidgetKey,
+                AttributesBundle(
+                    StackList.one(NotificationCard.IsClosed.WithValue(isClosed)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a NotificationCard widget.</summary>
+        /// <param name="isClosed">Whether the NotificationCard is closed.</param>
+        /// <param name="content">The content of the NotificationCard.</param>
+        static member NotificationCard(isClosed: bool, content: string) =
+            WidgetBuilder<'msg, IFabNotificationCard>(
+                NotificationCard.WidgetKey,
+                NotificationCard.IsClosed.WithValue(isClosed),
+                ContentControl.ContentString.WithValue(content)
+            )
+
+type NotificationCardModifiers =
+
+    /// <summary>Sets the NotificationType property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The NotificationType value.</param>
+    [<Extension>]
+    static member inline notificationType(this: WidgetBuilder<'msg, #IFabNotificationCard>, value: NotificationType) =
+        this.AddScalar(NotificationCard.NotificationType.WithValue(value))
+
+    /// <summary>Listens to the NotificationCard NotificationClosed event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the NotificationCard is closed.</param>
+    [<Extension>]
+    static member inline onNotificationClosed(this: WidgetBuilder<'msg, #IFabNotificationCard>, fn: RoutedEventArgs -> 'msg) =
+        this.AddScalar(NotificationCard.NotificationClosed.WithValue(fn))
+
+    /// <summary>Link a ViewRef to access the direct NotificationCard control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabNotificationCard>, value: ViewRef<NotificationCard>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type NotificationCardAttachedModifiers =
+
+    /// <summary>Sets the CloseOnClick property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The CloseOnClick value.</param>
+    [<Extension>]
+    static member inline closeOnClick(this: WidgetBuilder<'msg, #IFabButton>, value: bool) =
+        this.AddScalar(NotificationCard.CloseOnClick.WithValue(value))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Notifications/WindowNotificationManager.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Notifications/WindowNotificationManager.fs
new file mode 100644
index 00000000..a8714155
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Notifications/WindowNotificationManager.fs
@@ -0,0 +1,46 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Notifications
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabWindowNotificationManager =
+    inherit IFabTemplatedControl
+
+module WindowNotificationManager =
+    let WidgetKey =
+        Widgets.registerWithFactory(fun _ -> WindowNotificationManager(null))
+
+    let Position =
+        Attributes.defineAvaloniaPropertyWithEquality WindowNotificationManager.PositionProperty
+
+    let MaxItems =
+        Attributes.defineAvaloniaPropertyWithEquality WindowNotificationManager.MaxItemsProperty
+
+[<AutoOpen>]
+module WindowNotificationManagerBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a WindowNotificationManager widget.</summary>
+        static member WindowNotificationManager(viewRef: ViewRef<WindowNotificationManager>) =
+            WidgetBuilder<'msg, IFabWindowNotificationManager>(
+                WindowNotificationManager.WidgetKey,
+                AttributesBundle(StackList.one(ViewRefAttributes.ViewRef.WithValue(viewRef.Unbox)), ValueNone, ValueNone)
+            )
+
+
+type WindowNotificationManagerModifiers =
+    /// <summary>Sets the MaxItems property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The MaxItems value.</param>
+    [<Extension>]
+    static member inline maxItems(this: WidgetBuilder<'msg, #IFabWindowNotificationManager>, value: int) =
+        this.AddScalar(WindowNotificationManager.MaxItems.WithValue(value))
+
+    /// <summary>Sets the Position property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Position value.</param>
+    [<Extension>]
+    static member inline position(this: WidgetBuilder<'msg, #IFabWindowNotificationManager>, value: NotificationPosition) =
+        this.AddScalar(WindowNotificationManager.Position.WithValue(value))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/NumericUpDown.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/NumericUpDown.fs
new file mode 100644
index 00000000..ddf9327a
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/NumericUpDown.fs
@@ -0,0 +1,242 @@
+namespace Fabulous.Avalonia.Components
+
+open Avalonia.Controls
+open Avalonia.Data.Converters
+open Avalonia.Layout
+open Avalonia.Media
+open Fabulous
+open System.Globalization
+open System.Runtime.CompilerServices
+
+module NumericUpDownUpdaters =
+    let updateNumericUpDownMinMax _ (newValueOpt: struct (decimal * decimal) voption) (node: IViewNode) =
+        let numericUpDown = node.Target :?> NumericUpDown
+
+        match newValueOpt with
+        | ValueNone ->
+            numericUpDown.ClearValue(NumericUpDown.MinimumProperty)
+            numericUpDown.ClearValue(NumericUpDown.MaximumProperty)
+        | ValueSome(min, max) ->
+            let currMax = numericUpDown.GetValue(NumericUpDown.MaximumProperty)
+
+            if min > currMax then
+                numericUpDown.SetValue(NumericUpDown.MaximumProperty, max) |> ignore
+                numericUpDown.SetValue(NumericUpDown.MinimumProperty, min) |> ignore
+            else
+                numericUpDown.SetValue(NumericUpDown.MinimumProperty, min) |> ignore
+                numericUpDown.SetValue(NumericUpDown.MaximumProperty, max) |> ignore
+
+type IFabNumericUpDown =
+    inherit IFabTemplatedControl
+
+module NumericUpDown =
+    let WidgetKey = Widgets.register<NumericUpDown>()
+
+    let MinimumMaximum =
+        Attributes.defineSimpleScalarWithEquality<struct (decimal * decimal)> "NumericUpDown_MinimumMaximum" NumericUpDownUpdaters.updateNumericUpDownMinMax
+
+    let AllowSpin =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.AllowSpinProperty
+
+    let ButtonSpinnerLocation =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.ButtonSpinnerLocationProperty
+
+    let ClipValueToMinMax =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.ClipValueToMinMaxProperty
+
+    let FormatString =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.FormatStringProperty
+
+    let HorizontalContentAlignment =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.HorizontalContentAlignmentProperty
+
+    let VerticalContentAlignment =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.VerticalContentAlignmentProperty
+
+    let Increment =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.IncrementProperty
+
+    let IsReadOnly =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.IsReadOnlyProperty
+
+    let Maximum =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.MaximumProperty
+
+    let Minimum =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.MinimumProperty
+
+    let NumberFormat =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.NumberFormatProperty
+
+    let ParsingNumberStyle =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.ParsingNumberStyleProperty
+
+    let ShowButtonSpinner =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.ShowButtonSpinnerProperty
+
+    let Text = Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.TextProperty
+
+    let TextConverter =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.TextConverterProperty
+
+    let Watermark =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.WatermarkProperty
+
+    let TextAlignment =
+        Attributes.defineAvaloniaPropertyWithEquality NumericUpDown.TextAlignmentProperty
+
+    let ValueChanged =
+        Attributes.defineAvaloniaPropertyWithChangedEvent "NumericUpDown_ValueChanged" NumericUpDown.ValueProperty Option.toNullable Option.ofNullable
+
+[<AutoOpen>]
+module NumericUpDownBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a NumericUpDown widget.</summary>
+        /// <param name="value">The value of the NumericUpDown.</param>
+        /// <param name="fn">Raised when the NumericUpDown value changes.</param>
+        static member NumericUpDown(value: float option, fn: float option -> 'msg) =
+            WidgetBuilder<'msg, IFabNumericUpDown>(
+                NumericUpDown.WidgetKey,
+                NumericUpDown.ValueChanged.WithValue(
+                    let value =
+                        match value with
+                        | Some v -> Some(decimal v)
+                        | None -> None
+
+                    ValueEventData.create value (Option.map float >> fn)
+                )
+            )
+
+        /// <summary>Creates a NumericUpDown widget.</summary>
+        /// <param name="min">The minimum value of the NumericUpDown.</param>
+        /// <param name="max">The maximum value of the NumericUpDown.</param>
+        /// <param name="value">The value of the NumericUpDown.</param>
+        /// <param name="fn">Raised when the NumericUpDown value changes.</param>
+        static member NumericUpDown(min: float, max: float, value: float option, fn: float option -> 'msg) =
+            WidgetBuilder<'msg, IFabNumericUpDown>(
+                NumericUpDown.WidgetKey,
+                NumericUpDown.MinimumMaximum.WithValue(struct (decimal min, decimal max)),
+                NumericUpDown.ValueChanged.WithValue(
+                    let value =
+                        match value with
+                        | Some v -> Some(decimal v)
+                        | None -> None
+
+                    ValueEventData.create value (Option.map float >> fn)
+                )
+            )
+
+type NumericUpDownModifiers =
+
+    /// <summary>Sets the AllowSpin property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The AllowSpin value.</param>
+    [<Extension>]
+    static member inline allowSpin(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: bool) =
+        this.AddScalar(NumericUpDown.AllowSpin.WithValue(value))
+
+    /// <summary>Sets the ButtonSpinnerLocation property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ButtonSpinnerLocation value.</param>
+    [<Extension>]
+    static member inline buttonSpinnerLocation(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: Location) =
+        this.AddScalar(NumericUpDown.ButtonSpinnerLocation.WithValue(value))
+
+    /// <summary>Sets the ClipValueToMinMax property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ClipValueToMinMax value.</param>
+    [<Extension>]
+    static member inline clipValueToMinMax(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: bool) =
+        this.AddScalar(NumericUpDown.ClipValueToMinMax.WithValue(value))
+
+    /// <summary>Sets the FormatString property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The FormatString value.</param>
+    [<Extension>]
+    static member inline formatString(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: string) =
+        this.AddScalar(NumericUpDown.FormatString.WithValue(value))
+
+    /// <summary>Sets the HorizontalContentAlignment property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The HorizontalContentAlignment value.</param>
+    [<Extension>]
+    static member inline horizontalContentAlignment(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: HorizontalAlignment) =
+        this.AddScalar(NumericUpDown.HorizontalContentAlignment.WithValue(value))
+
+    /// <summary>Sets the VerticalContentAlignment property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The VerticalContentAlignment value.</param>
+    [<Extension>]
+    static member inline verticalContentAlignment(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: VerticalAlignment) =
+        this.AddScalar(NumericUpDown.VerticalContentAlignment.WithValue(value))
+
+    /// <summary>Sets the Increment property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Increment value.</param>
+    [<Extension>]
+    static member inline increment(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: float) =
+        this.AddScalar(NumericUpDown.Increment.WithValue(decimal value))
+
+    /// <summary>Sets the IsReadOnly property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsReadOnly value.</param>
+    [<Extension>]
+    static member inline isReadOnly(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: bool) =
+        this.AddScalar(NumericUpDown.IsReadOnly.WithValue(value))
+
+    /// <summary>Sets the NumberFormat property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The NumberFormat value.</param>
+    [<Extension>]
+    static member inline numberFormat(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: NumberFormatInfo) =
+        this.AddScalar(NumericUpDown.NumberFormat.WithValue(value))
+
+    /// <summary>Sets the ParsingNumberStyle property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ParsingNumberStyle value.</param>
+    [<Extension>]
+    static member inline parsingNumberStyle(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: NumberStyles) =
+        this.AddScalar(NumericUpDown.ParsingNumberStyle.WithValue(value))
+
+    /// <summary>Sets the ShowButtonSpinner property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ShowButtonSpinner value.</param>
+    [<Extension>]
+    static member inline showButtonSpinner(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: bool) =
+        this.AddScalar(NumericUpDown.ShowButtonSpinner.WithValue(value))
+
+    /// <summary>Sets the Text property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Text value.</param>
+    [<Extension>]
+    static member inline text(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: string) =
+        this.AddScalar(NumericUpDown.Text.WithValue(value))
+
+    /// <summary>Sets the TextConverter property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The TextConverter value.</param>
+    [<Extension>]
+    static member inline textConverter(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: IValueConverter) =
+        this.AddScalar(NumericUpDown.TextConverter.WithValue(value))
+
+    /// <summary>Sets the Watermark property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Watermark value.</param>
+    [<Extension>]
+    static member inline watermark(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: string) =
+        this.AddScalar(NumericUpDown.Watermark.WithValue(value))
+
+    /// <summary>Sets the TextAlignment property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The TextAlignment value.</param>
+    [<Extension>]
+    static member inline textAlignment(this: WidgetBuilder<'msg, #IFabNumericUpDown>, value: TextAlignment) =
+        this.AddScalar(NumericUpDown.TextAlignment.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct NumericUpDown control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabNumericUpDown>, value: ViewRef<NumericUpDown>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/AccessText.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/AccessText.fs
new file mode 100644
index 00000000..4deb3dc1
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/AccessText.fs
@@ -0,0 +1,32 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Primitives
+open Fabulous
+
+type IFabAccessText =
+    inherit IFabTextBlock
+
+module AccessText =
+    let WidgetKey = Widgets.register<AccessText>()
+
+    let ShowAccessKey =
+        Attributes.defineAvaloniaPropertyWithEquality AccessText.ShowAccessKeyProperty
+
+[<AutoOpen>]
+module AccessTextBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a AccessText widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="showAccessKey">Whether to underline the access key in the text.</param>
+        static member inline AccessText(text: string, showAccessKey: bool) =
+            WidgetBuilder<'msg, IFabAccessText>(AccessText.WidgetKey, TextBlock.Text.WithValue(text), AccessText.ShowAccessKey.WithValue(showAccessKey))
+
+type AccessTextModifiers =
+    /// <summary>Link a ViewRef to access the direct AccessText control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabAccessText>, value: ViewRef<AccessText>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/Popup.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/Popup.fs
new file mode 100644
index 00000000..6fd5a984
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/Popup.fs
@@ -0,0 +1,202 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Controls
+open Avalonia.Controls.Primitives
+open Avalonia.Controls.Primitives.PopupPositioning
+open Avalonia.Input
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabPopup =
+    inherit IFabControl
+
+module Popup =
+    let WidgetKey = Widgets.register<Popup>()
+
+    let WindowManagerAddShadowHint =
+        Attributes.defineAvaloniaPropertyWithEquality Popup.WindowManagerAddShadowHintProperty
+
+    let Child = Attributes.defineAvaloniaPropertyWidget Popup.ChildProperty
+
+    let InheritsTransform =
+        Attributes.defineAvaloniaPropertyWithEquality Popup.InheritsTransformProperty
+
+    let IsOpen = Attributes.defineAvaloniaPropertyWithEquality Popup.IsOpenProperty
+
+    let PlacementAnchor =
+        Attributes.defineAvaloniaPropertyWithEquality Popup.PlacementAnchorProperty
+
+    let PlacementConstraintAdjustment =
+        Attributes.defineAvaloniaPropertyWithEquality Popup.PlacementConstraintAdjustmentProperty
+
+    let PlacementGravity =
+        Attributes.defineAvaloniaPropertyWithEquality Popup.PlacementGravityProperty
+
+    let Placement =
+        Attributes.defineAvaloniaPropertyWithEquality Popup.PlacementProperty
+
+    let PlacementTarget =
+        Attributes.defineAvaloniaPropertyWithEquality Popup.PlacementTargetProperty
+
+    let PlacementRect =
+        Attributes.defineAvaloniaPropertyWithEquality Popup.PlacementRectProperty
+
+    let OverlayDismissEventPassThrough =
+        Attributes.defineAvaloniaPropertyWithEquality Popup.OverlayDismissEventPassThroughProperty
+
+    let HorizontalOffset =
+        Attributes.defineAvaloniaPropertyWithEquality Popup.HorizontalOffsetProperty
+
+    let IsLightDismissEnabled =
+        Attributes.defineAvaloniaPropertyWithEquality Popup.IsLightDismissEnabledProperty
+
+    let VerticalOffset =
+        Attributes.defineAvaloniaPropertyWithEquality Popup.VerticalOffsetProperty
+
+    let Topmost = Attributes.defineAvaloniaPropertyWithEquality Popup.TopmostProperty
+
+    let OverlayInputPassThroughElement =
+        Attributes.defineAvaloniaPropertyWithEquality Popup.OverlayInputPassThroughElementProperty
+
+    let Closed =
+        Attributes.defineEvent "Popup_Closed" (fun target -> (target :?> Popup).Closed)
+
+    let Opened =
+        Attributes.defineEventNoArg "Popup_Opened" (fun target -> (target :?> Popup).Opened)
+
+[<AutoOpen>]
+module PopupBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Popup widget.</summary>
+        /// <param name="isOpen">Whether the popup is open or not.</param>
+        /// <param name="content">The content of the popup.</param>
+        static member Popup(isOpen: bool, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabPopup>(
+                Popup.WidgetKey,
+                AttributesBundle(StackList.one(Popup.IsOpen.WithValue(isOpen)), ValueSome [| Popup.Child.WithValue(content.Compile()) |], ValueNone)
+            )
+
+type PopupModifiers =
+    /// <summary>Sets the WindowManagerAddShadowHint property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The WindowManagerAddShadowHint value.</param>
+    [<Extension>]
+    static member inline windowManagerAddShadowHint(this: WidgetBuilder<'msg, #IFabPopup>, value: bool) =
+        this.AddScalar(Popup.WindowManagerAddShadowHint.WithValue(value))
+
+    /// <summary>Sets the InheritsTransform property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The InheritsTransform value.</param>
+    [<Extension>]
+    static member inline inheritsTransform(this: WidgetBuilder<'msg, #IFabPopup>, value: bool) =
+        this.AddScalar(Popup.InheritsTransform.WithValue(value))
+
+    /// <summary>Sets the PlacementAnchor property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The PlacementAnchor value.</param>
+    [<Extension>]
+    static member inline placementAnchor(this: WidgetBuilder<'msg, #IFabPopup>, value: PopupAnchor) =
+        this.AddScalar(Popup.PlacementAnchor.WithValue(value))
+
+    /// <summary>Sets the PlacementConstraintAdjustment property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The PlacementConstraintAdjustment value.</param>
+    [<Extension>]
+    static member inline placementConstraintAdjustment(this: WidgetBuilder<'msg, #IFabPopup>, value: PopupPositionerConstraintAdjustment) =
+        this.AddScalar(Popup.PlacementConstraintAdjustment.WithValue(value))
+
+    /// <summary>Sets the PlacementGravity property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The PlacementGravity value.</param>
+    [<Extension>]
+    static member inline placementGravity(this: WidgetBuilder<'msg, #IFabPopup>, value: PopupGravity) =
+        this.AddScalar(Popup.PlacementGravity.WithValue(value))
+
+    /// <summary>Sets the Placement property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Placement value.</param>
+    [<Extension>]
+    static member inline placement(this: WidgetBuilder<'msg, #IFabPopup>, value: PlacementMode) =
+        this.AddScalar(Popup.Placement.WithValue(value))
+
+    /// <summary>Sets the PlacementTarget property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The PlacementTarget value.</param>
+    [<Extension>]
+    static member inline placementTarget(this: WidgetBuilder<'msg, #IFabPopup>, value: ViewRef<#Control>) =
+        match value.TryValue with
+        | None -> this
+        | Some value -> this.AddScalar(Popup.PlacementTarget.WithValue(value))
+
+    /// <summary>Sets the PlacementRect property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The PlacementRect value.</param>
+    [<Extension>]
+    static member inline placementRect(this: WidgetBuilder<'msg, #IFabPopup>, value: Rect) =
+        this.AddScalar(Popup.PlacementRect.WithValue(value))
+
+    /// <summary>Sets the OverlayDismissEventPassThrough property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The OverlayDismissEventPassThrough value.</param>
+    [<Extension>]
+    static member inline overlayDismissEventPassThrough(this: WidgetBuilder<'msg, #IFabPopup>, value: bool) =
+        this.AddScalar(Popup.OverlayDismissEventPassThrough.WithValue(value))
+
+    /// <summary>Sets the HorizontalOffset property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The HorizontalOffset value.</param>
+    [<Extension>]
+    static member inline horizontalOffset(this: WidgetBuilder<'msg, #IFabPopup>, value: float) =
+        this.AddScalar(Popup.HorizontalOffset.WithValue(value))
+
+    /// <summary>Sets the IsLightDismissEnabled property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsLightDismissEnabled value.</param>
+    [<Extension>]
+    static member inline isLightDismissEnabled(this: WidgetBuilder<'msg, #IFabPopup>, value: bool) =
+        this.AddScalar(Popup.IsLightDismissEnabled.WithValue(value))
+
+    /// <summary>Sets the VerticalOffset property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The VerticalOffset value.</param>
+    [<Extension>]
+    static member inline verticalOffset(this: WidgetBuilder<'msg, #IFabPopup>, value: float) =
+        this.AddScalar(Popup.VerticalOffset.WithValue(value))
+
+    /// <summary>Sets the Topmost property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Topmost value.</param>
+    [<Extension>]
+    static member inline topmost(this: WidgetBuilder<'msg, #IFabPopup>, value: bool) =
+        this.AddScalar(Popup.Topmost.WithValue(value))
+
+    /// <summary>Sets the OverlayInputPassThroughElement property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The OverlayInputPassThroughElement value.</param>
+    [<Extension>]
+    static member inline overlayInputPassThroughElement(this: WidgetBuilder<'msg, #IFabPopup>, value: IInputElement) =
+        this.AddScalar(Popup.OverlayInputPassThroughElement.WithValue(value))
+
+    /// <summary>Listens to the Popup Closed event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="msg">Raised when the Popup is closed.</param>
+    [<Extension>]
+    static member inline onClosed(this: WidgetBuilder<'msg, #IFabPopup>, msg: 'msg) =
+        this.AddScalar(Popup.Closed.WithValue(fun _ -> box msg))
+
+    /// <summary>Listens to the Popup Opened event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="msg">Raised when the Popup is opened.</param>
+    [<Extension>]
+    static member inline onOpened(this: WidgetBuilder<'msg, #IFabPopup>, msg: 'msg) =
+        this.AddScalar(Popup.Opened.WithValue(MsgValue msg))
+
+    /// <summary>Link a ViewRef to access the direct Popup control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabPopup>, value: ViewRef<Popup>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/ScrollBar.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/ScrollBar.fs
new file mode 100644
index 00000000..9fbfde71
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/ScrollBar.fs
@@ -0,0 +1,108 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Primitives
+open Avalonia.Layout
+open Fabulous
+
+type IFabScrollBar =
+    inherit IFabRangeBase
+
+module ScrollBar =
+    let WidgetKey = Widgets.register<ScrollBar>()
+
+    let ViewportSize =
+        Attributes.defineAvaloniaPropertyWithEquality ScrollBar.ViewportSizeProperty
+
+    let Visibility =
+        Attributes.defineAvaloniaPropertyWithEquality ScrollBar.VisibilityProperty
+
+    let Orientation =
+        Attributes.defineAvaloniaPropertyWithEquality ScrollBar.OrientationProperty
+
+    let AllowAutoHide =
+        Attributes.defineAvaloniaPropertyWithEquality ScrollBar.AllowAutoHideProperty
+
+    let HideDelay =
+        Attributes.defineAvaloniaPropertyWithEquality ScrollBar.HideDelayProperty
+
+    let ShowDelay =
+        Attributes.defineAvaloniaPropertyWithEquality ScrollBar.ShowDelayProperty
+
+    let Scroll =
+        Attributes.defineEvent "ScrollBar_Scroll" (fun target -> (target :?> ScrollBar).Scroll)
+
+[<AutoOpen>]
+module ScrollBarBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a ScrollBar widget.</summary>
+        /// <param name="min">Minimum value.</param>
+        /// <param name="max">Maximum value.</param>
+        /// <param name="value">Current value.</param>
+        /// <param name="fn">Raised when the value changes.</param>
+        static member inline ScrollBar(min: float, max: float, value: float, fn: float -> 'msg) =
+            WidgetBuilder<'msg, IFabScrollBar>(
+                ScrollBar.WidgetKey,
+                RangeBase.MinimumMaximum.WithValue(struct (min, max)),
+                RangeBase.ValueChanged.WithValue(ValueEventData.create value fn)
+            )
+
+type ScrollBarModifiers =
+
+    /// <summary>Sets the ViewportSize property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewportSize value.</param>
+    [<Extension>]
+    static member inline viewportSize(this: WidgetBuilder<'msg, #IFabScrollBar>, value: float) =
+        this.AddScalar(ScrollBar.ViewportSize.WithValue(value))
+
+    /// <summary>Sets the Visibility property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Visibility value.</param>
+    [<Extension>]
+    static member inline visibility(this: WidgetBuilder<'msg, #IFabScrollBar>, value: ScrollBarVisibility) =
+        this.AddScalar(ScrollBar.Visibility.WithValue(value))
+
+    /// <summary>Sets the Orientation property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Orientation value.</param>
+    [<Extension>]
+    static member inline orientation(this: WidgetBuilder<'msg, #IFabScrollBar>, value: Orientation) =
+        this.AddScalar(ScrollBar.Orientation.WithValue(value))
+
+    /// <summary>Sets the AllowAutoHide property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The AllowAutoHide value.</param>
+    [<Extension>]
+    static member inline allowAutoHide(this: WidgetBuilder<'msg, #IFabScrollBar>, value: bool) =
+        this.AddScalar(ScrollBar.AllowAutoHide.WithValue(value))
+
+    /// <summary>Sets the HideDelay property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The HideDelay value.</param>
+    [<Extension>]
+    static member inline hideDelay(this: WidgetBuilder<'msg, #IFabScrollBar>, value: TimeSpan) =
+        this.AddScalar(ScrollBar.HideDelay.WithValue(value))
+
+    /// <summary>Sets the ShowDelay property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ShowDelay value.</param>
+    [<Extension>]
+    static member inline showDelay(this: WidgetBuilder<'msg, #IFabScrollBar>, value: TimeSpan) =
+        this.AddScalar(ScrollBar.ShowDelay.WithValue(value))
+
+    /// <summary>Listens to the ScrollBar Scroll event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the Scroll value changes.</param>
+    [<Extension>]
+    static member inline onScroll(this: WidgetBuilder<'msg, #IFabScrollBar>, fn: ScrollEventArgs -> 'msg) =
+        this.AddScalar(ScrollBar.Scroll.WithValue(fn))
+
+    /// <summary>Link a ViewRef to access the direct ScrollBar control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabScrollBar>, value: ViewRef<ScrollBar>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/Thumb.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/Thumb.fs
new file mode 100644
index 00000000..59779d21
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/Thumb.fs
@@ -0,0 +1,68 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Primitives
+open Avalonia.Input
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabThumb =
+    inherit IFabTemplatedControl
+
+module Thumb =
+    let WidgetKey = Widgets.register<Thumb>()
+
+    let DragStarted =
+        Attributes.defineEvent<VectorEventArgs> "Thumb_DragStarted" (fun target -> (target :?> Thumb).DragStarted)
+
+    let DragDelta =
+        Attributes.defineEvent<VectorEventArgs> "Thumb_DragDelta" (fun target -> (target :?> Thumb).DragDelta)
+
+    let DragCompleted =
+        Attributes.defineEvent<VectorEventArgs> "Thumb_DragCompleted" (fun target -> (target :?> Thumb).DragCompleted)
+
+[<AutoOpen>]
+module ThumbBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Thumb widget.</summary>
+        static member Thumb() =
+            WidgetBuilder<'msg, IFabThumb>(Thumb.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+        /// <summary>Creates a Thumb widget.</summary>
+        /// <param name="template">The template to use for the Thumb.</param>
+        static member Thumb(template: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabThumb>(
+                Thumb.WidgetKey,
+                AttributesBundle(StackList.one(TemplatedControl.Template.WithValue(template.Compile())), ValueNone, ValueNone)
+            )
+
+type ThumbModifiers =
+
+    /// <summary>Listens to the Thumb DragStarted event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the Thumb dragged started.</param>
+    [<Extension>]
+    static member inline onDragStarted(this: WidgetBuilder<'msg, #IFabThumb>, fn: VectorEventArgs -> 'msg) =
+        this.AddScalar(Thumb.DragStarted.WithValue(fn))
+
+    /// <summary>Listens to the Thumb DragDelta event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the Thumb dragged.</param>
+    [<Extension>]
+    static member inline onDragDelta(this: WidgetBuilder<'msg, #IFabThumb>, fn: VectorEventArgs -> 'msg) =
+        this.AddScalar(Thumb.DragDelta.WithValue(fn))
+
+    /// <summary>Listens to the Thumb DragCompleted event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the Thumb dragged is completed.</param>
+    [<Extension>]
+    static member inline onDragCompleted(this: WidgetBuilder<'msg, #IFabThumb>, fn: VectorEventArgs -> 'msg) =
+        this.AddScalar(Thumb.DragCompleted.WithValue(fn))
+
+    /// <summary>Link a ViewRef to access the direct Thumb control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabThumb>, value: ViewRef<Thumb>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/_RangeBase.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/_RangeBase.fs
new file mode 100644
index 00000000..29a88d68
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Primitives/_RangeBase.fs
@@ -0,0 +1,61 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Primitives
+open Avalonia.Input
+open Fabulous
+
+type IFabRangeBase =
+    inherit IFabTemplatedControl
+
+module RangeBaseUpdaters =
+    let updateSliderMinMax _ (newValueOpt: struct (float * float) voption) (node: IViewNode) =
+        let slider = node.Target :?> RangeBase
+
+        match newValueOpt with
+        | ValueNone ->
+            slider.ClearValue(RangeBase.MinimumProperty)
+            slider.ClearValue(RangeBase.MaximumProperty)
+        | ValueSome(min, max) ->
+            let currMax = slider.GetValue(RangeBase.MaximumProperty)
+
+            if min > currMax then
+                slider.SetValue(RangeBase.MaximumProperty, max) |> ignore
+                slider.SetValue(RangeBase.MinimumProperty, min) |> ignore
+            else
+                slider.SetValue(RangeBase.MinimumProperty, min) |> ignore
+                slider.SetValue(RangeBase.MaximumProperty, max) |> ignore
+
+module RangeBase =
+    let MinimumMaximum =
+        Attributes.defineSimpleScalarWithEquality<struct (float * float)> "RangeBase_MinimumMaximum" RangeBaseUpdaters.updateSliderMinMax
+
+    let Minimum =
+        Attributes.defineAvaloniaPropertyWithEquality RangeBase.MinimumProperty
+
+    let Maximum =
+        Attributes.defineAvaloniaPropertyWithEquality RangeBase.MaximumProperty
+
+    let SmallChange =
+        Attributes.defineAvaloniaPropertyWithEquality RangeBase.SmallChangeProperty
+
+    let LargeChange =
+        Attributes.defineAvaloniaPropertyWithEquality RangeBase.LargeChangeProperty
+
+    let ValueChanged =
+        Attributes.defineAvaloniaPropertyWithChangedEvent' "RangeBase_ValueChanged" RangeBase.ValueProperty
+
+type RangeBaserModifiers =
+    /// <summary>Sets the SmallChange property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SmallChange value.</param>
+    [<Extension>]
+    static member inline smallChange(this: WidgetBuilder<'msg, #IFabRangeBase>, value: float) =
+        this.AddScalar(RangeBase.SmallChange.WithValue(value))
+
+    /// <summary>Sets the LargeChange property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The LargeChange value.</param>
+    [<Extension>]
+    static member inline largeChange(this: WidgetBuilder<'msg, #IFabRangeBase>, value: float) =
+        this.AddScalar(RangeBase.LargeChange.WithValue(value))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/ProgressBar.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/ProgressBar.fs
new file mode 100644
index 00000000..127d4f7b
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/ProgressBar.fs
@@ -0,0 +1,87 @@
+namespace Fabulous.Avalonia.Components
+
+open Avalonia.Controls
+open Avalonia.Layout
+open System.Runtime.CompilerServices
+
+open Fabulous
+
+type IFabProgressBar =
+    inherit IFabRangeBase
+
+module ProgressBar =
+    let WidgetKey = Widgets.register<ProgressBar>()
+
+    let IsIndeterminate =
+        Attributes.defineAvaloniaPropertyWithEquality ProgressBar.IsIndeterminateProperty
+
+    let Orientation =
+        Attributes.defineAvaloniaPropertyWithEquality ProgressBar.OrientationProperty
+
+    let Percentage =
+        Attributes.defineAvaloniaPropertyWithEquality ProgressBar.PercentageProperty
+
+    let ProgressTextFormat =
+        Attributes.defineAvaloniaPropertyWithEquality ProgressBar.ProgressTextFormatProperty
+
+    let ShowProgressText =
+        Attributes.defineAvaloniaPropertyWithEquality ProgressBar.ShowProgressTextProperty
+
+[<AutoOpen>]
+module ProgressBarBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a ProgressBar widget.</summary>
+        /// <param name="min">Minimum value.</param>
+        /// <param name="max">Maximum value.</param>
+        /// <param name="value">Current value.</param>
+        /// <param name="fn">Raised when the value changes.</param>
+        static member ProgressBar(min: float, max: float, value: float, fn: float -> 'msg) =
+            WidgetBuilder<'msg, IFabProgressBar>(
+                ProgressBar.WidgetKey,
+                RangeBase.MinimumMaximum.WithValue(struct (min, max)),
+                RangeBase.ValueChanged.WithValue(ValueEventData.create value fn)
+            )
+
+type ProgressBarModifiers =
+    /// <summary>Sets the IsIndeterminate property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsIndeterminate value.</param>
+    [<Extension>]
+    static member inline isIndeterminate(this: WidgetBuilder<'msg, #IFabProgressBar>, value: bool) =
+        this.AddScalar(ProgressBar.IsIndeterminate.WithValue(value))
+
+    /// <summary>Sets the Orientation property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Orientation value.</param>
+    [<Extension>]
+    static member inline orientation(this: WidgetBuilder<'msg, #IFabProgressBar>, value: Orientation) =
+        this.AddScalar(ProgressBar.Orientation.WithValue(value))
+
+    /// <summary>Sets the Percentage property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Percentage value.</param>
+    [<Extension>]
+    static member inline percentage(this: WidgetBuilder<'msg, #IFabProgressBar>, value: float) =
+        this.AddScalar(ProgressBar.Percentage.WithValue(value))
+
+    /// <summary>Sets the ProgressTextFormat property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ProgressTextFormat value.</param>
+    [<Extension>]
+    static member inline progressTextFormat(this: WidgetBuilder<'msg, #IFabProgressBar>, value: string) =
+        this.AddScalar(ProgressBar.ProgressTextFormat.WithValue(value))
+
+    /// <summary>Sets the ShowProgressText property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ShowProgressText value.</param>
+    [<Extension>]
+    static member inline showProgressText(this: WidgetBuilder<'msg, #IFabProgressBar>, value: bool) =
+        this.AddScalar(ProgressBar.ShowProgressText.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct ProgressBar control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabProgressBar>, value: ViewRef<ProgressBar>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/RefreshContainer.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/RefreshContainer.fs
new file mode 100644
index 00000000..6ee87a94
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/RefreshContainer.fs
@@ -0,0 +1,37 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Input
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentRefreshContainer =
+    inherit IFabComponentContentControl
+    inherit IFabRefreshContainer
+
+module ComponentRefreshContainer =
+    let RefreshRequested =
+        ComponentAttributes.defineEvent<RefreshRequestedEventArgs> "RefreshContainer_RefreshRequested" (fun target ->
+            (target :?> RefreshContainer).RefreshRequested)
+
+[<AutoOpen>]
+module ComponentRefreshContainerBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a RefreshContainer widget.</summary>
+        /// <param name="content">The content of the RefreshContainer.</param>
+        static member RefreshContainer(content: WidgetBuilder<unit, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentRefreshContainer>(
+                RefreshContainer.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
+            )
+
+type ComponentRefreshContainerModifiers =
+    /// <summary>Listens the RefreshContainer RefreshRequested event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the RefreshRequested event is fired.</param>
+    [<Extension>]
+    static member inline onRefreshRequested(this: WidgetBuilder<unit, #IFabComponentRefreshContainer>, fn: RefreshRequestedEventArgs -> unit) =
+        this.AddScalar(ComponentRefreshContainer.RefreshRequested.WithValue(fn))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/RefreshVisualizer.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/RefreshVisualizer.fs
new file mode 100644
index 00000000..4940c859
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/RefreshVisualizer.fs
@@ -0,0 +1,37 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Input
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFaComponentRefreshVisualizer =
+    inherit IFabComponentContentControl
+    inherit IFabRefreshVisualizer
+
+module ComponentRefreshVisualizer =
+    let RefreshRequested =
+        ComponentAttributes.defineEvent<RefreshRequestedEventArgs> "RefreshVisualizer_RefreshRequested" (fun target ->
+            (target :?> RefreshVisualizer).RefreshRequested)
+
+[<AutoOpen>]
+module ComponentRefreshVisualizerBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a RefreshVisualizer widget.</summary>
+        /// <param name="content">The content of the RefreshVisualizer.</param>
+        static member RefreshVisualizer(content: WidgetBuilder<unit, #IFabControl>) =
+            WidgetBuilder<unit, IFaComponentRefreshVisualizer>(
+                RefreshVisualizer.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
+            )
+
+type ComponentRefreshVisualizerModifiers =
+    /// <summary>Listens the RefreshVisualizer RefreshRequested event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the RefreshRequested event is fired.</param>
+    [<Extension>]
+    static member inline onRefreshRequested(this: WidgetBuilder<'msg, #IFaComponentRefreshVisualizer>, fn: RefreshRequestedEventArgs -> unit) =
+        this.AddScalar(ComponentRefreshVisualizer.RefreshRequested.WithValue(fn))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/SelectableTextBlock.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/SelectableTextBlock.fs
new file mode 100644
index 00000000..eaa62d7a
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/SelectableTextBlock.fs
@@ -0,0 +1,118 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Interactivity
+open Avalonia.Media
+open Avalonia.Media.Immutable
+open Fabulous
+open Fabulous.StackAllocatedCollections
+
+type IFabSelectableTextBlock =
+    inherit IFabTextBlock
+
+module SelectableTextBlock =
+    let WidgetKey = Widgets.register<SelectableTextBlock>()
+
+    let SelectionStart =
+        Attributes.defineAvaloniaPropertyWithEquality SelectableTextBlock.SelectionStartProperty
+
+    let SelectionEnd =
+        Attributes.defineAvaloniaPropertyWithEquality SelectableTextBlock.SelectionEndProperty
+
+    let SelectionBrushWidget =
+        Attributes.defineAvaloniaPropertyWidget SelectableTextBlock.SelectionBrushProperty
+
+    let SelectionBrush =
+        Attributes.defineAvaloniaPropertyWithEquality SelectableTextBlock.SelectionBrushProperty
+
+    let CopyingToClipboard =
+        Attributes.defineEvent "SelectableTextBlock_CopyingToClipboard" (fun target -> (target :?> SelectableTextBlock).CopyingToClipboard)
+
+[<AutoOpen>]
+module SelectableTextBlockBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a SelectableTextBlock widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="fn">Raised when the user copies the text to the clipboard.</param>
+        static member inline SelectableTextBlock(text: string, fn: RoutedEventArgs -> 'msg) =
+            WidgetBuilder<'msg, IFabSelectableTextBlock>(
+                SelectableTextBlock.WidgetKey,
+                TextBlock.Text.WithValue(text),
+                SelectableTextBlock.CopyingToClipboard.WithValue(fn)
+            )
+
+        /// <summary>Creates a SelectableTextBlock widget.</summary>
+        /// <param name="fn">Raised when the user copies the text to the clipboard.</param>
+        static member inline SelectableTextBlock(fn: RoutedEventArgs -> 'msg) =
+            CollectionBuilder<'msg, IFabSelectableTextBlock, IFabInline>(
+                SelectableTextBlock.WidgetKey,
+                TextBlock.Inlines,
+                SelectableTextBlock.CopyingToClipboard.WithValue(fn)
+            )
+
+type SelectableTextBlockModifiers =
+
+    /// <summary>Sets the SelectionStart property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionStart value.</param>
+    [<Extension>]
+    static member inline selectionStart(this: WidgetBuilder<'msg, #IFabSelectableTextBlock>, value: int) =
+        this.AddScalar(SelectableTextBlock.SelectionStart.WithValue(value))
+
+    /// <summary>Sets the SelectionEnd property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionEnd value.</param>
+    [<Extension>]
+    static member inline selectionEnd(this: WidgetBuilder<'msg, #IFabSelectableTextBlock>, value: int) =
+        this.AddScalar(SelectableTextBlock.SelectionEnd.WithValue(value))
+
+    /// <summary>Sets the SelectionBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionBrush value.</param>
+    [<Extension>]
+    static member inline selectionBrush(this: WidgetBuilder<'msg, #IFabSelectableTextBlock>, value: WidgetBuilder<'msg, #IFabBrush>) =
+        this.AddWidget(SelectableTextBlock.SelectionBrushWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the SelectionBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionBrush value.</param>
+    [<Extension>]
+    static member inline selectionBrush(this: WidgetBuilder<'msg, #IFabSelectableTextBlock>, value: IBrush) =
+        this.AddScalar(SelectableTextBlock.SelectionBrush.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct SelectableTextBlock control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabSelectableTextBlock>, value: ViewRef<SelectableTextBlock>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type SelectableTextBlockExtraModifiers =
+    /// <summary>Sets the SelectionBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionBrush value.</param>
+    [<Extension>]
+    static member inline selectionBrush(this: WidgetBuilder<'msg, #IFabSelectableTextBlock>, value: Color) =
+        SelectableTextBlockModifiers.selectionBrush(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the SelectionBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionBrush value.</param>
+    [<Extension>]
+    static member inline selectionBrush(this: WidgetBuilder<'msg, #IFabSelectableTextBlock>, value: string) =
+        SelectableTextBlockModifiers.selectionBrush(this, View.SolidColorBrush(value))
+
+type SelectableTextBlockCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabInline>
+        (_: AttributeCollectionBuilder<'msg, 'marker, IFabInline>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabInline>
+        (_: AttributeCollectionBuilder<'msg, 'marker, IFabInline>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Separator.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Separator.fs
new file mode 100644
index 00000000..f5f8f167
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Separator.fs
@@ -0,0 +1,28 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabSeparator =
+    inherit IFabTemplatedControl
+
+module Separator =
+    let WidgetKey = Widgets.register<Separator>()
+
+[<AutoOpen>]
+module SeparatorBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Separator widget.</summary>
+        static member Separator() =
+            WidgetBuilder<'msg, IFabSeparator>(Separator.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+type SeparatorModifiers =
+    /// <summary>Link a ViewRef to access the direct Separator control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabSeparator>, value: ViewRef<Separator>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Arc.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Arc.fs
new file mode 100644
index 00000000..7838c065
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Arc.fs
@@ -0,0 +1,35 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Shapes
+open Fabulous
+
+type IFabArc =
+    inherit IFabShape
+
+module Arc =
+    let WidgetKey = Widgets.register<Arc>()
+
+    let StartAngle =
+        Attributes.defineAvaloniaPropertyWithEquality Arc.StartAngleProperty
+
+    let SweepAngle =
+        Attributes.defineAvaloniaPropertyWithEquality Arc.SweepAngleProperty
+
+[<AutoOpen>]
+module ArcBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Arc widget/</summary>
+        /// <param name="startAngle">The starting angle/</param>
+        /// <param name="sweepAngle">The sweep angle.</param>
+        static member Arc(startAngle: float, sweepAngle: float) =
+            WidgetBuilder<'msg, IFabArc>(Arc.WidgetKey, Arc.StartAngle.WithValue(startAngle), Arc.SweepAngle.WithValue(sweepAngle))
+
+type ArcModifiers =
+    /// <summary>Link a ViewRef to access the direct Arc control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabArc>, value: ViewRef<Arc>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Ellipse.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Ellipse.fs
new file mode 100644
index 00000000..d95435de
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Ellipse.fs
@@ -0,0 +1,28 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Shapes
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabEllipse =
+    inherit IFabShape
+
+module Ellipse =
+    let WidgetKey = Widgets.register<Ellipse>()
+
+[<AutoOpen>]
+module EllipseBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Ellipse widget.</summary>
+        static member Ellipse() =
+            WidgetBuilder<'msg, IFabEllipse>(Ellipse.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+type EllipseModifiers =
+    /// <summary>Link a ViewRef to access the direct Ellipse control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabEllipse>, value: ViewRef<Ellipse>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Line.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Line.fs
new file mode 100644
index 00000000..7e3ce464
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Line.fs
@@ -0,0 +1,35 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Shapes
+open Avalonia
+open Fabulous
+
+type IFabLine =
+    inherit IFabShape
+
+module Line =
+    let WidgetKey = Widgets.register<Line>()
+
+    let StartPoint =
+        Attributes.defineAvaloniaPropertyWithEquality Line.StartPointProperty
+
+    let EndPoint = Attributes.defineAvaloniaPropertyWithEquality Line.EndPointProperty
+
+[<AutoOpen>]
+module LineBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Line widget.</summary>
+        /// <param name="starPoint">The start point of the line.</param>
+        /// <param name="endPoint">The end point of the line.</param>
+        static member Line(starPoint: Point, endPoint: Point) =
+            WidgetBuilder<'msg, IFabLine>(Line.WidgetKey, Line.StartPoint.WithValue(starPoint), Line.EndPoint.WithValue(endPoint))
+
+type LineModifiers =
+    /// <summary>Link a ViewRef to access the direct Line control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabLine>, value: ViewRef<Line>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Path.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Path.fs
new file mode 100644
index 00000000..d4d66d98
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Path.fs
@@ -0,0 +1,43 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Shapes
+open Avalonia.Media
+open Fabulous
+open Fabulous.StackAllocatedCollections
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabPath =
+    inherit IFabShape
+
+module Path =
+    let WidgetKey = Widgets.register<Path>()
+
+    let DataWidget = Attributes.defineAvaloniaPropertyWidget Path.DataProperty
+
+    let DataString = Attributes.defineAvaloniaPropertyWithEquality Path.DataProperty
+
+[<AutoOpen>]
+module PathBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Path widget.</summary>
+        /// <param name="content">The content of the Path.</param>
+        static member Path(content: WidgetBuilder<'msg, #IFabGeometry>) =
+            WidgetBuilder<'msg, IFabPath>(
+                Path.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| Path.DataWidget.WithValue(content.Compile()) |], ValueNone)
+            )
+
+        /// <summary>Creates a Path widget.</summary>
+        /// <param name="data">The content of the Path.</param>
+        static member Path(data: string) =
+            WidgetBuilder<'msg, IFabPath>(Path.WidgetKey, Path.DataString.WithValue(Geometry.Parse(data)))
+
+type PathModifiers =
+    /// <summary>Link a ViewRef to access the direct Path control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabPath>, value: ViewRef<Path>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Polygon.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Polygon.fs
new file mode 100644
index 00000000..22284233
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Polygon.fs
@@ -0,0 +1,41 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Collections.Generic
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Shapes
+open Avalonia
+open Fabulous
+
+type IFabPolygon =
+    inherit IFabShape
+
+module Polygon =
+    let WidgetKey = Widgets.register<Polygon>()
+
+    let Points =
+        Attributes.defineSimpleScalarWithEquality<Point list> "Polygon_Points" (fun _ newValueOpt node ->
+            let target = node.Target :?> AvaloniaObject
+
+            match newValueOpt with
+            | ValueNone -> target.ClearValue(Polygon.PointsProperty)
+            | ValueSome points ->
+                let coll = List<Point>()
+                points |> List.iter coll.Add
+                target.SetValue(Polygon.PointsProperty, coll) |> ignore)
+
+[<AutoOpen>]
+module PolygonBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Polygon widget.</summary>
+        /// <param name="points">The points of the polygon.</param>
+        static member Polygon(points: Point list) =
+            WidgetBuilder<'msg, IFabPolygon>(Polygon.WidgetKey, Polygon.Points.WithValue(points))
+
+type PolygonModifiers =
+    /// <summary>Link a ViewRef to access the direct Polygon control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabPolygon>, value: ViewRef<Polygon>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Polyline.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Polyline.fs
new file mode 100644
index 00000000..e198c7ca
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Polyline.fs
@@ -0,0 +1,41 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Collections.Generic
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Shapes
+open Avalonia
+open Fabulous
+
+type IFabPolyline =
+    inherit IFabShape
+
+module Polyline =
+    let WidgetKey = Widgets.register<Polyline>()
+
+    let Points =
+        Attributes.defineSimpleScalarWithEquality<Point list> "Polyline_Points" (fun _ newValueOpt node ->
+            let target = node.Target :?> AvaloniaObject
+
+            match newValueOpt with
+            | ValueNone -> target.ClearValue(Polyline.PointsProperty)
+            | ValueSome points ->
+                let coll = List<Point>()
+                points |> List.iter coll.Add
+                target.SetValue(Polyline.PointsProperty, coll) |> ignore)
+
+[<AutoOpen>]
+module PolylineBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Polyline widget.</summary>
+        /// <param name="points">The points of the polyline.</param>
+        static member Polyline(points: Point list) =
+            WidgetBuilder<'msg, IFabPolyline>(Polyline.WidgetKey, Polyline.Points.WithValue(points))
+
+type PolylineModifiers =
+    /// <summary>Link a ViewRef to access the direct Polyline control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabPolyline>, value: ViewRef<Polyline>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Rectangle.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Rectangle.fs
new file mode 100644
index 00000000..e10b70d9
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Rectangle.fs
@@ -0,0 +1,40 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Shapes
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabRectangle =
+    inherit IFabShape
+
+module Rectangle =
+    let WidgetKey = Widgets.register<Rectangle>()
+
+    let RadiusX =
+        Attributes.defineAvaloniaPropertyWithEquality Rectangle.RadiusXProperty
+
+    let RadiusY =
+        Attributes.defineAvaloniaPropertyWithEquality Rectangle.RadiusYProperty
+
+[<AutoOpen>]
+module RectangleBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Rectangle widget.</summary>
+        /// <param name="radiusX">The radius on the X-axis used to round the corners of the rectangle.</param>
+        /// <param name="radiusY">The radius on the Y-axis used to round the corners of the rectangle.</param>
+        static member Rectangle(radiusX: float, radiusY: float) =
+            WidgetBuilder<'msg, IFabRectangle>(Rectangle.WidgetKey, Rectangle.RadiusX.WithValue(radiusX), Rectangle.RadiusY.WithValue(radiusY))
+
+        /// <summary>Creates a Rectangle widget.</summary>
+        static member Rectangle() =
+            WidgetBuilder<'msg, IFabRectangle>(Rectangle.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+type RectangleModifiers =
+    /// <summary>Link a ViewRef to access the direct Rectangle control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabRectangle>, value: ViewRef<Rectangle>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Sector.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Sector.fs
new file mode 100644
index 00000000..a7056fd0
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/Sector.fs
@@ -0,0 +1,35 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Shapes
+open Fabulous
+
+type IFabSector =
+    inherit IFabShape
+
+module Sector =
+    let WidgetKey = Widgets.register<Sector>()
+
+    let StartAngle =
+        Attributes.defineAvaloniaPropertyWithEquality Sector.StartAngleProperty
+
+    let SweepAngle =
+        Attributes.defineAvaloniaPropertyWithEquality Sector.SweepAngleProperty
+
+[<AutoOpen>]
+module SectorBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Sector widget.</summary>
+        /// <param name="startAngle">The starting angle.</param>
+        /// <param name="sweepAngle">The sweep angle.</param>
+        static member Sector(startAngle: float, sweepAngle: float) =
+            WidgetBuilder<'msg, IFabSector>(Sector.WidgetKey, Sector.StartAngle.WithValue(startAngle), Sector.SweepAngle.WithValue(sweepAngle))
+
+type SectorModifiers =
+    /// <summary>Link a ViewRef to access the direct Sector control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabSector>, value: ViewRef<Sector>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/_Shape.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/_Shape.fs
new file mode 100644
index 00000000..155ae3a5
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Shapes/_Shape.fs
@@ -0,0 +1,147 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Shapes
+open Avalonia
+open Avalonia.Collections
+open Avalonia.Media
+open Avalonia.Media.Immutable
+open Fabulous
+
+type IFabShape =
+    inherit IFabControl
+
+module Shape =
+
+    let FillWidget = Attributes.defineAvaloniaPropertyWidget Shape.FillProperty
+
+    let Fill = Attributes.defineAvaloniaPropertyWithEquality Shape.FillProperty
+
+    let Stretch = Attributes.defineAvaloniaPropertyWithEquality Shape.StretchProperty
+
+    let StrokeWidget = Attributes.defineAvaloniaPropertyWidget Shape.StrokeProperty
+
+    let Stroke = Attributes.defineAvaloniaPropertyWithEquality Shape.StrokeProperty
+
+    let StrokeDashArray =
+        Attributes.defineSimpleScalarWithEquality<float list> "Shape_StrokeDashArray" (fun _ newValueOpt node ->
+            let target = node.Target :?> AvaloniaObject
+
+            match newValueOpt with
+            | ValueNone -> target.ClearValue(Shape.StrokeDashArrayProperty)
+            | ValueSome points ->
+                let coll = AvaloniaList<float>()
+                points |> List.iter coll.Add
+                target.SetValue(Shape.StrokeDashArrayProperty, coll) |> ignore)
+
+    let StrokeDashOffset =
+        Attributes.defineAvaloniaPropertyWithEquality Shape.StrokeDashOffsetProperty
+
+    let StrokeThickness =
+        Attributes.defineAvaloniaPropertyWithEquality Shape.StrokeThicknessProperty
+
+    let StrokeLineCap =
+        Attributes.defineAvaloniaPropertyWithEquality Shape.StrokeLineCapProperty
+
+    let StrokeJoin =
+        Attributes.defineAvaloniaPropertyWithEquality Shape.StrokeJoinProperty
+
+type ShapeModifiers =
+    /// <summary>Sets the Fill property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Fill value.</param>
+    [<Extension>]
+    static member inline fill(this: WidgetBuilder<'msg, #IFabShape>, value: WidgetBuilder<'msg, #IFabBrush>) =
+        this.AddWidget(Shape.FillWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the Fill property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Fill value.</param>
+    [<Extension>]
+    static member inline fill(this: WidgetBuilder<'msg, #IFabShape>, value: IBrush) =
+        this.AddScalar(Shape.Fill.WithValue(value))
+
+    /// <summary>Sets the Stretch property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Stretch value.</param>
+    [<Extension>]
+    static member inline stretch(this: WidgetBuilder<'msg, #IFabShape>, value: Stretch) =
+        this.AddScalar(Shape.Stretch.WithValue(value))
+
+    /// <summary>Sets the Stroke property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Stroke value.</param>
+    [<Extension>]
+    static member inline stroke(this: WidgetBuilder<'msg, #IFabShape>, value: WidgetBuilder<'msg, #IFabBrush>) =
+        this.AddWidget(Shape.StrokeWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the Stroke property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Stroke value.</param>
+    [<Extension>]
+    static member inline stroke(this: WidgetBuilder<'msg, #IFabShape>, value: IBrush) =
+        this.AddScalar(Shape.Stroke.WithValue(value))
+
+    /// <summary>Sets the StrokeDashArray property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StrokeDashArray value.</param>
+    [<Extension>]
+    static member inline strokeDashArray(this: WidgetBuilder<'msg, #IFabShape>, value: float list) =
+        this.AddScalar(Shape.StrokeDashArray.WithValue(value))
+
+    /// <summary>Sets the StrokeDashOffset property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StrokeDashOffset value.</param>
+    [<Extension>]
+    static member inline strokeDashOffset(this: WidgetBuilder<'msg, #IFabShape>, value: float) =
+        this.AddScalar(Shape.StrokeDashOffset.WithValue(value))
+
+    /// <summary>Sets the StrokeThickness property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StrokeThickness value.</param>
+    [<Extension>]
+    static member inline strokeThickness(this: WidgetBuilder<'msg, #IFabShape>, value: float) =
+        this.AddScalar(Shape.StrokeThickness.WithValue(value))
+
+    /// <summary>Sets the StrokeLineCap property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StrokeLineCap value.</param>
+    [<Extension>]
+    static member inline strokeLineCap(this: WidgetBuilder<'msg, #IFabShape>, value: PenLineCap) =
+        this.AddScalar(Shape.StrokeLineCap.WithValue(value))
+
+    /// <summary>Sets the StrokeJoin property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StrokeJoin value.</param>
+    [<Extension>]
+    static member inline strokeJoin(this: WidgetBuilder<'msg, #IFabShape>, value: PenLineJoin) =
+        this.AddScalar(Shape.StrokeJoin.WithValue(value))
+
+type ShapeExtraModifiers =
+    /// <summary>Sets the Fill property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Fill value.</param>
+    [<Extension>]
+    static member inline fill(this: WidgetBuilder<'msg, #IFabShape>, value: Color) =
+        ShapeModifiers.fill(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the Fill property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Fill value.</param>
+    [<Extension>]
+    static member inline fill(this: WidgetBuilder<'msg, #IFabShape>, value: string) =
+        ShapeModifiers.fill(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the Stroke property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Stroke value.</param>
+    [<Extension>]
+    static member inline stroke(this: WidgetBuilder<'msg, #IFabShape>, value: Color) =
+        ShapeModifiers.stroke(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the Stroke property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Stroke value.</param>
+    [<Extension>]
+    static member inline stroke(this: WidgetBuilder<'msg, #IFabShape>, value: string) =
+        ShapeModifiers.stroke(this, View.SolidColorBrush(value))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Slider.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Slider.fs
new file mode 100644
index 00000000..7a74c4ed
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Slider.fs
@@ -0,0 +1,113 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Collections
+open Avalonia.Controls
+open Avalonia.Layout
+
+open Fabulous
+
+type IFabSlider =
+    inherit IFabRangeBase
+
+module Slider =
+    let WidgetKey = Widgets.register<Slider>()
+
+    let Orientation =
+        Attributes.defineAvaloniaPropertyWithEquality Slider.OrientationProperty
+
+    let IsDirectionReversed =
+        Attributes.defineAvaloniaPropertyWithEquality Slider.IsDirectionReversedProperty
+
+    let IsSnapToTickEnabled =
+        Attributes.defineAvaloniaPropertyWithEquality Slider.IsSnapToTickEnabledProperty
+
+    let TickFrequency =
+        Attributes.defineAvaloniaPropertyWithEquality Slider.TickFrequencyProperty
+
+    let TickPlacement =
+        Attributes.defineAvaloniaPropertyWithEquality Slider.TickPlacementProperty
+
+    let Ticks =
+        Attributes.defineSimpleScalarWithEquality<float list> "Slider_Ticks" (fun _ newValueOpt node ->
+            let target = node.Target :?> AvaloniaObject
+
+            match newValueOpt with
+            | ValueNone -> target.ClearValue(Slider.TicksProperty)
+            | ValueSome points ->
+                let coll = AvaloniaList<float>()
+                points |> List.iter coll.Add
+                target.SetValue(Slider.TicksProperty, coll) |> ignore)
+
+[<AutoOpen>]
+module SliderBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Slider widget.</summary>
+        /// <param name="value">The initial value of the slider.</param>
+        /// <param name="fn">Raised when the slider value changes.</param>
+        static member Slider(value: float, fn: float -> 'msg) =
+            WidgetBuilder<'msg, IFabSlider>(Slider.WidgetKey, RangeBase.ValueChanged.WithValue(ValueEventData.create value fn))
+
+        /// <summary>Creates a Slider widget.</summary>
+        /// <param name="min">The minimum value of the slider.</param>
+        /// <param name="max">The maximum value of the slider.</param>
+        /// <param name="value">The initial value of the slider.</param>
+        /// <param name="fn">Raised when the slider value changes.</param>
+        static member inline Slider(min: float, max: float, value: float, fn: float -> 'msg) =
+            WidgetBuilder<'msg, IFabSlider>(
+                Slider.WidgetKey,
+                RangeBase.MinimumMaximum.WithValue(struct (min, max)),
+                RangeBase.ValueChanged.WithValue(ValueEventData.create value fn)
+            )
+
+type SliderModifiers =
+    /// <summary>Sets the Orientation property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Orientation value.</param>
+    [<Extension>]
+    static member inline orientation(this: WidgetBuilder<'msg, #IFabSlider>, value: Orientation) =
+        this.AddScalar(Slider.Orientation.WithValue(value))
+
+    /// <summary>Sets the IsDirectionReversed property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsDirectionReversed value.</param>
+    [<Extension>]
+    static member inline isDirectionReversed(this: WidgetBuilder<'msg, #IFabSlider>, value: bool) =
+        this.AddScalar(Slider.IsDirectionReversed.WithValue(value))
+
+    /// <summary>Sets the IsSnapToTickEnabled property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsSnapToTickEnabled value.</param>
+    [<Extension>]
+    static member inline isSnapToTickEnabled(this: WidgetBuilder<'msg, #IFabSlider>, value: bool) =
+        this.AddScalar(Slider.IsSnapToTickEnabled.WithValue(value))
+
+    /// <summary>Sets the TickFrequency property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The TickFrequency value.</param>
+    [<Extension>]
+    static member inline tickFrequency(this: WidgetBuilder<'msg, #IFabSlider>, value: float) =
+        this.AddScalar(Slider.TickFrequency.WithValue(value))
+
+    /// <summary>Sets the TickPlacement property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The TickPlacement value.</param>
+    [<Extension>]
+    static member inline tickPlacement(this: WidgetBuilder<'msg, #IFabSlider>, value: TickPlacement) =
+        this.AddScalar(Slider.TickPlacement.WithValue(value))
+
+    /// <summary>Sets the Ticks property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Ticks value.</param>
+    [<Extension>]
+    static member inline ticks(this: WidgetBuilder<'msg, #IFabSlider>, value: float list) =
+        this.AddScalar(Slider.Ticks.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct Slider control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabSlider>, value: ViewRef<Slider>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/TextBlock.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/TextBlock.fs
new file mode 100644
index 00000000..c659a76a
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/TextBlock.fs
@@ -0,0 +1,355 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Controls
+open Avalonia.Controls.Documents
+open Avalonia.Media
+open Fabulous
+open Fabulous.StackAllocatedCollections
+
+type IFabTextBlock =
+    inherit IFabControl
+
+module TextBlock =
+    let WidgetKey = Widgets.register<TextBlock>()
+
+    let BackgroundWidget =
+        Attributes.defineAvaloniaPropertyWidget TextBlock.BackgroundProperty
+
+    let Background =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.BackgroundProperty
+
+    let Padding =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.PaddingProperty
+
+    let FontFamily =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.FontFamilyProperty
+
+    let FontSize =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.FontSizeProperty
+
+    let FontStyle =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.FontStyleProperty
+
+    let FontWeight =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.FontWeightProperty
+
+    let FontStretch =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.FontStretchProperty
+
+    let ForegroundWidget =
+        Attributes.defineAvaloniaPropertyWidget TextBlock.ForegroundProperty
+
+    let Foreground =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.ForegroundProperty
+
+    let BaseLineOffset =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.BaselineOffsetProperty
+
+    let LineHeight =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.LineHeightProperty
+
+    let LetterSpacing =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.LetterSpacingProperty
+
+    let MaxLines =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.MaxLinesProperty
+
+    let Text = Attributes.defineAvaloniaPropertyWithEquality TextBlock.TextProperty
+
+    let TextAlignment =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.TextAlignmentProperty
+
+    let TextWrapping =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.TextWrappingProperty
+
+    let TextTrimming =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.TextTrimmingProperty
+
+    let LineSpacing =
+        Attributes.defineAvaloniaPropertyWithEquality TextBlock.LineSpacingProperty
+
+    let TextDecorations =
+        Attributes.defineAvaloniaListWidgetCollection "TextBlock_TextDecorations" (fun target ->
+            let target = target :?> TextBlock
+
+            if target.TextDecorations = null then
+                let newColl = TextDecorationCollection()
+                target.TextDecorations <- newColl
+                newColl
+            else
+                target.TextDecorations)
+
+    let Inlines =
+        Attributes.defineAvaloniaListWidgetCollection "TextBlock_Inlines" (fun target ->
+            let target = target :?> TextBlock
+
+            if target.Inlines = null then
+                let newColl = InlineCollection()
+                target.Inlines <- newColl
+                newColl
+            else
+                target.Inlines)
+
+[<AutoOpen>]
+module TextBlockBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a TextBlock widget.</summary>
+        /// <param name="text">The text to display.</param>
+        static member inline TextBlock(text: string) =
+            WidgetBuilder<'msg, IFabTextBlock>(TextBlock.WidgetKey, TextBlock.Text.WithValue(text))
+
+        /// <summary>Creates a TextBlock widget.</summary>
+        static member inline TextBlock() =
+            CollectionBuilder<'msg, IFabTextBlock, IFabInline>(TextBlock.WidgetKey, TextBlock.Inlines)
+
+type TextBlockModifiers =
+    /// <summary>Sets the Background property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Background value.</param>
+    [<Extension>]
+    static member inline background(this: WidgetBuilder<'msg, #IFabTextBlock>, value: WidgetBuilder<'msg, #IFabBrush>) =
+        this.AddWidget(TextBlock.BackgroundWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the Background property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Background value.</param>
+    [<Extension>]
+    static member inline background(this: WidgetBuilder<'msg, #IFabTextBlock>, value: IBrush) =
+        this.AddScalar(TextBlock.Background.WithValue(value))
+
+    /// <summary>Sets the Padding property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Padding value.</param>
+    [<Extension>]
+    static member inline padding(this: WidgetBuilder<'msg, #IFabTextBlock>, value: Thickness) =
+        this.AddScalar(TextBlock.Padding.WithValue(value))
+
+    /// <summary>Sets the FontFamily property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The FontFamily value.</param>
+    [<Extension>]
+    static member inline fontFamily(this: WidgetBuilder<'msg, #IFabTextBlock>, value: FontFamily) =
+        this.AddScalar(TextBlock.FontFamily.WithValue(value))
+
+    /// <summary>Sets the FontSize property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The FontSize value.</param>
+    [<Extension>]
+    static member inline fontSize(this: WidgetBuilder<'msg, #IFabTextBlock>, value: float) =
+        this.AddScalar(TextBlock.FontSize.WithValue(value))
+
+    /// <summary>Sets the FontStyle property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The FontStyle value.</param>
+    [<Extension>]
+    static member inline fontStyle(this: WidgetBuilder<'msg, #IFabTextBlock>, value: FontStyle) =
+        this.AddScalar(TextBlock.FontStyle.WithValue(value))
+
+    /// <summary>Sets the FontWeight property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The FontWeight value.</param>
+    [<Extension>]
+    static member inline fontWeight(this: WidgetBuilder<'msg, #IFabTextBlock>, value: FontWeight) =
+        this.AddScalar(TextBlock.FontWeight.WithValue(value))
+
+    /// <summary>Sets the FontStretch property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The FontStretch value.</param>
+    [<Extension>]
+    static member inline fontStretch(this: WidgetBuilder<'msg, #IFabTextBlock>, value: FontStretch) =
+        this.AddScalar(TextBlock.FontStretch.WithValue(value))
+
+    /// <summary>Sets the Foreground property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Foreground value.</param>
+    [<Extension>]
+    static member inline foreground(this: WidgetBuilder<'msg, #IFabTextBlock>, value: WidgetBuilder<'msg, #IFabBrush>) =
+        this.AddWidget(TextBlock.ForegroundWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the Foreground property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Foreground value.</param>
+    [<Extension>]
+    static member inline foreground(this: WidgetBuilder<'msg, #IFabTextBlock>, value: IBrush) =
+        this.AddScalar(TextBlock.Foreground.WithValue(value))
+
+    /// <summary>Sets the BaseLineOffset property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The BaseLineOffset value.</param>
+    [<Extension>]
+    static member inline baselineOffset(this: WidgetBuilder<'msg, #IFabTextBlock>, value: float) =
+        this.AddScalar(TextBlock.BaseLineOffset.WithValue(value))
+
+    /// <summary>Sets the LineHeight property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The LineHeight value.</param>
+    [<Extension>]
+    static member inline lineHeight(this: WidgetBuilder<'msg, #IFabTextBlock>, value: float) =
+        this.AddScalar(TextBlock.LineHeight.WithValue(value))
+
+    /// <summary>Sets the LetterSpacing property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The LetterSpacing value.</param>
+    [<Extension>]
+    static member inline letterSpacing(this: WidgetBuilder<'msg, #IFabTextBlock>, value: float) =
+        this.AddScalar(TextBlock.LetterSpacing.WithValue(value))
+
+    /// <summary>Sets the MaxLines property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The MaxLines value.</param>
+    [<Extension>]
+    static member inline maxLines(this: WidgetBuilder<'msg, #IFabTextBlock>, value: int) =
+        this.AddScalar(TextBlock.MaxLines.WithValue(value))
+
+    /// <summary>Sets the TextAlignment property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The TextAlignment value.</param>
+    [<Extension>]
+    static member inline textAlignment(this: WidgetBuilder<'msg, #IFabTextBlock>, value: TextAlignment) =
+        this.AddScalar(TextBlock.TextAlignment.WithValue(value))
+
+    /// <summary>Sets the TextWrapping property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The TextWrapping value.</param>
+    [<Extension>]
+    static member inline textWrapping(this: WidgetBuilder<'msg, #IFabTextBlock>, value: TextWrapping) =
+        this.AddScalar(TextBlock.TextWrapping.WithValue(value))
+
+    /// <summary>Sets the TextTrimming property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The TextTrimming value.</param>
+    [<Extension>]
+    static member inline textTrimming(this: WidgetBuilder<'msg, #IFabTextBlock>, value: TextTrimming) =
+        this.AddScalar(TextBlock.TextTrimming.WithValue(value))
+
+    /// <summary>Sets the LineSpacing property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The LineSpacing value.</param>
+    [<Extension>]
+    static member inline lineSpacing(this: WidgetBuilder<'msg, #IFabTextBlock>, value: float) =
+        this.AddScalar(TextBlock.LineSpacing.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct TextBlock control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabTextBlock>, value: ViewRef<TextBlock>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+
+type TextBlockExtraModifiers =
+    /// <summary>Sets the TextAlignment property to center.</summary>
+    /// <param name="this">Current widget.</param>
+    [<Extension>]
+    static member inline centerText(this: WidgetBuilder<'msg, #IFabTextBlock>) =
+        this.AddScalar(TextBlock.TextAlignment.WithValue(TextAlignment.Center))
+
+    /// <summary>Sets the Padding property uniformly.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Padding value.</param>
+    [<Extension>]
+    static member inline padding(this: WidgetBuilder<'msg, #IFabTextBlock>, value: float) =
+        TextBlockModifiers.padding(this, Thickness(value))
+
+    /// <summary>Sets the Padding property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="left">The left value.</param>
+    /// <param name="top">The top value.</param>
+    /// <param name="right">The right value.</param>
+    /// <param name="bottom">The bottom value.</param>
+    [<Extension>]
+    static member inline padding(this: WidgetBuilder<'msg, #IFabTextBlock>, left: float, top: float, right: float, bottom: float) =
+        TextBlockModifiers.padding(this, Thickness(left, top, right, bottom))
+
+    /// <summary>Sets the Padding property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="horizontal">The horizontal value.</param>
+    /// <param name="vertical">The vertical value.</param>
+    [<Extension>]
+    static member inline padding(this: WidgetBuilder<'msg, #IFabTextBlock>, horizontal: float, vertical) =
+        TextBlockModifiers.padding(this, Thickness(horizontal, vertical))
+
+    /// <summary>Sets the Background property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Background value.</param>
+    [<Extension>]
+    static member inline background(this: WidgetBuilder<'msg, #IFabTextBlock>, value: Color) =
+        TextBlockModifiers.background(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the Background property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Background value.</param>
+    [<Extension>]
+    static member inline background(this: WidgetBuilder<'msg, #IFabTextBlock>, value: string) =
+        TextBlockModifiers.background(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the Foreground property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Foreground value.</param>
+    [<Extension>]
+    static member inline foreground(this: WidgetBuilder<'msg, #IFabTextBlock>, value: Color) =
+        TextBlockModifiers.foreground(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the Foreground property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Foreground value.</param>
+    [<Extension>]
+    static member inline foreground(this: WidgetBuilder<'msg, #IFabTextBlock>, value: string) =
+        TextBlockModifiers.foreground(this, View.SolidColorBrush(value))
+
+type TextBlockCollectionBuilderExtensions =
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabTextDecoration>
+        (_: AttributeCollectionBuilder<'msg, 'marker, IFabTextDecoration>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabTextDecoration>
+        (_: AttributeCollectionBuilder<'msg, 'marker, IFabTextDecoration>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabInline>
+        (_: AttributeCollectionBuilder<'msg, 'marker, IFabInline>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabInline>
+        (_: AttributeCollectionBuilder<'msg, 'marker, IFabInline>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+type InlineCollectionModifiers =
+    /// <summary>Sets the TextDecorations property.</summary>
+    /// <param name="this">Current widget.</param>
+    [<Extension>]
+    static member inline textDecorations<'msg, 'marker when 'marker :> IFabInline>(this: WidgetBuilder<'msg, 'marker>) =
+        AttributeCollectionBuilder<'msg, 'marker, IFabTextDecoration>(this, Inline.TextDecorations)
+
+    /// <summary>Sets the TextDecorations property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The TextDecoration value.</param>
+    [<Extension>]
+    static member inline textDecoration(this: WidgetBuilder<'msg, #IFabInline>, value: WidgetBuilder<'msg, IFabTextDecoration>) =
+        AttributeCollectionBuilder<'msg, 'marker, IFabTextDecoration>(this, Inline.TextDecorations) { value }
+
+type TextBlockCollectionModifiers =
+    /// <summary>Sets the TextDecorations property.</summary>
+    /// <param name="this">Current widget.</param>
+    [<Extension>]
+    static member inline textDecorations<'msg, 'marker when 'marker :> IFabTextBlock>(this: WidgetBuilder<'msg, 'marker>) =
+        AttributeCollectionBuilder<'msg, 'marker, IFabTextDecoration>(this, TextBlock.TextDecorations)
+
+    /// <summary>Sets the TextDecorations property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The TextDecoration value.</param>
+    [<Extension>]
+    static member inline textDecoration(this: WidgetBuilder<'msg, #IFabTextBlock>, value: WidgetBuilder<'msg, IFabTextDecoration>) =
+        AttributeCollectionBuilder<'msg, 'marker, IFabTextDecoration>(this, TextBlock.TextDecorations) { value }
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/TextBox.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/TextBox.fs
new file mode 100644
index 00000000..37a05ddc
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/TextBox.fs
@@ -0,0 +1,404 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Media
+open Fabulous
+open Avalonia.Layout
+open Avalonia.Interactivity
+
+type IFabTextBox =
+    inherit IFabTemplatedControl
+
+module TextBox =
+    let WidgetKey = Widgets.register<TextBox>()
+
+    let TextAlignment =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.TextAlignmentProperty
+
+    let TextWrapping =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.TextWrappingProperty
+
+    let HorizontalContentAlignment =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.HorizontalContentAlignmentProperty
+
+    let VerticalContentAlignment =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.VerticalContentAlignmentProperty
+
+    let AcceptsReturn =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.AcceptsReturnProperty
+
+    let AcceptsTab =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.AcceptsTabProperty
+
+    let IsReadOnly =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.IsReadOnlyProperty
+
+    let IsUndoEnabled =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.IsUndoEnabledProperty
+
+    let UndoLimit =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.UndoLimitProperty
+
+    let LetterSpacing =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.LetterSpacingProperty
+
+    let LineHeight =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.LineHeightProperty
+
+    let MaxLength =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.MaxLengthProperty
+
+    let MaxLines =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.MaxLinesProperty
+
+    let PasswordChar =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.PasswordCharProperty
+
+    let RevealPassword =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.RevealPasswordProperty
+
+    let SelectionStart =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.SelectionStartProperty
+
+    let SelectionEnd =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.SelectionEndProperty
+
+    let Watermark =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.WatermarkProperty
+
+    let UseFloatingWatermark =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.UseFloatingWatermarkProperty
+
+    let CaretIndex =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.CaretIndexProperty
+
+    let NewLine = Attributes.defineAvaloniaPropertyWithEquality TextBox.NewLineProperty
+
+    let CaretBrushWidget =
+        Attributes.defineAvaloniaPropertyWidget TextBox.CaretBrushProperty
+
+    let CaretBrush =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.CaretBrushProperty
+
+    let SelectionBrushWidget =
+        Attributes.defineAvaloniaPropertyWidget TextBox.SelectionBrushProperty
+
+    let SelectionBrush =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.SelectionBrushProperty
+
+    let InnerLeftContentWidget =
+        Attributes.defineAvaloniaPropertyWidget TextBox.InnerLeftContentProperty
+
+    let InnerRightContentWidget =
+        Attributes.defineAvaloniaPropertyWidget TextBox.InnerRightContentProperty
+
+    let SelectionForegroundBrushWidget =
+        Attributes.defineAvaloniaPropertyWidget TextBox.SelectionForegroundBrushProperty
+
+    let SelectionForegroundBrush =
+        Attributes.defineAvaloniaPropertyWithEquality TextBox.SelectionForegroundBrushProperty
+
+    let TextChanged =
+        Attributes.defineAvaloniaPropertyWithChangedEvent' "TextBox_TextChanged" TextBox.TextProperty
+
+    let CopyingToClipboard =
+        Attributes.defineEvent<RoutedEventArgs> "TextBox_CopyingToClipboardEvent" (fun target -> (target :?> TextBox).CopyingToClipboard)
+
+    let CuttingToClipboard =
+        Attributes.defineEvent<RoutedEventArgs> "TextBox_CuttingToClipboard" (fun target -> (target :?> TextBox).CuttingToClipboard)
+
+    let PastingFromClipboard =
+        Attributes.defineEvent<RoutedEventArgs> "TextBox_PastingFromClipboardEvent" (fun target -> (target :?> TextBox).PastingFromClipboard)
+
+[<AutoOpen>]
+module TextBoxBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a TextBox widget.</summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="fn">Raised when the text changes.</param>
+        static member inline TextBox(text: string, fn: string -> 'msg) =
+            WidgetBuilder<'msg, IFabTextBox>(TextBox.WidgetKey, TextBox.TextChanged.WithValue(ValueEventData.create text fn))
+
+type TextBoxModifiers =
+
+    /// <summary>Sets the TextAlignment property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The TextAlignment value.</param>
+    [<Extension>]
+    static member inline textAlignment(this: WidgetBuilder<'msg, #IFabTextBox>, value: TextAlignment) =
+        this.AddScalar(TextBox.TextAlignment.WithValue(value))
+
+    /// <summary>Sets the TextWrapping property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The TextWrapping value.</param>
+    [<Extension>]
+    static member inline textWrapping(this: WidgetBuilder<'msg, #IFabTextBox>, value: TextWrapping) =
+        this.AddScalar(TextBox.TextWrapping.WithValue(value))
+
+    /// <summary>Sets the HorizontalContentAlignment property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The HorizontalContentAlignment value.</param>
+    [<Extension>]
+    static member inline horizontalContentAlignment(this: WidgetBuilder<'msg, #IFabTextBox>, value: HorizontalAlignment) =
+        this.AddScalar(TextBox.HorizontalContentAlignment.WithValue(value))
+
+    /// <summary>Sets the VerticalContentAlignment property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The VerticalContentAlignment value.</param>
+    [<Extension>]
+    static member inline verticalContentAlignment(this: WidgetBuilder<'msg, #IFabTextBox>, value: VerticalAlignment) =
+        this.AddScalar(TextBox.VerticalContentAlignment.WithValue(value))
+
+    /// <summary>Sets the AcceptsReturn property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The AcceptsReturn value.</param>
+    [<Extension>]
+    static member acceptsReturn(this: WidgetBuilder<'msg, #IFabTextBox>, value: bool) =
+        this.AddScalar(TextBox.AcceptsReturn.WithValue(value))
+
+    /// <summary>Sets the AcceptsTab property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The AcceptsTab value.</param>
+    [<Extension>]
+    static member acceptsTab(this: WidgetBuilder<'msg, #IFabTextBox>, value: bool) =
+        this.AddScalar(TextBox.AcceptsTab.WithValue(value))
+
+    /// <summary>Sets the IsReadOnly property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsReadOnly value.</param>
+    [<Extension>]
+    static member inline isReadOnly(this: WidgetBuilder<'msg, #IFabTextBox>, value: bool) =
+        this.AddScalar(TextBox.IsReadOnly.WithValue(value))
+
+    /// <summary>Sets the IsUndoEnabled property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsUndoEnabled value.</param>
+    [<Extension>]
+    static member inline isUndoEnabled(this: WidgetBuilder<'msg, #IFabTextBox>, value: bool) =
+        this.AddScalar(TextBox.IsUndoEnabled.WithValue(value))
+
+    /// <summary>Sets the UndoLimit property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The UndoLimit value.</param>
+    [<Extension>]
+    static member inline undoLimit(this: WidgetBuilder<'msg, #IFabTextBox>, value: int) =
+        this.AddScalar(TextBox.UndoLimit.WithValue(value))
+
+    /// <summary>Sets the LetterSpacing property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The LetterSpacing value.</param>
+    [<Extension>]
+    static member inline letterSpacing(this: WidgetBuilder<'msg, #IFabTextBox>, value: float) =
+        this.AddScalar(TextBox.LetterSpacing.WithValue(value))
+
+    /// <summary>Sets the LineHeight property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The LineHeight value.</param>
+    [<Extension>]
+    static member inline lineHeight(this: WidgetBuilder<'msg, #IFabTextBox>, value: float) =
+        this.AddScalar(TextBox.LineHeight.WithValue(value))
+
+    /// <summary>Sets the MaxLength property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The MaxLength value.</param>
+    [<Extension>]
+    static member inline maxLength(this: WidgetBuilder<'msg, #IFabTextBox>, value: int) =
+        this.AddScalar(TextBox.MaxLength.WithValue(value))
+
+    /// <summary>Sets the MinLines property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The MinLines value.</param>
+    [<Extension>]
+    static member inline maxLines(this: WidgetBuilder<'msg, #IFabTextBox>, value: int) =
+        this.AddScalar(TextBox.MaxLines.WithValue(value))
+
+    /// <summary>Sets the PasswordChar property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The PasswordChar value.</param>
+    [<Extension>]
+    static member inline passwordChar(this: WidgetBuilder<'msg, #IFabTextBox>, value: char) =
+        this.AddScalar(TextBox.PasswordChar.WithValue(value))
+
+    /// <summary>Sets the RevealedPassword property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The RevealedPassword value.</param>
+    [<Extension>]
+    static member inline revealPassword(this: WidgetBuilder<'msg, #IFabTextBox>, value: bool) =
+        this.AddScalar(TextBox.RevealPassword.WithValue(value))
+
+    /// <summary>Sets the SelectionStart property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionStart value.</param>
+    [<Extension>]
+    static member inline selectionStart(this: WidgetBuilder<'msg, #IFabTextBox>, value: int) =
+        this.AddScalar(TextBox.SelectionStart.WithValue(value))
+
+    /// <summary>Sets the SelectionEnd property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionEnd value.</param>
+    [<Extension>]
+    static member inline selectionEnd(this: WidgetBuilder<'msg, #IFabTextBox>, value: int) =
+        this.AddScalar(TextBox.SelectionEnd.WithValue(value))
+
+    /// <summary>Sets the Watermark property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Watermark value.</param>
+    [<Extension>]
+    static member inline watermark(this: WidgetBuilder<'msg, #IFabTextBox>, value: string) =
+        this.AddScalar(TextBox.Watermark.WithValue(value))
+
+    /// <summary>Sets the UseFloatingWatermark property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The UseFloatingWatermark value.</param>
+    [<Extension>]
+    static member inline useFloatingWatermark(this: WidgetBuilder<'msg, #IFabTextBox>, value: bool) =
+        this.AddScalar(TextBox.UseFloatingWatermark.WithValue(value))
+
+    /// <summary>Sets the CaretIndex property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The CaretIndex value.</param>
+    [<Extension>]
+    static member inline caretIndex(this: WidgetBuilder<'msg, #IFabTextBox>, value: int) =
+        this.AddScalar(TextBox.CaretIndex.WithValue(value))
+
+    /// <summary>Sets the NewLine property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The NewLine value.</param>
+    [<Extension>]
+    static member inline newLine(this: WidgetBuilder<'msg, #IFabTextBox>, value: string) =
+        this.AddScalar(TextBox.NewLine.WithValue(value))
+
+    /// <summary>Sets the CaretBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The CaretBrush value.</param>
+    [<Extension>]
+    static member inline caretBrush(this: WidgetBuilder<'msg, #IFabTextBox>, value: WidgetBuilder<'msg, #IFabBrush>) =
+        this.AddWidget(TextBox.CaretBrushWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the CaretBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The CaretBrush value.</param>
+    [<Extension>]
+    static member inline caretBrush(this: WidgetBuilder<'msg, #IFabTextBox>, value: IBrush) =
+        this.AddScalar(TextBox.CaretBrush.WithValue(value))
+
+    /// <summary>Sets the InnerLeftContent property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The InnerLeftContent value.</param>
+    [<Extension>]
+    static member inline innerLeftContent(this: WidgetBuilder<'msg, #IFabTextBox>, value: WidgetBuilder<'msg, #IFabControl>) =
+        this.AddWidget(TextBox.InnerLeftContentWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the InnerRightContent property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The InnerRightContent value.</param>
+    [<Extension>]
+    static member inline innerRightContent(this: WidgetBuilder<'msg, #IFabTextBox>, value: WidgetBuilder<'msg, #IFabControl>) =
+        this.AddWidget(TextBox.InnerRightContentWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the SelectionBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionBrush value.</param>
+    [<Extension>]
+    static member inline selectionBrush(this: WidgetBuilder<'msg, #IFabTextBox>, value: WidgetBuilder<'msg, #IFabBrush>) =
+        this.AddWidget(TextBox.SelectionBrushWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the SelectionBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionBrush value.</param>
+    [<Extension>]
+    static member inline selectionBrush(this: WidgetBuilder<'msg, #IFabTextBox>, value: IBrush) =
+        this.AddScalar(TextBox.SelectionBrush.WithValue(value))
+
+    /// <summary>Sets the SelectionForegroundBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionForegroundBrush value.</param>
+    [<Extension>]
+    static member inline selectionForegroundBrush(this: WidgetBuilder<'msg, #IFabTextBox>, value: WidgetBuilder<'msg, #IFabBrush>) =
+        this.AddWidget(TextBox.SelectionForegroundBrushWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the SelectionForegroundBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionForegroundBrush value.</param>
+    [<Extension>]
+    static member inline selectionForegroundBrush(this: WidgetBuilder<'msg, #IFabTextBox>, value: IBrush) =
+        this.AddScalar(TextBox.SelectionForegroundBrush.WithValue(value))
+
+    /// /// <summary>Listens to the TexBox CopyingToClipboard event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the CopyingToClipboard changes.</param>
+    [<Extension>]
+    static member inline onCopyingToClipboard(this: WidgetBuilder<'msg, #IFabTextBox>, fn: RoutedEventArgs -> 'msg) =
+        this.AddScalar(TextBox.CopyingToClipboard.WithValue(fn))
+
+    /// <summary>Listens to the TexBox CuttingToClipboard event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the CuttingToClipboard changes.</param>
+    [<Extension>]
+    static member inline onCuttingToClipboard(this: WidgetBuilder<'msg, #IFabTextBox>, fn: RoutedEventArgs -> 'msg) =
+        this.AddScalar(TextBox.CuttingToClipboard.WithValue(fn))
+
+    /// <summary>Listens to the TexBox PastingFromClipboard event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the PastingFromClipboard changes.</param>
+    [<Extension>]
+    static member inline onPastingFromClipboard(this: WidgetBuilder<'msg, #IFabTextBox>, fn: RoutedEventArgs -> 'msg) =
+        this.AddScalar(TextBox.PastingFromClipboard.WithValue(fn))
+
+    /// <summary>Link a ViewRef to access the direct TextBox control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabTextBox>, value: ViewRef<TextBox>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type TextBoxExtraModifiers =
+    /// <summary>Sets the TextAlignment to center.</summary>
+    /// <param name="this">Current widget.</param>
+    [<Extension>]
+    static member inline centerText(this: WidgetBuilder<'msg, #IFabTextBox>) =
+        this.AddScalar(TextBox.TextAlignment.WithValue(TextAlignment.Center))
+
+    /// <summary>Sets the CaretBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The CaretBrush value.</param>
+    [<Extension>]
+    static member inline caretBrush(this: WidgetBuilder<'msg, #IFabTextBox>, value: Color) =
+        TextBoxModifiers.caretBrush(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the CaretBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The CaretBrush value.</param>
+    [<Extension>]
+    static member inline caretBrush(this: WidgetBuilder<'msg, #IFabTextBox>, value: string) =
+        TextBoxModifiers.caretBrush(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the SelectionBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionBrush value.</param>
+    [<Extension>]
+    static member inline selectionBrush(this: WidgetBuilder<'msg, #IFabTextBox>, value: Color) =
+        TextBoxModifiers.selectionBrush(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the SelectionBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionBrush value.</param>
+    [<Extension>]
+    static member inline selectionBrush(this: WidgetBuilder<'msg, #IFabTextBox>, value: string) =
+        TextBoxModifiers.selectionBrush(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the SelectionForegroundBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionForegroundBrush value.</param>
+    [<Extension>]
+    static member inline selectionForegroundBrush(this: WidgetBuilder<'msg, #IFabTextBox>, value: Color) =
+        TextBoxModifiers.selectionForegroundBrush(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the SelectionForegroundBrush property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SelectionForegroundBrush value.</param>
+    [<Extension>]
+    static member inline selectionForegroundBrush(this: WidgetBuilder<'msg, #IFabTextBox>, value: string) =
+        TextBoxModifiers.selectionForegroundBrush(this, View.SolidColorBrush(value))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/ThemeVariantScope.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/ThemeVariantScope.fs
new file mode 100644
index 00000000..54d1d9b6
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/ThemeVariantScope.fs
@@ -0,0 +1,42 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Styling
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentThemeVariantScope =
+    inherit IFabComponentDecorator
+    inherit IFabThemeVariantScope
+
+module ComponentThemeVariantScope =
+    let ActualThemeVariantChanged =
+        ComponentAttributes.defineEventNoArg "TopLevel_ThemeVariantChanged" (fun target -> (target :?> ThemeVariantScope).ActualThemeVariantChanged)
+
+[<AutoOpen>]
+module ComponentThemeVariantScopeBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ThemeVariantScope widget.</summary>
+        /// <param name="theme">The theme variant to use.</param>
+        /// <param name="content">The content of the ThemeVariantScope.</param>
+        static member ThemeVariantScope(theme: ThemeVariant, content: WidgetBuilder<unit, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentThemeVariantScope>(
+                ThemeVariantScope.WidgetKey,
+                AttributesBundle(
+                    StackList.one(ThemeVariantScope.RequestedThemeVariant.WithValue(theme)),
+                    ValueSome [| Decorator.ChildWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+type ComponentThemeVariantScopeModifiers =
+
+    /// <summary>Listens the ThemeVariantScope ThemeVariantChanged event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the ThemeVariantChanged event is raised.</param>
+    [<Extension>]
+    static member inline onActualThemeVariantChanged(this: WidgetBuilder<unit, #IFabComponentThemeVariantScope>, fn: unit -> unit) =
+        this.AddScalar(ComponentThemeVariantScope.ActualThemeVariantChanged.WithValue(fn))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/TickBar.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/TickBar.fs
new file mode 100644
index 00000000..7e54163f
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/TickBar.fs
@@ -0,0 +1,18 @@
+namespace Fabulous.Avalonia.Components
+
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentTickBar =
+    inherit IFabComponentControl
+    inherit IFabTickBar
+
+[<AutoOpen>]
+module ComponentTickBarBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a TickBar widget.</summary>
+        /// <param name="min">The minimum value.</param>
+        /// <param name="max">The maximum value.</param>
+        static member TickBar(min: float, max: float) =
+            WidgetBuilder<unit, IFabComponentTickBar>(TickBar.WidgetKey, TickBar.Minimum.WithValue(min), TickBar.Maximum.WithValue(max))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/TimePicker.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/TimePicker.fs
new file mode 100644
index 00000000..1fd0bb5f
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/TimePicker.fs
@@ -0,0 +1,62 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+
+type IFabTimePicker =
+    inherit IFabTemplatedControl
+
+module TimePicker =
+    let WidgetKey = Widgets.register<TimePicker>()
+
+    let ClockIdentifier =
+        Attributes.defineAvaloniaPropertyWithEquality TimePicker.ClockIdentifierProperty
+
+    let MinuteIncrement =
+        Attributes.defineAvaloniaPropertyWithEquality TimePicker.MinuteIncrementProperty
+
+    let SelectedTimeChanged =
+        Attributes.defineAvaloniaPropertyWithChangedEvent "TimePicker_SelectedTimeChanged" TimePicker.SelectedTimeProperty Nullable Nullable.op_Explicit
+
+[<AutoOpen>]
+module TimePickerBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a TimePicker widget.</summary>
+        /// <param name="time">The initial time.</param>
+        /// <param name="fn">Raised when the selected time changes.</param>
+        static member TimePicker(time: TimeSpan, fn: TimeSpan -> 'msg) =
+            WidgetBuilder<'msg, IFabTimePicker>(TimePicker.WidgetKey, TimePicker.SelectedTimeChanged.WithValue(ValueEventData.create time fn))
+
+type TimePickerModifiers =
+
+    /// <summary>Sets the ClockIdentifier property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ClockIdentifier value.</param>
+    [<Extension>]
+    static member inline clockIdentifier(this: WidgetBuilder<'msg, #IFabTimePicker>, value: string) =
+        this.AddScalar(TimePicker.ClockIdentifier.WithValue(value))
+
+    /// <summary>Sets the MinuteIncrement property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The MinuteIncrement value.</param>
+    [<Extension>]
+    static member inline minuteIncrement(this: WidgetBuilder<'msg, #IFabTimePicker>, value: int) =
+        this.AddScalar(TimePicker.MinuteIncrement.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct TimePicker control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabTimePicker>, value: ViewRef<TimePicker>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type TimePickerExtraModifiers =
+    /// <summary>Sets the ClockIdentifier property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ClockIdentifier value.</param>
+    [<Extension>]
+    static member inline use24HourClock(this: WidgetBuilder<'msg, #IFabTimePicker>, value: bool) =
+        this.AddScalar(TimePicker.ClockIdentifier.WithValue(if value then "24HourClock" else "12HourClock"))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/ToggleSwitch.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/ToggleSwitch.fs
new file mode 100644
index 00000000..4a88657c
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/ToggleSwitch.fs
@@ -0,0 +1,123 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Runtime.CompilerServices
+open Avalonia.Animation
+open Avalonia.Controls
+open Fabulous
+
+type IFabToggleSwitch =
+    inherit IFabToggleButton
+
+module ToggleSwitch =
+    let WidgetKey = Widgets.register<ToggleSwitch>()
+
+    let OffContent =
+        Attributes.defineAvaloniaProperty<string, obj> ToggleSwitch.OffContentProperty box ScalarAttributeComparers.equalityCompare
+
+    let OffContentWidget =
+        Attributes.defineAvaloniaPropertyWidget ToggleSwitch.OffContentProperty
+
+    let OnContent =
+        Attributes.defineAvaloniaProperty<string, obj> ToggleSwitch.OnContentProperty box ScalarAttributeComparers.equalityCompare
+
+    let OnContentWidget =
+        Attributes.defineAvaloniaPropertyWidget ToggleSwitch.OnContentProperty
+
+    let KnobTransitions =
+        Attributes.defineAvaloniaListWidgetCollection "ToggleSwitch_KnobTransitions" (fun target ->
+            let target = (target :?> ToggleSwitch)
+
+            if target.Transitions = null then
+                let newColl = Transitions()
+                target.Transitions <- newColl
+                newColl
+            else
+                target.Transitions)
+
+[<AutoOpen>]
+module ToggleSwitchBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a ToggleSwitch widget.</summary>
+        /// <param name="isChecked">Whether the ToggleSwitch is checked.</param>
+        /// <param name="fn">Raised when the ToggleSwitch value changes.</param>
+        static member ToggleSwitch(isChecked: bool, fn: bool -> 'msg) =
+            WidgetBuilder<'msg, IFabToggleSwitch>(
+                ToggleSwitch.WidgetKey,
+                ToggleButton.IsThreeState.WithValue(false),
+                ToggleButton.CheckedChanged.WithValue(ValueEventData.create isChecked fn)
+            )
+
+        /// <summary>Creates a ThreeStateToggleSwitch widget.</summary>
+        /// <param name="isChecked">Whether the ToggleSwitch is checked.</param>
+        /// <param name="fn">Raised when the ToggleSwitch value changes.</param>
+        static member ThreeStateToggleSwitch(isChecked: bool option, fn: bool option -> 'msg) =
+            WidgetBuilder<'msg, IFabToggleSwitch>(
+                ToggleSwitch.WidgetKey,
+                ToggleButton.IsThreeState.WithValue(true),
+                ToggleButton.ThreeStateCheckedChanged.WithValue(ValueEventData.createVOption (ThreeState.fromOption(isChecked)) (ThreeState.toOption >> fn))
+            )
+
+type ToggleSwitchModifiers =
+    /// <summary>Sets the OffContent property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The OffContent value.</param>
+    [<Extension>]
+    static member inline offContent(this: WidgetBuilder<'msg, #IFabToggleSwitch>, value: string) =
+        this.AddScalar(ToggleSwitch.OffContent.WithValue(value))
+
+    /// <summary>Sets the OffContent property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The OffContent value.</param>
+    [<Extension>]
+    static member inline offContent(this: WidgetBuilder<'msg, #IFabToggleSwitch>, value: WidgetBuilder<'msg, #IFabControl>) =
+        this.AddWidget(ToggleSwitch.OffContentWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the OnContent property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The OnContent value.</param>
+    [<Extension>]
+    static member inline onContent(this: WidgetBuilder<'msg, #IFabToggleSwitch>, value: string) =
+        this.AddScalar(ToggleSwitch.OnContent.WithValue(value))
+
+    /// <summary>Sets the OnContent property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The OnContent value.</param>
+    [<Extension>]
+    static member inline onContent(this: WidgetBuilder<'msg, #IFabToggleSwitch>, value: WidgetBuilder<'msg, #IFabControl>) =
+        this.AddWidget(ToggleSwitch.OnContentWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the Content property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Content value.</param>
+    [<Extension>]
+    static member inline content(this: WidgetBuilder<'msg, #IFabToggleSwitch>, value: string) =
+        this.AddScalar(ContentControl.ContentString.WithValue(value))
+
+    /// <summary>Sets the Content property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Content value.</param>
+    [<Extension>]
+    static member inline content(this: WidgetBuilder<'msg, #IFabToggleSwitch>, value: WidgetBuilder<'msg, #IFabControl>) =
+        this.AddWidget(ContentControl.ContentWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the KnobTransitions property.</summary>
+    /// <param name="this">Current widget.</param>
+    [<Extension>]
+    static member inline knobTransitions(this: WidgetBuilder<'msg, #IFabToggleSwitch>) =
+        AttributeCollectionBuilder<'msg, #IFabToggleSwitch, IFabTransition>(this, ToggleSwitch.KnobTransitions)
+
+    /// <summary>Sets the KnobTransitions property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The KnobTransitions value.</param>
+    [<Extension>]
+    static member inline knobTransition(this: WidgetBuilder<'msg, #IFabToggleSwitch>, value: WidgetBuilder<'msg, #IFabTransition>) =
+        AttributeCollectionBuilder<'msg, #IFabToggleSwitch, IFabTransition>(this, ToggleSwitch.KnobTransitions) { value }
+
+    /// <summary>Link a ViewRef to access the direct ToggleSwitch control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabToggleSwitch>, value: ViewRef<ToggleSwitch>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Tooltip.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Tooltip.fs
new file mode 100644
index 00000000..bfb4c037
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Tooltip.fs
@@ -0,0 +1,24 @@
+namespace Fabulous.Avalonia.Components
+
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentToolTip =
+    inherit IFabComponentContentControl
+    inherit IFabToolTip
+
+[<AutoOpen>]
+module ComponentToolTipBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ToolTip widget.</summary>
+        static member ToolTip(content: string) =
+            WidgetBuilder<unit, IFabComponentToolTip>(ToolTip.WidgetKey, ContentControl.ContentString.WithValue(content))
+
+        /// <summary>Creates a ToolTip widget.</summary>
+        static member ToolTip(content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentToolTip>(
+                ToolTip.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
+            )
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/TransitioningContentControl.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/TransitioningContentControl.fs
new file mode 100644
index 00000000..75af82a2
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/TransitioningContentControl.fs
@@ -0,0 +1,52 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Animation
+open Avalonia.Controls
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabTransitioningContentControl =
+    inherit IFabContentControl
+
+module TransitioningContentControl =
+    let WidgetKey = Widgets.register<TransitioningContentControl>()
+
+    let PageTransition =
+        Attributes.defineAvaloniaPropertyWithEquality TransitioningContentControl.PageTransitionProperty
+
+    let IsTransitionReversed =
+        Attributes.defineAvaloniaPropertyWithEquality TransitioningContentControl.IsTransitionReversedProperty
+
+[<AutoOpen>]
+module TransitioningContentControlBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a TransitioningContentControl widget.</summary>
+        static member TransitioningContentControl(content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabTransitioningContentControl>(
+                TransitioningContentControl.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
+            )
+
+type TransitioningContentControlModifiers =
+    /// <summary>Link a ViewRef to access the direct TransitioningContentControl control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabTransitioningContentControl>, value: ViewRef<TransitioningContentControl>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+    /// <summary>Sets the PageTransition property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The PageTransition value.</param>
+    [<Extension>]
+    static member inline pageTransition(this: WidgetBuilder<'msg, #IFabTransitioningContentControl>, value: #IPageTransition) =
+        this.AddScalar(TransitioningContentControl.PageTransition.WithValue(value))
+
+    /// <summary>Sets the IsTransitionReversed property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsTransitionReversed value.</param>
+    [<Extension>]
+    static member inline isTransitionReversed(this: WidgetBuilder<'msg, #IFabTransitioningContentControl>, value: bool) =
+        this.AddScalar(TransitioningContentControl.IsTransitionReversed.WithValue(value))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/UserControl.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/UserControl.fs
new file mode 100644
index 00000000..76f1727f
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/UserControl.fs
@@ -0,0 +1,32 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabUserControl =
+    inherit IFabContentControl
+
+module UserControl =
+    let WidgetKey = Widgets.register<UserControl>()
+
+[<AutoOpen>]
+module UserControlBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a UserControl widget.</summary>
+        /// <param name="content">The content of the UserControl.</param>
+        static member UserControl(content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabUserControl>(
+                UserControl.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
+            )
+
+type UserControlModifiers =
+    /// <summary>Link a ViewRef to access the direct UserControl control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabUserControl>, value: ViewRef<UserControl>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Viewbox.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Viewbox.fs
new file mode 100644
index 00000000..93a9a2c2
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Viewbox.fs
@@ -0,0 +1,54 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Media
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabViewBox =
+    inherit IFabControl
+
+module ViewBox =
+    let WidgetKey = Widgets.register<Viewbox>()
+
+    let Stretch = Attributes.defineAvaloniaPropertyWithEquality Viewbox.StretchProperty
+
+    let StretchDirection =
+        Attributes.defineAvaloniaPropertyWithEquality Viewbox.StretchDirectionProperty
+
+    let Child = Attributes.defineAvaloniaPropertyWidget Viewbox.ChildProperty
+
+[<AutoOpen>]
+module ViewBoxBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a ViewBox widget.</summary>
+        /// <param name="content">The content of the ViewBox.</param>
+        static member ViewBox(content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabViewBox>(
+                ViewBox.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| ViewBox.Child.WithValue(content.Compile()) |], ValueNone)
+            )
+
+type ViewBoxModifiers =
+    /// <summary>Sets the Stretch property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Stretch value.</param>
+    [<Extension>]
+    static member inline stretch(this: WidgetBuilder<'msg, #IFabViewBox>, value: Stretch) =
+        this.AddScalar(ViewBox.Stretch.WithValue(value))
+
+    /// <summary>Sets the StretchDirection property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The StretchDirection value.</param>
+    [<Extension>]
+    static member inline stretchDirection(this: WidgetBuilder<'msg, #IFabViewBox>, value: StretchDirection) =
+        this.AddScalar(ViewBox.StretchDirection.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct ViewBox control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabViewBox>, value: ViewRef<Viewbox>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Controls/Window.fs b/src/Fabulous.Avalonia/ComponentViews/Controls/Window.fs
new file mode 100644
index 00000000..75a743f6
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Controls/Window.fs
@@ -0,0 +1,202 @@
+namespace Fabulous.Avalonia.Components
+
+open System.IO
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Interactivity
+open Avalonia.Media.Imaging
+open Avalonia.Platform
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabWindow =
+    inherit IFabWindowBase
+
+module Window =
+    let WidgetKey = Widgets.register<Window>()
+
+    let SizeToContent =
+        Attributes.defineAvaloniaPropertyWithEquality Window.SizeToContentProperty
+
+    let ExtendClientAreaToDecorationsHint =
+        Attributes.defineAvaloniaPropertyWithEquality Window.ExtendClientAreaToDecorationsHintProperty
+
+    let ExtendClientAreaChromeHints =
+        Attributes.defineAvaloniaPropertyWithEquality Window.ExtendClientAreaChromeHintsProperty
+
+    let ExtendClientAreaTitleBarHeightHint =
+        Attributes.defineAvaloniaPropertyWithEquality Window.ExtendClientAreaTitleBarHeightHintProperty
+
+    let SystemDecorations =
+        Attributes.defineAvaloniaPropertyWithEquality Window.SystemDecorationsProperty
+
+    let ShowActivated =
+        Attributes.defineAvaloniaPropertyWithEquality Window.ShowActivatedProperty
+
+    let ShowInTaskbar =
+        Attributes.defineAvaloniaPropertyWithEquality Window.ShowInTaskbarProperty
+
+    let WindowState =
+        Attributes.defineAvaloniaPropertyWithEquality Window.WindowStateProperty
+
+    let Title = Attributes.defineAvaloniaPropertyWithEquality Window.TitleProperty
+
+    let IconSource = Attributes.defineBindableWindowIconSource Window.IconProperty
+
+    let WindowStartupLocation =
+        Attributes.defineAvaloniaPropertyWithEquality Window.WindowStartupLocationProperty
+
+    let CanResize =
+        Attributes.defineAvaloniaPropertyWithEquality Window.CanResizeProperty
+
+    let WindowClosing =
+        Attributes.defineEvent "Window_Closing" (fun target -> (target :?> Window).Closing)
+
+    let WindowClosed =
+        Attributes.defineRoutedEvent "Window_Closed" Window.WindowClosedEvent
+
+    let WindowOpened =
+        Attributes.defineRoutedEvent "Window_Opened" Window.WindowOpenedEvent
+
+[<AutoOpen>]
+module WindowBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a Window widget.</summary>
+        /// <param name="content">The content of the window.</param>
+        static member Window(content: WidgetBuilder<'msg, #IFabAvaloniaObject>) =
+            WidgetBuilder<'msg, IFabWindow>(
+                Window.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
+            )
+
+        /// <summary>Creates a Window widget.</summary>
+        static member Window<'msg, 'childMarker>() =
+            SingleChildBuilder<'msg, IFabWindow, 'childMarker>(Window.WidgetKey, ContentControl.ContentWidget)
+
+type WindowModifiers =
+    /// <summary>Sets the SizeToContent property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SizeToContent value.</param>
+    [<Extension>]
+    static member inline sizeToContent(this: WidgetBuilder<'msg, #IFabWindow>, value: SizeToContent) =
+        this.AddScalar(Window.SizeToContent.WithValue(value))
+
+    /// <summary>Sets the ExtendClientAreaToDecorationsHint property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ExtendClientAreaToDecorationsHint value.</param>
+    [<Extension>]
+    static member inline extendClientAreaToDecorationsHint(this: WidgetBuilder<'msg, #IFabWindow>, value: bool) =
+        this.AddScalar(Window.ExtendClientAreaToDecorationsHint.WithValue(value))
+
+    /// <summary>Sets the ExtendClientAreaChromeHints property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ExtendClientAreaChromeHints value.</param>
+    [<Extension>]
+    static member inline extendClientAreaChromeHints(this: WidgetBuilder<'msg, #IFabWindow>, value: ExtendClientAreaChromeHints) =
+        this.AddScalar(Window.ExtendClientAreaChromeHints.WithValue(value))
+
+    /// <summary>Sets the ExtendClientAreaTitleBarHeightHint property.</summary>
+    /// <param name="this">Current widget.</param>
+    [<Extension>]
+    static member inline extendClientAreaTitleBarHeightHint(this: WidgetBuilder<'msg, #IFabWindow>, value: float) =
+        this.AddScalar(Window.ExtendClientAreaTitleBarHeightHint.WithValue(value))
+
+    /// <summary>Sets the SystemDecorations property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SystemDecorations value.</param>
+    [<Extension>]
+    static member inline systemDecorations(this: WidgetBuilder<'msg, #IFabWindow>, value: SystemDecorations) =
+        this.AddScalar(Window.SystemDecorations.WithValue(value))
+
+    /// <summary>Sets the ShowActivated property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ShowActivated value.</param>
+    [<Extension>]
+    static member inline showActivated(this: WidgetBuilder<'msg, #IFabWindow>, value: bool) =
+        this.AddScalar(Window.ShowActivated.WithValue(value))
+
+    /// <summary>Sets the ShowInTaskbar property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ShowInTaskbar value.</param>
+    [<Extension>]
+    static member inline showInTaskbar(this: WidgetBuilder<'msg, #IFabWindow>, value: bool) =
+        this.AddScalar(Window.ShowInTaskbar.WithValue(value))
+
+    /// <summary>Sets the WindowState property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The WindowState value.</param>
+    [<Extension>]
+    static member inline windowState(this: WidgetBuilder<'msg, #IFabWindow>, value: WindowState) =
+        this.AddScalar(Window.WindowState.WithValue(value))
+
+    /// <summary>Sets the Title property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Title value.</param>
+    [<Extension>]
+    static member inline title(this: WidgetBuilder<'msg, #IFabWindow>, value: string) =
+        this.AddScalar(Window.Title.WithValue(value))
+
+    /// <summary>Sets the WindowStartupLocation property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The WindowStartupLocation value.</param>
+    [<Extension>]
+    static member inline windowStartupLocation(this: WidgetBuilder<'msg, #IFabWindow>, value: WindowStartupLocation) =
+        this.AddScalar(Window.WindowStartupLocation.WithValue(value))
+
+    /// <summary>Sets the CanResize property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The CanResize value.</param>
+    [<Extension>]
+    static member inline canResize(this: WidgetBuilder<'msg, #IFabWindow>, value: bool) =
+        this.AddScalar(Window.CanResize.WithValue(value))
+
+    /// <summary>Listens to the Window WindowClosing event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the window is closing.</param>
+    [<Extension>]
+    static member inline onWindowClosing(this: WidgetBuilder<'msg, #IFabWindow>, fn: WindowClosingEventArgs -> 'msg) =
+        this.AddScalar(Window.WindowClosing.WithValue(fn))
+
+    /// <summary>Listens to the Window WindowClosed event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the window is closed.</param>
+    [<Extension>]
+    static member inline onWindowClosed(this: WidgetBuilder<'msg, #IFabWindow>, fn: RoutedEventArgs -> 'msg) =
+        this.AddScalar(Window.WindowClosed.WithValue(fn))
+
+    /// <summary>Listens to the Window WindowOpened event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the window is opened.</param>
+    [<Extension>]
+    static member inline onWindowOpened(this: WidgetBuilder<'msg, #IFabWindow>, fn: RoutedEventArgs -> 'msg) =
+        this.AddScalar(Window.WindowOpened.WithValue(fn))
+
+    /// <summary>Link a ViewRef to access the direct Window control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabWindow>, value: ViewRef<Window>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type WindowExtraModifiers =
+    /// <summary>Sets the Icon property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Icon value.</param>
+    [<Extension>]
+    static member inline icon(this: WidgetBuilder<'msg, #IFabWindow>, value: Bitmap) =
+        this.AddScalar(Window.IconSource.WithValue(ImageSourceValue.Bitmap(value)))
+
+    /// <summary>Sets the Icon property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Icon value.</param>
+    [<Extension>]
+    static member inline icon(this: WidgetBuilder<'msg, #IFabWindow>, value: string) =
+        this.AddScalar(Window.IconSource.WithValue(ImageSourceValue.File(value)))
+
+    /// <summary>Sets the Icon property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Icon value.</param>
+    [<Extension>]
+    static member inline icon(this: WidgetBuilder<'msg, #IFabWindow>, value: Stream) =
+        this.AddScalar(Window.IconSource.WithValue(ImageSourceValue.Stream(value)))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Imaging/CroppedBitmap.fs b/src/Fabulous.Avalonia/ComponentViews/Imaging/CroppedBitmap.fs
new file mode 100644
index 00000000..52b447c3
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Imaging/CroppedBitmap.fs
@@ -0,0 +1,65 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.IO
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Media.Imaging
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentCroppedBitmap =
+    inherit IFabComponentElement
+    inherit IFabCroppedBitmap
+
+[<AutoOpen>]
+module ComponentCroppedBitmapBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a CroppedBitmap widget.</summary>
+        /// <param name="source">The source image.</param>
+        /// <param name="rect">The rectangular area that the bitmap is cropped to.</param>
+        static member CroppedBitmap(source: Bitmap, rect: PixelRect) =
+            WidgetBuilder<unit, IFabComponentCroppedBitmap>(
+                CroppedBitmap.WidgetKey,
+                CroppedBitmap.Source.WithValue(ImageSourceValue.Bitmap(source)),
+                CroppedBitmap.SourceRect.WithValue(rect)
+            )
+
+        /// <summary>Creates a CroppedBitmap widget.</summary>
+        /// <param name="source">The source image.</param>
+        /// <param name="rect">The rectangular area that the bitmap is cropped to.</param>
+        static member CroppedBitmap(source: string, rect: PixelRect) =
+            WidgetBuilder<unit, IFabComponentCroppedBitmap>(
+                CroppedBitmap.WidgetKey,
+                CroppedBitmap.Source.WithValue(ImageSourceValue.File(source)),
+                CroppedBitmap.SourceRect.WithValue(rect)
+            )
+
+        /// <summary>Creates a CroppedBitmap widget.</summary>
+        /// <param name="source">The source image.</param>
+        /// <param name="rect">The rectangular area that the bitmap is cropped to.</param>
+        static member CroppedBitmap(source: Uri, rect: PixelRect) =
+            WidgetBuilder<unit, IFabComponentCroppedBitmap>(
+                CroppedBitmap.WidgetKey,
+                CroppedBitmap.Source.WithValue(ImageSourceValue.Uri(source)),
+                CroppedBitmap.SourceRect.WithValue(rect)
+            )
+
+        /// <summary>Creates a CroppedBitmap widget.</summary>
+        /// <param name="source">The source image.</param>
+        /// <param name="rect">The rectangular area that the bitmap is cropped to.</param>
+        static member CroppedBitmap(source: Stream, rect: PixelRect) =
+            WidgetBuilder<unit, IFabComponentCroppedBitmap>(
+                CroppedBitmap.WidgetKey,
+                CroppedBitmap.Source.WithValue(ImageSourceValue.Stream(source)),
+                CroppedBitmap.SourceRect.WithValue(rect)
+            )
+
+type ComponentCroppedBitmapModifiers =
+    /// <summary>Link a ViewRef to access the direct CroppedBitmap control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentCroppedBitmap>, value: ViewRef<CroppedBitmap>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Imaging/Image.fs b/src/Fabulous.Avalonia/ComponentViews/Imaging/Image.fs
new file mode 100644
index 00000000..f39b51a8
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Imaging/Image.fs
@@ -0,0 +1,113 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.IO
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Media
+open Avalonia.Media.Imaging
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentImage =
+    inherit IFabComponentControl
+    inherit IFabImage
+
+[<AutoOpen>]
+module ComponentImageBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates an Image widget.</summary>
+        /// <param name="source">The source image.</param>
+        static member Image(source: Bitmap) =
+            WidgetBuilder<unit, IFabComponentImage>(Image.WidgetKey, Image.Source.WithValue(ImageSourceValue.Bitmap(source)), Image.Stretch.WithValue(Stretch.Uniform))
+
+        /// <summary>Creates an Image widget.</summary>
+        /// <param name="source">The source image.</param>
+        /// <param name="stretch">The stretch mode.</param>
+        static member Image(source: Bitmap, stretch: Stretch) =
+            WidgetBuilder<unit, IFabComponentImage>(Image.WidgetKey, Image.Source.WithValue(ImageSourceValue.Bitmap(source)), Image.Stretch.WithValue(stretch))
+
+        /// <summary>Creates an Image widget.</summary>
+        /// <param name="source">The source image.</param>
+        static member Image(source: string) =
+            WidgetBuilder<unit, IFabComponentImage>(Image.WidgetKey, Image.Source.WithValue(ImageSourceValue.File(source)), Image.Stretch.WithValue(Stretch.Uniform))
+
+        /// <summary>Creates an Image widget.</summary>
+        /// <param name="source">The source image.</param>
+        /// <param name="stretch">The stretch mode.</param>
+        static member Image(source: string, stretch: Stretch) =
+            WidgetBuilder<unit, IFabComponentImage>(Image.WidgetKey, Image.Source.WithValue(ImageSourceValue.File(source)), Image.Stretch.WithValue(stretch))
+
+        /// <summary>Creates an Image widget.</summary>
+        /// <param name="source">The source image.</param>
+        static member Image(source: Uri) =
+            WidgetBuilder<unit, IFabComponentImage>(Image.WidgetKey, Image.Source.WithValue(ImageSourceValue.Uri(source)), Image.Stretch.WithValue(Stretch.Uniform))
+
+        /// <summary>Creates an Image widget.</summary>
+        /// <param name="source">The source image.</param>
+        /// <param name="stretch">The stretch mode.</param>
+        static member Image(source: Uri, stretch: Stretch) =
+            WidgetBuilder<unit, IFabComponentImage>(Image.WidgetKey, Image.Source.WithValue(ImageSourceValue.Uri(source)), Image.Stretch.WithValue(stretch))
+
+        /// <summary>Creates an Image widget.</summary>
+        /// <param name="source">The source image.</param>
+        static member Image(source: Stream) =
+            WidgetBuilder<unit, IFabComponentImage>(Image.WidgetKey, Image.Source.WithValue(ImageSourceValue.Stream(source)), Image.Stretch.WithValue(Stretch.Uniform))
+
+        /// <summary>Creates an Image widget.</summary>
+        /// <param name="source">The source image.</param>
+        /// <param name="stretch">The stretch mode.</param>
+        static member Image(source: Stream, stretch: Stretch) =
+            WidgetBuilder<unit, IFabComponentImage>(Image.WidgetKey, Image.Source.WithValue(ImageSourceValue.Stream(source)), Image.Stretch.WithValue(stretch))
+
+        /// <summary>Creates an Image widget.</summary>
+        /// <param name="source">The source image.</param>
+        static member Image(source: WidgetBuilder<unit, IFabDrawingImage>) =
+            WidgetBuilder<unit, IFabComponentImage>(
+                Image.WidgetKey,
+                AttributesBundle(
+                    StackList.one(Image.Stretch.WithValue(Stretch.Uniform)),
+                    ValueSome [| Image.SourceWidget.WithValue(source.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates an Image widget.</summary>
+        /// <param name="source">The source image.</param>
+        /// <param name="stretch">The stretch mode.</param>
+        static member Image(stretch: Stretch, source: WidgetBuilder<unit, IFabDrawingImage>) =
+            WidgetBuilder<unit, IFabComponentImage>(
+                Image.WidgetKey,
+                AttributesBundle(StackList.one(Image.Stretch.WithValue(stretch)), ValueSome [| Image.SourceWidget.WithValue(source.Compile()) |], ValueNone)
+            )
+
+        /// <summary>Creates an Image widget.</summary>
+        /// <param name="source">The source image.</param>
+        static member Image(source: WidgetBuilder<unit, IFabComponentCroppedBitmap>) =
+            WidgetBuilder<unit, IFabComponentImage>(
+                Image.WidgetKey,
+                AttributesBundle(
+                    StackList.one(Image.Stretch.WithValue(Stretch.Uniform)),
+                    ValueSome [| Image.SourceWidget.WithValue(source.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates an Image widget.</summary>
+        /// <param name="source">The source image.</param>
+        /// <param name="stretch">The stretch mode.</param>
+        static member Image(stretch: Stretch, source: WidgetBuilder<unit, IFabComponentCroppedBitmap>) =
+            WidgetBuilder<unit, IFabComponentImage>(
+                Image.WidgetKey,
+                AttributesBundle(StackList.one(Image.Stretch.WithValue(stretch)), ValueSome [| Image.SourceWidget.WithValue(source.Compile()) |], ValueNone)
+            )
+
+type ComponentImageModifiers =
+    /// <summary>Link a ViewRef to access the direct Image control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<unit, IFabComponentImage>, value: ViewRef<Image>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Imaging/PathIcon.fs b/src/Fabulous.Avalonia/ComponentViews/Imaging/PathIcon.fs
new file mode 100644
index 00000000..5cb2482f
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Imaging/PathIcon.fs
@@ -0,0 +1,29 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentPathIcon =
+    inherit IFabComponentIconElement
+    inherit IFabPathIcon
+
+[<AutoOpen>]
+module ComponentPathIconBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a PathIcon widget.</summary>
+        /// <param name="content">The content of the PathIcon.</param>
+        static member PathIcon(content: WidgetBuilder<unit, #IFabComponentGeometry>) =
+            WidgetBuilder<unit, IFabComponentPathIcon>(
+                PathIcon.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| PathIcon.DataWidget.WithValue(content.Compile()) |], ValueNone)
+            )
+
+        /// <summary>Creates a PathIcon widget.</summary>
+        /// <param name="path">The path of the PathIcon.</param>
+        static member PathIcon(path: string) =
+            WidgetBuilder<unit, IFabComponentPathIcon>(PathIcon.WidgetKey, PathIcon.DataString.WithValue(Geometry.Parse(path)))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Imaging/TrayIcon.fs b/src/Fabulous.Avalonia/ComponentViews/Imaging/TrayIcon.fs
new file mode 100644
index 00000000..e8ff64e5
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Imaging/TrayIcon.fs
@@ -0,0 +1,80 @@
+namespace Fabulous.Avalonia.Components
+
+open System.IO
+open System.Runtime.CompilerServices
+open Avalonia.Media.Imaging
+open Fabulous
+open Avalonia.Controls
+open Fabulous.Avalonia
+
+type IFabComponentTrayIcon =
+    inherit IFabComponentElement
+    inherit IFabTrayIcon
+
+module ComponentTrayIcon =
+    let Clicked =
+        ComponentAttributes.defineEventNoArg "TrayIcon_Clicked" (fun target -> (target :?> TrayIcon).Clicked)
+
+[<AutoOpen>]
+module ComponentTrayIconBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a TrayIcon widget.</summary>
+        /// <param name="icon">The icon to display.</param>
+        static member TrayIcon(icon: Bitmap) =
+            WidgetBuilder<unit, IFabComponentTrayIcon>(TrayIcon.WidgetKey, TrayIcon.IconSource.WithValue(ImageSourceValue.Bitmap(icon)))
+
+        /// <summary>Creates a TrayIcon widget.</summary>
+        /// <param name="icon">The icon to display.</param>
+        /// <param name="text">The tooltip text to display.</param>
+        static member TrayIcon(icon: Bitmap, text: string) =
+            WidgetBuilder<unit, IFabComponentTrayIcon>(
+                TrayIcon.WidgetKey,
+                TrayIcon.IconSource.WithValue(ImageSourceValue.Bitmap(icon)),
+                TrayIcon.ToolTipText.WithValue(text)
+            )
+
+        /// <summary>Creates a TrayIcon widget.</summary>
+        /// <param name="icon">The icon to display.</param>
+        static member TrayIcon(icon: string) =
+            WidgetBuilder<unit, IFabComponentTrayIcon>(TrayIcon.WidgetKey, TrayIcon.IconSource.WithValue(ImageSourceValue.File(icon)))
+
+        /// <summary>Creates a TrayIcon widget.</summary>
+        /// <param name="icon">The icon to display.</param>
+        /// <param name="text">The tooltip text to display.</param>
+        static member TrayIcon(icon: string, text: string) =
+            WidgetBuilder<unit, IFabComponentTrayIcon>(
+                TrayIcon.WidgetKey,
+                TrayIcon.IconSource.WithValue(ImageSourceValue.File(icon)),
+                TrayIcon.ToolTipText.WithValue(text)
+            )
+
+        /// <summary>Creates a TrayIcon widget.</summary>
+        /// <param name="icon">The icon to display.</param>
+        static member TrayIcon(icon: Stream) =
+            WidgetBuilder<unit, IFabComponentTrayIcon>(TrayIcon.WidgetKey, TrayIcon.IconSource.WithValue(ImageSourceValue.Stream(icon)))
+
+        /// <summary>Creates a TrayIcon widget.</summary>
+        /// <param name="icon">The icon to display.</param>
+        /// <param name="text">The tooltip text to display.</param>
+        static member TrayIcon(icon: Stream, text: string) =
+            WidgetBuilder<unit, IFabComponentTrayIcon>(
+                TrayIcon.WidgetKey,
+                TrayIcon.IconSource.WithValue(ImageSourceValue.Stream(icon)),
+                TrayIcon.ToolTipText.WithValue(text)
+            )
+
+type ComponentTrayIconModifiers =
+    /// <summary>Listens to the TrayIcon Clicked event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="msg">Raised when the Clicked event fires.</param>
+    [<Extension>]
+    static member inline onClicked(this: WidgetBuilder<'msg, #IFabComponentTrayIcon>, msg: unit -> unit) =
+        this.AddScalar(ComponentTrayIcon.Clicked.WithValue(msg))
+
+    /// <summary>Link a ViewRef to access the direct TrayIcon control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentTrayIcon>, value: ViewRef<TrayIcon>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Imaging/_IconElement.fs b/src/Fabulous.Avalonia/ComponentViews/Imaging/_IconElement.fs
new file mode 100644
index 00000000..ea101a1e
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Imaging/_IconElement.fs
@@ -0,0 +1,7 @@
+namespace Fabulous.Avalonia.Components
+
+open Fabulous.Avalonia
+
+type IFabComponentIconElement =
+    inherit IFabComponentTemplatedControl
+    inherit IFabIconElement
diff --git a/src/Fabulous.Avalonia/ComponentViews/Layouts/ScrollViewer.fs b/src/Fabulous.Avalonia/ComponentViews/Layouts/ScrollViewer.fs
new file mode 100644
index 00000000..f63e904e
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Layouts/ScrollViewer.fs
@@ -0,0 +1,37 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Controls
+open Avalonia.Controls.Primitives
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentScrollViewer =
+    inherit IFabComponentContentControl
+    inherit IFabScrollViewer
+
+module ComponentScrollViewer =
+    let ScrollChanged =
+        ComponentAttributes.defineEvent "ScrollViewer_ScrollChangedEvent" (fun target -> (target :?> ScrollViewer).ScrollChanged)
+
+[<AutoOpen>]
+module ComponentScrollViewerBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ScrollViewer widget</summary>
+        /// <param name="content">The content to display</param>
+        static member ScrollViewer(content: WidgetBuilder<unit, #IFabControl>) =
+            WidgetBuilder<unit, IFabScrollViewer>(
+                ScrollViewer.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
+            )
+
+type ComponentScrollViewerModifiers =
+    /// <summary>Listens to the ScrollViewer ScrollChanged event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the ScrollChanged event fires.</param>
+    [<Extension>]
+    static member inline onScrollChanged(this: WidgetBuilder<unit, #IFabComponentScrollViewer>, fn: ScrollChangedEventArgs -> unit) =
+        this.AddScalar(ComponentScrollViewer.ScrollChanged.WithValue(fn))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Layouts/SliptView.fs b/src/Fabulous.Avalonia/ComponentViews/Layouts/SliptView.fs
new file mode 100644
index 00000000..822f201d
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Layouts/SliptView.fs
@@ -0,0 +1,88 @@
+namespace Fabulous.Avalonia.Components
+
+open Avalonia.Controls
+open Avalonia.Controls.Primitives
+open Avalonia.Interactivity
+open Avalonia.Media
+open Avalonia.Media.Immutable
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+open System.Runtime.CompilerServices
+
+type IFabComponentSplitView =
+    inherit IFabComponentContentControl
+    inherit IFabSplitView
+
+module ComponentSplitView =
+    let PanClosed =
+        ComponentAttributes.defineEvent "SplitView_PanClosed" (fun target -> (target :?> SplitView).PaneClosed)
+
+    let PanClosing =
+        ComponentAttributes.defineEvent "SplitView_PanClosing" (fun target -> (target :?> SplitView).PaneClosing)
+
+    let PanOpened =
+       ComponentAttributes.defineEvent "SplitView_PanOpened" (fun target -> (target :?> SplitView).PaneOpened)
+
+    let PanOpening =
+        ComponentAttributes.defineEvent "SplitView_PanOpening" (fun target -> (target :?> SplitView).PaneOpening)
+
+    let IsPresented =
+        ComponentAttributes.defineAvaloniaPropertyWithChangedEvent' "SplitView_IsPresented" SplitView.IsPaneOpenProperty
+
+[<AutoOpen>]
+module ComponentSplitViewBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a SplitView widget.</summary>
+        /// <param name="pane">The content of the pane.</param>
+        /// <param name="content">The content to display.</param>
+        static member SplitView(pane: WidgetBuilder<'msg, #IFabComponentControl>, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentSplitView>(
+                SplitView.WidgetKey,
+                AttributesBundle(
+                    StackList.empty(),
+                    ValueSome
+                        [| SplitView.Pane.WithValue(pane.Compile())
+                           ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueSome [||]
+                )
+            )
+
+type ComponentSplitViewModifiers =
+    /// <summary>Listens to the SplitView PanClosed event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the PanClosed event fires.</param>
+    [<Extension>]
+    static member inline onPanClosed(this: WidgetBuilder<unit, #IFabSplitView>, fn: RoutedEventArgs -> unit) =
+        this.AddScalar(ComponentSplitView.PanClosed.WithValue(fn))
+
+    /// <summary>Listens to the SplitView PanClosing event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the PanClosing event fires.</param>
+    [<Extension>]
+    static member inline onPanClosing(this: WidgetBuilder<unit, #IFabSplitView>, fn: CancelRoutedEventArgs -> unit) =
+        this.AddScalar(ComponentSplitView.PanClosing.WithValue(fn))
+
+    /// <summary>Listens to the SplitView PanOpened event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the PanOpened event fires.</param>
+    [<Extension>]
+    static member inline onPanOpened(this: WidgetBuilder<'msg, #IFabSplitView>, fn: RoutedEventArgs -> unit) =
+        this.AddScalar(ComponentSplitView.PanOpened.WithValue(fn))
+
+    /// <summary>Listens to the SplitView PanOpening event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the PanOpening event fires.</param>
+    [<Extension>]
+    static member inline onPanOpening(this: WidgetBuilder<'msg, #IFabSplitView>, fn: CancelRoutedEventArgs -> unit) =
+        this.AddScalar(ComponentSplitView.PanOpening.WithValue(fn))
+
+    /// <summary>Listens to the SplitView IsPresented event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsPresented value.</param>
+    /// <param name="fn">Raised when the IsPresented event fires.</param>
+    [<Extension>]
+    static member inline isPresented(this: WidgetBuilder<'msg, #IFabSplitView>, value: bool, fn: bool -> unit) =
+        this.AddScalar(ComponentSplitView.IsPresented.WithValue(ComponentValueEventData.create value fn))
+
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/ConicGradientBrush.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/ConicGradientBrush.fs
new file mode 100644
index 00000000..59988d20
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/ConicGradientBrush.fs
@@ -0,0 +1,86 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentConicGradientBrush =
+    inherit IFabComponentGradientBrush
+    inherit IFabConicGradientBrush
+
+[<AutoOpen>]
+module ComponentConicGradientBrushBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ConicGradientBrush widget.</summary>
+        /// <param name="center">The center of the gradient.</param>
+        /// <param name="angle">The angle of the gradient.</param>
+        static member ConicGradientBrush(center: RelativePoint, angle: float) =
+            CollectionBuilder<unit, IFabComponentConicGradientBrush, IFabComponentGradientStop>(
+                ConicGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                ConicGradientBrush.Center.WithValue(center),
+                ConicGradientBrush.Angle.WithValue(angle)
+            )
+
+        /// <summary>Creates a ConicGradientBrush widget.</summary>
+        /// <param name="center">The center of the gradient.</param>
+        static member ConicGradientBrush(center: RelativePoint) =
+            CollectionBuilder<unit, IFabConicGradientBrush, IFabGradientStop>(
+                ConicGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                ConicGradientBrush.Center.WithValue(center),
+                ConicGradientBrush.Angle.WithValue(0.)
+            )
+
+        /// <summary>Creates a ConicGradientBrush widget.</summary>
+        /// <param name="center">The center of the gradient.</param>
+        /// <param name="unit">The unit of the center.</param>
+        /// <param name="angle">The angle of the gradient.</param>
+        static member ConicGradientBrush(center: Point, unit: RelativeUnit, angle: float) =
+            CollectionBuilder<unit, IFabConicGradientBrush, IFabGradientStop>(
+                ConicGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                ConicGradientBrush.Center.WithValue(RelativePoint(center, unit)),
+                ConicGradientBrush.Angle.WithValue(angle)
+            )
+
+        /// <summary>Creates a ConicGradientBrush widget.</summary>
+        /// <param name="center">The center of the gradient.</param>
+        /// <param name="unit">The unit of the center.</param>
+        static member ConicGradientBrush(center: Point, unit: RelativeUnit) =
+            CollectionBuilder<unit, IFabConicGradientBrush, IFabGradientStop>(
+                ConicGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                ConicGradientBrush.Center.WithValue(RelativePoint(center, unit)),
+                ConicGradientBrush.Angle.WithValue(0.)
+            )
+
+        /// <summary>Creates a ConicGradientBrush widget.</summary>
+        /// <param name="angle">The angle of the gradient.</param>
+        static member ConicGradientBrush(angle: float) =
+            CollectionBuilder<unit, IFabConicGradientBrush, IFabGradientStop>(
+                ConicGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                ConicGradientBrush.Center.WithValue(RelativePoint.Center),
+                ConicGradientBrush.Angle.WithValue(angle)
+            )
+
+        /// <summary>Creates a ConicGradientBrush widget.</summary>
+        static member ConicGradientBrush() =
+            CollectionBuilder<unit, IFabConicGradientBrush, IFabGradientStop>(
+                ConicGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                ConicGradientBrush.Center.WithValue(RelativePoint.Center),
+                ConicGradientBrush.Angle.WithValue(0.)
+            )
+
+type ComponentConicGradientBrushModifiers =
+    /// <summary>Link a ViewRef to access the direct ConicGradientBrush control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentConicGradientBrush>, value: ViewRef<ConicGradientBrush>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/DrawingBrush.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/DrawingBrush.fs
new file mode 100644
index 00000000..f38f7f42
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/DrawingBrush.fs
@@ -0,0 +1,31 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentDrawingBrush =
+    inherit IFabComponentTileBrush
+    inherit IFabDrawingBrush
+
+[<AutoOpen>]
+module ComponentDrawingBrushBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a DrawingBrush widget.</summary>
+        /// <param name="source">The source drawing.</param>
+        static member DrawingBrush(source: WidgetBuilder<'msg, #IFabComponentDrawing>) =
+            WidgetBuilder<unit, IFabComponentDrawingBrush>(
+                DrawingBrush.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| DrawingBrush.Drawing.WithValue(source.Compile()) |], ValueNone)
+            )
+
+type ComponentDrawingBrushModifiers =
+    /// <summary>Link a ViewRef to access the direct DrawingBrush control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentDrawingBrush>, value: ViewRef<DrawingBrush>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/GradientStop.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/GradientStop.fs
new file mode 100644
index 00000000..9e1f922a
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/GradientStop.fs
@@ -0,0 +1,52 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentGradientStop =
+    inherit IFabComponentElement
+    inherit IFabGradientStop
+
+[<AutoOpen>]
+module ComponentGradientStopBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a GradientStop widget.</summary>
+        /// <param name="color">The color of the gradient stop.</param>
+        /// <param name="offset">The offset of the gradient stop.</param>
+        static member GradientStop(color: Color, offset: float) =
+            WidgetBuilder<unit, IFabComponentGradientStop>(GradientStop.WidgetKey, GradientStop.Color.WithValue(color), GradientStop.Offset.WithValue(offset))
+
+        /// <summary>Creates a GradientStop widget.</summary>
+        /// <param name="color">The color of the gradient stop.</param>
+        /// <param name="offset">The offset of the gradient stop.</param>
+        static member GradientStop(color: string, offset: float) =
+            WidgetBuilder<unit, IFabComponentGradientStop>(
+                GradientStop.WidgetKey,
+                GradientStop.Color.WithValue(Color.Parse(color)),
+                GradientStop.Offset.WithValue(offset)
+            )
+
+type ComponentGradientStopBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabGradientStop>
+        (_: CollectionBuilder<'msg, 'marker, IFabGradientStop>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabGradientStop>
+        (_: CollectionBuilder<'msg, 'marker, IFabGradientStop>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+type GradientStopModifiers =
+    /// <summary>Link a ViewRef to access the direct GradientStop control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentGradientStop>, value: ViewRef<GradientStop>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/ImageBrush.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/ImageBrush.fs
new file mode 100644
index 00000000..14428e8b
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/ImageBrush.fs
@@ -0,0 +1,45 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.IO
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Avalonia.Media.Imaging
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentImageBrush =
+    inherit IFabComponentTileBrush
+    inherit IFabImageBrush
+
+[<AutoOpen>]
+module ComponentImageBrushBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ImageBrush widget.</summary>
+        /// <param name="source">The image source.</param>
+        static member ImageBrush(source: Bitmap) =
+            WidgetBuilder<unit, IFabComponentImageBrush>(ImageBrush.WidgetKey, ImageBrush.Source.WithValue(ImageSourceValue.Bitmap(source)))
+
+        /// <summary>Creates a ImageBrush widget.</summary>
+        /// <param name="source">The image source.</param>
+        static member ImageBrush(source: string) =
+            WidgetBuilder<unit, IFabComponentImageBrush>(ImageBrush.WidgetKey, ImageBrush.Source.WithValue(ImageSourceValue.File(source)))
+
+        /// <summary>Creates a ImageBrush widget.</summary>
+        /// <param name="source">The image source.</param>
+        static member ImageBrush(source: Uri) =
+            WidgetBuilder<unit, IFabComponentImageBrush>(ImageBrush.WidgetKey, ImageBrush.Source.WithValue(ImageSourceValue.Uri(source)))
+
+        /// <summary>Creates a ImageBrush widget.</summary>
+        /// <param name="source">The image source.</param>
+        static member ImageBrush(source: Stream) =
+            WidgetBuilder<unit, IFabComponentImageBrush>(ImageBrush.WidgetKey, ImageBrush.Source.WithValue(ImageSourceValue.Stream(source)))
+
+type ComponentImageBrushModifiers =
+    /// <summary>Link a ViewRef to access the direct ImageBrush control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentImageBrush>, value: ViewRef<ImageBrush>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/LinearGradientBrush.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/LinearGradientBrush.fs
new file mode 100644
index 00000000..40ebd0bb
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/LinearGradientBrush.fs
@@ -0,0 +1,94 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentLinearGradientBrush =
+    inherit IFabComponentGradientBrush
+    inherit IFabLinearGradientBrush
+
+[<AutoOpen>]
+module ComponentLinearGradientBrushBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a LinearGradientBrush widget.</summary>
+        /// <param name="startPoint">The start point of the gradient.</param>
+        /// <param name="endPoint">The end point of the gradient.</param>
+        static member LinearGradientBrush(startPoint: RelativePoint, endPoint: RelativePoint) =
+            CollectionBuilder<'msg, IFabComponentLinearGradientBrush, IFabComponentGradientStop>(
+                LinearGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                LinearGradientBrush.StartPoint.WithValue(startPoint),
+                LinearGradientBrush.EndPoint.WithValue(endPoint)
+            )
+
+        /// <summary>Creates a LinearGradientBrush widget.</summary>
+        /// <param name="startPoint">The start point of the gradient.</param>
+        /// <param name="endPoint">The end point of the gradient.</param>
+        static member LinearGradientBrush'(startPoint: RelativePoint, endPoint: RelativePoint) =
+            WidgetBuilder<'msg, IFabComponentLinearGradientBrush>(
+                LinearGradientBrush.WidgetKey,
+                LinearGradientBrush.StartPoint.WithValue(startPoint),
+                LinearGradientBrush.EndPoint.WithValue(endPoint)
+            )
+
+        /// <summary>Creates a LinearGradientBrush widget.</summary>
+        /// <param name="startPoint">The start point of the gradient.</param>
+        /// <param name="endPoint">The end point of the gradient.</param>
+        /// <param name="unit">The relative unit of the start and end points.</param>
+        static member LinearGradientBrush(startPoint: Point, endPoint: Point, unit: RelativeUnit) =
+            CollectionBuilder<'msg, IFabComponentLinearGradientBrush, IFabComponentGradientStop>(
+                LinearGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                LinearGradientBrush.StartPoint.WithValue(RelativePoint(startPoint, unit)),
+                LinearGradientBrush.EndPoint.WithValue(RelativePoint(endPoint, unit))
+            )
+
+        /// <summary>Creates a LinearGradientBrush widget.</summary>
+        /// <param name="startPoint">The start point of the gradient.</param>
+        /// <param name="endPoint">The end point of the gradient.</param>
+        static member LinearGradientBrush(startPoint: Point, endPoint: Point) =
+            let startPoint = RelativePoint(startPoint, RelativeUnit.Relative)
+            let endPoint = RelativePoint(endPoint, RelativeUnit.Relative)
+            View.LinearGradientBrush(startPoint, endPoint)
+
+        /// <summary>Creates a LinearGradientBrush widget.</summary>
+        /// <param name="startPoint">The start point of the gradient.</param>
+        /// <param name="endPoint">The end point of the gradient.</param>
+        /// <param name="startUnit">The relative unit of the start point.</param>
+        /// <param name="endUnit">The relative unit of the end point.</param>
+        static member LinearGradientBrush(startPoint: Point, endPoint: Point, startUnit: RelativeUnit, endUnit: RelativeUnit) =
+            CollectionBuilder<'msg, IFabComponentLinearGradientBrush, IFabComponentGradientStop>(
+                LinearGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                LinearGradientBrush.StartPoint.WithValue(RelativePoint(startPoint, startUnit)),
+                LinearGradientBrush.EndPoint.WithValue(RelativePoint(endPoint, endUnit))
+            )
+
+        /// <summary>Creates a LinearGradientBrush widget.</summary>
+        static member LinearGradientBrush() =
+            CollectionBuilder<'msg, IFabComponentLinearGradientBrush, IFabComponentGradientStop>(
+                LinearGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                LinearGradientBrush.StartPoint.WithValue(RelativePoint.TopLeft),
+                LinearGradientBrush.EndPoint.WithValue(RelativePoint.BottomRight)
+            )
+
+        /// <summary>Creates a LinearGradientBrush widget.</summary>
+        static member LinearGradientBrush'() =
+            WidgetBuilder<'msg, IFabComponentLinearGradientBrush>(
+                LinearGradientBrush.WidgetKey,
+                LinearGradientBrush.StartPoint.WithValue(RelativePoint.TopLeft),
+                LinearGradientBrush.EndPoint.WithValue(RelativePoint.BottomRight)
+            )
+
+type ComponentLinearGradientBrushModifiers =
+    /// <summary>Link a ViewRef to access the direct LinearGradientBrush control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentLinearGradientBrush>, value: ViewRef<LinearGradientBrush>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/RadialGradientBrush.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/RadialGradientBrush.fs
new file mode 100644
index 00000000..efc57f61
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/RadialGradientBrush.fs
@@ -0,0 +1,89 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentRadialGradientBrush =
+    inherit IFabComponentGradientBrush
+    inherit IFabRadialGradientBrush
+
+module ComponentRadialGradientBrush =
+    let WidgetKey = Widgets.register<RadialGradientBrush>()
+
+    let Center =
+        Attributes.defineAvaloniaPropertyWithEquality RadialGradientBrush.CenterProperty
+
+    let GradientOrigin =
+        Attributes.defineAvaloniaPropertyWithEquality RadialGradientBrush.GradientOriginProperty
+
+    let Radius =
+        Attributes.defineAvaloniaPropertyWithEquality RadialGradientBrush.RadiusProperty
+
+[<AutoOpen>]
+module ComponentRadialGradientBrushBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a RadialGradientBrush widget.</summary>
+        /// <param name="center">The center of the gradient.</param>
+        static member RadialGradientBrush(center: RelativePoint) =
+            CollectionBuilder<unit, IFabComponentRadialGradientBrush, IFabComponentGradientStop>(
+                RadialGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                RadialGradientBrush.Center.WithValue(center),
+                RadialGradientBrush.GradientOrigin.WithValue(RelativePoint.Center)
+            )
+
+        /// <summary>Creates a RadialGradientBrush widget.</summary>
+        /// <param name="center">The center of the gradient.</param>
+        /// <param name="unit">The relative unit of the center.</param>
+        static member RadialGradientBrush(center: Point, unit: RelativeUnit) =
+            CollectionBuilder<unit, IFabComponentRadialGradientBrush, IFabComponentGradientStop>(
+                RadialGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                RadialGradientBrush.Center.WithValue(RelativePoint(center, unit)),
+                RadialGradientBrush.GradientOrigin.WithValue(RelativePoint.Center)
+            )
+
+        /// <summary>Creates a RadialGradientBrush widget.</summary>
+        /// <param name="center">The center of the gradient.</param>
+        /// <param name="origin">The origin of the gradient.</param>
+        static member RadialGradientBrush(center: RelativePoint, origin: RelativePoint) =
+            CollectionBuilder<unit, IFabComponentRadialGradientBrush, IFabGradientStop>(
+                RadialGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                RadialGradientBrush.Center.WithValue(center),
+                RadialGradientBrush.GradientOrigin.WithValue(origin)
+            )
+
+        /// <summary>Creates a RadialGradientBrush widget.</summary>
+        /// <param name="center">The center of the gradient.</param>
+        /// <param name="origin">The origin of the gradient.</param>
+        /// <param name="unit">The relative unit of the center and origin.</param>
+        static member RadialGradientBrush(center: Point, origin: Point, unit: RelativeUnit) =
+            CollectionBuilder<unit, IFabComponentRadialGradientBrush, IFabComponentGradientStop>(
+                RadialGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                RadialGradientBrush.Center.WithValue(RelativePoint(center, unit)),
+                RadialGradientBrush.GradientOrigin.WithValue(RelativePoint(origin, unit))
+            )
+
+        /// <summary>Creates a RadialGradientBrush widget.</summary>
+        static member RadialGradientBrush() =
+            CollectionBuilder<unit, IFabComponentRadialGradientBrush, IFabComponentGradientStop>(
+                RadialGradientBrush.WidgetKey,
+                ComponentGradientBrush.GradientStops,
+                RadialGradientBrush.Center.WithValue(RelativePoint.Center),
+                RadialGradientBrush.GradientOrigin.WithValue(RelativePoint.Center)
+            )
+
+type ComponentRadialGradientBrushModifiers =
+
+    /// <summary>Link a ViewRef to access the direct RadialGradientBrush control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentRadialGradientBrush>, value: ViewRef<RadialGradientBrush>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/VisualBrush.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/VisualBrush.fs
new file mode 100644
index 00000000..8e2e25c7
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/VisualBrush.fs
@@ -0,0 +1,31 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentVisualBrush =
+    inherit IFabComponentTileBrush
+    inherit IFabVisualBrush
+
+[<AutoOpen>]
+module ComponentVisualBrushBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a VisualBrush widget.</summary>
+        /// <param name="content">The content of the VisualBrush.</param>
+        static member VisualBrush(content: WidgetBuilder<'msg, #IFabComponentVisual>) =
+            WidgetBuilder<unit, IFabComponentVisualBrush>(
+                VisualBrush.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| VisualBrush.Visual.WithValue(content.Compile()) |], ValueNone)
+            )
+
+type ComponentVisualBrushModifiers =
+    /// <summary>Link a ViewRef to access the direct VisualBrush control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentVisualBrush>, value: ViewRef<VisualBrush>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/_GradientBrush.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/_GradientBrush.fs
new file mode 100644
index 00000000..d6e705e9
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Brushes/_GradientBrush.fs
@@ -0,0 +1,23 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentGradientBrush =
+    inherit IFabComponentBrush
+    inherit IFabGradientBrush
+
+module ComponentGradientBrush =
+    let GradientStops =
+        ComponentAttributes.defineAvaloniaListWidgetCollection "GradientBrush_GradientStops" (fun target -> (target :?> GradientBrush).GradientStops)
+
+type ComponentGradientBrushModifiers =
+
+    /// <summary>Sets the SpreadMethod property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The SpreadMethod value.</param>
+    [<Extension>]
+    static member inline spreadMethod(this: WidgetBuilder<'msg, #IFabGradientBrush>, value: GradientSpreadMethod) =
+        this.AddScalar(GradientBrush.SpreadMethod.WithValue(value))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/DashStyle.fs b/src/Fabulous.Avalonia/ComponentViews/Media/DashStyle.fs
new file mode 100644
index 00000000..8e04f549
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/DashStyle.fs
@@ -0,0 +1,29 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentDashStyle =
+    inherit IFabComponentAnimatable
+    inherit IFabDashStyle
+
+[<AutoOpen>]
+module ComponentDashStyleBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a DashStyle widget.</summary>
+        /// <param name="dashes">The length of alternating dashes and gaps.</param>
+        /// <param name="offset">How far in the dash sequence the stroke will start.</param>
+        static member DashStyle(dashes: float list, offset: float) =
+            WidgetBuilder<unit, IFabComponentDashStyle>(DashStyle.WidgetKey, DashStyle.Dashes.WithValue(dashes), DashStyle.Offset.WithValue(offset))
+
+type ComponentDashStyleModifiers =
+
+    /// <summary>Link a ViewRef to access the direct DashStyle control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentDashStyle>, value: ViewRef<DashStyle>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/DrawingGroup.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/DrawingGroup.fs
new file mode 100644
index 00000000..10169be2
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/DrawingGroup.fs
@@ -0,0 +1,51 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Avalonia.Media.Immutable
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentDrawingGroup =
+    inherit IFabComponentDrawing
+    inherit IFabDrawingGroup
+
+module ComponentDrawingGroup =
+
+    let Children =
+        ComponentAttributes.defineAvaloniaListWidgetCollection "DrawingGroup_Children" (fun target -> (target :?> DrawingGroup).Children)
+
+[<AutoOpen>]
+module ComponentDrawingGroupBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a DrawingGroup widget.</summary>
+        static member DrawingGroup() =
+            CollectionBuilder<'msg, IFabComponentDrawingGroup, IFabComponentDrawing>(DrawingGroup.WidgetKey, ComponentDrawingGroup.Children, DrawingGroup.Opacity.WithValue(1.0))
+
+        /// <summary>Creates a DrawingGroup widget.</summary>
+        /// <param name="opacity">The opacity of the drawing group.</param>
+        static member DrawingGroup(opacity: float) =
+            CollectionBuilder<'msg, IFabComponentDrawingGroup, IFabComponentDrawing>(DrawingGroup.WidgetKey, ComponentDrawingGroup.Children, DrawingGroup.Opacity.WithValue(opacity))
+
+type ComponentDrawingGroupModifiers =
+    /// <summary>Link a ViewRef to access the direct DrawingGroup control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentDrawingGroup>, value: ViewRef<DrawingGroup>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type ComponentDrawingGroupCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabDrawing>
+        (_: CollectionBuilder<'msg, 'marker, IFabDrawing>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabDrawing>
+        (_: CollectionBuilder<'msg, 'marker, IFabDrawing>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/DrawingImage.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/DrawingImage.fs
new file mode 100644
index 00000000..447ee987
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/DrawingImage.fs
@@ -0,0 +1,42 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentDrawingImage =
+    inherit IFabComponentDrawing
+    inherit IFabDrawingImage
+
+module ComponentDrawingImage =
+    let Invalidated =
+        ComponentAttributes.defineEventNoArg "DrawingImage_Invalidated" (fun target -> (target :?> DrawingImage).Invalidated)
+
+[<AutoOpen>]
+module ComponentDrawingImageBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a DrawingImage widget.</summary>
+        /// <param name="source">The source of the drawing.</param>
+        static member DrawingImage(source: WidgetBuilder<'msg, #IFabComponentDrawing>) =
+            WidgetBuilder<'msg, IFabComponentDrawingImage>(
+                DrawingImage.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| DrawingImage.Drawing.WithValue(source.Compile()) |], ValueNone)
+            )
+
+type ComponentDrawingImageModifiers =
+    /// <summary>Listens the DrawingImage Invalidated event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="msg">Raised when the DrawingImage is invalidated.</param>
+    [<Extension>]
+    static member inline onInvalidated(this: WidgetBuilder<'msg, #IFabComponentDrawingImage>, msg: unit -> unit) =
+        this.AddScalar(ComponentDrawingImage.Invalidated.WithValue(msg))
+
+    /// <summary>Link a ViewRef to access the direct DrawingImage control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentDrawingImage>, value: ViewRef<DrawingImage>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/GeometryDrawing.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/GeometryDrawing.fs
new file mode 100644
index 00000000..33168239
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/GeometryDrawing.fs
@@ -0,0 +1,109 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentGeometryDrawing =
+    inherit IFabComponentDrawing
+    inherit IFabGeometryDrawing
+
+[<AutoOpen>]
+module ComponentGeometryDrawingBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a GeometryDrawing widget.</summary>
+        /// <param name="geometry">The Geometry that describes the shape of this GeometryDrawing.</param>
+        /// <param name="brush">The Brush used to fill the interior with the shape described by this GeometryDrawing.</param>
+        static member GeometryDrawing(geometry: WidgetBuilder<'msg, #IFabComponentGeometry>, brush: WidgetBuilder<'msg, #IFabComponentBrush>) =
+            WidgetBuilder<'msg, IFabComponentGeometryDrawing>(
+                GeometryDrawing.WidgetKey,
+                AttributesBundle(
+                    StackList.empty(),
+                    ValueSome
+                        [| GeometryDrawing.BrushWidget.WithValue(brush.Compile())
+                           GeometryDrawing.GeometryWidget.WithValue(geometry.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a GeometryDrawing widget.</summary>
+        /// <param name="geometry">The Geometry that describes the shape of this GeometryDrawing.</param>
+        /// <param name="brush">The Brush used to fill the interior with the shape described by this GeometryDrawing.</param>
+        static member GeometryDrawing(geometry: string, brush: WidgetBuilder<'msg, #IFabComponentBrush>) =
+            WidgetBuilder<'msg, IFabComponentGeometryDrawing>(
+                GeometryDrawing.WidgetKey,
+                AttributesBundle(
+                    StackList.one(GeometryDrawing.Geometry.WithValue(StreamGeometry.Parse(geometry))),
+                    ValueSome [| GeometryDrawing.BrushWidget.WithValue(brush.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a GeometryDrawing widget.</summary>
+        /// <param name="geometry">The Geometry that describes the shape of this GeometryDrawing.</param>
+        /// <param name="brush">The Brush used to fill the interior with the shape described by this GeometryDrawing.</param>
+        static member GeometryDrawing(geometry: string, brush: Color) =
+            View.GeometryDrawing(geometry, View.SolidColorBrush(brush))
+
+        /// <summary>Creates a GeometryDrawing widget.</summary>
+        /// <param name="geometry">The Geometry that describes the shape of this GeometryDrawing.</param>
+        /// <param name="brush">The Brush used to fill the interior with the shape described by this GeometryDrawing.</param>
+        static member GeometryDrawing(geometry: string, brush: string) =
+            View.GeometryDrawing(geometry, View.SolidColorBrush(brush))
+
+        /// <summary>Creates a GeometryDrawing widget.</summary>
+        /// <param name="geometry">The Geometry that describes the shape of this GeometryDrawing.</param>
+        /// <param name="brush">The Brush used to fill the interior with the shape described by this GeometryDrawing.</param>
+        static member GeometryDrawing(geometry: WidgetBuilder<unit, #IFabComponentGeometry>, brush: Color) =
+            View.GeometryDrawing(geometry, View.SolidColorBrush(brush))
+
+        /// <summary>Creates a GeometryDrawing widget.</summary>
+        /// <param name="geometry">The Geometry that describes the shape of this GeometryDrawing.</param>
+        /// <param name="brush">The Brush used to fill the interior with the shape described by this GeometryDrawing.</param>
+        static member GeometryDrawing(geometry: WidgetBuilder<unit, #IFabComponentGeometry>, brush: string) =
+            View.GeometryDrawing(geometry, View.SolidColorBrush(brush))
+
+        /// <summary>Creates a GeometryDrawing widget.</summary>
+        /// <param name="geometry">The Geometry that describes the shape of this GeometryDrawing.</param>
+        /// <param name="brush">The Brush used to fill the interior with the shape described by this GeometryDrawing.</param>
+        static member GeometryDrawing(geometry: WidgetBuilder<'msg, #IFabComponentGeometry>, brush: IBrush) =
+            WidgetBuilder<'msg, IFabComponentGeometryDrawing>(
+                GeometryDrawing.WidgetKey,
+                AttributesBundle(
+                    StackList.one(GeometryDrawing.Brush.WithValue(brush)),
+                    ValueSome [| GeometryDrawing.GeometryWidget.WithValue(geometry.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a GeometryDrawing widget.</summary>
+        /// <param name="geometry">The Geometry that describes the shape of this GeometryDrawing.</param>
+        /// <param name="brush">The Brush used to fill the interior with the shape described by this GeometryDrawing.</param>
+        static member GeometryDrawing(geometry: string, brush: IBrush) =
+            WidgetBuilder<'msg, IFabComponentGeometryDrawing>(
+                GeometryDrawing.WidgetKey,
+                AttributesBundle(
+                    StackList.two(GeometryDrawing.Brush.WithValue(brush), GeometryDrawing.Geometry.WithValue(StreamGeometry.Parse(geometry))),
+                    ValueNone,
+                    ValueNone
+                )
+            )
+
+type ComponentGeometryDrawingModifiers =
+
+    /// <summary>Sets the Pen property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Pen value.</param>
+    [<Extension>]
+    static member inline pen(this: WidgetBuilder<'msg, #IFabComponentGeometryDrawing>, value: WidgetBuilder<'msg, #IFabPen>) =
+        this.AddWidget(GeometryDrawing.Pen.WithValue(value.Compile()))
+
+    /// <summary>Link a ViewRef to access the direct GeometryDrawing control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentGeometryDrawing>, value: ViewRef<GeometryDrawing>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/GlyphRunDrawing.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/GlyphRunDrawing.fs
new file mode 100644
index 00000000..80df8847
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/GlyphRunDrawing.fs
@@ -0,0 +1,60 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Avalonia.Media.Immutable
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentGlyphRunDrawing =
+    inherit IFabComponentDrawing
+    inherit IFabGlyphRunDrawing
+
+[<AutoOpen>]
+module ComponentGlyphRunDrawingBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a GlyphRunDrawing widget.</summary>
+        /// <param name="brush">The content of the drawing.</param>
+        /// <param name="glyphRun">The glyph run to draw.</param>
+        static member GlyphRunDrawing(brush: WidgetBuilder<'msg, #IFabBrush>, glyphRun: GlyphRun) =
+            WidgetBuilder<'msg, IFabComponentGlyphRunDrawing>(
+                GlyphRunDrawing.WidgetKey,
+                AttributesBundle(
+                    StackList.one(GlyphRunDrawing.GlyphRun.WithValue(glyphRun)),
+                    ValueSome [| GlyphRunDrawing.ForegroundWidget.WithValue(brush.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a GlyphRunDrawing widget.</summary>
+        /// <param name="brush">The content of the drawing.</param>
+        /// <param name="glyphRun">The glyph run to draw.</param>
+        static member GlyphRunDrawing(brush: IBrush, glyphRun: GlyphRun) =
+            WidgetBuilder<'msg, IFabComponentGlyphRunDrawing>(
+                GlyphRunDrawing.WidgetKey,
+                GlyphRunDrawing.GlyphRun.WithValue(glyphRun),
+                GlyphRunDrawing.Foreground.WithValue(brush)
+            )
+
+        /// <summary>Creates a GlyphRunDrawing widget.</summary>
+        /// <param name="brush">The content of the drawing.</param>
+        /// <param name="glyphRun">The glyph run to draw.</param>
+        static member GlyphRunDrawing(brush: Color, glyphRun: GlyphRun) =
+            View.GlyphRunDrawing(View.SolidColorBrush(brush), glyphRun)
+
+        /// <summary>Creates a GlyphRunDrawing widget.</summary>
+        /// <param name="brush">The content of the drawing.</param>
+        /// <param name="glyphRun">The glyph run to draw.</param>
+        static member GlyphRunDrawing(brush: string, glyphRun: GlyphRun) =
+            View.GlyphRunDrawing(View.SolidColorBrush(brush), glyphRun)
+
+type ComponentGlyphRunDrawingModifiers =
+
+    /// <summary>Link a ViewRef to access the direct GlyphRunDrawing control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentGlyphRunDrawing>, value: ViewRef<GlyphRunDrawing>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/ImageDrawing.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/ImageDrawing.fs
new file mode 100644
index 00000000..079bc589
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Drawing/ImageDrawing.fs
@@ -0,0 +1,81 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.IO
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Media
+open Avalonia.Media.Imaging
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentImageDrawing =
+    inherit IFabComponentDrawing
+    inherit IFabImageDrawing
+
+[<AutoOpen>]
+module ComponentImageDrawingBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ImageDrawing widget.</summary>
+        /// <param name="source">The source of the image.</param>
+        /// <param name="rect">The rectangle to draw the image in.</param>
+        static member ImageDrawing(source: Bitmap, rect: Rect) =
+            WidgetBuilder<'msg, IFabComponentImageDrawing>(
+                ImageDrawing.WidgetKey,
+                ImageDrawing.ImageSource.WithValue(ImageSourceValue.Bitmap(source)),
+                ImageDrawing.Rect.WithValue(rect)
+            )
+
+        /// <summary>Creates a ImageDrawing widget.</summary>
+        /// <param name="source">The source of the image.</param>
+        /// <param name="rect">The rectangle to draw the image in.</param>
+        static member ImageDrawing(source: string, rect: Rect) =
+            WidgetBuilder<'msg, IFabComponentImageDrawing>(
+                ImageDrawing.WidgetKey,
+                ImageDrawing.ImageSource.WithValue(ImageSourceValue.File(source)),
+                ImageDrawing.Rect.WithValue(rect)
+            )
+
+        /// <summary>Creates a ImageDrawing widget.</summary>
+        /// <param name="source">The source of the image.</param>
+        /// <param name="rect">The rectangle to draw the image in.</param>
+        static member ImageDrawing(source: Uri, rect: Rect) =
+            WidgetBuilder<'msg, IFabComponentImageDrawing>(
+                ImageDrawing.WidgetKey,
+                ImageDrawing.ImageSource.WithValue(ImageSourceValue.Uri(source)),
+                ImageDrawing.Rect.WithValue(rect)
+            )
+
+        /// <summary>Creates a ImageDrawing widget.</summary>
+        /// <param name="source">The source of the image.</param>
+        /// <param name="rect">The rectangle to draw the image in.</param>
+        static member ImageDrawing(source: Stream, rect: Rect) =
+            WidgetBuilder<'msg, IFabComponentImageDrawing>(
+                ImageDrawing.WidgetKey,
+                ImageDrawing.ImageSource.WithValue(ImageSourceValue.Stream(source)),
+                ImageDrawing.Rect.WithValue(rect)
+            )
+
+        /// <summary>Creates a ImageDrawing widget.</summary>
+        /// <param name="source">The source of the image.</param>
+        /// <param name="rect">The rectangle to draw the image in.</param>
+        static member ImageDrawing(source: WidgetBuilder<'msg, #IFabDrawing>, rect: Rect) =
+            WidgetBuilder<'msg, IFabComponentImageDrawing>(
+                ImageDrawing.WidgetKey,
+                AttributesBundle(
+                    StackList.one(ImageDrawing.Rect.WithValue(rect)),
+                    ValueSome [| ImageDrawing.ImageSourceWidget.WithValue(source.Compile()) |],
+                    ValueNone
+                )
+            )
+
+type ComponentImageDrawingModifiers =
+
+    /// <summary>Link a ViewRef to access the direct ImageDrawing control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentImageDrawing>, value: ViewRef<ImageDrawing>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Effects/BlurEffect.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Effects/BlurEffect.fs
new file mode 100644
index 00000000..34c4ee36
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Effects/BlurEffect.fs
@@ -0,0 +1,25 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Collections.Generic
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentBlurEffect =
+    inherit IFabComponentEffect
+    inherit IFabBlurEffect
+
+[<AutoOpen>]
+module ComponentBlurEffectBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a BlurEffect widget.</summary>
+        static member BlurEffect() =
+            WidgetBuilder<'msg, IFabComponentBlurEffect>(BlurEffect.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+        /// <summary>Creates a BlurEffect widget.</summary>
+        /// <param name="radius">The radius of the blur effect.</param>
+        static member BlurEffect(radius: float) =
+            WidgetBuilder<'msg, IFabComponentBlurEffect>(BlurEffect.WidgetKey, BlurEffect.Radius.WithValue(radius))
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Effects/DropShadowDirectionEffect.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Effects/DropShadowDirectionEffect.fs
new file mode 100644
index 00000000..b17e55a6
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Effects/DropShadowDirectionEffect.fs
@@ -0,0 +1,28 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentDropShadowDirectionEffect =
+    inherit IFabComponentDropShadowEffectBase
+
+[<AutoOpen>]
+module ComponentDropShadowDirectionEffectBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a DropShadowDirectionEffect widget.</summary>
+        static member DropShadowDirectionEffect() =
+            WidgetBuilder<unit, IFabDropShadowDirectionEffect>(DropShadowDirectionEffect.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+        /// <summary>Creates a DropShadowDirectionEffect widget.</summary>
+        /// <param name="shadowDepth">The depth of the shadow.</param>
+        /// <param name="direction">The direction of the shadow.</param>
+        static member DropShadowDirectionEffect(shadowDepth: float, direction: float) =
+            WidgetBuilder<unit, IFabDropShadowDirectionEffect>(
+                DropShadowDirectionEffect.WidgetKey,
+                DropShadowDirectionEffect.ShadowDepth.WithValue(shadowDepth),
+                DropShadowDirectionEffect.Direction.WithValue(direction)
+            )
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Effects/DropShadowEffect.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Effects/DropShadowEffect.fs
new file mode 100644
index 00000000..c4c3ebcb
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Effects/DropShadowEffect.fs
@@ -0,0 +1,29 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentDropShadowEffect =
+    inherit IFabComponentDropShadowEffectBase
+    inherit IFabDropShadowEffect
+
+[<AutoOpen>]
+module ComponentDropShadowEffectBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a DropShadowEffect widget.</summary>
+        static member DropShadowEffect() =
+            WidgetBuilder<unit, IFabDropShadowEffect>(DropShadowEffect.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+        /// <summary>Creates a DropShadowEffect widget.</summary>
+        /// <param name="offsetX">The X offset of the shadow.</param>
+        /// <param name="offsetY">The Y offset of the shadow.</param>
+        static member DropShadowEffect(offsetX: float, offsetY: float) =
+            WidgetBuilder<unit, IFabDropShadowEffect>(
+                DropShadowEffect.WidgetKey,
+                DropShadowEffect.OffsetX.WithValue(offsetX),
+                DropShadowEffect.OffsetY.WithValue(offsetY)
+            )
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/CombinedGeometry.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/CombinedGeometry.fs
new file mode 100644
index 00000000..4c7c8233
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/CombinedGeometry.fs
@@ -0,0 +1,29 @@
+namespace Fabulous.Avalonia.Components
+
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentCombinedGeometry =
+    inherit IFabComponentGeometry
+    inherit IFabCombinedGeometry
+
+
+[<AutoOpen>]
+module ComponentCombinedGeometryBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a CombinedGeometry widget.</summary>
+        /// <param name="geometry1">The first geometry.</param>
+        /// <param name="geometry2">The second geometry.</param>
+        static member CombinedGeometry(geometry1: WidgetBuilder<unit, #IFabGeometry>, geometry2: WidgetBuilder<unit, #IFabComponentGeometry>) =
+            WidgetBuilder<'msg, IFabComponentCombinedGeometry>(
+                CombinedGeometry.WidgetKey,
+                AttributesBundle(
+                    StackList.empty(),
+                    ValueSome
+                        [| CombinedGeometry.Geometry1.WithValue(geometry1.Compile())
+                           CombinedGeometry.Geometry2.WithValue(geometry2.Compile()) |],
+                    ValueNone
+                )
+            )
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/EllipseGeometry.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/EllipseGeometry.fs
new file mode 100644
index 00000000..f2337bd3
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/EllipseGeometry.fs
@@ -0,0 +1,22 @@
+namespace Fabulous.Avalonia.Components
+
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentEllipseGeometry =
+    inherit IFabComponentGeometry
+    inherit IFabEllipseGeometry
+
+[<AutoOpen>]
+module EllipseGeometryBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a EllipseGeometry widget.</summary>
+        /// <param name="radiusX">The X radius of the ellipse.</param>
+        /// <param name="radiusY">The Y radius of the ellipse.</param>
+        static member EllipseGeometry(radiusX: float, radiusY: float) =
+            WidgetBuilder<unit, IFabComponentEllipseGeometry>(
+                EllipseGeometry.WidgetKey,
+                EllipseGeometry.RadiusX.WithValue(radiusX),
+                EllipseGeometry.RadiusY.WithValue(radiusY)
+            )
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/GeometryGroup.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/GeometryGroup.fs
new file mode 100644
index 00000000..e15a8838
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/GeometryGroup.fs
@@ -0,0 +1,41 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentGeometryGroup =
+    inherit IFabComponentGeometry
+    inherit IFabGeometryGroup
+
+module ComponentGeometryGroup =
+    let Children =
+        ComponentAttributes.defineAvaloniaListWidgetCollection "GeometryGroup_Children" (fun target -> (target :?> GeometryGroup).Children)
+
+[<AutoOpen>]
+module ComponentGeometryGroupBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a GeometryGroup widget.</summary>
+        /// <param name="fillRule">The fill rule to apply to the geometry group.</param>
+        static member GeometryGroup(fillRule: FillRule) =
+            CollectionBuilder<unit, IFabComponentGeometryGroup, IFabComponentGeometry>(
+                GeometryGroup.WidgetKey,
+                ComponentGeometryGroup.Children,
+                GeometryGroup.FillRule.WithValue(fillRule)
+            )
+
+type ComponentGeometryGroupCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabComponentGeometry>
+        (_: CollectionBuilder<'msg, 'marker, IFabComponentGeometry>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabComponentGeometry>
+        (_: CollectionBuilder<'msg, 'marker, IFabComponentGeometry>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/LineGeometry.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/LineGeometry.fs
new file mode 100644
index 00000000..52207bf6
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/LineGeometry.fs
@@ -0,0 +1,23 @@
+namespace Fabulous.Avalonia.Components
+
+open Avalonia
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentLineGeometry =
+    inherit IFabComponentGeometry
+    inherit IFabLineGeometry
+
+[<AutoOpen>]
+module ComponentLineGeometryBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a LineGeometry widget.</summary>
+        /// <param name="startPoint">The start point of the line.</param>
+        /// <param name="endPoint">The end point of the line.</param>
+        static member LineGeometry(startPoint: Point, endPoint: Point) =
+            WidgetBuilder<unit, IFabLineGeometry>(
+                LineGeometry.WidgetKey,
+                LineGeometry.StartPoint.WithValue(startPoint),
+                LineGeometry.EndPoint.WithValue(endPoint)
+            )
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/PathGeometry.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/PathGeometry.fs
new file mode 100644
index 00000000..68f00955
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/PathGeometry.fs
@@ -0,0 +1,60 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentPathGeometry =
+    inherit IFabComponentGeometry
+    inherit IFabPathGeometry
+
+module ComponentPathGeometry =
+    let FiguresWidget =
+        ComponentAttributes.defineAvaloniaListWidgetCollection "PathGeometry_Figures" (fun target -> (target :?> PathGeometry).Figures)
+
+[<AutoOpen>]
+module PathGeometryBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a PathGeometry widget.</summary>
+        /// <param name="fillRule">The fill rule to apply to the geometry.</param>
+        static member PathGeometry(fillRule: FillRule) =
+            CollectionBuilder<'msg, IFabComponentPathGeometry, IFabComponentPathFigure>(
+                PathGeometry.WidgetKey,
+                ComponentPathGeometry.FiguresWidget,
+                PathGeometry.FillRule.WithValue(fillRule)
+            )
+
+        /// <summary>Creates a PathGeometry widget.</summary>
+        /// <param name="pathData">The path data to parse.</param>
+        /// <param name="fillRule">The fill rule to apply to the geometry.</param>
+        static member PathGeometry(pathData: string, fillRule: FillRule) =
+            WidgetBuilder<'msg, IFabComponentPathGeometry>(
+                PathGeometry.WidgetKey,
+                PathGeometry.Figures.WithValue(PathFigures.Parse(pathData)),
+                PathGeometry.FillRule.WithValue(fillRule)
+            )
+
+type PathGeometryBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabComponentPathFigure>
+        (_: CollectionBuilder<'msg, 'marker, IFabComponentPathFigure>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabPathFigure>
+        (_: CollectionBuilder<'msg, 'marker, IFabComponentPathFigure>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+type PathGeometryModifiers =
+
+    /// <summary>Link a ViewRef to access the direct PathGeometry control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabPathGeometry>, value: ViewRef<PathGeometry>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/PolylineGeometry.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/PolylineGeometry.fs
new file mode 100644
index 00000000..a9bca012
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/PolylineGeometry.fs
@@ -0,0 +1,23 @@
+namespace Fabulous.Avalonia.Components
+
+open Avalonia
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentPolylineGeometry =
+    inherit IFabComponentGeometry
+    inherit IFabPolylineGeometry
+
+[<AutoOpen>]
+module ComponentPolylineGeometryBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a RotateTransform widget.</summary>
+        /// <param name="points">The points of the polyline.</param>
+        /// <param name="isFilled">Whether the polyline is filled.</param>
+        static member PolylineGeometry(points: Point list, isFilled: bool) =
+            WidgetBuilder<unit, IFabComponentPolylineGeometry>(
+                PolylineGeometry.WidgetKey,
+                PolylineGeometry.Points.WithValue(points |> Array.ofList),
+                PolylineGeometry.IsFilled.WithValue(isFilled)
+            )
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/RectangleGeometry.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/RectangleGeometry.fs
new file mode 100644
index 00000000..2ba3d351
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Geometries/RectangleGeometry.fs
@@ -0,0 +1,20 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentRectangleGeometry =
+    inherit IFabComponentGeometry
+    inherit IFabRectangleGeometry
+
+[<AutoOpen>]
+module ComponentRectangleGeometryBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a RectangleGeometry widget.</summary>
+        /// <param name="rect">The rectangle to use for the geometry.</param>
+        static member RectangleGeometry(rect: Rect) =
+            WidgetBuilder<unit, IFabRectangleGeometry>(RectangleGeometry.WidgetKey, RectangleGeometry.Rect.WithValue(rect))
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/ArcSegment.fs b/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/ArcSegment.fs
new file mode 100644
index 00000000..5db8d6c9
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/ArcSegment.fs
@@ -0,0 +1,31 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentArcSegment =
+    inherit IFabComponentPathSegment
+    inherit IFabArcSegment
+
+[<AutoOpen>]
+module ComponentArcSegmentBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ArcSegment widget.</summary>
+        /// <param name="point">The point at which the arc ends.</param>
+        /// <param name="size">The size of the arc.</param>
+        static member ArcSegment(point: Point, size: Size) =
+            WidgetBuilder<unit, IFabComponentArcSegment>(ArcSegment.WidgetKey, ArcSegment.Point.WithValue(point), ArcSegment.Size.WithValue(size))
+
+type ComponentArcSegmentModifiers =
+
+    /// <summary>Link a ViewRef to access the direct ArcSegment control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<unit, IFabComponentArcSegment>, value: ViewRef<ArcSegment>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/BezierSegment.fs b/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/BezierSegment.fs
new file mode 100644
index 00000000..a3b00a0f
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/BezierSegment.fs
@@ -0,0 +1,36 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentBezierSegment =
+    inherit IFabComponentPathSegment
+    inherit IFabBezierSegment
+
+[<AutoOpen>]
+module ComponentBezierSegmentBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a BezierSegment widget.</summary>
+        /// <param name="point1">The first control point of the curve.</param>
+        /// <param name="point2">The second control point of the curve.</param>
+        /// <param name="point3">The third control point of the curve.</param>
+        static member BezierSegment(point1: Point, point2: Point, point3: Point) =
+            WidgetBuilder<unit, IFabComponentBezierSegment>(
+                BezierSegment.WidgetKey,
+                BezierSegment.Point1.WithValue(point1),
+                BezierSegment.Point2.WithValue(point2),
+                BezierSegment.Point3.WithValue(point3)
+            )
+
+type ComponentBezierSegmentModifiers =
+
+    /// <summary>Link a ViewRef to access the direct BezierSegment control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentBezierSegment>, value: ViewRef<BezierSegment>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/LineSegment.fs b/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/LineSegment.fs
new file mode 100644
index 00000000..8c6a2d1d
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/LineSegment.fs
@@ -0,0 +1,19 @@
+namespace Fabulous.Avalonia.Components
+
+open Avalonia
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentLineSegment =
+    inherit IFabComponentPathSegment
+    inherit IFabLineSegment
+
+[<AutoOpen>]
+module ComponentLineSegmentBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a LineSegment widget.</summary>
+        /// <param name="point">The point to draw the line to.</param>
+        static member LineSegment(point: Point) =
+            WidgetBuilder<unit, IFabComponentLineSegment>(LineSegment.WidgetKey, LineSegment.Point.WithValue(point))
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/PathFigure.fs b/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/PathFigure.fs
new file mode 100644
index 00000000..7eecf721
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/PathFigure.fs
@@ -0,0 +1,39 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentPathFigure =
+    inherit IFabComponentElement
+    inherit IFabPathFigure
+
+module ComponentPathFigure =
+    let Segments =
+        ComponentAttributes.defineAvaloniaListWidgetCollection "PathFigure_Segments" (fun target -> (target :?> PathFigure).Segments)
+
+
+[<AutoOpen>]
+module PathFigureBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a PathFigure widget.</summary>
+        /// <param name="startPoint">The start point of the path.</param>
+        static member PathFigure(startPoint: Point) =
+            CollectionBuilder<unit, IFabComponentPathFigure, IFabPathSegment>(PathFigure.WidgetKey, ComponentPathFigure.Segments, PathFigure.StartPoint.WithValue(startPoint))
+
+type PathFigureBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabPathSegment>
+        (_: CollectionBuilder<'msg, 'marker, IFabPathSegment>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabPathSegment>
+        (_: CollectionBuilder<'msg, 'marker, IFabPathSegment>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/PolyLineSegment.fs b/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/PolyLineSegment.fs
new file mode 100644
index 00000000..845eaa2e
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/PolyLineSegment.fs
@@ -0,0 +1,30 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentPolyLineSegment =
+    inherit IFabComponentPathSegment
+    inherit IFabPolyLineSegment
+
+[<AutoOpen>]
+module ComponentPolyLineSegmentBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a PolyLineSegment widget.</summary>
+        /// <param name="points">The points of the polyline.</param>
+        static member PolyLineSegment(points: Point list) =
+            WidgetBuilder<unit, IFabComponentPolyLineSegment>(PolyLineSegment.WidgetKey, PolyLineSegment.Points.WithValue(points |> Array.ofList))
+
+type ComponentPolyLineSegmentModifiers =
+
+    /// <summary>Link a ViewRef to access the direct PolyLineSegment control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentPolyLineSegment>, value: ViewRef<PolyLineSegment>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/QuadraticBezierSegment.fs b/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/QuadraticBezierSegment.fs
new file mode 100644
index 00000000..43cfaa19
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/PathSegments/QuadraticBezierSegment.fs
@@ -0,0 +1,35 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentQuadraticBezierSegment =
+    inherit IFabComponentPathSegment
+    inherit IFabQuadraticBezierSegment
+
+[<AutoOpen>]
+module ComponentQuadraticBezierSegmentBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a QuadraticBezierSegment widget.</summary>
+        /// <param name="point1">The first control point of the curve.</param>
+        /// <param name="point2">The second control point of the curve.</param>
+        static member QuadraticBezierSegment(point1: Point, point2: Point) =
+            WidgetBuilder<unit, IFabComponentQuadraticBezierSegment>(
+                QuadraticBezierSegment.WidgetKey,
+                QuadraticBezierSegment.Point1.WithValue(point1),
+                QuadraticBezierSegment.Point2.WithValue(point2)
+            )
+
+type ComponentQuadraticBezierSegmentModifiers =
+
+    /// <summary>Link a ViewRef to access the direct QuadraticBezierSegment control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<unit, IFabComponentQuadraticBezierSegment>, value: ViewRef<QuadraticBezierSegment>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Pen.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Pen.fs
new file mode 100644
index 00000000..2a601be0
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Pen.fs
@@ -0,0 +1,51 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Avalonia.Media.Immutable
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentPen =
+    inherit IFabComponentElement
+    inherit IFabPen
+
+[<AutoOpen>]
+module ComponentPenBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a Pen widget.</summary>
+        /// <param name="brush">The brush used to draw the stroke.</param>
+        /// <param name="thickness">The thickness of the stroke.</param>
+        static member Pen(brush: WidgetBuilder<'msg, #IFabBrush>, thickness: float) =
+            WidgetBuilder<'msg, IFabComponentPen>(
+                Pen.WidgetKey,
+                AttributesBundle(StackList.one(Pen.Thickness.WithValue(thickness)), ValueSome [| Pen.BrushWidget.WithValue(brush.Compile()) |], ValueNone)
+            )
+
+        /// <summary>Creates a Pen widget.</summary>
+        /// <param name="brush">The brush used to draw the stroke.</param>
+        /// <param name="thickness">The thickness of the stroke.</param>
+        static member Pen(brush: IBrush, thickness: float) =
+            WidgetBuilder<'msg, IFabComponentPen>(Pen.WidgetKey, Pen.Thickness.WithValue(thickness), Pen.Brush.WithValue(brush))
+
+        /// <summary>Creates a Pen widget.</summary>
+        /// <param name="brush">The brush used to draw the stroke.</param>
+        /// <param name="thickness">The thickness of the stroke.</param>
+        static member Pen(brush: Color, thickness: float) =
+            View.Pen(View.SolidColorBrush(brush), thickness)
+
+        /// <summary>Creates a Pen widget.</summary>
+        /// <param name="brush">The brush used to draw the stroke.</param>
+        /// <param name="thickness">The thickness of the stroke.</param>
+        static member Pen(brush: string, thickness: float) =
+            View.Pen(View.SolidColorBrush(brush), thickness)
+
+type ComponentPenModifiers =
+    /// <summary>Link a ViewRef to access the direct Pen control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentPen>, value: ViewRef<Pen>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/MatrixTransform.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/MatrixTransform.fs
new file mode 100644
index 00000000..90d3ad39
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/MatrixTransform.fs
@@ -0,0 +1,28 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentMatrixTransform =
+    inherit IFabComponentTransform
+    inherit IFabMatrixTransform
+
+[<AutoOpen>]
+module ComponentMatrixTransformBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a MatrixTransform widget.</summary>
+        /// <param name="matrix">The Matrix to apply.</param>
+        static member MatrixTransform(matrix: Matrix) =
+            WidgetBuilder<'msg, IFabComponentMatrixTransform>(MatrixTransform.WidgetKey, MatrixTransform.Matrix.WithValue(matrix))
+
+type ComponentMatrixTransformModifiers =
+    /// <summary>Link a ViewRef to access the direct MatrixTransform control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentMatrixTransform>, value: ViewRef<MatrixTransform>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/Rotate3DTransform.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/Rotate3DTransform.fs
new file mode 100644
index 00000000..10b6b744
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/Rotate3DTransform.fs
@@ -0,0 +1,39 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentRotate3DTransform =
+    inherit IFabComponentTransform
+    inherit IFabRotate3DTransform
+
+[<AutoOpen>]
+module Rotate3DTransformBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a Rotate3DTransform widget.</summary>
+        /// <param name="angleX">The angle of rotation about the x-axis, in degrees.</param>
+        /// <param name="angleY">The angle of rotation about the y-axis, in degrees.</param>
+        /// <param name="angleZ">The angle of rotation about the z-axis, in degrees.</param>
+        /// <param name="centerX">The x-coordinate of the rotation center point.</param>
+        /// <param name="centerY">The y-coordinate of the rotation center point.</param>
+        /// <param name="centerZ">The z-coordinate of the rotation center point.</param>
+        /// <param name="depth">The distance between the plane of the screen and the rotated object.</param>
+        static member Rotate3DTransform(angleX: float, angleY: float, angleZ: float, centerX: float, centerY: float, centerZ: float, depth: float) =
+            WidgetBuilder<unit, IFabComponentRotate3DTransform>(
+                Rotate3DTransform.WidgetKey,
+                Rotate3DTransform.Angle.WithValue(struct (angleX, angleY, angleZ)),
+                Rotate3DTransform.Center.WithValue(struct (centerX, centerY, centerZ)),
+                Rotate3DTransform.Depth.WithValue(depth)
+            )
+
+type Rotate3DTransformModifiers =
+    /// <summary>Link a ViewRef to access the direct Rotate3DTransform control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentRotate3DTransform>, value: ViewRef<Rotate3DTransform>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/RotateTransform.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/RotateTransform.fs
new file mode 100644
index 00000000..bbef7089
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/RotateTransform.fs
@@ -0,0 +1,44 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentRotateTransform =
+    inherit IFabComponentTransform
+    inherit IFabRotateTransform
+
+[<AutoOpen>]
+module ComponentRotateTransformBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a RotateTransform widget.</summary>
+        /// <param name="angle">The Angle to apply.</param>
+        /// <param name="centerX">The X coordinate of the center of rotation.</param>
+        /// <param name="centerY">The Y coordinate of the center of rotation.</param>
+        static member RotateTransform(angle: float, centerX: float, centerY: float) =
+            WidgetBuilder<unit, IFabComponentRotateTransform>(
+                RotateTransform.WidgetKey,
+                RotateTransform.Angle.WithValue(angle),
+                RotateTransform.CenterX.WithValue(centerX),
+                RotateTransform.CenterY.WithValue(centerY)
+            )
+
+        /// <summary>Creates a RotateTransform widget.</summary>
+        /// <param name="angle">The Angle to apply.</param>
+        static member RotateTransform(angle: float) =
+            WidgetBuilder<unit, IFabComponentRotateTransform>(RotateTransform.WidgetKey, RotateTransform.Angle.WithValue(angle))
+
+        /// <summary>Creates a RotateTransform widget.</summary>
+        static member RotateTransform() =
+            WidgetBuilder<unit, IFabComponentRotateTransform>(RotateTransform.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+type ComponentRotateTransformTransformModifiers =
+    /// <summary>Link a ViewRef to access the direct RotateTransform control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentRotateTransform>, value: ViewRef<RotateTransform>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/ScaleTransform.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/ScaleTransform.fs
new file mode 100644
index 00000000..bb3e71d9
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/ScaleTransform.fs
@@ -0,0 +1,38 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentScaleTransform =
+    inherit IFabComponentTransform
+    inherit IFabScaleTransform
+
+[<AutoOpen>]
+module ComponentScaleTransformBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ScaleTransform widget.</summary>
+        /// <param name="scaleX">The X scale factor.</param>
+        /// <param name="scaleY">The Y scale factor.</param>
+        static member ScaleTransform(scaleX: float, scaleY: float) =
+            WidgetBuilder<unit, IFabComponentScaleTransform>(ScaleTransform.WidgetKey, ScaleTransform.ScaleX.WithValue(scaleX), ScaleTransform.ScaleY.WithValue(scaleY))
+
+        /// <summary>Creates a ScaleTransform widget.</summary>
+        /// <param name="scaleX">The X scale factor.</param>
+        static member ScaleTransform(scaleX: float) =
+            WidgetBuilder<unit, IFabComponentScaleTransform>(ScaleTransform.WidgetKey, ScaleTransform.ScaleX.WithValue(scaleX))
+
+        /// <summary>Creates a ScaleTransform widget.</summary>
+        static member ScaleTransform() =
+            WidgetBuilder<unit, IFabComponentScaleTransform>(ScaleTransform.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+type ComponentScaleTransformModifiers =
+    /// <summary>Link a ViewRef to access the direct ScaleTransform control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentScaleTransform>, value: ViewRef<ScaleTransform>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/SkewTransform.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/SkewTransform.fs
new file mode 100644
index 00000000..a50d681f
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/SkewTransform.fs
@@ -0,0 +1,38 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentSkewTransform =
+    inherit IFabComponentTransform
+    inherit IFabSkewTransform
+
+[<AutoOpen>]
+module ComponentSkewTransformBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a SkewTransform widget.</summary>
+        /// <param name="angleX">The AngleX to apply.</param>
+        /// <param name="angleY">The AngleY to apply.</param>
+        static member SkewTransform(angleX: float, angleY: float) =
+            WidgetBuilder<unit, IFabComponentSkewTransform>(SkewTransform.WidgetKey, SkewTransform.AngleX.WithValue(angleX), SkewTransform.AngleY.WithValue(angleY))
+
+        /// <summary>Creates a SkewTransform widget.</summary>
+        /// <param name="angleX">The AngleX to apply.</param>
+        static member SkewTransform(angleX: float) =
+            WidgetBuilder<unit, IFabComponentSkewTransform>(SkewTransform.WidgetKey, SkewTransform.AngleX.WithValue(angleX))
+
+        /// <summary>Creates a SkewTransform widget.</summary>
+        static member SkewTransform() =
+            WidgetBuilder<unit, IFabComponentSkewTransform>(SkewTransform.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+type ComponentSkewTransformTransformModifiers =
+    /// <summary>Link a ViewRef to access the direct SkewTransform control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentSkewTransform>, value: ViewRef<SkewTransform>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/TransformGroup.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/TransformGroup.fs
new file mode 100644
index 00000000..73e347d4
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/TransformGroup.fs
@@ -0,0 +1,45 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentTransformGroup =
+    inherit IFabComponentTransform
+    inherit IFabTransformGroup
+
+module ComponentTransformGroup =
+
+    let Children =
+        ComponentAttributes.defineAvaloniaListWidgetCollection "TransformGroup_Children" (fun target -> (target :?> TransformGroup).Children)
+
+[<AutoOpen>]
+module ComponentTransformGroupBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a TransformGroup widget.</summary>
+        static member TransformGroup() =
+            CollectionBuilder<unit, IFabComponentTransformGroup, IFabComponentTransform>(TransformGroup.WidgetKey, ComponentTransformGroup.Children)
+
+type ComponentTransformGroupCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabTransform>
+        (_: CollectionBuilder<'msg, 'marker, IFabTransform>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabTransform>
+        (_: CollectionBuilder<'msg, 'marker, IFabTransform>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+type TransformGroupModifiers =
+    /// <summary>Link a ViewRef to access the direct TransformGroup control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabTransformGroup>, value: ViewRef<TransformGroup>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/TranslateTransform.fs b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/TranslateTransform.fs
new file mode 100644
index 00000000..6a19da4e
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/Transforms/TranslateTransform.fs
@@ -0,0 +1,38 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentTranslateTransform =
+    inherit IFabComponentTransform
+    inherit IFabTranslateTransform
+
+[<AutoOpen>]
+module ComponentTranslateTransformBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a TranslateTransform widget.</summary>
+        /// <param name="x">The X offset.</param>
+        /// <param name="y">The Y offset.</param>
+        static member TranslateTransform(x: float, y: float) =
+            WidgetBuilder<'msg, IFabComponentTranslateTransform>(TranslateTransform.WidgetKey, TranslateTransform.X.WithValue(x), TranslateTransform.Y.WithValue(y))
+
+        /// <summary>Creates a TranslateTransform widget.</summary>
+        /// <param name="x">The X offset.</param>
+        static member TranslateTransform(x: float) =
+            WidgetBuilder<'msg, IFabComponentTranslateTransform>(TranslateTransform.WidgetKey, TranslateTransform.X.WithValue(x))
+
+        /// <summary>Creates a TranslateTransform widget.</summary>
+        static member TranslateTransform() =
+            WidgetBuilder<'msg, IFabComponentTranslateTransform>(TranslateTransform.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+type ComponentTranslateTransformModifiers =
+    /// <summary>Link a ViewRef to access the direct TranslateTransform control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentTranslateTransform>, value: ViewRef<TranslateTransform>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/_DropShadowEffectBase.fs b/src/Fabulous.Avalonia/ComponentViews/Media/_DropShadowEffectBase.fs
new file mode 100644
index 00000000..8185faee
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/_DropShadowEffectBase.fs
@@ -0,0 +1,10 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentDropShadowEffectBase =
+    inherit IFabComponentEffect
+    inherit IFabDropShadowEffectBase
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/_Effect.fs b/src/Fabulous.Avalonia/ComponentViews/Media/_Effect.fs
new file mode 100644
index 00000000..672e7d15
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/_Effect.fs
@@ -0,0 +1,22 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentEffect =
+    inherit IFabComponentAnimatable
+    inherit IFabEffect
+
+module ComponentEffect =
+    let Invalidated =
+        ComponentAttributes.defineEventNoArg "Effect_Invalidated" (fun target -> (target :?> Effect).Invalidated)
+
+type ComponentEffectModifiers =
+    /// <summary>Listens the Effect Invalidated event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="msg">Raised when the Effect is invalidated.</param>
+    [<Extension>]
+    static member inline onInvalidated(this: WidgetBuilder<'msg, #IFabComponentEffect>, msg: unit -> unit) =
+        this.AddScalar(ComponentEffect.Invalidated.WithValue(msg))
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/_IDrawing.fs b/src/Fabulous.Avalonia/ComponentViews/Media/_IDrawing.fs
new file mode 100644
index 00000000..7436dd87
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/_IDrawing.fs
@@ -0,0 +1,7 @@
+namespace Fabulous.Avalonia.Components
+
+open Fabulous.Avalonia
+
+type IFabComponentDrawing =
+    inherit IFabComponentElement
+    inherit IFabDrawing
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/_IGeometry.fs b/src/Fabulous.Avalonia/ComponentViews/Media/_IGeometry.fs
new file mode 100644
index 00000000..b36f76c5
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/_IGeometry.fs
@@ -0,0 +1,30 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentGeometry =
+    inherit IFabComponentElement
+    inherit IFabGeometry
+
+module ComponentGeometry =
+    let Changed =
+        ComponentAttributes.defineEventNoArg "Geometry_Changed" (fun target -> (target :?> Geometry).Changed)
+
+type ComponentGeometryModifiers =
+    /// <summary>Listens to the Geometry Changed event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="msg">Raised when the geometry changes.</param>
+    [<Extension>]
+    static member inline onChanged(this: WidgetBuilder<unit, #IFabComponentGeometry>, msg: unit -> unit) =
+        this.AddScalar(ComponentGeometry.Changed.WithValue(msg))
+
+type GeometryAttachedModifiers =
+    /// <summary>Sets the Clip property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Clip value.</param>
+    [<Extension>]
+    static member inline clip(this: WidgetBuilder<unit, #IFabComponentVisual>, value: WidgetBuilder<unit, #IFabComponentGeometry>) =
+        this.AddWidget(Visual.ClipWidget.WithValue(value.Compile()))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/_IPathSegment.fs b/src/Fabulous.Avalonia/ComponentViews/Media/_IPathSegment.fs
new file mode 100644
index 00000000..18a5bdbf
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/_IPathSegment.fs
@@ -0,0 +1,7 @@
+namespace Fabulous.Avalonia.Components
+
+open Fabulous.Avalonia
+
+type IFabComponentPathSegment =
+    inherit IFabComponentElement
+    inherit IFabPathSegment
diff --git a/src/Fabulous.Avalonia/ComponentViews/Media/_TileBrush.fs b/src/Fabulous.Avalonia/ComponentViews/Media/_TileBrush.fs
new file mode 100644
index 00000000..3c9f8dee
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Media/_TileBrush.fs
@@ -0,0 +1,7 @@
+namespace Fabulous.Avalonia.Components
+
+open Fabulous.Avalonia
+
+type IFabComponentTileBrush =
+    inherit IFabComponentBrush
+    inherit IFabTileBrush
diff --git a/src/Fabulous.Avalonia/ComponentViews/Menu/ComboBox.fs b/src/Fabulous.Avalonia/ComponentViews/Menu/ComboBox.fs
new file mode 100644
index 00000000..1b9b70d6
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Menu/ComboBox.fs
@@ -0,0 +1,70 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Layout
+open Avalonia.Media
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentComboBox =
+    inherit IFabComponentSelectingItemsControl
+    inherit IFabComboBox
+
+module ComponentComboBox =
+    let DropDownOpened =
+        ComponentAttributes.defineAvaloniaPropertyWithChangedEvent' "Opened" ComboBox.IsDropDownOpenProperty
+
+
+[<AutoOpen>]
+module ComboBoxBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ComboBox widget.</summary>
+        /// <param name="items">The items to display in the ComboBox.</param>
+        static member ComboBox(items: seq<_>) =
+            WidgetBuilder<unit, IFabComponentComboBox>(
+                ComboBox.WidgetKey,
+                AttributesBundle(StackList.one(ItemsControl.ItemsSource.WithValue(items)), ValueNone, ValueNone)
+            )
+
+        /// <summary>Creates a ComboBox widget.</summary>
+        /// <param name="items">The items to display in the ComboBox.</param>
+        /// <param name="template">The template to use to render each item.</param>
+        static member ComboBox(items: seq<'itemData>, template: 'itemData -> WidgetBuilder<unit, 'itemMarker>) =
+            WidgetHelpers.buildItems<unit, IFabComponentComboBox, 'itemData, 'itemMarker> ComboBox.WidgetKey ItemsControl.ItemsSourceTemplate items template
+
+        /// <summary>Creates a ComboBox widget.</summary>
+        static member ComboBox() =
+            CollectionBuilder<unit, IFabComponentComboBox, IFabComponentComboBoxItem>(ComboBox.WidgetKey, ComponentItemsControl.Items)
+
+type ComponentComboBoxModifiers =
+    /// <summary>Listens to the ComboBox DropDownOpened event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="isOpen">Weather the drop down is open or not.</param>
+    /// <param name="fn">Raised when the DropDownOpened event fires.</param>
+    [<Extension>]
+    static member inline onDropDownOpened(this: WidgetBuilder<'msg, #IFabComponentComboBox>, isOpen: bool, fn: bool -> unit) =
+        this.AddScalar(ComponentComboBox.DropDownOpened.WithValue(ComponentValueEventData.create isOpen fn))
+
+    /// <summary>Link a ViewRef to access the direct ComboBox control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentComboBox>, value: ViewRef<ComboBox>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type ComponentComboBoxCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabComboBoxItem>
+        (_: CollectionBuilder<'msg, 'marker, IFabComboBoxItem>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabComboBoxItem>
+        (_: CollectionBuilder<'msg, 'marker, IFabComboBoxItem>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
diff --git a/src/Fabulous.Avalonia/ComponentViews/Menu/ContextMenu.fs b/src/Fabulous.Avalonia/ComponentViews/Menu/ContextMenu.fs
new file mode 100644
index 00000000..ed2d29d8
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Menu/ContextMenu.fs
@@ -0,0 +1,81 @@
+namespace Fabulous.Avalonia.Components
+
+open System.ComponentModel
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Controls
+open Avalonia.Controls.Primitives.PopupPositioning
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentContextMenu =
+    inherit IFabComponentMenuBase
+    inherit IFabContextMenu
+
+module ComponentContextMenu =
+    let Opening =
+        ComponentAttributes.defineCancelEvent "ContextMenu_Opening" (fun target -> (target :?> ContextMenu).Opening)
+
+    let Closing =
+        ComponentAttributes.defineCancelEvent "ContextMenu_Closing" (fun target -> (target :?> ContextMenu).Closing)
+
+[<AutoOpen>]
+module ComponentContextMenuBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ContextMenu widget.</summary>
+        /// <param name="placement">The placement mode of the ContextMenu.</param>
+        static member ContextMenu(placement: PlacementMode) =
+            CollectionBuilder<unit, IFabComponentContextMenu, IFabComponentControl>(ContextMenu.WidgetKey, ComponentItemsControl.Items, ContextMenu.Placement.WithValue(placement))
+
+        /// <summary>Creates a ContextMenu widget.</summary>
+        static member ContextMenu() =
+            CollectionBuilder<unit, IFabComponentContextMenu, IFabComponentControl>(
+                ContextMenu.WidgetKey,
+                ComponentItemsControl.Items,
+                ContextMenu.Placement.WithValue(PlacementMode.Bottom)
+            )
+
+type ComponentContextMenuModifiers =
+    /// <summary>Listens to the ContextMenu Opening event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the Opening event fires.</param>
+    [<Extension>]
+    static member inline onOpening(this: WidgetBuilder<'msg, #IFabContextMenu>, fn: CancelEventArgs -> unit) =
+        this.AddScalar(ComponentContextMenu.Opening.WithValue(fn))
+
+    /// <summary>Listens to the ContextMenu Closing event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the Closing event fires.</param>
+    [<Extension>]
+    static member inline onClosing(this: WidgetBuilder<'msg, #IFabContextMenu>, fn: CancelEventArgs -> unit) =
+        this.AddScalar(ComponentContextMenu.Closing.WithValue(fn))
+
+    /// <summary>Link a ViewRef to access the direct ContextMenu control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentContextMenu>, value: ViewRef<ContextMenu>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type ComponentContextMenuAttachedModifiers =
+    /// <summary>Sets the ContextMenu property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ContextMenu value.</param>
+    [<Extension>]
+    static member inline contextMenu(this: WidgetBuilder<'msg, #IFabComponentControl>, value: WidgetBuilder<'msg, IFabComponentContextMenu>) =
+        this.AddWidget(Control.ContextMenu.WithValue(value.Compile()))
+
+type ComponentContextMenuCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabControl>
+        (_: CollectionBuilder<'msg, 'marker, IFabControl>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabControl>
+        (_: CollectionBuilder<'msg, 'marker, IFabControl>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
diff --git a/src/Fabulous.Avalonia/ComponentViews/Menu/Flyout.fs b/src/Fabulous.Avalonia/ComponentViews/Menu/Flyout.fs
new file mode 100644
index 00000000..82e0968a
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Menu/Flyout.fs
@@ -0,0 +1,39 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentFlyout =
+    inherit IFabComponentPopupFlyoutBase
+    inherit IFabFlyout
+
+[<AutoOpen>]
+module ComponentFlyoutBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a Flyout widget.</summary>
+        /// <param name="content">The content of the Flyout.</param>
+        static member Flyout(content: WidgetBuilder<'msg, #IFabComponentControl>) =
+            WidgetBuilder<unit, IFabComponentFlyout>(
+                Flyout.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| Flyout.Content.WithValue(content.Compile()) |], ValueNone)
+            )
+
+type ComponentFlyoutModifiers =
+    /// <summary>Link a ViewRef to access the direct Flyout control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabFlyout>, value: ViewRef<Flyout>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type ComponentFlyoutAttachedModifiers =
+    /// <summary>Sets the AttachedFlyout property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The AttachedFlyout value.</param>
+    [<Extension>]
+    static member inline attachedFlyout(this: WidgetBuilder<'msg, #IFabComponentControl>, value: WidgetBuilder<'msg, #IFabComponentFlyoutBase>) =
+        this.AddWidget(FlyoutBase.AttachedFlyout.WithValue(value.Compile()))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Menu/Menu.fs b/src/Fabulous.Avalonia/ComponentViews/Menu/Menu.fs
new file mode 100644
index 00000000..384ff9c8
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Menu/Menu.fs
@@ -0,0 +1,40 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentMenu =
+    inherit IFabComponentMenuBase
+    inherit IFabMenu
+
+[<AutoOpen>]
+module ComponentMenuBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a Menu widget.</summary>
+        static member Menu() =
+            CollectionBuilder<unit, IFabComponentMenu, IFabComponentMenuItem>(Menu.WidgetKey, ComponentItemsControl.Items)
+
+type ComponentMenuModifiers =
+    /// <summary>Link a ViewRef to access the direct Menu control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentMenu>, value: ViewRef<Menu>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type MenuCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabMenuItem>
+        (_: CollectionBuilder<'msg, 'marker, IFabMenuItem>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabMenuItem>
+        (_: CollectionBuilder<'msg, 'marker, IFabMenuItem>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
diff --git a/src/Fabulous.Avalonia/ComponentViews/Menu/MenuFlyout.fs b/src/Fabulous.Avalonia/ComponentViews/Menu/MenuFlyout.fs
new file mode 100644
index 00000000..eee9a25d
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Menu/MenuFlyout.fs
@@ -0,0 +1,52 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentMenuFlyout =
+    inherit IFabComponentPopupFlyoutBase
+    inherit IFabMenuFlyout
+
+module ComponentMenuFlyout =
+    let Items =
+        ComponentAttributes.defineAvaloniaNonGenericListWidgetCollection "MenuFlyout_Items" (fun target ->
+            let target = target :?> MenuFlyout
+
+            if target.Items = null then
+                let newColl = ItemCollection.Empty
+                target.Items.Add newColl |> ignore
+                newColl
+            else
+                target.Items)
+
+[<AutoOpen>]
+module ComponentMenuFlyoutBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a MenuFlyout widget.</summary>
+        static member MenuFlyout() =
+            CollectionBuilder<unit, IFabComponentMenuFlyout, IFabComponentMenuItem>(MenuFlyout.WidgetKey, ComponentMenuFlyout.Items)
+
+type ComponentMenuFlyoutModifiers =
+    /// <summary>Link a ViewRef to access the direct MenuFlyout control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabMenuFlyout>, value: ViewRef<MenuFlyout>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type ComponentMenuFlyoutCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabMenuItem>
+        (_: CollectionBuilder<'msg, 'marker, IFabMenuItem>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabMenuItem>
+        (_: CollectionBuilder<'msg, 'marker, IFabMenuItem>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
diff --git a/src/Fabulous.Avalonia/ComponentViews/Menu/NativeMenu.fs b/src/Fabulous.Avalonia/ComponentViews/Menu/NativeMenu.fs
new file mode 100644
index 00000000..167f05ed
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Menu/NativeMenu.fs
@@ -0,0 +1,104 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentNativeMenu =
+    inherit IFabComponentNativeMenuItemBase
+    inherit IFabNativeMenu
+
+module ComponentNativeMenu =
+    let WidgetKey = Widgets.register<NativeMenu>()
+
+    let Items =
+        ComponentAttributes.defineListWidgetCollection "NativeMenu_Items" (fun target -> (target :?> NativeMenu).Items)
+
+    let Opening =
+        ComponentAttributes.defineEvent "NativeMenu_Opening" (fun target -> (target :?> NativeMenu).Opening)
+
+    let Closed =
+        ComponentAttributes.defineEvent "NativeMenu_Opening" (fun target -> (target :?> NativeMenu).Closed)
+
+    let NeedsUpdate =
+        ComponentAttributes.defineEvent "NativeMenu_NeedsUpdate" (fun target -> (target :?> NativeMenu).NeedsUpdate)
+
+module NativeMenuAttached =
+    let NativeMenu = Attributes.defineAvaloniaPropertyWidget NativeMenu.MenuProperty
+
+    let IsNativeMenuExported =
+        Attributes.defineAvaloniaPropertyWithEquality Avalonia.Controls.NativeMenu.IsNativeMenuExportedProperty
+
+[<AutoOpen>]
+module ComponentNativeMenuBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a NativeMenu widget</summary>
+        static member NativeMenu() =
+            CollectionBuilder<'msg, IFabComponentNativeMenu, IFabComponentNativeMenuItem>(NativeMenu.WidgetKey, ComponentNativeMenu.Items)
+
+type NativeMenuModifiers =
+    /// <summary>Listens to the NativeMenu Opening event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="msg">Raised when the Opening event fires.</param>
+    [<Extension>]
+    static member inline onOpening(this: WidgetBuilder<'msg, #IFabNativeMenu>, msg: EventArgs -> unit) =
+        this.AddScalar(ComponentNativeMenu.Opening.WithValue(msg))
+
+    /// <summary>Listens to the NativeMenu Closed event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="msg">Raised when the Closed event fires.</param>
+    [<Extension>]
+    static member inline onClosed(this: WidgetBuilder<'msg, #IFabNativeMenu>, msg: EventArgs -> unit) =
+        this.AddScalar(ComponentNativeMenu.Closed.WithValue(msg))
+
+    /// <summary>Listens to the NativeMenu NeedsUpdate event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="msg">Raised when the NeedsUpdate event fires.</param>
+    [<Extension>]
+    static member inline onNeedsUpdate(this: WidgetBuilder<'msg, #IFabNativeMenu>, msg: EventArgs -> unit) =
+        this.AddScalar(ComponentNativeMenu.NeedsUpdate.WithValue(msg))
+
+    /// <summary>Link a ViewRef to access the direct NativeMenu control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentNativeMenu>, value: ViewRef<NativeMenu>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type NativeMenuAttachedModifiers =
+    /// <summary>Sets the IsNativeMenuExported property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The IsNativeMenuExported value.</param>
+    [<Extension>]
+    static member inline isNativeMenuExported(this: WidgetBuilder<'msg, #IFabTopLevel>, value: bool) =
+        this.AddScalar(NativeMenuAttached.IsNativeMenuExported.WithValue(value))
+
+    /// <summary>Sets the Menu property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Menu value.</param>
+    [<Extension>]
+    static member inline menu(this: WidgetBuilder<'msg, #IFabNativeMenuItem>, value: WidgetBuilder<'msg, #IFabNativeMenu>) =
+        this.AddWidget(NativeMenuItem.Menu.WithValue(value.Compile()))
+
+type ComponentWindowMenuAttachedModifiers =
+    /// <summary>Sets the NativeMenu property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The NativeMenu value.</param>
+    [<Extension>]
+    static member inline menu(this: WidgetBuilder<'msg, #IFabWindow>, value: WidgetBuilder<'msg, #IFabNativeMenu>) =
+        this.AddWidget(NativeMenuAttached.NativeMenu.WithValue(value.Compile()))
+
+type NativeViewYieldExtensions =
+    [<Extension>]
+    static member inline Yield(_: CollectionBuilder<'msg, #IFabNativeMenu, IFabNativeMenuItem>, x: WidgetBuilder<'msg, #IFabNativeMenuItem>) : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield
+        (_: CollectionBuilder<'msg, #IFabNativeMenu, IFabNativeMenuItem>, x: WidgetBuilder<'msg, Memo.Memoized<#IFabNativeMenuItem>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
diff --git a/src/Fabulous.Avalonia/ComponentViews/Menu/NativeMenuBar.fs b/src/Fabulous.Avalonia/ComponentViews/Menu/NativeMenuBar.fs
new file mode 100644
index 00000000..78062a29
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Menu/NativeMenuBar.fs
@@ -0,0 +1,27 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentNativeMenuBar =
+    inherit IFabComponentTemplatedControl
+    inherit IFabNativeMenuBar
+
+[<AutoOpen>]
+module ComponentNativeMenuBarBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a NativeMenuBar widget.</summary>
+        static member NativeMenuBar() =
+            WidgetBuilder<unit, IFabComponentNativeMenuBar>(NativeMenuBar.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+type ComponentNativeMenuBarAttachedModifiers =
+    /// <summary>Link a ViewRef to access the direct NativeMenuBar control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentNativeMenuBar>, value: ViewRef<NativeMenuBar>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Menu/NativeMenuItem.fs b/src/Fabulous.Avalonia/ComponentViews/Menu/NativeMenuItem.fs
new file mode 100644
index 00000000..71156487
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Menu/NativeMenuItem.fs
@@ -0,0 +1,46 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.IO
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Input
+open Avalonia.Media.Imaging
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentNativeMenuItem =
+    inherit IFabComponentElement
+    inherit IFabNativeMenuItem
+
+module ComponentNativeMenuItem =
+
+    let Click =
+        ComponentAttributes.defineEventNoArg "NativeMenuItem_Click" (fun target -> (target :?> NativeMenuItem).Click)
+
+[<AutoOpen>]
+module NativeMenuItemBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a NativeMenuItem widget.</summary>
+        /// <param name="header">The header of the Flyout.</param>
+        static member NativeMenuItem(header: string) =
+            WidgetBuilder<unit, IFabComponentNativeMenuItem>(NativeMenuItem.WidgetKey, NativeMenuItem.Header.WithValue(header))
+
+        /// <summary>Creates a NativeMenuItem widget.</summary>
+        /// <param name="header">The header of the Flyout.</param>
+        /// <param name="onClicked">Raised when the menu item is clicked.</param>
+        static member NativeMenuItem(header: string, onClicked: unit -> unit) =
+            WidgetBuilder<unit, IFabComponentNativeMenuItem>(
+                NativeMenuItem.WidgetKey,
+                NativeMenuItem.Header.WithValue(header),
+                ComponentNativeMenuItem.Click.WithValue(onClicked)
+            )
+
+type ComponentNativeMenuItemModifiers =
+    /// <summary>Link a ViewRef to access the direct NativeMenuItem control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabNativeMenuItem>, value: ViewRef<NativeMenuItem>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/Menu/NativeMenuSeparator.fs b/src/Fabulous.Avalonia/ComponentViews/Menu/NativeMenuSeparator.fs
new file mode 100644
index 00000000..d31cbecc
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Menu/NativeMenuSeparator.fs
@@ -0,0 +1,30 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentNativeMenuItemSeparator =
+    inherit IFabComponentNativeMenuItem
+    inherit IFabNativeMenuItemSeparator
+
+module NativeMenuItemSeparator =
+    let WidgetKey = Widgets.register<NativeMenuItemSeparator>()
+
+[<AutoOpen>]
+module NativeMenuItemSeparatorBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a NativeMenuItemSeparator widget.</summary>
+        static member NativeMenuItemSeparator() =
+            WidgetBuilder<'msg, IFabNativeMenuItemSeparator>(NativeMenuItemSeparator.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+type NativeMenuItemSeparatorModifiers =
+    /// <summary>Link a ViewRef to access the direct NativeMenuItemSeparator control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabNativeMenuItemSeparator>, value: ViewRef<NativeMenuItemSeparator>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Menu/TabStrip.fs b/src/Fabulous.Avalonia/ComponentViews/Menu/TabStrip.fs
new file mode 100644
index 00000000..a2af9f0b
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Menu/TabStrip.fs
@@ -0,0 +1,31 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Primitives
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentTabStrip =
+    inherit IFabComponentSelectingItemsControl
+    inherit IFabTabStrip
+
+
+[<AutoOpen>]
+module ComponentTabStripBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a TabStrip widget.</summary>
+        /// <param name="items">The items to display.</param>
+        /// <param name="template">The template to use to render each item.</param>
+        static member TabStrip<'msg, 'itemData, 'itemMarker when 'itemMarker :> IFabComponentControl>
+            (items: seq<'itemData>, template: 'itemData -> WidgetBuilder<'msg, 'itemMarker>)
+            =
+            WidgetHelpers.buildItems<'msg, IFabComponentTabStrip, 'itemData, 'itemMarker> TabStrip.WidgetKey ItemsControl.ItemsSourceTemplate items template
+
+type ComponentTabStripModifiers =
+    /// <summary>Link a ViewRef to access the direct TabStrip control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentTabStrip>, value: ViewRef<TabStrip>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Menu/_NativeMenuItemBase.fs b/src/Fabulous.Avalonia/ComponentViews/Menu/_NativeMenuItemBase.fs
new file mode 100644
index 00000000..29e35d59
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Menu/_NativeMenuItemBase.fs
@@ -0,0 +1,7 @@
+namespace Fabulous.Avalonia.Components
+
+open Fabulous.Avalonia
+
+type IFabComponentNativeMenuItemBase =
+    inherit IFabComponentElement
+    inherit IFabNativeMenuItemBase
diff --git a/src/Fabulous.Avalonia/ComponentViews/MenuItems/ComboBoxItem.fs b/src/Fabulous.Avalonia/ComponentViews/MenuItems/ComboBoxItem.fs
new file mode 100644
index 00000000..5529e4ae
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/MenuItems/ComboBoxItem.fs
@@ -0,0 +1,60 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentComboBoxItem =
+    inherit IFabComponentListBoxItem
+    inherit IFabComboBoxItem
+
+[<AutoOpen>]
+module ComponentComboBoxItemBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ComboBoxItem widget.</summary>
+        /// <param name="content">The content of the ComboBoxItem.</param>
+        static member ComboBoxItem(content: string) =
+            WidgetBuilder<unit, IFabComponentComboBoxItem>(ComboBoxItem.WidgetKey, ContentControl.ContentString.WithValue(content))
+
+        /// <summary>Creates a ComboBoxItem widget.</summary>
+        /// <param name="content">The content of the ComboBoxItem.</param>
+        /// <param name="isSelected">Whether the ComboBoxItem is selected.</param>
+        static member ComboBoxItem(content: string, isSelected: bool) =
+            WidgetBuilder<unit, IFabComponentComboBoxItem>(
+                ComboBoxItem.WidgetKey,
+                ContentControl.ContentString.WithValue(content),
+                ListBoxItem.IsSelected.WithValue(isSelected)
+            )
+
+        /// <summary>Creates a ComboBoxItem widget.</summary>
+        /// <param name="content">The content of the ComboBoxItem.</param>
+        static member ComboBoxItem(content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentComboBoxItem>(
+                ComboBoxItem.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
+            )
+
+        /// <summary>Creates a ComboBoxItem widget.</summary>
+        /// <param name="isSelected">Whether the ComboBoxItem is selected.</param>
+        /// <param name="content">The content of the ComboBoxItem.</param>
+        static member ComboBoxItem(isSelected: bool, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentComboBoxItem>(
+                ComboBoxItem.WidgetKey,
+                AttributesBundle(
+                    StackList.one(ListBoxItem.IsSelected.WithValue(isSelected)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+type ComponentComboBoxItemModifiers =
+    /// <summary>Link a ViewRef to access the direct MenuItem control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<unit, IFabComponentComboBoxItem>, value: ViewRef<ComboBoxItem>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/MenuItems/ListBoxItem.fs b/src/Fabulous.Avalonia/ComponentViews/MenuItems/ListBoxItem.fs
new file mode 100644
index 00000000..8a5352e6
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/MenuItems/ListBoxItem.fs
@@ -0,0 +1,52 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentListBoxItem =
+    inherit IFabComponentContentControl
+    inherit IFabListBoxItem
+
+[<AutoOpen>]
+module ComponentListBoxItemBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ListBoxItem widget.</summary>
+        /// <param name="content">The content of the ListBoxItem.</param>
+        /// <param name="isSelected">Whether the ListBoxItem is selected.</param>
+        static member ListBoxItem(content: string, isSelected: bool) =
+            WidgetBuilder<unit, IFabComponentListBoxItem>(
+                ListBoxItem.WidgetKey,
+                ContentControl.ContentString.WithValue(content),
+                ListBoxItem.IsSelected.WithValue(isSelected)
+            )
+
+        /// <summary>Creates a ListBoxItem widget.</summary>
+        /// <param name="content">The content of the ListBoxItem.</param>
+        static member ListBoxItem(content: string) =
+            WidgetBuilder<unit, IFabComponentListBoxItem>(ListBoxItem.WidgetKey, ContentControl.ContentString.WithValue(content))
+
+        /// <summary>Creates a ListBoxItem widget.</summary>
+        /// <param name="isSelected">Whether the ListBoxItem is selected.</param>
+        /// <param name="content">The content of the ListBoxItem.</param>
+        static member ListBoxItem(isSelected: bool, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabListBoxItem>(
+                ListBoxItem.WidgetKey,
+                AttributesBundle(
+                    StackList.one(ListBoxItem.IsSelected.WithValue(isSelected)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a ListBoxItem widget.</summary>
+        /// <param name="content">The content of the ListBoxItem.</param>
+        static member ListBoxItem(content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabListBoxItem>(
+                ListBoxItem.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
+            )
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/MenuItems/MenuItem.fs b/src/Fabulous.Avalonia/ComponentViews/MenuItems/MenuItem.fs
new file mode 100644
index 00000000..6388e8c4
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/MenuItems/MenuItem.fs
@@ -0,0 +1,168 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+
+open Avalonia.Input
+open Avalonia.Interactivity
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentMenuItem =
+    inherit IFabComponentHeaderedSelectingItemsControl
+    inherit IFabMenuItem
+
+module ComponentMenuItem =
+    let Clicked =
+        ComponentAttributes.defineEvent "MenuItem_Clicked" (fun target -> (target :?> MenuItem).Click)
+
+    let PointerEnteredItem =
+        ComponentAttributes.defineEvent "MenuItem_PointerEnteredItem" (fun target -> (target :?> MenuItem).PointerEnteredItem)
+
+    let PointerExitedItem =
+        ComponentAttributes.defineEvent "MenuItem_PointerExitedItem" (fun target -> (target :?> MenuItem).PointerExitedItem)
+
+    let SubmenuOpened =
+        ComponentAttributes.defineEvent "MenuItem_SubmenuOpened" (fun target -> (target :?> MenuItem).SubmenuOpened)
+
+[<AutoOpen>]
+module ComponentMenuItemBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a MenuItem widget.</summary>
+        /// <param name="header">The header of the menu item.</param>
+        static member MenuItem(header: string) =
+            WidgetBuilder<'msg, IFabMenuItem>(MenuItem.WidgetKey, HeaderedContentControl.HeaderString.WithValue(header))
+
+        /// <summary>Creates a MenuItem widget.</summary>
+        /// <param name="header">The header of the menu item.</param>
+        /// <param name="onClick">Raised when the menu item is clicked.</param>
+        static member MenuItem(header: string, onClick: RoutedEventArgs -> unit) =
+            WidgetBuilder<'msg, IFabMenuItem>(
+                MenuItem.WidgetKey,
+                HeaderedContentControl.HeaderString.WithValue(header),
+                ComponentMenuItem.Clicked.WithValue(onClick)
+            )
+
+        /// <summary>Creates a MenuItem widget.</summary>
+        /// <param name="header">The header of the menu item.</param>
+        static member MenuItem(header: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<'msg, IFabMenuItem>(
+                MenuItem.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| HeaderedContentControl.HeaderWidget.WithValue(header.Compile()) |], ValueNone)
+            )
+
+        /// <summary>Creates a MenuItem widget.</summary>
+        /// <param name="header">The header of the menu item.</param>
+        /// <param name="onClick">Raised when the menu item is clicked.</param>
+        static member MenuItem(header: WidgetBuilder<'msg, #IFabControl>, onClick: RoutedEventArgs -> unit) =
+            WidgetBuilder<'msg, IFabMenuItem>(
+                MenuItem.WidgetKey,
+                AttributesBundle(
+                    StackList.one(ComponentMenuItem.Clicked.WithValue(onClick)),
+                    ValueSome [| HeaderedContentControl.HeaderWidget.WithValue(header.Compile()) |],
+                    ValueNone
+                )
+            )
+
+[<AutoOpen>]
+module ComponentMenuItemsBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a MenuItems widget.</summary>
+        static member MenuItems() =
+            CollectionBuilder<'msg, IFabComponentMenuItem, IFabComponentMenuItem>(MenuItem.WidgetKey, ComponentItemsControl.Items)
+
+        /// <summary>Creates a MenuItems widget.</summary>
+        static member MenuItems(header: WidgetBuilder<'msg, #IFabComponentControl>) =
+            CollectionBuilder<'msg, IFabComponentMenuItem, IFabComponentMenuItem>(
+                MenuItem.WidgetKey,
+                ComponentItemsControl.Items,
+                AttributesBundle(StackList.empty(), ValueSome [| HeaderedContentControl.HeaderWidget.WithValue(header.Compile()) |], ValueNone)
+            )
+
+        /// <summary>Creates a MenuItems widget.</summary>
+        /// <param name="header">The header of the menu item.</param>
+        /// <param name="onClick">Raised when the menu item is clicked.</param>
+        static member MenuItems(header: WidgetBuilder<'msg, #IFabComponentControl>, onClick: RoutedEventArgs -> unit) =
+            CollectionBuilder<'msg, IFabComponentMenuItem, IFabComponentMenuItem>(
+                MenuItem.WidgetKey,
+                ComponentItemsControl.Items,
+                AttributesBundle(
+                    StackList.one(ComponentMenuItem.Clicked.WithValue(onClick)),
+                    ValueSome [| HeaderedContentControl.HeaderWidget.WithValue(header.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a MenuItems widget.</summary>
+        /// <param name="header">The header of the menu item.</param>
+        static member MenuItems(header: string) =
+            CollectionBuilder<'msg, IFabComponentMenuItem, IFabComponentMenuItem>(
+                MenuItem.WidgetKey,
+                ComponentItemsControl.Items,
+                AttributesBundle(StackList.one(HeaderedContentControl.HeaderString.WithValue(header)), ValueNone, ValueNone)
+            )
+
+        /// <summary>Creates a MenuItems widget.</summary>
+        /// <param name="header">The header of the menu item.</param>
+        /// <param name="onClick">Raised when the menu item is clicked.</param>
+        static member MenuItems(header: string, onClick: RoutedEventArgs -> unit) =
+            CollectionBuilder<unit, IFabComponentMenuItem, IFabComponentMenuItem>(
+                MenuItem.WidgetKey,
+                ComponentItemsControl.Items,
+                AttributesBundle(
+                    StackList.two(ComponentMenuItem.Clicked.WithValue(onClick), HeaderedContentControl.HeaderString.WithValue(header)),
+                    ValueNone,
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a MenuItems widget.</summary>
+        /// <param name="onClick">Raised when the menu item is clicked.</param>
+        static member inline MenuItems(onClick: RoutedEventArgs -> unit) =
+            CollectionBuilder<unit, IFabComponentMenuItem, IFabComponentMenuItem>(MenuItem.WidgetKey, ComponentItemsControl.Items, ComponentMenuItem.Clicked.WithValue(onClick))
+
+type ComponentMenuItemModifiers =
+    /// <summary>Listens to the MenuItem PointerEnteredItem event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the PointerEnteredItem event is fired.</param>
+    [<Extension>]
+    static member inline onPointerEnteredItem(this: WidgetBuilder<'msg, #IFabMenuItem>, fn: RoutedEventArgs -> unit) =
+        this.AddScalar(ComponentMenuItem.PointerEnteredItem.WithValue(fn))
+
+    /// <summary>Listens to the MenuItem PointerExitedItem event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the PointerExitedItem event is fired.</param>
+    [<Extension>]
+    static member inline onPointerExitedItem(this: WidgetBuilder<'msg, #IFabMenuItem>, fn: RoutedEventArgs -> unit) =
+        this.AddScalar(ComponentMenuItem.PointerExitedItem.WithValue(fn))
+
+    /// <summary>Listens to the MenuItem SubmenuClosed event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the SubmenuClosed event is fired.</param>
+    [<Extension>]
+    static member inline onSubmenuOpened(this: WidgetBuilder<'msg, #IFabMenuItem>, fn: RoutedEventArgs -> unit) =
+        this.AddScalar(ComponentMenuItem.SubmenuOpened.WithValue(fn))
+
+    /// <summary>Link a ViewRef to access the direct MenuItem control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabMenuItem>, value: ViewRef<MenuItem>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type MenuItemCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabMenuItem>
+        (_: CollectionBuilder<'msg, 'marker, IFabMenuItem>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabMenuItem>
+        (_: CollectionBuilder<'msg, 'marker, IFabMenuItem>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
diff --git a/src/Fabulous.Avalonia/ComponentViews/MenuItems/TabItem.fs b/src/Fabulous.Avalonia/ComponentViews/MenuItems/TabItem.fs
new file mode 100644
index 00000000..cc61ee6f
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/MenuItems/TabItem.fs
@@ -0,0 +1,51 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentTabItem =
+    inherit IFabComponentHeaderedContentControl
+    inherit IFabTabItem
+
+[<AutoOpen>]
+module ComponentTabItemBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a TabItem widget.</summary>
+        /// <param name="header">The header of the TabItem.</param>
+        /// <param name="content">The content of the TabItem.</param>
+        static member TabItem(header: string, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentTabItem>(
+                TabItem.WidgetKey,
+                AttributesBundle(
+                    StackList.one(HeaderedContentControl.HeaderString.WithValue(header)),
+                    ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a TabItem widget.</summary>
+        /// <param name="header">The header of the TabItem.</param>
+        /// <param name="content">The content of the TabItem.</param>
+        static member TabItem(header: WidgetBuilder<'msg, #IFabControl>, content: WidgetBuilder<'msg, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentTabItem>(
+                TabItem.WidgetKey,
+                AttributesBundle(
+                    StackList.empty(),
+                    ValueSome
+                        [| HeaderedContentControl.HeaderWidget.WithValue(header.Compile())
+                           ContentControl.ContentWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+type ComponentTabItemModifiers =
+    /// <summary>Link a ViewRef to access the direct TabItem control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<unit, IFabComponentTabItem>, value: ViewRef<TabItem>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/MenuItems/TreeViewItem.fs b/src/Fabulous.Avalonia/ComponentViews/MenuItems/TreeViewItem.fs
new file mode 100644
index 00000000..05fa2bdb
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/MenuItems/TreeViewItem.fs
@@ -0,0 +1,60 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentTreeViewItem =
+    inherit IFabComponentHeaderedItemsControl
+    inherit IFabTreeViewItem
+
+[<AutoOpen>]
+module ComponentTreeViewItemBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a TreeViewItem widget.</summary>
+        /// <param name="content">The content of the TreeViewItem.</param>
+        /// <param name="isSelected">Whether the TreeViewItem is selected.</param>
+        static member TreeViewItem(content: string, isSelected: bool) =
+            WidgetBuilder<unit, IFabComponentTreeViewItem>(
+                TreeViewItem.WidgetKey,
+                HeaderedItemsControl.HeaderString.WithValue(content),
+                TreeViewItem.IsSelected.WithValue(isSelected)
+            )
+
+        /// <summary>Creates a TreeViewItem widget.</summary>
+        /// <param name="content">The content of the TreeViewItem.</param>
+        static member TreeViewItem(content: string) =
+            WidgetBuilder<unit, IFabComponentTreeViewItem>(TreeViewItem.WidgetKey, HeaderedItemsControl.HeaderString.WithValue(content))
+
+        /// <summary>Creates a TreeViewItem widget.</summary>
+        /// <param name="isSelected">Whether the TreeViewItem is selected.</param>
+        /// <param name="content">The content of the TreeViewItem.</param>
+        static member TreeViewItem(isSelected: bool, content: WidgetBuilder<unit, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentTreeViewItem>(
+                TreeViewItem.WidgetKey,
+                AttributesBundle(
+                    StackList.one(TreeViewItem.IsSelected.WithValue(isSelected)),
+                    ValueSome [| HeaderedItemsControl.HeaderWidget.WithValue(content.Compile()) |],
+                    ValueNone
+                )
+            )
+
+        /// <summary>Creates a TreeViewItem widget.</summary>
+        /// <param name="content">The content of the TreeViewItem.</param>
+        static member TreeViewItem(content: WidgetBuilder<unit, #IFabControl>) =
+            WidgetBuilder<unit, IFabComponentTreeViewItem>(
+                TreeViewItem.WidgetKey,
+                AttributesBundle(StackList.empty(), ValueSome [| HeaderedItemsControl.HeaderWidget.WithValue(content.Compile()) |], ValueNone)
+            )
+
+type ComponentTreeViewItemModifiers =
+    /// <summary>Link a ViewRef to access the direct TreeViewItem control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentTreeViewItem>, value: ViewRef<TreeViewItem>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/Panels/Canvas.fs b/src/Fabulous.Avalonia/ComponentViews/Panels/Canvas.fs
new file mode 100644
index 00000000..d77e3768
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Panels/Canvas.fs
@@ -0,0 +1,31 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentCanvas =
+    inherit IFabComponentPanel
+    inherit IFabCanvas
+
+[<AutoOpen>]
+module ComponentCanvasBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a Canvas widget.</summary>
+        static member Canvas() =
+            CollectionBuilder<unit, IFabComponentCanvas, IFabComponentControl>(Canvas.WidgetKey, ComponentPanel.Children)
+
+        /// <summary>Creates a Canvas widget.</summary>
+        /// <param name="viewRef">The ViewRef instance that will receive access to the underlying control.</param>
+        static member Canvas(viewRef: ViewRef<Canvas>) =
+            WidgetBuilder<unit, IFabComponentCanvas>(Canvas.WidgetKey, ViewRefAttributes.ViewRef.WithValue(viewRef.Unbox))
+
+type ComponentCanvasModifiers =
+    /// <summary>Link a ViewRef to access the direct Canvas control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<unit, IFabComponentCanvas>, value: ViewRef<Canvas>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Panels/DockPanel.fs b/src/Fabulous.Avalonia/ComponentViews/Panels/DockPanel.fs
new file mode 100644
index 00000000..1814e162
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Panels/DockPanel.fs
@@ -0,0 +1,31 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentDockPanel =
+    inherit IFabComponentPanel
+    inherit IFabDockPanel
+
+[<AutoOpen>]
+module ComponentDockPanelBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a DockPanel widget.</summary>
+        static member Dock() =
+            CollectionBuilder<unit, IFabComponentDockPanel, IFabComponentControl>(DockPanel.WidgetKey, ComponentPanel.Children, DockPanel.LastChildFill.WithValue(true))
+
+        /// <summary>Creates a DockPanel widget.</summary>
+        /// <param name="lastChildFill">Whether the last child element within a DockPanel stretches to fill the remaining available space.</param>
+        static member Dock(lastChildFill: bool) =
+            CollectionBuilder<unit, IFabComponentDockPanel, IFabComponentControl>(DockPanel.WidgetKey, ComponentPanel.Children, DockPanel.LastChildFill.WithValue(lastChildFill))
+
+type ComponentDockPanelModifiers =
+    /// <summary>Link a ViewRef to access the direct DockPanel control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentDockPanel>, value: ViewRef<DockPanel>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Panels/Grid.fs b/src/Fabulous.Avalonia/ComponentViews/Panels/Grid.fs
new file mode 100644
index 00000000..71dd8e1e
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Panels/Grid.fs
@@ -0,0 +1,28 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentGrid =
+    inherit IFabComponentPanel
+    inherit IFabGrid
+
+[<AutoOpen>]
+module ComponentGridBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a Grid widget.</summary>
+        /// <param name="coldefs">Column definitions.</param>
+        /// <param name="rowdefs">Row definitions.</param>
+        static member Grid(coldefs: seq<Dimension>, rowdefs: seq<Dimension>) =
+            CollectionBuilder<unit, IFabComponentGrid, IFabComponentControl>(
+                Grid.WidgetKey,
+                ComponentPanel.Children,
+                Grid.ColumnDefinitions.WithValue(Array.ofSeq coldefs),
+                Grid.RowDefinitions.WithValue(Array.ofSeq rowdefs)
+            )
+
+        /// <summary>Creates a Grid widget with a single column and row.</summary>
+        static member Grid() = View.Grid([ Star ], [ Star ])
\ No newline at end of file
diff --git a/src/Fabulous.Avalonia/ComponentViews/Panels/Panel.fs b/src/Fabulous.Avalonia/ComponentViews/Panels/Panel.fs
new file mode 100644
index 00000000..74cc4b24
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Panels/Panel.fs
@@ -0,0 +1,94 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Media
+open Fabulous
+open Fabulous.StackAllocatedCollections
+open Fabulous.Avalonia
+
+[<AutoOpen>]
+module ComponentPanelBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a Panel widget.</summary>
+        static member Panel() =
+            CollectionBuilder<unit, IFabComponentPanel, IFabComponentControl>(Panel.WidgetKey, ComponentPanel.Children)
+
+type ComponentPanelModifiers =
+    /// <summary>Sets the Background property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Background value.</param>
+    [<Extension>]
+    static member inline background(this: WidgetBuilder<'msg, #IFabComponentPanel>, value: WidgetBuilder<'msg, #IFabBrush>) =
+        this.AddWidget(Panel.BackgroundWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the Background property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Background value.</param>
+    [<Extension>]
+    static member inline background(this: WidgetBuilder<'msg, #IFabComponentPanel>, value: IBrush) =
+        this.AddScalar(Panel.Background.WithValue(value))
+
+    /// <summary>Sets the Foreground property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Foreground value.</param>
+    [<Extension>]
+    static member inline foreground(this: WidgetBuilder<'msg, #IFabComponentPanel>, value: WidgetBuilder<unit, #IFabComponentBrush>) =
+        this.AddWidget(TextElement.ForegroundWidget.WithValue(value.Compile()))
+
+    /// <summary>Sets the Foreground property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Foreground value.</param>
+    [<Extension>]
+    static member inline foreground(this: WidgetBuilder<unit, #IFabComponentPanel>, value: IBrush) =
+        this.AddScalar(TextElement.Foreground.WithValue(value))
+
+    /// <summary>Link a ViewRef to access the direct Panel control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<unit, IFabComponentPanel>, value: ViewRef<Panel>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+type ComponentPanelExtraModifiers =
+    /// <summary>Sets the Background property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Background value.</param>
+    [<Extension>]
+    static member inline background(this: WidgetBuilder<unit, #IFabComponentPanel>, value: Color) =
+        PanelModifiers.background(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the Background property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Background value.</param>
+    [<Extension>]
+    static member inline background(this: WidgetBuilder<unit, #IFabComponentPanel>, value: string) =
+        PanelModifiers.background(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the Foreground property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Foreground value.</param>
+    [<Extension>]
+    static member inline foreground(this: WidgetBuilder<unit, #IFabComponentPanel>, value: Color) =
+        PanelModifiers.foreground(this, View.SolidColorBrush(value))
+
+    /// <summary>Sets the Foreground property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Foreground value.</param>
+    [<Extension>]
+    static member inline foreground(this: WidgetBuilder<unit, #IFabComponentPanel>, value: string) =
+        PanelModifiers.foreground(this, View.SolidColorBrush(value))
+
+type ComponentPanelCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'marker :> IFabComponentPanel and 'itemType :> IFabComponentControl>
+        (_: CollectionBuilder<'msg, 'marker, IFabControl>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'marker :> IFabComponentPanel and 'itemType :> IFabComponentControl>
+        (_: CollectionBuilder<'msg, 'marker, IFabComponentControl>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
diff --git a/src/Fabulous.Avalonia/ComponentViews/Panels/ReversibleStackPanel.fs b/src/Fabulous.Avalonia/ComponentViews/Panels/ReversibleStackPanel.fs
new file mode 100644
index 00000000..995eeb52
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Panels/ReversibleStackPanel.fs
@@ -0,0 +1,64 @@
+namespace Fabulous.Avalonia.Components
+
+open Avalonia.Controls
+open Avalonia.Layout
+open Fabulous
+open Fabulous.StackAllocatedCollections.StackList
+open System.Runtime.CompilerServices
+
+type IFabComponentReversibleStackPanel =
+    inherit IFabComponentStackPanel
+
+module ReversibleStackPanel =
+    let WidgetKey = Widgets.register<ReversibleStackPanel>()
+
+    let ReverseOrder =
+        Attributes.defineAvaloniaPropertyWithEquality ReversibleStackPanel.ReverseOrderProperty
+
+[<AutoOpen>]
+module ReversibleStackPanelBuilders =
+    type Fabulous.Avalonia.View with
+
+        /// <summary>Creates a VStack widget.</summary>
+        /// <param name="spacing">The spacing between each child.</param>
+        /// <param name="reverseOrder">If true, the children will be reversed.</param>
+        static member VStack(?spacing: float, ?reverseOrder: bool) =
+
+            let mutable scalars =
+                StackList.one(StackPanel.Orientation.WithValue(Orientation.Vertical))
+
+            match spacing with
+            | None -> ()
+            | Some v -> scalars <- StackList.add(&scalars, StackPanel.Spacing.WithValue(v))
+
+            match reverseOrder with
+            | None -> ()
+            | Some v -> scalars <- StackList.add(&scalars, ReversibleStackPanel.ReverseOrder.WithValue(v))
+
+            CollectionBuilder<'msg, IFabReversibleStackPanel, IFabControl>(ReversibleStackPanel.WidgetKey, scalars, Panel.Children)
+
+        /// <summary>Creates a HStack widget.</summary>
+        /// <param name="spacing">The spacing between each child.</param>
+        /// <param name="reverseOrder">If true, the children will be reversed.</param>
+        static member HStack(?spacing: float, ?reverseOrder: bool) =
+
+            let mutable scalars =
+                StackList.one(StackPanel.Orientation.WithValue(Orientation.Horizontal))
+
+            match spacing with
+            | None -> ()
+            | Some v -> scalars <- StackList.add(&scalars, StackPanel.Spacing.WithValue(v))
+
+            match reverseOrder with
+            | None -> ()
+            | Some v -> scalars <- StackList.add(&scalars, ReversibleStackPanel.ReverseOrder.WithValue(v))
+
+            CollectionBuilder<'msg, IFabReversibleStackPanel, IFabControl>(ReversibleStackPanel.WidgetKey, scalars, Panel.Children)
+
+type ReversibleStackPanelModifiers =
+    /// <summary>Link a ViewRef to access the direct ReversibleStackPanel control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabReversibleStackPanel>, value: ViewRef<ReversibleStackPanel>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Panels/UniformGrid.fs b/src/Fabulous.Avalonia/ComponentViews/Panels/UniformGrid.fs
new file mode 100644
index 00000000..e45fbe03
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Panels/UniformGrid.fs
@@ -0,0 +1,59 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Primitives
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentUniformGrid =
+    inherit IFabComponentPanel
+    inherit IFabUniformGrid
+
+[<AutoOpen>]
+module ComponentUniformGridBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a UniformGrid widget.</summary>
+        /// <param name="cols">The number of columns in the grid.</param>
+        /// <param name="rows">The number of rows in the grid.</param>
+        static member UniformGrid(?cols: int, ?rows: int) =
+            match cols, rows with
+            | Some cols, Some rows ->
+                CollectionBuilder<unit, IFabComponentUniformGrid, IFabComponentControl>(
+                    UniformGrid.WidgetKey,
+                    ComponentPanel.Children,
+                    UniformGrid.Columns.WithValue(cols),
+                    UniformGrid.Rows.WithValue(rows)
+                )
+            | Some cols, None ->
+                CollectionBuilder<unit, IFabComponentUniformGrid, IFabComponentControl>(
+                    UniformGrid.WidgetKey,
+                    ComponentPanel.Children,
+                    UniformGrid.Columns.WithValue(cols),
+                    UniformGrid.Rows.WithValue(0)
+                )
+
+            | None, Some rows ->
+                CollectionBuilder<unit, IFabComponentUniformGrid, IFabComponentControl>(
+                    UniformGrid.WidgetKey,
+                    ComponentPanel.Children,
+                    UniformGrid.Columns.WithValue(0),
+                    UniformGrid.Rows.WithValue(rows)
+                )
+
+            | None, None ->
+                CollectionBuilder<unit, IFabComponentUniformGrid, IFabComponentControl>(
+                    UniformGrid.WidgetKey,
+                    ComponentPanel.Children,
+                    UniformGrid.Columns.WithValue(0),
+                    UniformGrid.Rows.WithValue(0)
+                )
+
+type ComponentUniformGridModifiers =
+
+    /// <summary>Link a ViewRef to access the direct UniformGrid control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<unit, IFabComponentUniformGrid>, value: ViewRef<UniformGrid>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Panels/VirtualizingStackPanel.fs b/src/Fabulous.Avalonia/ComponentViews/Panels/VirtualizingStackPanel.fs
new file mode 100644
index 00000000..0ac26cc9
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Panels/VirtualizingStackPanel.fs
@@ -0,0 +1,54 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Interactivity
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections.StackList
+
+type IFabComponentVirtualizingStackPanel =
+    inherit IFabComponentVirtualizingPanel
+    inherit IFabVirtualizingStackPanel
+
+module ComponentVirtualizingStackPanel =
+    let HorizontalSnapPointsChanged =
+        ComponentAttributes.defineEvent "VirtualizingStackPanel_HorizontalSnapPointsChanged" (fun target ->
+            (target :?> VirtualizingStackPanel)
+                .HorizontalSnapPointsChanged)
+
+    let VerticalSnapPointsChanged =
+        ComponentAttributes.defineEvent "VirtualizingStackPanel_VerticalSnapPointsChanged" (fun target ->
+            (target :?> VirtualizingStackPanel)
+                .VerticalSnapPointsChanged)
+
+[<AutoOpen>]
+module ComponentVirtualizingStackPanelBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a VirtualizingStackPanel widget.</summary>
+        static member VirtualizingStackPanel() =
+            WidgetBuilder<'msg, IFabVirtualizingStackPanel>(VirtualizingStackPanel.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
+
+type ComponentVirtualizingStackPanelModifiers =
+
+    /// <summary>Listens to the StackPanel HorizontalSnapPointsChanged event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the HorizontalSnapPointsChanged event fires.</param>
+    [<Extension>]
+    static member inline onHorizontalSnapPointsChanged(this: WidgetBuilder<unit, #IFabComponentVirtualizingStackPanel>, fn: RoutedEventArgs -> unit) =
+        this.AddScalar(ComponentVirtualizingStackPanel.HorizontalSnapPointsChanged.WithValue(fn))
+
+    /// <summary>Listens to the StackPanel VerticalSnapPointsChanged event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the VerticalSnapPointsChanged event fires.</param>
+    [<Extension>]
+    static member inline onVerticalSnapPointsChanged(this: WidgetBuilder<unit, #IFabComponentVirtualizingStackPanel>, fn: RoutedEventArgs -> unit) =
+        this.AddScalar(ComponentVirtualizingStackPanel.VerticalSnapPointsChanged.WithValue(fn))
+
+    /// <summary>Link a ViewRef to access the direct VirtualizingStackPanel control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentVirtualizingStackPanel>, value: ViewRef<VirtualizingStackPanel>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Panels/WrapPanel.fs b/src/Fabulous.Avalonia/ComponentViews/Panels/WrapPanel.fs
new file mode 100644
index 00000000..23459be3
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Panels/WrapPanel.fs
@@ -0,0 +1,35 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentWrapPanel =
+    inherit IFabComponentPanel
+    inherit IFabWrapPanel
+
+[<AutoOpen>]
+module ComponentWrapPanelBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a <see cref="WrapPanel" /> with <see cref="WrapPanel.Orientation" /> set to <see cref="Orientation.Vertical" />
+        /// rendering child elements from left to right while they fit the width and starting a new line when there is no space left
+        /// (including any margins and borders). See <seealso href="https://docs.avaloniaui.net/docs/reference/controls/detailed-reference/wrappanel" />.</summary>
+        static member VWrap() =
+            CollectionBuilder<unit, IFabComponentWrapPanel, IFabComponentControl>(WrapPanel.WidgetKey, ComponentPanel.Children, WrapPanel.Orientation.WithValue(Orientation.Vertical))
+
+        /// <summary>Creates a <see cref="WrapPanel" /> with <see cref="WrapPanel.Orientation" /> set to <see cref="Orientation.Horizontal" />
+        /// rendering child elements from top to bottom while they fit the height and starting a new column when there is no space left
+        /// (including any margins and borders). See <seealso href="https://docs.avaloniaui.net/docs/reference/controls/detailed-reference/wrappanel" />.</summary>
+        static member HWrap() =
+            CollectionBuilder<unit, IFabComponentWrapPanel, IFabComponentControl>(WrapPanel.WidgetKey, ComponentPanel.Children, WrapPanel.Orientation.WithValue(Orientation.Horizontal))
+
+type ComponentWrapPanelModifiers =
+
+    /// <summary>Link a ViewRef to access the direct WrapPanel control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabWrapPanel>, value: ViewRef<WrapPanel>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Panels/_AdornerLayer.fs b/src/Fabulous.Avalonia/ComponentViews/Panels/_AdornerLayer.fs
new file mode 100644
index 00000000..a3e31a38
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Panels/_AdornerLayer.fs
@@ -0,0 +1,18 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls.Primitives
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentAdornerLayer =
+    inherit IFabComponentCanvas
+    inherit IFabAdornerLayer
+
+type ComponentAdornerLayerAttachedModifiers =
+    /// <summary>Link a ViewRef to access the direct AdornerLayer control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<unit, IFabComponentAdornerLayer>, value: ViewRef<AdornerLayer>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Panels/_StackPanel.fs b/src/Fabulous.Avalonia/ComponentViews/Panels/_StackPanel.fs
new file mode 100644
index 00000000..2412fb75
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Panels/_StackPanel.fs
@@ -0,0 +1,41 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Runtime.CompilerServices
+open Avalonia.Controls
+open Avalonia.Interactivity
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentStackPanel =
+    inherit IFabComponentPanel
+    inherit IFabStackPanel
+
+module ComponentStackPanel =
+    let HorizontalSnapPointsChanged =
+        ComponentAttributes.defineEvent "StackPanel_HorizontalSnapPointsChanged" (fun target -> (target :?> StackPanel).HorizontalSnapPointsChanged)
+
+    let VerticalSnapPointsChanged =
+        ComponentAttributes.defineEvent "StackPanel_VerticalSnapPointsChanged" (fun target -> (target :?> StackPanel).VerticalSnapPointsChanged)
+
+type ComponentStackPanelModifiers =
+
+    /// <summary>Listens to the StackPanel HorizontalSnapPointsChanged event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the HorizontalSnapPointsChanged event fires.</param>
+    [<Extension>]
+    static member inline onHorizontalSnapPointsChanged(this: WidgetBuilder<unit, #IFabComponentStackPanel>, fn: RoutedEventArgs -> unit) =
+        this.AddScalar(ComponentStackPanel.HorizontalSnapPointsChanged.WithValue(fn))
+
+    /// <summary>Listens to the StackPanel VerticalSnapPointsChanged event.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="fn">Raised when the VerticalSnapPointsChanged event fires.</param>
+    [<Extension>]
+    static member inline onVerticalSnapPointsChanged(this: WidgetBuilder<unit, #IFabComponentStackPanel>, fn: RoutedEventArgs -> unit) =
+        this.AddScalar(ComponentStackPanel.VerticalSnapPointsChanged.WithValue(fn))
+
+    /// <summary>Link a ViewRef to access the direct StackPanel control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<unit, IFabComponentStackPanel>, value: ViewRef<StackPanel>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Styling/Animation.fs b/src/Fabulous.Avalonia/ComponentViews/Styling/Animation.fs
new file mode 100644
index 00000000..12cbc957
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Styling/Animation.fs
@@ -0,0 +1,83 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Runtime.CompilerServices
+open Avalonia.Animation
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentAnimation =
+    inherit IFabComponentElement
+    inherit IFabAnimation
+
+module ComponentAnimation =
+    let Children =
+        ComponentAttributes.defineAvaloniaListWidgetCollection "Animation_KeyFramesProperty" (fun target -> (target :?> Animation).Children)
+
+[<AutoOpen>]
+module ComponentAnimationBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates an Animation widget with the specified duration and keyframes.</summary>
+        /// <param name="duration">The main Window of the Application.</param>
+        static member Animation(duration: TimeSpan) =
+            CollectionBuilder<unit, IFabComponentAnimation, IFabKeyFrame>(
+                Animation.WidgetKey,
+                ComponentAnimation.Children,
+                Animation.Duration.WithValue(duration)
+            )
+
+        /// <summary>Creates an Animation widget with keyframes.</summary>
+        static member Animation() =
+            CollectionBuilder<unit, IFabComponentAnimation, IFabKeyFrame>(Animation.WidgetKey, ComponentAnimation.Children)
+
+type ComponentAnimationCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabComponentKeyFrame>
+        (_: CollectionBuilder<'msg, 'marker, IFabComponentKeyFrame>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabComponentKeyFrame>
+        (_: CollectionBuilder<'msg, 'marker, IFabComponentKeyFrame>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabComponentAnimation>
+        (_: CollectionBuilder<'msg, 'marker, IFabComponentAnimation>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabComponentAnimation>
+        (_: CollectionBuilder<'msg, 'marker, IFabComponentAnimation>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'marker :> IFabComponentAnimatable and 'itemType :> IFabComponentAnimation>
+        (_: AttributeCollectionBuilder<'msg, 'marker, IFabComponentAnimation>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'marker :> IFabComponentAnimatable and 'itemType :> IFabComponentAnimation>
+        (_: AttributeCollectionBuilder<'msg, 'marker, IFabComponentAnimation>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+[<AutoOpen>]
+module ComponentAnimationAttachedBuilders =
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary> Creates a Animation widget with the specified duration and keyframes.</summary>
+        /// <param name="keyFrame">The keyframe to add to the animation.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member inline Animation(keyFrame: WidgetBuilder<'msg, IFabKeyFrame>, duration: TimeSpan) =
+            CollectionBuilder<'msg, IFabAnimation, IFabKeyFrame>(Animation.WidgetKey, ComponentAnimation.Children, Animation.Duration.WithValue(duration)) {
+                keyFrame
+            }
diff --git a/src/Fabulous.Avalonia/ComponentViews/Styling/KeyFrame.fs b/src/Fabulous.Avalonia/ComponentViews/Styling/KeyFrame.fs
new file mode 100644
index 00000000..9eb8db79
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Styling/KeyFrame.fs
@@ -0,0 +1,30 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Globalization
+open System.Runtime.CompilerServices
+open Avalonia
+open Avalonia.Animation
+open Avalonia.Styling
+open Fabulous
+open Fabulous.Avalonia
+
+type IFabComponentKeyFrame =
+    inherit IFabComponentElement
+    inherit IFabKeyFrame
+
+[<AutoOpen>]
+module ComponentKeyFrameBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a KeyFrame widget.</summary>
+        /// <param name="setters">The animation setters to apply.</param>
+        static member KeyFrames(setters: IAnimationSetter seq) =
+            WidgetBuilder<unit, IFabComponentKeyFrame>(KeyFrame.WidgetKey, KeyFrame.Setters.WithValue(setters))
+
+        /// <summary>Creates a KeyFrame widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="value">The value to animate to.</param>
+        static member KeyFrame(property: AvaloniaProperty, value: obj) =
+            WidgetBuilder<unit, IFabComponentKeyFrame>(KeyFrame.WidgetKey, KeyFrame.Setter.WithValue(Setter(property, value)))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Styling/Style.fs b/src/Fabulous.Avalonia/ComponentViews/Styling/Style.fs
new file mode 100644
index 00000000..2a1b18d0
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Styling/Style.fs
@@ -0,0 +1,77 @@
+namespace Fabulous.Avalonia.Components
+
+open System.Collections.Generic
+open System.Runtime.CompilerServices
+open Avalonia.Styling
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentStyle =
+    inherit IFabComponentElement
+    inherit IFabStyle
+
+module ComponentStyle =
+
+    let Animations =
+        ComponentAttributes.defineListWidgetCollection "Style_Animations" (fun target -> (target :?> Style).Animations :> IList<_>)
+
+[<AutoOpen>]
+module ComponentStyleBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates an Animations widget.</summary>
+        static member Animations() =
+            CollectionBuilder<unit, IFabComponentStyle, IFabComponentAnimation>(Style.WidgetKey, ComponentStyle.Animations)
+
+type ComponentStyleCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabComponentAnimation>
+        (_: CollectionBuilder<'msg, 'marker, IFabComponentAnimation>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabComponentAnimation>
+        (_: CollectionBuilder<'msg, 'marker, IFabComponentAnimation>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield
+        (_: AttributeCollectionBuilder<'msg, #IFabComponentStyledElement, IFabComponentStyle>, x: WidgetBuilder<'msg, #IFabComponentStyle>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield
+        (_: AttributeCollectionBuilder<'msg, #IFabComponentStyledElement, IFabComponentStyle>, x: WidgetBuilder<'msg, Memo.Memoized<#IFabComponentStyle>>) : Content<
+                                                                                                                                                                 'msg
+                                                                                                                                                              >
+        =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+type ComponentStyleModifiers =
+    /// <summary>Sets the Animations property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Animation value.</param>
+    [<Extension>]
+    static member inline animation(this: WidgetBuilder<'msg, #IFabStyledElement>, value: WidgetBuilder<'msg, IFabComponentAnimation>) =
+        AttributeCollectionBuilder<'msg, #IFabComponentStyledElement, IFabComponentStyle>(this, ComponentStyledElement.StylesWidget) {
+            CollectionBuilder<'msg, IFabComponentStyle, IFabComponentAnimation>(Style.WidgetKey, ComponentStyle.Animations) { value }
+        }
+
+    /// <summary>Sets the Animations property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Animation value.</param>
+    [<Extension>]
+    static member inline animation(this: WidgetBuilder<'msg, #IFabComponentStyledElement>, value: WidgetBuilder<'msg, IFabComponentStyle>) =
+        AttributeCollectionBuilder<'msg, #IFabComponentStyledElement, IFabStyle>(this, ComponentStyledElement.StylesWidget) { value }
+
+    /// <summary>Link a ViewRef to access the direct Style control instance.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
+    [<Extension>]
+    static member inline reference(this: WidgetBuilder<'msg, IFabComponentStyle>, value: ViewRef<Style>) =
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/ComponentViews/Styling/Transition.fs b/src/Fabulous.Avalonia/ComponentViews/Styling/Transition.fs
new file mode 100644
index 00000000..d87eb3a7
--- /dev/null
+++ b/src/Fabulous.Avalonia/ComponentViews/Styling/Transition.fs
@@ -0,0 +1,274 @@
+namespace Fabulous.Avalonia.Components
+
+open System
+open System.Runtime.CompilerServices
+open Avalonia
+open Fabulous
+open Fabulous.Avalonia
+open Fabulous.StackAllocatedCollections
+
+type IFabComponentTransition =
+    inherit IFabComponentElement
+    inherit IFabTransition
+
+type IFabComponentDoubleTransition =
+    inherit IFabComponentTransition
+
+[<AutoOpen>]
+module ComponentDoubleTransitionBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a DoubleTransition widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member DoubleTransition(property: AvaloniaProperty, duration: TimeSpan) =
+            WidgetBuilder<unit, IFabDoubleTransition>(
+                DoubleTransition.WidgetKey,
+                TransitionBase.Property.WithValue(property),
+                TransitionBase.Duration.WithValue(duration)
+            )
+
+type IFabComponentBoxShadowsTransition =
+    inherit IFabComponentTransition
+
+[<AutoOpen>]
+module ComponentBoxShadowsTransitionBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a BoxShadowsTransition widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member BoxShadowsTransition(property: AvaloniaProperty, duration: TimeSpan) =
+            WidgetBuilder<unit, IFabComponentBoxShadowsTransition>(
+                BoxShadowsTransition.WidgetKey,
+                TransitionBase.Property.WithValue(property),
+                TransitionBase.Duration.WithValue(duration)
+            )
+
+type IFabComponentBrushTransition =
+    inherit IFabComponentTransition
+
+
+[<AutoOpen>]
+module ComponentBrushTransitionBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a BrushTransition widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member BrushTransition(property: AvaloniaProperty, duration: TimeSpan) =
+            WidgetBuilder<unit, IFabComponentBrushTransition>(
+                BrushTransition.WidgetKey,
+                TransitionBase.Property.WithValue(property),
+                TransitionBase.Duration.WithValue(duration)
+            )
+
+type IFabComponentColorTransition =
+    inherit IFabComponentTransition
+
+[<AutoOpen>]
+module ComponentColorTransitionBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ColorTransition widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member ColorTransition(property: AvaloniaProperty, duration: TimeSpan) =
+            WidgetBuilder<unit, IFabComponentColorTransition>(
+                ColorTransition.WidgetKey,
+                TransitionBase.Property.WithValue(property),
+                TransitionBase.Duration.WithValue(duration)
+            )
+
+type IFabComponentCornerRadiusTransition =
+    inherit IFabComponentTransition
+
+[<AutoOpen>]
+module CornerRadiusTransitionBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a CornerRadiusTransition widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member CornerRadiusTransition(property: AvaloniaProperty, duration: TimeSpan) =
+            WidgetBuilder<unit, IFabComponentCornerRadiusTransition>(
+                CornerRadiusTransition.WidgetKey,
+                TransitionBase.Property.WithValue(property),
+                TransitionBase.Duration.WithValue(duration)
+            )
+
+type IFabComponentFloatTransition =
+    inherit IFabComponentTransition
+
+[<AutoOpen>]
+module ComponentFloatTransitionBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a FloatTransition widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member FloatTransition(property: AvaloniaProperty, duration: TimeSpan) =
+            WidgetBuilder<unit, IFabComponentFloatTransition>(
+                FloatTransition.WidgetKey,
+                TransitionBase.Property.WithValue(property),
+                TransitionBase.Duration.WithValue(duration)
+            )
+
+type IFabComponentIntegerTransition =
+    inherit IFabComponentTransition
+
+[<AutoOpen>]
+module ComponentIntegerTransitionBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a IntegerTransition widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member IntegerTransition(property: AvaloniaProperty, duration: TimeSpan) =
+            WidgetBuilder<unit, IFabComponentIntegerTransition>(
+                IntegerTransition.WidgetKey,
+                TransitionBase.Property.WithValue(property),
+                TransitionBase.Duration.WithValue(duration)
+            )
+
+type IFabComponentPointTransition =
+    inherit IFabComponentTransition
+
+[<AutoOpen>]
+module ComponentPointTransitionBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a PointTransition widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member PointTransition(property: AvaloniaProperty, duration: TimeSpan) =
+            WidgetBuilder<unit, IFabComponentPointTransition>(
+                PointTransition.WidgetKey,
+                TransitionBase.Property.WithValue(property),
+                TransitionBase.Duration.WithValue(duration)
+            )
+
+type IFabComponentSizeTransition =
+    inherit IFabComponentTransition
+
+[<AutoOpen>]
+module ComponentSizeTransitionBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a SizeTransition widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member SizeTransition(property: AvaloniaProperty, duration: TimeSpan) =
+            WidgetBuilder<unit, IFabComponentSizeTransition>(
+                SizeTransition.WidgetKey,
+                TransitionBase.Property.WithValue(property),
+                TransitionBase.Duration.WithValue(duration)
+            )
+
+type IFabComponentThicknessTransition =
+    inherit IFabComponentTransition
+
+[<AutoOpen>]
+module ComponentThicknessTransitionBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a ThicknessTransition widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member ThicknessTransition(property: AvaloniaProperty, duration: TimeSpan) =
+            WidgetBuilder<unit, IFabComponentThicknessTransition>(
+                ThicknessTransition.WidgetKey,
+                TransitionBase.Property.WithValue(property),
+                TransitionBase.Duration.WithValue(duration)
+            )
+
+type IFabComponentTransformOperationsTransition =
+    inherit IFabComponentTransition
+
+[<AutoOpen>]
+module ComponentTransformOperationsTransitionBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a TransformOperationsTransition widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member TransformOperationsTransition(property: AvaloniaProperty, duration: TimeSpan) =
+            WidgetBuilder<unit, IFabComponentTransformOperationsTransition>(
+                TransformOperationsTransition.WidgetKey,
+                TransitionBase.Property.WithValue(property),
+                TransitionBase.Duration.WithValue(duration)
+            )
+
+type IFabComponentVectorTransition =
+    inherit IFabComponentTransition
+
+[<AutoOpen>]
+module ComponentVectorTransitionBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a VectorTransition widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member VectorTransition(property: AvaloniaProperty, duration: TimeSpan) =
+            WidgetBuilder<unit, IFabComponentVectorTransition>(
+                VectorTransition.WidgetKey,
+                TransitionBase.Property.WithValue(property),
+                TransitionBase.Duration.WithValue(duration)
+            )
+
+type IFabComponentEffectTransition =
+    inherit IFabTransition
+
+[<AutoOpen>]
+module ComponentEffectTransitionBuilders =
+
+    type Fabulous.Avalonia.Components.View with
+
+        /// <summary>Creates a EffectTransition widget.</summary>
+        /// <param name="property">The property to animate.</param>
+        /// <param name="duration">The duration of the animation.</param>
+        static member EffectTransition(property: AvaloniaProperty, duration: TimeSpan) =
+            WidgetBuilder<unit, IFabComponentEffectTransition>(
+                EffectTransition.WidgetKey,
+                TransitionBase.Property.WithValue(property),
+                TransitionBase.Duration.WithValue(duration)
+            )
+
+type ComponentTransitionBaseCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'marker :> IFabComponentAnimatable and 'itemType :> IFabComponentTransition>
+        (_: AttributeCollectionBuilder<'msg, 'marker, IFabComponentTransition>, x: WidgetBuilder<'msg, 'itemType>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'marker :> IFabComponentAnimatable and 'itemType :> IFabComponentTransition>
+        (_: AttributeCollectionBuilder<'msg, 'marker, IFabComponentTransition>, x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>)
+        : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+type ComponentTransitionCollectionModifiers =
+    /// <summary>Sets the Transitions property.</summary>
+    /// <param name="this">Current widget.</param>
+    [<Extension>]
+    static member inline transition(this: WidgetBuilder<unit, #IFabComponentAnimatable>) =
+        AttributeCollectionBuilder<unit, #IFabComponentAnimatable, IFabComponentTransition>(this, ComponentAnimatable.Transitions)
+
+    /// <summary>Sets the Transition property.</summary>
+    /// <param name="this">Current widget.</param>
+    /// <param name="value">The Transition value.</param>
+    [<Extension>]
+    static member inline transition(this: WidgetBuilder<unit, #IFabAnimatable>, value: WidgetBuilder<unit, #IFabComponentTransition>) =
+        AttributeCollectionBuilder<unit, #IFabComponentAnimatable, IFabComponentTransition>(this, ComponentAnimatable.Transitions) { value }
diff --git a/src/Fabulous.Avalonia/Fabulous.Avalonia.fsproj b/src/Fabulous.Avalonia/Fabulous.Avalonia.fsproj
index 208b9b95..a1115aa5 100644
--- a/src/Fabulous.Avalonia/Fabulous.Avalonia.fsproj
+++ b/src/Fabulous.Avalonia/Fabulous.Avalonia.fsproj
@@ -218,7 +218,6 @@
     <Compile Include="Views\Panels\UniformGrid.fs" />
     <Compile Include="Views\Application.fs" />
     <Compile Include="Views\Any.fs" />
-    <Folder Include="ComponentViews\Controls\" />
     <Compile Include="ComponentViews\_Element.fs" />
     <Compile Include="ComponentViews\_Animatable.fs" />
     <Compile Include="ComponentViews\_StyledElement.fs" />
@@ -247,6 +246,158 @@
     <Compile Include="ComponentViews\_MenuBase.fs" />
     <Compile Include="ComponentViews\_HeaderedSelectingItemsControl.fs" />
     <Compile Include="ComponentViews\_WindowBase.fs" />
+    <Compile Include="ComponentViews\Controls\Tooltip.fs" />
+    <Compile Include="ComponentViews\Controls\Border.fs" />
+    <Compile Include="ComponentViews\Controls\RefreshVisualizer.fs" />
+    <Compile Include="ComponentViews\Controls\RefreshContainer.fs" />
+    <Compile Include="ComponentViews\Controls\ThemeVariantScope.fs" />
+    <Compile Include="ComponentViews\Controls\ExperimentalAcrylicMaterial.fs" />
+    <Compile Include="ComponentViews\Controls\ExperimentalAcrylicBorder.fs" />
+    <Compile Include="ComponentViews\Controls\HeaderedContentControl.fs" />
+    <Compile Include="ComponentViews\Controls\LayoutTransformControl.fs" />
+    <Compile Include="ComponentViews\Controls\TickBar.fs" />
+    <Compile Include="ComponentViews\Controls\DataValidationErrors.fs" />
+    <Compile Include="ComponentViews\Controls\AutoCompleteBox.fs" />
+    <Compile Include="ComponentViews\Controls\Buttons\DropDownButton.fs" />
+    <Compile Include="ComponentViews\Controls\Buttons\HyperlinkButton.fs" />
+    <Compile Include="ComponentViews\Controls\Buttons\ButtonSpinner.fs" />
+    <Compile Include="ComponentViews\Controls\Buttons\RepeatButton.fs" />
+    <Compile Include="ComponentViews\Controls\Buttons\SplitButton.fs" />
+    <Compile Include="ComponentViews\Controls\Buttons\RadioButton.fs" />
+    <Compile Include="ComponentViews\Controls\Buttons\ToggleSplitButton.fs" />
+    <Compile Include="ComponentViews\Controls\Buttons\ToggleButton.fs" />
+    <Compile Include="ComponentViews\Controls\Buttons\Button.fs" />
+    <Compile Include="ComponentViews\Controls\Calendar.fs" />
+    <Compile Include="ComponentViews\Controls\CalendarDatePicker.fs" />
+    <Compile Include="ComponentViews\Controls\CheckBox.fs" />
+    <Compile Include="ComponentViews\Controls\DatePicker.fs" />
+    <Compile Include="ComponentViews\Controls\Documents\Italic.fs" />
+    <Compile Include="ComponentViews\Controls\Documents\TextDecoration.fs" />
+    <Compile Include="ComponentViews\Controls\Documents\Run.fs" />
+    <Compile Include="ComponentViews\Controls\Documents\_Inline.fs" />
+    <Compile Include="ComponentViews\Controls\Documents\Underline.fs" />
+    <Compile Include="ComponentViews\Controls\Documents\InlineUIContainer.fs" />
+    <Compile Include="ComponentViews\Controls\Documents\LineBreak.fs" />
+    <Compile Include="ComponentViews\Controls\Documents\Span.fs" />
+    <Compile Include="ComponentViews\Controls\Documents\Bold.fs" />
+    <Compile Include="ComponentViews\Controls\Expander.fs" />
+    <Compile Include="ComponentViews\Controls\GridSplitter.fs" />
+    <Compile Include="ComponentViews\Controls\Label.fs" />
+    <Compile Include="ComponentViews\Controls\MaskedTextBox.fs" />
+    <Compile Include="ComponentViews\Controls\Notifications\NotificationCard.fs" />
+    <Compile Include="ComponentViews\Controls\Notifications\WindowNotificationManager.fs" />
+    <Compile Include="ComponentViews\Controls\NumericUpDown.fs" />
+    <Compile Include="ComponentViews\Controls\Primitives\AccessText.fs" />
+    <Compile Include="ComponentViews\Controls\Primitives\Popup.fs" />
+    <Compile Include="ComponentViews\Controls\Primitives\Thumb.fs" />
+    <Compile Include="ComponentViews\Controls\Primitives\_RangeBase.fs" />
+    <Compile Include="ComponentViews\Controls\Primitives\ScrollBar.fs" />
+    <Compile Include="ComponentViews\Controls\ProgressBar.fs" />
+    <Compile Include="ComponentViews\Controls\SelectableTextBlock.fs" />
+    <Compile Include="ComponentViews\Controls\Separator.fs" />
+    <Compile Include="ComponentViews\Controls\Shapes\Polygon.fs" />
+    <Compile Include="ComponentViews\Controls\Shapes\Line.fs" />
+    <Compile Include="ComponentViews\Controls\Shapes\Rectangle.fs" />
+    <Compile Include="ComponentViews\Controls\Shapes\Polyline.fs" />
+    <Compile Include="ComponentViews\Controls\Shapes\Path.fs" />
+    <Compile Include="ComponentViews\Controls\Shapes\Sector.fs" />
+    <Compile Include="ComponentViews\Controls\Shapes\_Shape.fs" />
+    <Compile Include="ComponentViews\Controls\Shapes\Arc.fs" />
+    <Compile Include="ComponentViews\Controls\Shapes\Ellipse.fs" />
+    <Compile Include="ComponentViews\Controls\Slider.fs" />
+    <Compile Include="ComponentViews\Controls\TextBlock.fs" />
+    <Compile Include="ComponentViews\Controls\TextBox.fs" />
+    <Compile Include="ComponentViews\Controls\TimePicker.fs" />
+    <Compile Include="ComponentViews\Controls\ToggleSwitch.fs" />
+    <Compile Include="ComponentViews\Controls\TransitioningContentControl.fs" />
+    <Compile Include="ComponentViews\Controls\UserControl.fs" />
+    <Compile Include="ComponentViews\Controls\Viewbox.fs" />
+    <Compile Include="ComponentViews\Controls\Window.fs" />
+    <Compile Include="ComponentViews\Styling\KeyFrame.fs" />
+    <Compile Include="ComponentViews\Styling\Animation.fs" />
+    <Compile Include="ComponentViews\Styling\Transition.fs" />
+    <Compile Include="ComponentViews\Styling\Style.fs" />
+    <Compile Include="ComponentViews\Media\_IDrawing.fs" />
+    <Compile Include="ComponentViews\Media\_IPathSegment.fs" />
+    <Compile Include="ComponentViews\Media\_IGeometry.fs" />
+    <Compile Include="ComponentViews\Media\_TileBrush.fs" />
+    <Compile Include="ComponentViews\Media\_Effect.fs" />
+    <Compile Include="ComponentViews\Media\_DropShadowEffectBase.fs" />
+    <Compile Include="ComponentViews\Media\Effects\DropShadowDirectionEffect.fs" />
+    <Compile Include="ComponentViews\Media\Effects\DropShadowEffect.fs" />
+    <Compile Include="ComponentViews\Media\Effects\BlurEffect.fs" />
+    <Compile Include="ComponentViews\Media\PathSegments\QuadraticBezierSegment.fs" />
+    <Compile Include="ComponentViews\Media\PathSegments\PathFigure.fs" />
+    <Compile Include="ComponentViews\Media\PathSegments\BezierSegment.fs" />
+    <Compile Include="ComponentViews\Media\PathSegments\PolyLineSegment.fs" />
+    <Compile Include="ComponentViews\Media\PathSegments\ArcSegment.fs" />
+    <Compile Include="ComponentViews\Media\PathSegments\LineSegment.fs" />
+    <Compile Include="ComponentViews\Media\Geometries\LineGeometry.fs" />
+    <Compile Include="ComponentViews\Media\Geometries\CombinedGeometry.fs" />
+    <Compile Include="ComponentViews\Media\Geometries\EllipseGeometry.fs" />
+    <Compile Include="ComponentViews\Media\Geometries\GeometryGroup.fs" />
+    <Compile Include="ComponentViews\Media\Geometries\PolylineGeometry.fs" />
+    <Compile Include="ComponentViews\Media\Geometries\PathGeometry.fs" />
+    <Compile Include="ComponentViews\Media\Geometries\RectangleGeometry.fs" />
+    <Compile Include="ComponentViews\Media\Transforms\Rotate3DTransform.fs" />
+    <Compile Include="ComponentViews\Media\Transforms\TransformGroup.fs" />
+    <Compile Include="ComponentViews\Media\Transforms\RotateTransform.fs" />
+    <Compile Include="ComponentViews\Media\Transforms\SkewTransform.fs" />
+    <Compile Include="ComponentViews\Media\Transforms\ScaleTransform.fs" />
+    <Compile Include="ComponentViews\Media\Transforms\MatrixTransform.fs" />
+    <Compile Include="ComponentViews\Media\Transforms\TranslateTransform.fs" />
+    <Compile Include="ComponentViews\Media\Drawing\GlyphRunDrawing.fs" />
+    <Compile Include="ComponentViews\Media\Drawing\ImageDrawing.fs" />
+    <Compile Include="ComponentViews\Media\Drawing\DrawingGroup.fs" />
+    <Compile Include="ComponentViews\Media\Drawing\DrawingImage.fs" />
+    <Compile Include="ComponentViews\Media\Drawing\GeometryDrawing.fs" />
+    <Compile Include="ComponentViews\Media\Brushes\_GradientBrush.fs" />
+    <Compile Include="ComponentViews\Media\Brushes\GradientStop.fs" />
+    <Compile Include="ComponentViews\Media\Brushes\ConicGradientBrush.fs" />
+    <Compile Include="ComponentViews\Media\Brushes\RadialGradientBrush.fs" />
+    <Compile Include="ComponentViews\Media\Brushes\DrawingBrush.fs" />
+    <Compile Include="ComponentViews\Media\Brushes\ImageBrush.fs" />
+    <Compile Include="ComponentViews\Media\Brushes\LinearGradientBrush.fs" />
+    <Compile Include="ComponentViews\Media\Brushes\VisualBrush.fs" />
+    <Compile Include="ComponentViews\Media\DashStyle.fs" />
+    <Compile Include="ComponentViews\Media\Pen.fs" />
+    <Compile Include="ComponentViews\MenuItems\ListBoxItem.fs" />
+    <Compile Include="ComponentViews\MenuItems\MenuItem.fs" />
+    <Compile Include="ComponentViews\MenuItems\TreeViewItem.fs" />
+    <Compile Include="ComponentViews\MenuItems\TabItem.fs" />
+    <Compile Include="ComponentViews\MenuItems\ComboBoxItem.fs" />
+    <Compile Include="ComponentViews\Collections\TreeView.fs" />
+    <Compile Include="ComponentViews\Collections\TabControl.fs" />
+    <Compile Include="ComponentViews\Collections\Carousel.fs" />
+    <Compile Include="ComponentViews\Collections\ListBox.fs" />
+    <Compile Include="ComponentViews\Imaging\_IconElement.fs" />
+    <Compile Include="ComponentViews\Imaging\TrayIcon.fs" />
+    <Compile Include="ComponentViews\Imaging\PathIcon.fs" />
+    <Compile Include="ComponentViews\Imaging\CroppedBitmap.fs" />
+    <Compile Include="ComponentViews\Imaging\Image.fs" />
+    <Compile Include="ComponentViews\Layouts\ScrollViewer.fs" />
+    <Compile Include="ComponentViews\Layouts\SliptView.fs" />
+    <Compile Include="ComponentViews\Menu\ComboBox.fs" />
+    <Compile Include="ComponentViews\Menu\TabStrip.fs" />
+    <Compile Include="ComponentViews\Menu\_NativeMenuItemBase.fs" />
+    <Compile Include="ComponentViews\Menu\NativeMenuItem.fs" />
+    <Compile Include="ComponentViews\Menu\NativeMenu.fs" />
+    <Compile Include="ComponentViews\Menu\NativeMenuSeparator.fs" />
+    <Compile Include="ComponentViews\Menu\Flyout.fs" />
+    <Compile Include="ComponentViews\Menu\Menu.fs" />
+    <Compile Include="ComponentViews\Menu\ContextMenu.fs" />
+    <Compile Include="ComponentViews\Menu\NativeMenuBar.fs" />
+    <Compile Include="ComponentViews\Menu\MenuFlyout.fs" />
+    <Compile Include="ComponentViews\Panels\DockPanel.fs" />
+    <Compile Include="ComponentViews\Panels\_StackPanel.fs" />
+    <Compile Include="ComponentViews\Panels\Grid.fs" />
+    <Compile Include="ComponentViews\Panels\ReversibleStackPanel.fs" />
+    <Compile Include="ComponentViews\Panels\UniformGrid.fs" />
+    <Compile Include="ComponentViews\Panels\VirtualizingStackPanel.fs" />
+    <Compile Include="ComponentViews\Panels\Canvas.fs" />
+    <Compile Include="ComponentViews\Panels\WrapPanel.fs" />
+    <Compile Include="ComponentViews\Panels\_AdornerLayer.fs" />
+    <Compile Include="ComponentViews\Panels\Panel.fs" />
     <Folder Include="MvuViews\Controls\" />
     <Compile Include="MvuViews\_Element.fs" />
     <Compile Include="MvuViews\_Animatable.fs" />
diff --git a/src/Fabulous.Avalonia/Views/Controls/DataValidationErrors.fs b/src/Fabulous.Avalonia/Views/Controls/DataValidationErrors.fs
index c884db08..843e9617 100644
--- a/src/Fabulous.Avalonia/Views/Controls/DataValidationErrors.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/DataValidationErrors.fs
@@ -6,7 +6,7 @@ open Avalonia
 open Avalonia.Controls
 open Fabulous
 
-type IFaDataValidationErrors =
+type IFabDataValidationErrors =
     inherit IFabContentControl
 
 module DataValidationErrors =
@@ -29,7 +29,7 @@ type DataValidationErrorsModifiers =
     /// <param name="this">Current widget.</param>
     /// <param name="value">The HasErrors value.</param>
     [<Extension>]
-    static member inline hasErrors(this: WidgetBuilder<'msg, #IFaDataValidationErrors>, value: bool) =
+    static member inline hasErrors(this: WidgetBuilder<'msg, #IFabDataValidationErrors>, value: bool) =
         this.AddScalar(DataValidationErrors.HasErrors.WithValue(value))
 
     /// <summary>Sets the Errors property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/DashStyle.fs b/src/Fabulous.Avalonia/Views/Media/DashStyle.fs
index e4054b11..42ded7fc 100644
--- a/src/Fabulous.Avalonia/Views/Media/DashStyle.fs
+++ b/src/Fabulous.Avalonia/Views/Media/DashStyle.fs
@@ -6,7 +6,7 @@ open Avalonia.Collections
 open Avalonia.Media
 open Fabulous
 
-type IFaDashStyle =
+type IFabDashStyle =
     inherit IFabAnimatable
 
 module DashStyle =
@@ -41,5 +41,5 @@ type DashStyleModifiers =
     /// <param name="this">Current widget.</param>
     /// <param name="value">The ViewRef instance that will receive access to the underlying control.</param>
     [<Extension>]
-    static member inline reference(this: WidgetBuilder<'msg, IFaDashStyle>, value: ViewRef<DashStyle>) =
+    static member inline reference(this: WidgetBuilder<'msg, IFabDashStyle>, value: ViewRef<DashStyle>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
diff --git a/src/Fabulous.Avalonia/Views/Media/Pen.fs b/src/Fabulous.Avalonia/Views/Media/Pen.fs
index 69f76416..57bc61d2 100644
--- a/src/Fabulous.Avalonia/Views/Media/Pen.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Pen.fs
@@ -63,7 +63,7 @@ type PenModifiers =
     /// <param name="this">Current widget.</param>
     /// <param name="value">The DashStyle value.</param>
     [<Extension>]
-    static member inline dashStyle(this: WidgetBuilder<'msg, #IFabPen>, value: WidgetBuilder<'msg, IFaDashStyle>) =
+    static member inline dashStyle(this: WidgetBuilder<'msg, #IFabPen>, value: WidgetBuilder<'msg, IFabDashStyle>) =
         this.AddWidget(Pen.DashStyle.WithValue(value.Compile()))
 
     /// <summary>Sets the LineCap property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/_Panel.fs b/src/Fabulous.Avalonia/Views/_Panel.fs
index 60f11722..92dbe974 100644
--- a/src/Fabulous.Avalonia/Views/_Panel.fs
+++ b/src/Fabulous.Avalonia/Views/_Panel.fs
@@ -14,5 +14,5 @@ module Panel =
     let Background =
         Attributes.defineAvaloniaPropertyWithEquality Panel.BackgroundProperty
 
-    let Children =
-        Attributes.defineAvaloniaListWidgetCollection "Panel_Children" (fun x -> (x :?> Panel).Children)
+    // let Children =
+    //     Attributes.defineAvaloniaListWidgetCollection "Panel_Children" (fun x -> (x :?> Panel).Children)