diff --git a/.gitmodules b/.gitmodules
index eb4f031..2bc37d4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "litehtml"]
 	path = litehtml
-	url = https://github.com/litehtml/litehtml.git
+	url = tig:tig/litehtml.git
diff --git a/Example.Wpf/Example.Wpf.csproj b/Example.Wpf/Example.Wpf.csproj
index 2c3bfc2..6331efd 100644
--- a/Example.Wpf/Example.Wpf.csproj
+++ b/Example.Wpf/Example.Wpf.csproj
@@ -35,6 +35,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="LiteHtmlSharp.WPF">
+      <HintPath>..\LiteHtmlSharp.Wpf\bin\Debug\net45\LiteHtmlSharp.WPF.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
@@ -95,12 +98,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\LiteHtmlSharp.Wpf\LiteHtmlSharp.Wpf.csproj">
-      <Project>{e1b78fe5-a0b8-4250-bfb5-f604f22550e2}</Project>
-      <Name>LiteHtmlSharp.Wpf</Name>
-    </ProjectReference>
-  </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.
diff --git a/Example.Wpf/Example.Wpf.sln b/Example.Wpf/Example.Wpf.sln
new file mode 100644
index 0000000..af8aefc
--- /dev/null
+++ b/Example.Wpf/Example.Wpf.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29521.150
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example.Wpf", "Example.Wpf.csproj", "{33B4D9F4-0DFE-4A85-9289-227BFC64ACBF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{33B4D9F4-0DFE-4A85-9289-227BFC64ACBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33B4D9F4-0DFE-4A85-9289-227BFC64ACBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33B4D9F4-0DFE-4A85-9289-227BFC64ACBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33B4D9F4-0DFE-4A85-9289-227BFC64ACBF}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {10B2808D-C8D0-4058-9720-CE2AB6F32503}
+	EndGlobalSection
+EndGlobal
diff --git a/Example.Wpf/MainWindow.xaml.cs b/Example.Wpf/MainWindow.xaml.cs
index 819e4f5..a2b63b0 100644
--- a/Example.Wpf/MainWindow.xaml.cs
+++ b/Example.Wpf/MainWindow.xaml.cs
@@ -1,6 +1,7 @@
-using LiteHtmlSharp.Wpf;
+using LiteHtmlSharp.Wpf;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -18,136 +19,142 @@
 
 namespace Example.Wpf
 {
-   /// <summary>
-   /// Interaction logic for MainWindow.xaml
-   /// </summary>
-   public partial class MainWindow : Window
-   {
-      WpfContainer _litehtmlContainer;
-      LiteHtmlPanel _liteHtmlPanel;
-      HttpClient _httpClient;
-      string _lastUrl;
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        WpfContainer _litehtmlContainer;
+        LiteHtmlPanel _liteHtmlPanel;
+        HttpClient _httpClient;
+        string _lastUrl;
 
-      public MainWindow()
-      {
-         InitializeComponent();
-         var masterCss = IncludedMasterCss.CssString;
+        public MainWindow()
+        {
+            InitializeComponent();
+            var masterCss = IncludedMasterCss.CssString;
 
-         _httpClient = new HttpClient();
+            _httpClient = new HttpClient();
 
-         _litehtmlContainer = new WpfContainer(masterCss, GetResourceString, GetResourceBytes);
-         _liteHtmlPanel = new LiteHtmlPanel(ScrollViewer, _litehtmlContainer);
-         _liteHtmlPanel.LinkClicked += LiteHtmlPanel_LinkClicked;
-         _liteHtmlPanel.LoadHtml(@"
-            <html>
-               <head></head>
-               <body>
-                  <div><a href='http://www.google.com'>google.com</a></div>
-                  <div><a href='http://www.pingplotter.com'>pingplotter.com</a></div>
-                  <br />
-                  <div style='width:100px; height:100px; background-color:red'></div>
-                  <p>
-                     Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam auctor nisi quis ultrices scelerisque. 
-                     Mauris imperdiet vehicula metus quis bibendum. Maecenas non erat quis est imperdiet vehicula. Proin 
-                     scelerisque mauris purus, elementum sodales tellus imperdiet id. Vivamus luctus lorem nec augue 
-                     porttitor, eu mattis nisl laoreet. Cras fringilla vel purus ut imperdiet. Donec luctus finibus elit, 
-                     eu elementum purus cursus a. Suspendisse mollis tristique leo a auctor. Vivamus pulvinar pretium 
-                     elementum. Donec purus sapien, consequat laoreet eros viverra, laoreet pulvinar ligula. Sed faucibus 
-                     nisl odio, sed facilisis odio scelerisque ut.
-                  </p>
-                  <p>
-                     Nullam dapibus enim vel tortor luctus molestie. Vestibulum non sagittis leo, non vulputate magna. 
-                     Aliquam erat volutpat. Nulla hendrerit vel metus nec condimentum. Sed aliquet purus id ipsum interdum 
-                     ullamcorper. Nullam congue luctus urna eu bibendum. Morbi non tellus turpis. Mauris nec dui in massa 
-                     facilisis imperdiet. Proin metus purus, imperdiet ac laoreet vel, elementum ac nulla. Vivamus dolor 
-                     tellus, blandit auctor elementum id, mattis consequat tellus. Vivamus id maximus felis. Praesent 
-                     aliquet augue id metus rutrum maximus. Etiam et nulla eu lectus efficitur elementum. Integer porttitor 
-                     quis erat sit amet feugiat. In id magna mollis, viverra nibh at, sollicitudin leo.
-                  </p>
-               </body>
-            </html>
-         ");
-      }
+            _litehtmlContainer = new WpfContainer(masterCss, GetResourceString, GetResourceBytes);
+            _liteHtmlPanel = new LiteHtmlPanel(ScrollViewer, _litehtmlContainer);
+            _liteHtmlPanel.LinkClicked += LiteHtmlPanel_LinkClicked;
+            using (var reader = new StreamReader(@"C:\Users\ckindel\source\winprint\tests\Home.html", Encoding.UTF8))
+            {
+                _liteHtmlPanel.LoadHtml(reader.ReadToEnd());
+            }
+            //   _liteHtmlPanel.LoadHtml(@"
+            //   <html>
+            //      <head></head>
+            //      <body>
+            //         <div><a href='http://www.google.com'>google.com</a></div>
+            //         <div><a href='http://www.pingplotter.com'>pingplotter.com</a></div>
+            //         <br />
+            //         <div style='width:100px; height:100px; background-color:red'></div>
+            //         <p>
+            //            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam auctor nisi quis ultrices scelerisque. 
+            //            Mauris imperdiet vehicula metus quis bibendum. Maecenas non erat quis est imperdiet vehicula. Proin 
+            //            scelerisque mauris purus, elementum sodales tellus imperdiet id. Vivamus luctus lorem nec augue 
+            //            porttitor, eu mattis nisl laoreet. Cras fringilla vel purus ut imperdiet. Donec luctus finibus elit, 
+            //            eu elementum purus cursus a. Suspendisse mollis tristique leo a auctor. Vivamus pulvinar pretium 
+            //            elementum. Donec purus sapien, consequat laoreet eros viverra, laoreet pulvinar ligula. Sed faucibus 
+            //            nisl odio, sed facilisis odio scelerisque ut.
+            //         </p>
+            //         <p>
+            //            Nullam dapibus enim vel tortor luctus molestie. Vestibulum non sagittis leo, non vulputate magna. 
+            //            Aliquam erat volutpat. Nulla hendrerit vel metus nec condimentum. Sed aliquet purus id ipsum interdum 
+            //            ullamcorper. Nullam congue luctus urna eu bibendum. Morbi non tellus turpis. Mauris nec dui in massa 
+            //            facilisis imperdiet. Proin metus purus, imperdiet ac laoreet vel, elementum ac nulla. Vivamus dolor 
+            //            tellus, blandit auctor elementum id, mattis consequat tellus. Vivamus id maximus felis. Praesent 
+            //            aliquet augue id metus rutrum maximus. Etiam et nulla eu lectus efficitur elementum. Integer porttitor 
+            //            quis erat sit amet feugiat. In id magna mollis, viverra nibh at, sollicitudin leo.
+            //         </p>
+            //      </body>
+            //   </html>
+            //");
+        }
 
-      private void LiteHtmlPanel_LinkClicked(string url)
-      {
-         if (url.StartsWith("http:") || url.StartsWith("https:"))
-         {
-            _lastUrl = url;
-         }
-         else
-         {
-            var builder = new UriBuilder(_lastUrl);
-            builder.Path = url;
-            _lastUrl = builder.ToString();
-         }
-         try
-         {
-            var pageContent = _httpClient.GetStringAsync(_lastUrl).Result;
-            _liteHtmlPanel.LoadHtml(pageContent);
-         }
-         catch (Exception ex)
-         {
-            MessageBox.Show("Error loading page. " + (ex.InnerException ?? ex).Message);
-         }
-      }
+        private void LiteHtmlPanel_LinkClicked(string url)
+        {
+            if (url.StartsWith("http:") || url.StartsWith("https:"))
+            {
+                _lastUrl = url;
+            }
+            else
+            {
+                var builder = new UriBuilder(_lastUrl);
+                builder.Path = url;
+                _lastUrl = builder.ToString();
+            }
+            try
+            {
+                var pageContent = _httpClient.GetStringAsync(_lastUrl).Result;
+                _liteHtmlPanel.LoadHtml(pageContent);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("Error loading page. " + (ex.InnerException ?? ex).Message);
+            }
+        }
 
-      public byte[] GetResourceBytes(string resource)
-      {
-         if (string.IsNullOrWhiteSpace(resource))
-         {
-            return new byte[0];
-         }
+        public byte[] GetResourceBytes(string resource)
+        {
+            if (string.IsNullOrWhiteSpace(resource))
+            {
+                return new byte[0];
+            }
 
-         try
-         {
-            var url = GetUrlForRequest(resource);
-            return _httpClient.GetByteArrayAsync(url).Result;
-         }
-         catch
-         {
-            return null;
-         }
-      }
+            try
+            {
+                var url = GetUrlForRequest(resource);
+                return _httpClient.GetByteArrayAsync(url).Result;
+            }
+            catch
+            {
+                return null;
+            }
+        }
 
-      public string GetResourceString(string resource)
-      {
-         if (string.IsNullOrWhiteSpace(resource))
-         {
-            return string.Empty;
-         }
-         try
-         {
-            var url = GetUrlForRequest(resource);
-            return _httpClient.GetStringAsync(url).Result;
-         }
-         catch
-         {
-            return null;
-         }
-      }
+        public string GetResourceString(string resource)
+        {
+            if (string.IsNullOrWhiteSpace(resource))
+            {
+                return string.Empty;
+            }
+            try
+            {
+                var url = GetUrlForRequest(resource);
+                string data = _httpClient.GetStringAsync(url).Result;
+                return data;
+            }
+            catch (Exception e)
+            {
+                Debug.WriteLine($"GetResourceString({resource} - {e.Message}");
+                return null;
+            }
+        }
 
-      string GetUrlForRequest(string resource)
-      {
-         try
-         {
-            UriBuilder urlBuilder;
-            if (resource.StartsWith("//") || resource.StartsWith("http:") || resource.StartsWith("https:"))
+        string GetUrlForRequest(string resource)
+        {
+            try
             {
-               urlBuilder = new UriBuilder(resource.TrimStart(new char[] { '/' }));
+                UriBuilder urlBuilder;
+                if (resource.StartsWith("//") || resource.StartsWith("http:") || resource.StartsWith("https:"))
+                {
+                    urlBuilder = new UriBuilder(resource.TrimStart(new char[] { '/' }));
+                }
+                else
+                {
+                    urlBuilder = new UriBuilder(_lastUrl);
+                    urlBuilder.Path = resource;
+                }
+                var requestUrl = urlBuilder.ToString();
+                return requestUrl;
             }
-            else
+            catch
             {
-               urlBuilder = new UriBuilder(_lastUrl);
-               urlBuilder.Path = resource;
+                return null;
             }
-            var requestUrl = urlBuilder.ToString();
-            return requestUrl;
-         }
-         catch
-         {
-            return null;
-         }
-      }
-   }
+        }
+    }
 }
diff --git a/LiteHtmlLib/LiteHtmlLib.sln b/LiteHtmlLib/LiteHtmlLib.sln
new file mode 100644
index 0000000..2aea54a
--- /dev/null
+++ b/LiteHtmlLib/LiteHtmlLib.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29521.150
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LiteHtmlLib", "LiteHtmlLib.vcxproj", "{2E1F5B1E-430B-4FFF-963C-92229154F261}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2E1F5B1E-430B-4FFF-963C-92229154F261}.Debug|x64.ActiveCfg = Debug|x64
+		{2E1F5B1E-430B-4FFF-963C-92229154F261}.Debug|x64.Build.0 = Debug|x64
+		{2E1F5B1E-430B-4FFF-963C-92229154F261}.Debug|x86.ActiveCfg = Debug|Win32
+		{2E1F5B1E-430B-4FFF-963C-92229154F261}.Debug|x86.Build.0 = Debug|Win32
+		{2E1F5B1E-430B-4FFF-963C-92229154F261}.Release|x64.ActiveCfg = Release|x64
+		{2E1F5B1E-430B-4FFF-963C-92229154F261}.Release|x64.Build.0 = Release|x64
+		{2E1F5B1E-430B-4FFF-963C-92229154F261}.Release|x86.ActiveCfg = Release|Win32
+		{2E1F5B1E-430B-4FFF-963C-92229154F261}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {E1E7AFBD-7694-4B66-8C60-0D9D8A15DC2E}
+	EndGlobalSection
+EndGlobal
diff --git a/LiteHtmlLib/LiteHtmlLib.vcxproj b/LiteHtmlLib/LiteHtmlLib.vcxproj
index 1d6ba2c..3b23290 100644
--- a/LiteHtmlLib/LiteHtmlLib.vcxproj
+++ b/LiteHtmlLib/LiteHtmlLib.vcxproj
@@ -22,32 +22,32 @@
     <ProjectGuid>{2E1F5B1E-430B-4FFF-963C-92229154F261}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>LiteHtmlLib</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -70,20 +70,20 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\Release\x86\</OutDir>
