diff --git a/.run/BTCPayServer_ Altcoins-HTTPS.run.xml b/.run/BTCPayServer_ Altcoins-HTTPS.run.xml
index a16a770..75303db 100644
--- a/.run/BTCPayServer_ Altcoins-HTTPS.run.xml	
+++ b/.run/BTCPayServer_ Altcoins-HTTPS.run.xml	
@@ -12,7 +12,6 @@
     <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
     <method v="2">
       <option name="Build Solution" enabled="true" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="wabi publish" run_configuration_type="DotNetFolderPublish" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/Plugins/BTCPayServer.Plugins.AOPP/BTCPayServer.Plugins.AOPP.csproj b/Plugins/BTCPayServer.Plugins.AOPP/BTCPayServer.Plugins.AOPP.csproj
index 3313874..2ceb735 100644
--- a/Plugins/BTCPayServer.Plugins.AOPP/BTCPayServer.Plugins.AOPP.csproj
+++ b/Plugins/BTCPayServer.Plugins.AOPP/BTCPayServer.Plugins.AOPP.csproj
@@ -1,34 +1,54 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-  <Import Project="../../submodules/btcpayserver/Build/Common.csproj" />
-  <PropertyGroup>
-    <Product>AOPP</Product>
-    <Description>Allows you to support the AOPP protocol in invoices to allow customers to bypass stupid KYC rules.</Description>
-    <Authors>Kukks</Authors>
-    <Version>1.0.1</Version>
-  </PropertyGroup>
 
-  <!-- Plugin development properties -->
-  <PropertyGroup>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <PreserveCompilationContext>false</PreserveCompilationContext>
-    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-  </PropertyGroup>
+  <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-  <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
-  <ItemDefinitionGroup>
-    <ProjectReference>
-      <Properties>StaticWebAssetsEnabled=false</Properties>
-      <Private>false</Private>
-      <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
-    </ProjectReference>
-  </ItemDefinitionGroup>
+    <PropertyGroup>
+      <TargetFramework>net6.0</TargetFramework>
+      <LangVersion>10</LangVersion>
+      <Configurations>Debug;Release;Altcoins-Release;Altcoins-Debug</Configurations>
+      <Platforms>AnyCPU</Platforms>
+    </PropertyGroup>
+
+    <!-- Default similar to Debug/Release -->
+    <PropertyGroup Condition=" '$(Configuration)' == 'Altcoins-Release' ">
+      <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+      <Altcoins>true</Altcoins>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)' == 'Altcoins-Debug'">
+      <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+      <Altcoins>true</Altcoins>
+    </PropertyGroup>
+
+    <!-- Plugin specific properties -->
+    <PropertyGroup>
+      <Product>AOPP</Product>
+      <Description>Allows you to support the AOPP protocol in invoices to allow customers to bypass stupid KYC rules.</Description>
+      <Authors>Kukks</Authors>
+      <Version>1.0.1</Version>
+    </PropertyGroup>
+
+    <!-- Plugin development properties -->
+    <PropertyGroup>
+      <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+      <PreserveCompilationContext>false</PreserveCompilationContext>
+      <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+    </PropertyGroup>
+
+    <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
+    <ItemDefinitionGroup>
+      <ProjectReference>
+        <Properties>StaticWebAssetsEnabled=false</Properties>
+        <Private>false</Private>
+        <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
+      </ProjectReference>
+    </ItemDefinitionGroup>
+
+
+    <ItemGroup>
+      <EmbeddedResource Include="Resources\**"/>
+      <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj"/>
+    </ItemGroup>
+    <ItemGroup>
+      <Folder Include="Resources"/>
+    </ItemGroup>
+  </Project>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj" />
-    <EmbeddedResource Include="Resources\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Views\Shared" />
-  </ItemGroup>
-</Project>
diff --git a/Plugins/BTCPayServer.Plugins.BitcoinWhitepaper/BTCPayServer.Plugins.BitcoinWhitepaper.csproj b/Plugins/BTCPayServer.Plugins.BitcoinWhitepaper/BTCPayServer.Plugins.BitcoinWhitepaper.csproj
index 7126445..34c810c 100644
--- a/Plugins/BTCPayServer.Plugins.BitcoinWhitepaper/BTCPayServer.Plugins.BitcoinWhitepaper.csproj
+++ b/Plugins/BTCPayServer.Plugins.BitcoinWhitepaper/BTCPayServer.Plugins.BitcoinWhitepaper.csproj
@@ -1,34 +1,53 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
 
