From ddbcdf7f70415adeeeafcfcb6f03ff77a6f709dd Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Wed, 8 Mar 2023 18:30:31 -0600
Subject: [PATCH 01/12] Updated default root namespace and PackageId

---
 .../src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/ProjectTemplate/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj b/template/ProjectTemplate/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj
index 39e8f7ca1..9f72102f0 100644
--- a/template/ProjectTemplate/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj
+++ b/template/ProjectTemplate/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <ToolkitComponentName>ProjectTemplate</ToolkitComponentName>
-    <PackageId>CommunityToolkit.Labs.$(PackageIdVariant).ProjectTemplate</PackageId>
+    <PackageId>CommunityToolkit.Labs.$(PackageIdVariant).Controls.ProjectTemplate</PackageId>
     <Description>This package contains ProjectTemplate.</Description>
     <Version>0.0.1</Version>
 
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
-    <RootNamespace>CommunityToolkit.Labs.WinUI.ProjectTemplateRns</RootNamespace>
+    <RootNamespace>CommunityToolkit.WinUI.Controls.ProjectTemplateRns</RootNamespace>
   </PropertyGroup>
 
   <!-- Sets this up as a toolkit component's source project -->

From b3088580ff7a9e1124ce512542c2379bccad3a5d Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Wed, 8 Mar 2023 18:30:44 -0600
Subject: [PATCH 02/12] Doc fix

---
 template/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/README.md b/template/README.md
