From 1cbd1ee61f1d89ae035c818bf48b6153b4fc5217 Mon Sep 17 00:00:00 2001
From: Chaidir Ali Assegaf <ading.assegaf@gmail.com>
Date: Thu, 31 Jul 2025 12:46:18 +0700
Subject: [PATCH 1/2] Fix Version

---
 .idea/.idea.HTMLToQPDF/.idea/.gitignore      | 13 +++++++++++++
 .idea/.idea.HTMLToQPDF/.idea/encodings.xml   |  4 ++++
 .idea/.idea.HTMLToQPDF/.idea/indexLayout.xml |  8 ++++++++
 .idea/.idea.HTMLToQPDF/.idea/vcs.xml         |  6 ++++++
 HTMLToQPDF.Example/HTMLToQPDF.Example.csproj | 10 +++++-----
 HTMLToQPDF/Components/HTMLComponent.cs       |  2 +-
 HTMLToQPDF/HTMLToQPDF.csproj                 |  6 +++---
 7 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 .idea/.idea.HTMLToQPDF/.idea/.gitignore
 create mode 100644 .idea/.idea.HTMLToQPDF/.idea/encodings.xml
 create mode 100644 .idea/.idea.HTMLToQPDF/.idea/indexLayout.xml
 create mode 100644 .idea/.idea.HTMLToQPDF/.idea/vcs.xml

diff --git a/.idea/.idea.HTMLToQPDF/.idea/.gitignore b/.idea/.idea.HTMLToQPDF/.idea/.gitignore
new file mode 100644
index 0000000..4cada4e
--- /dev/null
+++ b/.idea/.idea.HTMLToQPDF/.idea/.gitignore
@@ -0,0 +1,13 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/.idea.HTMLToQPDF.iml
+/projectSettingsUpdater.xml
+/modules.xml
+/contentModel.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/.idea.HTMLToQPDF/.idea/encodings.xml b/.idea/.idea.HTMLToQPDF/.idea/encodings.xml
new file mode 100644
index 0000000..df87cf9
--- /dev/null
+++ b/.idea/.idea.HTMLToQPDF/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.HTMLToQPDF/.idea/indexLayout.xml b/.idea/.idea.HTMLToQPDF/.idea/indexLayout.xml
new file mode 100644
index 0000000..7b08163
--- /dev/null
+++ b/.idea/.idea.HTMLToQPDF/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.HTMLToQPDF/.idea/vcs.xml b/.idea/.idea.HTMLToQPDF/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/.idea.HTMLToQPDF/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/HTMLToQPDF.Example/HTMLToQPDF.Example.csproj b/HTMLToQPDF.Example/HTMLToQPDF.Example.csproj
index c801ecd..74ef6f5 100644
--- a/HTMLToQPDF.Example/HTMLToQPDF.Example.csproj
+++ b/HTMLToQPDF.Example/HTMLToQPDF.Example.csproj
@@ -17,14 +17,14 @@
 
   <ItemGroup>
     <PackageReference Include="DevExpress.Mvvm.CodeGenerators" Version="22.1.1" />
-    <PackageReference Include="DevExpressMvvm" Version="22.1.3" />
-    <PackageReference Include="Fody" Version="6.6.4">
+    <PackageReference Include="DevExpressMvvm" Version="24.1.6" />
+    <PackageReference Include="Fody" Version="6.9.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="HandyControls" Version="3.4.2" />
-    <PackageReference Include="PropertyChanged.Fody" Version="4.0.4" />
-    <PackageReference Include="QuestPDF" Version="2023.12.5" />
+    <PackageReference Include="HandyControls" Version="3.6.0" />
+    <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" />
+    <PackageReference Include="QuestPDF" Version="2025.7.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/HTMLToQPDF/Components/HTMLComponent.cs b/HTMLToQPDF/Components/HTMLComponent.cs
index 3d386f2..97c22a1 100644
--- a/HTMLToQPDF/Components/HTMLComponent.cs
+++ b/HTMLToQPDF/Components/HTMLComponent.cs
@@ -46,7 +46,7 @@ internal class HTMLComponent : IComponent
             { "ol", c => c.PaddingLeft(30) }
         };
 
-        public float ListVerticalPadding { get; set; } = 12;
+        public float ListVerticalPadding { get; set; }
 
         public string HTML { get; set; } = "";
 
diff --git a/HTMLToQPDF/HTMLToQPDF.csproj b/HTMLToQPDF/HTMLToQPDF.csproj
index d619eea..7a47862 100644
--- a/HTMLToQPDF/HTMLToQPDF.csproj
+++ b/HTMLToQPDF/HTMLToQPDF.csproj
@@ -14,7 +14,7 @@
     <RepositoryUrl>https://github.com/Relorer/HTMLToQPDF</RepositoryUrl>
     <PackageTags>pdf, file, export, generate, generation, tool, create, creation, render, document, format, quest, html, library, converter, open, source, free, standard, core</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>1.1.0</Version>
+    <Version>1.2.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,8 +25,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.59" />
-    <PackageReference Include="QuestPDF" Version="2023.12.5" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.12.2" />
+    <PackageReference Include="QuestPDF" Version="2025.7.0" />
   </ItemGroup>
 
   <ItemGroup>

From 48cbb68345ed38aa1925d4be9933a02903c86e12 Mon Sep 17 00:00:00 2001
From: Chaidir Ali Assegaf <ading.assegaf@gmail.com>
Date: Sun, 14 Dec 2025 17:55:36 +0700
Subject: [PATCH 2/2] Refactor component namespaces and class names for
 consistency; update HTML handling methods

---
 HTMLToQPDF.Example/App.xaml.cs                |   6 +-
 HTMLToQPDF.Example/HTMLToQPDF.Example.csproj  |   9 +-
 HTMLToQPDF.Example/MainWindow.xaml            |   5 +-
 HTMLToQPDF.Example/MainWindow.xaml.cs         |   6 +-
 .../Properties/Resources.Designer.cs          |  35 ++-
 .../Utilities/FileDialogHelper.cs             |  12 +-
 HTMLToQPDF.Example/Utilities/PDFCreator.cs    |   8 +-
 .../ViewModels/MainWindowViewModel.cs         |  13 +-
 HTMLToQPDF/Components/BaseHTMLComponent.cs    |  40 ++--
 HTMLToQPDF/Components/HTMLComponent.cs        |  29 +--
 HTMLToQPDF/Components/HTMLComponentsArgs.cs   |   4 +-
 HTMLToQPDF/Components/ParagraphComponent.cs   |  72 +++---
 HTMLToQPDF/Components/Tags/AComponent.cs      |  11 +-
 HTMLToQPDF/Components/Tags/BrComponent.cs     |   7 +-
 HTMLToQPDF/Components/Tags/ImgComponent.cs    |  15 +-
 HTMLToQPDF/Components/Tags/ListComponent.cs   |  15 +-
 HTMLToQPDF/Components/Tags/TableComponent.cs  |  49 ++--
 .../Extensions/HTMLComponentExtensions.cs     |  10 +-
 HTMLToQPDF/Extensions/HtmlNodeExtensions.cs   |  96 ++++----
 HTMLToQPDF/Extensions/IContainerExtensions.cs |   8 +-
 HTMLToQPDF/HTMLDescriptor.cs                  |  16 +-
 HTMLToQPDF/HTMLToQPDF.csproj                  |   4 +-
 HTMLToQPDF/StyleSettings.cs                   |  25 ++-
 HTMLToQPDF/Utils/HTMLUtils.cs                 |  23 +-
 HTMLToQPDF/Utils/ImgUtils.cs                  |  27 +--
 HTMLToQPDF/Utils/UnitUtils.cs                 |   2 +-
 Usage.md                                      | 210 ++++++++++++++++++
 27 files changed, 478 insertions(+), 279 deletions(-)
 create mode 100644 Usage.md

diff --git a/HTMLToQPDF.Example/App.xaml.cs b/HTMLToQPDF.Example/App.xaml.cs
index 93e3762..9c26572 100644
--- a/HTMLToQPDF.Example/App.xaml.cs
+++ b/HTMLToQPDF.Example/App.xaml.cs
@@ -1,11 +1,9 @@
-using System.Windows;
-
-namespace HTMLToQPDF.Example
+namespace HTMLToQPDF.Example
 {
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
-    public partial class App : Application
+    public partial class App
     {
     }
 }
\ No newline at end of file
diff --git a/HTMLToQPDF.Example/HTMLToQPDF.Example.csproj b/HTMLToQPDF.Example/HTMLToQPDF.Example.csproj
index 74ef6f5..7f4446d 100644
--- a/HTMLToQPDF.Example/HTMLToQPDF.Example.csproj
+++ b/HTMLToQPDF.Example/HTMLToQPDF.Example.csproj
@@ -2,13 +2,14 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Assets\web-programming.ico</ApplicationIcon>
     <PublishSingleFile>true</PublishSingleFile>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
     <DebugType>embedded</DebugType>