-    <Import Project="../../submodules/btcpayserver/Build/Common.csproj" />
+    <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-    <!-- Plugin specific properties -->
-    <PropertyGroup>
-        <Product>Bitcoin Whitepaper</Product>
-        <Description>This makes the Bitcoin whitepaper available on your BTCPay Server.</Description>
-        <Authors>Kukks</Authors>
-        <Version>1.0.2</Version>
-    </PropertyGroup>
+        <PropertyGroup>
+            <TargetFramework>net6.0</TargetFramework>
+            <LangVersion>10</LangVersion>
+            <Configurations>Debug;Release;Altcoins-Release;Altcoins-Debug</Configurations>
+            <Platforms>AnyCPU</Platforms>
+        </PropertyGroup>
 
-    <!-- Plugin development properties -->
-    <PropertyGroup>
-        <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-        <PreserveCompilationContext>false</PreserveCompilationContext>
-        <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-    </PropertyGroup>
+        <!-- Default similar to Debug/Release -->
+        <PropertyGroup Condition=" '$(Configuration)' == 'Altcoins-Release' ">
+            <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+            <Altcoins>true</Altcoins>
+        </PropertyGroup>
+        <PropertyGroup Condition="'$(Configuration)' == 'Altcoins-Debug'">
+            <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+            <Altcoins>true</Altcoins>
+        </PropertyGroup>
 
-    <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
-    <ItemDefinitionGroup>
-        <ProjectReference>
-            <Properties>StaticWebAssetsEnabled=false</Properties>
-            <Private>false</Private>
-            <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
-        </ProjectReference>
-    </ItemDefinitionGroup>
+        <!-- Plugin specific properties -->
+        <PropertyGroup>
+            <Product>Bitcoin Whitepaper</Product>
+            <Description>This makes the Bitcoin whitepaper available on your BTCPay Server.</Description>
+            <Authors>Kukks</Authors>
+            <Version>1.0.2</Version>
+        </PropertyGroup>
+        <!-- Plugin development properties -->
+        <PropertyGroup>
+            <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+            <PreserveCompilationContext>false</PreserveCompilationContext>
+            <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+        </PropertyGroup>
+
+        <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
+        <ItemDefinitionGroup>
+            <ProjectReference>
+                <Properties>StaticWebAssetsEnabled=false</Properties>
+                <Private>false</Private>
+                <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
+            </ProjectReference>
+        </ItemDefinitionGroup>
+
+
+        <ItemGroup>
+            <EmbeddedResource Include="Resources\**"/>
+            <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj"/>
+        </ItemGroup>
+        <ItemGroup>
+            <Folder Include="Resources"/>
+        </ItemGroup>
+    </Project>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj">
-        </ProjectReference>
-        <EmbeddedResource Include="bitcoin.pdf" />
-    </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Plugins/BTCPayServer.Plugins.FixedFloat/BTCPayServer.Plugins.FixedFloat.csproj b/Plugins/BTCPayServer.Plugins.FixedFloat/BTCPayServer.Plugins.FixedFloat.csproj
index 27531e8..f519f40 100644
--- a/Plugins/BTCPayServer.Plugins.FixedFloat/BTCPayServer.Plugins.FixedFloat.csproj
+++ b/Plugins/BTCPayServer.Plugins.FixedFloat/BTCPayServer.Plugins.FixedFloat.csproj
@@ -1,36 +1,52 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-  <Import Project="../../submodules/btcpayserver/Build/Common.csproj" />
-  <!-- Plugin specific properties -->
-  <PropertyGroup>
-    <Product>FixedFloat</Product>
-    <Description>Allows you to embed a FixedFloat conversion screen to allow customers to pay with altcoins.</Description>
-    <Authors>Kukks</Authors>
-    <Version>1.0.6</Version>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <LangVersion>10</LangVersion>
+        <Configurations>Debug;Release;Altcoins-Release;Altcoins-Debug</Configurations>
+        <Platforms>AnyCPU</Platforms>
+    </PropertyGroup>
 
