diff --git a/Directory.Packages.props b/Directory.Packages.props
index 0a3960232..f7b46855c 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -5,7 +5,7 @@
   <ItemGroup>
     <PackageVersion Include="Fabulous" Version="3.0.0-pre1" />
     <PackageVersion Include="FsCheck.NUnit" Version="2.16.4" />
-    <PackageVersion Include="FSharp.Core" Version="8.0.100" />
+    <PackageVersion Include="FSharp.Core" Version="8.0.200" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="NUnit" Version="3.13.3" />
diff --git a/extensions/Fabulous.Avalonia.ColorPicker/ColorPicker.fs b/extensions/Fabulous.Avalonia.ColorPicker/ColorPicker.fs
index e99373aa5..77476bb77 100644
--- a/extensions/Fabulous.Avalonia.ColorPicker/ColorPicker.fs
+++ b/extensions/Fabulous.Avalonia.ColorPicker/ColorPicker.fs
@@ -32,7 +32,6 @@ module ColorPickerBuilders =
         static member ColorPicker(color: Color, fn: Color -> 'msg) =
             WidgetBuilder<'msg, IFabColorPicker>(ColorPicker.WidgetKey, ColorView.ColorChanged.WithValue(ValueEventData.create color fn))
 
-[<Extension>]
 type ColorPickerModifiers =
     /// <summary>Link a ViewRef to access the direct ColorPicker control instance</summary>
     /// <param name="this">Current widget</param>
diff --git a/extensions/Fabulous.Avalonia.ColorPicker/ColorPreviewer.fs b/extensions/Fabulous.Avalonia.ColorPicker/ColorPreviewer.fs
index a82f23087..281317cb9 100644
--- a/extensions/Fabulous.Avalonia.ColorPicker/ColorPreviewer.fs
+++ b/extensions/Fabulous.Avalonia.ColorPicker/ColorPreviewer.fs
@@ -36,7 +36,6 @@ module ColorPreviewerBuilders =
         static member ColorPreviewer(fn: ColorChangedEventArgs -> 'msg) =
             WidgetBuilder<'msg, IFabColorPreviewer>(ColorPreviewer.WidgetKey, ColorPreviewer.ColorChanged.WithValue(fn))
 
-[<Extension>]
 type ColorPreviewerModifiers =
     /// <summary>Link a ViewRef to access the direct ColorSlider control instance</summary>
     /// <param name="this">Current widget</param>
diff --git a/extensions/Fabulous.Avalonia.ColorPicker/ColorSlider.fs b/extensions/Fabulous.Avalonia.ColorPicker/ColorSlider.fs
index e16086394..75749b072 100644
--- a/extensions/Fabulous.Avalonia.ColorPicker/ColorSlider.fs
+++ b/extensions/Fabulous.Avalonia.ColorPicker/ColorSlider.fs
@@ -59,7 +59,6 @@ module ColorSliderBuilders =
         static member ColorSlider(color: Color, fn: Color -> 'msg) =
             WidgetBuilder<'msg, IFabColorSlider>(ColorSlider.WidgetKey, ColorSlider.ColorChanged.WithValue(ValueEventData.create color fn))
 
-[<Extension>]
 type ColorSliderModifiers =
     /// <summary>Link a ViewRef to access the direct ColorSlider control instance</summary>
     /// <param name="this">Current widget</param>
diff --git a/extensions/Fabulous.Avalonia.ColorPicker/ColorSpectrum.fs b/extensions/Fabulous.Avalonia.ColorPicker/ColorSpectrum.fs
index 03e44c512..79bfa75e8 100644
--- a/extensions/Fabulous.Avalonia.ColorPicker/ColorSpectrum.fs
+++ b/extensions/Fabulous.Avalonia.ColorPicker/ColorSpectrum.fs
@@ -69,7 +69,6 @@ module ColorSpectrumBuilders =
         static member ColorSpectrum(color: Color, fn: Color -> 'msg) =
             WidgetBuilder<'msg, IFabColorSpectrum>(ColorSpectrum.WidgetKey, ColorSpectrum.ColorChanged.WithValue(ValueEventData.create color fn))
 
-[<Extension>]
 type ColorSpectrumModifiers =
     /// <summary>Link a ViewRef to access the direct ColorSpectrum control instance</summary>
     /// <param name="this">Current widget</param>
diff --git a/extensions/Fabulous.Avalonia.ColorPicker/ColorView.fs b/extensions/Fabulous.Avalonia.ColorPicker/ColorView.fs
index f74918d7b..29f4de022 100644
--- a/extensions/Fabulous.Avalonia.ColorPicker/ColorView.fs
+++ b/extensions/Fabulous.Avalonia.ColorPicker/ColorView.fs
@@ -113,7 +113,6 @@ module ColorViewBuilders =
         static member ColorView(color: Color, fn: Color -> 'msg) =
             WidgetBuilder<'msg, IFabColorView>(ColorView.WidgetKey, ColorView.ColorChanged.WithValue(ValueEventData.create color fn))
 
-[<Extension>]
 type ColorViewModifiers =
     /// <summary>Link a ViewRef to access the direct ColorView control instance</summary>
     /// <param name="this">Current widget</param>
diff --git a/extensions/Fabulous.Avalonia.DataGrid/DataGrid.fs b/extensions/Fabulous.Avalonia.DataGrid/DataGrid.fs
index 4eb483e5b..e89715253 100644
--- a/extensions/Fabulous.Avalonia.DataGrid/DataGrid.fs
+++ b/extensions/Fabulous.Avalonia.DataGrid/DataGrid.fs
@@ -207,7 +207,6 @@ module DataGridBuilders =
         static member CustomDataGrid(items: #IEnumerable) =
             CollectionBuilder<'msg, IFabDataGrid, #IFabDataGridColumn>(DataGrid.WidgetKey, DataGrid.Columns, DataGrid.Items.WithValue(items))
 
-[<Extension>]
 type DataGridModifiers =
     /// <summary>Link a ViewRef to access the direct DataGrid control instance.</summary>
     /// <param name="this">Current widget.</param>
@@ -601,7 +600,6 @@ type DataGridModifiers =
     static member inline onUnloadingRowDetails(this: WidgetBuilder<'msg, IFabDataGrid>, fn: DataGridRowDetailsEventArgs -> 'msg) =
         this.AddScalar(DataGrid.UnloadingRowDetails.WithValue(fn))
 
-[<Extension>]
 type DataGridExtraModifiers =
     /// <summary>Sets the HorizontalGridLinesBrush property.</summary>
     /// <param name="this">Current widget.</param>
@@ -645,7 +643,6 @@ type DataGridExtraModifiers =
     static member inline verticalGridLinesBrush(this: WidgetBuilder<'msg, IFabDataGrid>, value: string) =
         DataGridModifiers.verticalGridLinesBrush(this, View.SolidColorBrush(Color.Parse(value)))
 
-[<Extension>]
 type DataGridCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabDataGridColumn>
diff --git a/extensions/Fabulous.Avalonia.DataGrid/DataGridCheckBoxColumn.fs b/extensions/Fabulous.Avalonia.DataGrid/DataGridCheckBoxColumn.fs
index 00f56573e..5556755d0 100644
--- a/extensions/Fabulous.Avalonia.DataGrid/DataGridCheckBoxColumn.fs
+++ b/extensions/Fabulous.Avalonia.DataGrid/DataGridCheckBoxColumn.fs
@@ -67,7 +67,6 @@ module DataGridCheckBoxColumnBuilders =
                 )
             )
 
-[<Extension>]
 type DataGridCheckBoxColumnModifiers =
     /// <summary>Link a ViewRef to access the direct DataGridCheckBoxColumn control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/extensions/Fabulous.Avalonia.DataGrid/DataGridTextColumn.fs b/extensions/Fabulous.Avalonia.DataGrid/DataGridTextColumn.fs
index 33493d0b8..1d108cf08 100644
--- a/extensions/Fabulous.Avalonia.DataGrid/DataGridTextColumn.fs
+++ b/extensions/Fabulous.Avalonia.DataGrid/DataGridTextColumn.fs
@@ -87,7 +87,6 @@ module DataGridTextColumnBuilders =
                 )
             )
 
-[<Extension>]
 type DataGridTextColumnModifiers =
     /// <summary>Link a ViewRef to access the direct DataGridTextColumn control instance.</summary>
     /// <param name="this">Current widget.</param>
@@ -145,7 +144,6 @@ type DataGridTextColumnModifiers =
     static member inline foreground(this: WidgetBuilder<'msg, IFabDataGridTextColumn>, value: WidgetBuilder<'msg, #IFabBrush>) =
         this.AddWidget(DataGridTextColumn.ForegroundWidget.WithValue(value.Compile()))
 
-[<Extension>]
 type DataGridTextColumnExtraModifiers =
     /// <summary>Set the Foreground property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/extensions/Fabulous.Avalonia.DataGrid/_DataGridColumn.fs b/extensions/Fabulous.Avalonia.DataGrid/_DataGridColumn.fs
index e97d8de7b..adbd1a115 100644
--- a/extensions/Fabulous.Avalonia.DataGrid/_DataGridColumn.fs
+++ b/extensions/Fabulous.Avalonia.DataGrid/_DataGridColumn.fs
@@ -25,7 +25,6 @@ module DataGridColumn =
     let IsVisible =
         Attributes.defineAvaloniaPropertyWithEquality DataGridColumn.IsVisibleProperty
 
-[<Extension>]
 type DataGridColumnModifiers =
 
     /// <summary>Sets the CellTheme property.</summary>
diff --git a/extensions/Fabulous.Avalonia.ItemsRepeater/ItemsRepeater.fs b/extensions/Fabulous.Avalonia.ItemsRepeater/ItemsRepeater.fs
index 5d55156f8..1f0492280 100644
--- a/extensions/Fabulous.Avalonia.ItemsRepeater/ItemsRepeater.fs
+++ b/extensions/Fabulous.Avalonia.ItemsRepeater/ItemsRepeater.fs
@@ -50,7 +50,6 @@ module ItemsRepeaterBuilders =
             ) =
             WidgetHelpers.buildItems<'msg, IFabItemsRepeater, 'itemData, 'itemMarker> ItemsRepeater.WidgetKey ItemsRepeater.ItemsSource items template
 
-[<Extension>]
 type ItemsRepeaterModifiers =
     /// <summary>Link a ViewRef to access the direct ItemsRepeater control instance</summary>
     /// <param name="this">Current widget</param>
diff --git a/extensions/Fabulous.Avalonia.TreeDataGrid/TreeDataGrid.fs b/extensions/Fabulous.Avalonia.TreeDataGrid/TreeDataGrid.fs
index dc60ec217..ee322bb98 100644
--- a/extensions/Fabulous.Avalonia.TreeDataGrid/TreeDataGrid.fs
+++ b/extensions/Fabulous.Avalonia.TreeDataGrid/TreeDataGrid.fs
@@ -60,7 +60,6 @@ module TreeDataGridBuilders =
         static member TreeDataGrid(source: #ITreeDataGridSource, rows: IRows) =
             WidgetBuilder<'msg, IFabTreeDataGrid>(TreeDataGrid.WidgetKey, TreeDataGrid.Source.WithValue(source), TreeDataGrid.Rows.WithValue(rows))
 
-[<Extension>]
 type TreeDataGridModifiers =
     /// <summary>Link a ViewRef to access the direct TreeDataGrid control instance</summary>
     /// <param name="this">Current widget</param>
diff --git a/global.json b/global.json
index 72d38cd27..7bd16fdfb 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "8.0.200",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }
diff --git a/samples/Gallery/Common.fs b/samples/Gallery/Common.fs
index c5ff8f0e1..9b4683577 100644
--- a/samples/Gallery/Common.fs
+++ b/samples/Gallery/Common.fs
@@ -102,7 +102,6 @@ module HamburgerMenuExtBuilders =
         static member inline HamburgerMenu() =
             CollectionBuilder<'msg, IFabHamburgerMenu, IFabTabItem>(HamburgerMenuExt.WidgetKey, ItemsControl.Items)
 
-[<Extension>]
 type HamburgerMenuModifiers =
     [<Extension>]
     static member inline reference(this: WidgetBuilder<'msg, IFabHamburgerMenu>, value: ViewRef<HamburgerMenu>) =
diff --git a/samples/Gallery/Pages/OpenGLPage.fs b/samples/Gallery/Pages/OpenGLPage.fs
index e446b643d..09442688a 100644
--- a/samples/Gallery/Pages/OpenGLPage.fs
+++ b/samples/Gallery/Pages/OpenGLPage.fs
@@ -402,7 +402,6 @@ module OpenGLWidgetBuilders =
         static member inline OpenGlPageControl<'msg>(yaw: float, pitch: float, roll: float, disco: float) =
             WidgetBuilder<'msg, IFabOpenGlPageControl>(OpenGlPageControl.WidgetKey, OpenGlPageControl.Data.WithValue(struct (yaw, pitch, roll, disco)))
 
-[<Extension>]
 type OpenGLWidgetModifiers =
     [<Extension>]
     static member inline reference(this: WidgetBuilder<'msg, IFabOpenGlPageControl>, value: ViewRef<OpenGlPageControl>) =
diff --git a/samples/RenderDemo.Android/RenderDemo.Android.fsproj b/samples/RenderDemo.Android/RenderDemo.Android.fsproj
index 8fc066892..52df52c68 100644
--- a/samples/RenderDemo.Android/RenderDemo.Android.fsproj
+++ b/samples/RenderDemo.Android/RenderDemo.Android.fsproj
@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.3.1.3" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel" Version="2.3.1.3" />
+<!--    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.3.1.3" />-->
+<!--    <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel" Version="2.3.1.3" />-->
     <PackageReference Include="Avalonia.Android" />
     <ProjectReference Include="..\RenderDemo\RenderDemo.fsproj" />
 
diff --git a/samples/RenderDemo/Animations/SlidingAnimation.fs b/samples/RenderDemo/Animations/SlidingAnimation.fs
index bf4f99f98..6048987ed 100644
--- a/samples/RenderDemo/Animations/SlidingAnimation.fs
+++ b/samples/RenderDemo/Animations/SlidingAnimation.fs
@@ -78,7 +78,6 @@ module ViewExtensions =
             | ValueNone -> ()
             | ValueSome v -> SetBottom(target, v))
 
-[<Extension>]
 type AnimatedControlModifiers =
     [<Extension>]
     static member inline slideLeft(this: WidgetBuilder<'msg, #IFabControl>, value: float) =
diff --git a/samples/RenderDemo/Widgets.fs b/samples/RenderDemo/Widgets.fs
index d878238b1..84317a965 100644
--- a/samples/RenderDemo/Widgets.fs
+++ b/samples/RenderDemo/Widgets.fs
@@ -32,7 +32,6 @@ module HamburgerMenuBuilders =
             CollectionBuilder<'msg, IFabHamburgerMenu, IFabTabItem>(HamburgerMenu.WidgetKey, ItemsControl.Items)
 
 
-[<Extension>]
 type HamburgerMenuModifiers =
     [<Extension>]
     static member inline reference(this: WidgetBuilder<'msg, IFabHamburgerMenu>, value: ViewRef<HamburgerMenu>) =
diff --git a/src/Fabulous.Avalonia/Application.fs b/src/Fabulous.Avalonia/Application.fs
index 6aadc7b22..25cac697e 100644
--- a/src/Fabulous.Avalonia/Application.fs
+++ b/src/Fabulous.Avalonia/Application.fs
@@ -233,7 +233,6 @@ module ApplicationBuilders =
         static member inline SingleViewApplication<'msg, 'childMarker>() =
             SingleChildBuilder<'msg, IFabApplication, 'childMarker>(Application.WidgetKey, Application.MainView)
 
-[<Extension>]
 type ApplicationModifiers =
     /// <summary>Sets the application name.</summary>
     /// <param name="this">Current widget.</param>
@@ -320,7 +319,6 @@ type ApplicationModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabApplication>, value: ViewRef<FabApplication>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type ApplicationYieldExtensions =
     [<Extension>]
     static member inline Yield(_: AttributeCollectionBuilder<'msg, #IFabApplication, IFabTrayIcon>, x: WidgetBuilder<'msg, #IFabTrayIcon>) : Content<'msg> =
@@ -334,7 +332,6 @@ type ApplicationYieldExtensions =
         ) : Content<'msg> =
         { Widgets = MutStackArray1.One(x.Compile()) }
 
-[<Extension>]
 type TrayIconAttachedModifiers =
     /// <summary>Sets the tray icons for the application.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Collections/Carousel.fs b/src/Fabulous.Avalonia/Views/Collections/Carousel.fs
index 56759901e..12ff3b416 100644
--- a/src/Fabulous.Avalonia/Views/Collections/Carousel.fs
+++ b/src/Fabulous.Avalonia/Views/Collections/Carousel.fs
@@ -75,7 +75,6 @@ module CarouselBuilders =
             ) =
             WidgetHelpers.buildItems<'msg, IFabCarousel, 'itemData, 'itemMarker> Carousel.WidgetKey ItemsControl.ItemsSource items template
 
-[<Extension>]
 type CarouselModifiers =
 
     /// <summary>Sets the PageTransition property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Collections/ListBox.fs b/src/Fabulous.Avalonia/Views/Collections/ListBox.fs
index 1492e1386..9b1b23314 100644
--- a/src/Fabulous.Avalonia/Views/Collections/ListBox.fs
+++ b/src/Fabulous.Avalonia/Views/Collections/ListBox.fs
@@ -36,7 +36,6 @@ module ListBoxBuilders =
         static member ListBox() =
             CollectionBuilder<'msg, IFabListBox, IFabListBoxItem>(ListBox.WidgetKey, ItemsControl.Items)
 
-[<Extension>]
 type ListBoxModifiers =
     /// <summary>Sets the SelectionMode property.</summary>
     /// <param name="this">Current widget.</param>
@@ -59,7 +58,6 @@ type ListBoxModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabListBox>, value: ViewRef<ListBox>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type ListBoxCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabListBoxItem>
diff --git a/src/Fabulous.Avalonia/Views/Collections/TabControl.fs b/src/Fabulous.Avalonia/Views/Collections/TabControl.fs
index 675621dbc..eac6c8ef6 100644
--- a/src/Fabulous.Avalonia/Views/Collections/TabControl.fs
+++ b/src/Fabulous.Avalonia/Views/Collections/TabControl.fs
@@ -34,7 +34,6 @@ module TabControlBuilders =
         static member TabControl() =
             CollectionBuilder<'msg, IFabTabControl, IFabTabItem>(TabControl.WidgetKey, ItemsControl.Items, TabControl.TabStripPlacement.WithValue(Dock.Top))
 
-[<Extension>]
 type TabControlModifiers =
     /// <summary>Sets the HorizontalContentAlignment property.</summary>
     /// <param name="this">Current widget.</param>
@@ -57,7 +56,6 @@ type TabControlModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabTabControl>, value: ViewRef<TabControl>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type TabControlExtraModifiers =
 
     /// <summary>Sets the HorizontalContentAlignment property to center.</summary>
@@ -78,7 +76,6 @@ type TabControlExtraModifiers =
     static member inline center(this: WidgetBuilder<'msg, #IFabTabControl>) =
         this.centerHorizontal().centerVertical()
 
-[<Extension>]
 type TabControlCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabTabItem>
diff --git a/src/Fabulous.Avalonia/Views/Collections/TreeView.fs b/src/Fabulous.Avalonia/Views/Collections/TreeView.fs
index e2fb35a2c..2c06ef816 100644
--- a/src/Fabulous.Avalonia/Views/Collections/TreeView.fs
+++ b/src/Fabulous.Avalonia/Views/Collections/TreeView.fs
@@ -74,7 +74,6 @@ module TreeViewBuilders =
 
             WidgetBuilder<'msg, IFabTreeView>(TreeView.WidgetKey, TreeView.ItemsSource.WithValue(data))
 
-[<Extension>]
 type TreeViewModifiers =
     /// <summary>Link a ViewRef to access the direct TreeView control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/AutoCompleteBox.fs b/src/Fabulous.Avalonia/Views/Controls/AutoCompleteBox.fs
index 904b08de1..81cdbe861 100644
--- a/src/Fabulous.Avalonia/Views/Controls/AutoCompleteBox.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/AutoCompleteBox.fs
@@ -90,7 +90,6 @@ module AutoCompleteBoxBuilders =
                 AutoCompleteBox.TextChanged.WithValue(ValueEventData.create text fn)
             )
 
-[<Extension>]
 type AutoCompleteBoxModifiers =
     /// <summary>Sets the MinimumPrefixLength property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Border.fs b/src/Fabulous.Avalonia/Views/Controls/Border.fs
index b7987b567..7052830c8 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Border.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Border.fs
@@ -48,7 +48,6 @@ module BorderBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| Decorator.ChildWidget.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type BorderModifiers =
     /// <summary>Sets the Background property.</summary>
     /// <param name="this">Current widget.</param>
@@ -106,7 +105,6 @@ type BorderModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabBorder>, value: ViewRef<Border>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type BorderExtraModifiers =
     /// <summary>Sets the CornerRadius property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Buttons/Button.fs b/src/Fabulous.Avalonia/Views/Controls/Buttons/Button.fs
index 6d7c6c96c..412897645 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Buttons/Button.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Buttons/Button.fs
@@ -51,7 +51,6 @@ module ButtonBuilders =
 
             )
 
-[<Extension>]
 type ButtonModifiers =
     /// <summary>Sets the ClickMode property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Buttons/ButtonSpinner.fs b/src/Fabulous.Avalonia/Views/Controls/Buttons/ButtonSpinner.fs
index 5af0b3f92..5bcaa78fd 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Buttons/ButtonSpinner.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Buttons/ButtonSpinner.fs
@@ -29,7 +29,6 @@ module ButtonSpinnerBuilders =
         static member inline ButtonSpinner(text: string, fn: SpinEventArgs -> 'msg) =
             WidgetBuilder<'msg, IFabButtonSpinner>(ButtonSpinner.WidgetKey, ContentControl.ContentString.WithValue(text), Spinner.Spin.WithValue(fn))
 
-[<Extension>]
 type ButtonSpinnerModifiers =
 
     /// <summary>Sets the AllowSpin property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Buttons/DropDownButton.fs b/src/Fabulous.Avalonia/Views/Controls/Buttons/DropDownButton.fs
index 3274012d3..e101c9af0 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Buttons/DropDownButton.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Buttons/DropDownButton.fs
@@ -39,7 +39,6 @@ module DropDownButtonBuilders =
                 )
             )
 
-[<Extension>]
 type DropDownButtonModifiers =
     /// <summary>Link a ViewRef to access the direct DropDownButton control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Buttons/RadioButton.fs b/src/Fabulous.Avalonia/Views/Controls/Buttons/RadioButton.fs
index 6cf1f4cd9..3f16887b4 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Buttons/RadioButton.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Buttons/RadioButton.fs
@@ -74,7 +74,6 @@ module RadioButtonBuilders =
                 )
             )
 
-[<Extension>]
 type RadioButtonAttachedModifiers =
     /// <summary>Sets the GroupName property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Buttons/RepeatButton.fs b/src/Fabulous.Avalonia/Views/Controls/Buttons/RepeatButton.fs
index 06a980a9e..7f755db76 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Buttons/RepeatButton.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Buttons/RepeatButton.fs
@@ -43,7 +43,6 @@ module RepeatButtonBuilders =
                 )
             )
 
