diff --git a/appveyor.yml b/appveyor.yml
index 8928d47ce5..8f1380fe5d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,7 +20,7 @@ artifacts:
 - path: artifacts/test
   name: test
   type: zip
-- path: artifacts/addin/Release/VisualStudio/Eto.Addin.VisualStudio.vsix
+- path: artifacts/addin/Release/VisualStudio/Eto.Addin.VisualStudio*.vsix
   name: vsix
 branches:
   only:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 412fe90c57..64d2d6d2a4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -42,15 +42,16 @@ jobs:
   - task: CopyFiles@2
     displayName: Copy nupkg
     inputs:
+      sourceFolder: artifacts/nuget/$(build.configuration)/
       contents: |
-        artifacts/nuget/$(build.configuration)/Eto.Platform.XamMac*.nupkg
-        artifacts/nuget/$(build.configuration)/Eto.Platform.Gtk2*.nupkg
-      targetFolder: $(Build.ArtifactStagingDirectory)
+        Eto.Platform.XamMac*.nupkg
+        Eto.Platform.Gtk2*.nupkg
+      targetFolder: $(Build.ArtifactStagingDirectory)/nuget/
       
   - task: PublishBuildArtifacts@1
     displayName: Publish nupkg
     inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/artifacts/nuget/$(build.configuration)
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/nuget/
       artifactName: nuget
       publishLocation: container
 
@@ -58,18 +59,19 @@ jobs:
     displayName: Build MonoDevelop Addin
     inputs:
       solution: build/Build.proj
-      msbuildArguments: /t:BuildAddins
+      msbuildArguments: /t:BuildAddins /v:minimal /bl:$(Build.ArtifactStagingDirectory)/msbuild-binlog/MSBuild.BuildAddins.MacOS.binlog
 
   - task: CopyFiles@2
     displayName: Copy MonoDevelop Addin
     inputs:
-      contents: artifacts/addin/$(build.configuration)/net472/Eto.Addin.MonoDevelop*.mpack
-      targetFolder: $(Build.ArtifactStagingDirectory)
+      sourceFolder: artifacts/addin/$(build.configuration)/net472/
+      contents: Eto.Addin.MonoDevelop*.mpack
+      targetFolder: $(Build.ArtifactStagingDirectory)/addin/
 
   - task: PublishBuildArtifacts@1
     displayName: Publish MonoDevelop Addin
     inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/artifacts/addin/$(build.configuration)/net472
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/addin/
       artifactName: addins
       publishLocation: container
 
@@ -77,7 +79,7 @@ jobs:
     condition: failed()
     displayName: Publish MSBuild logs
     inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/msbuild-binlog
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/msbuild-binlog/
       artifactName: msbuild-binlog
       publishLocation: container                            
     
@@ -101,33 +103,47 @@ jobs:
       solution: build/Build.proj
       msbuildArguments: $(build.arguments) /p:HaveWindowsDesktopSdk=true /v:minimal /bl:$(Build.ArtifactStagingDirectory)/msbuild-binlog/MSBuild.BuildPackage.Windows.binlog
 
-  - task: msbuild@1
-    displayName: Build Visual Studio Addin
-    inputs:
-      solution: build/Build.proj
-      msbuildArguments: /t:BuildAddins /p:HaveWindowsDesktopSdk=true /v:minimal /bl:$(Build.ArtifactStagingDirectory)/msbuild-binlog/MSBuild.BuildAddins.Windows.binlog
-
   - task: PublishBuildArtifacts@1
     displayName: Publish nupkg
     inputs:
-      pathtoPublish: artifacts/nuget/$(build.configuration)
+      pathtoPublish: artifacts/nuget/$(build.configuration)/
       artifactName: nuget
       publishLocation: container
   - task: PublishBuildArtifacts@1
     displayName: Publish tests
     inputs:
-      pathtoPublish: artifacts/test/$(build.configuration)
+      pathtoPublish: artifacts/test/$(build.configuration)/
       artifactName: test
       publishLocation: container
   - task: PublishBuildArtifacts@1
     displayName: Publish samples
     inputs:
-      pathtoPublish: artifacts/samples/$(build.configuration)
+      pathtoPublish: artifacts/samples/$(build.configuration)/
       artifactName: samples
       publishLocation: container
+      
+  - task: msbuild@1
+    displayName: Build Visual Studio Addin
+    inputs:
+      solution: build/Build.proj
+      msbuildArguments: /t:BuildAddins /p:HaveWindowsDesktopSdk=true /v:minimal /bl:$(Build.ArtifactStagingDirectory)/msbuild-binlog/MSBuild.BuildAddins.Windows.binlog
+  - task: CopyFiles@2
+    displayName: Copy Visual Studio Addin
+    inputs:
+      sourceFolder: artifacts/addin/$(build.configuration)/VisualStudio/
+      contents: Eto.Addin.VisualStudio*.vsix
+      targetFolder: $(Build.ArtifactStagingDirectory)/addin/
   - task: PublishBuildArtifacts@1
     displayName: Publish Visual Studio Addin
     inputs:
-      pathtoPublish: artifacts/addin/$(build.configuration)/VisualStudio/Eto.Addin.VisualStudio.vsix
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/addin/
       artifactName: addins
       publishLocation: container
+      
+  - task: PublishBuildArtifacts@1
+    condition: failed()
+    displayName: Publish MSBuild logs
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/msbuild-binlog/
+      artifactName: msbuild-binlog
+      publishLocation: container                            
diff --git a/build/Build.proj b/build/Build.proj
index 4c1b89646f..85f033074f 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -221,8 +221,8 @@
       <OtherOptions Include="xm" Value="-xm" />
       <OtherOptions Include="wf_xm" Value="-wf -xm" />
 
-      <Separate Include="separate" Value="-s" />
-      <Separate Include="combined" Value="" />
+      <Combined Include="separate" Value="" />
+      <Combined Include="combined" Value="-c" />
 
       <Framework Include="full" />
       <Framework Include="core" />
@@ -230,12 +230,12 @@
 
       <CombinedProject1 Include="*" LanguageId="%(Language.Identity)" Language="%(Language.Value)" />
       <CombinedProject2 Include="@(CombinedProject1)" ModeId="%(Mode.Identity)" Mode="%(Mode.Identity)" />
-      <CombinedProject3 Include="@(CombinedProject2)" SeparateId="%(Separate.Identity)" Separate="%(Separate.Value)" />
-      <CombinedProject4 Include="@(CombinedProject3)" OtherId="%(OtherOptions.Identity)" Other="%(OtherOptions.Value)" />
-      <CombinedProject Include="@(CombinedProject4)" FrameworkId="%(Framework.Identity)" Framework="%(Framework.Identity)" />
+      <CombinedProject3 Include="@(CombinedProject2)" CombinedId="%(Combined.Identity)" Combined="%(Combined.Value)" />
+      <CombinedProject4 Include="@(CombinedProject3)" FrameworkId="%(Framework.Identity)" Framework="%(Framework.Identity)" />
+      <CombinedProject Include="@(CombinedProject4)" OtherId="%(OtherOptions.Identity)" Other="%(OtherOptions.Value)" />
     </ItemGroup>
 
-    <Exec Command="dotnet new etoapp -m %(CombinedProject.Mode) -sln -lang %(Language) %(Other) %(Separate) -f %(Framework) -o $(ArtifactsDir)templates\App.%(LanguageId)-%(SeparateId)-%(OtherId)-%(ModeId)-%(FrameworkId)" />
+    <Exec Command="export DOTNET_NEW_LOCAL_SEARCH_FILE_ONLY=TRUE &amp;&amp; dotnet new etoapp -m %(CombinedProject.Mode) -sln -lang %(Language) %(Other) %(Combined) -f %(Framework) -o $(ArtifactsDir)templates\App.%(LanguageId)-%(CombinedId)-%(OtherId)-%(ModeId)-%(FrameworkId)" />
 
     <!-- generate file templates -->
     <ItemGroup>
