diff --git a/routes/actions.php b/routes/actions.php
index 79ce7048ea..791dde6804 100644
--- a/routes/actions.php
+++ b/routes/actions.php
@@ -5,35 +5,36 @@
 use CraftCms\Commerce\Http\Controllers\CartController;
 use CraftCms\Commerce\Http\Controllers\DonationsController;
 use CraftCms\Commerce\Http\Controllers\OrdersController;
-use CraftCms\Commerce\Http\Controllers\Settings\CatalogPricingController;
-use CraftCms\Commerce\Http\Controllers\Settings\CatalogPricingRulesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\CatalogPricingController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\CatalogPricingRulesController;
 use CraftCms\Commerce\Http\Controllers\DownloadsController;
 use CraftCms\Commerce\Http\Controllers\EmailPreviewController;
-use CraftCms\Commerce\Http\Controllers\Settings\DiscountsController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\DiscountsController;
 use CraftCms\Commerce\Http\Controllers\Settings\EmailsController;
 use CraftCms\Commerce\Http\Controllers\FormulasController;
 use CraftCms\Commerce\Http\Controllers\Settings\GatewaysController;
+use CraftCms\Commerce\Http\Controllers\Settings\GeneralSettingsController;
 use CraftCms\Commerce\Http\Controllers\InventoryController;
 use CraftCms\Commerce\Http\Controllers\InventoryLocationsController;
 use CraftCms\Commerce\Http\Controllers\Settings\LineItemStatusesController;
 use CraftCms\Commerce\Http\Controllers\Settings\OrderSettingsController;
 use CraftCms\Commerce\Http\Controllers\Settings\OrderStatusesController;
-use CraftCms\Commerce\Http\Controllers\Settings\PaymentCurrenciesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\PaymentCurrenciesController;
 use CraftCms\Commerce\Http\Controllers\PaymentSourcesController;
 use CraftCms\Commerce\Http\Controllers\PaymentsController;
 use CraftCms\Commerce\Http\Controllers\Settings\PdfsController;
 use CraftCms\Commerce\Http\Controllers\Settings\ProductTypesController;
-use CraftCms\Commerce\Http\Controllers\Settings\SalesController;
-use CraftCms\Commerce\Http\Controllers\Settings\SettingsController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingCategoriesController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingMethodsController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingRulesController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingZonesController;
-use CraftCms\Commerce\Http\Controllers\Settings\StoreManagementController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\SalesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingCategoriesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingMethodsController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingRulesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingZonesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\StoreManagementController;
 use CraftCms\Commerce\Http\Controllers\Settings\StoresController;
-use CraftCms\Commerce\Http\Controllers\Settings\TaxCategoriesController;
-use CraftCms\Commerce\Http\Controllers\Settings\TaxRatesController;
-use CraftCms\Commerce\Http\Controllers\Settings\TaxZonesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\TaxCategoriesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\TaxRatesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\TaxZonesController;
+use CraftCms\Commerce\Http\Controllers\Settings\TransferSettingsController;
 use CraftCms\Commerce\Http\Controllers\TransfersController;
 use CraftCms\Commerce\Http\Controllers\UserOrdersController;
 use CraftCms\Commerce\Http\Controllers\WebhooksController;
@@ -81,8 +82,8 @@
     Route::post('gateways/archive', [GatewaysController::class, 'archive']);
     Route::post('gateways/reorder', [GatewaysController::class, 'reorder']);
 
-    Route::post('settings/save-settings', [SettingsController::class, 'saveSettings']);
-    Route::post('settings/save-transfer-settings', [SettingsController::class, 'saveTransferSettings']);
+    Route::post('settings/save-settings', [GeneralSettingsController::class, 'saveSettings']);
+    Route::post('settings/save-transfer-settings', [TransferSettingsController::class, 'saveTransferSettings']);
     Route::post('order-settings/save', [OrderSettingsController::class, 'save']);
 
     Route::post('stores/save-store', [StoresController::class, 'saveStore']);
diff --git a/routes/cp.php b/routes/cp.php
index 33c6375606..4130e826a0 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -3,32 +3,33 @@
 use CraftCms\Cms\Http\Controllers\Elements\EditElementController;
 use CraftCms\Cms\Http\Middleware\RequireAdmin;
 use CraftCms\Commerce\Http\Controllers\DonationsController;
-use CraftCms\Commerce\Http\Controllers\Settings\CatalogPricingController;
-use CraftCms\Commerce\Http\Controllers\Settings\CatalogPricingRulesController;
-use CraftCms\Commerce\Http\Controllers\Settings\DiscountsController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\CatalogPricingController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\CatalogPricingRulesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\DiscountsController;
 use CraftCms\Commerce\Http\Controllers\Settings\EmailsController;
 use CraftCms\Commerce\Http\Controllers\Settings\GatewaysController;
 use CraftCms\Commerce\Http\Controllers\InventoryController;
 use CraftCms\Commerce\Http\Controllers\InventoryLocationsController;
 use CraftCms\Commerce\Http\Controllers\OrdersController;
+use CraftCms\Commerce\Http\Controllers\Settings\GeneralSettingsController;
 use CraftCms\Commerce\Http\Controllers\Settings\LineItemStatusesController;
 use CraftCms\Commerce\Http\Controllers\Settings\OrderSettingsController;
 use CraftCms\Commerce\Http\Controllers\Settings\OrderStatusesController;
-use CraftCms\Commerce\Http\Controllers\Settings\PaymentCurrenciesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\PaymentCurrenciesController;
 use CraftCms\Commerce\Http\Controllers\Settings\PdfsController;
 use CraftCms\Commerce\Http\Controllers\ProductsController;
 use CraftCms\Commerce\Http\Controllers\Settings\ProductTypesController;
-use CraftCms\Commerce\Http\Controllers\Settings\SalesController;
-use CraftCms\Commerce\Http\Controllers\Settings\SettingsController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingCategoriesController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingMethodsController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingRulesController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingZonesController;
-use CraftCms\Commerce\Http\Controllers\Settings\StoreManagementController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\SalesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingCategoriesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingMethodsController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingRulesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingZonesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\StoreManagementController;
 use CraftCms\Commerce\Http\Controllers\Settings\StoresController;
-use CraftCms\Commerce\Http\Controllers\Settings\TaxCategoriesController;
-use CraftCms\Commerce\Http\Controllers\Settings\TaxRatesController;
-use CraftCms\Commerce\Http\Controllers\Settings\TaxZonesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\TaxCategoriesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\TaxRatesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\TaxZonesController;
+use CraftCms\Commerce\Http\Controllers\Settings\TransferSettingsController;
 use CraftCms\Commerce\Http\Controllers\TransfersController;
 use CraftCms\Commerce\Http\Controllers\Users\UsersController;
 use CraftCms\Commerce\Http\Controllers\VariantsController;
@@ -41,11 +42,12 @@
     Route::middleware(RequireAdmin::class)->group(function () {
         Route::get('commerce/settings/gateways', [GatewaysController::class, 'index']);
         Route::get('commerce/settings/gateways/new', [GatewaysController::class, 'edit']);
+        Route::post('commerce/settings/gateways/render-form', [GatewaysController::class, 'renderForm']);
         Route::get('commerce/settings/gateways/{id}', [GatewaysController::class, 'edit'])->whereNumber('id');
 
-        Route::get('commerce/settings/general', [SettingsController::class, 'edit']);
+        Route::get('commerce/settings/general', [GeneralSettingsController::class, 'edit']);
         Route::get('commerce/settings/ordersettings', [OrderSettingsController::class, 'edit']);
-        Route::get('commerce/settings/transfers', [SettingsController::class, 'editTransferSettings']);
+        Route::get('commerce/settings/transfers', [TransferSettingsController::class, 'editTransferSettings']);
 
         Route::get('commerce/settings/stores', [StoresController::class, 'storesIndex']);
         Route::get('commerce/settings/stores/new', [StoresController::class, 'editStore']);
@@ -62,10 +64,12 @@
 
         Route::get('commerce/settings/producttypes', [ProductTypesController::class, 'productTypeIndex']);
         Route::get('commerce/settings/producttypes/new', [ProductTypesController::class, 'editProductType']);
+        Route::post('commerce/settings/producttypes/render-form', [ProductTypesController::class, 'renderForm']);
         Route::get('commerce/settings/producttypes/{productTypeId}', [ProductTypesController::class, 'editProductType'])->whereNumber('productTypeId');
 
         Route::get('commerce/settings/emails', [EmailsController::class, 'index']);
         Route::get('commerce/settings/emails/{storeHandle}/new', [EmailsController::class, 'edit']);
+        Route::post('commerce/settings/emails/render-form', [EmailsController::class, 'renderForm']);
         Route::get('commerce/settings/emails/{storeHandle}/{id}', [EmailsController::class, 'edit'])->whereNumber('id');
 
         Route::get('commerce/settings/pdfs', [PdfsController::class, 'index']);
diff --git a/src-yii2/templates/store-management/discounts/_edit.twig b/src-yii2/templates/store-management/discounts/_edit.twig
index 226d2b619d..881e317ba4 100644
--- a/src-yii2/templates/store-management/discounts/_edit.twig
+++ b/src-yii2/templates/store-management/discounts/_edit.twig
@@ -236,45 +236,29 @@
 
     <div id="conditions" class="hidden flex-fields">
 
-        {% set orderConditionInput %}
-            {{ discount.orderCondition|commerceConditionBuilderHtml }}
-        {% endset %}
-
         {{ forms.field({
             label: 'Match Order'|t('commerce'),
             instructions: 'Create rules that allow this discount to match the order.'|t('commerce'),
             errors: discount.getErrors('orderCondition')
-        }, orderConditionInput) }}
-
-        {% set customerConditionInput %}
-            {{ discount.customerCondition|commerceConditionBuilderHtml }}
-        {% endset %}
+        }, orderConditionHtml) }}
 
         {{ forms.field({
             label: 'Match Customer'|t('commerce'),
             instructions: 'Create rules that allow this discount to match the order’s customer.'|t('commerce'),
             errors: discount.getErrors('customerCondition')
-        }, customerConditionInput) }}
-
-        {% set shippingAddressConditionInput %}
-            {{ discount.shippingAddressCondition|commerceConditionBuilderHtml }}
-        {% endset %}
+        }, customerConditionHtml) }}
 
         {{ forms.field({
             label: 'Match Shipping Address'|t('commerce'),
             instructions: 'Create rules that allow this discount to match the order’s shipping address.'|t('commerce'),
             errors: discount.getErrors('shippingAddressCondition')
-        }, shippingAddressConditionInput) }}
-
-        {% set billingAddressConditionInput %}
-            {{ discount.billingAddressCondition|commerceConditionBuilderHtml }}
-        {% endset %}
+        }, shippingAddressConditionHtml) }}
 
         {{ forms.field({
             label: 'Match Billing Address'|t('commerce'),
             instructions: 'Create rules that allow this discount to match the order’s billing address.'|t('commerce'),
             errors: discount.getErrors('billingAddressCondition')
-        }, billingAddressConditionInput) }}
+        }, billingAddressConditionHtml) }}
 
         {{ forms.dateTimeField({
             label: "Start Date"|t('commerce'),
diff --git a/src-yii2/templates/store-management/pricing-rules/_edit.twig b/src-yii2/templates/store-management/pricing-rules/_edit.twig
index 477555cc98..7c468ad07c 100644
--- a/src-yii2/templates/store-management/pricing-rules/_edit.twig
+++ b/src-yii2/templates/store-management/pricing-rules/_edit.twig
@@ -50,52 +50,36 @@
 
       <hr>
 
-      {% set productConditionInput %}
-        {{ catalogPricingRule.productCondition|commerceConditionBuilderHtml }}
-      {% endset %}
-
       {{ forms.field({
         id: 'productCondition',
         label: 'Match Product'|t('commerce'),
         errors: catalogPricingRule.getErrors('productCondition')
-      }, productConditionInput) }}
-
-      {% set variantConditionInput %}
-        {{ catalogPricingRule.variantCondition|commerceConditionBuilderHtml }}
-      {% endset %}
+      }, productConditionHtml) }}
 
       {{ forms.field({
         id: 'variantCondition',
         label: 'Match Variant'|t('commerce'),
         errors: catalogPricingRule.getErrors('variantCondition')
-      }, variantConditionInput) }}
+      }, variantConditionHtml) }}
 
       <a class="fieldtoggle {% if catalogPricingRule.purchasableCondition.getConditionRules().getRules()|length > 0 %}expanded{% endif %}"
          data-target="cpr-purchasable-condition">{{ 'Advanced'|t('commerce') }}</a>
       <div id="cpr-purchasable-condition"
         class="{% if catalogPricingRule.purchasableCondition.getConditionRules().getRules()|length < 1 %}hidden{% endif %}">
-          {% set purchasableConditionInput %}
-            {{ catalogPricingRule.purchasableCondition|commerceConditionBuilderHtml }}
-          {% endset %}
-
           {{ forms.field({
             id: 'purchasableCondition',
             label: 'Match Purchasable'|t('commerce'),
             errors: catalogPricingRule.getErrors('purchasableCondition')
-          }, purchasableConditionInput) }}
+          }, purchasableConditionHtml) }}
       </div>
 
       <hr>
 
-      {% set customerConditionInput %}
-        {{ catalogPricingRule.customerCondition|commerceConditionBuilderHtml }}
-      {% endset %}
-
       {{ forms.field({
         id: 'customerCondition',
         label: 'Match Customer'|t('commerce'),
         errors: catalogPricingRule.getErrors('customerCondition')
-      }, customerConditionInput) }}
+      }, customerConditionHtml) }}
   </div>
 
   <div id="actions" class="hidden">
diff --git a/src-yii2/templates/store-management/pricing-rules/_slideout.twig b/src-yii2/templates/store-management/pricing-rules/_slideout.twig
index 81d4131796..8b4bc90ddd 100644
--- a/src-yii2/templates/store-management/pricing-rules/_slideout.twig
+++ b/src-yii2/templates/store-management/pricing-rules/_slideout.twig
@@ -36,15 +36,11 @@
     errors: catalogPricingRule.getErrors('dateTo'),
   }) }}
 
-  {% set customerConditionInput %}
-    {{ catalogPricingRule.customerCondition|commerceConditionBuilderHtml }}
-  {% endset %}
-
   {{ forms.field({
     id: 'customerCondition',
     label: 'Match Customer'|t('commerce'),
     errors: catalogPricingRule.getErrors('customerCondition')
-  }, customerConditionInput) }}
+  }, customerConditionHtml) }}
 </div>
 
 <div id="actions" class="hidden">
diff --git a/src-yii2/templates/store-management/shipping/shippingmethods/_edit.twig b/src-yii2/templates/store-management/shipping/shippingmethods/_edit.twig
index 27641673a7..3233964e17 100644
--- a/src-yii2/templates/store-management/shipping/shippingmethods/_edit.twig
+++ b/src-yii2/templates/store-management/shipping/shippingmethods/_edit.twig
@@ -57,27 +57,19 @@
         }) }}
     </div>
 
-    {% set orderConditionInput %}
-      {{ shippingMethod.orderCondition|commerceConditionBuilderHtml }}
-    {% endset %}
-
     {{ forms.field({
         id: 'orderCondition',
         label: 'Match Order'|t('commerce'),
         errors: shippingMethod.getErrors('orderCondition'),
         instructions: 'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availability early, or if there are common conditions to all rules for this method.'|t('commerce'),
-    }, orderConditionInput) }}
-
-    {% set customerConditionInput %}
-      {{ shippingMethod.customerCondition|commerceConditionBuilderHtml }}
-    {% endset %}
+    }, orderConditionHtml) }}
 
     {{ forms.field({
         id: 'customerCondition',
         label: 'Match Customer'|t('commerce'),
         errors: shippingMethod.getErrors('customerCondition'),
         instructions: 'Conditions here are matched against the order’s customer before looking through the rules. This is useful if you want qualify a method’s availability early or if there are common conditions to all rules for this method.'|t('commerce'),
-    }, customerConditionInput) }}
+    }, customerConditionHtml) }}
 
 {% if shippingMethod.id %}
   <div id="rules">
diff --git a/src-yii2/templates/store-management/shipping/shippingrules/_edit.twig b/src-yii2/templates/store-management/shipping/shippingrules/_edit.twig
index 88f0ca42f4..e731dcd070 100644
--- a/src-yii2/templates/store-management/shipping/shippingrules/_edit.twig
+++ b/src-yii2/templates/store-management/shipping/shippingrules/_edit.twig
@@ -114,15 +114,11 @@
     <div id="conditions-tab" class="hidden">
         <p>{{ "Filtering conditions which describe to which orders this rule is applicable to. Write 0 to skip a condition."|t('commerce') }}</p>
 
-        {% set orderConditionInput %}
-          {{ shippingRule.orderCondition|commerceConditionBuilderHtml }}
-        {% endset %}
-
         {{ forms.field({
           id: 'orderCondition',
           label: 'Match Order'|t('commerce'),
           errors: shippingRule.getErrors('orderCondition')
-        }, orderConditionInput) }}
+        }, orderConditionHtml) }}
 
         <a class="fieldtoggle {% if shippingRule.orderConditionFormula %}expanded{% endif %}"
            data-target="orderConditionFormula-advanced">{{ 'Advanced'|t('commerce') }}</a>
@@ -157,15 +153,11 @@
 
         <hr>
 
-        {% set customerConditionInput %}
-          {{ shippingRule.customerCondition|commerceConditionBuilderHtml }}
-        {% endset %}
-
         {{ forms.field({
           id: 'customerCondition',
           label: 'Match Customer'|t('commerce'),
           errors: shippingRule.getErrors('customerCondition')
-        }, customerConditionInput) }}
+        }, customerConditionHtml) }}
 
       <hr>
 
