diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c770205..a23d053 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,13 +13,13 @@ jobs:
     name: Build windows-latest
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 8.0.*
+        dotnet-version: 10.0.*
     - name: Install Dependencies
-      run: dotnet restore
+      run: dotnet restore --configfile ./NuGet.config
     - name: Build
       run: dotnet build --configuration Release --no-restore
     - name: Test
diff --git a/Directory.Build.props b/Directory.Build.props
index 9c8767b..c76c022 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,7 @@
 <Project>
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>disable</Nullable>
 		<IsPackable>false</IsPackable>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 	</PropertyGroup>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index ca701ce..6d39bd3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -10,7 +10,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="5.3.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.3.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
-    <PackageVersion Include="OrchardCore.DisplayManagement.Liquid" Version="2.2.1" />
+    <PackageVersion Include="OrchardCore.DisplayManagement.Liquid" Version="3.0.0-preview-19005" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.analyzers" Version="1.27.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
diff --git a/NuGet.config b/NuGet.config
index f96ed09..336a592 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,8 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <packageSources>
-    <!-- Ignore global configuration -->
-    <clear />
-    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
+	<packageSources>
+		<clear />
+		<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
+		<add key="Cloudsmith" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" />
+	</packageSources>
+
+	<packageSourceMapping>
+		<packageSource key="Cloudsmith">
+			<package pattern="OrchardCore" />
+			<package pattern="OrchardCore.*" />
+			<package pattern="TheAdmin" />
+			<package pattern="TheAgencyTheme" />
+			<package pattern="TheBlogTheme" />
+			<package pattern="TheComingSoonTheme" />
+			<package pattern="TheTheme" />
+			<package pattern="SafeMode" />
+		</packageSource>
+		<packageSource key="NuGet">
+			<package pattern="*" />
+			<package pattern="OrchardCoreContrib.*" />
+			<package pattern="OrchardCore.Translations.*" />
+		</packageSource>
+	</packageSourceMapping>
 </configuration>
