diff --git a/src/Uno.Extensions.Templates/Uno.Extensions.Templates.csproj b/src/Uno.Extensions.Templates/Uno.Extensions.Templates.csproj
index 570a976954..f2342636ab 100644
--- a/src/Uno.Extensions.Templates/Uno.Extensions.Templates.csproj
+++ b/src/Uno.Extensions.Templates/Uno.Extensions.Templates.csproj
@@ -36,41 +36,16 @@
 	</ItemGroup>
 	
 	<Target Name="ReplaceTemplateCode" BeforeTargets="BeforeBuild">
-		<!-- <ItemGroup>
-			<MyTemplateSourceUIFiles Include="content\unoapp-extensions-net6\MyExtensionsApp.UI\**\*" />
-		</ItemGroup>
-
-		<Copy SourceFiles="@(MyTemplateSourceUIFiles)" DestinationFiles="@(MyTemplateSourceUIFiles->'content\unoapp-extensions\MyExtensionsApp.UI\%(RecursiveDir)%(Filename)%(Extension)')" /> 
-
-		<ItemGroup>
-			<MyTemplateSourceFiles Include="content\unoapp-extensions-net6\MyExtensionsApp\**\*" />
-		</ItemGroup>
-
-		<Copy SourceFiles="@(MyTemplateSourceFiles)" DestinationFiles="@(MyTemplateSourceFiles->'content\unoapp-extensions\MyExtensionsApp\%(RecursiveDir)%(Filename)%(Extension)')" />  -->
-
-
 		<ItemGroup>
-			<!-- <Content Include="content\unoapp-extensions\**" KeepDuplicates="False">
-				<PackagePath>content\unoapp-extensions</PackagePath>
-				<Pack>true</Pack>
-			</Content> -->
 			<Content Include="content\unoapp-extensions\**" KeepDuplicates="False">
 				<PackagePath>content\unoapp-extensions</PackagePath>
 				<Pack>true</Pack>
 			</Content>
+			<Content Remove="content\unoapp-extensions\MyExtensionsApp.Debugging.sln" />
 		</ItemGroup>
 	</Target>
 
 	<Target Name="ReplaceVersions" BeforeTargets="BeforeBuild">
-	 <!-- Condition="'$(PackageVersion)'!='255.255.255.255'" -->
-		<!-- <ItemGroup>
-			<MySourceFiles Include="..\..\samples\Commerce\Commerce.Shared\**\*" />
-		</ItemGroup> -->
-
-		<!-- <Copy SourceFiles="@(MySourceFiles)" DestinationFiles="@(MySourceFiles->'content\unoapp-samples-commerce\MyExtensionsApp.Shared\%(RecursiveDir)%(Filename)%(Extension)')" />
-
-		<RenameFiles SourcePath="content\unoapp-samples-commerce\MyExtensionsApp.Shared" SourceName="Commerce" TargetName="MyExtensionsApp" /> -->
-		
 		<PropertyGroup>
 			<MSBuildDeveloperNamespace>
 				<Namespace Prefix="x" Uri="http://schemas.microsoft.com/developer/msbuild/2003" />
@@ -90,115 +65,7 @@
 		<XmlPoke XmlInputPath="%(_AllCSProjFiles.Identity)" Query="//PackageVersion[@Version='255.255.255.255']/@Version" Value="$(PackageVersion)" Namespaces="" />
 		<XmlPoke XmlInputPath="%(_AllCSProjFiles.Identity)" Query="//PackageReference[@Version='255.255.255.255']/@VersionOverride" Value="$(PackageVersion)" Namespaces="" />
 
-		<!-- <XmlPeek XmlInputPath="..\..\samples\Commerce\Commerce.Wasm\Commerce.Wasm.csproj" Query="//PackageReference[@Include='Uno.Toolkit.WinUI']/@Version">
-			<Output TaskParameter="Result" ItemName="Uno_Toolkit_WinUI_Version" />
-		</XmlPeek>
-		<XmlPeek XmlInputPath="..\..\samples\Commerce\Commerce.Wasm\Commerce.Wasm.csproj" Query="//PackageReference[@Include='Uno.Toolkit.WinUI.Material']/@Version">
-			<Output TaskParameter="Result" ItemName="Uno_Toolkit_WinUI_Material_Version" />
-		</XmlPeek>
-		<XmlPeek XmlInputPath="..\..\samples\Commerce\Commerce.Wasm\Commerce.Wasm.csproj" Query="//PackageReference[@Include='Uno.Material.WinUI']/@Version">
-			<Output TaskParameter="Result" ItemName="Uno_Material_WinUI_Version" />
-		</XmlPeek> -->
-
-		<!-- Uno_Toolkit_WinUI_Version -->
-		<!-- <XmlPoke XmlInputPath="%(_AllCSProjFiles.Identity)"
-						 Query="//x:PackageReference[@Include='Uno.Toolkit.WinUI']/@Version"
-						 Value="@(Uno_Toolkit_WinUI_Version)"
-						 Namespaces="$(MSBuildDeveloperNamespace)" />
-		<XmlPoke XmlInputPath="%(_AllCSProjFiles.Identity)"
-						 Query="//PackageReference[@Include='Uno.Toolkit.WinUI']/@Version"
-						 Value="@(Uno_Toolkit_WinUI_Version)"
-						 Namespaces="" /> -->
 
-		<!-- Uno_Toolkit_WinUI_Material_Version -->
-		<!-- <XmlPoke XmlInputPath="%(_AllCSProjFiles.Identity)"
-						 Query="//x:PackageReference[@Include='Uno.Toolkit.WinUI.Material']/@Version"
-						 Value="@(Uno_Toolkit_WinUI_Material_Version)"
-						 Namespaces="$(MSBuildDeveloperNamespace)" />
-		<XmlPoke XmlInputPath="%(_AllCSProjFiles.Identity)"
-						 Query="//PackageReference[@Include='Uno.Toolkit.WinUI.Material']/@Version"
-						 Value="@(Uno_Toolkit_WinUI_Material_Version)"
-						 Namespaces="" /> -->
 
-		<!-- Uno_Material_WinUI_Version -->
-		<!-- <XmlPoke XmlInputPath="%(_AllCSProjFiles.Identity)"
-						 Query="//x:PackageReference[@Include='Uno.Material.WinUI']/@Version"
-						 Value="@(Uno_Material_WinUI_Version)"
-						 Namespaces="$(MSBuildDeveloperNamespace)" />
-		<XmlPoke XmlInputPath="%(_AllCSProjFiles.Identity)"
-						 Query="//PackageReference[@Include='Uno.Material.WinUI']/@Version"
-						 Value="@(Uno_Material_WinUI_Version)"
-						 Namespaces="" /> -->
-
-		<!-- <ItemGroup>
-			<Content Include="content\unoapp-samples-commerce\**" KeepDuplicates="False">
-				<PackagePath>content\unoapp-samples-commerce</PackagePath>
-				<Pack>true</Pack>
-			</Content>
-		</ItemGroup> -->
 	</Target>