+    <OutDir>.\bin\Debug\win-x86\</OutDir>
     <IntDir>.\Build\x86\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>.\Release\x64\</OutDir>
+    <OutDir>.\bin\Debug\win-x64\</OutDir>
     <IntDir>.\Build\x64\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>.\bin\Release\win-x86\</OutDir>
-    <IntDir>.\obj\win-x86\</IntDir>
+    <IntDir>.\Build\x86\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>.\bin\Release\win-x64\</OutDir>
-    <IntDir>.\obj\win-x64\</IntDir>
+    <IntDir>.\Build\x64\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -92,7 +92,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_UNICODE;UNICODE;LITEHTML_UTF8;WIN32;_DEBUG;_WINDOWS;_USRDLL;LITEHTMLLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\litehtml\src;..\litehtml\src\gumbo;..\LiteHtmlLib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\litehtml\include\litehtml;..\litehtml\src;..\litehtml\src\gumbo\include;..\litehtml\src\gumbo\include\gumbo;..\litehtml\src\gumbo\visualc\include;..\LiteHtmlLib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -108,7 +108,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_UNICODE;UNICODE;LITEHTML_UTF8;_DEBUG;WIN32;_WINDOWS;_USRDLL;LITEHTMLLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\litehtml\src;..\litehtml\src\gumbo;..\LiteHtmlLib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\litehtml\include\litehtml;..\litehtml\src;..\litehtml\src\gumbo\include;..\litehtml\src\gumbo\include\gumbo;..\litehtml\src\gumbo\visualc\include;..\LiteHtmlLib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
@@ -125,7 +125,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;LITEHTML_UTF8;WIN32;NDEBUG;_WINDOWS;_USRDLL;LITEHTMLLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\litehtml\src;..\litehtml\src\gumbo;..\LiteHtmlLib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\litehtml\include\litehtml;..\litehtml\src;..\litehtml\src\gumbo\include;..\litehtml\src\gumbo\include\gumbo;..\litehtml\src\gumbo\visualc\include;..\LiteHtmlLib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -146,7 +146,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;LITEHTML_UTF8;WIN32;NDEBUG;_WINDOWS;_USRDLL;LITEHTMLLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\litehtml\src;..\litehtml\src\gumbo;..\LiteHtmlLib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\litehtml\include\litehtml;..\litehtml\src;..\litehtml\src\gumbo\include;..\litehtml\src\gumbo\include\gumbo;..\litehtml\src\gumbo\visualc\include;..\LiteHtmlLib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <OmitFramePointers>false</OmitFramePointers>
@@ -158,80 +158,10 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <Text Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\litehtml\src\attributes.h" />
-    <ClInclude Include="..\litehtml\src\background.h" />
-    <ClInclude Include="..\litehtml\src\borders.h" />
-    <ClInclude Include="..\litehtml\src\box.h" />
-    <ClInclude Include="..\litehtml\src\context.h" />
-    <ClInclude Include="..\litehtml\src\css_length.h" />
-    <ClInclude Include="..\litehtml\src\css_margins.h" />
-    <ClInclude Include="..\litehtml\src\css_offsets.h" />
-    <ClInclude Include="..\litehtml\src\css_position.h" />
-    <ClInclude Include="..\litehtml\src\css_selector.h" />
-    <ClInclude Include="..\litehtml\src\document.h" />
-    <ClInclude Include="..\litehtml\src\element.h" />
-    <ClInclude Include="..\litehtml\src\el_anchor.h" />
-    <ClInclude Include="..\litehtml\src\el_base.h" />
-    <ClInclude Include="..\litehtml\src\el_before_after.h" />
-    <ClInclude Include="..\litehtml\src\el_body.h" />
-    <ClInclude Include="..\litehtml\src\el_break.h" />
-    <ClInclude Include="..\litehtml\src\el_cdata.h" />
-    <ClInclude Include="..\litehtml\src\el_comment.h" />
-    <ClInclude Include="..\litehtml\src\el_div.h" />
-    <ClInclude Include="..\litehtml\src\el_font.h" />
-    <ClInclude Include="..\litehtml\src\el_image.h" />
-    <ClInclude Include="..\litehtml\src\el_link.h" />
-    <ClInclude Include="..\litehtml\src\el_para.h" />
-    <ClInclude Include="..\litehtml\src\el_script.h" />
-    <ClInclude Include="..\litehtml\src\el_space.h" />
-    <ClInclude Include="..\litehtml\src\el_style.h" />
-    <ClInclude Include="..\litehtml\src\el_table.h" />
-    <ClInclude Include="..\litehtml\src\el_td.h" />
-    <ClInclude Include="..\litehtml\src\el_text.h" />
-    <ClInclude Include="..\litehtml\src\el_title.h" />
-    <ClInclude Include="..\litehtml\src\el_tr.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\attribute.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\char_ref.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\error.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\gumbo.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\insertion_mode.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\parser.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\strings.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\string_buffer.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\string_piece.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\tag_enum.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\tag_gperf.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\tag_sizes.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\tag_strings.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\tokenizer.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\tokenizer_states.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\token_type.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\utf8.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\util.h" />
-    <ClInclude Include="..\litehtml\src\gumbo\vector.h" />
-    <ClInclude Include="..\litehtml\src\html.h" />
-    <ClInclude Include="..\litehtml\src\html_tag.h" />
-    <ClInclude Include="..\litehtml\src\iterators.h" />
-    <ClInclude Include="..\litehtml\src\media_query.h" />
-    <ClInclude Include="..\litehtml\src\os_types.h" />
-    <ClInclude Include="..\litehtml\src\style.h" />
-    <ClInclude Include="..\litehtml\src\stylesheet.h" />
-    <ClInclude Include="..\litehtml\src\table.h" />
-    <ClInclude Include="..\litehtml\src\types.h" />
-    <ClInclude Include="..\litehtml\src\utf8_strings.h" />
-    <ClInclude Include="..\litehtml\src\web_color.h" />
-    <ClInclude Include="src\CallbackDelegates.h" />
-    <ClInclude Include="src\DocContainer.h" />
-    <ClInclude Include="src\Globals.h" />
-    <ClInclude Include="src\TagElement.h" />
-  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\litehtml\src\background.cpp" />
     <ClCompile Include="..\litehtml\src\box.cpp" />