-[<Extension>]
 type RepeatButtonModifiers =
     /// <summary>Sets the Delay property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Buttons/SplitButton.fs b/src/Fabulous.Avalonia/Views/Controls/Buttons/SplitButton.fs
index 5976cf4f6..704961014 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Buttons/SplitButton.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Buttons/SplitButton.fs
@@ -43,7 +43,6 @@ module SplitButtonBuilders =
                 )
             )
 
-[<Extension>]
 type SplitButtonModifiers =
     /// <summary>Sets the Flyout property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Buttons/ToggleButton.fs b/src/Fabulous.Avalonia/Views/Controls/Buttons/ToggleButton.fs
index faa70451f..6a13ead37 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Buttons/ToggleButton.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Buttons/ToggleButton.fs
@@ -96,7 +96,6 @@ module ToggleButtonBuilders =
                 )
             )
 
-[<Extension>]
 type ToggleButtonModifiers =
     /// <summary>Link a ViewRef to access the direct ToggleButton control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Buttons/ToggleSplitButton.fs b/src/Fabulous.Avalonia/Views/Controls/Buttons/ToggleSplitButton.fs
index eda44c0e8..5db184a85 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Buttons/ToggleSplitButton.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Buttons/ToggleSplitButton.fs
@@ -43,7 +43,6 @@ module ToggleSplitButtonBuilders =
                 )
             )
 
-[<Extension>]
 type ToggleSplitButtonModifiers =
     /// <summary>Link a ViewRef to access the direct ToggleSplitButton control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Calendar.fs b/src/Fabulous.Avalonia/Views/Controls/Calendar.fs
index 3df00e828..ad5b50ced 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Calendar.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Calendar.fs
@@ -74,7 +74,6 @@ module CalendarBuilders =
                 Calendar.SelectedDateChanged.WithValue(ValueEventData.create date fn)
             )
 
-[<Extension>]
 type CalendarModifiers =
     /// <summary>Sets the FirstDayOfWeek property.</summary>
     /// <param name="this">Current widget.</param>
@@ -153,7 +152,6 @@ type CalendarModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabCalendar>, value: ViewRef<Calendar>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type CalendarExtraModifiers =
     /// <summary>Sets the HeaderBackground property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/CalendarDatePicker.fs b/src/Fabulous.Avalonia/Views/Controls/CalendarDatePicker.fs
index 1ba91bdbc..ef33886e7 100644
--- a/src/Fabulous.Avalonia/Views/Controls/CalendarDatePicker.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/CalendarDatePicker.fs
@@ -80,7 +80,6 @@ module CalendarDatePickerBuilders =
                 CalendarDatePicker.SelectedDateChanged.WithValue(ValueEventData.create date fn)
             )
 
-[<Extension>]
 type CalendarDatePickerModifiers =
     /// <summary>Sets the DisplayDate property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/CheckBox.fs b/src/Fabulous.Avalonia/Views/Controls/CheckBox.fs
index 55d47441c..5230eb4a0 100644
--- a/src/Fabulous.Avalonia/Views/Controls/CheckBox.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/CheckBox.fs
@@ -89,7 +89,6 @@ module CheckBoxBuilders =
                 )
             )
 
-[<Extension>]
 type CheckBoxModifiers =
     /// <summary>Link a ViewRef to access the direct CheckBox control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/DataValidationErrors.fs b/src/Fabulous.Avalonia/Views/Controls/DataValidationErrors.fs
index 78da57312..c884db08b 100644
--- a/src/Fabulous.Avalonia/Views/Controls/DataValidationErrors.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/DataValidationErrors.fs
@@ -23,7 +23,6 @@ module DataValidationErrors =
     let HasErrors =
         Attributes.defineAvaloniaPropertyWithEquality DataValidationErrors.HasErrorsProperty
 
-[<Extension>]
 type DataValidationErrorsModifiers =
 
     /// <summary>Sets the HasErrors property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Controls/DatePicker.fs b/src/Fabulous.Avalonia/Views/Controls/DatePicker.fs
index 45a598e94..2b5caae62 100644
--- a/src/Fabulous.Avalonia/Views/Controls/DatePicker.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/DatePicker.fs
@@ -48,7 +48,6 @@ module DatePickerBuilders =
         static member inline DatePicker(date: DateTimeOffset, fn: DateTimeOffset -> 'msg) =
             WidgetBuilder<'msg, IFabDatePicker>(DatePicker.WidgetKey, DatePicker.SelectedDateChanged.WithValue(ValueEventData.create date fn))
 
-[<Extension>]
 type DatePickerModifiers =
     /// <summary>Sets the DayVisible property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Documents/Bold.fs b/src/Fabulous.Avalonia/Views/Controls/Documents/Bold.fs
index 257e76829..1d6b9c4e8 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Documents/Bold.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Documents/Bold.fs
@@ -23,7 +23,6 @@ module BoldBuilders =
         static member Bold(text: string) =
             View.Bold<'msg>() { View.Run<'msg>(text) }
 
-[<Extension>]
 type BoldModifiers =
     /// <summary>Link a ViewRef to access the direct Bold control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Documents/InlineUIContainer.fs b/src/Fabulous.Avalonia/Views/Controls/Documents/InlineUIContainer.fs
index 725dcf985..a46c261c2 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Documents/InlineUIContainer.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Documents/InlineUIContainer.fs
@@ -26,7 +26,6 @@ module InlineUIContainerBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| InlineUIContainer.Children.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type InlineUIContainerModifiers =
     /// <summary>Link a ViewRef to access the direct InlineUIContainer control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Documents/Italic.fs b/src/Fabulous.Avalonia/Views/Controls/Documents/Italic.fs
index e59c8295e..fa67156bb 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Documents/Italic.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Documents/Italic.fs
@@ -23,7 +23,6 @@ module ItalicBuilders =
         static member Italic(text: string) =
             View.Italic<'msg>() { View.Run<'msg>(text) }
 
-[<Extension>]
 type ItalicModifiers =
     /// <summary>Link a ViewRef to access the direct Italic control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Documents/LineBreak.fs b/src/Fabulous.Avalonia/Views/Controls/Documents/LineBreak.fs
index 7b1a9e9e7..7f9c59af1 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Documents/LineBreak.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Documents/LineBreak.fs
@@ -19,7 +19,6 @@ module LineBreakBuilders =
         static member LineBreak() =
             WidgetBuilder<'msg, IFabLineBreak>(LineBreak.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
 
-[<Extension>]
 type LineBreakModifiers =
     /// <summary>Link a ViewRef to access the direct LineBreak control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Documents/Run.fs b/src/Fabulous.Avalonia/Views/Controls/Documents/Run.fs
index 865a72a24..b0098c408 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Documents/Run.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Documents/Run.fs
@@ -21,7 +21,6 @@ module RunBuilders =
         static member Run(text: string) =
             WidgetBuilder<'msg, IFabRun>(Run.WidgetKey, Run.Text.WithValue(text))
 
-[<Extension>]
 type RunModifiers =
     /// <summary>Link a ViewRef to access the direct Run control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Documents/Span.fs b/src/Fabulous.Avalonia/Views/Controls/Documents/Span.fs
index 53c52d5a7..5b7e2e294 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Documents/Span.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Documents/Span.fs
@@ -22,7 +22,6 @@ module SpanBuilders =
         static member Span() =
             CollectionBuilder<'msg, IFabSpan, IFabInline>(Span.WidgetKey, Span.Inlines)
 
-[<Extension>]
 type SpanModifiers =
     /// <summary>Link a ViewRef to access the direct Span control instance.</summary>
     /// <param name="this">Current widget.</param>
@@ -31,7 +30,6 @@ type SpanModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabSpan>, value: ViewRef<Span>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type SpanCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabInline>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Documents/TextDecoration.fs b/src/Fabulous.Avalonia/Views/Controls/Documents/TextDecoration.fs
index 6a0ca2a1f..eb8adc739 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Documents/TextDecoration.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Documents/TextDecoration.fs
@@ -60,7 +60,6 @@ module TextDecorationBuilders =
         static member inline TextDecoration(location: TextDecorationLocation) =
             WidgetBuilder<'msg, IFabTextDecoration>(TextDecoration.WidgetKey, TextDecoration.Location.WithValue(location))
 
-[<Extension>]
 type TextDecorationModifiers =
     /// <summary>Sets the Stroke property.</summary>
     /// <param name="this">Current widget.</param>
@@ -132,7 +131,6 @@ type TextDecorationModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabTextDecoration>, value: ViewRef<TextDecoration>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type TextDecorationExtraModifiers =
     /// <summary>Sets the Stroke property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Documents/Underline.fs b/src/Fabulous.Avalonia/Views/Controls/Documents/Underline.fs
index c528b5403..281a6e1f2 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Documents/Underline.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Documents/Underline.fs
@@ -22,7 +22,6 @@ module UnderlineBuilders =
         /// <param name="text">The text to display.</param>
         static member Underline(text: string) = View.Underline() { View.Run(text) }
 
-[<Extension>]
 type UnderlineModifiers =
     /// <summary>Link a ViewRef to access the direct Underline control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Documents/_Inline.fs b/src/Fabulous.Avalonia/Views/Controls/Documents/_Inline.fs
index 5cbdd5c63..34f446adc 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Documents/_Inline.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Documents/_Inline.fs
@@ -23,7 +23,6 @@ module Inline =
     let BaselineAlignment =
         Attributes.defineAvaloniaPropertyWithEquality Inline.BaselineAlignmentProperty
 
-[<Extension>]
 type InlineModifiers =
     /// <summary>Sets the BaselineAlignment property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Expander.fs b/src/Fabulous.Avalonia/Views/Controls/Expander.fs
index 173596372..65b7786de 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Expander.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Expander.fs
@@ -86,7 +86,6 @@ module ExpanderBuilders =
                 )
             )
 
-[<Extension>]
 type ExpanderModifiers =
     /// <summary>Sets the ContentTransition property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/ExperimentalAcrylicBorder.fs b/src/Fabulous.Avalonia/Views/Controls/ExperimentalAcrylicBorder.fs
