diff --git a/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Data/DevExpress.DevAV.Data.csproj b/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Data/DevExpress.DevAV.Data.csproj
index 05721a6..54e6983 100644
--- a/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Data/DevExpress.DevAV.Data.csproj
+++ b/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Data/DevExpress.DevAV.Data.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>True</UseWindowsForms>
     <OutputType>Library</OutputType>
     <EnableDefaultItems>false</EnableDefaultItems>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Reports/DevExpress.DevAV.Reports.csproj b/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Reports/DevExpress.DevAV.Reports.csproj
index 3a0853e..555d81c 100644
--- a/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Reports/DevExpress.DevAV.Reports.csproj
+++ b/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Reports/DevExpress.DevAV.Reports.csproj
@@ -2,6 +2,8 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Library</OutputType>
+    <UseWPF>True</UseWPF>
+    <UseWindowsForms>True</UseWindowsForms>
     <EnableDefaultItems>false</EnableDefaultItems>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/DevExpress.OutlookInspiredApp.csproj b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/DevExpress.OutlookInspiredApp.csproj
index 7309aef..62eaa3a 100644
--- a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/DevExpress.OutlookInspiredApp.csproj
+++ b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/DevExpress.OutlookInspiredApp.csproj
@@ -2,7 +2,8 @@
   <PropertyGroup>
     <ProjectGuid>{3932816E-D0B4-08A9-2715-8D5B7DC201D8}</ProjectGuid>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-	<OutputType>WinExe</OutputType>
+    <UseWindowsForms>True</UseWindowsForms>
+	  <OutputType>WinExe</OutputType>
     <EnableDefaultItems>False</EnableDefaultItems>
     <Configurations>Debug;Release</Configurations>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
@@ -156,9 +157,7 @@
     <Compile Include="Modules\Customers\CustomerView.Designer.cs">
       <DependentUpon>CustomerView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Modules\Employees\EmployeeMailMerge.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="Modules\Employees\EmployeeMailMerge.cs" />
     <Compile Include="Modules\Employees\EmployeeMailMerge.Designer.cs">
       <DependentUpon>EmployeeMailMerge.cs</DependentUpon>
     </Compile>
@@ -240,9 +239,7 @@
     <Compile Include="Modules\Sales\QuickReportView\OrderDocQuickReportView.Designer.cs">
       <DependentUpon>OrderDocQuickReportView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Modules\Sales\OrderMailMerge.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="Modules\Sales\OrderMailMerge.cs" />
     <Compile Include="Modules\Sales\OrderMailMerge.Designer.cs">
       <DependentUpon>OrderMailMerge.cs</DependentUpon>
     </Compile>