diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba045945..e2bc54fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,10 @@
-# Rapid XAML Toolkit - ChangeLog
+# Rapid XAML Toolkit - ChangeLog
 
-## Upcoming
+## 2.0 (Feb 2025)
 
-- [See what's planned next](https://github.com/mrlacey/Rapid-XAML-Toolkit/milestone/7)
+- Support for Visual Studio 2022.
+- Combined in to a single VSIX package.
+- Now works with MAUI, WinUI, & WPF.
 
 ## 0.14.1
 
diff --git a/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.nuspec b/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.nuspec
index cd8d7101..a0bdc18b 100644
--- a/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.nuspec
+++ b/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.nuspec
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>RapidXaml.AutoFix</id>
@@ -13,8 +13,8 @@
     <description>Use Rapid XAML custom analyzers to modify XAML files.</description>
     <summary>Apply automatic changes to XAML files.</summary>
     <releaseNotes>.</releaseNotes>
-    <copyright>© 2022 Matt Lacey Ltd.</copyright>
-    <tags>XAML, MAUI, MVVM, UNO, UWP, WinUI, WPF, Xamarin.Forms</tags>
+    <copyright>© 2025 Matt Lacey Ltd.</copyright>
+    <tags>XAML, MAUI, MVVM, UNO, WinUI, WPF</tags>
     <dependencies>
       <group targetFramework="netstandard2.0">
         <dependency id="RapidXaml.CustomAnalysis" version="0.13.0" exclude="Build,Analyzers" />
diff --git a/VSIX/RapidXaml.CustomAnalysis/RapidXaml.CustomAnalysis.nuspec b/VSIX/RapidXaml.CustomAnalysis/RapidXaml.CustomAnalysis.nuspec
index 6f461d6f..6e4cad29 100644
--- a/VSIX/RapidXaml.CustomAnalysis/RapidXaml.CustomAnalysis.nuspec
+++ b/VSIX/RapidXaml.CustomAnalysis/RapidXaml.CustomAnalysis.nuspec
@@ -14,7 +14,7 @@
     <summary>Create custom XAML analyzers.</summary>
     <releaseNotes>Fix bug with `AnalysisActions.AddAttribute`</releaseNotes>
     <copyright>Copyright © 2023 Matt Lacey Ltd.</copyright>
-    <tags>XAML, MAUI, MVVM, UNO, UWP, WinUI, WPF, Xamarin.Forms</tags>
+    <tags>XAML, MAUI, MVVM, UNO, WinUI, WPF</tags>
     <readme>docs\readme.md</readme>
     <dependencies>
       <group targetFramework="netstandard2.0">
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/BindingToXBindAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/BindingToXBindAnalyzer.cs
index 2d46fdb5..c67e1e94 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/BindingToXBindAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/BindingToXBindAnalyzer.cs
@@ -16,7 +16,7 @@ public BindingToXBindAnalyzer(VisualStudioIntegration.IVisualStudioAbstraction v
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
             if (!extraDetails.TryGet(KnownExtraDetails.Framework, out ProjectFramework framework)
-             || framework != ProjectFramework.Uwp)
+             || framework != ProjectFramework.WinUI)
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/TwoPaneViewAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/TwoPaneViewAnalyzer.cs
index 92fd4734..baf529f2 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/TwoPaneViewAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/TwoPaneViewAnalyzer.cs
@@ -28,7 +28,7 @@ public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisD
                     result.HighlightDescendantWithoutAction(
                         RapidXamlErrorType.Error,
                         code: "WinUI-2PV",
-                        description: "Do not put a TwoPaneView inside the pane of another TwoPaneview.",
+                        description: "Do not put a TwoPaneView inside the pane of another TwoPaneView.",
                         descendant: desc,
                         moreInfoUrl: "https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/two-pane-view#dos-and-donts");
                 }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/UnoIgnorablesAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/UnoIgnorablesAnalyzer.cs