index f32e0b93e..f56745ac6 100644
--- a/template/README.md
+++ b/template/README.md
@@ -15,7 +15,7 @@ dotnet new labexp -n MyExperimentNameHere
 ```
 
 This creates a new experiment called "MyExperimentNameHere".
-You can now open `./components/MyExperimentNameHere/MyExperimentNameHere.sln` and start your experiment.
+You can now open `./components/MyExperimentNameHere/OpenSolution.bat` to start your experiment.
 
 ### Inside the generated solution
 

From e0022a9a681b1cfc1dda0628647cbf944b0c400a Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Wed, 8 Mar 2023 18:51:15 -0600
Subject: [PATCH 03/12] Renamed template csproj

---
 ...roj => CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename template/ProjectTemplate/src/{CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj => CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj} (100%)

diff --git a/template/ProjectTemplate/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj b/template/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
similarity index 100%
rename from template/ProjectTemplate/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj
rename to template/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj

From d6ea465268859fd8aa5e6a5b9b8e7ad4ac55b52b Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 9 Mar 2023 17:04:32 -0600
Subject: [PATCH 04/12] Move PackageId prefix to property in
 Directory.Build.props

---
 Directory.Build.props                                           | 1 +
 common/ToolkitComponent.SourceProject.props                     | 2 +-
 .../src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj     | 1 -
 .../src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj  | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 158ebd1f0..1b9915078 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
+    <PackageIdPrefix>CommunityToolkit.Labs</PackageIdPrefix>
     <RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
   </PropertyGroup>
diff --git a/common/ToolkitComponent.SourceProject.props b/common/ToolkitComponent.SourceProject.props
index a9f7d6578..1e87977be 100644
--- a/common/ToolkitComponent.SourceProject.props
+++ b/common/ToolkitComponent.SourceProject.props
@@ -10,7 +10,7 @@
   <Import Project="$(RepositoryDirectory)common\MultiTarget\MultiTarget.props" />
   
   <PropertyGroup>
-    <PackageId Condition="'$(PackageId)' == ''">CommunityToolkit.Labs.$(PackageIdVariant).$(ToolkitComponentName)</PackageId>
+    <PackageId Condition="'$(PackageId)' == ''">$(PackageIdPrefix).$(PackageIdVariant).$(ToolkitComponentName)</PackageId>
   </PropertyGroup>
 
   <!-- XAML Pages are automatically included, and don't need to be specified here. -->
diff --git a/components/SegmentedControl/src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj b/components/SegmentedControl/src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj
index e7ebc6f12..6ce285369 100644
--- a/components/SegmentedControl/src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj
+++ b/components/SegmentedControl/src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <ToolkitComponentName>SegmentedControl</ToolkitComponentName>
-    <PackageId>CommunityToolkit.Labs.$(PackageIdVariant).SegmentedControl</PackageId>
     <Description>This package contains SegmentedControl.</Description>
     <Version>0.0.1</Version>
 
diff --git a/template/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj b/template/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
index 9f72102f0..23542be82 100644
--- a/template/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
+++ b/template/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <ToolkitComponentName>ProjectTemplate</ToolkitComponentName>
-    <PackageId>CommunityToolkit.Labs.$(PackageIdVariant).Controls.ProjectTemplate</PackageId>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.ProjectTemplate</PackageId>
     <Description>This package contains ProjectTemplate.</Description>
     <Version>0.0.1</Version>
 

From 837e28cf5915ee004bb14d0fd6812367744d4b34 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 9 Mar 2023 17:09:03 -0600
Subject: [PATCH 05/12] Moved code / docs to new default namespace

---
 .../ProjectTemplate/samples/ProjectTemplateCustomSample.xaml  | 2 +-
 .../samples/ProjectTemplateTemplatedSample.xaml               | 2 +-
 .../samples/ProjectTemplateTemplatedStyleCustomSample.xaml    | 4 ++--
 .../samples/ProjectTemplateXbindBackedSample.xaml             | 2 +-
 .../samples/ProjectTemplateXbindBackedStyleCustomSample.xaml  | 2 +-
 template/ProjectTemplate/src/ProjectTemplate.cs               | 2 +-
 .../src/ProjectTemplateStyle_ClassicBinding.xaml              | 2 +-
 template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml  | 4 ++--
 .../ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml.cs    | 2 +-
 .../ProjectTemplate/src/ProjectTemplate_ClassicBinding.cs     | 2 +-
 template/ProjectTemplate/src/ProjectTemplate_xBind.cs         | 2 +-
 template/ProjectTemplate/src/Themes/Generic.xaml              | 4 ++--
 .../ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml | 2 +-
 template/README.md                                            | 4 ++--
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
index c744fd697..0bc7f1eef 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.Labs.WinUI"
+      xmlns:labs="using:CommunityToolkit.WinUI.Controls"
       xmlns:local="using:ProjectTemplateExperiment.Samples"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
diff --git a/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
index 06374b718..483a58433 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.Labs.WinUI"
+      xmlns:labs="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
diff --git a/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
index 12d353f09..dd1904fa4 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.Labs.WinUI"
+      xmlns:labs="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
@@ -11,7 +11,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <!--  Import custom styles  -->
-                <ResourceDictionary Source="ms-appx:///CommunityToolkit.Labs.WinUI.ProjectTemplate/ProjectTemplateStyle_ClassicBinding.xaml" />
+                <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.ProjectTemplate/ProjectTemplateStyle_ClassicBinding.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Page.Resources>
diff --git a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
index c7661a1b4..d691840a1 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.Labs.WinUI"
+      xmlns:labs="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
diff --git a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
index ecfb01deb..c7ec6ddda 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.Labs.WinUI"
+      xmlns:labs="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
diff --git a/template/ProjectTemplate/src/ProjectTemplate.cs b/template/ProjectTemplate/src/ProjectTemplate.cs
index 0f3f02d0d..87911049f 100644
--- a/template/ProjectTemplate/src/ProjectTemplate.cs
+++ b/template/ProjectTemplate/src/ProjectTemplate.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace CommunityToolkit.Labs.WinUI;
+namespace CommunityToolkit.WinUI.Controls;
 
 /// <summary>
 /// This is an example control based off of the BoxPanel sample here: https://docs.microsoft.com/windows/apps/design/layout/boxpanel-example-custom-panel. If you need this similar sort of layout component for an application, see UniformGrid in the Toolkit.
diff --git a/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml b/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml
index b609a5716..b9f121597 100644
--- a/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml
+++ b/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml
@@ -1,7 +1,7 @@
 <!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:labs="using:CommunityToolkit.Labs.WinUI">
+                    xmlns:labs="using:CommunityToolkit.WinUI.Controls">
 
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
diff --git a/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml b/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml
index f080a4180..27389a61b 100644
--- a/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml
+++ b/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml
@@ -1,8 +1,8 @@
 <!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
-<ResourceDictionary x:Class="CommunityToolkit.Labs.WinUI.ProjectTemplateStyle_xBind"
+<ResourceDictionary x:Class="CommunityToolkit.WinUI.Controls.ProjectTemplateStyle_xBind"
                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:labs="using:CommunityToolkit.Labs.WinUI">
+                    xmlns:labs="using:CommunityToolkit.WinUI.Controls">
 
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
diff --git a/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml.cs b/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml.cs
index adacfe974..e0770101e 100644
--- a/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml.cs
+++ b/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace CommunityToolkit.Labs.WinUI;
+namespace CommunityToolkit.WinUI.Controls;
 
 /// <summary>
 /// Backing code for this resource dictionary.
diff --git a/template/ProjectTemplate/src/ProjectTemplate_ClassicBinding.cs b/template/ProjectTemplate/src/ProjectTemplate_ClassicBinding.cs
index 745f11b01..ccb3fb2b7 100644
--- a/template/ProjectTemplate/src/ProjectTemplate_ClassicBinding.cs
+++ b/template/ProjectTemplate/src/ProjectTemplate_ClassicBinding.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace CommunityToolkit.Labs.WinUI;
+namespace CommunityToolkit.WinUI.Controls;
 
 /// <summary>
 /// An example templated control.
diff --git a/template/ProjectTemplate/src/ProjectTemplate_xBind.cs b/template/ProjectTemplate/src/ProjectTemplate_xBind.cs
index 461e24205..d8e0811ac 100644
--- a/template/ProjectTemplate/src/ProjectTemplate_xBind.cs
+++ b/template/ProjectTemplate/src/ProjectTemplate_xBind.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace CommunityToolkit.Labs.WinUI;
+namespace CommunityToolkit.WinUI.Controls;
 
 /// <summary>
 /// An example templated control.
diff --git a/template/ProjectTemplate/src/Themes/Generic.xaml b/template/ProjectTemplate/src/Themes/Generic.xaml
index eb4e339ad..d61389163 100644
--- a/template/ProjectTemplate/src/Themes/Generic.xaml
+++ b/template/ProjectTemplate/src/Themes/Generic.xaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:labs="using:CommunityToolkit.Labs.WinUI">
+                    xmlns:labs="using:CommunityToolkit.WinUI.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <labs:ProjectTemplateStyle_xBind />
-        <ResourceDictionary Source="ms-appx:///CommunityToolkit.Labs.WinUI.ProjectTemplate/ProjectTemplateStyle_ClassicBinding.xaml" />
+        <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.ProjectTemplate/ProjectTemplateStyle_ClassicBinding.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
diff --git a/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml b/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
index c2936542a..ab8c8cecc 100644
--- a/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
+++ b/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.Labs.WinUI"
+      xmlns:labs="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
       mc:Ignorable="d">
diff --git a/template/README.md b/template/README.md
index f56745ac6..028b99579 100644
--- a/template/README.md
+++ b/template/README.md
@@ -31,7 +31,7 @@ The `Tests` folder contains projects used to run the tests on different platform
 
 #### Where to add your code
 
-The main code of your experiment will go in the project `CommunityToolkit.Labs.WinUI.MyExperimentNameHere`. When an experiment is merged into Labs, this code will be bundled automatically in a NuGet package and pushed to the Labs DevOps feed. This will let others try out your experiment and provide feedback to further your experiment.
+The main code of your experiment will go in the project `CommunityToolkit.WinUI.Controls.MyExperimentNameHere`. When an experiment is merged into Labs, this code will be bundled automatically in a NuGet package and pushed to the Labs DevOps feed. This will let others try out your experiment and provide feedback to further your experiment.
 You will find an empty class in `MyExperimentNameHere.cs` that you can use as your starting point or one of the templated variants. You can find more info in the `MyExperimentNameHere.md` file in the sample project.
 
 The project `MyExperimentNameHere.Sample`is where you can put code that will allow you to demonstrate and exercise the experiment. In this project you'll find a sample page that includes an example of how to use settings and properties that can be controlled within the sample app. This folder also contains a **markdown** file that contains the documentation for the experiment and how to use it.
@@ -64,7 +64,7 @@ This may require a reboot.
 
 #### Updating NuGet Package
 
-Packages are manually versioned right now, [see this issue here](https://github.com/CommunityToolkit/Labs-Windows/issues/133). In order to update your NuGet package, update the `<Version>` tag in your library's `CommunityToolkit.Labs.WinUI.MyExperimentNameHere.csproj` file.
+Packages are manually versioned right now, [see this issue here](https://github.com/CommunityToolkit/Labs-Windows/issues/133). In order to update your NuGet package, update the `<Version>` tag in your library's `CommunityToolkit.WinUI.Controls.MyExperimentNameHere.csproj` file.
 
 #### WebAssembly Sample Project
 

From d3f624073b67697734b83b2652980b8a634703d7 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 9 Mar 2023 17:24:18 -0600
Subject: [PATCH 06/12] Use xmlns:controls instead of xmlns:labs

---
 .../ProjectTemplate/samples/ProjectTemplateCustomSample.xaml    | 2 +-
 .../ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml | 2 +-
 .../samples/ProjectTemplateTemplatedStyleCustomSample.xaml      | 2 +-
 .../samples/ProjectTemplateXbindBackedSample.xaml               | 2 +-
 .../samples/ProjectTemplateXbindBackedStyleCustomSample.xaml    | 2 +-
 .../src/ProjectTemplateStyle_ClassicBinding.xaml                | 2 +-
 template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml    | 2 +-
 template/ProjectTemplate/src/Themes/Generic.xaml                | 2 +-
 .../ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
index 0bc7f1eef..c2573317c 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.WinUI.Controls"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:local="using:ProjectTemplateExperiment.Samples"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
diff --git a/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
index 483a58433..a25c3e143 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.WinUI.Controls"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
diff --git a/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
index dd1904fa4..6a706d62c 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.WinUI.Controls"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
diff --git a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
index d691840a1..a2447bc5c 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.WinUI.Controls"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
diff --git a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
index c7ec6ddda..7a72deb5f 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.WinUI.Controls"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
diff --git a/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml b/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml
index b9f121597..91aa0fc87 100644
--- a/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml
+++ b/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml
@@ -1,7 +1,7 @@
 <!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:labs="using:CommunityToolkit.WinUI.Controls">
+                    xmlns:controls="using:CommunityToolkit.WinUI.Controls">
 
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
diff --git a/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml b/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml
index 27389a61b..9f940424a 100644
--- a/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml
+++ b/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml
@@ -2,7 +2,7 @@
 <ResourceDictionary x:Class="CommunityToolkit.WinUI.Controls.ProjectTemplateStyle_xBind"
                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:labs="using:CommunityToolkit.WinUI.Controls">
+                    xmlns:controls="using:CommunityToolkit.WinUI.Controls">
 
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
diff --git a/template/ProjectTemplate/src/Themes/Generic.xaml b/template/ProjectTemplate/src/Themes/Generic.xaml
index d61389163..adfa0d336 100644
--- a/template/ProjectTemplate/src/Themes/Generic.xaml
+++ b/template/ProjectTemplate/src/Themes/Generic.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:labs="using:CommunityToolkit.WinUI.Controls">
+                    xmlns:controls="using:CommunityToolkit.WinUI.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <labs:ProjectTemplateStyle_xBind />
diff --git a/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml b/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
index ab8c8cecc..f02111185 100644
--- a/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
+++ b/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.WinUI.Controls"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
       mc:Ignorable="d">

From 01ee9d6cdf0e529b661c8eee41e0ba99f4c8cec3 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 9 Mar 2023 17:24:18 -0600
Subject: [PATCH 07/12] Use xmlns:controls instead of xmlns:labs

---
 .../samples/ProjectTemplateCustomSample.xaml         |  6 +++---
 .../samples/ProjectTemplateTemplatedSample.xaml      |  4 ++--
 .../ProjectTemplateTemplatedStyleCustomSample.xaml   |  4 ++--
 .../samples/ProjectTemplateXbindBackedSample.xaml    |  4 ++--
 .../ProjectTemplateXbindBackedStyleCustomSample.xaml |  6 +++---
 .../src/ProjectTemplateStyle_ClassicBinding.xaml     | 10 +++++-----
 .../src/ProjectTemplateStyle_xBind.xaml              | 12 ++++++------
 template/ProjectTemplate/src/Themes/Generic.xaml     |  4 ++--
 .../tests/ExampleProjectTemplateTestPage.xaml        |  4 ++--
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
index 0bc7f1eef..47c8feb9a 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.WinUI.Controls"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:local="using:ProjectTemplateExperiment.Samples"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
@@ -11,13 +11,13 @@
     <StackPanel Spacing="15">
         <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}"
                    Text="{x:Bind TitleText, Mode=OneWay}" />
-        <labs:ProjectTemplate Orientation="{x:Bind local:ProjectTemplateCustomSample.ConvertStringToOrientation(LayoutOrientation), Mode=OneWay}">
+        <controls:ProjectTemplate Orientation="{x:Bind local:ProjectTemplateCustomSample.ConvertStringToOrientation(LayoutOrientation), Mode=OneWay}">
             <TextBlock Text="1" />
             <TextBlock Text="2" />
             <TextBlock Text="3" />
             <TextBlock Text="4" />
             <TextBlock Text="5" />
             <TextBlock Text="6" />
-        </labs:ProjectTemplate>
+        </controls:ProjectTemplate>
     </StackPanel>
 </Page>
diff --git a/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
index 483a58433..a9ac85d37 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
@@ -3,12 +3,12 @@
       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:labs="using:CommunityToolkit.WinUI.Controls"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
     <StackPanel Spacing="16">
-        <labs:ProjectTemplate_ClassicBinding FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
+        <controls:ProjectTemplate_ClassicBinding FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
                                              FontSize="{x:Bind TextSize, Mode=OneWay}"
                                              Foreground="{x:Bind TextForeground, Mode=OneWay}"
                                              Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
diff --git a/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
index dd1904fa4..a9c992e7b 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.WinUI.Controls"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
@@ -17,7 +17,7 @@
     </Page.Resources>
 
     <StackPanel Spacing="16">
-        <labs:ProjectTemplate_ClassicBinding FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
+        <controls:ProjectTemplate_ClassicBinding FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
                                              FontSize="{x:Bind TextSize, Mode=OneWay}"
                                              Foreground="{x:Bind TextForeground, Mode=OneWay}"
                                              Style="{StaticResource CustomClassicBindingProjectTemplateStyle}"
diff --git a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
index d691840a1..1205a22d5 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
@@ -3,12 +3,12 @@
       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:labs="using:CommunityToolkit.WinUI.Controls"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
     <StackPanel Spacing="16">
-        <labs:ProjectTemplate_xBind FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
+        <controls:ProjectTemplate_xBind FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
                                     FontSize="{x:Bind TextSize, Mode=OneWay}"
                                     Foreground="{x:Bind TextForeground, Mode=OneWay}"
                                     Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
diff --git a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
index c7ec6ddda..04912df84 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
@@ -3,7 +3,7 @@
       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:labs="using:CommunityToolkit.WinUI.Controls"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
@@ -11,13 +11,13 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <!--  Import custom styles  -->
-                <labs:ProjectTemplateStyle_xBind />
+                <controls:ProjectTemplateStyle_xBind />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Page.Resources>
 
     <StackPanel Spacing="16">
-        <labs:ProjectTemplate_xBind FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
+        <controls:ProjectTemplate_xBind FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
                                     FontSize="{x:Bind TextSize, Mode=OneWay}"
                                     Foreground="{x:Bind TextForeground, Mode=OneWay}"
                                     Style="{StaticResource CustomxBindProjectTemplateStyle}"
diff --git a/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml b/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml
index b9f121597..78c1c522c 100644
--- a/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml
+++ b/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml
@@ -1,7 +1,7 @@
 <!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:labs="using:CommunityToolkit.WinUI.Controls">
+                    xmlns:controls="using:CommunityToolkit.WinUI.Controls">
 
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
@@ -22,16 +22,16 @@
 
     <!--  Implicitly applied default style  -->
     <Style BasedOn="{StaticResource DefaultClassicBindingProjectTemplateStyle}"
-           TargetType="labs:ProjectTemplate_ClassicBinding" />
+           TargetType="controls:ProjectTemplate_ClassicBinding" />
 
     <Style x:Key="DefaultClassicBindingProjectTemplateStyle"
-           TargetType="labs:ProjectTemplate_ClassicBinding">
+           TargetType="controls:ProjectTemplate_ClassicBinding">
         <Style.Setters>
             <Setter Property="MyProperty" Value="This property has been overriden by the style template" />
             <Setter Property="ItemPadding" Value="{StaticResource DefaultProjectTemplateItemPadding}" />
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="labs:ProjectTemplate_ClassicBinding">
+                    <ControlTemplate TargetType="controls:ProjectTemplate_ClassicBinding">
                         <Grid Padding="{TemplateBinding ItemPadding}">
                             <StackPanel Spacing="20">
                                 <TextBlock x:Name="PART_HelloWorld"
@@ -52,7 +52,7 @@
     <!--  Minimal, custom style  -->
     <Style x:Key="CustomClassicBindingProjectTemplateStyle"
            BasedOn="{StaticResource DefaultClassicBindingProjectTemplateStyle}"
-           TargetType="labs:ProjectTemplate_ClassicBinding">
+           TargetType="controls:ProjectTemplate_ClassicBinding">
         <Style.Setters>
             <Setter Property="MyProperty" Value="This property has been overriden by a custom style!" />
             <Setter Property="ItemPadding" Value="25" />
diff --git a/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml b/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml
index 27389a61b..efa526130 100644
--- a/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml
+++ b/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml
@@ -2,7 +2,7 @@
 <ResourceDictionary x:Class="CommunityToolkit.WinUI.Controls.ProjectTemplateStyle_xBind"
                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:labs="using:CommunityToolkit.WinUI.Controls">
+                    xmlns:controls="using:CommunityToolkit.WinUI.Controls">
 
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
@@ -23,21 +23,21 @@
 
     <!--  Implicitly applied default style  -->
     <Style BasedOn="{StaticResource DefaultxBindProjectTemplateStyle}"
-           TargetType="labs:ProjectTemplate_xBind" />
+           TargetType="controls:ProjectTemplate_xBind" />
 
     <Style x:Key="DefaultxBindProjectTemplateStyle"
-           TargetType="labs:ProjectTemplate_xBind">
+           TargetType="controls:ProjectTemplate_xBind">
         <Style.Setters>
             <Setter Property="MyProperty" Value="This property has been overriden by the style template" />
             <Setter Property="ItemPadding" Value="{StaticResource DefaultProjectTemplateItemPadding}" />
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="labs:ProjectTemplate_xBind">
+                    <ControlTemplate TargetType="controls:ProjectTemplate_xBind">
                         <ContentControl x:Name="ContentContainer"
                                         HorizontalContentAlignment="Stretch"
                                         VerticalContentAlignment="Stretch">
                             <ContentControl.ContentTemplate>
-                                <DataTemplate x:DataType="labs:ProjectTemplate_xBind">
+                                <DataTemplate x:DataType="controls:ProjectTemplate_xBind">
                                     <Grid Padding="{x:Bind ItemPadding}"
                                           PointerEntered="{x:Bind Element_PointerEntered}">
                                         <StackPanel Spacing="20">
@@ -59,7 +59,7 @@
     <!--  Minimal, custom style  -->
     <Style x:Key="CustomxBindProjectTemplateStyle"
            BasedOn="{StaticResource DefaultxBindProjectTemplateStyle}"
-           TargetType="labs:ProjectTemplate_xBind">
+           TargetType="controls:ProjectTemplate_xBind">
         <Style.Setters>
             <Setter Property="MyProperty" Value="This property has been overriden by a custom style!" />
             <Setter Property="ItemPadding" Value="25" />
diff --git a/template/ProjectTemplate/src/Themes/Generic.xaml b/template/ProjectTemplate/src/Themes/Generic.xaml
index d61389163..e965b0cd9 100644
--- a/template/ProjectTemplate/src/Themes/Generic.xaml
+++ b/template/ProjectTemplate/src/Themes/Generic.xaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:labs="using:CommunityToolkit.WinUI.Controls">
+                    xmlns:controls="using:CommunityToolkit.WinUI.Controls">
 
     <ResourceDictionary.MergedDictionaries>
-        <labs:ProjectTemplateStyle_xBind />
+        <controls:ProjectTemplateStyle_xBind />
         <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.ProjectTemplate/ProjectTemplateStyle_ClassicBinding.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml b/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
index ab8c8cecc..1e55a505a 100644
--- a/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
+++ b/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
@@ -3,12 +3,12 @@
       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:labs="using:CommunityToolkit.WinUI.Controls"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
       mc:Ignorable="d">
 
     <Grid>
-        <labs:ProjectTemplate_ClassicBinding x:Name="ProjectTemplateControl" />
+        <controls:ProjectTemplate_ClassicBinding x:Name="ProjectTemplateControl" />
     </Grid>
 </Page>

From 4b70c59ecdc520cff327ad446ea7a1b41c6ce5c6 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 9 Mar 2023 18:53:17 -0600
Subject: [PATCH 08/12] Fixed xaml styling

---
 .../samples/ProjectTemplateCustomSample.xaml           |  2 +-
 .../samples/ProjectTemplateTemplatedSample.xaml        |  8 ++++----
 .../ProjectTemplateTemplatedStyleCustomSample.xaml     | 10 +++++-----
 .../samples/ProjectTemplateXbindBackedSample.xaml      |  8 ++++----
 .../ProjectTemplateXbindBackedStyleCustomSample.xaml   | 10 +++++-----
 .../tests/ExampleProjectTemplateTestPage.xaml          |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
index 47c8feb9a..ebaf1b730 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
@@ -2,8 +2,8 @@
 <Page x:Class="ProjectTemplateExperiment.Samples.ProjectTemplateCustomSample"
       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:controls="using:CommunityToolkit.WinUI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="using:ProjectTemplateExperiment.Samples"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
diff --git a/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
index a9ac85d37..be0e62ea5 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
@@ -2,15 +2,15 @@
 <Page x:Class="ProjectTemplateExperiment.Samples.ProjectTemplateTemplatedSample"
       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:controls="using:CommunityToolkit.WinUI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
     <StackPanel Spacing="16">
         <controls:ProjectTemplate_ClassicBinding FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
-                                             FontSize="{x:Bind TextSize, Mode=OneWay}"
-                                             Foreground="{x:Bind TextForeground, Mode=OneWay}"
-                                             Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
+                                                 FontSize="{x:Bind TextSize, Mode=OneWay}"
+                                                 Foreground="{x:Bind TextForeground, Mode=OneWay}"
+                                                 Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
     </StackPanel>
 </Page>
diff --git a/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
index a9c992e7b..50f1c6768 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
@@ -2,8 +2,8 @@
 <Page x:Class="ProjectTemplateExperiment.Samples.ProjectTemplateTemplatedStyleCustomSample"
       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:controls="using:CommunityToolkit.WinUI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
@@ -18,9 +18,9 @@
 
     <StackPanel Spacing="16">
         <controls:ProjectTemplate_ClassicBinding FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
-                                             FontSize="{x:Bind TextSize, Mode=OneWay}"
-                                             Foreground="{x:Bind TextForeground, Mode=OneWay}"
-                                             Style="{StaticResource CustomClassicBindingProjectTemplateStyle}"
-                                             Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
+                                                 FontSize="{x:Bind TextSize, Mode=OneWay}"
+                                                 Foreground="{x:Bind TextForeground, Mode=OneWay}"
+                                                 Style="{StaticResource CustomClassicBindingProjectTemplateStyle}"
+                                                 Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
     </StackPanel>
 </Page>
diff --git a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
index 1205a22d5..ee1ac3c6d 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
@@ -2,15 +2,15 @@
 <Page x:Class="ProjectTemplateExperiment.Samples.ProjectTemplateXbindBackedSample"
       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:controls="using:CommunityToolkit.WinUI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
     <StackPanel Spacing="16">
         <controls:ProjectTemplate_xBind FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
-                                    FontSize="{x:Bind TextSize, Mode=OneWay}"
-                                    Foreground="{x:Bind TextForeground, Mode=OneWay}"
-                                    Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
+                                        FontSize="{x:Bind TextSize, Mode=OneWay}"
+                                        Foreground="{x:Bind TextForeground, Mode=OneWay}"
+                                        Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
     </StackPanel>
 </Page>
diff --git a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
index 04912df84..8782b94e6 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
@@ -2,8 +2,8 @@
 <Page x:Class="ProjectTemplateExperiment.Samples.ProjectTemplateXbindBackedStyleCustomSample"
       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:controls="using:CommunityToolkit.WinUI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
@@ -18,9 +18,9 @@
 
     <StackPanel Spacing="16">
         <controls:ProjectTemplate_xBind FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
-                                    FontSize="{x:Bind TextSize, Mode=OneWay}"
-                                    Foreground="{x:Bind TextForeground, Mode=OneWay}"
-                                    Style="{StaticResource CustomxBindProjectTemplateStyle}"
-                                    Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
+                                        FontSize="{x:Bind TextSize, Mode=OneWay}"
+                                        Foreground="{x:Bind TextForeground, Mode=OneWay}"
+                                        Style="{StaticResource CustomxBindProjectTemplateStyle}"
+                                        Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
     </StackPanel>
 </Page>
diff --git a/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml b/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
index 1e55a505a..b3f44a5a7 100644
--- a/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
+++ b/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
@@ -2,8 +2,8 @@
 <Page x:Class="ProjectTemplateExperiment.Tests.ExampleProjectTemplateTestPage"
       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:controls="using:CommunityToolkit.WinUI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
       mc:Ignorable="d">

From 97e8b5f21ee6169cb0c340e9b6f418c91e183064 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Fri, 10 Mar 2023 14:21:12 -0600
Subject: [PATCH 09/12] Removed default component namespace from global usings

---
 common/GlobalUsings_WinUI.cs                                    | 2 --
 components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs      | 2 ++
 .../samples/SegmentedControlBasicSample.xaml.cs                 | 1 +
 .../samples/StackedNotificationsBehaviorCustomSample.xaml.cs    | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/GlobalUsings_WinUI.cs b/common/GlobalUsings_WinUI.cs
index 24d4eb16a..547158a0a 100644
--- a/common/GlobalUsings_WinUI.cs
+++ b/common/GlobalUsings_WinUI.cs
@@ -7,8 +7,6 @@
 
 global using System.Runtime.InteropServices.WindowsRuntime;
 
-global using CommunityToolkit.Labs.WinUI;
-
 global using Windows.Foundation;
 global using Windows.Foundation.Collections;
 
diff --git a/components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs b/components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs
index 025fd8e4a..38b0f02a0 100644
--- a/components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs
+++ b/components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Labs.WinUI;
+
 namespace CanvasLayoutExperiment.Samples;
 
 /// <summary>
diff --git a/components/SegmentedControl/samples/SegmentedControlBasicSample.xaml.cs b/components/SegmentedControl/samples/SegmentedControlBasicSample.xaml.cs
index 09fd29bb9..9a8904f7d 100644
--- a/components/SegmentedControl/samples/SegmentedControlBasicSample.xaml.cs
+++ b/components/SegmentedControl/samples/SegmentedControlBasicSample.xaml.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.UI.Xaml.Controls;
+using CommunityToolkit.Labs.WinUI;
 
 namespace SegmentedControlExperiment.Samples;
 
diff --git a/components/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs b/components/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs
index 2ac06da19..09c9d2792 100644
--- a/components/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs
+++ b/components/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Labs.WinUI;
+
 namespace StackedNotificationsBehaviorExperiment.Samples;
 
 /// <summary>

From a85b7920459af99133956a6cc4a87331c0058897 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Fri, 10 Mar 2023 14:24:32 -0600
Subject: [PATCH 10/12] Unify default package ID

---
 .../src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/template/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj b/template/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
index 23542be82..5dc2b1e98 100644
--- a/template/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
+++ b/template/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <ToolkitComponentName>ProjectTemplate</ToolkitComponentName>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.ProjectTemplate</PackageId>
     <Description>This package contains ProjectTemplate.</Description>
     <Version>0.0.1</Version>
 

From b37e7cc38555146124e315949f09498ff47a3e8c Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Fri, 10 Mar 2023 14:57:31 -0600
Subject: [PATCH 11/12] Fixed missing using directive

---
 .../ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs
index 26484e6b3..c5adf1769 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs
+++ b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.WinUI.Controls;
+
 namespace ProjectTemplateExperiment.Samples;
 
 /// <summary>

From 8977e1f6ee8c2a25e423c81de499811ed72851ce Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Fri, 10 Mar 2023 14:57:31 -0600
Subject: [PATCH 12/12] Fixed missing using directive

---
 .../ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs | 2 ++
 .../ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs
index 26484e6b3..c5adf1769 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs
+++ b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.WinUI.Controls;
+
 namespace ProjectTemplateExperiment.Samples;
 
 /// <summary>
diff --git a/template/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs b/template/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs
index b5c28a621..0e8d5764c 100644
--- a/template/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs
+++ b/template/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs
@@ -4,6 +4,7 @@
 
 using CommunityToolkit.Tooling.TestGen;
 using CommunityToolkit.Tests;
+using CommunityToolkit.WinUI.Controls;
 
 namespace ProjectTemplateExperiment.Tests;