diff --git a/QRCoder.Xaml/QRCoder.Xaml.csproj b/QRCoder.Xaml/QRCoder.Xaml.csproj
index 0c9d7229..94c720c0 100644
--- a/QRCoder.Xaml/QRCoder.Xaml.csproj
+++ b/QRCoder.Xaml/QRCoder.Xaml.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;net5.0-windows;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net40;net5.0-windows;net6.0-windows</TargetFrameworks>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <!-- <UseWindowsForms Condition="'$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0-windows'">true</UseWindowsForms> -->
 	<UseWPF Condition="'$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0-windows'">true</UseWPF>
diff --git a/QRCoder/ArtQRCode.cs b/QRCoder/ArtQRCode.cs
index c1964c93..f09591f1 100644
--- a/QRCoder/ArtQRCode.cs
+++ b/QRCoder/ArtQRCode.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
+#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET5_0_WINDOWS || NET6_0 || NET6_0_WINDOWS
 
 using System;
 using System.Drawing;
diff --git a/QRCoder/Base64QRCode.cs b/QRCoder/Base64QRCode.cs
index 539af073..e3a2cf26 100644
--- a/QRCoder/Base64QRCode.cs
+++ b/QRCoder/Base64QRCode.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
+#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET5_0_WINDOWS || NET6_0 || NET6_0_WINDOWS
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
diff --git a/QRCoder/PdfByteQRCode.cs b/QRCoder/PdfByteQRCode.cs
index 22549797..140d961d 100644
--- a/QRCoder/PdfByteQRCode.cs
+++ b/QRCoder/PdfByteQRCode.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
+#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET5_0_WINDOWS || NET6_0 || NET6_0_WINDOWS
 using System;
 using System.Collections.Generic;
 using System.Drawing.Imaging;
diff --git a/QRCoder/PostscriptQRCode.cs b/QRCoder/PostscriptQRCode.cs
index 710551d1..e541d4d8 100644
--- a/QRCoder/PostscriptQRCode.cs
+++ b/QRCoder/PostscriptQRCode.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
+#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET5_0_WINDOWS || NET6_0 || NET6_0_WINDOWS
 using System;
 using System.Drawing;
 using static QRCoder.QRCodeGenerator;
diff --git a/QRCoder/QRCode.cs b/QRCoder/QRCode.cs
index 3fac751e..4222a5fd 100644
--- a/QRCoder/QRCode.cs
+++ b/QRCoder/QRCode.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
+#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET5_0_WINDOWS || NET6_0 || NET6_0_WINDOWS
 using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
diff --git a/QRCoder/QRCoder.csproj b/QRCoder/QRCoder.csproj
index d67a7989..c3c5816c 100644
--- a/QRCoder/QRCoder.csproj
+++ b/QRCoder/QRCoder.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;netstandard1.3;netstandard2.0;net5.0;net5.0-windows;net6.0;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard1.3;netstandard2.0;net5.0;net5.0-windows;net6.0;net6.0-windows;</TargetFrameworks>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <DefineConstants Condition="'$(TargetFramework)' == 'net5.0-windows'">$(DefineConstants);NET5_0_WINDOWS</DefineConstants>
 	  <DefineConstants Condition="'$(TargetFramework)' == 'net6.0-windows'">$(DefineConstants);NET6_0_WINDOWS</DefineConstants>
@@ -16,7 +16,7 @@
   <PropertyGroup>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <PackageId>QRCoder</PackageId>
-    <Version>1.4.3</Version>
+    <Version>1.4.4</Version>
     <Authors>Raffael Herrmann</Authors>
     <PackageOwners>Raffael Herrmann</PackageOwners>
     <AssemblyName>QRCoder</AssemblyName>
@@ -48,9 +48,9 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net5.0-windows' ">
     <PackageReference Include="System.Drawing.Common" Version="5.0.3" />
   </ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
-		<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-	</ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net6.0-windows' ">
+	<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+  </ItemGroup>
 
   <PropertyGroup>
     <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
diff --git a/QRCoder/SvgQRCode.cs b/QRCoder/SvgQRCode.cs
index e03ce5dc..8cae0414 100644
--- a/QRCoder/SvgQRCode.cs
+++ b/QRCoder/SvgQRCode.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
+#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET5_0_WINDOWS || NET6_0 || NET6_0_WINDOWS
 using QRCoder.Extensions;
 using System;
 using System.Collections;
diff --git a/QRCoderTests/QRCoderTests.csproj b/QRCoderTests/QRCoderTests.csproj
index 3f1aa274..c65ac58a 100644
--- a/QRCoderTests/QRCoderTests.csproj
+++ b/QRCoderTests/QRCoderTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net35;net452;netcoreapp1.1;netcoreapp2.0;net5.0;net5.0-windows;net6.0;net6.0-windows</TargetFrameworks>
+		<TargetFrameworks>net452;netcoreapp1.1;netcoreapp2.0;net5.0;net5.0-windows;net6.0;net6.0-windows</TargetFrameworks>
 		<UseWindowsForms Condition="'$(TargetFramework)' == 'net5.0-windows'">true</UseWindowsForms>
 		<UseWPF Condition="'$(TargetFramework)' == 'net5.0-windows'">true</UseWPF>
 		<DefineConstants Condition="'$(TargetFramework)' == 'net5.0-windows'">$(DefineConstants);NET5_0_WINDOWS</DefineConstants>