diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 000000000..cd0d3128a
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />
+</Project>
\ No newline at end of file
diff --git a/WinUIGallery/Directory.Build.props b/WinUIGallery/Directory.Build.props
index 2301ed66b..39faf6040 100644
--- a/WinUIGallery/Directory.Build.props
+++ b/WinUIGallery/Directory.Build.props
@@ -7,11 +7,8 @@
     
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />
 
-  <!-- When building standalone, WinUI Gallery needs to do some extra things that are done implicitly in the WinUI repo.
-       Determine if building standalone by conditioning on the MuxCustomBuildTasksPackageVersion property, which only exists in the WinUI repo -->
-  <PropertyGroup Condition="'$(MuxCustomBuildTasksPackageVersion)' != ''">
-    <IsInWinUIRepo>true</IsInWinUIRepo>
-
+  <!-- When building standalone, WinUI Gallery needs to do some extra things that are done implicitly in the WinUI repo.-->
+  <PropertyGroup Condition="'$(IsInWinUIRepo)' == 'true'">
     <!-- We want to binplace the WinUI Gallery pdb to a subdirectory of Symbols\Test so that the UWP and Desktop versions don't 
          overwrite each other. -->
     <BinplaceSymbolsToSubdir>true</BinplaceSymbolsToSubdir>