index 495c0b364..3d15c99d2 100644
--- a/src/Fabulous.Avalonia/Views/Controls/ExperimentalAcrylicBorder.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/ExperimentalAcrylicBorder.fs
@@ -35,7 +35,6 @@ module ExperimentalAcrylicBorderBuilders =
         static member ExperimentalAcrylicBorder() =
             WidgetBuilder<'msg, IFabExperimentalAcrylicBorder>(ExperimentalAcrylicBorder.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
 
-[<Extension>]
 type ExperimentalAcrylicBorderModifiers =
     /// <summary>Sets the CornerRadius property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/ExperimentalAcrylicMaterial.fs b/src/Fabulous.Avalonia/Views/Controls/ExperimentalAcrylicMaterial.fs
index fee5a2122..2fd8180f9 100644
--- a/src/Fabulous.Avalonia/Views/Controls/ExperimentalAcrylicMaterial.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/ExperimentalAcrylicMaterial.fs
@@ -43,7 +43,6 @@ module ExperimentalAcrylicMaterialBuilders =
                 AttributesBundle(StackList.empty(), ValueNone, ValueNone)
             )
 
-[<Extension>]
 type ExperimentalAcrylicMaterialModifiers =
 
     /// <summary>Sets the TintColor property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Controls/GridSplitter.fs b/src/Fabulous.Avalonia/Views/Controls/GridSplitter.fs
index 08b1d83ac..bac7c665d 100644
--- a/src/Fabulous.Avalonia/Views/Controls/GridSplitter.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/GridSplitter.fs
@@ -40,7 +40,6 @@ module GridSplitterBuilders =
         static member GridSplitter(resizeDirection: GridResizeDirection) =
             WidgetBuilder<'msg, IFabGridSplitter>(GridSplitter.WidgetKey, GridSplitter.ResizeDirection.WithValue(resizeDirection))
 
-[<Extension>]
 type GridSplitterModifiers =
     /// <summary>Sets the ResizeBehavior property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/HeaderedContentControl.fs b/src/Fabulous.Avalonia/Views/Controls/HeaderedContentControl.fs
index ae1dd1373..fa3a8a07b 100644
--- a/src/Fabulous.Avalonia/Views/Controls/HeaderedContentControl.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/HeaderedContentControl.fs
@@ -59,7 +59,6 @@ module HeaderedContentControlBuilders =
                 ContentControl.ContentString.WithValue(content)
             )
 
-[<Extension>]
 type HeaderedContentControlModifiers =
 
     /// <summary>Link a ViewRef to access the direct HeaderedContentControl control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Label.fs b/src/Fabulous.Avalonia/Views/Controls/Label.fs
index 9d4909d2e..3b884fcc2 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Label.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Label.fs
@@ -32,7 +32,6 @@ module LabelBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type LabelModifiers =
     /// <summary>Sets the Target property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/LayoutTransformControl.fs b/src/Fabulous.Avalonia/Views/Controls/LayoutTransformControl.fs
index 806c4ffdd..a9a9aa972 100644
--- a/src/Fabulous.Avalonia/Views/Controls/LayoutTransformControl.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/LayoutTransformControl.fs
@@ -33,7 +33,6 @@ module LayoutTransformControlBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| Decorator.ChildWidget.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type LayoutTransformControlModifiers =
     /// <summary>Sets the LayoutTransform property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/MaskedTextBox.fs b/src/Fabulous.Avalonia/Views/Controls/MaskedTextBox.fs
index c4e502815..69f31fc23 100644
--- a/src/Fabulous.Avalonia/Views/Controls/MaskedTextBox.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/MaskedTextBox.fs
@@ -52,7 +52,6 @@ module MaskedTextBoxBuilders =
                 MaskedTextBox.TextChanged.WithValue(ValueEventData.create text fn)
             )
 
-[<Extension>]
 type MaskedTextBoxModifiers =
     /// <summary>Sets the AsciiOnly property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Notifications/NotificationCard.fs b/src/Fabulous.Avalonia/Views/Controls/Notifications/NotificationCard.fs
index b494442d4..fa104e0f0 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Notifications/NotificationCard.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Notifications/NotificationCard.fs
@@ -51,7 +51,6 @@ module NotificationCardBuilders =
                 ContentControl.ContentString.WithValue(content)
             )
 
-[<Extension>]
 type NotificationCardModifiers =
 
     /// <summary>Sets the NotificationType property.</summary>
@@ -75,7 +74,6 @@ type NotificationCardModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabNotificationCard>, value: ViewRef<NotificationCard>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type NotificationCardAttachedModifiers =
 
     /// <summary>Sets the CloseOnClick property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Notifications/WindowNotificationManager.fs b/src/Fabulous.Avalonia/Views/Controls/Notifications/WindowNotificationManager.fs
index 432407023..6b42f6a57 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Notifications/WindowNotificationManager.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Notifications/WindowNotificationManager.fs
@@ -30,7 +30,6 @@ module WindowNotificationManagerBuilders =
             )
 
 
-[<Extension>]
 type WindowNotificationManagerModifiers =
     /// <summary>Sets the MaxItems property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/NumericUpDown.fs b/src/Fabulous.Avalonia/Views/Controls/NumericUpDown.fs
index e96144f86..d888fcb4e 100644
--- a/src/Fabulous.Avalonia/Views/Controls/NumericUpDown.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/NumericUpDown.fs
@@ -127,7 +127,6 @@ module NumericUpDownBuilders =
                 )
             )
 
-[<Extension>]
 type NumericUpDownModifiers =
 
     /// <summary>Sets the AllowSpin property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Primitives/AccessText.fs b/src/Fabulous.Avalonia/Views/Controls/Primitives/AccessText.fs
index f53ab798c..f2503fb41 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Primitives/AccessText.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Primitives/AccessText.fs
@@ -23,7 +23,6 @@ module AccessTextBuilders =
         static member inline AccessText(text: string, showAccessKey: bool) =
             WidgetBuilder<'msg, IFabAccessText>(AccessText.WidgetKey, TextBlock.Text.WithValue(text), AccessText.ShowAccessKey.WithValue(showAccessKey))
 
-[<Extension>]
 type AccessTextModifiers =
     /// <summary>Link a ViewRef to access the direct AccessText control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Primitives/Popup.fs b/src/Fabulous.Avalonia/Views/Controls/Primitives/Popup.fs
index 7e194cf76..495b0e67f 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Primitives/Popup.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Primitives/Popup.fs
@@ -79,7 +79,6 @@ module PopupBuilders =
                 AttributesBundle(StackList.one(Popup.IsOpen.WithValue(isOpen)), ValueSome [| Popup.Child.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type PopupModifiers =
     /// <summary>Sets the WindowManagerAddShadowHint property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Primitives/ScrollBar.fs b/src/Fabulous.Avalonia/Views/Controls/Primitives/ScrollBar.fs
index 63f71256c..0b4e6959f 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Primitives/ScrollBar.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Primitives/ScrollBar.fs
@@ -49,7 +49,6 @@ module ScrollBarBuilders =
                 RangeBase.ValueChanged.WithValue(ValueEventData.create value fn)
             )
 
-[<Extension>]
 type ScrollBarModifiers =
 
     /// <summary>Sets the ViewportSize property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Primitives/_RangeBase.fs b/src/Fabulous.Avalonia/Views/Controls/Primitives/_RangeBase.fs
index 3f6d01a53..6138b651e 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Primitives/_RangeBase.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Primitives/_RangeBase.fs
@@ -45,7 +45,6 @@ module RangeBase =
     let ValueChanged =
         Attributes.defineAvaloniaPropertyWithChangedEvent' "RangeBase_ValueChanged" RangeBase.ValueProperty
 
-[<Extension>]
 type RangeBaserModifiers =
     /// <summary>Sets the SmallChange property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/ProgressBar.fs b/src/Fabulous.Avalonia/Views/Controls/ProgressBar.fs
index b4bbf95c9..2ddcabac9 100644
--- a/src/Fabulous.Avalonia/Views/Controls/ProgressBar.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/ProgressBar.fs
@@ -43,7 +43,6 @@ module ProgressBarBuilders =
                 RangeBase.ValueChanged.WithValue(ValueEventData.create value fn)
             )
 
-[<Extension>]
 type ProgressBarModifiers =
     /// <summary>Sets the IsIndeterminate property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/RefreshContainer.fs b/src/Fabulous.Avalonia/Views/Controls/RefreshContainer.fs
index 4113916f1..91b91174b 100644
--- a/src/Fabulous.Avalonia/Views/Controls/RefreshContainer.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/RefreshContainer.fs
@@ -34,7 +34,6 @@ module RefreshContainerBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type RefreshContainerModifiers =
     /// <summary>Sets the PullDirection property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/RefreshVisualizer.fs b/src/Fabulous.Avalonia/Views/Controls/RefreshVisualizer.fs
index 2bcb7fadd..ca3dae765 100644
--- a/src/Fabulous.Avalonia/Views/Controls/RefreshVisualizer.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/RefreshVisualizer.fs
@@ -31,7 +31,6 @@ module RefreshVisualizerBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type RefreshVisualizerModifiers =
     /// <summary>Sets the Orientation property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/SelectableTextBlock.fs b/src/Fabulous.Avalonia/Views/Controls/SelectableTextBlock.fs
index d19c2c10d..e3c13a099 100644
--- a/src/Fabulous.Avalonia/Views/Controls/SelectableTextBlock.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/SelectableTextBlock.fs
@@ -52,7 +52,6 @@ module SelectableTextBlockBuilders =
                 SelectableTextBlock.CopyingToClipboard.WithValue(fn)
             )
 
-[<Extension>]
 type SelectableTextBlockModifiers =
 
     /// <summary>Sets the SelectionStart property.</summary>
@@ -90,7 +89,6 @@ type SelectableTextBlockModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabSelectableTextBlock>, value: ViewRef<SelectableTextBlock>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type SelectableTextBlockExtraModifiers =
     /// <summary>Sets the SelectionBrush property.</summary>
     /// <param name="this">Current widget.</param>
@@ -106,7 +104,6 @@ type SelectableTextBlockExtraModifiers =
     static member inline selectionBrush(this: WidgetBuilder<'msg, #IFabSelectableTextBlock>, value: string) =
         SelectableTextBlockModifiers.selectionBrush(this, View.SolidColorBrush(value))
 
-[<Extension>]
 type SelectableTextBlockCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabInline>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Separator.fs b/src/Fabulous.Avalonia/Views/Controls/Separator.fs
index 139a75a23..90425cd74 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Separator.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Separator.fs
@@ -19,7 +19,6 @@ module SeparatorBuilders =
         static member Separator() =
             WidgetBuilder<'msg, IFabSeparator>(Separator.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
 
-[<Extension>]
 type SeparatorModifiers =
     /// <summary>Link a ViewRef to access the direct Separator control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Shapes/Arc.fs b/src/Fabulous.Avalonia/Views/Controls/Shapes/Arc.fs
index c951f478d..20b2bf16e 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Shapes/Arc.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Shapes/Arc.fs
@@ -26,7 +26,6 @@ module ArcBuilders =
         static member Arc(startAngle: float, sweepAngle: float) =
             WidgetBuilder<'msg, IFabArc>(Arc.WidgetKey, Arc.StartAngle.WithValue(startAngle), Arc.SweepAngle.WithValue(sweepAngle))
 
-[<Extension>]
 type ArcModifiers =
     /// <summary>Link a ViewRef to access the direct Arc control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Shapes/Ellipse.fs b/src/Fabulous.Avalonia/Views/Controls/Shapes/Ellipse.fs
index c8b4dce32..91ab5b4c9 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Shapes/Ellipse.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Shapes/Ellipse.fs
@@ -19,7 +19,6 @@ module EllipseBuilders =
         static member Ellipse() =
             WidgetBuilder<'msg, IFabEllipse>(Ellipse.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
 
-[<Extension>]
 type EllipseModifiers =
     /// <summary>Link a ViewRef to access the direct Ellipse control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Shapes/Line.fs b/src/Fabulous.Avalonia/Views/Controls/Shapes/Line.fs
index 70db52eda..781adac41 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Shapes/Line.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Shapes/Line.fs
@@ -26,7 +26,6 @@ module LineBuilders =
         static member Line(starPoint: Point, endPoint: Point) =
             WidgetBuilder<'msg, IFabLine>(Line.WidgetKey, Line.StartPoint.WithValue(starPoint), Line.EndPoint.WithValue(endPoint))
 
-[<Extension>]
 type LineModifiers =
     /// <summary>Link a ViewRef to access the direct Line control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Shapes/Path.fs b/src/Fabulous.Avalonia/Views/Controls/Shapes/Path.fs
index 31d607974..fdf59313b 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Shapes/Path.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Shapes/Path.fs
@@ -34,7 +34,6 @@ module PathBuilders =
         static member Path(data: string) =
             WidgetBuilder<'msg, IFabPath>(Path.WidgetKey, Path.DataString.WithValue(Geometry.Parse(data)))
 
-[<Extension>]
 type PathModifiers =
     /// <summary>Link a ViewRef to access the direct Path control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Shapes/Polygon.fs b/src/Fabulous.Avalonia/Views/Controls/Shapes/Polygon.fs
index 36eec09ea..db13d23c9 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Shapes/Polygon.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Shapes/Polygon.fs
@@ -32,7 +32,6 @@ module PolygonBuilders =
         static member Polygon(points: Point list) =
             WidgetBuilder<'msg, IFabPolygon>(Polygon.WidgetKey, Polygon.Points.WithValue(points))
 
-[<Extension>]
 type PolygonModifiers =
     /// <summary>Link a ViewRef to access the direct Polygon control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Shapes/Polyline.fs b/src/Fabulous.Avalonia/Views/Controls/Shapes/Polyline.fs
index ed2aff103..4576128af 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Shapes/Polyline.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Shapes/Polyline.fs
@@ -32,7 +32,6 @@ module PolylineBuilders =
         static member Polyline(points: Point list) =
             WidgetBuilder<'msg, IFabPolyline>(Polyline.WidgetKey, Polyline.Points.WithValue(points))
 
-[<Extension>]
 type PolylineModifiers =
     /// <summary>Link a ViewRef to access the direct Polyline control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Shapes/Rectangle.fs b/src/Fabulous.Avalonia/Views/Controls/Shapes/Rectangle.fs
index 3999c89b7..a9ff9e989 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Shapes/Rectangle.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Shapes/Rectangle.fs
@@ -31,7 +31,6 @@ module RectangleBuilders =
         static member Rectangle() =
             WidgetBuilder<'msg, IFabRectangle>(Rectangle.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
 
-[<Extension>]
 type RectangleModifiers =
     /// <summary>Link a ViewRef to access the direct Rectangle control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Shapes/Sector.fs b/src/Fabulous.Avalonia/Views/Controls/Shapes/Sector.fs
index c341bd2f8..6a21c2439 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Shapes/Sector.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Shapes/Sector.fs
@@ -26,7 +26,6 @@ module SectorBuilders =
         static member Sector(startAngle: float, sweepAngle: float) =
             WidgetBuilder<'msg, IFabSector>(Sector.WidgetKey, Sector.StartAngle.WithValue(startAngle), Sector.SweepAngle.WithValue(sweepAngle))
 
-[<Extension>]
 type SectorModifiers =
     /// <summary>Link a ViewRef to access the direct Sector control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Shapes/_Shape.fs b/src/Fabulous.Avalonia/Views/Controls/Shapes/_Shape.fs
index 5aa1c4811..2e59fb872 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Shapes/_Shape.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Shapes/_Shape.fs
@@ -46,7 +46,6 @@ module Shape =
     let StrokeJoin =
         Attributes.defineAvaloniaPropertyWithEquality Shape.StrokeJoinProperty
 
-[<Extension>]
 type ShapeModifiers =
     /// <summary>Sets the Fill property.</summary>
     /// <param name="this">Current widget.</param>
@@ -118,7 +117,6 @@ type ShapeModifiers =
     static member inline strokeJoin(this: WidgetBuilder<'msg, #IFabShape>, value: PenLineJoin) =
         this.AddScalar(Shape.StrokeJoin.WithValue(value))
 
-[<Extension>]
 type ShapeExtraModifiers =
     /// <summary>Sets the Fill property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Slider.fs b/src/Fabulous.Avalonia/Views/Controls/Slider.fs
index 5c5d10c32..8fbc90ef7 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Slider.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Slider.fs
@@ -62,7 +62,6 @@ module SliderBuilders =
                 RangeBase.ValueChanged.WithValue(ValueEventData.create value fn)
             )
 
-[<Extension>]
 type SliderModifiers =
     /// <summary>Sets the Orientation property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/TextBlock.fs b/src/Fabulous.Avalonia/Views/Controls/TextBlock.fs
index 3243c0bee..f5aa19cc0 100644
--- a/src/Fabulous.Avalonia/Views/Controls/TextBlock.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/TextBlock.fs
@@ -105,7 +105,6 @@ module TextBlockBuilders =
         static member inline TextBlock() =
             CollectionBuilder<'msg, IFabTextBlock, IFabInline>(TextBlock.WidgetKey, TextBlock.Inlines)
 
-[<Extension>]
 type TextBlockModifiers =
     /// <summary>Sets the Background property.</summary>
     /// <param name="this">Current widget.</param>
@@ -241,7 +240,6 @@ type TextBlockModifiers =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
 
-[<Extension>]
 type TextBlockExtraModifiers =
     /// <summary>Sets the TextAlignment property to center.</summary>
     /// <param name="this">Current widget.</param>
@@ -302,7 +300,6 @@ type TextBlockExtraModifiers =
     static member inline foreground(this: WidgetBuilder<'msg, #IFabTextBlock>, value: string) =
         TextBlockModifiers.foreground(this, View.SolidColorBrush(value))
 
-[<Extension>]
 type TextBlockCollectionBuilderExtensions =
 
     [<Extension>]
@@ -337,7 +334,6 @@ type TextBlockCollectionBuilderExtensions =
         ) : Content<'msg> =
         { Widgets = MutStackArray1.One(x.Compile()) }
 
-[<Extension>]
 type InlineCollectionModifiers =
     /// <summary>Sets the TextDecorations property.</summary>
     /// <param name="this">Current widget.</param>
@@ -352,7 +348,6 @@ type InlineCollectionModifiers =
     static member inline textDecoration(this: WidgetBuilder<'msg, #IFabInline>, value: WidgetBuilder<'msg, IFabTextDecoration>) =
         AttributeCollectionBuilder<'msg, 'marker, IFabTextDecoration>(this, Inline.TextDecorations) { value }
 
-[<Extension>]
 type TextBlockCollectionModifiers =
     /// <summary>Sets the TextDecorations property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/TextBox.fs b/src/Fabulous.Avalonia/Views/Controls/TextBox.fs
index 7571b51ed..b0dbfb66b 100644
--- a/src/Fabulous.Avalonia/Views/Controls/TextBox.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/TextBox.fs
@@ -121,7 +121,6 @@ module TextBoxBuilders =
         static member inline TextBox(text: string, fn: string -> 'msg) =
             WidgetBuilder<'msg, IFabTextBox>(TextBox.WidgetKey, TextBox.TextChanged.WithValue(ValueEventData.create text fn))
 
-[<Extension>]
 type TextBoxModifiers =
 
     /// <summary>Sets the TextAlignment property.</summary>
@@ -355,7 +354,6 @@ type TextBoxModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabTextBox>, value: ViewRef<TextBox>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type TextBoxExtraModifiers =
     /// <summary>Sets the TextAlignment to center.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/ThemeVariantScope.fs b/src/Fabulous.Avalonia/Views/Controls/ThemeVariantScope.fs
index 22f1aad50..9e7804783 100644
--- a/src/Fabulous.Avalonia/Views/Controls/ThemeVariantScope.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/ThemeVariantScope.fs
@@ -36,7 +36,6 @@ module ThemeVariantScopeBuilders =
                 )
             )
 
