diff --git a/Plugins/BTCPayServer.Plugins.Blink/BlinkPlugin.cs b/Plugins/BTCPayServer.Plugins.Blink/BlinkPlugin.cs
index 24ca597..3472751 100644
--- a/Plugins/BTCPayServer.Plugins.Blink/BlinkPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.Blink/BlinkPlugin.cs
@@ -18,7 +18,7 @@ namespace BTCPayServer.Plugins.Blink
 
         public override void Execute(IServiceCollection applicationBuilder)
         {
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Blink/LNPaymentMethodSetupTab", "ln-payment-method-setup-tab"));
+            applicationBuilder.AddUIExtension("ln-payment-method-setup-tab", "Blink/LNPaymentMethodSetupTab");
             applicationBuilder.AddSingleton<ILightningConnectionStringHandler>(provider => provider.GetRequiredService<BlinkLightningConnectionStringHandler>());
             applicationBuilder.AddSingleton<BlinkLightningConnectionStringHandler>();
 
diff --git a/Plugins/BTCPayServer.Plugins.Breez/BreezPlugin.cs b/Plugins/BTCPayServer.Plugins.Breez/BreezPlugin.cs
index ecd582c..672c4ee 100644
--- a/Plugins/BTCPayServer.Plugins.Breez/BreezPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.Breez/BreezPlugin.cs
@@ -21,16 +21,13 @@ namespace BTCPayServer.Plugins.Breez
             applicationBuilder.AddSingleton<IHostedService>(provider => provider.GetRequiredService<BreezService>());
             applicationBuilder.AddSingleton<BreezLightningConnectionStringHandler>();
             applicationBuilder.AddSingleton<ILightningConnectionStringHandler>(provider => provider.GetRequiredService<BreezLightningConnectionStringHandler>());
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Breez/BreezNav",
-                "store-integrations-nav"));
+            applicationBuilder.AddUIExtension("store-integrations-nav", "Breez/BreezNav");
             
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Breez/LNPaymentMethodSetupTabhead", "ln-payment-method-setup-tabhead"));
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Breez/LNPaymentMethodSetupTab", "ln-payment-method-setup-tab"));
+            applicationBuilder.AddUIExtension("ln-payment-method-setup-tabhead", "Breez/LNPaymentMethodSetupTabhead");
+            applicationBuilder.AddUIExtension("ln-payment-method-setup-tab", "Breez/LNPaymentMethodSetupTab");
 
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Breez/BreezNodeInfo",
-                "dashboard"));
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Breez/BreezPaymentsTable",
-                "dashboard"));
+            applicationBuilder.AddUIExtension("dashboard", "Breez/BreezNodeInfo");
+            applicationBuilder.AddUIExtension("dashboard", "Breez/BreezPaymentsTable");
             base.Execute(applicationBuilder);
         }
     }
diff --git a/Plugins/BTCPayServer.Plugins.Bringin/BringinPlugin.cs b/Plugins/BTCPayServer.Plugins.Bringin/BringinPlugin.cs
index 17637dd..fbc8b7f 100644
--- a/Plugins/BTCPayServer.Plugins.Bringin/BringinPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.Bringin/BringinPlugin.cs
@@ -21,8 +21,7 @@ public class BringinPlugin : BaseBTCPayServerPlugin
     {
         applicationBuilder.AddSingleton<BringinService>();
         applicationBuilder.AddSingleton<IHostedService, BringinService>(s => s.GetService<BringinService>());
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Bringin/BringinDashboardWidget", "dashboard"));
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Bringin/Nav",
-            "store-integrations-nav"));
+        applicationBuilder.AddUIExtension("dashboard", "Bringin/BringinDashboardWidget");
+        applicationBuilder.AddUIExtension("store-integrations-nav", "Bringin/Nav");
     }
 }
\ No newline at end of file
diff --git a/Plugins/BTCPayServer.Plugins.Bringin/BringinService.cs b/Plugins/BTCPayServer.Plugins.Bringin/BringinService.cs
index 05cd745..4c054f9 100644
--- a/Plugins/BTCPayServer.Plugins.Bringin/BringinService.cs
+++ b/Plugins/BTCPayServer.Plugins.Bringin/BringinService.cs
@@ -309,7 +309,7 @@ public class BringinService : EventHostedServiceBase
             PayoutMethodId = paymentMethodId,
             StoreId = storeId,
             Destination = destination,