diff --git a/WinUIGallery/Package.MSIX.appxmanifest b/WinUIGallery/Package.MSIX.appxmanifest
new file mode 100644
index 000000000..801d54721
--- /dev/null
+++ b/WinUIGallery/Package.MSIX.appxmanifest
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package 
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" 
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" 
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" 
+  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" 
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap mp uap3">
+  <Identity Name="Microsoft.WinUI3ControlsGallery.Desktop" Publisher="CN=WinUITest" Version="1.3.6.0" />
+  <mp:PhoneIdentity PhoneProductId="863667e0-667a-4bb4-ac52-c59656c7333a" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+  <Properties>
+    <DisplayName>WinUI 3 Gallery</DisplayName>
+    <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
+    <Logo>Assets\Tiles\StoreLogo-sdk.png</Logo>
+    <uap:SupportedUsers>multiple</uap:SupportedUsers>
+  </Properties>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$">
+      <uap:VisualElements DisplayName="WinUI 3 Gallery" Square150x150Logo="Assets\Tiles\squaretile-sdk.png" Square44x44Logo="Assets\Tiles\SmallTile-sdk.png" Description="WinUI 3 Gallery" BackgroundColor="transparent">
+        <uap:DefaultTile Square310x310Logo="Assets\Tiles\LargeTile.png" Wide310x150Logo="Assets\Tiles\WideTile.png" Square71x71Logo="Assets\Tiles\SmallTile.png">
+          <uap:ShowNameOnTiles>
+            <uap:ShowOn Tile="square150x150Logo" />
+            <uap:ShowOn Tile="wide310x150Logo" />
+            <uap:ShowOn Tile="square310x310Logo" />
+          </uap:ShowNameOnTiles>
+        </uap:DefaultTile>
+        <uap:SplashScreen Image="Assets\Tiles\splash-sdk.png" BackgroundColor="#00b2f0" />
+      </uap:VisualElements>
+      <Extensions>
+        <uap3:Extension Category="windows.appUriHandler">
+          <uap3:AppUriHandler>
+            <uap3:Host Name="winuigallery.com" />
+            <uap3:Host Name="xamlcontrolsgallery.com" />
+          </uap3:AppUriHandler>
+        </uap3:Extension>
+        <uap:Extension Category="windows.protocol">
+          <uap:Protocol Name="winui3gallery">
+            <uap:DisplayName>WinUI 3 Gallery</uap:DisplayName>
+          </uap:Protocol>
+        </uap:Extension>
+      </Extensions>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+    <Capability Name="internetClient" />
+  </Capabilities>
+</Package>
\ No newline at end of file
diff --git a/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj b/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
deleted file mode 100644
index 7a269fd77..000000000
--- a/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x86">
-      <Configuration>Debug</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x86">
-      <Configuration>Release</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
-    <SDKIdentifier>Windows</SDKIdentifier>
-    <SDKVersion>10.0</SDKVersion>
-  </PropertyGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
-  <Import Project="common.props" />
-  <PropertyGroup>
-    <ProjectGuid>4c7b20d7-5f5c-440e-8da3-b19a328cc8bd</ProjectGuid>
-    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-    <EntryPointProjectUniqueName>WinUIGallery.DesktopWap.csproj</EntryPointProjectUniqueName>
-    <AppxBundleNameForOutput>WinUIGallery.DesktopWap</AppxBundleNameForOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(IsInWinUIRepo)' == 'true'">
-    <PackageCertificateKeyFile>$(ProjectRoot)build\MSTest.pfx</PackageCertificateKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundlePlatforms>$(Platform)</AppxBundlePlatforms>
-    <AppxBundlePlatforms Condition="'$(BuildAllAppFlavors)' == 'true'">x86|x64|ARM64</AppxBundlePlatforms>
-    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.WAP.appxmanifest" Condition="!('$(Configuration)' == 'Debug')">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-    <AppxManifest Include="Package.WAP.Dev.appxmanifest" Condition="'$(Configuration)' == 'Debug'">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="WinUIGallery.DesktopWap.csproj">
-      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
-      <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup Condition="'$(WindowsAppSdkPackageVersion)' != ''">
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="[$(WindowsAppSdkPackageVersion)]" GeneratePathProperty="true">
-      <IncludeAssets>build</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="[$(MicrosoftWindowsSDKBuildToolsNugetPackageVersion)]">
-      <IncludeAssets>build</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
-  <!-- WinUI 3 NuGet-specific logic-->
-  <PropertyGroup Condition="'$(WinUIPackageVersion)' != ''">
-    <AppxTargetsLocation Condition="'$(AppxTargetsLocation)'==''">$(MSBuildThisFileDirectory)build\</AppxTargetsLocation>
-  </PropertyGroup>
-  <Import Project="$(AppxTargetsLocation)Microsoft.WinUI.AppX.targets" Condition="Exists('$(AppxTargetsLocation)Microsoft.WinUI.AppX.targets') AND '$(WinUIPackageVersion)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/WinUIGallery/WinUIGallery.DesktopWap.sln b/WinUIGallery/WinUIGallery.DesktopWap.sln
deleted file mode 100644
index 44a0a8269..000000000
--- a/WinUIGallery/WinUIGallery.DesktopWap.sln
+++ /dev/null
@@ -1,74 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.1.32319.34
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A98961E3-CB85-4AFC-990C-FD9F57043E7D}"
-	ProjectSection(SolutionItems) = preProject
-		..\Directory.Build.props = ..\Directory.Build.props
-	EndProjectSection
-EndProject
-Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "WinUIGallery.DesktopWap.Package", "WinUIGallery.DesktopWap.Package.wapproj", "{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUIGallery.DesktopWap", "WinUIGallery.DesktopWap.csproj", "{D78F3B56-340D-44F0-9AF1-320D473BA611}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM64 = Debug|ARM64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|ARM64 = Release|ARM64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|Win32.ActiveCfg = Debug|x86
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|Win32.Build.0 = Debug|x86
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|Win32.Deploy.0 = Debug|x86
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|x64.ActiveCfg = Debug|x64
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|x64.Build.0 = Debug|x64
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|x64.Deploy.0 = Debug|x64
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|x86.ActiveCfg = Debug|x86
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|x86.Build.0 = Debug|x86
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|x86.Deploy.0 = Debug|x86
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|ARM64.Build.0 = Release|ARM64
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|ARM64.Deploy.0 = Release|ARM64
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|Win32.ActiveCfg = Release|x86
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|Win32.Build.0 = Release|x86
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|Win32.Deploy.0 = Release|x86
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x64.ActiveCfg = Release|x64
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x64.Build.0 = Release|x64
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x64.Deploy.0 = Release|x64
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x86.ActiveCfg = Release|x86
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x86.Build.0 = Release|x86
-		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x86.Deploy.0 = Release|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|ARM64.Build.0 = Debug|ARM64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|Win32.ActiveCfg = Debug|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|Win32.Build.0 = Debug|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x64.ActiveCfg = Debug|x64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x64.Build.0 = Debug|x64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x86.ActiveCfg = Debug|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x86.Build.0 = Debug|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|ARM64.ActiveCfg = Release|ARM64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|ARM64.Build.0 = Release|ARM64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|Win32.ActiveCfg = Release|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|Win32.Build.0 = Release|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x64.ActiveCfg = Release|x64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x64.Build.0 = Release|x64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x86.ActiveCfg = Release|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5B033CDA-6491-405C-A05B-CEE6AC4060B9}
-	EndGlobalSection
-EndGlobal
diff --git a/WinUIGallery/WinUIGallery.DesktopWap.csproj b/WinUIGallery/WinUIGallery.csproj
similarity index 78%
rename from WinUIGallery/WinUIGallery.DesktopWap.csproj
rename to WinUIGallery/WinUIGallery.csproj
index 5d5e26546..341684526 100644
--- a/WinUIGallery/WinUIGallery.DesktopWap.csproj
+++ b/WinUIGallery/WinUIGallery.csproj
@@ -2,16 +2,19 @@
   <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.1" />
 
   <PropertyGroup>
