diff --git a/I3DShapesTool.Lib/I3DShapesTool.Lib.csproj b/I3DShapesTool.Lib/I3DShapesTool.Lib.csproj
index 99f5ab7..b01628f 100644
--- a/I3DShapesTool.Lib/I3DShapesTool.Lib.csproj
+++ b/I3DShapesTool.Lib/I3DShapesTool.Lib.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
+	<Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/I3DShapesTool/I3DShapesTool.csproj b/I3DShapesTool/I3DShapesTool.csproj
index f4791ee..cbf8ffb 100644
--- a/I3DShapesTool/I3DShapesTool.csproj
+++ b/I3DShapesTool/I3DShapesTool.csproj
@@ -2,13 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
     <PublishSingleFile>true</PublishSingleFile>
     <PublishTrimmed>true</PublishTrimmed>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 
     <Authors>Donkie</Authors>
+
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/I3DShapesTool/Properties/PublishProfiles/FolderProfile.pubxml b/I3DShapesTool/Properties/PublishProfiles/FolderProfile.pubxml
index 519faa4..b1868d2 100644
--- a/I3DShapesTool/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/I3DShapesTool/Properties/PublishProfiles/FolderProfile.pubxml
@@ -6,10 +6,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <PublishDir>bin\Release\netcoreapp2.0\publish\</PublishDir>
+    <Platform>x86</Platform>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <PublishDir>bin\Release\netcoreapp3.1\publish\</PublishDir>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+    <SelfContained>true</SelfContained>
+    <PublishReadyToRun>False</PublishReadyToRun>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/I3DShapesToolTest/I3DShapesToolTest.csproj b/I3DShapesToolTest/I3DShapesToolTest.csproj
index 4be6f43..d71a53d 100644
--- a/I3DShapesToolTest/I3DShapesToolTest.csproj
+++ b/I3DShapesToolTest/I3DShapesToolTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>