diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
index 1d87d91f..ac2636a0 100644
--- a/.github/workflows/build-deploy.yml
+++ b/.github/workflows/build-deploy.yml
@@ -15,7 +15,7 @@ jobs:
     env:
       Solution_Name: ./src/MauiReactor.Build.sln
       TemplatePack_Name: ./src/MauiReactor.TemplatePack/MauiReactor.TemplatePack.csproj
-      Version: 2.0.33
+      Version: 2.0.34
 
     steps:
     - name: Checkout
diff --git a/samples/ChartApp/Pages/MainPage.cs b/samples/ChartApp/Pages/MainPage.cs
index 0d1e2943..cef23d39 100644
--- a/samples/ChartApp/Pages/MainPage.cs
+++ b/samples/ChartApp/Pages/MainPage.cs
@@ -22,7 +22,7 @@ partial class PolarChart { }
 
 class ChartPageState
 {
-    public double[] Values { get; set; } = new double[] { 2, 1, 2, 3, 2, 3, 3 };
+    public double[] Values { get; set; } = [2, 1, 2, 3, 2, 3, 3];
 }
 
 
diff --git a/samples/MauiReactor.TestApp/MauiProgram.cs b/samples/MauiReactor.TestApp/MauiProgram.cs
index 9d7a37dc..2ed75602 100644
--- a/samples/MauiReactor.TestApp/MauiProgram.cs
+++ b/samples/MauiReactor.TestApp/MauiProgram.cs
@@ -15,13 +15,15 @@ public static MauiApp CreateMauiApp()
                 app.AddResource("Resources/Styles/DefaultTheme.xaml");
 
                 app.SetWindowsSpecificAssetsDirectory("Assets");
+
+                app.UseTheme<AppTheme>();
             })
 #if DEBUG
             .EnableMauiReactorHotReload()
             //This will enable the FrameRateIndicator widget
             //Disable before publishing the app
             .EnableFrameRateIndicator()
-#endif                
+#endif
             .ConfigureFonts(fonts =>
             {
                 fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
@@ -30,6 +32,17 @@ public static MauiApp CreateMauiApp()
 
         builder.Services.AddSingleton<Services.IncrementService>();
 
+
         return builder.Build();
     }
+}
+
+class AppTheme : Theme
+{
+    protected override void OnApply()
+    {
+        LabelStyles.Default = _ => _
+            .FontAttributes(MauiControls.FontAttributes.Italic)
+            .FontSize(32);
+    }
 }
\ No newline at end of file
diff --git a/samples/MauiReactor.TestApp/Pages/CounterPage.cs b/samples/MauiReactor.TestApp/Pages/CounterPage.cs
index 9d48e29f..085b3a97 100644
--- a/samples/MauiReactor.TestApp/Pages/CounterPage.cs
+++ b/samples/MauiReactor.TestApp/Pages/CounterPage.cs
@@ -18,7 +18,7 @@ class CounterPage : Component<CounterPageState>
     public override VisualNode Render()
         => ContentPage("Counter Sample",
             VStack(
-                Label($"Counter: {State.Counter}"),
+                Label($"Counter: {State.Counter}").ThemeKey("H1"),
 
                 Button("Click To Increment", () =>
                     SetState(s => s.Counter++))
diff --git a/src/MauiReactor.Scaffold/TypeGenerator.cs b/src/MauiReactor.Scaffold/TypeGenerator.cs
index 887a9bb5..221afb25 100644
--- a/src/MauiReactor.Scaffold/TypeGenerator.cs
+++ b/src/MauiReactor.Scaffold/TypeGenerator.cs
@@ -199,14 +199,29 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("()\n    { \n        \n    }\n\n    public ");
+            this.Write("()\n    { \n        ");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
+            
+            #line default
+            #line hidden
+            this.Write("Styles.Default?.Invoke(this);\n    }\n\n    public ");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
+            
+            #line default
+            #line hidden
+            this.Write("(Action<T?> componentRefAction)\n        : base(componentRefAction)\n    {\n        " +
+                    "");
             
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
             
             #line default
             #line hidden
-            this.Write("(Action<T?> componentRefAction)\n        : base(componentRefAction)\n    {\n\n    }\n");
+            this.Write("Styles.Default?.Invoke(this);\n    }\n");
             
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
  } else if (IsGenericType()) { 
@@ -255,14 +270,14 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("()\n    { \n        \n    }\n\n    public ");
+            this.Write("()\n    { \n    }\n\n    public ");
             
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
             
             #line default
             #line hidden
-            this.Write("(Action<T?> componentRefAction)\n        : base(componentRefAction)\n    {\n\n    }\n");
+            this.Write("(Action<T?> componentRefAction)\n        : base(componentRefAction)\n    {\n    }\n");
             
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
  } else if (IsTypeSealed()) { 
@@ -304,7 +319,14 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("()\n    { \n        \n    }\n\n    public ");
+            this.Write("()\n    { \n        ");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
+            
+            #line default
+            #line hidden
+            this.Write("Styles.Default?.Invoke(this);\n    }\n\n    public ");
             
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
@@ -318,7 +340,14 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("?> componentRefAction)\n        : base(componentRefAction)\n    {\n\n    }\n");
+            this.Write("?> componentRefAction)\n        : base(componentRefAction)\n    {\n        ");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
+            
+            #line default
+            #line hidden
+            this.Write("Styles.Default?.Invoke(this);\n    }\n");
             
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
  } else if (IsTypeNotAbstractWithEmptyConstructor()) { 
@@ -360,14 +389,29 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("()\n    { \n        \n    }\n\n    public ");
+            this.Write("()\n    { \n        ");
             
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
             
             #line default
             #line hidden
-            this.Write("(Action<T?> componentRefAction)\n        : base(componentRefAction)\n    {\n\n    }\n");
+            this.Write("Styles.Default?.Invoke(this);\n    }\n\n    public ");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
+            
+            #line default
+            #line hidden
+            this.Write("(Action<T?> componentRefAction)\n        : base(componentRefAction)\n    {\n        " +
+                    "");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
+            
+            #line default
+            #line hidden
+            this.Write("Styles.Default?.Invoke(this);\n    }\n");
             
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
  } else { 
@@ -409,15 +453,29 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("()\n    { \n        \n    }\n\n    protected ");
+            this.Write("()\n    { \n        ");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
+            
+            #line default
+            #line hidden
+            this.Write("Styles.Default?.Invoke(this);\n    }\n\n    protected ");
             
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
             
             #line default
             #line hidden
-            this.Write("(Action<T?> componentRefAction)\n        : base(componentRefAction)\n    {\n\n    }  " +
-                    "  \n");
+            this.Write("(Action<T?> componentRefAction)\n        : base(componentRefAction)\n    {\n        " +
+                    "");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
+            
+            #line default
+            #line hidden
+            this.Write("Styles.Default?.Invoke(this);\n    }    \n");
             
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
  } 
@@ -845,6 +903,29 @@ public virtual string TransformText()
             this.Write("\n\n    partial void OnBeginUpdate();\n    partial void OnEndUpdate();\n\n    partial " +
                     "void OnBeginAnimate();\n    partial void OnEndAnimate();\n\n    ");
             
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+ if (!IsGenericType()) { 
+            
+            #line default
+            #line hidden
+            this.Write("\n    protected override void OnThemeChanged()\n    {\n        if (ThemeKey != null " +
+                    "&& ");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
+            
+            #line default
+            #line hidden
+            this.Write("Styles.Themes.TryGetValue(ThemeKey, out var styleAction))\n        {\n            s" +
+                    "tyleAction(this);\n        }\n\n        base.OnThemeChanged();\n    }\n    ");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+ } 
+            
+            #line default
+            #line hidden
+            this.Write("\n\n    ");
+            
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
  if (Events.Any()) { 
             
@@ -2911,6 +2992,40 @@ public virtual string TransformText()
             #line default
             #line hidden
             this.Write("\n}\n\n");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+ if (!IsGenericType()) { 
+            
+            #line default
+            #line hidden
+            this.Write("\npublic static partial class ");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
+            
+            #line default
+            #line hidden
+            this.Write("Styles\n{\n\n    public static Action<");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName()));
+            
+            #line default
+            #line hidden
+            this.Write(">? Default { get; set; }\n\n    public static Dictionary<string, Action<");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName()));
+            
+            #line default
+            #line hidden
+            this.Write(">> Themes { get; } = [];\n}\n");
+            
+            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
+ } 
+            
+            #line default
+            #line hidden
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/MauiReactor.Scaffold/TypeGenerator.tt b/src/MauiReactor.Scaffold/TypeGenerator.tt
index 7e9a0920..3f26f025 100644
--- a/src/MauiReactor.Scaffold/TypeGenerator.tt
+++ b/src/MauiReactor.Scaffold/TypeGenerator.tt
@@ -42,65 +42,63 @@ public abstract partial class <#= TypeName() #><T> : <#= BaseTypeName() #><T, <#
 {
     public <#= TypeName() #>()
     { 
-        
+        <#= TypeName() #>Styles.Default?.Invoke(this);
     }
 
     public <#= TypeName() #>(Action<T?> componentRefAction)
         : base(componentRefAction)
     {
-
+        <#= TypeName() #>Styles.Default?.Invoke(this);
     }
 <# } else if (IsGenericType()) { #>
 public abstract partial class <#= TypeName() #><T, TChild> : <#= BaseTypeName() #><T>, <#= InterfaceName() #> where T : <#= FullTypeName() #><TChild>, new() where TChild : <#= GenericArgumentBaseFullTypeName() #>
 {
     public <#= TypeName() #>()
     { 
-        
     }
 
     public <#= TypeName() #>(Action<T?> componentRefAction)
         : base(componentRefAction)
     {
-
     }
 <# } else if (IsTypeSealed()) { #>
 public sealed partial class <#= TypeName() #> : <#= BaseTypeName() #><<#= FullTypeName() #>>, <#= InterfaceName() #>
 {
     public <#= TypeName() #>()
     { 
-        
+        <#= TypeName() #>Styles.Default?.Invoke(this);
     }
 
     public <#= TypeName() #>(Action<<#= FullTypeName() #>?> componentRefAction)
         : base(componentRefAction)
     {
-
+        <#= TypeName() #>Styles.Default?.Invoke(this);
     }
 <# } else if (IsTypeNotAbstractWithEmptyConstructor()) { #>
 public partial class <#= TypeName() #><T> : <#= BaseTypeName() #><T>, <#= InterfaceName() #> where T : <#= FullTypeName() #>, new()
 {
     public <#= TypeName() #>()
     { 
-        
+        <#= TypeName() #>Styles.Default?.Invoke(this);
     }
 
     public <#= TypeName() #>(Action<T?> componentRefAction)
         : base(componentRefAction)
     {
-
+        <#= TypeName() #>Styles.Default?.Invoke(this);
     }
 <# } else { #>
 public abstract partial class <#= TypeName() #><T> : <#= BaseTypeName() #><T>, <#= InterfaceName() #> where T : <#= FullTypeName() #>, new()
 {
     protected <#= TypeName() #>()
     { 
-        
+        <#= TypeName() #>Styles.Default?.Invoke(this);
     }
 
     protected <#= TypeName() #>(Action<T?> componentRefAction)
         : base(componentRefAction)
     {
-
+        <#= TypeName() #>Styles.Default?.Invoke(this);
     }    
 <# } #>
 
@@ -186,6 +184,18 @@ public abstract partial class <#= TypeName() #><T> : <#= BaseTypeName() #><T>, <
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
 
+    <# if (!IsGenericType()) { #>
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && <#= TypeName() #>Styles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+    <# } #>
+
     <# if (Events.Any()) { #>
 
     partial void OnAttachingNativeEvents();
@@ -446,3 +456,12 @@ public static partial class <#= TypeName() #>Extensions
     <# } #>
 }
 
+<# if (!IsGenericType()) { #>
+public static partial class <#= TypeName() #>Styles
+{
+
+    public static Action<<#= InterfaceName() #>>? Default { get; set; }
+
+    public static Dictionary<string, Action<<#= InterfaceName() #>>> Themes { get; } = [];
+}
+<# } #>
\ No newline at end of file
diff --git a/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.cs b/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.cs
index 4f5b936e..acecb5a0 100644
--- a/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.cs
+++ b/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.cs
@@ -227,7 +227,14 @@ namespace ");
             
             #line default
             #line hidden
-            this.Write("()\r\n        { \r\n        \r\n        }\r\n\r\n        public ");
+            this.Write("()\r\n        { \r\n            ");
+            
+            #line 53 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
+            
+            #line default
+            #line hidden
+            this.Write("Styles.Default?.Invoke(this);\r\n        }\r\n\r\n        public ");
             
             #line 56 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
@@ -235,7 +242,14 @@ namespace ");
             #line default
             #line hidden
             this.Write("(Action<T?> componentRefAction)\r\n            : base(componentRefAction)\r\n        " +
-                    "{\r\n\r\n        }\r\n    ");
+                    "{\r\n            ");
+            
+            #line 59 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
+            
+            #line default
+            #line hidden
+            this.Write("Styles.Default?.Invoke(this);\r\n        }\r\n    ");
             
             #line 61 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (IsGenericType) { 
@@ -290,214 +304,256 @@ namespace ");
             
             #line default
             #line hidden
-            this.Write("()\r\n        { \r\n        \r\n        }\r\n\r\n        public ");
+            this.Write("()\r\n        { \r\n        }\r\n\r\n        public ");
             
-            #line 69 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 68 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("(Action<T?> componentRefAction)\r\n            : base(componentRefAction)\r\n        " +
-                    "{\r\n\r\n        }\r\n    ");
+                    "{\r\n        }\r\n    ");
             
-            #line 74 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 72 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (IsTypeSealed) { 
             
             #line default
             #line hidden
             this.Write("    public sealed partial class ");
             
-            #line 75 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 73 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write(" : ");
             
-            #line 75 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 73 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BaseTypeName()));
             
             #line default
             #line hidden
             this.Write("<");
             
-            #line 75 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 73 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(">, ");
             
-            #line 75 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 73 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             
-            #line 75 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 73 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(SupportItemTemplate ? ", ICustomDataTemplateOwner, IAutomationItemContainer" : string.Empty));
             
             #line default
             #line hidden
             this.Write("\r\n    {\r\n        public ");
             
+            #line 75 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
+            
+            #line default
+            #line hidden
+            this.Write("()\r\n        { \r\n            ");
+            
             #line 77 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
-            this.Write("()\r\n        { \r\n        \r\n        }\r\n\r\n        public ");
+            this.Write("Styles.Default?.Invoke(this);\r\n        }\r\n\r\n        public ");
             
-            #line 82 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 80 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("(Action<");
             
-            #line 82 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 80 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
-            this.Write("?> componentRefAction)\r\n            : base(componentRefAction)\r\n        {\r\n\r\n    " +
-                    "    }\r\n    ");
+            this.Write("?> componentRefAction)\r\n            : base(componentRefAction)\r\n        {\r\n      " +
+                    "      ");
+            
+            #line 83 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
+            
+            #line default
+            #line hidden
+            this.Write("Styles.Default?.Invoke(this);\r\n        }\r\n    ");
             
-            #line 87 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 85 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (IsTypeNotAbstractWithEmptyConstructor) { 
             
             #line default
             #line hidden
             this.Write("    public partial class ");
             
-            #line 88 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 86 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("<T> : ");
             
-            #line 88 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 86 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BaseTypeName()));
             
             #line default
             #line hidden
             this.Write("<T>, ");
             
-            #line 88 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 86 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             
-            #line 88 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 86 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(SupportItemTemplate ? ", ICustomDataTemplateOwner, IAutomationItemContainer" : string.Empty));
             
             #line default
             #line hidden
             this.Write(" where T : ");
             
-            #line 88 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 86 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(", new()\r\n    {\r\n        public ");
             
+            #line 88 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
+            
+            #line default
+            #line hidden
+            this.Write("()\r\n        { \r\n            ");
+            
             #line 90 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
-            this.Write("()\r\n        { \r\n        \r\n        }\r\n\r\n        public ");
+            this.Write("Styles.Default?.Invoke(this);\r\n        }\r\n\r\n        public ");
             
-            #line 95 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 93 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("(Action<T?> componentRefAction)\r\n            : base(componentRefAction)\r\n        " +
-                    "{\r\n\r\n        }\r\n    ");
+                    "{\r\n            ");
+            
+            #line 96 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
-            #line 100 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line default
+            #line hidden
+            this.Write("Styles.Default?.Invoke(this);\r\n        }\r\n    ");
+            
+            #line 98 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else { 
             
             #line default
             #line hidden
             this.Write("    public abstract partial class ");
             
-            #line 101 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 99 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("<T> : ");
             
-            #line 101 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 99 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BaseTypeName()));
             
             #line default
             #line hidden
             this.Write("<T>, ");
             
-            #line 101 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 99 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 101 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 99 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(SupportItemTemplate ? ", ICustomDataTemplateOwner, IAutomationItemContainer" : string.Empty));
             
             #line default
             #line hidden
             this.Write(" where T : ");
             
-            #line 101 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 99 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(", new()\r\n    {\r\n        protected ");
             
+            #line 101 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
+            
+            #line default
+            #line hidden
+            this.Write("()\r\n        { \r\n            ");
+            
             #line 103 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
-            this.Write("()\r\n        { \r\n        \r\n        }\r\n\r\n        protected ");
+            this.Write("Styles.Default?.Invoke(this);\r\n        }\r\n\r\n        protected ");
             
-            #line 108 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 106 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("(Action<T?> componentRefAction)\r\n            : base(componentRefAction)\r\n        " +
-                    "{\r\n\r\n        }    \r\n    ");
+                    "{\r\n            ");
             
-            #line 113 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 109 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
+            
+            #line default
+            #line hidden
+            this.Write("Styles.Default?.Invoke(this);\r\n        }    \r\n    ");
+            
+            #line 111 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("        ");
             
-            #line 114 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 112 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (SupportItemTemplate) { 
             
             #line default
             #line hidden
             this.Write("        IEnumerable? ");
             
-            #line 115 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 113 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(".ItemsSource { get; set; }\r\n\r\n        Func<object, VisualNode>? ");
             
-            #line 117 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 115 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
@@ -506,21 +562,21 @@ namespace ");
                     "loadedForciblyChildren;\r\n\r\n        VisualNode? ICustomDataTemplateOwner.GetVisua" +
                     "lNodeForItem(object item)\r\n        {\r\n            var thisAs");
             
-            #line 123 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 121 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(" = (");
             
-            #line 123 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 121 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")this;\r\n            if (thisAs");
             
-            #line 124 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 122 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
@@ -528,7 +584,7 @@ namespace ");
             this.Write(".ItemTemplate == null)\r\n            {\r\n                return null;\r\n            " +
                     "}\r\n\r\n            var visualNodeForItem = thisAs");
             
-            #line 129 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 127 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
@@ -561,42 +617,42 @@ namespace ");
                     "          }\r\n        }\r\n\r\n        private CustomDataTemplate? _customDataTemplat" +
                     "e;\r\n        ");
             
-            #line 189 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 187 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n        ");
             
-            #line 191 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 189 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  foreach (var property in Properties) { 
             
             #line default
             #line hidden
             this.Write("        object? ");
             
-            #line 192 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 190 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 192 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 190 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" { get; set; }\r\n        ");
             
-            #line 193 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 191 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n        ");
             
-            #line 195 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 193 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  foreach (var ev in Events) {
         var genericArgs = ((INamedTypeSymbol)ev.Type).TypeArguments;
         
@@ -605,77 +661,77 @@ namespace ");
             #line hidden
             this.Write("        Action? ");
             
-            #line 198 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 196 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 198 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 196 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name));
             
             #line default
             #line hidden
             this.Write("Action { get; set; }\r\n        Action<");
             
-            #line 199 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 197 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GetActionWithArgsParameters(ev)));
             
             #line default
             #line hidden
             this.Write(">? ");
             
-            #line 199 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 197 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 199 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 197 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name));
             
             #line default
             #line hidden
             this.Write("ActionWithArgs { get; set; }\r\n        ");
             
-            #line 200 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 198 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n        ");
             
-            #line 202 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 200 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (_childrenTypes.Length > 0) { 
             
             #line default
             #line hidden
             this.Write("        ");
             
-            #line 203 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 201 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  foreach (var childType in _childrenTypes) { 
             
             #line default
             #line hidden
             this.Write("        private readonly Dictionary<Microsoft.Maui.Controls.BindableObject, ");
             
-            #line 204 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 202 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(childType.TypeSymbol.GetFullyQualifiedName()));
             
             #line default
             #line hidden
             this.Write("> _");
             
-            #line 204 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 202 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(childType.TypeSymbol.Name.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write("ElementItemMap = new();\r\n        ");
             
-            #line 205 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 203 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
@@ -684,91 +740,91 @@ namespace ");
                     "ntrols.BindableObject childControl)\r\n        {\r\n            Validate.EnsureNotNu" +
                     "ll(NativeControl);\r\n\r\n            var thisAs");
             
-            #line 211 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 209 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(" = (");
             
-            #line 211 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 209 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")this;\r\n            ");
             
-            #line 212 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 210 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  bool firstElementToAdd = true; 
             
             #line default
             #line hidden
             this.Write("            ");
             
-            #line 213 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 211 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  foreach (var childType in _childrenTypes) { 
             
             #line default
             #line hidden
             this.Write("            ");
             
-            #line 214 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 212 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(firstElementToAdd ? string.Empty : "else "));
             
             #line default
             #line hidden
             this.Write("if (childControl is ");
             
-            #line 214 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 212 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(childType.TypeSymbol.GetFullyQualifiedName()));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 214 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 212 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(childType.TypeSymbol.Name.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write("Item)\r\n            {\r\n                NativeControl.");
             
-            #line 216 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 214 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(childType.ChildPropertyName));
             
             #line default
             #line hidden
             this.Write(".Insert(widget.ChildIndex, ");
             
-            #line 216 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 214 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(childType.TypeSymbol.Name.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write("Item);\r\n                _");
             
-            #line 217 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 215 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(childType.TypeSymbol.Name.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write("ElementItemMap[childControl] = ");
             
-            #line 217 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 215 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(childType.TypeSymbol.Name.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write("Item;\r\n            }\r\n            ");
             
-            #line 219 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 217 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  firstElementToAdd = false; 
             
             #line default
             #line hidden
             this.Write("            ");
             
-            #line 220 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 218 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
@@ -782,84 +838,84 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             Validate.EnsureNotNull(NativeControl);
             var thisAs");
             
-            #line 228 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 226 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(" = (");
             
-            #line 228 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 226 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")this;\r\n            ");
             
-            #line 229 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 227 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  bool firstElementRemove = true; 
             
             #line default
             #line hidden
             this.Write("            ");
             
-            #line 230 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 228 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  foreach (var childType in _childrenTypes) { 
             
             #line default
             #line hidden
             this.Write("            ");
             
-            #line 231 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 229 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(firstElementRemove ? string.Empty : "else "));
             
             #line default
             #line hidden
             this.Write("if (_");
             
-            #line 231 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 229 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(childType.TypeSymbol.Name.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write("ElementItemMap.TryGetValue(childControl, out var ");
             
-            #line 231 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 229 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(childType.TypeSymbol.Name.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write("Item))\r\n            {\r\n                NativeControl.");
             
-            #line 233 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 231 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(childType.ChildPropertyName));
             
             #line default
             #line hidden
             this.Write(".Remove(");
             
-            #line 233 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 231 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(childType.TypeSymbol.Name.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write("Item);\r\n            }\r\n            ");
             
-            #line 235 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 233 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  firstElementRemove = false; 
             
             #line default
             #line hidden
             this.Write("            ");
             
-            #line 236 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 234 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n            base.OnRemoveChild(widget, childControl);\r\n        }\r\n        ");
             
-            #line 240 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 238 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  }
             
             #line default
@@ -867,35 +923,35 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("\r\n        protected override void OnUpdate()\r\n        {\r\n            OnBeginUpdat" +
                     "e();\r\n\r\n            ");
             
-            #line 246 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 244 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (Properties.Any() || SupportItemTemplate) { 
             
             #line default
             #line hidden
             this.Write("            Validate.EnsureNotNull(NativeControl);\r\n            var thisAs");
             
-            #line 248 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 246 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(" = (");
             
-            #line 248 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 246 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")this;\r\n            ");
             
-            #line 249 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 247 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
 }
             
             #line default
             #line hidden
             this.Write("            \r\n            ");
             
-            #line 251 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 249 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (SupportItemTemplate) { 
             
             #line default
@@ -903,14 +959,14 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("            \r\n            _loadedForciblyChildren = null;\r\n\r\n            if (this" +
                     "As");
             
-            #line 255 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 253 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(".ItemsSource != null &&\r\n                NativeControl.ItemsSource == thisAs");
             
-            #line 256 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 254 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
@@ -919,7 +975,7 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
                     "emplate);\r\n\r\n                _customDataTemplate.Owner = this;\r\n\r\n              " +
                     "  _customDataTemplate.Update();\r\n            }\r\n            else if (thisAs");
             
-            #line 264 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 262 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
@@ -927,7 +983,7 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(".ItemsSource != null)\r\n            {\r\n                _customDataTemplate = new C" +
                     "ustomDataTemplate(this);\r\n                NativeControl.ItemsSource = thisAs");
             
-            #line 267 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 265 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
@@ -935,14 +991,14 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(".ItemsSource;\r\n                NativeControl.ItemTemplate = _customDataTemplate.D" +
                     "ataTemplate;\r\n            }\r\n            else\r\n            {\r\n                ");
             
-            #line 272 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 270 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (IsGenericType) { 
             
             #line default
             #line hidden
             this.Write("                NativeControl.ClearValue(global::");
             
-            #line 273 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 271 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
@@ -950,147 +1006,147 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("<TChild>.ItemsSourceProperty);\r\n                NativeControl.ClearValue(global::" +
                     "");
             
-            #line 274 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 272 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write("<TChild>.ItemTemplateProperty);\r\n                ");
             
-            #line 275 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 273 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else { 
             
             #line default
             #line hidden
             this.Write("                NativeControl.ClearValue(global::");
             
-            #line 276 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 274 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".ItemsSourceProperty);\r\n                NativeControl.ClearValue(global::");
             
-            #line 277 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 275 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".ItemTemplateProperty);\r\n                ");
             
-            #line 278 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 276 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("            }\r\n            ");
             
-            #line 280 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 278 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n\r\n            ");
             
-            #line 283 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 281 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (Properties.Any()) { 
             
             #line default
             #line hidden
             this.Write("            ");
             
-            #line 284 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 282 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  foreach (var property in Properties) { 
             
             #line default
             #line hidden
             this.Write("            ");
             
-            #line 285 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 283 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (IsGenericType) { 
             
             #line default
             #line hidden
             this.Write("            SetPropertyValue(NativeControl, global::");
             
-            #line 286 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 284 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write("<TChild>.");
             
-            #line 286 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 284 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("Property, thisAs");
             