-  <!-- Plugin development properties -->
-  <PropertyGroup>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <PreserveCompilationContext>false</PreserveCompilationContext>
-    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-  </PropertyGroup>
+    <!-- Default similar to Debug/Release -->
+    <PropertyGroup Condition=" '$(Configuration)' == 'Altcoins-Release' ">
+        <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+        <Altcoins>true</Altcoins>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)' == 'Altcoins-Debug'">
+        <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+        <Altcoins>true</Altcoins>
+    </PropertyGroup>
 
-  <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
-  <ItemDefinitionGroup>
-    <ProjectReference>
-      <Properties>StaticWebAssetsEnabled=false</Properties>
-      <Private>false</Private>
-      <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj" />
-    <EmbeddedResource Include="Resources\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Views\Shared" />
-  </ItemGroup>
+    <!-- Plugin specific properties -->
+    <PropertyGroup>
+        <Product>FixedFloat</Product>
+        <Description>Allows you to embed a FixedFloat conversion screen to allow customers to pay with altcoins.</Description>
+        <Authors>Kukks</Authors>
+        <Version>1.0.6</Version>
+    </PropertyGroup>
+    <!-- Plugin development properties -->
+    <PropertyGroup>
+        <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+        <PreserveCompilationContext>false</PreserveCompilationContext>
+        <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+    </PropertyGroup>
+
+    <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
+    <ItemDefinitionGroup>
+        <ProjectReference>
+            <Properties>StaticWebAssetsEnabled=false</Properties>
+            <Private>false</Private>
+            <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
+        </ProjectReference>
+    </ItemDefinitionGroup>
+
+
+    <ItemGroup>
+        <EmbeddedResource Include="Resources\**"/>
+        <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj"/>
+    </ItemGroup>
+    <ItemGroup>
+        <Folder Include="Resources"/>
+    </ItemGroup>
 </Project>
+
diff --git a/Plugins/BTCPayServer.Plugins.LSP/BTCPayServer.Plugins.LSP.csproj b/Plugins/BTCPayServer.Plugins.LSP/BTCPayServer.Plugins.LSP.csproj
index 07eba4f..1fba247 100644
--- a/Plugins/BTCPayServer.Plugins.LSP/BTCPayServer.Plugins.LSP.csproj
+++ b/Plugins/BTCPayServer.Plugins.LSP/BTCPayServer.Plugins.LSP.csproj
@@ -1,6 +1,24 @@
+
+
+
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-  <Import Project="../../submodules/btcpayserver/Build/Common.csproj" />
+<PropertyGroup>
+  <TargetFramework>net6.0</TargetFramework>
+  <LangVersion>10</LangVersion>
+  <Configurations>Debug;Release;Altcoins-Release;Altcoins-Debug</Configurations>
+  <Platforms>AnyCPU</Platforms>
+</PropertyGroup>
+
+<!-- Default similar to Debug/Release -->
+<PropertyGroup Condition=" '$(Configuration)' == 'Altcoins-Release' ">
+  <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+  <Altcoins>true</Altcoins>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)' == 'Altcoins-Debug'">
+  <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+  <Altcoins>true</Altcoins>
+</PropertyGroup>
 
   <!-- Plugin specific properties -->
   <PropertyGroup>
@@ -9,29 +27,28 @@
     <Authors>Kukks</Authors>
     <Version>1.0.0</Version>
   </PropertyGroup>
+<!-- Plugin development properties -->
+<PropertyGroup>
+  <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+  <PreserveCompilationContext>false</PreserveCompilationContext>
+  <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+</PropertyGroup>
 
-  <!-- Plugin development properties -->
-  <PropertyGroup>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <PreserveCompilationContext>false</PreserveCompilationContext>
-    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-  </PropertyGroup>
+<!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
+<ItemDefinitionGroup>
+  <ProjectReference>
+    <Properties>StaticWebAssetsEnabled=false</Properties>
+    <Private>false</Private>
+    <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
+  </ProjectReference>
+</ItemDefinitionGroup>
 