-[<Extension>]
 type ThemeVariantScopeModifiers =
 
     /// <summary>Listens the ThemeVariantScope ThemeVariantChanged event.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Controls/TickBar.fs b/src/Fabulous.Avalonia/Views/Controls/TickBar.fs
index 226359220..ccfb30136 100644
--- a/src/Fabulous.Avalonia/Views/Controls/TickBar.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/TickBar.fs
@@ -58,7 +58,6 @@ module TickBarBuilders =
         static member TickBar(min: float, max: float) =
             WidgetBuilder<'msg, IFabTickBar>(TickBar.WidgetKey, TickBar.Minimum.WithValue(min), TickBar.Maximum.WithValue(max))
 
-[<Extension>]
 type TickBarModifiers =
     /// <summary>Sets the Fill property.</summary>
     /// <param name="this">Current widget.</param>
@@ -123,7 +122,6 @@ type TickBarModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabTickBar>, value: ViewRef<TickBar>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type TickBarExtraModifiers =
     /// <summary>Sets the Fill property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/TimePicker.fs b/src/Fabulous.Avalonia/Views/Controls/TimePicker.fs
index 8c3063d7a..844405c03 100644
--- a/src/Fabulous.Avalonia/Views/Controls/TimePicker.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/TimePicker.fs
@@ -30,7 +30,6 @@ module TimePickerBuilders =
         static member inline TimePicker(time: TimeSpan, fn: TimeSpan -> 'msg) =
             WidgetBuilder<'msg, IFabTimePicker>(TimePicker.WidgetKey, TimePicker.SelectedTimeChanged.WithValue(ValueEventData.create time fn))
 
-[<Extension>]
 type TimePickerModifiers =
 
     /// <summary>Sets the ClockIdentifier property.</summary>
@@ -54,7 +53,6 @@ type TimePickerModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabTimePicker>, value: ViewRef<TimePicker>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type TimePickerExtraModifiers =
     /// <summary>Sets the ClockIdentifier property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/ToggleSwitch.fs b/src/Fabulous.Avalonia/Views/Controls/ToggleSwitch.fs
index 2ec3a54a0..9b70e9b8b 100644
--- a/src/Fabulous.Avalonia/Views/Controls/ToggleSwitch.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/ToggleSwitch.fs
@@ -59,7 +59,6 @@ module ToggleSwitchBuilders =
                 ToggleButton.ThreeStateCheckedChanged.WithValue(ValueEventData.createVOption (ThreeState.fromOption(isChecked)) (ThreeState.toOption >> fn))
             )
 
-[<Extension>]
 type ToggleSwitchModifiers =
     /// <summary>Sets the OffContent property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Tooltip.fs b/src/Fabulous.Avalonia/Views/Controls/Tooltip.fs
index 2e602359d..5cc57ae81 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Tooltip.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Tooltip.fs
@@ -42,7 +42,6 @@ module ToolTipBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type ToolTipModifiers =
     /// <summary>Sets the Tip property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/TransitioningContentControl.fs b/src/Fabulous.Avalonia/Views/Controls/TransitioningContentControl.fs
index f87b6d774..5d1f2e054 100644
--- a/src/Fabulous.Avalonia/Views/Controls/TransitioningContentControl.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/TransitioningContentControl.fs
@@ -29,7 +29,6 @@ module TransitioningContentControlBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type TransitioningContentControlModifiers =
     /// <summary>Link a ViewRef to access the direct TransitioningContentControl control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/UserControl.fs b/src/Fabulous.Avalonia/Views/Controls/UserControl.fs
index 6b397e501..254180318 100644
--- a/src/Fabulous.Avalonia/Views/Controls/UserControl.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/UserControl.fs
@@ -23,7 +23,6 @@ module UserControlBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type UserControlModifiers =
     /// <summary>Link a ViewRef to access the direct UserControl control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Viewbox.fs b/src/Fabulous.Avalonia/Views/Controls/Viewbox.fs
index 304a87899..c28a8da7a 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Viewbox.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Viewbox.fs
@@ -31,7 +31,6 @@ module ViewBoxBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| ViewBox.Child.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type ViewBoxModifiers =
     /// <summary>Sets the Stretch property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Controls/Window.fs b/src/Fabulous.Avalonia/Views/Controls/Window.fs
index abd11ecbd..9e7b2ea89 100644
--- a/src/Fabulous.Avalonia/Views/Controls/Window.fs
+++ b/src/Fabulous.Avalonia/Views/Controls/Window.fs
@@ -74,7 +74,6 @@ module WindowBuilders =
         static member inline Window<'msg, 'childMarker>() =
             SingleChildBuilder<'msg, IFabWindow, 'childMarker>(Window.WidgetKey, ContentControl.ContentWidget)
 
-[<Extension>]
 type WindowModifiers =
     /// <summary>Sets the SizeToContent property.</summary>
     /// <param name="this">Current widget.</param>
@@ -180,7 +179,6 @@ type WindowModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabWindow>, value: ViewRef<Window>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type WindowExtraModifiers =
     /// <summary>Sets the Icon property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Imaging/CroppedBitmap.fs b/src/Fabulous.Avalonia/Views/Imaging/CroppedBitmap.fs
index bce373464..dbfb5a3d6 100644
--- a/src/Fabulous.Avalonia/Views/Imaging/CroppedBitmap.fs
+++ b/src/Fabulous.Avalonia/Views/Imaging/CroppedBitmap.fs
@@ -64,7 +64,6 @@ module CroppedBitmapBuilders =
                 CroppedBitmap.SourceRect.WithValue(rect)
             )
 
-[<Extension>]
 type CroppedBitmapModifiers =
     /// <summary>Link a ViewRef to access the direct CroppedBitmap control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Imaging/Image.fs b/src/Fabulous.Avalonia/Views/Imaging/Image.fs
index 76f15b1ea..a7c32663f 100644
--- a/src/Fabulous.Avalonia/Views/Imaging/Image.fs
+++ b/src/Fabulous.Avalonia/Views/Imaging/Image.fs
@@ -114,7 +114,6 @@ module ImageBuilders =
                 AttributesBundle(StackList.one(Image.Stretch.WithValue(stretch)), ValueSome [| Image.SourceWidget.WithValue(source.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type ImageModifiers =
     /// <summary>Sets the StretchDirection property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Imaging/PathIcon.fs b/src/Fabulous.Avalonia/Views/Imaging/PathIcon.fs
index d9ada9ba7..f942313b4 100644
--- a/src/Fabulous.Avalonia/Views/Imaging/PathIcon.fs
+++ b/src/Fabulous.Avalonia/Views/Imaging/PathIcon.fs
@@ -33,7 +33,6 @@ module PathIconBuilders =
         static member PathIcon(path: string) =
             WidgetBuilder<'msg, IFabPathIcon>(PathIcon.WidgetKey, PathIcon.DataString.WithValue(Geometry.Parse(path)))
 
-[<Extension>]
 type PathIconModifiers =
     /// <summary>Link a ViewRef to access the direct PathIcon control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Imaging/TrayIcon.fs b/src/Fabulous.Avalonia/Views/Imaging/TrayIcon.fs
index 35f4c12d4..b7aaaf83b 100644
--- a/src/Fabulous.Avalonia/Views/Imaging/TrayIcon.fs
+++ b/src/Fabulous.Avalonia/Views/Imaging/TrayIcon.fs
@@ -74,7 +74,6 @@ module TrayIconBuilders =
                 TrayIcon.ToolTipText.WithValue(text)
             )
 
-[<Extension>]
 type TrayIconModifiers =
     /// <summary>Sets the Menu property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Layouts/ScrollViewer.fs b/src/Fabulous.Avalonia/Views/Layouts/ScrollViewer.fs
index e91d6a4fb..d74ee1a25 100644
--- a/src/Fabulous.Avalonia/Views/Layouts/ScrollViewer.fs
+++ b/src/Fabulous.Avalonia/Views/Layouts/ScrollViewer.fs
@@ -67,7 +67,6 @@ module ScrollViewerBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type ScrollViewerModifiers =
     /// <summary>Sets the Extent property.</summary>
     /// <param name="this">Current widget.</param>
@@ -167,7 +166,6 @@ type ScrollViewerModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabScrollViewer>, value: ViewRef<ScrollViewer>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type ScrollViewerAttachedModifiers =
     /// <summary>Sets the BringIntoViewOnFocusChange property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Layouts/SliptView.fs b/src/Fabulous.Avalonia/Views/Layouts/SliptView.fs
index 431429886..ad4c21e95 100644
--- a/src/Fabulous.Avalonia/Views/Layouts/SliptView.fs
+++ b/src/Fabulous.Avalonia/Views/Layouts/SliptView.fs
@@ -81,7 +81,6 @@ module SplitViewBuilders =
                 )
             )
 
-[<Extension>]
 type SplitViewModifiers =
     /// <summary>Sets the CompactPaneLength property.</summary>
     /// <param name="this">Current widget.</param>
@@ -196,7 +195,6 @@ type SplitViewModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabSplitView>, value: ViewRef<SplitView>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type SplitViewExtraModifiers =
     /// <summary>Sets the PaneBackground property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Brushes/ConicGradientBrush.fs b/src/Fabulous.Avalonia/Views/Media/Brushes/ConicGradientBrush.fs
index a93263ab8..05bd7da12 100644
--- a/src/Fabulous.Avalonia/Views/Media/Brushes/ConicGradientBrush.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Brushes/ConicGradientBrush.fs
@@ -84,7 +84,6 @@ module ConicGradientBrushBuilders =
                 ConicGradientBrush.Angle.WithValue(0.)
             )
 
-[<Extension>]
 type ConicGradientBrushModifiers =
     /// <summary>Link a ViewRef to access the direct ConicGradientBrush control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Brushes/DrawingBrush.fs b/src/Fabulous.Avalonia/Views/Media/Brushes/DrawingBrush.fs
index 5f9b84cfb..2a0ee05cc 100644
--- a/src/Fabulous.Avalonia/Views/Media/Brushes/DrawingBrush.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Brushes/DrawingBrush.fs
@@ -25,7 +25,6 @@ module DrawingBrushBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| DrawingBrush.Drawing.WithValue(source.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type DrawingBrushModifiers =
     /// <summary>Link a ViewRef to access the direct DrawingBrush control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Brushes/GradientStop.fs b/src/Fabulous.Avalonia/Views/Media/Brushes/GradientStop.fs
index 928a2ea4f..49934ef32 100644
--- a/src/Fabulous.Avalonia/Views/Media/Brushes/GradientStop.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Brushes/GradientStop.fs
@@ -37,7 +37,6 @@ module GradientStopBuilders =
                 GradientStop.Offset.WithValue(offset)
             )
 
-[<Extension>]
 type GradientStopBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabGradientStop>
@@ -55,7 +54,6 @@ type GradientStopBuilderExtensions =
         ) : Content<'msg> =
         { Widgets = MutStackArray1.One(x.Compile()) }
 
-[<Extension>]
 type GradientStopModifiers =
     /// <summary>Link a ViewRef to access the direct GradientStop control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Brushes/ImageBrush.fs b/src/Fabulous.Avalonia/Views/Media/Brushes/ImageBrush.fs
index dea31448d..0e8f2de92 100644
--- a/src/Fabulous.Avalonia/Views/Media/Brushes/ImageBrush.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Brushes/ImageBrush.fs
@@ -39,7 +39,6 @@ module ImageBrushBuilders =
         static member ImageBrush(source: Stream) =
             WidgetBuilder<'msg, IFabImageBrush>(ImageBrush.WidgetKey, ImageBrush.Source.WithValue(ImageSourceValue.Stream(source)))
 
-[<Extension>]
 type ImageBrushModifiers =
     /// <summary>Link a ViewRef to access the direct ImageBrush control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Brushes/LinearGradientBrush.fs b/src/Fabulous.Avalonia/Views/Media/Brushes/LinearGradientBrush.fs
index 6aec909d3..f86d79720 100644
--- a/src/Fabulous.Avalonia/Views/Media/Brushes/LinearGradientBrush.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Brushes/LinearGradientBrush.fs
@@ -92,7 +92,6 @@ module LinearGradientBrushBuilders =
                 LinearGradientBrush.EndPoint.WithValue(RelativePoint.BottomRight)
             )
 
-[<Extension>]
 type LinearGradientBrushModifiers =
     /// <summary>Link a ViewRef to access the direct LinearGradientBrush control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Brushes/RadialGradientBrush.fs b/src/Fabulous.Avalonia/Views/Media/Brushes/RadialGradientBrush.fs
index f4697b655..0d615c535 100644
--- a/src/Fabulous.Avalonia/Views/Media/Brushes/RadialGradientBrush.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Brushes/RadialGradientBrush.fs
@@ -77,7 +77,6 @@ module RadialGradientBrushBuilders =
                 RadialGradientBrush.GradientOrigin.WithValue(RelativePoint.Center)
             )
 
-[<Extension>]
 type RadialGradientBrushModifiers =
 
     /// <summary>Sets the Radius property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/Brushes/VisualBrush.fs b/src/Fabulous.Avalonia/Views/Media/Brushes/VisualBrush.fs
index d16ea93b5..e50fcc125 100644
--- a/src/Fabulous.Avalonia/Views/Media/Brushes/VisualBrush.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Brushes/VisualBrush.fs
@@ -26,7 +26,6 @@ module VisualBrushBuilders =
             )
 
 
-[<Extension>]
 type VisualBrushModifiers =
     /// <summary>Link a ViewRef to access the direct VisualBrush control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Brushes/_GradientBrush.fs b/src/Fabulous.Avalonia/Views/Media/Brushes/_GradientBrush.fs