diff --git a/src/Addins/Eto.Addin.MonoDevelop.sln b/src/Addins/Eto.Addin.MonoDevelop.sln
index 3d7e183b04..5621a53b47 100644
--- a/src/Addins/Eto.Addin.MonoDevelop.sln
+++ b/src/Addins/Eto.Addin.MonoDevelop.sln
@@ -13,12 +13,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Serialization.Xaml", ".
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Serialization.Json", "..\Eto.Serialization.Json\Eto.Serialization.Json.csproj", "{FCEFD5C0-8705-11E4-B4A9-0800200C9A66}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B4E4F6B1-48B2-4D57-8CEB-39796557ECB5}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{B4E4F6B1-48B2-4D57-8CEB-39796557ECB5}"
 	ProjectSection(SolutionItems) = preProject
-		..\..\addin-project.xml = ..\..\addin-project.xml
-		..\..\NuGet.Config = ..\..\NuGet.Config
-		..\..\Directory.Build.props = ..\..\Directory.Build.props
-		..\..\Directory.Build.targets = ..\..\Directory.Build.targets
+		..\..\build\Build.proj = ..\..\build\Build.proj
+		..\..\build\Common.Build.props = ..\..\build\Common.Build.props
+		..\..\build\Common.Build.targets = ..\..\build\Common.Build.targets
+		..\..\build\Common.props = ..\..\build\Common.props
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto", "..\Eto\Eto.csproj", "{04348E2F-003F-4CFF-B0CB-5E8B073FCA91}"
diff --git a/src/Addins/Eto.Addin.MonoDevelop/Eto.Addin.MonoDevelop.csproj b/src/Addins/Eto.Addin.MonoDevelop/Eto.Addin.MonoDevelop.csproj
index 883e853085..b072da4d4f 100644
--- a/src/Addins/Eto.Addin.MonoDevelop/Eto.Addin.MonoDevelop.csproj
+++ b/src/Addins/Eto.Addin.MonoDevelop/Eto.Addin.MonoDevelop.csproj
@@ -37,8 +37,8 @@
   </ItemGroup>
   <ItemGroup>
     <AddinFile Include="Templates\Files\**\*" />
-    <AddinFile Include="$(ArtifactsDir)\nuget\$(Configuration)\Eto.Forms.Templates.2.5.0-dev.nupkg">
-      <Link>Packages\Eto.Forms.Templates.2.5.0-dev.nupkg</Link>
+    <AddinFile Include="$(ArtifactsDir)\nuget\$(Configuration)\Eto.Forms.Templates.$(InformationalVersion).nupkg">
+      <Link>Packages\Eto.Forms.Templates.$(InformationalVersion).nupkg</Link>
     </AddinFile>
   </ItemGroup>
   <ItemGroup>
@@ -51,4 +51,12 @@
       <AddinReference Update="MonoDevelop.Ide" Version="$(MonoDevelopVersion)" />
     </ItemGroup>
   </Target>
+  
+  <Target Name="RenameMpack" AfterTargets="PackageAddin">
+    <PropertyGroup>
+      <MPackName>$(OutputPath)Eto.Addin.MonoDevelop-$(InformationalVersion).mpack</MPackName>
+    </PropertyGroup>
+    <Delete Files="$(MPackName)" />
+    <Move SourceFiles="$(PackageFile)" DestinationFiles="$(MPackName)" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Addins/Eto.Addin.MonoDevelop/Properties/Manifest.addin.xml b/src/Addins/Eto.Addin.MonoDevelop/Properties/Manifest.addin.xml
index 735b4e22a3..8d7e37d5a2 100644
--- a/src/Addins/Eto.Addin.MonoDevelop/Properties/Manifest.addin.xml
+++ b/src/Addins/Eto.Addin.MonoDevelop/Properties/Manifest.addin.xml
@@ -36,7 +36,7 @@
 			imageId="eto-project"
 			wizard="Eto.Addin.MonoDevelop.ProjectWizard"
 			category="multiplat/app/eto"
-			supportedParameters="AppName,Separated,Xeto,Preview,Jeto,XamMac,NoDash,Framework"
+			supportedParameters="AppName,Combined,Xeto,Preview,Jeto,XamMac,NoDash,Framework"
 			/>
 		<Template
 			id="Eto.App.FSharp"
@@ -44,7 +44,7 @@
 			imageId="eto-project"
 			wizard="Eto.Addin.MonoDevelop.ProjectWizard"
 			category="multiplat/app/eto"
-			supportedParameters="AppName,Separated,Xeto,Preview,Jeto,XamMac,NoDash,Framework"
+			supportedParameters="AppName,Combined,Xeto,Preview,Jeto,XamMac,NoDash,Framework"
 			/>
 	</Extension>
 
diff --git a/src/Addins/Eto.Addin.Shared/ProjectWizardPageModel.cs b/src/Addins/Eto.Addin.Shared/ProjectWizardPageModel.cs
index cc63cca4db..ea1e6ccf54 100644
--- a/src/Addins/Eto.Addin.Shared/ProjectWizardPageModel.cs
+++ b/src/Addins/Eto.Addin.Shared/ProjectWizardPageModel.cs
@@ -21,7 +21,7 @@ public ProjectWizardPageModel(IParameterSource source, XElement optionsElement)
 			UsePCL = SupportsPCL;
 			UseNET = !SupportsPCL;
 			UseSAL = false;
-			Separate = false;
+			Combined = false;
 			Mode = "code";
 			IncludeSolution = false;
 			if (SupportsBase)
@@ -40,6 +40,8 @@ public bool IsValid
 					if (string.IsNullOrWhiteSpace(AppName) || AppNameInvalid)
 						return false;
 				}
+				if (SupportsFramework && !SelectedFrameworks.Any())
+					return false;
 				return true;
 			}
 		}
@@ -94,7 +96,7 @@ public string AppName
 
 		public bool SupportsProjectType => SupportsPCL || SupportsSAL || SupportsNetStandard;
 
-		public bool SupportsSeparated => Source.IsSupportedParameter("Separated");
+		public bool SupportsCombined => Source.IsSupportedParameter("Combined");
 
 		public bool SupportsXamMac => Source.IsSupportedParameter("XamMac");
 
@@ -110,12 +112,12 @@ public string AppName
 
 		public bool NoDash => Source.IsSupportedParameter("NoDash");
 
-		public bool Separate
+		public bool Combined
 		{
-			get { return Source.GetParameter("Separate").ToBool(); }
+			get { return Source.GetParameter("Combined").ToBool(); }
 			set
 			{
-				Source.SetParameter("Separate", value.ToString());
+				Source.SetParameter("Combined", value.ToString());
 				OnPropertyChanged();
 				OnPropertyChanged(nameof(Information));
 			}
@@ -215,21 +217,22 @@ public override string Title
 			set { base.Title = value; }
 		}
 
-		public bool RequiresInput => SupportsSeparated || SupportsProjectType || SupportsPanelType;
+		public bool RequiresInput => SupportsCombined || SupportsProjectType || SupportsPanelType;
 
 		public class FrameworkInfo
 		{
 			public string Text { get; set; }
 			public string Value { get; set; }
 			public string Description { get; set; }
+			public bool CanUseCombined { get; set; }
 		}
 
 		public FrameworkInfo[] SupportedFrameworks => frameworkInformation;
 
 		static readonly FrameworkInfo[] frameworkInformation =
 		{
-			new FrameworkInfo { Text = "Full .NET Framework", Value = "full"},
-			new FrameworkInfo { Text = ".NET Core", Value = "core" }
+			new FrameworkInfo { Text = "Full .NET Framework", Value = "full", CanUseCombined = true },
+			new FrameworkInfo { Text = ".NET Core", Value = "core", CanUseCombined = false }
 		};
 
 		List<FrameworkInfo> _selectedFrameworks;
@@ -243,11 +246,17 @@ public IEnumerable<object> SelectedFrameworks
 
 				string parameterValue = _selectedFrameworks.Count == 1 ? _selectedFrameworks[0].Value : "both";
 				Source.SetParameter("Framework", parameterValue);
+
+				if (!AllowCombined)
+					Combined = false;
 				OnPropertyChanged();
 				OnPropertyChanged(nameof(Information));
+				OnPropertyChanged(nameof(AllowCombined));
 			}
 		}
 