-            #line 286 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 284 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 286 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 284 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            ");
             
-            #line 287 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 285 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else { 
             
             #line default
             #line hidden
             this.Write("            SetPropertyValue(NativeControl, global::");
             
-            #line 288 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 286 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 288 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 286 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("Property, thisAs");
             
-            #line 288 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 286 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 288 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 286 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            ");
             
-            #line 289 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 287 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("            ");
             
-            #line 290 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 288 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n            ");
             
-            #line 292 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 290 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
@@ -1098,7 +1154,7 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("\r\n            base.OnUpdate();\r\n\r\n            OnEndUpdate();\r\n        }\r\n\r\n      " +
                     "  ");
             
-            #line 299 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 297 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (AnimatableProperties.Any()) { 
             
             #line default
@@ -1106,105 +1162,105 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("        protected override void OnAnimate()\r\n        {\r\n            OnBeginAnimat" +
                     "e();\r\n\r\n            var thisAs");
             
-            #line 304 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 302 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(" = (");
             
-            #line 304 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 302 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")this;\r\n\r\n            ");
             
-            #line 306 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 304 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  foreach (var property in AnimatableProperties) { 
             
             #line default
             #line hidden
             this.Write("            ");
             
-            #line 307 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 305 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (IsGenericType) { 
             
             #line default
             #line hidden
             this.Write("            AnimateProperty(");
             
-            #line 308 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 306 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write("<TChild>.");
             
-            #line 308 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 306 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("Property, thisAs");
             
-            #line 308 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 306 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 308 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 306 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            ");
             
-            #line 309 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 307 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else { 
             
             #line default
             #line hidden
             this.Write("            AnimateProperty(global::");
             
-            #line 310 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 308 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 310 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 308 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("Property, thisAs");
             
-            #line 310 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 308 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 310 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 308 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            ");
             
-            #line 311 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 309 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("            ");
             
-            #line 312 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 310 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
@@ -1212,16 +1268,40 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("\r\n            base.OnAnimate();\r\n\r\n            OnEndAnimate();\r\n        }\r\n      " +
                     "  ");
             
-            #line 318 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 316 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n        partial void OnBeginUpdate();\r\n        partial void OnEndUpdate();\r\n\r\n " +
-                    "       partial void OnBeginAnimate();\r\n        partial void OnEndAnimate();\r\n\r\n " +
-                    "       ");
+                    "       partial void OnBeginAnimate();\r\n        partial void OnEndAnimate();\r\n   " +
+                    "     \r\n        ");
+            
+            #line 324 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+ if (!IsGenericType) { 
+            
+            #line default
+            #line hidden
+            this.Write("        protected override void OnThemeChanged()\r\n        {\r\n            if (Them" +
+                    "eKey != null && ");
+            
+            #line 327 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
+            
+            #line default
+            #line hidden
+            this.Write("Styles.Themes.TryGetValue(ThemeKey, out var styleAction))\r\n            {\r\n       " +
+                    "         styleAction(this);\r\n            }\r\n\r\n            base.OnThemeChanged();" +
+                    "\r\n        }\r\n        ");
+            
+            #line 334 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+ } 
             
-            #line 326 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line default
+            #line hidden
+            this.Write("\r\n        ");
+            
+            #line 336 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (Events.Any()) { 
             
             #line default
@@ -1231,70 +1311,70 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
                     "     {\r\n            Validate.EnsureNotNull(NativeControl);\r\n\r\n            var th" +
                     "isAs");
             
-            #line 335 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 345 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(" = (");
             
-            #line 335 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 345 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")this;\r\n            ");
             
-            #line 336 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 346 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  foreach (var ev in Events) { 
             
             #line default
             #line hidden
             this.Write("            if (thisAs");
             
-            #line 337 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 347 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 337 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 347 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name));
             
             #line default
             #line hidden
             this.Write("Action != null || thisAs");
             
-            #line 337 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 347 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 337 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 347 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name));
             
             #line default
             #line hidden
             this.Write("ActionWithArgs != null)\r\n            {\r\n                NativeControl.");
             
-            #line 339 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 349 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name));
             
             #line default
             #line hidden
             this.Write(" += NativeControl_");
             
-            #line 339 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 349 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name));
             
             #line default
             #line hidden
             this.Write(";\r\n            }\r\n            ");
             
-            #line 341 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 351 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
@@ -1302,7 +1382,7 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("\r\n            OnAttachingNativeEvents();\r\n\r\n            base.OnAttachNativeEvents" +
                     "();\r\n        }\r\n\r\n        ");
             
-            #line 348 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 358 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  foreach (var ev in Events) { 
         var genericArgs = ((INamedTypeSymbol)ev.Type).TypeArguments;
         
@@ -1311,49 +1391,49 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             #line hidden
             this.Write("        ");
             
-            #line 351 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 361 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GetDelegateParametersDescriptor(ev)));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            var thisAs");
             
-            #line 353 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 363 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(" = (");
             
-            #line 353 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 363 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")this;\r\n            thisAs");
             
-            #line 354 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 364 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 354 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 364 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name));
             
             #line default
             #line hidden
             this.Write("Action?.Invoke();\r\n            ");
             
-            #line 355 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 365 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GetDelegateInvokeDescriptor(ev)));
             
             #line default
             #line hidden
             this.Write("\r\n        }\r\n        ");
             
-            #line 357 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 367 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
@@ -1361,28 +1441,28 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("\r\n        protected override void OnDetachNativeEvents()\r\n        {\r\n            " +
                     "if (NativeControl != null)\r\n            {\r\n            ");
             
-            #line 363 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 373 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  foreach (var ev in Events) { 
             
             #line default
             #line hidden
             this.Write("            NativeControl.");
             
-            #line 364 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 374 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name));
             
             #line default
             #line hidden
             this.Write(" -= NativeControl_");
             
-            #line 364 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 374 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name));
             
             #line default
             #line hidden
             this.Write(";\r\n            ");
             
-            #line 365 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 375 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
@@ -1390,14 +1470,14 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("            }\r\n\r\n            OnDetachingNativeEvents();\r\n\r\n            base.OnDet" +
                     "achNativeEvents();\r\n        }\r\n        ");
             
-            #line 372 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 382 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("        \r\n        ");
             
-            #line 374 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 384 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (SupportItemTemplate) { 
             
             #line default
@@ -1405,42 +1485,42 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("        protected override void OnMigrated(VisualNode newNode)\r\n        {\r\n      " +
                     "      var new");
             
-            #line 377 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 387 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write(" = ((");
             
-            #line 377 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 387 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("<T>)newNode);\r\n            new");
             
-            #line 378 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 388 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("._customDataTemplate = _customDataTemplate;\r\n            if (new");
             
-            #line 379 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 389 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("._customDataTemplate != null)\r\n            {\r\n                new");
             
-            #line 381 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 391 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("._customDataTemplate.Owner = new");
             
-            #line 381 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 391 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
@@ -1449,70 +1529,70 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
                     "\n\r\n        protected override void OnUnmount()\r\n        {\r\n            Validate." +
                     "EnsureNotNull(NativeControl);\r\n            NativeControl.ClearValue(global::");
             
-            #line 390 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 400 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".ItemsSourceProperty);\r\n            NativeControl.ClearValue(global::");
             
-            #line 391 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 401 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".ItemTemplateProperty);\r\n            base.OnUnmount();\r\n        }\r\n\r\n        ");
             
-            #line 395 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 405 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("    }\r\n\r\n    ");
             
-            #line 398 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 408 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (IsTypeNotAbstractWithEmptyConstructor && !IsTypeSealed) { 
             
             #line default
             #line hidden
             this.Write("    public partial class ");
             
-            #line 399 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 409 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write(" : ");
             
-            #line 399 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 409 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("<");
             
-            #line 399 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 409 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(">\r\n    {\r\n        public ");
             
-            #line 401 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 411 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("()\r\n        { \r\n        \r\n        }\r\n\r\n        public ");
             
-            #line 406 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 416 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("(Action<");
             
-            #line 406 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 416 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
@@ -1520,49 +1600,49 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("?> componentRefAction)\r\n            : base(componentRefAction)\r\n        {\r\n\r\n    " +
                     "    }\r\n    }\r\n    ");
             
-            #line 412 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 422 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n    ");
             
-            #line 414 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 424 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (GeneratorType.Name != TypeName) { 
             
             #line default
             #line hidden
             this.Write("    public partial class ");
             
-            #line 415 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 425 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GeneratorType.Name));
             
             #line default
             #line hidden
             this.Write(" : ");
             
-            #line 415 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 425 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("\r\n    {\r\n        public ");
             
-            #line 417 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 427 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GeneratorType.Name));
             
             #line default
             #line hidden
             this.Write("()\r\n        { \r\n        \r\n        }\r\n\r\n        public ");
             
-            #line 422 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 432 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GeneratorType.Name));
             
             #line default
             #line hidden
             this.Write("(Action<");
             
-            #line 422 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 432 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
@@ -1570,77 +1650,77 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("?> componentRefAction)\r\n            : base(componentRefAction)\r\n        {\r\n\r\n    " +
                     "    }\r\n    }\r\n    ");
             
-            #line 428 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 438 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n    public static partial class ");
             
-            #line 430 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 440 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
             
             #line default
             #line hidden
             this.Write("Extensions\r\n    {\r\n        ");
             
-            #line 432 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 442 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (SupportItemTemplate) { 
             
             #line default
             #line hidden
             this.Write("        public static T ItemsSource<T, TItem>(this T ");
             
-            #line 433 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 443 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", IEnumerable<TItem> itemsSource) where T : ");
             
-            #line 433 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 443 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 435 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 445 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".ItemsSource = itemsSource;\r\n            return ");
             
-            #line 436 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 446 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n\r\n        public static T ItemsSource<T, TItem>(this T ");
             
-            #line 439 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 449 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", IEnumerable<TItem> itemsSource, Func<TItem, VisualNode> template) where T : ");
             
-            #line 439 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 449 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 441 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 451 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".ItemsSource = itemsSource;\r\n            ");
             
-            #line 442 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 452 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
@@ -1648,1533 +1728,1533 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(".ItemTemplate = new Func<object, VisualNode>(item => template((TItem)item));\r\n   " +
                     "         return ");
             
-            #line 443 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 453 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        ");
             
-            #line 445 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 455 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n        \r\n        ");
             
-            #line 448 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 458 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  foreach (var property in Properties.GroupBy(p => p.Name).Select(g => g.First())) { 
             
             #line default
             #line hidden
             this.Write("\r\n        ");
             
-            #line 450 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 460 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (property.Type.Equals(TypeofDouble, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("\r\n        static void Set");
             
-            #line 452 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 462 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("(object ");
             
-            #line 452 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 462 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", RxAnimation animation)\r\n            => ((");
             
-            #line 453 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 463 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")");
             
-            #line 453 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 463 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(").");
             
-            #line 453 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 463 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ((RxDoubleAnimation)animation).CurrentValue();\r\n\r\n        ");
             
-            #line 455 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 465 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofFloat, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("\r\n        static void Set");
             
-            #line 457 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 467 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("(object ");
             
-            #line 457 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 467 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", RxAnimation animation)\r\n            => ((");
             
-            #line 458 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 468 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")");
             
-            #line 458 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 468 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(").");
             
-            #line 458 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 468 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ((RxFloatAnimation)animation).CurrentValue();          \r\n\r\n        ");
             
-            #line 460 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 470 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofRect, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("\r\n        static void Set");
             
-            #line 462 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 472 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("(object ");
             
-            #line 462 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 472 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", RxAnimation animation)\r\n            => ((");
             
-            #line 463 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 473 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")");
             
-            #line 463 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 473 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(").");
             
-            #line 463 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 473 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ((RxRectAnimation)animation).CurrentValue();\r\n\r\n        ");
             
-            #line 465 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 475 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofPoint, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("    \r\n        static void Set");
             
-            #line 467 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 477 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("(object ");
             
-            #line 467 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 477 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", RxAnimation animation)\r\n            => ((");
             
-            #line 468 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 478 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")");
             
-            #line 468 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 478 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(").");
             
-            #line 468 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 478 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ((RxPointAnimation)animation).CurrentValue();\r\n\r\n        ");
             
-            #line 470 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 480 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofPointF, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        \r\n        static void Set");
             
-            #line 472 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 482 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("(object ");
             
-            #line 472 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 482 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", RxAnimation animation)\r\n            => ((");
             
-            #line 473 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 483 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")");
             
-            #line 473 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 483 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(").");
             
-            #line 473 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 483 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ((RxPointFAnimation)animation).CurrentValue();\r\n\r\n        ");
             
-            #line 475 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 485 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofThickness, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        \r\n        static void Set");
             
-            #line 477 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 487 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("(object ");
             
-            #line 477 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 487 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", RxAnimation animation)\r\n            => ((");
             
-            #line 478 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 488 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")");
             
-            #line 478 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 488 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(").");
             
-            #line 478 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 488 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ((RxThicknessAnimation)animation).CurrentValue();\r\n\r\n        ");
             
-            #line 480 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 490 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofThicknessF, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        \r\n        static void Set");
             
-            #line 482 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 492 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("(object ");
             
-            #line 482 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 492 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", RxAnimation animation)\r\n            => ((");
             
-            #line 483 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 493 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")");
             
-            #line 483 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 493 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(").");
             
-            #line 483 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 493 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ((RxThicknessFAnimation)animation).CurrentValue();\r\n\r\n        ");
             
-            #line 485 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 495 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofCornerRadiusF, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        \r\n        static void Set");
             
-            #line 487 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 497 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("(object ");
             
-            #line 487 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 497 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", RxAnimation animation)\r\n            => ((");
             
-            #line 488 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 498 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")");
             
-            #line 488 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 498 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(").");
             
-            #line 488 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 498 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ((RxCornerRadiusFAnimation)animation).CurrentValue();\r\n\r\n        ");
             
-            #line 490 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 500 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofCornerRadius, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        \r\n        static void Set");
             
-            #line 492 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 502 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("(object ");
             
-            #line 492 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 502 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", RxAnimation animation)\r\n            => ((");
             
-            #line 493 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 503 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write(")");
             
-            #line 493 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 503 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(").");
             
-            #line 493 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 503 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ((RxCornerRadiusAnimation)animation).CurrentValue();\r\n        \r\n        ");
             
-            #line 495 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 505 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n        ");
             
-            #line 497 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 507 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n\r\n        ");
             
-            #line 500 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 510 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  foreach (var property in Properties) { 
             
             #line default
             #line hidden
             this.Write("\r\n        ");
             
-            #line 502 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 512 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (property.Type.Equals(TypeofDouble, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 503 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 513 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 503 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 513 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", ");
             
-            #line 503 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 513 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Type.GetFullyQualifiedName().ToReservedWordFullTypeName()));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 503 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 513 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(", RxDoubleAnimation? customAnimation = null) where T : ");
             
-            #line 503 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 513 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 505 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 515 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 505 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 515 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ");
             
-            #line 505 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 515 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(";\r\n            ");
             
-            #line 506 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 516 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 506 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 516 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 506 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 516 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("Property, customAnimation ?? new RxDoubleAnimation(");
             
-            #line 506 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 516 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write("), Set");
             
-            #line 506 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 516 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 507 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 517 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }        \r\n        ");
             
-            #line 509 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 519 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofFloat, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 510 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 520 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 510 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 520 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", ");
             
-            #line 510 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 520 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Type.GetFullyQualifiedName().ToReservedWordFullTypeName()));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 510 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 520 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(", RxFloatAnimation? customAnimation = null) where T : ");
             
-            #line 510 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 520 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 512 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 522 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 512 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 522 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ");
             
-            #line 512 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 522 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(";\r\n            ");
             
-            #line 513 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 523 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 513 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 523 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 513 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 523 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("Property, customAnimation ?? new RxFloatAnimation(");
             
-            #line 513 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 523 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write("), Set");
             
-            #line 513 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 523 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 514 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 524 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }        \r\n        ");
             
-            #line 516 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 526 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofRect, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 517 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 527 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 517 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 527 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", ");
             
-            #line 517 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 527 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Type.GetFullyQualifiedName().ToReservedWordFullTypeName()));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 517 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 527 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(", RxRectAnimation? customAnimation = null) where T : ");
             
-            #line 517 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 527 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 519 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 529 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 519 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 529 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ");
             
-            #line 519 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 529 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(";\r\n            ");
             
-            #line 520 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 530 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 520 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 530 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 520 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 530 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("Property, customAnimation ?? new RxSimpleRectAnimation(");
             
-            #line 520 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 530 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write("), Set");
             
-            #line 520 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 530 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 521 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 531 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }        \r\n        ");
             
-            #line 523 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 533 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofPoint, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 524 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 534 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 524 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 534 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", ");
             
-            #line 524 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 534 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Type.GetFullyQualifiedName().ToReservedWordFullTypeName()));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 524 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 534 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(", RxPointAnimation? customAnimation = null) where T : ");
             
-            #line 524 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 534 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 526 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 536 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 526 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 536 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ");
             
-            #line 526 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 536 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(";\r\n            ");
             
-            #line 527 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 537 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 527 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 537 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 527 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 537 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("Property, customAnimation ?? new RxSimplePointAnimation(");
             
-            #line 527 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 537 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write("), Set");
             
-            #line 527 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 537 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 528 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 538 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }        \r\n        ");
             
-            #line 530 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 540 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofPointF, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 531 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 541 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 531 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 541 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", ");
             
-            #line 531 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 541 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Type.GetFullyQualifiedName().ToReservedWordFullTypeName()));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 531 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 541 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(", RxPointFAnimation? customAnimation = null) where T : ");
             
-            #line 531 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 541 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 533 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 543 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 533 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 543 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ");
             
-            #line 533 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 543 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(";\r\n            ");
             
-            #line 534 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 544 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 534 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 544 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 534 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 544 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("Property, customAnimation ?? new RxSimplePointFAnimation(");
             
-            #line 534 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 544 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write("), Set");
             
-            #line 534 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 544 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 535 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 545 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }        \r\n        ");
             
-            #line 537 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 547 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofThickness, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 538 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 548 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 538 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 548 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", ");
             
-            #line 538 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 548 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Type.GetFullyQualifiedName().ToReservedWordFullTypeName()));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 538 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 548 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(", RxThicknessAnimation? customAnimation = null) where T : ");
             
-            #line 538 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 548 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 540 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 550 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 540 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 550 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ");
             
-            #line 540 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 550 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(";\r\n            ");
             
-            #line 541 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 551 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 541 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 551 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 541 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 551 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("Property, customAnimation ?? new RxSimpleThicknessAnimation(");
             
-            #line 541 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 551 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write("), Set");
             
-            #line 541 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 551 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 542 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 552 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }                \r\n        ");
             
-            #line 544 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 554 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofThicknessF, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 545 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 555 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 545 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 555 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", ");
             
-            #line 545 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 555 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Type.GetFullyQualifiedName().ToReservedWordFullTypeName()));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 545 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 555 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(", RxThicknessFAnimation? customAnimation = null) where T : ");
             
-            #line 545 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 555 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 547 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 557 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 547 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 557 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ");
             
-            #line 547 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 557 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(";\r\n            ");
             
-            #line 548 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 558 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 548 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 558 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 548 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 558 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("Property, customAnimation ?? new RxSimpleThicknessFAnimation(");
             
-            #line 548 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 558 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write("), Set");
             
-            #line 548 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 558 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 549 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 559 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }                \r\n        ");
             
-            #line 551 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 561 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofCornerRadiusF, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 552 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 562 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 552 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 562 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", ");
             
-            #line 552 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 562 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Type.GetFullyQualifiedName().ToReservedWordFullTypeName()));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 552 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 562 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(", RxCornerRadiusFAnimation? customAnimation = null) where T : ");
             
-            #line 552 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 562 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 554 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 564 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 554 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 564 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ");
             
-            #line 554 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 564 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(";\r\n            ");
             
-            #line 555 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 565 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 555 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 565 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 555 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 565 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("Property, customAnimation ?? new RxSimpleCornerRadiusFAnimation(");
             
-            #line 555 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 565 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write("), Set");
             
-            #line 555 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 565 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 556 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 566 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }              \r\n        ");
             
-            #line 558 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 568 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else if (property.Type.Equals(TypeofCornerRadius, SymbolEqualityComparer.Default)) { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 559 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 569 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 559 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 569 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", ");
             
-            #line 559 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 569 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Type.GetFullyQualifiedName().ToReservedWordFullTypeName()));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 559 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 569 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(", RxCornerRadiusAnimation? customAnimation = null) where T : ");
             
-            #line 559 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 569 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 561 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 571 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 561 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 571 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ");
             
-            #line 561 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 571 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(";\r\n            ");
             
-            #line 562 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 572 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 562 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 572 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 562 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 572 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("Property, customAnimation ?? new RxSimpleCornerRadiusAnimation(");
             
-            #line 562 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 572 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write("), Set");
             
-            #line 562 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 572 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 563 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 573 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        ");
             
-            #line 565 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 575 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } else { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 566 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 576 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 566 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 576 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", ");
             
-            #line 566 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 576 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Type.GetFullyQualifiedName().ToReservedWordFullTypeName()));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 566 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 576 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(") where T : ");
             
-            #line 566 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 576 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 568 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 578 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 568 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 578 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = ");
             
-            #line 568 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 578 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write(";\r\n            return ");
             
-            #line 569 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 579 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }       \r\n        ");
             
-            #line 571 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 581 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n        public static T ");
             
-            #line 573 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 583 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 573 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 583 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", Func<");
             
-            #line 573 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 583 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Type.GetFullyQualifiedName().ToReservedWordFullTypeName()));
             
             #line default
             #line hidden
             this.Write("> ");
             
-            #line 573 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 583 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write("Func) where T : ");
             
-            #line 573 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 583 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 575 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 585 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 575 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 585 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = new PropertyValue<");
             
-            #line 575 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 585 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Type.GetFullyQualifiedName().ToReservedWordFullTypeName()));
             
             #line default
             #line hidden
             this.Write(">(");
             
-            #line 575 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 585 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name.CamelCase()));
             
             #line default
             #line hidden
             this.Write("Func);\r\n            return ");
             
-            #line 576 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 586 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        ");
             
-            #line 578 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 588 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (property.Type.Name == "Thickness") { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 579 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 589 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 579 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 589 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
@@ -3182,42 +3262,42 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(", double leftRight, double topBottom, RxThicknessAnimation? customAnimation = nul" +
                     "l) where T : ");
             
-            #line 579 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 589 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 581 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 591 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 581 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 591 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = new Microsoft.Maui.Thickness(leftRight, topBottom);\r\n            ");
             
-            #line 582 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 592 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 582 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 592 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 582 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 592 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -3225,70 +3305,70 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("Property, customAnimation ?? new RxSimpleThicknessAnimation(new Microsoft.Maui.Th" +
                     "ickness(leftRight, topBottom)), Set");
             
-            #line 582 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 592 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 583 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 593 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        public static T ");
             
-            #line 585 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 595 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 585 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 595 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", double uniformSize, RxThicknessAnimation? customAnimation = null) where T : ");
             
-            #line 585 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 595 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 587 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 597 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 587 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 597 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = new Microsoft.Maui.Thickness(uniformSize);\r\n            ");
             
-            #line 588 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 598 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 588 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 598 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 588 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 598 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -3296,28 +3376,28 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("Property, customAnimation ?? new RxSimpleThicknessAnimation(new Microsoft.Maui.Th" +
                     "ickness(uniformSize)), Set");
             
-            #line 588 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 598 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 589 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 599 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        public static T ");
             
-            #line 591 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 601 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 591 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 601 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
@@ -3325,42 +3405,42 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(", double left, double top, double right, double bottom, RxThicknessAnimation? cus" +
                     "tomAnimation = null) where T : ");
             
-            #line 591 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 601 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 593 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 603 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 593 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 603 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = new Microsoft.Maui.Thickness(left, top, right, bottom);\r\n            ");
             
-            #line 594 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 604 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 594 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 604 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 594 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 604 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -3368,42 +3448,42 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("Property, customAnimation ?? new RxSimpleThicknessAnimation(new Microsoft.Maui.Th" +
                     "ickness(left, top, right, bottom)), Set");
             
-            #line 594 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 604 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 595 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 605 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        ");
             
-            #line 597 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 607 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n        ");
             
-            #line 599 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 609 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (property.Type.Name == "ThicknessF") { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 600 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 610 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 600 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 610 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
@@ -3411,42 +3491,42 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(", float leftRight, float topBottom, RxThicknessFAnimation? customAnimation = null" +
                     ") where T : ");
             
-            #line 600 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 610 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 602 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 612 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 602 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 612 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = new ThicknessF(leftRight, topBottom);\r\n            ");
             
-            #line 603 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 613 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 603 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 613 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 603 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 613 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -3454,70 +3534,70 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("Property, customAnimation ?? new RxSimpleThicknessFAnimation(new ThicknessF(leftR" +
                     "ight, topBottom)), Set");
             
-            #line 603 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 613 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 604 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 614 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        public static T ");
             
-            #line 606 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 616 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 606 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 616 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", float uniformSize, RxThicknessFAnimation? customAnimation = null) where T : ");
             
-            #line 606 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 616 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 608 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 618 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 608 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 618 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = new ThicknessF(uniformSize);\r\n            ");
             
-            #line 609 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 619 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 609 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 619 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 609 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 619 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -3525,28 +3605,28 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("Property, customAnimation ?? new RxSimpleThicknessFAnimation(new ThicknessF(unifo" +
                     "rmSize)), Set");
             
-            #line 609 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 619 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 610 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 620 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        public static T ");
             
-            #line 612 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 622 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 612 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 622 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
@@ -3554,42 +3634,42 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(", float left, float top, float right, float bottom, RxThicknessFAnimation? custom" +
                     "Animation = null) where T : ");
             
-            #line 612 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 622 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 614 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 624 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 614 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 624 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = new ThicknessF(left, top, right, bottom);\r\n            ");
             
-            #line 615 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 625 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 615 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 625 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 615 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 625 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -3597,84 +3677,84 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("Property, customAnimation ?? new RxSimpleThicknessFAnimation(new ThicknessF(left," +
                     " top, right, bottom)), Set");
             
-            #line 615 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 625 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 616 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 626 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        ");
             
-            #line 618 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 628 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("        \r\n        ");
             
-            #line 620 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 630 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (property.Type.Name == "CornerRadius") { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 621 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 631 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 621 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 631 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", float uniformSize, RxCornerRadiusAnimation? customAnimation = null) where T : ");
             
-            #line 621 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 631 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 623 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 633 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 623 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 633 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = new CornerRadius(uniformSize);\r\n            ");
             
-            #line 624 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 634 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 624 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 634 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 624 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 634 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -3682,28 +3762,28 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("Property, customAnimation ?? new RxSimpleCornerRadiusAnimation(new CornerRadius(u" +
                     "niformSize)), Set");
             
-            #line 624 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 634 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 625 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 635 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        public static T ");
             