+    <!-- Set WindowsPackageType to 'None' to build XCG as an unpackaged application - use the "WinUIGallery Unpackaged" profile to launch it -->
+    <!-- Set WindowsPackageType to 'MSIX' to build XCG as an packaged application - use the "WinUIGallery Packaged" profile to launch it -->
+    <WindowsPackageType Condition="'$(WindowsPackageType)'==''">MSIX</WindowsPackageType>
     <OutputType>WinExe</OutputType>
     <TargetFramework>$(SamplesTargetFrameworkMoniker)</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <DefineConstants>$(DefineConstants);MSIX</DefineConstants>
     <DefineConstants Condition="'$(WindowsAppSdkSelfContained)'==''">$(DefineConstants);WindowsAppSdkRuntimeDependent</DefineConstants>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;ARM64</Platforms>
-    <NoWarn>8305</NoWarn>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <EnableMsixTooling>false</EnableMsixTooling>
+    <EnableMsixTooling>true</EnableMsixTooling>
     <NoWarn>
       0108; <!-- 'x' hides inherited member 'y'. Use the new keyword if hiding was intended. -->
       8305  <!-- 'x' is for evaluation purposes only and is subject to change or removal in future updates. -->
@@ -22,21 +25,41 @@
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(WindowsPackageType)'=='None'">
+      <WindowsAppSdkEnableMdd>true</WindowsAppSdkEnableMdd>
+      <WindowsAppSdkBootstrapInitialize>true</WindowsAppSdkBootstrapInitialize>
+      <DefineConstants>$(DefineConstants);UNPACKAGED</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(WindowsPackageType)'=='MSIX'">
+      <DefineConstants>MSIX</DefineConstants>
+  </PropertyGroup>
+
+  <!-- AppInstaller settings when building in the WinUI repo -->
+  <PropertyGroup Condition="'$(IsInWinUIRepo)' == 'true'">
+    <GenerateAppInstallerFile>true</GenerateAppInstallerFile>
+    <!-- URI must be absolute so this is really only useful for testing a locally produced
+         AppInstaller. -->
+    <AppInstallerUri>$(AppxPackageDir)</AppInstallerUri>
+    <!-- False until https://task.ms/31482969 is implemented -->
+    <AppxBundle>Never</AppxBundle>
+  </PropertyGroup>
+
   <Import Project="Common.props" />
 
   <!-- In the WinUI repo, package reference versions are controlled centrally by a Packages.props.  We will
        just add versionless PackageReferences here.  They will be updated to their actual versions by either the Packages.props file
        in the WinUI repo, or the next ItemGroup below when standalone. -->
   <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
     <PackageReference Include="ColorCode.Core" />
-    <PackageReference Include="CommunityToolkit.Labs.WinUI.SegmentedControl" Version="0.0.2" />
-    <PackageReference Include="CommunityToolkit.Labs.WinUI.SettingsControls" Version="0.0.16" />
-    <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
-    <PackageReference Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" />
     <PackageReference Include="Microsoft.Graphics.Win2D" />
