diff --git a/.gitignore b/.gitignore
index ce3a150ad..4686d3375 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ x64/
 .builds
 
 # Visual C++ cache files
+.vs/
 ipch/
 *.aps
 *.ncb
@@ -107,4 +108,4 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 
-*.DotSettings
\ No newline at end of file
+*.DotSettings
diff --git a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
index ef0fd7acc..34754ddae 100644
--- a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
+++ b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
@@ -1,90 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CA249F5D-9285-40A6-B217-5889EF79FD7E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RootNamespace>TheArtOfDev.HtmlRenderer.PdfSharp</RootNamespace>
     <AssemblyName>HtmlRenderer.PdfSharp</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="PdfSharp, Version=1.50.4000.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="PdfSharp.Charting, Version=1.50.4000.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.Charting.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Adapters\BrushAdapter.cs" />
-    <Compile Include="Adapters\FontAdapter.cs" />
-    <Compile Include="Adapters\FontFamilyAdapter.cs" />
-    <Compile Include="Adapters\GraphicsAdapter.cs" />
-    <Compile Include="Adapters\GraphicsPathAdapter.cs" />
-    <Compile Include="Adapters\ImageAdapter.cs" />
-    <Compile Include="Adapters\PenAdapter.cs" />
-    <Compile Include="Adapters\XTextureBrush.cs" />
-    <Compile Include="PdfGenerateConfig.cs" />
-    <Compile Include="HtmlContainer.cs" />
-    <Compile Include="PdfGenerator.cs" />
-    <Compile Include="Adapters\PdfSharpAdapter.cs" />
-    <Compile Include="Utilities\Utils.cs" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\HtmlRenderer\HtmlRenderer.csproj">
-      <Project>{fe611685-391f-4e3e-b27e-d3150e51e49b}</Project>
-      <Name>HtmlRenderer</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\HtmlRenderer\HtmlRenderer.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <Reference Include="PdfSharp">
+      <HintPath>..\..\..\PDFsharp\src\PdfSharp.Charting\bin\Release\netcoreapp3.1\PdfSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="PdfSharp.Charting">
+      <HintPath>..\..\..\PDFsharp\src\PdfSharp.Charting\bin\Release\netcoreapp3.1\PdfSharp.Charting.dll</HintPath>
+    </Reference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/Source/HtmlRenderer/Core/Utils/CssConstants.cs b/Source/HtmlRenderer/Core/Utils/CssConstants.cs
index 655849256..612f013a9 100644
--- a/Source/HtmlRenderer/Core/Utils/CssConstants.cs
+++ b/Source/HtmlRenderer/Core/Utils/CssConstants.cs
@@ -164,6 +164,6 @@ internal static class CssConstants
         /// <summary>
         /// Default font used for the generic 'serif' family
         /// </summary>
-        public const string DefaultFont = "Segoe UI";
+        public const string DefaultFont = "Arial";
     }
 }