index ac27ff863..ccb568f96 100644
--- a/src/Fabulous.Avalonia/Views/Media/Brushes/_GradientBrush.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Brushes/_GradientBrush.fs
@@ -15,7 +15,6 @@ module GradientBrush =
     let GradientStops =
         Attributes.defineAvaloniaListWidgetCollection "GradientBrush_GradientStops" (fun target -> (target :?> GradientBrush).GradientStops)
 
-[<Extension>]
 type GradientBrushModifiers =
 
     /// <summary>Sets the SpreadMethod property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/DashStyle.fs b/src/Fabulous.Avalonia/Views/Media/DashStyle.fs
index 27086a55f..e4054b11f 100644
--- a/src/Fabulous.Avalonia/Views/Media/DashStyle.fs
+++ b/src/Fabulous.Avalonia/Views/Media/DashStyle.fs
@@ -35,7 +35,6 @@ module DashStyleBuilders =
         static member DashStyle(dashes: float list, offset: float) =
             WidgetBuilder<'msg, IFaDashStyle>(DashStyle.WidgetKey, DashStyle.Dashes.WithValue(dashes), DashStyle.Offset.WithValue(offset))
 
-[<Extension>]
 type DashStyleModifiers =
 
     /// <summary>Link a ViewRef to access the direct DashStyle control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/Drawing/DrawingGroup.fs b/src/Fabulous.Avalonia/Views/Media/Drawing/DrawingGroup.fs
index 5a42045e8..7ecb933fb 100644
--- a/src/Fabulous.Avalonia/Views/Media/Drawing/DrawingGroup.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Drawing/DrawingGroup.fs
@@ -46,7 +46,6 @@ module DrawingGroupBuilders =
         static member DrawingGroup<'msg>(opacity: float) =
             CollectionBuilder<'msg, IFabDrawingGroup, IFabDrawing>(DrawingGroup.WidgetKey, DrawingGroup.Children, DrawingGroup.Opacity.WithValue(opacity))
 
-[<Extension>]
 type DrawingGroupModifiers =
 
     /// <summary>Sets the OpacityMask property.</summary>
@@ -91,7 +90,6 @@ type DrawingGroupModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabDrawingGroup>, value: ViewRef<DrawingGroup>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type DrawingGroupExtraModifiers =
     /// <summary>Sets the OpacityMask property.</summary>
     /// <param name="this">Current widget.</param>
@@ -107,7 +105,6 @@ type DrawingGroupExtraModifiers =
     static member inline opacityMask(this: WidgetBuilder<'msg, #IFabDrawingGroup>, value: string) =
         DrawingGroupModifiers.opacityMask(this, View.SolidColorBrush(value))
 
-[<Extension>]
 type DrawingGroupCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabDrawing>
diff --git a/src/Fabulous.Avalonia/Views/Media/Drawing/DrawingImage.fs b/src/Fabulous.Avalonia/Views/Media/Drawing/DrawingImage.fs
index ddae86134..5d5139be7 100644
--- a/src/Fabulous.Avalonia/Views/Media/Drawing/DrawingImage.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Drawing/DrawingImage.fs
@@ -28,7 +28,6 @@ module DrawingImageBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| DrawingImage.Drawing.WithValue(source.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type DrawingImageModifiers =
     /// <summary>Listens the DrawingImage Invalidated event.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Drawing/GeometryDrawing.fs b/src/Fabulous.Avalonia/Views/Media/Drawing/GeometryDrawing.fs
index 445270df6..ad6341834 100644
--- a/src/Fabulous.Avalonia/Views/Media/Drawing/GeometryDrawing.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Drawing/GeometryDrawing.fs
@@ -107,7 +107,6 @@ module GeometryDrawingBuilders =
                 )
             )
 
-[<Extension>]
 type GeometryDrawingModifiers =
 
     /// <summary>Sets the Pen property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/Drawing/GlyphRunDrawing.fs b/src/Fabulous.Avalonia/Views/Media/Drawing/GlyphRunDrawing.fs
index 1b4a398b9..46bd2e3a0 100644
--- a/src/Fabulous.Avalonia/Views/Media/Drawing/GlyphRunDrawing.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Drawing/GlyphRunDrawing.fs
@@ -60,7 +60,6 @@ module GlyphRunDrawingBuilders =
         static member GlyphRunDrawing(brush: string, glyphRun: GlyphRun) =
             View.GlyphRunDrawing(View.SolidColorBrush(brush), glyphRun)
 
-[<Extension>]
 type GlyphRunDrawingModifiers =
 
     /// <summary>Link a ViewRef to access the direct GlyphRunDrawing control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/Drawing/ImageDrawing.fs b/src/Fabulous.Avalonia/Views/Media/Drawing/ImageDrawing.fs
index c52f54f71..d668656fe 100644
--- a/src/Fabulous.Avalonia/Views/Media/Drawing/ImageDrawing.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Drawing/ImageDrawing.fs
@@ -80,7 +80,6 @@ module ImageDrawingBuilders =
                 )
             )
 
-[<Extension>]
 type ImageDrawingModifiers =
 
     /// <summary>Link a ViewRef to access the direct ImageDrawing control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/Effects/BlurEffect.fs b/src/Fabulous.Avalonia/Views/Media/Effects/BlurEffect.fs
index 73fdac99d..bcb21c4f7 100644
--- a/src/Fabulous.Avalonia/Views/Media/Effects/BlurEffect.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Effects/BlurEffect.fs
@@ -27,7 +27,6 @@ module BlurEffectBuilders =
         static member BlurEffect(radius: float) =
             WidgetBuilder<'msg, IFabBlurEffect>(BlurEffect.WidgetKey, BlurEffect.Radius.WithValue(radius))
 
-[<Extension>]
 type BlurEffectModifiers =
 
     /// <summary>Link a ViewRef to access the direct BlurEffect control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/Effects/DropShadowDirectionEffect.fs b/src/Fabulous.Avalonia/Views/Media/Effects/DropShadowDirectionEffect.fs
index 605d9fba5..c5fcce9a7 100644
--- a/src/Fabulous.Avalonia/Views/Media/Effects/DropShadowDirectionEffect.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Effects/DropShadowDirectionEffect.fs
@@ -35,7 +35,6 @@ module DropShadowDirectionEffectBuilders =
                 DropShadowDirectionEffect.Direction.WithValue(direction)
             )
 
-[<Extension>]
 type DropShadowDirectionEffectModifiers =
 
     /// <summary>Link a ViewRef to access the direct DropShadowDirectionEffect control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/Effects/DropShadowEffect.fs b/src/Fabulous.Avalonia/Views/Media/Effects/DropShadowEffect.fs
index eae7e7f09..de21e25f5 100644
--- a/src/Fabulous.Avalonia/Views/Media/Effects/DropShadowEffect.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Effects/DropShadowEffect.fs
@@ -35,7 +35,6 @@ module DropShadowEffectBuilders =
                 DropShadowEffect.OffsetY.WithValue(offsetY)
             )
 
-[<Extension>]
 type DropShadowEffectModifiers =
 
     /// <summary>Link a ViewRef to access the direct DropShadowEffect control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/Geometries/CombinedGeometry.fs b/src/Fabulous.Avalonia/Views/Media/Geometries/CombinedGeometry.fs
index 129b88e2d..b3ad14743 100644
--- a/src/Fabulous.Avalonia/Views/Media/Geometries/CombinedGeometry.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Geometries/CombinedGeometry.fs
@@ -40,7 +40,6 @@ module CombinedGeometryBuilders =
                 )
             )
 
-[<Extension>]
 type CombinedGeometryModifiers =
     /// <summary>Sets the GeometryCombineMode property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Geometries/EllipseGeometry.fs b/src/Fabulous.Avalonia/Views/Media/Geometries/EllipseGeometry.fs
index 0fca639a8..8ca4014f1 100644
--- a/src/Fabulous.Avalonia/Views/Media/Geometries/EllipseGeometry.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Geometries/EllipseGeometry.fs
@@ -37,7 +37,6 @@ module EllipseGeometryBuilders =
                 EllipseGeometry.RadiusY.WithValue(radiusY)
             )
 
-[<Extension>]
 type EllipseGeometryModifiers =
     /// <summary>Sets the Center property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Geometries/GeometryGroup.fs b/src/Fabulous.Avalonia/Views/Media/Geometries/GeometryGroup.fs
index 8621f3b63..1da07a7b3 100644
--- a/src/Fabulous.Avalonia/Views/Media/Geometries/GeometryGroup.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Geometries/GeometryGroup.fs
@@ -30,7 +30,6 @@ module GeometryGroupBuilders =
                 GeometryGroup.FillRule.WithValue(fillRule)
             )
 
-[<Extension>]
 type GeometryGroupCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabGeometry>
@@ -48,7 +47,6 @@ type GeometryGroupCollectionBuilderExtensions =
         ) : Content<'msg> =
         { Widgets = MutStackArray1.One(x.Compile()) }
 
-[<Extension>]
 type GeometryGroupModifiers =
 
     /// <summary>Link a ViewRef to access the direct GeometryGroup control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/Geometries/LineGeometry.fs b/src/Fabulous.Avalonia/Views/Media/Geometries/LineGeometry.fs
index 5645b63f1..8682b8878 100644
--- a/src/Fabulous.Avalonia/Views/Media/Geometries/LineGeometry.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Geometries/LineGeometry.fs
@@ -31,7 +31,6 @@ module LineGeometryBuilders =
                 LineGeometry.EndPoint.WithValue(endPoint)
             )
 
-[<Extension>]
 type LineGeometryModifiers =
 
     /// <summary>Link a ViewRef to access the direct LineGeometry control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/Geometries/PathGeometry.fs b/src/Fabulous.Avalonia/Views/Media/Geometries/PathGeometry.fs
index e9e5a28f3..1f8989473 100644
--- a/src/Fabulous.Avalonia/Views/Media/Geometries/PathGeometry.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Geometries/PathGeometry.fs
@@ -44,7 +44,6 @@ module PathGeometryBuilders =
                 PathGeometry.FillRule.WithValue(fillRule)
             )
 
-[<Extension>]
 type PathGeometryBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabPathFigure>
@@ -62,7 +61,6 @@ type PathGeometryBuilderExtensions =
         ) : Content<'msg> =
         { Widgets = MutStackArray1.One(x.Compile()) }
 
-[<Extension>]
 type PathGeometryModifiers =
 
     /// <summary>Link a ViewRef to access the direct PathGeometry control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/Geometries/PolylineGeometry.fs b/src/Fabulous.Avalonia/Views/Media/Geometries/PolylineGeometry.fs
index 94680f324..20daac464 100644
--- a/src/Fabulous.Avalonia/Views/Media/Geometries/PolylineGeometry.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Geometries/PolylineGeometry.fs
@@ -31,7 +31,6 @@ module PolylineGeometryBuilders =
                 PolylineGeometry.IsFilled.WithValue(isFilled)
             )
 
-[<Extension>]
 type PolylineGeometryModifiers =
 
     /// <summary>Link a ViewRef to access the direct PolylineGeometry control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/Geometries/RectangleGeometry.fs b/src/Fabulous.Avalonia/Views/Media/Geometries/RectangleGeometry.fs
index 87641096c..7b8eefed4 100644
--- a/src/Fabulous.Avalonia/Views/Media/Geometries/RectangleGeometry.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Geometries/RectangleGeometry.fs
@@ -23,7 +23,6 @@ module RectangleGeometryBuilders =
         static member RectangleGeometry(rect: Rect) =
             WidgetBuilder<'msg, IFabRectangleGeometry>(RectangleGeometry.WidgetKey, RectangleGeometry.Rect.WithValue(rect))
 
-[<Extension>]
 type RectangleGeometryModifiers =
 
     /// <summary>Link a ViewRef to access the direct RectangleGeometry control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/PathSegments/ArcSegment.fs b/src/Fabulous.Avalonia/Views/Media/PathSegments/ArcSegment.fs
index c957ace70..f5f5e3aeb 100644
--- a/src/Fabulous.Avalonia/Views/Media/PathSegments/ArcSegment.fs
+++ b/src/Fabulous.Avalonia/Views/Media/PathSegments/ArcSegment.fs
@@ -35,7 +35,6 @@ module ArcSegmentBuilders =
         static member inline ArcSegment(point: Point, size: Size) =
             WidgetBuilder<'msg, IFabArcSegment>(ArcSegment.WidgetKey, ArcSegment.Point.WithValue(point), ArcSegment.Size.WithValue(size))
 
-[<Extension>]
 type ArcSegmentModifiers =
 
     /// <summary>Sets the RotationAngle property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/PathSegments/BezierSegment.fs b/src/Fabulous.Avalonia/Views/Media/PathSegments/BezierSegment.fs
index 9b59b7a60..5e9078209 100644
--- a/src/Fabulous.Avalonia/Views/Media/PathSegments/BezierSegment.fs
+++ b/src/Fabulous.Avalonia/Views/Media/PathSegments/BezierSegment.fs
@@ -36,7 +36,6 @@ module BezierSegmentBuilders =
                 BezierSegment.Point3.WithValue(point3)
             )
 
-[<Extension>]
 type BezierSegmentModifiers =
 
     /// <summary>Link a ViewRef to access the direct BezierSegment control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/PathSegments/LineSegment.fs b/src/Fabulous.Avalonia/Views/Media/PathSegments/LineSegment.fs
index b16990ca2..d27c75020 100644
--- a/src/Fabulous.Avalonia/Views/Media/PathSegments/LineSegment.fs
+++ b/src/Fabulous.Avalonia/Views/Media/PathSegments/LineSegment.fs
@@ -23,7 +23,6 @@ module LineSegmentBuilders =
         static member inline LineSegment(point: Point) =
             WidgetBuilder<'msg, IFabLineSegment>(LineSegment.WidgetKey, LineSegment.Point.WithValue(point))
 
-[<Extension>]
 type LineSegmentModifiers =
 
     /// <summary>Link a ViewRef to access the direct LineSegment control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/PathSegments/PathFigure.fs b/src/Fabulous.Avalonia/Views/Media/PathSegments/PathFigure.fs
index dd368c340..4be774f21 100644
--- a/src/Fabulous.Avalonia/Views/Media/PathSegments/PathFigure.fs
+++ b/src/Fabulous.Avalonia/Views/Media/PathSegments/PathFigure.fs
@@ -33,7 +33,6 @@ module PathFigureBuilders =
         static member PathFigure(startPoint: Point) =
             CollectionBuilder<'msg, IFabPathFigure, IFabPathSegment>(PathFigure.WidgetKey, PathFigure.Segments, PathFigure.StartPoint.WithValue(startPoint))
 
-[<Extension>]
 type PathFigureModifiers =
 
     /// <summary>Sets the IsClosed property.</summary>
@@ -57,7 +56,6 @@ type PathFigureModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabPathFigure>, value: ViewRef<PathFigure>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type PathFigureBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabPathSegment>
diff --git a/src/Fabulous.Avalonia/Views/Media/PathSegments/PolyLineSegment.fs b/src/Fabulous.Avalonia/Views/Media/PathSegments/PolyLineSegment.fs
index 52132f5f0..25355e819 100644
--- a/src/Fabulous.Avalonia/Views/Media/PathSegments/PolyLineSegment.fs
+++ b/src/Fabulous.Avalonia/Views/Media/PathSegments/PolyLineSegment.fs
@@ -24,7 +24,6 @@ module PolyLineSegmentBuilders =
         static member inline PolyLineSegment(points: Point list) =
             WidgetBuilder<'msg, IFabPolyLineSegment>(PolyLineSegment.WidgetKey, PolyLineSegment.Points.WithValue(points |> Array.ofList))
 
-[<Extension>]
 type PolyLineSegmentModifiers =
 
     /// <summary>Link a ViewRef to access the direct PolyLineSegment control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/PathSegments/QuadraticBezierSegment.fs b/src/Fabulous.Avalonia/Views/Media/PathSegments/QuadraticBezierSegment.fs
index 57070f0c3..9e0df7e75 100644
--- a/src/Fabulous.Avalonia/Views/Media/PathSegments/QuadraticBezierSegment.fs
+++ b/src/Fabulous.Avalonia/Views/Media/PathSegments/QuadraticBezierSegment.fs
@@ -32,7 +32,6 @@ module QuadraticBezierSegmentBuilders =
                 QuadraticBezierSegment.Point2.WithValue(point2)
             )
 
-[<Extension>]
 type QuadraticBezierSegmentModifiers =
 
     /// <summary>Link a ViewRef to access the direct QuadraticBezierSegment control instance.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Media/Pen.fs b/src/Fabulous.Avalonia/Views/Media/Pen.fs