+    <ClCompile Include="..\litehtml\src\codepoint.cpp" />
     <ClCompile Include="..\litehtml\src\context.cpp" />
     <ClCompile Include="..\litehtml\src\css_length.cpp" />
     <ClCompile Include="..\litehtml\src\css_selector.cpp" />
@@ -247,6 +177,7 @@
     <ClCompile Include="..\litehtml\src\el_div.cpp" />
     <ClCompile Include="..\litehtml\src\el_font.cpp" />
     <ClCompile Include="..\litehtml\src\el_image.cpp" />
+    <ClCompile Include="..\litehtml\src\el_li.cpp" />
     <ClCompile Include="..\litehtml\src\el_link.cpp" />
     <ClCompile Include="..\litehtml\src\el_para.cpp" />
     <ClCompile Include="..\litehtml\src\el_script.cpp" />
@@ -272,9 +203,14 @@
     <ClCompile Include="..\litehtml\src\html_tag.cpp" />
     <ClCompile Include="..\litehtml\src\iterators.cpp" />
     <ClCompile Include="..\litehtml\src\media_query.cpp" />
+    <ClCompile Include="..\litehtml\src\num_cvt.cpp" />
+    <ClCompile Include="..\litehtml\src\strtod.cpp" />
     <ClCompile Include="..\litehtml\src\style.cpp" />
     <ClCompile Include="..\litehtml\src\stylesheet.cpp" />
     <ClCompile Include="..\litehtml\src\table.cpp" />