-            Value = orderMoney.ToUnit(MoneyUnit.BTC),
+            ClaimedAmount = orderMoney.ToUnit(MoneyUnit.BTC),
             PreApprove = true,
             Metadata = JObject.FromObject(new
             {
diff --git a/Plugins/BTCPayServer.Plugins.DataErasure/DataErasurePlugin.cs b/Plugins/BTCPayServer.Plugins.DataErasure/DataErasurePlugin.cs
index f0869b6..c4071b5 100644
--- a/Plugins/BTCPayServer.Plugins.DataErasure/DataErasurePlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.DataErasure/DataErasurePlugin.cs
@@ -15,8 +15,7 @@ namespace BTCPayServer.Plugins.DataErasure
         {
             applicationBuilder.AddSingleton<DataErasureService>();
             applicationBuilder.AddHostedService( sp => sp.GetRequiredService<DataErasureService>());
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("DataErasure/DataErasureNav",
-                "store-integrations-nav"));
+            applicationBuilder.AddUIExtension("store-integrations-nav", "DataErasure/DataErasureNav");
             base.Execute(applicationBuilder);
         }
     }
diff --git a/Plugins/BTCPayServer.Plugins.DynamicRateLimits/DynamicRateLimitsPlugin.cs b/Plugins/BTCPayServer.Plugins.DynamicRateLimits/DynamicRateLimitsPlugin.cs
index f579983..b94ab60 100644
--- a/Plugins/BTCPayServer.Plugins.DynamicRateLimits/DynamicRateLimitsPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.DynamicRateLimits/DynamicRateLimitsPlugin.cs
@@ -16,8 +16,7 @@ public class DynamicRateLimitsPlugin : BaseBTCPayServerPlugin
     {
         applicationBuilder.AddSingleton<DynamicRateLimitsService>();
         applicationBuilder.AddSingleton<IHostedService>(provider => provider.GetRequiredService<DynamicRateLimitsService>());
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("DynamicRateLimitsPlugin/Nav",
-            "server-nav"));
+        applicationBuilder.AddUIExtension("server-nav", "DynamicRateLimitsPlugin/Nav");
         base.Execute(applicationBuilder);
     }
 }
\ No newline at end of file
diff --git a/Plugins/BTCPayServer.Plugins.DynamicReports/DynamicReportsPlugin.cs b/Plugins/BTCPayServer.Plugins.DynamicReports/DynamicReportsPlugin.cs
index f78589c..8c98ef4 100644
--- a/Plugins/BTCPayServer.Plugins.DynamicReports/DynamicReportsPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.DynamicReports/DynamicReportsPlugin.cs
@@ -16,8 +16,7 @@ public class DynamicReportsPlugin : BaseBTCPayServerPlugin
     {
         applicationBuilder.AddSingleton<DynamicReportService>();
         applicationBuilder.AddSingleton<IHostedService>(provider => provider.GetRequiredService<DynamicReportService>());
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("DynamicReportsPlugin/Nav",
-            "server-nav"));
+        applicationBuilder.AddUIExtension("server-nav", "DynamicReportsPlugin/Nav");
         base.Execute(applicationBuilder);
     }
 }
\ No newline at end of file
diff --git a/Plugins/BTCPayServer.Plugins.FileSeller/FileSellerPlugin.cs b/Plugins/BTCPayServer.Plugins.FileSeller/FileSellerPlugin.cs
index 0dbed6d..58a9348 100644
--- a/Plugins/BTCPayServer.Plugins.FileSeller/FileSellerPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.FileSeller/FileSellerPlugin.cs
@@ -15,13 +15,9 @@ public class FileSellerPlugin : BaseBTCPayServerPlugin
     public override void Execute(IServiceCollection applicationBuilder)
     {
         applicationBuilder.AddHostedService<FileSellerService>();
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("FileSeller/Detect",
-            "header-nav"));
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("FileSeller/Detect",
-            "checkout-end"));
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("FileSeller/FileSellerTemplateEditorItemDetail",
-            "app-template-editor-item-detail"));
-
+        applicationBuilder.AddUIExtension("header-nav", "FileSeller/Detect");
+        applicationBuilder.AddUIExtension("checkout-end", "FileSeller/Detect");
+        applicationBuilder.AddUIExtension("app-template-editor-item-detail", "FileSeller/FileSellerTemplateEditorItemDetail");
 
         base.Execute(applicationBuilder);
     }
