diff --git a/KGySoft.Drawing.UnitTest/KGySoft.Drawing.UnitTest.csproj b/KGySoft.Drawing.UnitTest/KGySoft.Drawing.UnitTest.csproj
index b3afe4c1..6dbb1511 100644
--- a/KGySoft.Drawing.UnitTest/KGySoft.Drawing.UnitTest.csproj
+++ b/KGySoft.Drawing.UnitTest/KGySoft.Drawing.UnitTest.csproj
@@ -82,18 +82,18 @@
     <AssemblyOriginatorKeyFile>..\KGySoft.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
-    <Reference Include="KGySoft.CoreLibraries, Version=4.6.1.0, Culture=neutral, PublicKeyToken=b45eba277439ddfe, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\KGySoft.CoreLibraries.4.6.1\lib\net35\KGySoft.CoreLibraries.dll</HintPath>
+    <Reference Include="KGySoft.CoreLibraries, Version=4.7.0.0, Culture=neutral, PublicKeyToken=b45eba277439ddfe, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\KGySoft.CoreLibraries.4.7.0\lib\net35\KGySoft.CoreLibraries.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
-    <Reference Include="KGySoft.CoreLibraries, Version=4.6.1.0, Culture=neutral, PublicKeyToken=b45eba277439ddfe, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\KGySoft.CoreLibraries.4.6.1\lib\net40\KGySoft.CoreLibraries.dll</HintPath>
+    <Reference Include="KGySoft.CoreLibraries, Version=4.7.0.0, Culture=neutral, PublicKeyToken=b45eba277439ddfe, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\KGySoft.CoreLibraries.4.7.0\lib\net40\KGySoft.CoreLibraries.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
-    <Reference Include="KGySoft.CoreLibraries, Version=4.6.1.0, Culture=neutral, PublicKeyToken=b45eba277439ddfe, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\KGySoft.CoreLibraries.4.6.1\lib\net45\KGySoft.CoreLibraries.dll</HintPath>
+    <Reference Include="KGySoft.CoreLibraries, Version=4.7.0.0, Culture=neutral, PublicKeyToken=b45eba277439ddfe, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\KGySoft.CoreLibraries.4.7.0\lib\net45\KGySoft.CoreLibraries.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
diff --git a/KGySoft.Drawing.UnitTest/packages.config b/KGySoft.Drawing.UnitTest/packages.config
index 5bfb72af..7df5b962 100644
--- a/KGySoft.Drawing.UnitTest/packages.config
+++ b/KGySoft.Drawing.UnitTest/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="KGySoft.CoreLibraries" version="4.6.1" targetFramework="net45" />
+  <package id="KGySoft.CoreLibraries" version="4.7.0" targetFramework="net45" />
   <package id="NUnit" version="3.11.0" targetFramework="net45" />
   <package id="NUnit3TestAdapter" version="3.11.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/KGySoft.Drawing/.nuspec/KGySoft.Drawing.nuspec b/KGySoft.Drawing/.nuspec/KGySoft.Drawing.nuspec
index b0d392ea..5ed35aa6 100644
--- a/KGySoft.Drawing/.nuspec/KGySoft.Drawing.nuspec
+++ b/KGySoft.Drawing/.nuspec/KGySoft.Drawing.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>KGySoft.Drawing</id>
-    <version>4.6.1</version>
+    <version>4.7.0</version>
     <title>KGy SOFT Drawing Libraries</title>
     <authors>György Kőszeg</authors>
     <owners>György Kőszeg</owners>
@@ -23,7 +23,8 @@ Among others:
 - Converting between various pixel formats preserving transparency if possible.
 - Useful extensions for the Icon, Bitmap, Image, Metafile and Graphics types.
 
-Find the full documentation with examples online: https://docs.kgysoft.net/drawing</description>
+Demo App and Debugger Visualizers: https://github.com/koszeggy/KGySoft.Drawing.Tools
+Find Documentation: https://docs.kgysoft.net/drawing</description>
     <releaseNotes>See the detailed release notes here: https://github.com/koszeggy/KGySoft.Drawing/blob/master/KGySoft.Drawing/changelog.txt</releaseNotes>
     <copyright>Copyright © KGy SOFT</copyright>
     <tags>KGySoft Drawing extension icon bitmap image metafile graphics gif tiff emf wmf</tags>