+		public bool AllowCombined => _selectedFrameworks?.All(r => r.CanUseCombined) == true;
+
 
 		struct TypeInfo
 		{
@@ -266,14 +275,14 @@ struct TypeInfo
 		struct CombinedInfo
 		{
 			public string Text;
-			public bool Separate;
+			public bool Combined;
 			public bool? IncludeXamMac;
 		}
 
 		static CombinedInfo[] combinedInformation = {
-			new CombinedInfo { Separate = false, IncludeXamMac = true, Text = "A single combined project that can build for Windows, Linux and Mac, and a separate Xamarin.Mac project to bundle mono with VS for Mac." },
-			new CombinedInfo { Separate = false, IncludeXamMac = false, Text = "A single combined project that can build for Windows, Linux, and Mac." },
-			new CombinedInfo { Separate = true, Text = "A separate project for each platform." },
+			new CombinedInfo { Combined = true, IncludeXamMac = true, Text = "A single combined project that can build for Windows, Linux and Mac, and a separate Xamarin.Mac project to bundle mono with VS for Mac." },
+			new CombinedInfo { Combined = true, IncludeXamMac = false, Text = "A single combined project that can build for Windows, Linux, and Mac." },
+			new CombinedInfo { Combined = false, Text = "A separate project for each platform." },
 		};
 
 		struct FormatInfo
@@ -307,10 +316,10 @@ public string Information
 			{
 				var text = new List<string>();
 
-				if (SupportsSeparated)
+				if (SupportsCombined)
 				{
 					var combinedInfo = from i in combinedInformation
-									   where i.Separate == Separate
+									   where i.Combined == Combined
 											  && (i.IncludeXamMac == null || i.IncludeXamMac == IncludeXamMac)
 									   select i.Text;
 					text.Add(combinedInfo.FirstOrDefault());
diff --git a/src/Addins/Eto.Addin.Shared/ProjectWizardPageView.cs b/src/Addins/Eto.Addin.Shared/ProjectWizardPageView.cs
index 3700aa409f..360769745c 100644
--- a/src/Addins/Eto.Addin.Shared/ProjectWizardPageView.cs
+++ b/src/Addins/Eto.Addin.Shared/ProjectWizardPageView.cs
@@ -45,7 +45,7 @@ public ProjectWizardPageView(ProjectWizardPageModel model)
 				content.AddRow(HeadingLabel((model.IsLibrary ? "Library" : "App") + " Name:"), label);
 			}
 
-			if (model.SupportsSeparated)
+			if (model.SupportsCombined)
 			{
 				var platformTypeList = new RadioButtonList
 				{
@@ -53,13 +53,14 @@ public ProjectWizardPageView(ProjectWizardPageModel model)
 					Spacing = radioSpacing,
 					Items =
 					{
-						new ListItem { Text = "Single Windows, Linux, and Mac desktop project", Key = "combined" },
-						new ListItem { Text = "Separate projects for each platform", Key = "separate" }
+						new ListItem { Text = "Separate projects for each platform", Key = "separate" },
+						new ListItem { Text = "Single Windows, Linux, and Mac desktop project", Key = "combined" }
 					}
 				};
+				platformTypeList.BindDataContext(c => c.Enabled, (ProjectWizardPageModel m) => m.AllowCombined);
 				platformTypeList.SelectedKeyBinding
-				                .Convert(v => v == "separate", v => v ? "separate" : "combined")
-				                .BindDataContext((ProjectWizardPageModel m) => m.Separate);
+				                .Convert(v => v == "combined", v => v ? "combined" : "separate")
+				                .BindDataContext((ProjectWizardPageModel m) => m.Combined);
 				content.AddRow(HeadingLabel("Launcher:"), platformTypeList);
 			}
 
diff --git a/src/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio.csproj b/src/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio.csproj
index 48468a15db..c8687a0168 100755
--- a/src/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio.csproj
+++ b/src/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio.csproj
@@ -4,6 +4,7 @@
     <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
+  <Import Project="..\..\Directory.Build.props" />
   <PropertyGroup>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -24,6 +25,7 @@
     <DefaultNewProjectNode>CSharp\Eto.Forms</DefaultNewProjectNode>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <TargetFrameworkProfile />
+    <TargetVsixContainerName>Eto.Addin.VisualStudio-$(InformationalVersion).vsix</TargetVsixContainerName>
   </PropertyGroup>
   <PropertyGroup>
     <StartAction>Program</StartAction>
@@ -107,8 +109,8 @@
     <Content Include="template.pkgdef">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\..\..\artifacts\nuget\$(Configuration)\Eto.Forms.Templates.2.5.0-dev.nupkg">
-      <Link>Eto.Forms.Templates.2.5.0-dev.nupkg</Link>
+    <Content Include="..\..\..\artifacts\nuget\$(Configuration)\Eto.Forms.Templates.$(InformationalVersion).nupkg">
+      <Link>Eto.Forms.Templates.$(InformationalVersion).nupkg</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Resource Include="Templates\File-FSharp\File.ico" />
diff --git a/src/Addins/Eto.Addin.VisualStudio/Templates/App-CSharp/App.vstemplate b/src/Addins/Eto.Addin.VisualStudio/Templates/App-CSharp/App.vstemplate
old mode 100644
new mode 100755
index d5ecfe4e8a..82405bf20e
--- a/src/Addins/Eto.Addin.VisualStudio/Templates/App-CSharp/App.vstemplate
+++ b/src/Addins/Eto.Addin.VisualStudio/Templates/App-CSharp/App.vstemplate
@@ -40,6 +40,6 @@
     <FullClassName>Microsoft.VisualStudio.TemplateEngine.Wizard.TemplateEngineWizard</FullClassName>
   </WizardExtension>
   <WizardData>
-    <SupportedParameters>Separated,Xeto,Jeto,Preview,XamMac</SupportedParameters>
+    <SupportedParameters>Combined,Xeto,Jeto,Preview,XamMac,Framework</SupportedParameters>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/src/Addins/Eto.Addin.VisualStudio/Templates/App-FSharp/App.vstemplate b/src/Addins/Eto.Addin.VisualStudio/Templates/App-FSharp/App.vstemplate
old mode 100644
new mode 100755
index 0f75f07628..ec18b3965f
--- a/src/Addins/Eto.Addin.VisualStudio/Templates/App-FSharp/App.vstemplate
+++ b/src/Addins/Eto.Addin.VisualStudio/Templates/App-FSharp/App.vstemplate
@@ -40,6 +40,6 @@
     <FullClassName>Microsoft.VisualStudio.TemplateEngine.Wizard.TemplateEngineWizard</FullClassName>
   </WizardExtension>
   <WizardData>
-    <SupportedParameters>Separated,Xeto,Jeto,Preview,XamMac</SupportedParameters>
+    <SupportedParameters>Combined,Xeto,Jeto,Preview,XamMac,Framework</SupportedParameters>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/src/Addins/Eto.Addin.VisualStudio/source.extension.vsixmanifest b/src/Addins/Eto.Addin.VisualStudio/source.extension.vsixmanifest
index 8befad033f..e7426a12f2 100755
--- a/src/Addins/Eto.Addin.VisualStudio/source.extension.vsixmanifest
+++ b/src/Addins/Eto.Addin.VisualStudio/source.extension.vsixmanifest
@@ -28,9 +28,9 @@
         <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" AssemblyName="|%CurrentProject%;AssemblyName|" />
     </Assets>
     <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.1.28811.260,17.0)" DisplayName="Visual Studio core editor" />
-        <Prerequisite Id="Microsoft.NetCore.Component.SDK" Version="[16.4.29519.181,17.0)" DisplayName=".NET Core 3.1 SDK" />
-        <Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[16.4.29429.68,17.0)" DisplayName=".NET desktop development tools" />
-        <Prerequisite Id="Microsoft.Net.Component.4.7.2.TargetingPack" Version="[16.0.28517.75,17.0)" DisplayName=".NET Framework 4.7.2 targeting pack" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
+        <Prerequisite Id="Microsoft.NetCore.Component.SDK" Version="[16.0,17.0)" DisplayName=".NET Core 3.1 SDK" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[16.0,17.0)" DisplayName=".NET desktop development tools" />
+        <Prerequisite Id="Microsoft.Net.Component.4.7.2.TargetingPack" Version="[16.0,17.0)" DisplayName=".NET Framework 4.7.2 targeting pack" />
     </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/src/Addins/Eto.Addin.VisualStudio/template.pkgdef b/src/Addins/Eto.Addin.VisualStudio/template.pkgdef
old mode 100644
new mode 100755
index ad89705403..ebf304ef83
--- a/src/Addins/Eto.Addin.VisualStudio/template.pkgdef
+++ b/src/Addins/Eto.Addin.VisualStudio/template.pkgdef
@@ -1,2 +1,2 @@
-[$RootKey$\TemplateEngine\Templates\3D4FD2DF-D658-41C4-BB13-5AD85A9230BC]
+[$RootKey$\TemplateEngine\Templates\Eto.Forms]
 "InstalledPath"="$PackageFolder$"
\ No newline at end of file
diff --git a/src/Addins/Eto.Forms.Templates/content/App-CSharp/.template.config/dotnetcli.host.json b/src/Addins/Eto.Forms.Templates/content/App-CSharp/.template.config/dotnetcli.host.json
index 9916bb0e38..e66424e2d7 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-CSharp/.template.config/dotnetcli.host.json
+++ b/src/Addins/Eto.Forms.Templates/content/App-CSharp/.template.config/dotnetcli.host.json
@@ -9,9 +9,9 @@
 			"longName": "gtk-version",
 			"shortName": "g"
 		},