diff --git a/Plugins/BTCPayServer.Plugins.MicroNode/MicroNodePlugin.cs b/Plugins/BTCPayServer.Plugins.MicroNode/MicroNodePlugin.cs
index 0c0ecb9..8808b4a 100644
--- a/Plugins/BTCPayServer.Plugins.MicroNode/MicroNodePlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.MicroNode/MicroNodePlugin.cs
@@ -18,9 +18,9 @@ public class MicroNodePlugin:BaseBTCPayServerPlugin
     public override void Execute(IServiceCollection applicationBuilder)
     {
         
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("MicroNode/MicroNodeNav", "header-nav"));
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("MicroNode/LNPaymentMethodSetupTabhead", "ln-payment-method-setup-tabhead"));
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("MicroNode/LNPaymentMethodSetupTab", "ln-payment-method-setup-tab"));
+        applicationBuilder.AddUIExtension("header-nav", "MicroNode/MicroNodeNav");
+        applicationBuilder.AddUIExtension("ln-payment-method-setup-tabhead", "MicroNode/LNPaymentMethodSetupTabhead");
+        applicationBuilder.AddUIExtension("ln-payment-method-setup-tab", "MicroNode/LNPaymentMethodSetupTab");
         // applicationBuilder.AddStartupTask<MicroNodeStartupTask>();
         applicationBuilder.AddSingleton<MicroNodeContextFactory>();
         applicationBuilder.AddDbContext<MicroNodeContext>((provider, o) =>
diff --git a/Plugins/BTCPayServer.Plugins.MicroNode/MicroNodeService.cs b/Plugins/BTCPayServer.Plugins.MicroNode/MicroNodeService.cs
index 5c5e219..aa1d40f 100644
--- a/Plugins/BTCPayServer.Plugins.MicroNode/MicroNodeService.cs
+++ b/Plugins/BTCPayServer.Plugins.MicroNode/MicroNodeService.cs
@@ -620,7 +620,7 @@ public class MicroNodeService : EventHostedServiceBase
                         }
                         var payout = await _pullPaymentHostedService.Claim(new ClaimRequest()
                         {
-                            Value = LightMoney.MilliSatoshis(balance.MilliSatoshi).ToDecimal(LightMoneyUnit.BTC),
+                            ClaimedAmount = LightMoney.MilliSatoshis(balance.MilliSatoshi).ToDecimal(LightMoneyUnit.BTC),
                             StoreId = masterClients.Key,
                             Destination = new LNURLPayClaimDestinaton(destination),
                             PreApprove = true,
diff --git a/Plugins/BTCPayServer.Plugins.NIP05/Nip05Plugin.cs b/Plugins/BTCPayServer.Plugins.NIP05/Nip05Plugin.cs
index 8f849bf..e317da6 100644
--- a/Plugins/BTCPayServer.Plugins.NIP05/Nip05Plugin.cs
+++ b/Plugins/BTCPayServer.Plugins.NIP05/Nip05Plugin.cs
@@ -18,9 +18,8 @@ namespace BTCPayServer.Plugins.NIP05
 
         public override void Execute(IServiceCollection applicationBuilder)
         {
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Nip05Nav",
-                "store-integrations-nav"));
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("NWC/LNPaymentMethodSetupTab", "ln-payment-method-setup-tab"));
+            applicationBuilder.AddUIExtension("store-integrations-nav", "Nip05Nav");
+            applicationBuilder.AddUIExtension("ln-payment-method-setup-tab", "NWC/LNPaymentMethodSetupTab");
 
             applicationBuilder.AddSingleton<IPluginHookFilter, LnurlDescriptionFilter>();
             applicationBuilder.AddSingleton<IPluginHookFilter, LnurlFilter>();
diff --git a/Plugins/BTCPayServer.Plugins.Prism/PrismPlugin.cs b/Plugins/BTCPayServer.Plugins.Prism/PrismPlugin.cs
index ea4aca5..70661fe 100644
--- a/Plugins/BTCPayServer.Plugins.Prism/PrismPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.Prism/PrismPlugin.cs
@@ -18,8 +18,7 @@ public class PrismPlugin : BaseBTCPayServerPlugin
     {   
         applicationBuilder.AddServerSideBlazor(o => o.DetailedErrors = true);
         
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("PrismNav",
-            "store-integrations-nav"));
+        applicationBuilder.AddUIExtension("store-integrations-nav", "PrismNav");
         applicationBuilder.AddSingleton<SatBreaker>();
         applicationBuilder.AddHostedService(provider => provider.GetRequiredService<SatBreaker>());
         applicationBuilder.AddSingleton<IPluginHookFilter, OpenSatsDestinationValidator>();
diff --git a/Plugins/BTCPayServer.Plugins.Prism/SatBreaker.cs b/Plugins/BTCPayServer.Plugins.Prism/SatBreaker.cs
index fc4f720..6c49bf9 100644
--- a/Plugins/BTCPayServer.Plugins.Prism/SatBreaker.cs
+++ b/Plugins/BTCPayServer.Plugins.Prism/SatBreaker.cs
@@ -547,7 +547,7 @@ namespace BTCPayServer.Plugins.Prism
                     PreApprove = true,
                     StoreId = storeId,
                     PayoutMethodId = pmi,
