diff --git a/LM-Kit-Maestro/LM-Kit-Maestro.csproj b/LM-Kit-Maestro/LM-Kit-Maestro.csproj
index 7841f06..3249d63 100644
--- a/LM-Kit-Maestro/LM-Kit-Maestro.csproj
+++ b/LM-Kit-Maestro/LM-Kit-Maestro.csproj
@@ -80,7 +80,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Blazor.Bootstrap" Version="3.2.0" />
 		<PackageReference Include="LM-Kit.NET" Version="2024.12.7" />
 		<PackageReference Include="Majorsoft.Blazor.Components.Common.JsInterop" Version="1.5.0" />
 		<PackageReference Include="Markdig" Version="0.38.0" />
@@ -92,6 +91,7 @@
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
 		<PackageReference Include="MetroLog.Maui" Version="2.1.0" />
 		<PackageReference Include="Mopups" Version="1.3.2" />
+		<PackageReference Include="MudBlazor" Version="7.15.0" />
 		<PackageReference Include="SimpleToolkit.SimpleShell" Version="4.1.3" />
 		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
 		<PackageReference Include="System.Text.Json" Version="9.0.0" />
diff --git a/LM-Kit-Maestro/MauiProgram.cs b/LM-Kit-Maestro/MauiProgram.cs
index 6226ba5..8c319a9 100644
--- a/LM-Kit-Maestro/MauiProgram.cs
+++ b/LM-Kit-Maestro/MauiProgram.cs
@@ -12,6 +12,7 @@
 using Mopups.Hosting;
 using Mopups.Services;
 using CommunityToolkit.Maui.Storage;
+using MudBlazor.Services;
 
 namespace LMKit.Maestro
 {
@@ -48,10 +49,9 @@ public static MauiApp CreateMauiApp()
                 })
                 .ConfigureMauiHandlers(handlers => { handlers.AddCustomHandlers(); });
 
+            builder.Services.AddMudServices();
             builder.Services.AddMauiBlazorWebView();
             builder.Services.AddJsInteropExtensions();
-            builder.Services.AddBlazorBootstrap();
-
 
 #if DEBUG
             builder.Services.AddBlazorWebViewDeveloperTools();
diff --git a/LM-Kit-Maestro/UI/Razor/MainLayout.razor b/LM-Kit-Maestro/UI/Razor/MainLayout.razor
index 53a4e95..7ff765b 100644
--- a/LM-Kit-Maestro/UI/Razor/MainLayout.razor
+++ b/LM-Kit-Maestro/UI/Razor/MainLayout.razor
@@ -1,3 +1,13 @@
 @inherits LayoutComponentBase
 
-@Body
\ No newline at end of file
+@Body
+
+@* Required *@
+<MudThemeProvider />
+<MudPopoverProvider />
+
+@* Needed for dialogs *@
+<MudDialogProvider />
+
+@* Needed for snackbars *@
+<MudSnackbarProvider />
diff --git a/LM-Kit-Maestro/UI/Razor/_Imports.razor b/LM-Kit-Maestro/UI/Razor/_Imports.razor
index 0d8a032..7689bb1 100644
--- a/LM-Kit-Maestro/UI/Razor/_Imports.razor
+++ b/LM-Kit-Maestro/UI/Razor/_Imports.razor
@@ -28,4 +28,4 @@
 @using Majorsoft.Blazor.Components.Common.JsInterop.Resize
 @using Majorsoft.Blazor.Components.Common.JsInterop.Scroll;
 
-@using BlazorBootstrap;
\ No newline at end of file
+@using MudBlazor;
\ No newline at end of file
diff --git a/LM-Kit-Maestro/wwwroot/index.html b/LM-Kit-Maestro/wwwroot/index.html
index 2557414..809cde7 100644
--- a/LM-Kit-Maestro/wwwroot/index.html
+++ b/LM-Kit-Maestro/wwwroot/index.html
@@ -5,15 +5,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
     <title>Maestro</title>
     <base href="/" />
-    <link rel="stylesheet" href="css/bootstrap.min.css" />
     <link rel="stylesheet" href="css/lmkitmaestro.css" />
     <link rel="stylesheet" href="css/font-awesome.css" />
     <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
 
-    <!-- Blazor Bootstrap-->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" rel="stylesheet" />
-    <link href="_content/Blazor.Bootstrap/blazor.bootstrap.css" rel="stylesheet" />
+    <!-- MudBlazor -->
+    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
+    <link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" />
 </head>
 
 <body>
@@ -38,9 +36,8 @@
     <script src="js/fontawesome.js"></script>
     <script src="_framework/blazor.webview.js" autostart="false"></script>
 
-    <!-- Blazor Bootstrap-->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
-    <script src="_content/Blazor.Bootstrap/blazor.bootstrap.js"></script>
+    <!-- Mud Blazor-->
+    <script src="_content/MudBlazor/MudBlazor.min.js"></script>
 </body>
 
 </html>