-
-	<UsingTask TaskName="RenameFiles" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
-		<ParameterGroup>
-			<SourcePath ParameterType="System.String" Required="True" Output="False" />
-			<SourceName ParameterType="System.String" Required="True" Output="False" />
-			<TargetName ParameterType="System.String" Required="True" Output="False" />
-		</ParameterGroup>
-		<Task>
-			<Reference Include="System.Xml" />
-			<Using Namespace="System" />
-			<Using Namespace="System.Linq" />
-			<Using Namespace="System.IO" />
-			<Code Type="Fragment" Language="cs">
-				<![CDATA[
-					string[] filters = new[] { "*.cs", "*.xml", "*.xaml", "*.plist", "*.js", "*.config", "*.appxmanifest", "*.projitems", "*.shproj", "*.csproj", "*.sln" };
-					foreach (var file in filters.SelectMany(f => Directory.EnumerateFiles(SourcePath, f, SearchOption.AllDirectories)))
-					{
-						Log.LogMessage("Converting file: " + file);
-						var s = File.ReadAllText(file);
-						s = s
-							.Replace(SourceName, TargetName)
-							;
-							
-						if(Path.GetExtension(file).ToLower() == ".cs" && !s.StartsWith("//-:cnd:noEmit"))
-						{
-							// Disable conditionals for all imported files
-							s = "//-:cnd:noEmit\r\n" + s;
-						}
-
-						var fileName = Path.GetFileName(file);
-						var filePath = Path.GetDirectoryName(file);
-						var updatedFileName = fileName.Replace(SourceName, TargetName);
-						
-						File.WriteAllText(file, s);
-						if(updatedFileName != fileName)
-						{
-							File.Delete(Path.Combine(filePath, updatedFileName));
-							Log.LogMessage("Move file: " + file + " to " + Path.Combine(filePath, updatedFileName));
-							File.Move(file, Path.Combine(filePath, updatedFileName));
-						}
-					}
-					Func<string[]> getFolders = () => Directory.GetDirectories(SourcePath, "*.*", SearchOption.AllDirectories);
-					var folders = getFolders();
-					for (int i = 0; i < folders.Length; i++)
-					{
-						var dir = folders[i];
-						if(!Directory.Exists(dir)) continue;
-						var dirName = Path.GetFileName(dir);
-						var path = Path.GetDirectoryName(dir);
-						var updatedDirName = dirName.Replace(SourceName, TargetName);
-						if(updatedDirName != dirName)
-						{
-							i = 0;
-							folders = getFolders();
-							var target = Path.Combine(path, updatedDirName);
-							Log.LogMessage("Moving: " + dir + " to " + target);
-							Directory.Move(dir, target);
-						}
-					}
-				]]>
-			</Code>
-		</Task>
-	</UsingTask>
-
 </Project>
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/dotnetcli.host.json b/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/dotnetcli.host.json
index 3836941b6c..a61b636854 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/dotnetcli.host.json
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/dotnetcli.host.json
@@ -1,29 +1,57 @@
 {
   "$schema": "http://json.schemastore.org/dotnetcli.host",
   "symbolInfo": {
-    "WebAssembly": {
+    "wasm": {
       "longName": "webassembly",
       "shortName": "wasm"
     },
-    "iOS": {
+    "ios": {
       "longName": "ios",
       "shortName": "ios"
     },
-    "Android": {
+    "android": {
       "longName": "android",
-      "shortName": "android"
+      "shortName": "droid"
     },
-    "macOS": {
+    "macos": {
       "longName": "macos",
       "shortName": "macos"
     },
+    "maccatalyst": {
+      "longName": "maccatalyst",
+      "shortName": "catalyst"
+    },
     "skia-wpf": {
       "longName": "skia-wpf",
-      "shortName": "skia-wpf"
+      "shortName": "wpf"
     },
     "skia-gtk": {
       "longName": "skia-gtk",
-      "shortName": "skia-gtk"
+      "shortName": "gtk"
+    },
+    "skia-linux-fb": {
+      "longName": "skia-linux-fb",
+      "shortName": "linux"
+    },
+    "winAppSdk": {
+      "longName": "windowsAppSdk",
+      "shortName": "win"
+    },
+    "tests": {
+      "longName": "tests",
+      "shortName": "tests"
+    },
+    "wasm-pwa-manifest": {
+      "longName": "wasm-pwa-manifest",
+      "shortName": "pwa"
+    },
+    "vscode": {
+      "longName": "vscode",
+      "shortName": "vscode"
     },
+    "skipRestore": {
+      "longName": "skipPackageRestore",
+      "shortName": "skipRestore"
+    }
   }
 }
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/ide.host.json b/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/ide.host.json
new file mode 100644
index 0000000000..42c6aaa91f
--- /dev/null
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/ide.host.json
@@ -0,0 +1,134 @@
+{
+  "$schema": "http://json.schemastore.org/ide.host",
+  "name": {
+    "text": "Multi-Platform App (Uno.Extensions)"
+  },
+  "description": {
+    "text": "Solution template for creating a multi-platform C# & XAML application targeting Windows App SDK, Android, iOS, macOS, WebAssembly, Skia/WPF and Skia/GTK for Linux."
+  },
+  "order": 610,
+  "icon": "uno-logo.png",
+  "learnMoreLink": "https://github.com/unoplatform/uno",
+  "symbolInfo": [
+    {
+      "id": "wasm",
+      "name": {
+        "text": "Web - WebAssembly"
+      },
+      "description":
+      {
+        "text": "Enables the WebAssembly platform support project"
+      },
+      "defaultValue": "true",
+      "isVisible":true
+    },
+    {
+      "id": "ios",
+      "name": {
+        "text": "Mobile - iOS"
+      },
+      "description":
+      {
+        "text": "Enables the iOS platform in the Mobile support project"
+      },
+      "defaultValue": "true",
+      "isVisible":true
+    },
+    {
+      "id": "android",
+      "name": {
+        "text": "Mobile - Android"
+      },
+      "description":
+      {
+        "text": "Enables the Android platform in the Mobile support project"
+      },
+      "defaultValue": "true",
+      "isVisible":true
+    },
+    {
+      "id": "winAppSdk",
+      "name": {
+        "text": "Desktop - WinUI (Windows App SDK)"
+      },
+      "description":
+      {
+        "text": "Enables the Widnows App SDK platform support project"
+      },
+      "defaultValue": "true",
+      "isVisible":true
+    },
+    {
+      "id": "skia-gtk",
+      "name": {
+        "text": "Desktop - Gtk (Linux, macOS, Windows 7 or later)"
+      },
+      "description":
+      {
+        "text": "Enables the Skia/GTK platform support project"
+      },
+      "defaultValue": "true",
+      "isVisible":true
+    },
+    {
+      "id": "macos",
+      "name": {
+        "text": "Desktop - macOS (AppKit)"
+      },
+      "description":
+      {
+        "text": "Enables the macOS (AppKit) platform in the Mobile support project"
+      },
+      "defaultValue": "false",
+      "isVisible":true
+    },
+    {
+      "id": "maccatalyst",
+      "name": {
+        "text": "Desktop - macOS (Catalyst)"
+      },
+      "description":
+      {
+        "text": "Enables the macOS (Catalyst) platform in the Mobile support project"
+      },
+      "defaultValue": "true",
+      "isVisible":true
+    },
+    {
+      "id": "skia-wpf",
+      "name": {
+        "text": "Desktop - WPF (Windows 7 or later)"
+      },
+      "description":
+      {
+        "text": "Enables the Skia/WPF platform support project"
+      },
+      "defaultValue": "false",
+      "isVisible":true
+    },
+    {
+      "id": "skia-linux-fb",
+      "name": {
+        "text": "Desktop - Linux Framebuffer"
+      },
+      "description":
+      {
+        "text": "Enables the Skia/Linux Framebuffer platform support project"
+      },
+      "defaultValue": "false",
+      "isVisible":true
+    },
+    {
+      "id": "tests",
+      "name": {
+        "text": "Testing - Unit and UI Tests"
+      },
+      "description":
+      {
+        "text": "Includes projects for unit and UI tests"
+      },
+      "defaultValue": "true",
+      "isVisible":true
+    }
+  ]
+}
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/template.json b/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/template.json
index 9bc986b194..7629c833a8 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/template.json
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/template.json
@@ -10,95 +10,65 @@
     "macOS",
     "Linux",
     "WebAssembly",
+    "WinUI",
+    "WindowsAppSdk",
+    "Extensions",
     "dotnet-new"
   ],
   "name": "Multi-Platform App (Uno.Extensions)",
   "identity": "Uno.Extensions",
   "groupIdentity": "Uno.Extensions",
-  "description": "Template for creating a multi-platform C# & XAML application targeting WinUI, Android, iOS, macOS, WebAssembly, Skia/WPF and Skia/GTK for Linux.",
+  "description": "Solution template for creating a multi-platform C# & XAML application targeting Windows App SDK, Android, iOS, macOS, WebAssembly, Skia/WPF and Skia/GTK for Linux.",
   "precedence": "6001",
   "tags": {
     "language": "C#",
-    "type": "project"
+    "type": "solution"
   },
   "shortName": "unoapp-extensions",
   "sourceName": "MyExtensionsApp",
-  "defaultName": "UnoApp",
+  "defaultName": "UnoExtApp",
   "placeholderFilename": "template-ignore",
   "preferNameDirectory": true,
   "guids": [
-    "4C26868E-5E7C-458D-82E3-040509D0C71F", // Solution file (SLN)
-    "99E19497-29A6-4B77-B773-BEC55F9B55DC", // .NET Standard Library
-    "8D9F8CF0-E178-402D-8D40-A88B7B5F3D42", // Android
-    "91D74A40-E440-42AD-B51F-C2D641C49384", // iOS
-    "B445DF73-AC9E-4276-9FBA-7CB5AD5D2518",
-    "3EA9E612-E717-4E55-9034-DE653429FEFD", // WPF
+    "C7433AE2-B1A0-4C1A-887E-5CAA7AAF67A6", // Solution file (SolutionGuid)
+    "BACDD33A-304C-46C4-9B00-AC166978D7E0", // (core) .NET Standard Library
+    "6279C845-92F8-4333-AB99-3D213163593C", // UI
+    "339C569C-EE23-445E-B908-743673EE5BC9", // Platforms Solution folder
+    "24D56E12-2373-4CBD-9AD4-5C931D15FB0D", // Mobile
+    "40EA03F7-8A22-4143-B251-79BAC3EB13D2", // Wasm
+    "A5B8155A-118F-4794-B551-C6F3CF7E5411", // Skia.Gtk
+    "6C744695-DA38-44D9-B487-FE5804C5508D", // Skia.WPF
+    "5A78EE9A-1922-468C-96E3-45817727511C", // Windows
+    "925C7A3E-6532-4E27-8ABE-37A4F9B73C8B", // Skia.Linux.FrameBuffer
+    "7EF70027-9874-4112-A14F-33F02169CF8A", // Tests Solution folder
+    "EB3EB846-D5CB-4140-834F-1CC40A0FD6D0", // Tests
+    "7229D034-7DBE-4FD7-B0E4-38D617571F93", // UITests
+    "E2821155-50B7-468D-A15B-E0EAF55DAC2B", // WINDOWS - Package.appxmanifest Identity.Name
   ],
-  "symbols": {
-    "guid1": {
-      "type": "generated",
-      "generator": "guid",
-      "replaces": "$guid1$",
-      "parameters": {
-        "format": "N"
-      }
-    },
-    "guid2": {
-      "type": "generated",
-      "generator": "guid",
-      "replaces": "$guid2$",
-      "parameters": {
-        "format": "N"
-      }
-    },
-    "guid3": {
-      "type": "generated",
-      "generator": "guid",
-      "replaces": "$guid3$",
-      "parameters": {
-        "format": "N"
-      }
-    },
-    "guid4": {
-      "type": "generated",
-      "generator": "guid",
-      "replaces": "$guid4$",
-      "parameters": {
-        "format": "N"
-      }
-    },
-    "guid5": {
-      "type": "generated",
-      "generator": "guid",
-      "replaces": "$guid5$",
-      "parameters": {
-        "format": "N"
-      }
-    },
-    "windowsPublisherName": {
+  "symbols": { 
+    "wasm": {
       "type": "parameter",
-      "datatype": "text",
-      "replaces": "$XmlEscapedPublisherDistinguishedName$",
-      "description": "Provides the value to use for the Windows head publisher",
-      "defaultValue": "O=MyCompany"
+      "dataType": "bool",
+      "defaultValue": "true",
+      "description": "Enables the WebAssembly platform support project"
     },
-    "wasm": {
+    "ios": {
       "type": "parameter",
       "dataType": "bool",
       "defaultValue": "true",
-      "description": "Enables the WebAssembly (WASM) platform support project"
+      "description": "Enables the iOS platform in the Mobile support project"
     },
-    "mobile": {
+    "android": {
       "type": "parameter",
       "dataType": "bool",
       "defaultValue": "true",
-      "description": "Enables the mobile platform (iOS, Android, MacOS) support project"
+      "description": "Enables the Android platform in the Mobile support project"
     },
-    "skia-wpf": {
+    "winAppSdk": {
       "type": "parameter",
       "dataType": "bool",
       "defaultValue": "true",
-      "description": "Enables the Skia/WPF platform support project"
+      "description": "Enables the Windows App Sdk platform support project"
     },
     "skia-gtk": {
       "type": "parameter",
@@ -106,30 +76,86 @@
       "defaultValue": "true",
       "description": "Enables the Skia/GTK platform support project"
     },
+    "maccatalyst": {
+      "type": "parameter",
+      "dataType": "bool",
+      "defaultValue": "true",
+      "description": "Enables the macOS (Catalyst) platform in the Mobile support project"
+    },
+    "macos": {
+      "type": "parameter",
+      "dataType": "bool",
+      "defaultValue": "true",
+      "description": "Enables the macOS (AppKit) platform in the Mobile support project"
+    },
+    "skia-wpf": {
+      "type": "parameter",
+      "dataType": "bool",
+      "defaultValue": "true",
+      "description": "Enables the Skia/WPF platform support project"
+    },
+    "skia-linux-fb": {
+      "type": "parameter",
+      "dataType": "bool",
+      "defaultValue": "true",
+      "description": "Enables the Skia/Linux Framebuffer platform support project"
+    },
+    "tests": {
+      "type": "parameter",
+      "dataType": "bool",
+      "defaultValue": "true",
+      "description": "Includes unit and UI test projects"
+    },
+    "mobile": {
+      "type": "computed",
+      "dataType": "bool",
+      "value": "(android || ios || macos || maccatalyst)"
+    },
     "vscode": {
       "type": "parameter",
       "dataType": "bool",
       "defaultValue": "false",
-      "description": "Adds the Visual Studio Code Debugging support files"
+      "description": "Adds the Visual Studio Code Debugging support files for WebAssembly"
     },
     "skipRestore": {
       "type": "parameter",
       "datatype": "bool",
       "description": "If specified, skips the automatic restore of the project on create.",
       "defaultValue": "false"
+    },
+    "wasm-pwa-manifest": {
+      "type": "parameter",
+      "datatype": "bool",
+      "description": "Enables the generation of a PWA manifest for WebAssembly",
+      "defaultValue": "true"
     }
   },
   "primaryOutputs": [
+    {
+      "path": "MyExtensionsApp.sln"
+    },
     {
       "path": "MyExtensionsApp.UI\\MyExtensionsApp.UI.shproj"
     },
     {
       "path": "MyExtensionsApp\\MyExtensionsApp.csproj"
     },
+    {
+      "condition": "tests",
+      "path": "MyExtensionsApp.Tests\\MyExtensionsApp.Tests.csproj"
+    },
+    {
+      "condition": "tests",
+      "path": "MyExtensionsApp.UITests\\MyExtensionsApp.UITests.csproj"
+    },
     {
       "condition": "mobile",
       "path": "MyExtensionsApp.Mobile\\MyExtensionsApp.Mobile.csproj"
     },
+    {
+      "condition": "winAppSdk",
+      "path": "MyExtensionsApp.Windows\\MyExtensionsApp.Windows.csproj"
+    },
     {
       "condition": "wasm",
       "path": "MyExtensionsApp.Wasm\\MyExtensionsApp.Wasm.csproj"
@@ -141,6 +167,10 @@
     {
       "condition": "skia-wpf",
       "path": "MyExtensionsApp.Skia.WPF\\MyExtensionsApp.Skia.Wpf.csproj"
+    },
+    {
+      "condition": "skia-linux-fb",
+      "path": "MyExtensionsApp.Skia.Linux.FrameBuffer\\MyExtensionsApp.Skia.Linux.FrameBuffer.csproj"
     }
   ],
   "sources": [
@@ -155,6 +185,35 @@
             "**/*.ttf"
           ]
         },
+        {
+          "exclude": [
+            "MyExtensionsApp.Debugging.sln"
+          ]
+        },
+        {
+          "condition": "(!android)",
+          "exclude": [
+            "MyExtensionsApp.Mobile/Android/**/*"
+          ]
+        },
+        {
+          "condition": "(!ios)",
+          "exclude": [
+            "MyExtensionsApp.Mobile/iOS/**/*"
+          ]
+        },
+        {
+          "condition": "(!macos)",
+          "exclude": [
+            "MyExtensionsApp.Mobile/macOS/**/*"
+          ]
+        },
+        {
+          "condition": "(!maccatalyst)",
+          "exclude": [
+            "MyExtensionsApp.Mobile/MacCatalyst/**/*"
+          ]
+        },
         {
           "condition": "(!mobile)",
           "exclude": [
@@ -179,11 +238,37 @@
             "MyExtensionsApp.Skia.WPF/**/*"
           ]
         },
+        {
+          "condition": "(!skia-linux-fb)",
+          "exclude": [
+            "MyExtensionsApp.Skia.Linux.FrameBuffer/**/*"
+          ]
+        },
+        {
+          "condition": "(!winAppSdk)",
+          "exclude": [
+            "MyExtensionsApp.Windows/**/*"
+          ]
+        },
+        {
+          "condition": "(!tests)",
+          "exclude": [
+            "MyExtensionsApp.Tests/**/*",
+            "MyExtensionsApp.UITests/**/*"
+          ]
+        },
         {
           "condition": "(!vscode)",
           "exclude": [
             ".vscode/**/*"
           ]
+        },
+        {
+        "condition": "(!wasm-pwa-manifest)",
+        "exclude": [
+          "MyExtensionsApp.Wasm/manifest.json",
+          "MyExtensionsApp.Wasm/Assets/AppIcon-*"
+        ]
         }
       ]
     }
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/vs-2017.3.host.json b/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/vs-2017.3.host.json
deleted file mode 100644
index cde987cfb8..0000000000
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/vs-2017.3.host.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/vs-2017.3.host",
-  "name": {
-    "text": "Cross-Platform App"
-  },
-  "description": {
-    "text": "Solution template for creating a cross-platform XAML app with the Uno Platform that targets UWP, Android, iOS, macOS, WebAssembly, Skia/Tizen, Skia/WPF and Skia/GTK for Linux."
-  },
-  "order": 610,
-  "icon": "uno-logo.png",
-  "learnMoreLink": "https://github.com/unoplatform/uno",
-  "uiFilters": [
-    "oneaspnet"
-  ],
-  "unsupportedHosts": [
-    {
-      "id": "vs"
-    }
-  ],
-  "additionalWizardParameters": {
-    "$isMultiProjectTemplate$": "true"
-  },
-  "symbolInfo": [
-    {
-      "id": "WebAssembly",
-      "name": {
-        "text": "Add support for WebAssembly"
-      },
-      "isVisible": "true"
-    },
-    {
-      "id": "iOS",
-      "name": {
-        "text": "Add support for iOS"
-      },
-      "isVisible": "true"
-    },
-    {
-      "id": "Android",
-      "name": {
-        "text": "Add support for Android"
-      },
-      "isVisible": "true"
-    },
-    {
-      "id": "macOS",
-      "name": {
-        "text": "Add support for macOS"
-      },
-      "isVisible": "true"
-    },
-    {
-      "id": "skia-gtk",
-      "name": {
-        "text": "Add support for Skia/GTK (Linux, macOS, Windows 7/10)"
-      },
-      "isVisible": "true"
-    },
-    {
-      "id": "skia-wpf",
-      "name": {
-        "text": "Add support for Skia/WPF (Windows 7/10)"
-      },
-      "isVisible": "true"
-    },
-    {
-      "id": "skia-linux-fb",
-      "name": {
-        "text": "Add support for Skia/Linux FrameBuffer"
-      },
-      "isVisible": "true"
-    },
-    {
-      "id": "vscodeWasm",
-      "name": {
-        "text": "Adds the Visual Studio Code Debugging support files for WebAssembly"
-      },
-      "isVisible": "false"
-    },
-    {
-      "id": "windowsPublisherName",
-      "name": {
-        "text": "Provides the value to use for the Windows head publisher"
-      },
-      "isVisible": "true"
-    }
-  ]
-}
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/.vscode/settings.json b/src/Uno.Extensions.Templates/content/unoapp-extensions/.vscode/settings.json
new file mode 100644
index 0000000000..f58161fffa
--- /dev/null
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+  "explorer.fileNesting.enabled": true,
+  "explorer.fileNesting.expand": false,
+  "explorer.fileNesting.patterns": {
+	  "*.xaml": "$(capture).xaml.cs"
+  }
+}
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props b/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props
index 975b487c95..7ba4c8fbbd 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props
@@ -36,21 +36,21 @@
     <PackageVersion Include="Uno.Extensions.Serialization" Version="255.255.255.255" />
     <PackageVersion Include="Uno.Extensions.Serialization.Http" Version="255.255.255.255" />
     <PackageVersion Include="Uno.Extensions.Serialization.Refit" Version="255.255.255.255" />
-    <PackageVersion Include="Uno.Material.WinUI" Version="2.3.0" />
-    <PackageVersion Include="Uno.Toolkit.WinUI" Version="2.4.0-dev.85" />
-    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version=" 2.4.0-dev.85" />
-    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.0-dev.947" />
+    <PackageVersion Include="Uno.Material.WinUI" Version="2.4.0-dev.42" />
+    <PackageVersion Include="Uno.Toolkit.WinUI" Version="2.4.0-dev.99" />
+    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version=" 2.4.0-dev.99" />
+    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.0-dev.962" />
     <PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.32" />
     <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
     <PackageVersion Include="Uno.Wasm.Bootstrap" Version="3.3.1" />
     <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="3.3.1" />
-    <PackageVersion Include="Uno.WinUI" Version="4.6.0-dev.947" />
-    <PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.6.0-dev.947" />
-    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.6.0-dev.947" />
-    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.6.0-dev.947" />
-    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="4.6.0-dev.947" />
-    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.6.0-dev.947" />
+    <PackageVersion Include="Uno.WinUI" Version="4.6.0-dev.962" />
+    <PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.6.0-dev.962" />
+    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.6.0-dev.962" />
+    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.6.0-dev.962" />
+    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="4.6.0-dev.962" />
+    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.6.0-dev.962" />
     <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
     <PackageVersion Include="Xamarin.UITest" Version="3.2.6" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp-vsmac.slnf b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp-vsmac.slnf
index b52f21dcda..ec32017307 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp-vsmac.slnf
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp-vsmac.slnf
@@ -2,10 +2,16 @@
   "solution": {
     "path": "MyExtensionsApp.sln",
     "projects": [
+#//#if (mobile)
       "MyExtensionsApp.Mobile\\MyExtensionsApp.Mobile.csproj",
+#//#endif
+#//#if (skia-gtk)
       "MyExtensionsApp.Skia.Gtk\\MyExtensionsApp.Skia.Gtk.csproj",
-      "MyExtensionsApp.UI\\MyExtensionsApp.UI.shproj",
+#//#endif
+#//#if (wasm)
       "MyExtensionsApp.Wasm\\MyExtensionsApp.Wasm.csproj",
+#//#endif
+      "MyExtensionsApp.UI\\MyExtensionsApp.UI.shproj",
       "MyExtensionsApp\\MyExtensionsApp.csproj"
     ]
   }
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Debugging.sln b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Debugging.sln
new file mode 100644
index 0000000000..3723a3583f
--- /dev/null
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Debugging.sln
@@ -0,0 +1,366 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32210.308
+MinimumVisualStudioVersion = 15.0.26124.0
+
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MyExtensionsApp.UI", "MyExtensionsApp.UI\MyExtensionsApp.UI.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}"
+EndProject
+
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Mobile", "MyExtensionsApp.Mobile\MyExtensionsApp.Mobile.csproj", "{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Wasm", "MyExtensionsApp.Wasm\MyExtensionsApp.Wasm.csproj", "{40EA03F7-8A22-4143-B251-79BAC3EB13D2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Skia.Gtk", "MyExtensionsApp.Skia.Gtk\MyExtensionsApp.Skia.Gtk.csproj", "{A5B8155A-118F-4794-B551-C6F3CF7E5411}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Skia.WPF", "MyExtensionsApp.Skia.WPF\MyExtensionsApp.Skia.WPF.csproj", "{6C744695-DA38-44D9-B487-FE5804C5508D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp", "MyExtensionsApp\MyExtensionsApp.csproj", "{BACDD33A-304C-46C4-9B00-AC166978D7E0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Tests", "MyExtensionsApp.Tests\MyExtensionsApp.Tests.csproj", "{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.UITests", "MyExtensionsApp.UITests\MyExtensionsApp.UITests.csproj", "{7229D034-7DBE-4FD7-B0E4-38D617571F93}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{339C569C-EE23-445E-B908-743673EE5BC9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{7EF70027-9874-4112-A14F-33F02169CF8A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BADA71DC-7FFD-4EDC-9F28-FB74AEADC713}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+		Directory.Packages.props = Directory.Packages.props
+		global.json = global.json
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Windows", "MyExtensionsApp.Windows\MyExtensionsApp.Windows.csproj", "{5A78EE9A-1922-468C-96E3-45817727511C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Skia.Linux.FrameBuffer", "MyExtensionsApp.Skia.Linux.FrameBuffer\MyExtensionsApp.Skia.Linux.FrameBuffer.csproj", "{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
+		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
+		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|ARM.Build.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|ARM64.Deploy.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|iPhone.Deploy.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|x64.Build.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|x86.Build.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|ARM.Build.0 = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|ARM.Deploy.0 = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|ARM64.Build.0 = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|ARM64.Deploy.0 = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|iPhone.Build.0 = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|iPhone.Deploy.0 = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|x64.ActiveCfg = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|x64.Build.0 = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|x64.Deploy.0 = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|x86.ActiveCfg = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|x86.Build.0 = Release|Any CPU
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|x86.Deploy.0 = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|ARM.Build.0 = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|x64.Build.0 = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|x86.Build.0 = Debug|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|ARM.ActiveCfg = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|ARM.Build.0 = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|ARM64.Build.0 = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|iPhone.Build.0 = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x64.ActiveCfg = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x64.Build.0 = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x86.ActiveCfg = Release|Any CPU
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x86.Build.0 = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|ARM.Build.0 = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|x64.Build.0 = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|x86.Build.0 = Debug|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|ARM.Build.0 = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|ARM64.Build.0 = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|iPhone.Build.0 = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|x64.ActiveCfg = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|x64.Build.0 = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|x86.ActiveCfg = Release|Any CPU
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|x86.Build.0 = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|ARM64.Deploy.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|iPhone.Deploy.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|x64.Build.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|x86.Build.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|ARM.Build.0 = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|ARM.Deploy.0 = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|ARM64.Build.0 = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|ARM64.Deploy.0 = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|iPhone.Build.0 = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|x64.ActiveCfg = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|x64.Build.0 = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|x64.Deploy.0 = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|x86.ActiveCfg = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|x86.Build.0 = Release|Any CPU
+		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|x86.Deploy.0 = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|ARM.Build.0 = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|x64.Build.0 = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|x86.Build.0 = Debug|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|ARM.ActiveCfg = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|ARM.Build.0 = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|ARM64.Build.0 = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|iPhone.Build.0 = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|x64.ActiveCfg = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|x64.Build.0 = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|x86.ActiveCfg = Release|Any CPU
+		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|x86.Build.0 = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|ARM.Build.0 = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|x64.Build.0 = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|x86.Build.0 = Debug|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|ARM.ActiveCfg = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|ARM.Build.0 = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|ARM64.Build.0 = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|iPhone.Build.0 = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|x64.ActiveCfg = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|x64.Build.0 = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|x86.ActiveCfg = Release|Any CPU
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|x86.Build.0 = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|ARM.Build.0 = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|x64.Build.0 = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|x86.Build.0 = Debug|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|ARM.ActiveCfg = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|ARM.Build.0 = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|ARM64.Build.0 = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|iPhone.Build.0 = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|x64.ActiveCfg = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|x64.Build.0 = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|x86.ActiveCfg = Release|Any CPU
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|x86.Build.0 = Release|Any CPU
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|Any CPU.Build.0 = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|Any CPU.Deploy.0 = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|ARM.ActiveCfg = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|ARM.Build.0 = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|ARM.Deploy.0 = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|ARM64.ActiveCfg = Debug|arm64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|ARM64.Build.0 = Debug|arm64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|ARM64.Deploy.0 = Debug|arm64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|iPhone.ActiveCfg = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|iPhone.Build.0 = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|iPhone.Deploy.0 = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|iPhoneSimulator.Build.0 = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|iPhoneSimulator.Deploy.0 = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|x64.ActiveCfg = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|x64.Build.0 = Debug|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|x86.ActiveCfg = Debug|x86
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|x86.Build.0 = Debug|x86
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|Any CPU.ActiveCfg = Release|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|Any CPU.Build.0 = Release|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|Any CPU.Deploy.0 = Release|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|ARM.ActiveCfg = Release|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|ARM.Build.0 = Release|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|ARM64.ActiveCfg = Release|arm64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|ARM64.Build.0 = Release|arm64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|iPhone.ActiveCfg = Release|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|iPhone.Build.0 = Release|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|iPhoneSimulator.ActiveCfg = Release|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|iPhoneSimulator.Build.0 = Release|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|x64.ActiveCfg = Release|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|x64.Build.0 = Release|x64
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|x86.ActiveCfg = Release|x86
+		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|x86.Build.0 = Release|x86
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|ARM.Build.0 = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|x64.Build.0 = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|x86.Build.0 = Debug|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|ARM.ActiveCfg = Release|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|ARM.Build.0 = Release|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|ARM64.Build.0 = Release|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|iPhone.Build.0 = Release|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|x64.ActiveCfg = Release|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|x64.Build.0 = Release|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|x86.ActiveCfg = Release|Any CPU
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D} = {339C569C-EE23-445E-B908-743673EE5BC9}
+		{40EA03F7-8A22-4143-B251-79BAC3EB13D2} = {339C569C-EE23-445E-B908-743673EE5BC9}
+		{A5B8155A-118F-4794-B551-C6F3CF7E5411} = {339C569C-EE23-445E-B908-743673EE5BC9}
+		{6C744695-DA38-44D9-B487-FE5804C5508D} = {339C569C-EE23-445E-B908-743673EE5BC9}
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0} = {7EF70027-9874-4112-A14F-33F02169CF8A}
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93} = {7EF70027-9874-4112-A14F-33F02169CF8A}
+		{5A78EE9A-1922-468C-96E3-45817727511C} = {339C569C-EE23-445E-B908-743673EE5BC9}
+		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B} = {339C569C-EE23-445E-B908-743673EE5BC9}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C7433AE2-B1A0-4C1A-887E-5CAA7AAF67A6}
+	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{24d56e12-2373-4cbd-9ad4-5c931d15fb0d}*SharedItemsImports = 5
+		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{40ea03f7-8a22-4143-b251-79bac3eb13d2}*SharedItemsImports = 5
+		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{5a78ee9a-1922-468c-96e3-45817727511c}*SharedItemsImports = 5
+		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13
+		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{6c744695-da38-44d9-b487-fe5804c5508d}*SharedItemsImports = 5
+		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{925c7a3e-6532-4e27-8abe-37a4f9b73c8b}*SharedItemsImports = 5
+		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{a5b8155a-118f-4794-b551-c6f3cf7e5411}*SharedItemsImports = 5
+	EndGlobalSection
+EndGlobal
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Mobile/MyExtensionsApp.Mobile.csproj b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Mobile/MyExtensionsApp.Mobile.csproj
index a15e3ba93a..175590ee32 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Mobile/MyExtensionsApp.Mobile.csproj
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Mobile/MyExtensionsApp.Mobile.csproj
@@ -1,9 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst;net6.0-macos</TargetFrameworks>
+<!--#if (android)
+<TargetFrameworks>$(TargetFrameworks);net6.0-android</TargetFrameworks>
+#endif -->
+<!--#if (ios)
+<TargetFrameworks>$(TargetFrameworks);net6.0-ios</TargetFrameworks>
+#endif -->
+<!--#if (macos)
+<TargetFrameworks>$(TargetFrameworks);net6.0-macos</TargetFrameworks>
+#endif -->
+<!--#if (maccatalyst)
+<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
+#endif -->
 		<SingleProject>true</SingleProject>
 		<OutputType>Exe</OutputType>
-		<DefineConstants>$(DefinedConstants);WINUI</DefineConstants>
 		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-ios'">iossimulator-x64</RuntimeIdentifier>
 		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
 		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-macos'">osx-x64</RuntimeIdentifier>
@@ -89,9 +99,6 @@
 	<ItemGroup>
 		<ProjectReference Include="..\MyExtensionsApp\MyExtensionsApp.csproj" />
 	</ItemGroup>
-	<ItemGroup>
-	  <Folder Include="Android\Resources\values\NewFolder\" />
-	</ItemGroup>
 
 	<Import Project="..\MyExtensionsApp.UI\MyExtensionsApp.UI.projitems" Label="Shared" />
 </Project>
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/MyExtensionsApp.Skia.Gtk.csproj b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/MyExtensionsApp.Skia.Gtk.csproj
index d85c04178c..c62837ebc0 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/MyExtensionsApp.Skia.Gtk.csproj
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/MyExtensionsApp.Skia.Gtk.csproj
@@ -4,7 +4,6 @@
 		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
 		<TargetFramework>net6.0</TargetFramework>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
-		<DefineConstants>$(DefinedConstants);WINUI</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup Condition="exists('..\MyExtensionsApp.Windows')">
 		<EmbeddedResource Include="..\MyExtensionsApp.Windows\Package.appxmanifest" LogicalName="Package.appxmanifest" />
@@ -16,15 +15,12 @@
 
 	<ItemGroup>
 		<Content Include="Assets\Fonts\uno-fluentui-assets.ttf" />
-		<Content Include="Assets\Fonts\Roboto-Light.ttf" />
-		<Content Include="Assets\Fonts\Roboto-Medium.ttf" />
-		<Content Include="Assets\Fonts\Roboto-Regular.ttf" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Uno.WinUI.Skia.Gtk"  />
-		<PackageReference Include="Uno.WinUI.RemoteControl"  Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="SkiaSharp.Views.Uno.WinUI"  />
-		<PackageReference Include="SkiaSharp.Skottie"  />
+		<PackageReference Include="Uno.WinUI.Skia.Gtk" />
+		<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="SkiaSharp.Views.Uno.WinUI" />
+		<PackageReference Include="SkiaSharp.Skottie" />
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
 		<PackageReference Include="Uno.Material.WinUI" />
 		<PackageReference Include="Uno.Toolkit.WinUI.Material" />
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/app.manifest b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/app.manifest
index 4628eb0c18..afa26b5e14 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/app.manifest
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="$ext_safeprojectname$.Gtk"/>
+  <assemblyIdentity version="1.0.0.0" name="MyExtensionsApp.Gtk"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Linux.FrameBuffer/MyExtensionsApp.Skia.Linux.FrameBuffer.csproj b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Linux.FrameBuffer/MyExtensionsApp.Skia.Linux.FrameBuffer.csproj
index 44728e8cbd..b470d93690 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Linux.FrameBuffer/MyExtensionsApp.Skia.Linux.FrameBuffer.csproj
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Linux.FrameBuffer/MyExtensionsApp.Skia.Linux.FrameBuffer.csproj
@@ -3,7 +3,6 @@
 		<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
 		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
 		<TargetFramework>net6.0</TargetFramework>
-		<DefineConstants>$(DefinedConstants);WINUI</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup Condition="exists('..\MyExtensionsApp.Windows')">
 		<EmbeddedResource Include="..\MyExtensionsApp.Windows\Package.appxmanifest" LogicalName="Package.appxmanifest" />
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/App.config b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/App.config
deleted file mode 100644
index 20939707c8..0000000000
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
-</configuration>
\ No newline at end of file
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Light.ttf b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Light.ttf
deleted file mode 100644
index 0e977514ff..0000000000
Binary files a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Light.ttf and /dev/null differ
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Medium.ttf b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Medium.ttf
deleted file mode 100644
index e89b0b79a2..0000000000
Binary files a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Medium.ttf and /dev/null differ
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Regular.ttf b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Regular.ttf
deleted file mode 100644
index 3d6861b423..0000000000
Binary files a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Regular.ttf and /dev/null differ
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/MyExtensionsApp.Skia.WPF.csproj b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/MyExtensionsApp.Skia.WPF.csproj
index 14783260ec..81532e1ed2 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/MyExtensionsApp.Skia.WPF.csproj
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/MyExtensionsApp.Skia.WPF.csproj
@@ -4,10 +4,18 @@
 		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
 		<TargetFramework>net6.0-windows</TargetFramework>
 		<UseWPF>true</UseWPF>
-		<ApplicationManifest>app.manifest</ApplicationManifest>
-		<DefineConstants>$(DefinedConstants);WINUI</DefineConstants>
 	</PropertyGroup>
-
+	<ItemGroup Label="AssemblyInfo">
+		<AssemblyAttribute Include="System.Runtime.InteropServices.ComVisibleAttribute">
+			<_Parameter1>false</_Parameter1>
+		</AssemblyAttribute>
+		<AssemblyAttribute Include="System.Windows.ThemeInfo">
+			<_Parameter1>System.Windows.ResourceDictionaryLocation.None</_Parameter1>
+			<_Parameter1_IsLiteral>true</_Parameter1_IsLiteral>
+			<_Parameter2>System.Windows.ResourceDictionaryLocation.SourceAssembly</_Parameter2>
+			<_Parameter2_IsLiteral>true</_Parameter2_IsLiteral>
+		</AssemblyAttribute>
+	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Uno.WinUI.Skia.Wpf" />
 		<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
@@ -46,9 +54,6 @@
 	<Import Project="..\MyExtensionsApp.UI\MyExtensionsApp.UI.projitems" Label="Shared" />
 
 	<ItemGroup>
-		<Content Include="Assets\Fonts\Material\Roboto-Light.ttf" />
-		<Content Include="Assets\Fonts\Material\Roboto-Medium.ttf" />
-		<Content Include="Assets\Fonts\Material\Roboto-Regular.ttf" />
 		<Content Include="Assets\Fonts\uno-fluentui-assets.ttf" />
 	</ItemGroup>
 </Project>
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/AssemblyInfo.cs b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/AssemblyInfo.cs
deleted file mode 100644
index a58ef709d6..0000000000
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-	ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-									 //(used if a resource is not found in the page,
-									 // or application resource dictionaries)
-	ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-											  //(used if a resource is not found in the page,
-											  // app, or any theme specific resource dictionaries)
-)]
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/Resources.Designer.cs b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/Resources.Designer.cs
deleted file mode 100644
index 2b756ec823..0000000000
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace MyExtensionsApp.WPF.Properties
-{
-
-
-	/// <summary>
-	///   A strongly-typed resource class, for looking up localized strings, etc.
-	/// </summary>
-	// This class was auto-generated by the StronglyTypedResourceBuilder
-	// class via a tool like ResGen or Visual Studio.
-	// To add or remove a member, edit your .ResX file then rerun ResGen
-	// with the /str option, or rebuild your VS project.
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-	[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-	internal class Resources
-	{
-
-		private static global::System.Resources.ResourceManager resourceMan;
-
-		private static global::System.Globalization.CultureInfo resourceCulture;
-
-		[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-		internal Resources()
-		{
-		}
-
-		/// <summary>
-		///   Returns the cached ResourceManager instance used by this class.
-		/// </summary>
-		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-		internal static global::System.Resources.ResourceManager ResourceManager
-		{
-			get
-			{
-				if ((resourceMan == null))
-				{
-					global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MyExtensionsApp.WPF.Properties.Resources", typeof(Resources).Assembly);
-					resourceMan = temp;
-				}
-				return resourceMan;
-			}
-		}
-
-		/// <summary>
-		///   Overrides the current thread's CurrentUICulture property for all
-		///   resource lookups using this strongly typed resource class.
-		/// </summary>
-		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-		internal static global::System.Globalization.CultureInfo Culture
-		{
-			get
-			{
-				return resourceCulture;
-			}
-			set
-			{
-				resourceCulture = value;
-			}
-		}
-	}
-}
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/Resources.resx b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/Resources.resx
deleted file mode 100644
index af7dbebbac..0000000000
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/Settings.Designer.cs b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/Settings.Designer.cs
deleted file mode 100644
index 51c4e9ee0d..0000000000
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace MyExtensionsApp.WPF.Properties
-{
-
-
-	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-	internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-	{
-
-		private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-		public static Settings Default
-		{
-			get
-			{
-				return defaultInstance;
-			}
-		}
-	}
-}
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/Settings.settings b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/Settings.settings
deleted file mode 100644
index 033d7a5e9e..0000000000
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
\ No newline at end of file
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/app.manifest b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/app.manifest
deleted file mode 100644
index 0b2e717e99..0000000000
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/app.manifest
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="$ext_safeprojectname$.WPF.Host"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-             If you want to change the Windows User Account Control level replace the 
-             requestedExecutionLevel node with one of the following.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
-            Remove this element if your application requires this virtualization for backwards
-            compatibility.
-        -->
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- A list of the Windows versions that this application has been tested on
-           and is designed to work with. Uncomment the appropriate elements
-           and Windows will automatically select the most compatible environment. -->
-
-      <!-- Windows Vista -->
-      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
-
-      <!-- Windows 7 -->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
-
-      <!-- Windows 8 -->
-      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
-
-      <!-- Windows 8.1 -->
-      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
-
-      <!-- Windows 10 -->
-      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
-
-    </application>
-  </compatibility>
-
-  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
-       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
-       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
-       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
-  
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-    </windowsSettings>
-  </application>
-  
-
-  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
-  <!--
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="*"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
-    </dependentAssembly>
-  </dependency>
-  -->
-
-</assembly>
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Tests/MyExtensionsApp.Tests.csproj b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Tests/MyExtensionsApp.Tests.csproj
index f33a4bac56..b82f45f4c6 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Tests/MyExtensionsApp.Tests.csproj
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Tests/MyExtensionsApp.Tests.csproj
@@ -3,7 +3,6 @@
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
 		<IsPackable>false</IsPackable>
-		<IsTestProject>true</IsTestProject>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/Assets/Fonts/Roboto-Light.ttf b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/Assets/Fonts/Material/Roboto-Light.ttf
similarity index 100%
rename from src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/Assets/Fonts/Roboto-Light.ttf
rename to src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/Assets/Fonts/Material/Roboto-Light.ttf
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/Assets/Fonts/Roboto-Medium.ttf b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/Assets/Fonts/Material/Roboto-Medium.ttf
similarity index 100%
rename from src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/Assets/Fonts/Roboto-Medium.ttf
rename to src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/Assets/Fonts/Material/Roboto-Medium.ttf
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/Assets/Fonts/Roboto-Regular.ttf b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/Assets/Fonts/Material/Roboto-Regular.ttf
similarity index 100%
rename from src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/Assets/Fonts/Roboto-Regular.ttf
rename to src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/Assets/Fonts/Material/Roboto-Regular.ttf
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/MyExtensionsApp.UI.projitems b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/MyExtensionsApp.UI.projitems
index 9cc3d01d47..b252036370 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/MyExtensionsApp.UI.projitems
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/MyExtensionsApp.UI.projitems
@@ -34,6 +34,18 @@
 		 explicitly included in the projitem, so files can be added from vscode
 		 without manipulating the projitem file.
 	-->
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Fonts\Material\Roboto-Light.ttf">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Fonts\Material\Roboto-Medium.ttf">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Fonts\Material\Roboto-Regular.ttf">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
     <Page Include="$(MSBuildThisFileDirectory)Views\Shell.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/MyExtensionsApp.UI.shproj b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/MyExtensionsApp.UI.shproj
index 7ca6715bb3..876f28c0e5 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/MyExtensionsApp.UI.shproj
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/MyExtensionsApp.UI.shproj
@@ -10,4 +10,9 @@
   <PropertyGroup />
   <Import Project="MyExtensionsApp.UI.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
+  <ItemGroup>
+    <_Globbed_Content Remove="Assets\Fonts\Material\Roboto-Light.ttf" />
+    <_Globbed_Content Remove="Assets\Fonts\Material\Roboto-Medium.ttf" />
+    <_Globbed_Content Remove="Assets\Fonts\Material\Roboto-Regular.ttf" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/Strings/en/Resources.resw b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/Strings/en/Resources.resw
index 366322d45b..00aca7587d 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/Strings/en/Resources.resw
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/Strings/en/Resources.resw
@@ -118,6 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="ApplicationName" xml:space="preserve">
-    <value>$ext_safeprojectname$</value>
+    <value>MyExtensionsApp</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UITests/Constants.cs b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UITests/Constants.cs
index 50836a361a..fc85ef4214 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UITests/Constants.cs
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UITests/Constants.cs
@@ -4,7 +4,7 @@ namespace MyExtensionsApp.UITests;
 
 public class Constants
 {
-	public readonly static string WebAssemblyDefaultUri = "https://localhost:58524/";
+	public readonly static string WebAssemblyDefaultUri = "http://localhost:5000/";
 	public readonly static string iOSAppName = "com.example.app";
 	public readonly static string AndroidAppName = "com.example.app";
 	public readonly static string iOSDeviceNameOrId = "iPad Pro (12.9-inch) (3rd generation)";
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UITests/Given_MainPage.cs b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UITests/Given_MainPage.cs
index e3a37370b6..a2e8d27fc4 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UITests/Given_MainPage.cs
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UITests/Given_MainPage.cs
@@ -8,6 +8,12 @@ public class Given_MainPage : TestBase
 	[Test]
 	public void When_SmokeTest()
 	{
+		// NOTICE
+		// To run UITests, Run the WASM target without debugger. Note
+		// the port that is being used and update the Contants.cs file
+		// in the UITests project with the correct port number.
+
+
 		// Query for the SecondPageButton and then tap it
 		Query xamlButton = q => q.All().Marked("SecondPageButton");
 		App.WaitForElement(xamlButton);
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UITests/MyExtensionsApp.UITests.csproj b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UITests/MyExtensionsApp.UITests.csproj
index ac7bd2ff74..3be1bf0491 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UITests/MyExtensionsApp.UITests.csproj
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UITests/MyExtensionsApp.UITests.csproj
@@ -2,7 +2,6 @@
 
 	<PropertyGroup>
 		<TargetFramework>net48</TargetFramework>
-		<IsTestProject>true</IsTestProject>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-128.png b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-128.png
new file mode 100644
index 0000000000..5757c31d27
Binary files /dev/null and b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-128.png differ
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-16.png b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-16.png
new file mode 100644
index 0000000000..17d637b23c
Binary files /dev/null and b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-16.png differ
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-256.png b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-256.png
new file mode 100644
index 0000000000..dcaaf7fad7
Binary files /dev/null and b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-256.png differ
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-32.png b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-32.png
new file mode 100644
index 0000000000..c02a2268a0
Binary files /dev/null and b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-32.png differ
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-512.png b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-512.png
new file mode 100644
index 0000000000..a90995087d
Binary files /dev/null and b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Assets/AppIcon-512.png differ
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/MyExtensionsApp.Wasm.csproj b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/MyExtensionsApp.Wasm.csproj
index 990f7d5ea1..b3cc62209d 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/MyExtensionsApp.Wasm.csproj
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/MyExtensionsApp.Wasm.csproj
@@ -3,7 +3,7 @@
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net6.0</TargetFramework>
 		<NoWarn>$(NoWarn);NU1504;NU1505;NU1701</NoWarn>
-		<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
+		<!-- Disabled due to issue with Central Package Management with implicit using -->
 		<ImplicitUsings>disable</ImplicitUsings>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)'=='Debug'">
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Properties/launchSettings.json b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Properties/launchSettings.json
new file mode 100644
index 0000000000..d071463d3e
--- /dev/null
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/Properties/launchSettings.json
@@ -0,0 +1,30 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:8080",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "MyExtensionsApp.Wasm": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:5000",
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/manifest.json b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/manifest.json
new file mode 100644
index 0000000000..f183b1614d
--- /dev/null
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/manifest.json
@@ -0,0 +1,37 @@
+{
+  "background_color": "#ffffff",
+  "description": "MyExtensionsApp",
+  "display": "standalone",
+  "icons": [
+    {
+      "src": "Assets/AppIcon-16.png",
+      "sizes": "16x16",
+      "type": "image/png"
+    },
+    {
+      "src": "Assets/AppIcon-32.png",
+      "sizes": "32x32",
+      "type": "image/png"
+    },
+    {
+      "src": "Assets/AppIcon-128.png",
+      "sizes": "128x128",
+      "type": "image/png"
+    },
+    {
+      "src": "Assets/AppIcon-256.png",
+      "sizes": "256x256",
+      "type": "image/png"
+    },
+    {
+      "src": "Assets/AppIcon-512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "name": "MyExtensionsApp",
+  "short_name": "MyExtensionsApp",
+  "start_url": "/index.html",
+  "theme_color": "#ffffff",
+  "scope": "/"
+}
\ No newline at end of file
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Light.ttf b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Light.ttf
deleted file mode 100644
index 0e977514ff..0000000000
Binary files a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Light.ttf and /dev/null differ
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Medium.ttf b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Medium.ttf
deleted file mode 100644
index e89b0b79a2..0000000000
Binary files a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Medium.ttf and /dev/null differ
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Regular.ttf b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Regular.ttf
deleted file mode 100644
index 3d6861b423..0000000000
Binary files a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Regular.ttf and /dev/null differ
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Windows/MyExtensionsApp.Windows.csproj b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Windows/MyExtensionsApp.Windows.csproj
index 3a8903d0a2..5debce38a0 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Windows/MyExtensionsApp.Windows.csproj
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.Windows/MyExtensionsApp.Windows.csproj
@@ -9,7 +9,7 @@
 		<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
 		<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
 		<UseWinUI>true</UseWinUI>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+		<EnableMsixTooling>true</EnableMsixTooling>
 	</PropertyGroup>
 
 	<PropertyGroup>
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.sln b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.sln
index da84fe7d9e..fc5a4e7d9c 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.sln
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.sln
@@ -2,26 +2,54 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32210.308
 MinimumVisualStudioVersion = 15.0.26124.0
+
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp", "MyExtensionsApp\MyExtensionsApp.csproj", "{BACDD33A-304C-46C4-9B00-AC166978D7E0}"
+EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MyExtensionsApp.UI", "MyExtensionsApp.UI\MyExtensionsApp.UI.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}"
 EndProject
+
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{339C569C-EE23-445E-B908-743673EE5BC9}"
+EndProject
+
+#//#if (mobile)
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Mobile", "MyExtensionsApp.Mobile\MyExtensionsApp.Mobile.csproj", "{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}"
 EndProject
+#//#endif
+
+#//#if (wasm)
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Wasm", "MyExtensionsApp.Wasm\MyExtensionsApp.Wasm.csproj", "{40EA03F7-8A22-4143-B251-79BAC3EB13D2}"
 EndProject
+#//#endif
+
+#//#if (skia-gtk)
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Skia.Gtk", "MyExtensionsApp.Skia.Gtk\MyExtensionsApp.Skia.Gtk.csproj", "{A5B8155A-118F-4794-B551-C6F3CF7E5411}"
 EndProject
+#//#endif
+
+#//#if (skia-wpf)
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Skia.WPF", "MyExtensionsApp.Skia.WPF\MyExtensionsApp.Skia.WPF.csproj", "{6C744695-DA38-44D9-B487-FE5804C5508D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp", "MyExtensionsApp\MyExtensionsApp.csproj", "{BACDD33A-304C-46C4-9B00-AC166978D7E0}"
-EndProject
+#//#endif
+
+#//#if (tests)
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Tests", "MyExtensionsApp.Tests\MyExtensionsApp.Tests.csproj", "{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.UITests", "MyExtensionsApp.UITests\MyExtensionsApp.UITests.csproj", "{7229D034-7DBE-4FD7-B0E4-38D617571F93}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{339C569C-EE23-445E-B908-743673EE5BC9}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{7EF70027-9874-4112-A14F-33F02169CF8A}"
 EndProject
+#//#endif
+
+#//#if (winAppSdk)
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Windows", "MyExtensionsApp.Windows\MyExtensionsApp.Windows.csproj", "{5A78EE9A-1922-468C-96E3-45817727511C}"
+EndProject
+#//#endif
+
+#//#if (skia-linux-fb)
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Skia.Linux.FrameBuffer", "MyExtensionsApp.Skia.Linux.FrameBuffer\MyExtensionsApp.Skia.Linux.FrameBuffer.csproj", "{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}"
+EndProject
+#//#endif
+
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BADA71DC-7FFD-4EDC-9F28-FB74AEADC713}"
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
@@ -30,10 +58,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Windows", "MyExtensionsApp.Windows\MyExtensionsApp.Windows.csproj", "{5A78EE9A-1922-468C-96E3-45817727511C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyExtensionsApp.Skia.Linux.FrameBuffer", "MyExtensionsApp.Skia.Linux.FrameBuffer\MyExtensionsApp.Skia.Linux.FrameBuffer.csproj", "{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -52,6 +76,7 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+#//#if (mobile)
 		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -94,6 +119,9 @@ Global
 		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|x86.ActiveCfg = Release|Any CPU
 		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|x86.Build.0 = Release|Any CPU
 		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D}.Release|x86.Deploy.0 = Release|Any CPU
+#//#endif
+
+#//#if (wasm)
 		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -122,6 +150,9 @@ Global
 		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x64.Build.0 = Release|Any CPU
 		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x86.ActiveCfg = Release|Any CPU
 		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x86.Build.0 = Release|Any CPU
+#//#endif
+
+#//#if (skia-gtk)
 		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -150,6 +181,9 @@ Global
 		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|x64.Build.0 = Release|Any CPU
 		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|x86.ActiveCfg = Release|Any CPU
 		{A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|x86.Build.0 = Release|Any CPU
+#//#endif
+
+#//#if (skia-wpf)
 		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6C744695-DA38-44D9-B487-FE5804C5508D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -189,6 +223,8 @@ Global
 		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|x86.ActiveCfg = Release|Any CPU
 		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|x86.Build.0 = Release|Any CPU
 		{6C744695-DA38-44D9-B487-FE5804C5508D}.Release|x86.Deploy.0 = Release|Any CPU
+#//#endif
+
 		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -217,6 +253,8 @@ Global
 		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|x64.Build.0 = Release|Any CPU
 		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|x86.ActiveCfg = Release|Any CPU
 		{BACDD33A-304C-46C4-9B00-AC166978D7E0}.Release|x86.Build.0 = Release|Any CPU
+
+#//#if (tests)
 		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -245,6 +283,9 @@ Global
 		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|x64.Build.0 = Release|Any CPU
 		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|x86.ActiveCfg = Release|Any CPU
 		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0}.Release|x86.Build.0 = Release|Any CPU
+#//#endif
+
+#//#if (tests)
 		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -273,6 +314,9 @@ Global
 		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|x64.Build.0 = Release|Any CPU
 		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|x86.ActiveCfg = Release|Any CPU
 		{7229D034-7DBE-4FD7-B0E4-38D617571F93}.Release|x86.Build.0 = Release|Any CPU
+#//#endif
+
+#//#if (winAppSdk)
 		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|Any CPU.Build.0 = Debug|x64
 		{5A78EE9A-1922-468C-96E3-45817727511C}.Debug|Any CPU.Deploy.0 = Debug|x64
@@ -307,6 +351,9 @@ Global
 		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|x64.Build.0 = Release|x64
 		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|x86.ActiveCfg = Release|x86
 		{5A78EE9A-1922-468C-96E3-45817727511C}.Release|x86.Build.0 = Release|x86
+#//#endif
+
+#//#if (skia-linux-fb)
 		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -335,30 +382,57 @@ Global
 		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|x64.Build.0 = Release|Any CPU
 		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|x86.ActiveCfg = Release|Any CPU
 		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B}.Release|x86.Build.0 = Release|Any CPU
+#//#endif
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+#//#if (mobile)
 		{24D56E12-2373-4CBD-9AD4-5C931D15FB0D} = {339C569C-EE23-445E-B908-743673EE5BC9}
+#//#endif
+#//#if (wasm)
 		{40EA03F7-8A22-4143-B251-79BAC3EB13D2} = {339C569C-EE23-445E-B908-743673EE5BC9}
+#//#endif
+#//#if (skia-gtk)
 		{A5B8155A-118F-4794-B551-C6F3CF7E5411} = {339C569C-EE23-445E-B908-743673EE5BC9}
+#//#endif
+#//#if (skia-wpf)
 		{6C744695-DA38-44D9-B487-FE5804C5508D} = {339C569C-EE23-445E-B908-743673EE5BC9}
-		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0} = {7EF70027-9874-4112-A14F-33F02169CF8A}
-		{7229D034-7DBE-4FD7-B0E4-38D617571F93} = {7EF70027-9874-4112-A14F-33F02169CF8A}
+#//#endif
+#//#if (winAppSdk)
 		{5A78EE9A-1922-468C-96E3-45817727511C} = {339C569C-EE23-445E-B908-743673EE5BC9}
+#//#endif
+#//#if (skia-linux-fb)
 		{925C7A3E-6532-4E27-8ABE-37A4F9B73C8B} = {339C569C-EE23-445E-B908-743673EE5BC9}
+#//#endif
+#//#if (tests)
+		{EB3EB846-D5CB-4140-834F-1CC40A0FD6D0} = {7EF70027-9874-4112-A14F-33F02169CF8A}
+		{7229D034-7DBE-4FD7-B0E4-38D617571F93} = {7EF70027-9874-4112-A14F-33F02169CF8A}
+#//#endif
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C7433AE2-B1A0-4C1A-887E-5CAA7AAF67A6}
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+#//#if (mobile)
 		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{24d56e12-2373-4cbd-9ad4-5c931d15fb0d}*SharedItemsImports = 5
+#//#endif
+#//#if (wasm)
 		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{40ea03f7-8a22-4143-b251-79bac3eb13d2}*SharedItemsImports = 5
+#//#endif
+#//#if (winAppSdk)
 		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{5a78ee9a-1922-468c-96e3-45817727511c}*SharedItemsImports = 5
+#//#endif
 		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13
+#//#if (skia-wpf)
 		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{6c744695-da38-44d9-b487-fe5804c5508d}*SharedItemsImports = 5
+#//#endif
+#//#if (skia-linux-fb)
 		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{925c7a3e-6532-4e27-8abe-37a4f9b73c8b}*SharedItemsImports = 5
+#//#endif
+#//#if (skia-gtk)
 		MyExtensionsApp.UI\MyExtensionsApp.UI.projitems*{a5b8155a-118f-4794-b551-c6f3cf7e5411}*SharedItemsImports = 5
+#//#endif
 	EndGlobalSection
 EndGlobal
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp/MyExtensionsApp.csproj b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp/MyExtensionsApp.csproj
index 69e8a1a496..1ef6f01cde 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp/MyExtensionsApp.csproj
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp/MyExtensionsApp.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
-		<IsCoreProject>true</IsCoreProject>
 	</PropertyGroup>
 	
   <ItemGroup>
diff --git a/src/Uno.Extensions.Templates/reinstall.ps1 b/src/Uno.Extensions.Templates/reinstall.ps1
new file mode 100644
index 0000000000..98af1b828d
--- /dev/null
+++ b/src/Uno.Extensions.Templates/reinstall.ps1
@@ -0,0 +1,2 @@
+dotnet new -u Uno.Extensions.Templates
+dotnet new -i .\bin\Uno.Extensions.Templates\Release\Uno.Extensions.Templates.255.255.255.255.nupkg