diff --git a/AsBuiltReport.Diagram/Src/Private/Add-HtmlLabel.ps1 b/AsBuiltReport.Diagram/Src/Private/Add-HtmlLabel.ps1
index 7d0308d..7ae23ec 100644
--- a/AsBuiltReport.Diagram/Src/Private/Add-HtmlLabel.ps1
+++ b/AsBuiltReport.Diagram/Src/Private/Add-HtmlLabel.ps1
@@ -282,8 +282,8 @@ function Add-HtmlLabel {
     )
 
     $ICON = if ($IconType -eq 'NoIcon') { 'NoIcon' }
-            elseif ($ImagesObj[$IconType]) { $ImagesObj[$IconType] }
-            else { 'no_icon.png' }
+    elseif ($ImagesObj[$IconType]) { $ImagesObj[$IconType] }
+    else { 'no_icon.png' }
 
     $CalculatedImageSize = $null
     if ($ImageSizePercent -lt 100 -and $ICON -ne 'NoIcon') {
@@ -294,16 +294,16 @@ function Add-HtmlLabel {
     }
 
     $fontParams = @{
-        FontSize          = $FontSize
-        FontColor         = $FontColor
-        FontBold          = $FontBold
-        FontItalic        = $FontItalic
-        FontUnderline     = $FontUnderline
-        FontName          = $FontName
-        FontSubscript     = $FontSubscript
-        FontSuperscript   = $FontSuperscript
+        FontSize = $FontSize
+        FontColor = $FontColor
+        FontBold = $FontBold
+        FontItalic = $FontItalic
+        FontUnderline = $FontUnderline
+        FontName = $FontName
+        FontSubscript = $FontSubscript
+        FontSuperscript = $FontSuperscript
         FontStrikeThrough = $FontStrikeThrough
-        FontOverline      = $FontOverline
+        FontOverline = $FontOverline
     }
     $FormattedLabel = Format-HtmlFontProperty -Text $Label @fontParams
 
@@ -312,10 +312,10 @@ function Add-HtmlLabel {
 
     # Base table params shared by all branches; TableBackgroundColor is added for non-debug branches only.
     $baseTableParams = @{
-        Port        = $Port
-        TableStyle  = $TableStyle
+        Port = $Port
+        TableStyle = $TableStyle
         TableBorder = $TableBorder
-        CellBorder  = $CellBorder
+        CellBorder = $CellBorder
         CellSpacing = $effectiveCellSpacing
         CellPadding = $effectiveCellPadding
     }
diff --git a/AsBuiltReport.Diagram/Src/Private/Add-HtmlSignatureTable.ps1 b/AsBuiltReport.Diagram/Src/Private/Add-HtmlSignatureTable.ps1
index d4191a3..e02578c 100644
--- a/AsBuiltReport.Diagram/Src/Private/Add-HtmlSignatureTable.ps1
+++ b/AsBuiltReport.Diagram/Src/Private/Add-HtmlSignatureTable.ps1
@@ -257,33 +257,33 @@ function Add-HtmlSignatureTable {
     $effectiveFontBold = if ($NoFontBold) { $false } else { $FontBold }
 
     $fontParams = @{
-        FontSize          = $FontSize
-        FontColor         = $FontColor
-        FontBold          = $effectiveFontBold
-        FontItalic        = $FontItalic
-        FontUnderline     = $FontUnderline
-        FontName          = $FontName
-        FontSubscript     = $FontSubscript
-        FontSuperscript   = $FontSuperscript
+        FontSize = $FontSize
+        FontColor = $FontColor
+        FontBold = $effectiveFontBold
+        FontItalic = $FontItalic
+        FontUnderline = $FontUnderline
+        FontName = $FontName
+        FontSubscript = $FontSubscript
+        FontSuperscript = $FontSuperscript
         FontStrikeThrough = $FontStrikeThrough
-        FontOverline      = $FontOverline
+        FontOverline = $FontOverline
     }
 
     $tableParams = @{
-        Port                 = $Port
-        TableStyle           = $TableStyle
+        Port = $Port
+        TableStyle = $TableStyle
         TableBackgroundColor = $TableBackgroundColor
-        TableBorderColor     = $TableBorderColor
-        TableBorder          = $TableBorder
-        CellBorder           = $CellBorder
-        CellSpacing          = $CellSpacing
-        CellPadding          = $CellPadding
+        TableBorderColor = $TableBorderColor
+        TableBorder = $TableBorder
+        CellBorder = $CellBorder
+        CellSpacing = $CellSpacing
+        CellPadding = $CellPadding
     }
 
     $TR = ($Rows | ForEach-Object {
-        $FormattedRow = Format-HtmlFontProperty -Text $_ @fontParams
-        '<TR><TD BGCOLOR="{0}" valign="top" align="{1}" colspan="2">{2}</TD></TR>' -f $CellBackgroundColor, $Align, $FormattedRow
-    }) -join ''
+            $FormattedRow = Format-HtmlFontProperty -Text $_ @fontParams
+            '<TR><TD BGCOLOR="{0}" valign="top" align="{1}" colspan="2">{2}</TD></TR>' -f $CellBackgroundColor, $Align, $FormattedRow
+        }) -join ''
 
     if ($ICON) {
         if ($IconDebug) {
diff --git a/AsBuiltReport.Diagram/Src/Private/Add-HtmlSubGraph.ps1 b/AsBuiltReport.Diagram/Src/Private/Add-HtmlSubGraph.ps1
index ed79799..9d26a8f 100644
--- a/AsBuiltReport.Diagram/Src/Private/Add-HtmlSubGraph.ps1
+++ b/AsBuiltReport.Diagram/Src/Private/Add-HtmlSubGraph.ps1
@@ -340,16 +340,16 @@ function Add-HtmlSubGraph {
     }
 
     $fontParams = @{
-        FontSize          = $FontSize
-        FontColor         = $FontColor
-        FontBold          = $FontBold
-        FontItalic        = $FontItalic
-        FontUnderline     = $FontUnderline
-        FontName          = $FontName
-        FontSubscript     = $FontSubscript
-        FontSuperscript   = $FontSuperscript
+        FontSize = $FontSize
+        FontColor = $FontColor
+        FontBold = $FontBold
+        FontItalic = $FontItalic
+        FontUnderline = $FontUnderline
+        FontName = $FontName
+        FontSubscript = $FontSubscript
+        FontSuperscript = $FontSuperscript
         FontStrikeThrough = $FontStrikeThrough
-        FontOverline      = $FontOverline
+        FontOverline = $FontOverline
     }
     $FormattedLabel = Format-HtmlFontProperty @fontParams -Text $Label
 
@@ -384,11 +384,11 @@ function Add-HtmlSubGraph {
     }
 
     $tableParams = @{
-        TableStyle           = $TableStyle
+        TableStyle = $TableStyle
         TableBackgroundColor = $TableBackgroundColor
-        CellSpacing          = $CellSpacing
-        CellPadding          = $CellPadding
-        TableRowContent      = $TR
+        CellSpacing = $CellSpacing
+        CellPadding = $CellPadding
+        TableRowContent = $TR
     }
     if ($IconDebug) {
         $tableParams.TableBorderColor = 'red'
diff --git a/AsBuiltReport.Diagram/Src/Private/Add-HtmlTable.ps1 b/AsBuiltReport.Diagram/Src/Private/Add-HtmlTable.ps1
index 0009394..4812729 100644
--- a/AsBuiltReport.Diagram/Src/Private/Add-HtmlTable.ps1
+++ b/AsBuiltReport.Diagram/Src/Private/Add-HtmlTable.ps1
@@ -415,16 +415,16 @@ function Add-HtmlTable {
     $TD = ''
     $TR = ''
     $fontParams = @{
-        FontSize          = $FontSize
-        FontColor         = $FontColor
-        FontBold          = $FontBold
-        FontItalic        = $FontItalic
-        FontUnderline     = $FontUnderline
-        FontName          = $FontName
-        FontSubscript     = $FontSubscript
-        FontSuperscript   = $FontSuperscript
+        FontSize = $FontSize
+        FontColor = $FontColor
+        FontBold = $FontBold
+        FontItalic = $FontItalic
+        FontUnderline = $FontUnderline
+        FontName = $FontName
+        FontSubscript = $FontSubscript
+        FontSuperscript = $FontSuperscript
         FontStrikeThrough = $FontStrikeThrough
-        FontOverline      = $FontOverline
+        FontOverline = $FontOverline
     }
     # Create the table and splitting elements based on the ColumnSize value
     while ($Number -ne $Group.Count) {
@@ -440,16 +440,16 @@ function Add-HtmlTable {
     # This part set the capability to emulate Graphviz Subgraph
     if ($Subgraph) {
         $subgraphFontParams = @{
-            FontSize          = $SubgraphLabelFontsize
-            FontColor         = $SubgraphFontColor
-            FontBold          = $SubgraphFontBold
-            FontItalic        = $SubgraphFontItalic
-            FontUnderline     = $SubgraphFontUnderline
-            FontName          = $SubgraphFontName
-            FontSubscript     = $SubgraphFontSubscript
-            FontSuperscript   = $SubgraphFontSuperscript
+            FontSize = $SubgraphLabelFontsize
+            FontColor = $SubgraphFontColor
+            FontBold = $SubgraphFontBold
+            FontItalic = $SubgraphFontItalic
+            FontUnderline = $SubgraphFontUnderline
+            FontName = $SubgraphFontName
+            FontSubscript = $SubgraphFontSubscript
+            FontSuperscript = $SubgraphFontSuperscript
             FontStrikeThrough = $SubgraphFontStrikeThrough
-            FontOverline      = $SubgraphFontOverline
+            FontOverline = $SubgraphFontOverline
         }
         $FormattedName = if ($SubGraphLabel) {
             Format-HtmlFontProperty @subgraphFontParams -Text $SubGraphLabel
@@ -492,12 +492,12 @@ function Add-HtmlTable {
     }
 
     $tableParams = @{
-        TableStyle           = $SubgraphTableStyle
+        TableStyle = $SubgraphTableStyle
         TableBackgroundColor = $TableBackgroundColor
-        CellBorder           = $CellBorder
-        CellSpacing          = $CellSpacing
-        CellPadding          = $CellPadding
-        TableRowContent      = $TR
+        CellBorder = $CellBorder
+        CellSpacing = $CellSpacing
+        CellPadding = $CellPadding
+        TableRowContent = $TR
     }
     if ($IconDebug) {
         $tableParams.TableBorderColor = 'red'
diff --git a/AsBuiltReport.Diagram/Src/Private/Add-NodeIcon.ps1 b/AsBuiltReport.Diagram/Src/Private/Add-NodeIcon.ps1
index d1f1e99..f5c3d71 100644
--- a/AsBuiltReport.Diagram/Src/Private/Add-NodeIcon.ps1
+++ b/AsBuiltReport.Diagram/Src/Private/Add-NodeIcon.ps1
@@ -384,28 +384,28 @@ function Add-NodeIcon {
     }
 
     $fontParams = @{
-        Text             = $LabelName
-        FontSize         = $FontSize
-        FontColor        = $FontColor
-        FontBold         = $FontBold
-        FontItalic       = $FontItalic
-        FontUnderline    = $FontUnderline
-        FontName         = $FontName
-        FontSubscript    = $FontSubscript
-        FontSuperscript  = $FontSuperscript
+        Text = $LabelName
+        FontSize = $FontSize
+        FontColor = $FontColor
+        FontBold = $FontBold
+        FontItalic = $FontItalic
+        FontUnderline = $FontUnderline
+        FontName = $FontName
+        FontSubscript = $FontSubscript
+        FontSuperscript = $FontSuperscript
         FontStrikeThrough = $FontStrikeThrough
-        FontOverline     = $FontOverline
+        FontOverline = $FontOverline
     }
     $FormattedName = Format-HtmlFontProperty @fontParams
 
     $tableParams = @{
-        Port                 = $Port
-        TableStyle           = $TableStyle
-        TableBorderColor     = $TableBorderColor
-        TableBorder          = $TableBorder
-        CellBorder           = $CellBorder
-        CellSpacing          = $CellSpacing
-        CellPadding          = $CellPadding
+        Port = $Port
+        TableStyle = $TableStyle
+        TableBorderColor = $TableBorderColor
+        TableBorder = $TableBorder
+        CellBorder = $CellBorder
+        CellSpacing = $CellSpacing
+        CellPadding = $CellPadding
         TableBackgroundColor = $TableBackgroundColor
     }
     if ($IconDebug) {
diff --git a/AsBuiltReport.Diagram/Src/Private/Add-NodeImage.ps1 b/AsBuiltReport.Diagram/Src/Private/Add-NodeImage.ps1
index 170fd22..58a770d 100644
--- a/AsBuiltReport.Diagram/Src/Private/Add-NodeImage.ps1
+++ b/AsBuiltReport.Diagram/Src/Private/Add-NodeImage.ps1
@@ -186,11 +186,11 @@ function Add-NodeImage {
         $HTML = Format-HtmlTable -TableBackgroundColor '#FFCCCC' -TableBorderColor 'red' -CellBorder 0 -CellSpacing 0 -CellPadding 0 -TableRowContent $TRContent
     } else {
         $tableParams = @{
-            TableStyle           = $TableBorderStyle
-            TableBorder          = $TableBorder
+            TableStyle = $TableBorderStyle
+            TableBorder = $TableBorder
             TableBackgroundColor = $TableBackgroundColor
-            TableBorderColor     = $TableBorderColor
-            CellBorder           = 0
+            TableBorderColor = $TableBorderColor
+            CellBorder = 0
         }
         if ($ImageSize) {
             $TRContent = '<TR><TD STYLE="{0}" ALIGN="Center" fixedsize="true" width="{1}" height="{2}" colspan="1"><img src="{3}"/></TD></TR>' -f $TableBorderStyle, $ImageSize.Width, $ImageSize.Height, $IconSrc
diff --git a/AsBuiltReport.Diagram/Src/Private/Add-NodeText.ps1 b/AsBuiltReport.Diagram/Src/Private/Add-NodeText.ps1
index eee77d0..a8df565 100644
--- a/AsBuiltReport.Diagram/Src/Private/Add-NodeText.ps1
+++ b/AsBuiltReport.Diagram/Src/Private/Add-NodeText.ps1
@@ -187,13 +187,13 @@ function Add-NodeText {
     }
 
     $fontParams = @{
-        Text         = $Text
-        FontSize     = $FontSize
-        FontColor    = $FontColor
-        FontBold     = $FontBold
-        FontItalic   = $FontItalic
+        Text = $Text
+        FontSize = $FontSize
+        FontColor = $FontColor
+        FontBold = $FontBold
+        FontItalic = $FontItalic
         FontUnderline = $FontUnderline
-        FontName     = $FontName
+        FontName = $FontName
     }
     $FormattedText = Format-HtmlFontProperty @fontParams