diff --git a/src-yii2/templates/store-management/shipping/shippingzones/_fields.twig b/src-yii2/templates/store-management/shipping/shippingzones/_fields.twig
index e2a3fedf05..3084cb6907 100644
--- a/src-yii2/templates/store-management/shipping/shippingzones/_fields.twig
+++ b/src-yii2/templates/store-management/shipping/shippingzones/_fields.twig
@@ -27,4 +27,4 @@
 
     {{ forms.field({
         label: 'Address Condition'|t('app'),
-    }, condition.builderHtml) }}
\ No newline at end of file
+    }, conditionHtml) }}
\ No newline at end of file
diff --git a/src-yii2/templates/store-management/tax/taxzones/_fields.twig b/src-yii2/templates/store-management/tax/taxzones/_fields.twig
index 541c9aaf42..d1c56a5c49 100644
--- a/src-yii2/templates/store-management/tax/taxzones/_fields.twig
+++ b/src-yii2/templates/store-management/tax/taxzones/_fields.twig
@@ -46,4 +46,4 @@
 
     {{ forms.field({
         label: 'Address Condition'|t('app'),
-    }, condition.builderHtml) }}
+    }, conditionHtml) }}
diff --git a/src/CatalogPricing/CatalogPricing.php b/src/CatalogPricing/CatalogPricing.php
index ac8a8493af..229dff4542 100644
--- a/src/CatalogPricing/CatalogPricing.php
+++ b/src/CatalogPricing/CatalogPricing.php
@@ -297,9 +297,16 @@ public function getCatalogPrices(int $storeId, ?CatalogPricingCondition $conditi
 
     public function getCatalogPricesPageInfo(int $storeId, ?CatalogPricingCondition $conditionBuilder = null, bool $includeBasePrices = true, ?string $searchText = null, int $limit = 100, int $offset = 0): array
     {
+        // getCountForPagination() wraps the query as-is and counts a column from its SELECT —
+        // but this query only ever selects price/promotionalPrice/salePrice aggregates, never
+        // purchasableId, so that column was never there to count. select()ing it first (like
+        // the pre-port Yii2 version did) replaces the aggregate select instead of layering atop
+        // it, giving a plain "one row per purchasableId" result to just count.
         $total = $this->buildCatalogPricesQuery($storeId, $conditionBuilder, $includeBasePrices, $searchText)
+            ->select(['purchasableId'])
             ->groupBy('purchasableId')
-            ->getCountForPagination(['purchasableId']);
+            ->get()
+            ->count();
 
         return [
             'first' => $offset + 1,
@@ -482,10 +489,14 @@ private function _normalizeIds(?array $ids): ?array
      */
     public function createCatalogPricesQuery(?int $userId = null, int|string|null $storeId = null, bool $allPrices = false, ?CatalogPricingCondition $condition = null): \Illuminate\Database\Query\Builder
     {
+        // Quoted via the connection's own grammar, not embedded as bare SQL — the column is
+        // camelCase, and an unquoted raw fragment gets folded to lowercase by Postgres.
+        $isPromotionalPrice = DB::connection()->getQueryGrammar()->wrap('isPromotionalPrice');
+
         $query = DB::table(Table::CATALOG_PRICING . ' as cp')
             ->select([
-                DB::raw('MIN(CASE WHEN isPromotionalPrice = FALSE THEN price END) AS price'),
-                DB::raw('MIN(CASE WHEN isPromotionalPrice = TRUE THEN price END) AS promotionalPrice'),
+                DB::raw("MIN(CASE WHEN {$isPromotionalPrice} = FALSE THEN price END) AS price"),
+                DB::raw("MIN(CASE WHEN {$isPromotionalPrice} = TRUE THEN price END) AS promotionalPrice"),
                 DB::raw('MIN(price) AS salePrice'),
             ]);
 
@@ -504,10 +515,12 @@ public function createCatalogPricesQuery(?int $userId = null, int|string|null $s
         /** @var CatalogPricingCondition $condition */
         $condition->modifyQuery($query);
 
+        // Plain where()s rather than whereRaw() — the column is camelCase, and an unquoted
+        // raw fragment gets folded to lowercase by Postgres, no longer matching it.
         $query->where(function($q) {
-            $q->whereNull('dateFrom')->orWhereRaw('dateFrom <= ?', [CraftDb::prepareDateForDb(new DateTime())]);
+            $q->whereNull('dateFrom')->orWhere('dateFrom', '<=', CraftDb::prepareDateForDb(new DateTime()));
         })->where(function($q) {
-            $q->whereNull('dateTo')->orWhereRaw('dateTo >= ?', [CraftDb::prepareDateForDb(new DateTime())]);
+            $q->whereNull('dateTo')->orWhere('dateTo', '>=', CraftDb::prepareDateForDb(new DateTime()));
         });
 
         if (!$allPrices) {
@@ -545,9 +558,9 @@ public function createCatalogPricingQuery(?int $userId = null, int|string|null $
         $condition->modifyQuery($query);
 
         $query->where(function($q) {
-            $q->whereNull('dateFrom')->orWhereRaw('dateFrom <= ?', [CraftDb::prepareDateForDb(new DateTime())]);
+            $q->whereNull('dateFrom')->orWhere('dateFrom', '<=', CraftDb::prepareDateForDb(new DateTime()));
         })->where(function($q) {
-            $q->whereNull('dateTo')->orWhereRaw('dateTo >= ?', [CraftDb::prepareDateForDb(new DateTime())]);
+            $q->whereNull('dateTo')->orWhere('dateTo', '>=', CraftDb::prepareDateForDb(new DateTime()));
         })->orderBy('purchasableId')->orderBy('price');
 
         if (!$allPrices) {
diff --git a/src/Customer/Conditions/DiscountGroupConditionRule.php b/src/Customer/Conditions/DiscountGroupConditionRule.php
index 742261e743..d143e88531 100644
--- a/src/Customer/Conditions/DiscountGroupConditionRule.php
+++ b/src/Customer/Conditions/DiscountGroupConditionRule.php
@@ -6,7 +6,7 @@
 
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 use CraftCms\Cms\User\Conditions\GroupConditionRule;
-use Illuminate\Contracts\Database\Query\Builder;
+use Illuminate\Database\Query\Builder;
 use Override;
 use RuntimeException;
 
diff --git a/src/Http/Controllers/Concerns/HasStoreManagementScreen.php b/src/Http/Controllers/Concerns/HasStoreManagementScreen.php
index 7ce1cdef27..3f203d44b2 100644
--- a/src/Http/Controllers/Concerns/HasStoreManagementScreen.php
+++ b/src/Http/Controllers/Concerns/HasStoreManagementScreen.php
@@ -19,7 +19,12 @@
  * (shipping, tax, promotions, payment currencies, etc). Every controller that needs it resolves
  * its own `Store` from a `storeHandle` route segment — there's no framework-level route binding
  * for handle-scoped resources in cms-6 (confirmed: every handle-scoped core controller does the
- * same manual resolve-and-404), so this stays a plain trait rather than a shared base class.
+ * same manual resolve-and-404) — so `resolveStore()` stays a plain method taking `$storeHandle`
+ * as a parameter, not something a shared base class could inject via its constructor.
+ *
+ * This still lives as a trait, mixed into {@see \CraftCms\Commerce\Http\Controllers\StoreManagement\BaseStoreManagementController}
+ * rather than inlined there directly, so the per-call resolution above isn't mistaken for
+ * something the base class's constructor could have done instead.
  */
 trait HasStoreManagementScreen
 {
diff --git a/src/Http/Controllers/Settings/BaseSettingsController.php b/src/Http/Controllers/Settings/BaseSettingsController.php
new file mode 100644
index 0000000000..68693597fd
--- /dev/null
+++ b/src/Http/Controllers/Settings/BaseSettingsController.php
@@ -0,0 +1,157 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Commerce\Http\Controllers\Settings;
+
+use CraftCms\Cms\Config\GeneralConfig;
+use CraftCms\Cms\Cp\Data\NavItem;
+use CraftCms\Cms\Form\FormResolver;
+use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Http\Responses\CpScreenResponse;
+
+use CraftCms\Commerce\Plugin;
+use function CraftCms\Cms\cp_url;
+use function CraftCms\Cms\t;
+
+abstract class BaseSettingsController
+{
+    use RespondsWithFlash;
+
+    protected bool $readOnly;
+
+    public function __construct(
+        protected GeneralConfig $generalConfig,
+        protected FormResolver $formResolver,
+        protected readonly Plugin $plugin,
+    ) {
+        $this->readOnly = !$generalConfig->allowAdminChanges;
+    }
+
+    /**
+     * @return NavItem[]
+     */
+    protected function subnav(): array
+    {
+        $path = request()->craftPath();
+
+        return [
+            new NavItem()
+                ->label(t('General Settings', category: 'commerce'))
+                ->url(cp_url('commerce/settings/general'))
+                ->selected($path === 'commerce/settings/general'),
+
+            new NavItem()
+                ->label(t('Stores & Sites', category: 'commerce'))
+                ->group(true)
+                ->subnav([
+                    new NavItem()
+                        ->label(t('Stores', category: 'commerce'))
+                        ->url(cp_url('commerce/settings/stores'))
+                        ->selected($path === 'commerce/settings/stores'),
+                    new NavItem()
+                        ->label(t('Sites'))
+                        ->url(cp_url('commerce/settings/sites'))
+                        ->selected($path === 'commerce/settings/sites'),
+                ]),
+
+            new NavItem()
+                ->label(t('Products', category: 'commerce'))
+                ->group(true)
+                ->subnav([
+                    new NavItem()
+                        ->label(t('Product Types', category: 'commerce'))
+                        ->url(cp_url('commerce/settings/producttypes'))
+                        ->selected($path === 'commerce/settings/producttypes'),
+                ]),
+
+            new NavItem()
+                ->label(t('Orders', category: 'commerce'))
+                ->group(true)
+                ->subnav([
+                    new NavItem()
+                        ->label(t('Order Fields', category: 'commerce'))
+                        ->url(cp_url('commerce/settings/ordersettings'))
+                        ->selected($path === 'commerce/settings/ordersettings'),
+                    new NavItem()
+                        ->label(t('Order Statuses', category: 'commerce'))
+                        ->url(cp_url('commerce/settings/orderstatuses'))
+                        ->selected($path === 'commerce/settings/orderstatuses'),
+                    new NavItem()
+                        ->label(t('Line Item Statuses', category: 'commerce'))
+                        ->url(cp_url('commerce/settings/lineitemstatuses'))
+                        ->selected($path === 'commerce/settings/lineitemstatuses'),
+                ]),
+
+            new NavItem()
+                ->label(t('PDFs & Emails', category: 'commerce'))
+                ->group(true)
+                ->subnav([
+                    new NavItem()
+                        ->label(t('PDFs', category: 'commerce'))
+                        ->url(cp_url('commerce/settings/pdfs'))
+                        ->selected($path === 'commerce/settings/pdfs'),
+                    new NavItem()
+                        ->label(t('Emails', category: 'commerce'))
+                        ->url(cp_url('commerce/settings/emails'))
+                        ->selected($path === 'commerce/settings/emails'),
+                ]),
+
+            new NavItem()
+                ->label(t('Payments', category: 'commerce'))
+                ->group(true)
+                ->subnav([
+                    new NavItem()
+                        ->label(t('Gateways', category: 'commerce'))
+                        ->url(cp_url('commerce/settings/gateways'))
+                        ->selected($path === 'commerce/settings/gateways'),
+                ]),
+
+            new NavItem()
+                ->label(t('Transfers', category: 'commerce'))
+                ->group(true)
+                ->subnav([
+                    new NavItem()
+                        ->label(t('Transfer Fields', category: 'commerce'))
+                        ->url(cp_url('commerce/settings/transfers'))
+                        ->selected($path === 'commerce/settings/transfers'),
+                ]),
+        ];
+    }
+
+    /**
+     * Returns this controller's own section crumb (e.g. "Emails"). {@see self::crumbs()}
+     * decides whether it actually links, based on whether anything follows it.
+     *
+     * @return array{label: string, href: string}
+     */
+    abstract protected function getSectionCrumb(): array;
+
+    /**
+     * Builds "Settings / <section>[ / ...$trail]". Pass one entry per crumb
+     * beyond the section (usually zero, for an index; one, for a record being
+     * edited). Whichever crumb ends up last never links, since it's the page
+     * already showing.
+     *
+     * @param array{label: string, url?: ?string} ...$trail
+     * @return list<array<string, string>>
+     */
+    final protected function crumbs(array ...$trail): array
+    {
+        $crumbs = [
+            ['label' => t('Settings'), 'href' => cp_url('commerce/settings')],
+            $this->getSectionCrumb(),
+            ...array_map(fn(array $crumb) => ['label' => $crumb['label'], 'href' => $crumb['url'] ?? null], $trail),
+        ];
+
+        $crumbs[array_key_last($crumbs)]['href'] = null;
+
+        return $crumbs;
+    }
+
+    protected function cpScreenResponse(): CpScreenResponse
+    {
+        return new CpScreenResponse()
+            ->subnav($this->subnav());
+    }
+}
diff --git a/src/Http/Controllers/Settings/EmailsController.php b/src/Http/Controllers/Settings/EmailsController.php
index 069429b93b..403537e3b6 100644
--- a/src/Http/Controllers/Settings/EmailsController.php
+++ b/src/Http/Controllers/Settings/EmailsController.php
@@ -5,52 +5,115 @@
 namespace CraftCms\Commerce\Http\Controllers\Settings;
 
 use craft\helpers\App;
-use CraftCms\Cms\Config\GeneralConfig;
-use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Cp\SelectOptions;
+use CraftCms\Cms\Form\Controls\Choice;
+use CraftCms\Cms\Form\Controls\Combobox;
+use CraftCms\Cms\Form\Controls\Lightswitch;
+use CraftCms\Cms\Form\Controls\Text;
+use CraftCms\Cms\Form\Enums\ControlMode;
+use CraftCms\Cms\Form\Form;
+use CraftCms\Cms\Form\FormContext;
+use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Form\Nodes\Heading;
+use CraftCms\Cms\Form\Nodes\HiddenField;
+use CraftCms\Cms\Form\Nodes\Table;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
-use CraftCms\Cms\Site\Data\Site;
-use CraftCms\Cms\Support\Arr;
 use CraftCms\Cms\Support\Facades\Sites;
-use CraftCms\Cms\View\TemplateMode;
+use CraftCms\Cms\Support\Html;
+use CraftCms\Cms\Support\Url;
 use CraftCms\Commerce\Email\Data\Email;
 use CraftCms\Commerce\Email\Emails;
 use CraftCms\Commerce\Email\Models\Email as EmailRecord;
 use CraftCms\Commerce\Helpers\Locale as LocaleHelper;
-use CraftCms\Commerce\Pdf\Data\Pdf;
 use CraftCms\Commerce\Pdf\Pdfs;
 use CraftCms\Commerce\Store\Data\Store;
-
 use CraftCms\Commerce\Store\Stores;
+
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
-use function CraftCms\Cms\pageTemplate;
+use function CraftCms\Cms\cp_url;
 use function CraftCms\Cms\t;
 
-readonly class EmailsController
+class EmailsController extends BaseSettingsController
 {
-    use RespondsWithFlash;
-
-    private bool $readOnly;
-
-    public function __construct(GeneralConfig $generalConfig)
+    protected function getSectionCrumb(): array
     {
-        $this->readOnly = !$generalConfig->allowAdminChanges;
+        return ['label' => t('Emails', category: 'commerce'), 'href' => cp_url('commerce/settings/emails')];
     }
 
-    public function index(): string
+    public function index(): CpScreenResponse
     {
-        $emails = [];
         $stores = app(Stores::class)->getAllStores();
+        $isMultiStore = $stores->count() > 1;
+
+        // Every store's table can plant its own create action in the page's shared actions
+        // slot, so with more than one store, only the first store's table gets one — a single
+        // combined "New email" menu covering every store, rather than one button apiece.
+        $createMenuItems = $this->readOnly ? [] : $stores->map(fn(Store $store) => [
+            'label' => $store->name,
+            'url' => cp_url("commerce/settings/emails/{$store->handle}/new"),
+        ])->all();
+        $createMenuAssigned = false;
 
-        $stores->each(function(Store $store) use (&$emails) {
-            $emails[$store->handle] = app(Emails::class)->getAllEmails($store->id);
+        $nodes = [];
+        $stores->each(function(Store $store) use (&$nodes, $isMultiStore, $createMenuItems, &$createMenuAssigned) {
+            if ($isMultiStore) {
+                $nodes[] = Heading::make("{$store->handle}-heading", $store->name);
+            }
+
+            $rows = app(Emails::class)->getAllEmails($store->id)
+                ->map(function(Email $email) {
+                    $to = $email->recipientType === EmailRecord::TYPE_CUSTOM
+                        ? $email->getTo(false)
+                        : t('Customer', category: 'commerce');
+                    $previewUrl = Url::actionUrl('commerce/email-preview/render', ['email' => "{$email->id}:{$email->storeId}"]);
+
+                    return [
+                        'id' => $email->id,
+                        'name' => ['label' => t($email->name, category: 'site'), 'url' => $email->getCpEditUrl()],
+                        'subject' => t($email->subject, category: 'site'),
+                        'to' => $to,
+                        'bcc' => $email->getBcc(false),
+                        'template' => $email->templatePath ? ['html' => Html::tag('code', Html::encode($email->templatePath))] : '',
+                        // Opens in a new tab, same as the old admin table's preview button — the
+                        // structured link shapes don't support that, so this is a hand-built anchor.
+                        'preview' => ['html' => Html::a(t('Preview', category: 'commerce'), $previewUrl, [
+                            'class' => 'btn small',
+                            'target' => '_blank',
+                            'rel' => 'noopener',
+                        ])],
+                    ];
+                })
+                ->all();
+
+            $nodes[] = Table::make("{$store->handle}-emails")
+                ->columns([
+                    ['key' => 'name', 'label' => t('Name')],
+                    ['key' => 'subject', 'label' => t('Subject', category: 'commerce')],
+                    ['key' => 'to', 'label' => t('To', category: 'commerce')],
+                    ['key' => 'bcc', 'label' => t('Bcc', category: 'commerce')],
+                    ['key' => 'template', 'label' => t('Template Path', category: 'commerce')],
+                    ['key' => 'preview', 'label' => t('Preview', category: 'commerce')],
+                ])
+                ->rows($rows)
+                ->emptyMessage(t('No emails exist yet.', category: 'commerce'))
+                ->when(!$createMenuAssigned && $createMenuItems, function(Table $table) use ($createMenuItems, &$createMenuAssigned) {
+                    $table->createActionMenu(t('New email', category: 'commerce'), $createMenuItems);
+                    $createMenuAssigned = true;
+                })
+                ->when(!$this->readOnly, fn(Table $table) => $table
+                    ->deletable(action([self::class, 'delete'])));
         });
 
-        return pageTemplate('commerce/settings/emails/index', [
-            'stores' => $stores->all(),
-            'emails' => $emails,
-            'readOnly' => $this->readOnly,
-        ], TemplateMode::Cp);
+        $title = t('Emails', category: 'commerce');
+
+        return $this->cpScreenResponse()
+            ->title($title)
+            ->crumbs($this->crumbs())
+            ->inertiaPage('Form', [
+                'form' => $this->formResolver->resolve(Form::make($nodes), new FormContext()),
+            ]);
     }
 
     public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResponse
@@ -68,48 +131,162 @@ public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResp
 
         $title = $email->id ? $email->name : t('Create a new email', category: 'commerce');
 
-        $pdfs = app(Pdfs::class)->getAllPdfs($email->storeId);
-        $pdfList = ['' => t('Do not attach a PDF to this email', category: 'commerce')];
-        $pdfList = Arr::merge($pdfList, $pdfs->mapWithKeys(fn(Pdf $pdf) => [$pdf->id => $pdf->name])->all());
-        $senderAddressPlaceholder = App::mailSettings()->fromEmail;
-        $senderNamePlaceholder = App::mailSettings()->fromName;
-
-        $emailLanguageOptions = [
-            EmailRecord::LOCALE_ORDER_LANGUAGE => t('The language the order was made in.', category: 'commerce'),
+        $values = [
+            'storeId' => $store->id,
+            'id' => $email->id,
+            'name' => $email->name,
+            'senderAddress' => $email->getSenderAddress(false),
+            'senderName' => $email->getSenderName(false),
+            'subject' => $email->subject,
+            'replyTo' => $email->replyTo,
+            'recipientType' => $email->recipientType,
+            'to' => $email->getTo(false),
+            'bcc' => $email->getBcc(false),
+            'cc' => $email->getCc(false),
+            'templatePath' => $email->templatePath,
+            'plainTextTemplatePath' => $email->plainTextTemplatePath,
+            'pdfId' => $email->pdfId,
+            'language' => $email->language,
+            'renderSiteId' => $email->renderSiteId,
+            'enabled' => $email->enabled,
         ];
 
-        $emailLanguageOptions = array_merge($emailLanguageOptions, LocaleHelper::getSiteAndOtherLanguages());
-
-        $emailRenderSiteOptions = [
-            '' => t('The site the order was made in.', category: 'commerce'),
-            ['optgroup' => t('Sites', category: 'commerce')],
-        ] + collect(Sites::getAllSites())->mapWithKeys(fn(Site $site) => [$site->id => $site->name])->all();
+        $form = $this->formResolver->resolve($this->buildForm($values), new FormContext(
+            values: $values,
+            mode: $this->generalConfig->allowAdminChanges ? ControlMode::Editable : ControlMode::ReadOnly,
+            refreshable: !$this->readOnly,
+        ));
 
-        return new CpScreenResponse()
+        return $this->cpScreenResponse()
             ->title($title)
-            ->crumbs([
-                ['label' => t('Commerce', category: 'commerce'), 'url' => 'commerce'],
-                ['label' => t('Settings'), 'url' => 'commerce/settings', 'ariaLabel' => t('Commerce Settings', category: 'commerce')],
-                ['label' => t('Emails', category: 'commerce'), 'url' => 'commerce/settings/emails'],
-            ])
-            ->selectedSubnavItem('settings')
+            ->crumbs($email->id ? $this->crumbs(['label' => $title]) : $this->crumbs())
             ->action('commerce/emails/save')
             ->redirectUrl('commerce/settings/emails')
-            ->contentTemplate('commerce/settings/emails/_edit', [
-                'email' => $email,
-                'pdfList' => $pdfList,
-                'senderAddressPlaceholder' => $senderAddressPlaceholder,
-                'senderNamePlaceholder' => $senderNamePlaceholder,
-                'emailLanguageOptions' => $emailLanguageOptions,
-                'emailRenderSiteOptions' => $emailRenderSiteOptions,
-                'readOnly' => $this->readOnly,
+            ->inertiaPage('Form', [
+                'form' => $form,
+                'submit' => [
+                    'method' => 'post',
+                    'url' => action([self::class, 'save']),
+                ],
+                'refreshUrl' => $this->readOnly ? null : action([self::class, 'renderForm']),
             ]);
     }
 
+    /**
+     * Re-resolves the {@see edit()} Form tree for the values currently in progress on the
+     * client, so the Recipient toggle can show or hide the Custom Recipient field without a
+     * full page reload.
+     */
+    public function renderForm(Request $request): JsonResponse
+    {
+        // Validate for shape only — Request::validate() returns just the ruled subset, which
+        // would silently strip every field but the ones named here back out of `values`.
+        // Reading the raw input keeps the full posted values intact for buildForm()'s branching.
+        $request->validate([
+            'values' => ['required', 'array'],
+            'scope' => ['present', 'array', 'size:0'],
+        ]);
+
+        $values = $request->input('values');
+
+        $form = $this->formResolver->resolve($this->buildForm($values), new FormContext(
+            values: $values,
+            mode: ControlMode::Editable,
+            refreshable: true,
+        ));
+
+        return new JsonResponse(['form' => $form]);
+    }
+
+    /** @param array<string, mixed> $values */
+    private function buildForm(array $values): Form
+    {
+        $storeId = (int)($values['storeId'] ?? 0);
+        $store = app(Stores::class)->getStoreById($storeId) ?? app(Stores::class)->getPrimaryStore();
+
+        $pdfOptions = [['label' => t('Do not attach a PDF to this email', category: 'commerce'), 'value' => '']];
+        foreach (app(Pdfs::class)->getAllPdfs($store->id) as $pdf) {
+            $pdfOptions[] = ['label' => $pdf->name, 'value' => $pdf->id];
+        }
+
+        // The old select field grouped these under "Site Languages"/"Other Languages" optgroup
+        // headers; Choice has no optgroup concept, so this flattens them into one list — every
+        // option still selectable, just without the section headers.
+        $languageOptions = collect([EmailRecord::LOCALE_ORDER_LANGUAGE => t('The language the order was made in.', category: 'commerce')])
+            ->merge(LocaleHelper::getSiteAndOtherLanguages())
+            ->reject(fn($label) => is_array($label))
+            ->map(fn($label, $value) => ['label' => $label, 'value' => $value])
+            ->values()
+            ->all();
+
+        $siteOptions = [['label' => t('The site the order was made in.', category: 'commerce'), 'value' => '']];
+        foreach (Sites::getAllSites() as $site) {
+            $siteOptions[] = ['label' => $site->name, 'value' => $site->id];
+        }
+
+        $envTriggers = SelectOptions::getEnvTextExpanderTriggers();
+        $isCustomRecipient = ($values['recipientType'] ?? EmailRecord::TYPE_CUSTOMER) === EmailRecord::TYPE_CUSTOM;
+
+        $formNodes = [
+            HiddenField::make('storeId'),
+        ];
+
+        if (!empty($values['id'])) {
+            $formNodes[] = HiddenField::make('id');
+        }
+
+        $formNodes[] = Field::make(t('Name', category: 'commerce'), Text::make('name')->autofocus())
+            ->instructions(t('What this email will be called in the control panel.', category: 'commerce'))
+            ->required();
+        $formNodes[] = Field::make(t('Status Email Address', category: 'commerce'), Text::make('senderAddress')
+            ->placeholder(App::mailSettings()->fromEmail)
+            ->textExpanderTriggers($envTriggers))
+            ->instructions(t('The email address that order status emails are sent from. Leave blank to use the System Email Address defined in Craft’s General Settings.', category: 'commerce'));
+        $formNodes[] = Field::make(t('From Name', category: 'commerce'), Text::make('senderName')
+            ->placeholder(App::mailSettings()->fromName)
+            ->textExpanderTriggers($envTriggers))
+            ->instructions(t('The “From” name that will be used when sending order status emails. Leave blank to use the Sender Name defined in Craft’s General Settings.', category: 'commerce'));
+        $formNodes[] = Field::make(t('Email Subject', category: 'commerce'), Text::make('subject'))
+            ->instructions(t('The subject line of the email. Twig code can be used here.', category: 'commerce'))
+            ->required();
+        $formNodes[] = Field::make(t('Reply To', category: 'commerce'), Text::make('replyTo'))
+            ->instructions(t('The reply to email address. Leave blank for normal reply to of email sender. Twig code can be used here.', category: 'commerce'));
+        $formNodes[] = Field::make(t('Recipient', category: 'commerce'), Choice::make('recipientType')->options([
+            ['label' => t('Send to the customer', category: 'commerce'), 'value' => EmailRecord::TYPE_CUSTOMER],
+            ['label' => t('Send to custom recipient', category: 'commerce'), 'value' => EmailRecord::TYPE_CUSTOM],
+        ])->reactive())
+            ->instructions(t('The recipient of the email. Twig code can be used here.', category: 'commerce'))
+            ->required();
+        // The old template combined this with Recipient as one compound field, showing/hiding
+        // this half inline based on the select above; here it's its own Field, toggled visible
+        // via the Form's refreshable round trip instead.
+        $formNodes[] = Field::make(t('Custom Recipient', category: 'commerce'), Text::make('to')->textExpanderTriggers($envTriggers))
+            ->visible($isCustomRecipient);
+        $formNodes[] = Field::make(t('BCC’d Recipient', category: 'commerce'), Text::make('bcc')->textExpanderTriggers($envTriggers))
+            ->instructions(t('Additional recipients that should receive this email. Twig code can be used here.', category: 'commerce'));
+        $formNodes[] = Field::make(t('CC’d Recipient', category: 'commerce'), Text::make('cc')->textExpanderTriggers($envTriggers))
+            ->instructions(t('Additional recipients that should receive this email. Twig code can be used here.', category: 'commerce'));
+        $formNodes[] = Field::make(t('HTML Email Template Path', category: 'commerce'), Combobox::make('templatePath')->options(SelectOptions::getTemplateSuggestions()))
+            ->instructions(t('The template to be used for HTML emails.', category: 'commerce'))
+            ->required();
+        $formNodes[] = Field::make(t('Plain Text Email Template Path', category: 'commerce'), Text::make('plainTextTemplatePath'))
+            ->instructions(t('The template to be used for plain text emails. Twig code can be used here.', category: 'commerce'));
+        $formNodes[] = Field::make(t('PDF Attachment', category: 'commerce'), Choice::make('pdfId')->options($pdfOptions))
+            ->instructions(t('The PDF to attach to this email.', category: 'commerce'));
+        $formNodes[] = Field::make(t('Language', category: 'commerce'), Choice::make('language')->options($languageOptions))
+            ->instructions(t('The language to be used when this email is rendered.', category: 'commerce'));
+        $formNodes[] = Field::make(t('Site', category: 'app'), Choice::make('renderSiteId')->options($siteOptions))
+            ->instructions(t('The site to be used when this email is rendered.', category: 'commerce'));
+        $formNodes[] = Field::make(t('Enabled?', category: 'commerce'), Lightswitch::make('enabled'))
+            ->instructions(t('If disabled, this email will not send.', category: 'commerce'));
+
+        return Form::make($formNodes);
+    }
+
     public function save(Request $request): Response
     {
         $emailsService = app(Emails::class);
-        $emailId = $request->input('emailId') ? (int)$request->input('emailId') : null;
+        $emailId = $request->input('id') ? (int)$request->input('id') : null;
         $storeId = $request->input('storeId');
         abort_if(!$storeId, 400, "Invalid store ID: $storeId");
         $storeId = (int)$storeId;
diff --git a/src/Http/Controllers/Settings/GatewaysController.php b/src/Http/Controllers/Settings/GatewaysController.php
index 822f1f7d0c..b849b17d13 100644
--- a/src/Http/Controllers/Settings/GatewaysController.php
+++ b/src/Http/Controllers/Settings/GatewaysController.php
@@ -4,67 +4,124 @@
 
 namespace CraftCms\Commerce\Http\Controllers\Settings;
 
-use CraftCms\Cms\Config\GeneralConfig;
-use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Cp\FormFields;
+use CraftCms\Cms\Cp\SelectOptions;
+use CraftCms\Cms\Form\Controls\Choice;
+use CraftCms\Cms\Form\Controls\Combobox;
+use CraftCms\Cms\Form\Controls\ConditionBuilder;
+use CraftCms\Cms\Form\Controls\Handle;
+use CraftCms\Cms\Form\Controls\Text;
+use CraftCms\Cms\Form\Enums\ControlMode;
+use CraftCms\Cms\Form\Form;
+use CraftCms\Cms\Form\FormContext;
+use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Form\Nodes\Group;
+use CraftCms\Cms\Form\Nodes\HiddenField;
+use CraftCms\Cms\Form\Nodes\Table;
+use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Html;
-use CraftCms\Cms\View\TemplateMode;
-use CraftCms\Commerce\Database\Table;
+use CraftCms\Cms\Support\Url;
+use CraftCms\Commerce\Address\Conditions\GatewayAddressCondition;
+use CraftCms\Commerce\Database\Table as DbTable;
+use CraftCms\Commerce\Order\Conditions\GatewayOrderCondition;
+use CraftCms\Commerce\Payment\Gateway\Contracts\GatewayInterface;
 use CraftCms\Commerce\Payment\Gateway\Gateways;
 use CraftCms\Commerce\Payment\Gateway\Types\Dummy;
 use CraftCms\Commerce\Payment\Gateway\Types\MissingGateway;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
-
 use Symfony\Component\HttpFoundation\Response;
-use function CraftCms\Cms\pageTemplate;
+use function CraftCms\Cms\cp_url;
 use function CraftCms\Cms\t;
 
-readonly class GatewaysController
+class GatewaysController extends BaseSettingsController
 {
-    use RespondsWithFlash;
-
-    private bool $readOnly;
-
-    public function __construct(GeneralConfig $generalConfig)
+    protected function getSectionCrumb(): array
     {
-        $this->readOnly = !$generalConfig->allowAdminChanges;
+        return ['label' => t('Gateways', category: 'commerce'), 'href' => cp_url('commerce/settings/gateways')];
     }
 
-    public function index(): string
+    public function index(): CpScreenResponse
     {
-        $gateways = app(Gateways::class)->getAllGateways();
-        $archivedGateways = app(Gateways::class)->getAllArchivedGateways();
+        $gatewayService = app(Gateways::class);
+        $gateways = $gatewayService->getAllGateways();
+        $archivedGateways = $gatewayService->getAllArchivedGateways();
+
+        $nameCell = fn(GatewayInterface $gateway) => ['html' => Html::a(
+            Html::encode(t($gateway->name, category: 'site')),
+            $gateway->getCpEditUrl(),
+            ['class' => 'cell-bold'],
+        )];
+        $typeCell = fn(GatewayInterface $gateway) => ['html' => $gateway instanceof MissingGateway
+            ? Html::tag('span', Html::encode($gateway->expectedType), ['class' => 'error'])
+            : Html::encode($gateway::displayName()), ];
+
+        $rows = $gateways->map(fn(GatewayInterface $gateway) => [
+            'id' => $gateway->id,
+            'name' => $nameCell($gateway),
+            'handle' => ['html' => FormFields::copytextHtml(['value' => $gateway->handle, 'monospace' => true])],
+            'type' => $typeCell($gateway),
+            'customerEnabled' => $gateway->getIsFrontendEnabled() ? ['icon' => 'check', 'label' => t('Yes')] : '',
+        ])->values()->all();
+
+        $nodes = [
+            Table::make('gateways')
+                ->columns([
+                    ['key' => 'id', 'label' => t('ID')],
+                    ['key' => 'name', 'label' => t('Name')],
+                    ['key' => 'handle', 'label' => t('Handle')],
+                    ['key' => 'type', 'label' => t('Type', category: 'commerce')],
+                    ['key' => 'customerEnabled', 'label' => t('Customer Enabled?', category: 'commerce')],
+                ])
+                ->rows($rows)
+                ->emptyMessage(t('No gateways exist yet.', category: 'commerce'))
+                ->when(!$this->readOnly, fn(Table $table) => $table
+                    ->createAction(t('New gateway', category: 'commerce'), cp_url('commerce/settings/gateways/new'))
+                    ->reorderable(action([self::class, 'reorder']))
+                    ->deletable(action([self::class, 'archive']))),
+        ];
 
-        if (!empty($archivedGateways)) {
-            $gatewayIdsWithTransactions = DB::table(Table::TRANSACTIONS)
+        if ($archivedGateways !== []) {
+            $gatewayIdsWithTransactions = DB::table(DbTable::TRANSACTIONS)
                 ->select('gatewayId')
                 ->groupBy('gatewayId')
                 ->pluck('gatewayId')
                 ->all();
 
-            foreach ($archivedGateways as &$gateway) {
-                $missing = $gateway instanceof MissingGateway;
-                $gateway = [
-                    'id' => $gateway->id,
-                    'title' => Html::encode(t($gateway->name, category: 'site')),
-                    'handle' => Html::encode($gateway->handle),
-                    'type' => [
-                        'missing' => $missing,
-                        'name' => Html::encode($missing ? $gateway->expectedType : $gateway->displayName()),
-                    ],
-                    'hasTransactions' => in_array($gateway->id, $gatewayIdsWithTransactions),
-                ];
-            }
+            $archivedRows = array_values(array_map(fn(GatewayInterface $gateway) => [
+                'id' => $gateway->id,
+                'name' => $nameCell($gateway),
+                'handle' => ['html' => FormFields::copytextHtml(['value' => $gateway->handle, 'monospace' => true])],
+                'type' => $typeCell($gateway),
+                'hasTransactions' => in_array($gateway->id, $gatewayIdsWithTransactions, true) ? ['icon' => 'check', 'label' => t('Yes')] : '',
+            ], $archivedGateways));
+
+            $nodes[] = Group::make('archived-gateways', [
+                Table::make('archived-gateways-table')
+                    ->columns([
+                        ['key' => 'id', 'label' => t('ID')],
+                        ['key' => 'name', 'label' => t('Name')],
+                        ['key' => 'handle', 'label' => t('Handle')],
+                        ['key' => 'type', 'label' => t('Type', category: 'commerce')],
+                        ['key' => 'hasTransactions', 'label' => t('Has Transactions?', category: 'commerce')],
+                    ])
+                    ->rows($archivedRows),
+            ])->label(t('Show archived gateways', category: 'commerce'))->collapsible();
         }
 
-        return pageTemplate('commerce/settings/gateways/index', [
-            'gateways' => $gateways,
-            'archivedGateways' => array_values($archivedGateways),
-            'readOnly' => $this->readOnly,
-        ], TemplateMode::Cp);
+        $title = t('Gateways', category: 'commerce');
+
+        return $this->cpScreenResponse()
+            ->title($title)
+            ->crumbs($this->crumbs())
+            ->inertiaPage('Form', [
+                'form' => $this->formResolver->resolve(Form::make($nodes), new FormContext()),
+            ]);
     }
 
-    public function edit(?int $id = null): string
+    public function edit(?int $id = null): CpScreenResponse
     {
         $gatewayService = app(Gateways::class);
 
@@ -75,37 +132,200 @@ public function edit(?int $id = null): string
             $gateway = $gatewayService->createGateway(['type' => Dummy::class]);
         }
 
+        $title = $gateway->id ? $gateway->name : t('Create a new gateway', category: 'commerce');
+
+        // The Combobox only recognizes its own '1'/'0' option values (or an env var
+        // reference) — a literal bool default (unparsed) needs stringifying first, or it
+        // shows as free-typed text instead of resolving to the matching Yes/No option.
+        $isFrontendEnabled = $gateway->getIsFrontendEnabled(false);
+        if (is_bool($isFrontendEnabled)) {
+            $isFrontendEnabled = $isFrontendEnabled ? '1' : '0';
+        }
+
+        $values = [
+            'id' => $gateway->id,
+            'name' => $gateway->name,
+            'handle' => $gateway->handle,
+            'type' => $gateway::class,
+            'paymentType' => $gateway->paymentType,
+            'isFrontendEnabled' => $isFrontendEnabled,
+            'orderCondition' => $gateway->getOrderCondition()->getConfig(),
+            'billingAddressCondition' => $gateway->getBillingAddressCondition()->getConfig(),
+            'shippingAddressCondition' => $gateway->getShippingAddressCondition()->getConfig(),
+            ...$gateway->getSettings(),
+        ];
+
+        $form = $this->formResolver->resolve($this->buildForm($values), new FormContext(
+            values: $values,
+            mode: $this->generalConfig->allowAdminChanges ? ControlMode::Editable : ControlMode::ReadOnly,
+            refreshable: !$this->readOnly,
+        ));
+
+        return $this->cpScreenResponse()
+            ->title($title)
+            ->crumbs($gateway->id ? $this->crumbs(['label' => $title]) : $this->crumbs())
+            ->action('commerce/gateways/save')
+            ->redirectUrl('commerce/settings/gateways')
+            ->inertiaPage('Form', [
+                'form' => $form,
+                'submit' => [
+                    'method' => 'post',
+                    'url' => action([self::class, 'save']),
+                ],
+                'refreshUrl' => $this->readOnly ? null : action([self::class, 'renderForm']),
+            ]);
+    }
+
+    /**
+     * Re-resolves the {@see edit()} Form tree for the values currently in progress on the
+     * client, so switching the Gateway type can swap in that type's own settings fields
+     * without a full page reload.
+     */
+    public function renderForm(Request $request): JsonResponse
+    {
+        // Validate for shape only — Request::validate() returns just the ruled subset, which
+        // would silently strip every field but the ones named here back out of `values`.
+        // Reading the raw input keeps the full posted values intact for buildForm()'s branching.
+        $request->validate([
+            'values' => ['required', 'array'],
+            'scope' => ['present', 'array', 'size:0'],
+        ]);
+
+        $values = $request->input('values');
+
+        $form = $this->formResolver->resolve($this->buildForm($values), new FormContext(
+            values: $values,
+            mode: ControlMode::Editable,
+            refreshable: true,
+        ));
+
+        return new JsonResponse(['form' => $form]);
+    }
+
+    /**
+     * @param  array<string, mixed>  $values  Passed by reference so a stale `paymentType`
+     *   left over from a since-changed Gateway type — no longer one of its options — can be
+     *   corrected here and reflected back in the FormContext both callers resolve against.
+     */
+    private function buildForm(array &$values): Form
+    {
+        $gatewayService = app(Gateways::class);
+        $type = $values['type'] ?? Dummy::class;
+
         /** @var string[] $allGatewayTypes */
         $allGatewayTypes = $gatewayService->getAllGatewayTypes();
 
-        // Make sure the selected gateway class is in there
-        if (!in_array($gateway::class, $allGatewayTypes, true)) {
-            $allGatewayTypes[] = $gateway::class;
+        // Make sure the selected gateway class is in there, even if it's no longer selectable
+        // (e.g. a plugin gateway type that's since been superseded).
+        if (!in_array($type, $allGatewayTypes, true)) {
+            $allGatewayTypes[] = $type;
         }
 
-        $gatewayInstances = [];
         $gatewayOptions = [];
-
         foreach ($allGatewayTypes as $class) {
-            if ($class === $gateway::class || $class::isSelectable()) {
-                $gatewayInstances[$class] = $gatewayService->createGateway($class);
-
-                $gatewayOptions[] = [
-                    'value' => $class,
-                    'label' => $class::displayName(),
-                ];
+            if ($class === $type || $class::isSelectable()) {
+                $gatewayOptions[] = ['value' => $class, 'label' => $class::displayName()];
             }
         }
 
-        return pageTemplate('commerce/settings/gateways/_edit', [
-            'id' => $id,
-            'gateway' => $gateway,
-            'gatewayTypes' => $allGatewayTypes,
-            'gatewayInstances' => $gatewayInstances,
-            'gatewayOptions' => $gatewayOptions,
-            'title' => $gateway->id ? $gateway->name : t('Create a new gateway', category: 'commerce'),
-            'readOnly' => $this->readOnly,
-        ], TemplateMode::Cp);
+        // Rebuild a live instance of the currently selected type, seeded with whatever's been
+        // posted so far — mirrors save()'s own config-building, so switching types (or a
+        // reactive round trip mid-edit) always reflects what's actually in the form right now.
+        $bareGateway = $gatewayService->createGateway($type);
+        // getSettings() (rather than settingsAttributes()) since a gateway type may back its
+        // settings with private properties exposed only through a custom getSettings()
+        // override — Manual's onlyAllowForZeroPriceOrders being a case in point.
+        $settingsKeys = array_keys($bareGateway->getSettings());
+
+        $gateway = $gatewayService->createGateway([
+            'type' => $type,
+            'id' => $values['id'] ?? null,
+            'name' => $values['name'] ?? null,
+            'handle' => $values['handle'] ?? null,
+            'paymentType' => $values['paymentType'] ?? null,
+            'isFrontendEnabled' => $values['isFrontendEnabled'] ?? null,
+            'settings' => Arr::only($values, $settingsKeys),
+        ]);
+
+        $handle = Handle::make('handle');
+        if (empty($values['id'])) {
+            $handle->source('name');
+        }
+
+        $formNodes = [];
+
+        if (!empty($values['id'])) {
+            $formNodes[] = HiddenField::make('id');
+        }
+
+        $formNodes[] = Field::make(t('Name', category: 'commerce'), Text::make('name')->autofocus())
+            ->instructions(t('What this gateway will be called in the control panel.', category: 'commerce'))
+            ->required();
+        $formNodes[] = Field::make(t('Handle', category: 'commerce'), $handle)
+            ->instructions(t('How you’ll refer to this gateway in the templates.', category: 'commerce'))
+            ->required();
+
+        if ($gateway->id && $gateway->supportsWebhooks()) {
+            $formNodes[] = Field::make(t('Webhook URL', category: 'commerce'), Text::make('webhookUrl')
+                ->mode(ControlMode::ReadOnly)
+                ->value(Url::siteUrl('commerce/webhooks/process-webhook/gateway/' . $gateway->id)))
+                ->instructions(t('The webhook URL for this gateway.', category: 'commerce'));
+        }
+
+        $formNodes[] = Field::make(t('Gateway', category: 'commerce'), Choice::make('type')->options($gatewayOptions)->reactive())
+            ->warning(!empty($values['id']) ? t('Changing this value may affect your ability to refund existing transactions.', category: 'commerce') : null)
+            ->required();
+
+        $paymentTypeOptions = collect($gateway->getPaymentTypeOptions())->map(fn($label, $value) => ['label' => $label, 'value' => $value])->values();
+
+        // Switching Gateway type can leave a paymentType selected that the new type doesn't
+        // offer (e.g. Manual only offers "authorize"); fall back to that type's first option
+        // rather than silently submitting a value it never presented as a choice.
+        if (!$paymentTypeOptions->contains('value', $values['paymentType'] ?? null)) {
+            $values['paymentType'] = $paymentTypeOptions->first()['value'] ?? null;
+        }
+
+        $formNodes[] = Field::make(t('Credit Card Payment Type', category: 'commerce'), Choice::make('paymentType')->options($paymentTypeOptions->all()))
+            ->instructions(t('If set to Authorize Only, you will need to manually capture payments before the funds will be transferred to your account. The Gateway needs to support the selected option.', category: 'commerce'))
+            ->required();
+
+        $settingsForm = $gateway->settingsForm(new FormContext(
+            values: $values,
+            mode: ControlMode::Editable,
+        ));
+        if ($settingsForm !== null) {
+            array_push($formNodes, ...$settingsForm->nodes());
+        }
+
+        // getBooleanEnvOptions()'s optgroup carries its own `options` as a Collection (fine for
+        // its one existing caller, which reshapes it before use) — a Form control's options
+        // must be plain-array JSON-safe all the way down, so that gets flattened here rather
+        // than changing the shared method's return shape for every other caller.
+        $envOptions = array_map(fn(array $group) => [...$group, 'options' => $group['options']->all()], SelectOptions::getBooleanEnvOptions());
+
+        $formNodes[] = Field::make(t('Enabled for customers to select during checkout?', category: 'commerce'), Combobox::make('isFrontendEnabled')->options([
+            ['label' => t('Yes'), 'value' => '1'],
+            ['label' => t('No'), 'value' => '0'],
+            ...$envOptions,
+        ]));
+
+        $formNodes[] = Field::make(t('Match Order', category: 'commerce'), ConditionBuilder::make('orderCondition')
+            ->conditionClass(GatewayOrderCondition::class)
+            ->forProjectConfig()
+            ->value($values['orderCondition'] ?? []))
+            ->instructions(t('Create rules that allow this gateway to match the order.', category: 'commerce'));
+        $formNodes[] = Field::make(t('Match Billing Address', category: 'commerce'), ConditionBuilder::make('billingAddressCondition')
+            ->conditionClass(GatewayAddressCondition::class)
+            ->forProjectConfig()
+            ->value($values['billingAddressCondition'] ?? []))
+            ->instructions(t('Create rules that allow this gateway to match the billing address.', category: 'commerce'));
+        $formNodes[] = Field::make(t('Match Shipping Address', category: 'commerce'), ConditionBuilder::make('shippingAddressCondition')
+            ->conditionClass(GatewayAddressCondition::class)
+            ->forProjectConfig()
+            ->value($values['shippingAddressCondition'] ?? []))
+            ->instructions(t('Create rules that allow this gateway to match the shipping address.', category: 'commerce'));
+
+        return Form::make($formNodes);
     }
 
     public function save(Request $request): Response
@@ -116,14 +336,26 @@ public function save(Request $request): Response
         abort_if($type === null, 400, 'Missing gateway type');
         $gatewayId = $request->input('id');
 
+        $bareGateway = $gatewayService->createGateway($type);
+
+        // A Gateway type switch can leave a paymentType posted that the new type doesn't
+        // offer (e.g. Manual only offers "authorize") — the client corrects its display once
+        // the reactive round trip returns the new options, but a submit racing ahead of that
+        // (or bypassing it) shouldn't be able to persist a value the type never presented as
+        // a choice, so this falls back to that type's first option instead.
+        $paymentType = $request->input('paymentType');
+        if (!array_key_exists($paymentType, $bareGateway->getPaymentTypeOptions())) {
+            $paymentType = array_key_first($bareGateway->getPaymentTypeOptions());
+        }
+
         $config = [
             'id' => $gatewayId,
             'type' => $type,
             'name' => $request->input('name'),
             'handle' => $request->input('handle'),
-            'paymentType' => $request->input('paymentTypes.' . $type . '.paymentType'),
+            'paymentType' => $paymentType,
             'isFrontendEnabled' => $request->input('isFrontendEnabled'),
-            'settings' => $request->input('types.' . $type),
+            'settings' => Arr::only($request->input(), array_keys($bareGateway->getSettings())),
         ];
 
         // Handle order condition if it's in the request
diff --git a/src/Http/Controllers/Settings/GeneralSettingsController.php b/src/Http/Controllers/Settings/GeneralSettingsController.php
new file mode 100644
index 0000000000..a0bd5ebbd8
--- /dev/null
+++ b/src/Http/Controllers/Settings/GeneralSettingsController.php
@@ -0,0 +1,109 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Commerce\Http\Controllers\Settings;
+
+use CraftCms\Cms\Form\Controls\Combobox;
+use CraftCms\Cms\Form\Enums\ControlMode;
+use CraftCms\Cms\Form\Form;
+use CraftCms\Cms\Form\FormContext;
+use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Form\Nodes\Heading;
+use CraftCms\Cms\Form\Nodes\Separator;
+use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Http\Responses\CpScreenResponse;
+use CraftCms\Cms\Support\Facades\Plugins;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Config;
+use Symfony\Component\HttpFoundation\Response;
+
+use function CraftCms\Cms\cp_url;
+use function CraftCms\Cms\t;
+
+class GeneralSettingsController extends BaseSettingsController
+{
+    use RespondsWithFlash;
+
+    protected function getSectionCrumb(): array
+    {
+        return ['label' => t('General Settings', category: 'commerce'), 'href' => cp_url('commerce/settings/general')];
+    }
+
+    public function edit(): CpScreenResponse
+    {
+        $settings = $this->plugin->getSettings();
+        $config = Config::get('craft.commerce', null);
+
+        $overrideWarning = function($key) use ($config) {
+            if ($config && isset($config[$key])) {
+                return t("This is being overridden by the {setting} config setting in `config/{file}.php`.", [
+                    'setting' => $key,
+                    'file' => 'commerce',
+                ], category: 'commerce');
+            }
+
+            return null;
+        };
+
+        $form = Form::make([
+            Heading::make('units-heading', t('Units', category: 'commerce'))->level(3),
+            Field::make(t('Weight Unit'), Combobox::make('weightUnits')
+                ->options(array_map(fn($unit, $label) => ['value' => $unit, 'label' => $label], array_keys($settings->getWeightUnitsOptions()), $settings->getWeightUnitsOptions()))
+                ->showAllOnEmpty())
+                ->required()
+                ->instructions(t('The unit of measurement that should be used when specifying product weights.', category: 'commerce')),
+            Field::make(t('Dimension Unit'), Combobox::make('dimensionUnits')
+                ->options(array_map(fn($unit, $label) => ['value' => $unit, 'label' => $label], array_keys($settings->getDimensionUnits()), $settings->getDimensionUnits()))
+                ->showAllOnEmpty())
+                ->required()
+                ->instructions(t('The unit of measurement that should be used when specifying product dimensions.', category: 'commerce')),
+            Separator::make('default-view-separator'),
+            Heading::make('default-view-heading', t('Control Panel Settings', category: 'commerce'))->level(3),
+            Field::make(t('Default View'), Combobox::make('defaultView')
+                ->options(array_map(fn($unit, $label) => ['value' => $unit, 'label' => $label], array_keys($settings->getDefaultViewOptions()), $settings->getDefaultViewOptions()))
+                ->showAllOnEmpty())
+                ->required()
+                ->warning($overrideWarning('defaultView'))
+                ->instructions(t('Default Commerce control panel view. If the user does not have permission it will fall back to a location they can access.', category: 'commerce')),
+        ]);
+
+        $form = $this->formResolver->resolve($form, new FormContext(
+            namespace: 'settings',
+            values: [
+                'settings' => [
+                    'weightUnits' => $settings->weightUnits,
+                    'dimensionUnits' => $settings->dimensionUnits,
+                    'defaultView' => $settings->defaultView,
+                ],
+            ],
+            mode: $this->generalConfig->allowAdminChanges ? ControlMode::Editable : ControlMode::ReadOnly,
+        ));
+
+        $title = t('General Settings', category: 'commerce');
+
+        return $this->cpScreenResponse()
+            ->title($title)
+            ->crumbs($this->crumbs())
+            ->redirectUrl('commerce/settings/general')
+            ->inertiaPage('Form', [
+                'form' => $form,
+                'submit' => [
+                    'method' => 'post',
+                    'url' => action([self::class, 'saveSettings']),
+                ],
+            ]);
+    }
+
+    public function saveSettings(Request $request): Response|string
+    {
+        $settings = $request->input('settings');
+        $pluginSettingsSaved = Plugins::savePluginSettings($this->plugin, $settings);
+
+        if (!$pluginSettingsSaved) {
+            return $this->asFailure(t('Couldn’t save settings.', category: 'commerce'));
+        }
+
+        return $this->asSuccess(t('Settings saved.', category: 'commerce'));
+    }
+}
diff --git a/src/Http/Controllers/Settings/LineItemStatusesController.php b/src/Http/Controllers/Settings/LineItemStatusesController.php
index 6e44533790..11bd309ac8 100644
--- a/src/Http/Controllers/Settings/LineItemStatusesController.php
+++ b/src/Http/Controllers/Settings/LineItemStatusesController.php
@@ -4,12 +4,23 @@
 
 namespace CraftCms\Commerce\Http\Controllers\Settings;
 
-use CraftCms\Cms\Config\GeneralConfig;
-use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Cp\FormFields;
+use CraftCms\Cms\Form\Controls\Choice;
+use CraftCms\Cms\Form\Controls\Handle;
+use CraftCms\Cms\Form\Controls\Lightswitch;
+use CraftCms\Cms\Form\Controls\Text;
+use CraftCms\Cms\Form\Enums\ChoicePresentation;
+use CraftCms\Cms\Form\Enums\ControlMode;
+use CraftCms\Cms\Form\Form;
+use CraftCms\Cms\Form\FormContext;
+use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Form\Nodes\Heading;
+use CraftCms\Cms\Form\Nodes\HiddenField;
+use CraftCms\Cms\Form\Nodes\Table;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
+use CraftCms\Cms\Support\Html;
 use CraftCms\Cms\Support\Json;
-use CraftCms\Cms\View\TemplateMode;
-use CraftCms\Commerce\Database\Table;
+use CraftCms\Commerce\Database\Table as DbTable;
 use CraftCms\Commerce\Order\Data\LineItemStatus;
 use CraftCms\Commerce\Order\LineItemStatuses;
 use CraftCms\Commerce\Store\Data\Store;
@@ -18,34 +29,76 @@
 
 use Illuminate\Support\Facades\DB;
 use Symfony\Component\HttpFoundation\Response;
-use function CraftCms\Cms\pageTemplate;
+use function CraftCms\Cms\cp_url;
 use function CraftCms\Cms\t;
 
-readonly class LineItemStatusesController
+class LineItemStatusesController extends BaseSettingsController
 {
-    use RespondsWithFlash;
+    private const array STATUS_COLORS = ['green', 'orange', 'red', 'blue', 'yellow', 'pink', 'purple', 'turquoise', 'light', 'grey', 'black'];
 
-    private bool $readOnly;
-
-    public function __construct(GeneralConfig $generalConfig)
+    protected function getSectionCrumb(): array
     {
-        $this->readOnly = !$generalConfig->allowAdminChanges;
+        return ['label' => t('Line Item Statuses', category: 'commerce'), 'href' => cp_url('commerce/settings/lineitemstatuses')];
     }
 
-    public function index(): string
+    public function index(): CpScreenResponse
     {
-        $lineItemStatuses = [];
         $stores = app(Stores::class)->getAllStores();
-
-        $stores->each(function(Store $store) use (&$lineItemStatuses) {
-            $lineItemStatuses[$store->handle] = app(LineItemStatuses::class)->getAllLineItemStatuses($store->id);
+        $isMultiStore = $stores->count() > 1;
+
+        // Every store's table can plant its own create action in the page's shared actions
+        // slot, so with more than one store, only the first store's table gets one — a single
+        // combined "New line item status" menu covering every store, rather than one button apiece.
+        $createMenuItems = $this->readOnly ? [] : $stores->map(fn(Store $store) => [
+            'label' => $store->name,
+            'url' => cp_url("commerce/settings/lineitemstatuses/{$store->handle}/new"),
+        ])->all();
+        $createMenuAssigned = false;
+
+        $nodes = [];
+        $stores->each(function(Store $store) use (&$nodes, $isMultiStore, $createMenuItems, &$createMenuAssigned) {
+            if ($isMultiStore) {
+                $nodes[] = Heading::make("{$store->handle}-heading", $store->name);
+            }
+
+            $rows = app(LineItemStatuses::class)->getAllLineItemStatuses($store->id)
+                ->map(fn(LineItemStatus $lineItemStatus) => [
+                    'id' => $lineItemStatus->id,
+                    // getLabelHtml() already encodes the name it interpolates — safe to wrap directly.
+                    'name' => ['html' => Html::a($lineItemStatus->getLabelHtml(), $lineItemStatus->getCpEditUrl(), ['class' => 'cell-bold'])],
+                    'handle' => ['html' => FormFields::copytextHtml(['value' => $lineItemStatus->handle, 'monospace' => true])],
+                    'default' => $lineItemStatus->default ? ['icon' => 'check', 'label' => t('Yes')] : '',
+                ])
+                ->all();
+
+            $nodes[] = Table::make("{$store->handle}-line-item-statuses")
+                ->columns([
+                    ['key' => 'name', 'label' => t('Name')],
+                    ['key' => 'handle', 'label' => t('Handle')],
+                    ['key' => 'default', 'label' => t('Default Status?', category: 'commerce')],
+                ])
+                ->rows($rows)
+                ->emptyMessage(t('No line item statuses exist yet.', category: 'commerce'))
+                ->when(!$createMenuAssigned && $createMenuItems, function(Table $table) use ($createMenuItems, &$createMenuAssigned) {
+                    $table->createActionMenu(t('New line item status', category: 'commerce'), $createMenuItems);
+                    $createMenuAssigned = true;
+                })
+                ->when(!$this->readOnly, fn(Table $table) => $table
+                    ->reorderable(action([self::class, 'reorder']))
+                    ->deletable(
+                        action([self::class, 'archive']),
+                        t('Are you sure you want to delete this line item status? This will set all line items with this status to no status.', category: 'commerce'),
+                    ));
         });
 
-        return pageTemplate('commerce/settings/lineitemstatuses/index', [
-            'lineItemStatuses' => $lineItemStatuses,
-            'stores' => $stores->all(),
-            'readOnly' => $this->readOnly,
-        ], TemplateMode::Cp);
+        $title = t('Line Item Statuses', category: 'commerce');
+
+        return $this->cpScreenResponse()
+            ->title($title)
+            ->crumbs($this->crumbs())
+            ->inertiaPage('Form', [
+                'form' => $this->formResolver->resolve(Form::make($nodes), new FormContext()),
+            ]);
     }
 
     public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResponse
@@ -61,15 +114,13 @@ public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResp
             $lineItemStatus = new LineItemStatus(['storeId' => $store->id]);
         }
 
-        $statusColors = ['green', 'orange', 'red', 'blue', 'yellow', 'pink', 'purple', 'turquoise', 'light', 'grey', 'black'];
-        $nextAvailableColor = null;
-
         if ($lineItemStatus->id) {
             $title = $lineItemStatus->name;
+            $statusColor = $lineItemStatus->color;
         } else {
             $title = t('Create a new line item status', category: 'commerce');
 
-            $availableColors = $statusColors;
+            $availableColors = self::STATUS_COLORS;
             app(LineItemStatuses::class)->getAllLineItemStatuses($store->id)->each(function(LineItemStatus $status) use (&$availableColors) {
                 $key = array_search($status->color, $availableColors, true);
                 if ($key !== false) {
@@ -77,24 +128,63 @@ public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResp
                 }
             });
 
-            $nextAvailableColor = !empty($availableColors) ? array_shift($availableColors) : 'green';
+            $statusColor = !empty($availableColors) ? array_shift($availableColors) : 'green';
+        }
+
+        $colorOptions = array_map(fn(string $color) => [
+            'label' => ucfirst(t($color, category: 'commerce')),
+            'labelHtml' => Html::tag('span', '', ['class' => "status $color"]) . Html::encode(ucfirst(t($color, category: 'commerce'))),
+            'value' => $color,
+        ], self::STATUS_COLORS);
+
+        $handle = Handle::make('handle');
+        if (!$lineItemStatus->id) {
+            $handle->source('name');
+        }
+
+        $formNodes = [
+            HiddenField::make('storeId'),
+        ];
+
+        if ($lineItemStatus->id) {
+            $formNodes[] = HiddenField::make('sortOrder');
+            $formNodes[] = HiddenField::make('id');
         }
 
-        return new CpScreenResponse()
+        $formNodes[] = Field::make(t('Name', category: 'commerce'), Text::make('name')->autofocus())
+            ->instructions(t('What this status will be called in the control panel.', category: 'commerce'))
+            ->required();
+        $formNodes[] = Field::make(t('Handle', category: 'commerce'), $handle)
+            ->instructions(t('How you’ll refer to this status in the templates.', category: 'commerce'))
+            ->required();
+        $formNodes[] = Field::make(t('Color', category: 'commerce'), Choice::make('color')->presentation(ChoicePresentation::Radios)->options($colorOptions))
+            ->instructions(t('Choose a color to represent the order’s status', category: 'commerce'));
+        $formNodes[] = Field::make(t('New line items get this status by default when the order is completed', category: 'commerce'), Lightswitch::make('default'));
+
+        $form = $this->formResolver->resolve(Form::make($formNodes), new FormContext(
+            values: [
+                'storeId' => $store->id,
+                'sortOrder' => $lineItemStatus->sortOrder,
+                'id' => $lineItemStatus->id,
+                'name' => $lineItemStatus->name,
+                'handle' => $lineItemStatus->handle,
+                'color' => $statusColor,
+                'default' => $lineItemStatus->default,
+            ],
+            mode: $this->generalConfig->allowAdminChanges ? ControlMode::Editable : ControlMode::ReadOnly,
+        ));
+
+        return $this->cpScreenResponse()
             ->title($title)
-            ->crumbs([
-                ['label' => t('Commerce', category: 'commerce'), 'url' => 'commerce'],
-                ['label' => t('Settings'), 'url' => 'commerce/settings', 'ariaLabel' => t('Commerce Settings', category: 'commerce')],
-                ['label' => t('Line Item Statuses', category: 'commerce'), 'url' => 'commerce/settings/lineitemstatuses'],
-            ])
-            ->selectedSubnavItem('settings')
+            ->crumbs($lineItemStatus->id ? $this->crumbs(['label' => $title]) : $this->crumbs())
             ->action('commerce/line-item-statuses/save')
             ->redirectUrl('commerce/settings/lineitemstatuses')
-            ->contentTemplate('commerce/settings/lineitemstatuses/_edit', [
-                'lineItemStatus' => $lineItemStatus,
-                'statusColors' => $statusColors,
-                'nextAvailableColor' => $nextAvailableColor,
-                'readOnly' => $this->readOnly,
+            ->inertiaPage('Form', [
+                'form' => $form,
+                'submit' => [
+                    'method' => 'post',
+                    'url' => action([self::class, 'save']),
+                ],
             ]);
     }
 
@@ -115,7 +205,7 @@ public function save(Request $request): Response
             return $this->asModelFailure($lineItemStatus, t('Couldn\'t save line item status.', category: 'commerce'), 'lineItemStatus');
         }
 
-        return $this->asModelSuccess($lineItemStatus, t('Order status saved.', category: 'commerce'), 'lineItemStatus');
+        return $this->asModelSuccess($lineItemStatus, t('Line item status saved.', category: 'commerce'), 'lineItemStatus');
     }
 
     public function reorder(Request $request): Response
@@ -139,7 +229,7 @@ public function archive(Request $request): Response
         $lineItemStatusId = $request->input('id');
         abort_if(!$lineItemStatusId, 400, 'Missing line item status id');
 
-        $storeId = DB::table(Table::LINEITEMSTATUSES)->where('id', $lineItemStatusId)->value('storeId');
+        $storeId = DB::table(DbTable::LINEITEMSTATUSES)->where('id', $lineItemStatusId)->value('storeId');
 
         if (!$storeId || !app(LineItemStatuses::class)->archiveLineItemStatusById((int)$lineItemStatusId, $storeId)) {
             return $this->asFailure(t('Couldn\'t archive Line Item Status.', category: 'commerce'));
diff --git a/src/Http/Controllers/Settings/OrderSettingsController.php b/src/Http/Controllers/Settings/OrderSettingsController.php
index 910214cfad..ea4d4dd354 100644
--- a/src/Http/Controllers/Settings/OrderSettingsController.php
+++ b/src/Http/Controllers/Settings/OrderSettingsController.php
@@ -4,39 +4,60 @@
 
 namespace CraftCms\Commerce\Http\Controllers\Settings;
 
-use CraftCms\Cms\Config\GeneralConfig;
-use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Form\Controls\FieldLayoutDesigner;
+use CraftCms\Cms\Form\Enums\ControlMode;
+use CraftCms\Cms\Form\Form;
+use CraftCms\Cms\Form\FormContext;
+use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Facades\Fields;
 use CraftCms\Cms\Support\Facades\ProjectConfig;
 use CraftCms\Cms\Support\Str;
-use CraftCms\Cms\View\TemplateMode;
 use CraftCms\Commerce\Order\Elements\Order;
 use CraftCms\Commerce\Order\Orders;
 use Symfony\Component\HttpFoundation\Response;
 
-use function CraftCms\Cms\pageTemplate;
+use function CraftCms\Cms\cp_url;
 use function CraftCms\Cms\t;
 
-readonly class OrderSettingsController
+class OrderSettingsController extends BaseSettingsController
 {
-    use RespondsWithFlash;
-
-    private bool $readOnly;
-
-    public function __construct(GeneralConfig $generalConfig)
+    protected function getSectionCrumb(): array
     {
-        $this->readOnly = !$generalConfig->allowAdminChanges;
+        return ['label' => t('Order Fields', category: 'commerce'), 'href' => cp_url('commerce/settings/ordersettings')];
     }
 
-    public function edit(): string
+    public function edit(): CpScreenResponse
     {
         $fieldLayout = Fields::getLayoutByType(Order::class);
+        $title = t('Order Settings', category: 'commerce');
+
+        $form = Form::make([
+            Field::make(null, FieldLayoutDesigner::make('fieldLayout')
+                ->elementType(Order::class)
+                ->withCardViewDesigner()),
+        ]);
 
-        return pageTemplate('commerce/settings/ordersettings/_edit', [
-            'fieldLayout' => $fieldLayout,
-            'title' => t('Order Settings', category: 'commerce'),
-            'readOnly' => $this->readOnly,
-        ], TemplateMode::Cp);
+        return $this->cpScreenResponse()
+            ->title($title)
+            ->crumbs($this->crumbs())
+            ->redirectUrl('commerce/settings/ordersettings')
+            ->inertiaPage('Form', [
+                'form' => $this->formResolver->resolve($form, new FormContext(
+                    values: [
+                        'fieldLayout' => [
+                            'id' => $fieldLayout->id,
+                            'uid' => $fieldLayout->uid,
+                            ...($fieldLayout->getConfig() ?? []),
+                        ],
+                    ],
+                    mode: $this->readOnly ? ControlMode::ReadOnly : ControlMode::Editable,
+                )),
+                'submit' => [
+                    'method' => 'post',
+                    'url' => action([self::class, 'save']),
+                ],
+            ]);
     }
 
     public function save(): Response
diff --git a/src/Http/Controllers/Settings/OrderStatusesController.php b/src/Http/Controllers/Settings/OrderStatusesController.php
index eecbe1c667..22ce91a25a 100644
--- a/src/Http/Controllers/Settings/OrderStatusesController.php
+++ b/src/Http/Controllers/Settings/OrderStatusesController.php
@@ -5,12 +5,23 @@
 namespace CraftCms\Commerce\Http\Controllers\Settings;
 
 use craft\db\Query;
-use CraftCms\Cms\Config\GeneralConfig;
-use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Cp\FormFields;
+use CraftCms\Cms\Form\Controls\Choice;
+use CraftCms\Cms\Form\Controls\Handle;
+use CraftCms\Cms\Form\Controls\Lightswitch;
+use CraftCms\Cms\Form\Controls\Text;
+use CraftCms\Cms\Form\Enums\ChoicePresentation;
+use CraftCms\Cms\Form\Enums\ControlMode;
+use CraftCms\Cms\Form\Form;
+use CraftCms\Cms\Form\FormContext;
+use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Form\Nodes\Heading;
+use CraftCms\Cms\Form\Nodes\HiddenField;
+use CraftCms\Cms\Form\Nodes\Table;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
+use CraftCms\Cms\Support\Html;
 use CraftCms\Cms\Support\Json;
-use CraftCms\Cms\View\TemplateMode;
-use CraftCms\Commerce\Database\Table;
+use CraftCms\Commerce\Database\Table as DbTable;
 use CraftCms\Commerce\Email\Data\Email;
 use CraftCms\Commerce\Email\Emails;
 use CraftCms\Commerce\Order\Data\OrderStatus;
@@ -22,35 +33,86 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Symfony\Component\HttpFoundation\Response;
+use function CraftCms\Cms\cp_url;
 use function CraftCms\Cms\currentUser;
-use function CraftCms\Cms\pageTemplate;
 use function CraftCms\Cms\t;
 
-readonly class OrderStatusesController
+class OrderStatusesController extends BaseSettingsController
 {
-    use RespondsWithFlash;
+    private const array STATUS_COLORS = ['green', 'orange', 'red', 'blue', 'yellow', 'pink', 'purple', 'turquoise', 'light', 'grey', 'black'];
 
-    private bool $readOnly;
-
-    public function __construct(GeneralConfig $generalConfig)
+    protected function getSectionCrumb(): array
     {
-        $this->readOnly = !$generalConfig->allowAdminChanges;
+        return ['label' => t('Order Statuses', category: 'commerce'), 'href' => cp_url('commerce/settings/orderstatuses')];
     }
 
-    public function index(): string
+    public function index(): CpScreenResponse
     {
-        $orderStatuses = [];
         $stores = app(Stores::class)->getAllStores();
-
-        $stores->each(function(Store $store) use (&$orderStatuses) {
-            $orderStatuses[$store->handle] = app(OrderStatuses::class)->getAllOrderStatuses($store->id);
+        $isMultiStore = $stores->count() > 1;
+
+        // Every store's table can plant its own create action in the page's shared actions
+        // slot, so with more than one store, only the first store's table gets one — a single
+        // combined "New order status" menu covering every store, rather than one button apiece.
+        $createMenuItems = $this->readOnly ? [] : $stores->map(fn(Store $store) => [
+            'label' => $store->name,
+            'url' => cp_url("commerce/settings/orderstatuses/{$store->handle}/new"),
+        ])->all();
+        $createMenuAssigned = false;
+
+        $nodes = [];
+        $stores->each(function(Store $store) use (&$nodes, $isMultiStore, $createMenuItems, &$createMenuAssigned) {
+            if ($isMultiStore) {
+                $nodes[] = Heading::make("{$store->handle}-heading", $store->name);
+            }
+
+            $rows = app(OrderStatuses::class)->getAllOrderStatuses($store->id)
+                ->map(function(OrderStatus $orderStatus) {
+                    $emailCount = count($orderStatus->getEmailIds());
+
+                    return [
+                        'id' => $orderStatus->id,
+                        // getLabelHtml() already Html::encode()s the name it interpolates — safe to
+                        // wrap directly, same as the pre-conversion Twig index did.
+                        'name' => ['html' => Html::a($orderStatus->getLabelHtml(), $orderStatus->getCpEditUrl(), ['class' => 'cell-bold'])],
+                        'handle' => ['html' => FormFields::copytextHtml(['value' => $orderStatus->handle, 'monospace' => true])],
+                        'hasEmails' => $emailCount > 0 ? $emailCount : '',
+                        'default' => $orderStatus->default ? ['icon' => 'check', 'label' => t('Yes')] : '',
+                    ];
+                })
+                // getAllOrderStatuses() ends in a ->filter(), which (like the rest of Illuminate's
+                // Collection) preserves original keys rather than reindexing — so with an item
+                // filtered out upstream, ->all() can hand back a non-sequential array that
+                // json_encodes as a JS object instead of an array. ->values() guarantees a plain list.
+                ->values()
+                ->all();
+
+            $nodes[] = Table::make("{$store->handle}-order-statuses")
+                ->columns([
+                    ['key' => 'name', 'label' => t('Name')],
+                    ['key' => 'handle', 'label' => t('Handle')],
+                    ['key' => 'hasEmails', 'label' => t('Has Emails?', category: 'commerce')],
+                    ['key' => 'default', 'label' => t('Default Status?', category: 'commerce')],
+                ])
+                ->rows($rows)
+                ->emptyMessage(t('No order statuses exist yet.', category: 'commerce'))
+                ->when(!$createMenuAssigned && $createMenuItems, function(Table $table) use ($createMenuItems, &$createMenuAssigned) {
+                    $table->createActionMenu(t('New order status', category: 'commerce'), $createMenuItems);
+                    $createMenuAssigned = true;
+                })
+                ->when(!$this->readOnly, fn(Table $table) => $table
+                    ->reorderable(action([self::class, 'reorder']))
+                    ->deletable(action([self::class, 'delete'])));
         });
 
-        return pageTemplate('commerce/settings/orderstatuses/index', [
-            'orderStatuses' => $orderStatuses,
-            'stores' => $stores->all(),
-            'readOnly' => $this->readOnly,
-        ], TemplateMode::Cp);
+        $title = t('Order Statuses', category: 'commerce');
+
+        return $this->cpScreenResponse()
+            ->title($title)
+            ->crumbs($this->crumbs())
+            ->inertiaPage('Form', [
+                'form' => $this->formResolver->resolve(Form::make($nodes), new FormContext()),
+            ]);
     }
 
     public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResponse
@@ -66,15 +128,13 @@ public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResp
             $orderStatus = new OrderStatus(['storeId' => $store->id]);
         }
 
-        $statusColors = ['green', 'orange', 'red', 'blue', 'yellow', 'pink', 'purple', 'turquoise', 'light', 'grey', 'black'];
-        $nextAvailableColor = null;
-
         if ($orderStatus->id) {
             $title = $orderStatus->name;
+            $statusColor = $orderStatus->color;
         } else {
             $title = t('Create a new order status', category: 'commerce');
 
-            $availableColors = $statusColors;
+            $availableColors = self::STATUS_COLORS;
             app(OrderStatuses::class)->getAllOrderStatuses($store->id)->each(function(OrderStatus $status) use (&$availableColors) {
                 $key = array_search($status->color, $availableColors, true);
                 if ($key !== false) {
@@ -82,27 +142,86 @@ public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResp
                 }
             });
 
-            $nextAvailableColor = !empty($availableColors) ? array_shift($availableColors) : 'green';
+            $statusColor = !empty($availableColors) ? array_shift($availableColors) : 'green';
         }
 
-        $emails = app(Emails::class)->getAllEmails($store->id)->mapWithKeys(fn(Email $email) => [$email->id => $email->name])->all();
+        $colorOptions = array_map(fn(string $color) => [
+            'label' => ucfirst(t($color, category: 'commerce')),
+            'labelHtml' => Html::tag('span', '', ['class' => "status $color"]) . Html::encode(ucfirst(t($color, category: 'commerce'))),
+            'value' => $color,
+        ], self::STATUS_COLORS);
+
+        $emailOptions = app(Emails::class)->getAllEmails($store->id)
+            ->map(fn(Email $email) => ['label' => $email->name, 'value' => $email->id])
+            ->all();
+
+        $emailsNode = Field::make(t('Status Emails', category: 'commerce'), Choice::make('emails')->multiple()->options($emailOptions))
+            ->instructions(t('Select the emails that will be sent when transitioning to this status.', category: 'commerce'))
+            ->warning($emailOptions === [] ? t('You currently have no emails configured to select for this status.', category: 'commerce') : null);
+
+        // An existing default status can't be un-defaulted from its own screen — promote a
+        // different status to default instead. A brand new status defaults to on when it'll be
+        // the store's first (nothing else to be the default), same as the legacy behavior.
+        $isDefault = $orderStatus->default
+            || app(OrderStatuses::class)->getAllOrderStatuses($store->id)->count() === 0;
+
+        $defaultNode = $orderStatus->default
+            ? HiddenField::make('default')
+            : Field::make(t('New orders get this status by default', category: 'commerce'), Lightswitch::make('default'));
+
+        $handle = Handle::make('handle');
+        if (!$orderStatus->id) {
+            $handle->source('name');
+        }
+
+        $formNodes = [
+            HiddenField::make('storeId'),
+        ];
+
+        if ($orderStatus->id) {
+            $formNodes[] = HiddenField::make('sortOrder');
+            $formNodes[] = HiddenField::make('id');
+        }
 
-        return new CpScreenResponse()
+        $formNodes[] = Field::make(t('Name', category: 'commerce'), Text::make('name')->autofocus())
+            ->instructions(t('What this status will be called in the control panel.', category: 'commerce'))
+            ->required();
+        $formNodes[] = Field::make(t('Handle', category: 'commerce'), $handle)
+            ->instructions(t('How you’ll refer to this status in the templates.', category: 'commerce'))
+            ->required();
+        $formNodes[] = Field::make(t('Description', category: 'commerce'), Text::make('description'))
+            ->instructions(t('Order Status description.', category: 'commerce'));
+        $formNodes[] = Field::make(t('Color', category: 'commerce'), Choice::make('color')->presentation(ChoicePresentation::Radios)->options($colorOptions))
+            ->instructions(t('Choose a color to represent the order’s status', category: 'commerce'));
+        $formNodes[] = $emailsNode;
+        $formNodes[] = $defaultNode;
+
+        $form = $this->formResolver->resolve(Form::make($formNodes), new FormContext(
+            values: [
+                'storeId' => $store->id,
+                'sortOrder' => $orderStatus->sortOrder,
+                'id' => $orderStatus->id,
+                'name' => $orderStatus->name,
+                'handle' => $orderStatus->handle,
+                'description' => $orderStatus->description,
+                'color' => $statusColor,
+                'emails' => $orderStatus->getEmailIds(),
+                'default' => $isDefault,
+            ],
+            mode: $this->generalConfig->allowAdminChanges ? ControlMode::Editable : ControlMode::ReadOnly,
+        ));
+
+        return $this->cpScreenResponse()
             ->title($title)
-            ->crumbs([
-                ['label' => t('Commerce', category: 'commerce'), 'url' => 'commerce'],
-                ['label' => t('Settings'), 'url' => 'commerce/settings', 'ariaLabel' => t('Commerce Settings', category: 'commerce')],
-                ['label' => t('Order Statuses', category: 'commerce'), 'url' => 'commerce/settings/orderstatuses'],
-            ])
-            ->selectedSubnavItem('settings')
+            ->crumbs($orderStatus->id ? $this->crumbs(['label' => $title]) : $this->crumbs())
             ->action('commerce/order-statuses/save')
             ->redirectUrl('commerce/settings/orderstatuses')
-            ->contentTemplate('commerce/settings/orderstatuses/_edit', [
-                'orderStatus' => $orderStatus,
-                'statusColors' => $statusColors,
-                'nextAvailableColor' => $nextAvailableColor,
-                'emails' => $emails,
-                'readOnly' => $this->readOnly,
+            ->inertiaPage('Form', [
+                'form' => $form,
+                'submit' => [
+                    'method' => 'post',
+                    'url' => action([self::class, 'save']),
+                ],
             ]);
     }
 
@@ -124,7 +243,7 @@ public function save(Request $request): Response
 
         if (!$id) {
             $orderStatus->sortOrder = new Query()
-                    ->from(Table::ORDERSTATUSES)
+                    ->from(DbTable::ORDERSTATUSES)
                     ->where(['storeId' => $storeId])
                     ->max('[[sortOrder]]') + 1;
         }
@@ -177,7 +296,7 @@ public function delete(Request $request): Response
         $orderStatusId = $request->input('id');
         abort_if(!$orderStatusId, 400, 'Missing order status id');
 
-        $storeId = DB::table(Table::ORDERSTATUSES)->where('id', $orderStatusId)->value('storeId');
+        $storeId = DB::table(DbTable::ORDERSTATUSES)->where('id', $orderStatusId)->value('storeId');
 
         if ($storeId) {
             $this->requireStoreAccess((int)$storeId);
diff --git a/src/Http/Controllers/Settings/PdfsController.php b/src/Http/Controllers/Settings/PdfsController.php
index 704e590ecc..34f0dc68c9 100644
--- a/src/Http/Controllers/Settings/PdfsController.php
+++ b/src/Http/Controllers/Settings/PdfsController.php
@@ -4,11 +4,23 @@
 
 namespace CraftCms\Commerce\Http\Controllers\Settings;
 
-use CraftCms\Cms\Config\GeneralConfig;
-use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Cp\FormFields;
+use CraftCms\Cms\Cp\SelectOptions;
+use CraftCms\Cms\Form\Controls\Choice;
+use CraftCms\Cms\Form\Controls\Combobox;
+use CraftCms\Cms\Form\Controls\Handle;
+use CraftCms\Cms\Form\Controls\Lightswitch;
+use CraftCms\Cms\Form\Controls\Number;
+use CraftCms\Cms\Form\Controls\Text;
+use CraftCms\Cms\Form\Enums\ControlMode;
+use CraftCms\Cms\Form\Form;
+use CraftCms\Cms\Form\FormContext;
+use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Form\Nodes\Heading;
+use CraftCms\Cms\Form\Nodes\HiddenField;
+use CraftCms\Cms\Form\Nodes\Table;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Json;
-use CraftCms\Cms\View\TemplateMode;
 use CraftCms\Commerce\Helpers\Locale as LocaleHelper;
 use CraftCms\Commerce\Pdf\Data\Pdf;
 use CraftCms\Commerce\Pdf\Models\Pdf as PdfRecord;
@@ -18,34 +30,72 @@
 
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
-use function CraftCms\Cms\pageTemplate;
+use function CraftCms\Cms\cp_url;
 use function CraftCms\Cms\t;
 
-readonly class PdfsController
+class PdfsController extends BaseSettingsController
 {
-    use RespondsWithFlash;
-
-    private bool $readOnly;
-
-    public function __construct(GeneralConfig $generalConfig)
+    protected function getSectionCrumb(): array
     {
-        $this->readOnly = !$generalConfig->allowAdminChanges;
+        return ['label' => t('PDFs', category: 'commerce'), 'href' => cp_url('commerce/settings/pdfs')];
     }
 
-    public function index(): string
+    public function index(): CpScreenResponse
     {
-        $pdfs = [];
         $stores = app(Stores::class)->getAllStores();
+        $isMultiStore = $stores->count() > 1;
+
+        // Every store's table can plant its own create action in the page's shared actions
+        // slot, so with more than one store, only the first store's table gets one — a single
+        // combined "New PDF" menu covering every store, rather than one button apiece.
+        $createMenuItems = $this->readOnly ? [] : $stores->map(fn(Store $store) => [
+            'label' => $store->name,
+            'url' => cp_url("commerce/settings/pdfs/{$store->handle}/new"),
+        ])->all();
+        $createMenuAssigned = false;
 
-        $stores->each(function(Store $store) use (&$pdfs) {
-            $pdfs[$store->handle] = app(Pdfs::class)->getAllPdfs($store->id);
+        $nodes = [];
+        $stores->each(function(Store $store) use (&$nodes, $isMultiStore, $createMenuItems, &$createMenuAssigned) {
+            if ($isMultiStore) {
+                $nodes[] = Heading::make("{$store->handle}-heading", $store->name);
+            }
+
+            $rows = app(Pdfs::class)->getAllPdfs($store->id)
+                ->map(fn(Pdf $pdf) => [
+                    'id' => $pdf->id,
+                    'name' => ['label' => t($pdf->name, category: 'site'), 'url' => $pdf->getCpEditUrl()],
+                    'handle' => ['html' => FormFields::copytextHtml(['value' => $pdf->handle, 'monospace' => true])],
+                    'enabled' => $pdf->enabled ? ['icon' => 'check', 'label' => t('Yes')] : '',
+                    'default' => $pdf->isDefault ? ['icon' => 'check', 'label' => t('Yes')] : '',
+                ])
+                ->all();
+
+            $nodes[] = Table::make("{$store->handle}-pdfs")
+                ->columns([
+                    ['key' => 'name', 'label' => t('Name')],
+                    ['key' => 'handle', 'label' => t('Handle')],
+                    ['key' => 'enabled', 'label' => t('Enabled?', category: 'commerce')],
+                    ['key' => 'default', 'label' => t('Default?', category: 'commerce')],
+                ])
+                ->rows($rows)
+                ->emptyMessage(t('No PDFs exist yet.', category: 'commerce'))
+                ->when(!$createMenuAssigned && $createMenuItems, function(Table $table) use ($createMenuItems, &$createMenuAssigned) {
+                    $table->createActionMenu(t('New PDF', category: 'commerce'), $createMenuItems);
+                    $createMenuAssigned = true;
+                })
+                ->when(!$this->readOnly, fn(Table $table) => $table
+                    ->reorderable(action([self::class, 'reorder']))
+                    ->deletable(action([self::class, 'delete'])));
         });
 
-        return pageTemplate('commerce/settings/pdfs/index', [
-            'pdfs' => $pdfs,
-            'stores' => $stores->all(),
-            'readOnly' => $this->readOnly,
-        ], TemplateMode::Cp);
+        $title = t('PDFs', category: 'commerce');
+
+        return $this->cpScreenResponse()
+            ->title($title)
+            ->crumbs($this->crumbs())
+            ->inertiaPage('Form', [
+                'form' => $this->formResolver->resolve(Form::make($nodes), new FormContext()),
+            ]);
     }
 
     public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResponse
@@ -54,12 +104,6 @@ public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResp
             $store = app(Stores::class)->getPrimaryStore();
         }
 
-        $pdfLanguageOptions = [
-            PdfRecord::LOCALE_ORDER_LANGUAGE => t('The language the order was made in.', category: 'commerce'),
-        ];
-
-        $pdfLanguageOptions = array_merge($pdfLanguageOptions, LocaleHelper::getSiteAndOtherLanguages());
-
         if ($id) {
             $pdf = app(Pdfs::class)->getPdfById($id, $store->id);
             abort_if($pdf === null, 404);
@@ -68,28 +112,106 @@ public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResp
         }
 
         $title = $pdf->id ? $pdf->name : t('Create a new PDF', category: 'commerce');
+        $isDefault = $pdf->isDefault || app(Pdfs::class)->getAllPdfs($pdf->storeId)->count() === 0;
+
+        // The old select field grouped these under "Site Languages"/"Other Languages" optgroup
+        // headers; Choice has no optgroup concept, so this flattens them into one list — every
+        // option still selectable, just without the section headers.
+        $languageOptions = collect([PdfRecord::LOCALE_ORDER_LANGUAGE => t('The language the order was made in.', category: 'commerce')])
+            ->merge(LocaleHelper::getSiteAndOtherLanguages())
+            ->reject(fn($label) => is_array($label))
+            ->map(fn($label, $value) => ['label' => $label, 'value' => $value])
+            ->values()
+            ->all();
 
-        $isDefault = app(Pdfs::class)->getAllPdfs($pdf->storeId)->count() === 0 || $pdf->isDefault;
-        $paperOrientationOptions = Pdf::getPaperOrientationOptions();
-        $paperSizeOptions = Pdf::getPaperSizeOptions();
+        $paperOrientationOptions = collect(Pdf::getPaperOrientationOptions())
+            ->map(fn($label, $value) => ['label' => $label, 'value' => $value])
+            ->values()
+            ->all();
 
-        return new CpScreenResponse()
+        $paperSizeOptions = collect(Pdf::getPaperSizeOptions())
+            ->map(fn($label, $value) => ['label' => $label, 'value' => $value])
+            ->values()
+            ->all();
+
+        $handle = Handle::make('handle');
+        if (!$pdf->id) {
+            $handle->source('name');
+        }
+
+        $defaultNode = $pdf->isDefault
+            ? HiddenField::make('isDefault')
+            : Field::make(t('Default Order PDF', category: 'commerce'), Lightswitch::make('isDefault'))
+                ->instructions(t('This is the default PDF that will be rendered when requesting the order PDF.', category: 'commerce'));
+
+        $formNodes = [
+            HiddenField::make('storeId'),
+        ];
+
+        if ($pdf->id) {
+            $formNodes[] = HiddenField::make('id');
+        }
+
+        $formNodes[] = Field::make(t('Name', category: 'commerce'), Text::make('name')->autofocus())
+            ->instructions(t('What this PDF will be called in the control panel.', category: 'commerce'))
+            ->required();
+        $formNodes[] = Field::make(t('Handle', category: 'commerce'), $handle)
+            ->instructions(t('How you’ll refer to this PDF in the templates.', category: 'commerce'))
+            ->required();
+        $formNodes[] = Field::make(t('Description', category: 'commerce'), Text::make('description'));
+        // Same template-path autosuggest as the old craft.cp.getTemplateSuggestions() JS call —
+        // Combobox is a free-text input with suggestions, not a closed choice.
+        $formNodes[] = Field::make(t('PDF Template Path', category: 'commerce'), Combobox::make('templatePath')->options(SelectOptions::getTemplateSuggestions()))
+            ->instructions(t('The template that the PDF should be generated from.', category: 'commerce'))
+            ->required();
+        $formNodes[] = Field::make(t('Order PDF Filename Format', category: 'commerce'), Text::make('fileNameFormat')->monospace())
+            ->instructions(t('What the order PDF filename should look like (sans extension). You can include tags that output order properties, such as {ex1} or {ex2}.', [
+                // Field::instructions() runs through the same markdown as the Twig field macro, but
+                // (unlike the old macro) doesn't pass raw inline HTML through — backticks instead of
+                // literal <code> tags get the same rendered result.
+                'ex1' => '`{number}`',
+                'ex2' => '`{myOrderCustomField}`',
+            ], category: 'commerce'));
+        $formNodes[] = Field::make(t('Language', category: 'commerce'), Choice::make('language')->options($languageOptions))
+            ->instructions(t('The language to be used when PDF is rendered.'));
+        $formNodes[] = Field::make(t('Paper Orientation', category: 'commerce'), Choice::make('paperOrientation')->options($paperOrientationOptions));
+        $formNodes[] = Field::make(t('Paper Size', category: 'commerce'), Choice::make('paperSize')->options($paperSizeOptions));
+        $formNodes[] = Field::make(t('Link Duration', category: 'commerce'), Number::make('linkExpiry')->min(1))
+            ->instructions(t('How long (in seconds) a PDF download link should remain valid before expiring. Default is 86400 (24 hours).', category: 'commerce'));
+        $formNodes[] = Field::make(t('Enabled?', category: 'commerce'), Lightswitch::make('enabled'))
+            ->instructions(t('If disabled, this PDF will not be available or sent with emails.', category: 'commerce'));
+        $formNodes[] = $defaultNode;
+
+        $form = $this->formResolver->resolve(Form::make($formNodes), new FormContext(
+            values: [
+                'storeId' => $store->id,
+                'id' => $pdf->id,
+                'name' => $pdf->name,
+                'handle' => $pdf->handle,
+                'description' => $pdf->description,
+                'templatePath' => $pdf->templatePath,
+                'fileNameFormat' => $pdf->fileNameFormat,
+                'language' => $pdf->language,
+                'paperOrientation' => $pdf->paperOrientation,
+                'paperSize' => $pdf->paperSize,
+                'linkExpiry' => $pdf->linkExpiry,
+                'enabled' => $pdf->enabled,
+                'isDefault' => $isDefault,
+            ],
+            mode: $this->generalConfig->allowAdminChanges ? ControlMode::Editable : ControlMode::ReadOnly,
+        ));
+
+        return $this->cpScreenResponse()
             ->title($title)
-            ->crumbs([
-                ['label' => t('Commerce', category: 'commerce'), 'url' => 'commerce'],
-                ['label' => t('Settings'), 'url' => 'commerce/settings', 'ariaLabel' => t('Commerce Settings', category: 'commerce')],
-                ['label' => t('PDFs', category: 'commerce'), 'url' => 'commerce/settings/pdfs'],
-            ])
-            ->selectedSubnavItem('settings')
+            ->crumbs($pdf->id ? $this->crumbs(['label' => $title]) : $this->crumbs())
             ->action('commerce/pdfs/save')
             ->redirectUrl('commerce/settings/pdfs')
-            ->contentTemplate('commerce/settings/pdfs/_edit', [
-                'pdf' => $pdf,
-                'pdfLanguageOptions' => $pdfLanguageOptions,
-                'isDefault' => $isDefault,
-                'paperOrientationOptions' => $paperOrientationOptions,
-                'paperSizeOptions' => $paperSizeOptions,
-                'readOnly' => $this->readOnly,
+            ->inertiaPage('Form', [
+                'form' => $form,
+                'submit' => [
+                    'method' => 'post',
+                    'url' => action([self::class, 'save']),
+                ],
             ]);
     }
 
diff --git a/src/Http/Controllers/Settings/ProductTypesController.php b/src/Http/Controllers/Settings/ProductTypesController.php
index e23a685043..90f1bbba4e 100644
--- a/src/Http/Controllers/Settings/ProductTypesController.php
+++ b/src/Http/Controllers/Settings/ProductTypesController.php
@@ -4,45 +4,98 @@
 
 namespace CraftCms\Commerce\Http\Controllers\Settings;
 
-use craft\web\assets\editsection\EditSectionAsset;
-use CraftCms\Cms\Config\GeneralConfig;
+use CraftCms\Cms\Cp\SelectOptions;
 use CraftCms\Cms\Element\Enums\PropagationMethod;
-use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Field\Enums\TranslationMethod;
+use CraftCms\Cms\Form\Controls\Choice;
+use CraftCms\Cms\Form\Controls\FieldLayoutDesigner;
+use CraftCms\Cms\Form\Controls\Handle;
+use CraftCms\Cms\Form\Controls\Lightswitch;
+use CraftCms\Cms\Form\Controls\Number;
+use CraftCms\Cms\Form\Controls\Table as TableControl;
+use CraftCms\Cms\Form\Controls\Text;
+use CraftCms\Cms\Form\Enums\ControlMode;
+use CraftCms\Cms\Form\Form;
+use CraftCms\Cms\Form\FormContext;
+use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Form\Nodes\Heading;
+use CraftCms\Cms\Form\Nodes\HiddenField;
+use CraftCms\Cms\Form\Nodes\Separator;
+use CraftCms\Cms\Form\Nodes\Table;
+use CraftCms\Cms\Form\Nodes\TemplateContent;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Facades\Fields;
 use CraftCms\Cms\Support\Facades\Sites;
-use CraftCms\Cms\View\TemplateMode;
+use CraftCms\Cms\Support\Html;
 use CraftCms\Commerce\Product\Elements\Product;
 use CraftCms\Commerce\Product\ProductType\Data\ProductType;
 use CraftCms\Commerce\Product\ProductType\Data\ProductTypeSite;
 use CraftCms\Commerce\Product\ProductType\ProductTypes;
 use CraftCms\Commerce\Product\Variant\Elements\Variant;
+use CraftCms\Commerce\Shipping\Data\ShippingCategory;
+use CraftCms\Commerce\Tax\Data\TaxCategory;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 use Symfony\Component\HttpFoundation\Response;
+use function CraftCms\Cms\cp_url;
 use function CraftCms\Cms\currentUser;
-use function CraftCms\Cms\pageTemplate;
 use function CraftCms\Cms\t;
 
-readonly class ProductTypesController
+class ProductTypesController extends BaseSettingsController
 {
-    use RespondsWithFlash;
-
-    private bool $readOnly;
-
-    public function __construct(GeneralConfig $generalConfig)
+    protected function getSectionCrumb(): array
     {
-        $this->readOnly = !$generalConfig->allowAdminChanges;
+        return ['label' => t('Product Types', category: 'commerce'), 'href' => cp_url('commerce/settings/producttypes')];
     }
 
-    public function productTypeIndex(): string
+    public function productTypeIndex(): CpScreenResponse
     {
-        $productTypes = app(ProductTypes::class)->getAllProductTypes();
-
-        return pageTemplate('commerce/settings/producttypes/index', [
-            'productTypes' => $productTypes,
-            'readOnly' => $this->readOnly,
-        ], TemplateMode::Cp);
+        $canManageShipping = (bool)currentUser()?->can('commerce-manageShipping');
+        $canManageTaxes = (bool)currentUser()?->can('commerce-manageTaxes');
+
+        $rows = array_map(fn(ProductType $productType) => [
+            'name' => [
+                'label' => t($productType->name, category: 'site'),
+                'url' => $productType->getCpEditUrl(),
+            ],
+            'handle' => $productType->handle,
+            'maxVariants' => $productType->maxVariants ?? '',
+            'shippingCategories' => array_map(fn(ShippingCategory $category) => [
+                'label' => t($category->name, category: 'site'),
+                'url' => $canManageShipping ? $category->getCpEditUrl() : null,
+            ], $productType->getShippingCategories()),
+            'taxCategories' => array_map(fn(TaxCategory $category) => [
+                'label' => t($category->name, category: 'site'),
+                'url' => $canManageTaxes ? $category->getCpEditUrl() : null,
+            ], $productType->getTaxCategories()),
+        ], app(ProductTypes::class)->getAllProductTypes());
+
+        $title = t('Product Types', category: 'commerce');
+
+        $form = Form::make([
+            Table::make('product-types')
+                ->columns([
+                    ['key' => 'name', 'label' => t('Name')],
+                    ['key' => 'handle', 'label' => t('Handle')],
+                    ['key' => 'maxVariants', 'label' => t('Max Variants', category: 'commerce')],
+                    ['key' => 'shippingCategories', 'label' => t('Available Shipping Categories', category: 'commerce')],
+                    ['key' => 'taxCategories', 'label' => t('Available Tax Categories', category: 'commerce')],
+                ])
+                ->rows(array_values($rows))
+                ->emptyMessage(t('No product types exist yet.', category: 'commerce'))
+                ->createAction(
+                    $this->readOnly ? null : t('New product type', category: 'commerce'),
+                    $this->readOnly ? null : cp_url('commerce/settings/producttypes/new'),
+                ),
+        ]);
+
+        return $this->cpScreenResponse()
+            ->title($title)
+            ->crumbs($this->crumbs())
+            ->inertiaPage('Form', [
+                'form' => $this->formResolver->resolve($form, new FormContext()),
+            ]);
     }
 
     public function editProductType(?int $productTypeId = null): CpScreenResponse
@@ -58,48 +111,384 @@ public function editProductType(?int $productTypeId = null): CpScreenResponse
         }
 
         $title = $productTypeId ? $productType->name : t('Create a new product type', category: 'commerce');
-
-        \Craft::$app->getView()->registerAssetBundle(EditSectionAsset::class);
-
-        return new CpScreenResponse()
+        $values = $this->initialValues($productType, $brandNewProductType);
+
+        $form = $this->formResolver->resolve(
+            $this->buildForm($productType, $values, $brandNewProductType),
+            new FormContext(
+                values: $values,
+                mode: $this->readOnly ? ControlMode::ReadOnly : ControlMode::Editable,
+                refreshable: !$this->readOnly,
+            ),
+        );
+
+        return $this->cpScreenResponse()
             ->title($title)
-            ->crumbs([
-                ['label' => t('Commerce', category: 'commerce'), 'url' => 'commerce'],
-                ['label' => t('Settings'), 'url' => 'commerce/settings', 'ariaLabel' => t('Commerce Settings', category: 'commerce')],
-                ['label' => t('Product Types', category: 'commerce'), 'url' => 'commerce/settings/producttypes'],
-            ])
-            ->tabs([
-                'productTypeSettings' => [
-                    'label' => t('Settings'),
-                    'url' => '#product-type-settings',
+            ->crumbs($brandNewProductType ? $this->crumbs() : $this->crumbs(['label' => $title]))
+            ->redirectUrl('commerce/settings/producttypes')
+            ->inertiaPage('Form', [
+                'form' => $form,
+                'submit' => [
+                    'method' => 'post',
+                    'url' => action([self::class, 'saveProductType']),
                 ],
-                'taxAndShipping' => [
-                    'label' => t('Tax & Shipping', category: 'commerce'),
-                    'url' => '#tax-and-shipping',
+                'refreshUrl' => $this->readOnly ? null : action([self::class, 'renderForm']),
+            ]);
+    }
+
+    /**
+     * Re-resolves the {@see editProductType()} Form tree for the values currently in progress
+     * on the client, so toggles like `isStructure`/`hasProductTitleField` can branch which
+     * fields appear next without a full page reload.
+     */
+    public function renderForm(Request $request): JsonResponse
+    {
+        // Validate for shape only — `Request::validate()` returns just the ruled subset
+        // (`validated()`), which would silently strip every field but `productTypeId` back
+        // out of `values`. Reading the raw input keeps the full posted values intact, which
+        // `buildForm()`'s branching (and every other control's live value) depends on.
+        $request->validate([
+            'values' => ['required', 'array'],
+            'values.productTypeId' => ['nullable', 'integer'],
+            'scope' => ['present', 'array', 'size:0'],
+        ]);
+
+        $values = $request->input('values');
+        $productTypeId = $values['productTypeId'] ?? null;
+
+        if ($productTypeId) {
+            $productType = app(ProductTypes::class)->getProductTypeById((int) $productTypeId);
+            abort_if(!$productType, 404);
+        } else {
+            $productType = new ProductType();
+        }
+
+        // The client only posts values for controls currently in the rendered tree — a field
+        // hidden behind a toggle that's about to flip back on is absent, not merely empty. Layer
+        // the posted values over this model's real defaults so a newly-revealed field (e.g.
+        // `defaultPlacement` when `isStructure` flips on) gets its actual value instead of null.
+        $values = array_replace($this->initialValues($productType, brandNew: !$productTypeId), $values);
+
+        $form = $this->formResolver->resolve(
+            $this->buildForm($productType, $values, brandNew: !$productTypeId),
+            new FormContext(
+                values: $values,
+                mode: ControlMode::Editable,
+                refreshable: true,
+            ),
+        );
+
+        return new JsonResponse(['form' => $form]);
+    }
+
+    /**
+     * The Form's starting values, derived from a loaded (or brand new) {@see ProductType}.
+     * Only used for the initial page load — {@see renderForm()} uses the client's own
+     * in-progress values instead, so unsaved edits aren't clobbered on every toggle.
+     *
+     * @return array<string, mixed>
+     */
+    private function initialValues(ProductType $productType, bool $brandNew): array
+    {
+        $siteSettings = $productType->getSiteSettings();
+        $siteRows = [];
+
+        foreach (Sites::getAllSites() as $site) {
+            $settings = $siteSettings[$site->id] ?? null;
+
+            $siteRows[$site->handle] = [
+                'name' => $site->getName(),
+                'enabled' => $brandNew || $settings !== null,
+                'uriFormat' => $settings->uriFormat ?? '',
+                'template' => $settings->template ?? '',
+                'enabledByDefault' => $settings === null || $settings->enabledByDefault,
+            ];
+        }
+
+        $productFieldLayout = $productType->getProductFieldLayout();
+        $variantFieldLayout = $productType->getVariantFieldLayout();
+
+        return [
+            'productTypeId' => $productType->id,
+            'name' => $productType->name,
+            'handle' => $productType->handle,
+            'isStructure' => $productType->isStructure,
+            'defaultPlacement' => $productType->defaultPlacement,
+            'maxLevels' => $productType->maxLevels ?? '',
+            'enableVersioning' => $productType->enableVersioning,
+            'hasProductTitleField' => $productType->hasProductTitleField,
+            'productTitleFormat' => $productType->productTitleFormat,
+            'productTitleTranslationMethod' => $productType->productTitleTranslationMethod,
+            'productTitleTranslationKeyFormat' => $productType->productTitleTranslationKeyFormat ?? '',
+            'productUiLabelFormat' => $productType->productUiLabelFormat,
+            'showSlugField' => $productType->showSlugField,
+            'slugTranslationMethod' => $productType->slugTranslationMethod,
+            'slugTranslationKeyFormat' => $productType->slugTranslationKeyFormat ?? '',
+            'skuFormat' => $productType->skuFormat ?? '',
+            'descriptionFormat' => $productType->descriptionFormat,
+            'maxVariants' => $productType->maxVariants ?? '',
+            'hasDimensions' => $productType->hasDimensions,
+            'hasVariantTitleField' => $productType->hasVariantTitleField,
+            'variantTitleFormat' => $productType->variantTitleFormat,
+            'variantTitleTranslationMethod' => $productType->variantTitleTranslationMethod,
+            'variantTitleTranslationKeyFormat' => $productType->variantTitleTranslationKeyFormat ?? '',
+            'variantUiLabelFormat' => $productType->variantUiLabelFormat,
+            'sites' => $siteRows,
+            'previewTargets' => $productType->previewTargets ?? [],
+            'propagationMethod' => $productType->propagationMethod->value,
+            'fieldLayout' => [
+                'id' => $productFieldLayout->id,
+                'uid' => $productFieldLayout->uid,
+                ...($productFieldLayout->getConfig() ?? []),
+            ],
+            'variant-layout' => [
+                'fieldLayout' => [
+                    'id' => $variantFieldLayout->id,
+                    'uid' => $variantFieldLayout->uid,
+                    ...($variantFieldLayout->getConfig() ?? []),
                 ],
-                'productFields' => [
-                    'label' => t('Product Fields', category: 'commerce'),
-                    'url' => '#product-fields',
+            ],
+        ];
+    }
+
+    /**
+     * Builds the edit screen's Form tree, branching on `$values` (rather than reading straight
+     * off `$productType`) so {@see editProductType()} and {@see renderForm()} produce the exact
+     * same shape for the exact same values — one from a loaded model, the other from whatever the
+     * client just posted mid-edit.
+     *
+     * @param  array<string, mixed>  $values
+     */
+    private function buildForm(ProductType $productType, array $values, bool $brandNew): Form
+    {
+        $isMultiSite = Sites::isMultiSite();
+
+        $handle = Handle::make('handle');
+
+        if ($brandNew) {
+            $handle->source('name');
+        }
+
+        $isStructureField = Field::make(
+            t('Enable structure for products of this type', category: 'commerce'),
+            Lightswitch::make('isStructure'),
+        );
+
+        if ($productType->id) {
+            $isStructureField->warning(t('Changing this may result in data loss.'));
+        }
+
+        $settingsFields = [
+            HiddenField::make('productTypeId'),
+            Field::make(t('Name', category: 'commerce'), Text::make('name')->autofocus())
+                ->instructions(t('What this product type will be called in the control panel.', category: 'commerce'))
+                ->required(),
+            Field::make(t('Handle', category: 'commerce'), $handle)
+                ->instructions(t('How you’ll refer to this product type in the templates.', category: 'commerce'))
+                ->required(),
+            $isStructureField,
+        ];
+
+        if ($values['isStructure'] ?? false) {
+            $settingsFields[] = Field::make(
+                t('Default {type} Placement', ['type' => t('Product', category: 'commerce')]),
+                Choice::make('defaultPlacement')->options([
+                    ['value' => 'beginning', 'label' => t('Before other {type}', ['type' => t('products', category: 'commerce')])],
+                    ['value' => 'end', 'label' => t('After other {type}', ['type' => t('products', category: 'commerce')])],
+                ]),
+            )->instructions(t('Where new {type} should be placed by default in the structure.', ['type' => t('products', category: 'commerce')]));
+
+            $settingsFields[] = Field::make(t('Max Levels'), Number::make('maxLevels')->min(1)->max(32767)->size(5))
+                ->instructions(t('The maximum number of levels this product type can have. Leave blank if you don’t care.', category: 'commerce'));
+        }
+
+        $settingsFields[] = Field::make(t('Enable versioning for products of this type', category: 'commerce'), Lightswitch::make('enableVersioning'));
+        $settingsFields[] = Field::make(t('Show the Title field for products', category: 'commerce'), Lightswitch::make('hasProductTitleField'));
+
+        if ($values['hasProductTitleField'] ?? false) {
+            if ($isMultiSite) {
+                $settingsFields[] = Field::make(
+                    t('{name} Translation Method', ['name' => t('Title')]),
+                    Choice::make('productTitleTranslationMethod')->options(TranslationMethod::asOptions()),
+                )->instructions(t('How should {name} values be translated?', ['name' => t('Title')]));
+
+                if (($values['productTitleTranslationMethod'] ?? null) === TranslationMethod::Custom->value) {
+                    $settingsFields[] = Field::make(
+                        t('{name} Translation Key Format', ['name' => t('Title')]),
+                        Text::make('productTitleTranslationKeyFormat')->monospace(),
+                    )->instructions(t('Template that defines the {name} field’s custom “translation key” format. Values will be copied to all sites that produce the same key.', ['name' => t('Title')]));
+                }
+            }
+        } else {
+            $settingsFields[] = Field::make(t('Product Title Format', category: 'commerce'), Text::make('productTitleFormat')->monospace())
+                ->instructions(t('What the auto-generated product titles should look like. You can include tags that output product properties, such as {ex1} or {ex2}. All custom fields used must be set to required.', [
+                    'ex1' => Html::code('{sku}'),
+                    'ex2' => Html::code('{myProductsCustomField}'),
+                ], category: 'commerce'));
+        }
+
+        $settingsFields[] = Field::make(t('UI Label Format'), Text::make('productUiLabelFormat')->monospace())
+            ->instructions(t('How products should be labeled within the control panel.', category: 'commerce'));
+        $settingsFields[] = Field::make(t('Show the Slug field'), Lightswitch::make('showSlugField'));
+
+        if ($isMultiSite && ($values['showSlugField'] ?? false)) {
+            $settingsFields[] = Field::make(
+                t('{name} Translation Method', ['name' => t('Slug')]),
+                Choice::make('slugTranslationMethod')->options(TranslationMethod::asOptions()),
+            )->instructions(t('How should {name} values be translated?', ['name' => t('Slug')]));
+
+            if (($values['slugTranslationMethod'] ?? null) === TranslationMethod::Custom->value) {
+                $settingsFields[] = Field::make(
+                    t('{name} Translation Key Format', ['name' => t('Slug')]),
+                    Text::make('slugTranslationKeyFormat')->monospace(),
+                )->instructions(t('Template that defines the {name} field’s custom "translation key" format. Values will be copied to all sites that produce the same key.', ['name' => t('Slug')]));
+            }
+        }
+
+        $settingsFields[] = Field::make(t('Automatic SKU Format', category: 'commerce'), Text::make('skuFormat')->monospace())
+            ->instructions(t('What the unique auto-generated SKUs should look like, when a SKU field is submitted without a value. You can include tags that output properties, such as {ex1} or {ex2}', [
+                'ex1' => Html::code('{product.slug}'),
+                'ex2' => Html::code('{myVariantCustomField}'),
+            ], category: 'commerce'));
+        $settingsFields[] = Field::make(t('Order Description Format', category: 'commerce'), Text::make('descriptionFormat')->monospace())
+            ->instructions(t('How this product will be described on a line item in an order. You can include tags that output properties, such as {ex1} or {ex2}', [
+                'ex1' => Html::code('{product.title}'),
+                'ex2' => Html::code('{myVariantCustomField}'),
+            ], category: 'commerce'));
+        $settingsFields[] = Field::make(t('Max Variants', category: 'commerce'), Number::make('maxVariants')->size(2));
+        $settingsFields[] = Field::make(t('Show the Dimensions and Weight fields for products of this type', category: 'commerce'), Lightswitch::make('hasDimensions'));
+        $settingsFields[] = Separator::make('variant-settings-separator');
+        $settingsFields[] = Field::make(t('Show the Title field for variants', category: 'commerce'), Lightswitch::make('hasVariantTitleField'));
+
+        if ($values['hasVariantTitleField'] ?? false) {
+            if ($isMultiSite) {
+                $settingsFields[] = Field::make(
+                    t('{name} Translation Method', ['name' => t('Title')]),
+                    Choice::make('variantTitleTranslationMethod')->options(TranslationMethod::asOptions()),
+                )->instructions(t('How should {name} values be translated?', ['name' => t('Title')]));
+
+                if (($values['variantTitleTranslationMethod'] ?? null) === TranslationMethod::Custom->value) {
+                    $settingsFields[] = Field::make(
+                        t('{name} Translation Key Format', ['name' => t('Title')]),
+                        Text::make('variantTitleTranslationKeyFormat')->monospace(),
+                    )->instructions(t('Template that defines the {name} field’s custom “translation key” format. Values will be copied to all sites that produce the same key.', ['name' => t('Title')]));
+                }
+            }
+        } else {
+            $settingsFields[] = Field::make(t('Variant Title Format', category: 'commerce'), Text::make('variantTitleFormat')->monospace())
+                ->instructions(t('What the auto-generated variant titles should look like. You can include tags that output variant properties, such as {ex1} or {ex2}. All custom fields used must be set to required.', [
+                    'ex1' => Html::code('{sku}'),
+                    'ex2' => Html::code('{myVariantsCustomField}'),
+                ], category: 'commerce'));
+        }
+
+        $settingsFields[] = Field::make(t('Variant UI Label Format', category: 'commerce'), Text::make('variantUiLabelFormat')->monospace())
+            ->instructions(t('How variants should be labeled within the control panel.', category: 'commerce'));
+        $settingsFields[] = Separator::make('site-settings-separator');
+        $settingsFields[] = Heading::make('site-settings-heading', t('Site Settings'))
+            ->description(t('Choose which sites this product type should be available in, and configure the site-specific settings.', category: 'commerce'));
+        $settingsFields[] = Field::make(control: TableControl::make('sites')
+            ->keyed()
+            ->columns([
+                'name' => ['heading' => t('Site'), 'type' => 'heading'],
+                'enabled' => ['heading' => t('Enabled'), 'type' => 'lightswitch'],
+                'uriFormat' => [
+                    'heading' => t('Product URI Format', category: 'commerce'),
+                    'type' => 'singleline',
+                    'info' => t('What product URIs should look like for the site.', category: 'commerce'),
                 ],
-                'variantFields' => [
-                    'label' => t('Variant Fields', category: 'commerce'),
-                    'url' => '#variant-fields',
+                'template' => [
+                    'heading' => t('Template'),
+                    'type' => 'template',
+                    'options' => SelectOptions::getTemplateSuggestions(),
+                    'info' => t('Which template should be loaded when a product’s URL is requested.', category: 'commerce'),
                 ],
+                'enabledByDefault' => ['heading' => t('Default Status'), 'type' => 'lightswitch'],
+            ]));
+
+        if (!$this->generalConfig->headlessMode) {
+            $settingsFields[] = Separator::make('preview-targets-separator');
+            $settingsFields[] = Heading::make('preview-targets-heading', t('Preview Targets'))
+                ->description(t('Locations that should be available for previewing products in this product type.', category: 'commerce'));
+            $settingsFields[] = Field::make(control: TableControl::make('previewTargets')
+                ->columns([
+                    'label' => ['heading' => t('Label'), 'type' => 'singleline'],
+                    'urlFormat' => [
+                        'heading' => t('URL Format'),
+                        'type' => 'singleline',
+                        'info' => t('The URL/URI to use for this target.'),
+                    ],
+                    'refresh' => ['heading' => t('Auto-refresh'), 'type' => 'lightswitch'],
+                ])
+                ->allowAdd()
+                ->allowDelete()
+                ->allowReorder());
+        }
+
+        if ($isMultiSite) {
+            $settingsFields[] = Field::make(
+                t('Propagation Method'),
+                Choice::make('propagationMethod')->options([
+                    ['value' => 'none', 'label' => t('Only save product to the site they were created in', category: 'commerce')],
+                    ['value' => 'siteGroup', 'label' => t('Save product to other sites in the same site group', category: 'commerce')],
+                    ['value' => 'language', 'label' => t('Save product to other sites with the same language', category: 'commerce')],
+                    ['value' => 'all', 'label' => t('Save product to all sites enabled for this product type', category: 'commerce')],
+                    ['value' => 'custom', 'label' => t('Let each product choose which sites it should be saved to', category: 'commerce')],
+                ]),
+            )->instructions(t('Of the enabled sites above, which sites should products in this product type be saved to?', category: 'commerce'));
+        }
+
+        return Form::make()
+            ->addTab(t('Settings'), $settingsFields)
+            ->addTab(t('Tax & Shipping', category: 'commerce'), [
+                Heading::make('shipping-categories-heading', t('Available Shipping Categories', category: 'commerce')),
+                TemplateContent::make('shipping-categories', $this->categoriesHtml(
+                    $productType->getShippingCategories(),
+                    (bool) currentUser()?->can('commerce-manageShipping'),
+                )),
+                Separator::make('tax-shipping-separator'),
+                Heading::make('tax-categories-heading', t('Available Tax Categories', category: 'commerce')),
+                TemplateContent::make('tax-categories', $this->categoriesHtml(
+                    $productType->getTaxCategories(),
+                    (bool) currentUser()?->can('commerce-manageTaxes'),
+                )),
             ])
-            ->selectedSubnavItem('settings')
-            ->action('commerce/product-types/save-product-type')
-            ->submitButtonLabel(t('Save'))
-            ->redirectUrl('commerce/settings/producttypes')
-            ->contentTemplate('commerce/settings/producttypes/_edit', [
-                'productTypeId' => $productTypeId,
-                'productType' => $productType,
-                'brandNewProductType' => $brandNewProductType,
-                'title' => $title,
-                'selectedTab' => 'productTypeSettings',
-                'readOnly' => $this->readOnly,
+            ->addTab(t('Product Fields', category: 'commerce'), [
+                Field::make(null, FieldLayoutDesigner::make('fieldLayout')
+                    ->elementType(Product::class)
+                    ->withCardViewDesigner()),
+            ])
+            ->addTab(t('Variant Fields', category: 'commerce'), [
+                Field::make(null, FieldLayoutDesigner::make('variant-layout.fieldLayout')
+                    ->elementType(Variant::class)
+                    ->withCardViewDesigner()),
             ]);
     }
 
+    /**
+     * @param  ShippingCategory[]|TaxCategory[]  $categories
+     *
+     * Category names are user-entered, so every name is run through {@see Html::encode()}
+     * before it's embedded — `Html::tag()`/`Html::a()` don't encode their content themselves
+     * (they assume the caller already has), and this content is otherwise-unsanitized HTML by
+     * the time {@see TemplateContent::make()} sanitizes it, so this can't rely on that alone.
+     */
+    private function categoriesHtml(array $categories, bool $canManage): string
+    {
+        if (empty($categories)) {
+            return Html::tag('p', Html::encode(t('None', category: 'commerce')));
+        }
+
+        $items = implode('', array_map(
+            fn($category) => Html::tag('li', $canManage
+                ? Html::a(Html::encode(t($category->name, category: 'site')), $category->getCpEditUrl())
+                : Html::encode(t($category->name, category: 'site'))),
+            $categories,
+        ));
+
+        return Html::tag('ul', $items, ['class' => 'bullets']);
+    }
+
     public function saveProductType(Request $request): ?Response
     {
         abort_unless(currentUser()?->can('manageCommerce'), 403, t('This action is not allowed for the current user.', category: 'commerce'));
diff --git a/src/Http/Controllers/Settings/SettingsController.php b/src/Http/Controllers/Settings/SettingsController.php
deleted file mode 100644
index ea5a5b6725..0000000000
--- a/src/Http/Controllers/Settings/SettingsController.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CraftCms\Commerce\Http\Controllers\Settings;
-
-use CraftCms\Cms\Config\GeneralConfig;
-use CraftCms\Cms\Http\RespondsWithFlash;
-use CraftCms\Cms\Support\Facades\Fields;
-use CraftCms\Cms\Support\Facades\Plugins;
-use CraftCms\Cms\Support\Facades\ProjectConfig;
-use CraftCms\Cms\Support\Str;
-use CraftCms\Cms\View\TemplateMode;
-use CraftCms\Commerce\Plugin;
-use CraftCms\Commerce\Transfer\Elements\Transfer;
-use CraftCms\Commerce\Transfer\Transfers;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-use function CraftCms\Cms\pageTemplate;
-use function CraftCms\Cms\t;
-
-readonly class SettingsController
-{
-    use RespondsWithFlash;
-
-    private bool $readOnly;
-
-    public function __construct(GeneralConfig $generalConfig, private readonly Plugin $plugin)
-    {
-        $this->readOnly = !$generalConfig->allowAdminChanges;
-    }
-
-    public function edit(): string
-    {
-        return pageTemplate('commerce/settings/general', [
-            'settings' => $this->plugin->getSettings(),
-            'readOnly' => $this->readOnly,
-        ], TemplateMode::Cp);
-    }
-
-    public function saveSettings(Request $request): Response|string
-    {
-        $plugin = $this->plugin;
-        $settings = $request->input('settings');
-        $pluginSettingsSaved = Plugins::savePluginSettings($plugin, $settings);
-
-        if (!$pluginSettingsSaved) {
-            return pageTemplate('commerce/settings/general/index', ['settings' => $plugin->getSettings()], TemplateMode::Cp);
-        }
-
-        return $this->asSuccess(t('Settings saved.', category: 'commerce'));
-    }
-
-    public function saveTransferSettings(): Response
-    {
-        $fieldLayout = Fields::assembleLayoutFromPost();
-
-        $fieldLayout->reservedFieldHandles = [
-            'originLocationId',
-            'originLocation',
-            'destinationLocationId',
-            'destinationLocation',
-        ];
-
-        $fieldLayout->type = Transfer::class;
-
-        if (!$fieldLayout->validate()) {
-            return $this->asFailure(t('Couldn\'t save transfer fields.', category: 'commerce'));
-        }
-
-        if ($currentTransfersFieldLayout = ProjectConfig::get(Transfers::CONFIG_FIELDLAYOUT_KEY)) {
-            $uid = array_key_first($currentTransfersFieldLayout);
-        } else {
-            $uid = (string)Str::uuid();
-        }
-
-        $configData = [$uid => $fieldLayout->getConfig()];
-        $result = ProjectConfig::set(Transfers::CONFIG_FIELDLAYOUT_KEY, $configData, force: true);
-
-        if (!$result) {
-            return $this->asFailure(t('Couldn\'t save transfer fields.'));
-        }
-
-        return $this->asSuccess(t('Transfer fields saved.', category: 'commerce'));
-    }
-
-    public function editTransferSettings(): string
-    {
-        $fieldLayout = app(Transfers::class)->getFieldLayout();
-
-        return pageTemplate('commerce/settings/transfers/_edit', [
-            'fieldLayout' => $fieldLayout,
-            'title' => t('Transfer Settings', category: 'commerce'),
-            'readOnly' => $this->readOnly,
-        ], TemplateMode::Cp);
-    }
-}
diff --git a/src/Http/Controllers/Settings/StoresController.php b/src/Http/Controllers/Settings/StoresController.php
index 39b96a69c2..8fee4fce4f 100644
--- a/src/Http/Controllers/Settings/StoresController.php
+++ b/src/Http/Controllers/Settings/StoresController.php
@@ -5,36 +5,43 @@
 namespace CraftCms\Commerce\Http\Controllers\Settings;
 
 use craft\db\Query;
-use CraftCms\Cms\Config\GeneralConfig;
-use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Form\Controls\Choice;
+use CraftCms\Cms\Form\Controls\Handle;
+use CraftCms\Cms\Form\Controls\Lightswitch;
+use CraftCms\Cms\Form\Controls\Table as TableControl;
+use CraftCms\Cms\Form\Controls\Text;
+use CraftCms\Cms\Form\Enums\ControlMode;
+use CraftCms\Cms\Form\Form;
+use CraftCms\Cms\Form\FormContext;
+use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Form\Nodes\HiddenField;
+use CraftCms\Cms\Form\Nodes\Table;
+use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Facades\Sites;
+use CraftCms\Cms\Support\Html;
 use CraftCms\Cms\Support\Json;
 use CraftCms\Cms\Support\Url;
-use CraftCms\Cms\View\TemplateMode;
 use CraftCms\Commerce\CatalogPricing\CatalogPricingRules;
-use CraftCms\Commerce\Database\Table;
+use CraftCms\Commerce\Database\Table as DbTable;
 use CraftCms\Commerce\Order\Elements\Order;
 use CraftCms\Commerce\Payment\Currencies;
+use CraftCms\Commerce\Plugin;
 use CraftCms\Commerce\Store\Data\Store;
 
 use CraftCms\Commerce\Store\Stores;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
-use function CraftCms\Cms\pageTemplate;
+use function CraftCms\Cms\cp_url;
 use function CraftCms\Cms\t;
 
-readonly class StoresController
+class StoresController extends BaseSettingsController
 {
-    use RespondsWithFlash;
-
-    private bool $readOnly;
-
-    public function __construct(GeneralConfig $generalConfig)
+    protected function getSectionCrumb(): array
     {
-        $this->readOnly = !$generalConfig->allowAdminChanges;
+        return ['label' => t('Stores'), 'href' => cp_url('commerce/settings/stores')];
     }
 
-    public function editStore(?int $storeId = null): string
+    public function editStore(?int $storeId = null): CpScreenResponse
     {
         $storesService = app(Stores::class);
 
@@ -54,12 +61,6 @@ public function editStore(?int $storeId = null): string
             $title = t('Create a new Store');
         }
 
-        $crumbs = [
-            ['label' => t('Commerce', category: 'commerce'), 'url' => Url::url('commerce')],
-            ['label' => t('Settings', category: 'commerce'), 'url' => Url::url('commerce/settings')],
-            ['label' => t('Stores'), 'url' => Url::url('commerce/settings/stores')],
-        ];
-
         $hasOrders = $storeModel->id && Order::find()
                 ->trashed(null)
                 ->storeId($storeModel->id)
@@ -80,18 +81,145 @@ public function editStore(?int $storeId = null): string
 
         $currencyOptions = app(Currencies::class)->getAllCurrenciesList();
 
-        return pageTemplate('commerce/settings/stores/_edit', [
-            'brandNewStore' => $brandNewStore,
-            'allowCurrencyChange' => $allowCurrencyChange,
-            'title' => $title,
-            'crumbs' => $crumbs,
-            'store' => $storeModel,
-            'currencyOptions' => $currencyOptions,
-            'availableSiteOptions' => $availableSiteOptions,
-            'freeOrderPaymentStrategyOptions' => $storeModel->getFreeOrderPaymentStrategyOptions(),
-            'minimumTotalPriceStrategyOptions' => $storeModel->getMinimumTotalPriceStrategyOptions(),
-            'readOnly' => $this->readOnly,
-        ], TemplateMode::Cp);
+        $form = $this->buildStoreForm($storeModel, $brandNewStore, $allowCurrencyChange, $availableSiteOptions, $currencyOptions);
+        $values = $this->storeInitialValues($storeModel);
+
+        return $this->cpScreenResponse()
+            ->title($title)
+            ->crumbs($brandNewStore ? $this->crumbs() : $this->crumbs(['label' => $title]))
+            ->redirectUrl('commerce/settings/stores')
+            ->inertiaPage('Form', [
+                'form' => $this->formResolver->resolve($form, new FormContext(
+                    values: $values,
+                    mode: $this->readOnly ? ControlMode::ReadOnly : ControlMode::Editable,
+                )),
+                'submit' => [
+                    'method' => 'post',
+                    'url' => action([self::class, 'saveStore']),
+                ],
+            ]);
+    }
+
+    /**
+     * @param  list<array{label: string, value: mixed, disabled?: bool}>  $availableSiteOptions
+     * @param  list<array{label: string, value: mixed}>  $currencyOptions
+     */
+    private function buildStoreForm(
+        Store $storeModel,
+        bool $brandNewStore,
+        bool $allowCurrencyChange,
+        array $availableSiteOptions,
+        array $currencyOptions,
+    ): Form {
+        $currencyControl = Choice::make('currency')->options($currencyOptions);
+
+        if (!$allowCurrencyChange) {
+            $currencyControl->mode(ControlMode::Disabled);
+        }
+
+        $currencyField = Field::make(t('Currency', category: 'commerce'), $currencyControl)->required();
+
+        if (!$allowCurrencyChange) {
+            $currencyField->tip(t('The primary currency cannot be changed after orders are placed.', category: 'commerce'));
+        }
+
+        $handle = Handle::make('handle');
+
+        if ($brandNewStore) {
+            $handle->source('name');
+        }
+
+        $storeFields = [
+            $brandNewStore ? null : HiddenField::make('storeId'),
+            Field::make(t('Name', category: 'commerce'), Text::make('name')->autofocus())
+                ->required(),
+            Field::make(t('Handle', category: 'app'), $handle)
+                ->instructions(t('How you’ll refer to this store in the templates.', category: 'app'))
+                ->required(),
+            $brandNewStore
+                ? Field::make(t('Sites', category: 'commerce'), Choice::make('siteId')->options($availableSiteOptions))
+                    ->instructions(t('Every new store must be assigned to at least one site.', category: 'commerce'))
+                : null,
+            $currencyField,
+            $storeModel->primary
+                ? null
+                : Field::make(t('Make this the primary store', category: 'commerce'), Lightswitch::make('primary')),
+        ];
+
+        $settingsFields = [
+            Field::make(t('Auto Set New Cart Addresses', category: 'commerce'), Lightswitch::make('autoSetNewCartAddresses'))
+                ->instructions(t('Whether the user’s primary shipping and billing addresses should be set automatically on new carts.', category: 'commerce')),
+            Field::make(t('Auto Set Cart Shipping Method Option', category: 'commerce'), Lightswitch::make('autoSetCartShippingMethodOption'))
+                ->instructions(t('Whether the first available shipping method option should be set automatically on carts.', category: 'commerce')),
+            Field::make(t('Auto Set Payment Source', category: 'commerce'), Lightswitch::make('autoSetPaymentSource'))
+                ->instructions(t('Whether the user’s primary payment source should be set automatically on new carts.', category: 'commerce')),
+            Field::make(t('Allow Empty Cart On Checkout', category: 'commerce'), Lightswitch::make('allowEmptyCartOnCheckout')),
+            Field::make(t('Allow Checkout Without Payment', category: 'commerce'), Lightswitch::make('allowCheckoutWithoutPayment')),
+            Field::make(t('Allow Partial Payment On Checkout', category: 'commerce'), Lightswitch::make('allowPartialPaymentOnCheckout')),
+            Field::make(t('Free Order Payment Strategy', category: 'commerce'), Choice::make('freeOrderPaymentStrategy')
+                ->options(self::choiceOptions($storeModel->getFreeOrderPaymentStrategyOptions())))
+                ->instructions(t('Strategy to apply when an order is free or has a zero balance.', category: 'commerce'))
+                ->required(),
+            Field::make(t('Minimum Total Price Strategy', category: 'commerce'), Choice::make('minimumTotalPriceStrategy')
+                ->options(self::choiceOptions($storeModel->getMinimumTotalPriceStrategyOptions())))
+                ->instructions(t('Strategy to apply when calculating the minimum order price.', category: 'commerce'))
+                ->required(),
+            Field::make(t('Require Shipping Address At Checkout', category: 'commerce'), Lightswitch::make('requireShippingAddressAtCheckout')),
+            Field::make(t('Require Billing Address At Checkout', category: 'commerce'), Lightswitch::make('requireBillingAddressAtCheckout')),
+            Field::make(t('Require Shipping Method Selection At Checkout', category: 'commerce'), Lightswitch::make('requireShippingMethodSelectionAtCheckout')),
+            Field::make(t('Use Billing Address For Tax', category: 'commerce'), Lightswitch::make('useBillingAddressForTax')),
+            Field::make(t('Validate Business Tax ID as Vat ID', category: 'commerce'), Lightswitch::make('validateOrganizationTaxIdAsVatId')),
+            Field::make(t('Order Reference Number Format', category: 'commerce'), Text::make('orderReferenceFormat')->monospace())
+                ->instructions(t('A friendly reference number will be generated based on this format when a cart is completed and becomes an order. For example {ex1}, or {ex2}. The result of this format must be unique.', [
+                    'ex1' => '2018-{number[:7]}',
+                    'ex2' => "{{object.dateCompleted|date('y')}}-{{ seq(object.dateCompleted|date('y'), 8) }}",
+                ], category: 'commerce')),
+        ];
+
+        return Form::make()
+            ->addTab(t('Store', category: 'commerce'), array_values(array_filter($storeFields)))
+            ->addTab(t('Settings', category: 'commerce'), $settingsFields);
+    }
+
+    /** @return array<string, mixed> */
+    private function storeInitialValues(Store $storeModel): array
+    {
+        return [
+            'storeId' => $storeModel->id,
+            'name' => $storeModel->getName(false),
+            'handle' => $storeModel->handle,
+            'siteId' => null,
+            'currency' => $storeModel->getCurrency()?->getCode(),
+            'primary' => $storeModel->primary,
+            'autoSetNewCartAddresses' => $storeModel->getAutoSetNewCartAddresses(),
+            'autoSetCartShippingMethodOption' => $storeModel->getAutoSetCartShippingMethodOption(),
+            'autoSetPaymentSource' => $storeModel->getAutoSetPaymentSource(),
+            'allowEmptyCartOnCheckout' => $storeModel->getAllowEmptyCartOnCheckout(),
+            'allowCheckoutWithoutPayment' => $storeModel->getAllowCheckoutWithoutPayment(),
+            'allowPartialPaymentOnCheckout' => $storeModel->getAllowPartialPaymentOnCheckout(),
+            'freeOrderPaymentStrategy' => $storeModel->getFreeOrderPaymentStrategy(),
+            'minimumTotalPriceStrategy' => $storeModel->getMinimumTotalPriceStrategy(),
+            'requireShippingAddressAtCheckout' => $storeModel->getRequireShippingAddressAtCheckout(),
+            'requireBillingAddressAtCheckout' => $storeModel->getRequireBillingAddressAtCheckout(),
+            'requireShippingMethodSelectionAtCheckout' => $storeModel->getRequireShippingMethodSelectionAtCheckout(),
+            'useBillingAddressForTax' => $storeModel->getUseBillingAddressForTax(),
+            'validateOrganizationTaxIdAsVatId' => $storeModel->getValidateOrganizationTaxIdAsVatId(),
+            'orderReferenceFormat' => $storeModel->getOrderReferenceFormat(),
+        ];
+    }
+
+    /**
+     * @param  array<string, string>  $options  Value-keyed label map, as returned by e.g.
+     *   {@see Store::getFreeOrderPaymentStrategyOptions()}.
+     * @return list<array{value: string, label: string}>
+     */
+    private static function choiceOptions(array $options): array
+    {
+        return array_map(
+            fn(string $value, string $label) => ['value' => $value, 'label' => $label],
+            array_keys($options),
+            $options,
+        );
     }
 
     public function saveStore(Request $request): Response
@@ -132,7 +260,7 @@ public function saveStore(Request $request): Response
             $store->uid = $savedStore->uid;
             $store->sortOrder = $savedStore->sortOrder;
         } elseif (!$storeId) {
-            $store->sortOrder = new Query()->from(Table::STORES)->max('[[sortOrder]]') + 1;
+            $store->sortOrder = new Query()->from(DbTable::STORES)->max('[[sortOrder]]') + 1;
         }
 
         if (!$store->validate() || !$storesService->saveStore($store)) {
@@ -148,14 +276,10 @@ public function saveStore(Request $request): Response
         return $this->asModelSuccess($store, t('Store saved.'), 'store');
     }
 
-    public function storesIndex(): string
+    public function storesIndex(): CpScreenResponse
     {
         $stores = app(Stores::class)->getAllStores();
 
-        $crumbs = [
-            ['label' => t('Commerce', category: 'commerce'), 'url' => Url::url('commerce')],
-        ];
-
         $menuItems = [];
         $stores->each(function(Store $s) use (&$menuItems) {
             $m = [];
@@ -178,14 +302,65 @@ public function storesIndex(): string
             $menuItems[$s->handle] = $m;
         });
 
-        return pageTemplate('commerce/settings/stores/index', [
-            'stores' => $stores,
-            'crumbs' => $crumbs,
-            'sitesStores' => app(Stores::class)->getAllSiteStores(),
-            'primaryStoreId' => app(Stores::class)->getPrimaryStore()->id,
-            'menuItems' => $menuItems,
-            'readOnly' => $this->readOnly,
-        ], TemplateMode::Cp);
+        $rows = $stores->map(fn(Store $s) => [
+            'id' => $s->id,
+            'name' => [
+                'label' => t($s->getName(), category: 'site'),
+                'url' => Url::cpUrl('commerce/settings/stores/' . $s->id),
+            ],
+            'handle' => $s->handle,
+            'sites' => $s->getSiteNames()->join(', '),
+            'currency' => ['html' => Html::tag('code', Html::encode($s->getCurrency()?->getCode() ?? ''))],
+            'primary' => $s->primary ? ['icon' => 'check', 'label' => t('Yes')] : '',
+            'management' => [
+                'label' => t('Store Management', category: 'commerce'),
+                'items' => $menuItems[$s->handle],
+            ],
+            '_deletable' => !$s->primary,
+        ])->all();
+
+        $title = t('Stores');
+
+        $showNewStoreButton = !$this->readOnly && $stores->count() < count(Sites::getAllSites());
+
+        if ($showNewStoreButton) {
+            $showNewStoreButton = ($this->plugin->is(Plugin::EDITION_PRO, '=')
+                    && $stores->count() < Plugin::EDITION_PRO_STORE_LIMIT
+                    && app(CatalogPricingRules::class)->canUseCatalogPricingRules())
+                || ($this->plugin->is(Plugin::EDITION_ENTERPRISE, '=')
+                    && app(CatalogPricingRules::class)->canUseCatalogPricingRules());
+        }
+
+        $form = Form::make([
+            Table::make('stores')
+                ->columns([
+                    ['key' => 'name', 'label' => t('Name')],
+                    ['key' => 'handle', 'label' => t('Handle')],
+                    ['key' => 'sites', 'label' => t('Sites', category: 'commerce')],
+                    ['key' => 'currency', 'label' => t('Currency', category: 'commerce')],
+                    ['key' => 'primary', 'label' => t('Primary', category: 'commerce')],
+                    ['key' => 'management', 'label' => t('Store Management', category: 'commerce')],
+                ])
+                ->rows($rows)
+                ->emptyMessage(t('No stores exist yet.', category: 'commerce'))
+                ->createAction(
+                    $showNewStoreButton ? t('New store') : null,
+                    $showNewStoreButton ? Url::cpUrl('commerce/settings/stores/new') : null,
+                )
+                ->when(!$this->readOnly, fn(Table $table) => $table
+                    ->reorderable(action([self::class, 'reorderStores']))
+                    ->deletable(
+                        action([self::class, 'deleteStore']),
+                        t('Are you sure you want to permanently delete this store and everything in it?', category: 'commerce'),
+                    )),
+        ]);
+
+        return $this->cpScreenResponse()
+            ->title($title)
+            ->crumbs($this->crumbs())
+            ->inertiaPage('Form', [
+                'form' => $this->formResolver->resolve($form, new FormContext()),
+            ]);
     }
 
     public function deleteStore(Request $request): Response
@@ -214,20 +389,54 @@ public function reorderStores(Request $request): Response
         return $this->asSuccess();
     }
 
-    public function editSiteStores(): string
+    public function editSiteStores(): CpScreenResponse
     {
-        $crumbs = [
-            ['label' => t('Commerce', category: 'commerce'), 'url' => Url::url('commerce')],
-        ];
+        $storesService = app(Stores::class);
+        $sitesStores = $storesService->getAllSiteStores();
+        $primaryStoreId = $storesService->getPrimaryStore()->id;
+
+        $storeOptions = $storesService->getAllStores()->map(fn(Store $store) => [
+            'label' => $store->getName(),
+            'value' => $store->id,
+        ])->all();
+
+        $rows = [];
+
+        foreach (Sites::getAllSites() as $site) {
+            $siteStore = $sitesStores->count() > 0 ? $sitesStores->firstWhere('siteId', $site->id) : null;
+
+            $rows[$site->id] = [
+                'site' => t($site->name, category: 'site'),
+                'storeId' => $siteStore->storeId ?? $primaryStoreId,
+            ];
+        }
 
-        return pageTemplate('commerce/settings/stores/_siteStore', [
-            'crumbs' => $crumbs,
-            'stores' => app(Stores::class)->getAllStores(),
-            'sites' => Sites::getAllSites(),
-            'sitesStores' => app(Stores::class)->getAllSiteStores(),
-            'primaryStoreId' => app(Stores::class)->getPrimaryStore()->id,
-            'readOnly' => $this->readOnly,
-        ], TemplateMode::Cp);
+        $form = Form::make([
+            Field::make(null, TableControl::make('siteStores')
+                ->columns([
+                    'site' => ['type' => 'heading', 'heading' => t('Site')],
+                    'storeId' => ['type' => 'select', 'heading' => t('Store', category: 'commerce'), 'options' => $storeOptions],
+                ])
+                ->keyed()),
+        ]);
+
+        $values = ['siteStores' => $rows];
+        $title = t('Sites');
+
+        return $this->cpScreenResponse()
+            ->title($title)
+            ->crumbs($this->crumbs(['label' => $title]))
+            ->redirectUrl('commerce/settings/sites')
+            ->inertiaPage('Form', [
+                'form' => $this->formResolver->resolve($form, new FormContext(
+                    values: $values,
+                    mode: $this->readOnly ? ControlMode::ReadOnly : ControlMode::Editable,
+                )),
+                'submit' => [
+                    'method' => 'post',
+                    'url' => action([self::class, 'saveSiteStores']),
+                ],
+            ]);
     }
 
     public function saveSiteStores(Request $request): Response
@@ -238,7 +447,8 @@ public function saveSiteStores(Request $request): Response
 
         foreach ($sitesStores as $siteStore) {
             if (isset($siteStoresData[$siteStore->siteId])) {
-                $siteStore->storeId = $siteStoresData[$siteStore->siteId]['storeId'];
+                $storeId = $siteStoresData[$siteStore->siteId]['storeId'];
+                $siteStore->storeId = $storeId !== null && $storeId !== '' ? (int) $storeId : null;
             }
         }
 
diff --git a/src/Http/Controllers/Settings/TransferSettingsController.php b/src/Http/Controllers/Settings/TransferSettingsController.php
new file mode 100644
index 0000000000..58cbf7cb79
--- /dev/null
+++ b/src/Http/Controllers/Settings/TransferSettingsController.php
@@ -0,0 +1,101 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Commerce\Http\Controllers\Settings;
+
+use CraftCms\Cms\Form\Controls\FieldLayoutDesigner;
+use CraftCms\Cms\Form\Enums\ControlMode;
+use CraftCms\Cms\Form\Form;
+use CraftCms\Cms\Form\FormContext;
+use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Http\Responses\CpScreenResponse;
+use CraftCms\Cms\Support\Facades\Fields;
+use CraftCms\Cms\Support\Facades\ProjectConfig;
+use CraftCms\Cms\Support\Str;
+use CraftCms\Commerce\Transfer\Elements\Transfer;
+use CraftCms\Commerce\Transfer\Transfers;
+use Symfony\Component\HttpFoundation\Response;
+
+use function CraftCms\Cms\cp_url;
+use function CraftCms\Cms\t;
+
+class TransferSettingsController extends BaseSettingsController
+{
+    use RespondsWithFlash;
+
+    protected function getSectionCrumb(): array
+    {
+        return ['label' => t('Transfer Fields', category: 'commerce'), 'href' => cp_url('commerce/settings/transfers')];
+    }
+
+    public function saveTransferSettings(): Response
+    {
+        $fieldLayout = Fields::assembleLayoutFromPost();
+
+        $fieldLayout->reservedFieldHandles = [
+            'originLocationId',
+            'originLocation',
+            'destinationLocationId',
+            'destinationLocation',
+        ];
+
+        $fieldLayout->type = Transfer::class;
+
+        if (!$fieldLayout->validate()) {
+            return $this->asFailure(t('Couldn’t save transfer fields.', category: 'commerce'));
+        }
+
+        if ($currentTransfersFieldLayout = ProjectConfig::get(Transfers::CONFIG_FIELDLAYOUT_KEY)) {
+            $uid = array_key_first($currentTransfersFieldLayout);
+        } else {
+            $uid = (string)Str::uuid();
+        }
+
+        $configData = [$uid => $fieldLayout->getConfig()];
+        $result = ProjectConfig::set(Transfers::CONFIG_FIELDLAYOUT_KEY, $configData, force: true);
+
+        if (!$result) {
+            return $this->asFailure(t('Couldn’t save transfer fields.', category: 'commerce'));
+        }
+
+        return $this->asSuccess(t('Transfer fields saved.', category: 'commerce'));
+    }
+
+    public function editTransferSettings(): CpScreenResponse
+    {
+        $fieldLayout = app(Transfers::class)->getFieldLayout();
+
+        $form = Form::make([
+            Field::make(null, FieldLayoutDesigner::make('fieldLayout')
+                ->elementType(Transfer::class)
+                ->withCardViewDesigner()),
+        ]);
+
+        $form = $this->formResolver->resolve($form, new FormContext(
+            values: [
+                'fieldLayout' => [
+                    'id' => $fieldLayout->id,
+                    'uid' => $fieldLayout->uid,
+                    ...($fieldLayout->getConfig() ?? []),
+                ],
+            ],
+            mode: $this->generalConfig->allowAdminChanges ? ControlMode::Editable : ControlMode::ReadOnly,
+        ));
+
+        $title = t('Transfer Settings', category: 'commerce');
+
+        return $this->cpScreenResponse()
+            ->title($title)
+            ->crumbs($this->crumbs())
+            ->redirectUrl('commerce/settings/transfers')
+            ->inertiaPage('Form', [
+                'form' => $form,
+                'submit' => [
+                    'method' => 'post',
+                    'url' => action([self::class, 'saveTransferSettings']),
+                ],
+            ]);
+    }
+}
diff --git a/src/Http/Controllers/StoreManagement/BaseStoreManagementController.php b/src/Http/Controllers/StoreManagement/BaseStoreManagementController.php
new file mode 100644
index 0000000000..ef6cfd34f0
--- /dev/null
+++ b/src/Http/Controllers/StoreManagement/BaseStoreManagementController.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
+
+use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Commerce\Http\Controllers\Concerns\HasStoreManagementScreen;
+
+/**
+ * Shared ancestor for Commerce's store-management settings controllers (shipping, tax,
+ * promotions, payment currencies, etc). All of the actual shared behavior still lives in
+ * {@see HasStoreManagementScreen} — this class exists so every controller in this namespace
+ * has a common type to extend, matching the `BaseSettingsController` convention next door,
+ * rather than each one pulling the trait in independently.
+ *
+ * Every controller still resolves its own `Store` from a `storeHandle` route segment per
+ * action method, not via the constructor — there's no framework-level route binding for
+ * handle-scoped resources in cms-6, so `resolveStore()` stays a plain method taking
+ * `$storeHandle` as a parameter rather than a constructor-injected dependency.
+ */
+abstract readonly class BaseStoreManagementController
+{
+    use HasStoreManagementScreen;
+    use RespondsWithFlash;
+}
diff --git a/src/Http/Controllers/Settings/CatalogPricingController.php b/src/Http/Controllers/StoreManagement/CatalogPricingController.php
similarity index 97%
rename from src/Http/Controllers/Settings/CatalogPricingController.php
rename to src/Http/Controllers/StoreManagement/CatalogPricingController.php
index b38610833c..0dc8bd7b37 100644
--- a/src/Http/Controllers/Settings/CatalogPricingController.php
+++ b/src/Http/Controllers/StoreManagement/CatalogPricingController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Commerce\Http\Controllers\Settings;
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
 
 use craft\commerce\web\assets\catalogpricing\CatalogPricingAsset;
 use craft\helpers\Cp;
@@ -79,6 +79,7 @@ public function filter(Request $request): JsonResponse
 
         $condition = $request->input('condition') ?? ['class' => CatalogPricingCondition::class];
         $conditionBuilder = Conditions::createCondition($condition);
+        // Condition classes no longer self-render; ConditionBuilderRenderer replaces the old getBuilderHtml()/builderHtml().
         $conditionBuilderHtml = new ConditionBuilderRenderer($conditionBuilder)->render();
 
         $view = \Craft::$app->getView();
diff --git a/src/Http/Controllers/Settings/CatalogPricingRulesController.php b/src/Http/Controllers/StoreManagement/CatalogPricingRulesController.php
similarity index 95%
rename from src/Http/Controllers/Settings/CatalogPricingRulesController.php
rename to src/Http/Controllers/StoreManagement/CatalogPricingRulesController.php
index 8a2c455c96..4a4c4ed603 100644
--- a/src/Http/Controllers/Settings/CatalogPricingRulesController.php
+++ b/src/Http/Controllers/StoreManagement/CatalogPricingRulesController.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Commerce\Http\Controllers\Settings;
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
 
 use craft\helpers\Cp;
 use craft\helpers\Localization;
-use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Condition\ConditionBuilderRenderer;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\DateTimeHelper;
 use CraftCms\Cms\Support\Facades\Conditions;
@@ -26,7 +26,6 @@
 use CraftCms\Commerce\CatalogPricing\Data\CatalogPricingRule;
 use CraftCms\Commerce\CatalogPricing\Models\CatalogPricingRule as CatalogPricingRuleRecord;
 use CraftCms\Commerce\Helpers\Currency;
-use CraftCms\Commerce\Http\Controllers\Concerns\HasStoreManagementScreen;
 use CraftCms\Commerce\Payment\PaymentCurrencies;
 use CraftCms\Commerce\Purchasable\Conditions\CatalogPricingRulePurchasableCondition;
 use CraftCms\Commerce\Purchasable\Conditions\PurchasableConditionRule;
@@ -38,11 +37,8 @@
 use function CraftCms\Cms\currentUserElement;
 use function CraftCms\Cms\t;
 
-readonly class CatalogPricingRulesController
+readonly class CatalogPricingRulesController extends BaseStoreManagementController
 {
-    use HasStoreManagementScreen;
-    use RespondsWithFlash;
-
     public function index(?string $storeHandle = null): CpScreenResponse
     {
         $store = $this->resolveStore($storeHandle);
@@ -379,6 +375,12 @@ private function populateVariables(array $variables): array
             ['label' => t('Original promotional price', category: 'commerce'), 'value' => 'promotionalPrice'],
         ];
 
+        // Condition classes no longer self-render; ConditionBuilderRenderer replaces the old getBuilderHtml()/builderHtml().
+        $variables['productConditionHtml'] = new ConditionBuilderRenderer($catalogPricingRule->getProductCondition())->render();
+        $variables['variantConditionHtml'] = new ConditionBuilderRenderer($catalogPricingRule->getVariantCondition())->render();
+        $variables['purchasableConditionHtml'] = new ConditionBuilderRenderer($catalogPricingRule->getPurchasableCondition())->render();
+        $variables['customerConditionHtml'] = new ConditionBuilderRenderer($catalogPricingRule->getCustomerCondition())->render();
+
         return $variables;
     }
 }
diff --git a/src/Http/Controllers/Settings/DiscountsController.php b/src/Http/Controllers/StoreManagement/DiscountsController.php
similarity index 97%
rename from src/Http/Controllers/Settings/DiscountsController.php
rename to src/Http/Controllers/StoreManagement/DiscountsController.php
index 2bf4e931aa..d4a3b44991 100644
--- a/src/Http/Controllers/Settings/DiscountsController.php
+++ b/src/Http/Controllers/StoreManagement/DiscountsController.php
@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Commerce\Http\Controllers\Settings;
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
 
 use craft\commerce\web\assets\coupons\CouponsAsset;
 use craft\db\Query;
 use craft\elements\Category;
 use craft\helpers\AdminTable;
+use CraftCms\Cms\Condition\ConditionBuilderRenderer;
 use CraftCms\Cms\Edition;
 use CraftCms\Cms\Entry\Elements\Entry;
-use CraftCms\Cms\Http\RespondsWithFlash;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Arr;
 use CraftCms\Cms\Support\DateTimeHelper;
@@ -26,7 +26,6 @@
 use CraftCms\Cms\View\Enums\Position;
 use CraftCms\Commerce\Database\Table;
 use CraftCms\Commerce\Helpers\Localization;
-use CraftCms\Commerce\Http\Controllers\Concerns\HasStoreManagementScreen;
 use CraftCms\Commerce\Payment\Currencies;
 use CraftCms\Commerce\Product\Elements\Product;
 use CraftCms\Commerce\Promotion\Coupons;
@@ -46,11 +45,8 @@
 use function CraftCms\Cms\currentUserElement;
 use function CraftCms\Cms\t;
 
-readonly class DiscountsController
+readonly class DiscountsController extends BaseStoreManagementController
 {
-    use HasStoreManagementScreen;
-    use RespondsWithFlash;
-
     public const string DISCOUNT_COUNTER_TYPE_TOTAL = 'total';
     public const string DISCOUNT_COUNTER_TYPE_EMAIL = 'email';
     public const string DISCOUNT_COUNTER_TYPE_CUSTOMER = 'customer';
@@ -622,6 +618,12 @@ private function populateVariables(array &$variables): void
             $variables['customerUsage'] = 0;
         }
 
+        // Condition classes no longer self-render; ConditionBuilderRenderer replaces the old getBuilderHtml()/builderHtml().
+        $variables['orderConditionHtml'] = new ConditionBuilderRenderer($discount->getOrderCondition())->render();
+        $variables['customerConditionHtml'] = new ConditionBuilderRenderer($discount->getCustomerCondition())->render();
+        $variables['shippingAddressConditionHtml'] = new ConditionBuilderRenderer($discount->getShippingAddressCondition())->render();
+        $variables['billingAddressConditionHtml'] = new ConditionBuilderRenderer($discount->getBillingAddressCondition())->render();
+
         $variables['categoryElementType'] = Category::class;
         $variables['entryElementType'] = Entry::class;
 
diff --git a/src/Http/Controllers/Settings/PaymentCurrenciesController.php b/src/Http/Controllers/StoreManagement/PaymentCurrenciesController.php
similarity index 94%
rename from src/Http/Controllers/Settings/PaymentCurrenciesController.php
rename to src/Http/Controllers/StoreManagement/PaymentCurrenciesController.php
index fc7e6adcf8..52b396f48e 100644
--- a/src/Http/Controllers/Settings/PaymentCurrenciesController.php
+++ b/src/Http/Controllers/StoreManagement/PaymentCurrenciesController.php
@@ -2,15 +2,13 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Commerce\Http\Controllers\Settings;
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
 
 use craft\helpers\Cp;
 use craft\i18n\Formatter;
-use CraftCms\Cms\Http\RespondsWithFlash;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Facades\I18N;
 use CraftCms\Cms\Support\Html;
-use CraftCms\Commerce\Http\Controllers\Concerns\HasStoreManagementScreen;
 use CraftCms\Commerce\Order\Elements\Order;
 use CraftCms\Commerce\Payment\Currencies;
 use CraftCms\Commerce\Payment\Data\PaymentCurrency;
@@ -20,11 +18,8 @@
 use Symfony\Component\HttpFoundation\Response;
 use function CraftCms\Cms\t;
 
-readonly class PaymentCurrenciesController
+readonly class PaymentCurrenciesController extends BaseStoreManagementController
 {
-    use HasStoreManagementScreen;
-    use RespondsWithFlash;
-
     public function index(?string $storeHandle = null): CpScreenResponse
     {
         $store = $this->resolveStore($storeHandle);
diff --git a/src/Http/Controllers/Settings/SalesController.php b/src/Http/Controllers/StoreManagement/SalesController.php
similarity index 98%
rename from src/Http/Controllers/Settings/SalesController.php
rename to src/Http/Controllers/StoreManagement/SalesController.php
index f7e10aac95..dfdd1f6e56 100644
--- a/src/Http/Controllers/Settings/SalesController.php
+++ b/src/Http/Controllers/StoreManagement/SalesController.php
@@ -2,13 +2,12 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Commerce\Http\Controllers\Settings;
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
 
 use craft\elements\Category;
 use craft\helpers\Localization;
 use CraftCms\Cms\Edition;
 use CraftCms\Cms\Entry\Elements\Entry;
-use CraftCms\Cms\Http\RespondsWithFlash;
 use CraftCms\Cms\Support\Arr;
 use CraftCms\Cms\Support\DateTimeHelper;
 use CraftCms\Cms\Support\Facades\Elements;
@@ -17,7 +16,6 @@
 use CraftCms\Cms\Support\Json;
 use CraftCms\Cms\Translation\Locale;
 use CraftCms\Cms\View\TemplateMode;
-use CraftCms\Commerce\Http\Controllers\Concerns\HasStoreManagementScreen;
 use CraftCms\Commerce\Payment\PaymentCurrencies;
 use CraftCms\Commerce\Product\Elements\Product;
 use CraftCms\Commerce\Product\Products;
@@ -36,11 +34,8 @@
 use function CraftCms\Cms\pageTemplate;
 use function CraftCms\Cms\t;
 
-readonly class SalesController
+readonly class SalesController extends BaseStoreManagementController
 {
-    use HasStoreManagementScreen;
-    use RespondsWithFlash;
-
     private function guard(): void
     {
         abort_unless(app(Sales::class)->canUseSales(), 403, 'Unable to use sales while using multi store or pricing rules.');
diff --git a/src/Http/Controllers/Settings/ShippingCategoriesController.php b/src/Http/Controllers/StoreManagement/ShippingCategoriesController.php
similarity index 97%
rename from src/Http/Controllers/Settings/ShippingCategoriesController.php
rename to src/Http/Controllers/StoreManagement/ShippingCategoriesController.php
index 9fe5bd4654..b96c9989a4 100644
--- a/src/Http/Controllers/Settings/ShippingCategoriesController.php
+++ b/src/Http/Controllers/StoreManagement/ShippingCategoriesController.php
@@ -2,10 +2,9 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Commerce\Http\Controllers\Settings;
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
 
 use craft\helpers\Cp;
-use CraftCms\Cms\Http\RespondsWithFlash;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Arr;
 use CraftCms\Cms\Support\Facades\HtmlStack;
@@ -13,7 +12,6 @@
 use CraftCms\Cms\Support\Html as NewHtml;
 use CraftCms\Cms\Support\Json;
 use CraftCms\Cms\View\Enums\Position;
-use CraftCms\Commerce\Http\Controllers\Concerns\HasStoreManagementScreen;
 use CraftCms\Commerce\Product\ProductType\ProductTypes;
 use CraftCms\Commerce\Shipping\Data\ShippingCategory;
 use CraftCms\Commerce\Shipping\ShippingCategories;
@@ -23,11 +21,8 @@
 use Symfony\Component\HttpFoundation\Response;
 use function CraftCms\Cms\t;
 
-readonly class ShippingCategoriesController
+readonly class ShippingCategoriesController extends BaseStoreManagementController
 {
-    use HasStoreManagementScreen;
-    use RespondsWithFlash;
-
     public function index(?string $storeHandle = null): CpScreenResponse
     {
         $store = $this->resolveStore($storeHandle);
diff --git a/src/Http/Controllers/Settings/ShippingMethodsController.php b/src/Http/Controllers/StoreManagement/ShippingMethodsController.php
similarity index 93%
rename from src/Http/Controllers/Settings/ShippingMethodsController.php
rename to src/Http/Controllers/StoreManagement/ShippingMethodsController.php
index bfaf9c23f7..dae8929094 100644
--- a/src/Http/Controllers/Settings/ShippingMethodsController.php
+++ b/src/Http/Controllers/StoreManagement/ShippingMethodsController.php
@@ -2,17 +2,16 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Commerce\Http\Controllers\Settings;
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
 
 use craft\helpers\Cp;
-use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Condition\ConditionBuilderRenderer;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Facades\HtmlStack;
 use CraftCms\Cms\Support\Facades\I18N;
 use CraftCms\Cms\Support\Html as NewHtml;
 use CraftCms\Cms\Support\Json;
 use CraftCms\Cms\View\Enums\Position;
-use CraftCms\Commerce\Http\Controllers\Concerns\HasStoreManagementScreen;
 use CraftCms\Commerce\Shipping\Data\ShippingMethod;
 use CraftCms\Commerce\Shipping\Models\ShippingMethod as ShippingMethodRecord;
 use CraftCms\Commerce\Shipping\ShippingMethods;
@@ -23,11 +22,8 @@
 use Symfony\Component\HttpFoundation\Response;
 use function CraftCms\Cms\t;
 
-readonly class ShippingMethodsController
+readonly class ShippingMethodsController extends BaseStoreManagementController
 {
-    use HasStoreManagementScreen;
-    use RespondsWithFlash;
-
     public function index(?string $storeHandle = null): CpScreenResponse
     {
         $store = $this->resolveStore($storeHandle);
@@ -138,6 +134,10 @@ public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResp
             ]);
         }
 
+        // Condition classes no longer self-render; ConditionBuilderRenderer replaces the old getBuilderHtml()/builderHtml().
+        $orderConditionHtml = new ConditionBuilderRenderer($shippingMethod->getOrderCondition())->render();
+        $customerConditionHtml = new ConditionBuilderRenderer($shippingMethod->getCustomerCondition())->render();
+
         return $this->storeManagementCpScreen($storeHandle, false)
             ->title($title)
             ->action('commerce/shipping-methods/save')
@@ -150,6 +150,8 @@ public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResp
                 'shippingRules' => $shippingRules,
                 'store' => $store,
                 'storeHandle' => $storeHandle,
+                'orderConditionHtml' => $orderConditionHtml,
+                'customerConditionHtml' => $customerConditionHtml,
             ]);
     }
 
diff --git a/src/Http/Controllers/Settings/ShippingRulesController.php b/src/Http/Controllers/StoreManagement/ShippingRulesController.php
similarity index 92%
rename from src/Http/Controllers/Settings/ShippingRulesController.php
rename to src/Http/Controllers/StoreManagement/ShippingRulesController.php
index a05ed49f63..35390c7523 100644
--- a/src/Http/Controllers/Settings/ShippingRulesController.php
+++ b/src/Http/Controllers/StoreManagement/ShippingRulesController.php
@@ -2,17 +2,16 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Commerce\Http\Controllers\Settings;
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
 
 use craft\helpers\Localization;
-use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Condition\ConditionBuilderRenderer;
 use CraftCms\Cms\Support\Facades\HtmlStack;
 use CraftCms\Cms\Support\Facades\InputNamespace;
 use CraftCms\Cms\Support\Facades\Template;
 use CraftCms\Cms\Support\Json;
 use CraftCms\Cms\Support\Money;
 use CraftCms\Cms\View\TemplateMode;
-use CraftCms\Commerce\Http\Controllers\Concerns\HasStoreManagementScreen;
 use CraftCms\Commerce\Shipping\Data\ShippingAddressZone;
 use CraftCms\Commerce\Shipping\Data\ShippingRule;
 use CraftCms\Commerce\Shipping\Data\ShippingRuleCategory;
@@ -26,11 +25,8 @@
 use function CraftCms\Cms\pageTemplate;
 use function CraftCms\Cms\t;
 
-readonly class ShippingRulesController
+readonly class ShippingRulesController extends BaseStoreManagementController
 {
-    use HasStoreManagementScreen;
-    use RespondsWithFlash;
-
     public function edit(?string $storeHandle = null, ?int $methodId = null, ?int $ruleId = null): string
     {
         $store = $this->resolveStore($storeHandle);
@@ -64,6 +60,10 @@ public function edit(?string $storeHandle = null, ?int $methodId = null, ?int $r
 
         $title = $ruleId ? $shippingRule->name : t('Create a new shipping rule', category: 'commerce');
 
+        // Condition classes no longer self-render; ConditionBuilderRenderer replaces the old getBuilderHtml()/builderHtml().
+        $orderConditionHtml = new ConditionBuilderRenderer($shippingRule->getOrderCondition())->render();
+        $customerConditionHtml = new ConditionBuilderRenderer($shippingRule->getCustomerCondition())->render();
+
         $shippingZones = app(ShippingZones::class)->getAllShippingZones($store->id)->all();
         $shippingZoneOptions = [];
         $shippingZoneOptions[] = t('Anywhere', category: 'commerce');
@@ -82,6 +82,8 @@ public function edit(?string $storeHandle = null, ?int $methodId = null, ?int $r
             'ruleId' => $ruleId,
             'shippingRule' => $shippingRule,
             'shippingMethod' => $shippingMethod,
+            'orderConditionHtml' => $orderConditionHtml,
+            'customerConditionHtml' => $customerConditionHtml,
             'newShippingZoneFields' => $newShippingZoneFields,
             'newShippingZoneJs' => $newShippingZoneJs,
             'title' => $title,
diff --git a/src/Http/Controllers/Settings/ShippingZonesController.php b/src/Http/Controllers/StoreManagement/ShippingZonesController.php
similarity index 93%
rename from src/Http/Controllers/Settings/ShippingZonesController.php
rename to src/Http/Controllers/StoreManagement/ShippingZonesController.php
index 0f4e4cd193..ab6184bc91 100644
--- a/src/Http/Controllers/Settings/ShippingZonesController.php
+++ b/src/Http/Controllers/StoreManagement/ShippingZonesController.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Commerce\Http\Controllers\Settings;
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
 
-use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Condition\ConditionBuilderRenderer;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Facades\HtmlStack;
 use CraftCms\Cms\Support\Facades\I18N;
@@ -12,7 +12,6 @@
 use CraftCms\Cms\Support\Json;
 use CraftCms\Cms\View\Enums\Position;
 use CraftCms\Commerce\Formula\Formulas;
-use CraftCms\Commerce\Http\Controllers\Concerns\HasStoreManagementScreen;
 use CraftCms\Commerce\Shipping\Data\ShippingAddressZone;
 use CraftCms\Commerce\Shipping\ShippingZones;
 
@@ -20,11 +19,8 @@
 use Symfony\Component\HttpFoundation\Response;
 use function CraftCms\Cms\t;
 
-readonly class ShippingZonesController
+readonly class ShippingZonesController extends BaseStoreManagementController
 {
-    use HasStoreManagementScreen;
-    use RespondsWithFlash;
-
     public function index(?string $storeHandle = null): CpScreenResponse
     {
         $store = $this->resolveStore($storeHandle);
@@ -84,6 +80,9 @@ public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResp
         $condition->name = 'condition';
         $condition->id = 'condition';
 
+        // Condition classes no longer self-render; ConditionBuilderRenderer replaces the old getBuilderHtml()/builderHtml().
+        $conditionHtml = new ConditionBuilderRenderer($condition)->render();
+
         $metadata = [];
         if ($shippingZone->id) {
             $metadata = [
@@ -100,7 +99,7 @@ public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResp
             ->metaSidebarHtml(\craft\helpers\Cp::metadataHtml($metadata))
             ->contentTemplate('commerce/store-management/shipping/shippingzones/_edit', [
                 'shippingZone' => $shippingZone,
-                'condition' => $condition,
+                'conditionHtml' => $conditionHtml,
                 'store' => $store,
             ]);
     }
diff --git a/src/Http/Controllers/Settings/StoreManagementController.php b/src/Http/Controllers/StoreManagement/StoreManagementController.php
similarity index 96%
rename from src/Http/Controllers/Settings/StoreManagementController.php
rename to src/Http/Controllers/StoreManagement/StoreManagementController.php
index e3814bc9cc..7bdeeb3965 100644
--- a/src/Http/Controllers/Settings/StoreManagementController.php
+++ b/src/Http/Controllers/StoreManagement/StoreManagementController.php
@@ -2,18 +2,16 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Commerce\Http\Controllers\Settings;
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
 
 use craft\helpers\Cp;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\ConditionBuilderRenderer;
-use CraftCms\Cms\Http\RespondsWithFlash;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Facades\Addresses;
 use CraftCms\Cms\Support\Html;
 use CraftCms\Commerce\Address\Conditions\ZoneAddressCondition;
 use CraftCms\Commerce\Helpers\Cp as CommerceCp;
-use CraftCms\Commerce\Http\Controllers\Concerns\HasStoreManagementScreen;
 use CraftCms\Commerce\Inventory\InventoryLocations;
 use CraftCms\Commerce\Plugin;
 use CraftCms\Commerce\Store\Stores;
@@ -25,11 +23,8 @@
 use function CraftCms\Cms\currentUserElement;
 use function CraftCms\Cms\t;
 
-readonly class StoreManagementController
+readonly class StoreManagementController extends BaseStoreManagementController
 {
-    use HasStoreManagementScreen;
-    use RespondsWithFlash;
-
     public function __construct(private Plugin $plugin)
     {
     }
@@ -93,6 +88,7 @@ public function edit(?string $storeHandle = null): Response|CpScreenResponse
         $condition->mainTag = 'div';
         $condition->name = 'marketAddressCondition';
         $condition->id = 'marketAddressCondition';
+        // Condition classes no longer self-render; ConditionBuilderRenderer replaces the old getBuilderHtml()/builderHtml().
         $marketAddressConditionFieldHtml = Cp::fieldHtml(new ConditionBuilderRenderer($condition)->render(), [
             'label' => t('Order Address Condition'),
             'instructions' => t('Only allow orders with addresses that match the following rules:'),
diff --git a/src/Http/Controllers/Settings/TaxCategoriesController.php b/src/Http/Controllers/StoreManagement/TaxCategoriesController.php
similarity index 97%
rename from src/Http/Controllers/Settings/TaxCategoriesController.php
rename to src/Http/Controllers/StoreManagement/TaxCategoriesController.php
index 8a98bb00a2..4005a96ccf 100644
--- a/src/Http/Controllers/Settings/TaxCategoriesController.php
+++ b/src/Http/Controllers/StoreManagement/TaxCategoriesController.php
@@ -2,10 +2,9 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Commerce\Http\Controllers\Settings;
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
 
 use craft\helpers\Cp;
-use CraftCms\Cms\Http\RespondsWithFlash;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Arr;
 use CraftCms\Cms\Support\Facades\HtmlStack;
@@ -13,7 +12,6 @@
 use CraftCms\Cms\Support\Html as NewHtml;
 use CraftCms\Cms\Support\Json;
 use CraftCms\Cms\View\Enums\Position;
-use CraftCms\Commerce\Http\Controllers\Concerns\HasStoreManagementScreen;
 use CraftCms\Commerce\Product\ProductType\ProductTypes;
 use CraftCms\Commerce\Store\Data\Store;
 use CraftCms\Commerce\Store\Stores;
@@ -26,11 +24,8 @@
 use Symfony\Component\HttpFoundation\Response;
 use function CraftCms\Cms\t;
 
-readonly class TaxCategoriesController
+readonly class TaxCategoriesController extends BaseStoreManagementController
 {
-    use HasStoreManagementScreen;
-    use RespondsWithFlash;
-
     public function index(?string $storeHandle = null): CpScreenResponse
     {
         $store = $this->resolveStore($storeHandle);
diff --git a/src/Http/Controllers/Settings/TaxRatesController.php b/src/Http/Controllers/StoreManagement/TaxRatesController.php
similarity index 97%
rename from src/Http/Controllers/Settings/TaxRatesController.php
rename to src/Http/Controllers/StoreManagement/TaxRatesController.php
index e057e7ac3c..ad84637008 100644
--- a/src/Http/Controllers/Settings/TaxRatesController.php
+++ b/src/Http/Controllers/StoreManagement/TaxRatesController.php
@@ -2,10 +2,9 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Commerce\Http\Controllers\Settings;
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
 
 use craft\helpers\Cp;
-use CraftCms\Cms\Http\RespondsWithFlash;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Facades\HtmlStack;
 use CraftCms\Cms\Support\Facades\I18N;
@@ -15,7 +14,6 @@
 use CraftCms\Cms\View\Enums\Position;
 use CraftCms\Commerce\Helpers\Cp as CommerceCp;
 use CraftCms\Commerce\Helpers\Localization;
-use CraftCms\Commerce\Http\Controllers\Concerns\HasStoreManagementScreen;
 use CraftCms\Commerce\Tax\Data\TaxRate;
 use CraftCms\Commerce\Tax\Models\TaxRate as TaxRateRecord;
 use CraftCms\Commerce\Tax\TaxCategories;
@@ -28,11 +26,8 @@
 use Symfony\Component\HttpFoundation\Response;
 use function CraftCms\Cms\t;
 
-readonly class TaxRatesController
+readonly class TaxRatesController extends BaseStoreManagementController
 {
-    use HasStoreManagementScreen;
-    use RespondsWithFlash;
-
     public function index(?string $storeHandle = null): CpScreenResponse
     {
         $store = $this->resolveStore($storeHandle);
diff --git a/src/Http/Controllers/Settings/TaxZonesController.php b/src/Http/Controllers/StoreManagement/TaxZonesController.php
similarity index 93%
rename from src/Http/Controllers/Settings/TaxZonesController.php
rename to src/Http/Controllers/StoreManagement/TaxZonesController.php
index cc033668aa..8d4e1c398e 100644
--- a/src/Http/Controllers/Settings/TaxZonesController.php
+++ b/src/Http/Controllers/StoreManagement/TaxZonesController.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Commerce\Http\Controllers\Settings;
+namespace CraftCms\Commerce\Http\Controllers\StoreManagement;
 
 use craft\helpers\Cp;
-use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Condition\ConditionBuilderRenderer;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Facades\HtmlStack;
 use CraftCms\Cms\Support\Facades\I18N;
@@ -13,7 +13,6 @@
 use CraftCms\Cms\Support\Json;
 use CraftCms\Cms\View\Enums\Position;
 use CraftCms\Commerce\Formula\Formulas;
-use CraftCms\Commerce\Http\Controllers\Concerns\HasStoreManagementScreen;
 use CraftCms\Commerce\Tax\Data\TaxAddressZone;
 use CraftCms\Commerce\Tax\TaxZones;
 
@@ -21,11 +20,8 @@
 use Symfony\Component\HttpFoundation\Response;
 use function CraftCms\Cms\t;
 
-readonly class TaxZonesController
+readonly class TaxZonesController extends BaseStoreManagementController
 {
-    use HasStoreManagementScreen;
-    use RespondsWithFlash;
-
     public function index(?string $storeHandle = null): CpScreenResponse
     {
         $store = $this->resolveStore($storeHandle);
@@ -94,6 +90,9 @@ public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResp
         $condition->name = 'condition';
         $condition->id = 'condition';
 
+        // Condition classes no longer self-render; ConditionBuilderRenderer replaces the old getBuilderHtml()/builderHtml().
+        $conditionHtml = new ConditionBuilderRenderer($condition)->render();
+
         $metaSidebar = '';
         if ($taxZone->id) {
             $metaSidebar = Cp::metadataHtml([
@@ -112,7 +111,7 @@ public function edit(?string $storeHandle = null, ?int $id = null): CpScreenResp
             ->contentTemplate('commerce/store-management/tax/taxzones/_edit', [
                 'taxZone' => $taxZone,
                 'store' => $store,
-                'condition' => $condition,
+                'conditionHtml' => $conditionHtml,
             ]);
     }
 
diff --git a/src/Order/Data/OrderStatus.php b/src/Order/Data/OrderStatus.php
index 3d61f5a011..4ab8cd3e21 100644
--- a/src/Order/Data/OrderStatus.php
+++ b/src/Order/Data/OrderStatus.php
@@ -7,6 +7,7 @@
 use CraftCms\Cms\Component\Component;
 use CraftCms\Cms\Component\Contracts\Chippable;
 use CraftCms\Cms\Cp\Html\StatusHtml;
+use CraftCms\Cms\Support\Url;
 use CraftCms\Commerce\Database\Table;
 use CraftCms\Commerce\Email\Emails;
 use CraftCms\Commerce\Order\Elements\Order;
@@ -89,7 +90,10 @@ public function extraFields(): array
 
     public function getCpEditUrl(): string
     {
-        return $this->getStore()->getStoreSettingsUrl('orderstatuses/' . $this->id);
+        // getStoreSettingsUrl() points at commerce/store-management/..., but order statuses
+        // live under commerce/settings/orderstatuses/... — build that URL directly, matching
+        // the sibling LineItemStatus::getCpEditUrl().
+        return Url::cpUrl('commerce/settings/orderstatuses/' . $this->getStore()->handle . '/' . $this->id);
     }
 
     public function getEmailIds(): array
diff --git a/src/Store/Stores.php b/src/Store/Stores.php
index 2e1926783b..50f54a7072 100644
--- a/src/Store/Stores.php
+++ b/src/Store/Stores.php
@@ -300,9 +300,9 @@ public function handleChangedStore(ConfigEvent $event): void
             $isNewStore = !$storeRecord->exists;
 
             $storeRecord->uid = $storeUid;
-            $storeRecord->name = $data['name'];
-            $storeRecord->handle = $data['handle'];
-            $storeRecord->primary = $data['primary'];
+            $storeRecord->name = $data['name'] ?? $storeRecord->name;
+            $storeRecord->handle = $data['handle'] ?? $storeRecord->handle;
+            $storeRecord->primary = $data['primary'] ?? $storeRecord->primary;
 
             $storeRecord->autoSetNewCartAddresses = ($data['autoSetNewCartAddresses'] ?? false);
             $storeRecord->autoSetCartShippingMethodOption = ($data['autoSetCartShippingMethodOption'] ?? false);
@@ -562,10 +562,12 @@ public function getAllSiteStores(): Collection
     public function getSiteIdsAvailableForAssignmentToNewStores(): array
     {
         // Sites that are assigned to more than one store
+        // Note: COUNT(*) here, not COUNT(storeId) — the latter is an unquoted identifier inside
+        // raw SQL, which Postgres folds to lowercase (`storeid`), a column that doesn't exist.
         $storeIds = DB::table(Table::SITESTORES)
             ->select('storeId')
             ->groupBy('storeId')
-            ->havingRaw('COUNT(storeId) > 1')
+            ->havingRaw('COUNT(*) > 1')
             ->pluck('storeId');
 
         return DB::table(Table::SITESTORES)
diff --git a/tests/Feature/Http/Controllers/Concerns/HasStoreManagementScreenTest.php b/tests/Feature/Http/Controllers/Concerns/HasStoreManagementScreenTest.php
index 380f203778..f5d01f72ad 100644
--- a/tests/Feature/Http/Controllers/Concerns/HasStoreManagementScreenTest.php
+++ b/tests/Feature/Http/Controllers/Concerns/HasStoreManagementScreenTest.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use CraftCms\Commerce\Http\Controllers\Settings\OrderStatusesController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingZonesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingZonesController;
 use CraftCms\Commerce\Store\Stores;
 use CraftCms\Commerce\Tests\Support\OrdersFixture;
 use Illuminate\Support\Facades\App;