+    <ClCompile Include="..\litehtml\src\tstring_view.cpp" />
+    <ClCompile Include="..\litehtml\src\url.cpp" />
+    <ClCompile Include="..\litehtml\src\url_path.cpp" />
     <ClCompile Include="..\litehtml\src\utf8_strings.cpp" />
     <ClCompile Include="..\litehtml\src\web_color.cpp" />
     <ClCompile Include="src\dllmain.cpp" />
@@ -282,9 +218,15 @@
     <ClCompile Include="src\Globals.cpp" />
     <ClCompile Include="src\TagElement.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\litehtml\include\litehtml.h" />
+    <ClInclude Include="src\CallbackDelegates.h" />
+    <ClInclude Include="src\DocContainer.h" />
+    <ClInclude Include="src\Globals.h" />
+    <ClInclude Include="src\TagElement.h" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="..\litehtml\src\gumbo\char_ref.rl" />
-    <None Include="..\litehtml\src\gumbo\tag.in" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/LiteHtmlLib/LiteHtmlLib.vcxproj.filters b/LiteHtmlLib/LiteHtmlLib.vcxproj.filters
index 1272f1a..00c6eca 100644
--- a/LiteHtmlLib/LiteHtmlLib.vcxproj.filters
+++ b/LiteHtmlLib/LiteHtmlLib.vcxproj.filters
@@ -18,195 +18,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Text Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\litehtml\src\media_query.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\os_types.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\style.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\stylesheet.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\table.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\types.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\utf8_strings.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\web_color.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\attributes.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\background.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\borders.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\box.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\context.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\css_length.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\css_margins.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\css_offsets.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\css_position.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\css_selector.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\document.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_anchor.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_base.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_before_after.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_body.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_break.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_cdata.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_comment.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_div.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_font.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_image.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_link.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_para.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_script.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_space.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_style.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_table.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_td.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_text.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_title.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\el_tr.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\element.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\html.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\html_tag.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\iterators.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\attribute.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\char_ref.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\error.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\gumbo.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\insertion_mode.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\parser.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\string_buffer.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\string_piece.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\strings.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\tag_enum.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\tag_gperf.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\tag_sizes.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\tag_strings.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\token_type.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\tokenizer.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\tokenizer_states.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\utf8.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\util.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\litehtml\src\gumbo\vector.h">
-      <Filter>litehtml_src</Filter>
-    </ClInclude>
     <ClInclude Include="src\DocContainer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -219,25 +30,22 @@
     <ClInclude Include="src\CallbackDelegates.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\litehtml\include\litehtml.h">