-		"Separate": {
-			"longName": "separate",
-			"shortName": "s"
+		"Combined": {
+			"longName": "combined",
+			"shortName": "c"
 		},
 		"Framework": {
 			"longName": "framework",
diff --git a/src/Addins/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json b/src/Addins/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json
index d466d0e923..dfd7c793a8 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json
+++ b/src/Addins/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json
@@ -53,18 +53,18 @@
 				},
 				{
 					"choice": "Gtk2",
-					"description": "Gtk# 2.12 (depricated)"
+					"description": "Gtk# 2.12 (deprecated)"
 				},
 				{
 					"choice": "Gtk3",
-					"description": "GTK# 3.0 (depricated)"
+					"description": "GTK# 3.0 (deprecated)"
 				}
 			],
 			"replaces": "Gtk"
 		},
-		"Separate": {
+		"Combined": {
 			"type": "parameter",
-			"description": "Use separate projects for each platform.\nDefault is to create a single destkop project that\nbuilds for all platforms",
+			"description": "Use a combined project to launch the application (Full .NET Framework only)",
 			"dataType": "bool",
 			"defaultValue": "false"
 		},
@@ -122,6 +122,10 @@
 			"type": "computed",
 			"value": "(Mode == \"json\")"
 		},
+		"UseCore": {
+			"type": "computed",
+			"value": "(Framework != \"full\")"
+		},
 		"IsWindow": {
 			"type": "computed",
 			"value": "true"
@@ -173,11 +177,11 @@
 					"exclude": [ "**/*.jeto", "**/*.jeto.*" ]
 				},
 				{
-					"condition": "(Separate)",
+					"condition": "(!Combined)",
 					"exclude": [ "**/EtoApp.1.Desktop/**/*" ]
 				},
 				{
-					"condition": "(!Separate)",
+					"condition": "(Combined)",
 					"exclude": [
 						"**/EtoApp.1.Gtk/**/*",
 						"**/EtoApp.1.Mac/**/*",
@@ -185,7 +189,7 @@
 					]
 				},
 				{
-					"condition": "(!IncludeWinForms || !Separate)",
+					"condition": "(!IncludeWinForms || Combined)",
 					"exclude": [
 						"**/EtoApp.1.WinForms/**/*"
 					]
@@ -203,23 +207,23 @@
 		{ "path": "EtoApp.1/EtoApp.1.csproj" },
 		{
 			"path": "EtoApp.1.Desktop/EtoApp.1.Desktop.csproj",
-			"condition": "(!Separate)"
+			"condition": "(Combined)"
 		},
 		{
 			"path": "EtoApp.1.Gtk/EtoApp.1.Gtk.csproj",
-			"condition": "(Separate)"
+			"condition": "(!Combined)"
 		},
 		{
 			"path": "EtoApp.1.Mac/EtoApp.1.Mac.csproj",
-			"condition": "(Separate)"
+			"condition": "(!Combined)"
 		},
 		{
 			"path": "EtoApp.1.WinForms/EtoApp.1.WinForms.csproj",
-			"condition": "(Separate && IncludeWinForms)"
+			"condition": "(!Combined && IncludeWinForms)"
 		},
 		{
 			"path": "EtoApp.1.Wpf/EtoApp.1.Wpf.csproj",
-			"condition": "(Separate)"
+			"condition": "(!Combined)"
 		},
 		{
 			"path": "EtoApp.1.XamMac/EtoApp.1.XamMac.csproj",
diff --git a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Desktop/EtoApp.1.Desktop.csproj b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Desktop/EtoApp.1.Desktop.csproj
index 3251f379f9..cfafa0bb7c 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Desktop/EtoApp.1.Desktop.csproj
+++ b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Desktop/EtoApp.1.Desktop.csproj
@@ -2,12 +2,10 @@
 	
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(Framework) == 'full'">net461</TargetFramework>
-    <TargetFramework Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFramework>
-    <TargetFrameworks Condition="$(Framework) == '' OR $(Framework) == 'both'">net461;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net461</TargetFrameworks>
     <AssemblySearchPaths Condition="$(GtkVersion)=='Gtk2' or $(GtkVersion)=='Gtk3'">$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>
   </PropertyGroup>
-	
+  
   <ItemGroup>
     <ProjectReference Include="..\EtoApp.1\EtoApp.1.csproj" />
   </ItemGroup>
diff --git a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj
index 150696fcee..4960b0f3e7 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj
+++ b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj
@@ -2,8 +2,8 @@
 	
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(Framework) == 'full'">net461</TargetFramework>
-    <TargetFramework Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFramework>
+    <TargetFrameworks Condition="$(Framework) == 'full'">net461</TargetFrameworks>
+    <TargetFrameworks Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="$(Framework) == '' OR $(Framework) == 'both'">net461;netcoreapp3.1</TargetFrameworks>
     <AssemblySearchPaths Condition="$(GtkVersion)=='Gtk2' or $(GtkVersion)=='Gtk3'">$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>
   </PropertyGroup>
diff --git a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Mac/EtoApp.1.Mac.csproj b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Mac/EtoApp.1.Mac.csproj
index c28ea586b4..968edd7f82 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Mac/EtoApp.1.Mac.csproj
+++ b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Mac/EtoApp.1.Mac.csproj
@@ -2,9 +2,11 @@
 	
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(Framework) == 'full'">net461</TargetFramework>
-    <TargetFramework Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFramework>
+    <TargetFrameworks Condition="$(Framework) == 'full'">net461</TargetFrameworks>
+    <TargetFrameworks Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="$(Framework) == '' OR $(Framework) == 'both'">net461;netcoreapp3.1</TargetFrameworks>
+    
+    <RuntimeIdentifiers Condition="$(Framework) != 'full'">osx-x64</RuntimeIdentifiers>
   </PropertyGroup>
 	
   <ItemGroup>
diff --git a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Mac/Info.plist b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Mac/Info.plist
index 08c3e82c86..19afa18f34 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Mac/Info.plist
+++ b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Mac/Info.plist
@@ -9,7 +9,7 @@
     <key>CFBundleShortVersionString</key>
     <string>1.0</string>
     <key>LSMinimumSystemVersion</key>
-    <string>10.9</string>
+    <string>10.12</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>en</string>
     <key>NSHumanReadableCopyright</key>
diff --git a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj
old mode 100644
new mode 100755
index 20f3b55dc0..4e5fc103a6
--- a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj
+++ b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj
@@ -2,17 +2,11 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(Framework) == 'full'">net461</TargetFramework>
-    <TargetFramework Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFramework>
+    <TargetFrameworks Condition="$(Framework) == 'full'">net461</TargetFrameworks>
+    <TargetFrameworks Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="$(Framework) == '' OR $(Framework) == 'both'">net461;netcoreapp3.1</TargetFrameworks>
-    <UseWindowsForms Condition="$(Framework) != 'full'">True</UseWindowsForms>
   </PropertyGroup>
 
-  <ItemGroup Condition="$(TargetFramework) == 'netcoreapp3.1' AND $(Framework) != 'full'">
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\EtoApp.1\EtoApp.1.csproj" />
   </ItemGroup>
diff --git a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj
old mode 100644
new mode 100755
index 92c8d788db..58628c3d56
--- a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj
+++ b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj
@@ -2,12 +2,11 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(Framework) == 'full'">net461</TargetFramework>
-    <TargetFramework Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFramework>
+    <TargetFrameworks Condition="$(Framework) == 'full'">net461</TargetFrameworks>
+    <TargetFrameworks Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="$(Framework) == '' OR $(Framework) == 'both'">net461;netcoreapp3.1</TargetFrameworks>
-    <UseWpf Condition="$(Framework) != 'full'">True</UseWpf>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\EtoApp.1\EtoApp.1.csproj" />
   </ItemGroup>
diff --git a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.sln b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.sln
index 639e92b86e..ecb923a3dc 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.sln
+++ b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.sln
@@ -4,7 +4,10 @@ VisualStudioVersion = 15.0.27130.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1", "EtoApp.1\EtoApp.1.csproj", "{4A7EEA91-18CE-4C33-8501-76049670866D}"
 EndProject
-#if Separate
+#if Combined
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1.Desktop", "EtoApp.1.Desktop\EtoApp.1.Desktop.csproj", "{90FC5409-708A-49CC-A80E-2C109E168CB8}"
+EndProject
+#else
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1.Gtk", "EtoApp.1.Gtk\EtoApp.1.Gtk.csproj", "{F83FE9CE-ACEC-44E7-8C9E-05362F50684E}"
 EndProject
 #if IncludeWinForms
@@ -15,9 +18,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1.Mac", "EtoApp.1.Ma
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1.Wpf", "EtoApp.1.Wpf\EtoApp.1.Wpf.csproj", "{7D9523D1-01EC-4E34-A559-03F332E64346}"
 EndProject
-#else
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1.Desktop", "EtoApp.1.Desktop\EtoApp.1.Desktop.csproj", "{90FC5409-708A-49CC-A80E-2C109E168CB8}"
-EndProject
 #endif
 #if IncludeXamMac
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1.XamMac", "EtoApp.1.XamMac\EtoApp.1.XamMac.csproj", "{05DB20E8-D401-4094-8096-88499C50E28A}"
@@ -33,7 +33,12 @@ Global
 		{4A7EEA91-18CE-4C33-8501-76049670866D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4A7EEA91-18CE-4C33-8501-76049670866D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A7EEA91-18CE-4C33-8501-76049670866D}.Release|Any CPU.Build.0 = Release|Any CPU
-#if Separate
+#if Combined
+		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Release|Any CPU.Build.0 = Release|Any CPU
+#else
 		{F83FE9CE-ACEC-44E7-8C9E-05362F50684E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F83FE9CE-ACEC-44E7-8C9E-05362F50684E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F83FE9CE-ACEC-44E7-8C9E-05362F50684E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -52,11 +57,6 @@ Global
 		{7D9523D1-01EC-4E34-A559-03F332E64346}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7D9523D1-01EC-4E34-A559-03F332E64346}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D9523D1-01EC-4E34-A559-03F332E64346}.Release|Any CPU.Build.0 = Release|Any CPU
-#else
-		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Release|Any CPU.Build.0 = Release|Any CPU
 #endif
 #if IncludeXamMac
 		{05DB20E8-D401-4094-8096-88499C50E28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
diff --git a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj
index ce23948ad9..fecd7e6112 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj
+++ b/src/Addins/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <DefineConstants Condition="$(Mode)==''">UseCode;IsWindow;IsForm</DefineConstants>
   </PropertyGroup>
   
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/.template.config/dotnetcli.host.json b/src/Addins/Eto.Forms.Templates/content/App-FSharp/.template.config/dotnetcli.host.json
index 9916bb0e38..e66424e2d7 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/.template.config/dotnetcli.host.json
+++ b/src/Addins/Eto.Forms.Templates/content/App-FSharp/.template.config/dotnetcli.host.json
@@ -9,9 +9,9 @@
 			"longName": "gtk-version",
 			"shortName": "g"
 		},
-		"Separate": {
-			"longName": "separate",
-			"shortName": "s"
+		"Combined": {
+			"longName": "combined",
+			"shortName": "c"
 		},
 		"Framework": {
 			"longName": "framework",
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json b/src/Addins/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json
index 16efdb4351..605d71f004 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json
+++ b/src/Addins/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json
@@ -53,18 +53,18 @@
 				},
 				{
 					"choice": "Gtk2",
-					"description": "Gtk# 2.12 (depricated)"
+					"description": "Gtk# 2.12 (deprecated)"
 				},
 				{
 					"choice": "Gtk3",
-					"description": "GTK# 3.0 (depricated)"
+					"description": "GTK# 3.0 (deprecated)"
 				}
 			],
 			"replaces": "Gtk"
 		},