+    <LangVersion>14</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,13 +19,13 @@
   <ItemGroup>
     <PackageReference Include="DevExpress.Mvvm.CodeGenerators" Version="22.1.1" />
     <PackageReference Include="DevExpressMvvm" Version="24.1.6" />
-    <PackageReference Include="Fody" Version="6.9.2">
+    <PackageReference Include="Fody" Version="6.9.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="HandyControls" Version="3.6.0" />
-    <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" />
-    <PackageReference Include="QuestPDF" Version="2025.7.0" />
+    <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="All" />
+    <PackageReference Include="QuestPDF" Version="2025.12.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/HTMLToQPDF.Example/MainWindow.xaml b/HTMLToQPDF.Example/MainWindow.xaml
index cf2d363..f7e2df2 100644
--- a/HTMLToQPDF.Example/MainWindow.xaml
+++ b/HTMLToQPDF.Example/MainWindow.xaml
@@ -4,7 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:hc="https://handyorg.github.io/handycontrol"
-    xmlns:local="clr-namespace:HTMLToQPDF.Example"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vm="clr-namespace:HTMLToQPDF.Example.ViewModels"
     Title="HTMLToQPDF"
@@ -29,7 +28,7 @@
                     IsChecked="{Binding CustomStyles}" />
                 <Button
                     Margin="5"
-                    Command="{Binding CreatePDFCommand}"
+                    Command="{Binding CreatePdfCommand}"
                     Content="Create PDF"
                     Style="{StaticResource ButtonPrimary}" />
             </StackPanel>
@@ -54,7 +53,7 @@
             VerticalContentAlignment="Top"
             hc:InfoElement.Placeholder="&lt;body&gt; Hello world! &lt;/body&gt;"
             AcceptsReturn="True"
-            Text="{Binding HTML, UpdateSourceTrigger=PropertyChanged}"
+            Text="{Binding Html, UpdateSourceTrigger=PropertyChanged}"
             TextWrapping="Wrap" />
     </DockPanel>
 </Window>