-  <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
-  <ItemDefinitionGroup>
-    <ProjectReference>
-      <Properties>StaticWebAssetsEnabled=false</Properties>
-      <Private>false</Private>
-      <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
-    </ProjectReference>
-  </ItemDefinitionGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj" />
-    <EmbeddedResource Include="Resources\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Views\Shared" />
-  </ItemGroup>
+<ItemGroup>
+  <EmbeddedResource Include="Resources\**"/>
+  <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj"/>
+</ItemGroup>
+<ItemGroup>
+  <Folder Include="Resources"/>
+</ItemGroup>
 </Project>
diff --git a/Plugins/BTCPayServer.Plugins.LiquidPlus/BTCPayServer.Plugins.LiquidPlus.csproj b/Plugins/BTCPayServer.Plugins.LiquidPlus/BTCPayServer.Plugins.LiquidPlus.csproj
index 70741d3..f5833f7 100644
--- a/Plugins/BTCPayServer.Plugins.LiquidPlus/BTCPayServer.Plugins.LiquidPlus.csproj
+++ b/Plugins/BTCPayServer.Plugins.LiquidPlus/BTCPayServer.Plugins.LiquidPlus.csproj
@@ -1,55 +1,53 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+  <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-  <Import Project="../../submodules/btcpayserver/Build/Common.csproj" />
+    <PropertyGroup>
+      <TargetFramework>net6.0</TargetFramework>
+      <LangVersion>10</LangVersion>
+      <Configurations>Debug;Release;Altcoins-Release;Altcoins-Debug</Configurations>
+      <Platforms>AnyCPU</Platforms>
+    </PropertyGroup>
 
-  <!-- Default similar to Debug/Release -->
-  <PropertyGroup Condition=" '$(Configuration)' == 'Altcoins-Release' ">
-    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
-    <Altcoins>true</Altcoins>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Altcoins-Debug'">
-    <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
-    <Altcoins>true</Altcoins>
-  </PropertyGroup>
-  <!-- -->
+    <!-- Default similar to Debug/Release -->
+    <PropertyGroup Condition=" '$(Configuration)' == 'Altcoins-Release' ">
+      <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+      <Altcoins>true</Altcoins>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)' == 'Altcoins-Debug'">
+      <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+      <Altcoins>true</Altcoins>
+    </PropertyGroup>
 
-  <PropertyGroup Condition="( '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Altcoins-Debug') And '$(RazorCompileOnBuild)' != 'true' And '$(DotNetWatchBuild)' != 'true' And '$(DesignTimeBuild)' != 'true'">
-    <RazorCompileOnBuild>false</RazorCompileOnBuild>
-  </PropertyGroup>
+    <!-- Plugin specific properties -->
+    <PropertyGroup>
+      <Product>Liquid+</Product>
+      <Description>Enhanced support for the liquid network.</Description>
+      <Authors>Kukks</Authors>
+      <Version>1.0.8</Version>
+    </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Altcoins)' == 'true'">
-    <DefineConstants>$(DefineConstants);ALTCOINS</DefineConstants>
-  </PropertyGroup>
-  <!-- Plugin specific properties -->
-  <PropertyGroup>
-    <Product>Liquid+</Product>
-    <Description>Enhanced support for the liquid network.</Description>
-    <Authors>Kukks</Authors>
-    <Version>1.0.8</Version>
-  </PropertyGroup>
+    <!-- Plugin development properties -->
+    <PropertyGroup>
+      <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+      <PreserveCompilationContext>false</PreserveCompilationContext>
+      <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+    </PropertyGroup>
 
-  <!-- Plugin development properties -->
-  <PropertyGroup>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <PreserveCompilationContext>false</PreserveCompilationContext>
-    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-  </PropertyGroup>
+    <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
+    <ItemDefinitionGroup>
+      <ProjectReference>
+        <Properties>StaticWebAssetsEnabled=false</Properties>
+        <Private>false</Private>
+        <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
+      </ProjectReference>
+    </ItemDefinitionGroup>
 
-  <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
-  <ItemDefinitionGroup>
-    <ProjectReference>
-      <Properties>StaticWebAssetsEnabled=false</Properties>
-      <Private>false</Private>
-      <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
-    </ProjectReference>
-  </ItemDefinitionGroup>
 