+      <Filter>litehtml_src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\litehtml\src\media_query.cpp">
-      <Filter>litehtml_src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\litehtml\src\style.cpp">
-      <Filter>litehtml_src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\litehtml\src\stylesheet.cpp">
-      <Filter>litehtml_src</Filter>
+    <ClCompile Include="src\dllmain.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\litehtml\src\table.cpp">
-      <Filter>litehtml_src</Filter>
+    <ClCompile Include="src\DocContainer.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\litehtml\src\utf8_strings.cpp">
-      <Filter>litehtml_src</Filter>
+    <ClCompile Include="src\Globals.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\litehtml\src\web_color.cpp">
-      <Filter>litehtml_src</Filter>
+    <ClCompile Include="src\TagElement.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\litehtml\src\background.cpp">
       <Filter>litehtml_src</Filter>
@@ -245,6 +53,9 @@
     <ClCompile Include="..\litehtml\src\box.cpp">
       <Filter>litehtml_src</Filter>
     </ClCompile>
+    <ClCompile Include="..\litehtml\src\codepoint.cpp">
+      <Filter>litehtml_src</Filter>
+    </ClCompile>
     <ClCompile Include="..\litehtml\src\context.cpp">
       <Filter>litehtml_src</Filter>
     </ClCompile>
@@ -287,6 +98,9 @@
     <ClCompile Include="..\litehtml\src\el_image.cpp">
       <Filter>litehtml_src</Filter>
     </ClCompile>
+    <ClCompile Include="..\litehtml\src\el_li.cpp">
+      <Filter>litehtml_src</Filter>
+    </ClCompile>
     <ClCompile Include="..\litehtml\src\el_link.cpp">
       <Filter>litehtml_src</Filter>
     </ClCompile>
@@ -329,6 +143,39 @@
     <ClCompile Include="..\litehtml\src\iterators.cpp">
       <Filter>litehtml_src</Filter>
     </ClCompile>
+    <ClCompile Include="..\litehtml\src\media_query.cpp">
+      <Filter>litehtml_src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\litehtml\src\num_cvt.cpp">
+      <Filter>litehtml_src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\litehtml\src\strtod.cpp">
+      <Filter>litehtml_src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\litehtml\src\style.cpp">
+      <Filter>litehtml_src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\litehtml\src\stylesheet.cpp">
+      <Filter>litehtml_src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\litehtml\src\table.cpp">
+      <Filter>litehtml_src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\litehtml\src\tstring_view.cpp">
+      <Filter>litehtml_src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\litehtml\src\url.cpp">
+      <Filter>litehtml_src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\litehtml\src\url_path.cpp">
+      <Filter>litehtml_src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\litehtml\src\utf8_strings.cpp">
+      <Filter>litehtml_src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\litehtml\src\web_color.cpp">
+      <Filter>litehtml_src</Filter>
+    </ClCompile>
     <ClCompile Include="..\litehtml\src\gumbo\attribute.c">
       <Filter>litehtml_src</Filter>
     </ClCompile>
@@ -362,25 +209,10 @@
     <ClCompile Include="..\litehtml\src\gumbo\vector.c">
       <Filter>litehtml_src</Filter>
     </ClCompile>
-    <ClCompile Include="src\dllmain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DocContainer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Globals.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TagElement.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\litehtml\src\gumbo\char_ref.rl">
       <Filter>litehtml_src</Filter>
     </None>
-    <None Include="..\litehtml\src\gumbo\tag.in">
-      <Filter>litehtml_src</Filter>
-    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/LiteHtmlLib/bin/Release/win-x64/LiteHtmlLib.dll b/LiteHtmlLib/bin/Release/win-x64/LiteHtmlLib.dll
deleted file mode 100644
index ee40dd5..0000000
Binary files a/LiteHtmlLib/bin/Release/win-x64/LiteHtmlLib.dll and /dev/null differ
diff --git a/LiteHtmlLib/bin/Release/win-x86/LiteHtmlLib.dll b/LiteHtmlLib/bin/Release/win-x86/LiteHtmlLib.dll
deleted file mode 100644
index 2425fc0..0000000
Binary files a/LiteHtmlLib/bin/Release/win-x86/LiteHtmlLib.dll and /dev/null differ
diff --git a/LiteHtmlLib/lib_dylib/CMakeLists.txt b/LiteHtmlLib/lib_dylib/CMakeLists.txt
index 041adf2..e037234 100644
--- a/LiteHtmlLib/lib_dylib/CMakeLists.txt
+++ b/LiteHtmlLib/lib_dylib/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.8)
 
 project(litehtml)
 