@@ -31,13 +32,13 @@ Find the full documentation with examples online: https://docs.kgysoft.net/drawi
     <repository type="git" url="https://github.com/koszeggy/KGySoft.Drawing" />
     <dependencies>
       <group targetFramework=".NETFramework3.5">
-        <dependency id="KGySoft.CoreLibraries" version="4.6.1" />
+        <dependency id="KGySoft.CoreLibraries" version="4.7.0" />
       </group>
       <group targetFramework=".NETFramework4.0">
-        <dependency id="KGySoft.CoreLibraries" version="4.6.1" />
+        <dependency id="KGySoft.CoreLibraries" version="4.7.0" />
       </group>
       <group targetFramework=".NETFramework4.5">
-        <dependency id="KGySoft.CoreLibraries" version="4.6.1" />
+        <dependency id="KGySoft.CoreLibraries" version="4.7.0" />
       </group>
     </dependencies>
   </metadata>
diff --git a/KGySoft.Drawing/.nuspec/readme.md b/KGySoft.Drawing/.nuspec/readme.md
index 0ee1eb69..5422be23 100644
--- a/KGySoft.Drawing/.nuspec/readme.md
+++ b/KGySoft.Drawing/.nuspec/readme.md
@@ -1,4 +1,6 @@
-![KGy SOFT .net](http://docs.kgysoft.net/drawing/icons/logo.png)
+[![KGy SOFT .net](http://docs.kgysoft.net/drawing/icons/logo.png)](https://kgysoft.net/drawing)
+
+[![Website](https://img.shields.io/website/https/kgysoft.net/drawing.svg)](https://kgysoft.net/drawing) [![Online Help](https://img.shields.io/website/https/docs.kgysoft.net/drawing.svg?label=online%20help&up_message=available)](https://docs.kgysoft.net/drawing) [![GitHub Repo](https://img.shields.io/github/repo-size/koszeggy/KGySoft.Drawing.svg?label=github)](https://github.com/koszeggy/KGySoft.Drawing) [![Drawing Tools](https://img.shields.io/github/repo-size/koszeggy/KGySoft.Drawing.Tools.svg?label=Drawing%20Tools)](https://github.com/koszeggy/KGySoft.Drawing.Tools)
 
 KGy SOFT Drawing Libraries provides advanced features for System.Drawing types.
 
@@ -10,3 +12,7 @@ Among others:
 - Advanced support for saving Icon, GIF and TIFF formats.
 - Converting between various pixel formats preserving transparency if possible.
 - Useful extensions for the [Icon](http://docs.kgysoft.net/drawing/?topic=html/T_KGySoft_Drawing_IconExtensions.htm), [Bitmap](http://docs.kgysoft.net/drawing/?topic=html/T_KGySoft_Drawing_BitmapExtensions.htm), [Image](http://docs.kgysoft.net/drawing/?topic=html/T_KGySoft_Drawing_ImageExtensions.htm), [Metafile](http://docs.kgysoft.net/drawing/?topic=html/T_KGySoft_Drawing_MetafileExtensions.htm) and [Graphics](http://docs.kgysoft.net/drawing/?topic=html/T_KGySoft_Drawing_GraphicsExtensions.htm) types.
+
+See the [online help](https://docs.kgysoft.net/drawing) for the complete documentation or the [project site](https://kgysoft.net/drawing) for some highlighted code examples.
+
+See also the [KGySoft.Drawing.Tools](https://github.com/koszeggy/KGySoft.Drawing.Tools) repo, which contains debugger visualizers built on the KGy SOFT Drawing Libraries as well as a test project, which demonstrates its features.
\ No newline at end of file
diff --git a/KGySoft.Drawing/.nuspec/readme.txt b/KGySoft.Drawing/.nuspec/readme.txt
index e0904739..07dc1c3a 100644
--- a/KGySoft.Drawing/.nuspec/readme.txt
+++ b/KGySoft.Drawing/.nuspec/readme.txt
@@ -1,14 +1,27 @@
 Thank you for installing KGy SOFT Drawing Libraries
 
 Release Notes: https://github.com/koszeggy/KGySoft.Drawing/blob/master/KGySoft.Drawing/changelog.txt
+
+KGy SOFT Drawing Libraries provides advanced features for System.Drawing types.
+
+                                                 ~~*~~
+
++----------------------------------------------------------------------------------------------------------------+
+| Debugger Visualizers for System.Drawing types built on KGy SOFT Drawing Libraries along with demo application: |
+|                            https://github.com/koszeggy/KGySoft.Drawing.Tools                                   |
++----------------------------------------------------------------------------------------------------------------+
+
+                                                 ~~*~~
+
 Project Home Page: https://kgysoft.net/drawing
 Online documentation: https://docs.kgysoft.net/drawing
 Offline documentation: <packages folder>\KGySoft.Drawing.<version>\Help\KGySoft.Drawing.chm
 GitHub: https://github.com/koszeggy/KGySoft.Drawing
 
-KGy SOFT Drawing Libraries provides advanced features for System.Drawing types.
+                                                 ~~*~~
+
+Some Highlights of KGy SOFT Drawing Libraries:
 
-Among others:
 - Several built-in icons as well as simple access to Windows associated and stock icons.
 - Extracting bitmaps from multi-frame bitmaps and icons.
 - Creating combined icons and multi-resolution bitmaps.
diff --git a/KGySoft.Drawing/Help/KGySoft.Drawing.chm b/KGySoft.Drawing/Help/KGySoft.Drawing.chm
index 6fec5577..ba400649 100644
Binary files a/KGySoft.Drawing/Help/KGySoft.Drawing.chm and b/KGySoft.Drawing/Help/KGySoft.Drawing.chm differ
diff --git a/KGySoft.Drawing/KGySoft.Drawing.MsHelp.shfbproj b/KGySoft.Drawing/KGySoft.Drawing.MsHelp.shfbproj
index c02d9b5d..1411990f 100644
--- a/KGySoft.Drawing/KGySoft.Drawing.MsHelp.shfbproj
+++ b/KGySoft.Drawing/KGySoft.Drawing.MsHelp.shfbproj
@@ -101,8 +101,6 @@
       <ImageId>Information16</ImageId>
       <AlternateText>Information 16</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\Warning256.png">
       <ImageId>Warning256</ImageId>
       <AlternateText>Warning 256</AlternateText>
@@ -215,8 +213,6 @@
       <ImageId>Error16</ImageId>
       <AlternateText>Error 16</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\Application16.png">
       <ImageId>Application16</ImageId>
       <AlternateText>Application 16</AlternateText>
@@ -245,8 +241,6 @@
       <ImageId>ApplicationXP32</ImageId>
       <AlternateText>ApplicationXP 32</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\ErrorXP16.png">
       <ImageId>ErrorXP16</ImageId>
       <AlternateText>ErrorXP 16</AlternateText>
@@ -255,8 +249,6 @@
       <ImageId>ErrorXP32</ImageId>
       <AlternateText>ErrorXP 32</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\InformationXP16.png">
       <ImageId>InformationXP16</ImageId>
       <AlternateText>InformationXP 16</AlternateText>
@@ -265,8 +257,6 @@
       <ImageId>InformationXP32</ImageId>
       <AlternateText>InformationXP 32</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\QuestionXP16.png">
       <ImageId>QuestionXP16</ImageId>
       <AlternateText>QuestionXP 16</AlternateText>
@@ -315,8 +305,6 @@
       <ImageId>SecurityQuestion48</ImageId>
       <AlternateText>Security Question 48</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\SecuritySuccess16.png">
       <ImageId>SecuritySuccess16</ImageId>
       <AlternateText>Security Success 16</AlternateText>
@@ -357,8 +345,6 @@
       <ImageId>SecurityWarning48</ImageId>
       <AlternateText>Security Warning 48</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\ShieldXP16.png">
       <ImageId>ShieldXP16</ImageId>
       <AlternateText>ShieldXP 16</AlternateText>
@@ -379,6 +365,98 @@
       <ImageId>WarningXP32</ImageId>
       <AlternateText>WarningXP 32</AlternateText>
     </Content>
+    <Content Include="Help\Images\Warning64.png">
+      <ImageId>Warning64</ImageId>
+      <AlternateText>Warning 64</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Warning32W10.png">
+      <ImageId>Warning32W10</ImageId>
+      <AlternateText>Warning 32 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Warning24.png">
+      <ImageId>Warning24</ImageId>
+      <AlternateText>Warning 24</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Warning20.png">
+      <ImageId>Warning20</ImageId>
+      <AlternateText>Warning 20</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Warning16W10.png">
+      <ImageId>Warning16W10</ImageId>
+      <AlternateText>Warning 16 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Shield32W10.png">
+      <ImageId>Shield32W10</ImageId>
+      <AlternateText>Shield 32 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Shield16W10.png">
+      <ImageId>Shield16W10</ImageId>
+      <AlternateText>Shield 16 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Question32W10.png">
+      <ImageId>Question32W10</ImageId>
+      <AlternateText>Question 32 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Question24.png">
+      <ImageId>Question24</ImageId>
+      <AlternateText>Question 24</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Question20.png">
+      <ImageId>Question20</ImageId>
+      <AlternateText>Question 20</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Question16W10.png">
+      <ImageId>Question16W10</ImageId>
+      <AlternateText>Question 16 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Information64.png">
+      <ImageId>Information64</ImageId>
+      <AlternateText>Information 64</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Information32W10.png">
+      <ImageId>Information32W10</ImageId>
+      <AlternateText>Information 32 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Information24.png">
+      <ImageId>Information24</ImageId>
+      <AlternateText>Information 24</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Information20.png">
+      <ImageId>Information20</ImageId>
+      <AlternateText>Information 20</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Information16W10.png">
+      <ImageId>Information16W10</ImageId>
+      <AlternateText>Information 16 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Error64.png">
+      <ImageId>Error64</ImageId>
+      <AlternateText>Error 64</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Error32W10.png">
+      <ImageId>Error32W10</ImageId>
+      <AlternateText>Error 32 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Error20.png">
+      <ImageId>Error20</ImageId>
+      <AlternateText>Error 20</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Error16W10.png">
+      <ImageId>Error16W10</ImageId>
+      <AlternateText>Error 16 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Application64.png">
+      <ImageId>Application64</ImageId>
+      <AlternateText>Application 64</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Application32W10.png">
+      <ImageId>Application32W10</ImageId>
+      <AlternateText>Application 32 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Application16W10.png">
+      <ImageId>Application16W10</ImageId>
+      <AlternateText>Application 16 W 10</AlternateText>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="KGySoft.Libraries">
diff --git a/KGySoft.Drawing/KGySoft.Drawing.WebsiteHelp.shfbproj b/KGySoft.Drawing/KGySoft.Drawing.WebsiteHelp.shfbproj
index e680d631..76a1c25b 100644
--- a/KGySoft.Drawing/KGySoft.Drawing.WebsiteHelp.shfbproj
+++ b/KGySoft.Drawing/KGySoft.Drawing.WebsiteHelp.shfbproj
@@ -102,8 +102,6 @@
       <ImageId>Information16</ImageId>
       <AlternateText>Information 16</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\Warning256.png">
       <ImageId>Warning256</ImageId>
       <AlternateText>Warning 256</AlternateText>
@@ -216,8 +214,6 @@
       <ImageId>Error16</ImageId>
       <AlternateText>Error 16</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\Application16.png">
       <ImageId>Application16</ImageId>
       <AlternateText>Application 16</AlternateText>
@@ -246,8 +242,6 @@
       <ImageId>ApplicationXP32</ImageId>
       <AlternateText>ApplicationXP 32</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\ErrorXP16.png">
       <ImageId>ErrorXP16</ImageId>
       <AlternateText>ErrorXP 16</AlternateText>
@@ -256,8 +250,6 @@
       <ImageId>ErrorXP32</ImageId>
       <AlternateText>ErrorXP 32</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\InformationXP16.png">
       <ImageId>InformationXP16</ImageId>
       <AlternateText>InformationXP 16</AlternateText>
@@ -266,8 +258,6 @@
       <ImageId>InformationXP32</ImageId>
       <AlternateText>InformationXP 32</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\QuestionXP16.png">
       <ImageId>QuestionXP16</ImageId>
       <AlternateText>QuestionXP 16</AlternateText>
@@ -316,8 +306,6 @@
       <ImageId>SecurityQuestion48</ImageId>
       <AlternateText>Security Question 48</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\SecuritySuccess16.png">
       <ImageId>SecuritySuccess16</ImageId>
       <AlternateText>Security Success 16</AlternateText>
@@ -358,8 +346,6 @@
       <ImageId>SecurityWarning48</ImageId>
       <AlternateText>Security Warning 48</AlternateText>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Help\Images\ShieldXP16.png">
       <ImageId>ShieldXP16</ImageId>
       <AlternateText>ShieldXP 16</AlternateText>
@@ -380,6 +366,98 @@
       <ImageId>WarningXP32</ImageId>
       <AlternateText>WarningXP 32</AlternateText>
     </Content>
+    <Content Include="Help\Images\Warning64.png">
+      <ImageId>Warning64</ImageId>
+      <AlternateText>Warning 64</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Warning32W10.png">
+      <ImageId>Warning32W10</ImageId>
+      <AlternateText>Warning 32 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Warning24.png">
+      <ImageId>Warning24</ImageId>
+      <AlternateText>Warning 24</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Warning20.png">
+      <ImageId>Warning20</ImageId>
+      <AlternateText>Warning 20</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Warning16W10.png">
+      <ImageId>Warning16W10</ImageId>
+      <AlternateText>Warning 16 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Shield32W10.png">
+      <ImageId>Shield32W10</ImageId>
+      <AlternateText>Shield 32 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Shield16W10.png">
+      <ImageId>Shield16W10</ImageId>
+      <AlternateText>Shield 16 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Question32W10.png">
+      <ImageId>Question32W10</ImageId>
+      <AlternateText>Question 32 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Question24.png">
+      <ImageId>Question24</ImageId>
+      <AlternateText>Question 24</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Question20.png">
+      <ImageId>Question20</ImageId>
+      <AlternateText>Question 20</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Question16W10.png">
+      <ImageId>Question16W10</ImageId>
+      <AlternateText>Question 16 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Information64.png">
+      <ImageId>Information64</ImageId>
+      <AlternateText>Information 64</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Information32W10.png">
+      <ImageId>Information32W10</ImageId>
+      <AlternateText>Information 32 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Information24.png">
+      <ImageId>Information24</ImageId>
+      <AlternateText>Information 24</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Information20.png">
+      <ImageId>Information20</ImageId>
+      <AlternateText>Information 20</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Information16W10.png">
+      <ImageId>Information16W10</ImageId>
+      <AlternateText>Information 16 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Error64.png">
+      <ImageId>Error64</ImageId>
+      <AlternateText>Error 64</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Error32W10.png">
+      <ImageId>Error32W10</ImageId>
+      <AlternateText>Error 32 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Error20.png">
+      <ImageId>Error20</ImageId>
+      <AlternateText>Error 20</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Error16W10.png">
+      <ImageId>Error16W10</ImageId>
+      <AlternateText>Error 16 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Application64.png">
+      <ImageId>Application64</ImageId>
+      <AlternateText>Application 64</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Application32W10.png">
+      <ImageId>Application32W10</ImageId>
+      <AlternateText>Application 32 W 10</AlternateText>
+    </Content>
+    <Content Include="Help\Images\Application16W10.png">
+      <ImageId>Application16W10</ImageId>
+      <AlternateText>Application 16 W 10</AlternateText>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="KGySoft.Libraries">
diff --git a/KGySoft.Drawing/KGySoft.Drawing.csproj b/KGySoft.Drawing/KGySoft.Drawing.csproj
index 4cb0802b..144a26ab 100644
--- a/KGySoft.Drawing/KGySoft.Drawing.csproj
+++ b/KGySoft.Drawing/KGySoft.Drawing.csproj
@@ -138,6 +138,12 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\LICENSE">
+      <Link>LICENSE</Link>
+    </None>
+    <None Include="..\README.md">
+      <Link>README.md</Link>
+    </None>
     <None Include="KGySoft.Drawing.ruleset" />
   </ItemGroup>
   <ItemGroup>
diff --git a/README.md b/README.md
index 6183c424..b614c06d 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,40 @@
 [![KGy SOFT .net](http://docs.kgysoft.net/drawing/icons/logo.png)](https://kgysoft.net)
 
-# KGy SOFT Drawing
+# KGy SOFT Drawing Libraries
 
 KGy SOFT Drawing Libraries provides advanced features for System.Drawing types.
 
-Among others:
-- Several [built-in icons](https://docs.kgysoft.net/drawing/?topic=html/T_KGySoft_Drawing_Icons.htm) as well as simple access to Windows associated and stock icons.
-- Extracting bitmaps from multi-frame bitmaps and icons.
-- Creating combined icons and multi-resolution bitmaps.
-- Saving metafiles in EMF/WMF formats.
-- Advanced support for saving Icon, GIF and TIFF formats.
-- Converting between various pixel formats preserving transparency if possible.
-- Useful extensions for the [Icon](http://docs.kgysoft.net/drawing/?topic=html/T_KGySoft_Drawing_IconExtensions.htm), [Bitmap](http://docs.kgysoft.net/drawing/?topic=html/T_KGySoft_Drawing_BitmapExtensions.htm), [Image](http://docs.kgysoft.net/drawing/?topic=html/T_KGySoft_Drawing_ImageExtensions.htm), [Metafile](http://docs.kgysoft.net/drawing/?topic=html/T_KGySoft_Drawing_MetafileExtensions.htm) and [Graphics](http://docs.kgysoft.net/drawing/?topic=html/T_KGySoft_Drawing_GraphicsExtensions.htm) types.
+[![Website](https://img.shields.io/website/https/kgysoft.net/corelibraries.svg)](https://kgysoft.net/drawing)
+[![Online Help](https://img.shields.io/website/https/docs.kgysoft.net/drawing.svg?label=online%20help&up_message=available)](https://docs.kgysoft.net/drawing)
+[![GitHub Repo](https://img.shields.io/github/repo-size/koszeggy/KGySoft.Drawing.svg?label=github)](https://github.com/koszeggy/KGySoft.Drawing)
+[![Nuget](https://img.shields.io/nuget/vpre/KGySoft.Drawing.svg)](https://www.nuget.org/packages/KGySoft.Drawing)
+[![Drawing Tools](https://img.shields.io/github/repo-size/koszeggy/KGySoft.Drawing.Tools.svg?label=Drawing%20Tools)](https://github.com/koszeggy/KGySoft.Drawing.Tools)
 
-## Download Binaries:
+## Table of Contents:
+1. [Download](#download)
+   - [Download Binaries](#download-binaries)
+   - [Download Demo App and Debugger Visualizers](#download-demo-app-debugger-and-visualizers)
+2. [Project Site](#project-site)
+3. [Documentation](#documentation)
+4. [Release Notes](#release-notes)
+5. [License](#license)
 
-The binaries can be donwloaded as a NuGet package directly from [nuget.org](https://www.nuget.org/packages/KGySoft.Drawing)
+## Download:
+
+### Download Binaries:
+
+The binaries can be downloaded as a NuGet package directly from [nuget.org](https://www.nuget.org/packages/KGySoft.Drawing)
 
 However, the preferred way is to install the package in VisualStudio either by looking for the `KGySoft.Drawing` package in the Nuget Package Manager GUI, or by sending the following command at the Package Manager Console prompt:
 
     PM> Install-Package KGySoft.Drawing
 
+### Download Demo App and Debugger Visualizers:
+
+[KGySoft.Drawing.Tools](https://github.com/koszeggy/KGySoft.Drawing.Tools) is another GitHub repository, which contains a couple of applications built on KGy SOFT Drawing Libraries along with debugger visualizers for several `System.Drawing` types including `Bitmap`, `Metafile`, `Icon`, `Graphics` and more.
+
+![Debugger Visualizer Test App](https://kgysoft.net/images/DebuggerVisualizerTest.png)
+
 ## Project Site
 
 Find the project site at [kgysoft.net](https://kgysoft.net/drawing/)
@@ -33,3 +47,6 @@ Find the project site at [kgysoft.net](https://kgysoft.net/drawing/)
 ## Release Notes
 
 See the [change log](https://github.com/koszeggy/KGySoft.Drawing/blob/master/KGySoft.Drawing/changelog.txt).
+
+## License
+This repository is under the [CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0/legalcode) license (see a short summary [here](https://creativecommons.org/licenses/by-nd/4.0)). It allows you to copy and redistribute the material in any medium or format for any purpose, even commercially. The only thing is not allowed is to distribute a modified material as yours.
\ No newline at end of file