-  <ItemGroup>  
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj" />
-    <EmbeddedResource Include="Resources\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Views\Shared" />
-  </ItemGroup>
-</Project>
+    <ItemGroup>
+      <EmbeddedResource Include="Resources\**"/>
+      <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj"/>
+    </ItemGroup>
+    <ItemGroup>
+      <Folder Include="Resources"/>
+    </ItemGroup>
+  </Project>
+
diff --git a/Plugins/BTCPayServer.Plugins.LiquidPlus/Controllers/StoreLiquidController.cs b/Plugins/BTCPayServer.Plugins.LiquidPlus/Controllers/StoreLiquidController.cs
index cac0edd..21b04c5 100644
--- a/Plugins/BTCPayServer.Plugins.LiquidPlus/Controllers/StoreLiquidController.cs
+++ b/Plugins/BTCPayServer.Plugins.LiquidPlus/Controllers/StoreLiquidController.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -11,8 +12,10 @@ using BTCPayServer.Client;
 using BTCPayServer.Common;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using NBitcoin;
 using NBXplorer;
+using XX;
 
 namespace BTCPayServer.Plugins.LiquidPlus.Controllers
 {
@@ -262,3 +265,18 @@ public class GenerateLiquidImportScripts
         }
     }
 }
+namespace XX
+{
+    public static class ModelStateExtensions
+    {
+        public static void AddModelError<TModel, TProperty>(this TModel source,
+            Expression<Func<TModel, TProperty>> ex,
+            string message,
+            ControllerBase controller)
+        {
+            var provider = (ModelExpressionProvider)controller.HttpContext.RequestServices.GetService(typeof(ModelExpressionProvider));
+            var key = provider.GetExpressionText(ex);
+            controller.ModelState.AddModelError(key, message);
+        }
+    }
+}
diff --git a/Plugins/BTCPayServer.Plugins.NFC/BTCPayServer.Plugins.NFC.csproj b/Plugins/BTCPayServer.Plugins.NFC/BTCPayServer.Plugins.NFC.csproj
index 4cb7c2d..dea7c3f 100644
--- a/Plugins/BTCPayServer.Plugins.NFC/BTCPayServer.Plugins.NFC.csproj
+++ b/Plugins/BTCPayServer.Plugins.NFC/BTCPayServer.Plugins.NFC.csproj
@@ -1,38 +1,53 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
 
 
-  <Import Project="../../submodules/btcpayserver/Build/Common.csproj" />
+  <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-  <!-- Plugin specific properties -->
-  <PropertyGroup>
-    <Product>LNURL NFC Support</Product>
-    <Description>Allows you to support contactless card payments over NFC and LNURL Withdraw!</Description>
-    <Authors>Kukks</Authors>
-    <Version>1.0.8</Version>
-  </PropertyGroup>
+    <PropertyGroup>
+      <TargetFramework>net6.0</TargetFramework>
+      <LangVersion>10</LangVersion>
+      <Configurations>Debug;Release;Altcoins-Release;Altcoins-Debug</Configurations>
+      <Platforms>AnyCPU</Platforms>
+    </PropertyGroup>
 
-  <!-- Plugin development properties -->
-  <PropertyGroup>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <PreserveCompilationContext>false</PreserveCompilationContext>
-    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-  </PropertyGroup>
+    <!-- Default similar to Debug/Release -->
+    <PropertyGroup Condition=" '$(Configuration)' == 'Altcoins-Release' ">
+      <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+      <Altcoins>true</Altcoins>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)' == 'Altcoins-Debug'">
+      <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+      <Altcoins>true</Altcoins>
+    </PropertyGroup>
+    <!-- -->
+    <!-- Plugin specific properties -->
+    <PropertyGroup>
+      <Product>LNURL NFC Support</Product>
+      <Description>Allows you to support contactless card payments over NFC and LNURL Withdraw!</Description>
+      <Authors>Kukks</Authors>
+      <Version>1.0.8</Version>
+    </PropertyGroup>
+    <!-- Plugin development properties -->
+    <PropertyGroup>
+      <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+      <PreserveCompilationContext>false</PreserveCompilationContext>
+      <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+    </PropertyGroup>
 