-set(CMAKE_CXX_FLAGS "-arch i386 -arch x86_64 -std=c++11 -stdlib=libc++ -O3 -fms-extensions")
-set(CMAKE_C_FLAGS "-arch i386 -arch x86_64 -std=c99 -O3 -fms-extensions")
+set(CMAKE_CXX_FLAGS "-std=c++11 -O3 -fms-extensions")
+set(CMAKE_C_FLAGS "-std=c99 -O3 -fms-extensions")
 
 set(SOURCE_LITEHTMLLIB 
                     ../../src/dllmain.cpp
@@ -12,7 +12,8 @@ set(SOURCE_LITEHTMLLIB
                     ../../src/TagElement.cpp
 )
 
-set(SOURCE_LITEHTML ../../../litehtml/src/background.cpp
+set(SOURCE_LITEHTML 
+                    ../../../litehtml/src/background.cpp
                     ../../../litehtml/src/box.cpp
                     ../../../litehtml/src/context.cpp
                     ../../../litehtml/src/css_length.cpp
@@ -64,3 +65,4 @@ set(SOURCE_GUMBO    ../../../litehtml/src/gumbo/attribute.c
 )
 
 add_library(litehtml SHARED ${SOURCE_LITEHTMLLIB} ${SOURCE_LITEHTML} ${SOURCE_GUMBO})
+include_directories("../../../litehtml/include/litehtml")
diff --git a/LiteHtmlLib/lib_dylib/build/liblitehtml.dylib b/LiteHtmlLib/lib_dylib/build/liblitehtml.dylib
deleted file mode 100755
index 1e893f5..0000000
Binary files a/LiteHtmlLib/lib_dylib/build/liblitehtml.dylib and /dev/null differ
diff --git a/LiteHtmlLib/src/CallbackDelegates.h b/LiteHtmlLib/src/CallbackDelegates.h
index 3c03734..5f9b174 100644
--- a/LiteHtmlLib/src/CallbackDelegates.h
+++ b/LiteHtmlLib/src/CallbackDelegates.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../litehtml/src/html.h"
+#include "html.h"
 #include "TagElement.h"
 
 struct Callbacks;
diff --git a/LiteHtmlLib/src/DocContainer.cpp b/LiteHtmlLib/src/DocContainer.cpp
index 645536f..118dcfb 100644
--- a/LiteHtmlLib/src/DocContainer.cpp
+++ b/LiteHtmlLib/src/DocContainer.cpp
@@ -32,7 +32,7 @@ void DocContainer::draw_text(litehtml::uint_ptr hdc, const litehtml::tchar_t * t
 	_callbacks.DrawText(text, hFont, color, pos);
 }
 
-int DocContainer::pt_to_px(int pt)
+int DocContainer::pt_to_px(int pt) const
 {
 	return _callbacks.PTtoPX(pt);
 }
diff --git a/LiteHtmlLib/src/DocContainer.h b/LiteHtmlLib/src/DocContainer.h
index 58fd557..3152a91 100644
--- a/LiteHtmlLib/src/DocContainer.h
+++ b/LiteHtmlLib/src/DocContainer.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "CallbackDelegates.h"
-#include "../../litehtml/src/html.h"
-#include "../../litehtml/src/context.h"
-#include "../../litehtml/src/document.h"
+#include "html.h"
+#include "context.h"
+#include "document.h"
 #include "TagElement.h"
 
 #if defined(LITEHTML_UTF8)
@@ -23,7 +23,7 @@ class DocContainer : public litehtml::document_container
 	virtual void delete_font(litehtml::uint_ptr hFont) override;
 	virtual int text_width(const litehtml::tchar_t * text, litehtml::uint_ptr hFont) override;
 	virtual void draw_text(litehtml::uint_ptr hdc, const litehtml::tchar_t * text, litehtml::uint_ptr hFont, litehtml::web_color color, const litehtml::position & pos) override;
-	virtual int pt_to_px(int pt) override;
+	virtual int pt_to_px(int pt) const override;
 	virtual int get_default_font_size() const override;
 	virtual const litehtml::tchar_t * get_default_font_name() const override;
 	virtual void draw_list_marker(litehtml::uint_ptr hdc, const litehtml::list_marker & marker) override;
diff --git a/LiteHtmlLib/src/TagElement.h b/LiteHtmlLib/src/TagElement.h
index c7c7a74..6ef34b5 100644
--- a/LiteHtmlLib/src/TagElement.h
+++ b/LiteHtmlLib/src/TagElement.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../litehtml/src/html.h"
+#include "html.h"
 
 struct ElementInfo
 {
diff --git a/LiteHtmlSharp.Mac/LiteHtmlSharp.Mac.csproj b/LiteHtmlSharp.Mac/LiteHtmlSharp.Mac.csproj
index 7de7915..115d58c 100644
--- a/LiteHtmlSharp.Mac/LiteHtmlSharp.Mac.csproj
+++ b/LiteHtmlSharp.Mac/LiteHtmlSharp.Mac.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);MAC</DefineConstants>
     <Authors>Matthew Little</Authors>
     <Company>Pingman Tools</Company>
diff --git a/LiteHtmlSharp.Wpf/IncludedMasterCss.cs b/LiteHtmlSharp.Wpf/IncludedMasterCss.cs
index 4866789..e3cf5e6 100644
--- a/LiteHtmlSharp.Wpf/IncludedMasterCss.cs
+++ b/LiteHtmlSharp.Wpf/IncludedMasterCss.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/LiteHtmlSharp.Wpf/LiteHtmlSharp.Wpf.csproj b/LiteHtmlSharp.Wpf/LiteHtmlSharp.Wpf.csproj
index c5ebb27..6992954 100644
--- a/LiteHtmlSharp.Wpf/LiteHtmlSharp.Wpf.csproj
+++ b/LiteHtmlSharp.Wpf/LiteHtmlSharp.Wpf.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
     <Version>1.1.0</Version>
     <Authors>Matthew Little</Authors>
@@ -16,6 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Remove="master.css" />
     <None Remove="x64\LiteHtmlLib.dll" />
     <None Remove="x86\LiteHtmlLib.dll" />
   </ItemGroup>
@@ -43,6 +44,10 @@
     </Content>
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="master.css" />
+  </ItemGroup>
+
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
diff --git a/LiteHtmlSharp.Wpf/master.css b/LiteHtmlSharp.Wpf/master.css
new file mode 100644
index 0000000..1bedb8b
--- /dev/null
+++ b/LiteHtmlSharp.Wpf/master.css
@@ -0,0 +1,327 @@
+html {
+    display: block;
+    height:100%;
+    width:100%;
+	position: relative;
+}
+
+head {
+    display: none
+}
+
+meta {
+    display: none
+}
+
+title {
+    display: none
+}
+
+link {
+    display: none
+}
+
+style {
+    display: none
+}
+
+script {
+    display: none
+}
+
+body {
+	display:block; 
+	margin:8px; 
+    height:100%;
+    width:100%;
+}
+
+p {
+	display:block; 
+	margin-top:1em; 
+	margin-bottom:1em;
+}
+
+b, strong {
+	display:inline; 
+	font-weight:bold;
+}
+
+i, em {
+	display:inline; 
+	font-style:italic;
+}
+
+center 
+{
+	text-align:center;
+	display:block;
+}
+
+a:link
+{
+	text-decoration: underline;
+	color: #00f;
+	cursor: pointer;
+}
+
+h1, h2, h3, h4, h5, h6, div {
+	display:block;
+}
+
+h1 {
+	font-weight:bold; 
+	margin-top:0.67em; 
+	margin-bottom:0.67em; 
+	font-size: 2em;
+}
+
+h2 {
+	font-weight:bold; 
+	margin-top:0.83em; 
+	margin-bottom:0.83em; 
+	font-size: 1.5em;
+}
+
+h3 {
+	font-weight:bold; 
+	margin-top:1em; 
+	margin-bottom:1em; 
+	font-size:1.17em;
+}
+
+h4 {
+	font-weight:bold; 
+	margin-top:1.33em; 
+	margin-bottom:1.33em
+}
+
+h5 {
+	font-weight:bold; 
+	margin-top:1.67em; 
+	margin-bottom:1.67em;
+	font-size:.83em;
+}
+
+h6 {
+	font-weight:bold; 
+	margin-top:2.33em; 
+	margin-bottom:2.33em;
+	font-size:.67em;
+} 
+
+br {
+	display:inline-block;
+}
+
+br[clear="all"]
+{
+	clear:both;
+}
+
+br[clear="left"]
+{
+	clear:left;
+}
+
+br[clear="right"]
+{
+	clear:right;
+}
+
+span {
+	display:inline
+}
+
+img {
+	display: inline-block;
+}
+
+img[align="right"]
+{
+	float: right;
+}
+
+img[align="left"]
+{
+	float: left;
+}
+
+hr {
+    display: block;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+    margin-left: auto;
+    margin-right: auto;
+    border-style: inset;
+    border-width: 1px
+}
+
+
+/***************** TABLES ********************/
+
+table {
+    display: table;
+    border-collapse: separate;
+    border-spacing: 2px;
+    border-top-color:gray;
+    border-left-color:gray;
+    border-bottom-color:black;
+    border-right-color:black;
+}
+
+tbody, tfoot, thead {
+	display:table-row-group;
+	vertical-align:middle;
+}
+
+tr {
+    display: table-row;
+    vertical-align: inherit;
+    border-color: inherit;
+}
+
+td, th {
+    display: table-cell;
+    vertical-align: inherit;
+    border-width:1px;
+    padding:1px;
+}
+
+th {
+	font-weight: bold;
+}
+
+table[border] {
+    border-style:solid;
+}
+
+table[border|=0] {
+    border-style:none;
+}
+
+table[border] td, table[border] th {
+    border-style:solid;
+    border-top-color:black;
+    border-left-color:black;
+    border-bottom-color:gray;
+    border-right-color:gray;
+}
+
+table[border|=0] td, table[border|=0] th {
+    border-style:none;
+}
+
+caption {
+	display: table-caption;
+}
+
+td[nowrap], th[nowrap] {
+	white-space:nowrap;
+}
+
+tt, code, kbd, samp {
+    font-family: monospace
+}
+
+pre, xmp, plaintext, listing {
+    display: block;
+    font-family: monospace;
+    white-space: pre;
+    margin: 1em 0
+}
+
+/***************** LISTS ********************/
+
+ul, menu, dir {
+    display: block;
+    list-style-type: disc;
+    margin-top: 1em;
+    margin-bottom: 1em;
+    margin-left: 0;
+    margin-right: 0;
+    padding-left: 40px
+}
+
+ol {
+    display: block;
+    list-style-type: decimal;
+    margin-top: 1em;
+    margin-bottom: 1em;
+    margin-left: 0;
+    margin-right: 0;
+    padding-left: 40px
+}
+
+li {
+    display: list-item;
+}
+
+ul ul, ol ul {
+    list-style-type: circle;
+}
+
+ol ol ul, ol ul ul, ul ol ul, ul ul ul {
+    list-style-type: square;
+}
+
+dd {
+    display: block;
+    margin-left: 40px;
+}
+
+dl {
+    display: block;
+    margin-top: 1em;
+    margin-bottom: 1em;
+    margin-left: 0;
+    margin-right: 0;
+}
+
+dt {
+    display: block;
+}
+
+ol ul, ul ol, ul ul, ol ol {
+    margin-top: 0;
+    margin-bottom: 0
+}
+
+blockquote {
+	display: block;
+	margin-top: 1em;
+	margin-bottom: 1em;
+	margin-left: 40px;
+	margin-left: 40px;
+}
+
+/*********** FORM ELEMENTS ************/
+
+form {
+	display: block;
+	margin-top: 0em;
+}
+
+option {
+	display: none;
+}
+
+input, textarea, keygen, select, button, isindex {
+	margin: 0em;
+	color: initial;
+	line-height: normal;
+	text-transform: none;
+	text-indent: 0;
+	text-shadow: none;
+	display: inline-block;
+}
+input[type="hidden"] {
+	display: none;
+}
+
+
+article, aside, footer, header, hgroup, nav, section 
+{
+	display: block;
+}
+
diff --git a/LiteHtmlSharp.sln b/LiteHtmlSharp.sln
index ed2e5e3..1b38a4a 100644
--- a/LiteHtmlSharp.sln
+++ b/LiteHtmlSharp.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2006
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32728.150
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiteHtmlSharp", "LiteHtmlSharp\LiteHtmlSharp.csproj", "{ACE4E835-8519-4EC0-8B26-38445133F169}"
 EndProject
@@ -19,10 +19,6 @@ EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "LiteHtmlSharp.CoreGraphics", "LiteHtmlSharp.CoreGraphics\LiteHtmlSharp.CoreGraphics.shproj", "{6C22A040-3735-43FE-BB3B-EDACDBCC0DBC}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		LiteHtmlSharp.Shared\LiteHtmlSharp.Shared.projitems*{46fd2d0e-a935-4e1c-bfc8-9b213b6c4ebf}*SharedItemsImports = 13
-		LiteHtmlSharp.CoreGraphics\LiteHtmlSharp.CoreGraphics.projitems*{6c22a040-3735-43fe-bb3b-edacdbcc0dbc}*SharedItemsImports = 13
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
@@ -34,8 +30,8 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{ACE4E835-8519-4EC0-8B26-38445133F169}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ACE4E835-8519-4EC0-8B26-38445133F169}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACE4E835-8519-4EC0-8B26-38445133F169}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ACE4E835-8519-4EC0-8B26-38445133F169}.Debug|x64.Build.0 = Debug|Any CPU
+		{ACE4E835-8519-4EC0-8B26-38445133F169}.Debug|x64.ActiveCfg = Debug|x64
+		{ACE4E835-8519-4EC0-8B26-38445133F169}.Debug|x64.Build.0 = Debug|x64
 		{ACE4E835-8519-4EC0-8B26-38445133F169}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{ACE4E835-8519-4EC0-8B26-38445133F169}.Debug|x86.Build.0 = Debug|Any CPU
 		{ACE4E835-8519-4EC0-8B26-38445133F169}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -47,7 +43,6 @@ Global
 		{D92A9F4F-EDB6-4D93-A2F7-353D322B47D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D92A9F4F-EDB6-4D93-A2F7-353D322B47D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D92A9F4F-EDB6-4D93-A2F7-353D322B47D6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D92A9F4F-EDB6-4D93-A2F7-353D322B47D6}.Debug|x64.Build.0 = Debug|Any CPU
 		{D92A9F4F-EDB6-4D93-A2F7-353D322B47D6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D92A9F4F-EDB6-4D93-A2F7-353D322B47D6}.Debug|x86.Build.0 = Debug|Any CPU
 		{D92A9F4F-EDB6-4D93-A2F7-353D322B47D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -59,7 +54,6 @@ Global
 		{B3DE251C-A7B8-42A2-A8C9-E525DFD7D387}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B3DE251C-A7B8-42A2-A8C9-E525DFD7D387}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B3DE251C-A7B8-42A2-A8C9-E525DFD7D387}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B3DE251C-A7B8-42A2-A8C9-E525DFD7D387}.Debug|x64.Build.0 = Debug|Any CPU
 		{B3DE251C-A7B8-42A2-A8C9-E525DFD7D387}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B3DE251C-A7B8-42A2-A8C9-E525DFD7D387}.Debug|x86.Build.0 = Debug|Any CPU
 		{B3DE251C-A7B8-42A2-A8C9-E525DFD7D387}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -75,4 +69,11 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {11DDFC82-7700-4CC7-9632-B78829C52DD7}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		LiteHtmlSharp.Shared\LiteHtmlSharp.Shared.projitems*{46fd2d0e-a935-4e1c-bfc8-9b213b6c4ebf}*SharedItemsImports = 13
