diff --git a/InputKit.sln b/InputKit.sln
index 89793c9..d5b6119 100644
--- a/InputKit.sln
+++ b/InputKit.sln
@@ -18,21 +18,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04AF3245-D32
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InputKit.Maui", "src\InputKit.Maui\InputKit.Maui.csproj", "{3CCCC21B-868D-41D2-86F3-4EE3D999BCD2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.InputKit", "src\Xamarin.Forms.InputKit\Xamarin.Forms.InputKit.csproj", "{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SandboxXF", "sandbox\SandboxXF\SandboxXF\SandboxXF.csproj", "{FCF92521-F61B-4BE1-9976-53094C1F24E8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SandboxXF.Android", "sandbox\SandboxXF\SandboxXF.Android\SandboxXF.Android.csproj", "{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SandboxXF.iOS", "sandbox\SandboxXF\SandboxXF.iOS\SandboxXF.iOS.csproj", "{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "maui", "maui", "{5C90769C-5C4F-40E0-901C-7D9E298AD159}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xamarin.forms", "xamarin.forms", "{58D6F816-1FD8-4B78-BEE2-34EEC52F15EC}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3B159F5D-AED9-4E4E-873A-A7332783681D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InputKit.Maui.Test", "test\InputKit.Maui.Test\InputKit.Maui.Test.csproj", "{837BFB2A-8FA7-4E68-A5FF-2B1F98675BA6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InputKit.Maui.Test", "test\InputKit.Maui.Test\InputKit.Maui.Test.csproj", "{837BFB2A-8FA7-4E68-A5FF-2B1F98675BA6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -110,114 +100,6 @@ Global
 		{3CCCC21B-868D-41D2-86F3-4EE3D999BCD2}.Release|iPhone.Build.0 = Release|Any CPU
 		{3CCCC21B-868D-41D2-86F3-4EE3D999BCD2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{3CCCC21B-868D-41D2-86F3-4EE3D999BCD2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Release|iPhone.Build.0 = Release|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Release|iPhone.Build.0 = Release|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Ad-Hoc|Any CPU.Deploy.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Ad-Hoc|iPhone.Deploy.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.AppStore|Any CPU.Deploy.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.AppStore|iPhone.Deploy.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.AppStore|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Release|iPhone.Build.0 = Release|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Ad-Hoc|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Ad-Hoc|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Ad-Hoc|iPhone.ActiveCfg = Debug|iPhone
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Ad-Hoc|iPhone.Build.0 = Debug|iPhone
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.AppStore|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.AppStore|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.AppStore|iPhone.ActiveCfg = Debug|iPhone
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.AppStore|iPhone.Build.0 = Debug|iPhone
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.AppStore|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.AppStore|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Debug|iPhone.Build.0 = Debug|iPhone
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Release|iPhone.ActiveCfg = Release|iPhone
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Release|iPhone.Build.0 = Release|iPhone
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{837BFB2A-8FA7-4E68-A5FF-2B1F98675BA6}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
 		{837BFB2A-8FA7-4E68-A5FF-2B1F98675BA6}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
 		{837BFB2A-8FA7-4E68-A5FF-2B1F98675BA6}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
@@ -249,12 +131,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{2673366B-4B8D-4110-882A-3DFCF983A2C2} = {5C90769C-5C4F-40E0-901C-7D9E298AD159}
 		{3CCCC21B-868D-41D2-86F3-4EE3D999BCD2} = {04AF3245-D32D-4A16-9136-654E69D8E98A}
-		{312E32B9-5B5E-4A5F-B060-3EE5ED84E95E} = {04AF3245-D32D-4A16-9136-654E69D8E98A}
-		{FCF92521-F61B-4BE1-9976-53094C1F24E8} = {58D6F816-1FD8-4B78-BEE2-34EEC52F15EC}
-		{4CC6CD68-C0EE-4B36-9708-9B75D5B567A7} = {58D6F816-1FD8-4B78-BEE2-34EEC52F15EC}
-		{E3CF62B5-71DD-4BCE-8E28-1715200BF4A8} = {58D6F816-1FD8-4B78-BEE2-34EEC52F15EC}
 		{5C90769C-5C4F-40E0-901C-7D9E298AD159} = {AD673FBF-AF29-4156-B7FB-D9AF738D875D}
-		{58D6F816-1FD8-4B78-BEE2-34EEC52F15EC} = {AD673FBF-AF29-4156-B7FB-D9AF738D875D}
 		{837BFB2A-8FA7-4E68-A5FF-2B1F98675BA6} = {3B159F5D-AED9-4E4E-873A-A7332783681D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/InputKit.sln.DotSettings b/InputKit.sln.DotSettings
new file mode 100644
index 0000000..a613109
--- /dev/null
+++ b/InputKit.sln.DotSettings
@@ -0,0 +1,4 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_SIZE/@EntryValue">4</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_STYLE/@EntryValue">Tab</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/TAB_WIDTH/@EntryValue">4</s:Int64></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/sandbox/SandboxMAUI/Pages/CheckBoxPage.xaml b/sandbox/SandboxMAUI/Pages/CheckBoxPage.xaml
index 85f26c8..5b46852 100644
--- a/sandbox/SandboxMAUI/Pages/CheckBoxPage.xaml
+++ b/sandbox/SandboxMAUI/Pages/CheckBoxPage.xaml
@@ -24,7 +24,7 @@
             
             <input:CheckBox Text="Option 0 Plain Checkbox" />
             <input:CheckBox Text="Option 1 with Filled Type" Type="Filled" />
-            <input:CheckBox Text="Option 2 with Material Type" Type="Material" />
+            <input:CheckBox CornerRadius="20" BoxSizeRequest="30" Text="Option 2 with Material Type" Type="Material" />
             <input:CheckBox Text="Option 2 with Square Shape" IconGeometry="{x:Static input:PredefinedShapes.Square}" />
             <input:CheckBox Text="Option 3 with Line Shape" IconGeometry="{x:Static input:PredefinedShapes.Line}" />
             <input:CheckBox Text="Option 3 with Line Shape with Material Type" Type="Material" IconGeometry="{x:Static input:PredefinedShapes.Line}" />
diff --git a/sandbox/SandboxXF/SandboxXF.Android/SandboxXF.Android.csproj b/sandbox/SandboxXF/SandboxXF.Android/SandboxXF.Android.csproj
index 5e88be8..71f06e1 100644
--- a/sandbox/SandboxXF/SandboxXF.Android/SandboxXF.Android.csproj
+++ b/sandbox/SandboxXF/SandboxXF.Android/SandboxXF.Android.csproj
@@ -88,10 +88,6 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Xamarin.Forms.InputKit\Xamarin.Forms.InputKit.csproj">
-      <Project>{312e32b9-5b5e-4a5f-b060-3ee5ed84e95e}</Project>
-      <Name>Xamarin.Forms.InputKit</Name>
-    </ProjectReference>
     <ProjectReference Include="..\SandboxXF\SandboxXF.csproj">
       <Project>{EAB620D9-4836-4FC1-8A7D-6E6DA3FF3143}</Project>
       <Name>SandboxXF</Name>
diff --git a/sandbox/SandboxXF/SandboxXF/SandboxXF.csproj b/sandbox/SandboxXF/SandboxXF/SandboxXF.csproj
index debcc13..1f6ae76 100644
--- a/sandbox/SandboxXF/SandboxXF/SandboxXF.csproj
+++ b/sandbox/SandboxXF/SandboxXF/SandboxXF.csproj
@@ -15,8 +15,4 @@
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2196" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
   </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Xamarin.Forms.InputKit\Xamarin.Forms.InputKit.csproj" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/InputKit.Maui.Test/TestClasses/ApplicationStub.cs b/test/InputKit.Maui.Test/TestClasses/ApplicationStub.cs
index 4830f0e..6d45e5c 100644
--- a/test/InputKit.Maui.Test/TestClasses/ApplicationStub.cs
+++ b/test/InputKit.Maui.Test/TestClasses/ApplicationStub.cs
@@ -29,5 +29,9 @@ public void CloseWindow(IWindow window)
 		_windows.Remove(window);
 	}
 
-	public void ThemeChanged() { }
+	public AppTheme UserAppTheme { get; }
+
+	public void ThemeChanged()
+	{
+	}
 }
\ No newline at end of file