diff --git a/Aaru.Server.New/Aaru.Server.New.csproj b/Aaru.Server.New/Aaru.Server.New.csproj
index d0db30f1..afaf28c0 100644
--- a/Aaru.Server.New/Aaru.Server.New.csproj
+++ b/Aaru.Server.New/Aaru.Server.New.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap" Version="1.5.2"/>
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.5.2"/>
     <PackageReference Include="Blazorise.Charts" Version="1.5.2"/>
     <PackageReference Include="Blazorise.DataGrid" Version="1.5.2"/>
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.5.2"/>
diff --git a/Aaru.Server.New/Components/App.razor b/Aaru.Server.New/Components/App.razor
index 6255d65a..f1a1fac1 100644
--- a/Aaru.Server.New/Components/App.razor
+++ b/Aaru.Server.New/Components/App.razor
@@ -6,10 +6,10 @@
     <meta charset="utf-8"/>
     <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
     <base href="/"/>
-    <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" rel="stylesheet">
+    <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" rel="stylesheet">
     <link href="_content/Blazorise.Icons.FontAwesome/v6/css/all.min.css" rel="stylesheet">
     <link href="_content/Blazorise/blazorise.css" rel="stylesheet"/>
-    <link href="_content/Blazorise.Bootstrap/blazorise.bootstrap.css" rel="stylesheet"/>
+    <link href="_content/Blazorise.Bootstrap5/blazorise.bootstrap5.css" rel="stylesheet"/>
     <link href="css/prism.css" rel="stylesheet"/>
     <link href="app.css" rel="stylesheet"/>
     <link href="Aaru.Server.New.styles.css" rel="stylesheet"/>
diff --git a/Aaru.Server.New/Program.cs b/Aaru.Server.New/Program.cs
index e059881f..a187f06e 100644
--- a/Aaru.Server.New/Program.cs
+++ b/Aaru.Server.New/Program.cs
@@ -4,7 +4,7 @@ using Aaru.Server.New;
 using Aaru.Server.New.Components;
 using Aaru.Server.New.Components.Account;
 using Blazorise;
-using Blazorise.Bootstrap;
+using Blazorise.Bootstrap5;
 using Blazorise.Icons.FontAwesome;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Identity;
@@ -119,7 +119,7 @@ builder.Services.AddIdentityCore<IdentityUser>(static options =>
 builder.Services.AddSingleton<IEmailSender<IdentityUser>, IdentityNoOpEmailSender>();
 
 builder.Services.AddBlazorise(static options => { options.Immediate = true; })
-       .AddBootstrapProviders()
+       .AddBootstrap5Providers()
        .AddFontAwesomeIcons();
 
 WebApplication app = builder.Build();
diff --git a/Aaru.Server.New/wwwroot/app.css b/Aaru.Server.New/wwwroot/app.css
index b38aaa7d..f1b96726 100644
--- a/Aaru.Server.New/wwwroot/app.css
+++ b/Aaru.Server.New/wwwroot/app.css
@@ -13,7 +13,7 @@ html, body {
   font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
 
-a, .btn-link {
+.nav-link {
   color: #006bb7;
 }
 
@@ -709,7 +709,7 @@ kbd {
   position: relative;
 }
 
-.table-fixed-header .table thead:not(.table-thead-theme) th {
+.table-fixed-header > .table > thead:not(.table-thead-theme) > tr > th {
   background-color: #333333;
 }