+		LiteHtmlSharp.CoreGraphics\LiteHtmlSharp.CoreGraphics.projitems*{6c22a040-3735-43fe-bb3b-edacdbcc0dbc}*SharedItemsImports = 13
+		LiteHtmlSharp.CoreGraphics\LiteHtmlSharp.CoreGraphics.projitems*{b3de251c-a7b8-42a2-a8c9-e525dfd7d387}*SharedItemsImports = 5
+		LiteHtmlSharp.Shared\LiteHtmlSharp.Shared.projitems*{b3de251c-a7b8-42a2-a8c9-e525dfd7d387}*SharedItemsImports = 5
+		LiteHtmlSharp.Shared\LiteHtmlSharp.Shared.projitems*{d92a9f4f-edb6-4d93-a2f7-353d322b47d6}*SharedItemsImports = 5
+	EndGlobalSection
 EndGlobal
diff --git a/LiteHtmlSharp/IncludedMasterCss.cs b/LiteHtmlSharp/IncludedMasterCss.cs
index 82707bb..fb346c7 100644
--- a/LiteHtmlSharp/IncludedMasterCss.cs
+++ b/LiteHtmlSharp/IncludedMasterCss.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -17,7 +17,7 @@ public static class IncludedMasterCss
         static string GetMasterCssResource()
         {
             var assembly = typeof(IncludedMasterCss).GetTypeInfo().Assembly;
-            var masterCssResourceName = assembly.GetName().Name + ".master.css";
+            var masterCssResourceName = assembly.GetName().Name + ".winprint.css";
             using (var reader = new StreamReader(assembly.GetManifestResourceStream(masterCssResourceName), Encoding.UTF8))
             {
                 return reader.ReadToEnd();
diff --git a/LiteHtmlSharp/LiteHtmlSharp.csproj b/LiteHtmlSharp/LiteHtmlSharp.csproj
index 405d165..675d2dc 100644
--- a/LiteHtmlSharp/LiteHtmlSharp.csproj
+++ b/LiteHtmlSharp/LiteHtmlSharp.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard1.1</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0</TargetFrameworks>
     <RootNamespace>LiteHtmlSharp</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Description>LiteHtmlSharp is a C# cross-platform library for HTML/CSS(2/3) visualization - self contained, fast and small</Description>
@@ -13,7 +13,8 @@
     <Company>Pingman Tools</Company>
     <Product />
     <PackageId>LiteHtmlSharp</PackageId>
-    <Version>1.1.0</Version>
+    <Version>1.2.1</Version>
+    <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/litehtml b/litehtml
index 7fe73be..acd5615 160000
--- a/litehtml
+++ b/litehtml
@@ -1 +1 @@
-Subproject commit 7fe73be5042a0de7194c29450de02d86064d34b3
+Subproject commit acd5615383b9a58c9a5b72e45919ab6b0fe6148a