diff --git a/Source/OpenQuestPDF.Examples/ContentDirectionExamples.cs b/Source/OpenQuestPDF.Examples/ContentDirectionExamples.cs
index 80b0626fd..857110275 100644
--- a/Source/OpenQuestPDF.Examples/ContentDirectionExamples.cs
+++ b/Source/OpenQuestPDF.Examples/ContentDirectionExamples.cs
@@ -111,7 +111,7 @@ public void Page()
                                     var price = Placeholders.Random.NextDouble() * 100;
                                     
                                     table.Cell().Text(item);
-                                    table.Cell().Text(Placeholders.Random.Next(1, 10));
+                                    table.Cell().Text(Placeholders.Random.Next(1, 10).ToString());
                                     table.Cell().Text($"USD${price:F2}");
                                 }
 
diff --git a/Source/OpenQuestPDF.Examples/DefaultTextStyleExample.cs b/Source/OpenQuestPDF.Examples/DefaultTextStyleExample.cs
index 07fe7c6b5..386d7b8a8 100644
--- a/Source/OpenQuestPDF.Examples/DefaultTextStyleExample.cs
+++ b/Source/OpenQuestPDF.Examples/DefaultTextStyleExample.cs
@@ -20,7 +20,7 @@ public void DefaultTextStyle()
                     container.Page(page =>
                     {
                         // all text in this set of pages has size 20
-                        page.DefaultTextStyle(TextStyle.Default.Size(20));
+                        page.DefaultTextStyle(TextStyle.Default.FontSize(20));
                     
                         page.Margin(20);
                         page.Size(PageSizes.A4);
diff --git a/Source/OpenQuestPDF.Examples/DifferentHeaderOnFirstPageExample.cs b/Source/OpenQuestPDF.Examples/DifferentHeaderOnFirstPageExample.cs
index aec742447..ed6f994dc 100644
--- a/Source/OpenQuestPDF.Examples/DifferentHeaderOnFirstPageExample.cs
+++ b/Source/OpenQuestPDF.Examples/DifferentHeaderOnFirstPageExample.cs
@@ -42,7 +42,7 @@ public void Placeholder()
                         
                         page.Footer().AlignCenter().Text(text =>
                         {
-                            text.DefaultTextStyle(TextStyle.Default.Size(16));
+                            text.DefaultTextStyle(TextStyle.Default.FontSize(16));
                             
                             text.CurrentPageNumber();
                             text.Span(" / ");
diff --git a/Source/OpenQuestPDF.Examples/DynamicSimpleTableExample.cs b/Source/OpenQuestPDF.Examples/DynamicSimpleTableExample.cs
index b2cfe0409..c025c0c91 100644
--- a/Source/OpenQuestPDF.Examples/DynamicSimpleTableExample.cs
+++ b/Source/OpenQuestPDF.Examples/DynamicSimpleTableExample.cs
@@ -90,7 +90,8 @@ IContainer Style(IContainer container)
                                 .Cell().ColumnSpan(5)
                                 .AlignRight()
                                 .PaddingTop(10)
-                                .Text($"Subtotal: {total}$", TextStyle.Default.Bold());
+                                .Text($"Subtotal: {total}$")
+                                .Style(TextStyle.Default.Bold());
                         });
                         
                         foreach (var index in Enumerable.Range(State.ShownItemsCount, itemsToDisplay))
@@ -137,7 +138,7 @@ public static void Dynamic()
                         .Decoration(decoration =>
                         {
                             decoration
-                                .Header()
+                                .Before()
                                 .PaddingBottom(5)
                                 .Text(text =>
                                 {
diff --git a/Source/OpenQuestPDF.Examples/ElementExamples.cs b/Source/OpenQuestPDF.Examples/ElementExamples.cs
index 4654b21de..4de7b7107 100644
--- a/Source/OpenQuestPDF.Examples/ElementExamples.cs
+++ b/Source/OpenQuestPDF.Examples/ElementExamples.cs
@@ -192,7 +192,7 @@ public void GridExample()
                 .PageSize(400, 230)
                 .Render(container =>
                 {
-                    var textStyle = TextStyle.Default.Size(14);
+                    var textStyle = TextStyle.Default.FontSize(14);
             
                     container
                         .Padding(15)
@@ -503,8 +503,8 @@ public void Scale()
                         {
                             var headerFontStyle = TextStyle
                                 .Default
-                                .Size(20)
-                                .Color(Colors.Blue.Darken2)
+                                .FontSize(20)
+                                .FontColor(Colors.Blue.Darken2)
                                 .SemiBold();
     
                             decoration
@@ -525,7 +525,7 @@ public void Scale()
                                             ? Colors.Red.Lighten4
                                             : Colors.Green.Lighten4;
 
-                                        var fontStyle = TextStyle.Default.Size(16);
+                                        var fontStyle = TextStyle.Default.FontSize(16);
                 
                                         column
                                             .Item()
diff --git a/Source/OpenQuestPDF.Examples/Engine/RenderingTest.cs b/Source/OpenQuestPDF.Examples/Engine/RenderingTest.cs
index 2953ede05..70ae718fb 100644
--- a/Source/OpenQuestPDF.Examples/Engine/RenderingTest.cs
+++ b/Source/OpenQuestPDF.Examples/Engine/RenderingTest.cs
@@ -104,7 +104,10 @@ public void Render(Action<IContainer> content)
         public void RenderDocument(Action<IDocumentContainer> content)
         {
             MaxPagesThreshold ??= ResultType == RenderingTestResult.Pdf ? 1000 : 10;
-            var document = new SimpleDocument(content, MaxPagesThreshold.Value, ApplyCaching, ApplyDebugging);
+            Settings.DocumentLayoutExceptionThreshold = MaxPagesThreshold.Value;
+            Settings.EnableCaching = ApplyCaching;
+            Settings.EnableDebugging = ApplyDebugging;
+            var document = new SimpleDocument(content);
 
             Render(document);
         }
diff --git a/Source/OpenQuestPDF.Examples/Engine/SimpleDocument.cs b/Source/OpenQuestPDF.Examples/Engine/SimpleDocument.cs
index 243032dc6..6f2933a8f 100644
--- a/Source/OpenQuestPDF.Examples/Engine/SimpleDocument.cs
+++ b/Source/OpenQuestPDF.Examples/Engine/SimpleDocument.cs
@@ -12,26 +12,18 @@ public class SimpleDocument : IDocument
         public const int ImageScalingFactor = 2;
         
         private Action<IDocumentContainer> Content { get; }
-        private int MaxPages { get; }
-        private bool ApplyCaching { get; }
-        private bool ApplyDebugging { get; }
 
-        public SimpleDocument(Action<IDocumentContainer> content, int maxPages, bool applyCaching, bool applyDebugging)
+        public SimpleDocument(Action<IDocumentContainer> content)
         {
-            Content = content;
-            MaxPages = maxPages;
-            ApplyCaching = applyCaching;
-            ApplyDebugging = applyDebugging;
+            Content = content;         
         }
         
         public DocumentMetadata GetMetadata()
         {
+            
             return new DocumentMetadata()
             {
                 RasterDpi = PageSizes.PointsPerInch * ImageScalingFactor,
-                DocumentLayoutExceptionThreshold = MaxPages,
-                ApplyCaching = ApplyCaching,
-                ApplyDebugging = ApplyDebugging
             };
         }
         
diff --git a/Source/OpenQuestPDF.Examples/ExecutionOrderExamples.cs b/Source/OpenQuestPDF.Examples/ExecutionOrderExamples.cs
index 06447cad2..7aca6c18b 100644
--- a/Source/OpenQuestPDF.Examples/ExecutionOrderExamples.cs
+++ b/Source/OpenQuestPDF.Examples/ExecutionOrderExamples.cs
@@ -20,7 +20,7 @@ public void Example()
                 .Render(container =>
                 {
                     container
-                        .DefaultTextStyle(TextStyle.Default.Size(18))
+                        .DefaultTextStyle(TextStyle.Default.FontSize(18))
                         .Padding(25)
                         .Row(row =>
                         {
diff --git a/Source/OpenQuestPDF.Examples/InlinedExamples.cs b/Source/OpenQuestPDF.Examples/InlinedExamples.cs
index 01e8913c8..c25b73171 100644
--- a/Source/OpenQuestPDF.Examples/InlinedExamples.cs
+++ b/Source/OpenQuestPDF.Examples/InlinedExamples.cs
@@ -27,7 +27,7 @@ public void Inlined()
                         {
                             decoration.Before().Text(text =>
                             {
-                                text.DefaultTextStyle(TextStyle.Default.Size(20));
+                                text.DefaultTextStyle(TextStyle.Default.FontSize(20));
                                 
                                 text.CurrentPageNumber();
                                 text.Span(" / ");
diff --git a/Source/OpenQuestPDF.Examples/LineExamples.cs b/Source/OpenQuestPDF.Examples/LineExamples.cs
index 63bef11db..706b2ee47 100644
--- a/Source/OpenQuestPDF.Examples/LineExamples.cs
+++ b/Source/OpenQuestPDF.Examples/LineExamples.cs
@@ -22,7 +22,7 @@ public void LineHorizontal()
                     container
                         .Padding(15)
                         .MinimalBox()
-                        .DefaultTextStyle(TextStyle.Default.Size(16))
+                        .DefaultTextStyle(TextStyle.Default.FontSize(16))
                         .Column(column =>
                         {
                             column.Item().Text("Above text");
@@ -44,7 +44,7 @@ public void LineVertical()
                 {
                     container
                         .Padding(15)
-                        .DefaultTextStyle(TextStyle.Default.Size(16))
+                        .DefaultTextStyle(TextStyle.Default.FontSize(16))
                         .Row(row =>
                         {
                             row.AutoItem().Text("Left text");
diff --git a/Source/OpenQuestPDF.Examples/LoremPicsumExample.cs b/Source/OpenQuestPDF.Examples/LoremPicsumExample.cs
index 406125f51..86e365c9c 100644
--- a/Source/OpenQuestPDF.Examples/LoremPicsumExample.cs
+++ b/Source/OpenQuestPDF.Examples/LoremPicsumExample.cs
@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net.Http;
 using NUnit.Framework;
 using OpenQuestPDF.Examples.Engine;
 using OpenQuestPDF.Fluent;
@@ -14,7 +14,7 @@ public LoremPicsum(bool greyscale)
         {
             Greyscale = greyscale;
         }
-        
+
         public void Compose(IContainer container)
         {
             var url = "https://picsum.photos/300/200";
@@ -22,14 +22,15 @@ public void Compose(IContainer container)
             if (Greyscale)
                 url += "?grayscale";
 
-            using var client = new WebClient();
-            client.Headers.Add("user-agent", "QuestPDF/1.0 Unit Testing");
-            
-            var response = client.DownloadData(url);
-            container.Image(response);
+            using var client = new HttpClient();
+            client.DefaultRequestHeaders.Add("user-agent", "OpenQuestPDF/1.0 Unit Testing");
+
+            var response = client.GetByteArrayAsync(url);
+            response.Wait();
+            container.Image(response.Result);
         }
     }
-    
+
     public class LoremPicsumExample
     {
         [Test]
@@ -52,7 +53,7 @@ public void LoremPicsum()
                             column
                                 .Item()
                                 .Component(new LoremPicsum(true));
-                    
+
                             column
                                 .Item()
                                 .AlignRight()
diff --git a/Source/OpenQuestPDF.Examples/StopPaging.cs b/Source/OpenQuestPDF.Examples/StopPaging.cs
index 374400b52..17ca8cc3c 100644
--- a/Source/OpenQuestPDF.Examples/StopPaging.cs
+++ b/Source/OpenQuestPDF.Examples/StopPaging.cs
@@ -20,14 +20,14 @@ public void Example()
                 {
                     container
                         .Padding(25)
-                        .DefaultTextStyle(TextStyle.Default.Size(14))
+                        .DefaultTextStyle(TextStyle.Default.FontSize(14))
                         .Decoration(decoration =>
                         {
                             decoration
                                 .Before()
                                 .Text(text =>
                                 {
-                                    text.DefaultTextStyle(TextStyle.Default.SemiBold().Color(Colors.Blue.Medium));
+                                    text.DefaultTextStyle(TextStyle.Default.SemiBold().FontColor(Colors.Blue.Medium));
                                     
                                     text.Span("Page ");
                                     text.CurrentPageNumber();
diff --git a/Source/OpenQuestPDF.Examples/TableExamples.cs b/Source/OpenQuestPDF.Examples/TableExamples.cs
index b7e118dcb..83de3974c 100644
--- a/Source/OpenQuestPDF.Examples/TableExamples.cs
+++ b/Source/OpenQuestPDF.Examples/TableExamples.cs
@@ -97,7 +97,7 @@ public void DefaultCellStyle()
                         .Padding(10)
                         .MinimalBox()
                         .Border(1)
-                        .DefaultTextStyle(TextStyle.Default.Size(16))
+                        .DefaultTextStyle(TextStyle.Default.FontSize(16))
                         .Table(table =>
                         {
                             table.ColumnsDefinition(columns =>
diff --git a/Source/OpenQuestPDF.Examples/TextBenchmark.cs b/Source/OpenQuestPDF.Examples/TextBenchmark.cs
index 88314db32..c8a3f9bc8 100644
--- a/Source/OpenQuestPDF.Examples/TextBenchmark.cs
+++ b/Source/OpenQuestPDF.Examples/TextBenchmark.cs
@@ -104,8 +104,8 @@ private static IEnumerable<BookChapter> GetBookChapters()
         
         private void ComposeBook(IDocumentContainer container, ICollection<BookChapter> chapters)
         {
-            var subtitleStyle = TextStyle.Default.Size(24).SemiBold().Color(Colors.Blue.Medium);
-            var normalStyle = TextStyle.Default.Size(14);
+            var subtitleStyle = TextStyle.Default.FontSize(24).SemiBold().FontColor(Colors.Blue.Medium);
+            var normalStyle = TextStyle.Default.FontSize(14);
 
             container.Page(page =>
             {
@@ -147,7 +147,7 @@ void TableOfContents(IContainer container)
                     
                     foreach (var chapter in chapters)
                     {
-                        column.Item().InternalLink(chapter.Title).Row(row =>
+                        column.Item().SectionLink(chapter.Title).Row(row =>
                         {
                             row.RelativeItem().Text(chapter.Title).Style(normalStyle);
                             row.ConstantItem(100).AlignRight().Text(text => text.BeginPageNumberOfSection(chapter.Title).Style(normalStyle));
@@ -199,7 +199,7 @@ void Acknowledgements(IContainer container)
 
             void SectionTitle(ColumnDescriptor column, string text)
             {
-                column.Item().Location(text).Text(text).Style(subtitleStyle);
+                column.Item().Section(text).Text(text).Style(subtitleStyle);
                 column.Item().PaddingTop(10).PaddingBottom(50).BorderBottom(1).BorderColor(Colors.Grey.Lighten2).ExtendHorizontal();
             }
             
diff --git a/Source/OpenQuestPDF.Examples/TextExamples.cs b/Source/OpenQuestPDF.Examples/TextExamples.cs
index 722b62af4..47d95568f 100644
--- a/Source/OpenQuestPDF.Examples/TextExamples.cs
+++ b/Source/OpenQuestPDF.Examples/TextExamples.cs
@@ -495,7 +495,7 @@ public void SpaceIssue()
 
                             text.EmptyLine();
 
-                            text.Hyperlink("Please visit QuestPDF website", "https://www.questpdf.com");
+                            text.Hyperlink("Please visit OpenQuestPDF GitHub repository", "https://www.github.com/LM-Development/OpenQuestPDF");
 
                             text.EmptyLine();
 
@@ -549,7 +549,7 @@ public void HugeList()
                             {
                                 text.Line($"{i}: {Placeholders.Paragraph()}");
 
-                                text.Hyperlink("Please visit QuestPDF website. ", "https://www.questpdf.com");
+                                text.Hyperlink("Please visit OpenQuestPDF project page. ", "https://www.github.com/LM-Development/OpenQuestPDF");
                                 
                                 text.Span("This is page number ");
                                 text.CurrentPageNumber();
@@ -928,10 +928,14 @@ public void DetectSpanPositionExample()
                     var paint = new SKPaint
                     {
                         Color = SKColors.Red,
-                        TextSize = fontSize
+                    };
+
+                    var font = new SKFont
+                    {
+                        Size = fontSize,
                     };
                     
-                    var fontMetrics = paint.FontMetrics;
+                    var fontMetrics = font.Metrics;
 
                     var start = 0f;
                     var end = 0f;
diff --git a/Source/OpenQuestPDF.Previewer/InteractiveCanvas.cs b/Source/OpenQuestPDF.Previewer/InteractiveCanvas.cs
index bd579ef03..666f29310 100644
--- a/Source/OpenQuestPDF.Previewer/InteractiveCanvas.cs
+++ b/Source/OpenQuestPDF.Previewer/InteractiveCanvas.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Skia;
@@ -9,7 +10,7 @@ namespace OpenQuestPDF.Previewer;
 class InteractiveCanvas : ICustomDrawOperation
 {
     public Rect Bounds { get; set; }
-    public ICollection<PreviewPage> Pages { get; set; }
+    public ICollection<PreviewPage>? Pages { get; set; }
 
     private float Width => (float)Bounds.Width;
     private float Height => (float)Bounds.Height;
@@ -24,9 +25,9 @@ class InteractiveCanvas : ICustomDrawOperation
     private const float PageSpacing = 25f;
     private const float SafeZone = 25f;
 
-    public float TotalPagesHeight => Pages.Sum(x => x.Height) + (Pages.Count - 1) * PageSpacing;
+    public float TotalPagesHeight => Pages != null ? Pages.Sum(x => x.Height) + (Pages.Count - 1) * PageSpacing : 0;
     public float TotalHeight => TotalPagesHeight + SafeZone * 2 / Scale;
-    public float MaxWidth => Pages.Any() ? Pages.Max(x => x.Width) : 0;
+    public float MaxWidth => Pages != null && Pages.Any() ? Pages.Max(x => x.Width) : 0;
     
     public float MaxTranslateY => TotalHeight - Height / Scale;
 
@@ -109,18 +110,20 @@ public void ZoomToPoint(float x, float y, float factor)
     
     #region rendering
     
-    public void Render(IDrawingContextImpl context)
+    public void Render(ImmediateDrawingContext context)
     {
-        if (Pages.Count <= 0)
+        var leaseFeature = context.TryGetFeature<ISkiaSharpApiLeaseFeature>();
+        if (leaseFeature == null)
+            throw new InvalidOperationException($"Context needs to support {nameof(ISkiaSharpApiLeaseFeature)}");
+        using var lease = leaseFeature.Lease();
+
+        var canvas = lease.SkCanvas;
+
+        if (Pages == null || Pages.Count <= 0)
             return;
 
         LimitScale();
-        LimitTranslate();
-        
-        var canvas = (context as ISkiaDrawingContextImpl)?.SkCanvas;
-        
-        if (canvas == null)
-            throw new InvalidOperationException($"Context needs to be ISkiaDrawingContextImpl but got {nameof(context)}");
+        LimitTranslate();     
 
         var originalMatrix = canvas.TotalMatrix;
 
diff --git a/Source/OpenQuestPDF.Previewer/OpenQuestPDF.Previewer.csproj b/Source/OpenQuestPDF.Previewer/OpenQuestPDF.Previewer.csproj
index e8cbf12fe..2577e6ca3 100644
--- a/Source/OpenQuestPDF.Previewer/OpenQuestPDF.Previewer.csproj
+++ b/Source/OpenQuestPDF.Previewer/OpenQuestPDF.Previewer.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <Authors>LM Development</Authors>
@@ -8,7 +8,7 @@
         <ToolCommandName>questpdf-previewer</ToolCommandName>
         <PackageDescription>OpenQuestPDF is an open-source, modern and battle-tested library that can help you with generating PDF documents by offering friendly, discoverable and predictable C# fluent API.</PackageDescription>
         <PackageReleaseNotes>Initial release.</PackageReleaseNotes>
-        <RepositoryUrl>https://github.com/LMDevelopment/OpenQuestPDF.git</RepositoryUrl>
+        <RepositoryUrl>https://github.com/LM-Development/OpenQuestPDF.git</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <Copyright>LM IT Services AG, OpenQuestPDF contributors</Copyright>
         <PackageTags>pdf report file export generate generation tool create creation render portable document format quest html library converter open source free standard core previewer</PackageTags>
@@ -38,6 +38,7 @@
         <PackageReference Include="Avalonia.Diagnostics" Version="11.3.6" />
         <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.3.6" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.6" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.6" />
         <PackageReference Include="ReactiveUI" Version="21.0.1" />
         <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.0" />
         <PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="3.119.0" />
diff --git a/Source/OpenQuestPDF.Previewer/PreviewerApp.axaml b/Source/OpenQuestPDF.Previewer/PreviewerApp.axaml
index 4c3e4f584..4b0a4d577 100644
--- a/Source/OpenQuestPDF.Previewer/PreviewerApp.axaml
+++ b/Source/OpenQuestPDF.Previewer/PreviewerApp.axaml
@@ -1,8 +1,9 @@
-<Application x:Class="QuestPDF.Previewer.PreviewerApp"
+<Application x:Class="OpenQuestPDF.Previewer.PreviewerApp"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Name="QuestPDF Document Preview">
+             Name="OpenQuestPDF Document Preview"
+			 RequestedThemeVariant="Dark">
 	<Application.Styles>
-		<FluentTheme Mode="Dark" />
+		<FluentTheme />
 	</Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/Source/OpenQuestPDF.Previewer/PreviewerWindow.axaml b/Source/OpenQuestPDF.Previewer/PreviewerWindow.axaml
index ee81f66bc..cc4a2dfcf 100644
--- a/Source/OpenQuestPDF.Previewer/PreviewerWindow.axaml
+++ b/Source/OpenQuestPDF.Previewer/PreviewerWindow.axaml
@@ -2,9 +2,9 @@
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 		xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-		xmlns:previewer="clr-namespace:QuestPDF.Previewer"
+		xmlns:previewer="clr-namespace:OpenQuestPDF.Previewer"
 		mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-		x:Class="QuestPDF.Previewer.PreviewerWindow"
+		x:Class="OpenQuestPDF.Previewer.PreviewerWindow"
 		x:DataType="previewer:PreviewerWindowViewModel"
 		x:CompileBindings="True"
 		WindowStartupLocation="CenterScreen"
@@ -13,7 +13,7 @@
 		Background="#666"
 		Icon="/Resources/Logo.png"
 		UseLayoutRounding="True"
-		Title="QuestPDF Document Preview">
+		Title="OpenQuestPDF Document Preview">
 	
 	<Window.Styles>
 		<Style Selector="Button.actions">
@@ -43,7 +43,7 @@
 			
 			<TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
 			           VerticalAlignment="Center" HorizontalAlignment="Center" 
-			           TextAlignment="Center" Text="QuestPDF Previewer" FontSize="14" Foreground="#DFFF" FontWeight="Regular" IsHitTestVisible="False" />
+			           TextAlignment="Center" Text="OpenQuestPDF Previewer" FontSize="14" Foreground="#DFFF" FontWeight="Regular" IsHitTestVisible="False" />
 			
 			<previewer:PreviewerControl Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"
 			                            HorizontalAlignment="Stretch" 
diff --git a/Source/OpenQuestPDF.Previewer/PreviewerWindow.axaml.cs b/Source/OpenQuestPDF.Previewer/PreviewerWindow.axaml.cs
index 349e82cf5..56d8a7a57 100644
--- a/Source/OpenQuestPDF.Previewer/PreviewerWindow.axaml.cs
+++ b/Source/OpenQuestPDF.Previewer/PreviewerWindow.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenQuestPDF.Previewer
 {
-    class PreviewerWindow : Window
+    partial class PreviewerWindow : Window
     {
         public PreviewerWindow()
         {
diff --git a/Source/OpenQuestPDF.UnitTests/FontManagerTests.cs b/Source/OpenQuestPDF.UnitTests/FontManagerTests.cs
index 95ae96a9b..2391c6acd 100644
--- a/Source/OpenQuestPDF.UnitTests/FontManagerTests.cs
+++ b/Source/OpenQuestPDF.UnitTests/FontManagerTests.cs
@@ -17,7 +17,7 @@ public void LoadFontFromFile()
         [Test]
         public void LoadFontFromEmbeddedResource()
         {
-            FontManager.RegisterFontFromEmbeddedResource("QuestPDF.UnitTests.Resources.FontEmbeddedResource.ttf");
+            FontManager.RegisterFontFromEmbeddedResource("OpenQuestPDF.UnitTests.Resources.FontEmbeddedResource.ttf");
         }
         
         [Test]
@@ -25,7 +25,7 @@ public void LoadFontFromEmbeddedResource_ShouldThrowException_WhenResourceIsNotA
         {
             Assert.Throws<ArgumentException>(() =>
             {
-                FontManager.RegisterFontFromEmbeddedResource("QuestPDF.UnitTests.WrongPath.ttf");
+                FontManager.RegisterFontFromEmbeddedResource("OpenQuestPDF.UnitTests.WrongPath.ttf");
             });
         }
     }
diff --git a/Source/OpenQuestPDF.UnitTests/ImageTests.cs b/Source/OpenQuestPDF.UnitTests/ImageTests.cs
index ff81e0ae6..51c582e00 100644
--- a/Source/OpenQuestPDF.UnitTests/ImageTests.cs
+++ b/Source/OpenQuestPDF.UnitTests/ImageTests.cs
@@ -49,7 +49,7 @@ public void Fluent_RecognizesImageProportions()
                     return container;
                 })
                 .MeasureElement(new Size(300, 200))
-                .CheckMeasureResult(SpacePlan.FullRender(300, 100));;
+                .CheckMeasureResult(SpacePlan.FullRender(300, 100));
         }
         
         SKImage GenerateImage(int width, int height)
diff --git a/Source/OpenQuestPDF.UnitTests/OpenQuestPDF.UnitTests.csproj b/Source/OpenQuestPDF.UnitTests/OpenQuestPDF.UnitTests.csproj
index c53918c87..fc8a547b1 100644
--- a/Source/OpenQuestPDF.UnitTests/OpenQuestPDF.UnitTests.csproj
+++ b/Source/OpenQuestPDF.UnitTests/OpenQuestPDF.UnitTests.csproj
@@ -11,6 +11,7 @@
         <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
         <PackageReference Include="SkiaSharp" Version="3.119.0" />
+        <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.119.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Source/OpenQuestPDF.UnitTests/TestEngine/TestPlan.cs b/Source/OpenQuestPDF.UnitTests/TestEngine/TestPlan.cs
index 3a30a4e8e..5999a8e1e 100644
--- a/Source/OpenQuestPDF.UnitTests/TestEngine/TestPlan.cs
+++ b/Source/OpenQuestPDF.UnitTests/TestEngine/TestPlan.cs
@@ -54,43 +54,43 @@ private ICanvas CreateCanvas()
                 {
                     var expected = GetExpected<CanvasTranslateOperation>();
 
-                    Assert.AreEqual(expected.Position.X, position.X, "Translate X");
-                    Assert.AreEqual(expected.Position.Y, position.Y, "Translate Y");
+                    Assert.That(position.X, Is.EqualTo(expected.Position.X), "Translate X");
+                    Assert.That(position.Y, Is.EqualTo(expected.Position.Y), "Translate Y");
                 },
                 RotateFunc = angle =>
                 {
                     var expected = GetExpected<CanvasRotateOperation>();
 
-                    Assert.AreEqual(expected.Angle, angle, "Rotate angle");
+                    Assert.That(angle, Is.EqualTo(expected.Angle), "Rotate angle");
                 },
                 ScaleFunc = (scaleX, scaleY) =>
                 {
                     var expected = GetExpected<CanvasScaleOperation>();
 
-                    Assert.AreEqual(expected.ScaleX, scaleX, "Scale X");
-                    Assert.AreEqual(expected.ScaleY, scaleY, "Scale Y");
+                    Assert.That(scaleX, Is.EqualTo(expected.ScaleX), "Scale X");
+                    Assert.That(scaleY, Is.EqualTo(expected.ScaleY), "Scale Y");
                 },
                 DrawRectFunc = (position, size, color) =>
                 {
                     var expected = GetExpected<CanvasDrawRectangleOperation>();
                     
-                    Assert.AreEqual(expected.Position.X, position.X, "Draw rectangle: X");
-                    Assert.AreEqual(expected.Position.Y, position.Y, "Draw rectangle: Y");
+                    Assert.That(position.X, Is.EqualTo(expected.Position.X), "Draw rectangle: X");
+                    Assert.That(position.Y, Is.EqualTo(expected.Position.Y), "Draw rectangle: Y");
                     
-                    Assert.AreEqual(expected.Size.Width, size.Width, "Draw rectangle: width");
-                    Assert.AreEqual(expected.Size.Height, size.Height, "Draw rectangle: height");
+                    Assert.That(size.Width, Is.EqualTo(expected.Size.Width), "Draw rectangle: width");
+                    Assert.That(size.Height, Is.EqualTo(expected.Size.Height), "Draw rectangle: height");
                     
-                    Assert.AreEqual(expected.Color, color, "Draw rectangle: color");
+                    Assert.That(color, Is.EqualTo(expected.Color), "Draw rectangle: color");
                 },
                 DrawImageFunc = (image, position, size) =>
                 {
                     var expected = GetExpected<CanvasDrawImageOperation>();
                     
-                    Assert.AreEqual(expected.Position.X, position.X, "Draw image: X");
-                    Assert.AreEqual(expected.Position.Y, position.Y, "Draw image: Y");
+                    Assert.That(position.X, Is.EqualTo(expected.Position.X), "Draw image: X");
+                    Assert.That(position.Y, Is.EqualTo(expected.Position.Y), "Draw image: Y");
                     
-                    Assert.AreEqual(expected.Size.Width, size.Width, "Draw image: width");
-                    Assert.AreEqual(expected.Size.Height, size.Height, "Draw image: height");
+                    Assert.That(size.Width, Is.EqualTo(expected.Size.Width), "Draw image: width");
+                    Assert.That(size.Height, Is.EqualTo(expected.Size.Height), "Draw image: height");
                 }
             };
         }
@@ -106,10 +106,10 @@ public Element CreateChild(string id)
                 {
                     var expected = GetExpected<ChildMeasureOperation>();
 
-                    Assert.AreEqual(expected.ChildId, id);
+                    Assert.That(id, Is.EqualTo(expected.ChildId));
                     
-                    Assert.AreEqual(expected.Input.Width, availableSpace.Width, $"Measure: width of child '{expected.ChildId}'");
-                    Assert.AreEqual(expected.Input.Height, availableSpace.Height, $"Measure: height of child '{expected.ChildId}'");
+                    Assert.That(availableSpace.Width, Is.EqualTo(expected.Input.Width), $"Measure: width of child '{expected.ChildId}'");
+                    Assert.That(availableSpace.Height, Is.EqualTo(expected.Input.Height), $"Measure: height of child '{expected.ChildId}'");
 
                     return expected.Output;
                 },
@@ -117,10 +117,10 @@ public Element CreateChild(string id)
                 {
                     var expected = GetExpected<ChildDrawOperation>();
 
-                    Assert.AreEqual(expected.ChildId, id);
+                    Assert.That(id, Is.EqualTo(expected.ChildId));
                     
-                    Assert.AreEqual(expected.Input.Width, availableSpace.Width, $"Draw: width of child '{expected.ChildId}'");
-                    Assert.AreEqual(expected.Input.Height, availableSpace.Height, $"Draw: width of child '{expected.ChildId}'");
+                    Assert.That(availableSpace.Width, Is.EqualTo(expected.Input.Width), $"Draw: width of child '{expected.ChildId}'");
+                    Assert.That(availableSpace.Height, Is.EqualTo(expected.Input.Height), $"Draw: width of child '{expected.ChildId}'");
                 }
             };
         }
@@ -199,11 +199,11 @@ public TestPlan CheckMeasureResult(SpacePlan expected)
             
             var actual = Element.Measure(OperationInput);
             
-            Assert.AreEqual(expected.GetType(), actual.GetType());
+            Assert.That(actual.GetType(), Is.EqualTo(expected.GetType()));
             
-            Assert.AreEqual(expected.Width, actual.Width, "Measure: width");
-            Assert.AreEqual(expected.Height, actual.Height, "Measure: height");
-            Assert.AreEqual(expected.Type, actual.Type, "Measure: height");
+            Assert.That(actual.Width, Is.EqualTo(expected.Width), "Measure: width");
+            Assert.That(actual.Height, Is.EqualTo(expected.Height), "Measure: height");
+            Assert.That(actual.Type, Is.EqualTo(expected.Type), "Measure: height");
             
             return this;
         }
@@ -217,14 +217,14 @@ public TestPlan CheckDrawResult()
 
         public TestPlan CheckState(Func<Element, bool> condition)
         {
-            Assert.IsTrue(condition(Element), "Checking condition");
+            Assert.That(condition(Element), Is.True, "Checking condition");
             return this;
         }
 
         public TestPlan CheckState<T>(Func<T, bool> condition) where T : Element
         {
-            Assert.IsTrue(Element is T);
-            Assert.IsTrue(condition(Element as T), "Checking condition");
+            Assert.That(Element, Is.InstanceOf<T>());
+            Assert.That(condition(Element as T), Is.True, "Checking condition");
             return this;
         }
         
@@ -273,8 +273,19 @@ private static void CompareDrawOperations(Element value, Element expected, Size?
             var expectedCanvas = new OperationRecordingCanvas();
             expected.InjectDependencies(null, expectedCanvas);
             expected.Draw(availableSpace.Value);
-            
-            valueCanvas.Operations.Should().BeEquivalentTo(expectedCanvas.Operations);
+
+            // Prüfe, ob Operationen vorhanden sind
+            Assert.That(valueCanvas.Operations, Is.Not.Null, "valueCanvas.Operations ist null");
+            Assert.That(expectedCanvas.Operations, Is.Not.Null, "expectedCanvas.Operations ist null");
+
+            // Prüfe, ob Operationen nicht leer sind
+            Assert.That(valueCanvas.Operations.Count, Is.GreaterThan(0), "valueCanvas.Operations ist leer");
+            Assert.That(expectedCanvas.Operations.Count, Is.GreaterThan(0), "expectedCanvas.Operations ist leer");
+
+            // Vergleiche die Operationen
+            valueCanvas.Operations.Should().BeEquivalentTo(expectedCanvas.Operations, options => options
+                .PreferringRuntimeMemberTypes()
+                .WithTracing());
         }
     }
 }
\ No newline at end of file
diff --git a/Source/OpenQuestPDF.UnitTests/TestsBase.cs b/Source/OpenQuestPDF.UnitTests/TestsBase.cs
deleted file mode 100644
index af5348432..000000000
--- a/Source/OpenQuestPDF.UnitTests/TestsBase.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using FluentAssertions;
-using NUnit.Framework;
-
-namespace OpenQuestPDF.UnitTests
-{
-    [SetUpFixture]
-    public class TestsBase
-    {
-        [OneTimeSetUp]
-        public void RunBeforeAnyTests()
-        {
-            AssertionOptions.AssertEquivalencyUsing(options => options
-                .IncludingNestedObjects()
-                .IncludingInternalProperties()
-                .IncludingInternalFields()
-                .AllowingInfiniteRecursion()
-                .RespectingRuntimeTypes()
-                .WithTracing()
-                .WithStrictOrdering());
-        }
-    }
-}
\ No newline at end of file
diff --git a/Source/OpenQuestPDF.UnitTests/TextStyleTests.cs b/Source/OpenQuestPDF.UnitTests/TextStyleTests.cs
index f6bc6ebc6..65d647dd3 100644
--- a/Source/OpenQuestPDF.UnitTests/TextStyleTests.cs
+++ b/Source/OpenQuestPDF.UnitTests/TextStyleTests.cs
@@ -53,7 +53,12 @@ public void ApplyInheritedAndGlobalStyle()
                 }
             };
 
-            targetStyle.Should().BeEquivalentTo(expectedStyle);
+            targetStyle.Should().BeEquivalentTo(expectedStyle, options => options
+                .IncludingNestedObjects()
+                .IncludingInternalProperties()
+                .IncludingInternalFields()
+                .AllowingInfiniteRecursion()
+                .WithStrictOrdering());
         }
     }
 }
\ No newline at end of file
diff --git a/Source/OpenQuestPDF/Drawing/DocumentGenerator.cs b/Source/OpenQuestPDF/Drawing/DocumentGenerator.cs
index 2aa576ff3..37b62efcb 100644
--- a/Source/OpenQuestPDF/Drawing/DocumentGenerator.cs
+++ b/Source/OpenQuestPDF/Drawing/DocumentGenerator.cs
@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using OpenQuestPDF.Drawing.Exceptions;
 using OpenQuestPDF.Drawing.Proxy;
 using OpenQuestPDF.Elements;
 using OpenQuestPDF.Elements.Text;
 using OpenQuestPDF.Elements.Text.Items;
-using OpenQuestPDF.Fluent;
 using OpenQuestPDF.Helpers;
 using OpenQuestPDF.Infrastructure;
 
@@ -168,7 +166,7 @@ private static DebuggingState ApplyDebugging(Container content)
 
             content.VisitChildren(x =>
             {
-                x.CreateProxy(y => new DebuggingProxy(debuggingState, y));
+                x?.CreateProxy(y => new DebuggingProxy(debuggingState, y));
             });
 
             return debuggingState;
diff --git a/Source/OpenQuestPDF/Drawing/DocumentMetadata.cs b/Source/OpenQuestPDF/Drawing/DocumentMetadata.cs
index f02be6b93..bfee8a89b 100644
--- a/Source/OpenQuestPDF/Drawing/DocumentMetadata.cs
+++ b/Source/OpenQuestPDF/Drawing/DocumentMetadata.cs
@@ -19,27 +19,6 @@ public class DocumentMetadata
         public DateTime CreationDate { get; set; } = DateTime.Now;
         public DateTime ModifiedDate { get; set; } = DateTime.Now;
 
-        [Obsolete("This API has been moved since version 2022.9. Please use theOpenQuestPDF.Settings.DocumentLayoutExceptionThreshold static property.")]
-        public int DocumentLayoutExceptionThreshold
-        {
-            get => Settings.DocumentLayoutExceptionThreshold;
-            set => Settings.DocumentLayoutExceptionThreshold = value;
-        }
-
-        [Obsolete("This API has been moved since version 2022.9. Please use theOpenQuestPDF.Settings.EnableCaching static property.")]
-        public bool ApplyCaching
-        {
-            get => Settings.EnableCaching;
-            set => Settings.EnableCaching = value;
-        }
-        
-        [Obsolete("This API has been moved since version 2022.9. Please use theOpenQuestPDF.Settings.EnableDebugging static property.")]
-        public bool ApplyDebugging
-        {
-            get => Settings.EnableDebugging;
-            set => Settings.EnableDebugging = value;
-        }
-
         public static DocumentMetadata Default => new DocumentMetadata();
     }
 }
\ No newline at end of file
diff --git a/Source/OpenQuestPDF/Drawing/FontManager.cs b/Source/OpenQuestPDF/Drawing/FontManager.cs
index f4464b0c0..b743fcdb9 100644
--- a/Source/OpenQuestPDF/Drawing/FontManager.cs
+++ b/Source/OpenQuestPDF/Drawing/FontManager.cs
@@ -90,6 +90,8 @@ private static void RegisterLibraryDefaultFonts()
                 var filePath = $"OpenQuestPDF.Resources.DefaultFont.{fileName}";
                 
                 using var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(filePath);
+                if (stream == null)
+                    throw new InvalidOperationException($"Cannot load default font file from an embedded resource. Please make sure that the resource is available: {filePath}");
                 RegisterFont(stream);
             }
         }
@@ -139,8 +141,13 @@ private static SKTypeface GetTypeface(TextStyle style)
 
             var fontStyle = new SKFontStyle(weight, SKFontStyleWidth.Normal, slant);
 
-            if (StyleSets.TryGetValue(style.FontFamily, out var fontStyleSet))
-                return fontStyleSet.Match(fontStyle);
+            if (style.FontFamily != null && StyleSets.TryGetValue(style.FontFamily, out var fontStyleSet))
+            { 
+                var fontStyleTypeface = fontStyleSet.Match(fontStyle);
+                if (fontStyleTypeface != null)
+                    return fontStyleTypeface;
+            }
+
 
             var fontFromDefaultSource = SKFontManager.Default.MatchFamily(style.FontFamily, fontStyle);
             
diff --git a/Source/OpenQuestPDF/Drawing/FontStyleSet.cs b/Source/OpenQuestPDF/Drawing/FontStyleSet.cs
index a336ed72b..d397b31b5 100644
--- a/Source/OpenQuestPDF/Drawing/FontStyleSet.cs
+++ b/Source/OpenQuestPDF/Drawing/FontStyleSet.cs
@@ -40,7 +40,7 @@ public void Add(SKTypeface typeface)
         };
 
         // Checks whether style a is a better match for the target then style b. Uses the CSS font style matching algorithm
-        internal static bool IsBetterMatch(SKFontStyle? target, SKFontStyle? a, SKFontStyle? b)
+        internal static bool IsBetterMatch(SKFontStyle target, SKFontStyle? a, SKFontStyle? b)
         {
             // A font is better than no font
             if (b == null) 
diff --git a/Source/OpenQuestPDF/Drawing/TextShaper.cs b/Source/OpenQuestPDF/Drawing/TextShaper.cs
index 8cc7530a1..454ccf602 100644
--- a/Source/OpenQuestPDF/Drawing/TextShaper.cs
+++ b/Source/OpenQuestPDF/Drawing/TextShaper.cs
@@ -81,7 +81,6 @@ public TextShapingResult Shape(string text)
         void PopulateBufferWithText(Buffer buffer, string text)
         {
             // Use UTF-16 as .NET strings are UTF-16 encoded
-            // This replaces the obsolete SKPaint.TextEncoding usage
             buffer.AddUtf16(text);
         }
     }
@@ -203,10 +202,15 @@ public float MeasureWidth(int startIndex, int endIndex)
             var firstVisualCharacterIndex = Direction == Direction.LeftToRight
                 ? startIndex
                 : endIndex;
-            
+
+            var textBlob = skTextBlobBuilder.Build();
+
+            if(textBlob == null)
+                return null;
+
             return new DrawTextCommand
             {
-                SkTextBlob = skTextBlobBuilder.Build(),
+                SkTextBlob = textBlob,
                 TextOffsetX = -this[firstVisualCharacterIndex].Position.X
             };
         }
diff --git a/Source/OpenQuestPDF/Elements/Alignment.cs b/Source/OpenQuestPDF/Elements/Alignment.cs
index 806448171..09925fa72 100644
--- a/Source/OpenQuestPDF/Elements/Alignment.cs
+++ b/Source/OpenQuestPDF/Elements/Alignment.cs
@@ -13,7 +13,11 @@ internal override void Draw(Size availableSpace)
         {
             if (Child == null)
                 return;
+
+            if (Canvas == null)
+                return;
             
+
             var childMeasurement = base.Measure(availableSpace);
             
             if (childMeasurement.Type == SpacePlanType.Wrap)
@@ -25,7 +29,7 @@ internal override void Draw(Size availableSpace)
 
             var top = GetTopOffset(availableSpace, childSize);
             var left = GetLeftOffset(availableSpace, childSize);
-            
+
             Canvas.Translate(new Position(left, top));
             base.Draw(childSize);
             Canvas.Translate(new Position(-left, -top));
diff --git a/Source/OpenQuestPDF/Elements/AspectRatio.cs b/Source/OpenQuestPDF/Elements/AspectRatio.cs
index e3eea1aed..489d43c0d 100644
--- a/Source/OpenQuestPDF/Elements/AspectRatio.cs
+++ b/Source/OpenQuestPDF/Elements/AspectRatio.cs
@@ -42,7 +42,9 @@ internal override void Draw(Size availableSpace)
         {
             if (Child == null)
                 return;
-            
+            if (Canvas == null)
+                return;
+
             var size = GetTargetSize(availableSpace);
             
             var offset = ContentDirection == ContentDirection.LeftToRight
diff --git a/Source/OpenQuestPDF/Elements/Background.cs b/Source/OpenQuestPDF/Elements/Background.cs
index 7906f4d58..e088f644e 100644
--- a/Source/OpenQuestPDF/Elements/Background.cs
+++ b/Source/OpenQuestPDF/Elements/Background.cs
@@ -9,6 +9,8 @@ internal class Background : ContainerElement
         
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             Canvas.DrawRectangle(Position.Zero, availableSpace, Color);
             base.Draw(availableSpace);
         }
diff --git a/Source/OpenQuestPDF/Elements/Border.cs b/Source/OpenQuestPDF/Elements/Border.cs
index ae0472b0d..8f3fef5e4 100644
--- a/Source/OpenQuestPDF/Elements/Border.cs
+++ b/Source/OpenQuestPDF/Elements/Border.cs
@@ -15,6 +15,9 @@ internal class Border : ContainerElement
         internal override void Draw(Size availableSpace)
         {
             base.Draw(availableSpace);
+
+            if (Canvas == null)
+                return;
             
             Canvas.DrawRectangle(
                 new Position(-Left/2, -Top/2), 
diff --git a/Source/OpenQuestPDF/Elements/Canvas.cs b/Source/OpenQuestPDF/Elements/Canvas.cs
index d3ccd19a2..8342d55b6 100644
--- a/Source/OpenQuestPDF/Elements/Canvas.cs
+++ b/Source/OpenQuestPDF/Elements/Canvas.cs
@@ -9,7 +9,7 @@ namespace OpenQuestPDF.Elements
     
     internal class Canvas : Element, ICacheable
     {
-        public DrawOnCanvas Handler { get; set; }
+        public required DrawOnCanvas Handler { get; set; }
         
         internal override SpacePlan Measure(Size availableSpace)
         {
diff --git a/Source/OpenQuestPDF/Elements/Column.cs b/Source/OpenQuestPDF/Elements/Column.cs
index 711f0a717..32bfb5f96 100644
--- a/Source/OpenQuestPDF/Elements/Column.cs
+++ b/Source/OpenQuestPDF/Elements/Column.cs
@@ -13,7 +13,7 @@ internal class ColumnItem : Container
     
     internal class ColumnItemRenderingCommand
     {
-        public ColumnItem ColumnItem { get; set; }
+        public required ColumnItem ColumnItem { get; set; }
         public SpacePlan Measurement { get; set; }
         public Size Size { get; set; }
         public Position Offset { get; set; }
@@ -34,7 +34,7 @@ public void ResetState()
             return Items;
         }
         
-        internal override void CreateProxy(Func<Element?, Element?> create)
+        internal override void CreateProxy(Func<Element, Element> create)
         {
             Items.ForEach(x => x.Child = create(x.Child));
         }
@@ -66,6 +66,9 @@ internal override SpacePlan Measure(Size availableSpace)
 
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
+
             var renderingCommands = PlanLayout(availableSpace);
 
             foreach (var command in renderingCommands)
diff --git a/Source/OpenQuestPDF/Elements/Constrained.cs b/Source/OpenQuestPDF/Elements/Constrained.cs
index 46949045c..d8537b8a1 100644
--- a/Source/OpenQuestPDF/Elements/Constrained.cs
+++ b/Source/OpenQuestPDF/Elements/Constrained.cs
@@ -47,6 +47,9 @@ internal override SpacePlan Measure(Size availableSpace)
         
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
+
             var size = new Size(
                 Min(MaxWidth, availableSpace.Width),
                 Min(MaxHeight, availableSpace.Height));
diff --git a/Source/OpenQuestPDF/Elements/DebugArea.cs b/Source/OpenQuestPDF/Elements/DebugArea.cs
index 07206cf48..32296218d 100644
--- a/Source/OpenQuestPDF/Elements/DebugArea.cs
+++ b/Source/OpenQuestPDF/Elements/DebugArea.cs
@@ -9,20 +9,23 @@ internal class DebugArea : IComponent
     {
         public IElement? Child { get; set; }
         
-        public string Text { get; set; }
+        public string? Text { get; set; }
         public string Color { get; set; } = Colors.Red.Medium;
         public void Compose(IContainer container)
         {
             var backgroundColor = SKColor.Parse(Color).WithAlpha(50).ToString();
-            
+
             container
                 .Border(1)
                 .BorderColor(Color)
                 .Layers(layers =>
                 {
-                    layers.PrimaryLayer().Element(Child);
+                    if (Child != null)
+                    {
+                        _ = layers.PrimaryLayer().Element(Child);
+                    }
                     layers.Layer().Background(backgroundColor);
-                    
+
                     layers
                         .Layer()
                         .ShowIf(!string.IsNullOrWhiteSpace(Text))
diff --git a/Source/OpenQuestPDF/Elements/DebugPointer.cs b/Source/OpenQuestPDF/Elements/DebugPointer.cs
index 468878ebe..41e0b8260 100644
--- a/Source/OpenQuestPDF/Elements/DebugPointer.cs
+++ b/Source/OpenQuestPDF/Elements/DebugPointer.cs
@@ -4,7 +4,7 @@ namespace OpenQuestPDF.Elements
 {
     internal class DebugPointer : Container
     {
-        public string Target { get; set; }
+        public required string Target { get; set; }
         public bool Highlight { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Source/OpenQuestPDF/Elements/Decoration.cs b/Source/OpenQuestPDF/Elements/Decoration.cs
index e5eb9f87b..fe0b8531a 100644
--- a/Source/OpenQuestPDF/Elements/Decoration.cs
+++ b/Source/OpenQuestPDF/Elements/Decoration.cs
@@ -9,7 +9,7 @@ namespace OpenQuestPDF.Elements
 {
     internal class DecorationItemRenderingCommand
     {
-        public Element Element { get; set; }
+        public required Element Element { get; set; }
         public SpacePlan Measurement { get; set; }
         public Position Offset { get; set; }
     }
@@ -29,7 +29,7 @@ internal class Decoration : Element, ICacheable, IContentDirectionAware
             yield return After;
         }
         
-        internal override void CreateProxy(Func<Element?, Element?> create)
+        internal override void CreateProxy(Func<Element, Element> create)
         {
             Before = create(Before);
             Content = create(Content);
@@ -59,6 +59,9 @@ internal override SpacePlan Measure(Size availableSpace)
 
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
+
             var renderingCommands = PlanLayout(availableSpace).ToList();
             var width = renderingCommands.Max(x => x.Measurement.Width);
             
diff --git a/Source/OpenQuestPDF/Elements/Dynamic.cs b/Source/OpenQuestPDF/Elements/Dynamic.cs
index 754b8864b..c25d1d5c3 100644
--- a/Source/OpenQuestPDF/Elements/Dynamic.cs
+++ b/Source/OpenQuestPDF/Elements/Dynamic.cs
@@ -48,6 +48,10 @@ internal override void Draw(Size availableSpace)
 
         private DynamicComponentComposeResult GetContent(Size availableSize, bool acceptNewState)
         {
+            if(Canvas == null)
+                throw new InvalidOperationException("The Canvas property is not set. This indicates a bug in the library - please report it on GitHub.");
+            if(PageContext == null)
+                throw new InvalidOperationException("The PageContext property is not set. This indicates a bug in the library - please report it on GitHub.");
             var componentState = Child.GetState();
             
             var context = new DynamicContext
@@ -59,7 +63,7 @@ private DynamicComponentComposeResult GetContent(Size availableSize, bool accept
                 ContentDirection = ContentDirection,
                 
                 PageNumber = PageContext.CurrentPage,
-                TotalPages = PageContext.GetLocation(Infrastructure.PageContext.DocumentLocation).PageEnd,
+                TotalPages = PageContext.GetLocation(Infrastructure.PageContext.DocumentLocation)?.PageEnd ?? 0,
                 AvailableSize = availableSize
             };
             
@@ -74,10 +78,10 @@ private DynamicComponentComposeResult GetContent(Size availableSize, bool accept
 
     public class DynamicContext
     {
-        internal IPageContext PageContext { get; set; }
-        internal ICanvas Canvas { get; set; }
+        internal IPageContext? PageContext { get; set; }
+        internal ICanvas? Canvas { get; set; }
         
-        internal TextStyle TextStyle { get; set; }
+        internal TextStyle? TextStyle { get; set; }
         internal ContentDirection ContentDirection { get; set; }
     
         public int PageNumber { get; internal set; }
@@ -86,6 +90,10 @@ public class DynamicContext
 
         public IDynamicElement CreateElement(Action<IContainer> content)
         {
+            if (PageContext == null || TextStyle == null || Canvas == null)
+            {
+                throw new ArgumentNullException("PageContext, TextStyle and Canvas properties must be set before calling CreateElement.");
+            }
             var container = new DynamicElement();
             content(container);
             
diff --git a/Source/OpenQuestPDF/Elements/DynamicImage.cs b/Source/OpenQuestPDF/Elements/DynamicImage.cs
index 10e198d57..5fa54aad3 100644
--- a/Source/OpenQuestPDF/Elements/DynamicImage.cs
+++ b/Source/OpenQuestPDF/Elements/DynamicImage.cs
@@ -19,6 +19,8 @@ internal override SpacePlan Measure(Size availableSpace)
 
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             var imageData = Source?.Invoke(availableSpace);
             
             if (imageData == null)
diff --git a/Source/OpenQuestPDF/Elements/Grid.cs b/Source/OpenQuestPDF/Elements/Grid.cs
index f4dfcacef..38cbb14d6 100644
--- a/Source/OpenQuestPDF/Elements/Grid.cs
+++ b/Source/OpenQuestPDF/Elements/Grid.cs
@@ -66,8 +66,14 @@ void BuildRow(RowDescriptor row)
             
             if (hasEmptySpace && Alignment != HorizontalAlignment.Left)
                 row.RelativeItem(emptySpace);
-                
-            elements.ForEach(x => row.RelativeItem(x.Columns).Element(x.Child));
+
+            elements.ForEach(x =>
+            {
+                if (x.Child is IElement child)
+                {
+                    row.RelativeItem(x.Columns).Element(child);
+                }
+            });
 
             if (hasEmptySpace && Alignment != HorizontalAlignment.Right)
                 row.RelativeItem(emptySpace);
diff --git a/Source/OpenQuestPDF/Elements/Hyperlink.cs b/Source/OpenQuestPDF/Elements/Hyperlink.cs
index b49bc42e3..a48894c4e 100644
--- a/Source/OpenQuestPDF/Elements/Hyperlink.cs
+++ b/Source/OpenQuestPDF/Elements/Hyperlink.cs
@@ -5,10 +5,12 @@ namespace OpenQuestPDF.Elements
 {
     internal class Hyperlink : ContainerElement
     {
-        public string Url { get; set; } = "https://www.questpdf.com";
+        public string Url { get; set; } = string.Empty;
         
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             var targetSize = base.Measure(availableSpace);
 
             if (targetSize.Type == SpacePlanType.Wrap)
diff --git a/Source/OpenQuestPDF/Elements/Image.cs b/Source/OpenQuestPDF/Elements/Image.cs
index c5b450233..ab9035822 100644
--- a/Source/OpenQuestPDF/Elements/Image.cs
+++ b/Source/OpenQuestPDF/Elements/Image.cs
@@ -23,6 +23,8 @@ internal override SpacePlan Measure(Size availableSpace)
 
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             if (InternalImage == null)
                 return;
 
diff --git a/Source/OpenQuestPDF/Elements/Inlined.cs b/Source/OpenQuestPDF/Elements/Inlined.cs
index f4456e5ef..b98b8eb01 100644
--- a/Source/OpenQuestPDF/Elements/Inlined.cs
+++ b/Source/OpenQuestPDF/Elements/Inlined.cs
@@ -85,6 +85,8 @@ internal override SpacePlan Measure(Size availableSpace)
 
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             SetDefaultAlignment();
             
             var lines = Compose(availableSpace);
diff --git a/Source/OpenQuestPDF/Elements/Line.cs b/Source/OpenQuestPDF/Elements/Line.cs
index 948969fed..1fddce17b 100644
--- a/Source/OpenQuestPDF/Elements/Line.cs
+++ b/Source/OpenQuestPDF/Elements/Line.cs
@@ -36,6 +36,8 @@ internal override SpacePlan Measure(Size availableSpace)
 
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             if (Type == LineType.Vertical)
             {
                 Canvas.DrawRectangle(new Position(-Size/2, 0), new Size(Size, availableSpace.Height), Color);
diff --git a/Source/OpenQuestPDF/Elements/MinimalBox.cs b/Source/OpenQuestPDF/Elements/MinimalBox.cs
index 15247de6c..6285a418a 100644
--- a/Source/OpenQuestPDF/Elements/MinimalBox.cs
+++ b/Source/OpenQuestPDF/Elements/MinimalBox.cs
@@ -9,6 +9,8 @@ internal class MinimalBox : ContainerElement, IContentDirectionAware
         
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             var targetSize = base.Measure(availableSpace);
             
             if (targetSize.Type == SpacePlanType.Wrap)
diff --git a/Source/OpenQuestPDF/Elements/Padding.cs b/Source/OpenQuestPDF/Elements/Padding.cs
index cc204b58d..95c78fd0b 100644
--- a/Source/OpenQuestPDF/Elements/Padding.cs
+++ b/Source/OpenQuestPDF/Elements/Padding.cs
@@ -43,6 +43,8 @@ internal override void Draw(Size availableSpace)
         {
             if (Child == null)
                 return;
+            if (Canvas == null)
+                return;
 
             var internalSpace = InternalSpace(availableSpace);
             
diff --git a/Source/OpenQuestPDF/Elements/Placeholder.cs b/Source/OpenQuestPDF/Elements/Placeholder.cs
index e8d9b539a..3fa0488f8 100644
--- a/Source/OpenQuestPDF/Elements/Placeholder.cs
+++ b/Source/OpenQuestPDF/Elements/Placeholder.cs
@@ -11,7 +11,7 @@ internal class Placeholder : IComponent
 
         static Placeholder()
         {
-            ImageData = Helpers.Helpers.LoadEmbeddedResource("QuestPDF.Resources.ImagePlaceholder.png");
+            ImageData = Helpers.Helpers.LoadEmbeddedResource("OpenQuestPDF.Resources.ImagePlaceholder.png");
         }
 
         public void Compose(IContainer container)
diff --git a/Source/OpenQuestPDF/Elements/Rotate.cs b/Source/OpenQuestPDF/Elements/Rotate.cs
index 9a22937db..1047e2366 100644
--- a/Source/OpenQuestPDF/Elements/Rotate.cs
+++ b/Source/OpenQuestPDF/Elements/Rotate.cs
@@ -8,6 +8,8 @@ internal class Rotate : ContainerElement
 
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             Canvas.Rotate(Angle);
             Child?.Draw(availableSpace);
             Canvas.Rotate(-Angle);
diff --git a/Source/OpenQuestPDF/Elements/Row.cs b/Source/OpenQuestPDF/Elements/Row.cs
index 61b275c6f..d5d702a79 100644
--- a/Source/OpenQuestPDF/Elements/Row.cs
+++ b/Source/OpenQuestPDF/Elements/Row.cs
@@ -25,7 +25,7 @@ internal class RowItem : Container
 
     internal class RowItemRenderingCommand
     {
-        public RowItem RowItem { get; set; }
+        public required RowItem RowItem { get; set; }
         public SpacePlan Measurement { get; set; }
         public Size Size { get; set; }
         public Position Offset { get; set; }
@@ -48,7 +48,7 @@ public void ResetState()
             return Items;
         }
         
-        internal override void CreateProxy(Func<Element?, Element?> create)
+        internal override void CreateProxy(Func<Element, Element> create)
         {
             Items.ForEach(x => x.Child = create(x.Child));
         }
@@ -79,6 +79,8 @@ internal override SpacePlan Measure(Size availableSpace)
 
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             if (!Items.Any())
                 return;
 
diff --git a/Source/OpenQuestPDF/Elements/Scale.cs b/Source/OpenQuestPDF/Elements/Scale.cs
index 66c4977db..2543adf01 100644
--- a/Source/OpenQuestPDF/Elements/Scale.cs
+++ b/Source/OpenQuestPDF/Elements/Scale.cs
@@ -35,6 +35,8 @@ internal override SpacePlan Measure(Size availableSpace)
         
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             var targetSpace = new Size(
                 Math.Abs(availableSpace.Width / ScaleX), 
                 Math.Abs(availableSpace.Height / ScaleY));
diff --git a/Source/OpenQuestPDF/Elements/ScaleToFit.cs b/Source/OpenQuestPDF/Elements/ScaleToFit.cs
index 1a79dd753..524bc5069 100644
--- a/Source/OpenQuestPDF/Elements/ScaleToFit.cs
+++ b/Source/OpenQuestPDF/Elements/ScaleToFit.cs
@@ -25,6 +25,8 @@ internal override SpacePlan Measure(Size availableSpace)
         
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             var perfectScale = FindPerfectScale(Child, availableSpace);
             
             if (!perfectScale.HasValue)
diff --git a/Source/OpenQuestPDF/Elements/Section.cs b/Source/OpenQuestPDF/Elements/Section.cs
index c10582fe6..0fc6e7e95 100644
--- a/Source/OpenQuestPDF/Elements/Section.cs
+++ b/Source/OpenQuestPDF/Elements/Section.cs
@@ -14,8 +14,13 @@ public void ResetState()
         
         internal override void Draw(Size availableSpace)
         {
+            if(PageContext == null)
+                return;
+
             if (!IsRendered)
             {
+                if (Canvas == null)
+                    return;
                 Canvas.DrawSection(LocationName);
                 IsRendered = true;
             }
diff --git a/Source/OpenQuestPDF/Elements/SectionLink.cs b/Source/OpenQuestPDF/Elements/SectionLink.cs
index a4fe59f5b..87a909321 100644
--- a/Source/OpenQuestPDF/Elements/SectionLink.cs
+++ b/Source/OpenQuestPDF/Elements/SectionLink.cs
@@ -5,15 +5,20 @@ namespace OpenQuestPDF.Elements
 {
     internal class SectionLink : ContainerElement
     {
-        public string SectionName { get; set; }
+        public string? SectionName { get; set; }
         
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             var targetSize = base.Measure(availableSpace);
 
             if (targetSize.Type == SpacePlanType.Wrap)
                 return;
 
+            if (SectionName == null)
+                return;
+
             Canvas.DrawSectionLink(SectionName, targetSize);
             base.Draw(availableSpace);
         }
diff --git a/Source/OpenQuestPDF/Elements/SimpleRotate.cs b/Source/OpenQuestPDF/Elements/SimpleRotate.cs
index e7704ab48..3415a39ee 100644
--- a/Source/OpenQuestPDF/Elements/SimpleRotate.cs
+++ b/Source/OpenQuestPDF/Elements/SimpleRotate.cs
@@ -33,6 +33,8 @@ internal override SpacePlan Measure(Size availableSpace)
         
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             var translate = new Position(
                 (NormalizedTurnCount == 1 || NormalizedTurnCount == 2) ? availableSpace.Width : 0,
                 (NormalizedTurnCount == 2 || NormalizedTurnCount == 3) ? availableSpace.Height : 0);
diff --git a/Source/OpenQuestPDF/Elements/Table/DynamicDictionary.cs b/Source/OpenQuestPDF/Elements/Table/DynamicDictionary.cs
index ce354e9e4..4bf1c72d2 100644
--- a/Source/OpenQuestPDF/Elements/Table/DynamicDictionary.cs
+++ b/Source/OpenQuestPDF/Elements/Table/DynamicDictionary.cs
@@ -7,15 +7,11 @@ namespace OpenQuestPDF.Elements.Table
     /// This dictionary allows to access key that does not exist.
     /// Instead of throwing an exception, it returns a default value.
     /// </summary>
-    internal class DynamicDictionary<TKey, TValue>
+    internal class DynamicDictionary<TKey, TValue> where TKey : notnull
     {
         private TValue Default { get; }
         private IDictionary<TKey, TValue> Dictionary { get; } = new Dictionary<TKey, TValue>();
 
-        public DynamicDictionary()
-        {
-            
-        }
         
         public DynamicDictionary(TValue defaultValue)
         {
diff --git a/Source/OpenQuestPDF/Elements/Table/Table.cs b/Source/OpenQuestPDF/Elements/Table/Table.cs
index e8e1a7bb6..f271f9aa6 100644
--- a/Source/OpenQuestPDF/Elements/Table/Table.cs
+++ b/Source/OpenQuestPDF/Elements/Table/Table.cs
@@ -109,6 +109,8 @@ internal override SpacePlan Measure(Size availableSpace)
 
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             UpdateColumnsWidth(availableSpace.Width);
             var renderingCommands = PlanLayout(availableSpace);
 
@@ -190,7 +192,7 @@ static float[] GetColumnLeftOffsets(IList<TableColumnDefinition> columns)
             
             ICollection<TableCellRenderingCommand> GetRenderingCommands()
             {
-                var rowBottomOffsets = new DynamicDictionary<int, float>();
+                var rowBottomOffsets = new DynamicDictionary<int, float>(defaultValue: 0);
                 var commands = new List<TableCellRenderingCommand>();
                 
                 var cellsToTry = Enumerable
diff --git a/Source/OpenQuestPDF/Elements/Table/TableCellRenderingCommand.cs b/Source/OpenQuestPDF/Elements/Table/TableCellRenderingCommand.cs
index fac8d5bd1..6edd5f5d2 100644
--- a/Source/OpenQuestPDF/Elements/Table/TableCellRenderingCommand.cs
+++ b/Source/OpenQuestPDF/Elements/Table/TableCellRenderingCommand.cs
@@ -5,7 +5,7 @@ namespace OpenQuestPDF.Elements.Table
 {
     internal class TableCellRenderingCommand
     {
-        public TableCell Cell { get; set; }
+        public required TableCell Cell { get; set; }
         public SpacePlan Measurement { get; set; }
         public Size Size { get; set; }
         public Position Offset { get; set; }
diff --git a/Source/OpenQuestPDF/Elements/Text/Calculation/TextDrawingRequest.cs b/Source/OpenQuestPDF/Elements/Text/Calculation/TextDrawingRequest.cs
index 0c738bcd4..5f6392a87 100644
--- a/Source/OpenQuestPDF/Elements/Text/Calculation/TextDrawingRequest.cs
+++ b/Source/OpenQuestPDF/Elements/Text/Calculation/TextDrawingRequest.cs
@@ -5,8 +5,8 @@ namespace OpenQuestPDF.Elements.Text.Calculation
 {
     internal class TextDrawingRequest
     {
-        public ICanvas Canvas { get; set; }
-        public IPageContext PageContext { get; set; }
+        public required ICanvas Canvas { get; set; }
+        public required IPageContext PageContext { get; set; }
         
         public int StartIndex { get; set; }
         public int EndIndex { get; set; }
diff --git a/Source/OpenQuestPDF/Elements/Text/Calculation/TextLine.cs b/Source/OpenQuestPDF/Elements/Text/Calculation/TextLine.cs
index a1ffad6a6..bea69a080 100644
--- a/Source/OpenQuestPDF/Elements/Text/Calculation/TextLine.cs
+++ b/Source/OpenQuestPDF/Elements/Text/Calculation/TextLine.cs
@@ -7,7 +7,7 @@ namespace OpenQuestPDF.Elements.Text.Calculation
 {
     internal class TextLine
     {
-        public ICollection<TextLineElement> Elements { get; private set; }
+        public required ICollection<TextLineElement> Elements { get; init; }
 
         public float TextHeight { get; private set; }
         public float LineHeight { get; private set; }
diff --git a/Source/OpenQuestPDF/Elements/Text/Calculation/TextLineElement.cs b/Source/OpenQuestPDF/Elements/Text/Calculation/TextLineElement.cs
index 37c79adb1..168c2b9e4 100644
--- a/Source/OpenQuestPDF/Elements/Text/Calculation/TextLineElement.cs
+++ b/Source/OpenQuestPDF/Elements/Text/Calculation/TextLineElement.cs
@@ -4,7 +4,7 @@ namespace OpenQuestPDF.Elements.Text.Calculation
 {
     internal class TextLineElement
     {
-        public ITextBlockItem Item { get; set; }
-        public TextMeasurementResult Measurement { get; set; }
+        public required ITextBlockItem Item { get; set; }
+        public required TextMeasurementResult Measurement { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Source/OpenQuestPDF/Elements/Text/Calculation/TextMeasurementRequest.cs b/Source/OpenQuestPDF/Elements/Text/Calculation/TextMeasurementRequest.cs
index 4589f8117..2b9b1a756 100644
--- a/Source/OpenQuestPDF/Elements/Text/Calculation/TextMeasurementRequest.cs
+++ b/Source/OpenQuestPDF/Elements/Text/Calculation/TextMeasurementRequest.cs
@@ -4,8 +4,8 @@ namespace OpenQuestPDF.Elements.Text.Calculation
 {
     internal class TextMeasurementRequest
     {
-        public ICanvas Canvas { get; set; }
-        public IPageContext PageContext { get; set; }
+        public required ICanvas Canvas { get; set; }
+        public required IPageContext PageContext { get; set; }
         
         public int StartIndex { get; set; }
         public float AvailableWidth { get; set; }
diff --git a/Source/OpenQuestPDF/Elements/Text/FontFallback.cs b/Source/OpenQuestPDF/Elements/Text/FontFallback.cs
index d117da0e5..4a1d490f9 100644
--- a/Source/OpenQuestPDF/Elements/Text/FontFallback.cs
+++ b/Source/OpenQuestPDF/Elements/Text/FontFallback.cs
@@ -20,13 +20,11 @@ public struct TextRun
 
         public class FallbackOption
         {
-            public TextStyle Style { get; set; }
-            public SKFont Font { get; set; }
-            public SKTypeface Typeface { get; set; }
+            public required TextStyle Style { get; set; }
+            public required SKFont Font { get; set; }
+            public required SKTypeface Typeface { get; set; }
         }
 
-        private static SKFontManager FontManager => SKFontManager.Default;
-
         public static IEnumerable<TextRun> SplitWithFontFallback(this string text, TextStyle textStyle)
         {
             var fallbackOptions = GetFallbackOptions(textStyle).ToArray();
diff --git a/Source/OpenQuestPDF/Elements/Text/Items/TextBlockSpan.cs b/Source/OpenQuestPDF/Elements/Text/Items/TextBlockSpan.cs
index 897dd33c5..e703f9666 100644
--- a/Source/OpenQuestPDF/Elements/Text/Items/TextBlockSpan.cs
+++ b/Source/OpenQuestPDF/Elements/Text/Items/TextBlockSpan.cs
@@ -99,6 +99,8 @@ internal class TextBlockSpan : ITextBlockItem
         // TODO: consider introducing text wrapping abstraction (basic, english-like, asian-like)
         private (int endIndex, int nextIndex)? WrapText(int startIndex, int endIndex, bool isFirstElementInLine)
         {
+            if (TextShapingResult == null)
+                throw new InvalidOperationException("Text shaping result is not available");
             // textLength - length of the part of the text that fits in available width (creating a line)
 
             // entire text fits, no need to wrap
@@ -136,13 +138,16 @@ internal class TextBlockSpan : ITextBlockItem
         
         public virtual void Draw(TextDrawingRequest request)
         {
+            if (TextShapingResult == null)
+                throw new InvalidOperationException("Text shaping result is not available");
+
             var fontMetrics = Style.ToFontMetrics();
 
             var glyphOffsetY = GetGlyphOffset();
             
             var textDrawingCommand = TextShapingResult.PositionText(request.StartIndex, request.EndIndex, Style);
 
-            if (Style.BackgroundColor != Colors.Transparent)
+            if (Style.BackgroundColor != null && Style.BackgroundColor != Colors.Transparent)
                 request.Canvas.DrawRectangle(new Position(0, request.TotalAscent), new Size(request.TextSize.Width, request.TextSize.Height), Style.BackgroundColor);
             
             if (textDrawingCommand.HasValue)
@@ -166,7 +171,7 @@ public virtual void Draw(TextDrawingRequest request)
             
             void DrawLine(float offset, float thickness)
             {
-                request.Canvas.DrawRectangle(new Position(0, offset), new Size(request.TextSize.Width, thickness), Style.Color);
+                request.Canvas.DrawRectangle(new Position(0, offset), new Size(request.TextSize.Width, thickness), Style.Color ?? TextStyle.LibraryDefault.Color!);
             }
 
             float GetGlyphOffset()
diff --git a/Source/OpenQuestPDF/Elements/Text/TextBlock.cs b/Source/OpenQuestPDF/Elements/Text/TextBlock.cs
index fea38b7ed..1bc5d8006 100644
--- a/Source/OpenQuestPDF/Elements/Text/TextBlock.cs
+++ b/Source/OpenQuestPDF/Elements/Text/TextBlock.cs
@@ -94,6 +94,11 @@ internal override SpacePlan Measure(Size availableSpace)
 
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
+            if (PageContext == null)
+                return;
+
             SetDefaultAlignment();
             
             var lines = DivideTextItemsIntoLines(availableSpace.Width, availableSpace.Height).ToList();
@@ -185,6 +190,9 @@ public IEnumerable<TextLine> DivideTextItemsIntoLines(float availableWidth, floa
 
             TextLine GetNextLine()
             {
+                if (Canvas == null || PageContext == null)
+                    throw new ArgumentNullException("Canvas or PageContext is null");
+
                 var currentWidth = 0f;
 
                 var currentLineElements = new List<TextLineElement>();
diff --git a/Source/OpenQuestPDF/Elements/Translate.cs b/Source/OpenQuestPDF/Elements/Translate.cs
index 20bdb2f33..7107c3b1a 100644
--- a/Source/OpenQuestPDF/Elements/Translate.cs
+++ b/Source/OpenQuestPDF/Elements/Translate.cs
@@ -10,6 +10,8 @@ internal class Translate : ContainerElement
 
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             var translate = new Position(TranslateX, TranslateY);
             
             Canvas.Translate(translate);
diff --git a/Source/OpenQuestPDF/Elements/Unconstrained.cs b/Source/OpenQuestPDF/Elements/Unconstrained.cs
index 9a5271f9c..ffb503089 100644
--- a/Source/OpenQuestPDF/Elements/Unconstrained.cs
+++ b/Source/OpenQuestPDF/Elements/Unconstrained.cs
@@ -22,6 +22,8 @@ internal override SpacePlan Measure(Size availableSpace)
 
         internal override void Draw(Size availableSpace)
         {
+            if (Canvas == null)
+                return;
             var measurement = base.Measure(Size.Max);
             
             if (measurement.Type == SpacePlanType.Wrap)
diff --git a/Source/OpenQuestPDF/Fluent/ColumnExtensions.cs b/Source/OpenQuestPDF/Fluent/ColumnExtensions.cs
index b8e7d322d..b1dd0ff63 100644
--- a/Source/OpenQuestPDF/Fluent/ColumnExtensions.cs
+++ b/Source/OpenQuestPDF/Fluent/ColumnExtensions.cs
@@ -28,11 +28,6 @@ public IContainer Item()
     
     public static class ColumnExtensions
     {
-        [Obsolete("This element has been renamed since version 2022.2. Please use the 'Column' method.")]
-        public static void Stack(this IContainer element, Action<ColumnDescriptor> handler)
-        {
-            element.Column(handler);
-        }
         
         public static void Column(this IContainer element, Action<ColumnDescriptor> handler)
         {
diff --git a/Source/OpenQuestPDF/Fluent/ComponentExtentions.cs b/Source/OpenQuestPDF/Fluent/ComponentExtentions.cs
index 8be51e578..a9edefeaa 100644
--- a/Source/OpenQuestPDF/Fluent/ComponentExtentions.cs
+++ b/Source/OpenQuestPDF/Fluent/ComponentExtentions.cs
@@ -70,7 +70,10 @@ static void Component<T>(this IContainer element, T component, Action<ComponentD
         static void Slot(this IContainer element, ISlot slot)
         {
             var child = (slot as Slot)?.Child;
-            element.Element(child);
+            if (child is IElement nonNullChild)
+            {
+                element.Element(nonNullChild);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Source/OpenQuestPDF/Fluent/DecorationExtensions.cs b/Source/OpenQuestPDF/Fluent/DecorationExtensions.cs
index ed4b6aae3..df710e32f 100644
--- a/Source/OpenQuestPDF/Fluent/DecorationExtensions.cs
+++ b/Source/OpenQuestPDF/Fluent/DecorationExtensions.cs
@@ -43,38 +43,6 @@ public void After(Action<IContainer> handler)
         {
             handler?.Invoke(After());
         }
-
-        #region Obsolete
-
-        [Obsolete("This element has been renamed since version 2022.2. Please use the 'Before' method.")]
-        public IContainer Header()
-        {
-            var container = new Container();
-            Decoration.Before = container;
-            return container;
-        }
-        
-        [Obsolete("This element has been renamed since version 2022.2. Please use the 'Before' method.")]
-        public void Header(Action<IContainer> handler)
-        {
-            handler?.Invoke(Header());
-        }
-        
-        [Obsolete("This element has been renamed since version 2022.2. Please use the 'After' method.")]
-        public IContainer Footer()
-        {
-            var container = new Container();
-            Decoration.After = container;
-            return container;
-        }
-        
-        [Obsolete("This element has been renamed since version 2022.2. Please use the 'After' method.")]
-        public void Footer(Action<IContainer> handler)
-        {
-            handler?.Invoke(Footer());
-        }
-
-        #endregion
     }
     
     public static class DecorationExtensions
diff --git a/Source/OpenQuestPDF/Fluent/ElementExtensions.cs b/Source/OpenQuestPDF/Fluent/ElementExtensions.cs
index b47ca46a2..3ed84664c 100644
--- a/Source/OpenQuestPDF/Fluent/ElementExtensions.cs
+++ b/Source/OpenQuestPDF/Fluent/ElementExtensions.cs
@@ -26,8 +26,8 @@ internal static T Element<T>(this IContainer element, T child) where T : IElemen
                 throw new DocumentComposeException(message);
             }
 
-            if (element != child as Element)
-                element.Child = child as Element;
+            if (element != null && child is Element childElement && element != childElement)
+                element.Child = childElement;
             
             return child;
         }
@@ -102,11 +102,6 @@ public static IContainer Container(this IContainer element)
             return element.Element(new Container());
         }
         
-        [Obsolete("This element has been renamed since version 2022.3. Please use the Hyperlink method.")]
-        public static IContainer ExternalLink(this IContainer element, string url)
-        {
-            return element.Hyperlink(url);
-        }
         
         public static IContainer Hyperlink(this IContainer element, string url)
         {
@@ -116,11 +111,6 @@ public static IContainer Hyperlink(this IContainer element, string url)
             });
         }
         
-        [Obsolete("This element has been renamed since version 2022.3. Please use the Section method.")]
-        public static IContainer Location(this IContainer element, string locationName)
-        {
-            return element.Section(locationName);
-        }
         
         public static IContainer Section(this IContainer element, string sectionName)
         {
@@ -130,11 +120,6 @@ public static IContainer Section(this IContainer element, string sectionName)
             });
         }
         
-        [Obsolete("This element has been renamed since version 2022.3. Please use the SectionLink method.")]
-        public static IContainer InternalLink(this IContainer element, string locationName)
-        {
-            return element.SectionLink(locationName);
-        }
         
         public static IContainer SectionLink(this IContainer element, string sectionName)
         {
@@ -157,11 +142,6 @@ public static void Canvas(this IContainer element, DrawOnCanvas handler)
             });
         }
         
-        [Obsolete("This element has been renamed since version 2022.1. Please use the MinimalBox method.")]
-        public static IContainer Box(this IContainer element)
-        {
-            return element.Element(new MinimalBox());
-        }
         
         public static IContainer MinimalBox(this IContainer element)
         {
diff --git a/Source/OpenQuestPDF/Fluent/GridExtensions.cs b/Source/OpenQuestPDF/Fluent/GridExtensions.cs
index df871875d..8602213c6 100644
--- a/Source/OpenQuestPDF/Fluent/GridExtensions.cs
+++ b/Source/OpenQuestPDF/Fluent/GridExtensions.cs
@@ -55,7 +55,7 @@ public IContainer Item(int columns = 1)
     
     public static class GridExtensions
     {
-        [Obsolete("This element has been deprecated since version 2022.11. Please use the Table element, or the combination of the Row and Column elements.")]
+        [Obsolete("This element has been deprecated since version QuestPDF Version 2022.11. Please use the Table element, or the combination of the Row and Column elements.")]
         public static void Grid(this IContainer element, Action<GridDescriptor> handler)
         {
             var descriptor = new GridDescriptor();
diff --git a/Source/OpenQuestPDF/Fluent/LineExtensions.cs b/Source/OpenQuestPDF/Fluent/LineExtensions.cs
index 796e20741..15276bab7 100644
--- a/Source/OpenQuestPDF/Fluent/LineExtensions.cs
+++ b/Source/OpenQuestPDF/Fluent/LineExtensions.cs
@@ -32,7 +32,8 @@ public static ILine LineHorizontal(this IContainer element, float size, Unit uni
         public static void LineColor(this ILine descriptor, string value)
         {
             ColorValidator.Validate(value);
-            (descriptor as Line).Color = value;
+            if (descriptor is Line lineDescriptor)
+                lineDescriptor.Color = value;
         }
     }
 }
\ No newline at end of file
diff --git a/Source/OpenQuestPDF/Fluent/PageExtensions.cs b/Source/OpenQuestPDF/Fluent/PageExtensions.cs
index 2d7e17d34..0689e0125 100644
--- a/Source/OpenQuestPDF/Fluent/PageExtensions.cs
+++ b/Source/OpenQuestPDF/Fluent/PageExtensions.cs
@@ -114,11 +114,6 @@ public void PageColor(string color)
             Page.BackgroundColor = color;
         }
         
-        [Obsolete("This element has been renamed since version 2022.3. Please use the PageColor method.")]
-        public void Background(string color)
-        {
-            PageColor(color);
-        }
         
         #endregion
         
@@ -169,7 +164,8 @@ public static IDocumentContainer Page(this IDocumentContainer document, Action<P
             var descriptor = new PageDescriptor();
             handler(descriptor);
             
-            (document as DocumentContainer).Pages.Add(descriptor.Page);
+            if(document is DocumentContainer documentContainer)
+                documentContainer.Pages.Add(descriptor.Page);
             
             return document;
         }
diff --git a/Source/OpenQuestPDF/Fluent/RowExtensions.cs b/Source/OpenQuestPDF/Fluent/RowExtensions.cs
index 2e19d94a5..41e8205d6 100644
--- a/Source/OpenQuestPDF/Fluent/RowExtensions.cs
+++ b/Source/OpenQuestPDF/Fluent/RowExtensions.cs
@@ -24,18 +24,6 @@ private IContainer Item(RowItemType type, float size = 0)
             Row.Items.Add(element);
             return element;
         }
-        
-        [Obsolete("This element has been renamed since version 2022.2. Please use the RelativeItem method.")]
-        public IContainer RelativeColumn(float size = 1)
-        {
-            return Item(RowItemType.Relative, size);
-        }
-        
-        [Obsolete("This element has been renamed since version 2022.2. Please use the ConstantItem method.")]
-        public IContainer ConstantColumn(float size)
-        {
-            return Item(RowItemType.Constant, size);
-        }
 
         public IContainer RelativeItem(float size = 1)
         {
diff --git a/Source/OpenQuestPDF/Fluent/TableExtensions.cs b/Source/OpenQuestPDF/Fluent/TableExtensions.cs
index edc391d96..77746eb05 100644
--- a/Source/OpenQuestPDF/Fluent/TableExtensions.cs
+++ b/Source/OpenQuestPDF/Fluent/TableExtensions.cs
@@ -50,8 +50,6 @@ public ITableCellContainer Cell()
     
     public class TableDescriptor
     {
-        internal List<TableColumnDefinition> Columns { get; private set; }
-
         private Table HeaderTable { get; } = new();
         private Table ContentTable { get; } = new();
         private Table FooterTable { get; } = new();
diff --git a/Source/OpenQuestPDF/Fluent/TextExtensions.cs b/Source/OpenQuestPDF/Fluent/TextExtensions.cs
index 3bd76c9ea..839355065 100644
--- a/Source/OpenQuestPDF/Fluent/TextExtensions.cs
+++ b/Source/OpenQuestPDF/Fluent/TextExtensions.cs
@@ -103,11 +103,6 @@ private void AddItemToLastTextBlock(ITextBlockItem item)
             lastTextBlock.Items.Add(item);
         }
         
-        [Obsolete("This element has been renamed since version 2022.3. Please use the overload that returns a TextSpanDescriptor object which allows to specify text style.")]
-        public void Span(string? text, TextStyle style)
-        {
-            Span(text).Style(style);
-        }
         
         public TextSpanDescriptor Span(string? text)
         {
@@ -165,14 +160,6 @@ public TextPageNumberDescriptor TotalPages()
         {
             return PageNumber(x => x.GetLocation(PageContext.DocumentLocation)?.Length);
         }
-
-        [Obsolete("This element has been renamed since version 2022.3. Please use the BeginPageNumberOfSection method.")]
-        public void PageNumberOfLocation(string locationName, TextStyle? style = null)
-        {
-            var descriptor = BeginPageNumberOfSection(locationName);
-            if (style != null)
-                descriptor.Style(style);
-        }
         
         public TextPageNumberDescriptor BeginPageNumberOfSection(string locationName)
         {
@@ -212,13 +199,6 @@ public TextSpanDescriptor SectionLink(string? text, string sectionName)
             return new TextSpanDescriptor(x => textBlockItem.Style = x);
         }
         
-        [Obsolete("This element has been renamed since version 2022.3. Please use the SectionLink method.")]
-        public void InternalLocation(string? text, string locationName, TextStyle? style = null)
-        {
-            var descriptor = SectionLink(text, locationName);
-            if (style != null)
-                descriptor.Style(style);
-        }
         
         public TextSpanDescriptor Hyperlink(string? text, string url)
         {
@@ -238,13 +218,6 @@ public TextSpanDescriptor Hyperlink(string? text, string url)
             return new TextSpanDescriptor(x => textBlockItem.Style = x);
         }
         
-        [Obsolete("This element has been renamed since version 2022.3. Please use the Hyperlink method.")]
-        public void ExternalLocation(string? text, string url, TextStyle? style = null)
-        {
-            var descriptor = Hyperlink(text, url);
-            if (style != null)
-                descriptor.Style(style);
-        }
         
         public IContainer Element()
         {
@@ -294,22 +267,13 @@ public static void Text(this IContainer element, Action<TextDescriptor> content)
             descriptor.Compose(element);
         }
         
-        [Obsolete("This method has been deprecated since version 2022.3. Please use the overload that returns a TextSpanDescriptor object which allows to specify text style.")]
-        public static void Text(this IContainer element, object? text, TextStyle style)
-        {
-            element.Text(text).Style(style);
-        }
-
-        [Obsolete("This method has been deprecated since version 2022.12. Please use an overload where the text parameter is passed explicitly as a string.")]
-        public static TextSpanDescriptor Text(this IContainer element, object? text)
-        {
-            return element.Text(text?.ToString());
-        }
 
         public static TextSpanDescriptor Text(this IContainer element, string? text)
         {
-            var descriptor = (TextSpanDescriptor) null!;
+            TextSpanDescriptor? descriptor = null;
             element.Text(x => descriptor = x.Span(text));
+            if (descriptor == null)
+                throw new InvalidOperationException("Text descriptor cannot be null");
             return descriptor;
         }
     }
diff --git a/Source/OpenQuestPDF/Fluent/TextStyleExtensions.cs b/Source/OpenQuestPDF/Fluent/TextStyleExtensions.cs
index 98e45170d..fe6c16eec 100644
--- a/Source/OpenQuestPDF/Fluent/TextStyleExtensions.cs
+++ b/Source/OpenQuestPDF/Fluent/TextStyleExtensions.cs
@@ -7,12 +7,6 @@ namespace OpenQuestPDF.Fluent
 {
     public static class TextStyleExtensions
     {
-        [Obsolete("This element has been renamed since version 2022.3. Please use the FontColor method.")]
-        public static TextStyle Color(this TextStyle style, string value)
-        {
-            return style.FontColor(value);
-        }
-        
         public static TextStyle FontColor(this TextStyle style, string value)
         {
             ColorValidator.Validate(value);
@@ -25,25 +19,17 @@ public static TextStyle BackgroundColor(this TextStyle style, string value)
             return style.Mutate(TextStyleProperty.BackgroundColor, value);
         }
         
-        [Obsolete("This element has been renamed since version 2022.3. Please use the FontFamily method.")]
-        public static TextStyle FontType(this TextStyle style, string value)
-        {
-            return style.FontFamily(value);
-        }
-        
         public static TextStyle FontFamily(this TextStyle style, string value)
         {
             return style.Mutate(TextStyleProperty.FontFamily, value);
         }
         
-        [Obsolete("This element has been renamed since version 2022.3. Please use the FontSize method.")]
-        public static TextStyle Size(this TextStyle style, float value)
-        {
-            return style.FontSize(value);
-        }
-        
+        /// <include file='../Resources/Documentation.xml' path='documentation/doc[@for=\"text.fontSize\"]/*' />
         public static TextStyle FontSize(this TextStyle style, float value)
         {
+            if (value <= 0)
+                throw new ArgumentException("Font size must be greater than 0.");
+            
             return style.Mutate(TextStyleProperty.Size, value);
         }
         
@@ -169,7 +155,7 @@ private static TextStyle Position(this TextStyle style, FontPosition fontPositio
         
         public static TextStyle Fallback(this TextStyle style, TextStyle? value = null)
         {
-            return style.Mutate(TextStyleProperty.Fallback, value);
+            return style.Mutate(TextStyleProperty.Fallback, value ?? TextStyle.Default);
         }
         
         public static TextStyle Fallback(this TextStyle style, Func<TextStyle, TextStyle> handler)
diff --git a/Source/OpenQuestPDF/Infrastructure/ContainerElement.cs b/Source/OpenQuestPDF/Infrastructure/ContainerElement.cs
index 9568fe627..d7bc84c47 100644
--- a/Source/OpenQuestPDF/Infrastructure/ContainerElement.cs
+++ b/Source/OpenQuestPDF/Infrastructure/ContainerElement.cs
@@ -7,12 +7,13 @@ namespace OpenQuestPDF.Infrastructure
 {
     internal abstract class ContainerElement : Element, IContainer
     {
-        internal Element? Child { get; set; } = Empty.Instance;
+        internal Element Child { get; set; } = Empty.Instance;
 
-        IElement? IContainer.Child
+        IElement
+        IContainer.Child
         {
             get => Child;
-            set => Child = value as Element;
+            set => Child = value as Element ?? Empty.Instance;
         }
 
         internal override IEnumerable<Element?> GetChildren()
@@ -20,7 +21,7 @@ internal abstract class ContainerElement : Element, IContainer
             yield return Child;
         }
 
-        internal override void CreateProxy(Func<Element?, Element?> create)
+        internal override void CreateProxy(Func<Element, Element> create)
         {
             Child = create(Child);
         }
diff --git a/Source/OpenQuestPDF/Infrastructure/Element.cs b/Source/OpenQuestPDF/Infrastructure/Element.cs
index 5855a6ccb..662c12eb6 100644
--- a/Source/OpenQuestPDF/Infrastructure/Element.cs
+++ b/Source/OpenQuestPDF/Infrastructure/Element.cs
@@ -7,15 +7,16 @@ namespace OpenQuestPDF.Infrastructure
 {
     internal abstract class Element : IElement
     {
-        internal IPageContext PageContext { get; set; }
-        internal ICanvas Canvas { get; set; }
+        // These properties are set by the dependency injection system before any element methods are called
+        internal IPageContext? PageContext { get; set; }
+        internal ICanvas? Canvas { get; set; }
         
         internal virtual IEnumerable<Element?> GetChildren()
         {
             yield break;
         }
 
-        internal virtual void CreateProxy(Func<Element?, Element?> create)
+        internal virtual void CreateProxy(Func<Element, Element> create)
         {
             
         }
diff --git a/Source/OpenQuestPDF/Infrastructure/IContainer.cs b/Source/OpenQuestPDF/Infrastructure/IContainer.cs
index f97a9e71c..57a696092 100644
--- a/Source/OpenQuestPDF/Infrastructure/IContainer.cs
+++ b/Source/OpenQuestPDF/Infrastructure/IContainer.cs
@@ -2,6 +2,6 @@
 {
     public interface IContainer
     {
-        IElement? Child { get; set; }
+        IElement Child { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Source/OpenQuestPDF/Infrastructure/IDynamicComponent.cs b/Source/OpenQuestPDF/Infrastructure/IDynamicComponent.cs
index f6f39caa6..444ea30a3 100644
--- a/Source/OpenQuestPDF/Infrastructure/IDynamicComponent.cs
+++ b/Source/OpenQuestPDF/Infrastructure/IDynamicComponent.cs
@@ -6,9 +6,10 @@ namespace OpenQuestPDF.Infrastructure
 {
     internal class DynamicComponentProxy
     {
-        internal Action<object> SetState { get; private set; }
-        internal Func<object> GetState { get; private set; }
-        internal Func<DynamicContext, DynamicComponentComposeResult> Compose { get; private set; }
+        // These properties are set by the CreateFrom factory method before use
+        internal Action<object> SetState { get; private set; } = null!;
+        internal Func<object> GetState { get; private set; } = null!;
+        internal Func<DynamicContext, DynamicComponentComposeResult> Compose { get; private set; } = null!;
         
         internal static DynamicComponentProxy CreateFrom<TState>(IDynamicComponent<TState> component) where TState : struct
         {
@@ -23,7 +24,7 @@ internal static DynamicComponentProxy CreateFrom<TState>(IDynamicComponent<TStat
 
     public class DynamicComponentComposeResult
     {
-        public IElement Content { get; set; }
+        public required IElement Content { get; set; }
         public bool HasMoreContent { get; set; }
     }
     
diff --git a/Source/OpenQuestPDF/Infrastructure/IPageContext.cs b/Source/OpenQuestPDF/Infrastructure/IPageContext.cs
index 76baaa2e5..ba88cd555 100644
--- a/Source/OpenQuestPDF/Infrastructure/IPageContext.cs
+++ b/Source/OpenQuestPDF/Infrastructure/IPageContext.cs
@@ -4,7 +4,7 @@ namespace OpenQuestPDF.Infrastructure
 {
     internal class DocumentLocation
     {
-        public string Name { get; set; }
+        public string? Name { get; set; }
         public int PageStart { get; set; }
         public int PageEnd { get; set; }
         public int Length => PageEnd - PageStart + 1;
diff --git a/Source/OpenQuestPDF/Infrastructure/TextStyleManager.cs b/Source/OpenQuestPDF/Infrastructure/TextStyleManager.cs
index b1560fafa..79d231f52 100644
--- a/Source/OpenQuestPDF/Infrastructure/TextStyleManager.cs
+++ b/Source/OpenQuestPDF/Infrastructure/TextStyleManager.cs
@@ -239,7 +239,7 @@ internal static TextStyle ApplyGlobalStyle(this TextStyle style)
         private static TextStyle UpdateFontFallback(this TextStyle style, bool overrideStyle)
         {
             var targetFallbackStyle = style
-                ?.Fallback
+                .Fallback
                 ?.ApplyStyleProperties(style, overrideStyle: overrideStyle, overrideFontFamily: false, applyFallback: false)
                 ?.UpdateFontFallback(overrideStyle);
             
diff --git a/Source/OpenQuestPDF/OpenQuestPDF.csproj b/Source/OpenQuestPDF/OpenQuestPDF.csproj
index edd31a3f6..ba3523832 100644
--- a/Source/OpenQuestPDF/OpenQuestPDF.csproj
+++ b/Source/OpenQuestPDF/OpenQuestPDF.csproj
@@ -5,7 +5,7 @@
         <PackageId>OpenQuestPDF</PackageId>
         <PackageDescription>OpenQuestPDF is an open-source, modern and battle-tested library that can help you with generating PDF documents by offering friendly, discoverable and predictable C# fluent API. Easily generate PDF reports, invoices, exports, etc.</PackageDescription>
         <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/Resources/ReleaseNotes.txt"))</PackageReleaseNotes>
-        <RepositoryUrl>https://github.com/LMDevelopment/OpenQuestPDF.git</RepositoryUrl>
+        <RepositoryUrl>https://github.com/LM-Development/OpenQuestPDF.git</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <Copyright>LM IT Services AG, OpenQuestPDF contributors</Copyright>
         <PackageTags>pdf report file export generate generation tool create creation render portable document format quest html library converter open source free standard core</PackageTags>
@@ -23,10 +23,10 @@
 
     <ItemGroup>
         <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-        <InternalsVisibleTo Include="QuestPDF.ReportSample" />
-        <InternalsVisibleTo Include="QuestPDF.UnitTests" />
-        <InternalsVisibleTo Include="QuestPDF.Examples" />
-        <InternalsVisibleTo Include="QuestPDF.Previewer" />
+        <InternalsVisibleTo Include="OpenQuestPDF.ReportSample" />
+        <InternalsVisibleTo Include="OpenQuestPDF.UnitTests" />
+        <InternalsVisibleTo Include="OpenQuestPDF.Examples" />
+        <InternalsVisibleTo Include="OpenQuestPDF.Previewer" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Source/OpenQuestPDF/Previewer/ExceptionDocument.cs b/Source/OpenQuestPDF/Previewer/ExceptionDocument.cs
index e4b327536..6ddc4d5a7 100644
--- a/Source/OpenQuestPDF/Previewer/ExceptionDocument.cs
+++ b/Source/OpenQuestPDF/Previewer/ExceptionDocument.cs
@@ -87,7 +87,7 @@ public void Compose(IDocumentContainer document)
                                 text.Span(currentException.Message);
                             });
                         
-                        foreach (var trace in currentException.StackTrace.Split('\n'))
+                        foreach (var trace in currentException?.StackTrace?.Split('\n') ?? [])
                         {
                             column
                                 .Item()
@@ -99,7 +99,7 @@ public void Compose(IDocumentContainer document)
                                 .FontSize(12);
                         }
                         
-                        currentException = currentException.InnerException;
+                        currentException = currentException?.InnerException;
                     }
                 });
             });
diff --git a/Source/OpenQuestPDF/Previewer/PreviewerService.cs b/Source/OpenQuestPDF/Previewer/PreviewerService.cs
index f26ec43e7..ab06b98a9 100644
--- a/Source/OpenQuestPDF/Previewer/PreviewerService.cs
+++ b/Source/OpenQuestPDF/Previewer/PreviewerService.cs
@@ -58,10 +58,13 @@ private async Task<bool> IsPreviewerAvailable()
             }
         }
         
-        private async Task<Version> GetPreviewerVersion()
+async Task<Version> GetPreviewerVersion()
         {
             using var result = await HttpClient.GetAsync("/version");
-            return await result.Content.ReadFromJsonAsync<Version>();
+            var version = await result.Content.ReadFromJsonAsync<Version>();
+            if (version == null)
+                throw new ArgumentNullException("Die Version des Previewers konnte nicht abgerufen werden.");
+            return version;
         }
         
         private void StartPreviewer()
@@ -72,7 +75,7 @@ private void StartPreviewer()
                 {
                     StartInfo = new()
                     {
-                        FileName = "questpdf-previewer",
+                        FileName = "openquestpdf-previewer",
                         Arguments = $"{Port}",
                         UseShellExecute = false,
                         CreateNoWindow = true