diff --git a/build/run-template-tests.ps1 b/build/run-template-tests.ps1
index 8752bf657cef..d1c52876c3b3 100644
--- a/build/run-template-tests.ps1
+++ b/build/run-template-tests.ps1
@@ -37,7 +37,7 @@ function Get-TemplateConfiguration(
     $f = If ($wasmVsCode) { $wasmVsCodeFlag } Else { $wasmVsCodeFlag + '=false' }
     $g = If ($skiaWpf)    { $skiaWpfFlag    } Else { $skiaWpfFlag    + '=false' }
     $h = If ($skiaGtk)    { $skiaGtkFlag    } Else { $skiaGtkFlag    + '=false' }
-    $i = If ($skiaTizen)  { $skiaTizenFlag  } Else { $skiaGtkTizen   + '=false' }
+    $i = If ($skiaTizen)  { $skiaTizenFlag  } Else { $skiaTizenFlag  + '=false' }
 
     @($a, $b, $c, $d, $e, $f, $g, $h, $i)
 }
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/UnoApp.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate/UnoApp.vstemplate
index 61641ab45587..1ba96893e1d9 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate/UnoApp.vstemplate
+++ b/src/SolutionTemplate/UnoSolutionTemplate/UnoApp.vstemplate
@@ -28,17 +28,19 @@
   </TemplateData>
   <TemplateContent>
 	<ProjectCollection>
+	  <SolutionFolder Name="Platforms">
+		<ProjectTemplateLink ProjectName="$projectname$.Droid" CopyParameters="true">Droid\Android.vstemplate</ProjectTemplateLink>
+		<ProjectTemplateLink ProjectName="$projectname$.iOS" CopyParameters="true">iOS\iOS.vstemplate</ProjectTemplateLink>
+		<ProjectTemplateLink ProjectName="$projectname$.UWP" CopyParameters="true">UWP\UWP.vstemplate</ProjectTemplateLink>
+		<ProjectTemplateLink ProjectName="$projectname$.Wasm" CopyParameters="true">Wasm\Wasm.vstemplate</ProjectTemplateLink>
+		<ProjectTemplateLink ProjectName="$projectname$.macOS" CopyParameters="true">macOS\macOS.vstemplate</ProjectTemplateLink>
+		<ProjectTemplateLink ProjectName="$projectname$.Skia.Wpf.Host" CopyParameters="true">Skia.Wpf.Host\SkiaWpfHost.vstemplate</ProjectTemplateLink>
+		<ProjectTemplateLink ProjectName="$projectname$.Skia.Wpf" CopyParameters="true">Skia.Wpf\SkiaWpf.vstemplate</ProjectTemplateLink>
+		<ProjectTemplateLink ProjectName="$projectname$.Skia.Gtk" CopyParameters="true">Skia.Gtk\SkiaGtk.vstemplate</ProjectTemplateLink>
+		<ProjectTemplateLink ProjectName="$projectname$.Skia.Tizen" CopyParameters="true">Skia.Tizen\SkiaTizen.vstemplate</ProjectTemplateLink>
+	  </SolutionFolder>
+
 	  <ProjectTemplateLink ProjectName="$projectname$.Shared" CopyParameters="true">Shared\Shared.vstemplate</ProjectTemplateLink>
-	  <ProjectTemplateLink ProjectName="$projectname$.Droid" CopyParameters="true">Droid\Android.vstemplate</ProjectTemplateLink>
-	  <ProjectTemplateLink ProjectName="$projectname$.iOS" CopyParameters="true">iOS\iOS.vstemplate</ProjectTemplateLink>
-	  <ProjectTemplateLink ProjectName="$projectname$.UWP" CopyParameters="true">UWP\UWP.vstemplate</ProjectTemplateLink>
-	  <ProjectTemplateLink ProjectName="$projectname$.Wasm" CopyParameters="true">Wasm\Wasm.vstemplate</ProjectTemplateLink>
-	  <ProjectTemplateLink ProjectName="$projectname$.macOS" CopyParameters="true">macOS\macOS.vstemplate</ProjectTemplateLink>
-	
-	  <ProjectTemplateLink ProjectName="$projectname$.Skia.Wpf.Host" CopyParameters="true">Skia.Wpf.Host\SkiaWpfHost.vstemplate</ProjectTemplateLink>
-	  <ProjectTemplateLink ProjectName="$projectname$.Skia.Wpf" CopyParameters="true">Skia.Wpf\SkiaWpf.vstemplate</ProjectTemplateLink>
-	  <ProjectTemplateLink ProjectName="$projectname$.Skia.Gtk" CopyParameters="true">Skia.Gtk\SkiaGtk.vstemplate</ProjectTemplateLink>
-	  <ProjectTemplateLink ProjectName="$projectname$.Skia.Tizen" CopyParameters="true">Skia.Tizen\SkiaTizen.vstemplate</ProjectTemplateLink>
 	</ProjectCollection>
   </TemplateContent>
   <WizardExtension>
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/UnoSolutionTemplate.csproj b/src/SolutionTemplate/UnoSolutionTemplate/UnoSolutionTemplate.csproj
index 02bb5d90cd6d..cd488659b0ed 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate/UnoSolutionTemplate.csproj
+++ b/src/SolutionTemplate/UnoSolutionTemplate/UnoSolutionTemplate.csproj
@@ -75,7 +75,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Skia.Tizen\Program.cs" />
+    <None Include="Skia.Tizen\Program.cs" />
+    <None Include="Skia.Tizen\Assets\Fonts\uno-fluentui-assets.ttf" />
     <None Include="Skia.Tizen\UnoQuickStart.Skia.Tizen.csproj" />
     <None Include="Skia.WPF\Program.cs" />
     <None Include="Skia.WPF.Host\App.xaml.cs" />
@@ -239,9 +240,9 @@
     <None Include="Skia.Gtk\SkiaGtk.vstemplate">
       <SubType>Designer</SubType>
     </None>
-    <Content Include="Skia.Tizen\shared\res\Icon.png" />
+    <None Include="Skia.Tizen\shared\res\Icon.png" />
     <Content Include="Skia.Tizen\SkiaTizen.vstemplate" />
-    <Content Include="Skia.Tizen\tizen-manifest.xml" />
+    <None Include="Skia.Tizen\tizen-manifest.xml" />
     <Content Include="UWP\Assets\LockScreenLogo.scale-200.png" />
     <Content Include="UWP\Assets\SplashScreen.scale-200.png" />
     <Content Include="UWP\Assets\Square150x150Logo.scale-200.png" />