-		"Separate": {
+		"Combined": {
 			"type": "parameter",
-			"description": "Use separate projects for each platform.\nDefault is to create a single destkop project that\nbuilds for all platforms",
+			"description": "Use a combined project to launch the application (Full .NET Framework only)",
 			"dataType": "bool",
 			"defaultValue": "false"
 		},
@@ -122,6 +122,10 @@
 			"type": "computed",
 			"value": "(Mode == \"json\")"
 		},
+		"UseCore": {
+			"type": "computed",
+			"value": "(Framework != \"full\")"
+		},
 		"IsWindow": {
 			"type": "computed",
 			"value": "true"
@@ -173,11 +177,11 @@
 					"exclude": [ "**/*.jeto", "**/*.jeto.*" ]
 				},
 				{
-					"condition": "(Separate)",
+					"condition": "(!Combined)",
 					"exclude": [ "**/EtoApp.1.Desktop/**/*" ]
 				},
 				{
-					"condition": "(!Separate)",
+					"condition": "(Combined)",
 					"exclude": [
 						"**/EtoApp.1.Gtk/**/*",
 						"**/EtoApp.1.Mac/**/*",
@@ -185,7 +189,7 @@
 					]
 				},
 				{
-					"condition": "(!IncludeWinForms || !Separate)",
+					"condition": "(!IncludeWinForms || Combined)",
 					"exclude": [
 						"**/EtoApp.1.WinForms/**/*"
 					]
@@ -203,23 +207,23 @@
 		{ "path": "EtoApp.1\\EtoApp.1.fsproj" },
 		{
 			"path": "EtoApp.1.Desktop\\EtoApp.1.Desktop.fsproj",
-			"condition": "(!Separate)"
+			"condition": "(Combined)"
 		},
 		{
 			"path": "EtoApp.1.Gtk\\EtoApp.1.Gtk.fsproj",
-			"condition": "(Separate)"
+			"condition": "(!Combined)"
 		},
 		{
 			"path": "EtoApp.1.Mac\\EtoApp.1.Mac.fsproj",
-			"condition": "(Separate)"
+			"condition": "(!Combined)"
 		},
 		{
 			"path": "EtoApp.1.WinForms\\EtoApp.1.WinForms.fsproj",
-			"condition": "(Separate && IncludeWinForms)"
+			"condition": "(!Combined && IncludeWinForms)"
 		},
 		{
 			"path": "EtoApp.1.Wpf\\EtoApp.1.Wpf.fsproj",
-			"condition": "(Separate)"
+			"condition": "(!Combined)"
 		},
 		{
 			"path": "EtoApp.1.XamMac\\EtoApp.1.XamMac.fsproj",
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Desktop/App.config b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Desktop/App.config
deleted file mode 100644
index 731f6de6c2..0000000000
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Desktop/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.6.1" />
-    </startup>
-</configuration>
\ No newline at end of file
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Desktop/EtoApp.1.Desktop.fsproj b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Desktop/EtoApp.1.Desktop.fsproj
index a57c30c586..6098b13414 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Desktop/EtoApp.1.Desktop.fsproj
+++ b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Desktop/EtoApp.1.Desktop.fsproj
@@ -2,12 +2,10 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(Framework) == 'full'">net461</TargetFramework>
-    <TargetFramework Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFramework>
-    <TargetFrameworks Condition="$(Framework) == '' OR $(Framework) == 'both'">net461;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net461</TargetFrameworks>
     <AssemblySearchPaths Condition="$(GtkVersion)=='Gtk2' or $(GtkVersion)=='Gtk3'">$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <Compile Include="Program.fs" />
   </ItemGroup>
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Desktop/Info.plist b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Desktop/Info.plist
index c38ae55f7b..19afa18f34 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Desktop/Info.plist
+++ b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Desktop/Info.plist
@@ -9,12 +9,12 @@
     <key>CFBundleShortVersionString</key>
     <string>1.0</string>
     <key>LSMinimumSystemVersion</key>
-    <string>10.9</string>
+    <string>10.12</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>en</string>
     <key>NSHumanReadableCopyright</key>
     <string></string>
     <key>CFBundleIconFile</key>
-    <string>MacIcon.icns</string>
+    <string>Icon.icns</string>
   </dict>
 </plist>
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Gtk/App.config b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Gtk/App.config
deleted file mode 100644
index 731f6de6c2..0000000000
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Gtk/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.6.1" />
-    </startup>
-</configuration>
\ No newline at end of file
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Gtk/AssemblyInfo.fs b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Gtk/AssemblyInfo.fs
deleted file mode 100644
index 7d0237ef4f..0000000000
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Gtk/AssemblyInfo.fs
+++ /dev/null
@@ -1,41 +0,0 @@
-namespace EtoApp._1.Gtk
-
-open System.Reflection
-open System.Runtime.CompilerServices
-open System.Runtime.InteropServices
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[<assembly: AssemblyTitle("EtoApp.1.Gtk")>]
-[<assembly: AssemblyDescription("")>]
-[<assembly: AssemblyConfiguration("")>]
-[<assembly: AssemblyCompany("")>]
-[<assembly: AssemblyProduct("EtoApp.1.Gtk")>]
-[<assembly: AssemblyCopyright("Copyright ©  2018")>]
-[<assembly: AssemblyTrademark("")>]
-[<assembly: AssemblyCulture("")>]
-
-// 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)>]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[<assembly: Guid("1cdef6d1-0fed-4c25-9430-3a19778f2ae0")>]
-
-// Version information for an assembly consists of the following four values:
-// 
-//       Major Version
-//       Minor Version 
-//       Build Number
-//       Revision
-// 
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [<assembly: AssemblyVersion("1.0.*")>]
-[<assembly: AssemblyVersion("1.0.0.0")>]
-[<assembly: AssemblyFileVersion("1.0.0.0")>]
-
-do
-    ()
\ No newline at end of file
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj
index f1c3f11b6d..d21b944665 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj
+++ b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(Framework) == 'full'">net461</TargetFramework>
-    <TargetFramework Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFramework>
+    <TargetFrameworks Condition="$(Framework) == 'full'">net461</TargetFrameworks>
+    <TargetFrameworks Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="$(Framework) == '' OR $(Framework) == 'both'">net461;netcoreapp3.1</TargetFrameworks>
     <AssemblySearchPaths Condition="$(GtkVersion)=='Gtk2' or $(GtkVersion)=='Gtk3'">$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>
   </PropertyGroup>
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Gtk/packages.config b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Gtk/packages.config
deleted file mode 100644
index 97398989b3..0000000000
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Gtk/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AtkSharp" version="3.22.24.29" targetFramework="net461" />
-  <package id="CairoSharp" version="3.22.24.29" targetFramework="net461" />
-  <package id="Eto.Forms" version="2.5.0-dev" targetFramework="net461" />
-  <package id="Eto.Platform.Gtk" version="2.5.0-dev" targetFramework="net461" />
-  <package id="GdkSharp" version="3.22.24.29" targetFramework="net461" />
-  <package id="GioSharp" version="3.22.24.29" targetFramework="net461" />
-  <package id="GLibSharp" version="3.22.24.29" targetFramework="net461" />
-  <package id="GtkSharp" version="3.22.25.56" targetFramework="net461" />
-  <package id="PangoSharp" version="3.22.24.29" targetFramework="net461" />
-  <package id="System.ComponentModel" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Mac/EtoApp.1.Mac.fsproj b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Mac/EtoApp.1.Mac.fsproj
index 3116f881e9..1472d52c46 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Mac/EtoApp.1.Mac.fsproj
+++ b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Mac/EtoApp.1.Mac.fsproj
@@ -2,9 +2,11 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(Framework) == 'full'">net461</TargetFramework>
-    <TargetFramework Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFramework>
+    <TargetFrameworks Condition="$(Framework) == 'full'">net461</TargetFrameworks>
+    <TargetFrameworks Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="$(Framework) == '' OR $(Framework) == 'both'">net461;netcoreapp3.1</TargetFrameworks>
+
+    <RuntimeIdentifiers Condition="$(Framework) != 'full'">osx-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Mac/Info.plist b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Mac/Info.plist
index 08c3e82c86..19afa18f34 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Mac/Info.plist
+++ b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Mac/Info.plist
@@ -9,7 +9,7 @@
     <key>CFBundleShortVersionString</key>
     <string>1.0</string>
     <key>LSMinimumSystemVersion</key>
-    <string>10.9</string>
+    <string>10.12</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>en</string>
     <key>NSHumanReadableCopyright</key>
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj
old mode 100644
new mode 100755
index 94e7b70914..10fe801a09
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj
+++ b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(Framework) == 'full'">net461</TargetFramework>
-    <TargetFramework Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFramework>
+    <TargetFrameworks Condition="$(Framework) == 'full'">net461</TargetFrameworks>
+    <TargetFrameworks Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="$(Framework) == '' OR $(Framework) == 'both'">net461;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
@@ -11,11 +11,6 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\EtoApp.1\EtoApp.1.fsproj" />
   </ItemGroup>
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Wpf/EtoApp.1.Wpf.fsproj b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Wpf/EtoApp.1.Wpf.fsproj
old mode 100644
new mode 100755
index 8d2d69fcbf..911da37979
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Wpf/EtoApp.1.Wpf.fsproj
+++ b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.Wpf/EtoApp.1.Wpf.fsproj
@@ -1,9 +1,9 @@
-<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(Framework) == 'full'">net461</TargetFramework>
-    <TargetFramework Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFramework>
+    <TargetFrameworks Condition="$(Framework) == 'full'">net461</TargetFrameworks>
+    <TargetFrameworks Condition="$(Framework) == 'core'">netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="$(Framework) == '' OR $(Framework) == 'both'">net461;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
@@ -11,11 +11,6 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="System.Windows" />
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\EtoApp.1\EtoApp.1.fsproj" />
   </ItemGroup>
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.sln b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.sln
index 79401e4126..7a3f6db40e 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.sln
+++ b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.sln
@@ -1,22 +1,28 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29519.181
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "EtoApp.1", "EtoApp.1\EtoApp.1.fsproj", "{4A7EEA91-18CE-4C33-8501-76049670866D}"
 EndProject
+#if Combined
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "EtoApp.1.Desktop", "EtoApp.1.Desktop\EtoApp.1.Desktop.fsproj", "{90FC5409-708A-49CC-A80E-2C109E168CB8}"
+EndProject
+#else
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "EtoApp.1.Gtk", "EtoApp.1.Gtk\EtoApp.1.Gtk.fsproj", "{F83FE9CE-ACEC-44E7-8C9E-05362F50684E}"
 EndProject
+#if IncludeWinForms
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "EtoApp.1.WinForms", "EtoApp.1.WinForms\EtoApp.1.WinForms.fsproj", "{19712124-C53F-486F-9C88-2BA310B38BE2}"
 EndProject
+#endif
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "EtoApp.1.Mac", "EtoApp.1.Mac\EtoApp.1.Mac.fsproj", "{BCAAFC40-AA8C-4D5A-8DD9-738E2A339097}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "EtoApp.1.Wpf", "EtoApp.1.Wpf\EtoApp.1.Wpf.fsproj", "{7D9523D1-01EC-4E34-A559-03F332E64346}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "EtoApp.1.Desktop", "EtoApp.1.Desktop\EtoApp.1.Desktop.fsproj", "{90FC5409-708A-49CC-A80E-2C109E168CB8}"
-EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "EtoApp.1.XamMac", "EtoApp.1.XamMac\EtoApp.1.XamMac.fsproj", "{05DB20E8-D401-4094-8096-88499C50E28A}"
+#endif
+#if IncludeXamMac
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "EtoApp.1.XamMac", "EtoApp.1.XamMac\EtoApp.1.XamMac.fsproj", "{05DB20E8-D401-4094-8096-88499C50E28A}"
 EndProject
+#endif
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,14 +33,22 @@ Global
 		{4A7EEA91-18CE-4C33-8501-76049670866D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4A7EEA91-18CE-4C33-8501-76049670866D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A7EEA91-18CE-4C33-8501-76049670866D}.Release|Any CPU.Build.0 = Release|Any CPU
+#if Combined
+		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Release|Any CPU.Build.0 = Release|Any CPU
+#else
 		{F83FE9CE-ACEC-44E7-8C9E-05362F50684E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F83FE9CE-ACEC-44E7-8C9E-05362F50684E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F83FE9CE-ACEC-44E7-8C9E-05362F50684E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F83FE9CE-ACEC-44E7-8C9E-05362F50684E}.Release|Any CPU.Build.0 = Release|Any CPU
+#if IncludeWinForms
 		{19712124-C53F-486F-9C88-2BA310B38BE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19712124-C53F-486F-9C88-2BA310B38BE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{19712124-C53F-486F-9C88-2BA310B38BE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19712124-C53F-486F-9C88-2BA310B38BE2}.Release|Any CPU.Build.0 = Release|Any CPU
+#endif
 		{BCAAFC40-AA8C-4D5A-8DD9-738E2A339097}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BCAAFC40-AA8C-4D5A-8DD9-738E2A339097}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BCAAFC40-AA8C-4D5A-8DD9-738E2A339097}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -43,14 +57,13 @@ Global
 		{7D9523D1-01EC-4E34-A559-03F332E64346}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7D9523D1-01EC-4E34-A559-03F332E64346}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D9523D1-01EC-4E34-A559-03F332E64346}.Release|Any CPU.Build.0 = Release|Any CPU
