diff --git a/LICENSE.txt b/LICENSE.txt
index 53c1ac5..9ce4a81 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2023 Valeriano Alfonso Rodriguez
+Copyright (c) 2015-2025 Valeriano Alfonso Rodriguez
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 87f3c82..bfbb2f1 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ VAR.WebFormsCore is a web framework based lightly on ASP.Net WebForms.
   * [x] AspnetCore
 
 ## Usage
-Currently there are two libraries:
+Currently, there are two libraries:
 * `VAR.WebFormsCore`: Core implementation of WebFormsCore
 * `VAR.WebFormsCore.AspnetCore`: AspnetCore interface
 
@@ -32,7 +32,7 @@ And one test web-application:
 * `VAR.WebFormsCore.TestWebApp`: A simple example web-application using WebFormsCore.
 
 ## Building
-A SLN solution is provided, for usage on Visual Studio, Rider or any editor with Omnisharp.
+An SLN solution is provided, for usage on Visual Studio, Rider or any editor with Omnisharp.
 
 ## Contributing
 1. Fork it!
diff --git a/VAR.WebFormsCore.AspNetCore/DefaultMain.cs b/VAR.WebFormsCore.AspNetCore/DefaultMain.cs
new file mode 100644
index 0000000..40788a9
--- /dev/null
+++ b/VAR.WebFormsCore.AspNetCore/DefaultMain.cs
@@ -0,0 +1,17 @@
+using Microsoft.AspNetCore.Builder;
+using VAR.WebFormsCore.AspNetCore.Code;
+
+namespace VAR.WebFormsCore.AspNetCore;
+
+public static class DefaultMain
+{
+    public static void WebFormCoreMain(string[] args)
+    {
+        var builder = WebApplication.CreateBuilder(args);
+        var app = builder.Build();
+
+        app.UseGlobalRouterMiddleware(builder.Environment);
+
+        app.Run();
+    }
+}
\ No newline at end of file
diff --git a/VAR.WebFormsCore.AspNetCore/Program.cs b/VAR.WebFormsCore.AspNetCore/Program.cs
deleted file mode 100644
index cbea266..0000000
--- a/VAR.WebFormsCore.AspNetCore/Program.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
-
-namespace VAR.WebFormsCore.AspNetCore;
-
-public static class DefaultMain
-{
-    public static void WebFormCoreMain(string[] args) { CreateHostBuilder(args).Build().Run(); }
-
-    private static IHostBuilder CreateHostBuilder(string[] args) =>
-        Host.CreateDefaultBuilder(args)
-            .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
-}
\ No newline at end of file
diff --git a/VAR.WebFormsCore.AspNetCore/Startup.cs b/VAR.WebFormsCore.AspNetCore/Startup.cs
deleted file mode 100644
index 3582b0f..0000000
--- a/VAR.WebFormsCore.AspNetCore/Startup.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Microsoft.Extensions.DependencyInjection;
-using VAR.WebFormsCore.AspNetCore.Code;
-
-namespace VAR.WebFormsCore.AspNetCore;
-
-public class Startup
-{
-    public void ConfigureServices(IServiceCollection services)
-    {
-        // If using Kestrel:
-        services.Configure<KestrelServerOptions>(options => { options.AddServerHeader = false; });
-    }
-
-    public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { app.UseGlobalRouterMiddleware(env); }
-}
\ No newline at end of file
diff --git a/VAR.WebFormsCore.AspNetCore/VAR.WebFormsCore.AspNetCore.csproj b/VAR.WebFormsCore.AspNetCore/VAR.WebFormsCore.AspNetCore.csproj
index c6e0112..85b5678 100644
--- a/VAR.WebFormsCore.AspNetCore/VAR.WebFormsCore.AspNetCore.csproj
+++ b/VAR.WebFormsCore.AspNetCore/VAR.WebFormsCore.AspNetCore.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Library</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
diff --git a/VAR.WebFormsCore.TestWebApp/VAR.WebFormsCore.TestWebApp.csproj b/VAR.WebFormsCore.TestWebApp/VAR.WebFormsCore.TestWebApp.csproj
index 2b322c4..dc1c1f0 100644
--- a/VAR.WebFormsCore.TestWebApp/VAR.WebFormsCore.TestWebApp.csproj
+++ b/VAR.WebFormsCore.TestWebApp/VAR.WebFormsCore.TestWebApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
diff --git a/VAR.WebFormsCore.Tests/VAR.WebFormsCore.Tests.csproj b/VAR.WebFormsCore.Tests/VAR.WebFormsCore.Tests.csproj
index edd3646..1c60024 100644
--- a/VAR.WebFormsCore.Tests/VAR.WebFormsCore.Tests.csproj
+++ b/VAR.WebFormsCore.Tests/VAR.WebFormsCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
diff --git a/VAR.WebFormsCore.sln.DotSettings b/VAR.WebFormsCore.sln.DotSettings
index abb84e5..e11a551 100644
--- a/VAR.WebFormsCore.sln.DotSettings
+++ b/VAR.WebFormsCore.sln.DotSettings
@@ -16,6 +16,10 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ENUM_DECLARATION/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PARAMETERS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
     <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+	<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_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=abiword/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Childs/@EntryIndexedValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/UserDictionary/Words/=Deauthenticate/@EntryIndexedValue">True</s:Boolean>