-            #line 627 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 637 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 627 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 637 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
@@ -3711,42 +3791,42 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(",float topLeft, float topRight, float bottomRight, float bottomLeft, RxCornerRadi" +
                     "usAnimation? customAnimation = null) where T : ");
             
-            #line 627 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 637 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 629 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 639 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 629 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 639 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = new CornerRadius(topLeft, topRight, bottomRight, bottomLeft);\r\n            ");
             
-            #line 630 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 640 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 630 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 640 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 630 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 640 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -3754,42 +3834,42 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("Property, customAnimation ?? new RxSimpleCornerRadiusAnimation(new CornerRadius(t" +
                     "opLeft, topRight, bottomRight, bottomLeft)), Set");
             
-            #line 630 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 640 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 631 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 641 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        ");
             
-            #line 633 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 643 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("        \r\n        ");
             
-            #line 635 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 645 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (property.Type.Name == "CornerRadiusF") { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 636 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 646 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 636 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 646 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
@@ -3797,42 +3877,42 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(", float uniformSize, RxCornerRadiusFAnimation? customAnimation = null) where T : " +
                     "");
             
-            #line 636 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 646 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 638 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 648 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 638 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 648 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = new CornerRadiusF(uniformSize);\r\n            ");
             
-            #line 639 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 649 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 639 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 649 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 639 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 649 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -3840,28 +3920,28 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("Property, customAnimation ?? new RxSimpleCornerRadiusFAnimation(new CornerRadiusF" +
                     "(uniformSize)), Set");
             
-            #line 639 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 649 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 640 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 650 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        public static T ");
             
-            #line 642 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 652 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 642 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 652 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
@@ -3869,42 +3949,42 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(",float topLeft, float topRight, float bottomRight, float bottomLeft, RxCornerRadi" +
                     "usFAnimation? customAnimation = null) where T : ");
             
-            #line 642 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 652 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 644 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 654 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 644 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 654 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = new CornerRadiusF(topLeft, topRight, bottomRight, bottomLeft);\r\n            ");
             
-            #line 645 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 655 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".AppendAnimatable(global::");
             
-            #line 645 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 655 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(FullTypeName));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 645 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 655 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -3912,140 +3992,140 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write("Property, customAnimation ?? new RxSimpleCornerRadiusFAnimation(new CornerRadiusF" +
                     "(topLeft, topRight, bottomRight, bottomLeft)), Set");
             
-            #line 645 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 655 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n            return ");
             
-            #line 646 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 656 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        ");
             
-            #line 648 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 658 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n\r\n        ");
             
-            #line 651 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 661 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (property.Type.GetFullyQualifiedName() == "Microsoft.Maui.Graphics.Point") { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 652 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 662 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 652 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 662 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", double x, double y) where T : ");
             
-            #line 652 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 662 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 654 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 664 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 654 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 664 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = new Microsoft.Maui.Graphics.Point(x, y);\r\n            return ");
             
-            #line 655 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 665 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        ");
             
-            #line 657 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 667 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("        \r\n\r\n        ");
             
-            #line 660 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 670 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (property.Type.Name == "CornerRadius") { 
             
             #line default
             #line hidden
             this.Write("        public static T ");
             
-            #line 661 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 671 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 661 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 671 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", double uniformRadius) where T : ");
             
-            #line 661 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 671 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 663 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 673 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 663 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 673 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = new CornerRadius(uniformRadius);\r\n            return ");
             
-            #line 664 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 674 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        public static T ");
             
-            #line 666 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 676 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 666 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 676 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
@@ -4053,21 +4133,21 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(", double topLeft, double topRight, double bottomLeft, double bottomRight) where T" +
                     " : ");
             
-            #line 666 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 676 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 668 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 678 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 668 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 678 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -4075,21 +4155,21 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(" = new CornerRadius(topLeft, topRight, bottomLeft, bottomRight);\r\n            ret" +
                     "urn ");
             
-            #line 669 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 679 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        ");
             
-            #line 671 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 681 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("        ");
             
-            #line 672 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 682 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  if (property.Type.Name == "ImageSource") { 
         var propertyName = property.Name; 
             
@@ -4097,77 +4177,77 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             #line hidden
             this.Write("        public static T ");
             
-            #line 674 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 684 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(propertyName));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 674 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 684 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", string file) where T : ");
             
-            #line 674 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 684 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 676 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 686 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 676 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 686 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = Microsoft.Maui.Controls.ImageSource.FromFile(file);\r\n            return ");
             
-            #line 677 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 687 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        public static T ");
             
-            #line 679 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 689 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(propertyName));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 679 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 689 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", string resourceName, Assembly sourceAssembly) where T : ");
             
-            #line 679 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 689 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 681 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 691 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 681 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 691 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -4175,84 +4255,84 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(" = Microsoft.Maui.Controls.ImageSource.FromResource(resourceName, sourceAssembly)" +
                     ";\r\n            return ");
             
-            #line 682 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 692 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        public static T ");
             
-            #line 684 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 694 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(propertyName));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 684 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 694 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", Uri imageUri) where T : ");
             
-            #line 684 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 694 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 686 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 696 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 686 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 696 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" = Microsoft.Maui.Controls.ImageSource.FromUri(imageUri);\r\n            return ");
             
-            #line 687 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 697 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        public static T ");
             
-            #line 689 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 699 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(propertyName));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 689 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 699 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", Uri imageUri, bool cachingEnabled, TimeSpan cacheValidity) where T : ");
             
-            #line 689 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 699 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 691 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 701 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 691 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 701 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -4261,42 +4341,42 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
                     " = imageUri,\r\n                CachingEnabled = cachingEnabled,\r\n                " +
                     "CacheValidity = cacheValidity\r\n            };\r\n            return ");
             
-            #line 697 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 707 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        public static T ");
             
-            #line 699 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 709 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(propertyName));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 699 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 709 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", Func<System.IO.Stream> imageStream) where T : ");
             
-            #line 699 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 709 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 701 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 711 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 701 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 711 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
@@ -4304,28 +4384,28 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             this.Write(" = Microsoft.Maui.Controls.ImageSource.FromStream(imageStream);\r\n            retu" +
                     "rn ");
             
-            #line 702 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 712 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        ");
             
-            #line 704 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 714 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n        ");
             
-            #line 706 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 716 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("        \r\n        ");
             
-            #line 708 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 718 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  foreach (var ev in Events) {
         var genericArgs = ((INamedTypeSymbol)ev.Type).TypeArguments;
         
@@ -4334,131 +4414,166 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             #line hidden
             this.Write("        public static T On");
             
-            #line 711 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 721 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 711 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 721 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", Action? ");
             
-            #line 711 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 721 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write("Action) where T : ");
             
-            #line 711 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 721 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 713 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 723 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 713 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 723 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name));
             
             #line default
             #line hidden
             this.Write("Action = ");
             
-            #line 713 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 723 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write("Action;\r\n            return ");
             
-            #line 714 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 724 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n\r\n        public static T On");
             
-            #line 717 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 727 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name));
             
             #line default
             #line hidden
             this.Write("<T>(this T ");
             
-            #line 717 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 727 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(", Action<");
             
-            #line 717 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 727 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GetActionWithArgsParameters(ev)));
             
             #line default
             #line hidden
             this.Write(">? ");
             
-            #line 717 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 727 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write("ActionWithArgs) where T : ");
             
-            #line 717 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 727 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
             
             #line default
             #line hidden
             this.Write("\r\n        {\r\n            ");
             
-            #line 719 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 729 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 719 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 729 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name));
             
             #line default
             #line hidden
             this.Write("ActionWithArgs = ");
             
-            #line 719 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 729 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.Name.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write("ActionWithArgs;\r\n            return ");
             
-            #line 720 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 730 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName.ToLocalVariableName()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n        ");
             
-            #line 722 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            #line 732 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+ } 
+            
+            #line default
+            #line hidden
+            this.Write("    }\r\n\r\n    ");
+            
+            #line 735 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+ if (!IsGenericType) { 
+            
+            #line default
+            #line hidden
+            this.Write("    public static partial class ");
+            
+            #line 736 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
+            
+            #line default
+            #line hidden
+            this.Write("Styles\r\n    {\r\n\r\n        public static Action<");
+            
+            #line 739 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
+            
+            #line default
+            #line hidden
+            this.Write(">? Default { get; set; }\r\n\r\n        public static Dictionary<string, Action<");
+            
+            #line 741 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(InterfaceName));
+            
+            #line default
+            #line hidden
+            this.Write(">> Themes { get; } = [];\r\n    }\r\n    ");
+            
+            #line 743 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 
             
             #line default
             #line hidden