-  <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
-  <ItemDefinitionGroup>
-    <ProjectReference>
-      <Properties>StaticWebAssetsEnabled=false</Properties>
-      <Private>false</Private>
-      <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
-    </ProjectReference>
-  </ItemDefinitionGroup>
+    <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
+    <ItemDefinitionGroup>
+      <ProjectReference>
+        <Properties>StaticWebAssetsEnabled=false</Properties>
+        <Private>false</Private>
+        <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
+      </ProjectReference>
+    </ItemDefinitionGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj" />
-    <EmbeddedResource Include="Resources\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Views\Shared" />
-  </ItemGroup>
-</Project>
+
+    <ItemGroup>
+      <EmbeddedResource Include="Resources\**"/>
+      <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj"/>
+    </ItemGroup>
+    <ItemGroup>
+      <Folder Include="Resources"/>
+    </ItemGroup>
+  </Project>
diff --git a/Plugins/BTCPayServer.Plugins.NFC/NFCController.cs b/Plugins/BTCPayServer.Plugins.NFC/NFCController.cs
index 209b7da..e0e8a75 100644
--- a/Plugins/BTCPayServer.Plugins.NFC/NFCController.cs
+++ b/Plugins/BTCPayServer.Plugins.NFC/NFCController.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;
-using BTCPayServer.Abstractions.Constants;
-using BTCPayServer.Client;
 using LNURL;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
diff --git a/Plugins/BTCPayServer.Plugins.SideShift/BTCPayServer.Plugins.SideShift.csproj b/Plugins/BTCPayServer.Plugins.SideShift/BTCPayServer.Plugins.SideShift.csproj
index 72f16cc..4a89bb1 100644
--- a/Plugins/BTCPayServer.Plugins.SideShift/BTCPayServer.Plugins.SideShift.csproj
+++ b/Plugins/BTCPayServer.Plugins.SideShift/BTCPayServer.Plugins.SideShift.csproj
@@ -1,7 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-  <Import Project="../../submodules/btcpayserver/Build/Common.csproj" />
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <LangVersion>10</LangVersion>
+    <Configurations>Debug;Release;Altcoins-Release;Altcoins-Debug</Configurations>
+    <Platforms>AnyCPU</Platforms>
+  </PropertyGroup>
 
+  <!-- Default similar to Debug/Release -->
+  <PropertyGroup Condition=" '$(Configuration)' == 'Altcoins-Release' ">
+    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+    <Altcoins>true</Altcoins>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Altcoins-Debug'">
+    <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+    <Altcoins>true</Altcoins>
+  </PropertyGroup>
+  <!-- -->
   <!-- Plugin specific properties -->
   <PropertyGroup>
     <Product>SideShift</Product>
@@ -9,7 +24,6 @@
     <Authors>Kukks</Authors>
     <Version>1.0.9</Version>
   </PropertyGroup>
-
   <!-- Plugin development properties -->
   <PropertyGroup>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
@@ -26,12 +40,12 @@
     </ProjectReference>
   </ItemDefinitionGroup>
 
+
   <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj" />
-    <EmbeddedResource Include="Resources\**" />
+    <EmbeddedResource Include="Resources\**"/>
+    <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Views\Shared" />
+    <Folder Include="Resources"/>
   </ItemGroup>
 </Project>
diff --git a/Plugins/BTCPayServer.Plugins.TicketTailor/BTCPayServer.Plugins.TicketTailor.csproj b/Plugins/BTCPayServer.Plugins.TicketTailor/BTCPayServer.Plugins.TicketTailor.csproj
index 77854a1..8e126d0 100644
--- a/Plugins/BTCPayServer.Plugins.TicketTailor/BTCPayServer.Plugins.TicketTailor.csproj
+++ b/Plugins/BTCPayServer.Plugins.TicketTailor/BTCPayServer.Plugins.TicketTailor.csproj
@@ -1,37 +1,51 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-  <Import Project="../../submodules/btcpayserver/Build/Common.csproj" />
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <LangVersion>10</LangVersion>
+        <Configurations>Debug;Release;Altcoins-Release;Altcoins-Debug</Configurations>
+        <Platforms>AnyCPU</Platforms>
+    </PropertyGroup>
 
