diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a8e8e6de..f0389930 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,10 +21,10 @@ jobs:
       - name: Fetch Submodules Recursively
         run: git submodule update --init --recursive
 
-      - name: .NET 8 Setup
+      - name: .NET 10 Setup
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '10.0.x'
 
       - name: .NET Restore
         run: dotnet restore FModel
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
index 3898ed70..b5acda65 100644
--- a/.github/workflows/qa.yml
+++ b/.github/workflows/qa.yml
@@ -14,10 +14,10 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: .NET 8 Setup
+      - name: .NET 10 Setup
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '10.0.x'
 
       - name: .NET Restore
         run: dotnet restore "./FModel/FModel.slnx"
diff --git a/.gitmodules b/.gitmodules
index 2221fc41..6f7f679d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "CUE4Parse"]
 	path = CUE4Parse
 	url = https://github.com/FabianFG/CUE4Parse
+[submodule "Adonis"]
+	path = Adonis
+	url = https://github.com/FModel/adonis-ui
diff --git a/Adonis b/Adonis
new file mode 160000
index 00000000..ca374f32
--- /dev/null
+++ b/Adonis
@@ -0,0 +1 @@
+Subproject commit ca374f32f71718d4662ff86bd9720c710666d5e0
diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
index 552ce20d..81a199a3 100644
--- a/FModel/FModel.csproj
+++ b/FModel/FModel.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>FModel.ico</ApplicationIcon>
     <Version>4.4.4.0</Version>
@@ -150,8 +150,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AdonisUI" Version="1.17.1" />
-    <PackageReference Include="AdonisUI.ClassicTheme" Version="1.17.1" />
     <PackageReference Include="Autoupdater.NET.Official" Version="1.9.2" />
     <PackageReference Include="AvalonEdit" Version="6.3.1.120" />
     <PackageReference Include="CSCore" Version="1.2.1.2" />
@@ -173,6 +171,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Adonis\src\AdonisUI\AdonisUI.csproj" />
+    <ProjectReference Include="..\Adonis\src\AdonisUI.ClassicTheme\AdonisUI.ClassicTheme.csproj" />
     <ProjectReference Include="..\CUE4Parse\CUE4Parse-Conversion\CUE4Parse-Conversion.csproj" />
     <ProjectReference Include="..\CUE4Parse\CUE4Parse\CUE4Parse.csproj" />
   </ItemGroup>
diff --git a/FModel/FModel.sln b/FModel/FModel.sln
deleted file mode 100644
index 238d1b59..00000000
--- a/FModel/FModel.sln
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31912.275
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FModel", "FModel.csproj", "{B1F494EA-90A6-4C24-800E-2F724A1884CA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUE4Parse", "..\CUE4Parse\CUE4Parse\CUE4Parse.csproj", "{C4620341-BBB7-4384-AC7D-5082D3E0386E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUE4Parse-Conversion", "..\CUE4Parse\CUE4Parse-Conversion\CUE4Parse-Conversion.csproj", "{D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B1F494EA-90A6-4C24-800E-2F724A1884CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1F494EA-90A6-4C24-800E-2F724A1884CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1F494EA-90A6-4C24-800E-2F724A1884CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1F494EA-90A6-4C24-800E-2F724A1884CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4620341-BBB7-4384-AC7D-5082D3E0386E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4620341-BBB7-4384-AC7D-5082D3E0386E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4620341-BBB7-4384-AC7D-5082D3E0386E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4620341-BBB7-4384-AC7D-5082D3E0386E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {53DB7A15-4E15-4575-9402-0110BDF2794E}
-	EndGlobalSection
-EndGlobal
diff --git a/FModel/FModel.slnx b/FModel/FModel.slnx
index ca74a91b..48be1ac4 100644
--- a/FModel/FModel.slnx
+++ b/FModel/FModel.slnx
@@ -1,4 +1,6 @@
 <Solution>
+  <Project Path="../Adonis/src/AdonisUI/AdonisUI.csproj" />
+  <Project Path="../Adonis/src/AdonisUI.ClassicTheme/AdonisUI.ClassicTheme.csproj" />
   <Project Path="../CUE4Parse/CUE4Parse-Conversion/CUE4Parse-Conversion.csproj" />
   <Project Path="../CUE4Parse/CUE4Parse/CUE4Parse.csproj" />
   <Project Path="FModel.csproj" />