-    <PackageReference Include="Microsoft.WinUI" />
-    <PackageReference Include="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" />
     <PackageReference Include="Microsoft.Windows.CsWinRT" />
+    <PackageReference Include="CommunityToolkit.Labs.WinUI.SegmentedControl"/>
+    <PackageReference Include="CommunityToolkit.Labs.WinUI.SettingsControls"/>
+    <PackageReference Include="CommunityToolkit.WinUI.UI"/>
+    <PackageReference Include="CommunityToolkit.WinUI.UI.Animations"/>
+    <PackageReference Include="Microsoft.VCRTForwarders.140" />
     <Manifest Include="$(ApplicationManifest)" />
 
     <!--
@@ -47,32 +70,30 @@
     <PackageReference Include="System.Private.Uri" />
   </ItemGroup>
   <ItemGroup Condition="'$(IsInWinUIRepo)' != 'true'">
+    <PackageReference Update="Microsoft.WindowsAppSDK" Version="$(WindowsAppSdkPackageVersion)" />
     <PackageReference Remove="ColorCode.Core" />
-    <PackageReference Include="ColorCode.WinUI" Version="$(ColorCodeVersion)" />
-    <PackageReference Update="Microsoft.Graphics.Win2D" Version="$(GraphicsWin2DVersion)" />
-    <PackageReference Update="Microsoft.VCRTForwarders.140" Version="1.0.6" />
-    <PackageReference Update="Microsoft.WinUI" Version="$(WinUIPackageVersion)" Condition="'$(WinUIPackageVersion)' != ''" />
+    <PackageReference Include="ColorCode.WinUI"
+                      Version="$(ColorCodeVersion)" />
+    <PackageReference Update="CommunityToolkit.Labs.WinUI.SegmentedControl"
+                      Version="$(CommunityToolkitSegmentedControlVersion)" />                      
+    <PackageReference Update="CommunityToolkit.Labs.WinUI.SettingsControls"
+                      Version="$(CommunityToolkitSettingsControlsVersion)" />
+    <PackageReference Update="CommunityToolkit.WinUI.UI"
+                      Version="$(CommunityToolkitWinUIVersion)" />
+    <PackageReference Update="CommunityToolkit.WinUI.UI.Animations"
+                      Version="$(CommunityToolkitWinUIVersion)" />                                                
+    <PackageReference Update="Microsoft.Graphics.Win2D"
+                      Version="$(GraphicsWin2DVersion)" />
+    <PackageReference Update="Microsoft.VCRTForwarders.140"
+                      Version="1.0.6" />
     <!-- Get latest WinRT.Runtime.dll from C#/WinRT -->
-    <PackageReference Update="Microsoft.Windows.CsWinRT" Version="$(MicrosoftCsWinRTPackageVersion)" />
+    <PackageReference Update="Microsoft.Windows.CsWinRT" Version="2.0.3" />
     <PackageReference Update="System.Private.Uri" Version="4.3.2" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(WindowsAppSdkPackageVersion)' != ''">
-    <PackageReference Remove="Microsoft.WinUI" />
-    <PackageReference Remove="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(IsInWinUIRepo)' != 'true'">
-    <PackageReference Update="Microsoft.WindowsAppSDK" Version="$(WindowsAppSdkPackageVersion)" Condition="'$(WindowsAppSdkPackageVersion)' != ''" />
-  </ItemGroup>
-
   <ItemGroup>
-    <PRIResource Include="Strings\en-US\Resources.resw" />
-
     <!--Include package/runtime version numbers-->
     <Compile Include="$(MicrosoftWindowsAppSDKPackageDir)include\WindowsAppSDK-VersionInfo.cs" />
-
     <Compile Remove="CollectionsInterop.cs" />
     <Compile Remove="Behaviors\ImageScrollBehavior.cs" />
     <Compile Remove="ControlPages\ScrollViewer2Page.xaml.cs" />