index dfa1a4303..3d6515d44 100644
--- a/src/Fabulous.Avalonia/Views/Media/Pen.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Pen.fs
@@ -58,7 +58,6 @@ module PenBuilders =
         static member Pen(brush: string, thickness: float) =
             View.Pen(View.SolidColorBrush(brush), thickness)
 
-[<Extension>]
 type PenModifiers =
     /// <summary>Sets the DashStyle property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Transforms/MatrixTransform.fs b/src/Fabulous.Avalonia/Views/Media/Transforms/MatrixTransform.fs
index dd6aba5f8..e9cdc00c5 100644
--- a/src/Fabulous.Avalonia/Views/Media/Transforms/MatrixTransform.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Transforms/MatrixTransform.fs
@@ -24,7 +24,6 @@ module MatrixTransformBuilders =
         static member MatrixTransform(matrix: Matrix) =
             WidgetBuilder<'msg, IFabMatrixTransform>(MatrixTransform.WidgetKey, MatrixTransform.Matrix.WithValue(matrix))
 
-[<Extension>]
 type MatrixTransformModifiers =
     /// <summary>Link a ViewRef to access the direct MatrixTransform control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Transforms/Rotate3DTransform.fs b/src/Fabulous.Avalonia/Views/Media/Transforms/Rotate3DTransform.fs
index 340c33df8..0263fa7e7 100644
--- a/src/Fabulous.Avalonia/Views/Media/Transforms/Rotate3DTransform.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Transforms/Rotate3DTransform.fs
@@ -65,7 +65,6 @@ module Rotate3DTransformBuilders =
                 Rotate3DTransform.Depth.WithValue(depth)
             )
 
-[<Extension>]
 type Rotate3DTransformModifiers =
     /// <summary>Link a ViewRef to access the direct Rotate3DTransform control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Transforms/RotateTransform.fs b/src/Fabulous.Avalonia/Views/Media/Transforms/RotateTransform.fs
index d0ee75adf..987f25ff3 100644
--- a/src/Fabulous.Avalonia/Views/Media/Transforms/RotateTransform.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Transforms/RotateTransform.fs
@@ -46,7 +46,6 @@ module RotateTransformBuilders =
         static member RotateTransform() =
             WidgetBuilder<'msg, IFabRotateTransform>(RotateTransform.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
 
-[<Extension>]
 type RotateTransformTransformModifiers =
     /// <summary>Link a ViewRef to access the direct RotateTransform control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Transforms/ScaleTransform.fs b/src/Fabulous.Avalonia/Views/Media/Transforms/ScaleTransform.fs
index af68a8b3b..c4b3aa47f 100644
--- a/src/Fabulous.Avalonia/Views/Media/Transforms/ScaleTransform.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Transforms/ScaleTransform.fs
@@ -37,7 +37,6 @@ module ScaleTransformBuilders =
         static member ScaleTransform() =
             WidgetBuilder<'msg, IFabScaleTransform>(ScaleTransform.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
 
-[<Extension>]
 type ScaleTransformModifiers =
     /// <summary>Link a ViewRef to access the direct ScaleTransform control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Transforms/SkewTransform.fs b/src/Fabulous.Avalonia/Views/Media/Transforms/SkewTransform.fs
index a698f5761..b390dfc2f 100644
--- a/src/Fabulous.Avalonia/Views/Media/Transforms/SkewTransform.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Transforms/SkewTransform.fs
@@ -37,7 +37,6 @@ module SkewTransformBuilders =
         static member SkewTransform() =
             WidgetBuilder<'msg, IFabSkewTransform>(SkewTransform.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
 
-[<Extension>]
 type SkewTransformTransformModifiers =
     /// <summary>Link a ViewRef to access the direct SkewTransform control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Transforms/TransformGroup.fs b/src/Fabulous.Avalonia/Views/Media/Transforms/TransformGroup.fs
index 262fdfc9b..5f637f432 100644
--- a/src/Fabulous.Avalonia/Views/Media/Transforms/TransformGroup.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Transforms/TransformGroup.fs
@@ -23,7 +23,6 @@ module TransformGroupBuilders =
         static member TransformGroup() =
             CollectionBuilder<'msg, IFabTransformGroup, IFabTransform>(TransformGroup.WidgetKey, TransformGroup.Children)
 
-[<Extension>]
 type TransformGroupCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabTransform>
@@ -41,7 +40,6 @@ type TransformGroupCollectionBuilderExtensions =
         ) : Content<'msg> =
         { Widgets = MutStackArray1.One(x.Compile()) }
 
-[<Extension>]
 type TransformGroupModifiers =
     /// <summary>Link a ViewRef to access the direct TransformGroup control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/Transforms/TranslateTransform.fs b/src/Fabulous.Avalonia/Views/Media/Transforms/TranslateTransform.fs
index b3ae8ba33..70c738fa0 100644
--- a/src/Fabulous.Avalonia/Views/Media/Transforms/TranslateTransform.fs
+++ b/src/Fabulous.Avalonia/Views/Media/Transforms/TranslateTransform.fs
@@ -35,7 +35,6 @@ module TranslateTransformBuilders =
         static member TranslateTransform() =
             WidgetBuilder<'msg, IFabTranslateTransform>(TranslateTransform.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
 
-[<Extension>]
 type TranslateTransformModifiers =
     /// <summary>Link a ViewRef to access the direct TranslateTransform control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/_DropShadowEffectBase.fs b/src/Fabulous.Avalonia/Views/Media/_DropShadowEffectBase.fs
index 5ab826918..bdba99a56 100644
--- a/src/Fabulous.Avalonia/Views/Media/_DropShadowEffectBase.fs
+++ b/src/Fabulous.Avalonia/Views/Media/_DropShadowEffectBase.fs
@@ -17,7 +17,6 @@ module DropShadowEffectBase =
     let Opacity =
         Attributes.defineAvaloniaPropertyWithEquality DropShadowEffectBase.OpacityProperty
 
-[<Extension>]
 type DropShadowEffectBaseModifiers =
     /// <summary>Sets the BlurRadius property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/_Effect.fs b/src/Fabulous.Avalonia/Views/Media/_Effect.fs
index e7623fd1f..502820996 100644
--- a/src/Fabulous.Avalonia/Views/Media/_Effect.fs
+++ b/src/Fabulous.Avalonia/Views/Media/_Effect.fs
@@ -11,7 +11,6 @@ module Effect =
     let Invalidated =
         Attributes.defineEventNoArg "Effect_Invalidated" (fun target -> (target :?> Effect).Invalidated)
 
-[<Extension>]
 type EffectModifiers =
     /// <summary>Listens the Effect Invalidated event.</summary>
     /// <param name="this">Current widget.</param>
@@ -20,7 +19,6 @@ type EffectModifiers =
     static member inline onInvalidated(this: WidgetBuilder<'msg, #IFabEffect>, msg: 'msg) =
         this.AddScalar(Effect.Invalidated.WithValue(MsgValue msg))
 
-[<Extension>]
 type AttachedEffectModifiers =
     /// <summary>Sets the Effect property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/_IGeometry.fs b/src/Fabulous.Avalonia/Views/Media/_IGeometry.fs
index f9c6f3158..152c2720f 100644
--- a/src/Fabulous.Avalonia/Views/Media/_IGeometry.fs
+++ b/src/Fabulous.Avalonia/Views/Media/_IGeometry.fs
@@ -14,7 +14,6 @@ module Geometry =
     let Changed =
         Attributes.defineEventNoArg "Geometry_Changed" (fun target -> (target :?> Geometry).Changed)
 
-[<Extension>]
 type GeometryModifiers =
     /// <summary>Sets the Transform property.</summary>
     /// <param name="this">Current widget.</param>
@@ -30,7 +29,6 @@ type GeometryModifiers =
     static member inline onChanged(this: WidgetBuilder<'msg, #IFabGeometry>, msg: 'msg) =
         this.AddScalar(Geometry.Changed.WithValue(MsgValue msg))
 
-[<Extension>]
 type GeometryAttachedModifiers =
     /// <summary>Sets the Clip property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Media/_TileBrush.fs b/src/Fabulous.Avalonia/Views/Media/_TileBrush.fs
index f96321741..88f659a9c 100644
--- a/src/Fabulous.Avalonia/Views/Media/_TileBrush.fs
+++ b/src/Fabulous.Avalonia/Views/Media/_TileBrush.fs
@@ -27,7 +27,6 @@ module TileBrush =
     let TileMode =
         Attributes.defineAvaloniaPropertyWithEquality TileBrush.TileModeProperty
 
-[<Extension>]
 type TileBrushModifiers =
 
     /// <summary>Sets the AlignmentX property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Menu/ComboBox.fs b/src/Fabulous.Avalonia/Views/Menu/ComboBox.fs
index 64aecc3c4..9df688582 100644
--- a/src/Fabulous.Avalonia/Views/Menu/ComboBox.fs
+++ b/src/Fabulous.Avalonia/Views/Menu/ComboBox.fs
@@ -51,7 +51,6 @@ module ComboBoxBuilders =
         static member ComboBox() =
             CollectionBuilder<'msg, IFabComboBox, IFabComboBoxItem>(ComboBox.WidgetKey, ItemsControl.Items)
 
-[<Extension>]
 type ComboBoxModifiers =
     /// <summary>Sets the IsDropDownOpen property.</summary>
     /// <param name="this">Current widget.</param>
@@ -117,7 +116,6 @@ type ComboBoxModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabComboBox>, value: ViewRef<ComboBox>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type ComboBoxExtraModifier =
     /// <summary>Sets the PlaceholderForeground property.</summary>
     /// <param name="this">Current widget.</param>
@@ -133,7 +131,6 @@ type ComboBoxExtraModifier =
     static member inline placeholderForeground(this: WidgetBuilder<'msg, #IFabComboBox>, value: string) =
         ComboBoxModifiers.placeholderForeground(this, View.SolidColorBrush(value))
 
-[<Extension>]
 type ComboBoxCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabComboBoxItem>
diff --git a/src/Fabulous.Avalonia/Views/Menu/ContextMenu.fs b/src/Fabulous.Avalonia/Views/Menu/ContextMenu.fs
index b93ab3897..e71d415fb 100644
--- a/src/Fabulous.Avalonia/Views/Menu/ContextMenu.fs
+++ b/src/Fabulous.Avalonia/Views/Menu/ContextMenu.fs
@@ -64,7 +64,6 @@ module ContextMenuBuilders =
                 ContextMenu.Placement.WithValue(PlacementMode.Bottom)
             )
 
-[<Extension>]
 type ContextMenuModifiers =
     /// <summary>Sets the HorizontalOffset property.</summary>
     /// <param name="this">Current widget.</param>
@@ -145,7 +144,6 @@ type ContextMenuModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabContextMenu>, value: ViewRef<ContextMenu>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type ContextMenuAttachedModifiers =
     /// <summary>Sets the ContextMenu property.</summary>
     /// <param name="this">Current widget.</param>
@@ -154,7 +152,6 @@ type ContextMenuAttachedModifiers =
     static member inline contextMenu(this: WidgetBuilder<'msg, #IFabControl>, value: WidgetBuilder<'msg, IFabContextMenu>) =
         this.AddWidget(Control.ContextMenu.WithValue(value.Compile()))
 
-[<Extension>]
 type ContextMenuCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabControl>
diff --git a/src/Fabulous.Avalonia/Views/Menu/Flyout.fs b/src/Fabulous.Avalonia/Views/Menu/Flyout.fs
index f1f2e4df4..3c6dc037f 100644
--- a/src/Fabulous.Avalonia/Views/Menu/Flyout.fs
+++ b/src/Fabulous.Avalonia/Views/Menu/Flyout.fs
@@ -26,7 +26,6 @@ module FlyoutBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| Flyout.Content.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type FlyoutModifiers =
     /// <summary>Link a ViewRef to access the direct Flyout control instance.</summary>
     /// <param name="this">Current widget.</param>
@@ -35,7 +34,6 @@ type FlyoutModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabFlyout>, value: ViewRef<Flyout>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type FlyoutAttachedModifiers =
     /// <summary>Sets the AttachedFlyout property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Menu/Menu.fs b/src/Fabulous.Avalonia/Views/Menu/Menu.fs
index 78a3cac09..953fe2601 100644
--- a/src/Fabulous.Avalonia/Views/Menu/Menu.fs
+++ b/src/Fabulous.Avalonia/Views/Menu/Menu.fs
@@ -19,7 +19,6 @@ module MenuBuilders =
         static member inline Menu() =
             CollectionBuilder<'msg, IFabMenu, IFabMenuItem>(Menu.WidgetKey, ItemsControl.Items)
 
-[<Extension>]
 type MenuModifiers =
     /// <summary>Link a ViewRef to access the direct Menu control instance.</summary>
     /// <param name="this">Current widget.</param>
@@ -28,7 +27,6 @@ type MenuModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabMenu>, value: ViewRef<Menu>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type MenuCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabMenuItem>
diff --git a/src/Fabulous.Avalonia/Views/Menu/MenuFlyout.fs b/src/Fabulous.Avalonia/Views/Menu/MenuFlyout.fs
index 57e70c356..30d32d6ab 100644
--- a/src/Fabulous.Avalonia/Views/Menu/MenuFlyout.fs
+++ b/src/Fabulous.Avalonia/Views/Menu/MenuFlyout.fs
@@ -30,7 +30,6 @@ module MenuFlyoutBuilders =
         static member inline MenuFlyout() =
             CollectionBuilder<'msg, IFabMenuFlyout, IFabControl>(MenuFlyout.WidgetKey, MenuFlyout.Items)
 
-[<Extension>]
 type MenuFlyoutModifiers =
     /// <summary>Link a ViewRef to access the direct MenuFlyout control instance.</summary>
     /// <param name="this">Current widget.</param>
@@ -39,7 +38,6 @@ type MenuFlyoutModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabMenuFlyout>, value: ViewRef<MenuFlyout>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type MenuFlyoutCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabControl>
diff --git a/src/Fabulous.Avalonia/Views/Menu/NativeMenu.fs b/src/Fabulous.Avalonia/Views/Menu/NativeMenu.fs
index 1e6125137..4621c667d 100644
--- a/src/Fabulous.Avalonia/Views/Menu/NativeMenu.fs
+++ b/src/Fabulous.Avalonia/Views/Menu/NativeMenu.fs
@@ -37,7 +37,6 @@ module NativeMenuBuilders =
         static member inline NativeMenu() =
             CollectionBuilder<'msg, IFabNativeMenu, IFabNativeMenuItem>(NativeMenu.WidgetKey, NativeMenu.Items)
 
-[<Extension>]
 type NativeMenuModifiers =
     /// <summary>Listens to the NativeMenu Opening event.</summary>
     /// <param name="this">Current widget.</param>
@@ -67,7 +66,6 @@ type NativeMenuModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabNativeMenu>, value: ViewRef<NativeMenu>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type NativeMenuAttachedModifiers =
     /// <summary>Sets the IsNativeMenuExported property.</summary>
     /// <param name="this">Current widget.</param>
