diff --git a/src/apps/blazor/client/Components/Dialogs/DeleteConfirmation.razor b/src/apps/blazor/client/Components/Dialogs/DeleteConfirmation.razor
index da39f6413..f69c2336e 100644
--- a/src/apps/blazor/client/Components/Dialogs/DeleteConfirmation.razor
+++ b/src/apps/blazor/client/Components/Dialogs/DeleteConfirmation.razor
@@ -16,7 +16,7 @@
 
 @code {
     [CascadingParameter]
-    MudDialogInstance MudDialog { get; set; } = default!;
+    IMudDialogInstance MudDialog { get; set; } = default!;
 
     [Parameter]
     public string? ContentText { get; set; }
diff --git a/src/apps/blazor/client/Components/Dialogs/Logout.razor b/src/apps/blazor/client/Components/Dialogs/Logout.razor
index 202ac8717..5a0d76f1f 100644
--- a/src/apps/blazor/client/Components/Dialogs/Logout.razor
+++ b/src/apps/blazor/client/Components/Dialogs/Logout.razor
@@ -26,7 +26,7 @@
 
     [Parameter] public Color Color { get; set; }
 
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
+    [CascadingParameter] IMudDialogInstance MudDialog { get; set; } = default!;
 
     async Task Submit()
     {
diff --git a/src/apps/blazor/client/Components/EntityTable/AddEditModal.razor.cs b/src/apps/blazor/client/Components/EntityTable/AddEditModal.razor.cs
index 7ac2136db..dd1aa5efe 100644
--- a/src/apps/blazor/client/Components/EntityTable/AddEditModal.razor.cs
+++ b/src/apps/blazor/client/Components/EntityTable/AddEditModal.razor.cs
@@ -25,7 +25,7 @@ public partial class AddEditModal<TRequest> : IAddEditModal<TRequest>
     public string? SuccessMessage { get; set; }
 
     [CascadingParameter]
-    private MudDialogInstance MudDialog { get; set; } = default!;
+    private IMudDialogInstance MudDialog { get; set; } = default!;
 
     private FshValidation? _customValidation;
 
diff --git a/src/apps/blazor/client/Directory.Packages.props b/src/apps/blazor/client/Directory.Packages.props
index d288f2a0f..04a1463d2 100644
--- a/src/apps/blazor/client/Directory.Packages.props
+++ b/src/apps/blazor/client/Directory.Packages.props
@@ -17,6 +17,6 @@
     <PackageVersion Include="Blazored.LocalStorage" Version="4.5.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
-    <PackageVersion Include="MudBlazor" Version="7.15.0" />
+    <PackageVersion Include="MudBlazor" Version="8.0.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/apps/blazor/client/Layout/BaseLayout.razor.cs b/src/apps/blazor/client/Layout/BaseLayout.razor.cs
index f4a7159cc..524a2923d 100644
--- a/src/apps/blazor/client/Layout/BaseLayout.razor.cs
+++ b/src/apps/blazor/client/Layout/BaseLayout.razor.cs
@@ -24,7 +24,7 @@ protected override async Task OnInitializedAsync()
             config.Icon = Icons.Custom.Brands.GitHub;
             config.Action = "Star us on Github!";
             config.ActionColor = Color.Info;
-            config.Onclick = snackbar =>
+            config.OnClick = snackbar =>
             {
                 Navigation.NavigateTo("https://github.com/fullstackhero/dotnet-starter-kit");
                 return Task.CompletedTask;
diff --git a/src/apps/blazor/client/Pages/Multitenancy/UpgradeSubscriptionModal.razor b/src/apps/blazor/client/Pages/Multitenancy/UpgradeSubscriptionModal.razor
index 2b9b2bf4a..f91a7b597 100644
--- a/src/apps/blazor/client/Pages/Multitenancy/UpgradeSubscriptionModal.razor
+++ b/src/apps/blazor/client/Pages/Multitenancy/UpgradeSubscriptionModal.razor
@@ -31,7 +31,7 @@
 @code
 {
     [Parameter] public UpgradeSubscriptionCommand Request { get; set; } = new();
-    [CascadingParameter] private MudDialogInstance MudDialog { get; set; } = default!;
+    [CascadingParameter] private IMudDialogInstance MudDialog { get; set; } = default!;
     DateTime? date = DateTime.Today;
 
     protected override void OnInitialized() =>
diff --git a/src/apps/blazor/infrastructure/Directory.Packages.props b/src/apps/blazor/infrastructure/Directory.Packages.props
index ab41fcaea..ae21ef766 100644
--- a/src/apps/blazor/infrastructure/Directory.Packages.props
+++ b/src/apps/blazor/infrastructure/Directory.Packages.props
@@ -17,6 +17,6 @@
     <PackageVersion Include="Blazored.LocalStorage" Version="4.5.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
-    <PackageVersion Include="MudBlazor" Version="7.15.0" />
+    <PackageVersion Include="MudBlazor" Version="8.0.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/apps/blazor/infrastructure/Themes/CustomTypography.cs b/src/apps/blazor/infrastructure/Themes/CustomTypography.cs
index 094a37859..69faf18ed 100644
--- a/src/apps/blazor/infrastructure/Themes/CustomTypography.cs
+++ b/src/apps/blazor/infrastructure/Themes/CustomTypography.cs
@@ -6,108 +6,108 @@ public static class CustomTypography
 {
     public static Typography FshTypography => new Typography()
     {
-        Default = new Default()
+        Default = new DefaultTypography()
         {
             FontFamily = ["Montserrat", "Helvetica", "Arial", "sans-serif"],
             FontSize = ".875rem",
-            FontWeight = 400,
-            LineHeight = 1.43,
+            FontWeight = "400",
+            LineHeight = "1.43",
             LetterSpacing = ".01071em"
         },
-        H1 = new H1()
+        H1 = new H1Typography()
         {
             FontFamily = ["Montserrat", "Helvetica", "Arial", "sans-serif"],
             FontSize = "3rem",
-            FontWeight = 300,
-            LineHeight = 1.167,
+            FontWeight = "300",
+            LineHeight = "1.167",
             LetterSpacing = "-.01562em"
         },
-        H2 = new H2()
+        H2 = new H2Typography()
         {
             FontFamily = ["Montserrat", "Helvetica", "Arial", "sans-serif"],
             FontSize = "2.75rem",
-            FontWeight = 300,
-            LineHeight = 1.2,
+            FontWeight = "300",
+            LineHeight = "1.2",
             LetterSpacing = "-.00833em"
         },
-        H3 = new H3()
+        H3 = new H3Typography()
         {
             FontFamily = ["Montserrat", "Helvetica", "Arial", "sans-serif"],
             FontSize = "2rem",
-            FontWeight = 400,
-            LineHeight = 1.167,
+            FontWeight = "400",
+            LineHeight = "1.167",
             LetterSpacing = "0"
         },
-        H4 = new H4()
+        H4 = new H4Typography()
         {
             FontFamily = ["Montserrat", "Helvetica", "Arial", "sans-serif"],
             FontSize = "1.75rem",
-            FontWeight = 400,
-            LineHeight = 1.235,
+            FontWeight = "400",
+            LineHeight = "1.235",
             LetterSpacing = ".00735em"
         },
-        H5 = new H5()
+        H5 = new H5Typography()
         {
             FontFamily = ["Montserrat", "Helvetica", "Arial", "sans-serif"],
             FontSize = "1.5rem",
-            FontWeight = 400,
-            LineHeight = 1.334,
+            FontWeight = "400",
+            LineHeight = "1.334",
             LetterSpacing = "0"
         },
-        H6 = new H6()
+        H6 = new H6Typography()
         {
             FontFamily = ["Montserrat", "Helvetica", "Arial", "sans-serif"],
             FontSize = "1.25rem",
-            FontWeight = 400,
-            LineHeight = 1.6,
+            FontWeight = "400",
+            LineHeight = "1.6",
             LetterSpacing = ".0075em"
         },
-        Button = new Button()
+        Button = new ButtonTypography()
         {
             FontFamily = ["Montserrat", "Helvetica", "Arial", "sans-serif"],
             FontSize = ".875rem",
-            FontWeight = 400,
-            LineHeight = 1.75,
+            FontWeight = "400",
+            LineHeight = "1.75",
             LetterSpacing = ".02857em"
         },
-        Body1 = new Body1()
+        Body1 = new Body1Typography()
         {
             FontFamily = ["Montserrat", "Helvetica", "Arial", "sans-serif"],
             FontSize = "1rem",
-            FontWeight = 400,
-            LineHeight = 1.5,
+            FontWeight = "400",
+            LineHeight = "1.5",
             LetterSpacing = ".00938em"
         },
-        Body2 = new Body2()
+        Body2 = new Body2Typography()
         {
             FontFamily = ["Montserrat", "Helvetica", "Arial", "sans-serif"],
             FontSize = ".875rem",
-            FontWeight = 400,
-            LineHeight = 1.43,
+            FontWeight = "400",
+            LineHeight = "1.43",
             LetterSpacing = ".01071em"
         },
-        Caption = new Caption()
+        Caption = new CaptionTypography()
         {
             FontFamily = ["Montserrat", "Helvetica", "Arial", "sans-serif"],
             FontSize = ".75rem",
-            FontWeight = 200,
-            LineHeight = 1.66,
+            FontWeight = "200",
+            LineHeight = "1.66",
             LetterSpacing = ".03333em"
         },
-        Subtitle1 = new Subtitle1()
+        Subtitle1 = new Subtitle1Typography()
         {
             FontFamily = ["Montserrat", "Helvetica", "Arial", "sans-serif"],
             FontSize = "1rem",
-            FontWeight = 400,
-            LineHeight = 1.57,
+            FontWeight = "400",
+            LineHeight = "1.57",
             LetterSpacing = ".00714em"
         },
-        Subtitle2 = new Subtitle2()
+        Subtitle2 = new Subtitle2Typography()
         {
             FontFamily = ["Montserrat", "Helvetica", "Arial", "sans-serif"],
             FontSize = ".875rem",
-            FontWeight = 400,
-            LineHeight = 1.57,
+            FontWeight = "400",
+            LineHeight = "1.57",
             LetterSpacing = ".00714em"
         }
     };