-  <!-- Plugin specific properties -->
-  <PropertyGroup>
-    <Product>TicketTailor</Product>
-    <Description>Allows you to integrate with TicketTailor.com to sell tickets for Bitcoin</Description>
-    <Authors>Kukks</Authors>
-    <Version>1.0.5</Version>
-  </PropertyGroup>
+    <!-- Default similar to Debug/Release -->
+    <PropertyGroup Condition=" '$(Configuration)' == 'Altcoins-Release' ">
+        <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+        <Altcoins>true</Altcoins>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)' == 'Altcoins-Debug'">
+        <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+        <Altcoins>true</Altcoins>
+    </PropertyGroup>
+    <!-- -->
+    <!-- Plugin specific properties -->
+    <PropertyGroup>
+        <Product>TicketTailor</Product>
+        <Description>Allows you to integrate with TicketTailor.com to sell tickets for Bitcoin</Description>
+        <Authors>Kukks</Authors>
+        <Version>1.0.5</Version>
+    </PropertyGroup>
+    <!-- Plugin development properties -->
+    <PropertyGroup>
+        <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+        <PreserveCompilationContext>false</PreserveCompilationContext>
+        <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+    </PropertyGroup>
 
-  <!-- Plugin development properties -->
-  <PropertyGroup>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <PreserveCompilationContext>false</PreserveCompilationContext>
-    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-  </PropertyGroup>
+    <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
+    <ItemDefinitionGroup>
+        <ProjectReference>
+            <Properties>StaticWebAssetsEnabled=false</Properties>
+            <Private>false</Private>
+            <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
+        </ProjectReference>
+    </ItemDefinitionGroup>
 
-  <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
-  <ItemDefinitionGroup>
-    <ProjectReference>
-      <Properties>StaticWebAssetsEnabled=false</Properties>
-      <Private>false</Private>
-      <ExcludeAssets>runtime;native;build;buildTransitive;contentFiles</ExcludeAssets>
-    </ProjectReference>
-  </ItemDefinitionGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj" />
-    <EmbeddedResource Include="Resources\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Views\Shared" />
-  </ItemGroup>
-</Project>
+    <ItemGroup>
+        <EmbeddedResource Include="Resources\**"/>
+        <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj"/>
+    </ItemGroup>
+    <ItemGroup>
+        <Folder Include="Resources"/>
+    </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj
index bbba91c..c2836aa 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj
@@ -1,6 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-    <Import Project="../../submodules/btcpayserver/Build/Common.csproj"/>
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <LangVersion>10</LangVersion>
+        <Configurations>Debug;Release;Altcoins-Release;Altcoins-Debug</Configurations>
+        <Platforms>AnyCPU</Platforms>
+    </PropertyGroup>
+
+    <!-- Default similar to Debug/Release -->
+    <PropertyGroup Condition=" '$(Configuration)' == 'Altcoins-Release' ">
+        <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+        <Altcoins>true</Altcoins>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)' == 'Altcoins-Debug'">
+        <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+        <Altcoins>true</Altcoins>
+    </PropertyGroup>
+    <!-- -->
 
     <!-- Plugin specific properties -->
     <PropertyGroup>
@@ -12,13 +28,9 @@
 
     <!-- Plugin development properties -->
     <PropertyGroup>
-
-        <GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile>
         <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
         <PreserveCompilationContext>false</PreserveCompilationContext>
         <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-        <MvcRazorExcludeRefAssembliesFromPublish>False</MvcRazorExcludeRefAssembliesFromPublish>
-        <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
     </PropertyGroup>
 
     <!-- This will make sure that referencing BTCPayServer doesn't put any artifact in the published directory -->
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiStoreSettings.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiStoreSettings.cs
index a4e53b5..5e79a57 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiStoreSettings.cs
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiStoreSettings.cs
@@ -17,7 +17,6 @@ public class WabisabiStoreSettings
     public bool ConsolidationMode { get; set; } = false;
     public bool RedCoinIsolation { get; set; } = false;
     public int AnonymitySetTarget { get; set; } = 5;
-    public double MaxFee { get; set; } = 5;
 
     public bool BatchPayments { get; set; } = true;