@@ -83,7 +81,6 @@ type NativeMenuAttachedModifiers =
     static member inline menu(this: WidgetBuilder<'msg, #IFabNativeMenuItem>, value: WidgetBuilder<'msg, #IFabNativeMenu>) =
         this.AddWidget(NativeMenuItem.Menu.WithValue(value.Compile()))
 
-[<Extension>]
 type WindowMenuAttachedModifiers =
     /// <summary>Sets the NativeMenu property.</summary>
     /// <param name="this">Current widget.</param>
@@ -92,7 +89,6 @@ type WindowMenuAttachedModifiers =
     static member inline menu(this: WidgetBuilder<'msg, #IFabWindow>, value: WidgetBuilder<'msg, #IFabNativeMenu>) =
         this.AddWidget(NativeMenuAttached.NativeMenu.WithValue(value.Compile()))
 
-[<Extension>]
 type NativeViewYieldExtensions =
     [<Extension>]
     static member inline Yield(_: CollectionBuilder<'msg, #IFabNativeMenu, IFabNativeMenuItem>, x: WidgetBuilder<'msg, #IFabNativeMenuItem>) : Content<'msg> =
diff --git a/src/Fabulous.Avalonia/Views/Menu/NativeMenuBar.fs b/src/Fabulous.Avalonia/Views/Menu/NativeMenuBar.fs
index 81ef2ec86..09a0821ed 100644
--- a/src/Fabulous.Avalonia/Views/Menu/NativeMenuBar.fs
+++ b/src/Fabulous.Avalonia/Views/Menu/NativeMenuBar.fs
@@ -23,7 +23,6 @@ module NativeMenuBarBuilders =
         static member inline NativeMenuBar() =
             WidgetBuilder<'msg, IFabNativeMenuBar>(NativeMenuBar.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
 
-[<Extension>]
 type NativeMenuBarAttachedModifiers =
 
     /// <summary>Sets the EnableMenuItemClickForwarding property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/Menu/NativeMenuItem.fs b/src/Fabulous.Avalonia/Views/Menu/NativeMenuItem.fs
index ec2196d56..d2cb030eb 100644
--- a/src/Fabulous.Avalonia/Views/Menu/NativeMenuItem.fs
+++ b/src/Fabulous.Avalonia/Views/Menu/NativeMenuItem.fs
@@ -58,7 +58,6 @@ module NativeMenuItemBuilders =
                 NativeMenuItem.Click.WithValue(MsgValue onClicked)
             )
 
-[<Extension>]
 type NativeMenuItemModifiers =
     /// <summary>Sets the Gesture property.</summary>
     /// <param name="this">Current widget.</param>
@@ -102,7 +101,6 @@ type NativeMenuItemModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabNativeMenuItem>, value: ViewRef<NativeMenuItem>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type NativeMenuItemExtraModifiers =
     /// <summary>Sets the Icon property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Menu/NativeMenuSeparator.fs b/src/Fabulous.Avalonia/Views/Menu/NativeMenuSeparator.fs
index c6e30d0a1..391d75b57 100644
--- a/src/Fabulous.Avalonia/Views/Menu/NativeMenuSeparator.fs
+++ b/src/Fabulous.Avalonia/Views/Menu/NativeMenuSeparator.fs
@@ -19,7 +19,6 @@ module NativeMenuItemSeparatorBuilders =
         static member inline NativeMenuItemSeparator() =
             WidgetBuilder<'msg, IFabNativeMenuItemSeparator>(NativeMenuItemSeparator.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
 
-[<Extension>]
 type NativeMenuItemSeparatorModifiers =
     /// <summary>Link a ViewRef to access the direct NativeMenuItemSeparator control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Menu/TabStrip.fs b/src/Fabulous.Avalonia/Views/Menu/TabStrip.fs
index ab9df7191..dc214be4d 100644
--- a/src/Fabulous.Avalonia/Views/Menu/TabStrip.fs
+++ b/src/Fabulous.Avalonia/Views/Menu/TabStrip.fs
@@ -24,7 +24,6 @@ module TabStripBuilders =
             ) =
             WidgetHelpers.buildItems<'msg, IFabTabStrip, 'itemData, 'itemMarker> TabStrip.WidgetKey ItemsControl.ItemsSource items template
 
-[<Extension>]
 type TabStripModifiers =
     /// <summary>Link a ViewRef to access the direct TabStrip control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/MenuItems/ComboBoxItem.fs b/src/Fabulous.Avalonia/Views/MenuItems/ComboBoxItem.fs
index b6f5f5fa6..df97ace29 100644
--- a/src/Fabulous.Avalonia/Views/MenuItems/ComboBoxItem.fs
+++ b/src/Fabulous.Avalonia/Views/MenuItems/ComboBoxItem.fs
@@ -52,7 +52,6 @@ module ComboBoxItemBuilders =
                 )
             )
 
-[<Extension>]
 type ComboBoxItemModifiers =
     /// <summary>Link a ViewRef to access the direct MenuItem control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/MenuItems/ListBoxItem.fs b/src/Fabulous.Avalonia/Views/MenuItems/ListBoxItem.fs
index e2b93c51b..a79177342 100644
--- a/src/Fabulous.Avalonia/Views/MenuItems/ListBoxItem.fs
+++ b/src/Fabulous.Avalonia/Views/MenuItems/ListBoxItem.fs
@@ -55,7 +55,6 @@ module ListBoxItemBuilders =
                 AttributesBundle(StackList.empty(), ValueSome [| ContentControl.ContentWidget.WithValue(content.Compile()) |], ValueNone)
             )
 
-[<Extension>]
 type ListBoxItemModifiers =
     /// <summary>Link a ViewRef to access the direct MenuItem control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/MenuItems/MenuItem.fs b/src/Fabulous.Avalonia/Views/MenuItems/MenuItem.fs
index 9a3297493..6f1be59e8 100644
--- a/src/Fabulous.Avalonia/Views/MenuItems/MenuItem.fs
+++ b/src/Fabulous.Avalonia/Views/MenuItems/MenuItem.fs
@@ -121,7 +121,6 @@ module MenuItemBuilders =
                 (StackList.one(MenuItem.Clicked.WithValue(fun _ -> box onClick)))
                 [| HeaderedContentControl.HeaderWidget.WithValue(header.Compile()) |]
 
-[<Extension>]
 type MenuItemModifiers =
     /// <summary>Sets the HotKey property.</summary>
     /// <param name="this">Current widget.</param>
@@ -193,7 +192,6 @@ type MenuItemModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabMenuItem>, value: ViewRef<MenuItem>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type MenuItemCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabMenuItem>
diff --git a/src/Fabulous.Avalonia/Views/MenuItems/TabItem.fs b/src/Fabulous.Avalonia/Views/MenuItems/TabItem.fs
index 758fedab9..aeec9d671 100644
--- a/src/Fabulous.Avalonia/Views/MenuItems/TabItem.fs
+++ b/src/Fabulous.Avalonia/Views/MenuItems/TabItem.fs
@@ -49,7 +49,6 @@ module TabItemBuilders =
                 )
             )
 
-[<Extension>]
 type TabItemModifiers =
     /// <summary>Sets the TabStripPlacement property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Panels/AdornerLayer.fs b/src/Fabulous.Avalonia/Views/Panels/AdornerLayer.fs
index 55341608c..edf8e5b9b 100644
--- a/src/Fabulous.Avalonia/Views/Panels/AdornerLayer.fs
+++ b/src/Fabulous.Avalonia/Views/Panels/AdornerLayer.fs
@@ -18,7 +18,6 @@ module AdornerLayer =
     let IsIsClipEnabled =
         Attributes.defineAvaloniaPropertyWithEquality AdornerLayer.IsClipEnabledProperty
 
-[<Extension>]
 type AdornerLayerAttachedModifiers =
     /// <summary>Sets the Adorner property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Panels/Canvas.fs b/src/Fabulous.Avalonia/Views/Panels/Canvas.fs
index 79cb30e2a..af7289883 100644
--- a/src/Fabulous.Avalonia/Views/Panels/Canvas.fs
+++ b/src/Fabulous.Avalonia/Views/Panels/Canvas.fs
@@ -32,7 +32,6 @@ module CanvasBuilders =
         static member Canvas(viewRef: ViewRef<Canvas>) =
             WidgetBuilder<'msg, IFabCanvas>(Canvas.WidgetKey, ViewRefAttributes.ViewRef.WithValue(viewRef.Unbox))
 
-[<Extension>]
 type CanvasModifiers =
     /// <summary>Sets the Left property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Panels/DockPanel.fs b/src/Fabulous.Avalonia/Views/Panels/DockPanel.fs
index 4478826e4..3c86b9bf7 100644
--- a/src/Fabulous.Avalonia/Views/Panels/DockPanel.fs
+++ b/src/Fabulous.Avalonia/Views/Panels/DockPanel.fs
@@ -28,7 +28,6 @@ module DockPanelBuilders =
         static member Dock(lastChildFill: bool) =
             CollectionBuilder<'msg, IFabDockPanel, IFabControl>(DockPanel.WidgetKey, Panel.Children, DockPanel.LastChildFill.WithValue(lastChildFill))
 
-[<Extension>]
 type DockPanelModifiers =
     /// <summary>Sets the Dock property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Panels/Grid.fs b/src/Fabulous.Avalonia/Views/Panels/Grid.fs
index ef9bcc0e8..7b1f46771 100644
--- a/src/Fabulous.Avalonia/Views/Panels/Grid.fs
+++ b/src/Fabulous.Avalonia/Views/Panels/Grid.fs
@@ -96,7 +96,6 @@ module GridBuilders =
         /// <summary>Creates a Grid widget with a single column and row.</summary>
         static member inline Grid<'msg>() = View.Grid<'msg>([ Star ], [ Star ])
 
-[<Extension>]
 type GridModifiers =
     /// <summary>Sets the ShowGridLines property.</summary>
     /// <param name="this">Current widget.</param>
@@ -112,7 +111,6 @@ type GridModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabGrid>, value: ViewRef<Grid>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type GridAttachedModifiers =
     /// <summary>Sets the Column property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Panels/Panel.fs b/src/Fabulous.Avalonia/Views/Panels/Panel.fs
index 20d2ad1ee..da567146b 100644
--- a/src/Fabulous.Avalonia/Views/Panels/Panel.fs
+++ b/src/Fabulous.Avalonia/Views/Panels/Panel.fs
@@ -29,7 +29,6 @@ module PanelBuilders =
         static member Panel() =
             CollectionBuilder<'msg, IFabPanel, IFabControl>(Panel.WidgetKey, Panel.Children)
 
-[<Extension>]
 type PanelModifiers =
     /// <summary>Sets the Background property.</summary>
     /// <param name="this">Current widget.</param>
@@ -66,7 +65,6 @@ type PanelModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabPanel>, value: ViewRef<Panel>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type PanelExtraModifiers =
     /// <summary>Sets the Background property.</summary>
     /// <param name="this">Current widget.</param>
@@ -96,7 +94,6 @@ type PanelExtraModifiers =
     static member inline foreground(this: WidgetBuilder<'msg, #IFabPanel>, value: string) =
         PanelModifiers.foreground(this, View.SolidColorBrush(value))
 
-[<Extension>]
 type PanelCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'marker :> IFabPanel and 'itemType :> IFabControl>
diff --git a/src/Fabulous.Avalonia/Views/Panels/ReversibleStackPanel.fs b/src/Fabulous.Avalonia/Views/Panels/ReversibleStackPanel.fs
index 462c7497b..9b3fa2ef8 100644
--- a/src/Fabulous.Avalonia/Views/Panels/ReversibleStackPanel.fs
+++ b/src/Fabulous.Avalonia/Views/Panels/ReversibleStackPanel.fs
@@ -56,7 +56,6 @@ module ReversibleStackPanelBuilders =
 
             CollectionBuilder<'msg, IFabReversibleStackPanel, IFabControl>(ReversibleStackPanel.WidgetKey, scalars, Panel.Children)
 
-[<Extension>]
 type ReversibleStackPanelModifiers =
     /// <summary>Link a ViewRef to access the direct ReversibleStackPanel control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Panels/StackPanel.fs b/src/Fabulous.Avalonia/Views/Panels/StackPanel.fs
index e27003a6c..1314924d8 100644
--- a/src/Fabulous.Avalonia/Views/Panels/StackPanel.fs
+++ b/src/Fabulous.Avalonia/Views/Panels/StackPanel.fs
@@ -29,7 +29,6 @@ module StackPanel =
     let VerticalSnapPointsChanged =
         Attributes.defineEvent "StackPanel_VerticalSnapPointsChanged" (fun target -> (target :?> StackPanel).VerticalSnapPointsChanged)
 
-[<Extension>]
 type StackPanelModifiers =
     /// <summary>Sets the AreHorizontalSnapPointsRegular property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Panels/UniformGrid.fs b/src/Fabulous.Avalonia/Views/Panels/UniformGrid.fs
index a83b39981..f3f108ea3 100644
--- a/src/Fabulous.Avalonia/Views/Panels/UniformGrid.fs
+++ b/src/Fabulous.Avalonia/Views/Panels/UniformGrid.fs
@@ -58,7 +58,6 @@ module UniformGridBuilders =
                     UniformGrid.Rows.WithValue(0)
                 )
 
-[<Extension>]
 type UniformGridModifiers =
     /// <summary>Sets the FirstColumn property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Panels/WrapPanel.fs b/src/Fabulous.Avalonia/Views/Panels/WrapPanel.fs
index b28a1ff69..889aa458d 100644
--- a/src/Fabulous.Avalonia/Views/Panels/WrapPanel.fs
+++ b/src/Fabulous.Avalonia/Views/Panels/WrapPanel.fs
@@ -32,7 +32,6 @@ module WrapPanelBuilders =
         static member HWrap<'msg>() =
             CollectionBuilder<'msg, IFabWrapPanel, IFabControl>(WrapPanel.WidgetKey, Panel.Children, WrapPanel.Orientation.WithValue(Orientation.Horizontal))
 
-[<Extension>]
 type WrapPanelModifiers =
     /// <summary>Sets the ItemWidth property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/SolidColorBrush.fs b/src/Fabulous.Avalonia/Views/SolidColorBrush.fs
index 4a3844f8a..1a07abaf3 100644
--- a/src/Fabulous.Avalonia/Views/SolidColorBrush.fs
+++ b/src/Fabulous.Avalonia/Views/SolidColorBrush.fs
@@ -27,7 +27,6 @@ module SolidColorBrushBuilders =
         static member SolidColorBrush(color: string) =
             View.SolidColorBrush(Color.Parse(color))
 
-[<Extension>]
 type SolidColorBrushModifiers =
     /// <summary>Link a ViewRef to access the direct SolidColorBrush control instance.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Styling/Animation.fs b/src/Fabulous.Avalonia/Views/Styling/Animation.fs
index f28cfb1ac..0150b3bd9 100644
--- a/src/Fabulous.Avalonia/Views/Styling/Animation.fs
+++ b/src/Fabulous.Avalonia/Views/Styling/Animation.fs
@@ -53,7 +53,6 @@ module AnimationBuilders =
         static member Animation<'msg>() =
             CollectionBuilder<'msg, IFabAnimation, IFabKeyFrame>(Animation.WidgetKey, Animation.Children)
 
-[<Extension>]
 type AnimationModifiers =
     /// <summary>Sets the IterationCount property to Infinite.</summary>
     /// <param name="this">Current widget.</param>
@@ -117,7 +116,6 @@ type AnimationModifiers =
     static member inline reference(this: WidgetBuilder<'msg, IFabAnimation>, value: ViewRef<Animation>) =
         this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
 
-[<Extension>]
 type AnimationCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabKeyFrame>
diff --git a/src/Fabulous.Avalonia/Views/Styling/KeyFrame.fs b/src/Fabulous.Avalonia/Views/Styling/KeyFrame.fs
index 9b0902f32..3f16c3590 100644
--- a/src/Fabulous.Avalonia/Views/Styling/KeyFrame.fs
+++ b/src/Fabulous.Avalonia/Views/Styling/KeyFrame.fs
@@ -56,7 +56,6 @@ module KeyFrameBuilders =
         static member KeyFrame(property: AvaloniaProperty, value: obj) =
             WidgetBuilder<'msg, IFabKeyFrame>(KeyFrame.WidgetKey, KeyFrame.Setter.WithValue(Setter(property, value)))
 
-[<Extension>]
 type KeyFrameModifiers =
     /// <summary>Sets the Cue property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Styling/Style.fs b/src/Fabulous.Avalonia/Views/Styling/Style.fs
index ca08516c6..4a2c8022a 100644
--- a/src/Fabulous.Avalonia/Views/Styling/Style.fs
+++ b/src/Fabulous.Avalonia/Views/Styling/Style.fs
@@ -25,7 +25,6 @@ module StyleBuilders =
         static member Animations() =
             CollectionBuilder<'msg, IFabStyle, IFabAnimation>(Style.WidgetKey, Style.Animations)
 
-[<Extension>]
 type StyleCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'itemType :> IFabAnimation>
@@ -55,7 +54,6 @@ type StyleCollectionBuilderExtensions =
         ) : Content<'msg> =
         { Widgets = MutStackArray1.One(x.Compile()) }
 
-[<Extension>]
 type StyleModifiers =
     /// <summary>Sets the Animations property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/Styling/Transition.fs b/src/Fabulous.Avalonia/Views/Styling/Transition.fs
index e282d641d..c3cad5a85 100644
--- a/src/Fabulous.Avalonia/Views/Styling/Transition.fs
+++ b/src/Fabulous.Avalonia/Views/Styling/Transition.fs
@@ -24,7 +24,6 @@ module TransitionBase =
     let Property =
         Attributes.defineAvaloniaPropertyWithEquality TransitionBase.PropertyProperty
 
-[<Extension>]
 type TransitionBaseModifiers =
     /// <summary>Sets the Delay property.</summary>
     /// <param name="this">Current widget.</param>
@@ -328,7 +327,6 @@ module EffectTransitionBuilders =
                 TransitionBase.Duration.WithValue(duration)
             )
 
-[<Extension>]
 type TransitionBaseCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield<'msg, 'marker, 'itemType when 'marker :> IFabAnimatable and 'itemType :> IFabTransition>
@@ -346,7 +344,6 @@ type TransitionBaseCollectionBuilderExtensions =
         ) : Content<'msg> =
         { Widgets = MutStackArray1.One(x.Compile()) }
 
