diff --git a/.idea/.idea.Aaru.Server/.idea/projectSettingsUpdater.xml b/.idea/.idea.Aaru.Server/.idea/projectSettingsUpdater.xml
index 4bb9f4d2..ef20cb08 100644
--- a/.idea/.idea.Aaru.Server/.idea/projectSettingsUpdater.xml
+++ b/.idea/.idea.Aaru.Server/.idea/projectSettingsUpdater.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RiderProjectSettingsUpdater">
-    <option name="vcsConfiguration" value="2" />
+    <option name="singleClickDiffPreview" value="1" />
+    <option name="unhandledExceptionsIgnoreList" value="1" />
+    <option name="vcsConfiguration" value="3" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/.idea.Aaru.Server/.idea/vcs.xml b/.idea/.idea.Aaru.Server/.idea/vcs.xml
index 00056d19..9071732d 100644
--- a/.idea/.idea.Aaru.Server/.idea/vcs.xml
+++ b/.idea/.idea.Aaru.Server/.idea/vcs.xml
@@ -7,6 +7,7 @@
   </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Aaru.Server.New/Aaru.Documentation" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/Aaru.Server/wwwroot" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/CICMMetadata" vcs="Git" />
   </component>
diff --git a/Aaru.Server.Api/Aaru.Server.Api.csproj b/Aaru.Server.Api/Aaru.Server.Api.csproj
index 88a7b97a..fbb720db 100644
--- a/Aaru.Server.Api/Aaru.Server.Api.csproj
+++ b/Aaru.Server.Api/Aaru.Server.Api.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <InvariantGlobalization>true</InvariantGlobalization>
-        <PublishAot>true</PublishAot>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <InvariantGlobalization>true</InvariantGlobalization>
+    <!--        <PublishAot>true</PublishAot> -->
+  </PropertyGroup>
 
 </Project>
diff --git a/Aaru.Server.Database/Aaru.Server.Database.csproj b/Aaru.Server.Database/Aaru.Server.Database.csproj
index c68ca2b5..d2a5ab6b 100644
--- a/Aaru.Server.Database/Aaru.Server.Database.csproj
+++ b/Aaru.Server.Database/Aaru.Server.Database.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Aaru.CommonTypes" Version="6.0.0-alpha8"/>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.0"/>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0"/>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0"/>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0"/>
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0"/>
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.3.efcore.9.0.0"/>
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2"/>
   </ItemGroup>
 </Project>
diff --git a/Aaru.Server.New/Aaru.Server.New.csproj b/Aaru.Server.New/Aaru.Server.New.csproj
index ba5aa666..24fc755f 100644
--- a/Aaru.Server.New/Aaru.Server.New.csproj
+++ b/Aaru.Server.New/Aaru.Server.New.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-Aaru.Server.New-79282495-4F67-4766-871D-448D1338E8BC</UserSecretsId>
@@ -18,15 +18,15 @@
     <PackageReference Include="ChoPGP" Version="1.0.1.5"/>
     <PackageReference Include="MailKit" Version="4.5.0"/>
     <PackageReference Include="Markdig" Version="0.37.0"/>
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.4"/>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.4"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4"/>
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0"/>
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0"/>
     <PackageReference Include="MimeKit" Version="4.5.0"/>
     <PackageReference Include="WebStoating.Markdig.PrismWithPlugins" Version="1.0.0"/>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2"/>
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.3.efcore.9.0.0"/>
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.4"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.0"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Aaru.Server.New/Program.cs b/Aaru.Server.New/Program.cs
index 6e84f24a..c0ec46e3 100644
--- a/Aaru.Server.New/Program.cs
+++ b/Aaru.Server.New/Program.cs
@@ -141,7 +141,7 @@ else
 app.UseHttpsRedirection();
 
 app.UseAuthorization();
-app.UseStaticFiles();
+app.MapStaticAssets();
 app.UseAntiforgery();
 
 app.MapRazorComponents<App>().AddInteractiveServerRenderMode();
diff --git a/Aaru.Server.sln.DotSettings b/Aaru.Server.sln.DotSettings
index 0cd40dee..7ed06dbe 100644
--- a/Aaru.Server.sln.DotSettings
+++ b/Aaru.Server.sln.DotSettings
@@ -988,6 +988,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=AACS/@EntryIndexedValue">True</s:Boolean>
diff --git a/Aaru.Server/wwwroot b/Aaru.Server/wwwroot
index 12d07980..b16ee1ab 160000
--- a/Aaru.Server/wwwroot
+++ b/Aaru.Server/wwwroot
@@ -1 +1 @@
-Subproject commit 12d079807da1e148f498acede25b01133bcda9a5
+Subproject commit b16ee1ab1b749a6c68d37629a9eac07a35aadd7d