diff --git a/PwshSpectreConsole.Tests/formatting/Format-SpectreTable.tests.ps1 b/PwshSpectreConsole.Tests/formatting/Format-SpectreTable.tests.ps1
index 4cebc667..3cb9357b 100644
--- a/PwshSpectreConsole.Tests/formatting/Format-SpectreTable.tests.ps1
+++ b/PwshSpectreConsole.Tests/formatting/Format-SpectreTable.tests.ps1
@@ -1,201 +1,201 @@
-Remove-Module PwshSpectreConsole -Force -ErrorAction SilentlyContinue
-Import-Module "$PSScriptRoot\..\..\PwshSpectreConsole\PwshSpectreConsole.psd1" -Force
-Import-Module "$PSScriptRoot\..\TestHelpers.psm1" -Force
-
-Describe "Format-SpectreTable" {
-    InModuleScope "PwshSpectreConsole" {
-        BeforeEach {
-            $testConsole = [Spectre.Console.Testing.TestConsole]::new()
-            $testConsole.EmitAnsiSequences = $true
-            [Spectre.Console.Testing.TestConsoleExtensions]::Width($testConsole, 140)
-            $testData = $null
-            $testBorder = Get-RandomBoxBorder
-            $testColor = Get-RandomColor
-
-            Mock Write-AnsiConsole {
-                $RenderableObject | Should -BeOfType [Spectre.Console.Table]
-                $RenderableObject.Rows.Count | Should -Be $testData.Count
-                if ($testBorder -ne "None") {
-                    $RenderableObject.Border.GetType().Name | Should -BeLike "*$testBorder*"
-                }
-                if ($testColor) {
-                    $RenderableObject.BorderStyle.Foreground.ToMarkup() | Should -Be $testColor
-                }
-
-                $testConsole.Write($RenderableObject)
-            }
-        }
-
-        It "Should create a table when default display members for a command are required" {
-            $testData = Get-ChildItem "$PSScriptRoot"
-            Format-SpectreTable -Data $testData -Border $testBorder -Color $testColor
-            Assert-MockCalled -CommandName "Write-AnsiConsole" -Times 1 -Exactly
-        }
-
-        It "Should create a table when default display members for a command are required and input is piped" {
-            $testData = Get-ChildItem "$PSScriptRoot"
-            $testData | Format-SpectreTable -Border $testBorder -Color $testColor
-            Assert-MockCalled -CommandName "Write-AnsiConsole" -Times 1 -Exactly
-        }
-
-        It "Should be able to retrieve default display members for command output with format data" {
-            $testData = Get-ChildItem "$PSScriptRoot"
-            $defaultDisplayMembers = $testData | Format-Table | Get-TableHeader
-            if ($IsLinux -or $IsMacOS) {
-                #  Expected @('UnixMode', 'User', 'Group', 'LastWrite…', 'Size', 'Name'), but got @('UnixMode', 'User', 'Group', 'LastWriteTime', 'Size', 'Name').
-                # i have no idea whats truncating LastWriteTime
-                # $defaultDisplayMembers.Properties.GetEnumerator().Name | Should -Be @("UnixMode", "User", "Group", "LastWriteTime", "Size", "Name")
-                $defaultDisplayMembers.keys | Should -Match 'UnixMode|User|Group|LastWrite|Size|Name'
-            } else {
-                $defaultDisplayMembers.keys | Should -Be @("Mode", "LastWriteTime", "Length", "Name")
-            }
-        }
-
-        It "Should not throw and should return null when input does not have format data" {
-            {
-                $defaultDisplayMembers = [hashtable]@{
-                    "Hello" = "World"
-                } | Get-TableHeader
-                $defaultDisplayMembers | Should -Be $null
-            } | Should -Not -Throw
-        }
-
-        It "Should be able to format ansi strings" {
-            $rawString = "hello world"
-            $ansiString = "`e[31mhello `e[46mworld`e[0m"
-            $result = ConvertTo-SpectreDecoration -String $ansiString
-            $result.Length | Should -Be $rawString.Length
-        }
-
-        It "Should be able to format PSStyle strings" {
-            $rawString = ""
-            $ansiString = ""
-            $PSStyle | Get-Member -MemberType Property | Where-Object { $_.Definition -match '^string' -And $_.Name -notmatch 'off$|Reset' } | ForEach-Object {
-                $name = $_.Name
-                $rawString += "$name "
-                $ansiString += "$($PSStyle.$name)$name "
-            }
-            $ansiString += "$($PSStyle.Reset)"
-            $result = ConvertTo-SpectreDecoration -String $ansiString
-            $result.Length | Should -Be $rawString.Length
-        }
-
-        It "Should be able to format strings with spectre markup when opted in" {
-            $rawString = "hello spectremarkup world"
-            $ansiString = "hello [red]spectremarkup[/] world"
-            $result = ConvertTo-SpectreDecoration -String $ansiString -AllowMarkup
-            $result.Length | Should -Be $rawString.Length
-        }
-
-        It "Should leave spectre markup alone by default" {
-            $ansiString = "hello [red]spectremarkup[/] world"
-            $result = ConvertTo-SpectreDecoration -String $ansiString
-            $result.Length | Should -Be $ansiString.Length
-        }
-
-        It "Should be able to create a new table cell with spectre markup" {
-            $rawString = "hello spectremarkup world"
-            $ansiString = "hello [red]spectremarkup[/] world"
-            $result = New-TableCell -String $ansiString -AllowMarkup
-            $result | Should -BeOfType [Spectre.Console.Markup]
-            $result.Length | Should -Be $rawString.Length
-        }
-
-        It "Should be able to create a new table cell without spectre markup by default" {
-            $ansiString = "hello [red]spectremarkup[/] world"
-            $result = New-TableCell -String $ansiString
-            $result | Should -BeOfType [Spectre.Console.Text]
-            $result.Length | Should -Be $ansiString.Length
-        }
-
-        It "Should be able to create a new table row with spectre markup" {
-            $entryitem = Get-SpectreTableRowData -Markup
-            $result = New-TableRow -Entry $entryItem -AllowMarkup
-            $result -is [array] | Should -Be $true
-            $result[0] | Should -BeOfType [Spectre.Console.Markup]
-            $result.Count | Should -Be $entryitem.Count
-        }
-
-        It "Should be able to create a new table row without spectre markup by default" {
-            $entryitem = Get-SpectreTableRowData -Markup
-            $result = New-TableRow -Entry $entryItem
-            $result -is [array] | Should -Be $true
-            $result[0] | Should -BeOfType [Spectre.Console.Text]
-            $result[0].Length | Should -Be $entryItem[0].Length
-            $result.Count | Should -Be $entryitem.Count
-        }
-
-        It "Should create a table and display results properly" {
-            $testBorder = 'Markdown'
-            $testData = Get-ChildItem "$PSScriptRoot"
-            $verification = $testdata | Format-Table | Get-TableHeader
-            Format-SpectreTable -Data $testData -Border $testBorder -Color $testColor
-            $testResult = $testConsole.Output
-            $rows = $testResult -split "\r?\n" | Select-Object -Skip 1 -SkipLast 2
-            $header = $rows[0]
-            $properties = $header -split '\|' | StripAnsi | ForEach-Object {
-                if (-Not [String]::IsNullOrWhiteSpace($_)) {
-                    $_.Trim()
-                }
-            }
-            if ($IsLinux -or $IsMacOS) {
-                $verification.keys | Should -Match 'UnixMode|User|Group|LastWrite|Size|Name'
-            } else {
-                $verification.keys | Should -Be $properties
-            }
-            Assert-MockCalled -CommandName "Write-AnsiConsole" -Times 1 -Exactly
-        }
-
-        It "Should create a table and display ICollection results properly" {
-            $testData = 1 | Group-Object
-            $testBorder = 'Markdown'
-            $testColor = $null
-            Write-Debug "Setting testcolor to $testColor"
-            Format-SpectreTable -Data $testData -Border $testBorder -HideHeaders -Property Group
-            $testResult = $testConsole.Output | StripAnsi
-            $clean = $testResult -replace '\s+|\|'
-            $clean | Should -Be '{1}'
-            Assert-MockCalled -CommandName "Write-AnsiConsole" -Times 1 -Exactly
-        }
-        
-        It "Should be able to use calculated properties" {
-            $testData = Get-Process -Id $pid
-            $testBorder = 'Markdown'
-            $testColor = $null
-            Write-Debug "Setting testcolor to $testColor"
-            $testData | Format-SpectreTable ProcessName, @{Label = "TotalRunningTime"; Expression = { (Get-Date) - $_.StartTime } } -Border $testBorder
-            $testResult = $testConsole.Output
-            $obj = $testResult -split "\r?\n" | Select-Object -Skip 1 -SkipLast 2
-            $deconstructed = $obj -split '\|' | StripAnsi | ForEach-Object {
-                if (-Not [String]::IsNullOrEmpty($_)) {
-                    $_.Trim()
-                }
-            }
-            $deconstructed[0] | Should -Be 'ProcessName'
-            $deconstructed[1] | Should -Be 'TotalRunningTime'
-            $deconstructed[4] | Should -Be 'pwsh'
-            Assert-MockCalled -CommandName "Write-AnsiConsole" -Times 1 -Exactly
-        }
-
-        It "Should match the snapshot" {
-            Mock Write-AnsiConsole {
-                $testConsole.Write($RenderableObject)
-            }
-            [pscustomobject]@{
-                "Name"  = "Test 1"
-                "Value" = 10
-                "Color" = "Turquoise2"
-            }, [pscustomobject]@{
-                "Name"  = "Test 2"
-                "Value" = 20
-                "Color" = "#ff0000"
-            }, [pscustomobject]@{
-                "Name"  = "Test 3"
-                "Value" = 30
-                "Color" = "Turquoise2"
-            } | Format-SpectreTable -Border "Rounded" -Color "Turquoise2"
-
-            { Assert-OutputMatchesSnapshot -SnapshotName "Format-SpectreTable" -Output $testConsole.Output } | Should -Not -Throw
-        }
-    }
-}
+Remove-Module PwshSpectreConsole -Force -ErrorAction SilentlyContinue
+Import-Module "$PSScriptRoot\..\..\PwshSpectreConsole\PwshSpectreConsole.psd1" -Force
+Import-Module "$PSScriptRoot\..\TestHelpers.psm1" -Force
+
+Describe "Format-SpectreTable" {
+    InModuleScope "PwshSpectreConsole" {
+        BeforeEach {
+            $testConsole = [Spectre.Console.Testing.TestConsole]::new()
+            $testConsole.EmitAnsiSequences = $true
+            [Spectre.Console.Testing.TestConsoleExtensions]::Width($testConsole, 140)
+            $testData = $null
+            $testBorder = Get-RandomBoxBorder
+            $testColor = Get-RandomColor
+
+            Mock Write-AnsiConsole {
+                $RenderableObject | Should -BeOfType [Spectre.Console.Table]
+                $RenderableObject.Rows.Count | Should -Be $testData.Count
+                if ($testBorder -ne "None") {
+                    $RenderableObject.Border.GetType().Name | Should -BeLike "*$testBorder*"
+                }
+                if ($testColor) {
+                    $RenderableObject.BorderStyle.Foreground.ToMarkup() | Should -Be $testColor
+                }
+
+                $testConsole.Write($RenderableObject)
+            }
+        }
+
+        It "Should create a table when default display members for a command are required" {
+            $testData = Get-ChildItem "$PSScriptRoot"
+            Format-SpectreTable -Data $testData -Border $testBorder -Color $testColor
+            Assert-MockCalled -CommandName "Write-AnsiConsole" -Times 1 -Exactly
+        }
+
+        It "Should create a table when default display members for a command are required and input is piped" {
+            $testData = Get-ChildItem "$PSScriptRoot"
+            $testData | Format-SpectreTable -Border $testBorder -Color $testColor
+            Assert-MockCalled -CommandName "Write-AnsiConsole" -Times 1 -Exactly
+        }
+
+        It "Should be able to retrieve default display members for command output with format data" {
+            $testData = Get-ChildItem "$PSScriptRoot"
+            $defaultDisplayMembers = $testData | Format-Table | Get-TableHeader
+            if ($IsLinux -or $IsMacOS) {
+                #  Expected @('UnixMode', 'User', 'Group', 'LastWrite…', 'Size', 'Name'), but got @('UnixMode', 'User', 'Group', 'LastWriteTime', 'Size', 'Name').
+                # i have no idea whats truncating LastWriteTime
+                # $defaultDisplayMembers.Properties.GetEnumerator().Name | Should -Be @("UnixMode", "User", "Group", "LastWriteTime", "Size", "Name")
+                $defaultDisplayMembers.keys | Should -Match 'UnixMode|User|Group|LastWrite|Size|Name'
+            } else {
+                $defaultDisplayMembers.keys | Should -Be @("Mode", "LastWriteTime", "Length", "Name")
+            }
+        }
+
+        It "Should not throw and should return null when input does not have format data" {
+            {
+                $defaultDisplayMembers = [hashtable]@{
+                    "Hello" = "World"
+                } | Get-TableHeader
+                $defaultDisplayMembers | Should -Be $null
+            } | Should -Not -Throw
+        }
+
+        It "Should be able to format ansi strings" {
+            $rawString = "hello world"
+            $ansiString = "`e[31mhello `e[46mworld`e[0m"
+            $result = ConvertTo-SpectreDecoration -String $ansiString
+            $result.Length | Should -Be $rawString.Length
+        }
+
+        It "Should be able to format PSStyle strings" {
+            $rawString = ""
+            $ansiString = ""
+            $PSStyle | Get-Member -MemberType Property | Where-Object { $_.Definition -match '^string' -And $_.Name -notmatch 'off$|Reset' } | ForEach-Object {
+                $name = $_.Name
+                $rawString += "$name "
+                $ansiString += "$($PSStyle.$name)$name "
+            }
+            $ansiString += "$($PSStyle.Reset)"
+            $result = ConvertTo-SpectreDecoration -String $ansiString
+            $result.Length | Should -Be $rawString.Length
+        }
+
+        It "Should be able to format strings with spectre markup when opted in" {
+            $rawString = "hello spectremarkup world"
+            $ansiString = "hello [red]spectremarkup[/] world"
+            $result = ConvertTo-SpectreDecoration -String $ansiString -AllowMarkup
+            $result.Length | Should -Be $rawString.Length
+        }
+
+        It "Should leave spectre markup alone by default" {
+            $ansiString = "hello [red]spectremarkup[/] world"
+            $result = ConvertTo-SpectreDecoration -String $ansiString
+            $result.Length | Should -Be $ansiString.Length
+        }
+
+        It "Should be able to create a new table cell with spectre markup" {
+            $rawString = "hello spectremarkup world"
+            $ansiString = "hello [red]spectremarkup[/] world"
+            $result = New-TableCell -CellData $ansiString -AllowMarkup
+            $result | Should -BeOfType [Spectre.Console.Markup]
+            $result.Length | Should -Be $rawString.Length
+        }
+
+        It "Should be able to create a new table cell without spectre markup by default" {
+            $ansiString = "hello [red]spectremarkup[/] world"
+            $result = New-TableCell -CellData $ansiString
+            $result | Should -BeOfType [Spectre.Console.Text]
+            $result.Length | Should -Be $ansiString.Length
+        }
+
+        It "Should be able to create a new table row with spectre markup" {
+            $entryitem = Get-SpectreTableRowData -Markup
+            $result = New-TableRow -Entry $entryItem -AllowMarkup
+            $result -is [array] | Should -Be $true
+            $result[0] | Should -BeOfType [Spectre.Console.Markup]
+            $result.Count | Should -Be $entryitem.Count
+        }
+
+        It "Should be able to create a new table row without spectre markup by default" {
+            $entryitem = Get-SpectreTableRowData -Markup
+            $result = New-TableRow -Entry $entryItem
+            $result -is [array] | Should -Be $true
+            $result[0] | Should -BeOfType [Spectre.Console.Text]
+            $result[0].Length | Should -Be $entryItem[0].Length
+            $result.Count | Should -Be $entryitem.Count
+        }
+
+        It "Should create a table and display results properly" {
+            $testBorder = 'Markdown'
+            $testData = Get-ChildItem "$PSScriptRoot"
+            $verification = $testdata | Format-Table | Get-TableHeader
+            Format-SpectreTable -Data $testData -Border $testBorder -Color $testColor
+            $testResult = $testConsole.Output
+            $rows = $testResult -split "\r?\n" | Select-Object -Skip 1 -SkipLast 2
+            $header = $rows[0]
+            $properties = $header -split '\|' | StripAnsi | ForEach-Object {
+                if (-Not [String]::IsNullOrWhiteSpace($_)) {
+                    $_.Trim()
+                }
+            }
+            if ($IsLinux -or $IsMacOS) {
+                $verification.keys | Should -Match 'UnixMode|User|Group|LastWrite|Size|Name'
+            } else {
+                $verification.keys | Should -Be $properties
+            }
+            Assert-MockCalled -CommandName "Write-AnsiConsole" -Times 1 -Exactly
+        }
+
+        It "Should create a table and display ICollection results properly" {
+            $testData = 1 | Group-Object
+            $testBorder = 'Markdown'
+            $testColor = $null
+            Write-Debug "Setting testcolor to $testColor"
+            Format-SpectreTable -Data $testData -Border $testBorder -HideHeaders -Property Group
+            $testResult = $testConsole.Output | StripAnsi
+            $clean = $testResult -replace '\s+|\|'
+            $clean | Should -Be '{1}'
+            Assert-MockCalled -CommandName "Write-AnsiConsole" -Times 1 -Exactly
+        }
+        
+        It "Should be able to use calculated properties" {
+            $testData = Get-Process -Id $pid
+            $testBorder = 'Markdown'
+            $testColor = $null
+            Write-Debug "Setting testcolor to $testColor"
+            $testData | Format-SpectreTable ProcessName, @{Label = "TotalRunningTime"; Expression = { (Get-Date) - $_.StartTime } } -Border $testBorder
+            $testResult = $testConsole.Output
+            $obj = $testResult -split "\r?\n" | Select-Object -Skip 1 -SkipLast 2
+            $deconstructed = $obj -split '\|' | StripAnsi | ForEach-Object {
+                if (-Not [String]::IsNullOrEmpty($_)) {
+                    $_.Trim()
+                }
+            }
+            $deconstructed[0] | Should -Be 'ProcessName'
+            $deconstructed[1] | Should -Be 'TotalRunningTime'
+            $deconstructed[4] | Should -Be 'pwsh'
+            Assert-MockCalled -CommandName "Write-AnsiConsole" -Times 1 -Exactly
+        }
+
+        It "Should match the snapshot" {
+            Mock Write-AnsiConsole {
+                $testConsole.Write($RenderableObject)
+            }
+            [pscustomobject]@{
+                "Name"  = "Test 1"
+                "Value" = 10
+                "Color" = "Turquoise2"
+            }, [pscustomobject]@{
+                "Name"  = "Test 2"
+                "Value" = 20
+                "Color" = "#ff0000"
+            }, [pscustomobject]@{
+                "Name"  = "Test 3"
+                "Value" = 30
+                "Color" = "Turquoise2"
+            } | Format-SpectreTable -Border "Rounded" -Color "Turquoise2"
+
+            { Assert-OutputMatchesSnapshot -SnapshotName "Format-SpectreTable" -Output $testConsole.Output } | Should -Not -Throw
+        }
+    }
+}
diff --git a/PwshSpectreConsole/private/New-TableCell.ps1 b/PwshSpectreConsole/private/New-TableCell.ps1
index 43c11c2b..a81c733d 100644
--- a/PwshSpectreConsole/private/New-TableCell.ps1
+++ b/PwshSpectreConsole/private/New-TableCell.ps1
@@ -3,30 +3,36 @@ using namespace Spectre.Console
 function New-TableCell {
     [cmdletbinding()]
     param(
-        [Object] $String,
+        [Object] $CellData,
         [Color] $Color = [Color]::Default,
         [Switch] $AllowMarkup
     )
     Write-Debug "Module: $($ExecutionContext.SessionState.Module.Name) Command: $($MyInvocation.MyCommand.Name) Param: $($PSBoundParameters.GetEnumerator())"
-    if ([String]::IsNullOrEmpty($String)) {
+
+    # Spectre console already knows how to format its own renderables, this allows embedding spectre widgets inside table cells
+    if ($CellData -is [Spectre.Console.Rendering.Renderable]) {
+        return $CellData
+    }
+
+    if ([String]::IsNullOrEmpty($CellData)) {
         if ($AllowMarkup) {
             return [Markup]::new(' ', [Style]::new($Color))
         }
         return [Text]::new(' ', [Style]::new($Color))
     }
-    if (-Not [String]::IsNullOrEmpty($String.ToString())) {
+    if (-Not [String]::IsNullOrEmpty($CellData.ToString())) {
         if ($AllowMarkup) {
-            Write-Debug "New-TableCell ToString(), Markup, $($String.ToString())"
-            return [Markup]::new($String.ToString(), [Style]::new($Color))
+            Write-Debug "New-TableCell ToString(), Markup, $($CellData.ToString())"
+            return [Markup]::new($CellData.ToString(), [Style]::new($Color))
         }
-        Write-Debug "New-TableCell ToString(), Text, $($String.ToString())"
-        return [Text]::new($String.ToString(), [Style]::new($Color))
+        Write-Debug "New-TableCell ToString(), Text, $($CellData.ToString())"
+        return [Text]::new($CellData.ToString(), [Style]::new($Color))
     }
     # just coerce to string.
     if ($AllowMarkup) {
-        Write-Debug "New-TableCell [String], markup, $([String]$String)"
-        return [Markup]::new([String]$String, [Style]::new($Color))
+        Write-Debug "New-TableCell [String], markup, $([String]$CellData)"
+        return [Markup]::new([String]$CellData, [Style]::new($Color))
     }
-    Write-Debug "New-TableCell [String], Text, $([String]$String)"
-    return [Text]::new([String]$String, [Style]::new($Color))
+    Write-Debug "New-TableCell [String], Text, $([String]$CellData)"
+    return [Text]::new([String]$CellData, [Style]::new($Color))
 }
diff --git a/PwshSpectreConsole/private/New-TableRow.ps1 b/PwshSpectreConsole/private/New-TableRow.ps1
index 3e740650..010d27a1 100644
--- a/PwshSpectreConsole/private/New-TableRow.ps1
+++ b/PwshSpectreConsole/private/New-TableRow.ps1
@@ -4,14 +4,20 @@ function New-TableRow {
         [Object] $Entry,
         [Color] $Color = [Color]::Default,
         [Switch] $AllowMarkup,
-        [Switch] $Scalar
+        [Switch] $Scalar,
+        [hashtable] $Renderables
     )
     Write-Debug "Module: $($ExecutionContext.SessionState.Module.Name) Command: $($MyInvocation.MyCommand.Name) Param: $($PSBoundParameters.GetEnumerator())"
     $opts = @{
         AllowMarkup = $AllowMarkup
     }
     if ($scalar) {
-        New-TableCell -String $Entry -Color $Color @opts
+        # Swap spectre renderable objects with the raw object
+        $name = $Entry.ToString()
+        if ($name.StartsWith("RENDERABLE__")) {
+            $Entry = $renderables[$name]
+        }
+        New-TableCell -CellData $Entry -Color $Color @opts
     } else {
         # simplified, should be faster.
         $detectVT = '\x1b'
@@ -24,7 +30,12 @@ function New-TableRow {
                 ConvertTo-SpectreDecoration -String $cell @opts
                 continue
             }
-            New-TableCell -String $cell -Color $Color @opts
+            # Swap spectre renderable objects with the raw spectre renderable object
+            $name = $cell.ToString()
+            if ($name.StartsWith("RENDERABLE__")) {
+                $cell = $renderables[$name]
+            }
+            New-TableCell -CellData $cell -Color $Color @opts
         }
         return $rows
     }
diff --git a/PwshSpectreConsole/public/formatting/Format-SpectreTable.ps1 b/PwshSpectreConsole/public/formatting/Format-SpectreTable.ps1
index 01e33df4..d37272c8 100644
--- a/PwshSpectreConsole/public/formatting/Format-SpectreTable.ps1
+++ b/PwshSpectreConsole/public/formatting/Format-SpectreTable.ps1
@@ -1,182 +1,219 @@
-using module "..\..\private\completions\Completers.psm1"
-using namespace Spectre.Console
-
-function Format-SpectreTable {
-    <#
-    .SYNOPSIS
-    Formats an array of objects into a Spectre Console table. Thanks to [trackd](https://github.com/trackd) and [fmotion1](https://github.com/fmotion1) for the updates to support markdown and color in the table contents.
-    ![Example table](/table.png)
-
-    .DESCRIPTION
-    This function takes an array of objects and formats them into a table using the Spectre Console library. The table can be customized with a border style and color.
-
-    .PARAMETER Property
-    Specifies the object properties that appear in the display and the order in which they appear.
-    Type one or more property names, separated by commas, or use a hash table to display a calculated property.
-    Wildcards are permitted.
-    The Property parameter is optional. You can't use the Property and View parameters in the same command.
-    The value of the Property parameter can be a new calculated property.
-    The calculated property can be a script block or a hash table. Valid key-value pairs are:
-    - Name (or Label) `<string>`
-    - Expression - `<string>` or `<script block>`
-    - FormatString - `<string>`
-    - Width - `<int32>` - must be greater than `0`
-    - Alignment - value can be `Left`, `Center`, or `Right`
-
-    .PARAMETER Data
-    The array of objects to be formatted into a table.
-    Takes pipeline input.
-
-    .PARAMETER Border
-    The border style of the table. Default is "Double".
-
-    .PARAMETER Color
-    The color of the table border. Default is the accent color of the script.
-
-    .PARAMETER HeaderColor
-    The color of the table header text. Default is the DefaultTableHeaderColor.
-
-    .PARAMETER TextColor
-    The color of the table text. Default is the DefaultTableTextColor.
-
-    .PARAMETER Width
-    The width of the table.
-
-    .PARAMETER HideHeaders
-    Hides the headers of the table.
-
-    .PARAMETER Title
-    The title of the table.
-
-    .PARAMETER AllowMarkup
-    Allow Spectre markup in the table elements e.g. [green]message[/].
-
-    .PARAMETER Wrap
-    Displays text that exceeds the column width on the next line. By default, text that exceeds the column width is truncated
-    Currently there is a bug with this, spectre.console/issues/1185
-
-    .PARAMETER View
-    The View parameter lets you specify an alternate format or custom view for the table.
-
-    .EXAMPLE
-    $data = @(
-        [pscustomobject]@{Name="John"; Age=25; City="New York"},
-        [pscustomobject]@{Name="Jane"; Age=30; City="Los Angeles"}
-    )
-    Format-SpectreTable -Data $data
-
-    .EXAMPLE
-    $Properties = @(
-        # foreground + background
-        @{'Name'='FileName'; Expression={ "[white on DeepSkyBlue3_1]" + $_.Name + "[/]" }},
-        # foreground
-        @{'Name'='Last Updated'; Expression={ "[DeepSkyBlue3_1]" + $_.LastWriteTime.ToString() + "[/]" }},
-        # background
-        @{'Name'='Drive'; Expression={ "[black on LightGreen_1]" + $_.PSDrive.Root + "[/]" }}
-    )
-    Get-ChildItem | Format-SpectreTable -Property $Properties -AllowMarkup
-
-    .EXAMPLE
-    1..10 | Format-SpectreTable -Title Numbers
-    #>
-    [Reflection.AssemblyMetadata("title", "Format-SpectreTable")]
-    [cmdletbinding(DefaultParameterSetName = '__AllParameterSets')]
-    [Alias('fst')]
-    param(
-        [Parameter(ValueFromPipeline, Mandatory)]
-        [Alias('InputObject')]
-        [object] $Data,
-        [Parameter(Position = 0, ParameterSetName = 'Property')]
-        [object[]] $Property,
-        [Switch] $Wrap,
-        [Parameter(ParameterSetName = 'View')]
-        [String] $View,
-        [ValidateSet([SpectreConsoleTableBorder], ErrorMessage = "Value '{0}' is invalid. Try one of: {1}")]
-        [string] $Border = "Double",
-        [ColorTransformationAttribute()]
-        [ArgumentCompletionsSpectreColors()]
-        [Color] $Color = $script:AccentColor,
-        [ColorTransformationAttribute()]
-        [ArgumentCompletionsSpectreColors()]
-        [Color] $HeaderColor = $script:DefaultTableHeaderColor,
-        [ColorTransformationAttribute()]
-        [ArgumentCompletionsSpectreColors()]
-        [Color] $TextColor = $script:DefaultTableTextColor,
-        [ValidateScript({ $_ -gt 0 -and $_ -le (Get-HostWidth) }, ErrorMessage = "Value '{0}' is invalid. Cannot be negative or exceed console width.")]
-        [int] $Width,
-        [switch] $HideHeaders,
-        [String] $Title,
-        [switch] $AllowMarkup
-    )
-    begin {
-        Write-Debug "Module: $($ExecutionContext.SessionState.Module.Name) Command: $($MyInvocation.MyCommand.Name) Param: $($PSBoundParameters.GetEnumerator())"
-        $tableoptions = @{}
-        $rowoptions = @{}
-        $FormatTableParams = @{}
-        $collector = [System.Collections.Generic.List[psobject]]::new()
-        $table = [Table]::new()
-        $table.Border = [TableBorder]::$Border
-        $table.BorderStyle = [Style]::new($Color)
-        switch ($PSBoundParameters.Keys) {
-            'Width' { $table.Width = $Width }
-            'HideHeaders' { $table.ShowHeaders = $false }
-            'Title' { $tableoptions.Title = $Title }
-            'AllowMarkup' { $rowoptions.AllowMarkup = $true }
-            'Wrap' { $tableoptions.Wrap = $true ; $FormatTableParams.Wrap = $true }
-            'View' { $FormatTableParams.View = $View }
-            'Property' { $FormatTableParams.Property = $Property }
-        }
-    }
-    process {
-        foreach ($entry in $data) {
-            if ($entry -is [hashtable]) {
-                $collector.add([pscustomobject]$entry)
-            } else {
-                $collector.add($entry)
-            }
-        }
-    }
-    end {
-        if ($collector.count -eq 0) {
-            return
-        }
-        if ($FormatTableParams.Keys.Count -gt 0) {
-            Write-Debug "Using Format-Table with parameters: $($FormatTableParams.Keys -join ', ')"
-            $collector = $collector | Format-Table @FormatTableParams
-        } else {
-            $collector = $collector | Format-Table
-        }
-        if (-Not $collector.shapeInfo) {
-            # scalar array, no header
-            $rowoptions.scalar = $tableoptions.scalar = $true
-            $table = Add-TableColumns -Table $table @tableoptions -Color $HeaderColor
-        } else {
-            # grab the FormatStartData
-            $Headers = Get-TableHeader $collector[0]
-            if ($Headers) {
-                $table = Add-TableColumns -Table $table -formatData $Headers -Color $HeaderColor
-            } else {
-                return
-            }
-        }
-        foreach ($item in $collector.FormatEntryInfo) {
-            if ($rowoptions.scalar) {
-                $row = New-TableRow -Entry $item.Text -Color $TextColor @rowoptions
-            } else {
-                if ($null -eq $item.FormatPropertyFieldList.propertyValue) {
-                    continue
-                }
-                $row = New-TableRow -Entry $item.FormatPropertyFieldList.propertyValue -Color $TextColor @rowoptions
-            }
-            if ($AllowMarkup) {
-                $table = [TableExtensions]::AddRow($table, [Markup[]]$row)
-            } else {
-                $table = [TableExtensions]::AddRow($table, [Text[]]$row)
-            }
-        }
-        if ($Title -And -Not $rowoptions.scalar) {
-            $table.Title = [TableTitle]::new($Title, [Style]::new($Color))
-        }
-        Write-AnsiConsole $table
-    }
-}
+using module "..\..\private\completions\Completers.psm1"
+using namespace Spectre.Console
+
+function Format-SpectreTable {
+    <#
+    .SYNOPSIS
+    Formats an array of objects into a Spectre Console table. Thanks to [trackd](https://github.com/trackd) and [fmotion1](https://github.com/fmotion1) for the updates to support markdown and color in the table contents.
+    ![Example table](/table.png)
+
+    .DESCRIPTION
+    This function takes an array of objects and formats them into a table using the Spectre Console library. The table can be customized with a border style and color.
+
+    .PARAMETER Property
+    Specifies the object properties that appear in the display and the order in which they appear.
+    Type one or more property names, separated by commas, or use a hash table to display a calculated property.
+    Wildcards are permitted.
+    The Property parameter is optional. You can't use the Property and View parameters in the same command.
+    The value of the Property parameter can be a new calculated property.
+    The calculated property can be a script block or a hash table. Valid key-value pairs are:
+    - Name (or Label) `<string>`
+    - Expression - `<string>` or `<script block>`
+    - FormatString - `<string>`
+    - Width - `<int32>` - must be greater than `0`
+    - Alignment - value can be `Left`, `Center`, or `Right`
+
+    .PARAMETER Data
+    The array of objects to be formatted into a table.
+    Takes pipeline input.
+
+    .PARAMETER Border
+    The border style of the table. Default is "Double".
+
+    .PARAMETER Color
+    The color of the table border. Default is the accent color of the script.
+
+    .PARAMETER HeaderColor
+    The color of the table header text. Default is the DefaultTableHeaderColor.
+
+    .PARAMETER TextColor
+    The color of the table text. Default is the DefaultTableTextColor.
+
+    .PARAMETER Width
+    The width of the table.
+
+    .PARAMETER HideHeaders
+    Hides the headers of the table.
+
+    .PARAMETER Title
+    The title of the table.
+
+    .PARAMETER AllowMarkup
+    Allow Spectre markup in the table elements e.g. [green]message[/].
+
+    .PARAMETER Wrap
+    Displays text that exceeds the column width on the next line. By default, text that exceeds the column width is truncated
+    Currently there is a bug with this, spectre.console/issues/1185
+
+    .PARAMETER View
+    The View parameter lets you specify an alternate format or custom view for the table.
+
+    .PARAMETER PassThru
+    Returns the table object instead of writing it to the console.
+
+    .EXAMPLE
+    $data = @(
+        [pscustomobject]@{Name="John"; Age=25; City="New York"},
+        [pscustomobject]@{Name="Jane"; Age=30; City="Los Angeles"}
+    )
+    Format-SpectreTable -Data $data
+
+    .EXAMPLE
+    $Properties = @(
+        # foreground + background
+        @{'Name'='FileName'; Expression={ "[white on DeepSkyBlue3_1]" + $_.Name + "[/]" }},
+        # foreground
+        @{'Name'='Last Updated'; Expression={ "[DeepSkyBlue3_1]" + $_.LastWriteTime.ToString() + "[/]" }},
+        # background
+        @{'Name'='Drive'; Expression={ "[black on LightGreen_1]" + $_.PSDrive.Root + "[/]" }}
+    )
+    Get-ChildItem | Format-SpectreTable -Property $Properties -AllowMarkup
+
+    .EXAMPLE
+    1..10 | Format-SpectreTable -Title Numbers
+    #>
+    [Reflection.AssemblyMetadata("title", "Format-SpectreTable")]
+    [cmdletbinding(DefaultParameterSetName = '__AllParameterSets')]
+    [Alias('fst')]
+    param(
+        [Parameter(ValueFromPipeline, Mandatory)]
+        [Alias('InputObject')]
+        [object] $Data,
+        [Parameter(Position = 0, ParameterSetName = 'Property')]
+        [object[]] $Property,
+        [Switch] $Wrap,
+        [Parameter(ParameterSetName = 'View')]
+        [String] $View,
+        [ValidateSet([SpectreConsoleTableBorder], ErrorMessage = "Value '{0}' is invalid. Try one of: {1}")]
+        [string] $Border = "Double",
+        [ColorTransformationAttribute()]
+        [ArgumentCompletionsSpectreColors()]
+        [Color] $Color = $script:AccentColor,
+        [ColorTransformationAttribute()]
+        [ArgumentCompletionsSpectreColors()]
+        [Color] $HeaderColor = $script:DefaultTableHeaderColor,
+        [ColorTransformationAttribute()]
+        [ArgumentCompletionsSpectreColors()]
+        [Color] $TextColor = $script:DefaultTableTextColor,
+        [ValidateScript({ $_ -gt 0 -and $_ -le (Get-HostWidth) }, ErrorMessage = "Value '{0}' is invalid. Cannot be negative or exceed console width.")]
+        [int] $Width,
+        [switch] $HideHeaders,
+        [String] $Title,
+        [switch] $AllowMarkup,
+        [switch] $PassThru
+    )
+    begin {
+        Write-Debug "Module: $($ExecutionContext.SessionState.Module.Name) Command: $($MyInvocation.MyCommand.Name) Param: $($PSBoundParameters.GetEnumerator())"
+        $tableoptions = @{}
+        $rowoptions = @{}
+        $FormatTableParams = @{}
+        $collector = [System.Collections.Generic.List[psobject]]::new()
+        $renderables = @{}
+        $table = [Table]::new()
+        $table.Border = [TableBorder]::$Border
+        $table.BorderStyle = [Style]::new($Color)
+        switch ($PSBoundParameters.Keys) {
+            'Width' { $table.Width = $Width }
+            'HideHeaders' { $table.ShowHeaders = $false }
+            'Title' { $tableoptions.Title = $Title }
+            'AllowMarkup' { $rowoptions.AllowMarkup = $true }
+            'Wrap' { $tableoptions.Wrap = $true ; $FormatTableParams.Wrap = $true }
+            'View' { $FormatTableParams.View = $View }
+            'Property' { $FormatTableParams.Property = $Property }
+        }
+    }
+    process {
+        foreach ($entry in $data) {
+            if ($entry -is [Spectre.Console.Rendering.Renderable]) {
+                # The fancy stuff below to handle powershell formatting turns renderable spectre objects into strings.
+                # Here we're storing the original object in a lookup table to be read back when it's time to add cells to the table.
+                $renderableKey = "RENDERABLE__$([Guid]::NewGuid().Guid)"
+                $renderables[$renderableKey] = $entry
+                $collector.add($renderableKey)
+            } elseif ($entry -is [hashtable]) {
+                # Recursively expand values in the hashtable finding any renderables and putting them in the lookup table
+                $entry = Convert-HashtableToRenderSafePSObject -Hashtable $entry -Renderables $renderables
+                $collector.add($entry)
+            } else {
+                $collector.add($entry)
+            }
+        }
+    }
+    end {
+        if ($collector.count -eq 0) {
+            return
+        }
+        if ($FormatTableParams.Keys.Count -gt 0) {
+            Write-Debug "Using Format-Table with parameters: $($FormatTableParams.Keys -join ', ')"
+            $collector = $collector | Format-Table @FormatTableParams
+        } else {
+            $collector = $collector | Format-Table
+        }
+        if (-Not $collector.shapeInfo) {
+            # scalar array, no header
+            $rowoptions.scalar = $tableoptions.scalar = $true
+            $table = Add-TableColumns -Table $table @tableoptions -Color $HeaderColor
+        } else {
+            # grab the FormatStartData
+            $Headers = Get-TableHeader $collector[0]
+            if ($Headers) {
+                $table = Add-TableColumns -Table $table -formatData $Headers -Color $HeaderColor
+            } else {
+                return
+            }
+        }
+        foreach ($item in $collector.FormatEntryInfo) {
+            if ($rowoptions.scalar) {
+                $row = New-TableRow -Entry $item.Text -Renderables $renderables -Color $TextColor @rowoptions
+            } else {
+                if ($null -eq $item.FormatPropertyFieldList.propertyValue) {
+                    continue
+                }
+                $row = New-TableRow -Entry $item.FormatPropertyFieldList.propertyValue -Renderables $renderables -Color $TextColor @rowoptions
+            }
+            if ($AllowMarkup) {
+                $table = [TableExtensions]::AddRow($table, [Markup[]]$row)
+            } else {
+                $table = [TableExtensions]::AddRow($table, [Rendering.Renderable[]]$row)
+            }
+        }
+        if ($Title -And -Not $rowoptions.scalar) {
+            $table.Title = [TableTitle]::new($Title, [Style]::new($Color))
+        }
+
+        if ($PassThru) {
+            return $table
+        } else {
+            Write-AnsiConsole $table
+        }
+    }
+}
+
+function Convert-HashtableToRenderSafePSObject {
+    param(
+        [hashtable] $Hashtable,
+        [hashtable] $Renderables
+    )
+    $customObject = @{}
+    foreach ($item in $Hashtable.GetEnumerator()) {
+        if ($item.Value -is [hashtable]) {
+            $item.Value = Convert-HashtableToRenderSafePSObject -Hashtable $item.Value
+        } elseif ($item.Value -is [Spectre.Console.Rendering.Renderable]) {
+            $renderableKey = "RENDERABLE__$([Guid]::NewGuid().Guid)"
+            $Renderables[$renderableKey] = $item.Value
+            $item.Value = $renderableKey
+        }
+        $customObject[$item.Key] = $item.Value
+    }
+    return [pscustomobject]$customObject
+}
\ No newline at end of file