\ No newline at end of file
diff --git a/Source/HtmlRenderer/HtmlRenderer.csproj b/Source/HtmlRenderer/HtmlRenderer.csproj
index 74549b41d..4a220d390 100644
--- a/Source/HtmlRenderer/HtmlRenderer.csproj
+++ b/Source/HtmlRenderer/HtmlRenderer.csproj
@@ -1,129 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{FE611685-391F-4E3E-B27E-D3150E51E49B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TheArtOfDev.HtmlRenderer</RootNamespace>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>HtmlRenderer</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <RootNamespace>TheArtOfDev.HtmlRenderer</RootNamespace>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Core\Utils\ImageError.png" />
-    <EmbeddedResource Include="Core\Utils\ImageLoad.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Core\CssDefaults.cs" />
-    <Compile Include="Core\Dom\CssBox.cs" />
-    <Compile Include="Core\Dom\CssBoxFrame.cs" />
-    <Compile Include="Core\Dom\CssBoxHr.cs" />
-    <Compile Include="Core\Dom\CssBoxImage.cs" />
-    <Compile Include="Core\Dom\CssBoxProperties.cs" />
-    <Compile Include="Core\Dom\CssLayoutEngine.cs" />
-    <Compile Include="Core\Dom\CssLayoutEngineTable.cs" />
-    <Compile Include="Core\Dom\CssLength.cs" />
-    <Compile Include="Core\Dom\CssLineBox.cs" />
-    <Compile Include="Core\Dom\CssRect.cs" />
-    <Compile Include="Core\Dom\CssRectImage.cs" />
-    <Compile Include="Core\Dom\CssRectWord.cs" />
-    <Compile Include="Core\Dom\CssSpacingBox.cs" />
-    <Compile Include="Core\Dom\CssUnit.cs" />
-    <Compile Include="Core\Dom\HoverBoxBlock.cs" />
-    <Compile Include="Core\Dom\HtmlTag.cs" />
-    <Compile Include="Core\Dom\Border.cs" />
-    <Compile Include="Core\Entities\CssBlock.cs" />
-    <Compile Include="Core\Entities\CssBlockSelectorItem.cs" />
-    <Compile Include="Core\Entities\HtmlGenerationStyle.cs" />
-    <Compile Include="Core\Entities\HtmlImageLoadEventArgs.cs" />
-    <Compile Include="Core\Entities\HtmlLinkClickedEventArgs.cs" />
-    <Compile Include="Core\Entities\HtmlLinkClickedException.cs" />
-    <Compile Include="Core\Entities\HtmlRefreshEventArgs.cs" />
-    <Compile Include="Core\Entities\HtmlRenderErrorEventArgs.cs" />
-    <Compile Include="Core\Entities\HtmlRenderErrorType.cs" />
-    <Compile Include="Core\Entities\HtmlScrollEventArgs.cs" />
-    <Compile Include="Core\Entities\HtmlStylesheetLoadEventArgs.cs" />
-    <Compile Include="Core\Entities\LinkElementData.cs" />
-    <Compile Include="Core\Handlers\BackgroundImageDrawHandler.cs" />
-    <Compile Include="Core\Handlers\BordersDrawHandler.cs" />
-    <Compile Include="Core\Handlers\ContextMenuHandler.cs" />
-    <Compile Include="Core\Handlers\FontsHandler.cs" />
-    <Compile Include="Core\Handlers\ImageDownloader.cs" />
-    <Compile Include="Core\Handlers\ImageLoadHandler.cs" />
-    <Compile Include="Core\Handlers\SelectionHandler.cs" />
-    <Compile Include="Core\Handlers\StylesheetLoadHandler.cs" />
-    <Compile Include="Core\HtmlRendererUtils.cs" />
-    <Compile Include="Core\Parse\CssParser.cs" />
-    <Compile Include="Core\Parse\CssValueParser.cs" />
-    <Compile Include="Core\Parse\DomParser.cs" />
-    <Compile Include="Core\Parse\HtmlParser.cs" />
-    <Compile Include="Core\Parse\RegexParserUtils.cs" />
-    <Compile Include="Core\Utils\ArgChecker.cs" />
-    <Compile Include="Core\Utils\CommonUtils.cs" />
-    <Compile Include="Core\Utils\CssConstants.cs" />
-    <Compile Include="Core\Utils\CssUtils.cs" />
-    <Compile Include="Core\Utils\DomUtils.cs" />
-    <Compile Include="Core\Utils\HtmlConstants.cs" />
-    <Compile Include="Core\Utils\HtmlUtils.cs" />
-    <Compile Include="Core\Utils\RenderUtils.cs" />
-    <Compile Include="Core\HtmlContainerInt.cs" />
-    <Compile Include="Core\CssData.cs" />
-    <Compile Include="Adapters\Entities\RColor.cs" />
-    <Compile Include="Adapters\Entities\RDashStyle.cs" />
-    <Compile Include="Adapters\Entities\RFontStyle.cs" />
-    <Compile Include="Adapters\Entities\RKeyEvent.cs" />
-    <Compile Include="Adapters\Entities\RMouseEvent.cs" />
-    <Compile Include="Adapters\Entities\RPoint.cs" />
-    <Compile Include="Adapters\Entities\RRect.cs" />
-    <Compile Include="Adapters\Entities\RSize.cs" />
-    <Compile Include="Adapters\RAdapter.cs" />
-    <Compile Include="Adapters\RBrush.cs" />
-    <Compile Include="Adapters\RContextMenu.cs" />
-    <Compile Include="Adapters\RControl.cs" />
-    <Compile Include="Adapters\RFont.cs" />
-    <Compile Include="Adapters\RFontFamily.cs" />
-    <Compile Include="Adapters\RGraphics.cs" />
-    <Compile Include="Adapters\RGraphicsPath.cs" />
-    <Compile Include="Adapters\RImage.cs" />
-    <Compile Include="Adapters\RPen.cs" />
-    <Compile Include="Core\Utils\SubString.cs" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/Source/Writable-HtmlRenderer.sln b/Source/Writable-HtmlRenderer.sln
new file mode 100644
index 000000000..c52e286b6
--- /dev/null
+++ b/Source/Writable-HtmlRenderer.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29926.136
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HtmlRenderer", "HtmlRenderer\HtmlRenderer.csproj", "{FE611685-391F-4E3E-B27E-D3150E51E49B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlRenderer.PdfSharp", "HtmlRenderer.PdfSharp\HtmlRenderer.PdfSharp.csproj", "{CA249F5D-9285-40A6-B217-5889EF79FD7E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C87AC291-13C2-494A-BBED-68908F972D50}
+	EndGlobalSection
+EndGlobal