diff --git a/MudBlazor.Markdown.sln b/MudBlazor.Markdown.sln
deleted file mode 100644
index 56896f2b..00000000
--- a/MudBlazor.Markdown.sln
+++ /dev/null
@@ -1,42 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.32014.148
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MudBlazor.Markdown", "src\MudBlazor.Markdown\MudBlazor.Markdown.csproj", "{D98CF970-15A6-4174-9180-FD5BACA76BDD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MudBlazor.Markdown.Tests", "tests\MudBlazor.Markdown.Tests\MudBlazor.Markdown.Tests.csproj", "{CEE74ADB-80A4-4011-A2C6-68EB7902409A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MudBlazor.Markdown.Benchmarks", "benchmarks\MudBlazor.Markdown.Benchmarks\MudBlazor.Markdown.Benchmarks.csproj", "{F9210A1D-E13C-4805-A080-77DCB9B047CA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks", "{014FA7C1-7652-4A13-8BBB-A5CD8B97FB94}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D98CF970-15A6-4174-9180-FD5BACA76BDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D98CF970-15A6-4174-9180-FD5BACA76BDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D98CF970-15A6-4174-9180-FD5BACA76BDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D98CF970-15A6-4174-9180-FD5BACA76BDD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CEE74ADB-80A4-4011-A2C6-68EB7902409A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CEE74ADB-80A4-4011-A2C6-68EB7902409A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CEE74ADB-80A4-4011-A2C6-68EB7902409A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CEE74ADB-80A4-4011-A2C6-68EB7902409A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9210A1D-E13C-4805-A080-77DCB9B047CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9210A1D-E13C-4805-A080-77DCB9B047CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9210A1D-E13C-4805-A080-77DCB9B047CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9210A1D-E13C-4805-A080-77DCB9B047CA}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8C5169D9-A38F-464C-88CE-F13FDCD37404}
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{F9210A1D-E13C-4805-A080-77DCB9B047CA} = {014FA7C1-7652-4A13-8BBB-A5CD8B97FB94}
-	EndGlobalSection
-EndGlobal
diff --git a/MudBlazor.Markdown.slnx b/MudBlazor.Markdown.slnx
new file mode 100644
index 00000000..0903568e
--- /dev/null
+++ b/MudBlazor.Markdown.slnx
@@ -0,0 +1,7 @@
+<Solution>
+    <Project Path="src\MudBlazor.Markdown\MudBlazor.Markdown.csproj" />
+    <Project Path="tests\MudBlazor.Markdown.Tests\MudBlazor.Markdown.Tests.csproj" />
+    <Folder Name="/Benchmarks/">
+        <Project Path="benchmarks\MudBlazor.Markdown.Benchmarks\MudBlazor.Markdown.Benchmarks.csproj" />
+    </Folder>
+</Solution>
diff --git a/samples/MudBlazor.Markdown.Core/MudBlazor.Markdown.Core.csproj b/samples/MudBlazor.Markdown.Core/MudBlazor.Markdown.Core.csproj
index 3ad1860f..35a11139 100644
--- a/samples/MudBlazor.Markdown.Core/MudBlazor.Markdown.Core.csproj
+++ b/samples/MudBlazor.Markdown.Core/MudBlazor.Markdown.Core.csproj
@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.8" />
-		<PackageReference Include="System.Reactive" Version="6.0.1" />
+		<PackageReference Include="System.Reactive" Version="6.1.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/samples/MudBlazor.Markdown.Samples.sln b/samples/MudBlazor.Markdown.Samples.sln
deleted file mode 100644
index 205d55e4..00000000
--- a/samples/MudBlazor.Markdown.Samples.sln
+++ /dev/null
@@ -1,49 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.2.32630.192
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MudBlazor.Markdown.Wasm", "WebAssembly\MudBlazor.Markdown.Wasm.csproj", "{938200EC-072C-4FD7-B699-AEEFF03546BB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MudBlazor.Markdown", "..\src\MudBlazor.Markdown\MudBlazor.Markdown.csproj", "{41F1EEBB-4754-4340-86BB-6DA2D8144549}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MudBlazor.Markdown.Core", "MudBlazor.Markdown.Core\MudBlazor.Markdown.Core.csproj", "{F31C9EBC-792B-422A-B173-D6E027224452}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MudBlazor.Markdown.Server", "Server\MudBlazor.Markdown.Server.csproj", "{1A77149A-AE40-4596-83E6-25C8BE3EFA76}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MudBlazor.Markdown.SSR", "SSR\MudBlazor.Markdown.SSR.csproj", "{3EB55216-730C-4797-8082-0616E0FA4DEB}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{938200EC-072C-4FD7-B699-AEEFF03546BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{938200EC-072C-4FD7-B699-AEEFF03546BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{938200EC-072C-4FD7-B699-AEEFF03546BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{938200EC-072C-4FD7-B699-AEEFF03546BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41F1EEBB-4754-4340-86BB-6DA2D8144549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41F1EEBB-4754-4340-86BB-6DA2D8144549}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41F1EEBB-4754-4340-86BB-6DA2D8144549}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41F1EEBB-4754-4340-86BB-6DA2D8144549}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F31C9EBC-792B-422A-B173-D6E027224452}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F31C9EBC-792B-422A-B173-D6E027224452}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F31C9EBC-792B-422A-B173-D6E027224452}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F31C9EBC-792B-422A-B173-D6E027224452}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1A77149A-AE40-4596-83E6-25C8BE3EFA76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A77149A-AE40-4596-83E6-25C8BE3EFA76}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A77149A-AE40-4596-83E6-25C8BE3EFA76}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A77149A-AE40-4596-83E6-25C8BE3EFA76}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3EB55216-730C-4797-8082-0616E0FA4DEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3EB55216-730C-4797-8082-0616E0FA4DEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3EB55216-730C-4797-8082-0616E0FA4DEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3EB55216-730C-4797-8082-0616E0FA4DEB}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E6E3C44E-D2E7-4D56-9449-725E96DA9DEB}
-	EndGlobalSection
-EndGlobal
diff --git a/samples/MudBlazor.Markdown.Samples.slnx b/samples/MudBlazor.Markdown.Samples.slnx
new file mode 100644
index 00000000..4ed87961
--- /dev/null
+++ b/samples/MudBlazor.Markdown.Samples.slnx
@@ -0,0 +1,7 @@
+<Solution>
+    <Project Path="..\src\MudBlazor.Markdown\MudBlazor.Markdown.csproj" />
+    <Project Path="MudBlazor.Markdown.Core\MudBlazor.Markdown.Core.csproj" />
+    <Project Path="Server\MudBlazor.Markdown.Server.csproj" />
+    <Project Path="WebAssembly\MudBlazor.Markdown.Wasm.csproj" />
+    <Project Path="SSR\MudBlazor.Markdown.SSR.csproj" />
+</Solution>
diff --git a/samples/Server/MudBlazor.Markdown.Server.csproj b/samples/Server/MudBlazor.Markdown.Server.csproj
index aa734b68..fc3fb1f9 100644
--- a/samples/Server/MudBlazor.Markdown.Server.csproj
+++ b/samples/Server/MudBlazor.Markdown.Server.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ReactiveUI.Blazor" Version="20.4.1" />
+		<PackageReference Include="ReactiveUI.Blazor" Version="22.3.1" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/samples/WebAssembly/MudBlazor.Markdown.Wasm.csproj b/samples/WebAssembly/MudBlazor.Markdown.Wasm.csproj
index c32dd4df..4b95269e 100644
--- a/samples/WebAssembly/MudBlazor.Markdown.Wasm.csproj
+++ b/samples/WebAssembly/MudBlazor.Markdown.Wasm.csproj
@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.8" PrivateAssets="all" />
-		<PackageReference Include="ReactiveUI.Blazor" Version="20.4.1" />
+		<PackageReference Include="ReactiveUI.Blazor" Version="22.3.1" />
 		<PackageReference Include="System.Net.Http.Json" Version="9.0.8" />
 	</ItemGroup>
 
diff --git a/src/MudBlazor.Markdown/Resources/MudBlazor.Markdown.css b/src/MudBlazor.Markdown/Resources/MudBlazor.Markdown.css
index b4fc33df..102f0d12 100644
--- a/src/MudBlazor.Markdown/Resources/MudBlazor.Markdown.css
+++ b/src/MudBlazor.Markdown/Resources/MudBlazor.Markdown.css
@@ -55,8 +55,8 @@ pre code.hljs {
 }
 
 /* Table */
-.mud-markdown-body table {
-	margin: 1.25em 0;
+.mud-markdown-body .mud-table {
+	margin: 0 0 1.25em 0;
 }
 
 .mud-markdown-body table p {