From 51797ec4e311fecd9d4c9ab097745df2fd88db14 Mon Sep 17 00:00:00 2001
From: Ivan Bochkarev <ivanx86@gmail.com>
Date: Wed, 16 Sep 2026 08:47:59 +0600
Subject: [PATCH 1/4] feat(vue): centralize PrimeVue theme via VueTools
 useTheme (#701 Part B)

Resolve the active PrimeVue theme from the VueTools `vuetools.theme`
system setting instead of hardcoding Aura in every manager entry.

- Add `primevueTheme.js` helper: spreads `getActiveTheme()` and forces
  `darkModeSelector: 'none'` so manager chrome stays light. Works for
  both aura `{ theme: { preset } }` and modx `{ theme: ModxManagerTheme }`.
- Migrate all 11 entries + main.js off the hardcoded Aura preset to the
  helper; externalize `@vuetools/useTheme` in vite.config.js.
- Make `formStyles.js` runtime inject a no-op under the Modx preset
  (Modx owns control height/density); keep it for Aura.
- Theme-aware CSS: alias `--ms3-accent-primary` to `--p-primary-color`,
  use `--p-modx-space-panel` (with fallbacks) for mt-3/mb-3, and widen
  select/multiselect filters to 100% in main.css.
- Add `severity="success"` to primary Save buttons in dialog footers
  across order, settings, and catalog grids (fine on Aura too).
- Tighten the VueTools import-map check in 3 manager controllers to also
  require `vuetools/theme`; bump VueTools resolver to 1.2.0-pl and update
  the `ms3_vuetools_required` lexicon (ru+en) to mention >= 1.2.0.
---
 assets/components/minishop3/css/mgr/main.css  |  6 +++--
 .../minishop3/controllers/manager.class.php   |  4 ++-
 .../controllers/resource_create.class.php     |  4 ++-
 .../controllers/resource_update.class.php     |  4 ++-
 .../minishop3/lexicon/en/default.inc.php      |  2 +-
 .../minishop3/lexicon/ru/default.inc.php      |  2 +-
 vueManager/src/components/ActionsEditor.vue   |  1 +
 .../src/components/CategoryOptionsTab.vue     |  1 +
 vueManager/src/components/CustomersGrid.vue   |  2 ++
 vueManager/src/components/DeliveriesGrid.vue  |  2 +-
 .../src/components/ExtraFieldsManager.vue     |  1 +
 .../src/components/GridFieldsConfig.vue       |  3 ++-
 vueManager/src/components/LinksGrid.vue       |  2 +-
 vueManager/src/components/ModelFieldsGrid.vue |  4 +--
 .../src/components/NotificationsGrid.vue      |  2 +-
 .../src/components/OptionGroupsGrid.vue       |  2 +-
 vueManager/src/components/OptionsGrid.vue     |  2 +-
 vueManager/src/components/PaymentsGrid.vue    |  2 +-
 vueManager/src/components/StatusesGrid.vue    |  2 +-
 vueManager/src/components/VendorsGrid.vue     |  2 +-
 .../order/OrderAddProductDialog.vue           |  1 +
 .../components/order/OrderFormActionsBar.vue  |  1 +
 .../src/components/order/OrderShipmentTab.vue |  1 +
 vueManager/src/entries/api-test.js            | 10 +++----
 vueManager/src/entries/category-options.js    | 11 +++-----
 vueManager/src/entries/category-products.js   | 10 +++----
 vueManager/src/entries/customers.js           | 10 +++----
 vueManager/src/entries/help.js                | 12 +++------
 vueManager/src/entries/notifications.js       | 10 +++----
 vueManager/src/entries/order.js               | 10 +++----
 vueManager/src/entries/orders.js              | 10 +++----
 vueManager/src/entries/product-tabs.js        | 10 +++----
 vueManager/src/entries/settings.js            | 10 +++----
 vueManager/src/entries/utilities.js           | 10 +++----
 vueManager/src/main.js                        | 13 +++------
 vueManager/src/scss/_variables.scss           |  6 ++---
 vueManager/src/scss/primevue.scss             |  4 +--
 vueManager/src/utils/formStyles.js            |  7 +++++
 vueManager/src/utils/primevueTheme.js         | 27 +++++++++++++++++++
 vueManager/vite.config.js                     |  1 +
 40 files changed, 112 insertions(+), 112 deletions(-)
 create mode 100644 vueManager/src/utils/primevueTheme.js

diff --git a/assets/components/minishop3/css/mgr/main.css b/assets/components/minishop3/css/mgr/main.css
index 1aa2a2c09..501821e6e 100644
--- a/assets/components/minishop3/css/mgr/main.css
+++ b/assets/components/minishop3/css/mgr/main.css
@@ -494,6 +494,8 @@ a.x-menu-item .x-menu-item-text .icon {
     box-sizing: border-box !important;
 }
 
-.p-select-filter {
-    width: 90% !important;
+/* Select filter must fill IconField (was 90% — left a dead strip and misaligned search icon). */
+.p-select-overlay .p-select-filter,
+.p-multiselect-overlay .p-multiselect-filter {
+    width: 100% !important;
 }
diff --git a/core/components/minishop3/controllers/manager.class.php b/core/components/minishop3/controllers/manager.class.php
index b1bf86746..e7610c581 100644
--- a/core/components/minishop3/controllers/manager.class.php
+++ b/core/components/minishop3/controllers/manager.class.php
@@ -118,7 +118,9 @@ protected function registerVueCoreCheck()
     if (importMap) {
         try {
             var mapContent = JSON.parse(importMap.textContent);
-            hasVueCore = mapContent.imports && mapContent.imports.vue;
+            hasVueCore = mapContent.imports
+                && mapContent.imports.vue
+                && mapContent.imports['vuetools/theme'];
         } catch (e) {
             hasVueCore = false;
         }
diff --git a/core/components/minishop3/controllers/resource_create.class.php b/core/components/minishop3/controllers/resource_create.class.php
index 58e2f90fa..1fedad858 100644
--- a/core/components/minishop3/controllers/resource_create.class.php
+++ b/core/components/minishop3/controllers/resource_create.class.php
@@ -94,7 +94,9 @@ protected function registerVueCoreCheck()
     if (importMap) {
         try {
             var mapContent = JSON.parse(importMap.textContent);
-            hasVueCore = mapContent.imports && mapContent.imports.vue;
+            hasVueCore = mapContent.imports
+                && mapContent.imports.vue
+                && mapContent.imports['vuetools/theme'];
         } catch (e) {
             hasVueCore = false;
         }
diff --git a/core/components/minishop3/controllers/resource_update.class.php b/core/components/minishop3/controllers/resource_update.class.php
index d7db2e535..4b6a0d3b3 100644
--- a/core/components/minishop3/controllers/resource_update.class.php
+++ b/core/components/minishop3/controllers/resource_update.class.php
@@ -98,7 +98,9 @@ protected function registerVueCoreCheck()
     if (importMap) {
         try {
             var mapContent = JSON.parse(importMap.textContent);
-            hasVueCore = mapContent.imports && mapContent.imports.vue;
+            hasVueCore = mapContent.imports
+                && mapContent.imports.vue
+                && mapContent.imports['vuetools/theme'];
         } catch (e) {
             hasVueCore = false;
         }
diff --git a/core/components/minishop3/lexicon/en/default.inc.php b/core/components/minishop3/lexicon/en/default.inc.php
index e6c65ed78..d2301f84e 100644
--- a/core/components/minishop3/lexicon/en/default.inc.php
+++ b/core/components/minishop3/lexicon/en/default.inc.php
@@ -294,7 +294,7 @@
 $_lang['ms3_help_desc'] = 'Useful links and information';
 
 $_lang['ms3_error'] = 'Error';
-$_lang['ms3_vuetools_required'] = 'VueTools package is required for MiniShop3. Please install it via Package Manager.';
+$_lang['ms3_vuetools_required'] = 'VueTools package (>= 1.2.0) is required for MiniShop3. Please install it via Package Manager.';
 
 $_lang['ms3_mgr_order_recalc_invalid_mode'] = 'Invalid order cost recalculation mode.';
 $_lang['ms3_mgr_order_recalc_manual_delivery_missing'] = 'Manual delivery cost (manual_delivery_cost) is required in manual mode.';
diff --git a/core/components/minishop3/lexicon/ru/default.inc.php b/core/components/minishop3/lexicon/ru/default.inc.php
index 8791f7eaf..a1f2ef212 100644
--- a/core/components/minishop3/lexicon/ru/default.inc.php
+++ b/core/components/minishop3/lexicon/ru/default.inc.php
@@ -294,7 +294,7 @@
 $_lang['ms3_help_desc'] = 'Полезные ссылки и информация';
 
 $_lang['ms3_error'] = 'Ошибка';
-$_lang['ms3_vuetools_required'] = 'Для работы MiniShop3 требуется пакет VueTools. Установите его через Менеджер пакетов.';
+$_lang['ms3_vuetools_required'] = 'Для работы MiniShop3 требуется пакет VueTools (>= 1.2.0). Установите его через Менеджер пакетов.';
 
 $_lang['ms3_mgr_order_recalc_invalid_mode'] = 'Недопустимый режим пересчёта стоимости заказа.';
 $_lang['ms3_mgr_order_recalc_manual_delivery_missing'] = 'В режиме manual обязательно укажите manual_delivery_cost (стоимость доставки).';
diff --git a/vueManager/src/components/ActionsEditor.vue b/vueManager/src/components/ActionsEditor.vue
index 04ad1726f..eef456c08 100644
--- a/vueManager/src/components/ActionsEditor.vue
+++ b/vueManager/src/components/ActionsEditor.vue
@@ -370,6 +370,7 @@ function closeDialog() {
         <Button
           :label="_('save')"
           icon="pi pi-check"
+          severity="success"
           :disabled="!editingAction?.name"
           @click="saveAction"
         />
diff --git a/vueManager/src/components/CategoryOptionsTab.vue b/vueManager/src/components/CategoryOptionsTab.vue
index 15cc7d8f4..339eeef9a 100644
--- a/vueManager/src/components/CategoryOptionsTab.vue
+++ b/vueManager/src/components/CategoryOptionsTab.vue
@@ -510,6 +510,7 @@ onMounted(() => {
         />
         <Button
           :label="_('save') || 'Сохранить'"
+          severity="success"
           :loading="addSaving"
           :disabled="!addOptionId"
           @click="addOption"
diff --git a/vueManager/src/components/CustomersGrid.vue b/vueManager/src/components/CustomersGrid.vue
index f8ed6d45b..2090b41e8 100644
--- a/vueManager/src/components/CustomersGrid.vue
+++ b/vueManager/src/components/CustomersGrid.vue
@@ -933,6 +933,7 @@ onMounted(async () => {
           type="button"
           :label="_('save')"
           icon="pi pi-check"
+          severity="success"
           :loading="saving"
           @click="saveCustomer"
         />
@@ -1105,6 +1106,7 @@ onMounted(async () => {
             <Button
               :label="_('save')"
               icon="pi pi-check"
+              severity="success"
               :loading="savingAddress"
               @click="saveAddress"
             />
diff --git a/vueManager/src/components/DeliveriesGrid.vue b/vueManager/src/components/DeliveriesGrid.vue
index a40ddc129..1f6a03760 100644
--- a/vueManager/src/components/DeliveriesGrid.vue
+++ b/vueManager/src/components/DeliveriesGrid.vue
@@ -755,7 +755,7 @@ onMounted(async () => {
 
       <template #footer>
         <Button :label="_('cancel')" icon="pi pi-times" severity="secondary" @click="close" />
-        <Button :label="_('save')" icon="pi pi-check" :loading="saving" @click="saveDelivery" />
+        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveDelivery" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/ExtraFieldsManager.vue b/vueManager/src/components/ExtraFieldsManager.vue
index b0064b2f0..b183ba5f7 100644
--- a/vueManager/src/components/ExtraFieldsManager.vue
+++ b/vueManager/src/components/ExtraFieldsManager.vue
@@ -894,6 +894,7 @@ onMounted(() => {
         <Button
           :label="isEditMode ? _('ms3_vue_dialog_save') : _('ms3_vue_dialog_create')"
           icon="pi pi-check"
+          severity="success"
           :loading="saving"
           @click="saveField"
         />
diff --git a/vueManager/src/components/GridFieldsConfig.vue b/vueManager/src/components/GridFieldsConfig.vue
index 7c0756969..c4adcfcb0 100644
--- a/vueManager/src/components/GridFieldsConfig.vue
+++ b/vueManager/src/components/GridFieldsConfig.vue
@@ -1098,7 +1098,7 @@ onMounted(() => {
 
         <!-- Save button -->
         <div class="flex justify-content-end">
-          <Button :label="_('save')" icon="pi pi-check" :loading="saving" @click="saveConfig" />
+          <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveConfig" />
         </div>
       </template>
     </Card>
@@ -1718,6 +1718,7 @@ onMounted(() => {
         <Button
           :label="_('save')"
           icon="pi pi-check"
+          severity="success"
           :disabled="!editingField || !editingField.field_name"
           @click="saveEdit"
         />
diff --git a/vueManager/src/components/LinksGrid.vue b/vueManager/src/components/LinksGrid.vue
index ca72da197..6f6afd438 100644
--- a/vueManager/src/components/LinksGrid.vue
+++ b/vueManager/src/components/LinksGrid.vue
@@ -344,7 +344,7 @@ onMounted(() => {
 
       <template #footer>
         <Button :label="_('cancel')" icon="pi pi-times" severity="secondary" @click="close" />
-        <Button :label="_('save')" icon="pi pi-check" :loading="saving" @click="saveLink" />
+        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveLink" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/ModelFieldsGrid.vue b/vueManager/src/components/ModelFieldsGrid.vue
index 291268656..b4fdbcffd 100644
--- a/vueManager/src/components/ModelFieldsGrid.vue
+++ b/vueManager/src/components/ModelFieldsGrid.vue
@@ -969,7 +969,7 @@ onMounted(async () => {
           class="p-button-text"
           @click="editDialogVisible = false"
         />
-        <Button :label="_('save')" icon="pi pi-check" :loading="saving" @click="saveField" />
+        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveField" />
       </template>
     </Dialog>
 
@@ -1049,7 +1049,7 @@ onMounted(async () => {
           class="p-button-text"
           @click="sectionDialogVisible = false"
         />
-        <Button :label="_('save')" icon="pi pi-check" :loading="savingSec" @click="saveSection" />
+        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="savingSec" @click="saveSection" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/NotificationsGrid.vue b/vueManager/src/components/NotificationsGrid.vue
index 6fc4382c4..d7185e525 100644
--- a/vueManager/src/components/NotificationsGrid.vue
+++ b/vueManager/src/components/NotificationsGrid.vue
@@ -505,7 +505,7 @@ onMounted(async () => {
 
       <template #footer>
         <Button :label="_('cancel')" icon="pi pi-times" class="p-button-text" @click="close" />
-        <Button :label="_('save')" icon="pi pi-check" :loading="saving" @click="saveNotification" />
+        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveNotification" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/OptionGroupsGrid.vue b/vueManager/src/components/OptionGroupsGrid.vue
index be61c0be1..c7ea3f1d4 100644
--- a/vueManager/src/components/OptionGroupsGrid.vue
+++ b/vueManager/src/components/OptionGroupsGrid.vue
@@ -343,7 +343,7 @@ onMounted(() => {
       </div>
       <template #footer>
         <Button :label="_('cancel')" severity="secondary" @click="close" />
-        <Button :label="_('save')" icon="pi pi-check" :loading="saving" @click="saveGroup" />
+        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveGroup" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/OptionsGrid.vue b/vueManager/src/components/OptionsGrid.vue
index 1ad917e32..8e5ea183f 100644
--- a/vueManager/src/components/OptionsGrid.vue
+++ b/vueManager/src/components/OptionsGrid.vue
@@ -550,7 +550,7 @@ onBeforeUnmount(() => {
           :disabled="dialogSaving"
           @click="dialogVisible = false"
         />
-        <Button :label="_('save') || 'Сохранить'" :loading="dialogSaving" @click="saveOption" />
+        <Button :label="_('save') || 'Сохранить'" severity="success" :loading="dialogSaving" @click="saveOption" />
       </template>
     </Dialog>
 
diff --git a/vueManager/src/components/PaymentsGrid.vue b/vueManager/src/components/PaymentsGrid.vue
index 7a494a5c2..298c50c98 100644
--- a/vueManager/src/components/PaymentsGrid.vue
+++ b/vueManager/src/components/PaymentsGrid.vue
@@ -682,7 +682,7 @@ onMounted(async () => {
 
       <template #footer>
         <Button :label="_('cancel')" icon="pi pi-times" severity="secondary" @click="close" />
-        <Button :label="_('save')" icon="pi pi-check" :loading="saving" @click="savePayment" />
+        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="savePayment" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/StatusesGrid.vue b/vueManager/src/components/StatusesGrid.vue
index 1a65d7a90..6dfe580b7 100644
--- a/vueManager/src/components/StatusesGrid.vue
+++ b/vueManager/src/components/StatusesGrid.vue
@@ -444,7 +444,7 @@ onMounted(() => {
 
       <template #footer>
         <Button :label="_('cancel')" icon="pi pi-times" severity="secondary" @click="close" />
-        <Button :label="_('save')" icon="pi pi-check" :loading="saving" @click="saveStatus" />
+        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveStatus" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/VendorsGrid.vue b/vueManager/src/components/VendorsGrid.vue
index ffe72b7fb..5ea8e6c1c 100644
--- a/vueManager/src/components/VendorsGrid.vue
+++ b/vueManager/src/components/VendorsGrid.vue
@@ -767,7 +767,7 @@ onMounted(async () => {
           severity="secondary"
           @click="editDialogVisible = false"
         />
-        <Button :label="_('save')" icon="pi pi-check" :loading="saving" @click="saveVendor" />
+        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveVendor" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/order/OrderAddProductDialog.vue b/vueManager/src/components/order/OrderAddProductDialog.vue
index 1ac639bb8..bedf349a8 100644
--- a/vueManager/src/components/order/OrderAddProductDialog.vue
+++ b/vueManager/src/components/order/OrderAddProductDialog.vue
@@ -130,6 +130,7 @@ defineProps({
     <Button
       :label="_('save')"
       icon="pi pi-check"
+      severity="success"
       :loading="savingNewProduct"
       :disabled="!selectedProduct || !selectedProduct.id"
       @click="saveNewProduct"
diff --git a/vueManager/src/components/order/OrderFormActionsBar.vue b/vueManager/src/components/order/OrderFormActionsBar.vue
index 921784df9..17ca01816 100644
--- a/vueManager/src/components/order/OrderFormActionsBar.vue
+++ b/vueManager/src/components/order/OrderFormActionsBar.vue
@@ -27,6 +27,7 @@ const { _ } = useLexicon()
       v-else
       :label="_('save')"
       icon="pi pi-check"
+      severity="success"
       :loading="saving"
       :disabled="recalculatingCost"
       @click="emit('save')"
diff --git a/vueManager/src/components/order/OrderShipmentTab.vue b/vueManager/src/components/order/OrderShipmentTab.vue
index deb0ae5ee..560f6a94f 100644
--- a/vueManager/src/components/order/OrderShipmentTab.vue
+++ b/vueManager/src/components/order/OrderShipmentTab.vue
@@ -181,6 +181,7 @@ watch(orderId, loadShipment, { immediate: true })
           <Button
             :label="_('save')"
             icon="pi pi-check"
+            severity="success"
             :loading="saving"
             @click="saveShipment(false)"
           />
diff --git a/vueManager/src/entries/api-test.js b/vueManager/src/entries/api-test.js
index 41f572881..0686e1fa1 100644
--- a/vueManager/src/entries/api-test.js
+++ b/vueManager/src/entries/api-test.js
@@ -9,11 +9,12 @@ import 'primeicons/primeicons.css'
 
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
+import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import VueApiTest from '../components/ApiTest.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
+import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
 
 /**
  * Creates and configures Vue application
@@ -25,12 +26,7 @@ function createVueApp() {
   app.use(pinia)
 
   app.use(PrimeVue, {
-    theme: {
-      preset: Aura,
-      options: {
-        darkModeSelector: 'none',
-      },
-    },
+    ...getManagerPrimeVueThemeOptions(),
     locale: getPrimeVueLocale(),
   })
 
diff --git a/vueManager/src/entries/category-options.js b/vueManager/src/entries/category-options.js
index fa29c6d8d..5508c391a 100644
--- a/vueManager/src/entries/category-options.js
+++ b/vueManager/src/entries/category-options.js
@@ -6,12 +6,13 @@
  */
 
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
-import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
+import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import CategoryOptionsTab from '../components/CategoryOptionsTab.vue'
 import { provideUiGroup } from '../composables/uiGroup.js'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
+import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
 
 const MOUNT_ID = 'ms3-vue-category-options'
 
@@ -31,13 +32,7 @@ function mountApp() {
   app = createApp(CategoryOptionsTab, { categoryId })
 
   app.use(PrimeVue, {
-    theme: {
-      preset: Aura,
-      options: {
-        darkModeSelector: 'none',
-        cssLayer: false,
-      },
-    },
+    ...getManagerPrimeVueThemeOptions(),
     locale: getPrimeVueLocale(),
   })
   app.use(ToastService)
diff --git a/vueManager/src/entries/category-products.js b/vueManager/src/entries/category-products.js
index 748d17e51..2e625c3a6 100644
--- a/vueManager/src/entries/category-products.js
+++ b/vueManager/src/entries/category-products.js
@@ -10,12 +10,13 @@ import 'primeicons/primeicons.css'
 
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
+import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import CategoryProductsGrid from '../components/CategoryProductsGrid.vue'
 import { provideUiGroup } from '../composables/uiGroup.js'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
+import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
 
 let appInstance = null
 
@@ -32,12 +33,7 @@ function createVueApp(categoryId) {
   app.use(pinia)
 
   app.use(PrimeVue, {
-    theme: {
-      preset: Aura,
-      options: {
-        darkModeSelector: 'none',
-      },
-    },
+    ...getManagerPrimeVueThemeOptions(),
     locale: getPrimeVueLocale(),
   })
 
diff --git a/vueManager/src/entries/customers.js b/vueManager/src/entries/customers.js
index 3428a6ca7..89242f74d 100644
--- a/vueManager/src/entries/customers.js
+++ b/vueManager/src/entries/customers.js
@@ -9,11 +9,12 @@ import 'primeicons/primeicons.css'
 
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
+import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import CustomersGrid from '../components/CustomersGrid.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
+import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
 
 /**
  * Creates and configures Vue application
@@ -25,12 +26,7 @@ function createVueApp() {
   app.use(pinia)
 
   app.use(PrimeVue, {
-    theme: {
-      preset: Aura,
-      options: {
-        darkModeSelector: 'none',
-      },
-    },
+    ...getManagerPrimeVueThemeOptions(),
     locale: getPrimeVueLocale(),
   })
 
diff --git a/vueManager/src/entries/help.js b/vueManager/src/entries/help.js
index 107775978..d2126d7ed 100644
--- a/vueManager/src/entries/help.js
+++ b/vueManager/src/entries/help.js
@@ -5,11 +5,12 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import { Aura, PrimeVue } from 'primevue'
+import { PrimeVue } from 'primevue'
 import { createApp } from 'vue'
 
 import HelpPage from '../components/HelpPage.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
+import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
 
 /**
  * Creates and configures Vue application
@@ -17,14 +18,7 @@ import { injectFormStylesOverride } from '../utils/formStyles.js'
 function createVueApp() {
   const app = createApp(HelpPage)
 
-  app.use(PrimeVue, {
-    theme: {
-      preset: Aura,
-      options: {
-        darkModeSelector: 'none',
-      },
-    },
-  })
+  app.use(PrimeVue, getManagerPrimeVueThemeOptions())
 
   return app
 }
diff --git a/vueManager/src/entries/notifications.js b/vueManager/src/entries/notifications.js
index 03c4fd6c1..87528aefa 100644
--- a/vueManager/src/entries/notifications.js
+++ b/vueManager/src/entries/notifications.js
@@ -9,11 +9,12 @@ import 'primeicons/primeicons.css'
 
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
+import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import NotificationsGrid from '../components/NotificationsGrid.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
+import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
 
 /**
  * Creates and configures Vue application
@@ -25,12 +26,7 @@ function createVueApp() {
   app.use(pinia)
 
   app.use(PrimeVue, {
-    theme: {
-      preset: Aura,
-      options: {
-        darkModeSelector: 'none',
-      },
-    },
+    ...getManagerPrimeVueThemeOptions(),
     locale: getPrimeVueLocale(),
   })
 
diff --git a/vueManager/src/entries/order.js b/vueManager/src/entries/order.js
index 1371ea7c8..1f6f54bb1 100644
--- a/vueManager/src/entries/order.js
+++ b/vueManager/src/entries/order.js
@@ -7,7 +7,7 @@ import 'primeicons/primeicons.css'
 
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
+import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import OrderView from '../components/OrderView.vue'
@@ -16,6 +16,7 @@ import {
   snapshotOrderTabConfigForQueue,
   validateOrderPluginTabConfig,
 } from '../utils/orderPluginTab.js'
+import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
 
 /**
  * Plugin registry for third-party order manager tabs (Vue / ExtJS). See GitHub #166.
@@ -133,12 +134,7 @@ function createVueApp() {
   app.use(pinia)
 
   app.use(PrimeVue, {
-    theme: {
-      preset: Aura,
-      options: {
-        darkModeSelector: 'none',
-      },
-    },
+    ...getManagerPrimeVueThemeOptions(),
     locale: getPrimeVueLocale(),
   })
 
diff --git a/vueManager/src/entries/orders.js b/vueManager/src/entries/orders.js
index 53a2d9e85..c7dea4364 100644
--- a/vueManager/src/entries/orders.js
+++ b/vueManager/src/entries/orders.js
@@ -7,11 +7,12 @@ import 'primeicons/primeicons.css'
 
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
+import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import OrdersGrid from '../components/OrdersGrid.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
+import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
 
 /**
  * Creates and configures Vue application
@@ -22,12 +23,7 @@ function createVueApp() {
   app.use(pinia)
 
   app.use(PrimeVue, {
-    theme: {
-      preset: Aura,
-      options: {
-        darkModeSelector: 'none',
-      },
-    },
+    ...getManagerPrimeVueThemeOptions(),
     locale: getPrimeVueLocale(),
   })
 
diff --git a/vueManager/src/entries/product-tabs.js b/vueManager/src/entries/product-tabs.js
index 988a40255..6aaf1a4e5 100644
--- a/vueManager/src/entries/product-tabs.js
+++ b/vueManager/src/entries/product-tabs.js
@@ -11,11 +11,12 @@ import 'primeicons/primeicons.css'
 
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
+import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import ProductTabs from '../components/product/ProductTabs.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
+import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
 
 /**
  * Plugin Registry for third-party tabs
@@ -127,12 +128,7 @@ function createVueApp(props) {
   app.use(pinia)
 
   app.use(PrimeVue, {
-    theme: {
-      preset: Aura,
-      options: {
-        darkModeSelector: 'none',
-      },
-    },
+    ...getManagerPrimeVueThemeOptions(),
     locale: getPrimeVueLocale(),
   })
 
diff --git a/vueManager/src/entries/settings.js b/vueManager/src/entries/settings.js
index d6732c313..9182f48e8 100644
--- a/vueManager/src/entries/settings.js
+++ b/vueManager/src/entries/settings.js
@@ -6,22 +6,18 @@ import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
-import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
+import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import SettingsPage from '../components/SettingsPage.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
+import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
 
 function createVueApp() {
   const app = createApp(SettingsPage)
 
   app.use(PrimeVue, {
-    theme: {
-      preset: Aura,
-      options: {
-        darkModeSelector: 'none',
-      },
-    },
+    ...getManagerPrimeVueThemeOptions(),
     locale: getPrimeVueLocale(),
   })
   app.use(ConfirmationService)
diff --git a/vueManager/src/entries/utilities.js b/vueManager/src/entries/utilities.js
index a5ec7188d..6b8ade804 100644
--- a/vueManager/src/entries/utilities.js
+++ b/vueManager/src/entries/utilities.js
@@ -7,11 +7,12 @@ import 'primeicons/primeicons.css'
 
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
+import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import UtilitiesPage from '../components/UtilitiesPage.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
+import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
 
 export function init(selector = '#ms3-vue-utilities') {
   const $el = document.querySelector(selector)
@@ -22,12 +23,7 @@ export function init(selector = '#ms3-vue-utilities') {
   const app = createApp(UtilitiesPage)
   app.use(createPinia())
   app.use(PrimeVue, {
-    theme: {
-      preset: Aura,
-      options: {
-        darkModeSelector: 'none',
-      },
-    },
+    ...getManagerPrimeVueThemeOptions(),
     locale: getPrimeVueLocale(),
   })
   app.use(ConfirmationService)
diff --git a/vueManager/src/main.js b/vueManager/src/main.js
index 421143c9b..99bf6d946 100644
--- a/vueManager/src/main.js
+++ b/vueManager/src/main.js
@@ -3,9 +3,11 @@ import 'primeicons/primeicons.css'
 
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
+import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
+import { getManagerPrimeVueThemeOptions } from './utils/primevueTheme.js'
+
 /**
  * MiniShop3 Vue Manager
  *
@@ -37,14 +39,7 @@ export function createVueApp(rootComponent) {
   app.use(pinia)
 
   app.use(PrimeVue, {
-    theme: {
-      preset: Aura,
-      options: {
-        darkModeSelector: 'none',
-        cssLayer: false,
-        prefix: 'p',
-      },
-    },
+    ...getManagerPrimeVueThemeOptions(),
     locale: getPrimeVueLocale(),
     pt: {
       directives: {
diff --git a/vueManager/src/scss/_variables.scss b/vueManager/src/scss/_variables.scss
index ef997e9cf..3419359c5 100644
--- a/vueManager/src/scss/_variables.scss
+++ b/vueManager/src/scss/_variables.scss
@@ -64,9 +64,9 @@
   --ms3-text-info-result: #0c5460;
   --ms3-text-error-result: #721c24;
 
-  /* Colors — accents */
-  --ms3-accent-primary: #3b82f6;
-  --ms3-accent-focus: rgb(59 130 246 / 30%);
+  /* Colors — accents (alias ModxManagerTheme primary, not Tailwind blue) */
+  --ms3-accent-primary: var(--p-primary-color, #234368);
+  --ms3-accent-focus: color-mix(in srgb, var(--p-primary-color, #234368) 30%, transparent);
   --ms3-accent-teal: #32ab9a;
   --ms3-accent-green: #4caf50;
   --ms3-border-upload: #ddd;
diff --git a/vueManager/src/scss/primevue.scss b/vueManager/src/scss/primevue.scss
index 39441f63b..64b6dfa98 100644
--- a/vueManager/src/scss/primevue.scss
+++ b/vueManager/src/scss/primevue.scss
@@ -73,7 +73,7 @@
 
 .vueApp .mt-3,
 .p-dialog .mt-3 {
-  margin-top: 0.75rem;
+  margin-top: var(--p-modx-space-panel, 15px);
 }
 
 .vueApp .mt-4,
@@ -113,7 +113,7 @@
 
 .vueApp .mb-3,
 .p-dialog .mb-3 {
-  margin-bottom: 0.75rem;
+  margin-bottom: var(--p-modx-space-panel, 15px);
 }
 
 .vueApp .mb-4,
diff --git a/vueManager/src/utils/formStyles.js b/vueManager/src/utils/formStyles.js
index 55a67b1ce..21674ed17 100644
--- a/vueManager/src/utils/formStyles.js
+++ b/vueManager/src/utils/formStyles.js
@@ -4,10 +4,17 @@
  * Вызывать после app.mount(). PrimeVue с @primeuix/themes встраивает тему в runtime
  * после загрузки бандла, поэтому стили из SCSS (даже с !important) загружаются раньше
  * и перезаписываются. Runtime injection обеспечивает применение наших правил последними.
+ *
+ * Под Modx preset (vuetools.theme = modx) инжект отключён: Modx сам владеет высотой
+ * контролов и плотностью, наши переопределения конфликтовали бы с его токенами.
  */
+import { getThemeName } from '@vuetools/useTheme'
+
 const STYLE_ID = 'ms3-form-styles-override'
 
 export function injectFormStylesOverride() {
+  // Modx preset owns control height/density — skip our Aura-era overrides.
+  if (getThemeName() === 'modx') return
   if (document.getElementById(STYLE_ID)) return
 
   const css = `
diff --git a/vueManager/src/utils/primevueTheme.js b/vueManager/src/utils/primevueTheme.js
new file mode 100644
index 000000000..ec950f48c
--- /dev/null
+++ b/vueManager/src/utils/primevueTheme.js
@@ -0,0 +1,27 @@
+/**
+ * Manager PrimeVue theme options.
+ *
+ * VueTools `useTheme` resolves the active theme from the `vuetools.theme` system
+ * setting (registry: `aura` → `{ theme: { preset: Aura } }`, `modx` →
+ * `{ theme: ModxManagerTheme }` where `ModxManagerTheme = { preset, options }`).
+ *
+ * The manager chrome stays light even when the OS prefers dark, so
+ * `darkModeSelector: 'none'` is forced on top of the registry defaults.
+ * Spreading `active.theme` keeps both shapes intact: aura's `{ preset }` and
+ * modx's `{ preset, options }`.
+ */
+import { getActiveTheme } from '@vuetools/useTheme'
+
+export function getManagerPrimeVueThemeOptions() {
+  const active = getActiveTheme()
+  return {
+    ...active,
+    theme: {
+      ...active.theme,
+      options: {
+        ...(active.theme?.options ?? {}),
+        darkModeSelector: 'none',
+      },
+    },
+  }
+}
diff --git a/vueManager/vite.config.js b/vueManager/vite.config.js
index d41acfdf0..a6801f04e 100644
--- a/vueManager/vite.config.js
+++ b/vueManager/vite.config.js
@@ -99,6 +99,7 @@ export default defineConfig(({ command }) => {
     '@vuetools/useModx',
     '@vuetools/usePermission',
     '@vuetools/usePrimeVueLocale',
+    '@vuetools/useTheme',
   ]
 
   // Subpath imports (primevue/button) resolve to node_modules and ship a second

From c852ac257699bb9bed19a6139e562dcb5e8db042 Mon Sep 17 00:00:00 2001
From: Ivan Bochkarev <ivanx86@gmail.com>
Date: Wed, 16 Sep 2026 08:52:26 +0600
Subject: [PATCH 2/4] refactor(vue): DRY PrimeVue theme wiring after #701 Part
 B

Add getManagerPrimeVueConfig() and isModxManagerTheme() so entries
share one locale+theme setup; help.js keeps theme-only path.
---
 vueManager/src/entries/api-test.js          |  8 ++---
 vueManager/src/entries/category-options.js  |  8 ++---
 vueManager/src/entries/category-products.js |  8 ++---
 vueManager/src/entries/customers.js         |  8 ++---
 vueManager/src/entries/notifications.js     |  8 ++---
 vueManager/src/entries/order.js             |  8 ++---
 vueManager/src/entries/orders.js            |  8 ++---
 vueManager/src/entries/product-tabs.js      |  8 ++---
 vueManager/src/entries/settings.js          |  8 ++---
 vueManager/src/entries/utilities.js         |  8 ++---
 vueManager/src/main.js                      |  9 ++----
 vueManager/src/utils/formStyles.js          |  4 +--
 vueManager/src/utils/primevueTheme.js       | 36 +++++++++++++--------
 13 files changed, 47 insertions(+), 82 deletions(-)

diff --git a/vueManager/src/entries/api-test.js b/vueManager/src/entries/api-test.js
index 0686e1fa1..b33156f3d 100644
--- a/vueManager/src/entries/api-test.js
+++ b/vueManager/src/entries/api-test.js
@@ -7,14 +7,13 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
 import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import VueApiTest from '../components/ApiTest.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
-import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
+import { getManagerPrimeVueConfig } from '../utils/primevueTheme.js'
 
 /**
  * Creates and configures Vue application
@@ -25,10 +24,7 @@ function createVueApp() {
   const pinia = createPinia()
   app.use(pinia)
 
-  app.use(PrimeVue, {
-    ...getManagerPrimeVueThemeOptions(),
-    locale: getPrimeVueLocale(),
-  })
+  app.use(PrimeVue, getManagerPrimeVueConfig())
 
   app.use(ConfirmationService)
   app.use(ToastService)
diff --git a/vueManager/src/entries/category-options.js b/vueManager/src/entries/category-options.js
index 5508c391a..68362ff5a 100644
--- a/vueManager/src/entries/category-options.js
+++ b/vueManager/src/entries/category-options.js
@@ -5,14 +5,13 @@
  * ms3-grid-category-option + ms3-window-option-add + ms3-window-copy-category.
  */
 
-import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import CategoryOptionsTab from '../components/CategoryOptionsTab.vue'
 import { provideUiGroup } from '../composables/uiGroup.js'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
-import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
+import { getManagerPrimeVueConfig } from '../utils/primevueTheme.js'
 
 const MOUNT_ID = 'ms3-vue-category-options'
 
@@ -31,10 +30,7 @@ function mountApp() {
 
   app = createApp(CategoryOptionsTab, { categoryId })
 
-  app.use(PrimeVue, {
-    ...getManagerPrimeVueThemeOptions(),
-    locale: getPrimeVueLocale(),
-  })
+  app.use(PrimeVue, getManagerPrimeVueConfig())
   app.use(ToastService)
   app.use(ConfirmationService)
   provideUiGroup(app, 'category-options')
diff --git a/vueManager/src/entries/category-products.js b/vueManager/src/entries/category-products.js
index 2e625c3a6..e00a9e525 100644
--- a/vueManager/src/entries/category-products.js
+++ b/vueManager/src/entries/category-products.js
@@ -8,7 +8,6 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
 import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
@@ -16,7 +15,7 @@ import { createApp } from 'vue'
 import CategoryProductsGrid from '../components/CategoryProductsGrid.vue'
 import { provideUiGroup } from '../composables/uiGroup.js'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
-import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
+import { getManagerPrimeVueConfig } from '../utils/primevueTheme.js'
 
 let appInstance = null
 
@@ -32,10 +31,7 @@ function createVueApp(categoryId) {
   const pinia = createPinia()
   app.use(pinia)
 
-  app.use(PrimeVue, {
-    ...getManagerPrimeVueThemeOptions(),
-    locale: getPrimeVueLocale(),
-  })
+  app.use(PrimeVue, getManagerPrimeVueConfig())
 
   app.use(ConfirmationService)
   app.use(ToastService)
diff --git a/vueManager/src/entries/customers.js b/vueManager/src/entries/customers.js
index 89242f74d..75acd12cb 100644
--- a/vueManager/src/entries/customers.js
+++ b/vueManager/src/entries/customers.js
@@ -7,14 +7,13 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
 import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import CustomersGrid from '../components/CustomersGrid.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
-import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
+import { getManagerPrimeVueConfig } from '../utils/primevueTheme.js'
 
 /**
  * Creates and configures Vue application
@@ -25,10 +24,7 @@ function createVueApp() {
   const pinia = createPinia()
   app.use(pinia)
 
-  app.use(PrimeVue, {
-    ...getManagerPrimeVueThemeOptions(),
-    locale: getPrimeVueLocale(),
-  })
+  app.use(PrimeVue, getManagerPrimeVueConfig())
 
   app.use(ConfirmationService)
   app.use(ToastService)
diff --git a/vueManager/src/entries/notifications.js b/vueManager/src/entries/notifications.js
index 87528aefa..6f862f3b9 100644
--- a/vueManager/src/entries/notifications.js
+++ b/vueManager/src/entries/notifications.js
@@ -7,14 +7,13 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
 import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import NotificationsGrid from '../components/NotificationsGrid.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
-import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
+import { getManagerPrimeVueConfig } from '../utils/primevueTheme.js'
 
 /**
  * Creates and configures Vue application
@@ -25,10 +24,7 @@ function createVueApp() {
   const pinia = createPinia()
   app.use(pinia)
 
-  app.use(PrimeVue, {
-    ...getManagerPrimeVueThemeOptions(),
-    locale: getPrimeVueLocale(),
-  })
+  app.use(PrimeVue, getManagerPrimeVueConfig())
 
   app.use(ConfirmationService)
   app.use(ToastService)
diff --git a/vueManager/src/entries/order.js b/vueManager/src/entries/order.js
index 1f6f54bb1..d6ea6d5eb 100644
--- a/vueManager/src/entries/order.js
+++ b/vueManager/src/entries/order.js
@@ -5,7 +5,6 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
 import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
@@ -16,7 +15,7 @@ import {
   snapshotOrderTabConfigForQueue,
   validateOrderPluginTabConfig,
 } from '../utils/orderPluginTab.js'
-import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
+import { getManagerPrimeVueConfig } from '../utils/primevueTheme.js'
 
 /**
  * Plugin registry for third-party order manager tabs (Vue / ExtJS). See GitHub #166.
@@ -133,10 +132,7 @@ function createVueApp() {
   const pinia = createPinia()
   app.use(pinia)
 
-  app.use(PrimeVue, {
-    ...getManagerPrimeVueThemeOptions(),
-    locale: getPrimeVueLocale(),
-  })
+  app.use(PrimeVue, getManagerPrimeVueConfig())
 
   app.use(ConfirmationService)
   app.use(ToastService)
diff --git a/vueManager/src/entries/orders.js b/vueManager/src/entries/orders.js
index c7dea4364..cdcba7909 100644
--- a/vueManager/src/entries/orders.js
+++ b/vueManager/src/entries/orders.js
@@ -5,14 +5,13 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
 import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import OrdersGrid from '../components/OrdersGrid.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
-import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
+import { getManagerPrimeVueConfig } from '../utils/primevueTheme.js'
 
 /**
  * Creates and configures Vue application
@@ -22,10 +21,7 @@ function createVueApp() {
   const pinia = createPinia()
   app.use(pinia)
 
-  app.use(PrimeVue, {
-    ...getManagerPrimeVueThemeOptions(),
-    locale: getPrimeVueLocale(),
-  })
+  app.use(PrimeVue, getManagerPrimeVueConfig())
 
   app.use(ConfirmationService)
   app.use(ToastService)
diff --git a/vueManager/src/entries/product-tabs.js b/vueManager/src/entries/product-tabs.js
index 6aaf1a4e5..8eff0fdd7 100644
--- a/vueManager/src/entries/product-tabs.js
+++ b/vueManager/src/entries/product-tabs.js
@@ -9,14 +9,13 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
 import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import ProductTabs from '../components/product/ProductTabs.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
-import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
+import { getManagerPrimeVueConfig } from '../utils/primevueTheme.js'
 
 /**
  * Plugin Registry for third-party tabs
@@ -127,10 +126,7 @@ function createVueApp(props) {
   const pinia = createPinia()
   app.use(pinia)
 
-  app.use(PrimeVue, {
-    ...getManagerPrimeVueThemeOptions(),
-    locale: getPrimeVueLocale(),
-  })
+  app.use(PrimeVue, getManagerPrimeVueConfig())
 
   app.use(ToastService)
   app.use(ConfirmationService)
diff --git a/vueManager/src/entries/settings.js b/vueManager/src/entries/settings.js
index 9182f48e8..c7af4a73c 100644
--- a/vueManager/src/entries/settings.js
+++ b/vueManager/src/entries/settings.js
@@ -5,21 +5,17 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import SettingsPage from '../components/SettingsPage.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
-import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
+import { getManagerPrimeVueConfig } from '../utils/primevueTheme.js'
 
 function createVueApp() {
   const app = createApp(SettingsPage)
 
-  app.use(PrimeVue, {
-    ...getManagerPrimeVueThemeOptions(),
-    locale: getPrimeVueLocale(),
-  })
+  app.use(PrimeVue, getManagerPrimeVueConfig())
   app.use(ConfirmationService)
   app.use(ToastService)
 
diff --git a/vueManager/src/entries/utilities.js b/vueManager/src/entries/utilities.js
index 6b8ade804..7a0556df8 100644
--- a/vueManager/src/entries/utilities.js
+++ b/vueManager/src/entries/utilities.js
@@ -5,14 +5,13 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
 import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import UtilitiesPage from '../components/UtilitiesPage.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
-import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
+import { getManagerPrimeVueConfig } from '../utils/primevueTheme.js'
 
 export function init(selector = '#ms3-vue-utilities') {
   const $el = document.querySelector(selector)
@@ -22,10 +21,7 @@ export function init(selector = '#ms3-vue-utilities') {
 
   const app = createApp(UtilitiesPage)
   app.use(createPinia())
-  app.use(PrimeVue, {
-    ...getManagerPrimeVueThemeOptions(),
-    locale: getPrimeVueLocale(),
-  })
+  app.use(PrimeVue, getManagerPrimeVueConfig())
   app.use(ConfirmationService)
   app.use(ToastService)
   app.mount(selector)
diff --git a/vueManager/src/main.js b/vueManager/src/main.js
index 99bf6d946..749dfe277 100644
--- a/vueManager/src/main.js
+++ b/vueManager/src/main.js
@@ -1,12 +1,11 @@
 import './scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
 import { ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
-import { getManagerPrimeVueThemeOptions } from './utils/primevueTheme.js'
+import { getManagerPrimeVueConfig } from './utils/primevueTheme.js'
 
 /**
  * MiniShop3 Vue Manager
@@ -38,9 +37,7 @@ export function createVueApp(rootComponent) {
   const pinia = createPinia()
   app.use(pinia)
 
-  app.use(PrimeVue, {
-    ...getManagerPrimeVueThemeOptions(),
-    locale: getPrimeVueLocale(),
+  app.use(PrimeVue, getManagerPrimeVueConfig({
     pt: {
       directives: {
         tooltip: {
@@ -48,7 +45,7 @@ export function createVueApp(rootComponent) {
         },
       },
     },
-  })
+  }))
 
   app.use(ConfirmationService)
   app.use(ToastService)
diff --git a/vueManager/src/utils/formStyles.js b/vueManager/src/utils/formStyles.js
index 21674ed17..3128dc1a6 100644
--- a/vueManager/src/utils/formStyles.js
+++ b/vueManager/src/utils/formStyles.js
@@ -8,13 +8,13 @@
  * Под Modx preset (vuetools.theme = modx) инжект отключён: Modx сам владеет высотой
  * контролов и плотностью, наши переопределения конфликтовали бы с его токенами.
  */
-import { getThemeName } from '@vuetools/useTheme'
+import { isModxManagerTheme } from './primevueTheme.js'
 
 const STYLE_ID = 'ms3-form-styles-override'
 
 export function injectFormStylesOverride() {
   // Modx preset owns control height/density — skip our Aura-era overrides.
-  if (getThemeName() === 'modx') return
+  if (isModxManagerTheme()) return
   if (document.getElementById(STYLE_ID)) return
 
   const css = `
diff --git a/vueManager/src/utils/primevueTheme.js b/vueManager/src/utils/primevueTheme.js
index ec950f48c..c20e1e0ab 100644
--- a/vueManager/src/utils/primevueTheme.js
+++ b/vueManager/src/utils/primevueTheme.js
@@ -1,27 +1,35 @@
 /**
- * Manager PrimeVue theme options.
+ * PrimeVue theme for MiniShop3 manager entries.
  *
- * VueTools `useTheme` resolves the active theme from the `vuetools.theme` system
- * setting (registry: `aura` → `{ theme: { preset: Aura } }`, `modx` →
- * `{ theme: ModxManagerTheme }` where `ModxManagerTheme = { preset, options }`).
- *
- * The manager chrome stays light even when the OS prefers dark, so
- * `darkModeSelector: 'none'` is forced on top of the registry defaults.
- * Spreading `active.theme` keeps both shapes intact: aura's `{ preset }` and
- * modx's `{ preset, options }`.
+ * Resolves `vuetools.theme` via VueTools and forces `darkModeSelector: 'none'`
+ * so manager chrome stays light (aura `{ preset }` or modx `{ preset, options }`).
  */
-import { getActiveTheme } from '@vuetools/useTheme'
+import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
+import { getActiveTheme, getThemeName } from '@vuetools/useTheme'
+
+export function isModxManagerTheme() {
+  return getThemeName() === 'modx'
+}
 
 export function getManagerPrimeVueThemeOptions() {
-  const active = getActiveTheme()
+  const { theme, ...rest } = getActiveTheme()
   return {
-    ...active,
+    ...rest,
     theme: {
-      ...active.theme,
+      ...theme,
       options: {
-        ...(active.theme?.options ?? {}),
+        ...theme?.options,
         darkModeSelector: 'none',
       },
     },
   }
 }
+
+/** Theme options plus manager locale; pass PrimeVue extras (e.g. `pt`) when needed. */
+export function getManagerPrimeVueConfig(extra = {}) {
+  return {
+    ...getManagerPrimeVueThemeOptions(),
+    locale: getPrimeVueLocale(),
+    ...extra,
+  }
+}

From d82a8916eea20500ced98eedd9a3710dbb188d29 Mon Sep 17 00:00:00 2001
From: Ivan Bochkarev <ivanx86@gmail.com>
Date: Wed, 16 Sep 2026 09:04:52 +0600
Subject: [PATCH 3/4] =?UTF-8?q?fix(vue):=20Address=20#701=20Part=20B=20rev?=
 =?UTF-8?q?iew=20=E2=80=94=20Aura=20contrast,=20shared=20VueTools=20check?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert accent/--p-modx spacing that broke default Aura; restore cssLayer
false in the theme helper; extract import-map check to one include;
unify help.js on getManagerPrimeVueConfig.
---
 .../minishop3/controllers/manager.class.php   | 54 +--------------
 .../controllers/resource_create.class.php     | 54 +--------------
 .../controllers/resource_update.class.php     | 54 +--------------
 .../controllers/vue_core_check.inc.php        | 65 +++++++++++++++++++
 .../minishop3/lexicon/en/default.inc.php      |  2 +-
 .../minishop3/lexicon/ru/default.inc.php      |  2 +-
 vueManager/src/entries/help.js                |  4 +-
 vueManager/src/scss/_variables.scss           |  6 +-
 vueManager/src/scss/primevue.scss             |  4 +-
 vueManager/src/utils/formStyles.js            |  4 +-
 vueManager/src/utils/primevueTheme.js         | 35 ++++++----
 11 files changed, 109 insertions(+), 175 deletions(-)
 create mode 100644 core/components/minishop3/controllers/vue_core_check.inc.php

diff --git a/core/components/minishop3/controllers/manager.class.php b/core/components/minishop3/controllers/manager.class.php
index e7610c581..b3c53b70b 100644
--- a/core/components/minishop3/controllers/manager.class.php
+++ b/core/components/minishop3/controllers/manager.class.php
@@ -105,59 +105,11 @@ public function addVueModule($src)
      */
     protected function registerVueCoreCheck()
     {
+        require_once __DIR__ . '/vue_core_check.inc.php';
         $alertTitle = $this->modx->lexicon('ms3_error') ?: 'Error';
         $alertMessage = $this->modx->lexicon('ms3_vuetools_required')
-            ?: 'VueTools package is required. Please install it from Package Manager.';
-
-        $script = <<<JS
-<script>
-(function() {
-    var importMap = document.querySelector('script[type="importmap"]');
-    var hasVueCore = false;
-
-    if (importMap) {
-        try {
-            var mapContent = JSON.parse(importMap.textContent);
-            hasVueCore = mapContent.imports
-                && mapContent.imports.vue
-                && mapContent.imports['vuetools/theme'];
-        } catch (e) {
-            hasVueCore = false;
-        }
-    }
-
-    if (!hasVueCore) {
-        document.querySelectorAll('script[type="module"][data-vue-module]').forEach(function(el) {
-            el.remove();
-        });
-
-        if (typeof Ext !== 'undefined') {
-            Ext.onReady(function() {
-                if (typeof MODx !== 'undefined' && MODx.msg) {
-                    MODx.msg.alert('{$alertTitle}', '{$alertMessage}');
-                } else {
-                    alert('{$alertMessage}');
-                }
-            });
-        } else {
-            document.addEventListener('DOMContentLoaded', function() {
-                setTimeout(function() {
-                    if (typeof MODx !== 'undefined' && MODx.msg) {
-                        MODx.msg.alert('{$alertTitle}', '{$alertMessage}');
-                    } else {
-                        alert('{$alertMessage}');
-                    }
-                }, 500);
-            });
-        }
-
-        window.MS3_VUE_CORE_MISSING = true;
-    }
-})();
-</script>
-JS;
-
-        $this->modx->regClientStartupHTMLBlock($script);
+            ?: 'VueTools package (>= 1.2.0) is required. Please install or update it via Package Manager.';
+        ms3_register_vue_core_check($this->modx, $alertTitle, $alertMessage);
     }
 
     /**
diff --git a/core/components/minishop3/controllers/resource_create.class.php b/core/components/minishop3/controllers/resource_create.class.php
index 1fedad858..13dfbe063 100644
--- a/core/components/minishop3/controllers/resource_create.class.php
+++ b/core/components/minishop3/controllers/resource_create.class.php
@@ -81,59 +81,11 @@ public function addVueModule($src)
      */
     protected function registerVueCoreCheck()
     {
+        require_once __DIR__ . '/vue_core_check.inc.php';
         $alertTitle = $this->modx->lexicon('ms3_error') ?: 'Error';
         $alertMessage = $this->modx->lexicon('ms3_vuetools_required')
-            ?: 'VueTools package is required. Please install it from Package Manager.';
-
-        $script = <<<JS
-<script>
-(function() {
-    var importMap = document.querySelector('script[type="importmap"]');
-    var hasVueCore = false;
-
-    if (importMap) {
-        try {
-            var mapContent = JSON.parse(importMap.textContent);
-            hasVueCore = mapContent.imports
-                && mapContent.imports.vue
-                && mapContent.imports['vuetools/theme'];
-        } catch (e) {
-            hasVueCore = false;
-        }
-    }
-
-    if (!hasVueCore) {
-        document.querySelectorAll('script[type="module"][data-vue-module]').forEach(function(el) {
-            el.remove();
-        });
-
-        if (typeof Ext !== 'undefined') {
-            Ext.onReady(function() {
-                if (typeof MODx !== 'undefined' && MODx.msg) {
-                    MODx.msg.alert('{$alertTitle}', '{$alertMessage}');
-                } else {
-                    alert('{$alertMessage}');
-                }
-            });
-        } else {
-            document.addEventListener('DOMContentLoaded', function() {
-                setTimeout(function() {
-                    if (typeof MODx !== 'undefined' && MODx.msg) {
-                        MODx.msg.alert('{$alertTitle}', '{$alertMessage}');
-                    } else {
-                        alert('{$alertMessage}');
-                    }
-                }, 500);
-            });
-        }
-
-        window.MS3_VUE_CORE_MISSING = true;
-    }
-})();
-</script>
-JS;
-
-        $this->modx->regClientStartupHTMLBlock($script);
+            ?: 'VueTools package (>= 1.2.0) is required. Please install or update it via Package Manager.';
+        ms3_register_vue_core_check($this->modx, $alertTitle, $alertMessage);
     }
 
     /**
diff --git a/core/components/minishop3/controllers/resource_update.class.php b/core/components/minishop3/controllers/resource_update.class.php
index 4b6a0d3b3..f66ea89de 100644
--- a/core/components/minishop3/controllers/resource_update.class.php
+++ b/core/components/minishop3/controllers/resource_update.class.php
@@ -85,59 +85,11 @@ public function addVueModule($src)
      */
     protected function registerVueCoreCheck()
     {
+        require_once __DIR__ . '/vue_core_check.inc.php';
         $alertTitle = $this->modx->lexicon('ms3_error') ?: 'Error';
         $alertMessage = $this->modx->lexicon('ms3_vuetools_required')
-            ?: 'VueTools package is required. Please install it from Package Manager.';
-
-        $script = <<<JS
-<script>
-(function() {
-    var importMap = document.querySelector('script[type="importmap"]');
-    var hasVueCore = false;
-
-    if (importMap) {
-        try {
-            var mapContent = JSON.parse(importMap.textContent);
-            hasVueCore = mapContent.imports
-                && mapContent.imports.vue
-                && mapContent.imports['vuetools/theme'];
-        } catch (e) {
-            hasVueCore = false;
-        }
-    }
-
-    if (!hasVueCore) {
-        document.querySelectorAll('script[type="module"][data-vue-module]').forEach(function(el) {
-            el.remove();
-        });
-
-        if (typeof Ext !== 'undefined') {
-            Ext.onReady(function() {
-                if (typeof MODx !== 'undefined' && MODx.msg) {
-                    MODx.msg.alert('{$alertTitle}', '{$alertMessage}');
-                } else {
-                    alert('{$alertMessage}');
-                }
-            });
-        } else {
-            document.addEventListener('DOMContentLoaded', function() {
-                setTimeout(function() {
-                    if (typeof MODx !== 'undefined' && MODx.msg) {
-                        MODx.msg.alert('{$alertTitle}', '{$alertMessage}');
-                    } else {
-                        alert('{$alertMessage}');
-                    }
-                }, 500);
-            });
-        }
-
-        window.MS3_VUE_CORE_MISSING = true;
-    }
-})();
-</script>
-JS;
-
-        $this->modx->regClientStartupHTMLBlock($script);
+            ?: 'VueTools package (>= 1.2.0) is required. Please install or update it via Package Manager.';
+        ms3_register_vue_core_check($this->modx, $alertTitle, $alertMessage);
     }
 
     /**
diff --git a/core/components/minishop3/controllers/vue_core_check.inc.php b/core/components/minishop3/controllers/vue_core_check.inc.php
new file mode 100644
index 000000000..4f84184a2
--- /dev/null
+++ b/core/components/minishop3/controllers/vue_core_check.inc.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * Register startup HTML that requires VueTools Import Map with theme support (>= 1.2.0).
+ *
+ * Signal key `vuetools/theme` is present only in VueTools builds that ship
+ * `@vuetools/useTheme` / getActiveTheme(). Without it, remove data-vue-module
+ * scripts and show a MODX alert instead of a silent ES module link error.
+ *
+ * @param \MODX\Revolution\modX $modx
+ * @param string $alertTitle
+ * @param string $alertMessage
+ */
+function ms3_register_vue_core_check($modx, string $alertTitle, string $alertMessage): void
+{
+    $script = <<<JS
+<script>
+(function() {
+    var importMap = document.querySelector('script[type="importmap"]');
+    var hasVueToolsTheme = false;
+
+    if (importMap) {
+        try {
+            var mapContent = JSON.parse(importMap.textContent);
+            hasVueToolsTheme = mapContent.imports
+                && mapContent.imports.vue
+                && mapContent.imports['vuetools/theme'];
+        } catch (e) {
+            hasVueToolsTheme = false;
+        }
+    }
+
+    if (!hasVueToolsTheme) {
+        document.querySelectorAll('script[type="module"][data-vue-module]').forEach(function(el) {
+            el.remove();
+        });
+
+        if (typeof Ext !== 'undefined') {
+            Ext.onReady(function() {
+                if (typeof MODx !== 'undefined' && MODx.msg) {
+                    MODx.msg.alert('{$alertTitle}', '{$alertMessage}');
+                } else {
+                    alert('{$alertMessage}');
+                }
+            });
+        } else {
+            document.addEventListener('DOMContentLoaded', function() {
+                setTimeout(function() {
+                    if (typeof MODx !== 'undefined' && MODx.msg) {
+                        MODx.msg.alert('{$alertTitle}', '{$alertMessage}');
+                    } else {
+                        alert('{$alertMessage}');
+                    }
+                }, 500);
+            });
+        }
+
+        window.MS3_VUE_CORE_MISSING = true;
+    }
+})();
+</script>
+JS;
+
+    $modx->regClientStartupHTMLBlock($script);
+}
diff --git a/core/components/minishop3/lexicon/en/default.inc.php b/core/components/minishop3/lexicon/en/default.inc.php
index d2301f84e..30f266a0c 100644
--- a/core/components/minishop3/lexicon/en/default.inc.php
+++ b/core/components/minishop3/lexicon/en/default.inc.php
@@ -294,7 +294,7 @@
 $_lang['ms3_help_desc'] = 'Useful links and information';
 
 $_lang['ms3_error'] = 'Error';
-$_lang['ms3_vuetools_required'] = 'VueTools package (>= 1.2.0) is required for MiniShop3. Please install it via Package Manager.';
+$_lang['ms3_vuetools_required'] = 'VueTools package (>= 1.2.0) is required for MiniShop3. Please install or update it via Package Manager.';
 
 $_lang['ms3_mgr_order_recalc_invalid_mode'] = 'Invalid order cost recalculation mode.';
 $_lang['ms3_mgr_order_recalc_manual_delivery_missing'] = 'Manual delivery cost (manual_delivery_cost) is required in manual mode.';
diff --git a/core/components/minishop3/lexicon/ru/default.inc.php b/core/components/minishop3/lexicon/ru/default.inc.php
index a1f2ef212..67747b555 100644
--- a/core/components/minishop3/lexicon/ru/default.inc.php
+++ b/core/components/minishop3/lexicon/ru/default.inc.php
@@ -294,7 +294,7 @@
 $_lang['ms3_help_desc'] = 'Полезные ссылки и информация';
 
 $_lang['ms3_error'] = 'Ошибка';
-$_lang['ms3_vuetools_required'] = 'Для работы MiniShop3 требуется пакет VueTools (>= 1.2.0). Установите его через Менеджер пакетов.';
+$_lang['ms3_vuetools_required'] = 'Для работы MiniShop3 требуется пакет VueTools (>= 1.2.0). Установите или обновите его через Менеджер пакетов.';
 
 $_lang['ms3_mgr_order_recalc_invalid_mode'] = 'Недопустимый режим пересчёта стоимости заказа.';
 $_lang['ms3_mgr_order_recalc_manual_delivery_missing'] = 'В режиме manual обязательно укажите manual_delivery_cost (стоимость доставки).';
diff --git a/vueManager/src/entries/help.js b/vueManager/src/entries/help.js
index d2126d7ed..c47733354 100644
--- a/vueManager/src/entries/help.js
+++ b/vueManager/src/entries/help.js
@@ -10,7 +10,7 @@ import { createApp } from 'vue'
 
 import HelpPage from '../components/HelpPage.vue'
 import { injectFormStylesOverride } from '../utils/formStyles.js'
-import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
+import { getManagerPrimeVueConfig } from '../utils/primevueTheme.js'
 
 /**
  * Creates and configures Vue application
@@ -18,7 +18,7 @@ import { getManagerPrimeVueThemeOptions } from '../utils/primevueTheme.js'
 function createVueApp() {
   const app = createApp(HelpPage)
 
-  app.use(PrimeVue, getManagerPrimeVueThemeOptions())
+  app.use(PrimeVue, getManagerPrimeVueConfig())
 
   return app
 }
diff --git a/vueManager/src/scss/_variables.scss b/vueManager/src/scss/_variables.scss
index 3419359c5..65ca85e1e 100644
--- a/vueManager/src/scss/_variables.scss
+++ b/vueManager/src/scss/_variables.scss
@@ -64,9 +64,9 @@
   --ms3-text-info-result: #0c5460;
   --ms3-text-error-result: #721c24;
 
-  /* Colors — accents (alias ModxManagerTheme primary, not Tailwind blue) */
-  --ms3-accent-primary: var(--p-primary-color, #234368);
-  --ms3-accent-focus: color-mix(in srgb, var(--p-primary-color, #234368) 30%, transparent);
+  /* Colors — accents (fixed blue: Aura --p-primary-color is emerald and fails AA on links) */
+  --ms3-accent-primary: #3b82f6;
+  --ms3-accent-focus: rgb(59 130 246 / 30%);
   --ms3-accent-teal: #32ab9a;
   --ms3-accent-green: #4caf50;
   --ms3-border-upload: #ddd;
diff --git a/vueManager/src/scss/primevue.scss b/vueManager/src/scss/primevue.scss
index 64b6dfa98..39441f63b 100644
--- a/vueManager/src/scss/primevue.scss
+++ b/vueManager/src/scss/primevue.scss
@@ -73,7 +73,7 @@
 
 .vueApp .mt-3,
 .p-dialog .mt-3 {
-  margin-top: var(--p-modx-space-panel, 15px);
+  margin-top: 0.75rem;
 }
 
 .vueApp .mt-4,
@@ -113,7 +113,7 @@
 
 .vueApp .mb-3,
 .p-dialog .mb-3 {
-  margin-bottom: var(--p-modx-space-panel, 15px);
+  margin-bottom: 0.75rem;
 }
 
 .vueApp .mb-4,
diff --git a/vueManager/src/utils/formStyles.js b/vueManager/src/utils/formStyles.js
index 3128dc1a6..188132bc8 100644
--- a/vueManager/src/utils/formStyles.js
+++ b/vueManager/src/utils/formStyles.js
@@ -8,13 +8,13 @@
  * Под Modx preset (vuetools.theme = modx) инжект отключён: Modx сам владеет высотой
  * контролов и плотностью, наши переопределения конфликтовали бы с его токенами.
  */
-import { isModxManagerTheme } from './primevueTheme.js'
+import { shouldInjectFormStylesOverride } from './primevueTheme.js'
 
 const STYLE_ID = 'ms3-form-styles-override'
 
 export function injectFormStylesOverride() {
   // Modx preset owns control height/density — skip our Aura-era overrides.
-  if (isModxManagerTheme()) return
+  if (!shouldInjectFormStylesOverride()) return
   if (document.getElementById(STYLE_ID)) return
 
   const css = `
diff --git a/vueManager/src/utils/primevueTheme.js b/vueManager/src/utils/primevueTheme.js
index c20e1e0ab..348a0fe38 100644
--- a/vueManager/src/utils/primevueTheme.js
+++ b/vueManager/src/utils/primevueTheme.js
@@ -1,17 +1,18 @@
 /**
  * PrimeVue theme for MiniShop3 manager entries.
  *
- * Resolves `vuetools.theme` via VueTools and forces `darkModeSelector: 'none'`
- * so manager chrome stays light (aura `{ preset }` or modx `{ preset, options }`).
+ * Resolves `vuetools.theme` via VueTools and forces manager chrome options:
+ * - `darkModeSelector: 'none'` — stay light even when the OS prefers dark
+ * - `cssLayer: false` — keep cascade against MODX/Ext manager CSS (was on
+ *   main.js / category-options before getActiveTheme migration)
+ *
+ * Registry shapes: aura `{ theme: { preset } }`, modx `{ theme: ModxManagerTheme }`
+ * where ModxManagerTheme = `{ preset, options }`.
  */
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { getActiveTheme, getThemeName } from '@vuetools/useTheme'
 
-export function isModxManagerTheme() {
-  return getThemeName() === 'modx'
-}
-
-export function getManagerPrimeVueThemeOptions() {
+function getManagerPrimeVueThemeOptions() {
   const { theme, ...rest } = getActiveTheme()
   return {
     ...rest,
@@ -20,16 +21,28 @@ export function getManagerPrimeVueThemeOptions() {
       options: {
         ...theme?.options,
         darkModeSelector: 'none',
+        cssLayer: false,
       },
     },
   }
 }
 
-/** Theme options plus manager locale; pass PrimeVue extras (e.g. `pt`) when needed. */
-export function getManagerPrimeVueConfig(extra = {}) {
-  return {
+/**
+ * Theme options plus manager locale.
+ * @param {{ pt?: object }} [options]
+ */
+export function getManagerPrimeVueConfig(options = {}) {
+  const config = {
     ...getManagerPrimeVueThemeOptions(),
     locale: getPrimeVueLocale(),
-    ...extra,
   }
+  if (options.pt !== undefined) {
+    config.pt = options.pt
+  }
+  return config
+}
+
+/** Aura-era form density inject should not run under Modx preset. */
+export function shouldInjectFormStylesOverride() {
+  return getThemeName() !== 'modx'
 }

From b1173ef3cb0af9984d2db26f1525332c283fadb5 Mon Sep 17 00:00:00 2001
From: Ivan Bochkarev <ivanx86@gmail.com>
Date: Thu, 17 Sep 2026 00:33:20 +0600
Subject: [PATCH 4/4] fix(vue): Make Save severity theme-aware for Aura default

Limit success severity to Modx preset via getPrimarySaveSeverity so
Aura keeps primary green. Cover OrderEditProductDialog and add helper
unit tests (#738 review).
---
 vueManager/src/components/ActionsEditor.vue   |  4 ++-
 .../src/components/CategoryOptionsTab.vue     |  4 ++-
 vueManager/src/components/CustomersGrid.vue   |  6 +++--
 vueManager/src/components/DeliveriesGrid.vue  |  4 ++-
 .../src/components/ExtraFieldsManager.vue     |  4 ++-
 .../src/components/GridFieldsConfig.vue       |  6 +++--
 vueManager/src/components/LinksGrid.vue       |  4 ++-
 vueManager/src/components/ModelFieldsGrid.vue |  6 +++--
 .../src/components/NotificationsGrid.vue      |  4 ++-
 .../src/components/OptionGroupsGrid.vue       |  4 ++-
 vueManager/src/components/OptionsGrid.vue     |  4 ++-
 vueManager/src/components/PaymentsGrid.vue    |  4 ++-
 vueManager/src/components/StatusesGrid.vue    |  4 ++-
 vueManager/src/components/VendorsGrid.vue     |  4 ++-
 .../order/OrderAddProductDialog.vue           |  5 +++-
 .../order/OrderEditProductDialog.vue          |  4 +++
 .../components/order/OrderFormActionsBar.vue  |  7 +++--
 .../src/components/order/OrderShipmentTab.vue |  4 ++-
 .../src/test/stubs/usePrimeVueLocale.js       |  3 +++
 vueManager/src/test/stubs/useTheme.js         | 13 +++++++++
 vueManager/src/utils/primevueTheme.js         | 17 +++++++++++-
 vueManager/src/utils/primevueTheme.test.js    | 27 +++++++++++++++++++
 vueManager/vitest.config.js                   |  4 +++
 23 files changed, 124 insertions(+), 22 deletions(-)
 create mode 100644 vueManager/src/test/stubs/usePrimeVueLocale.js
 create mode 100644 vueManager/src/test/stubs/useTheme.js
 create mode 100644 vueManager/src/utils/primevueTheme.test.js

diff --git a/vueManager/src/components/ActionsEditor.vue b/vueManager/src/components/ActionsEditor.vue
index eef456c08..f57b62142 100644
--- a/vueManager/src/components/ActionsEditor.vue
+++ b/vueManager/src/components/ActionsEditor.vue
@@ -9,6 +9,7 @@ import { Button, Checkbox, Column, DataTable, Dialog, InputText, Select } from '
 import { computed, ref, watch } from 'vue'
 
 import actionRegistry from '../actionRegistry.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 
 const props = defineProps({
   /**
@@ -31,6 +32,7 @@ const props = defineProps({
 const emit = defineEmits(['update:modelValue'])
 
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 const localActions = ref([])
 
@@ -370,7 +372,7 @@ function closeDialog() {
         <Button
           :label="_('save')"
           icon="pi pi-check"
-          severity="success"
+          :severity="primarySaveSeverity"
           :disabled="!editingAction?.name"
           @click="saveAction"
         />
diff --git a/vueManager/src/components/CategoryOptionsTab.vue b/vueManager/src/components/CategoryOptionsTab.vue
index 339eeef9a..c4d6f7f73 100644
--- a/vueManager/src/components/CategoryOptionsTab.vue
+++ b/vueManager/src/components/CategoryOptionsTab.vue
@@ -5,6 +5,7 @@ import { onMounted, ref, watch } from 'vue'
 
 import { useGroupedToast, useUiGroup } from '../composables/uiGroup.js'
 import request from '../request.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 
 const props = defineProps({
   categoryId: { type: Number, required: true },
@@ -12,6 +13,7 @@ const props = defineProps({
 
 const confirm = useConfirm()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 // From entry provideUiGroup('category-options'); fallback for non-entry mounts (#538/#539).
 const UI_GROUP = useUiGroup() || 'category-options'
@@ -510,7 +512,7 @@ onMounted(() => {
         />
         <Button
           :label="_('save') || 'Сохранить'"
-          severity="success"
+          :severity="primarySaveSeverity"
           :loading="addSaving"
           :disabled="!addOptionId"
           @click="addOption"
diff --git a/vueManager/src/components/CustomersGrid.vue b/vueManager/src/components/CustomersGrid.vue
index 2090b41e8..a25afb4bd 100644
--- a/vueManager/src/components/CustomersGrid.vue
+++ b/vueManager/src/components/CustomersGrid.vue
@@ -6,11 +6,13 @@ import { computed, nextTick, onMounted, ref } from 'vue'
 import { useGridFilterParams } from '../composables/useGridFilterParams.js'
 import { useSelection } from '../composables/useSelection.js'
 import request from '../request.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 import ActionsColumn from './ActionsColumn.vue'
 
 const toast = useToast()
 const confirm = useConfirm()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 // Bulk selection
 const {
@@ -933,7 +935,7 @@ onMounted(async () => {
           type="button"
           :label="_('save')"
           icon="pi pi-check"
-          severity="success"
+          :severity="primarySaveSeverity"
           :loading="saving"
           @click="saveCustomer"
         />
@@ -1106,7 +1108,7 @@ onMounted(async () => {
             <Button
               :label="_('save')"
               icon="pi pi-check"
-              severity="success"
+              :severity="primarySaveSeverity"
               :loading="savingAddress"
               @click="saveAddress"
             />
diff --git a/vueManager/src/components/DeliveriesGrid.vue b/vueManager/src/components/DeliveriesGrid.vue
index 1f6a03760..6d020f26c 100644
--- a/vueManager/src/components/DeliveriesGrid.vue
+++ b/vueManager/src/components/DeliveriesGrid.vue
@@ -13,12 +13,14 @@ import request from '../request.js'
 import { resolveAddCostPriceBadgeKind } from '../utils/addCostPriceBadgeKind.js'
 import { formatValue, getDisplayName, normalizeImagePath } from '../utils/displayFormatters.js'
 import { applyDeleteConfirmDefaults, gridDeleteAction } from '../utils/gridDeleteAction.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 import ActionsColumn from './ActionsColumn.vue'
 import FileBrowser from './FileBrowser.vue'
 import ValidationRulesEditor from './ValidationRulesEditor.vue'
 
 const toast = useToast()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 const CONFIRM_GROUP = 'settings-deliveries'
 
@@ -755,7 +757,7 @@ onMounted(async () => {
 
       <template #footer>
         <Button :label="_('cancel')" icon="pi pi-times" severity="secondary" @click="close" />
-        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveDelivery" />
+        <Button :label="_('save')" icon="pi pi-check" :severity="primarySaveSeverity" :loading="saving" @click="saveDelivery" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/ExtraFieldsManager.vue b/vueManager/src/components/ExtraFieldsManager.vue
index b183ba5f7..89448566f 100644
--- a/vueManager/src/components/ExtraFieldsManager.vue
+++ b/vueManager/src/components/ExtraFieldsManager.vue
@@ -10,6 +10,7 @@ import {
   KEY_VALUE_XTYPE,
   parseKeyValueConfig,
 } from '../utils/keyValueField.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 import {
   defaultRepeaterConfig,
   parseRepeaterConfig,
@@ -22,6 +23,7 @@ import RepeaterSchemaEditor from './RepeaterSchemaEditor.vue'
 const toast = useToast()
 const confirm = useConfirm()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 // State
 const loading = ref(false)
@@ -894,7 +896,7 @@ onMounted(() => {
         <Button
           :label="isEditMode ? _('ms3_vue_dialog_save') : _('ms3_vue_dialog_create')"
           icon="pi pi-check"
-          severity="success"
+          :severity="primarySaveSeverity"
           :loading="saving"
           @click="saveField"
         />
diff --git a/vueManager/src/components/GridFieldsConfig.vue b/vueManager/src/components/GridFieldsConfig.vue
index c4adcfcb0..92e419dcc 100644
--- a/vueManager/src/components/GridFieldsConfig.vue
+++ b/vueManager/src/components/GridFieldsConfig.vue
@@ -7,11 +7,13 @@ import draggable from 'vuedraggable'
 import { GridColumnEditorType, normalizeGridColumnEditorType } from '../constants/gridColumnEditorTypes.js'
 import request from '../request.js'
 import { isAllowlistedComboEndpoint } from '../utils/gridEditorOptions.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 import ActionsEditor from './ActionsEditor.vue'
 
 const toast = useToast()
 const confirm = useConfirm()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 const loading = ref(false)
 const saving = ref(false)
@@ -1098,7 +1100,7 @@ onMounted(() => {
 
         <!-- Save button -->
         <div class="flex justify-content-end">
-          <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveConfig" />
+          <Button :label="_('save')" icon="pi pi-check" :severity="primarySaveSeverity" :loading="saving" @click="saveConfig" />
         </div>
       </template>
     </Card>
@@ -1718,7 +1720,7 @@ onMounted(() => {
         <Button
           :label="_('save')"
           icon="pi pi-check"
-          severity="success"
+          :severity="primarySaveSeverity"
           :disabled="!editingField || !editingField.field_name"
           @click="saveEdit"
         />
diff --git a/vueManager/src/components/LinksGrid.vue b/vueManager/src/components/LinksGrid.vue
index 6f6afd438..7cebd913d 100644
--- a/vueManager/src/components/LinksGrid.vue
+++ b/vueManager/src/components/LinksGrid.vue
@@ -8,10 +8,12 @@ import { useResourceList } from '../composables/useResourceList.js'
 import { useSelection } from '../composables/useSelection.js'
 import request from '../request.js'
 import { gridDeleteAction } from '../utils/gridDeleteAction.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 import ActionsColumn from './ActionsColumn.vue'
 
 const toast = useToast()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 const CONFIRM_GROUP = 'settings-links'
 
@@ -344,7 +346,7 @@ onMounted(() => {
 
       <template #footer>
         <Button :label="_('cancel')" icon="pi pi-times" severity="secondary" @click="close" />
-        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveLink" />
+        <Button :label="_('save')" icon="pi pi-check" :severity="primarySaveSeverity" :loading="saving" @click="saveLink" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/ModelFieldsGrid.vue b/vueManager/src/components/ModelFieldsGrid.vue
index b4fdbcffd..adc047a90 100644
--- a/vueManager/src/components/ModelFieldsGrid.vue
+++ b/vueManager/src/components/ModelFieldsGrid.vue
@@ -5,10 +5,12 @@ import { computed, onMounted, ref } from 'vue'
 import draggable from 'vuedraggable'
 
 import request from '../request.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 
 const toast = useToast()
 const confirm = useConfirm()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 const loading = ref(false)
 const fields = ref([])
@@ -969,7 +971,7 @@ onMounted(async () => {
           class="p-button-text"
           @click="editDialogVisible = false"
         />
-        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveField" />
+        <Button :label="_('save')" icon="pi pi-check" :severity="primarySaveSeverity" :loading="saving" @click="saveField" />
       </template>
     </Dialog>
 
@@ -1049,7 +1051,7 @@ onMounted(async () => {
           class="p-button-text"
           @click="sectionDialogVisible = false"
         />
-        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="savingSec" @click="saveSection" />
+        <Button :label="_('save')" icon="pi pi-check" :severity="primarySaveSeverity" :loading="savingSec" @click="saveSection" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/NotificationsGrid.vue b/vueManager/src/components/NotificationsGrid.vue
index d7185e525..8b5a533a8 100644
--- a/vueManager/src/components/NotificationsGrid.vue
+++ b/vueManager/src/components/NotificationsGrid.vue
@@ -6,10 +6,12 @@ import { computed, onMounted, ref } from 'vue'
 import { useCrudDialog } from '../composables/useCrudDialog.js'
 import { useResourceList } from '../composables/useResourceList.js'
 import request from '../request.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 
 const toast = useToast()
 const confirm = useConfirm()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 const references = ref({
   statuses: [],
@@ -505,7 +507,7 @@ onMounted(async () => {
 
       <template #footer>
         <Button :label="_('cancel')" icon="pi pi-times" class="p-button-text" @click="close" />
-        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveNotification" />
+        <Button :label="_('save')" icon="pi pi-check" :severity="primarySaveSeverity" :loading="saving" @click="saveNotification" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/OptionGroupsGrid.vue b/vueManager/src/components/OptionGroupsGrid.vue
index c7ea3f1d4..11589e611 100644
--- a/vueManager/src/components/OptionGroupsGrid.vue
+++ b/vueManager/src/components/OptionGroupsGrid.vue
@@ -10,6 +10,7 @@ import { useSelection } from '../composables/useSelection.js'
 import { useSortableList } from '../composables/useSortableList.js'
 import request from '../request.js'
 import { notifyOptionGroupsChanged } from '../utils/optionGroupsBus.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 
 /**
  * Option groups grid — manage msOptionGroup rows (#10).
@@ -24,6 +25,7 @@ import { notifyOptionGroupsChanged } from '../utils/optionGroupsBus.js'
 const toast = useToast()
 const confirm = useConfirm()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 const CONFIRM_GROUP = 'settings-option-groups'
 
@@ -343,7 +345,7 @@ onMounted(() => {
       </div>
       <template #footer>
         <Button :label="_('cancel')" severity="secondary" @click="close" />
-        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveGroup" />
+        <Button :label="_('save')" icon="pi pi-check" :severity="primarySaveSeverity" :loading="saving" @click="saveGroup" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/OptionsGrid.vue b/vueManager/src/components/OptionsGrid.vue
index 8e5ea183f..3a5c8d411 100644
--- a/vueManager/src/components/OptionsGrid.vue
+++ b/vueManager/src/components/OptionsGrid.vue
@@ -5,12 +5,14 @@ import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 import request from '../request.js'
 import { onOptionGroupsChanged } from '../utils/optionGroupsBus.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 import OptionCategoryTree from './OptionCategoryTree.vue'
 import OptionValuesEditor from './OptionValuesEditor.vue'
 
 const toast = useToast()
 const confirm = useConfirm()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 const CONFIRM_GROUP = 'settings-options'
 
@@ -550,7 +552,7 @@ onBeforeUnmount(() => {
           :disabled="dialogSaving"
           @click="dialogVisible = false"
         />
-        <Button :label="_('save') || 'Сохранить'" severity="success" :loading="dialogSaving" @click="saveOption" />
+        <Button :label="_('save') || 'Сохранить'" :severity="primarySaveSeverity" :loading="dialogSaving" @click="saveOption" />
       </template>
     </Dialog>
 
diff --git a/vueManager/src/components/PaymentsGrid.vue b/vueManager/src/components/PaymentsGrid.vue
index 298c50c98..0ae5b9d7e 100644
--- a/vueManager/src/components/PaymentsGrid.vue
+++ b/vueManager/src/components/PaymentsGrid.vue
@@ -13,11 +13,13 @@ import request from '../request.js'
 import { resolveAddCostPriceBadgeKind } from '../utils/addCostPriceBadgeKind.js'
 import { formatValue, getDisplayName, normalizeImagePath } from '../utils/displayFormatters.js'
 import { applyDeleteConfirmDefaults, gridDeleteAction } from '../utils/gridDeleteAction.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 import ActionsColumn from './ActionsColumn.vue'
 import FileBrowser from './FileBrowser.vue'
 
 const toast = useToast()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 const CONFIRM_GROUP = 'settings-payments'
 
@@ -682,7 +684,7 @@ onMounted(async () => {
 
       <template #footer>
         <Button :label="_('cancel')" icon="pi pi-times" severity="secondary" @click="close" />
-        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="savePayment" />
+        <Button :label="_('save')" icon="pi pi-check" :severity="primarySaveSeverity" :loading="saving" @click="savePayment" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/StatusesGrid.vue b/vueManager/src/components/StatusesGrid.vue
index 6dfe580b7..b32f2c0cb 100644
--- a/vueManager/src/components/StatusesGrid.vue
+++ b/vueManager/src/components/StatusesGrid.vue
@@ -10,10 +10,12 @@ import { useSelection } from '../composables/useSelection.js'
 import { useSortableList } from '../composables/useSortableList.js'
 import request from '../request.js'
 import { gridDeleteAction } from '../utils/gridDeleteAction.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 import ActionsColumn from './ActionsColumn.vue'
 
 const toast = useToast()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 const CONFIRM_GROUP = 'settings-statuses'
 
@@ -444,7 +446,7 @@ onMounted(() => {
 
       <template #footer>
         <Button :label="_('cancel')" icon="pi pi-times" severity="secondary" @click="close" />
-        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveStatus" />
+        <Button :label="_('save')" icon="pi pi-check" :severity="primarySaveSeverity" :loading="saving" @click="saveStatus" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/VendorsGrid.vue b/vueManager/src/components/VendorsGrid.vue
index 5ea8e6c1c..78663646f 100644
--- a/vueManager/src/components/VendorsGrid.vue
+++ b/vueManager/src/components/VendorsGrid.vue
@@ -11,12 +11,14 @@ import { useSortableList } from '../composables/useSortableList.js'
 import request from '../request.js'
 import { formatValue, normalizeImagePath } from '../utils/displayFormatters.js'
 import { applyDeleteConfirmDefaults, gridDeleteAction } from '../utils/gridDeleteAction.js'
+import { getPrimarySaveSeverity } from '../utils/primevueTheme.js'
 import ActionsColumn from './ActionsColumn.vue'
 import DynamicField from './DynamicField.vue'
 import FileBrowser from './FileBrowser.vue'
 
 const toast = useToast()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 const CONFIRM_GROUP = 'settings-vendors'
 
@@ -767,7 +769,7 @@ onMounted(async () => {
           severity="secondary"
           @click="editDialogVisible = false"
         />
-        <Button :label="_('save')" icon="pi pi-check" severity="success" :loading="saving" @click="saveVendor" />
+        <Button :label="_('save')" icon="pi pi-check" :severity="primarySaveSeverity" :loading="saving" @click="saveVendor" />
       </template>
     </Dialog>
   </div>
diff --git a/vueManager/src/components/order/OrderAddProductDialog.vue b/vueManager/src/components/order/OrderAddProductDialog.vue
index bedf349a8..fcac9fec5 100644
--- a/vueManager/src/components/order/OrderAddProductDialog.vue
+++ b/vueManager/src/components/order/OrderAddProductDialog.vue
@@ -2,7 +2,10 @@
 import { useLexicon } from '@vuetools/useLexicon'
 import { AutoComplete, Button, Dialog, InputNumber } from 'primevue'
 
+import { getPrimarySaveSeverity } from '../../utils/primevueTheme.js'
+
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 const visible = defineModel('visible', { type: Boolean, default: false })
 const selectedProduct = defineModel('selectedProduct', { type: Object, default: null })
@@ -130,7 +133,7 @@ defineProps({
     <Button
       :label="_('save')"
       icon="pi pi-check"
-      severity="success"
+      :severity="primarySaveSeverity"
       :loading="savingNewProduct"
       :disabled="!selectedProduct || !selectedProduct.id"
       @click="saveNewProduct"
diff --git a/vueManager/src/components/order/OrderEditProductDialog.vue b/vueManager/src/components/order/OrderEditProductDialog.vue
index f39119877..8132de920 100644
--- a/vueManager/src/components/order/OrderEditProductDialog.vue
+++ b/vueManager/src/components/order/OrderEditProductDialog.vue
@@ -2,7 +2,10 @@
 import { useLexicon } from '@vuetools/useLexicon'
 import { Button, Dialog, InputNumber, InputText, Select, Textarea } from 'primevue'
 
+import { getPrimarySaveSeverity } from '../../utils/primevueTheme.js'
+
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 
 const visible = defineModel('visible', { type: Boolean, default: false })
 const editProductForm = defineModel('editProductForm', { type: Object, required: true })
@@ -232,6 +235,7 @@ defineProps({
     <Button
       :label="_('save')"
       icon="pi pi-check"
+      :severity="primarySaveSeverity"
       :loading="savingProduct"
       @click="saveEditedProduct"
     />
diff --git a/vueManager/src/components/order/OrderFormActionsBar.vue b/vueManager/src/components/order/OrderFormActionsBar.vue
index 17ca01816..4b8dfacb4 100644
--- a/vueManager/src/components/order/OrderFormActionsBar.vue
+++ b/vueManager/src/components/order/OrderFormActionsBar.vue
@@ -2,6 +2,8 @@
 import { useLexicon } from '@vuetools/useLexicon'
 import { Button } from 'primevue'
 
+import { getPrimarySaveSeverity } from '../../utils/primevueTheme.js'
+
 defineProps({
   isCreateMode: { type: Boolean, required: true },
   saving: { type: Boolean, default: false },
@@ -11,6 +13,7 @@ defineProps({
 
 const emit = defineEmits(['create', 'save', 'cancel'])
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 </script>
 
 <template>
@@ -19,7 +22,7 @@ const { _ } = useLexicon()
       v-if="isCreateMode"
       :label="_('ms3_order_create')"
       icon="pi pi-plus"
-      severity="success"
+      :severity="primarySaveSeverity"
       :loading="saving"
       @click="emit('create')"
     />
@@ -27,7 +30,7 @@ const { _ } = useLexicon()
       v-else
       :label="_('save')"
       icon="pi pi-check"
-      severity="success"
+      :severity="primarySaveSeverity"
       :loading="saving"
       :disabled="recalculatingCost"
       @click="emit('save')"
diff --git a/vueManager/src/components/order/OrderShipmentTab.vue b/vueManager/src/components/order/OrderShipmentTab.vue
index 560f6a94f..5d4025137 100644
--- a/vueManager/src/components/order/OrderShipmentTab.vue
+++ b/vueManager/src/components/order/OrderShipmentTab.vue
@@ -6,6 +6,7 @@ import { computed, inject, ref, watch } from 'vue'
 import { ORDER_CONTEXT_KEY } from '../../composables/orderContext.js'
 import { useOrderFormatters } from '../../composables/useOrderFormatters.js'
 import request from '../../request.js'
+import { getPrimarySaveSeverity } from '../../utils/primevueTheme.js'
 
 const STATUS_FALLBACK = [
   'preparing',
@@ -28,6 +29,7 @@ if (!orderCtx) {
 const { order, isCreateMode } = orderCtx
 const { formatDate } = useOrderFormatters()
 const { _ } = useLexicon()
+const primarySaveSeverity = getPrimarySaveSeverity()
 const toast = useToast()
 
 function formatUnix(value) {
@@ -181,7 +183,7 @@ watch(orderId, loadShipment, { immediate: true })
           <Button
             :label="_('save')"
             icon="pi pi-check"
-            severity="success"
+            :severity="primarySaveSeverity"
             :loading="saving"
             @click="saveShipment(false)"
           />
diff --git a/vueManager/src/test/stubs/usePrimeVueLocale.js b/vueManager/src/test/stubs/usePrimeVueLocale.js
new file mode 100644
index 000000000..ae9846889
--- /dev/null
+++ b/vueManager/src/test/stubs/usePrimeVueLocale.js
@@ -0,0 +1,3 @@
+export function getPrimeVueLocale() {
+  return {}
+}
diff --git a/vueManager/src/test/stubs/useTheme.js b/vueManager/src/test/stubs/useTheme.js
new file mode 100644
index 000000000..969f2a2b3
--- /dev/null
+++ b/vueManager/src/test/stubs/useTheme.js
@@ -0,0 +1,13 @@
+let themeName = 'aura'
+
+export function __setThemeNameForTests(name) {
+  themeName = name
+}
+
+export function getThemeName() {
+  return themeName
+}
+
+export function getActiveTheme() {
+  return { theme: { preset: {}, options: {} } }
+}
diff --git a/vueManager/src/utils/primevueTheme.js b/vueManager/src/utils/primevueTheme.js
index 348a0fe38..2742d2689 100644
--- a/vueManager/src/utils/primevueTheme.js
+++ b/vueManager/src/utils/primevueTheme.js
@@ -42,7 +42,22 @@ export function getManagerPrimeVueConfig(options = {}) {
   return config
 }
 
+export function isModxManagerTheme() {
+  return getThemeName() === 'modx'
+}
+
 /** Aura-era form density inject should not run under Modx preset. */
 export function shouldInjectFormStylesOverride() {
-  return getThemeName() !== 'modx'
+  return !isModxManagerTheme()
+}
+
+/**
+ * Severity for primary Save (and order Create) actions.
+ * Modx uses success green; Aura keeps default primary so Part B does not
+ * restyle the default theme (#701 / #738 review).
+ *
+ * @returns {'success'|undefined}
+ */
+export function getPrimarySaveSeverity() {
+  return isModxManagerTheme() ? 'success' : undefined
 }
diff --git a/vueManager/src/utils/primevueTheme.test.js b/vueManager/src/utils/primevueTheme.test.js
new file mode 100644
index 000000000..e577312e4
--- /dev/null
+++ b/vueManager/src/utils/primevueTheme.test.js
@@ -0,0 +1,27 @@
+import { __setThemeNameForTests } from '@vuetools/useTheme'
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import {
+  getPrimarySaveSeverity,
+  isModxManagerTheme,
+  shouldInjectFormStylesOverride,
+} from './primevueTheme.js'
+
+describe('primevueTheme helpers (#701 Part B / #738)', () => {
+  beforeEach(() => {
+    __setThemeNameForTests('aura')
+  })
+
+  it('uses success severity only under Modx theme', () => {
+    __setThemeNameForTests('modx')
+    expect(isModxManagerTheme()).toBe(true)
+    expect(getPrimarySaveSeverity()).toBe('success')
+    expect(shouldInjectFormStylesOverride()).toBe(false)
+  })
+
+  it('leaves Aura Save on default primary (no success restyle)', () => {
+    expect(isModxManagerTheme()).toBe(false)
+    expect(getPrimarySaveSeverity()).toBeUndefined()
+    expect(shouldInjectFormStylesOverride()).toBe(true)
+  })
+})
diff --git a/vueManager/vitest.config.js b/vueManager/vitest.config.js
index 9aa5b23f9..4b5111aa5 100644
--- a/vueManager/vitest.config.js
+++ b/vueManager/vitest.config.js
@@ -11,6 +11,10 @@ export default defineConfig({
       '@vuetools/useLexicon': fileURLToPath(
         new URL('./src/test/stubs/useLexicon.js', import.meta.url)
       ),
+      '@vuetools/useTheme': fileURLToPath(new URL('./src/test/stubs/useTheme.js', import.meta.url)),
+      '@vuetools/usePrimeVueLocale': fileURLToPath(
+        new URL('./src/test/stubs/usePrimeVueLocale.js', import.meta.url)
+      ),
     },
   },
   test: {