diff --git a/CSJ2K/CSJ2K.csproj b/CSJ2K/CSJ2K.csproj
index 8d294d59..ef4d4e06 100644
--- a/CSJ2K/CSJ2K.csproj
+++ b/CSJ2K/CSJ2K.csproj
@@ -61,6 +61,6 @@
     </PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ZKWeb.System.Drawing" Version="4.0.0" />
+    <PackageReference Include="CoreCompat.System.Drawing.v2" Version="5.2.0-preview1-r131" Condition="'$(TargetFrameworkVersion)' == 'netstandard2.0'" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/CSJ2K/J2KEncoder.cs b/CSJ2K/J2KEncoder.cs
index 5d8ea1bd..18890d30 100644
--- a/CSJ2K/J2KEncoder.cs
+++ b/CSJ2K/J2KEncoder.cs
@@ -1,7 +1,7 @@
 #region Using Statements
 using System;
 using System.Collections.Generic;
-using System.DrawingCore;
+using System.Drawing;
 using System.IO;
 using CSJ2K.j2k.quantization.quantizer;
 using CSJ2K.j2k.image.forwcomptransf;
diff --git a/CSJ2K/Util/BitmapImage.cs b/CSJ2K/Util/BitmapImage.cs
index 386e8e26..88b76bbf 100644
--- a/CSJ2K/Util/BitmapImage.cs
+++ b/CSJ2K/Util/BitmapImage.cs
@@ -3,8 +3,8 @@
 
 namespace CSJ2K.Util
 {
-    using System.DrawingCore;
-    using System.DrawingCore.Imaging;
+    using System.Drawing;
+    using System.Drawing.Imaging;
 
     internal class BitmapImage : ImageBase<Image>
     {
diff --git a/CSJ2K/Util/BitmapImageSource.cs b/CSJ2K/Util/BitmapImageSource.cs
index 7495dbc4..5c9047a2 100644
--- a/CSJ2K/Util/BitmapImageSource.cs
+++ b/CSJ2K/Util/BitmapImageSource.cs
@@ -6,8 +6,8 @@ namespace CSJ2K.Util
     using System;
 
     using System.Linq;
-    using System.DrawingCore;
-    using System.DrawingCore.Imaging;
+    using System.Drawing;
+    using System.Drawing.Imaging;
     using CSJ2K.j2k.image;
 
     internal class BitmapImageSource : PortableImageSource
diff --git a/CSJ2K/j2k/image/input/ImgReaderGDI.cs b/CSJ2K/j2k/image/input/ImgReaderGDI.cs
index ff6d9a91..fc00ee55 100644
--- a/CSJ2K/j2k/image/input/ImgReaderGDI.cs
+++ b/CSJ2K/j2k/image/input/ImgReaderGDI.cs
@@ -7,8 +7,8 @@
 * */
 
 using System;
-using System.DrawingCore;
-using System.DrawingCore.Imaging;
+using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using CSJ2K.j2k.image;
 using CSJ2K.j2k.io;
diff --git a/LibreMetaverse.GUI/MiniMap.cs b/LibreMetaverse.GUI/MiniMap.cs
index b21f02ee..e3dd8bac 100644
--- a/LibreMetaverse.GUI/MiniMap.cs
+++ b/LibreMetaverse.GUI/MiniMap.cs
@@ -26,7 +26,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.DrawingCore;
+using System.Drawing;
 using System.Windows.Forms;
 using OpenMetaverse.Imaging;
 using OpenMetaverse.Assets;
@@ -91,7 +91,7 @@ namespace OpenMetaverse.GUI
                 {
                     Bitmap bmp = new Bitmap(256, 256);
                     Graphics g = Graphics.FromImage(bmp);
-                    g.Clear((System.DrawingCore.Color)(object)this.BackColor); // *HACK:
+                    g.Clear((System.Drawing.Color)(object)this.BackColor); // *HACK:
                     g.FillRectangle(BG_COLOR, 0f, 0f, 256f, 256f);
                     g.DrawImage(bmp, 0, 0);
 
diff --git a/LibreMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs b/LibreMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs
index 8ee3492f..4983e9f3 100644
--- a/LibreMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs
+++ b/LibreMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs
@@ -33,7 +33,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.DrawingCore;
+using System.Drawing;
 using System.IO;
 using OpenMetaverse.StructuredData;
 using PrimMesher;
diff --git a/LibreMetaverse.Rendering.Simple/SimpleRenderer.cs b/LibreMetaverse.Rendering.Simple/SimpleRenderer.cs
index a987df66..df0663c8 100644
--- a/LibreMetaverse.Rendering.Simple/SimpleRenderer.cs
+++ b/LibreMetaverse.Rendering.Simple/SimpleRenderer.cs
@@ -25,7 +25,7 @@
  */
 
 using System;
-using System.DrawingCore;
+using System.Drawing;
 using System.Collections.Generic;
 
 namespace OpenMetaverse.Rendering
diff --git a/LibreMetaverse/Imaging/BakeLayer.cs b/LibreMetaverse/Imaging/BakeLayer.cs
index 85430a6e..e7b0716b 100644
--- a/LibreMetaverse/Imaging/BakeLayer.cs
+++ b/LibreMetaverse/Imaging/BakeLayer.cs
@@ -28,7 +28,7 @@ using System;
 using System.Reflection;
 using System.Collections.Generic;
 using System.IO;
-using System.DrawingCore;
+using System.Drawing;
 using OpenMetaverse.Assets;
 using log4net;
 
diff --git a/LibreMetaverse/Imaging/ManagedImage.cs b/LibreMetaverse/Imaging/ManagedImage.cs
index 97bf1414..6be4144e 100644
--- a/LibreMetaverse/Imaging/ManagedImage.cs
+++ b/LibreMetaverse/Imaging/ManagedImage.cs
@@ -25,8 +25,8 @@
  */
 
 using System;
-using System.DrawingCore;
-using System.DrawingCore.Imaging;
+using System.Drawing;
+using System.Drawing.Imaging;
 
 namespace OpenMetaverse.Imaging
 {
diff --git a/LibreMetaverse/Imaging/OpenJPEG.cs b/LibreMetaverse/Imaging/OpenJPEG.cs
index aa3d9514..b687f9fe 100644
--- a/LibreMetaverse/Imaging/OpenJPEG.cs
+++ b/LibreMetaverse/Imaging/OpenJPEG.cs
@@ -25,10 +25,10 @@
  */
 
 using System;
-using System.DrawingCore;
-using System.DrawingCore.Imaging;
+using System.Drawing;
+using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
-using Rectangle = System.DrawingCore.Rectangle;
+using Rectangle = System.Drawing.Rectangle;
 
 namespace OpenMetaverse.Imaging
 {
diff --git a/LibreMetaverse/Imaging/TGALoader.cs b/LibreMetaverse/Imaging/TGALoader.cs
index 553549c1..36af43b1 100644
--- a/LibreMetaverse/Imaging/TGALoader.cs
+++ b/LibreMetaverse/Imaging/TGALoader.cs
@@ -25,8 +25,8 @@
  */
 
 using System;
-using System.DrawingCore;
-using System.DrawingCore.Imaging;
+using System.Drawing;
+using System.Drawing.Imaging;
 
 namespace OpenMetaverse.Imaging
 {
diff --git a/LibreMetaverse/ImportExport/ColladalLoader.cs b/LibreMetaverse/ImportExport/ColladalLoader.cs
index 69ea6eff..a54103b9 100644
--- a/LibreMetaverse/ImportExport/ColladalLoader.cs
+++ b/LibreMetaverse/ImportExport/ColladalLoader.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using System.IO;
 using System.Xml;
-using System.DrawingCore;
-using System.DrawingCore.Drawing2D;
+using System.Drawing;
+using System.Drawing.Drawing2D;
 using System.Linq;
 using System.Xml.Serialization;
 using OpenMetaverse.ImportExport.Collada14;
diff --git a/LibreMetaverse/Interfaces/IRendering.cs b/LibreMetaverse/Interfaces/IRendering.cs
index 653bd161..ade34f6f 100644
--- a/LibreMetaverse/Interfaces/IRendering.cs
+++ b/LibreMetaverse/Interfaces/IRendering.cs
@@ -26,7 +26,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.DrawingCore;
+using System.Drawing;
 
 namespace OpenMetaverse.Rendering
 {
diff --git a/LibreMetaverse/LibreMetaverse.csproj b/LibreMetaverse/LibreMetaverse.csproj
index 38405f78..d0bced09 100644
--- a/LibreMetaverse/LibreMetaverse.csproj
+++ b/LibreMetaverse/LibreMetaverse.csproj
@@ -10,7 +10,7 @@
     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>LibreMetaverse</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -52,9 +52,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ComponentAce.Compression.Libs.zlib" Version="1.0.4" />
+    <PackageReference Include="CoreCompat.System.Drawing.v2" Version="5.2.0-preview1-r131" Condition="'$(TargetFrameworkVersion)' == 'netstandard2.0'" />
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="XmlRpcCS" Version="2.1.1.2" />
-    <PackageReference Include="ZKWeb.System.Drawing" Version="4.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LibreMetaverse.StructuredData\LibreMetaverse.StructuredData.csproj" />
diff --git a/LibreMetaverse/Logger.cs b/LibreMetaverse/Logger.cs
index 2db6107b..48ac55f0 100644
--- a/LibreMetaverse/Logger.cs
+++ b/LibreMetaverse/Logger.cs
@@ -25,9 +25,10 @@
  */
 
 using System;
+using System.Reflection;
 using log4net;
+using log4net.Appender;
 using log4net.Config;
-using log4net.Repository;
 
 [assembly: XmlConfigurator(Watch = true)]
 
@@ -58,13 +59,13 @@ namespace OpenMetaverse
         /// </summary>
         static Logger()
         {
-            LogInstance = LogManager.GetLogger(Type.GetType("OpenMetaverse"));
+            LogInstance = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
             // If error level reporting isn't enabled we assume no logger is configured and initialize a default
             // ConsoleAppender
             if (!LogInstance.Logger.IsEnabledFor(log4net.Core.Level.Error))
             {
-                var appender = new log4net.Appender.ConsoleAppender
+                IAppender appender = new ConsoleAppender
                 {
                     Layout = new log4net.Layout.PatternLayout("%timestamp [%thread] %-5level - %message%newline")
                 };
diff --git a/PrimMesher/LibreMetaverse.PrimMesher.csproj b/PrimMesher/LibreMetaverse.PrimMesher.csproj
index 1dd0e2de..104c3fb9 100644
--- a/PrimMesher/LibreMetaverse.PrimMesher.csproj
+++ b/PrimMesher/LibreMetaverse.PrimMesher.csproj
@@ -30,6 +30,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ZKWeb.System.Drawing" Version="4.0.0" />
+    <PackageReference Include="CoreCompat.System.Drawing.v2" Version="5.2.0-preview1-r131" Condition="'$(TargetFrameworkVersion)' == 'netstandard2.0'" />
   </ItemGroup>
 </Project>
diff --git a/PrimMesher/SculptMap.cs b/PrimMesher/SculptMap.cs
index cd3b7e14..7cee8d8a 100644
--- a/PrimMesher/SculptMap.cs
+++ b/PrimMesher/SculptMap.cs
@@ -27,8 +27,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.DrawingCore;
-using System.DrawingCore.Drawing2D;
+using System.Drawing;
+using System.Drawing.Drawing2D;
 
 namespace PrimMesher
 {
diff --git a/PrimMesher/SculptMesh.cs b/PrimMesher/SculptMesh.cs
index 5b7a0861..a1e6a9ac 100644
--- a/PrimMesher/SculptMesh.cs
+++ b/PrimMesher/SculptMesh.cs
@@ -27,8 +27,8 @@
 
 using System.Collections.Generic;
 using System.IO;
-using System.DrawingCore;
-using Color = System.DrawingCore.Color;
+using System.Drawing;
+using Color = System.Drawing.Color;
 
 namespace PrimMesher
 {
diff --git a/Programs/Baker/Baker.csproj b/Programs/Baker/Baker.csproj
index 3b3bc81f..e1f17687 100644
--- a/Programs/Baker/Baker.csproj
+++ b/Programs/Baker/Baker.csproj
@@ -59,9 +59,6 @@
 	  <NoWarn>1591,1574,0419</NoWarn>
 	  <PlatformTarget>AnyCPU</PlatformTarget>
 	</PropertyGroup>
-	<ItemGroup>
-	  <PackageReference Include="ZKWeb.System.Drawing" Version="4.0.0" />
-	</ItemGroup>
 	<ItemGroup>
 	  <Reference Include="System">
 		  <Name>System</Name>
diff --git a/Programs/Baker/Oven.cs b/Programs/Baker/Oven.cs
index e1512e96..00028e05 100644
--- a/Programs/Baker/Oven.cs
+++ b/Programs/Baker/Oven.cs
@@ -1,5 +1,5 @@
 using System;
-using System.DrawingCore;
+using System.Drawing;
 using System.Runtime.InteropServices;
 
 namespace Baker
diff --git a/Programs/Baker/frmBaker.cs b/Programs/Baker/frmBaker.cs
index a3400c4c..a930f22b 100644
--- a/Programs/Baker/frmBaker.cs
+++ b/Programs/Baker/frmBaker.cs
@@ -1,5 +1,5 @@
 using System;
-using System.DrawingCore;
+using System.Drawing;
 using System.Windows.Forms;
 using System.IO;
 using OpenMetaverse.Imaging;
@@ -33,7 +33,7 @@ namespace Baker
                 //ManagedImage managedImage = new ManagedImage(AlphaMask);
 
                 // FIXME: Operate on ManagedImage instead of Bitmap
-                pic1.Image = (System.Drawing.Bitmap)(object)Oven.ModifyAlphaMask(_alphaMask, (byte)scrollWeight.Value, 0.0f); // *HACK:
+                pic1.Image = Oven.ModifyAlphaMask(_alphaMask, (byte)scrollWeight.Value, 0.0f); // *HACK:
             }
             else
             {
@@ -44,7 +44,7 @@ namespace Baker
 
         private void scrollWeight_Scroll(object sender, ScrollEventArgs e)
         {
-            pic1.Image = (System.Drawing.Bitmap)(object)Oven.ModifyAlphaMask(_alphaMask, (byte)scrollWeight.Value, 0.0f); // *HACK:
+            pic1.Image = (Image)Oven.ModifyAlphaMask(_alphaMask, (byte)scrollWeight.Value, 0.0f); // *HACK:
         }
 
         private void frmBaker_FormClosing(object sender, FormClosingEventArgs e)
diff --git a/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs b/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs
index fb4653bf..c359423b 100644
--- a/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs
+++ b/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
-using System.DrawingCore;
-using System.DrawingCore.Drawing2D;
+using System.Drawing;
+using System.Drawing.Drawing2D;
 using OpenMetaverse.Imaging;
 
 namespace OpenMetaverse.TestClient