diff --git a/WinUIGallery/WinUIGallery.sln b/WinUIGallery/WinUIGallery.sln
new file mode 100644
index 000000000..43340e6eb
--- /dev/null
+++ b/WinUIGallery/WinUIGallery.sln
@@ -0,0 +1,55 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29709.97
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A98961E3-CB85-4AFC-990C-FD9F57043E7D}"
+	ProjectSection(SolutionItems) = preProject
+		..\Directory.Build.props = ..\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUIGallery", "WinUIGallery.csproj", "{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM64 = Debug|ARM64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|ARM64 = Release|ARM64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Debug|ARM64.Build.0 = Debug|ARM64
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Debug|Win32.ActiveCfg = Debug|x86
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Debug|Win32.Build.0 = Debug|x86
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Debug|Win32.Deploy.0 = Debug|x86
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Debug|x64.ActiveCfg = Debug|x64
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Debug|x64.Build.0 = Debug|x64
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Debug|x64.Deploy.0 = Debug|x64
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Debug|x86.ActiveCfg = Debug|x86
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Debug|x86.Build.0 = Debug|x86
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Debug|x86.Deploy.0 = Debug|x86
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Release|ARM64.ActiveCfg = Release|ARM64
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Release|ARM64.Build.0 = Release|ARM64
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Release|ARM64.Deploy.0 = Release|ARM64
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Release|Win32.ActiveCfg = Release|x86
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Release|Win32.Build.0 = Release|x86
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Release|Win32.Deploy.0 = Release|x86
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Release|x64.ActiveCfg = Release|x64
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Release|x64.Build.0 = Release|x64
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Release|x64.Deploy.0 = Release|x64
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Release|x86.ActiveCfg = Release|x86
+		{151EA9DC-A79C-4CFB-ABBC-4C0746B995EC}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {5B033CDA-6491-405C-A05B-CEE6AC4060B9}
+	EndGlobalSection
+EndGlobal
diff --git a/WinUIGallery/standalone.props b/WinUIGallery/standalone.props
index 8a85e6b2c..efbd89a87 100644
--- a/WinUIGallery/standalone.props
+++ b/WinUIGallery/standalone.props
@@ -1,11 +1,14 @@
 <Project>
   <PropertyGroup>
     <!-- The NuGet versions of dependencies to build against. -->
-    <WindowsAppSdkPackageVersion>1.3.230502000</WindowsAppSdkPackageVersion>
+    <WindowsAppSdkPackageVersion>1.4.230725001</WindowsAppSdkPackageVersion>
     <SamplesTargetFrameworkMoniker>net6.0-windows10.0.19041.0</SamplesTargetFrameworkMoniker>
     <MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
     <GraphicsWin2DVersion>1.0.4</GraphicsWin2DVersion>
     <ColorCodeVersion>2.0.13</ColorCodeVersion>
+    <CommunityToolkitSegmentedControlVersion>0.0.2</CommunityToolkitSegmentedControlVersion>
+    <CommunityToolkitSettingsControlsVersion>0.0.16</CommunityToolkitSettingsControlsVersion>
+    <CommunityToolkitWinUIVersion>7.1.2</CommunityToolkitWinUIVersion>
     <MicrosoftWindowsSDKBuildToolsNugetPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsNugetPackageVersion>
     <MicrosoftCsWinRTPackageVersion>2.0.2</MicrosoftCsWinRTPackageVersion>
     <!-- We have multiple projects in the same directory, which means we need to separate their output paths-->
@@ -18,8 +21,6 @@
          are erroneously included.  Explicitly exclude them here
     -->
     <DefaultItemExcludes>obj\**;bin\**;$(DefaultItemExcludes)</DefaultItemExcludes>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(IsInWinUIRepo)' != 'true'">
     <!-- Where to place the files generated from CSWinRT from WinUIGallery.Desktop.-->
     <GeneratedFilesDir>obj\generated</GeneratedFilesDir>
   </PropertyGroup>
diff --git a/nuget.config b/nuget.config
index b20878e6d..c8c155621 100644
--- a/nuget.config
+++ b/nuget.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <config>
-    <clear />
     <add key="repositoryPath" value="$\..\packages" />
   </config>
   <disabledPackageSources>
@@ -9,7 +8,6 @@
   </disabledPackageSources>
   <packageSources>
     <!-- For more info, see https://docs.nuget.org/consume/nuget-config-file -->
-    <clear />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
 
     <!-- Windows Community Toolkit Labs preview feed -->