-                    Value = Money.Satoshis(payoutAmount).ToDecimal(MoneyUnit.BTC),
+                    ClaimedAmount = Money.Satoshis(payoutAmount).ToDecimal(MoneyUnit.BTC),
                     Metadata = JObject.FromObject(new
                     {
                         Source = source 
diff --git a/Plugins/BTCPayServer.Plugins.Subscriptions/SubscriptionPlugin.cs b/Plugins/BTCPayServer.Plugins.Subscriptions/SubscriptionPlugin.cs
index 317ee27..8045952 100644
--- a/Plugins/BTCPayServer.Plugins.Subscriptions/SubscriptionPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.Subscriptions/SubscriptionPlugin.cs
@@ -26,7 +26,7 @@ namespace BTCPayServer.Plugins.Subscriptions
             applicationBuilder.AddSingleton<IWebhookProvider>(o => o.GetRequiredService<SubscriptionService>());
             applicationBuilder.AddHostedService(s => s.GetRequiredService<SubscriptionService>());
 
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Subscriptions/NavExtension", "header-nav"));
+            applicationBuilder.AddUIExtension("header-nav", "Subscriptions/NavExtension");
             applicationBuilder.AddSingleton<AppBaseType, SubscriptionApp>();
             base.Execute(applicationBuilder);
         }
diff --git a/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs b/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs
index a5bd762..4f4c850 100644
--- a/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs
@@ -22,7 +22,7 @@ namespace BTCPayServer.Plugins.TicketTailor
             applicationBuilder.AddSingleton<IWebhookProvider>(o => o.GetRequiredService<TicketTailorService>());
             applicationBuilder.AddHostedService(s => s.GetRequiredService<TicketTailorService>());
 
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("TicketTailor/NavExtension", "header-nav"));
+            applicationBuilder.AddUIExtension("header-nav", "TicketTailor/NavExtension");
             applicationBuilder.AddSingleton<AppBaseType, TicketTailorApp>();
             base.Execute(applicationBuilder);
         }
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/Coordinator/CoordinatorExtensions.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/Coordinator/CoordinatorExtensions.cs
index e58d7b7..66891b6 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/Coordinator/CoordinatorExtensions.cs
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/Coordinator/CoordinatorExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Buffers;
+using BTCPayServer;
 using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Services;
 using BTCPayServer.Configuration;
@@ -40,7 +41,7 @@ public static class CoordinatorExtensions
         });
         services.AddHostedService((sp) => sp.GetRequiredService<WabisabiCoordinatorService>());
 
-        services.AddSingleton<IUIExtension>(new UIExtension("Wabisabi/WabisabiServerNavvExtension", "server-nav"));
+        services.AddUIExtension("server-nav", "Wabisabi/WabisabiServerNavvExtension");
 
 
         services.AddHttpClient("wabisabi-coordinator-scripts-no-redirect.onion")
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs
index c5ea376..fe58fea 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs
@@ -55,14 +55,10 @@ public class WabisabiPlugin : BaseBTCPayServerPlugin
         applicationBuilder.AddSingleton<IWalletProvider>(provider => provider.GetRequiredService<WalletProvider>());
         applicationBuilder.AddHostedService(provider => provider.GetRequiredService<WalletProvider>());
         ;
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Wabisabi/StoreIntegrationWabisabiOption",
-            "store-integrations-list"));
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Wabisabi/WabisabiNav",
-            "store-integrations-nav"));
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Wabisabi/WabisabiDashboard",
-            "dashboard"));
-        applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Wabisabi/WabisabiWalletSend",
-            "onchain-wallet-send"));
+        applicationBuilder.AddUIExtension("store-integrations-list", "Wabisabi/StoreIntegrationWabisabiOption");
+        applicationBuilder.AddUIExtension("store-integrations-nav", "Wabisabi/WabisabiNav");
+        applicationBuilder.AddUIExtension("dashboard", "Wabisabi/WabisabiDashboard");
+        applicationBuilder.AddUIExtension("onchain-wallet-send", "Wabisabi/WabisabiWalletSend");
 
         applicationBuilder.AddSingleton<IPayoutProcessorFactory, WabisabiPayoutProcessor>();
         Logger.SetMinimumLevel(LogLevel.Info);
diff --git a/submodules/btcpayserver b/submodules/btcpayserver
index 74011e5..41a2241 160000
--- a/submodules/btcpayserver
+++ b/submodules/btcpayserver
@@ -1 +1 @@
-Subproject commit 74011e50e3f334b62088669f62b6607e99eaceb4
+Subproject commit 41a2241ae1617cc365100786bd7d9c47bb082610