-[<Extension>]
 type TransitionCollectionModifiers =
     /// <summary>Sets the Transitions property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_Brush.fs b/src/Fabulous.Avalonia/Views/_Brush.fs
index f4d23c3cb..cf1c4e1ed 100644
--- a/src/Fabulous.Avalonia/Views/_Brush.fs
+++ b/src/Fabulous.Avalonia/Views/_Brush.fs
@@ -18,7 +18,6 @@ module Brush =
     let TransformOrigin =
         Attributes.defineAvaloniaPropertyWithEquality Brush.TransformOriginProperty
 
-[<Extension>]
 type BrushModifiers =
 
     /// <summary>Sets the Opacity property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/_ContentControl.fs b/src/Fabulous.Avalonia/Views/_ContentControl.fs
index ce2e9016f..4ec9c2e2a 100644
--- a/src/Fabulous.Avalonia/Views/_ContentControl.fs
+++ b/src/Fabulous.Avalonia/Views/_ContentControl.fs
@@ -21,7 +21,6 @@ module ContentControl =
     let VerticalContentAlignment =
         Attributes.defineAvaloniaPropertyWithEquality ContentControl.VerticalContentAlignmentProperty
 
-[<Extension>]
 type ContentControlModifiers =
     /// <summary>Sets the HorizontalContentAlignment property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_Control.fs b/src/Fabulous.Avalonia/Views/_Control.fs
index 614b2f11c..be4216d07 100644
--- a/src/Fabulous.Avalonia/Views/_Control.fs
+++ b/src/Fabulous.Avalonia/Views/_Control.fs
@@ -38,7 +38,6 @@ module Control =
     let SizeChanged =
         Attributes.defineEvent "Control_SizeChanged" (fun target -> (target :?> Control).SizeChanged)
 
-[<Extension>]
 type ControlModifiers =
     /// <summary>Sets the ContextFlyout property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_Decorator.fs b/src/Fabulous.Avalonia/Views/_Decorator.fs
index 4dfb5e81b..3f24a7ac9 100644
--- a/src/Fabulous.Avalonia/Views/_Decorator.fs
+++ b/src/Fabulous.Avalonia/Views/_Decorator.fs
@@ -16,7 +16,6 @@ module Decorator =
     let Padding =
         Attributes.defineAvaloniaPropertyWithEquality Decorator.PaddingProperty
 
-[<Extension>]
 type DecoratorModifiers =
     /// <summary>Sets the Padding property.</summary>
     /// <param name="this">Current widget.</param>
@@ -32,7 +31,6 @@ type DecoratorModifiers =
     static member inline child(this: WidgetBuilder<'msg, #IFabDecorator>, value: WidgetBuilder<'msg, #IFabControl>) =
         this.AddWidget(Decorator.ChildWidget.WithValue(value.Compile()))
 
-[<Extension>]
 type DecoratorExtraModifiers =
     /// <summary>Sets the Padding property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_DragDrop.fs b/src/Fabulous.Avalonia/Views/_DragDrop.fs
index 0969983ec..8c62c90a9 100644
--- a/src/Fabulous.Avalonia/Views/_DragDrop.fs
+++ b/src/Fabulous.Avalonia/Views/_DragDrop.fs
@@ -20,7 +20,6 @@ module DragDrop =
     let AllowDrop =
         Attributes.defineAvaloniaPropertyWithEquality DragDrop.AllowDropProperty
 
-[<Extension>]
 type DragDropModifiers =
     /// <summary>Listens to the DragDrop DragEnter event.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_FlyoutBase.fs b/src/Fabulous.Avalonia/Views/_FlyoutBase.fs
index 85ec63719..898ffde65 100644
--- a/src/Fabulous.Avalonia/Views/_FlyoutBase.fs
+++ b/src/Fabulous.Avalonia/Views/_FlyoutBase.fs
@@ -17,7 +17,6 @@ module FlyoutBase =
     let Closed =
         Attributes.defineEventNoArg "FlyoutBase_Closed" (fun target -> (target :?> FlyoutBase).Closed)
 
-[<Extension>]
 type FlyoutBaseModifiers =
     /// <summary>Listens to the FlyoutBase Opened event.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_ITransform.fs b/src/Fabulous.Avalonia/Views/_ITransform.fs
index aaecbf003..35dbe5e04 100644
--- a/src/Fabulous.Avalonia/Views/_ITransform.fs
+++ b/src/Fabulous.Avalonia/Views/_ITransform.fs
@@ -12,7 +12,6 @@ module Transform =
     let Changed =
         Attributes.defineEventNoArg "Transform_Changed" (fun target -> (target :?> Transform).Changed)
 
-[<Extension>]
 type TransformModifiers =
     /// <summary>Listens to the Transform changed event.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_InputElement.fs b/src/Fabulous.Avalonia/Views/_InputElement.fs
index 8b715453b..4d06addb8 100644
--- a/src/Fabulous.Avalonia/Views/_InputElement.fs
+++ b/src/Fabulous.Avalonia/Views/_InputElement.fs
@@ -78,7 +78,6 @@ module InputElement =
     let DoubleTapped =
         Attributes.defineEvent<TappedEventArgs> "InputElement_DoubleTapped" (fun target -> (target :?> InputElement).DoubleTapped)
 
-[<Extension>]
 type InputElementModifiers =
     /// <summary>Sets the Focusable property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_ItemsControl.fs b/src/Fabulous.Avalonia/Views/_ItemsControl.fs
index f3bf96dd1..ba7f8a02e 100644
--- a/src/Fabulous.Avalonia/Views/_ItemsControl.fs
+++ b/src/Fabulous.Avalonia/Views/_ItemsControl.fs
@@ -46,7 +46,6 @@ module ItemsControl =
     let ContainerPrepared =
         Attributes.defineEvent "ItemsControl_ContainerPrepared" (fun target -> (target :?> ItemsControl).ContainerPrepared)
 
-[<Extension>]
 type ItemsControlModifiers =
     /// <summary>Listens to the ItemsControl ContainerClearing event.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_Layoutable.fs b/src/Fabulous.Avalonia/Views/_Layoutable.fs
index 9041c2774..569139f2c 100644
--- a/src/Fabulous.Avalonia/Views/_Layoutable.fs
+++ b/src/Fabulous.Avalonia/Views/_Layoutable.fs
@@ -43,7 +43,6 @@ module Layoutable =
     let LayoutUpdated =
         Attributes.defineEventNoArg "Layoutable_LayoutUpdated" (fun target -> (target :?> Layoutable).LayoutUpdated)
 
-[<Extension>]
 type LayoutableModifiers =
     /// <summary>Sets the Width property.</summary>
     /// <param name="this">Current widget.</param>
@@ -129,7 +128,6 @@ type LayoutableModifiers =
     static member inline onLayoutUpdated(this: WidgetBuilder<'msg, #IFabLayoutable>, msg: 'msg) =
         this.AddScalar(Layoutable.LayoutUpdated.WithValue(MsgValue msg))
 
-[<Extension>]
 type LayoutableExtraModifiers =
     /// <summary>Sets the HorizontalAlignment property to Center.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_MenuBase.fs b/src/Fabulous.Avalonia/Views/_MenuBase.fs
index b515d5a6e..a5fab2bad 100644
--- a/src/Fabulous.Avalonia/Views/_MenuBase.fs
+++ b/src/Fabulous.Avalonia/Views/_MenuBase.fs
@@ -15,7 +15,6 @@ module MenuBase =
     let Closed =
         Attributes.defineEvent "MenuBase_Closed" (fun target -> (target :?> MenuBase).Closed)
 
-[<Extension>]
 type MenuBaseModifiers =
     /// <summary>Listens to the MenuOpened event.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_PopupFlyoutBase.fs b/src/Fabulous.Avalonia/Views/_PopupFlyoutBase.fs
index 37ed6dde7..e9c1bf33f 100644
--- a/src/Fabulous.Avalonia/Views/_PopupFlyoutBase.fs
+++ b/src/Fabulous.Avalonia/Views/_PopupFlyoutBase.fs
@@ -42,7 +42,6 @@ module PopupFlyoutBase =
     let Closing =
         Attributes.defineEvent "PopupFlyoutBase_Closing" (fun target -> (target :?> PopupFlyoutBase).Closing)
 
-[<Extension>]
 type PopupFlyoutBaseModifiers =
     /// <summary>Sets the Placement property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_RenderOptions.fs b/src/Fabulous.Avalonia/Views/_RenderOptions.fs
index 645b90e8e..1c0dfa6db 100644
--- a/src/Fabulous.Avalonia/Views/_RenderOptions.fs
+++ b/src/Fabulous.Avalonia/Views/_RenderOptions.fs
@@ -48,7 +48,6 @@ module RenderOptions =
                 let target = target :?> Visual
                 RenderOptions.SetTextRenderingMode(target, value))
 
-[<Extension>]
 type RenderOptionsModifiers =
     /// <summary>Sets the BitmapInterpolationMode property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_SelectingItemsControl.fs b/src/Fabulous.Avalonia/Views/_SelectingItemsControl.fs
index abef3392b..db38f3bbc 100644
--- a/src/Fabulous.Avalonia/Views/_SelectingItemsControl.fs
+++ b/src/Fabulous.Avalonia/Views/_SelectingItemsControl.fs
@@ -34,7 +34,6 @@ module SelectingItemsControl =
     let SelectedIndexChanged =
         Attributes.defineAvaloniaPropertyWithChangedEvent' "SelectingItemsControl_SelectedIndexChanged" SelectingItemsControl.SelectedIndexProperty
 
-[<Extension>]
 type SelectingItemsControlModifiers =
     /// <summary>Sets the AutoScrollToSelectedItem property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_Spinner.fs b/src/Fabulous.Avalonia/Views/_Spinner.fs
index be5d5b8c1..fa2bd78d7 100644
--- a/src/Fabulous.Avalonia/Views/_Spinner.fs
+++ b/src/Fabulous.Avalonia/Views/_Spinner.fs
@@ -15,7 +15,6 @@ module Spinner =
     let Spin =
         Attributes.defineEvent<SpinEventArgs> "Spinner_Spin" (fun target -> (target :?> Spinner).Spin)
 
-[<Extension>]
 type SpinnerModifiers =
 
     /// <summary>Sets the ValidSpinDirection property.</summary>
diff --git a/src/Fabulous.Avalonia/Views/_StyledElement.fs b/src/Fabulous.Avalonia/Views/_StyledElement.fs
index 851ec5fd4..8893258fa 100644
--- a/src/Fabulous.Avalonia/Views/_StyledElement.fs
+++ b/src/Fabulous.Avalonia/Views/_StyledElement.fs
@@ -90,7 +90,6 @@ module StyledElement =
                     node.TreeContext.Logger.Warn("The resource '{0}' was not found. The theme has been unset", themeKey)
                     target.Theme <- null)
 
-[<Extension>]
 type StyledElementModifiers =
     /// <summary>Sets the Name property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_TemplatedControl.fs b/src/Fabulous.Avalonia/Views/_TemplatedControl.fs
index 7cf58d85b..4b6c0cbc3 100644
--- a/src/Fabulous.Avalonia/Views/_TemplatedControl.fs
+++ b/src/Fabulous.Avalonia/Views/_TemplatedControl.fs
@@ -52,7 +52,6 @@ module TemplatedControl =
     let Padding =
         Attributes.defineAvaloniaPropertyWithEquality TemplatedControl.PaddingProperty
 
-[<Extension>]
 type TemplatedControlModifiers =
     /// <summary>Sets the BackgroundWidget property.</summary>
     /// <param name="this">Current widget.</param>
@@ -159,7 +158,6 @@ type TemplatedControlModifiers =
     static member inline padding(this: WidgetBuilder<'msg, #IFabTemplatedControl>, value: Thickness) =
         this.AddScalar(TemplatedControl.Padding.WithValue(value))
 
-[<Extension>]
 type TemplatedControlExtraModifiers =
     /// <summary>Sets the Padding property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_TextElement.fs b/src/Fabulous.Avalonia/Views/_TextElement.fs
index 2d983f239..e79813989 100644
--- a/src/Fabulous.Avalonia/Views/_TextElement.fs
+++ b/src/Fabulous.Avalonia/Views/_TextElement.fs
@@ -37,7 +37,6 @@ module TextElement =
     let Foreground =
         Attributes.defineAvaloniaPropertyWithEquality TextElement.ForegroundProperty
 
-[<Extension>]
 type TextElementModifiers =
     /// <summary>Sets the Background property.</summary>
     /// <param name="this">Current widget.</param>
@@ -102,7 +101,6 @@ type TextElementModifiers =
     static member inline foreground(this: WidgetBuilder<'msg, #IFabTextElement>, value: IBrush) =
         this.AddScalar(TextElement.Foreground.WithValue(value))
 
-[<Extension>]
 type TextElementExtraModifiers =
     /// <summary>Sets the Background property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_TopLevel.fs b/src/Fabulous.Avalonia/Views/_TopLevel.fs
index ae34f2b66..c34b9dc7e 100644
--- a/src/Fabulous.Avalonia/Views/_TopLevel.fs
+++ b/src/Fabulous.Avalonia/Views/_TopLevel.fs
@@ -50,7 +50,6 @@ module TopLevel =
     let ThemeVariantChanged =
         Attributes.defineEventNoArg "TopLevel_ThemeVariantChanged" (fun target -> (target :?> TopLevel).ActualThemeVariantChanged)
 
-[<Extension>]
 type TopLevelModifiers =
     /// <summary>Sets the PointerOverElement property.</summary>
     /// <param name="this">Current widget.</param>
@@ -129,7 +128,6 @@ type TopLevelModifiers =
     static member inline onScalingChanged(this: WidgetBuilder<'msg, #IFabTopLevel>, msg: 'msg) =
         this.AddScalar(TopLevel.ScalingChanged.WithValue(MsgValue msg))
 
-[<Extension>]
 type TopLevelExtraModifiers =
     /// <summary>Sets the TransparencyBackgroundFallback property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_Visual.fs b/src/Fabulous.Avalonia/Views/_Visual.fs
index 5092af35a..c2856fcbc 100644
--- a/src/Fabulous.Avalonia/Views/_Visual.fs
+++ b/src/Fabulous.Avalonia/Views/_Visual.fs
@@ -52,7 +52,6 @@ module Visual =
     let DetachedFromVisualTree =
         Attributes.defineEvent "VisualAttachedToVisualTree" (fun target -> (target :?> Visual).DetachedFromVisualTree)
 
-[<Extension>]
 type VisualModifiers =
     /// <summary>Sets the ClipToBounds property.</summary>
     /// <param name="this">Current widget.</param>
@@ -145,7 +144,6 @@ type VisualModifiers =
     static member inline renderTransform(this: WidgetBuilder<'msg, #IFabVisual>, value: WidgetBuilder<'msg, #IFabTransform>) =
         this.AddWidget(Visual.RenderTransformWidget.WithValue(value.Compile()))
 
-[<Extension>]
 type VisualExtraModifiers =
     /// <summary>Sets the OpacityMask property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/src/Fabulous.Avalonia/Views/_WindowBase.fs b/src/Fabulous.Avalonia/Views/_WindowBase.fs
index 51fb90589..b23bcdd5e 100644
--- a/src/Fabulous.Avalonia/Views/_WindowBase.fs
+++ b/src/Fabulous.Avalonia/Views/_WindowBase.fs
@@ -24,7 +24,6 @@ module WindowBase =
     let Resized =
         Attributes.defineEvent "WindowBase_Resized" (fun target -> (target :?> WindowBase).Resized)
 
-[<Extension>]
 type WindowBaseModifiers =
     /// <summary>Sets the Topmost property.</summary>
     /// <param name="this">Current widget.</param>
diff --git a/templates/content/blank/.template.config/template.json b/templates/content/blank/.template.config/template.json
index 135481347..27df47ea3 100644
--- a/templates/content/blank/.template.config/template.json
+++ b/templates/content/blank/.template.config/template.json
@@ -56,7 +56,7 @@
       "type": "parameter",
       "dataType": "string",
       "replaces": "FSharpCorePkgVersion",
-      "defaultValue": "8.0.100"
+      "defaultValue": "8.0.200"
     },
     "AvaloniaAndroidPkgVersion": {
       "type": "parameter",
diff --git a/templates/content/multi/.template.config/template.json b/templates/content/multi/.template.config/template.json
index b09b10321..3e4cb2adc 100644
--- a/templates/content/multi/.template.config/template.json
+++ b/templates/content/multi/.template.config/template.json
@@ -56,7 +56,7 @@
       "type": "parameter",
       "dataType": "string",
       "replaces": "FSharpCorePkgVersion",
-      "defaultValue": "8.0.100"
+      "defaultValue": "8.0.200"
     },
     "AvaloniaAndroidPkgVersion": {
       "type": "parameter",