index 36cb431f..8e783ae4 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/UnoIgnorablesAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/UnoIgnorablesAnalyzer.cs
@@ -19,7 +19,7 @@ public UnoIgnorablesAnalyzer(VisualStudioIntegration.IVisualStudioAbstraction vs
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
             if (!extraDetails.TryGet(KnownExtraDetails.Framework, out ProjectFramework framework)
-             || framework != ProjectFramework.Uwp)
+             || framework != ProjectFramework.WinUI)
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/XamarinForms/LabelAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/XamarinForms/LabelAnalyzer.cs
index 94a57275..228d7895 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/XamarinForms/LabelAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/CustomAnalysis/XamarinForms/LabelAnalyzer.cs
@@ -29,6 +29,7 @@ public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisD
                     return this.CheckForHardCodedString(Attributes.Text, AttributeType.Any, element, extraDetails);
 
                 case ProjectFramework.Uwp:
+                case ProjectFramework.WinUI:
                 case ProjectFramework.Unknown:
                 default:
                     return AnalysisActions.EmptyList;
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/AppBarButtonAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/AppBarButtonAnalyzer.cs
index 052108a0..c702de04 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/AppBarButtonAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/AppBarButtonAnalyzer.cs
@@ -19,7 +19,7 @@ public AppBarButtonAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/AppBarToggleButtonAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/AppBarToggleButtonAnalyzer.cs
index 47c3ba5a..e07fd869 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/AppBarToggleButtonAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/AppBarToggleButtonAnalyzer.cs
@@ -19,7 +19,7 @@ public AppBarToggleButtonAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/AutoSuggestBoxAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/AutoSuggestBoxAnalyzer.cs
index 8583cbcd..92761979 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/AutoSuggestBoxAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/AutoSuggestBoxAnalyzer.cs
@@ -19,7 +19,7 @@ public AutoSuggestBoxAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/CalendarDatePickerAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/CalendarDatePickerAnalyzer.cs
index edda9585..872b1336 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/CalendarDatePickerAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/CalendarDatePickerAnalyzer.cs
@@ -19,7 +19,7 @@ public CalendarDatePickerAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ComboBoxAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ComboBoxAnalyzer.cs
index 80fcbbad..99bc5185 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ComboBoxAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ComboBoxAnalyzer.cs
@@ -20,7 +20,7 @@ public ComboBoxAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/DataGridAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/DataGridAnalyzer.cs
index 9b6c9a8c..f5ca9c1a 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/DataGridAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/DataGridAnalyzer.cs
@@ -20,7 +20,7 @@ public DataGridAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/DatePickerAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/DatePickerAnalyzer.cs
index 6e304639..837a4c1d 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/DatePickerAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/DatePickerAnalyzer.cs
@@ -19,7 +19,7 @@ public DatePickerAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/HyperlinkButtonAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/HyperlinkButtonAnalyzer.cs
index 1d04f14a..44941486 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/HyperlinkButtonAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/HyperlinkButtonAnalyzer.cs
@@ -19,7 +19,7 @@ public HyperlinkButtonAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ListViewAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ListViewAnalyzer.cs
index 6abceb38..b0fcc931 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ListViewAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ListViewAnalyzer.cs
@@ -20,7 +20,7 @@ public ListViewAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/MenuFlyoutItemAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/MenuFlyoutItemAnalyzer.cs
index f5c0cc51..0648337b 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/MenuFlyoutItemAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/MenuFlyoutItemAnalyzer.cs
@@ -19,7 +19,8 @@ public MenuFlyoutItemAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            // TODO: Review MAUI support
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/MenuFlyoutSubItemAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/MenuFlyoutSubItemAnalyzer.cs
index 0a09d63f..e443fbb0 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/MenuFlyoutSubItemAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/MenuFlyoutSubItemAnalyzer.cs
@@ -19,7 +19,8 @@ public MenuFlyoutSubItemAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            // TODO: Review MAUI support
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/PasswordBoxAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/PasswordBoxAnalyzer.cs
index dee15744..37481c45 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/PasswordBoxAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/PasswordBoxAnalyzer.cs
@@ -19,7 +19,7 @@ public PasswordBoxAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/RepeatButtonAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/RepeatButtonAnalyzer.cs
index d89fefe0..1b506ad8 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/RepeatButtonAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/RepeatButtonAnalyzer.cs
@@ -19,7 +19,7 @@ public RepeatButtonAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/RichEditBoxAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/RichEditBoxAnalyzer.cs
index 918360ae..f91795ad 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/RichEditBoxAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/RichEditBoxAnalyzer.cs
@@ -19,7 +19,7 @@ public RichEditBoxAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/SliderAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/SliderAnalyzer.cs
index 42b16097..fbeb1fd6 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/SliderAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/SliderAnalyzer.cs
@@ -19,7 +19,7 @@ public SliderAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/TextBlockAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/TextBlockAnalyzer.cs
index 5e9f9b79..01a6482a 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/TextBlockAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/TextBlockAnalyzer.cs
@@ -19,7 +19,7 @@ public TextBlockAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/TextBoxAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/TextBoxAnalyzer.cs
index e81c13b2..d86dc684 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/TextBoxAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/TextBoxAnalyzer.cs
@@ -20,7 +20,7 @@ public TextBoxAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/TimePickerAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/TimePickerAnalyzer.cs
index f1e05d41..cd9f02fb 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/TimePickerAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/TimePickerAnalyzer.cs
@@ -19,7 +19,7 @@ public TimePickerAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ToggleMenuFlyoutItemAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ToggleMenuFlyoutItemAnalyzer.cs
index 93289cfa..fe0e8a35 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ToggleMenuFlyoutItemAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ToggleMenuFlyoutItemAnalyzer.cs
@@ -19,7 +19,7 @@ public ToggleMenuFlyoutItemAnalyzer(IVisualStudioAbstraction vsa, ILogger logger
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ToggleSwitchAnalyzer.cs b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ToggleSwitchAnalyzer.cs
index 1bdd8562..d61ea8d0 100644
--- a/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ToggleSwitchAnalyzer.cs
+++ b/VSIX/RapidXamlToolkit/Analysis/XamlAnalysis/Processors/ToggleSwitchAnalyzer.cs
@@ -19,7 +19,7 @@ public ToggleSwitchAnalyzer(IVisualStudioAbstraction vsa, ILogger logger)
 
         public override AnalysisActions Analyze(RapidXamlElement element, ExtraAnalysisDetails extraDetails)
         {
-            if (!extraDetails.IsFramework(ProjectFramework.Uwp))
+            if (!extraDetails.IsFramework(ProjectFramework.Uwp) && !extraDetails.IsFramework(ProjectFramework.WinUI))
             {
                 return AnalysisActions.None;
             }
diff --git a/VSIX/RapidXamlToolkit/Generation/Options/ProfileConfigControl.xaml b/VSIX/RapidXamlToolkit/Generation/Options/ProfileConfigControl.xaml
index 13a4a7aa..feada90f 100644
--- a/VSIX/RapidXamlToolkit/Generation/Options/ProfileConfigControl.xaml
+++ b/VSIX/RapidXamlToolkit/Generation/Options/ProfileConfigControl.xaml
@@ -82,10 +82,10 @@
                     <Setter Property="Margin" Value="0,0,10,0" />
                 </Style>
             </StackPanel.Resources>
-            <RadioButton Content="{x:Static strings:OptionsStringRes.Options_XamlUwp}" IsChecked="{Binding ProjectType, Converter={StaticResource ProjectTypeConverter}, ConverterParameter=Uwp}" />
+            <!--<RadioButton Content="{x:Static strings:OptionsStringRes.Options_XamlUwp}" IsChecked="{Binding ProjectType, Converter={StaticResource ProjectTypeConverter}, ConverterParameter=Uwp}" />-->
             <RadioButton Content="{x:Static strings:OptionsStringRes.Options_XamlWinUI}" IsChecked="{Binding ProjectType, Converter={StaticResource ProjectTypeConverter}, ConverterParameter=WinUI}" />
             <RadioButton Content="{x:Static strings:OptionsStringRes.Options_XamlWpf}" IsChecked="{Binding ProjectType, Converter={StaticResource ProjectTypeConverter}, ConverterParameter=Wpf}" />
-            <RadioButton Content="{x:Static strings:OptionsStringRes.Options_XamlXamarinForms}" IsChecked="{Binding ProjectType, Converter={StaticResource ProjectTypeConverter}, ConverterParameter=XamarinForms}" />
+            <!--<RadioButton Content="{x:Static strings:OptionsStringRes.Options_XamlXamarinForms}" IsChecked="{Binding ProjectType, Converter={StaticResource ProjectTypeConverter}, ConverterParameter=XamarinForms}" />-->
             <RadioButton Content="{x:Static strings:OptionsStringRes.Options_XamlMaui}" IsChecked="{Binding ProjectType, Converter={StaticResource ProjectTypeConverter}, ConverterParameter=MAUI}" />
             <!--<RadioButton Content="{x:Static strings:OptionsStringRes.Options_XamlAll}" IsChecked="{Binding Path=ProjectType, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static rxt:ProjectType.Any}}" />-->
         </StackPanel>
diff --git a/VSIX/RapidXamlToolkit/Generation/Options/Settings.cs b/VSIX/RapidXamlToolkit/Generation/Options/Settings.cs
index b7605dc1..0451c8c9 100644
--- a/VSIX/RapidXamlToolkit/Generation/Options/Settings.cs
+++ b/VSIX/RapidXamlToolkit/Generation/Options/Settings.cs
@@ -34,7 +34,7 @@ public ObservableCollection<ProfileSummary> ProfilesList
             {
                 var list = new ObservableCollection<ProfileSummary>();
 
-                // If multile profiles have the same name as the active (or fall back) profile, use the first one in the list with matching name
+                // If multiple profiles have the same name as the active (or fall back) profile, use the first one in the list with matching name
                 Dictionary<string, bool> activeIndicated = new Dictionary<string, bool>
                 {
                     { ProjectType.Uwp.GetDescription(), false },
diff --git a/VSIX/RapidXamlToolkit/source.extension.cs b/VSIX/RapidXamlToolkit/source.extension.cs
index 27cd7766..e3c43d8c 100644
--- a/VSIX/RapidXamlToolkit/source.extension.cs
+++ b/VSIX/RapidXamlToolkit/source.extension.cs
@@ -13,6 +13,6 @@ internal sealed partial class Vsix
         public const string Language = "en-US";
         public const string Version = "0.9.0.5";
         public const string Author = "Matt Lacey";
-        public const string Tags = "XAML;UWP;WPF;Xamarin.Forms;Uno;MVVM;MAUI;WinUI;DotNetMaui";
+        public const string Tags = "XAML;WPF;Uno;MVVM;MAUI;WinUI;DotNetMaui";
     }
 }
diff --git a/VSIX/RapidXamlToolkit/source.extension.vsixmanifest b/VSIX/RapidXamlToolkit/source.extension.vsixmanifest
index fcd4c871..35a4efa8 100644
--- a/VSIX/RapidXamlToolkit/source.extension.vsixmanifest
+++ b/VSIX/RapidXamlToolkit/source.extension.vsixmanifest
@@ -9,7 +9,7 @@
         <GettingStartedGuide>https://github.com/mrlacey/Rapid-XAML-Toolkit/tree/main/docs</GettingStartedGuide>
         <ReleaseNotes>https://github.com/mrlacey/Rapid-XAML-Toolkit/blob/main/CHANGELOG.md</ReleaseNotes>
         <Icon>Resources\RapidXamlToolkitLogo.png</Icon>
-        <Tags>XAML;UWP;WPF;Xamarin.Forms;Uno;MVVM;MAUI;WinUI;DotNetMaui</Tags>
+        <Tags>XAML;WPF;Uno;MVVM;MAUI;WinUI;DotNetMaui</Tags>
     </Metadata>
     <Installation>
         <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.10, 18.0)">