diff --git a/Directory.Build.props b/Directory.Build.props
index d0ed1ced4..402a08424 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -8,6 +8,7 @@
 
 		<!-- Required until xamarin targets are used (defined by MSBuild.SDK.Extras)-->
 		<DisableImplicitFrameworkDefines>false</DisableImplicitFrameworkDefines>
+		<UnoEnableXamlFuzzyMatching>false</UnoEnableXamlFuzzyMatching>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
diff --git a/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml b/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml
index 419cfce3f..d6fe5261e 100644
--- a/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml
+++ b/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml
@@ -6,7 +6,7 @@
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
 					xmlns:lottie_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
-					xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
+					xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
 					mc:Ignorable="d not_win lottie_not_win">
 
 	<lottie_win:LottieVisualSource x:Key="CupertinoDeterminateAnimation_Win"
diff --git a/src/library/Uno.Cupertino/Styles/Controls/ProgressRingWinUI.xaml b/src/library/Uno.Cupertino/Styles/Controls/ProgressRingWinUI.xaml
index b0463c8f4..23716ea3c 100644
--- a/src/library/Uno.Cupertino/Styles/Controls/ProgressRingWinUI.xaml
+++ b/src/library/Uno.Cupertino/Styles/Controls/ProgressRingWinUI.xaml
@@ -5,7 +5,7 @@
 					xmlns:not_win="http://uno.ui/not_win"
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-					xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
+					xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
 					mc:Ignorable="d not_win lottie_not_win">
 	<ResourceDictionary.MergedDictionaries>
 		<not_win:ResourceDictionary>
@@ -16,7 +16,7 @@
 
 		</not_win:ResourceDictionary>
 	</ResourceDictionary.MergedDictionaries>
-	
+
 	<not_win:Style x:Key="CupertinoProgressRingStyle"
 		   TargetType="muxc:ProgressRing">
 		<Setter Property="DeterminateSource"
diff --git a/src/library/Uno.Material/Styles/Controls/v1/ProgressRing.xaml b/src/library/Uno.Material/Styles/Controls/v1/ProgressRing.xaml
index b93238cf2..c2a0a18fe 100644
--- a/src/library/Uno.Material/Styles/Controls/v1/ProgressRing.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v1/ProgressRing.xaml
@@ -2,18 +2,18 @@
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 					xmlns:lottie_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
-					xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
+					xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:not_win="http://uno.ui/not_win"
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
 					mc:Ignorable="d not_win lottie_not_win">
-	
+
 	<lottie_win:LottieVisualSource x:Key="MaterialDeterminateAnimation_Win"
 								UriSource="ms-appx:///Uno.Material/Assets/MaterialDeterminate.json" />
 	<lottie_win:LottieVisualSource x:Key="MaterialIndeterminateAnimation_Win"
 								UriSource="ms-appx:///Uno.Material/Assets/MaterialIndeterminate.json" />
-	
+
 	<lottie_not_win:LottieVisualSource x:Key="MaterialDeterminateAnimation_Uno"
 									   UriSource="embedded://Uno.Material/Uno.Material.Assets.MaterialDeterminate.json" />
 	<lottie_not_win:LottieVisualSource x:Key="MaterialIndeterminateAnimation_Uno"
diff --git a/src/library/Uno.Material/Styles/Controls/v1/ProgressRingWinUI.xaml b/src/library/Uno.Material/Styles/Controls/v1/ProgressRingWinUI.xaml
index 5497069ae..1def90a20 100644
--- a/src/library/Uno.Material/Styles/Controls/v1/ProgressRingWinUI.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v1/ProgressRingWinUI.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
+                    xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
                     xmlns:lottie_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
diff --git a/src/library/Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml b/src/library/Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml
index 046af1367..ce930c112 100644
--- a/src/library/Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml
@@ -10,6 +10,7 @@
 					xmlns:toolkit="using:Uno.UI.Toolkit"
 					xmlns:macos="http://uno.ui/macos"
 					xmlns:uuc="using:Uno.UI.Controls"
+					xmlns:uuvc="using:Uno.UI.Views.Controls"
 					mc:Ignorable="ios android xamarin wasm macos">
 
 	<ios:Style x:Key="MaterialToggleSwitchStyle"
@@ -51,7 +52,7 @@
 										  Margin="0,8,0,5" />
 
 						<!-- Do not add x:Name to BindableUiSwitch or else page will not load -->
-						<uuc:BindableUISwitch Background="{TemplateBinding Foreground}"
+						<uuvc:BindableUISwitch Background="{TemplateBinding Foreground}"
 										  IsOn="{TemplateBinding IsOn, Mode=TwoWay}"
 										  Enabled="{TemplateBinding IsEnabled}" />
 					</StackPanel>
diff --git a/src/library/Uno.Material/Styles/Controls/v2/ProgressRing.xaml b/src/library/Uno.Material/Styles/Controls/v2/ProgressRing.xaml
index 93804272a..75131dc1d 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/ProgressRing.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/ProgressRing.xaml
@@ -2,7 +2,7 @@
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 					xmlns:lottie_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
-					xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
+					xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:not_win="http://uno.ui/not_win"
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -36,7 +36,7 @@
 							ResourceKey="SystemControlTransparentBrush" />
 		</ResourceDictionary>
 	</ResourceDictionary.ThemeDictionaries>
-	
+
 	<!-- WinUI 3 currently does not support the DeterminateSource and IndeterminateSource properties on Windows -->
 	<Style x:Key="MaterialProgressRingStyle"
 		   TargetType="muxc:ProgressRing">
diff --git a/src/library/Uno.Material/Styles/Controls/v2/ProgressRingWinUI.xaml b/src/library/Uno.Material/Styles/Controls/v2/ProgressRingWinUI.xaml
index 747a24bca..5eb27d489 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/ProgressRingWinUI.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/ProgressRingWinUI.xaml
@@ -2,7 +2,7 @@
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 					xmlns:lottie_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
-					xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
+					xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:not_win="http://uno.ui/not_win"
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
diff --git a/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml b/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml
index 2792f9e66..6aa6d5ea1 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml
@@ -6,6 +6,7 @@
 					xmlns:not_mobile="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:todo="what should be done"
 					xmlns:uuc="using:Uno.UI.Controls"
+					xmlns:uuvc="using:Uno.UI.Views.Controls"
 					xmlns:toolkit="using:Uno.UI.Toolkit"
 					mc:Ignorable="ios android todo">
 
@@ -521,7 +522,7 @@
 										  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
 
 						<!-- note: BindableUISwitch is a native control and does not support any attached properties nor common FrameworkElement/UIElement properties -->
-						<uuc:BindableUISwitch Background="{TemplateBinding Foreground}"
+						<uuvc:BindableUISwitch Background="{TemplateBinding Foreground}"
 										  Enabled="{TemplateBinding IsEnabled}"
 										  IsOn="{TemplateBinding IsOn, Mode=TwoWay}" />
 					</StackPanel>