\ No newline at end of file
diff --git a/HTMLToQPDF.Example/MainWindow.xaml.cs b/HTMLToQPDF.Example/MainWindow.xaml.cs
index 0d1d7bd..b8a9d38 100644
--- a/HTMLToQPDF.Example/MainWindow.xaml.cs
+++ b/HTMLToQPDF.Example/MainWindow.xaml.cs
@@ -1,11 +1,9 @@
-using System.Windows;
-
-namespace HTMLToQPDF.Example
+namespace HTMLToQPDF.Example
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class MainWindow : Window
+    public partial class MainWindow
     {
         public MainWindow()
         {
diff --git a/HTMLToQPDF.Example/Properties/Resources.Designer.cs b/HTMLToQPDF.Example/Properties/Resources.Designer.cs
index 441e76e..fb1c3e8 100644
--- a/HTMLToQPDF.Example/Properties/Resources.Designer.cs
+++ b/HTMLToQPDF.Example/Properties/Resources.Designer.cs
@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -61,27 +60,19 @@ internal Resources() {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &lt;div class=&quot;reader-container container container_center&quot;&gt;
-        ///    &lt;div class=&quot;article-image&quot;&gt;
-        ///        &lt;a href=&quot;https://github.com/&quot;&gt;
-        ///            &lt;img class=&quot;lazyload&quot;
-        ///                 data-background=&quot;&quot;
-        ///                 src=&quot;shortTestImage.png&quot; /&gt;
-        ///        &lt;/a&gt;
-        ///    &lt;/div&gt;
-        ///    &lt;p&gt;Lorem&lt;/p&gt;
-        ///    &lt;h1&gt;h1&lt;/h1&gt;
-        ///    &lt;h2&gt;&lt;s&gt;h2&lt;/s&gt;&lt;/h2&gt;
-        ///    &lt;h3&gt;h3&lt;/h3&gt;
-        ///    &lt;h4&gt;h4&lt;/h4&gt;
-        ///    &lt;h5&gt;h5&lt;/h5&gt;
-        ///    &lt;br /&gt;
-        ///    &lt;br /&gt;
-        ///    &lt;br /&gt;
-        ///    &lt;br /&gt;
-        ///    &lt;h6&gt;h6&lt;/h6&gt;
-        ///    &lt;p&gt;
-        ///        &lt;s&gt;Lorem &amp;nbsp;&amp;nbsp;ipsum&lt;/s&gt; dolor &lt;br /&gt;  [rest of string was truncated]&quot;;.
+        ///   Looks up a localized string similar to &lt;!DOCTYPE html&gt;
+        ///&lt;html lang=&quot;en&quot;&gt;
+        ///&lt;head&gt;
+        ///    &lt;meta charset=&quot;UTF-8&quot; /&gt;
+        ///    &lt;meta http-equiv=&quot;X-UA-Compatible&quot; content=&quot;IE=edge&quot; /&gt;
+        ///    &lt;meta name=&quot;viewport&quot; content=&quot;width=device-width, initial-scale=1.0&quot; /&gt;
+        ///    &lt;title&gt;Document&lt;/title&gt;
+        ///&lt;/head&gt;
+        ///&lt;body&gt;
+        ///    &lt;div class=&quot;reader-container container container_center&quot;&gt;
+        ///        &lt;div class=&quot;article-image&quot;&gt;
+        ///            &lt;a href=&quot;https://www.pexels.com/ru-ru/photo/7961265/&quot;&gt;
+        ///                &lt;img src=&quot;https://images.pexels.com/photos/7961265/pexels-photo-796126 [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string testHtml {
             get {
diff --git a/HTMLToQPDF.Example/Utilities/FileDialogHelper.cs b/HTMLToQPDF.Example/Utilities/FileDialogHelper.cs
index 6860471..f6b87b7 100644
--- a/HTMLToQPDF.Example/Utilities/FileDialogHelper.cs
+++ b/HTMLToQPDF.Example/Utilities/FileDialogHelper.cs
@@ -1,16 +1,18 @@
 using Microsoft.Win32;
 
-namespace HTMLToQPDF.Example.DialogWindows
+namespace HTMLToQPDF.Example.Utilities
 {
     internal static class FileDialogHelper
     {
         public static string GetSaveFilePath(string file)
         {
-            SaveFileDialog saveFileDialog = new SaveFileDialog();
+            var saveFileDialog = new SaveFileDialog
+            {
+                Filter = "PDF file|*.pdf",
+                Title = "Save an PDF File",
+                FileName = file
+            };
 
-            saveFileDialog.Filter = "PDF file|*.pdf";
-            saveFileDialog.Title = $"Save an PDF File";
-            saveFileDialog.FileName = file;
             saveFileDialog.ShowDialog();
 
             if (saveFileDialog.FileName != "")
diff --git a/HTMLToQPDF.Example/Utilities/PDFCreator.cs b/HTMLToQPDF.Example/Utilities/PDFCreator.cs
index f75a973..ad23ee4 100644
--- a/HTMLToQPDF.Example/Utilities/PDFCreator.cs
+++ b/HTMLToQPDF.Example/Utilities/PDFCreator.cs
@@ -1,11 +1,11 @@
-using HTMLQuestPDF.Extensions;
+using HTMLToQPDF.Extensions;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 
 namespace HTMLToQPDF.Example.Utilities
 {
-    internal static class PDFCreator
+    internal static class PdfCreator
     {
         public static void Create(string html, string path, bool customStyles)
         {
@@ -19,7 +19,9 @@ public static void Create(string html, string path, bool customStyles)
                     page.MarginHorizontal(0.5f, Unit.Centimetre);
                     page.MarginVertical(1f, Unit.Centimetre);
 
+#pragma warning disable CS0618 // Type or member is obsolete
                     page.DefaultTextStyle(TextStyle.Default.FontFamily("Arial").FontSize(8).Fallback(y => y.FontFamily("Segoe UI Emoji")));
+#pragma warning restore CS0618
 
                   /* page.DefaultTextStyle(TextStyle.Default
                     //    .Fallback(y => y.FontFamily("MS Reference Sans Serif")
@@ -30,7 +32,7 @@ public static void Create(string html, string path, bool customStyles)
 
                     page.Content().Column(col =>
                     {
-                        col.Item().HTML(handler =>
+                        col.Item().Html(handler =>
                          {
                              if (customStyles)
                              {
diff --git a/HTMLToQPDF.Example/ViewModels/MainWindowViewModel.cs b/HTMLToQPDF.Example/ViewModels/MainWindowViewModel.cs
index ca31ee2..6087204 100644
--- a/HTMLToQPDF.Example/ViewModels/MainWindowViewModel.cs
+++ b/HTMLToQPDF.Example/ViewModels/MainWindowViewModel.cs
@@ -1,6 +1,5 @@
 using DevExpress.Mvvm;
 using DevExpress.Mvvm.CodeGenerators;
-using HTMLToQPDF.Example.DialogWindows;
 using HTMLToQPDF.Example.Properties;
 using HTMLToQPDF.Example.Utilities;
 using System;
@@ -11,14 +10,14 @@ namespace HTMLToQPDF.Example.ViewModels
     [GenerateViewModel]
     public partial class MainWindowViewModel : ViewModelBase
     {
-        public string HTML { get; set; }
+        public string Html { get; set; }
         public string SavePath { get; set; }
         public bool CustomStyles { get; set; }
 
         public MainWindowViewModel()
         {
-            HTML = Resources.testHtml;
-            string desktop = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
+            Html = Resources.testHtml;
+            var desktop = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
             SavePath = Path.Combine(desktop, "example.pdf");
         }
 
@@ -29,11 +28,11 @@ private void SelectSavePath()
         }
 
         [GenerateCommand]
-        private void CreatePDF()
+        private void CreatePdf()
         {
-            PDFCreator.Create(HTML, SavePath, CustomStyles);
+            PdfCreator.Create(Html, SavePath, CustomStyles);
         }
 
-        private bool CanCreatePDF() => !string.IsNullOrEmpty(HTML);
+        private bool CanCreatePdf() => !string.IsNullOrEmpty(Html);
     }
 }
\ No newline at end of file
diff --git a/HTMLToQPDF/Components/BaseHTMLComponent.cs b/HTMLToQPDF/Components/BaseHTMLComponent.cs
index 9c485e1..b4dc484 100644
--- a/HTMLToQPDF/Components/BaseHTMLComponent.cs
+++ b/HTMLToQPDF/Components/BaseHTMLComponent.cs
@@ -1,29 +1,28 @@
 using HtmlAgilityPack;
-using HTMLQuestPDF.Extensions;
-using HTMLToQPDF.Components;
+using HTMLToQPDF.Extensions;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 
-namespace HTMLQuestPDF.Components
+namespace HTMLToQPDF.Components
 {
-    internal class BaseHTMLComponent : IComponent
+    internal class BaseHtmlComponent : IComponent
     {
-        protected readonly HTMLComponentsArgs args;
-        protected readonly HtmlNode node;
+        protected readonly HtmlComponentsArgs Args;
+        protected readonly HtmlNode Node;
 
-        public BaseHTMLComponent(HtmlNode node, HTMLComponentsArgs args)
+        public BaseHtmlComponent(HtmlNode node, HtmlComponentsArgs args)
         {
-            this.node = node;
-            this.args = args;
+            Node = node;
+            Args = args;
         }
 
         public void Compose(IContainer container)
         {
-            if (!node.HasContent() || node.Name.ToLower() == "head") return;
+            if (!Node.HasContent() || Node.Name.Equals("head", StringComparison.CurrentCultureIgnoreCase)) return;
 
             container = ApplyStyles(container);
 
-            if (node.ChildNodes.Any())
+            if (Node.ChildNodes.Count != 0)
             {
                 ComposeMany(container);
             }
@@ -35,7 +34,7 @@ public void Compose(IContainer container)
 
         protected virtual IContainer ApplyStyles(IContainer container)
         {
-            return args.ContainerStyles.TryGetValue(node.Name.ToLower(), out var style) ? style(container) : container;
+            return Args.ContainerStyles.TryGetValue(Node.Name.ToLower(), out var style) ? style(container) : container;
         }
 
         protected virtual void ComposeSingle(IContainer container)
@@ -47,14 +46,14 @@ protected virtual void ComposeMany(IContainer container)
             container.Column(col =>
             {
                 var buffer = new List<HtmlNode>();
-                foreach (var item in node.ChildNodes)
+                foreach (var item in Node.ChildNodes)
                 {
                     if (item.IsBlockNode() || item.HasBlockElement())
                     {
                         ComposeMany(col, buffer);
                         buffer.Clear();
 
-                        col.Item().Component(item.GetComponent(args));
+                        col.Item().Component(item.GetComponent(Args));
                     }
                     else
                     {
@@ -67,13 +66,14 @@ protected virtual void ComposeMany(IContainer container)
 
         private void ComposeMany(ColumnDescriptor col, List<HtmlNode> nodes)
         {
-            if (nodes.Count == 1)
+            switch (nodes.Count)
             {
-                col.Item().Component(nodes.First().GetComponent(args));
-            }
-            else if (nodes.Count > 0)
-            {
-                col.Item().Component(new ParagraphComponent(nodes, args));
+                case 1:
+                    col.Item().Component(nodes.First().GetComponent(Args));
+                    break;
+                case > 0:
+                    col.Item().Component(new ParagraphComponent(nodes, Args));
+                    break;
             }
         }
     }
diff --git a/HTMLToQPDF/Components/HTMLComponent.cs b/HTMLToQPDF/Components/HTMLComponent.cs
index 97c22a1..d2f8ac4 100644
--- a/HTMLToQPDF/Components/HTMLComponent.cs
+++ b/HTMLToQPDF/Components/HTMLComponent.cs
@@ -1,7 +1,5 @@
 using HtmlAgilityPack;
-using HTMLQuestPDF;
-using HTMLQuestPDF.Extensions;
-using HTMLQuestPDF.Utils;
+using HTMLToQPDF.Extensions;
 using HTMLToQPDF.Utils;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
@@ -12,11 +10,11 @@ namespace HTMLToQPDF.Components
 
     internal delegate void TextSpanAction(TextSpanDescriptor textSpan);
 
-    internal class HTMLComponent : IComponent
+    internal class HtmlComponent : IComponent
     {
         public GetImgBySrc GetImgBySrc { get; set; } = ImgUtils.GetImgBySrc;
 
-        public Dictionary<string, TextStyle> TextStyles { get; } = new Dictionary<string, TextStyle>()
+        public Dictionary<string, TextStyle> TextStyles { get; } = new()
         {
             { "h1", TextStyle.Default.FontSize(32).Bold() },
             { "h2", TextStyle.Default.FontSize(28).Bold() },
@@ -39,26 +37,24 @@ internal class HTMLComponent : IComponent
 
         };
 
-        public Dictionary<string, Func<IContainer, IContainer>> ContainerStyles { get; } = new Dictionary<string, Func<IContainer, IContainer>>()
+        public Dictionary<string, Func<IContainer, IContainer>> ContainerStyles { get; } = new()
         {
-            { "p", c => c.PaddingVertical(6) },
-            { "ul", c => c.PaddingLeft(30) },
-            { "ol", c => c.PaddingLeft(30) }
+            { "p", c => c.PaddingVertical(6) }
         };
 
         public float ListVerticalPadding { get; set; }
 
-        public string HTML { get; set; } = "";
+        public string Html { get; set; } = "";
 
         public void Compose(IContainer container)
         {
             var doc = new HtmlDocument();
-            doc.LoadHtml(HTMLUtils.PrepareHTML(HTML));
+            doc.LoadHtml(HtmlUtils.PrepareHtml(Html));
             var node = doc.DocumentNode;
 
             CreateSeparateBranchesForTextNodes(node);
 
-            container.Component(node.GetComponent(new HTMLComponentsArgs(TextStyles, ContainerStyles, ListVerticalPadding, GetImgBySrc)));
+            container.Component(node.GetComponent(new HtmlComponentsArgs(TextStyles, ContainerStyles, ListVerticalPadding, GetImgBySrc)));
         }
 
         /// <summary>
@@ -71,11 +67,11 @@ public void Compose(IContainer container)
         /// This is necessary to avoid extra line breaks
         /// </summary>
         /// <param name="node"></param>
-        private void CreateSeparateBranchesForTextNodes(HtmlNode node)
+        private static void CreateSeparateBranchesForTextNodes(HtmlNode node)
         {
             if (node.IsLineNode() && node.HasBlockElement())
             {
-                var slices = node.GetSlices(new List<HtmlNode>() { node });
+                var slices = node.GetSlices([node]);
 
                 var parent = node.ParentNode;
                 var children = node.ParentNode.ChildNodes.ToList();
@@ -99,10 +95,7 @@ private void CreateSeparateBranchesForTextNodes(HtmlNode node)
                         }
                     }
 
-                    if (newNode != null)
-                    {
-                        newNode.InnerHtml = newNode.InnerText.Trim();
-                    }
+                    newNode?.InnerHtml = newNode.InnerText.Trim();
                 }
 
                 children.Remove(node);
diff --git a/HTMLToQPDF/Components/HTMLComponentsArgs.cs b/HTMLToQPDF/Components/HTMLComponentsArgs.cs
index 613d60c..19dd66c 100644
--- a/HTMLToQPDF/Components/HTMLComponentsArgs.cs
+++ b/HTMLToQPDF/Components/HTMLComponentsArgs.cs
@@ -4,14 +4,14 @@ namespace HTMLToQPDF.Components
 {
     public delegate byte[]? GetImgBySrc(string src);
 
-    internal class HTMLComponentsArgs
+    internal class HtmlComponentsArgs
     {
         public Dictionary<string, TextStyle> TextStyles { get; }
         public Dictionary<string, Func<IContainer, IContainer>> ContainerStyles { get; }
         public float ListVerticalPadding { get; }
         public GetImgBySrc GetImgBySrc { get; }
 
-        public HTMLComponentsArgs(Dictionary<string, TextStyle> textStyles, Dictionary<string, Func<IContainer, IContainer>> containerStyles, float listVerticalPadding, GetImgBySrc getImgBySrc)
+        public HtmlComponentsArgs(Dictionary<string, TextStyle> textStyles, Dictionary<string, Func<IContainer, IContainer>> containerStyles, float listVerticalPadding, GetImgBySrc getImgBySrc)
         {
             TextStyles = textStyles;
             ContainerStyles = containerStyles;
diff --git a/HTMLToQPDF/Components/ParagraphComponent.cs b/HTMLToQPDF/Components/ParagraphComponent.cs
index 9bc0258..4af956d 100644
--- a/HTMLToQPDF/Components/ParagraphComponent.cs
+++ b/HTMLToQPDF/Components/ParagraphComponent.cs
@@ -1,37 +1,44 @@
 using HtmlAgilityPack;
-using HTMLQuestPDF.Extensions;
-using HTMLToQPDF.Components;
+using HTMLToQPDF.Extensions;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 
-namespace HTMLQuestPDF.Components
+namespace HTMLToQPDF.Components
 {
     internal class ParagraphComponent : IComponent
     {
-        private readonly List<HtmlNode> lineNodes;
-        private readonly Dictionary<string, TextStyle> textStyles;
+        private readonly List<HtmlNode> _lineNodes;
+        private readonly Dictionary<string, TextStyle> _textStyles;
 
-        public ParagraphComponent(List<HtmlNode> lineNodes, HTMLComponentsArgs args)
+        public ParagraphComponent(List<HtmlNode> lineNodes, HtmlComponentsArgs args)
         {
-            this.lineNodes = lineNodes;
-            this.textStyles = args.TextStyles;
+            _lineNodes = lineNodes;
+            _textStyles = args.TextStyles;
         }
 
-        private HtmlNode? GetParrentBlock(HtmlNode node)
+        private static HtmlNode? GetParrentBlock(HtmlNode node)
         {
-            if (node == null) return null;
-            return node.IsBlockNode() ? node : GetParrentBlock(node.ParentNode);
+            while (true)
+            {
+                if (node == null) return null;
+                if (node.IsBlockNode()) return node;
+                node = node.ParentNode;
+            }
         }
 
-        private HtmlNode? GetListItemNode(HtmlNode node)
+        private static HtmlNode? GetListItemNode(HtmlNode node)
         {
-            if (node == null || node.IsList()) return null;
-            return node.IsListItem() ? node : GetListItemNode(node.ParentNode);
+            while (true)
+            {
+                if (node == null || node.IsList()) return null;
+                if (node.IsListItem()) return node;
+                node = node.ParentNode;
+            }
         }
 
         public void Compose(IContainer container)
         {
-            var listItemNode = GetListItemNode(lineNodes.First()) ?? GetParrentBlock(lineNodes.First());
+            var listItemNode = GetListItemNode(_lineNodes.First()) ?? GetParrentBlock(_lineNodes.First());
             if (listItemNode == null) return;
 
             var numberInList = listItemNode.GetNumberInList();
@@ -40,26 +47,31 @@ public void Compose(IContainer container)
             {
                 container.Row(row =>
                 {
-                    var listPrefix = numberInList == -1 ? "" : numberInList == 0 ? "•  " : $"{numberInList}. ";
-                    row.AutoItem().MinWidth(26).AlignCenter().Text(listPrefix);
+                    var listPrefix = numberInList switch
+                    {
+                        -1 => "",
+                        0 => "•  ",
+                        _ => $"{numberInList}. "
+                    };
+                    row.AutoItem().MinWidth(13).AlignCenter().Text(listPrefix);
                     container = row.RelativeItem();
                 });
             }
 
-            var first = lineNodes.First();
-            var last = lineNodes.First();
+            var first = _lineNodes.First();
+            var last = _lineNodes.First();
 
             first.InnerHtml = first.InnerHtml.TrimStart();
             last.InnerHtml = last.InnerHtml.TrimEnd();
 
-            container.Text(GetAction(lineNodes));
+            container.Text(GetAction());
         }
 
-        private Action<TextDescriptor> GetAction(List<HtmlNode> nodes)
+        private Action<TextDescriptor> GetAction()
         {
             return text =>
             {
-                lineNodes.ForEach(node => GetAction(node).Invoke(text));
+                _lineNodes.ForEach(node => GetAction(node).Invoke(text));
             };
         }
 
@@ -94,22 +106,20 @@ private TextSpanAction GetTextSpanAction(HtmlNode node)
             {
                 var action = GetTextStyles(node);
                 action(spanAction);
-                if (node.ParentNode != null)
-                {
-                    var parrentAction = GetTextSpanAction(node.ParentNode);
-                    parrentAction(spanAction);
-                }
+                if (node.ParentNode == null) return;
+                var parrentAction = GetTextSpanAction(node.ParentNode);
+                parrentAction(spanAction);
             };
         }
 
-        public TextSpanAction GetTextStyles(HtmlNode element)
+        private TextSpanAction GetTextStyles(HtmlNode element)
         {
-            return (span) => span.Style(GetTextStyle(element));
+            return span => span.Style(GetTextStyle(element));
         }
 
-        public TextStyle GetTextStyle(HtmlNode element)
+        private TextStyle GetTextStyle(HtmlNode element)
         {
-            return textStyles.TryGetValue(element.Name.ToLower(), out TextStyle? style) ? style : TextStyle.Default;
+            return _textStyles.TryGetValue(element.Name.ToLower(), out var style) ? style : TextStyle.Default;
         }
     }
 }
\ No newline at end of file
diff --git a/HTMLToQPDF/Components/Tags/AComponent.cs b/HTMLToQPDF/Components/Tags/AComponent.cs
index 0fd71b3..878d74a 100644
--- a/HTMLToQPDF/Components/Tags/AComponent.cs
+++ b/HTMLToQPDF/Components/Tags/AComponent.cs
@@ -1,21 +1,20 @@
 using HtmlAgilityPack;
-using HTMLQuestPDF.Extensions;
-using HTMLToQPDF.Components;
+using HTMLToQPDF.Extensions;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 
-namespace HTMLQuestPDF.Components.Tags
+namespace HTMLToQPDF.Components.Tags
 {
-    internal class AComponent : BaseHTMLComponent
+    internal class AComponent : BaseHtmlComponent
     {
-        public AComponent(HtmlNode node, HTMLComponentsArgs args) : base(node, args)
+        public AComponent(HtmlNode node, HtmlComponentsArgs args) : base(node, args)
         {
         }
 
         protected override IContainer ApplyStyles(IContainer container)
         {
             container = base.ApplyStyles(container);
-            return node.TryGetLink(out string link) ? container.Hyperlink(link) : container;
+            return Node.TryGetLink(out var link) ? container.Hyperlink(link) : container;
         }
     }
 }
\ No newline at end of file
diff --git a/HTMLToQPDF/Components/Tags/BrComponent.cs b/HTMLToQPDF/Components/Tags/BrComponent.cs
index c9c791f..aaaf754 100644
--- a/HTMLToQPDF/Components/Tags/BrComponent.cs
+++ b/HTMLToQPDF/Components/Tags/BrComponent.cs
@@ -1,13 +1,12 @@
 using HtmlAgilityPack;
-using HTMLToQPDF.Components;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 
-namespace HTMLQuestPDF.Components.Tags
+namespace HTMLToQPDF.Components.Tags
 {
-    internal class BrComponent : BaseHTMLComponent
+    internal class BrComponent : BaseHtmlComponent
     {
-        public BrComponent(HtmlNode node, HTMLComponentsArgs args) : base(node, args)
+        public BrComponent(HtmlNode node, HtmlComponentsArgs args) : base(node, args)
         {
         }
 
diff --git a/HTMLToQPDF/Components/Tags/ImgComponent.cs b/HTMLToQPDF/Components/Tags/ImgComponent.cs
index 05733f9..6c21bad 100644
--- a/HTMLToQPDF/Components/Tags/ImgComponent.cs
+++ b/HTMLToQPDF/Components/Tags/ImgComponent.cs
@@ -1,24 +1,23 @@
 using HtmlAgilityPack;
-using HTMLToQPDF.Components;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 
-namespace HTMLQuestPDF.Components.Tags
+namespace HTMLToQPDF.Components.Tags
 {
-    internal class ImgComponent : BaseHTMLComponent
+    internal class ImgComponent : BaseHtmlComponent
     {
-        private readonly GetImgBySrc getImgBySrc;
+        private readonly GetImgBySrc _getImgBySrc;
 
-        public ImgComponent(HtmlNode node, HTMLComponentsArgs args) : base(node, args)
+        public ImgComponent(HtmlNode node, HtmlComponentsArgs args) : base(node, args)
         {
-            this.getImgBySrc = args.GetImgBySrc;
+            _getImgBySrc = args.GetImgBySrc;
         }
 
         protected override void ComposeSingle(IContainer container)
         {
-            var src = node.GetAttributeValue("src", "");
-            var img = getImgBySrc(src) ?? Placeholders.Image(200, 100);
+            var src = Node.GetAttributeValue("src", "");
+            var img = _getImgBySrc(src) ?? Placeholders.Image(200, 100);
             container.AlignCenter().Image(img).FitArea();
             
         }
diff --git a/HTMLToQPDF/Components/Tags/ListComponent.cs b/HTMLToQPDF/Components/Tags/ListComponent.cs
index 9064e6d..1ca4af2 100644
--- a/HTMLToQPDF/Components/Tags/ListComponent.cs
+++ b/HTMLToQPDF/Components/Tags/ListComponent.cs
@@ -1,24 +1,23 @@
 using HtmlAgilityPack;
-using HTMLQuestPDF.Extensions;
-using HTMLToQPDF.Components;
+using HTMLToQPDF.Extensions;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 
-namespace HTMLQuestPDF.Components.Tags
+namespace HTMLToQPDF.Components.Tags
 {
-    internal class ListComponent : BaseHTMLComponent
+    internal class ListComponent : BaseHtmlComponent
     {
-        public ListComponent(HtmlNode node, HTMLComponentsArgs args) : base(node, args)
+        public ListComponent(HtmlNode node, HtmlComponentsArgs args) : base(node, args)
         {
         }
 
         protected override IContainer ApplyStyles(IContainer container)
         {
-            var first = IsFirstList(node);
-            return base.ApplyStyles(container).Element(e => first ? e.PaddingVertical(args.ListVerticalPadding) : e);
+            var first = IsFirstList(Node);
+            return base.ApplyStyles(container).Element(e => first ? e.PaddingVertical(Args.ListVerticalPadding) : e);
         }
 
-        private bool IsFirstList(HtmlNode node)
+        private static bool IsFirstList(HtmlNode node)
         {
             if (node.ParentNode == null) return true;
             return !node.ParentNode.IsList() && IsFirstList(node.ParentNode);
diff --git a/HTMLToQPDF/Components/Tags/TableComponent.cs b/HTMLToQPDF/Components/Tags/TableComponent.cs
index 24e08e1..241a2ac 100644
--- a/HTMLToQPDF/Components/Tags/TableComponent.cs
+++ b/HTMLToQPDF/Components/Tags/TableComponent.cs
@@ -1,33 +1,32 @@
 using HtmlAgilityPack;
-using HTMLQuestPDF.Extensions;
-using HTMLToQPDF.Components;
+using HTMLToQPDF.Extensions;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 
-namespace HTMLQuestPDF.Components.Tags
+namespace HTMLToQPDF.Components.Tags
 {
-    internal class TableComponent : BaseHTMLComponent
+    internal class TableComponent : BaseHtmlComponent
     {
         private delegate (uint, uint) GetPositionDelegate(int rowIndex, uint colSpan, uint rowSpan);
 
-        public TableComponent(HtmlNode node, HTMLComponentsArgs args) : base(node, args)
+        public TableComponent(HtmlNode node, HtmlComponentsArgs args) : base(node, args)
         {
         }
 
         private HtmlNodeCollection GetCellNodes()
         {
-            node.Id = String.IsNullOrEmpty(node.Id) ? Guid.NewGuid().ToString() : node.Id;
-            return node.SelectNodes($"(//table[@id=\"{node.Id}\"]//th | //table[@id=\"{node.Id}\"]//td)");
+            Node.Id = string.IsNullOrEmpty(Node.Id) ? Guid.NewGuid().ToString() : Node.Id;
+            return Node.SelectNodes($"(//table[@id=\"{Node.Id}\"]//th | //table[@id=\"{Node.Id}\"]//td)");
         }
 
         private List<List<HtmlNode>> GetTableLines()
         {
             var tableItems = GetCellNodes();
 
-            List<List<HtmlNode>> lines = new List<List<HtmlNode>>();
+            var lines = new List<List<HtmlNode>>();
 
-            List<HtmlNode> lastLine = new List<HtmlNode>();
-            HtmlNode? lastTr = GetTr(tableItems.First());
+            var lastLine = new List<HtmlNode>();
+            var lastTr = GetTr(tableItems.First());
 
             foreach (var item in tableItems)
             {
@@ -35,7 +34,7 @@ private List<List<HtmlNode>> GetTableLines()
                 if (lastTr != currentTr)
                 {
                     lines.Add(lastLine);
-                    lastLine = new List<HtmlNode>();
+                    lastLine = [];
                     lastTr = currentTr;
                 }
                 lastLine.Add(item);
@@ -56,7 +55,7 @@ protected override void ComposeMany(IContainer container)
 
                     table.ColumnsDefinition(columns =>
                     {
-                        for (int i = 0; i < maxColumns; i++)
+                        for (var i = 0; i < maxColumns; i++)
                         {
                             columns.RelativeColumn();
                         }
@@ -68,10 +67,10 @@ protected override void ComposeMany(IContainer container)
                     {
                         foreach (var cell in line)
                         {
-                            uint colSpan = (uint)cell.GetAttributeValue("colspan", 1);
-                            uint rowSpan = (uint)cell.GetAttributeValue("rowspan", 1);
+                            var colSpan = (uint)cell.GetAttributeValue("colspan", 1);
+                            var rowSpan = (uint)cell.GetAttributeValue("rowspan", 1);
 
-                            (uint col, uint row) = getNextPosition(lines.IndexOf(line), colSpan, rowSpan);
+                            var (col, row) = getNextPosition(lines.IndexOf(line), colSpan, rowSpan);
 
                             table.Cell()
                             .ColumnSpan(colSpan)
@@ -80,7 +79,7 @@ protected override void ComposeMany(IContainer container)
                             .RowSpan(rowSpan)
                             .Border(1)
                             .Padding(5)
-                            .Component(cell.GetComponent(args));
+                            .Component(cell.GetComponent(Args));
                         }
                     }
                 });
@@ -89,10 +88,10 @@ protected override void ComposeMany(IContainer container)
         private GetPositionDelegate GetFuncGettingNextPosition(int maxColumns)
         {
             var rows = new List<bool[]>();
-            return (int rowIndex, uint colSpan, uint rowSpan) =>
+            return (rowIndex, colSpan, rowSpan) =>
             {
                 uint col = 0;
-                uint row = (uint)rowIndex;
+                var row = (uint)rowIndex;
 
                 if (rows.Count <= rowIndex) rows.Add(new bool[maxColumns]);
 
@@ -101,9 +100,9 @@ private GetPositionDelegate GetFuncGettingNextPosition(int maxColumns)
                     col++;
                 }
 
-                for (int j = 0; j < rowSpan; j++)
+                for (var j = 0; j < rowSpan; j++)
                 {
-                    for (int i = 0; i < colSpan; i++)
+                    for (var i = 0; i < colSpan; i++)
                     {
                         if (rows.Count <= rowIndex + j) rows.Add(new bool[maxColumns]);
                         rows[rowIndex + j][col + i] = true;
@@ -114,10 +113,14 @@ private GetPositionDelegate GetFuncGettingNextPosition(int maxColumns)
             };
         }
 
-        private HtmlNode? GetTr(HtmlNode node)
+        private static HtmlNode? GetTr(HtmlNode node)
         {
-            if (node.IsTable() || node == null) return null;
-            return node.IsTr() ? node : GetTr(node.ParentNode);
+            while (true)
+            {
+                if (node.IsTable() || node == null) return null;
+                if (node.IsTr()) return node;
+                node = node.ParentNode;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/HTMLToQPDF/Extensions/HTMLComponentExtensions.cs b/HTMLToQPDF/Extensions/HTMLComponentExtensions.cs
index e7af083..e19ac8c 100644
--- a/HTMLToQPDF/Extensions/HTMLComponentExtensions.cs
+++ b/HTMLToQPDF/Extensions/HTMLComponentExtensions.cs
@@ -1,15 +1,15 @@
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 
-namespace HTMLQuestPDF.Extensions
+namespace HTMLToQPDF.Extensions
 {
-    public static class HTMLComponentExtensions
+    public static class HtmlComponentExtensions
     {
-        public static void HTML(this IContainer container, Action<HTMLDescriptor> handler)
+        public static void Html(this IContainer container, Action<HtmlDescriptor> handler)
         {
-            var htmlPageDescriptor = new HTMLDescriptor();
+            var htmlPageDescriptor = new HtmlDescriptor();
             handler(htmlPageDescriptor);
-            container.Component(htmlPageDescriptor.PDFPage);
+            container.Component(htmlPageDescriptor.PdfPage);
         }
     }
 }
\ No newline at end of file
diff --git a/HTMLToQPDF/Extensions/HtmlNodeExtensions.cs b/HTMLToQPDF/Extensions/HtmlNodeExtensions.cs
index 71d04ed..5d83718 100644
--- a/HTMLToQPDF/Extensions/HtmlNodeExtensions.cs
+++ b/HTMLToQPDF/Extensions/HtmlNodeExtensions.cs
@@ -1,141 +1,135 @@
 using HtmlAgilityPack;
 
-namespace HTMLQuestPDF.Extensions
+namespace HTMLToQPDF.Extensions;
+
+internal static class HtmlNodeExtensions
 {
-    internal static class HtmlNodeExtensions
+    /// <param name="node"></param>
+    extension(HtmlNode node)
     {
-        public static HtmlNode? GetListNode(this HtmlNode node)
+        public HtmlNode? GetListNode()
         {
             if (node.IsList()) return node;
-            if (node.ParentNode == null) return null;
-            return GetListNode(node.ParentNode);
+            return node.ParentNode == null ? null : GetListNode(node.ParentNode);
         }
 
         /// <summary>
-        ///
+        /// 
         /// </summary>
-        /// <param name="node"></param>
         /// <returns>
         /// -1 - not a list
         /// 0 - marked list
         /// > 0 - number in the list
         /// </returns>
-        public static int GetNumberInList(this HtmlNode node)
+        public int GetNumberInList()
         {
             HtmlNode? listItem = null;
 
             if (node != null && node.IsListItem()) listItem = node;
             if (node?.ParentNode != null && node.ParentNode.IsListItem()) listItem = node.ParentNode;
 
-            if (listItem != null)
-            {
-                var listNode = listItem.GetListNode();
-                if (listNode == null || listNode.IsMarkedList()) return 0;
+            if (listItem == null) return -1;
+            var listNode = listItem.GetListNode();
+            if (listNode == null || listNode.IsMarkedList()) return 0;
 
-                return listNode.Descendants("li").Where(n => n.GetListNode() == listNode).ToList().IndexOf(listItem) + 1;
-            }
-            return -1;
+            return listNode.Descendants("li").Where(n => n.GetListNode() == listNode).ToList().IndexOf(listItem) + 1;
         }
 
-        public static List<List<HtmlNode>> GetSlices(this HtmlNode node, List<HtmlNode> slice)
+        public List<List<HtmlNode>> GetSlices(List<HtmlNode> slice)
         {
             var result = new List<List<HtmlNode>>();
 
-            if (!node.ChildNodes.Any() || node.NodeType == HtmlNodeType.Text)
+            if (node.ChildNodes.Count == 0 || node.NodeType == HtmlNodeType.Text)
             {
                 result.Add(slice);
-                return result;
             }
             else
             {
                 foreach (var item in node.ChildNodes)
                 {
-                    result.AddRange(GetSlices(item, new List<HtmlNode>(slice) { item }));
+                    result.AddRange(GetSlices(item, [..slice, item]));
                 }
             }
 
             return result;
         }
 
-        public static bool HasBlockElement(this HtmlNode node)
+        public bool HasBlockElement()
         {
-            foreach (var child in node.ChildNodes)
-            {
-                return child.IsBlockNode() || HasBlockElement(child);
-            }
-            return false;
+            return node.ChildNodes.Select(child => child.IsBlockNode() || HasBlockElement(child)).FirstOrDefault();
         }
 
-        public static bool HasContent(this HtmlNode node)
+        public bool HasContent()
         {
-            foreach (var item in node.ChildNodes)
+            if (node.ChildNodes.Any(HasContent))
             {
-                if (HasContent(item)) return true;
+                return true;
             }
+
             return !node.IsEmpty();
         }
 
-        public static bool IsBlockNode(this HtmlNode node)
+        public bool IsBlockNode()
         {
-            return HTMLMapSettings.BlockElements.Contains(node.Name.ToLower());
+            return HtmlMapSettings.BlockElements.Contains(node.Name.ToLower());
         }
 
-        public static bool IsBr(this HtmlNode node)
+        public bool IsBr()
         {
-            return node.Name.ToLower() == "br";
+            return node.Name.Equals("br", StringComparison.CurrentCultureIgnoreCase);
         }
 
-        public static bool IsTr(this HtmlNode node)
+        public bool IsTr()
         {
-            return node.Name.ToLower() == "tr";
+            return node.Name.Equals("tr", StringComparison.CurrentCultureIgnoreCase);
         }
 
-        public static bool IsEmpty(this HtmlNode node)
+        private bool IsEmpty()
         {
             return string.IsNullOrEmpty(node.InnerText) && !node.IsImg() && !node.IsBr();
         }
 
-        public static bool IsImg(this HtmlNode node)
+        private bool IsImg()
         {
-            return node.Name.ToLower() == "img";
+            return node.Name.Equals("img", StringComparison.CurrentCultureIgnoreCase);
         }
 
-        public static bool IsTable(this HtmlNode node)
+        public bool IsTable()
         {
-            return node.Name.ToLower() == "table";
+            return node.Name.Equals("table", StringComparison.CurrentCultureIgnoreCase);
         }
 
-        public static bool IsLineNode(this HtmlNode node)
+        public bool IsLineNode()
         {
-            return HTMLMapSettings.LineElements.Contains(node.Name.ToLower());
+            return HtmlMapSettings.LineElements.Contains(node.Name.ToLower());
         }
 
-        public static bool IsLink(this HtmlNode node)
+        private bool IsLink()
         {
-            return node.Name.ToLower() == "a";
+            return node.Name.Equals("a", StringComparison.CurrentCultureIgnoreCase);
         }
 
-        public static bool IsList(this HtmlNode node)
+        public bool IsList()
         {
             return node.IsMarkedList() || node.IsNumberedList();
         }
 
-        public static bool IsListItem(this HtmlNode node)
+        public bool IsListItem()
         {
-            return node.Name.ToLower() == "li";
+            return node.Name.Equals("li", StringComparison.CurrentCultureIgnoreCase);
         }
 
-        public static bool IsMarkedList(this HtmlNode node)
+        private bool IsMarkedList()
         {
-            return node.Name.ToLower() == "ul";
+            return node.Name.Equals("ul", StringComparison.CurrentCultureIgnoreCase);
         }
 
-        public static bool IsNumberedList(this HtmlNode node)
+        private bool IsNumberedList()
         {
-            return node.Name.ToLower() == "ol";
+            return node.Name.Equals("ol", StringComparison.CurrentCultureIgnoreCase);
         }
 
-        public static bool TryGetLink(this HtmlNode node, out string url)
+        public bool TryGetLink(out string url)
         {
             var current = node;
             while (current != null)
diff --git a/HTMLToQPDF/Extensions/IContainerExtensions.cs b/HTMLToQPDF/Extensions/IContainerExtensions.cs
index dc09678..173c6ed 100644
--- a/HTMLToQPDF/Extensions/IContainerExtensions.cs
+++ b/HTMLToQPDF/Extensions/IContainerExtensions.cs
@@ -1,15 +1,15 @@
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 
-namespace HTMLQuestPDF.Extensions
+namespace HTMLToQPDF.Extensions
 {
 #if DEBUG
 
-    internal static class IContainerExtensions
+    internal static class ContainerExtensions
     {
-        private static Random random = new Random();
+        private static readonly Random Random = new();
 
-        public static IContainer Debug(this IContainer container, string name) => container.DebugArea(name, String.Format("#{0:X6}", random.Next(0x1000000)));
+        public static IContainer Debug(this IContainer container, string name) => container.DebugArea(name, $"#{Random.Next(0x1000000):X6}");
     }
 
 #endif
diff --git a/HTMLToQPDF/HTMLDescriptor.cs b/HTMLToQPDF/HTMLDescriptor.cs
index e822c15..e641052 100644
--- a/HTMLToQPDF/HTMLDescriptor.cs
+++ b/HTMLToQPDF/HTMLDescriptor.cs
@@ -2,35 +2,35 @@
 using HTMLToQPDF.Utils;
 using QuestPDF.Infrastructure;
 
-namespace HTMLQuestPDF
+namespace HTMLToQPDF
 {
-    public class HTMLDescriptor
+    public class HtmlDescriptor
     {
-        internal HTMLComponent PDFPage { get; } = new HTMLComponent();
+        internal HtmlComponent PdfPage { get; } = new();
 
         public void SetHtml(string html)
         {
-            PDFPage.HTML = html;
+            PdfPage.Html = html;
         }
 
         public void OverloadImgReceivingFunc(GetImgBySrc getImg)
         {
-            PDFPage.GetImgBySrc = getImg;
+            PdfPage.GetImgBySrc = getImg;
         }
 
         public void SetTextStyleForHtmlElement(string tagName, TextStyle style)
         {
-            PDFPage.TextStyles[tagName.ToLower()] = style;
+            PdfPage.TextStyles[tagName.ToLower()] = style;
         }
 
         public void SetContainerStyleForHtmlElement(string tagName, Func<IContainer, IContainer> style)
         {
-            PDFPage.ContainerStyles[tagName.ToLower()] = style;
+            PdfPage.ContainerStyles[tagName.ToLower()] = style;
         }
 
         public void SetListVerticalPadding(float value, Unit unit = Unit.Point)
         {
-            PDFPage.ListVerticalPadding = UnitUtils.ToPoints(value, unit);
+            PdfPage.ListVerticalPadding = UnitUtils.ToPoints(value, unit);
         }
     }
 }
\ No newline at end of file
diff --git a/HTMLToQPDF/HTMLToQPDF.csproj b/HTMLToQPDF/HTMLToQPDF.csproj
index 7a47862..1a0e709 100644
--- a/HTMLToQPDF/HTMLToQPDF.csproj
+++ b/HTMLToQPDF/HTMLToQPDF.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Title>Relorer.QuestPDF.HTML</Title>
-    <Company></Company>
     <Authors>Relorer</Authors>
     <Description>Relorer.QuestPDF.HTML is an extension for QuestPDF that allows to generate PDF from HTML</Description>
     <PackageProjectUrl>https://github.com/Relorer/HTMLToQPDF</PackageProjectUrl>
@@ -15,6 +14,7 @@
     <PackageTags>pdf, file, export, generate, generation, tool, create, creation, render, document, format, quest, html, library, converter, open, source, free, standard, core</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Version>1.2.2</Version>
+    <LangVersion>14</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/HTMLToQPDF/StyleSettings.cs b/HTMLToQPDF/StyleSettings.cs
index df9cc5f..586e579 100644
--- a/HTMLToQPDF/StyleSettings.cs
+++ b/HTMLToQPDF/StyleSettings.cs
@@ -1,14 +1,14 @@
 using HtmlAgilityPack;
-using HTMLQuestPDF.Components;
-using HTMLQuestPDF.Components.Tags;
 using HTMLToQPDF.Components;
+using HTMLToQPDF.Components.Tags;
 using QuestPDF.Infrastructure;
 
-namespace HTMLQuestPDF
+namespace HTMLToQPDF
 {
-    internal static class HTMLMapSettings
+    internal static class HtmlMapSettings
     {
-        public static readonly string[] LineElements = new string[] {
+        public static readonly string[] LineElements =
+        [
             "a",
             "b",
             "br",
@@ -30,9 +30,10 @@ internal static class HTMLMapSettings
             "u",
             "img",
             "text"
-        };
+        ];
 
-        public static readonly string[] BlockElements = new string[] {
+        public static readonly string[] BlockElements =
+        [
             "#document",
             "div",
             "h1",
@@ -51,21 +52,21 @@ internal static class HTMLMapSettings
             "footer",
             "head",
             "html"
-        };
+        ];
 
-        public static IComponent GetComponent(this HtmlNode node, HTMLComponentsArgs args)
+        public static IComponent GetComponent(this HtmlNode node, HtmlComponentsArgs args)
         {
             return node.Name.ToLower() switch
             {
                 "#text" or "h1" or "h2" or "h3" or "h4" or "h5" or "h6" or "b" or "s" or "strike" or "i" or "small" or "u" or "del" or "em" or "strong" or "sub" or "sup"
-                    => new ParagraphComponent(new List<HtmlNode>() { node }, args),
+                    => new ParagraphComponent([node], args),
                 "br" => new BrComponent(node, args),
                 "a" => new AComponent(node, args),
-                "div" => new BaseHTMLComponent(node, args),
+                "div" => new BaseHtmlComponent(node, args),
                 "table" => new TableComponent(node, args),
                 "ul" or "ol" => new ListComponent(node, args),
                 "img" => new ImgComponent(node, args),
-                _ => new BaseHTMLComponent(node, args),
+                _ => new BaseHtmlComponent(node, args),
             };
         }
     }
diff --git a/HTMLToQPDF/Utils/HTMLUtils.cs b/HTMLToQPDF/Utils/HTMLUtils.cs
index 3015212..d4e25ff 100644
--- a/HTMLToQPDF/Utils/HTMLUtils.cs
+++ b/HTMLToQPDF/Utils/HTMLUtils.cs
@@ -1,13 +1,13 @@
 using System.Text.RegularExpressions;
 using System.Web;
 
-namespace HTMLQuestPDF.Utils
+namespace HTMLToQPDF.Utils
 {
-    internal static class HTMLUtils
+    internal static partial class HtmlUtils
     {
-        private static readonly string spaceAfterLineElementPattern = @$"\S<\/({string.Join("|", HTMLMapSettings.LineElements)})> ";
+        private static readonly string SpaceAfterLineElementPattern = @$"\S<\/({string.Join("|", HtmlMapSettings.LineElements)})> ";
 
-        public static string PrepareHTML(string value)
+        public static string PrepareHtml(string value)
         {
             var result = HttpUtility.HtmlDecode(value);
             result = RemoveExtraSpacesAndBreaks(result);
@@ -19,22 +19,29 @@ public static string PrepareHTML(string value)
 
         private static string RemoveExtraSpacesAndBreaks(string html)
         {
-            return Regex.Replace(html, @"[ \r\n]+", " ");
+            return RemoveExtraSpacesAndBreaksRegex().Replace(html, " ");
         }
 
         private static string RemoveSpacesBetweenElements(string html)
         {
-            return Regex.Replace(html, @">\s+<", _ => @"><").Replace("<space></space>", "<space> </space>");
+            return RemoveSpacesBetweenElementsRegex().Replace(html, _ => "><").Replace("<space></space>", "<space> </space>");
         }
 
         private static string RemoveSpacesAroundBr(string html)
         {
-            return Regex.Replace(html, @"\s+<\/?br\s*\/?>\s+", _ => @$"<br>");
+            return RemoveSpacesAroundBrRegex().Replace(html, _ => "<br>");
         }
 
         private static string WrapSpacesAfterLineElement(string html)
         {
-            return Regex.Replace(html, spaceAfterLineElementPattern, m => $"{m.Value.Substring(0, m.Value.Length - 1)}<space> </space>");
+            return Regex.Replace(html, SpaceAfterLineElementPattern, m => $"{m.Value[..^1]}<space> </space>");
         }
+
+        [GeneratedRegex(@"[ \r\n]+")]
+        private static partial Regex RemoveExtraSpacesAndBreaksRegex();
+        [GeneratedRegex(@">\s+<")]
+        private static partial Regex RemoveSpacesBetweenElementsRegex();
+        [GeneratedRegex(@"\s+<\/?br\s*\/?>\s+")]
+        private static partial Regex RemoveSpacesAroundBrRegex();
     }
 }
\ No newline at end of file
diff --git a/HTMLToQPDF/Utils/ImgUtils.cs b/HTMLToQPDF/Utils/ImgUtils.cs
index 63172da..b0d6f85 100644
--- a/HTMLToQPDF/Utils/ImgUtils.cs
+++ b/HTMLToQPDF/Utils/ImgUtils.cs
@@ -1,18 +1,13 @@
-using System.Net;
-
-namespace HTMLToQPDF.Utils
+namespace HTMLToQPDF.Utils
 {
     internal static class ImgUtils
     {
 
-        private static HttpClient _SingletonClient;
-
-        static ImgUtils() {
+        private static readonly HttpClient SingletonClient;
 
-            if (_SingletonClient == null)
-            {
-                _SingletonClient = new HttpClient();
-            }
+        static ImgUtils()
+        {
+            SingletonClient ??= new HttpClient();
         }
 
         /// <summary>
@@ -20,9 +15,9 @@ static ImgUtils() {
         /// </summary>
         public static void Dispose() {
 
-            if (_SingletonClient != null)
+            if (SingletonClient != null)
             {
-                _SingletonClient.Dispose();
+                SingletonClient.Dispose();
             }
         }
         
@@ -32,7 +27,7 @@ public static void Dispose() {
             {
                 if (src.Contains("base64"))
                 {
-                    var base64 = src.Substring(src.IndexOf("base64,") + "base64,".Length);
+                    var base64 = src[(src.IndexOf("base64,", StringComparison.Ordinal) + "base64,".Length)..];
                     return Convert.FromBase64String(base64);
                 }
 
@@ -51,10 +46,10 @@ public static void Dispose() {
         private static Task<byte[]> Download(string src)
         {
 
-            if (_SingletonClient != null)
+            if (SingletonClient != null)
             {
-                Uri uri = new Uri(src);
-                return _SingletonClient.GetByteArrayAsync(uri);
+                var uri = new Uri(src);
+                return SingletonClient.GetByteArrayAsync(uri);
             }
             else
             {
diff --git a/HTMLToQPDF/Utils/UnitUtils.cs b/HTMLToQPDF/Utils/UnitUtils.cs
index 6e988bd..288acfc 100644
--- a/HTMLToQPDF/Utils/UnitUtils.cs
+++ b/HTMLToQPDF/Utils/UnitUtils.cs
@@ -18,7 +18,7 @@ float GetConversionFactor()
                     Unit.Feet => 864f,
                     Unit.Inch => 72f,
                     Unit.Mil => 0.072f,
-                    _ => throw new ArgumentOutOfRangeException("unit", unit, null),
+                    _ => throw new ArgumentOutOfRangeException(nameof(unit), unit, null),
                 };
             }
         }
diff --git a/Usage.md b/Usage.md
new file mode 100644
index 0000000..c0375fb
--- /dev/null
+++ b/Usage.md
@@ -0,0 +1,210 @@
+# HTMLToQPDF Usage Guide
+
+HTMLToQPDF is a .NET library that extends QuestPDF to generate PDF documents from HTML content. It parses HTML using HtmlAgilityPack and converts it into QuestPDF components, supporting a wide range of HTML elements with customizable styling.
+
+## Features
+
+- Convert HTML to PDF with QuestPDF
+- Support for common HTML elements (headings, paragraphs, lists, tables, images, links, etc.)
+- Customizable text and container styles
+- Image handling with custom download functions
+- Nested lists and tables
+- Basic text formatting (bold, italic, underline, strikethrough, etc.)
+
+## Installation
+
+Add the HTMLToQPDF package to your .NET project via NuGet:
+
+```bash
+dotnet add package HTMLToQPDF
+```
+
+### Dependencies
+
+- [QuestPDF](https://www.nuget.org/packages/QuestPDF/)
+- [HtmlAgilityPack](https://www.nuget.org/packages/HtmlAgilityPack/)
+
+## Basic Usage
+
+### Simple HTML to PDF
+
+```csharp
+using QuestPDF.Fluent;
+using QuestPDF.Infrastructure;
+using HTMLToQPDF.Components;
+
+// Create a document
+Document.Create(container =>
+{
+    container.Page(page =>
+    {
+        page.Content().Column(col =>
+        {
+            col.Item().HTML(handler =>
+            {
+                handler.SetHtml("<h1>Hello World</h1><p>This is a paragraph.</p>");
+            });
+        });
+    });
+}).GeneratePdf("output.pdf");
+```
+
+### Handling Images
+
+By default, images are downloaded using `WebClient`. For better performance and async support, override the image receiving function:
+
+```csharp
+using System.Net.Http;
+using System.Threading.Tasks;
+
+// Define a custom image loader
+private static async Task<byte[]?> GetImgBySrc(string src)
+{
+    using var client = new HttpClient();
+    try
+    {
+        var response = await client.GetAsync(src);
+        if (response.IsSuccessStatusCode)
+        {
+            return await response.Content.ReadAsByteArrayAsync();
+        }
+    }
+    catch
+    {
+        // Handle errors
+    }
+    return null;
+}
+
+// Use in HTML handler
+col.Item().HTML(handler =>
+{
+    handler.OverloadImgReceivingFunc(src => Task.Run(() => GetImgBySrc(src)).Result);
+    handler.SetHtml(htmlWithImages);
+});
+```
+
+## Customizing Styles
+
+### Text Styles
+
+Customize text appearance for specific HTML elements:
+
+```csharp
+handler.SetTextStyleForHtmlElement("h1", TextStyle.Default.FontSize(32).Bold().FontColor(Colors.Blue.Medium));
+handler.SetTextStyleForHtmlElement("p", TextStyle.Default.FontSize(12).LineHeight(1.5f));
+handler.SetTextStyleForHtmlElement("strong", TextStyle.Default.Bold());
+```
+
+### Container Styles
+
+Apply layout styles to container elements:
+
+```csharp
+handler.SetContainerStyleForHtmlElement("div", c => c.Padding(10).Background(Colors.Grey.Lighten3));
+handler.SetContainerStyleForHtmlElement("ul", c => c.PaddingLeft(20));
+handler.SetContainerStyleForHtmlElement("table", c => c.Border(1).BorderColor(Colors.Black));
+```
+
+### List Vertical Padding
+
+Set padding between list items (does not apply to nested lists):
+
+```csharp
+handler.SetListVerticalPadding(15); // Default is 0
+```
+
+## Supported HTML Elements
+
+### Block Elements
+- `p`, `div`, `h1`-`h6`: Paragraphs and headings
+- `ul`, `ol`, `li`: Lists (unordered and ordered)
+- `table`, `tr`, `td`, `th`: Tables
+- `br`: Line breaks
+
+### Inline Elements
+- `b`, `strong`: Bold text
+- `i`, `em`: Italic text
+- `u`: Underlined text
+- `strike`, `del`, `s`: Strikethrough text
+- `small`: Smaller text
+- `sup`, `sub`: Superscript and subscript
+- `a`: Links (rendered as underlined text)
+- `img`: Images
+
+### Notes on Support
+- CSS classes and IDs are ignored; styling is based on tag names only.
+- Complex layouts (flexbox, grid) are not supported.
+- `pre` and `code` elements do not preserve whitespace or use monospace fonts.
+- `hr` elements are not rendered.
+- Form elements (`input`, `button`, etc.) are ignored.
+- JavaScript and CSS are stripped during parsing.
+
+## Examples
+
+### Complete Example with Styling
+
+```csharp
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+using HTMLToQPDF.Components;
+
+string html = @"
+<h1>My Document</h1>
+<p>This is a <strong>bold</strong> paragraph with <a href='https://example.com'>a link</a>.</p>
+<ul>
+    <li>Item 1</li>
+    <li>Item 2
+        <ol>
+            <li>Subitem 1</li>
+            <li>Subitem 2</li>
+        </ol>
+    </li>
+</ul>
+<table>
+    <tr><th>Name</th><th>Age</th></tr>
+    <tr><td>John</td><td>30</td></tr>
+    <tr><td>Jane</td><td>25</td></tr>
+</table>
+";
+
+Document.Create(container =>
+{
+    container.Page(page =>
+    {
+        page.Size(PageSizes.A4);
+        page.Margin(2, Unit.Centimetre);
+        page.Content().Column(col =>
+        {
+            col.Item().HTML(handler =>
+            {
+                handler.SetHtml(html);
+                handler.SetTextStyleForHtmlElement("h1", TextStyle.Default.FontSize(24).Bold());
+                handler.SetContainerStyleForHtmlElement("table", c => c.Border(1));
+                handler.SetListVerticalPadding(10);
+            });
+        });
+    });
+}).GeneratePdf("styled_output.pdf");
+```
+
+### Using with WPF or Other Frameworks
+
+The library integrates seamlessly with QuestPDF. For WPF applications, ensure you handle threading appropriately for PDF generation.
+
+## Limitations
+
+- No full CSS support; only basic tag-based styling.
+- Images must be loaded synchronously or handled via custom functions.
+- Complex HTML structures may not render perfectly.
+- No support for interactive elements or JavaScript.
+- Whitespace in `pre` blocks is not preserved.
+
+## Contributing
+
+If you find missing features or bugs, feel free to contribute or report issues on the GitHub repository.
+
+## License
+
+This library is open-source. Check the LICENSE file for details.