diff --git a/OrchardCoreContrib.PoExtractor.sln b/OrchardCoreContrib.PoExtractor.sln
deleted file mode 100644
index d149bdf..0000000
--- a/OrchardCoreContrib.PoExtractor.sln
+++ /dev/null
@@ -1,117 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33103.184
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCoreContrib.PoExtractor.Abstractions.Tests", "test\OrchardCoreContrib.PoExtractor.Core.Tests\OrchardCoreContrib.PoExtractor.Abstractions.Tests.csproj", "{4E0AF6EC-9BD0-4D39-8123-06163362185D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCoreContrib.PoExtractor.Liquid", "src\OrchardCoreContrib.PoExtractor.Liquid\OrchardCoreContrib.PoExtractor.Liquid.csproj", "{9DB27A54-F56F-465E-A1A9-28791C64710B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCoreContrib.PoExtractor", "src\OrchardCoreContrib.PoExtractor\OrchardCoreContrib.PoExtractor.csproj", "{D358C2C3-D568-4C60-BBFA-38AA2BE95C7A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCoreContrib.PoExtractor.Razor", "src\OrchardCoreContrib.PoExtractor.Razor\OrchardCoreContrib.PoExtractor.Razor.csproj", "{D871D2E9-FBD0-4C32-AE1A-0FBC89356345}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCoreContrib.PoExtractor.DotNet", "src\OrchardCoreContrib.PoExtractor.DotNet\OrchardCoreContrib.PoExtractor.DotNet.csproj", "{B86D3896-8371-47DF-94B4-634AA7C7A1C7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCoreContrib.PoExtractor.DotNet.CS", "src\OrchardCoreContrib.PoExtractor.DotNet.CS\OrchardCoreContrib.PoExtractor.DotNet.CS.csproj", "{F12A2C3B-728B-4AEC-9495-3FB56300D941}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCoreContrib.PoExtractor.DotNet.VB", "src\OrchardCoreContrib.PoExtractor.DotNet.VB\OrchardCoreContrib.PoExtractor.DotNet.VB.csproj", "{458FE156-43B6-4DB9-965D-672A7D318B90}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCoreContrib.PoExtractor.Liquid.Tests", "test\OrchardCoreContrib.PoExtractor.Liquid.Tests\OrchardCoreContrib.PoExtractor.Liquid.Tests.csproj", "{042754CC-2E1A-4ED9-8944-E51708A43515}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FCA7649D-2A78-4580-8866-A00571045744}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D1336C32-75A4-411A-90D3-E011D2CEB076}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCoreContrib.PoExtractor.Abstractions", "src\OrchardCoreContrib.PoExtractor.Abstractions\OrchardCoreContrib.PoExtractor.Abstractions.csproj", "{3CEF8D52-49EB-49C9-A421-64A59C031B61}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCoreContrib.PoExtractor.Tests", "test\OrchardCoreContrib.PoExtractor.Tests\OrchardCoreContrib.PoExtractor.Tests.csproj", "{7989E10F-A776-44FE-B3CF-1EB377EFD665}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCoreContrib.PoExtractor.DotNet.CS.Tests", "test\OrchardCoreContrib.PoExtractor.DotNet.CS.Tests\OrchardCoreContrib.PoExtractor.DotNet.CS.Tests.csproj", "{8BD3C4A9-2778-4B2F-8709-79FDC027CA01}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCoreContrib.PoExtractor.DotNet.VB.Tests", "test\OrchardCoreContrib.PoExtractor.DotNet.VB.Tests\OrchardCoreContrib.PoExtractor.DotNet.VB.Tests.csproj", "{A5885141-EDF9-4C6C-AFF7-B0BE92079E31}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DDD306EA-9B35-4984-9E96-CBE0450B82DC}"
-	ProjectSection(SolutionItems) = preProject
-		Directory.Build.props = Directory.Build.props
-		Directory.Packages.props = Directory.Packages.props
-		README.md = README.md
-		NuGet.config = NuGet.config
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4E0AF6EC-9BD0-4D39-8123-06163362185D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E0AF6EC-9BD0-4D39-8123-06163362185D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E0AF6EC-9BD0-4D39-8123-06163362185D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4E0AF6EC-9BD0-4D39-8123-06163362185D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9DB27A54-F56F-465E-A1A9-28791C64710B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DB27A54-F56F-465E-A1A9-28791C64710B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DB27A54-F56F-465E-A1A9-28791C64710B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9DB27A54-F56F-465E-A1A9-28791C64710B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D358C2C3-D568-4C60-BBFA-38AA2BE95C7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D358C2C3-D568-4C60-BBFA-38AA2BE95C7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D358C2C3-D568-4C60-BBFA-38AA2BE95C7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D358C2C3-D568-4C60-BBFA-38AA2BE95C7A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D871D2E9-FBD0-4C32-AE1A-0FBC89356345}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D871D2E9-FBD0-4C32-AE1A-0FBC89356345}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D871D2E9-FBD0-4C32-AE1A-0FBC89356345}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D871D2E9-FBD0-4C32-AE1A-0FBC89356345}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B86D3896-8371-47DF-94B4-634AA7C7A1C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B86D3896-8371-47DF-94B4-634AA7C7A1C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B86D3896-8371-47DF-94B4-634AA7C7A1C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B86D3896-8371-47DF-94B4-634AA7C7A1C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F12A2C3B-728B-4AEC-9495-3FB56300D941}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F12A2C3B-728B-4AEC-9495-3FB56300D941}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F12A2C3B-728B-4AEC-9495-3FB56300D941}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F12A2C3B-728B-4AEC-9495-3FB56300D941}.Release|Any CPU.Build.0 = Release|Any CPU
-		{458FE156-43B6-4DB9-965D-672A7D318B90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{458FE156-43B6-4DB9-965D-672A7D318B90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{458FE156-43B6-4DB9-965D-672A7D318B90}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{458FE156-43B6-4DB9-965D-672A7D318B90}.Release|Any CPU.Build.0 = Release|Any CPU
-		{042754CC-2E1A-4ED9-8944-E51708A43515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{042754CC-2E1A-4ED9-8944-E51708A43515}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{042754CC-2E1A-4ED9-8944-E51708A43515}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{042754CC-2E1A-4ED9-8944-E51708A43515}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CEF8D52-49EB-49C9-A421-64A59C031B61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CEF8D52-49EB-49C9-A421-64A59C031B61}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CEF8D52-49EB-49C9-A421-64A59C031B61}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3CEF8D52-49EB-49C9-A421-64A59C031B61}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7989E10F-A776-44FE-B3CF-1EB377EFD665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7989E10F-A776-44FE-B3CF-1EB377EFD665}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7989E10F-A776-44FE-B3CF-1EB377EFD665}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7989E10F-A776-44FE-B3CF-1EB377EFD665}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8BD3C4A9-2778-4B2F-8709-79FDC027CA01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BD3C4A9-2778-4B2F-8709-79FDC027CA01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BD3C4A9-2778-4B2F-8709-79FDC027CA01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BD3C4A9-2778-4B2F-8709-79FDC027CA01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A5885141-EDF9-4C6C-AFF7-B0BE92079E31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5885141-EDF9-4C6C-AFF7-B0BE92079E31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5885141-EDF9-4C6C-AFF7-B0BE92079E31}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A5885141-EDF9-4C6C-AFF7-B0BE92079E31}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{4E0AF6EC-9BD0-4D39-8123-06163362185D} = {D1336C32-75A4-411A-90D3-E011D2CEB076}
-		{9DB27A54-F56F-465E-A1A9-28791C64710B} = {FCA7649D-2A78-4580-8866-A00571045744}
-		{D358C2C3-D568-4C60-BBFA-38AA2BE95C7A} = {FCA7649D-2A78-4580-8866-A00571045744}
-		{D871D2E9-FBD0-4C32-AE1A-0FBC89356345} = {FCA7649D-2A78-4580-8866-A00571045744}
-		{B86D3896-8371-47DF-94B4-634AA7C7A1C7} = {FCA7649D-2A78-4580-8866-A00571045744}
-		{F12A2C3B-728B-4AEC-9495-3FB56300D941} = {FCA7649D-2A78-4580-8866-A00571045744}
-		{458FE156-43B6-4DB9-965D-672A7D318B90} = {FCA7649D-2A78-4580-8866-A00571045744}
-		{042754CC-2E1A-4ED9-8944-E51708A43515} = {D1336C32-75A4-411A-90D3-E011D2CEB076}
-		{3CEF8D52-49EB-49C9-A421-64A59C031B61} = {FCA7649D-2A78-4580-8866-A00571045744}
-		{7989E10F-A776-44FE-B3CF-1EB377EFD665} = {D1336C32-75A4-411A-90D3-E011D2CEB076}
-		{8BD3C4A9-2778-4B2F-8709-79FDC027CA01} = {D1336C32-75A4-411A-90D3-E011D2CEB076}
-		{A5885141-EDF9-4C6C-AFF7-B0BE92079E31} = {D1336C32-75A4-411A-90D3-E011D2CEB076}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {694D0244-80FF-47D4-A54D-2DB1356B72A1}
-	EndGlobalSection
-EndGlobal
diff --git a/OrchardCoreContrib.PoExtractor.slnx b/OrchardCoreContrib.PoExtractor.slnx
new file mode 100644
index 0000000..ab10efd
--- /dev/null
+++ b/OrchardCoreContrib.PoExtractor.slnx
@@ -0,0 +1,24 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+    <File Path="NuGet.config" />
+    <File Path="README.md" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/OrchardCoreContrib.PoExtractor.Abstractions/OrchardCoreContrib.PoExtractor.Abstractions.csproj" />
+    <Project Path="src/OrchardCoreContrib.PoExtractor.DotNet.CS/OrchardCoreContrib.PoExtractor.DotNet.CS.csproj" />
+    <Project Path="src/OrchardCoreContrib.PoExtractor.DotNet.VB/OrchardCoreContrib.PoExtractor.DotNet.VB.csproj" />
+    <Project Path="src/OrchardCoreContrib.PoExtractor.DotNet/OrchardCoreContrib.PoExtractor.DotNet.csproj" />
+    <Project Path="src/OrchardCoreContrib.PoExtractor.Liquid/OrchardCoreContrib.PoExtractor.Liquid.csproj" />
+    <Project Path="src/OrchardCoreContrib.PoExtractor.Razor/OrchardCoreContrib.PoExtractor.Razor.csproj" />
+    <Project Path="src/OrchardCoreContrib.PoExtractor/OrchardCoreContrib.PoExtractor.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="test/OrchardCoreContrib.PoExtractor.Core.Tests/OrchardCoreContrib.PoExtractor.Abstractions.Tests.csproj" />
+    <Project Path="test/OrchardCoreContrib.PoExtractor.DotNet.CS.Tests/OrchardCoreContrib.PoExtractor.DotNet.CS.Tests.csproj" />
+    <Project Path="test/OrchardCoreContrib.PoExtractor.DotNet.VB.Tests/OrchardCoreContrib.PoExtractor.DotNet.VB.Tests.csproj" />
+    <Project Path="test/OrchardCoreContrib.PoExtractor.Liquid.Tests/OrchardCoreContrib.PoExtractor.Liquid.Tests.csproj" />
+    <Project Path="test/OrchardCoreContrib.PoExtractor.Tests/OrchardCoreContrib.PoExtractor.Tests.csproj" />
+  </Folder>
+</Solution>
diff --git a/global.json b/global.json
deleted file mode 100644
index 7900c22..0000000
--- a/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "sdk": {
-    "version": "8.0.0",
-    "rollForward": "latestMinor"
-  }
-}