-		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90FC5409-708A-49CC-A80E-2C109E168CB8}.Release|Any CPU.Build.0 = Release|Any CPU
+#endif
+#if IncludeXamMac
 		{05DB20E8-D401-4094-8096-88499C50E28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{05DB20E8-D401-4094-8096-88499C50E28A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{05DB20E8-D401-4094-8096-88499C50E28A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{05DB20E8-D401-4094-8096-88499C50E28A}.Release|Any CPU.Build.0 = Release|Any CPU
+#endif
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj
index 42d9434239..aa815c9cf6 100644
--- a/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj
+++ b/src/Addins/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <DefineConstants Condition="$(Mode)==''">UseCode;IsWindow;IsForm</DefineConstants>
     <UseCode Condition="$(Mode)==''">True</UseCode>
   </PropertyGroup>
diff --git a/src/Eto.Mac/build/BundleDotNetCore.targets b/src/Eto.Mac/build/BundleDotNetCore.targets
index ec0d99fcfd..04ded5ac88 100644
--- a/src/Eto.Mac/build/BundleDotNetCore.targets
+++ b/src/Eto.Mac/build/BundleDotNetCore.targets
@@ -1,58 +1,68 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0" InitialTargets="MacTouchApp">
 
+  
   <PropertyGroup Condition="$(MacBuildBundle) == 'True'">
     <!-- properties you can override in your project file -->
   
     <!-- Set to True to automatically publish the bundle during build -->
     <MacAutoPublishBundle Condition="$(MacAutoPublishBundle) == ''">True</MacAutoPublishBundle>
     
-    <!-- Set the runtime identifier to use for the mac bundle -->
-    <MacBundleRuntimeIdentifier Condition="$(MacBundleRuntimeIdentifier) == ''">osx.10.10-x64</MacBundleRuntimeIdentifier>
-    
     <!-- Set to True to bundle .NET Core runtime, false to use a shared runtime (useful to speed up debug builds) -->
     <MacBundleDotNet Condition="$(MacBundleDotNet) == '' AND $(Configuration) == 'Release'">True</MacBundleDotNet>
     <MacBundleDotNet Condition="$(MacBundleDotNet) == ''">False</MacBundleDotNet>
   </PropertyGroup>
-  
-  <PropertyGroup Condition="$(MacBuildBundle) == 'True'">
-    <RuntimeIdentifiers>$(RuntimeIdentifiers);$(MacBundleRuntimeIdentifier)</RuntimeIdentifiers>
+
+  <ItemGroup Condition="$(MacBundleRuntimeIdentifiers) == ''">
+    <!-- derive our runtime identifiers by the ones in RuntimeIdentifiers, and filter by 'osx' -->
+    <MacBundleRuntimeIdentifiers Include="$(RuntimeIdentifiers)" Condition="$(RuntimeIdentifiers) != ''" />
+    <MacBundleRuntimeIdentifiers Include="$(RuntimeIdentifier)" Condition="$(RuntimeIdentifier) != ''" />
+  </ItemGroup>  
+  <PropertyGroup  Condition="$(MacBundleRuntimeIdentifiers) == ''">
+
   </PropertyGroup>
-  
+  <ItemGroup>
+    <!-- runtime identifiers have been explicitly set -->
+    <MacBundleRuntimeIdentifiers Include="$(MacBundleRuntimeIdentifiers)" Condition="$(MacBundleRuntimeIdentifiers) != ''" />
+  </ItemGroup>
+
   <Target Name="MacTouchApp" Condition="$(MacBuildBundle) == 'True'">
     <!-- This makes it so we can debug in VS for Mac right away without building first -->
-    <MakeDir Directories="$(OutputAppPath)" Condition="$(IsMac) == 'True' AND $(VisualStudioVersion) != '' AND $(TargetFramework) != '' AND $(RuntimeIdentifier) == ''" />
+    <MakeDir Directories="$(OutputAppPath)" Condition="$(IsMac) == 'True' AND $(VisualStudioVersion) != '' AND $(TargetFramework) != '' AND $(RuntimeIdentifier) != ''" />
   </Target>
   
   <!-- Build target to automatically publish -->
   <Target Name="MacBuildAppBundle" AfterTargets="AfterBuild" Condition="$(MacAutoPublishBundle) == 'True' AND $(MacIsBuildingBundle) != 'True'" Outputs="$(OutputAppPath)">
+    <Error Text="No RuntimeIdentifiers or MacRuntimeIdentifiers have been specified" Condition="@(MacBundleRuntimeIdentifiers->Count()) == 0" />
     <PropertyGroup>
       <MacTempBuildPath>$(IntermediateOutputPath)macbuild\</MacTempBuildPath>
       
       <MacBuildProperties>MacIsBuildingBundle=True</MacBuildProperties>
-      <MacBuildProperties>$(MacBuildProperties);RuntimeIdentifier=$(MacBundleRuntimeIdentifier)</MacBuildProperties>
       <MacBuildProperties>$(MacBuildProperties);TargetFramework=$(TargetFramework)</MacBuildProperties>
       <MacBuildProperties Condition="$(PublishSingleFile) == '' AND $(Configuration) == 'Release'">$(MacBuildProperties);PublishSingleFile=True</MacBuildProperties>
       <MacBuildProperties Condition="$(PublishTrimmed) == '' AND $(Configuration) == 'Release'">$(MacBuildProperties);PublishTrimmed=True</MacBuildProperties>
       <MacBuildProperties>$(MacBuildProperties);SelfContained=$(MacBundleDotNet)</MacBuildProperties>
-      <MacBuildProperties>$(MacBuildProperties);OutputAppPath=$(OutputAppPath)</MacBuildProperties>
-      <MacBuildProperties>$(MacBuildProperties);MacOutputPath=$(MacTempBuildPath)bin\</MacBuildProperties>
-      <MacBuildProperties>$(MacBuildProperties);PublishDir=$(MacTempBuildPath)publish\</MacBuildProperties>
-      
+      <MacBuildProperties>$(MacBuildProperties);MacTempBuildPath=$(MacTempBuildPath)</MacBuildProperties>
+      <MacBuildProperties>$(MacBuildProperties);MacOutputPath=$(OutputPath)</MacBuildProperties>
+      <MacBuildProperties Condition="@(MacBundleRuntimeIdentifiers->Count()) > 1">$(MacBuildProperties);MacAppendRuntimeIdentifierToOutputPath=True</MacBuildProperties>
+
       <_MacPublishTarget Condition="$(MacBundleDotNet) == 'True'">Publish</_MacPublishTarget>
       <_MacPublishTarget Condition="$(_MacPublishTarget) == ''">Build</_MacPublishTarget>
     </PropertyGroup>
-    <!--Projects="$(MSBuildProjectFullPath)" Targets="Restore" Properties="$(MacBuildProperties);_RestoreEnforceEvaluate=True" /-->
-    <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="$(_MacPublishTarget)" Properties="$(MacBuildProperties)" />
+    
+    <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="$(_MacPublishTarget)"
+             Properties="$(MacBuildProperties);RuntimeIdentifier=%(MacBundleRuntimeIdentifiers.Identity)"
+             Condition="$([System.String]::Copy(%(MacBundleRuntimeIdentifiers.Identity)).StartsWith('osx'))" />
   </Target>
 
-  <Target Name="MacCleanAppBundle" AfterTargets="AfterClean">
-    <RemoveDir Directories="$(OutputAppPath);$(MacTempBuildPath)" />
+  <Target Name="MacCleanAppBundle" AfterTargets="AfterClean" Condition="$(MacBuildBundle) == 'True'">
+    <RemoveDir Directories="$(MacTempBuildPath)" />
   </Target>
   
   <!-- Bundle using a system shared runtime -->
   <Target Name="MacBuildAppBundleWithoutRuntime" AfterTargets="AfterBuild" Condition="$(MacBundleDotNet) != 'True' AND $(MacIsBuildingBundle) == 'True'" DependsOnTargets="MacInitializeBundle">
     <ItemGroup>
       <LauncherFiles Include="$(TargetDir)**\*" />
+      <LauncherFiles Remove="$(TargetDir)**\*.pdb" Condition="$(MacIncludeSymbols) != 'True'" />
     </ItemGroup>
     
     <!-- copy executable and all files which need to be in the same folder -->
@@ -66,7 +76,7 @@
   <Target Name="MacPublishAppBundle" AfterTargets="Publish" Condition="$(MacBuildBundle) == 'True'" DependsOnTargets="MacInitializeBundle">
     <ItemGroup>
       <LauncherFiles Include="$(PublishDir)**\*" />
-      <LauncherFiles Remove="$(PublishDir)**\*.pdb" Condition="$(MacIncludeSymbols) == 'True'" />
+      <LauncherFiles Remove="$(PublishDir)**\*.pdb" Condition="$(MacIncludeSymbols) != 'True'" />
     </ItemGroup>
     
     <!-- copy executable and all files which need to be in the same folder -->
diff --git a/src/Eto.Mac/build/Mac.props b/src/Eto.Mac/build/Mac.props
index 96e5819d5d..99ce3d2342 100644
--- a/src/Eto.Mac/build/Mac.props
+++ b/src/Eto.Mac/build/Mac.props
@@ -5,7 +5,14 @@
     <IsMac Condition="$(OS) == 'Unix' and Exists('/usr/lib/libc.dylib')">True</IsMac>
     <IsUnix Condition="$(OS) == 'Unix'">True</IsUnix>
     <IsWindows Condition="$(IsUnix) != 'True'">True</IsWindows>
-    <OutputPath Condition="$(MacOutputPath) != ''">$(MacOutputPath)</OutputPath>
+  </PropertyGroup>
+  
+  <!-- for .NET Core publishing -->
+  <PropertyGroup Condition="$(MacIsBuildingBundle) == 'True' AND $(MacOutputPath) != ''">
+    <BaseOutputAppPath>$(MacOutputPath)</BaseOutputAppPath>
+    <BaseOutputAppPath Condition="$(MacAppendRuntimeIdentifierToOutputPath) == 'True'">$(BaseOutputAppPath)$(RuntimeIdentifier)\</BaseOutputAppPath>
+    <OutputPath>$(MacTempBuildPath)bin\</OutputPath>
+    <PublishDir>$(MacTempBuildPath)publish\</PublishDir>
   </PropertyGroup>
   
   <Import Project="$(MSBuildThisFileDirectory)MSBuildTaskHelper.props" Condition="'$(MSBuildTaskHelpersImported)'!='true'"/>
diff --git a/src/Eto.Mac/build/Mac.targets b/src/Eto.Mac/build/Mac.targets
index 18687fad73..bd2b2aa538 100644
--- a/src/Eto.Mac/build/Mac.targets
+++ b/src/Eto.Mac/build/Mac.targets
@@ -13,6 +13,7 @@
     <BaseOutputAppPath Condition="$(BaseOutputAppPath) == ''">bin\</BaseOutputAppPath>
     <BaseOutputAppPath>$(BaseOutputAppPath)$(Configuration)\</BaseOutputAppPath>
     <BaseOutputAppPath Condition="$(AppendTargetFrameworkToOutputPath) != 'False' AND $(TargetFramework) != ''">$(BaseOutputAppPath)$(TargetFramework)\</BaseOutputAppPath>
+    <BaseOutputAppPath Condition="$(AppendRuntimeIdentifierToOutputPath) == 'True' AND $(RuntimeIdentifer) != ''">$(BaseOutputAppPath)$(RuntimeIdentifer)\</BaseOutputAppPath>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -33,8 +34,8 @@
     -->
     <MacSetDefaultRunConfiguration Condition="'$(MacSetDefaultRunConfiguration)' == ''">True</MacSetDefaultRunConfiguration>
     
-    <!-- Specifies the full output .app path -->
-    <OutputAppPath Condition="'$(OutputAppPath)'=='' AND $(BaseOutputAppPath) != ''">$(BaseOutputAppPath)$(MacBundleName).app</OutputAppPath>
+    <!-- Specifies the full output .app path.  When building for more than one runtime identifier, this is ignored. -->
+    <OutputAppPath Condition="'$(OutputAppPath)'=='' AND $(BaseOutputAppPath) != ''">$(BaseOutputAppPath)$(MacBundleName).app\</OutputAppPath>
     
   </PropertyGroup>
 
@@ -249,7 +250,7 @@
     <Copy SourceFiles="$(ReferenceFiles)Icon.icns" DestinationFiles="$(OutputResourcesPath)\$(IconFile)" Condition="!Exists('$(OutputResourcesPath)\$(IconFile)')" />
 
     <!-- Set executable bit on launcher if on *nix -->
-    <Exec Command="chmod +x &quot;$(LauncherFileWithPath)&quot;" Condition="'$(OS)'=='Unix'" />
+    <Exec Command="chmod +x &quot;$(LauncherFileWithPath)&quot;" Condition="'$(OS)'=='Unix'" EchoOff="True" />
   </Target>
   
   <Import Project="BundleMono.targets" Condition="$(MacUseDotNetCore) != 'True' AND $(MacBuildBundle) == 'True'" />
diff --git a/test/Eto.Test.Mac/Eto.Test.Mac64.csproj b/test/Eto.Test.Mac/Eto.Test.Mac64.csproj
index b2985761f9..473e2ebf4c 100644
--- a/test/Eto.Test.Mac/Eto.Test.Mac64.csproj
+++ b/test/Eto.Test.Mac/Eto.Test.Mac64.csproj
@@ -1,12 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
+  
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props"/>
+  
+  <Import Project="..\..\build\MSBuildTaskHelper.props" Condition="'$(MSBuildTaskHelpersImported)'!='true'"/>
+  <Import Project="..\..\src\Eto.Mac\build\Mac.props" Condition="'$(ExcludeRestorePackageImports)' != 'true'" />
+  
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
     <OutputType>WinExe</OutputType>
+    
+    <RuntimeIdentifiers>osx-x64</RuntimeIdentifiers>
   </PropertyGroup>
+  
   <ItemGroup Condition="$(TargetFramework) == 'net461'">
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\..\src\Eto\Eto.csproj" />
     <ProjectReference Include="..\..\src\Eto.Mac\Eto.Mac64.csproj" />
@@ -19,7 +29,9 @@
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-
-  <Import Project="$(BuildDir)\Common.Mac.targets" />
+  
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets"/>
+  
+  <Import Project="..\..\src\Eto.Mac\build\Mac.targets" Condition="'$(ExcludeRestorePackageImports)' != 'true'" />
   
 </Project>
\ No newline at end of file