-            this.Write("    }\r\n}\r\n");
+            this.Write("}\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.tt b/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.tt
index 3072280b..6fb8503b 100644
--- a/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.tt
+++ b/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.tt
@@ -50,65 +50,63 @@ namespace <#= Namespace #>
     {
         public <#= TypeName #>()
         { 
-        
+            <#= TypeName #>Styles.Default?.Invoke(this);
         }
 
         public <#= TypeName #>(Action<T?> componentRefAction)
             : base(componentRefAction)
         {
-
+            <#= TypeName #>Styles.Default?.Invoke(this);
         }
     <# } else if (IsGenericType) { #>
     public abstract partial class <#= TypeName #><T, TChild> : <#= BaseTypeName() #><T>, <#= InterfaceName #><#= SupportItemTemplate ? ", ICustomDataTemplateOwner" : string.Empty #> where T : <#= FullTypeName #><TChild>, new() where TChild : <#= GenericArgumentBaseFullTypeName #>
     {
         public <#= TypeName #>()
         { 
-        
         }
 
         public <#= TypeName #>(Action<T?> componentRefAction)
             : base(componentRefAction)
         {
-
         }
     <# } else if (IsTypeSealed) { #>
     public sealed partial class <#= TypeName #> : <#= BaseTypeName() #><<#= FullTypeName #>>, <#= InterfaceName #><#= SupportItemTemplate ? ", ICustomDataTemplateOwner, IAutomationItemContainer" : string.Empty #>
     {
         public <#= TypeName #>()
         { 
-        
+            <#= TypeName #>Styles.Default?.Invoke(this);
         }
 
         public <#= TypeName #>(Action<<#= FullTypeName #>?> componentRefAction)
             : base(componentRefAction)
         {
-
+            <#= TypeName #>Styles.Default?.Invoke(this);
         }
     <# } else if (IsTypeNotAbstractWithEmptyConstructor) { #>
     public partial class <#= TypeName #><T> : <#= BaseTypeName() #><T>, <#= InterfaceName #><#= SupportItemTemplate ? ", ICustomDataTemplateOwner, IAutomationItemContainer" : string.Empty #> where T : <#= FullTypeName #>, new()
     {
         public <#= TypeName #>()
         { 
-        
+            <#= TypeName #>Styles.Default?.Invoke(this);
         }
 
         public <#= TypeName #>(Action<T?> componentRefAction)
             : base(componentRefAction)
         {
-
+            <#= TypeName #>Styles.Default?.Invoke(this);
         }
     <# } else { #>
     public abstract partial class <#= TypeName #><T> : <#= BaseTypeName() #><T>, <#= InterfaceName #> <#= SupportItemTemplate ? ", ICustomDataTemplateOwner, IAutomationItemContainer" : string.Empty #> where T : <#= FullTypeName #>, new()
     {
         protected <#= TypeName #>()
         { 
-        
+            <#= TypeName #>Styles.Default?.Invoke(this);
         }
 
         protected <#= TypeName #>(Action<T?> componentRefAction)
             : base(componentRefAction)
         {
-
+            <#= TypeName #>Styles.Default?.Invoke(this);
         }    
     <# } #>
         <# if (SupportItemTemplate) { #>
@@ -322,6 +320,18 @@ namespace <#= Namespace #>
 
         partial void OnBeginAnimate();
         partial void OnEndAnimate();
+        
+        <# if (!IsGenericType) { #>
+        protected override void OnThemeChanged()
+        {
+            if (ThemeKey != null && <#= TypeName #>Styles.Themes.TryGetValue(ThemeKey, out var styleAction))
+            {
+                styleAction(this);
+            }
+
+            base.OnThemeChanged();
+        }
+        <# } #>
 
         <# if (Events.Any()) { #>
 
@@ -721,4 +731,14 @@ namespace <#= Namespace #>
         }
         <# } #>
     }
+
+    <# if (!IsGenericType) { #>
+    public static partial class <#= TypeName #>Styles
+    {
+
+        public static Action<<#= InterfaceName #>>? Default { get; set; }
+
+        public static Dictionary<string, Action<<#= InterfaceName #>>> Themes { get; } = [];
+    }
+    <# } #>
 }
diff --git a/src/MauiReactor/AbsoluteLayout.cs b/src/MauiReactor/AbsoluteLayout.cs
index 1db27049..b2438475 100644
--- a/src/MauiReactor/AbsoluteLayout.cs
+++ b/src/MauiReactor/AbsoluteLayout.cs
@@ -18,10 +18,12 @@ public partial interface IAbsoluteLayout : ILayout
 {
     public AbsoluteLayout()
     {
+        AbsoluteLayoutStyles.Default?.Invoke(this);
     }
 
     public AbsoluteLayout(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        AbsoluteLayoutStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && AbsoluteLayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class AbsoluteLayout : AbsoluteLayout<Microsoft.Maui.Controls.AbsoluteLayout>
@@ -57,4 +68,10 @@ public AbsoluteLayout(Action<Microsoft.Maui.Controls.AbsoluteLayout?> componentR
 
 public static partial class AbsoluteLayoutExtensions
 {
+}
+
+public static partial class AbsoluteLayoutStyles
+{
+    public static Action<IAbsoluteLayout>? Default { get; set; }
+    public static Dictionary<string, Action<IAbsoluteLayout>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ActivityIndicator.cs b/src/MauiReactor/ActivityIndicator.cs
index 461afbc7..8dd8dd40 100644
--- a/src/MauiReactor/ActivityIndicator.cs
+++ b/src/MauiReactor/ActivityIndicator.cs
@@ -21,10 +21,12 @@ public partial interface IActivityIndicator : IView
 {
     public ActivityIndicator()
     {
+        ActivityIndicatorStyles.Default?.Invoke(this);
     }
 
     public ActivityIndicator(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ActivityIndicatorStyles.Default?.Invoke(this);
     }
 
     object? IActivityIndicator.IsRunning { get; set; }
@@ -56,6 +58,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ActivityIndicatorStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class ActivityIndicator : ActivityIndicator<Microsoft.Maui.Controls.ActivityIndicator>
@@ -98,4 +109,10 @@ public static T Color<T>(this T activityIndicator, Func<Microsoft.Maui.Graphics.
         activityIndicator.Color = new PropertyValue<Microsoft.Maui.Graphics.Color>(colorFunc);
         return activityIndicator;
     }
+}
+
+public static partial class ActivityIndicatorStyles
+{
+    public static Action<IActivityIndicator>? Default { get; set; }
+    public static Dictionary<string, Action<IActivityIndicator>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/BaseMenuItem.cs b/src/MauiReactor/BaseMenuItem.cs
index 4ad11d3e..64cbb79e 100644
--- a/src/MauiReactor/BaseMenuItem.cs
+++ b/src/MauiReactor/BaseMenuItem.cs
@@ -18,10 +18,12 @@ public partial interface IBaseMenuItem : IElement
 {
     protected BaseMenuItem()
     {
+        BaseMenuItemStyles.Default?.Invoke(this);
     }
 
     protected BaseMenuItem(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        BaseMenuItemStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,8 +44,23 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && BaseMenuItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class BaseMenuItemExtensions
 {
+}
+
+public static partial class BaseMenuItemStyles
+{
+    public static Action<IBaseMenuItem>? Default { get; set; }
+    public static Dictionary<string, Action<IBaseMenuItem>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/BaseShellItem.cs b/src/MauiReactor/BaseShellItem.cs
index 8c392477..dabf7617 100644
--- a/src/MauiReactor/BaseShellItem.cs
+++ b/src/MauiReactor/BaseShellItem.cs
@@ -35,10 +35,12 @@ public partial interface IBaseShellItem : INavigableElement
 {
     public BaseShellItem()
     {
+        BaseShellItemStyles.Default?.Invoke(this);
     }
 
     public BaseShellItem(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        BaseShellItemStyles.Default?.Invoke(this);
     }
 
     object? IBaseShellItem.FlyoutIcon { get; set; }
@@ -94,6 +96,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && BaseShellItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -345,4 +357,10 @@ public static T OnDisappearing<T>(this T baseShellItem, Action<object?, EventArg
         baseShellItem.DisappearingActionWithArgs = disappearingActionWithArgs;
         return baseShellItem;
     }
+}
+
+public static partial class BaseShellItemStyles
+{
+    public static Action<IBaseShellItem>? Default { get; set; }
+    public static Dictionary<string, Action<IBaseShellItem>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Behavior.cs b/src/MauiReactor/Behavior.cs
index 8675d653..b5780d22 100644
--- a/src/MauiReactor/Behavior.cs
+++ b/src/MauiReactor/Behavior.cs
@@ -18,10 +18,12 @@ public partial interface IBehavior : IVisualNode
 {
     protected Behavior()
     {
+        BehaviorStyles.Default?.Invoke(this);
     }
 
     protected Behavior(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        BehaviorStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,8 +44,23 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && BehaviorStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class BehaviorExtensions
 {
+}
+
+public static partial class BehaviorStyles
+{
+    public static Action<IBehavior>? Default { get; set; }
+    public static Dictionary<string, Action<IBehavior>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Border.cs b/src/MauiReactor/Border.cs
index 224c858e..6bea6963 100644
--- a/src/MauiReactor/Border.cs
+++ b/src/MauiReactor/Border.cs
@@ -33,10 +33,12 @@ public partial interface IBorder : IView
 {
     public Border()
     {
+        BorderStyles.Default?.Invoke(this);
     }
 
     public Border(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        BorderStyles.Default?.Invoke(this);
     }
 
     object? IBorder.Padding { get; set; }
@@ -104,6 +106,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && BorderStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class Border : Border<Microsoft.Maui.Controls.Border>
@@ -262,4 +273,10 @@ public static T StrokeMiterLimit<T>(this T border, Func<double> strokeMiterLimit
         border.StrokeMiterLimit = new PropertyValue<double>(strokeMiterLimitFunc);
         return border;
     }
+}
+
+public static partial class BorderStyles
+{
+    public static Action<IBorder>? Default { get; set; }
+    public static Dictionary<string, Action<IBorder>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/BoxView.cs b/src/MauiReactor/BoxView.cs
index a564a260..79f54d53 100644
--- a/src/MauiReactor/BoxView.cs
+++ b/src/MauiReactor/BoxView.cs
@@ -21,10 +21,12 @@ public partial interface IBoxView : IView
 {
     public BoxView()
     {
+        BoxViewStyles.Default?.Invoke(this);
     }
 
     public BoxView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        BoxViewStyles.Default?.Invoke(this);
     }
 
     object? IBoxView.Color { get; set; }
@@ -65,6 +67,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && BoxViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class BoxView : BoxView<Microsoft.Maui.Controls.BoxView>
@@ -125,4 +136,10 @@ public static T CornerRadius<T>(this T boxView, double topLeft, double topRight,
         boxView.AppendAnimatable(Microsoft.Maui.Controls.BoxView.CornerRadiusProperty, customAnimation ?? new RxSimpleCornerRadiusAnimation(new CornerRadius(topLeft, topRight, bottomLeft, bottomRight)), SetCornerRadius);
         return boxView;
     }
+}
+
+public static partial class BoxViewStyles
+{
+    public static Action<IBoxView>? Default { get; set; }
+    public static Dictionary<string, Action<IBoxView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Button.cs b/src/MauiReactor/Button.cs
index 9fd27e71..52860e04 100644
--- a/src/MauiReactor/Button.cs
+++ b/src/MauiReactor/Button.cs
@@ -59,10 +59,12 @@ public partial interface IButton : IView
 {
     public Button()
     {
+        ButtonStyles.Default?.Invoke(this);
     }
 
     public Button(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ButtonStyles.Default?.Invoke(this);
     }
 
     object? IButton.ContentLayout { get; set; }
@@ -176,6 +178,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ButtonStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -579,4 +591,10 @@ public static T OnReleased<T>(this T button, Action<object?, EventArgs>? release
         button.ReleasedActionWithArgs = releasedActionWithArgs;
         return button;
     }
+}
+
+public static partial class ButtonStyles
+{
+    public static Action<IButton>? Default { get; set; }
+    public static Dictionary<string, Action<IButton>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/CarouselView.cs b/src/MauiReactor/CarouselView.cs
index dfe56748..eba2390b 100644
--- a/src/MauiReactor/CarouselView.cs
+++ b/src/MauiReactor/CarouselView.cs
@@ -39,10 +39,12 @@ public partial interface ICarouselView : IItemsView
 {
     public CarouselView()
     {
+        CarouselViewStyles.Default?.Invoke(this);
     }
 
     public CarouselView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        CarouselViewStyles.Default?.Invoke(this);
     }
 
     object? ICarouselView.Loop { get; set; }
@@ -115,6 +117,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && CarouselViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -326,4 +338,10 @@ public static T OnPositionChanged<T>(this T carouselView, Action<object?, Positi
         carouselView.PositionChangedActionWithArgs = positionChangedActionWithArgs;
         return carouselView;
     }
+}
+
+public static partial class CarouselViewStyles
+{
+    public static Action<ICarouselView>? Default { get; set; }
+    public static Dictionary<string, Action<ICarouselView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Cell.cs b/src/MauiReactor/Cell.cs
index 38408de3..24377975 100644
--- a/src/MauiReactor/Cell.cs
+++ b/src/MauiReactor/Cell.cs
@@ -31,10 +31,12 @@ public partial interface ICell : IElement
 {
     protected Cell()
     {
+        CellStyles.Default?.Invoke(this);
     }
 
     protected Cell(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        CellStyles.Default?.Invoke(this);
     }
 
     object? ICell.IsEnabled { get; set; }
@@ -80,6 +82,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && CellStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -197,4 +209,10 @@ public static T OnTapped<T>(this T cell, Action<object?, EventArgs>? tappedActio
         cell.TappedActionWithArgs = tappedActionWithArgs;
         return cell;
     }
+}
+
+public static partial class CellStyles
+{
+    public static Action<ICell>? Default { get; set; }
+    public static Dictionary<string, Action<ICell>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/CheckBox.cs b/src/MauiReactor/CheckBox.cs
index a4ce1ea8..44528308 100644
--- a/src/MauiReactor/CheckBox.cs
+++ b/src/MauiReactor/CheckBox.cs
@@ -25,10 +25,12 @@ public partial interface ICheckBox : IView
 {
     public CheckBox()
     {
+        CheckBoxStyles.Default?.Invoke(this);
     }
 
     public CheckBox(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        CheckBoxStyles.Default?.Invoke(this);
     }
 
     object? ICheckBox.IsChecked { get; set; }
@@ -66,6 +68,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && CheckBoxStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -154,4 +166,10 @@ public static T OnCheckedChanged<T>(this T checkBox, Action<object?, CheckedChan
         checkBox.CheckedChangedActionWithArgs = checkedChangedActionWithArgs;
         return checkBox;
     }
+}
+
+public static partial class CheckBoxStyles
+{
+    public static Action<ICheckBox>? Default { get; set; }
+    public static Dictionary<string, Action<ICheckBox>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/CollectionView.cs b/src/MauiReactor/CollectionView.cs
index 35a34922..9e84707f 100644
--- a/src/MauiReactor/CollectionView.cs
+++ b/src/MauiReactor/CollectionView.cs
@@ -18,10 +18,12 @@ public partial interface ICollectionView : IReorderableItemsView
 {
     public CollectionView()
     {
+        CollectionViewStyles.Default?.Invoke(this);
     }
 
     public CollectionView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        CollectionViewStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && CollectionViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class CollectionView : CollectionView<Microsoft.Maui.Controls.CollectionView>
@@ -57,4 +68,10 @@ public CollectionView(Action<Microsoft.Maui.Controls.CollectionView?> componentR
 
 public static partial class CollectionViewExtensions
 {
+}
+
+public static partial class CollectionViewStyles
+{
+    public static Action<ICollectionView>? Default { get; set; }
+    public static Dictionary<string, Action<ICollectionView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Compatibility/Layout.cs b/src/MauiReactor/Compatibility/Layout.cs
index d222e8d2..ecd6449f 100644
--- a/src/MauiReactor/Compatibility/Layout.cs
+++ b/src/MauiReactor/Compatibility/Layout.cs
@@ -27,10 +27,12 @@ public partial interface ILayout : IView
 {
     protected Layout()
     {
+        LayoutStyles.Default?.Invoke(this);
     }
 
     protected Layout(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        LayoutStyles.Default?.Invoke(this);
     }
 
     object? ILayout.IsClippedToBounds { get; set; }
@@ -81,6 +83,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && LayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -198,4 +210,10 @@ public static T OnLayoutChanged<T>(this T layout, Action<object?, EventArgs>? la
         layout.LayoutChangedActionWithArgs = layoutChangedActionWithArgs;
         return layout;
     }
+}
+
+public static partial class LayoutStyles
+{
+    public static Action<ILayout>? Default { get; set; }
+    public static Dictionary<string, Action<ILayout>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ContentPage.cs b/src/MauiReactor/ContentPage.cs
index 1a656593..45b1b304 100644
--- a/src/MauiReactor/ContentPage.cs
+++ b/src/MauiReactor/ContentPage.cs
@@ -19,10 +19,12 @@ public partial interface IContentPage : ITemplatedPage
 {
     public ContentPage()
     {
+        ContentPageStyles.Default?.Invoke(this);
     }
 
     public ContentPage(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ContentPageStyles.Default?.Invoke(this);
     }
 
     object? IContentPage.HideSoftInputOnTapped { get; set; }
@@ -50,6 +52,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ContentPageStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class ContentPage : ContentPage<Microsoft.Maui.Controls.ContentPage>
@@ -78,4 +89,10 @@ public static T HideSoftInputOnTapped<T>(this T contentPage, Func<bool> hideSoft
         contentPage.HideSoftInputOnTapped = new PropertyValue<bool>(hideSoftInputOnTappedFunc);
         return contentPage;
     }
+}
+
+public static partial class ContentPageStyles
+{
+    public static Action<IContentPage>? Default { get; set; }
+    public static Dictionary<string, Action<IContentPage>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ContentView.cs b/src/MauiReactor/ContentView.cs
index 747c2868..7d87c295 100644
--- a/src/MauiReactor/ContentView.cs
+++ b/src/MauiReactor/ContentView.cs
@@ -18,10 +18,12 @@ public partial interface IContentView : ITemplatedView
 {
     public ContentView()
     {
+        ContentViewStyles.Default?.Invoke(this);
     }
 
     public ContentView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ContentViewStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ContentViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class ContentView : ContentView<Microsoft.Maui.Controls.ContentView>
@@ -57,4 +68,10 @@ public ContentView(Action<Microsoft.Maui.Controls.ContentView?> componentRefActi
 
 public static partial class ContentViewExtensions
 {
+}
+
+public static partial class ContentViewStyles
+{
+    public static Action<IContentView>? Default { get; set; }
+    public static Dictionary<string, Action<IContentView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/DatePicker.cs b/src/MauiReactor/DatePicker.cs
index c1088b47..49c275b2 100644
--- a/src/MauiReactor/DatePicker.cs
+++ b/src/MauiReactor/DatePicker.cs
@@ -41,10 +41,12 @@ public partial interface IDatePicker : IView
 {
     public DatePicker()
     {
+        DatePickerStyles.Default?.Invoke(this);
     }
 
     public DatePicker(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        DatePickerStyles.Default?.Invoke(this);
     }
 
     object? IDatePicker.Format { get; set; }
@@ -124,6 +126,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && DatePickerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -328,4 +340,10 @@ public static T OnDateSelected<T>(this T datePicker, Action<object?, DateChanged
         datePicker.DateSelectedActionWithArgs = dateSelectedActionWithArgs;
         return datePicker;
     }
+}
+
+public static partial class DatePickerStyles
+{
+    public static Action<IDatePicker>? Default { get; set; }
+    public static Dictionary<string, Action<IDatePicker>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/DragGestureRecognizer.cs b/src/MauiReactor/DragGestureRecognizer.cs
index cc6f3cf8..1db5d5c5 100644
--- a/src/MauiReactor/DragGestureRecognizer.cs
+++ b/src/MauiReactor/DragGestureRecognizer.cs
@@ -27,10 +27,12 @@ public partial interface IDragGestureRecognizer : IGestureRecognizer
 {
     public DragGestureRecognizer()
     {
+        DragGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     public DragGestureRecognizer(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        DragGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     object? IDragGestureRecognizer.CanDrag { get; set; }
@@ -70,6 +72,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && DragGestureRecognizerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -171,4 +183,10 @@ public static T OnDragStarting<T>(this T dragGestureRecognizer, Action<object?,
         dragGestureRecognizer.DragStartingActionWithArgs = dragStartingActionWithArgs;
         return dragGestureRecognizer;
     }
+}
+
+public static partial class DragGestureRecognizerStyles
+{
+    public static Action<IDragGestureRecognizer>? Default { get; set; }
+    public static Dictionary<string, Action<IDragGestureRecognizer>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/DropGestureRecognizer.cs b/src/MauiReactor/DropGestureRecognizer.cs
index 14b12c2a..0b78dbfd 100644
--- a/src/MauiReactor/DropGestureRecognizer.cs
+++ b/src/MauiReactor/DropGestureRecognizer.cs
@@ -31,10 +31,12 @@ public partial interface IDropGestureRecognizer : IGestureRecognizer
 {
     public DropGestureRecognizer()
     {
+        DropGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     public DropGestureRecognizer(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        DropGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     object? IDropGestureRecognizer.AllowDrop { get; set; }
@@ -80,6 +82,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && DropGestureRecognizerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -208,4 +220,10 @@ public static T OnDrop<T>(this T dropGestureRecognizer, Action<object?, DropEven
         dropGestureRecognizer.DropActionWithArgs = dropActionWithArgs;
         return dropGestureRecognizer;
     }
+}
+
+public static partial class DropGestureRecognizerStyles
+{
+    public static Action<IDropGestureRecognizer>? Default { get; set; }
+    public static Dictionary<string, Action<IDropGestureRecognizer>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Editor.cs b/src/MauiReactor/Editor.cs
index f04e5250..45f1313d 100644
--- a/src/MauiReactor/Editor.cs
+++ b/src/MauiReactor/Editor.cs
@@ -27,10 +27,12 @@ public partial interface IEditor : IInputView
 {
     public Editor()
     {
+        EditorStyles.Default?.Invoke(this);
     }
 
     public Editor(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        EditorStyles.Default?.Invoke(this);
     }
 
     object? IEditor.AutoSize { get; set; }
@@ -72,6 +74,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && EditorStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -174,4 +186,10 @@ public static T OnCompleted<T>(this T editor, Action<object?, EventArgs>? comple
         editor.CompletedActionWithArgs = completedActionWithArgs;
         return editor;
     }
+}
+
+public static partial class EditorStyles
+{
+    public static Action<IEditor>? Default { get; set; }
+    public static Dictionary<string, Action<IEditor>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Element.cs b/src/MauiReactor/Element.cs
index f7b72501..e94a5cd8 100644
--- a/src/MauiReactor/Element.cs
+++ b/src/MauiReactor/Element.cs
@@ -53,10 +53,12 @@ public partial interface IElement : IVisualNode
 {
     protected Element()
     {
+        ElementStyles.Default?.Invoke(this);
     }
 
     protected Element(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ElementStyles.Default?.Invoke(this);
     }
 
     object? IElement.AutomationId { get; set; }
@@ -136,6 +138,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ElementStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -402,4 +414,10 @@ public static T OnHandlerChanged<T>(this T element, Action<object?, EventArgs>?
         element.HandlerChangedActionWithArgs = handlerChangedActionWithArgs;
         return element;
     }
+}
+
+public static partial class ElementStyles
+{
+    public static Action<IElement>? Default { get; set; }
+    public static Dictionary<string, Action<IElement>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Element.partial.cs b/src/MauiReactor/Element.partial.cs
index 3fc11416..f6e694d5 100644
--- a/src/MauiReactor/Element.partial.cs
+++ b/src/MauiReactor/Element.partial.cs
@@ -3,9 +3,9 @@
 
 namespace MauiReactor
 {
-    public partial interface IElement : IVisualNode
+    public partial interface IElement : IVisualNodeWithAttachedProperties
     {
-        void SetAttachedProperty(BindableProperty property, object value);
+        //void SetAttachedProperty(BindableProperty property, object value);
 
     }
 
diff --git a/src/MauiReactor/Entry.cs b/src/MauiReactor/Entry.cs
index 34c82894..0ecc3baf 100644
--- a/src/MauiReactor/Entry.cs
+++ b/src/MauiReactor/Entry.cs
@@ -31,10 +31,12 @@ public partial interface IEntry : IInputView
 {
     public Entry()
     {
+        EntryStyles.Default?.Invoke(this);
     }
 
     public Entry(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        EntryStyles.Default?.Invoke(this);
     }
 
     object? IEntry.ReturnType { get; set; }
@@ -84,6 +86,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && EntryStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -214,4 +226,10 @@ public static T OnCompleted<T>(this T entry, Action<object?, EventArgs>? complet
         entry.CompletedActionWithArgs = completedActionWithArgs;
         return entry;
     }
+}
+
+public static partial class EntryStyles
+{
+    public static Action<IEntry>? Default { get; set; }
+    public static Dictionary<string, Action<IEntry>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/EntryCell.cs b/src/MauiReactor/EntryCell.cs
index 8ef55a1a..965d493f 100644
--- a/src/MauiReactor/EntryCell.cs
+++ b/src/MauiReactor/EntryCell.cs
@@ -35,10 +35,12 @@ public partial interface IEntryCell : ICell
 {
     public EntryCell()
     {
+        EntryCellStyles.Default?.Invoke(this);
     }
 
     public EntryCell(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        EntryCellStyles.Default?.Invoke(this);
     }
 
     object? IEntryCell.Text { get; set; }
@@ -96,6 +98,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && EntryCellStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -254,4 +266,10 @@ public static T OnCompleted<T>(this T entryCell, Action<object?, EventArgs>? com
         entryCell.CompletedActionWithArgs = completedActionWithArgs;
         return entryCell;
     }
+}
+
+public static partial class EntryCellStyles
+{
+    public static Action<IEntryCell>? Default { get; set; }
+    public static Dictionary<string, Action<IEntryCell>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/FlexLayout.cs b/src/MauiReactor/FlexLayout.cs
index 4adf5ff1..3594873e 100644
--- a/src/MauiReactor/FlexLayout.cs
+++ b/src/MauiReactor/FlexLayout.cs
@@ -29,10 +29,12 @@ public partial interface IFlexLayout : ILayout
 {
     public FlexLayout()
     {
+        FlexLayoutStyles.Default?.Invoke(this);
     }
 
     public FlexLayout(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        FlexLayoutStyles.Default?.Invoke(this);
     }
 
     object? IFlexLayout.Direction { get; set; }
@@ -80,6 +82,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && FlexLayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class FlexLayout : FlexLayout<Microsoft.Maui.Controls.FlexLayout>
@@ -178,4 +189,10 @@ public static T Wrap<T>(this T flexLayout, Func<Microsoft.Maui.Layouts.FlexWrap>
         flexLayout.Wrap = new PropertyValue<Microsoft.Maui.Layouts.FlexWrap>(wrapFunc);
         return flexLayout;
     }
+}
+
+public static partial class FlexLayoutStyles
+{
+    public static Action<IFlexLayout>? Default { get; set; }
+    public static Dictionary<string, Action<IFlexLayout>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/FlyoutBase.cs b/src/MauiReactor/FlyoutBase.cs
index f2b5443a..cff91bb8 100644
--- a/src/MauiReactor/FlyoutBase.cs
+++ b/src/MauiReactor/FlyoutBase.cs
@@ -18,10 +18,12 @@ public partial interface IFlyoutBase : IElement
 {
     protected FlyoutBase()
     {
+        FlyoutBaseStyles.Default?.Invoke(this);
     }
 
     protected FlyoutBase(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        FlyoutBaseStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,8 +44,23 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && FlyoutBaseStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class FlyoutBaseExtensions
 {
+}
+
+public static partial class FlyoutBaseStyles
+{
+    public static Action<IFlyoutBase>? Default { get; set; }
+    public static Dictionary<string, Action<IFlyoutBase>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/FlyoutItem.cs b/src/MauiReactor/FlyoutItem.cs
index 2a1ac061..3f97225b 100644
--- a/src/MauiReactor/FlyoutItem.cs
+++ b/src/MauiReactor/FlyoutItem.cs
@@ -18,10 +18,12 @@ public partial interface IFlyoutItem : IShellItem
 {
     public FlyoutItem()
     {
+        FlyoutItemStyles.Default?.Invoke(this);
     }
 
     public FlyoutItem(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        FlyoutItemStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && FlyoutItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class FlyoutItem : FlyoutItem<Microsoft.Maui.Controls.FlyoutItem>
@@ -57,4 +68,10 @@ public FlyoutItem(Action<Microsoft.Maui.Controls.FlyoutItem?> componentRefAction
 
 public static partial class FlyoutItemExtensions
 {
+}
+
+public static partial class FlyoutItemStyles
+{
+    public static Action<IFlyoutItem>? Default { get; set; }
+    public static Dictionary<string, Action<IFlyoutItem>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/FlyoutPage.cs b/src/MauiReactor/FlyoutPage.cs
index eeffed7b..13d564be 100644
--- a/src/MauiReactor/FlyoutPage.cs
+++ b/src/MauiReactor/FlyoutPage.cs
@@ -27,10 +27,12 @@ public partial interface IFlyoutPage : IPage
 {
     public FlyoutPage()
     {
+        FlyoutPageStyles.Default?.Invoke(this);
     }
 
     public FlyoutPage(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        FlyoutPageStyles.Default?.Invoke(this);
     }
 
     object? IFlyoutPage.IsGestureEnabled { get; set; }
@@ -72,6 +74,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && FlyoutPageStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -174,4 +186,10 @@ public static T OnIsPresentedChanged<T>(this T flyoutPage, Action<object?, Event
         flyoutPage.IsPresentedChangedActionWithArgs = isPresentedChangedActionWithArgs;
         return flyoutPage;
     }
+}
+
+public static partial class FlyoutPageStyles
+{
+    public static Action<IFlyoutPage>? Default { get; set; }
+    public static Dictionary<string, Action<IFlyoutPage>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Frame.cs b/src/MauiReactor/Frame.cs
index e7eebf1c..f358dc09 100644
--- a/src/MauiReactor/Frame.cs
+++ b/src/MauiReactor/Frame.cs
@@ -23,10 +23,12 @@ public partial interface IFrame : IContentView
 {
     public Frame()
     {
+        FrameStyles.Default?.Invoke(this);
     }
 
     public Frame(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        FrameStyles.Default?.Invoke(this);
     }
 
     object? IFrame.BorderColor { get; set; }
@@ -62,6 +64,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && FrameStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class Frame : Frame<Microsoft.Maui.Controls.Frame>
@@ -118,4 +129,10 @@ public static T CornerRadius<T>(this T frame, Func<float> cornerRadiusFunc)
         frame.CornerRadius = new PropertyValue<float>(cornerRadiusFunc);
         return frame;
     }
+}
+
+public static partial class FrameStyles
+{
+    public static Action<IFrame>? Default { get; set; }
+    public static Dictionary<string, Action<IFrame>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/GestureRecognizer.cs b/src/MauiReactor/GestureRecognizer.cs
index d962549d..1e8a50d7 100644
--- a/src/MauiReactor/GestureRecognizer.cs
+++ b/src/MauiReactor/GestureRecognizer.cs
@@ -18,10 +18,12 @@ public partial interface IGestureRecognizer : IElement
 {
     public GestureRecognizer()
     {
+        GestureRecognizerStyles.Default?.Invoke(this);
     }
 
     public GestureRecognizer(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        GestureRecognizerStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && GestureRecognizerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class GestureRecognizer : GestureRecognizer<Microsoft.Maui.Controls.GestureRecognizer>
@@ -57,4 +68,10 @@ public GestureRecognizer(Action<Microsoft.Maui.Controls.GestureRecognizer?> comp
 
 public static partial class GestureRecognizerExtensions
 {
+}
+
+public static partial class GestureRecognizerStyles
+{
+    public static Action<IGestureRecognizer>? Default { get; set; }
+    public static Dictionary<string, Action<IGestureRecognizer>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/GraphicsView.cs b/src/MauiReactor/GraphicsView.cs
index f6af87a3..b30eaf33 100644
--- a/src/MauiReactor/GraphicsView.cs
+++ b/src/MauiReactor/GraphicsView.cs
@@ -47,10 +47,12 @@ public partial interface IGraphicsView : IView
 {
     public GraphicsView()
     {
+        GraphicsViewStyles.Default?.Invoke(this);
     }
 
     public GraphicsView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        GraphicsViewStyles.Default?.Invoke(this);
     }
 
     object? IGraphicsView.Drawable { get; set; }
@@ -120,6 +122,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && GraphicsViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -356,4 +368,10 @@ public static T OnCancelInteraction<T>(this T graphicsView, Action<object?, Even
         graphicsView.CancelInteractionActionWithArgs = cancelInteractionActionWithArgs;
         return graphicsView;
     }
+}
+
+public static partial class GraphicsViewStyles
+{
+    public static Action<IGraphicsView>? Default { get; set; }
+    public static Dictionary<string, Action<IGraphicsView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Grid.cs b/src/MauiReactor/Grid.cs
index 8f4605b7..68d60408 100644
--- a/src/MauiReactor/Grid.cs
+++ b/src/MauiReactor/Grid.cs
@@ -21,10 +21,12 @@ public partial interface IGrid : ILayout
 {
     public Grid()
     {
+        GridStyles.Default?.Invoke(this);
     }
 
     public Grid(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        GridStyles.Default?.Invoke(this);
     }
 
     object? IGrid.RowSpacing { get; set; }
@@ -66,6 +68,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && GridStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class Grid : Grid<Microsoft.Maui.Controls.Grid>
@@ -112,4 +123,10 @@ public static T ColumnSpacing<T>(this T grid, Func<double> columnSpacingFunc)
         grid.ColumnSpacing = new PropertyValue<double>(columnSpacingFunc);
         return grid;
     }
+}
+
+public static partial class GridStyles
+{
+    public static Action<IGrid>? Default { get; set; }
+    public static Dictionary<string, Action<IGrid>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/GridItemsLayout.cs b/src/MauiReactor/GridItemsLayout.cs
index 341c21bf..28772009 100644
--- a/src/MauiReactor/GridItemsLayout.cs
+++ b/src/MauiReactor/GridItemsLayout.cs
@@ -23,10 +23,12 @@ public partial interface IGridItemsLayout : IItemsLayout
 {
     protected GridItemsLayout()
     {
+        GridItemsLayoutStyles.Default?.Invoke(this);
     }
 
     protected GridItemsLayout(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        GridItemsLayoutStyles.Default?.Invoke(this);
     }
 
     object? IGridItemsLayout.Span { get; set; }
@@ -72,6 +74,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && GridItemsLayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class GridItemsLayoutExtensions
@@ -121,4 +132,10 @@ public static T HorizontalItemSpacing<T>(this T gridItemsLayout, Func<double> ho
         gridItemsLayout.HorizontalItemSpacing = new PropertyValue<double>(horizontalItemSpacingFunc);
         return gridItemsLayout;
     }
+}
+
+public static partial class GridItemsLayoutStyles
+{
+    public static Action<IGridItemsLayout>? Default { get; set; }
+    public static Dictionary<string, Action<IGridItemsLayout>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/GroupableItemsView.cs b/src/MauiReactor/GroupableItemsView.cs
index 8cf6937d..9c8eacba 100644
--- a/src/MauiReactor/GroupableItemsView.cs
+++ b/src/MauiReactor/GroupableItemsView.cs
@@ -19,10 +19,12 @@ public partial interface IGroupableItemsView : ISelectableItemsView
 {
     public GroupableItemsView()
     {
+        GroupableItemsViewStyles.Default?.Invoke(this);
     }
 
     public GroupableItemsView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        GroupableItemsViewStyles.Default?.Invoke(this);
     }
 
     object? IGroupableItemsView.IsGrouped { get; set; }
@@ -50,6 +52,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && GroupableItemsViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class GroupableItemsView : GroupableItemsView<Microsoft.Maui.Controls.GroupableItemsView>
@@ -78,4 +89,10 @@ public static T IsGrouped<T>(this T groupableItemsView, Func<bool> isGroupedFunc
         groupableItemsView.IsGrouped = new PropertyValue<bool>(isGroupedFunc);
         return groupableItemsView;
     }
+}
+
+public static partial class GroupableItemsViewStyles
+{
+    public static Action<IGroupableItemsView>? Default { get; set; }
+    public static Dictionary<string, Action<IGroupableItemsView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/HorizontalStackLayout.cs b/src/MauiReactor/HorizontalStackLayout.cs
index 4a0ca565..fe55d866 100644
--- a/src/MauiReactor/HorizontalStackLayout.cs
+++ b/src/MauiReactor/HorizontalStackLayout.cs
@@ -18,10 +18,12 @@ public partial interface IHorizontalStackLayout : IStackBase
 {
     public HorizontalStackLayout()
     {
+        HorizontalStackLayoutStyles.Default?.Invoke(this);
     }
 
     public HorizontalStackLayout(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        HorizontalStackLayoutStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && HorizontalStackLayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class HorizontalStackLayout : HorizontalStackLayout<Microsoft.Maui.Controls.HorizontalStackLayout>
@@ -57,4 +68,10 @@ public HorizontalStackLayout(Action<Microsoft.Maui.Controls.HorizontalStackLayou
 
 public static partial class HorizontalStackLayoutExtensions
 {
+}
+
+public static partial class HorizontalStackLayoutStyles
+{
+    public static Action<IHorizontalStackLayout>? Default { get; set; }
+    public static Dictionary<string, Action<IHorizontalStackLayout>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/HotReload/IComponentLoader.cs b/src/MauiReactor/HotReload/IComponentLoader.cs
deleted file mode 100644
index f69e3db1..00000000
--- a/src/MauiReactor/HotReload/IComponentLoader.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text;
-
-namespace MauiReactor.HotReload
-{
-    internal interface IComponentLoader
-    {
-        event EventHandler<EventArgs> AssemblyChanged;
-
-        //Component? LoadComponent<T>() where T : Component, new();
-
-        Component LoadComponent(Type componentType);
-
-        void Run();
-
-        void Stop();
-    }
-
-    internal abstract class ComponentLoader
-    {
-        private static RemoteComponentLoader? _remoteComponentLoader;
-        private static LocalComponentLoader? _localComponentLoader;
-
-        public static bool UseRemoteLoader { get; set; }
-
-        public static IComponentLoader Instance => UseRemoteLoader ? _remoteComponentLoader ??= new RemoteComponentLoader() : _localComponentLoader ??= new LocalComponentLoader();
-    }
-}
diff --git a/src/MauiReactor/HotReload/ITypeLoader.cs b/src/MauiReactor/HotReload/ITypeLoader.cs
new file mode 100644
index 00000000..4bac8d3a
--- /dev/null
+++ b/src/MauiReactor/HotReload/ITypeLoader.cs
@@ -0,0 +1,39 @@
+using MauiReactor.Internals;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+
+namespace MauiReactor.HotReload
+{
+    internal interface ITypeLoaderEventConsumer
+    {
+        void OnAssemblyChanged();
+    }
+
+    internal interface ITypeLoader
+    {
+        WeakProducer<ITypeLoaderEventConsumer>? AssemblyChangedEvent { get; }
+
+        //T LoadObject<T>() where T : new();
+
+        T LoadObject<T>(Type type);
+
+        void Run();
+
+        void Stop();
+    }
+
+    internal abstract class TypeLoader
+    {
+        private static RemoteTypeLoader? _remoteComponentLoader;
+        private static LocalTypeLoader? _localComponentLoader;
+
+        public static bool UseRemoteLoader { get; set; }
+
+        public static ITypeLoader Instance 
+            => UseRemoteLoader ? _remoteComponentLoader ??= new RemoteTypeLoader() : _localComponentLoader ??= new LocalTypeLoader();
+
+        public static Action? OnHotReloadCompleted { get; set; }
+    }
+}
diff --git a/src/MauiReactor/HotReload/LocalComponentLoader.cs b/src/MauiReactor/HotReload/LocalComponentLoader.cs
deleted file mode 100644
index 2c4704a9..00000000
--- a/src/MauiReactor/HotReload/LocalComponentLoader.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace MauiReactor.HotReload
-{
-    internal class LocalComponentLoader : IComponentLoader
-    {
-#pragma warning disable CS0067
-        public event EventHandler<EventArgs>? AssemblyChanged;
-#pragma warning restore CS0067
-        public Component? LoadComponent<T>() where T : Component, new() => new T();
-
-        public Component LoadComponent(Type componentType)
-        {
-            return (Component)(Activator.CreateInstance(componentType) ?? throw new InvalidOperationException());
-        }
-
-        public void Run()
-        {
-            
-        }
-
-        public void Stop()
-        {
-            
-        }
-    }
-}
diff --git a/src/MauiReactor/HotReload/LocalTypeLoader.cs b/src/MauiReactor/HotReload/LocalTypeLoader.cs
new file mode 100644
index 00000000..37871404
--- /dev/null
+++ b/src/MauiReactor/HotReload/LocalTypeLoader.cs
@@ -0,0 +1,44 @@
+using MauiReactor.Internals;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MauiReactor.HotReload
+{
+    internal class LocalTypeLoader : ITypeLoader
+    {
+#pragma warning disable CS0067
+        //private readonly WeakEvent<EventArgs> _event = new();
+        //public event EventHandler<EventArgs> AssemblyChanged
+        //{
+        //    add => _event.AddListener(value);
+        //    remove => _event.RemoveListener(value);
+        //}
+        //public event EventHandler<EventArgs>? AssemblyChanged;
+
+        public WeakProducer<ITypeLoaderEventConsumer>? AssemblyChangedEvent { get; }
+
+#pragma warning restore CS0067
+        //public Component? LoadComponent<T>() where T : Component, new() => new T();
+
+        //public T LoadObject<T>() where T : new()
+        //{
+        //    return (T)(Activator.CreateInstance(typeof(T)) ?? throw new InvalidOperationException());
+        //}
+
+        public T LoadObject<T>(Type type)
+        {
+            return (T)(Activator.CreateInstance(type) ?? throw new InvalidOperationException());
+        }
+
+        public void Run()
+        {
+            
+        }
+
+        public void Stop()
+        {
+            
+        }
+    }
+}
diff --git a/src/MauiReactor/HotReload/RemoteComponentLoader.cs b/src/MauiReactor/HotReload/RemoteTypeLoader.cs
similarity index 57%
rename from src/MauiReactor/HotReload/RemoteComponentLoader.cs
rename to src/MauiReactor/HotReload/RemoteTypeLoader.cs
index c57f141f..49e3ed31 100644
--- a/src/MauiReactor/HotReload/RemoteComponentLoader.cs
+++ b/src/MauiReactor/HotReload/RemoteTypeLoader.cs
@@ -1,60 +1,62 @@
-using System;
+using MauiReactor.Internals;
+using System;
 using System.Diagnostics;
 using System.Reflection;
 using System.Reflection.Metadata;
 
-[assembly: MetadataUpdateHandler(typeof(MauiReactor.HotReload.RemoteComponentLoader))]
+[assembly: MetadataUpdateHandler(typeof(MauiReactor.HotReload.RemoteTypeLoader))]
 
 namespace MauiReactor.HotReload;
 
-internal class RemoteComponentLoader : IComponentLoader
-{
-    public event EventHandler<EventArgs>? AssemblyChanged;
+internal class RemoteTypeLoader : ITypeLoader
+{
+    //private readonly WeakEvent<EventArgs> _event = new();
+    //public event EventHandler<EventArgs> AssemblyChanged
+    //{
+    //    add => _event.AddListener(value);
+    //    remove => _event.RemoveListener(value);
+    //}
+    //public event EventHandler<EventArgs>? AssemblyChanged;
+    public WeakProducer<ITypeLoaderEventConsumer>? AssemblyChangedEvent { get; } = new();
+
 
     private readonly HotReloadServer _server;
 
-    private static RemoteComponentLoader? _instance;
+    private static RemoteTypeLoader? _instance;
 
     private Assembly? _assembly;
 
     private bool _running;
 
-    public Component? LoadComponent<T>() where T : Component, new()
-    {
-        if (_assembly == null)
-            return new T();
-
-        return LoadComponent(typeof(T));
-    }
-
-    public Component LoadComponent(Type componentType)
-    {
-        if (_assembly == null)
-        {
-            return (Component)(Activator.CreateInstance(componentType) ?? throw new InvalidOperationException());
-        }
-
-        var type = _assembly.GetType(componentType.FullName ?? throw new InvalidOperationException()) ?? throw new InvalidOperationException();
-
-        // if (type == null)
-        // {
-        //     Debug.WriteLine($"[MauiReactor] Unable to hot reload component {componentType.FullName}: type not found in received assembly");
-        //     return null;
-        //     //throw new InvalidOperationException($"Unable to hot-reload component {typeof(T).FullName}: type not found in received assembly");
-        // }
+    public T LoadObject<T>(Type type)
+    {
+        if (_assembly == null)
+        {
+            return (T)(Activator.CreateInstance(type) ?? throw new InvalidOperationException());
+        }
+
+        var objectTypeInAssembly = _assembly.GetType(type.FullName ?? throw new InvalidOperationException()) ?? throw new InvalidOperationException();
 
         try
         {
-            return (Component)(Activator.CreateInstance(type) ?? throw new InvalidOperationException());
+            return (T)(Activator.CreateInstance(objectTypeInAssembly) ?? throw new InvalidOperationException());
         }
         catch (Exception ex)
         {
-            Debug.WriteLine($"[MauiReactor] Unable to hot reload component {componentType.FullName}:{Environment.NewLine}{ex}");
-            throw new InvalidOperationException($"Unable to hot reload component {componentType.FullName}", ex);
-        }
+            Debug.WriteLine($"[MauiReactor] Unable to hot reload component {objectTypeInAssembly.FullName}:{Environment.NewLine}{ex}");
+            throw new InvalidOperationException($"Unable to hot reload component {objectTypeInAssembly.FullName}", ex);
+        }
     }
 
-    public RemoteComponentLoader()
+    //public T LoadObject<T>() where T : new()
+    //{
+    //    if (_assembly == null)
+    //        return new T();
+
+    //    return LoadObject<T>(typeof(T));
+    //}
+
+    public RemoteTypeLoader()
     {
         _instance = this;
         _server = new HotReloadServer(ReceivedAssemblyFromHost);
@@ -63,7 +65,10 @@ public RemoteComponentLoader()
     private void ReceivedAssemblyFromHost(Assembly? newAssembly)
     {
         _assembly = newAssembly;
-        AssemblyChanged?.Invoke(this, EventArgs.Empty);
+        //_event.Raise(this, EventArgs.Empty);
+        //AssemblyChanged?.Invoke(this, EventArgs.Empty);
+        AssemblyChangedEvent?.Raise(consumer => consumer.OnAssemblyChanged());
+        TypeLoader.OnHotReloadCompleted?.Invoke();
     }
 
     public void Run()
diff --git a/src/MauiReactor/Image.cs b/src/MauiReactor/Image.cs
index 15a91a75..ade29bf6 100644
--- a/src/MauiReactor/Image.cs
+++ b/src/MauiReactor/Image.cs
@@ -25,10 +25,12 @@ public partial interface IImage : IView
 {
     public Image()
     {
+        ImageStyles.Default?.Invoke(this);
     }
 
     public Image(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ImageStyles.Default?.Invoke(this);
     }
 
     object? IImage.Source { get; set; }
@@ -68,6 +70,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ImageStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class Image : Image<Microsoft.Maui.Controls.Image>
@@ -185,4 +196,10 @@ public static T IsAnimationPlaying<T>(this T image, Func<bool> isAnimationPlayin
         image.IsAnimationPlaying = new PropertyValue<bool>(isAnimationPlayingFunc);
         return image;
     }
+}
+
+public static partial class ImageStyles
+{
+    public static Action<IImage>? Default { get; set; }
+    public static Dictionary<string, Action<IImage>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ImageButton.cs b/src/MauiReactor/ImageButton.cs
index b9e24703..ec6968d2 100644
--- a/src/MauiReactor/ImageButton.cs
+++ b/src/MauiReactor/ImageButton.cs
@@ -43,10 +43,12 @@ public partial interface IImageButton : IView
 {
     public ImageButton()
     {
+        ImageButtonStyles.Default?.Invoke(this);
     }
 
     public ImageButton(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ImageButtonStyles.Default?.Invoke(this);
     }
 
     object? IImageButton.CornerRadius { get; set; }
@@ -126,6 +128,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ImageButtonStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -413,4 +425,10 @@ public static T OnReleased<T>(this T imageButton, Action<object?, EventArgs>? re
         imageButton.ReleasedActionWithArgs = releasedActionWithArgs;
         return imageButton;
     }
+}
+
+public static partial class ImageButtonStyles
+{
+    public static Action<IImageButton>? Default { get; set; }
+    public static Dictionary<string, Action<IImageButton>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ImageCell.cs b/src/MauiReactor/ImageCell.cs
index 453ae332..4862a343 100644
--- a/src/MauiReactor/ImageCell.cs
+++ b/src/MauiReactor/ImageCell.cs
@@ -19,10 +19,12 @@ public partial interface IImageCell : ITextCell
 {
     public ImageCell()
     {
+        ImageCellStyles.Default?.Invoke(this);
     }
 
     public ImageCell(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ImageCellStyles.Default?.Invoke(this);
     }
 
     object? IImageCell.ImageSource { get; set; }
@@ -50,6 +52,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ImageCellStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class ImageCell : ImageCell<Microsoft.Maui.Controls.ImageCell>
@@ -125,4 +136,10 @@ public static T ImageSource<T>(this T imageCell, Func<Stream> imageStream)
         imageCell.ImageSource = Microsoft.Maui.Controls.ImageSource.FromStream(imageStream);
         return imageCell;
     }
+}
+
+public static partial class ImageCellStyles
+{
+    public static Action<IImageCell>? Default { get; set; }
+    public static Dictionary<string, Action<IImageCell>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/IndicatorView.cs b/src/MauiReactor/IndicatorView.cs
index 9781fb02..363143ed 100644
--- a/src/MauiReactor/IndicatorView.cs
+++ b/src/MauiReactor/IndicatorView.cs
@@ -33,10 +33,12 @@ public partial interface IIndicatorView : ITemplatedView
 {
     public IndicatorView()
     {
+        IndicatorViewStyles.Default?.Invoke(this);
     }
 
     public IndicatorView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        IndicatorViewStyles.Default?.Invoke(this);
     }
 
     object? IIndicatorView.IndicatorsShape { get; set; }
@@ -101,6 +103,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && IndicatorViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class IndicatorView : IndicatorView<Microsoft.Maui.Controls.IndicatorView>
@@ -229,4 +240,10 @@ public static T IndicatorSize<T>(this T indicatorView, Func<double> indicatorSiz
         indicatorView.IndicatorSize = new PropertyValue<double>(indicatorSizeFunc);
         return indicatorView;
     }
+}
+
+public static partial class IndicatorViewStyles
+{
+    public static Action<IIndicatorView>? Default { get; set; }
+    public static Dictionary<string, Action<IIndicatorView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/InputView.cs b/src/MauiReactor/InputView.cs
index bf0a4fba..9015ebf7 100644
--- a/src/MauiReactor/InputView.cs
+++ b/src/MauiReactor/InputView.cs
@@ -55,10 +55,12 @@ public partial interface IInputView : IView
 {
     protected InputView()
     {
+        InputViewStyles.Default?.Invoke(this);
     }
 
     protected InputView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        InputViewStyles.Default?.Invoke(this);
     }
 
     object? IInputView.Text { get; set; }
@@ -166,6 +168,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && InputViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -457,4 +469,10 @@ public static T OnTextChanged<T>(this T inputView, Action<object?, TextChangedEv
         inputView.TextChangedActionWithArgs = textChangedActionWithArgs;
         return inputView;
     }
+}
+
+public static partial class InputViewStyles
+{
+    public static Action<IInputView>? Default { get; set; }
+    public static Dictionary<string, Action<IInputView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Integration/ComponentHost.cs b/src/MauiReactor/Integration/ComponentHost.cs
index f919f9a4..1a5fb3b5 100644
--- a/src/MauiReactor/Integration/ComponentHost.cs
+++ b/src/MauiReactor/Integration/ComponentHost.cs
@@ -12,7 +12,7 @@ namespace MauiReactor.Integration;
 
 public class ComponentHost : Microsoft.Maui.Controls.ContentView
 {
-    internal class ComponentHostNode : VisualNode, IVisualNode, IHostElement, ITemplateHost
+    internal class ComponentHostNode : VisualNode, IVisualNode, IHostElement, ITemplateHost, ITypeLoaderEventConsumer
     {
         private readonly ComponentHost _host;
         private Component? _component;
@@ -31,13 +31,13 @@ public ComponentHostNode(ComponentHost host)
 
         BindableObject? ITemplateHost.NativeElement => ContainerPage;
 
-        private void OnComponentAssemblyChanged(object? sender, EventArgs e)
+        public void OnAssemblyChanged()
         {
             Validate.EnsureNotNull(_component);
 
             try
             {
-                var newComponent = ComponentLoader.Instance.LoadComponent(_component.GetType());
+                var newComponent = TypeLoader.Instance.LoadObject<Component>(_component.GetType());
                 if (newComponent != null)
                 {
                     _component = newComponent;
@@ -162,8 +162,9 @@ IHostElement IHostElement.Run()
         {
             _sleeping = false;
 
-            ComponentLoader.Instance.Run();
-            ComponentLoader.Instance.AssemblyChanged += OnComponentAssemblyChanged;
+            TypeLoader.Instance.Run();
+            //TypeLoader.Instance.AssemblyChanged += OnComponentAssemblyChanged;
+            TypeLoader.Instance.AssemblyChangedEvent?.AddListener(this);
 
             OnLayout();
 
@@ -172,7 +173,9 @@ IHostElement IHostElement.Run()
 
         void IHostElement.Stop()
         {
-            ComponentLoader.Instance.AssemblyChanged -= OnComponentAssemblyChanged;
+            //TypeLoader.Instance.AssemblyChanged -= OnComponentAssemblyChanged;
+            TypeLoader.Instance.AssemblyChangedEvent?.RemoveListener(this);
+
 
             _sleeping = true;
         }
diff --git a/src/MauiReactor/Internals/WeakProducer.cs b/src/MauiReactor/Internals/WeakProducer.cs
new file mode 100644
index 00000000..53408260
--- /dev/null
+++ b/src/MauiReactor/Internals/WeakProducer.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MauiReactor.Internals;
+
+internal class WeakProducer<TConsumer> where TConsumer : class
+{
+    private readonly List<WeakReference<TConsumer>> _listeners = [];
+
+    public void AddListener(TConsumer handler)
+    {
+        RemoveListener(handler);
+
+        _listeners.Add(new WeakReference<TConsumer>(handler));
+    }
+
+    public void RemoveListener(TConsumer handler)
+    {
+        _listeners.RemoveAll(wr =>
+        {
+            if (!wr.TryGetTarget(out var refHandler) || handler == refHandler)
+            {
+                return true;
+            }
+
+            return false;
+        });
+    }
+
+    public void Raise(Action<TConsumer> actionOnConsumer)
+    {
+        for (int i = _listeners.Count - 1; i >= 0; i--)
+        {
+            var weakReference = _listeners[i];
+
+            if (weakReference.TryGetTarget(out var handler))
+            {
+                actionOnConsumer(handler);
+            }
+            else
+            {
+                _listeners.RemoveAt(i);
+            }
+        }
+    }
+}
+
+
+//internal class WeakEvent<TEventArgs>
+//{
+//    private readonly List<WeakReference<EventHandler<TEventArgs>>> _listeners = [];
+
+//    public void AddListener(EventHandler<TEventArgs> handler)
+//    {
+//        RemoveListener(handler);
+
+//        _listeners.Add(new WeakReference<EventHandler<TEventArgs>>(handler));
+//    }
+
+//    public void RemoveListener(EventHandler<TEventArgs> handler)
+//    {
+//        _listeners.RemoveAll(wr =>
+//        {
+//            if (!wr.TryGetTarget(out var refHandler) || handler == refHandler)
+//            {
+//                return true;
+//            }
+
+//            return false;
+//        });
+//    }
+
+//    public void Raise(object sender, TEventArgs args)
+//    {
+//        for (int i = _listeners.Count - 1; i >= 0; i--)
+//        {
+//            var weakReference = _listeners[i];
+
+//            if (weakReference.TryGetTarget(out var handler))
+//            {
+//                handler?.Invoke(sender, args);
+//            }
+//            else
+//            {
+//                _listeners.RemoveAt(i);
+//            }
+//        }
+//    }
+//}
diff --git a/src/MauiReactor/ItemsLayout.cs b/src/MauiReactor/ItemsLayout.cs
index a6128a4b..023c9369 100644
--- a/src/MauiReactor/ItemsLayout.cs
+++ b/src/MauiReactor/ItemsLayout.cs
@@ -21,10 +21,12 @@ public partial interface IItemsLayout : IVisualNode
 {
     protected ItemsLayout()
     {
+        ItemsLayoutStyles.Default?.Invoke(this);
     }
 
     protected ItemsLayout(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ItemsLayoutStyles.Default?.Invoke(this);
     }
 
     object? IItemsLayout.SnapPointsAlignment { get; set; }
@@ -56,6 +58,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ItemsLayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class ItemsLayoutExtensions
@@ -87,4 +98,10 @@ public static T SnapPointsType<T>(this T itemsLayout, Func<Microsoft.Maui.Contro
         itemsLayout.SnapPointsType = new PropertyValue<Microsoft.Maui.Controls.SnapPointsType>(snapPointsTypeFunc);
         return itemsLayout;
     }
+}
+
+public static partial class ItemsLayoutStyles
+{
+    public static Action<IItemsLayout>? Default { get; set; }
+    public static Dictionary<string, Action<IItemsLayout>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ItemsView.cs b/src/MauiReactor/ItemsView.cs
index ae8b0863..5ae7bb7b 100644
--- a/src/MauiReactor/ItemsView.cs
+++ b/src/MauiReactor/ItemsView.cs
@@ -37,10 +37,12 @@ public partial interface IItemsView : IView
 {
     protected ItemsView()
     {
+        ItemsViewStyles.Default?.Invoke(this);
     }
 
     protected ItemsView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ItemsViewStyles.Default?.Invoke(this);
     }
 
     object? IItemsView.HorizontalScrollBarVisibility { get; set; }
@@ -98,6 +100,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ItemsViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -257,4 +269,10 @@ public static T OnRemainingItemsThresholdReached<T>(this T itemsView, Action<obj
         itemsView.RemainingItemsThresholdReachedActionWithArgs = remainingItemsThresholdReachedActionWithArgs;
         return itemsView;
     }
+}
+
+public static partial class ItemsViewStyles
+{
+    public static Action<IItemsView>? Default { get; set; }
+    public static Dictionary<string, Action<IItemsView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Label.cs b/src/MauiReactor/Label.cs
index e8982f55..b268441e 100644
--- a/src/MauiReactor/Label.cs
+++ b/src/MauiReactor/Label.cs
@@ -51,10 +51,12 @@ public partial interface ILabel : IView
 {
     public Label()
     {
+        LabelStyles.Default?.Invoke(this);
     }
 
     public Label(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        LabelStyles.Default?.Invoke(this);
     }
 
     object? ILabel.HorizontalTextAlignment { get; set; }
@@ -158,6 +160,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && LabelStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class Label : Label<Microsoft.Maui.Controls.Label>
@@ -442,4 +453,10 @@ public static T TextType<T>(this T label, Func<Microsoft.Maui.TextType> textType
         label.TextType = new PropertyValue<Microsoft.Maui.TextType>(textTypeFunc);
         return label;
     }
+}
+
+public static partial class LabelStyles
+{
+    public static Action<ILabel>? Default { get; set; }
+    public static Dictionary<string, Action<ILabel>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Layout.cs b/src/MauiReactor/Layout.cs
index 6b3967a1..a4b4a0b9 100644
--- a/src/MauiReactor/Layout.cs
+++ b/src/MauiReactor/Layout.cs
@@ -23,10 +23,12 @@ public partial interface ILayout : IView
 {
     protected Layout()
     {
+        LayoutStyles.Default?.Invoke(this);
     }
 
     protected Layout(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        LayoutStyles.Default?.Invoke(this);
     }
 
     object? ILayout.IsClippedToBounds { get; set; }
@@ -71,6 +73,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && LayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class LayoutExtensions
@@ -142,4 +153,10 @@ public static T CascadeInputTransparent<T>(this T layout, Func<bool> cascadeInpu
         layout.CascadeInputTransparent = new PropertyValue<bool>(cascadeInputTransparentFunc);
         return layout;
     }
+}
+
+public static partial class LayoutStyles
+{
+    public static Action<ILayout>? Default { get; set; }
+    public static Dictionary<string, Action<ILayout>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/LinearItemsLayout.cs b/src/MauiReactor/LinearItemsLayout.cs
index 373f8dfe..f3cb8a2b 100644
--- a/src/MauiReactor/LinearItemsLayout.cs
+++ b/src/MauiReactor/LinearItemsLayout.cs
@@ -19,10 +19,12 @@ public partial interface ILinearItemsLayout : IItemsLayout
 {
     protected LinearItemsLayout()
     {
+        LinearItemsLayoutStyles.Default?.Invoke(this);
     }
 
     protected LinearItemsLayout(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        LinearItemsLayoutStyles.Default?.Invoke(this);
     }
 
     object? ILinearItemsLayout.ItemSpacing { get; set; }
@@ -59,6 +61,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && LinearItemsLayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class LinearItemsLayoutExtensions
@@ -78,4 +89,10 @@ public static T ItemSpacing<T>(this T linearItemsLayout, Func<double> itemSpacin
         linearItemsLayout.ItemSpacing = new PropertyValue<double>(itemSpacingFunc);
         return linearItemsLayout;
     }
+}
+
+public static partial class LinearItemsLayoutStyles
+{
+    public static Action<ILinearItemsLayout>? Default { get; set; }
+    public static Dictionary<string, Action<ILinearItemsLayout>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ListView.cs b/src/MauiReactor/ListView.cs
index 5b8858f2..a4b03b16 100644
--- a/src/MauiReactor/ListView.cs
+++ b/src/MauiReactor/ListView.cs
@@ -65,10 +65,12 @@ public partial interface IListView : IGenericItemsView
 {
     public ListView()
     {
+        ListViewStyles.Default?.Invoke(this);
     }
 
     public ListView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ListViewStyles.Default?.Invoke(this);
     }
 
     object? IListView.IsPullToRefreshEnabled { get; set; }
@@ -176,6 +178,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ListViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -539,4 +551,10 @@ public static T OnRefreshing<T>(this T listView, Action<object?, EventArgs>? ref
         listView.RefreshingActionWithArgs = refreshingActionWithArgs;
         return listView;
     }
+}
+
+public static partial class ListViewStyles
+{
+    public static Action<IListView>? Default { get; set; }
+    public static Dictionary<string, Action<IListView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/MenuBarItem.cs b/src/MauiReactor/MenuBarItem.cs
index 7e5f7a9a..2b911171 100644
--- a/src/MauiReactor/MenuBarItem.cs
+++ b/src/MauiReactor/MenuBarItem.cs
@@ -21,10 +21,12 @@ public partial interface IMenuBarItem : IBaseMenuItem
 {
     public MenuBarItem()
     {
+        MenuBarItemStyles.Default?.Invoke(this);
     }
 
     public MenuBarItem(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        MenuBarItemStyles.Default?.Invoke(this);
     }
 
     object? IMenuBarItem.Text { get; set; }
@@ -56,6 +58,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && MenuBarItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class MenuBarItem : MenuBarItem<Microsoft.Maui.Controls.MenuBarItem>
@@ -98,4 +109,10 @@ public static T IsEnabled<T>(this T menuBarItem, Func<bool> isEnabledFunc)
         menuBarItem.IsEnabled = new PropertyValue<bool>(isEnabledFunc);
         return menuBarItem;
     }
+}
+
+public static partial class MenuBarItemStyles
+{
+    public static Action<IMenuBarItem>? Default { get; set; }
+    public static Dictionary<string, Action<IMenuBarItem>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/MenuFlyout.cs b/src/MauiReactor/MenuFlyout.cs
index 27958bf2..1c0e37c7 100644
--- a/src/MauiReactor/MenuFlyout.cs
+++ b/src/MauiReactor/MenuFlyout.cs
@@ -18,10 +18,12 @@ public partial interface IMenuFlyout : IFlyoutBase
 {
     public MenuFlyout()
     {
+        MenuFlyoutStyles.Default?.Invoke(this);
     }
 
     public MenuFlyout(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        MenuFlyoutStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && MenuFlyoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class MenuFlyout : MenuFlyout<Microsoft.Maui.Controls.MenuFlyout>
@@ -57,4 +68,10 @@ public MenuFlyout(Action<Microsoft.Maui.Controls.MenuFlyout?> componentRefAction
 
 public static partial class MenuFlyoutExtensions
 {
+}
+
+public static partial class MenuFlyoutStyles
+{
+    public static Action<IMenuFlyout>? Default { get; set; }
+    public static Dictionary<string, Action<IMenuFlyout>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/MenuFlyoutItem.cs b/src/MauiReactor/MenuFlyoutItem.cs
index cac8fa79..5662c3fb 100644
--- a/src/MauiReactor/MenuFlyoutItem.cs
+++ b/src/MauiReactor/MenuFlyoutItem.cs
@@ -18,10 +18,12 @@ public partial interface IMenuFlyoutItem : IMenuItem
 {
     public MenuFlyoutItem()
     {
+        MenuFlyoutItemStyles.Default?.Invoke(this);
     }
 
     public MenuFlyoutItem(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        MenuFlyoutItemStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && MenuFlyoutItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class MenuFlyoutItem : MenuFlyoutItem<Microsoft.Maui.Controls.MenuFlyoutItem>
@@ -57,4 +68,10 @@ public MenuFlyoutItem(Action<Microsoft.Maui.Controls.MenuFlyoutItem?> componentR
 
 public static partial class MenuFlyoutItemExtensions
 {
+}
+
+public static partial class MenuFlyoutItemStyles
+{
+    public static Action<IMenuFlyoutItem>? Default { get; set; }
+    public static Dictionary<string, Action<IMenuFlyoutItem>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/MenuFlyoutSeparator.cs b/src/MauiReactor/MenuFlyoutSeparator.cs
index e5a71d40..e821ccaf 100644
--- a/src/MauiReactor/MenuFlyoutSeparator.cs
+++ b/src/MauiReactor/MenuFlyoutSeparator.cs
@@ -18,10 +18,12 @@ public partial interface IMenuFlyoutSeparator : IMenuFlyoutItem
 {
     public MenuFlyoutSeparator()
     {
+        MenuFlyoutSeparatorStyles.Default?.Invoke(this);
     }
 
     public MenuFlyoutSeparator(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        MenuFlyoutSeparatorStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && MenuFlyoutSeparatorStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class MenuFlyoutSeparator : MenuFlyoutSeparator<Microsoft.Maui.Controls.MenuFlyoutSeparator>
@@ -57,4 +68,10 @@ public MenuFlyoutSeparator(Action<Microsoft.Maui.Controls.MenuFlyoutSeparator?>
 
 public static partial class MenuFlyoutSeparatorExtensions
 {
+}
+
+public static partial class MenuFlyoutSeparatorStyles
+{
+    public static Action<IMenuFlyoutSeparator>? Default { get; set; }
+    public static Dictionary<string, Action<IMenuFlyoutSeparator>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/MenuFlyoutSubItem.cs b/src/MauiReactor/MenuFlyoutSubItem.cs
index 05de4e73..c7e79a24 100644
--- a/src/MauiReactor/MenuFlyoutSubItem.cs
+++ b/src/MauiReactor/MenuFlyoutSubItem.cs
@@ -18,10 +18,12 @@ public partial interface IMenuFlyoutSubItem : IMenuFlyoutItem
 {
     public MenuFlyoutSubItem()
     {
+        MenuFlyoutSubItemStyles.Default?.Invoke(this);
     }
 
     public MenuFlyoutSubItem(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        MenuFlyoutSubItemStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && MenuFlyoutSubItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class MenuFlyoutSubItem : MenuFlyoutSubItem<Microsoft.Maui.Controls.MenuFlyoutSubItem>
@@ -57,4 +68,10 @@ public MenuFlyoutSubItem(Action<Microsoft.Maui.Controls.MenuFlyoutSubItem?> comp
 
 public static partial class MenuFlyoutSubItemExtensions
 {
+}
+
+public static partial class MenuFlyoutSubItemStyles
+{
+    public static Action<IMenuFlyoutSubItem>? Default { get; set; }
+    public static Dictionary<string, Action<IMenuFlyoutSubItem>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/MenuItem.cs b/src/MauiReactor/MenuItem.cs
index c65993bf..9941d7a7 100644
--- a/src/MauiReactor/MenuItem.cs
+++ b/src/MauiReactor/MenuItem.cs
@@ -27,10 +27,12 @@ public partial interface IMenuItem : IBaseMenuItem
 {
     public MenuItem()
     {
+        MenuItemStyles.Default?.Invoke(this);
     }
 
     public MenuItem(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        MenuItemStyles.Default?.Invoke(this);
     }
 
     object? IMenuItem.IsDestructive { get; set; }
@@ -72,6 +74,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && MenuItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -221,4 +233,10 @@ public static T OnClicked<T>(this T menuItem, Action<object?, EventArgs>? clicke
         menuItem.ClickedActionWithArgs = clickedActionWithArgs;
         return menuItem;
     }
+}
+
+public static partial class MenuItemStyles
+{
+    public static Action<IMenuItem>? Default { get; set; }
+    public static Dictionary<string, Action<IMenuItem>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/NavigableElement.cs b/src/MauiReactor/NavigableElement.cs
index 33dc9a12..b3b284b7 100644
--- a/src/MauiReactor/NavigableElement.cs
+++ b/src/MauiReactor/NavigableElement.cs
@@ -19,10 +19,12 @@ public partial interface INavigableElement : IElement
 {
     protected NavigableElement()
     {
+        NavigableElementStyles.Default?.Invoke(this);
     }
 
     protected NavigableElement(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        NavigableElementStyles.Default?.Invoke(this);
     }
 
     object? INavigableElement.Style { get; set; }
@@ -50,6 +52,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && NavigableElementStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class NavigableElementExtensions
@@ -67,4 +78,10 @@ public static T Style<T>(this T navigableElement, Func<Microsoft.Maui.Controls.S
         navigableElement.Style = new PropertyValue<Microsoft.Maui.Controls.Style>(styleFunc);
         return navigableElement;
     }
+}
+
+public static partial class NavigableElementStyles
+{
+    public static Action<INavigableElement>? Default { get; set; }
+    public static Dictionary<string, Action<INavigableElement>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/NavigationPage.cs b/src/MauiReactor/NavigationPage.cs
index 796ba468..00cd39ef 100644
--- a/src/MauiReactor/NavigationPage.cs
+++ b/src/MauiReactor/NavigationPage.cs
@@ -35,10 +35,12 @@ public partial interface INavigationPage : IPage
 {
     public NavigationPage()
     {
+        NavigationPageStyles.Default?.Invoke(this);
     }
 
     public NavigationPage(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        NavigationPageStyles.Default?.Invoke(this);
     }
 
     object? INavigationPage.BarBackgroundColor { get; set; }
@@ -92,6 +94,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && NavigationPageStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -248,4 +260,10 @@ public static T OnPushed<T>(this T navigationPage, Action<object?, NavigationEve
         navigationPage.PushedActionWithArgs = pushedActionWithArgs;
         return navigationPage;
     }
+}
+
+public static partial class NavigationPageStyles
+{
+    public static Action<INavigationPage>? Default { get; set; }
+    public static Dictionary<string, Action<INavigationPage>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Page.cs b/src/MauiReactor/Page.cs
index 5be2f51f..afcf31c3 100644
--- a/src/MauiReactor/Page.cs
+++ b/src/MauiReactor/Page.cs
@@ -51,10 +51,12 @@ public partial interface IPage : IVisualElement
 {
     public Page()
     {
+        PageStyles.Default?.Invoke(this);
     }
 
     public Page(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        PageStyles.Default?.Invoke(this);
     }
 
     object? IPage.BackgroundImageSource { get; set; }
@@ -143,6 +145,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && PageStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -528,4 +540,10 @@ public static T OnNavigatedFrom<T>(this T page, Action<object?, NavigatedFromEve
         page.NavigatedFromActionWithArgs = navigatedFromActionWithArgs;
         return page;
     }
+}
+
+public static partial class PageStyles
+{
+    public static Action<IPage>? Default { get; set; }
+    public static Dictionary<string, Action<IPage>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/PageHost.cs b/src/MauiReactor/PageHost.cs
index 01a42070..c5e09156 100644
--- a/src/MauiReactor/PageHost.cs
+++ b/src/MauiReactor/PageHost.cs
@@ -86,7 +86,7 @@ protected sealed override void OnRemoveChild(VisualNode widget, BindableObject n
     }
 
 
-    internal class PageHost<T> : PageHost, IVisualNode, IHostElement, ITemplateHost where T : Component, new()
+    internal class PageHost<T> : PageHost, IVisualNode, IHostElement, ITemplateHost, ITypeLoaderEventConsumer where T : Component, new()
     {
         private Component? _component;
 
@@ -139,8 +139,8 @@ public IHostElement Run()
         {
             _component ??= InitializeComponent(new T());
 
-            ComponentLoader.Instance.Run();
-            ComponentLoader.Instance.AssemblyChanged += OnComponentAssemblyChanged;
+            TypeLoader.Instance.Run();
+            TypeLoader.Instance.AssemblyChangedEvent?.AddListener(this);
 
             OnLayout();
 
@@ -152,15 +152,20 @@ public IHostElement Run()
             _isMounted = true;
 
             return this;
-        }
-
-        private void OnComponentAssemblyChanged(object? sender, EventArgs e)
-        {
+        }
+
+        public void OnAssemblyChanged()
+        {
+        //    OnComponentAssemblyChanged();
+        //}
+
+        //private void OnComponentAssemblyChanged(/*object? sender, EventArgs e*/)
+        //{
             //Validate.EnsureNotNull(ReactorApplicationHost.Instance);
 
             try
             {
-                var newComponent = ComponentLoader.Instance.LoadComponent(typeof(T));
+                var newComponent = TypeLoader.Instance.LoadObject<Component>(typeof(T));
                 if (newComponent != null)
                 {
                     _component = newComponent;
@@ -182,7 +187,8 @@ private void OnComponentAssemblyChanged(object? sender, EventArgs e)
 
         public void Stop()
         {
-            ComponentLoader.Instance.AssemblyChanged -= OnComponentAssemblyChanged;
+            //TypeLoader.Instance.AssemblyChanged -= OnComponentAssemblyChanged;
+            TypeLoader.Instance.AssemblyChangedEvent?.RemoveListener(this);
             _sleeping = true;
         }
 
@@ -284,7 +290,7 @@ private bool AnimateVisuals()
         public void RequestAnimationFrame(VisualNode visualNode)
         {
             _listOfVisualsToAnimate.AddFirst(visualNode);
-        }
+        }
     }
 
     internal class PageHost<T, P> : PageHost<T> where T : Component, new() where P : class, new()
diff --git a/src/MauiReactor/PanGestureRecognizer.cs b/src/MauiReactor/PanGestureRecognizer.cs
index dcf89733..75677a76 100644
--- a/src/MauiReactor/PanGestureRecognizer.cs
+++ b/src/MauiReactor/PanGestureRecognizer.cs
@@ -23,10 +23,12 @@ public partial interface IPanGestureRecognizer : IGestureRecognizer
 {
     public PanGestureRecognizer()
     {
+        PanGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     public PanGestureRecognizer(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        PanGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     object? IPanGestureRecognizer.TouchPoints { get; set; }
@@ -60,6 +62,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && PanGestureRecognizerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -134,4 +146,10 @@ public static T OnPanUpdated<T>(this T panGestureRecognizer, Action<object?, Pan
         panGestureRecognizer.PanUpdatedActionWithArgs = panUpdatedActionWithArgs;
         return panGestureRecognizer;
     }
+}
+
+public static partial class PanGestureRecognizerStyles
+{
+    public static Action<IPanGestureRecognizer>? Default { get; set; }
+    public static Dictionary<string, Action<IPanGestureRecognizer>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Picker.cs b/src/MauiReactor/Picker.cs
index 2f398cd0..e7bf0f7a 100644
--- a/src/MauiReactor/Picker.cs
+++ b/src/MauiReactor/Picker.cs
@@ -43,10 +43,12 @@ public partial interface IPicker : IView
 {
     public Picker()
     {
+        PickerStyles.Default?.Invoke(this);
     }
 
     public Picker(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        PickerStyles.Default?.Invoke(this);
     }
 
     object? IPicker.TextColor { get; set; }
@@ -130,6 +132,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && PickerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -348,4 +360,10 @@ public static T OnSelectedIndexChanged<T>(this T picker, Action<object?, EventAr
         picker.SelectedIndexChangedActionWithArgs = selectedIndexChangedActionWithArgs;
         return picker;
     }
+}
+
+public static partial class PickerStyles
+{
+    public static Action<IPicker>? Default { get; set; }
+    public static Dictionary<string, Action<IPicker>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/PinchGestureRecognizer.cs b/src/MauiReactor/PinchGestureRecognizer.cs
index 7ce98b66..b3656ec5 100644
--- a/src/MauiReactor/PinchGestureRecognizer.cs
+++ b/src/MauiReactor/PinchGestureRecognizer.cs
@@ -21,10 +21,12 @@ public sealed partial class PinchGestureRecognizer : GestureRecognizer<Microsoft
 {
     public PinchGestureRecognizer()
     {
+        PinchGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     public PinchGestureRecognizer(Action<Microsoft.Maui.Controls.PinchGestureRecognizer?> componentRefAction) : base(componentRefAction)
     {
+        PinchGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     Action? IPinchGestureRecognizer.PinchUpdatedAction { get; set; }
@@ -52,6 +54,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && PinchGestureRecognizerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -101,4 +113,10 @@ public static T OnPinchUpdated<T>(this T pinchGestureRecognizer, Action<object?,
         pinchGestureRecognizer.PinchUpdatedActionWithArgs = pinchUpdatedActionWithArgs;
         return pinchGestureRecognizer;
     }
+}
+
+public static partial class PinchGestureRecognizerStyles
+{
+    public static Action<IPinchGestureRecognizer>? Default { get; set; }
+    public static Dictionary<string, Action<IPinchGestureRecognizer>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/PointerGestureRecognizer.cs b/src/MauiReactor/PointerGestureRecognizer.cs
index 9bc3a758..8695b1c9 100644
--- a/src/MauiReactor/PointerGestureRecognizer.cs
+++ b/src/MauiReactor/PointerGestureRecognizer.cs
@@ -37,10 +37,12 @@ public sealed partial class PointerGestureRecognizer : GestureRecognizer<Microso
 {
     public PointerGestureRecognizer()
     {
+        PointerGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     public PointerGestureRecognizer(Action<Microsoft.Maui.Controls.PointerGestureRecognizer?> componentRefAction) : base(componentRefAction)
     {
+        PointerGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     Action? IPointerGestureRecognizer.PointerEnteredAction { get; set; }
@@ -92,6 +94,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && PointerGestureRecognizerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -249,4 +261,10 @@ public static T OnPointerReleased<T>(this T pointerGestureRecognizer, Action<obj
         pointerGestureRecognizer.PointerReleasedActionWithArgs = pointerReleasedActionWithArgs;
         return pointerGestureRecognizer;
     }
+}
+
+public static partial class PointerGestureRecognizerStyles
+{
+    public static Action<IPointerGestureRecognizer>? Default { get; set; }
+    public static Dictionary<string, Action<IPointerGestureRecognizer>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ProgressBar.cs b/src/MauiReactor/ProgressBar.cs
index 227954ab..7f14e961 100644
--- a/src/MauiReactor/ProgressBar.cs
+++ b/src/MauiReactor/ProgressBar.cs
@@ -21,10 +21,12 @@ public partial interface IProgressBar : IView
 {
     public ProgressBar()
     {
+        ProgressBarStyles.Default?.Invoke(this);
     }
 
     public ProgressBar(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ProgressBarStyles.Default?.Invoke(this);
     }
 
     object? IProgressBar.ProgressColor { get; set; }
@@ -65,6 +67,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ProgressBarStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class ProgressBar : ProgressBar<Microsoft.Maui.Controls.ProgressBar>
@@ -109,4 +120,10 @@ public static T Progress<T>(this T progressBar, Func<double> progressFunc)
         progressBar.Progress = new PropertyValue<double>(progressFunc);
         return progressBar;
     }
+}
+
+public static partial class ProgressBarStyles
+{
+    public static Action<IProgressBar>? Default { get; set; }
+    public static Dictionary<string, Action<IProgressBar>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/RadioButton.cs b/src/MauiReactor/RadioButton.cs
index 3f8c9cd9..49da93e0 100644
--- a/src/MauiReactor/RadioButton.cs
+++ b/src/MauiReactor/RadioButton.cs
@@ -47,10 +47,12 @@ public partial interface IRadioButton : ITemplatedView
 {
     public RadioButton()
     {
+        RadioButtonStyles.Default?.Invoke(this);
     }
 
     public RadioButton(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        RadioButtonStyles.Default?.Invoke(this);
     }
 
     object? IRadioButton.Value { get; set; }
@@ -143,6 +145,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && RadioButtonStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -391,4 +403,10 @@ public static T OnCheckedChanged<T>(this T radioButton, Action<object?, CheckedC
         radioButton.CheckedChangedActionWithArgs = checkedChangedActionWithArgs;
         return radioButton;
     }
+}
+
+public static partial class RadioButtonStyles
+{
+    public static Action<IRadioButton>? Default { get; set; }
+    public static Dictionary<string, Action<IRadioButton>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ReactorApplication.cs b/src/MauiReactor/ReactorApplication.cs
index 811eec7d..372c5dfd 100644
--- a/src/MauiReactor/ReactorApplication.cs
+++ b/src/MauiReactor/ReactorApplication.cs
@@ -5,7 +5,7 @@
 
 namespace MauiReactor
 {
-    internal abstract class ReactorApplicationHost : VisualNode, IHostElement, IVisualNode
+    internal abstract class ReactorApplicationHost : VisualNode, IHostElement, IVisualNode, ITypeLoaderEventConsumer
     { 
         protected readonly ReactorApplication _application;
 
@@ -17,11 +17,17 @@ protected ReactorApplicationHost(ReactorApplication application)
 
             _application = application ?? throw new ArgumentNullException(nameof(application));
 
-            ComponentLoader.Instance.AssemblyChanged += (s, e) => OnComponentAssemblyChanged();
-        }
-
-        //public static ReactorApplicationHost? Instance { get; private set; }
-
+            //TypeLoader.Instance.AssemblyChanged += TypeLoader_AssemblyChanged;
+            TypeLoader.Instance.AssemblyChangedEvent?.AddListener(this);
+        }
+
+        //private void TypeLoader_AssemblyChanged(object? sender, EventArgs e)
+        //{
+        //    OnComponentAssemblyChanged();
+        //}
+
+        //public static ReactorApplicationHost? Instance { get; private set; }
+
         public static Action<UnhandledExceptionEventArgs>? UnhandledException { get; set; }
 
         internal static void FireUnhandledExceptionEvent(Exception ex)
@@ -36,7 +42,7 @@ internal static void FireUnhandledExceptionEvent(Exception ex)
 
         public abstract void Stop();
 
-        protected virtual void OnComponentAssemblyChanged()
+        public virtual void OnAssemblyChanged()
         { }
 
         //public ReactorApplicationHost OnUnhandledException(Action<UnhandledExceptionEventArgs> action)
@@ -118,9 +124,10 @@ public override IHostElement Run()
             if (!_started)
             {
                 _started = true;
+                _application.Theme?.Apply();
                 _rootComponent ??= new T();
                 OnLayout();
-                ComponentLoader.Instance.Run();
+                TypeLoader.Instance.Run();
 
                 if (_showFrameRate)
                 {
@@ -131,11 +138,17 @@ public override IHostElement Run()
             return this;
         }
 
-        protected override void OnComponentAssemblyChanged()
+        public override void OnAssemblyChanged()
         {
             try
             {
-                var newComponent = ComponentLoader.Instance.LoadComponent(typeof(T));
+                if (_application.Theme != null)
+                {
+                    _application.Theme = TypeLoader.Instance.LoadObject<Theme>(_application.Theme.GetType());
+                    _application.Theme?.Apply();
+                }
+
+                var newComponent = TypeLoader.Instance.LoadObject<Component>(typeof(T));
                 if (newComponent != null &&
                     _rootComponent != newComponent)
                 {
@@ -163,7 +176,7 @@ public override void Stop()
             if (_started)
             {
                 _started = false;
-                ComponentLoader.Instance.Stop();
+                TypeLoader.Instance.Stop();
 
                 if (_showFrameRate)
                 {
@@ -276,8 +289,10 @@ public abstract class ReactorApplication : Application
         protected ReactorApplication()
         {
         }
-        public Action<Uri>? AppLinkRequestReceived { get; set; }
-
+        public Action<Uri>? AppLinkRequestReceived { get; set; }
+
+        public Theme? Theme { get; internal set; }
+
         protected override void OnAppLinkRequestReceived(Uri uri)
         {
             AppLinkRequestReceived?.Invoke(uri);
@@ -348,9 +363,10 @@ public static class MauiAppBuilderExtensions
                 return app;
             });
 
-        public static MauiAppBuilder EnableMauiReactorHotReload(this MauiAppBuilder appBuilder)
+        public static MauiAppBuilder EnableMauiReactorHotReload(this MauiAppBuilder appBuilder, Action? onHotReloadCompleted = null)
         {
-            ComponentLoader.UseRemoteLoader = true;
+            TypeLoader.UseRemoteLoader = true;
+            TypeLoader.OnHotReloadCompleted = onHotReloadCompleted;
             return appBuilder;
         }
 
@@ -390,6 +406,12 @@ public static Application SetWindowsSpecificAssetsDirectory(this Application app
 
             return application;
         }
+
+        public static Application UseTheme<T>(this ReactorApplication application) where T : Theme, new()
+        {
+            application.Theme = new T();
+            return application;
+        }
     }
 }
 
diff --git a/src/MauiReactor/RefreshView.cs b/src/MauiReactor/RefreshView.cs
index ee9c14b0..9232de8e 100644
--- a/src/MauiReactor/RefreshView.cs
+++ b/src/MauiReactor/RefreshView.cs
@@ -25,10 +25,12 @@ public partial interface IRefreshView : IContentView
 {
     public RefreshView()
     {
+        RefreshViewStyles.Default?.Invoke(this);
     }
 
     public RefreshView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        RefreshViewStyles.Default?.Invoke(this);
     }
 
     object? IRefreshView.IsRefreshing { get; set; }
@@ -66,6 +68,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && RefreshViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -154,4 +166,10 @@ public static T OnRefreshing<T>(this T refreshView, Action<object?, EventArgs>?
         refreshView.RefreshingActionWithArgs = refreshingActionWithArgs;
         return refreshView;
     }
+}
+
+public static partial class RefreshViewStyles
+{
+    public static Action<IRefreshView>? Default { get; set; }
+    public static Dictionary<string, Action<IRefreshView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ReorderableItemsView.cs b/src/MauiReactor/ReorderableItemsView.cs
index 106335ef..85f73c44 100644
--- a/src/MauiReactor/ReorderableItemsView.cs
+++ b/src/MauiReactor/ReorderableItemsView.cs
@@ -25,10 +25,12 @@ public partial interface IReorderableItemsView : IGroupableItemsView
 {
     public ReorderableItemsView()
     {
+        ReorderableItemsViewStyles.Default?.Invoke(this);
     }
 
     public ReorderableItemsView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ReorderableItemsViewStyles.Default?.Invoke(this);
     }
 
     object? IReorderableItemsView.CanMixGroups { get; set; }
@@ -66,6 +68,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ReorderableItemsViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -154,4 +166,10 @@ public static T OnReorderCompleted<T>(this T reorderableItemsView, Action<object
         reorderableItemsView.ReorderCompletedActionWithArgs = reorderCompletedActionWithArgs;
         return reorderableItemsView;
     }
+}
+
+public static partial class ReorderableItemsViewStyles
+{
+    public static Action<IReorderableItemsView>? Default { get; set; }
+    public static Dictionary<string, Action<IReorderableItemsView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ScrollView.cs b/src/MauiReactor/ScrollView.cs
index 78e3653e..a66e0d30 100644
--- a/src/MauiReactor/ScrollView.cs
+++ b/src/MauiReactor/ScrollView.cs
@@ -27,10 +27,12 @@ public partial interface IScrollView : Compatibility.ILayout
 {
     public ScrollView()
     {
+        ScrollViewStyles.Default?.Invoke(this);
     }
 
     public ScrollView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ScrollViewStyles.Default?.Invoke(this);
     }
 
     object? IScrollView.Orientation { get; set; }
@@ -72,6 +74,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ScrollViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -174,4 +186,10 @@ public static T OnScrolled<T>(this T scrollView, Action<object?, ScrolledEventAr
         scrollView.ScrolledActionWithArgs = scrolledActionWithArgs;
         return scrollView;
     }
+}
+
+public static partial class ScrollViewStyles
+{
+    public static Action<IScrollView>? Default { get; set; }
+    public static Dictionary<string, Action<IScrollView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/SearchBar.cs b/src/MauiReactor/SearchBar.cs
index 3500f717..e51dca39 100644
--- a/src/MauiReactor/SearchBar.cs
+++ b/src/MauiReactor/SearchBar.cs
@@ -27,10 +27,12 @@ public partial interface ISearchBar : IInputView
 {
     public SearchBar()
     {
+        SearchBarStyles.Default?.Invoke(this);
     }
 
     public SearchBar(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        SearchBarStyles.Default?.Invoke(this);
     }
 
     object? ISearchBar.CancelButtonColor { get; set; }
@@ -72,6 +74,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && SearchBarStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -174,4 +186,10 @@ public static T OnSearchButtonPressed<T>(this T searchBar, Action<object?, Event
         searchBar.SearchButtonPressedActionWithArgs = searchButtonPressedActionWithArgs;
         return searchBar;
     }
+}
+
+public static partial class SearchBarStyles
+{
+    public static Action<ISearchBar>? Default { get; set; }
+    public static Dictionary<string, Action<ISearchBar>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/SelectableItemsView.cs b/src/MauiReactor/SelectableItemsView.cs
index ed1bc043..2638699f 100644
--- a/src/MauiReactor/SelectableItemsView.cs
+++ b/src/MauiReactor/SelectableItemsView.cs
@@ -25,10 +25,12 @@ public partial interface ISelectableItemsView : IStructuredItemsView
 {
     public SelectableItemsView()
     {
+        SelectableItemsViewStyles.Default?.Invoke(this);
     }
 
     public SelectableItemsView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        SelectableItemsViewStyles.Default?.Invoke(this);
     }
 
     object? ISelectableItemsView.SelectionMode { get; set; }
@@ -66,6 +68,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && SelectableItemsViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -154,4 +166,10 @@ public static T OnSelectionChanged<T>(this T selectableItemsView, Action<object?
         selectableItemsView.SelectionChangedActionWithArgs = selectionChangedActionWithArgs;
         return selectableItemsView;
     }
+}
+
+public static partial class SelectableItemsViewStyles
+{
+    public static Action<ISelectableItemsView>? Default { get; set; }
+    public static Dictionary<string, Action<ISelectableItemsView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shadow.cs b/src/MauiReactor/Shadow.cs
index 275af3a8..0772673b 100644
--- a/src/MauiReactor/Shadow.cs
+++ b/src/MauiReactor/Shadow.cs
@@ -25,10 +25,12 @@ public partial interface IShadow : IElement
 {
     public Shadow()
     {
+        ShadowStyles.Default?.Invoke(this);
     }
 
     public Shadow(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ShadowStyles.Default?.Invoke(this);
     }
 
     object? IShadow.Radius { get; set; }
@@ -77,6 +79,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ShadowStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class Shadow : Shadow<Microsoft.Maui.Controls.Shadow>
@@ -156,4 +167,10 @@ public static T Offset<T>(this T shadow, double x, double y)
         shadow.Offset = new Microsoft.Maui.Graphics.Point(x, y);
         return shadow;
     }
+}
+
+public static partial class ShadowStyles
+{
+    public static Action<IShadow>? Default { get; set; }
+    public static Dictionary<string, Action<IShadow>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/Ellipse.cs b/src/MauiReactor/Shapes/Ellipse.cs
index 3fcec8c8..f645458d 100644
--- a/src/MauiReactor/Shapes/Ellipse.cs
+++ b/src/MauiReactor/Shapes/Ellipse.cs
@@ -18,10 +18,12 @@ public sealed partial class Ellipse : Shapes.Shape<Microsoft.Maui.Controls.Shape
 {
     public Ellipse()
     {
+        EllipseStyles.Default?.Invoke(this);
     }
 
     public Ellipse(Action<Microsoft.Maui.Controls.Shapes.Ellipse?> componentRefAction) : base(componentRefAction)
     {
+        EllipseStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,8 +44,23 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && EllipseStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class EllipseExtensions
 {
+}
+
+public static partial class EllipseStyles
+{
+    public static Action<IEllipse>? Default { get; set; }
+    public static Dictionary<string, Action<IEllipse>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/EllipseGeometry.cs b/src/MauiReactor/Shapes/EllipseGeometry.cs
index f5e4731d..d9762eca 100644
--- a/src/MauiReactor/Shapes/EllipseGeometry.cs
+++ b/src/MauiReactor/Shapes/EllipseGeometry.cs
@@ -23,10 +23,12 @@ public partial interface IEllipseGeometry : Shapes.IGeometry
 {
     public EllipseGeometry()
     {
+        EllipseGeometryStyles.Default?.Invoke(this);
     }
 
     public EllipseGeometry(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        EllipseGeometryStyles.Default?.Invoke(this);
     }
 
     object? IEllipseGeometry.Center { get; set; }
@@ -73,6 +75,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && EllipseGeometryStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class EllipseGeometry : EllipseGeometry<Microsoft.Maui.Controls.Shapes.EllipseGeometry>
@@ -142,4 +153,10 @@ public static T RadiusY<T>(this T ellipseGeometry, Func<double> radiusYFunc)
         ellipseGeometry.RadiusY = new PropertyValue<double>(radiusYFunc);
         return ellipseGeometry;
     }
+}
+
+public static partial class EllipseGeometryStyles
+{
+    public static Action<IEllipseGeometry>? Default { get; set; }
+    public static Dictionary<string, Action<IEllipseGeometry>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/Geometry.cs b/src/MauiReactor/Shapes/Geometry.cs
index 2a24e423..d8ef57c8 100644
--- a/src/MauiReactor/Shapes/Geometry.cs
+++ b/src/MauiReactor/Shapes/Geometry.cs
@@ -18,10 +18,12 @@ public partial interface IGeometry : IVisualNode
 {
     protected Geometry()
     {
+        GeometryStyles.Default?.Invoke(this);
     }
 
     protected Geometry(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        GeometryStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,8 +44,23 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && GeometryStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class GeometryExtensions
 {
+}
+
+public static partial class GeometryStyles
+{
+    public static Action<IGeometry>? Default { get; set; }
+    public static Dictionary<string, Action<IGeometry>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/GeometryGroup.cs b/src/MauiReactor/Shapes/GeometryGroup.cs
index 77c593d4..4d57bb7d 100644
--- a/src/MauiReactor/Shapes/GeometryGroup.cs
+++ b/src/MauiReactor/Shapes/GeometryGroup.cs
@@ -25,10 +25,12 @@ public partial interface IGeometryGroup : Shapes.IGeometry
 {
     public GeometryGroup()
     {
+        GeometryGroupStyles.Default?.Invoke(this);
     }
 
     public GeometryGroup(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        GeometryGroupStyles.Default?.Invoke(this);
     }
 
     object? IGeometryGroup.Children { get; set; }
@@ -66,6 +68,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && GeometryGroupStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -154,4 +166,10 @@ public static T OnInvalidateGeometryRequested<T>(this T geometryGroup, Action<ob
         geometryGroup.InvalidateGeometryRequestedActionWithArgs = invalidateGeometryRequestedActionWithArgs;
         return geometryGroup;
     }
+}
+
+public static partial class GeometryGroupStyles
+{
+    public static Action<IGeometryGroup>? Default { get; set; }
+    public static Dictionary<string, Action<IGeometryGroup>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/Line.cs b/src/MauiReactor/Shapes/Line.cs
index df330d79..55c8fa5b 100644
--- a/src/MauiReactor/Shapes/Line.cs
+++ b/src/MauiReactor/Shapes/Line.cs
@@ -25,10 +25,12 @@ public sealed partial class Line : Shapes.Shape<Microsoft.Maui.Controls.Shapes.L
 {
     public Line()
     {
+        LineStyles.Default?.Invoke(this);
     }
 
     public Line(Action<Microsoft.Maui.Controls.Shapes.Line?> componentRefAction) : base(componentRefAction)
     {
+        LineStyles.Default?.Invoke(this);
     }
 
     object? ILine.X1 { get; set; }
@@ -80,6 +82,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && LineStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class LineExtensions
@@ -147,4 +158,10 @@ public static T Y2<T>(this T line, Func<double> y2Func)
         line.Y2 = new PropertyValue<double>(y2Func);
         return line;
     }
+}
+
+public static partial class LineStyles
+{
+    public static Action<ILine>? Default { get; set; }
+    public static Dictionary<string, Action<ILine>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/LineGeometry.cs b/src/MauiReactor/Shapes/LineGeometry.cs
index fc68a565..6259765b 100644
--- a/src/MauiReactor/Shapes/LineGeometry.cs
+++ b/src/MauiReactor/Shapes/LineGeometry.cs
@@ -21,10 +21,12 @@ public partial interface ILineGeometry : Shapes.IGeometry
 {
     public LineGeometry()
     {
+        LineGeometryStyles.Default?.Invoke(this);
     }
 
     public LineGeometry(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        LineGeometryStyles.Default?.Invoke(this);
     }
 
     object? ILineGeometry.StartPoint { get; set; }
@@ -66,6 +68,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && LineGeometryStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class LineGeometry : LineGeometry<Microsoft.Maui.Controls.Shapes.LineGeometry>
@@ -126,4 +137,10 @@ public static T EndPoint<T>(this T lineGeometry, double x, double y)
         lineGeometry.EndPoint = new Microsoft.Maui.Graphics.Point(x, y);
         return lineGeometry;
     }
+}
+
+public static partial class LineGeometryStyles
+{
+    public static Action<ILineGeometry>? Default { get; set; }
+    public static Dictionary<string, Action<ILineGeometry>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/Path.cs b/src/MauiReactor/Shapes/Path.cs
index 8e76916e..740f896a 100644
--- a/src/MauiReactor/Shapes/Path.cs
+++ b/src/MauiReactor/Shapes/Path.cs
@@ -19,10 +19,12 @@ public sealed partial class Path : Shapes.Shape<Microsoft.Maui.Controls.Shapes.P
 {
     public Path()
     {
+        PathStyles.Default?.Invoke(this);
     }
 
     public Path(Action<Microsoft.Maui.Controls.Shapes.Path?> componentRefAction) : base(componentRefAction)
     {
+        PathStyles.Default?.Invoke(this);
     }
 
     object? IPath.RenderTransform { get; set; }
@@ -50,6 +52,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && PathStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class PathExtensions
@@ -67,4 +78,10 @@ public static T RenderTransform<T>(this T path, Func<Microsoft.Maui.Controls.Sha
         path.RenderTransform = new PropertyValue<Microsoft.Maui.Controls.Shapes.Transform>(renderTransformFunc);
         return path;
     }
+}
+
+public static partial class PathStyles
+{
+    public static Action<IPath>? Default { get; set; }
+    public static Dictionary<string, Action<IPath>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/PathGeometry.cs b/src/MauiReactor/Shapes/PathGeometry.cs
index 3fa454bf..03c8dbfa 100644
--- a/src/MauiReactor/Shapes/PathGeometry.cs
+++ b/src/MauiReactor/Shapes/PathGeometry.cs
@@ -21,10 +21,12 @@ public sealed partial class PathGeometry : Shapes.Geometry<Microsoft.Maui.Contro
 {
     public PathGeometry()
     {
+        PathGeometryStyles.Default?.Invoke(this);
     }
 
     public PathGeometry(Action<Microsoft.Maui.Controls.Shapes.PathGeometry?> componentRefAction) : base(componentRefAction)
     {
+        PathGeometryStyles.Default?.Invoke(this);
     }
 
     object? IPathGeometry.Figures { get; set; }
@@ -56,6 +58,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && PathGeometryStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class PathGeometryExtensions
@@ -87,4 +98,10 @@ public static T FillRule<T>(this T pathGeometry, Func<Microsoft.Maui.Controls.Sh
         pathGeometry.FillRule = new PropertyValue<Microsoft.Maui.Controls.Shapes.FillRule>(fillRuleFunc);
         return pathGeometry;
     }
+}
+
+public static partial class PathGeometryStyles
+{
+    public static Action<IPathGeometry>? Default { get; set; }
+    public static Dictionary<string, Action<IPathGeometry>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/Polygon.cs b/src/MauiReactor/Shapes/Polygon.cs
index fec02e3b..4f817761 100644
--- a/src/MauiReactor/Shapes/Polygon.cs
+++ b/src/MauiReactor/Shapes/Polygon.cs
@@ -21,10 +21,12 @@ public sealed partial class Polygon : Shapes.Shape<Microsoft.Maui.Controls.Shape
 {
     public Polygon()
     {
+        PolygonStyles.Default?.Invoke(this);
     }
 
     public Polygon(Action<Microsoft.Maui.Controls.Shapes.Polygon?> componentRefAction) : base(componentRefAction)
     {
+        PolygonStyles.Default?.Invoke(this);
     }
 
     object? IPolygon.Points { get; set; }
@@ -56,6 +58,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && PolygonStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class PolygonExtensions
@@ -87,4 +98,10 @@ public static T FillRule<T>(this T polygon, Func<Microsoft.Maui.Controls.Shapes.
         polygon.FillRule = new PropertyValue<Microsoft.Maui.Controls.Shapes.FillRule>(fillRuleFunc);
         return polygon;
     }
+}
+
+public static partial class PolygonStyles
+{
+    public static Action<IPolygon>? Default { get; set; }
+    public static Dictionary<string, Action<IPolygon>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/Polyline.cs b/src/MauiReactor/Shapes/Polyline.cs
index 0a06ed56..202968b2 100644
--- a/src/MauiReactor/Shapes/Polyline.cs
+++ b/src/MauiReactor/Shapes/Polyline.cs
@@ -21,10 +21,12 @@ public sealed partial class Polyline : Shapes.Shape<Microsoft.Maui.Controls.Shap
 {
     public Polyline()
     {
+        PolylineStyles.Default?.Invoke(this);
     }
 
     public Polyline(Action<Microsoft.Maui.Controls.Shapes.Polyline?> componentRefAction) : base(componentRefAction)
     {
+        PolylineStyles.Default?.Invoke(this);
     }
 
     object? IPolyline.Points { get; set; }
@@ -56,6 +58,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && PolylineStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class PolylineExtensions
@@ -87,4 +98,10 @@ public static T FillRule<T>(this T polyline, Func<Microsoft.Maui.Controls.Shapes
         polyline.FillRule = new PropertyValue<Microsoft.Maui.Controls.Shapes.FillRule>(fillRuleFunc);
         return polyline;
     }
+}
+
+public static partial class PolylineStyles
+{
+    public static Action<IPolyline>? Default { get; set; }
+    public static Dictionary<string, Action<IPolyline>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/Rectangle.cs b/src/MauiReactor/Shapes/Rectangle.cs
index fa69d799..16ec33aa 100644
--- a/src/MauiReactor/Shapes/Rectangle.cs
+++ b/src/MauiReactor/Shapes/Rectangle.cs
@@ -21,10 +21,12 @@ public sealed partial class Rectangle : Shapes.Shape<Microsoft.Maui.Controls.Sha
 {
     public Rectangle()
     {
+        RectangleStyles.Default?.Invoke(this);
     }
 
     public Rectangle(Action<Microsoft.Maui.Controls.Shapes.Rectangle?> componentRefAction) : base(componentRefAction)
     {
+        RectangleStyles.Default?.Invoke(this);
     }
 
     object? IRectangle.RadiusX { get; set; }
@@ -66,6 +68,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && RectangleStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class RectangleExtensions
@@ -101,4 +112,10 @@ public static T RadiusY<T>(this T rectangle, Func<double> radiusYFunc)
         rectangle.RadiusY = new PropertyValue<double>(radiusYFunc);
         return rectangle;
     }
+}
+
+public static partial class RectangleStyles
+{
+    public static Action<IRectangle>? Default { get; set; }
+    public static Dictionary<string, Action<IRectangle>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/RectangleGeometry.cs b/src/MauiReactor/Shapes/RectangleGeometry.cs
index 59d1f12c..96fc2dc1 100644
--- a/src/MauiReactor/Shapes/RectangleGeometry.cs
+++ b/src/MauiReactor/Shapes/RectangleGeometry.cs
@@ -19,10 +19,12 @@ public partial interface IRectangleGeometry : Shapes.IGeometry
 {
     public RectangleGeometry()
     {
+        RectangleGeometryStyles.Default?.Invoke(this);
     }
 
     public RectangleGeometry(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        RectangleGeometryStyles.Default?.Invoke(this);
     }
 
     object? IRectangleGeometry.Rect { get; set; }
@@ -59,6 +61,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && RectangleGeometryStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class RectangleGeometry : RectangleGeometry<Microsoft.Maui.Controls.Shapes.RectangleGeometry>
@@ -89,4 +100,10 @@ public static T Rect<T>(this T rectangleGeometry, Func<Microsoft.Maui.Graphics.R
         rectangleGeometry.Rect = new PropertyValue<Microsoft.Maui.Graphics.Rect>(rectFunc);
         return rectangleGeometry;
     }
+}
+
+public static partial class RectangleGeometryStyles
+{
+    public static Action<IRectangleGeometry>? Default { get; set; }
+    public static Dictionary<string, Action<IRectangleGeometry>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/RoundRectangle.cs b/src/MauiReactor/Shapes/RoundRectangle.cs
index abfd8156..a8c31105 100644
--- a/src/MauiReactor/Shapes/RoundRectangle.cs
+++ b/src/MauiReactor/Shapes/RoundRectangle.cs
@@ -19,10 +19,12 @@ public sealed partial class RoundRectangle : Shapes.Shape<Microsoft.Maui.Control
 {
     public RoundRectangle()
     {
+        RoundRectangleStyles.Default?.Invoke(this);
     }
 
     public RoundRectangle(Action<Microsoft.Maui.Controls.Shapes.RoundRectangle?> componentRefAction) : base(componentRefAction)
     {
+        RoundRectangleStyles.Default?.Invoke(this);
     }
 
     object? IRoundRectangle.CornerRadius { get; set; }
@@ -59,6 +61,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && RoundRectangleStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class RoundRectangleExtensions
@@ -94,4 +105,10 @@ public static T CornerRadius<T>(this T roundRectangle, double topLeft, double to
         roundRectangle.AppendAnimatable(Microsoft.Maui.Controls.Shapes.RoundRectangle.CornerRadiusProperty, customAnimation ?? new RxSimpleCornerRadiusAnimation(new CornerRadius(topLeft, topRight, bottomLeft, bottomRight)), SetCornerRadius);
         return roundRectangle;
     }
+}
+
+public static partial class RoundRectangleStyles
+{
+    public static Action<IRoundRectangle>? Default { get; set; }
+    public static Dictionary<string, Action<IRoundRectangle>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/RoundRectangleGeometry.cs b/src/MauiReactor/Shapes/RoundRectangleGeometry.cs
index caad57e0..25b5293e 100644
--- a/src/MauiReactor/Shapes/RoundRectangleGeometry.cs
+++ b/src/MauiReactor/Shapes/RoundRectangleGeometry.cs
@@ -21,10 +21,12 @@ public partial interface IRoundRectangleGeometry : Shapes.IGeometryGroup
 {
     public RoundRectangleGeometry()
     {
+        RoundRectangleGeometryStyles.Default?.Invoke(this);
     }
 
     public RoundRectangleGeometry(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        RoundRectangleGeometryStyles.Default?.Invoke(this);
     }
 
     object? IRoundRectangleGeometry.Rect { get; set; }
@@ -66,6 +68,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && RoundRectangleGeometryStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class RoundRectangleGeometry : RoundRectangleGeometry<Microsoft.Maui.Controls.Shapes.RoundRectangleGeometry>
@@ -128,4 +139,10 @@ public static T CornerRadius<T>(this T roundRectangleGeometry, double topLeft, d
         roundRectangleGeometry.AppendAnimatable(Microsoft.Maui.Controls.Shapes.RoundRectangleGeometry.CornerRadiusProperty, customAnimation ?? new RxSimpleCornerRadiusAnimation(new CornerRadius(topLeft, topRight, bottomLeft, bottomRight)), SetCornerRadius);
         return roundRectangleGeometry;
     }
+}
+
+public static partial class RoundRectangleGeometryStyles
+{
+    public static Action<IRoundRectangleGeometry>? Default { get; set; }
+    public static Dictionary<string, Action<IRoundRectangleGeometry>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shapes/Shape.cs b/src/MauiReactor/Shapes/Shape.cs
index 483b6cdd..58bc4d73 100644
--- a/src/MauiReactor/Shapes/Shape.cs
+++ b/src/MauiReactor/Shapes/Shape.cs
@@ -35,10 +35,12 @@ public partial interface IShape : IView
 {
     protected Shape()
     {
+        ShapeStyles.Default?.Invoke(this);
     }
 
     protected Shape(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ShapeStyles.Default?.Invoke(this);
     }
 
     object? IShape.Fill { get; set; }
@@ -109,6 +111,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ShapeStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class ShapeExtensions
@@ -244,4 +255,10 @@ public static T Aspect<T>(this T shape, Func<Microsoft.Maui.Controls.Stretch> as
         shape.Aspect = new PropertyValue<Microsoft.Maui.Controls.Stretch>(aspectFunc);
         return shape;
     }
+}
+
+public static partial class ShapeStyles
+{
+    public static Action<IShape>? Default { get; set; }
+    public static Dictionary<string, Action<IShape>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Shell.cs b/src/MauiReactor/Shell.cs
index 3c8bfdf7..3014c186 100644
--- a/src/MauiReactor/Shell.cs
+++ b/src/MauiReactor/Shell.cs
@@ -49,10 +49,12 @@ public partial interface IShell : IPage
 {
     public Shell()
     {
+        ShellStyles.Default?.Invoke(this);
     }
 
     public Shell(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ShellStyles.Default?.Invoke(this);
     }
 
     object? IShell.FlyoutBehavior { get; set; }
@@ -146,6 +148,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ShellStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -499,4 +511,10 @@ public static T OnNavigating<T>(this T shell, Action<object?, ShellNavigatingEve
         shell.NavigatingActionWithArgs = navigatingActionWithArgs;
         return shell;
     }
+}
+
+public static partial class ShellStyles
+{
+    public static Action<IShell>? Default { get; set; }
+    public static Dictionary<string, Action<IShell>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ShellContent.cs b/src/MauiReactor/ShellContent.cs
index d2d1876b..d83d3327 100644
--- a/src/MauiReactor/ShellContent.cs
+++ b/src/MauiReactor/ShellContent.cs
@@ -18,10 +18,12 @@ public partial interface IShellContent : IBaseShellItem
 {
     public ShellContent()
     {
+        ShellContentStyles.Default?.Invoke(this);
     }
 
     public ShellContent(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ShellContentStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ShellContentStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class ShellContent : ShellContent<Microsoft.Maui.Controls.ShellContent>
@@ -57,4 +68,10 @@ public ShellContent(Action<Microsoft.Maui.Controls.ShellContent?> componentRefAc
 
 public static partial class ShellContentExtensions
 {
+}
+
+public static partial class ShellContentStyles
+{
+    public static Action<IShellContent>? Default { get; set; }
+    public static Dictionary<string, Action<IShellContent>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ShellGroupItem.cs b/src/MauiReactor/ShellGroupItem.cs
index de72fe31..cba51b4f 100644
--- a/src/MauiReactor/ShellGroupItem.cs
+++ b/src/MauiReactor/ShellGroupItem.cs
@@ -19,10 +19,12 @@ public partial interface IShellGroupItem : IBaseShellItem
 {
     public ShellGroupItem()
     {
+        ShellGroupItemStyles.Default?.Invoke(this);
     }
 
     public ShellGroupItem(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ShellGroupItemStyles.Default?.Invoke(this);
     }
 
     object? IShellGroupItem.FlyoutDisplayOptions { get; set; }
@@ -50,6 +52,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ShellGroupItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class ShellGroupItem : ShellGroupItem<Microsoft.Maui.Controls.ShellGroupItem>
@@ -78,4 +89,10 @@ public static T FlyoutDisplayOptions<T>(this T shellGroupItem, Func<Microsoft.Ma
         shellGroupItem.FlyoutDisplayOptions = new PropertyValue<Microsoft.Maui.Controls.FlyoutDisplayOptions>(flyoutDisplayOptionsFunc);
         return shellGroupItem;
     }
+}
+
+public static partial class ShellGroupItemStyles
+{
+    public static Action<IShellGroupItem>? Default { get; set; }
+    public static Dictionary<string, Action<IShellGroupItem>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ShellItem.cs b/src/MauiReactor/ShellItem.cs
index 370eb53b..02ca0996 100644
--- a/src/MauiReactor/ShellItem.cs
+++ b/src/MauiReactor/ShellItem.cs
@@ -18,10 +18,12 @@ public partial interface IShellItem : IShellGroupItem
 {
     public ShellItem()
     {
+        ShellItemStyles.Default?.Invoke(this);
     }
 
     public ShellItem(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ShellItemStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ShellItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class ShellItem : ShellItem<Microsoft.Maui.Controls.ShellItem>
@@ -57,4 +68,10 @@ public ShellItem(Action<Microsoft.Maui.Controls.ShellItem?> componentRefAction)
 
 public static partial class ShellItemExtensions
 {
+}
+
+public static partial class ShellItemStyles
+{
+    public static Action<IShellItem>? Default { get; set; }
+    public static Dictionary<string, Action<IShellItem>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ShellSection.cs b/src/MauiReactor/ShellSection.cs
index 34bfc6ee..ebf06b11 100644
--- a/src/MauiReactor/ShellSection.cs
+++ b/src/MauiReactor/ShellSection.cs
@@ -18,10 +18,12 @@ public partial interface IShellSection : IShellGroupItem
 {
     public ShellSection()
     {
+        ShellSectionStyles.Default?.Invoke(this);
     }
 
     public ShellSection(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ShellSectionStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ShellSectionStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class ShellSection : ShellSection<Microsoft.Maui.Controls.ShellSection>
@@ -57,4 +68,10 @@ public ShellSection(Action<Microsoft.Maui.Controls.ShellSection?> componentRefAc
 
 public static partial class ShellSectionExtensions
 {
+}
+
+public static partial class ShellSectionStyles
+{
+    public static Action<IShellSection>? Default { get; set; }
+    public static Dictionary<string, Action<IShellSection>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Slider.cs b/src/MauiReactor/Slider.cs
index c37fa5ed..509d21a1 100644
--- a/src/MauiReactor/Slider.cs
+++ b/src/MauiReactor/Slider.cs
@@ -43,10 +43,12 @@ public partial interface ISlider : IView
 {
     public Slider()
     {
+        SliderStyles.Default?.Invoke(this);
     }
 
     public Slider(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        SliderStyles.Default?.Invoke(this);
     }
 
     object? ISlider.Minimum { get; set; }
@@ -127,6 +129,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && SliderStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -392,4 +404,10 @@ public static T OnDragCompleted<T>(this T slider, Action<object?, EventArgs>? dr
         slider.DragCompletedActionWithArgs = dragCompletedActionWithArgs;
         return slider;
     }
+}
+
+public static partial class SliderStyles
+{
+    public static Action<ISlider>? Default { get; set; }
+    public static Dictionary<string, Action<ISlider>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/StackBase.cs b/src/MauiReactor/StackBase.cs
index 7c1748b0..5d151e6f 100644
--- a/src/MauiReactor/StackBase.cs
+++ b/src/MauiReactor/StackBase.cs
@@ -19,10 +19,12 @@ public partial interface IStackBase : ILayout
 {
     protected StackBase()
     {
+        StackBaseStyles.Default?.Invoke(this);
     }
 
     protected StackBase(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        StackBaseStyles.Default?.Invoke(this);
     }
 
     object? IStackBase.Spacing { get; set; }
@@ -59,6 +61,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && StackBaseStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class StackBaseExtensions
@@ -78,4 +89,10 @@ public static T Spacing<T>(this T stackBase, Func<double> spacingFunc)
         stackBase.Spacing = new PropertyValue<double>(spacingFunc);
         return stackBase;
     }
+}
+
+public static partial class StackBaseStyles
+{
+    public static Action<IStackBase>? Default { get; set; }
+    public static Dictionary<string, Action<IStackBase>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/StackLayout.cs b/src/MauiReactor/StackLayout.cs
index ad7184f4..77029dc5 100644
--- a/src/MauiReactor/StackLayout.cs
+++ b/src/MauiReactor/StackLayout.cs
@@ -19,10 +19,12 @@ public partial interface IStackLayout : IStackBase
 {
     public StackLayout()
     {
+        StackLayoutStyles.Default?.Invoke(this);
     }
 
     public StackLayout(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        StackLayoutStyles.Default?.Invoke(this);
     }
 
     object? IStackLayout.Orientation { get; set; }
@@ -50,6 +52,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && StackLayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class StackLayout : StackLayout<Microsoft.Maui.Controls.StackLayout>
@@ -78,4 +89,10 @@ public static T Orientation<T>(this T stackLayout, Func<Microsoft.Maui.Controls.
         stackLayout.Orientation = new PropertyValue<Microsoft.Maui.Controls.StackOrientation>(orientationFunc);
         return stackLayout;
     }
+}
+
+public static partial class StackLayoutStyles
+{
+    public static Action<IStackLayout>? Default { get; set; }
+    public static Dictionary<string, Action<IStackLayout>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Stepper.cs b/src/MauiReactor/Stepper.cs
index 80d0e545..87fce985 100644
--- a/src/MauiReactor/Stepper.cs
+++ b/src/MauiReactor/Stepper.cs
@@ -29,10 +29,12 @@ public partial interface IStepper : IView
 {
     public Stepper()
     {
+        StepperStyles.Default?.Invoke(this);
     }
 
     public Stepper(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        StepperStyles.Default?.Invoke(this);
     }
 
     object? IStepper.Maximum { get; set; }
@@ -90,6 +92,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && StepperStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -214,4 +226,10 @@ public static T OnValueChanged<T>(this T stepper, Action<object?, ValueChangedEv
         stepper.ValueChangedActionWithArgs = valueChangedActionWithArgs;
         return stepper;
     }
+}
+
+public static partial class StepperStyles
+{
+    public static Action<IStepper>? Default { get; set; }
+    public static Dictionary<string, Action<IStepper>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/StructuredItemsView.cs b/src/MauiReactor/StructuredItemsView.cs
index 802c9dc8..aaf324df 100644
--- a/src/MauiReactor/StructuredItemsView.cs
+++ b/src/MauiReactor/StructuredItemsView.cs
@@ -19,10 +19,12 @@ public partial interface IStructuredItemsView : IItemsView
 {
     public StructuredItemsView()
     {
+        StructuredItemsViewStyles.Default?.Invoke(this);
     }
 
     public StructuredItemsView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        StructuredItemsViewStyles.Default?.Invoke(this);
     }
 
     object? IStructuredItemsView.ItemSizingStrategy { get; set; }
@@ -50,6 +52,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && StructuredItemsViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class StructuredItemsView : StructuredItemsView<Microsoft.Maui.Controls.StructuredItemsView>
@@ -78,4 +89,10 @@ public static T ItemSizingStrategy<T>(this T structuredItemsView, Func<Microsoft
         structuredItemsView.ItemSizingStrategy = new PropertyValue<Microsoft.Maui.Controls.ItemSizingStrategy>(itemSizingStrategyFunc);
         return structuredItemsView;
     }
+}
+
+public static partial class StructuredItemsViewStyles
+{
+    public static Action<IStructuredItemsView>? Default { get; set; }
+    public static Dictionary<string, Action<IStructuredItemsView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/SwipeGestureRecognizer.cs b/src/MauiReactor/SwipeGestureRecognizer.cs
index c0a930a6..45bfeb40 100644
--- a/src/MauiReactor/SwipeGestureRecognizer.cs
+++ b/src/MauiReactor/SwipeGestureRecognizer.cs
@@ -25,10 +25,12 @@ public sealed partial class SwipeGestureRecognizer : GestureRecognizer<Microsoft
 {
     public SwipeGestureRecognizer()
     {
+        SwipeGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     public SwipeGestureRecognizer(Action<Microsoft.Maui.Controls.SwipeGestureRecognizer?> componentRefAction) : base(componentRefAction)
     {
+        SwipeGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     object? ISwipeGestureRecognizer.Direction { get; set; }
@@ -66,6 +68,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && SwipeGestureRecognizerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -143,4 +155,10 @@ public static T OnSwiped<T>(this T swipeGestureRecognizer, Action<object?, Swipe
         swipeGestureRecognizer.SwipedActionWithArgs = swipedActionWithArgs;
         return swipeGestureRecognizer;
     }
+}
+
+public static partial class SwipeGestureRecognizerStyles
+{
+    public static Action<ISwipeGestureRecognizer>? Default { get; set; }
+    public static Dictionary<string, Action<ISwipeGestureRecognizer>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/SwipeItem.cs b/src/MauiReactor/SwipeItem.cs
index 4480046c..5717f063 100644
--- a/src/MauiReactor/SwipeItem.cs
+++ b/src/MauiReactor/SwipeItem.cs
@@ -25,10 +25,12 @@ public partial interface ISwipeItem : IMenuItem
 {
     public SwipeItem()
     {
+        SwipeItemStyles.Default?.Invoke(this);
     }
 
     public SwipeItem(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        SwipeItemStyles.Default?.Invoke(this);
     }
 
     object? ISwipeItem.BackgroundColor { get; set; }
@@ -66,6 +68,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && SwipeItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -154,4 +166,10 @@ public static T OnInvoked<T>(this T swipeItem, Action<object?, EventArgs>? invok
         swipeItem.InvokedActionWithArgs = invokedActionWithArgs;
         return swipeItem;
     }
+}
+
+public static partial class SwipeItemStyles
+{
+    public static Action<ISwipeItem>? Default { get; set; }
+    public static Dictionary<string, Action<ISwipeItem>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/SwipeItemView.cs b/src/MauiReactor/SwipeItemView.cs
index 0609ff76..312f3147 100644
--- a/src/MauiReactor/SwipeItemView.cs
+++ b/src/MauiReactor/SwipeItemView.cs
@@ -21,10 +21,12 @@ public partial interface ISwipeItemView : IContentView
 {
     public SwipeItemView()
     {
+        SwipeItemViewStyles.Default?.Invoke(this);
     }
 
     public SwipeItemView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        SwipeItemViewStyles.Default?.Invoke(this);
     }
 
     Action? ISwipeItemView.InvokedAction { get; set; }
@@ -52,6 +54,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && SwipeItemViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -112,4 +124,10 @@ public static T OnInvoked<T>(this T swipeItemView, Action<object?, EventArgs>? i
         swipeItemView.InvokedActionWithArgs = invokedActionWithArgs;
         return swipeItemView;
     }
+}
+
+public static partial class SwipeItemViewStyles
+{
+    public static Action<ISwipeItemView>? Default { get; set; }
+    public static Dictionary<string, Action<ISwipeItemView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/SwipeItems.cs b/src/MauiReactor/SwipeItems.cs
index 8c137f47..e2752007 100644
--- a/src/MauiReactor/SwipeItems.cs
+++ b/src/MauiReactor/SwipeItems.cs
@@ -25,10 +25,12 @@ public partial interface ISwipeItems : IElement
 {
     public SwipeItems()
     {
+        SwipeItemsStyles.Default?.Invoke(this);
     }
 
     public SwipeItems(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        SwipeItemsStyles.Default?.Invoke(this);
     }
 
     object? ISwipeItems.Mode { get; set; }
@@ -66,6 +68,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && SwipeItemsStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -154,4 +166,10 @@ public static T OnCollectionChanged<T>(this T swipeItems, Action<object?, EventA
         swipeItems.CollectionChangedActionWithArgs = collectionChangedActionWithArgs;
         return swipeItems;
     }
+}
+
+public static partial class SwipeItemsStyles
+{
+    public static Action<ISwipeItems>? Default { get; set; }
+    public static Dictionary<string, Action<ISwipeItems>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/SwipeView.cs b/src/MauiReactor/SwipeView.cs
index 460297b8..d317317b 100644
--- a/src/MauiReactor/SwipeView.cs
+++ b/src/MauiReactor/SwipeView.cs
@@ -31,10 +31,12 @@ public partial interface ISwipeView : IContentView
 {
     public SwipeView()
     {
+        SwipeViewStyles.Default?.Invoke(this);
     }
 
     public SwipeView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        SwipeViewStyles.Default?.Invoke(this);
     }
 
     object? ISwipeView.Threshold { get; set; }
@@ -89,6 +91,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && SwipeViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -219,4 +231,10 @@ public static T OnSwipeEnded<T>(this T swipeView, Action<object?, SwipeEndedEven
         swipeView.SwipeEndedActionWithArgs = swipeEndedActionWithArgs;
         return swipeView;
     }
+}
+
+public static partial class SwipeViewStyles
+{
+    public static Action<ISwipeView>? Default { get; set; }
+    public static Dictionary<string, Action<ISwipeView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Switch.cs b/src/MauiReactor/Switch.cs
index 6b1a88c2..b0c23c29 100644
--- a/src/MauiReactor/Switch.cs
+++ b/src/MauiReactor/Switch.cs
@@ -27,10 +27,12 @@ public partial interface ISwitch : IView
 {
     public Switch()
     {
+        SwitchStyles.Default?.Invoke(this);
     }
 
     public Switch(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        SwitchStyles.Default?.Invoke(this);
     }
 
     object? ISwitch.IsToggled { get; set; }
@@ -72,6 +74,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && SwitchStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -174,4 +186,10 @@ public static T OnToggled<T>(this T @switch, Action<object?, ToggledEventArgs>?
         @switch.ToggledActionWithArgs = toggledActionWithArgs;
         return @switch;
     }
+}
+
+public static partial class SwitchStyles
+{
+    public static Action<ISwitch>? Default { get; set; }
+    public static Dictionary<string, Action<ISwitch>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/SwitchCell.cs b/src/MauiReactor/SwitchCell.cs
index 1b8f8472..c0cc6412 100644
--- a/src/MauiReactor/SwitchCell.cs
+++ b/src/MauiReactor/SwitchCell.cs
@@ -27,10 +27,12 @@ public partial interface ISwitchCell : ICell
 {
     public SwitchCell()
     {
+        SwitchCellStyles.Default?.Invoke(this);
     }
 
     public SwitchCell(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        SwitchCellStyles.Default?.Invoke(this);
     }
 
     object? ISwitchCell.On { get; set; }
@@ -72,6 +74,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && SwitchCellStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -174,4 +186,10 @@ public static T OnOnChanged<T>(this T switchCell, Action<object?, ToggledEventAr
         switchCell.OnChangedActionWithArgs = onChangedActionWithArgs;
         return switchCell;
     }
+}
+
+public static partial class SwitchCellStyles
+{
+    public static Action<ISwitchCell>? Default { get; set; }
+    public static Dictionary<string, Action<ISwitchCell>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Tab.cs b/src/MauiReactor/Tab.cs
index 289e9b81..c482f003 100644
--- a/src/MauiReactor/Tab.cs
+++ b/src/MauiReactor/Tab.cs
@@ -18,10 +18,12 @@ public partial interface ITab : IShellSection
 {
     public Tab()
     {
+        TabStyles.Default?.Invoke(this);
     }
 
     public Tab(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        TabStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && TabStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class Tab : Tab<Microsoft.Maui.Controls.Tab>
@@ -57,4 +68,10 @@ public Tab(Action<Microsoft.Maui.Controls.Tab?> componentRefAction) : base(compo
 
 public static partial class TabExtensions
 {
+}
+
+public static partial class TabStyles
+{
+    public static Action<ITab>? Default { get; set; }
+    public static Dictionary<string, Action<ITab>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/TabBar.cs b/src/MauiReactor/TabBar.cs
index c3484f96..7579df35 100644
--- a/src/MauiReactor/TabBar.cs
+++ b/src/MauiReactor/TabBar.cs
@@ -18,10 +18,12 @@ public partial interface ITabBar : IShellItem
 {
     public TabBar()
     {
+        TabBarStyles.Default?.Invoke(this);
     }
 
     public TabBar(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        TabBarStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && TabBarStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class TabBar : TabBar<Microsoft.Maui.Controls.TabBar>
@@ -57,4 +68,10 @@ public TabBar(Action<Microsoft.Maui.Controls.TabBar?> componentRefAction) : base
 
 public static partial class TabBarExtensions
 {
+}
+
+public static partial class TabBarStyles
+{
+    public static Action<ITabBar>? Default { get; set; }
+    public static Dictionary<string, Action<ITabBar>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/TabbedPage.cs b/src/MauiReactor/TabbedPage.cs
index e5bfc6e5..8566a4dd 100644
--- a/src/MauiReactor/TabbedPage.cs
+++ b/src/MauiReactor/TabbedPage.cs
@@ -27,10 +27,12 @@ public partial interface ITabbedPage : IGenericMultiPage
 {
     public TabbedPage()
     {
+        TabbedPageStyles.Default?.Invoke(this);
     }
 
     public TabbedPage(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        TabbedPageStyles.Default?.Invoke(this);
     }
 
     object? ITabbedPage.BarBackgroundColor { get; set; }
@@ -74,6 +76,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && TabbedPageStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class TabbedPage : TabbedPage<Microsoft.Maui.Controls.TabbedPage>
@@ -158,4 +169,10 @@ public static T SelectedTabColor<T>(this T tabbedPage, Func<Microsoft.Maui.Graph
         tabbedPage.SelectedTabColor = new PropertyValue<Microsoft.Maui.Graphics.Color>(selectedTabColorFunc);
         return tabbedPage;
     }
+}
+
+public static partial class TabbedPageStyles
+{
+    public static Action<ITabbedPage>? Default { get; set; }
+    public static Dictionary<string, Action<ITabbedPage>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/TableView.cs b/src/MauiReactor/TableView.cs
index 3f279a07..df406a84 100644
--- a/src/MauiReactor/TableView.cs
+++ b/src/MauiReactor/TableView.cs
@@ -21,10 +21,12 @@ public partial interface ITableView : IView
 {
     public TableView()
     {
+        TableViewStyles.Default?.Invoke(this);
     }
 
     public TableView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        TableViewStyles.Default?.Invoke(this);
     }
 
     object? ITableView.RowHeight { get; set; }
@@ -56,6 +58,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && TableViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class TableView : TableView<Microsoft.Maui.Controls.TableView>
@@ -98,4 +109,10 @@ public static T HasUnevenRows<T>(this T tableView, Func<bool> hasUnevenRowsFunc)
         tableView.HasUnevenRows = new PropertyValue<bool>(hasUnevenRowsFunc);
         return tableView;
     }
+}
+
+public static partial class TableViewStyles
+{
+    public static Action<ITableView>? Default { get; set; }
+    public static Dictionary<string, Action<ITableView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/TapGestureRecognizer.cs b/src/MauiReactor/TapGestureRecognizer.cs
index 27a86dd5..5efa5c64 100644
--- a/src/MauiReactor/TapGestureRecognizer.cs
+++ b/src/MauiReactor/TapGestureRecognizer.cs
@@ -25,10 +25,12 @@ public sealed partial class TapGestureRecognizer : GestureRecognizer<Microsoft.M
 {
     public TapGestureRecognizer()
     {
+        TapGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     public TapGestureRecognizer(Action<Microsoft.Maui.Controls.TapGestureRecognizer?> componentRefAction) : base(componentRefAction)
     {
+        TapGestureRecognizerStyles.Default?.Invoke(this);
     }
 
     object? ITapGestureRecognizer.NumberOfTapsRequired { get; set; }
@@ -66,6 +68,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && TapGestureRecognizerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -143,4 +155,10 @@ public static T OnTapped<T>(this T tapGestureRecognizer, Action<object?, TappedE
         tapGestureRecognizer.TappedActionWithArgs = tappedActionWithArgs;
         return tapGestureRecognizer;
     }
+}
+
+public static partial class TapGestureRecognizerStyles
+{
+    public static Action<ITapGestureRecognizer>? Default { get; set; }
+    public static Dictionary<string, Action<ITapGestureRecognizer>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/TemplatedPage.cs b/src/MauiReactor/TemplatedPage.cs
index 2272ccfc..dc641f1c 100644
--- a/src/MauiReactor/TemplatedPage.cs
+++ b/src/MauiReactor/TemplatedPage.cs
@@ -18,10 +18,12 @@ public partial interface ITemplatedPage : IPage
 {
     public TemplatedPage()
     {
+        TemplatedPageStyles.Default?.Invoke(this);
     }
 
     public TemplatedPage(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        TemplatedPageStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && TemplatedPageStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class TemplatedPage : TemplatedPage<Microsoft.Maui.Controls.TemplatedPage>
@@ -57,4 +68,10 @@ public TemplatedPage(Action<Microsoft.Maui.Controls.TemplatedPage?> componentRef
 
 public static partial class TemplatedPageExtensions
 {
+}
+
+public static partial class TemplatedPageStyles
+{
+    public static Action<ITemplatedPage>? Default { get; set; }
+    public static Dictionary<string, Action<ITemplatedPage>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/TemplatedView.cs b/src/MauiReactor/TemplatedView.cs
index ce8b94e5..9eb1a2f1 100644
--- a/src/MauiReactor/TemplatedView.cs
+++ b/src/MauiReactor/TemplatedView.cs
@@ -18,10 +18,12 @@ public partial interface ITemplatedView : Compatibility.ILayout
 {
     public TemplatedView()
     {
+        TemplatedViewStyles.Default?.Invoke(this);
     }
 
     public TemplatedView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        TemplatedViewStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && TemplatedViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class TemplatedView : TemplatedView<Microsoft.Maui.Controls.TemplatedView>
@@ -57,4 +68,10 @@ public TemplatedView(Action<Microsoft.Maui.Controls.TemplatedView?> componentRef
 
 public static partial class TemplatedViewExtensions
 {
+}
+
+public static partial class TemplatedViewStyles
+{
+    public static Action<ITemplatedView>? Default { get; set; }
+    public static Dictionary<string, Action<ITemplatedView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/TextCell.cs b/src/MauiReactor/TextCell.cs
index 5fef2350..b999d4cf 100644
--- a/src/MauiReactor/TextCell.cs
+++ b/src/MauiReactor/TextCell.cs
@@ -25,10 +25,12 @@ public partial interface ITextCell : ICell
 {
     public TextCell()
     {
+        TextCellStyles.Default?.Invoke(this);
     }
 
     public TextCell(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        TextCellStyles.Default?.Invoke(this);
     }
 
     object? ITextCell.Text { get; set; }
@@ -68,6 +70,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && TextCellStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class TextCell : TextCell<Microsoft.Maui.Controls.TextCell>
@@ -138,4 +149,10 @@ public static T DetailColor<T>(this T textCell, Func<Microsoft.Maui.Graphics.Col
         textCell.DetailColor = new PropertyValue<Microsoft.Maui.Graphics.Color>(detailColorFunc);
         return textCell;
     }
+}
+
+public static partial class TextCellStyles
+{
+    public static Action<ITextCell>? Default { get; set; }
+    public static Dictionary<string, Action<ITextCell>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Theme.cs b/src/MauiReactor/Theme.cs
new file mode 100644
index 00000000..d088929f
--- /dev/null
+++ b/src/MauiReactor/Theme.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MauiReactor;
+
+public abstract class Theme
+{
+    internal void Apply()
+    {
+        OnApply();
+    }
+
+    protected abstract void OnApply();
+}
diff --git a/src/MauiReactor/TimePicker.cs b/src/MauiReactor/TimePicker.cs
index c818433b..65136583 100644
--- a/src/MauiReactor/TimePicker.cs
+++ b/src/MauiReactor/TimePicker.cs
@@ -33,10 +33,12 @@ public partial interface ITimePicker : IView
 {
     public TimePicker()
     {
+        TimePickerStyles.Default?.Invoke(this);
     }
 
     public TimePicker(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        TimePickerStyles.Default?.Invoke(this);
     }
 
     object? ITimePicker.Format { get; set; }
@@ -102,6 +104,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && TimePickerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class TimePicker : TimePicker<Microsoft.Maui.Controls.TimePicker>
@@ -232,4 +243,10 @@ public static T FontAutoScalingEnabled<T>(this T timePicker, Func<bool> fontAuto
         timePicker.FontAutoScalingEnabled = new PropertyValue<bool>(fontAutoScalingEnabledFunc);
         return timePicker;
     }
+}
+
+public static partial class TimePickerStyles
+{
+    public static Action<ITimePicker>? Default { get; set; }
+    public static Dictionary<string, Action<ITimePicker>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ToolbarItem.cs b/src/MauiReactor/ToolbarItem.cs
index aa097ce7..1b26a374 100644
--- a/src/MauiReactor/ToolbarItem.cs
+++ b/src/MauiReactor/ToolbarItem.cs
@@ -18,10 +18,12 @@ public partial interface IToolbarItem : IMenuItem
 {
     public ToolbarItem()
     {
+        ToolbarItemStyles.Default?.Invoke(this);
     }
 
     public ToolbarItem(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ToolbarItemStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ToolbarItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class ToolbarItem : ToolbarItem<Microsoft.Maui.Controls.ToolbarItem>
@@ -57,4 +68,10 @@ public ToolbarItem(Action<Microsoft.Maui.Controls.ToolbarItem?> componentRefActi
 
 public static partial class ToolbarItemExtensions
 {
+}
+
+public static partial class ToolbarItemStyles
+{
+    public static Action<IToolbarItem>? Default { get; set; }
+    public static Dictionary<string, Action<IToolbarItem>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/VerticalStackLayout.cs b/src/MauiReactor/VerticalStackLayout.cs
index feaa3a06..cff53092 100644
--- a/src/MauiReactor/VerticalStackLayout.cs
+++ b/src/MauiReactor/VerticalStackLayout.cs
@@ -18,10 +18,12 @@ public partial interface IVerticalStackLayout : IStackBase
 {
     public VerticalStackLayout()
     {
+        VerticalStackLayoutStyles.Default?.Invoke(this);
     }
 
     public VerticalStackLayout(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        VerticalStackLayoutStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && VerticalStackLayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class VerticalStackLayout : VerticalStackLayout<Microsoft.Maui.Controls.VerticalStackLayout>
@@ -57,4 +68,10 @@ public VerticalStackLayout(Action<Microsoft.Maui.Controls.VerticalStackLayout?>
 
 public static partial class VerticalStackLayoutExtensions
 {
+}
+
+public static partial class VerticalStackLayoutStyles
+{
+    public static Action<IVerticalStackLayout>? Default { get; set; }
+    public static Dictionary<string, Action<IVerticalStackLayout>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/View.cs b/src/MauiReactor/View.cs
index de3ead92..30d6ebbb 100644
--- a/src/MauiReactor/View.cs
+++ b/src/MauiReactor/View.cs
@@ -23,10 +23,12 @@ public partial interface IView : IVisualElement
 {
     protected View()
     {
+        ViewStyles.Default?.Invoke(this);
     }
 
     protected View(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ViewStyles.Default?.Invoke(this);
     }
 
     object? IView.VerticalOptions { get; set; }
@@ -71,6 +73,15 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public static partial class ViewExtensions
@@ -142,4 +153,10 @@ public static T Margin<T>(this T view, double left, double top, double right, do
         view.AppendAnimatable(Microsoft.Maui.Controls.View.MarginProperty, customAnimation ?? new RxSimpleThicknessAnimation(new Thickness(left, top, right, bottom)), SetMargin);
         return view;
     }
+}
+
+public static partial class ViewStyles
+{
+    public static Action<IView>? Default { get; set; }
+    public static Dictionary<string, Action<IView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ViewCell.cs b/src/MauiReactor/ViewCell.cs
index 9fa62aee..bdfee156 100644
--- a/src/MauiReactor/ViewCell.cs
+++ b/src/MauiReactor/ViewCell.cs
@@ -18,10 +18,12 @@ public partial interface IViewCell : ICell
 {
     public ViewCell()
     {
+        ViewCellStyles.Default?.Invoke(this);
     }
 
     public ViewCell(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        ViewCellStyles.Default?.Invoke(this);
     }
 
     internal override void Reset()
@@ -42,6 +44,15 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && ViewCellStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
 }
 
 public partial class ViewCell : ViewCell<Microsoft.Maui.Controls.ViewCell>
@@ -57,4 +68,10 @@ public ViewCell(Action<Microsoft.Maui.Controls.ViewCell?> componentRefAction) :
 
 public static partial class ViewCellExtensions
 {
+}
+
+public static partial class ViewCellStyles
+{
+    public static Action<IViewCell>? Default { get; set; }
+    public static Dictionary<string, Action<IViewCell>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/VisualElement.cs b/src/MauiReactor/VisualElement.cs
index 8a1f2d6b..19742d8b 100644
--- a/src/MauiReactor/VisualElement.cs
+++ b/src/MauiReactor/VisualElement.cs
@@ -95,10 +95,12 @@ public partial interface IVisualElement : INavigableElement
 {
     protected VisualElement()
     {
+        VisualElementStyles.Default?.Invoke(this);
     }
 
     protected VisualElement(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        VisualElementStyles.Default?.Invoke(this);
     }
 
     object? IVisualElement.InputTransparent { get; set; }
@@ -289,6 +291,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && VisualElementStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -884,4 +896,10 @@ public static T OnUnloaded<T>(this T visualElement, Action<object?, EventArgs>?
         visualElement.UnloadedActionWithArgs = unloadedActionWithArgs;
         return visualElement;
     }
+}
+
+public static partial class VisualElementStyles
+{
+    public static Action<IVisualElement>? Default { get; set; }
+    public static Dictionary<string, Action<IVisualElement>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/VisualNode.cs b/src/MauiReactor/VisualNode.cs
index 4398581d..f7b2f749 100644
--- a/src/MauiReactor/VisualNode.cs
+++ b/src/MauiReactor/VisualNode.cs
@@ -7,8 +7,6 @@ namespace MauiReactor
 {
     public interface IVisualNode
     {
-        //void AppendAnimatable<T>(BindableProperty key, T animation, Action<T> action) where T : RxAnimation;
-
         void AppendAnimatable(BindableProperty key, RxAnimation animation, Action<IVisualNode, RxAnimation> action);
 
         Microsoft.Maui.Controls.Page? GetContainerPage();
@@ -16,6 +14,8 @@ public interface IVisualNode
         IHostElement? GetPageHost();
 
         IComponentWithState? GetContainerComponent();
+
+        string? ThemeKey { get; set; }
     }
 
     public static class VisualNodeExtensions
@@ -32,7 +32,7 @@ public static T OnPropertyChanging<T>(this T element, Action<object?, System.Com
             return element;
         }
 
-        public static T When<T>(this T node, bool flag, Action<T> actionToApplyWhenFlagIsTrue) where T : VisualNode
+        public static T When<T>(this T node, bool flag, Action<T> actionToApplyWhenFlagIsTrue) where T : IVisualNode
         {
             if (flag)
             {
@@ -41,38 +41,38 @@ public static T When<T>(this T node, bool flag, Action<T> actionToApplyWhenFlagI
             return node;
         }
 
-        public static T OnAndroid<T>(this T node, Action<T> actionToApplyWhenFlagIsTrue) where T : VisualNode
+        public static T OnAndroid<T>(this T node, Action<T> actionToApplyWhenFlagIsTrue) where T : IVisualNode
         {
             node.When(DeviceInfo.Current.Platform == DevicePlatform.Android, actionToApplyWhenFlagIsTrue);
             return node;
         }
 
-        public static T OniOS<T>(this T node, Action<T> actionToApplyWhenFlagIsTrue) where T : VisualNode
+        public static T OniOS<T>(this T node, Action<T> actionToApplyWhenFlagIsTrue) where T : IVisualNode
         {
             node.When(DeviceInfo.Current.Platform == DevicePlatform.iOS, actionToApplyWhenFlagIsTrue);
             return node;
         }
 
-        public static T OnMac<T>(this T node, Action<T> actionToApplyWhenFlagIsTrue) where T : VisualNode
+        public static T OnMac<T>(this T node, Action<T> actionToApplyWhenFlagIsTrue) where T : IVisualNode
         {
             node.When(DeviceInfo.Current.Platform == DevicePlatform.macOS ||
                 DeviceInfo.Current.Platform == DevicePlatform.MacCatalyst, actionToApplyWhenFlagIsTrue);
             return node;
         }
 
-        public static T OnWindows<T>(this T node, Action<T> actionToApplyWhenFlagIsTrue) where T : VisualNode
+        public static T OnWindows<T>(this T node, Action<T> actionToApplyWhenFlagIsTrue) where T : IVisualNode
         {
             node.When(DeviceInfo.Current.Platform == DevicePlatform.WinUI, actionToApplyWhenFlagIsTrue);
             return node;
         }
 
-        public static T OnPhone<T>(this T node, Action<T> actionToApplyWhenFlagIsTrue) where T : VisualNode
+        public static T OnPhone<T>(this T node, Action<T> actionToApplyWhenFlagIsTrue) where T : IVisualNode
         {
             node.When(DeviceInfo.Current.Idiom == DeviceIdiom.Phone, actionToApplyWhenFlagIsTrue);
             return node;
         }
 
-        public static T OnDesktop<T>(this T node, Action<T> actionToApplyWhenFlagIsTrue) where T : VisualNode
+        public static T OnDesktop<T>(this T node, Action<T> actionToApplyWhenFlagIsTrue) where T : IVisualNode
         {
             node.When(DeviceInfo.Current.Idiom == DeviceIdiom.Desktop, actionToApplyWhenFlagIsTrue);
             return node;
@@ -109,6 +109,17 @@ public static T WithOutAnimation<T>(this T node) where T : VisualNode
             node.DisableCurrentAnimatableProperties();
             return node;
         }
+
+        public static T ThemeKey<T>(this T node, string? themeKey) where T : IVisualNode
+        {
+            node.ThemeKey = themeKey;
+            return node;
+        }
+    }
+
+    public static class VisualNodeStyles
+    {
+        public static Action<IVisualNode>? Default { get; set; }
     }
 
     public abstract class VisualNode : IVisualNode, IAutomationItemContainer
@@ -129,12 +140,14 @@ public abstract class VisualNode : IVisualNode, IAutomationItemContainer
 
         private int _childIndex;
 
-        [ThreadStatic] 
-        internal static bool _skipAnimationMigration;
+        private string? _themeKey;
 
-        protected VisualNode()
-        {
-            //System.Diagnostics.Debug.WriteLine($"{this}->Created()");
+        [ThreadStatic] 
+        internal static bool _skipAnimationMigration;
+
+        protected VisualNode()
+        {
+            VisualNodeStyles.Default?.Invoke(this);
         }
 
         internal static BindablePropertyKey _mauiReactorPropertiesBagKey = BindableProperty.CreateAttachedReadOnly(nameof(_mauiReactorPropertiesBagKey),
@@ -165,10 +178,31 @@ public int ChildIndex
         protected virtual bool SupportChildIndexing { get; } = true;
 
         public object? Key { get; set; }
+        
         public Action<object?, PropertyChangedEventArgs>? PropertyChangedAction { get; set; }
+        
         public Action<object?, System.ComponentModel.PropertyChangingEventArgs>? PropertyChangingAction { get; set; }
+        
+        public string? ThemeKey
+        {
+            get => _themeKey;
+            set
+            {
+                if (_themeKey != value)
+                {
+                    _themeKey = value;
+                    OnThemeChanged();
+                }
+            }
+        }
+
+        protected virtual void OnThemeChanged()
+        {
+
+        }
 
         internal bool IsLayoutCycleRequired { get; set; } = true;
+        
         internal virtual VisualNode? Parent { get; set; }
 
         internal IReadOnlyList<VisualNode> Children
@@ -211,12 +245,6 @@ internal virtual void Reset()
             Parent = null;
         }
 
-        //public void AppendAnimatable<T>(BindableProperty key, T animation, Action<T> action) where T : RxAnimation
-        //{
-        //    var newAnimatableProperty = new Animatable(key, animation, target => action((T)target));
-
-        //    _animatables[key] = newAnimatableProperty;
-        //}
         public void AppendAnimatable(BindableProperty key, RxAnimation animation, Action<IVisualNode, RxAnimation> action)
         {
             var newAnimatableProperty = new Animatable(key, animation, action);
diff --git a/src/MauiReactor/WebView.cs b/src/MauiReactor/WebView.cs
index 5343e38a..03164e81 100644
--- a/src/MauiReactor/WebView.cs
+++ b/src/MauiReactor/WebView.cs
@@ -31,10 +31,12 @@ public partial interface IWebView : IView
 {
     public WebView()
     {
+        WebViewStyles.Default?.Invoke(this);
     }
 
     public WebView(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        WebViewStyles.Default?.Invoke(this);
     }
 
     object? IWebView.Source { get; set; }
@@ -82,6 +84,16 @@ protected override void OnUpdate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && WebViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -211,4 +223,10 @@ public static T OnNavigating<T>(this T webView, Action<object?, WebNavigatingEve
         webView.NavigatingActionWithArgs = navigatingActionWithArgs;
         return webView;
     }
+}
+
+public static partial class WebViewStyles
+{
+    public static Action<IWebView>? Default { get; set; }
+    public static Dictionary<string, Action<IWebView>> Themes { get; } = [];
 }
\ No newline at end of file
diff --git a/src/MauiReactor/Window.cs b/src/MauiReactor/Window.cs
index 0ff867f1..fdbacdc3 100644
--- a/src/MauiReactor/Window.cs
+++ b/src/MauiReactor/Window.cs
@@ -93,10 +93,12 @@ public partial interface IWindow : INavigableElement
 {
     public Window()
     {
+        WindowStyles.Default?.Invoke(this);
     }
 
     public Window(Action<T?> componentRefAction) : base(componentRefAction)
     {
+        WindowStyles.Default?.Invoke(this);
     }
 
     object? IWindow.Title { get; set; }
@@ -260,6 +262,16 @@ protected override void OnAnimate()
     partial void OnEndUpdate();
     partial void OnBeginAnimate();
     partial void OnEndAnimate();
+    protected override void OnThemeChanged()
+    {
+        if (ThemeKey != null && WindowStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
+        {
+            styleAction(this);
+        }
+
+        base.OnThemeChanged();
+    }
+
     partial void OnAttachingNativeEvents();
     partial void OnDetachingNativeEvents();
     protected override void OnAttachNativeEvents()
@@ -827,4 +839,10 @@ public static T OnDisplayDensityChanged<T>(this T window, Action<object?, Displa
         window.DisplayDensityChangedActionWithArgs = displayDensityChangedActionWithArgs;
         return window;
     }
+}
+
+public static partial class WindowStyles
+{
+    public static Action<IWindow>? Default { get; set; }
+    public static Dictionary<string, Action<IWindow>> Themes { get; } = [];
 }
\ No newline at end of file