diff --git a/_build/resolvers/resolver_01_setup.php b/_build/resolvers/resolver_01_setup.php
index c69cbde92..dce59fc53 100644
--- a/_build/resolvers/resolver_01_setup.php
+++ b/_build/resolvers/resolver_01_setup.php
@@ -19,7 +19,7 @@
         'service_url' => 'modstore.pro',
     ],
     'VueTools' => [
-        'version' => '1.0.0-beta1',
+        'version' => '1.2.0-pl',
         'service_url' => 'modstore.pro',
     ],
 ];
diff --git a/core/components/minishop3/controllers/manager.class.php b/core/components/minishop3/controllers/manager.class.php
index 33e36f1ac..b1bf86746 100644
--- a/core/components/minishop3/controllers/manager.class.php
+++ b/core/components/minishop3/controllers/manager.class.php
@@ -28,7 +28,8 @@ public function initialize()
      */
     public function addCss($script)
     {
-        $script = $script . '?v=' . $this->ms3->version;
+        require_once __DIR__ . '/vue_module_cache_bust.inc.php';
+        $script = ms3_vue_module_cache_bust_url($this->modx, $script, (string) $this->ms3->version);
         parent::addCss($script);
     }
 
@@ -89,8 +90,8 @@ public function addVueModule($src)
             self::$vueCoreCheckRegistered = true;
         }
 
-        // Add version to URL
-        $src = $src . '?v=' . $this->ms3->version;
+        require_once __DIR__ . '/vue_module_cache_bust.inc.php';
+        $src = ms3_vue_module_cache_bust_url($this->modx, $src, (string) $this->ms3->version);
 
         // Register the module (will be blocked by check if VueCore not installed)
         $this->modx->regClientStartupHTMLBlock(
diff --git a/core/components/minishop3/controllers/resource_create.class.php b/core/components/minishop3/controllers/resource_create.class.php
index 85f846302..58e2f90fa 100644
--- a/core/components/minishop3/controllers/resource_create.class.php
+++ b/core/components/minishop3/controllers/resource_create.class.php
@@ -29,7 +29,8 @@ public function initialize()
      */
     public function addCss($script)
     {
-        $script = $script . '?v=' . $this->ms3->version;
+        require_once __DIR__ . '/vue_module_cache_bust.inc.php';
+        $script = ms3_vue_module_cache_bust_url($this->modx, $script, (string) $this->ms3->version);
         parent::addCss($script);
     }
 
@@ -65,8 +66,8 @@ public function addVueModule($src)
             self::$vueCoreCheckRegistered = true;
         }
 
-        // Add version to URL
-        $src = $src . '?v=' . $this->ms3->version;
+        require_once __DIR__ . '/vue_module_cache_bust.inc.php';
+        $src = ms3_vue_module_cache_bust_url($this->modx, $src, (string) $this->ms3->version);
 
         // Register the module (will be blocked by check if VueCore not installed)
         $this->modx->regClientStartupHTMLBlock(
diff --git a/core/components/minishop3/controllers/resource_update.class.php b/core/components/minishop3/controllers/resource_update.class.php
index 2e81d6782..d7db2e535 100644
--- a/core/components/minishop3/controllers/resource_update.class.php
+++ b/core/components/minishop3/controllers/resource_update.class.php
@@ -33,7 +33,8 @@ public function initialize()
      */
     public function addCss($script)
     {
-        $script = $script . '?v=' . $this->ms3->version;
+        require_once __DIR__ . '/vue_module_cache_bust.inc.php';
+        $script = ms3_vue_module_cache_bust_url($this->modx, $script, (string) $this->ms3->version);
         parent::addCss($script);
     }
 
@@ -69,8 +70,8 @@ public function addVueModule($src)
             self::$vueCoreCheckRegistered = true;
         }
 
-        // Add version to URL
-        $src = $src . '?v=' . $this->ms3->version;
+        require_once __DIR__ . '/vue_module_cache_bust.inc.php';
+        $src = ms3_vue_module_cache_bust_url($this->modx, $src, (string) $this->ms3->version);
 
         // Register the module (will be blocked by check if VueCore not installed)
         $this->modx->regClientStartupHTMLBlock(
diff --git a/core/components/minishop3/controllers/vue_module_cache_bust.inc.php b/core/components/minishop3/controllers/vue_module_cache_bust.inc.php
new file mode 100644
index 000000000..afcea4e3b
--- /dev/null
+++ b/core/components/minishop3/controllers/vue_module_cache_bust.inc.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Append cache-bust query to a Vue manager asset URL (JS or CSS under vue-dist).
+ *
+ * Package version alone does not change when an Extra rebuilds vue-dist, so
+ * HTTP caches keep stale modules/styles. When the URL maps under assets_path,
+ * filemtime is mixed into `v=`.
+ */
+function ms3_vue_module_cache_bust_url($modx, string $src, string $packageVersion): string
+{
+    $version = $packageVersion;
+    $path = parse_url($src, PHP_URL_PATH);
+    if (is_string($path) && $path !== '') {
+        $assetsUrl = rtrim((string) $modx->getOption('assets_url'), '/');
+        $assetsPath = rtrim((string) $modx->getOption('assets_path'), '/');
+        $fsPath = null;
+        if ($assetsUrl !== '' && str_starts_with($path, $assetsUrl)) {
+            $fsPath = $assetsPath . substr($path, strlen($assetsUrl));
+        } elseif (defined('MODX_ASSETS_PATH') && str_starts_with($path, '/assets/')) {
+            $fsPath = rtrim(MODX_ASSETS_PATH, '/') . substr($path, strlen('/assets'));
+        }
+        if (is_string($fsPath) && is_file($fsPath)) {
+            $version .= '.' . filemtime($fsPath);
+        }
+    }
+
+    $separator = str_contains($src, '?') ? '&' : '?';
+
+    return $src . $separator . 'v=' . rawurlencode($version);
+}
diff --git a/core/components/minishop3/lexicon/en/help.inc.php b/core/components/minishop3/lexicon/en/help.inc.php
index a3c07dbaa..06f45081e 100644
--- a/core/components/minishop3/lexicon/en/help.inc.php
+++ b/core/components/minishop3/lexicon/en/help.inc.php
@@ -11,7 +11,7 @@
 $_lang['ms3_components_href'] = 'https://modstore.pro/';
 $_lang['ms3_components_text'] = 'Paid and free addons';
 $_lang['ms3_components_title'] = 'Addons';
-$_lang['ms3_demo_href'] = '#';
+$_lang['ms3_demo_href'] = 'https://minishop3.ru/';
 $_lang['ms3_demo_text'] = 'Go to demo site';
 $_lang['ms3_demo_title'] = 'Demo';
 $_lang['ms3_docs_href'] = 'https://docs.modx.pro/components/minishop3/';
@@ -25,8 +25,8 @@
 $_lang['ms3_github_title'] = 'github.com';
 $_lang['ms3_help'] = 'Help and support';
 $_lang['ms3_help_text'] = 'MiniShop3 - the most flexible and fast e-commerce component for MODX3.';
-$_lang['ms3_help_text_support'] = '<strong>You can support MiniShop3 financially:</strong>
-<br>- All details <a href="https://modx.pro/about" target="_blank">here</a>';
+$_lang['ms3_help_text_support'] = '<strong>Support MiniShop3 development</strong>
+<br>Payment details are on the <a href="https://modx.pro/about" target="_blank" rel="noopener noreferrer">about page</a>.';
 $_lang['ms3_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop3';
 $_lang['ms3_lexicons_text'] = 'Lexicon management';
 $_lang['ms3_localization_href'] = 'https://crowdin.com/project/minishop3-ecommerce';
@@ -41,6 +41,6 @@
 $_lang['ms3_settings_href'] = '?a=mgr/settings&namespace=minishop3';
 $_lang['ms3_settings_text'] = 'Settings';
 $_lang['ms3_sys_settings_href'] = '?a=system/settings&ns=minishop3';
-$_lang['ms3_sys_settings_text'] = 'System settings & Events';
+$_lang['ms3_sys_settings_text'] = 'System settings';
 $_lang['ms3_utilities_href'] = '?a=mgr/utilities&namespace=minishop3';
 $_lang['ms3_utilities_text'] = 'Utilities';
diff --git a/core/components/minishop3/lexicon/en/product.inc.php b/core/components/minishop3/lexicon/en/product.inc.php
index 8adb34a43..bffdff702 100644
--- a/core/components/minishop3/lexicon/en/product.inc.php
+++ b/core/components/minishop3/lexicon/en/product.inc.php
@@ -184,6 +184,7 @@
 $_lang['ms3_gallery_uppy_note_max_size'] = 'Maximum size: %{maxSize}';
 $_lang['ms3_gallery_uppy_back'] = 'Back';
 $_lang['ms3_gallery_uppy_add_more_files'] = 'Add more files';
+$_lang['ms3_gallery_uppy_adding_more_files'] = 'Adding more files';
 $_lang['ms3_gallery_uppy_drop_hint'] = 'Drop your files here';
 $_lang['ms3_gallery_uppy_error'] = 'Error';
 $_lang['ms3_gallery_uppy_failed_to_upload'] = 'Failed to upload %{file}';
@@ -191,6 +192,18 @@
 $_lang['ms3_gallery_uppy_no_files_found'] = 'You have no files or folders here';
 $_lang['ms3_gallery_uppy_pause_upload'] = 'Pause upload';
 $_lang['ms3_gallery_uppy_resume_upload'] = 'Resume upload';
+$_lang['ms3_gallery_uppy_editing'] = 'Editing image';
+$_lang['ms3_gallery_uppy_save'] = 'Save';
+$_lang['ms3_gallery_uppy_finish_editing'] = 'Finish editing';
+$_lang['ms3_gallery_uppy_save_changes'] = 'Save changes';
+$_lang['ms3_gallery_uppy_revert'] = 'Reset';
+$_lang['ms3_gallery_uppy_rotate'] = 'Rotate 90°';
+$_lang['ms3_gallery_uppy_zoom_in'] = 'Zoom in';
+$_lang['ms3_gallery_uppy_zoom_out'] = 'Zoom out';
+$_lang['ms3_gallery_uppy_flip_horizontal'] = 'Flip horizontally';
+$_lang['ms3_gallery_uppy_crop_square'] = 'Crop square';
+$_lang['ms3_gallery_uppy_crop_landscape'] = 'Crop landscape (16:9)';
+$_lang['ms3_gallery_uppy_crop_portrait'] = 'Crop portrait (9:16)';
 
 $_lang['ms3_gallery_search_placeholder'] = 'Search files...';
 $_lang['ms3_gallery_empty_text'] = 'No images yet. Upload files using the area above.';
diff --git a/core/components/minishop3/lexicon/en/vue.inc.php b/core/components/minishop3/lexicon/en/vue.inc.php
index 71cb21b1e..1f41e0bc0 100644
--- a/core/components/minishop3/lexicon/en/vue.inc.php
+++ b/core/components/minishop3/lexicon/en/vue.inc.php
@@ -658,6 +658,19 @@
 $_lang['log_action'] = 'Action';
 $_lang['log_user'] = 'User';
 $_lang['log_entry'] = 'Entry';
+$_lang['log_empty'] = 'No order history yet';
+$_lang['log_action_status'] = 'Status';
+$_lang['log_action_field'] = 'Field';
+$_lang['log_action_address'] = 'Address';
+$_lang['log_action_products'] = 'Products';
+$_lang['log_action_payment'] = 'Payment';
+$_lang['log_entry_status_id'] = 'Status ID: {id}';
+$_lang['log_entry_fields'] = 'Fields: {fields}';
+$_lang['log_entry_address'] = 'Address: {fields}';
+$_lang['log_entry_product_op_add'] = 'Added';
+$_lang['log_entry_product_op_remove'] = 'Removed';
+$_lang['log_entry_product_op_update'] = 'Updated';
+$_lang['log_entry_product_op_unknown'] = 'Change';
 $_lang['address_first_name'] = 'First Name';
 $_lang['address_last_name'] = 'Last Name';
 $_lang['address_phone'] = 'Phone';
@@ -1146,6 +1159,10 @@
 $_lang['ms3_vendor_email'] = 'Email';
 $_lang['ms3_vendor_description'] = 'Description';
 $_lang['ms3_vendor_properties'] = 'Properties';
+$_lang['ms3_vendor_select'] = 'Select vendor';
+$_lang['ms3_vendor_search'] = 'Search vendor…';
+$_lang['ms3_vendor_empty'] = 'No vendors found. Add a vendor in component settings.';
+$_lang['ms3_vendor_not_found'] = 'Vendor not found';
 
 // Vendor sections
 $_lang['ms3_section_vendor_info'] = 'Information';
diff --git a/core/components/minishop3/lexicon/ru/help.inc.php b/core/components/minishop3/lexicon/ru/help.inc.php
index 55143ba58..a1a62f97b 100644
--- a/core/components/minishop3/lexicon/ru/help.inc.php
+++ b/core/components/minishop3/lexicon/ru/help.inc.php
@@ -11,7 +11,7 @@
 $_lang['ms3_components_href'] = 'https://modstore.pro/';
 $_lang['ms3_components_text'] = 'Платные и бесплатные дополнения';
 $_lang['ms3_components_title'] = 'Дополнения';
-$_lang['ms3_demo_href'] = '#';
+$_lang['ms3_demo_href'] = 'https://minishop3.ru/';
 $_lang['ms3_demo_text'] = 'Перейти на демо-сайт';
 $_lang['ms3_demo_title'] = 'Демо';
 $_lang['ms3_docs_href'] = 'https://docs.modx.pro/components/minishop3/';
@@ -25,8 +25,8 @@
 $_lang['ms3_github_title'] = 'github.com';
 $_lang['ms3_help'] = 'Помощь и поддержка';
 $_lang['ms3_help_text'] = 'MiniShop3 - самый гибкий и быстрый компонент интернет-магазина для MODX3.';
-$_lang['ms3_help_text_support'] = '<strong>Вы можете поддержать MiniShop3 финансово:</strong>
-<br>- Все реквизиты <a href="https://modx.pro/about" target="_blank">здесь</a>';
+$_lang['ms3_help_text_support'] = '<strong>Поддержите разработку MiniShop3</strong>
+<br>Реквизиты для перевода — на <a href="https://modx.pro/about" target="_blank" rel="noopener noreferrer">странице о проекте</a>.';
 $_lang['ms3_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop3';
 $_lang['ms3_lexicons_text'] = 'Управление словарями';
 $_lang['ms3_localization_href'] = 'https://crowdin.com/project/minishop3-ecommerce';
@@ -41,6 +41,6 @@
 $_lang['ms3_settings_href'] = '?a=mgr/settings&namespace=minishop3';
 $_lang['ms3_settings_text'] = 'Настройки';
 $_lang['ms3_sys_settings_href'] = '?a=system/settings&ns=minishop3';
-$_lang['ms3_sys_settings_text'] = 'Системные настройки & События';
+$_lang['ms3_sys_settings_text'] = 'Системные настройки';
 $_lang['ms3_utilities_href'] = '?a=mgr/utilities&namespace=minishop3';
 $_lang['ms3_utilities_text'] = 'Утилиты';
diff --git a/core/components/minishop3/lexicon/ru/product.inc.php b/core/components/minishop3/lexicon/ru/product.inc.php
index 00303ec0b..802a6dc72 100644
--- a/core/components/minishop3/lexicon/ru/product.inc.php
+++ b/core/components/minishop3/lexicon/ru/product.inc.php
@@ -184,6 +184,7 @@
 $_lang['ms3_gallery_uppy_note_max_size'] = 'Макс. размер: %{maxSize}';
 $_lang['ms3_gallery_uppy_back'] = 'Назад';
 $_lang['ms3_gallery_uppy_add_more_files'] = 'Добавить ещё файлы';
+$_lang['ms3_gallery_uppy_adding_more_files'] = 'Добавление файлов';
 $_lang['ms3_gallery_uppy_drop_hint'] = 'Перетащите файлы сюда';
 $_lang['ms3_gallery_uppy_error'] = 'Ошибка';
 $_lang['ms3_gallery_uppy_failed_to_upload'] = 'Не удалось загрузить %{file}';
@@ -191,6 +192,18 @@
 $_lang['ms3_gallery_uppy_no_files_found'] = 'У вас нет файлов или папок';
 $_lang['ms3_gallery_uppy_pause_upload'] = 'Приостановить загрузку';
 $_lang['ms3_gallery_uppy_resume_upload'] = 'Возобновить загрузку';
+$_lang['ms3_gallery_uppy_editing'] = 'Редактирование изображения';
+$_lang['ms3_gallery_uppy_save'] = 'Сохранить';
+$_lang['ms3_gallery_uppy_finish_editing'] = 'Завершить редактирование';
+$_lang['ms3_gallery_uppy_save_changes'] = 'Сохранить изменения';
+$_lang['ms3_gallery_uppy_revert'] = 'Сбросить';
+$_lang['ms3_gallery_uppy_rotate'] = 'Повернуть на 90°';
+$_lang['ms3_gallery_uppy_zoom_in'] = 'Увеличить';
+$_lang['ms3_gallery_uppy_zoom_out'] = 'Уменьшить';
+$_lang['ms3_gallery_uppy_flip_horizontal'] = 'Отразить по горизонтали';
+$_lang['ms3_gallery_uppy_crop_square'] = 'Квадратная обрезка';
+$_lang['ms3_gallery_uppy_crop_landscape'] = 'Альбомная обрезка (16:9)';
+$_lang['ms3_gallery_uppy_crop_portrait'] = 'Портретная обрезка (9:16)';
 
 $_lang['ms3_gallery_search_placeholder'] = 'Поиск файлов...';
 $_lang['ms3_gallery_empty_text'] = 'Файлов нет. Загрузите через область выше.';
diff --git a/core/components/minishop3/lexicon/ru/vue.inc.php b/core/components/minishop3/lexicon/ru/vue.inc.php
index 5c3b32b95..1b284f0a4 100644
--- a/core/components/minishop3/lexicon/ru/vue.inc.php
+++ b/core/components/minishop3/lexicon/ru/vue.inc.php
@@ -657,6 +657,19 @@
 $_lang['log_action'] = 'Действие';
 $_lang['log_user'] = 'Пользователь';
 $_lang['log_entry'] = 'Запись';
+$_lang['log_empty'] = 'История заказа пуста';
+$_lang['log_action_status'] = 'Статус';
+$_lang['log_action_field'] = 'Поле';
+$_lang['log_action_address'] = 'Адрес';
+$_lang['log_action_products'] = 'Товары';
+$_lang['log_action_payment'] = 'Оплата';
+$_lang['log_entry_status_id'] = 'Статус ID: {id}';
+$_lang['log_entry_fields'] = 'Поля: {fields}';
+$_lang['log_entry_address'] = 'Адрес: {fields}';
+$_lang['log_entry_product_op_add'] = 'Добавлен';
+$_lang['log_entry_product_op_remove'] = 'Удалён';
+$_lang['log_entry_product_op_update'] = 'Изменён';
+$_lang['log_entry_product_op_unknown'] = 'Изменение';
 $_lang['address_first_name'] = 'Имя';
 $_lang['address_last_name'] = 'Фамилия';
 $_lang['address_phone'] = 'Телефон';
@@ -1148,6 +1161,10 @@
 $_lang['ms3_vendor_email'] = 'Email';
 $_lang['ms3_vendor_description'] = 'Описание';
 $_lang['ms3_vendor_properties'] = 'Свойства';
+$_lang['ms3_vendor_select'] = 'Выберите производителя';
+$_lang['ms3_vendor_search'] = 'Поиск производителя…';
+$_lang['ms3_vendor_empty'] = 'Производители не найдены. Добавьте производителя в настройках компонента.';
+$_lang['ms3_vendor_not_found'] = 'Производитель не найден';
 
 // Vendor sections
 $_lang['ms3_section_vendor_info'] = 'Информация';
diff --git a/core/components/minishop3/src/Controllers/Api/Manager/CategoryProductsController.php b/core/components/minishop3/src/Controllers/Api/Manager/CategoryProductsController.php
index 7a8858bc3..27b55ef5c 100644
--- a/core/components/minishop3/src/Controllers/Api/Manager/CategoryProductsController.php
+++ b/core/components/minishop3/src/Controllers/Api/Manager/CategoryProductsController.php
@@ -760,6 +760,8 @@ private function applyHideMenu(msProduct $product, bool $hidemenu): bool
      */
     protected function getDefaultFilters(): array
     {
+        $this->modx->lexicon->load('minishop3:vue');
+
         return [
             'query' => [
                 'type' => 'text',
@@ -773,8 +775,8 @@ protected function getDefaultFilters(): array
                 'label' => 'published',
                 'placeholder' => 'all',
                 'options' => [
-                    ['label' => 'Да', 'value' => 1],
-                    ['label' => 'Нет', 'value' => 0],
+                    ['label' => $this->modx->lexicon('ms3_yes'), 'value' => 1],
+                    ['label' => $this->modx->lexicon('ms3_no'), 'value' => 0],
                 ],
                 'width' => '120px',
                 'position' => 20,
diff --git a/vueManager/src/components/ActionsColumn.vue b/vueManager/src/components/ActionsColumn.vue
index 213f0974c..f7bc35c39 100644
--- a/vueManager/src/components/ActionsColumn.vue
+++ b/vueManager/src/components/ActionsColumn.vue
@@ -36,7 +36,7 @@
  * }
  */
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
+import { Button } from 'primevue'
 import { computed } from 'vue'
 
 import { useActions } from '../composables/useActions.js'
diff --git a/vueManager/src/components/ActionsEditor.vue b/vueManager/src/components/ActionsEditor.vue
index 775f669d3..04ad1726f 100644
--- a/vueManager/src/components/ActionsEditor.vue
+++ b/vueManager/src/components/ActionsEditor.vue
@@ -5,13 +5,7 @@
  * Allows adding, removing and editing actions in grid column
  */
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Checkbox from 'primevue/checkbox'
-import Column from 'primevue/column'
-import DataTable from 'primevue/datatable'
-import Dialog from 'primevue/dialog'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
+import { Button, Checkbox, Column, DataTable, Dialog, InputText, Select } from 'primevue'
 import { computed, ref, watch } from 'vue'
 
 import actionRegistry from '../actionRegistry.js'
diff --git a/vueManager/src/components/ApiTest.vue b/vueManager/src/components/ApiTest.vue
index 0ab791bd7..a7f8dc88d 100644
--- a/vueManager/src/components/ApiTest.vue
+++ b/vueManager/src/components/ApiTest.vue
@@ -2,21 +2,7 @@
 import { useApi } from '@vuetools/useApi'
 import { useModx } from '@vuetools/useModx'
 import { usePermission } from '@vuetools/usePermission'
-import Badge from 'primevue/badge'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Chip from 'primevue/chip'
-import Column from 'primevue/column'
-import DataTable from 'primevue/datatable'
-import Divider from 'primevue/divider'
-import Message from 'primevue/message'
-import Panel from 'primevue/panel'
-import ProgressSpinner from 'primevue/progressspinner'
-import Tab from 'primevue/tab'
-import TabList from 'primevue/tablist'
-import TabPanel from 'primevue/tabpanel'
-import TabPanels from 'primevue/tabpanels'
-import Tabs from 'primevue/tabs'
+import { Badge, Button, Card, Chip, Column, DataTable, Divider, Message, Panel, ProgressSpinner, Tab, TabList, TabPanel, TabPanels, Tabs } from 'primevue'
 import { computed, ref } from 'vue'
 
 const { get, loading, error, clearError } = useApi()
diff --git a/vueManager/src/components/AutocompleteCombo.vue b/vueManager/src/components/AutocompleteCombo.vue
index 60c90e914..223137292 100644
--- a/vueManager/src/components/AutocompleteCombo.vue
+++ b/vueManager/src/components/AutocompleteCombo.vue
@@ -17,7 +17,8 @@
 </template>
 
 <script setup>
-import AutoComplete from 'primevue/autocomplete'
+
+import { AutoComplete } from 'primevue'
 import { onMounted, ref, watch } from 'vue'
 
 import request from '../request.js'
diff --git a/vueManager/src/components/CategoryOptionsTab.vue b/vueManager/src/components/CategoryOptionsTab.vue
index 7395fa3f4..15cc7d8f4 100644
--- a/vueManager/src/components/CategoryOptionsTab.vue
+++ b/vueManager/src/components/CategoryOptionsTab.vue
@@ -1,17 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Checkbox from 'primevue/checkbox'
-import Column from 'primevue/column'
-import ConfirmDialog from 'primevue/confirmdialog'
-import DataTable from 'primevue/datatable'
-import Dialog from 'primevue/dialog'
-import IconField from 'primevue/iconfield'
-import InputIcon from 'primevue/inputicon'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
-import Toast from 'primevue/toast'
-import { useConfirm } from 'primevue/useconfirm'
+import { Button, Checkbox, Column, ConfirmDialog, DataTable, Dialog, IconField, InputIcon, InputText, Select, Toast, useConfirm } from 'primevue'
 import { onMounted, ref, watch } from 'vue'
 
 import { useGroupedToast, useUiGroup } from '../composables/uiGroup.js'
diff --git a/vueManager/src/components/CategoryProductsGrid.vue b/vueManager/src/components/CategoryProductsGrid.vue
index 92f11a4c6..f8d9d79fe 100644
--- a/vueManager/src/components/CategoryProductsGrid.vue
+++ b/vueManager/src/components/CategoryProductsGrid.vue
@@ -1,14 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Checkbox from 'primevue/checkbox'
-import ConfirmDialog from 'primevue/confirmdialog'
-import InputNumber from 'primevue/inputnumber'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
-import Tag from 'primevue/tag'
-import Toast from 'primevue/toast'
+import { Button, Card, Checkbox, ConfirmDialog, InputNumber, InputText, Select, Tag, Toast } from 'primevue'
 import { computed, defineProps, onMounted, ref, watch } from 'vue'
 import draggable from 'vuedraggable'
 
diff --git a/vueManager/src/components/CustomersGrid.vue b/vueManager/src/components/CustomersGrid.vue
index 85af08962..f8ed6d45b 100644
--- a/vueManager/src/components/CustomersGrid.vue
+++ b/vueManager/src/components/CustomersGrid.vue
@@ -1,19 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Checkbox from 'primevue/checkbox'
-import Column from 'primevue/column'
-import ConfirmDialog from 'primevue/confirmdialog'
-import DataTable from 'primevue/datatable'
-import Dialog from 'primevue/dialog'
-import InputGroup from 'primevue/inputgroup'
-import InputGroupAddon from 'primevue/inputgroupaddon'
-import InputText from 'primevue/inputtext'
-import Textarea from 'primevue/textarea'
-import Toast from 'primevue/toast'
-import { useConfirm } from 'primevue/useconfirm'
-import { useToast } from 'primevue/usetoast'
+import { Button, Card, Checkbox, Column, ConfirmDialog, DataTable, Dialog, InputGroup, InputGroupAddon, InputText, Textarea, Toast, useConfirm, useToast } from 'primevue'
 import { computed, nextTick, onMounted, ref } from 'vue'
 
 import { useGridFilterParams } from '../composables/useGridFilterParams.js'
diff --git a/vueManager/src/components/DeliveriesGrid.vue b/vueManager/src/components/DeliveriesGrid.vue
index 041d5b2ec..a40ddc129 100644
--- a/vueManager/src/components/DeliveriesGrid.vue
+++ b/vueManager/src/components/DeliveriesGrid.vue
@@ -1,24 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Badge from 'primevue/badge'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Checkbox from 'primevue/checkbox'
-import Column from 'primevue/column'
-import ConfirmDialog from 'primevue/confirmdialog'
-import DataTable from 'primevue/datatable'
-import Dialog from 'primevue/dialog'
-import InputNumber from 'primevue/inputnumber'
-import InputText from 'primevue/inputtext'
-import Tab from 'primevue/tab'
-import TabList from 'primevue/tablist'
-import TabPanel from 'primevue/tabpanel'
-import TabPanels from 'primevue/tabpanels'
-import Tabs from 'primevue/tabs'
-import Textarea from 'primevue/textarea'
-import Toast from 'primevue/toast'
-import ToggleSwitch from 'primevue/toggleswitch'
-import { useToast } from 'primevue/usetoast'
+import { Badge, Button, Card, Checkbox, Column, ConfirmDialog, DataTable, Dialog, InputNumber, InputText, Tab, TabList, TabPanel, TabPanels, Tabs, Textarea, Toast, ToggleSwitch, useToast } from 'primevue'
 import { computed, onMounted, ref } from 'vue'
 import draggable from 'vuedraggable'
 
diff --git a/vueManager/src/components/DynamicField.vue b/vueManager/src/components/DynamicField.vue
index 2d063586a..f277138fc 100644
--- a/vueManager/src/components/DynamicField.vue
+++ b/vueManager/src/components/DynamicField.vue
@@ -250,15 +250,8 @@
 </template>
 
 <script setup>
-import Checkbox from 'primevue/checkbox'
-import ColorPicker from 'primevue/colorpicker'
-import DatePicker from 'primevue/datepicker'
-import InputNumber from 'primevue/inputnumber'
-import InputText from 'primevue/inputtext'
-import Message from 'primevue/message'
-import Select from 'primevue/select'
-import Textarea from 'primevue/textarea'
-import ToggleSwitch from 'primevue/toggleswitch'
+
+import { Checkbox, ColorPicker, DatePicker, InputNumber, InputText, Message, Select, Textarea, ToggleSwitch } from 'primevue'
 import { computed, ref, watch } from 'vue'
 
 import { formatLocalDateYmd } from '../utils/formatLocalDateYmd.js'
diff --git a/vueManager/src/components/ExtraFieldsManager.vue b/vueManager/src/components/ExtraFieldsManager.vue
index 51dc0a5ce..b0064b2f0 100644
--- a/vueManager/src/components/ExtraFieldsManager.vue
+++ b/vueManager/src/components/ExtraFieldsManager.vue
@@ -1,20 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Checkbox from 'primevue/checkbox'
-import Column from 'primevue/column'
-import ConfirmDialog from 'primevue/confirmdialog'
-import DataTable from 'primevue/datatable'
-import Dialog from 'primevue/dialog'
-import Fieldset from 'primevue/fieldset'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
-import Tag from 'primevue/tag'
-import Textarea from 'primevue/textarea'
-import Toast from 'primevue/toast'
-import { useConfirm } from 'primevue/useconfirm'
-import { useToast } from 'primevue/usetoast'
+import { Button, Card, Checkbox, Column, ConfirmDialog, DataTable, Dialog, Fieldset, InputText, Select, Tag, Textarea, Toast, useConfirm, useToast } from 'primevue'
 import { computed, onMounted, ref, watch } from 'vue'
 
 import request from '../request.js'
diff --git a/vueManager/src/components/FileBrowser.vue b/vueManager/src/components/FileBrowser.vue
index 478041cf0..421e69998 100644
--- a/vueManager/src/components/FileBrowser.vue
+++ b/vueManager/src/components/FileBrowser.vue
@@ -1,6 +1,6 @@
 <script setup>
-import Button from 'primevue/button'
-import InputText from 'primevue/inputtext'
+
+import { Button, InputText } from 'primevue'
 import { computed, ref, watch } from 'vue'
 
 import { normalizeImagePath } from '../utils/displayFormatters.js'
diff --git a/vueManager/src/components/GridFieldsConfig.vue b/vueManager/src/components/GridFieldsConfig.vue
index 53ffea5d7..7c0756969 100644
--- a/vueManager/src/components/GridFieldsConfig.vue
+++ b/vueManager/src/components/GridFieldsConfig.vue
@@ -1,16 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Checkbox from 'primevue/checkbox'
-import ConfirmDialog from 'primevue/confirmdialog'
-import Dialog from 'primevue/dialog'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
-import Textarea from 'primevue/textarea'
-import Toast from 'primevue/toast'
-import { useConfirm } from 'primevue/useconfirm'
-import { useToast } from 'primevue/usetoast'
+import { Button, Card, Checkbox, ConfirmDialog, Dialog, InputText, Select, Textarea, Toast, useConfirm, useToast } from 'primevue'
 import { computed, onMounted, ref } from 'vue'
 import draggable from 'vuedraggable'
 
diff --git a/vueManager/src/components/HelpPage.vue b/vueManager/src/components/HelpPage.vue
index 1ec9beb42..53d27c763 100644
--- a/vueManager/src/components/HelpPage.vue
+++ b/vueManager/src/components/HelpPage.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
+import { Button, Card } from 'primevue'
 import { computed } from 'vue'
 
 const { _ } = useLexicon()
diff --git a/vueManager/src/components/ImportProducts.vue b/vueManager/src/components/ImportProducts.vue
index 195c25859..c66e6bfdc 100644
--- a/vueManager/src/components/ImportProducts.vue
+++ b/vueManager/src/components/ImportProducts.vue
@@ -1,16 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Checkbox from 'primevue/checkbox'
-import Column from 'primevue/column'
-import DataTable from 'primevue/datatable'
-import Message from 'primevue/message'
-import ProgressBar from 'primevue/progressbar'
-import RadioButton from 'primevue/radiobutton'
-import Select from 'primevue/select'
-import SelectButton from 'primevue/selectbutton'
-import Toast from 'primevue/toast'
-import { useToast } from 'primevue/usetoast'
+import { Button, Checkbox, Column, DataTable, Message, ProgressBar, RadioButton, Select, SelectButton, Toast, useToast } from 'primevue'
 import { computed, onMounted, ref, watch } from 'vue'
 
 import request from '../request.js'
diff --git a/vueManager/src/components/KeyValueField.vue b/vueManager/src/components/KeyValueField.vue
index 22387a172..c6b7442e0 100644
--- a/vueManager/src/components/KeyValueField.vue
+++ b/vueManager/src/components/KeyValueField.vue
@@ -1,9 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import InputNumber from 'primevue/inputnumber'
-import InputText from 'primevue/inputtext'
-import Message from 'primevue/message'
+import { Button, InputNumber, InputText, Message } from 'primevue'
 import { computed, ref, watch } from 'vue'
 
 import {
diff --git a/vueManager/src/components/KeyValueSchemaEditor.vue b/vueManager/src/components/KeyValueSchemaEditor.vue
index b3e763e0f..32964ba24 100644
--- a/vueManager/src/components/KeyValueSchemaEditor.vue
+++ b/vueManager/src/components/KeyValueSchemaEditor.vue
@@ -1,9 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Checkbox from 'primevue/checkbox'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
+import { Button, Checkbox, InputText, Select } from 'primevue'
 import { computed } from 'vue'
 
 import { defaultKeyValueConfig } from '../utils/keyValueField.js'
diff --git a/vueManager/src/components/LinksGrid.vue b/vueManager/src/components/LinksGrid.vue
index 1e5ba50b9..ca72da197 100644
--- a/vueManager/src/components/LinksGrid.vue
+++ b/vueManager/src/components/LinksGrid.vue
@@ -1,17 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Column from 'primevue/column'
-import ConfirmDialog from 'primevue/confirmdialog'
-import DataTable from 'primevue/datatable'
-import Dialog from 'primevue/dialog'
-import InputText from 'primevue/inputtext'
-import Paginator from 'primevue/paginator'
-import Select from 'primevue/select'
-import Textarea from 'primevue/textarea'
-import Toast from 'primevue/toast'
-import { useToast } from 'primevue/usetoast'
+import { Button, Card, Column, ConfirmDialog, DataTable, Dialog, InputText, Paginator, Select, Textarea, Toast, useToast } from 'primevue'
 import { computed, onMounted, ref } from 'vue'
 
 import { useCrudDialog } from '../composables/useCrudDialog.js'
diff --git a/vueManager/src/components/ModelFieldsGrid.vue b/vueManager/src/components/ModelFieldsGrid.vue
index d4bbdec67..291268656 100644
--- a/vueManager/src/components/ModelFieldsGrid.vue
+++ b/vueManager/src/components/ModelFieldsGrid.vue
@@ -1,22 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Checkbox from 'primevue/checkbox'
-import Column from 'primevue/column'
-import ConfirmDialog from 'primevue/confirmdialog'
-import DataTable from 'primevue/datatable'
-import Dialog from 'primevue/dialog'
-import Fieldset from 'primevue/fieldset'
-import InputNumber from 'primevue/inputnumber'
-import InputText from 'primevue/inputtext'
-import Panel from 'primevue/panel'
-import Select from 'primevue/select'
-import Slider from 'primevue/slider'
-import Textarea from 'primevue/textarea'
-import Toast from 'primevue/toast'
-import { useConfirm } from 'primevue/useconfirm'
-import { useToast } from 'primevue/usetoast'
+import { Button, Card, Checkbox, Column, ConfirmDialog, DataTable, Dialog, Fieldset, InputNumber, InputText, Panel, Select, Slider, Textarea, Toast, useConfirm, useToast } from 'primevue'
 import { computed, onMounted, ref } from 'vue'
 import draggable from 'vuedraggable'
 
diff --git a/vueManager/src/components/NotificationsGrid.vue b/vueManager/src/components/NotificationsGrid.vue
index 43862cb19..6fc4382c4 100644
--- a/vueManager/src/components/NotificationsGrid.vue
+++ b/vueManager/src/components/NotificationsGrid.vue
@@ -1,19 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Checkbox from 'primevue/checkbox'
-import Column from 'primevue/column'
-import ConfirmDialog from 'primevue/confirmdialog'
-import DataTable from 'primevue/datatable'
-import Dialog from 'primevue/dialog'
-import InputNumber from 'primevue/inputnumber'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
-import Tag from 'primevue/tag'
-import Toast from 'primevue/toast'
-import { useConfirm } from 'primevue/useconfirm'
-import { useToast } from 'primevue/usetoast'
+import { Button, Card, Checkbox, Column, ConfirmDialog, DataTable, Dialog, InputNumber, InputText, Select, Tag, Toast, useConfirm, useToast } from 'primevue'
 import { computed, onMounted, ref } from 'vue'
 
 import { useCrudDialog } from '../composables/useCrudDialog.js'
diff --git a/vueManager/src/components/OptionGroupsGrid.vue b/vueManager/src/components/OptionGroupsGrid.vue
index 9148aa772..be61c0be1 100644
--- a/vueManager/src/components/OptionGroupsGrid.vue
+++ b/vueManager/src/components/OptionGroupsGrid.vue
@@ -1,16 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Badge from 'primevue/badge'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Checkbox from 'primevue/checkbox'
-import ConfirmDialog from 'primevue/confirmdialog'
-import Dialog from 'primevue/dialog'
-import InputText from 'primevue/inputtext'
-import Textarea from 'primevue/textarea'
-import Toast from 'primevue/toast'
-import { useConfirm } from 'primevue/useconfirm'
-import { useToast } from 'primevue/usetoast'
+import { Badge, Button, Card, Checkbox, ConfirmDialog, Dialog, InputText, Textarea, Toast, useConfirm, useToast } from 'primevue'
 import { computed, onMounted, ref } from 'vue'
 import draggable from 'vuedraggable'
 
diff --git a/vueManager/src/components/OptionValuesEditor.vue b/vueManager/src/components/OptionValuesEditor.vue
index a622f8423..14ee0b0b9 100644
--- a/vueManager/src/components/OptionValuesEditor.vue
+++ b/vueManager/src/components/OptionValuesEditor.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import ColorPicker from 'primevue/colorpicker'
-import InputText from 'primevue/inputtext'
+import { Button, ColorPicker, InputText } from 'primevue'
 import { computed } from 'vue'
 import draggable from 'vuedraggable'
 
diff --git a/vueManager/src/components/OptionsAndGroupsTabs.vue b/vueManager/src/components/OptionsAndGroupsTabs.vue
index daf813e48..ddf618c09 100644
--- a/vueManager/src/components/OptionsAndGroupsTabs.vue
+++ b/vueManager/src/components/OptionsAndGroupsTabs.vue
@@ -1,10 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Tab from 'primevue/tab'
-import TabList from 'primevue/tablist'
-import TabPanel from 'primevue/tabpanel'
-import TabPanels from 'primevue/tabpanels'
-import Tabs from 'primevue/tabs'
+import { Tab, TabList, TabPanel, TabPanels, Tabs } from 'primevue'
 import { ref } from 'vue'
 
 import OptionGroupsGrid from './OptionGroupsGrid.vue'
diff --git a/vueManager/src/components/OptionsGrid.vue b/vueManager/src/components/OptionsGrid.vue
index 80d4788ae..1ad917e32 100644
--- a/vueManager/src/components/OptionsGrid.vue
+++ b/vueManager/src/components/OptionsGrid.vue
@@ -1,16 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Column from 'primevue/column'
-import ConfirmDialog from 'primevue/confirmdialog'
-import DataTable from 'primevue/datatable'
-import Dialog from 'primevue/dialog'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
-import Textarea from 'primevue/textarea'
-import Toast from 'primevue/toast'
-import { useConfirm } from 'primevue/useconfirm'
-import { useToast } from 'primevue/usetoast'
+import { Button, Column, ConfirmDialog, DataTable, Dialog, InputText, Select, Textarea, Toast, useConfirm, useToast } from 'primevue'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 import request from '../request.js'
diff --git a/vueManager/src/components/OrderView.vue b/vueManager/src/components/OrderView.vue
index 4f471e05c..4557065a9 100644
--- a/vueManager/src/components/OrderView.vue
+++ b/vueManager/src/components/OrderView.vue
@@ -1,13 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import ConfirmDialog from 'primevue/confirmdialog'
-import Tab from 'primevue/tab'
-import TabList from 'primevue/tablist'
-import TabPanel from 'primevue/tabpanel'
-import TabPanels from 'primevue/tabpanels'
-import Tabs from 'primevue/tabs'
-import Toast from 'primevue/toast'
+import { Button, ConfirmDialog, Tab, TabList, TabPanel, TabPanels, Tabs, Toast } from 'primevue'
 import { provide } from 'vue'
 
 import { ORDER_CONTEXT_KEY } from '../composables/orderContext.js'
diff --git a/vueManager/src/components/OrdersGrid.vue b/vueManager/src/components/OrdersGrid.vue
index 7f419e0c4..3afb8974d 100644
--- a/vueManager/src/components/OrdersGrid.vue
+++ b/vueManager/src/components/OrdersGrid.vue
@@ -1,17 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Checkbox from 'primevue/checkbox'
-import Column from 'primevue/column'
-import ConfirmDialog from 'primevue/confirmdialog'
-import DataTable from 'primevue/datatable'
-import DatePicker from 'primevue/datepicker'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
-import Tag from 'primevue/tag'
-import Toast from 'primevue/toast'
-import { useToast } from 'primevue/usetoast'
+import { Button, Card, Checkbox, Column, ConfirmDialog, DataTable, DatePicker, InputText, Select, Tag, Toast, useToast } from 'primevue'
 import { onMounted, ref } from 'vue'
 
 import { useGridConfig } from '../composables/useGridConfig.js'
@@ -69,7 +58,6 @@ const { columns, loadGridConfig } = useGridConfig({
   },
 })
 
-
 /**
  * Build GET params shared by list and stats endpoints (#469).
  *
diff --git a/vueManager/src/components/PaymentsGrid.vue b/vueManager/src/components/PaymentsGrid.vue
index 594f09b0a..7a494a5c2 100644
--- a/vueManager/src/components/PaymentsGrid.vue
+++ b/vueManager/src/components/PaymentsGrid.vue
@@ -1,23 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Badge from 'primevue/badge'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Checkbox from 'primevue/checkbox'
-import Column from 'primevue/column'
-import ConfirmDialog from 'primevue/confirmdialog'
-import DataTable from 'primevue/datatable'
-import Dialog from 'primevue/dialog'
-import InputText from 'primevue/inputtext'
-import Tab from 'primevue/tab'
-import TabList from 'primevue/tablist'
-import TabPanel from 'primevue/tabpanel'
-import TabPanels from 'primevue/tabpanels'
-import Tabs from 'primevue/tabs'
-import Textarea from 'primevue/textarea'
-import Toast from 'primevue/toast'
-import ToggleSwitch from 'primevue/toggleswitch'
-import { useToast } from 'primevue/usetoast'
+import { Badge, Button, Card, Checkbox, Column, ConfirmDialog, DataTable, Dialog, InputText, Tab, TabList, TabPanel, TabPanels, Tabs, Textarea, Toast, ToggleSwitch, useToast } from 'primevue'
 import { computed, onMounted, ref } from 'vue'
 import draggable from 'vuedraggable'
 
diff --git a/vueManager/src/components/ProductData.vue b/vueManager/src/components/ProductData.vue
index efe113980..1324abc90 100644
--- a/vueManager/src/components/ProductData.vue
+++ b/vueManager/src/components/ProductData.vue
@@ -1,10 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import { Button, Card, Column, DataTable, Dialog, InputText, Select } from 'primevue'
-import ConfirmDialog from 'primevue/confirmdialog'
-import Toast from 'primevue/toast'
-import { useConfirm } from 'primevue/useconfirm'
-import { useToast } from 'primevue/usetoast'
+import { Button, Card, Column, ConfirmDialog, DataTable, Dialog, InputText, Select, Toast, useConfirm, useToast } from 'primevue'
 import { onMounted, ref } from 'vue'
 
 const confirm = useConfirm()
diff --git a/vueManager/src/components/ProductDataConfig.vue b/vueManager/src/components/ProductDataConfig.vue
index ea407a52d..c34f37f63 100644
--- a/vueManager/src/components/ProductDataConfig.vue
+++ b/vueManager/src/components/ProductDataConfig.vue
@@ -1,17 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Checkbox from 'primevue/checkbox'
-import ConfirmDialog from 'primevue/confirmdialog'
-import Dialog from 'primevue/dialog'
-import InputNumber from 'primevue/inputnumber'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
-import Textarea from 'primevue/textarea'
-import Toast from 'primevue/toast'
-import { useConfirm } from 'primevue/useconfirm'
-import { useToast } from 'primevue/usetoast'
+import { Button, Card, Checkbox, ConfirmDialog, Dialog, InputNumber, InputText, Select, Textarea, Toast, useConfirm, useToast } from 'primevue'
 import { computed, onMounted, ref } from 'vue'
 import draggable from 'vuedraggable'
 
diff --git a/vueManager/src/components/ProductDataFields.vue b/vueManager/src/components/ProductDataFields.vue
index 946238239..cc03d8a77 100644
--- a/vueManager/src/components/ProductDataFields.vue
+++ b/vueManager/src/components/ProductDataFields.vue
@@ -1,9 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Card from 'primevue/card'
-import Fieldset from 'primevue/fieldset'
-import Message from 'primevue/message'
-import { useToast } from 'primevue/usetoast'
+import { Card, Fieldset, Message, useToast } from 'primevue'
 import { computed, onMounted, ref } from 'vue'
 
 import request from '../request.js'
diff --git a/vueManager/src/components/RepeaterField.vue b/vueManager/src/components/RepeaterField.vue
index d0f3ec96f..9c82710be 100644
--- a/vueManager/src/components/RepeaterField.vue
+++ b/vueManager/src/components/RepeaterField.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import InputNumber from 'primevue/inputnumber'
-import InputText from 'primevue/inputtext'
+import { Button, InputNumber, InputText } from 'primevue'
 import { computed, ref, watch } from 'vue'
 import draggable from 'vuedraggable'
 
diff --git a/vueManager/src/components/RepeaterSchemaEditor.vue b/vueManager/src/components/RepeaterSchemaEditor.vue
index 6c8b2b315..a3386b18f 100644
--- a/vueManager/src/components/RepeaterSchemaEditor.vue
+++ b/vueManager/src/components/RepeaterSchemaEditor.vue
@@ -1,10 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Checkbox from 'primevue/checkbox'
-import InputNumber from 'primevue/inputnumber'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
+import { Button, Checkbox, InputNumber, InputText, Select } from 'primevue'
 import { computed } from 'vue'
 
 import { defaultRepeaterConfig } from '../utils/repeaterField.js'
diff --git a/vueManager/src/components/ResourceCategoryTree.vue b/vueManager/src/components/ResourceCategoryTree.vue
index bea6603c4..978cee547 100644
--- a/vueManager/src/components/ResourceCategoryTree.vue
+++ b/vueManager/src/components/ResourceCategoryTree.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Checkbox from 'primevue/checkbox'
-import ContextMenu from 'primevue/contextmenu'
-import Tree from 'primevue/tree'
+import { Checkbox, ContextMenu, Tree } from 'primevue'
 import { computed, onMounted, ref, watch } from 'vue'
 
 import request from '../request.js'
diff --git a/vueManager/src/components/SettingsPage.vue b/vueManager/src/components/SettingsPage.vue
index 29acc6ba1..a7f57b4a2 100644
--- a/vueManager/src/components/SettingsPage.vue
+++ b/vueManager/src/components/SettingsPage.vue
@@ -1,11 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Tab from 'primevue/tab'
-import TabList from 'primevue/tablist'
-import TabPanel from 'primevue/tabpanel'
-import TabPanels from 'primevue/tabpanels'
-import Tabs from 'primevue/tabs'
+import { Button, Tab, TabList, TabPanel, TabPanels, Tabs } from 'primevue'
 import { onMounted, onUnmounted, ref, watch } from 'vue'
 
 import DeliveriesGrid from './DeliveriesGrid.vue'
diff --git a/vueManager/src/components/StatusesGrid.vue b/vueManager/src/components/StatusesGrid.vue
index ed7d963a6..1a65d7a90 100644
--- a/vueManager/src/components/StatusesGrid.vue
+++ b/vueManager/src/components/StatusesGrid.vue
@@ -1,15 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Checkbox from 'primevue/checkbox'
-import ColorPicker from 'primevue/colorpicker'
-import ConfirmDialog from 'primevue/confirmdialog'
-import Dialog from 'primevue/dialog'
-import InputText from 'primevue/inputtext'
-import Textarea from 'primevue/textarea'
-import Toast from 'primevue/toast'
-import { useToast } from 'primevue/usetoast'
+import { Button, Card, Checkbox, ColorPicker, ConfirmDialog, Dialog, InputText, Textarea, Toast, useToast } from 'primevue'
 import { onMounted, ref } from 'vue'
 import draggable from 'vuedraggable'
 
diff --git a/vueManager/src/components/UtilitiesGallery.vue b/vueManager/src/components/UtilitiesGallery.vue
index 3bdbc8cbf..f1eb0af4c 100644
--- a/vueManager/src/components/UtilitiesGallery.vue
+++ b/vueManager/src/components/UtilitiesGallery.vue
@@ -1,11 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Fieldset from 'primevue/fieldset'
-import InputNumber from 'primevue/inputnumber'
-import Message from 'primevue/message'
-import ProgressBar from 'primevue/progressbar'
+import { Button, Card, Fieldset, InputNumber, Message, ProgressBar } from 'primevue'
 import { computed, onMounted, ref } from 'vue'
 
 import request from '../request.js'
diff --git a/vueManager/src/components/UtilitiesPage.vue b/vueManager/src/components/UtilitiesPage.vue
index 92893d60f..c3cf85f80 100644
--- a/vueManager/src/components/UtilitiesPage.vue
+++ b/vueManager/src/components/UtilitiesPage.vue
@@ -1,11 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Tab from 'primevue/tab'
-import TabList from 'primevue/tablist'
-import TabPanel from 'primevue/tabpanel'
-import TabPanels from 'primevue/tabpanels'
-import Tabs from 'primevue/tabs'
+import { Button, Tab, TabList, TabPanel, TabPanels, Tabs } from 'primevue'
 import { ref, watch } from 'vue'
 
 import { getMs3Config } from '../utils/modx.js'
diff --git a/vueManager/src/components/ValidationRulesEditor.vue b/vueManager/src/components/ValidationRulesEditor.vue
index cf7bb4661..e644ebad8 100644
--- a/vueManager/src/components/ValidationRulesEditor.vue
+++ b/vueManager/src/components/ValidationRulesEditor.vue
@@ -1,12 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Chip from 'primevue/chip'
-import Dialog from 'primevue/dialog'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
-import Textarea from 'primevue/textarea'
-import ToggleSwitch from 'primevue/toggleswitch'
+import { Button, Chip, Dialog, InputText, Select, Textarea, ToggleSwitch } from 'primevue'
 import { computed, onMounted, ref, watch } from 'vue'
 
 import request from '../request.js'
diff --git a/vueManager/src/components/VendorCombo.vue b/vueManager/src/components/VendorCombo.vue
index 808a06760..f7603900b 100644
--- a/vueManager/src/components/VendorCombo.vue
+++ b/vueManager/src/components/VendorCombo.vue
@@ -6,14 +6,15 @@
       :options="vendors"
       option-label="name"
       option-value="id"
-      :placeholder="placeholder"
+      :placeholder="resolvedPlaceholder"
       :disabled="disabled"
       :loading="loading"
       :show-clear="showClear"
       :filter="enableFilter"
-      filter-placeholder="Search vendor..."
+      :filter-placeholder="filterPlaceholder"
       :empty-message="emptyMessage"
       :empty-filter-message="emptyFilterMessage"
+      :pt="selectPt"
       class="w-full"
       @change="handleChange"
     >
@@ -27,7 +28,8 @@
 </template>
 
 <script setup>
-import Select from 'primevue/select'
+import { useLexicon } from '@vuetools/useLexicon'
+import { Select } from 'primevue'
 import { computed, onMounted, ref, watch } from 'vue'
 
 import request from '../request.js'
@@ -54,7 +56,7 @@ const props = defineProps({
    */
   placeholder: {
     type: String,
-    default: 'Select vendor',
+    default: '',
   },
 
   /**
@@ -83,6 +85,7 @@ const props = defineProps({
 })
 
 const emit = defineEmits(['update:modelValue', 'change'])
+const { _ } = useLexicon()
 
 // State
 const loading = ref(false)
@@ -90,16 +93,36 @@ const vendors = ref([])
 const localValue = ref(props.modelValue)
 const wrapperRef = ref(null)
 
+function lex(key, fallback) {
+  const value = _(key)
+  return value && value !== key ? value : fallback
+}
+
+const resolvedPlaceholder = computed(
+  () => props.placeholder || lex('ms3_vendor_select', 'Select vendor')
+)
+
+const filterPlaceholder = computed(() => lex('ms3_vendor_search', 'Search vendor…'))
+
+const selectPt = computed(() => ({
+  clearIcon: {
+    'aria-label': lex('clear', 'Clear'),
+    role: 'button',
+    tabindex: '0',
+  },
+}))
+
 // Computed
 const emptyMessage = computed(() => {
   return vendors.value.length === 0
-    ? 'No vendors found. Add a vendor in component settings.'
-    : 'No results'
+    ? lex(
+        'ms3_vendor_empty',
+        'No vendors found. Add a vendor in component settings.'
+      )
+    : lex('ms3_vendor_not_found', 'Vendor not found')
 })
 
-const emptyFilterMessage = computed(() => {
-  return 'Vendor not found'
-})
+const emptyFilterMessage = computed(() => lex('ms3_vendor_not_found', 'Vendor not found'))
 
 /**
  * Load vendors from API
diff --git a/vueManager/src/components/VendorsGrid.vue b/vueManager/src/components/VendorsGrid.vue
index 04bc55265..ffe72b7fb 100644
--- a/vueManager/src/components/VendorsGrid.vue
+++ b/vueManager/src/components/VendorsGrid.vue
@@ -1,20 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Card from 'primevue/card'
-import Checkbox from 'primevue/checkbox'
-import ConfirmDialog from 'primevue/confirmdialog'
-import Dialog from 'primevue/dialog'
-import InputText from 'primevue/inputtext'
-import Paginator from 'primevue/paginator'
-import Tab from 'primevue/tab'
-import TabList from 'primevue/tablist'
-import TabPanel from 'primevue/tabpanel'
-import TabPanels from 'primevue/tabpanels'
-import Tabs from 'primevue/tabs'
-import Textarea from 'primevue/textarea'
-import Toast from 'primevue/toast'
-import { useToast } from 'primevue/usetoast'
+import { Button, Card, Checkbox, ConfirmDialog, Dialog, InputText, Paginator, Tab, TabList, TabPanel, TabPanels, Tabs, Textarea, Toast, useToast } from 'primevue'
 import { computed, onMounted, ref } from 'vue'
 import draggable from 'vuedraggable'
 
diff --git a/vueManager/src/components/gallery/GalleryUploader.vue b/vueManager/src/components/gallery/GalleryUploader.vue
index 4061bc4ef..cf6b7c8cb 100644
--- a/vueManager/src/components/gallery/GalleryUploader.vue
+++ b/vueManager/src/components/gallery/GalleryUploader.vue
@@ -76,6 +76,7 @@ const buildUppyLocale = () => {
       browseFolders: _('ms3_gallery_uppy_browse_folders'),
       back: _('ms3_gallery_uppy_back'),
       addMoreFiles: _('ms3_gallery_uppy_add_more_files'),
+      addingMoreFiles: _('ms3_gallery_uppy_adding_more_files'),
       dropHint: _('ms3_gallery_uppy_drop_hint'),
       uploadComplete: _('ms3_gallery_uppy_upload_complete'),
       uploadFailed: _('ms3_gallery_uppy_upload_failed'),
@@ -86,6 +87,10 @@ const buildUppyLocale = () => {
       edit: _('ms3_gallery_uppy_edit'),
       retry: _('ms3_gallery_uppy_retry'),
       addMore: _('ms3_gallery_uppy_add_more'),
+      editing: _('ms3_gallery_uppy_editing'),
+      save: _('ms3_gallery_uppy_save'),
+      finishEditingFile: _('ms3_gallery_uppy_finish_editing'),
+      saveChanges: _('ms3_gallery_uppy_save_changes'),
       error: _('ms3_gallery_uppy_error'),
       failedToUpload: _('ms3_gallery_uppy_failed_to_upload'),
       noDuplicates: _('ms3_gallery_uppy_no_duplicates'),
@@ -149,6 +154,18 @@ const initUppy = () => {
   uppy.use(ImageEditor, {
     target: Dashboard,
     quality: 0.8,
+    locale: {
+      strings: {
+        revert: _('ms3_gallery_uppy_revert'),
+        rotate: _('ms3_gallery_uppy_rotate'),
+        zoomIn: _('ms3_gallery_uppy_zoom_in'),
+        zoomOut: _('ms3_gallery_uppy_zoom_out'),
+        flipHorizontal: _('ms3_gallery_uppy_flip_horizontal'),
+        aspectRatioSquare: _('ms3_gallery_uppy_crop_square'),
+        aspectRatioLandscape: _('ms3_gallery_uppy_crop_landscape'),
+        aspectRatioPortrait: _('ms3_gallery_uppy_crop_portrait'),
+      },
+    },
   })
 
   uppy.use(XHRUpload, {
diff --git a/vueManager/src/components/gallery/ProductGallery.vue b/vueManager/src/components/gallery/ProductGallery.vue
index d09baeaec..ba3346df0 100644
--- a/vueManager/src/components/gallery/ProductGallery.vue
+++ b/vueManager/src/components/gallery/ProductGallery.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import ConfirmDialog from 'primevue/confirmdialog'
-import { useConfirm } from 'primevue/useconfirm'
-import { useToast } from 'primevue/usetoast'
+import { ConfirmDialog, useConfirm, useToast } from 'primevue'
 import { onMounted, ref } from 'vue'
 
 import { useGalleryApi } from '../../composables/useGalleryApi.js'
diff --git a/vueManager/src/components/gallery/ProductGalleryEditDialog.vue b/vueManager/src/components/gallery/ProductGalleryEditDialog.vue
index 8e2963c81..687f89d0d 100644
--- a/vueManager/src/components/gallery/ProductGalleryEditDialog.vue
+++ b/vueManager/src/components/gallery/ProductGalleryEditDialog.vue
@@ -1,9 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Dialog from 'primevue/dialog'
-import InputText from 'primevue/inputtext'
-import Textarea from 'primevue/textarea'
+import { Button, Dialog, InputText, Textarea } from 'primevue'
 import { ref, watch } from 'vue'
 
 const { _ } = useLexicon()
diff --git a/vueManager/src/components/gallery/ProductGalleryGrid.vue b/vueManager/src/components/gallery/ProductGalleryGrid.vue
index f729f2631..d4460756c 100644
--- a/vueManager/src/components/gallery/ProductGalleryGrid.vue
+++ b/vueManager/src/components/gallery/ProductGalleryGrid.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import ContextMenu from 'primevue/contextmenu'
-import InputText from 'primevue/inputtext'
-import Paginator from 'primevue/paginator'
+import { ContextMenu, InputText, Paginator } from 'primevue'
 import { computed, ref, watch } from 'vue'
 import draggable from 'vuedraggable'
 
diff --git a/vueManager/src/components/gallery/ProductGalleryToolbar.vue b/vueManager/src/components/gallery/ProductGalleryToolbar.vue
index d95d6141f..a47bcdd21 100644
--- a/vueManager/src/components/gallery/ProductGalleryToolbar.vue
+++ b/vueManager/src/components/gallery/ProductGalleryToolbar.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Menu from 'primevue/menu'
-import Select from 'primevue/select'
+import { Button, Menu, Select } from 'primevue'
 import { computed, ref } from 'vue'
 
 const { _ } = useLexicon()
diff --git a/vueManager/src/components/order/OrderAddProductDialog.vue b/vueManager/src/components/order/OrderAddProductDialog.vue
index ed6bf44d7..1ac639bb8 100644
--- a/vueManager/src/components/order/OrderAddProductDialog.vue
+++ b/vueManager/src/components/order/OrderAddProductDialog.vue
@@ -1,9 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import AutoComplete from 'primevue/autocomplete'
-import Button from 'primevue/button'
-import Dialog from 'primevue/dialog'
-import InputNumber from 'primevue/inputnumber'
+import { AutoComplete, Button, Dialog, InputNumber } from 'primevue'
 
 const { _ } = useLexicon()
 
diff --git a/vueManager/src/components/order/OrderAddressTab.vue b/vueManager/src/components/order/OrderAddressTab.vue
index be400f626..719de2f20 100644
--- a/vueManager/src/components/order/OrderAddressTab.vue
+++ b/vueManager/src/components/order/OrderAddressTab.vue
@@ -1,13 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import AutoComplete from 'primevue/autocomplete'
-import Button from 'primevue/button'
-import Checkbox from 'primevue/checkbox'
-import Fieldset from 'primevue/fieldset'
-import InputNumber from 'primevue/inputnumber'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
-import Textarea from 'primevue/textarea'
+import { AutoComplete, Button, Checkbox, Fieldset, InputNumber, InputText, Select, Textarea } from 'primevue'
 import { computed, inject } from 'vue'
 
 import { ORDER_CONTEXT_KEY } from '../../composables/orderContext.js'
diff --git a/vueManager/src/components/order/OrderDuplicateCustomerDialog.vue b/vueManager/src/components/order/OrderDuplicateCustomerDialog.vue
index 5316918bc..4646276ec 100644
--- a/vueManager/src/components/order/OrderDuplicateCustomerDialog.vue
+++ b/vueManager/src/components/order/OrderDuplicateCustomerDialog.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Dialog from 'primevue/dialog'
+import { Button, Dialog } from 'primevue'
 
 const { _ } = useLexicon()
 
diff --git a/vueManager/src/components/order/OrderEditProductDialog.vue b/vueManager/src/components/order/OrderEditProductDialog.vue
index 6021010ce..f39119877 100644
--- a/vueManager/src/components/order/OrderEditProductDialog.vue
+++ b/vueManager/src/components/order/OrderEditProductDialog.vue
@@ -1,11 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Dialog from 'primevue/dialog'
-import InputNumber from 'primevue/inputnumber'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
-import Textarea from 'primevue/textarea'
+import { Button, Dialog, InputNumber, InputText, Select, Textarea } from 'primevue'
 
 const { _ } = useLexicon()
 
diff --git a/vueManager/src/components/order/OrderExtraFieldsSection.vue b/vueManager/src/components/order/OrderExtraFieldsSection.vue
index 0808841f5..9fdd1c605 100644
--- a/vueManager/src/components/order/OrderExtraFieldsSection.vue
+++ b/vueManager/src/components/order/OrderExtraFieldsSection.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Fieldset from 'primevue/fieldset'
+import { Fieldset } from 'primevue'
 import { computed, inject } from 'vue'
 
 import { ORDER_CONTEXT_KEY } from '../../composables/orderContext.js'
diff --git a/vueManager/src/components/order/OrderFormActionsBar.vue b/vueManager/src/components/order/OrderFormActionsBar.vue
index 5b8714908..921784df9 100644
--- a/vueManager/src/components/order/OrderFormActionsBar.vue
+++ b/vueManager/src/components/order/OrderFormActionsBar.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
+import { Button } from 'primevue'
 
 defineProps({
   isCreateMode: { type: Boolean, required: true },
diff --git a/vueManager/src/components/order/OrderHistoryTab.vue b/vueManager/src/components/order/OrderHistoryTab.vue
index 4693e67f2..f1f0c8963 100644
--- a/vueManager/src/components/order/OrderHistoryTab.vue
+++ b/vueManager/src/components/order/OrderHistoryTab.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Column from 'primevue/column'
-import DataTable from 'primevue/datatable'
+import { Column, DataTable, Tag } from 'primevue'
 
 import { useOrderFormatters } from '../../composables/useOrderFormatters.js'
 import { useOrderLogFormatters } from '../../composables/useOrderLogFormatters.js'
@@ -11,26 +10,51 @@ defineProps({
 })
 
 const { formatDate, formatPrice } = useOrderFormatters()
-const { formatLogEntry } = useOrderLogFormatters({ formatPrice })
+const { formatLogEntry, formatLogAction, logActionSeverity } = useOrderLogFormatters({
+  formatPrice,
+})
 
 const { _ } = useLexicon()
 </script>
 
 <template>
   <div class="order-history-tab">
-    <DataTable :value="logs" striped-rows responsive-layout="scroll">
+    <DataTable
+      :value="logs"
+      striped-rows
+      responsive-layout="scroll"
+      data-key="id"
+    >
+      <template #empty>
+        <div class="history-empty">{{ _('log_empty') }}</div>
+      </template>
       <Column field="timestamp" :header="_('log_date')" style="width: 11.25rem">
         <template #body="{ data }">
           {{ formatDate(data.timestamp || data.createdon) }}
         </template>
       </Column>
-      <Column field="action" :header="_('log_action')" />
+      <Column field="action" :header="_('log_action')" style="width: 9.5rem">
+        <template #body="{ data }">
+          <Tag
+            :value="formatLogAction(data.action)"
+            :severity="logActionSeverity(data.action)"
+          />
+        </template>
+      </Column>
       <Column field="user_name" :header="_('log_user')" style="width: 9.375rem" />
-      <Column field="entry_formatted" :header="_('log_entry')">
+      <Column field="entry" :header="_('log_entry')">
         <template #body="{ data }">
-          {{ data.entry_formatted || formatLogEntry(data) }}
+          {{ formatLogEntry(data) }}
         </template>
       </Column>
     </DataTable>
   </div>
 </template>
+
+<style scoped>
+.history-empty {
+  padding: 1.5rem 0.625rem;
+  color: var(--ms3-text-muted, #696969);
+  text-align: center;
+}
+</style>
diff --git a/vueManager/src/components/order/OrderInfoTab.vue b/vueManager/src/components/order/OrderInfoTab.vue
index e87d8a688..2d7a3676d 100644
--- a/vueManager/src/components/order/OrderInfoTab.vue
+++ b/vueManager/src/components/order/OrderInfoTab.vue
@@ -1,14 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Checkbox from 'primevue/checkbox'
-import DatePicker from 'primevue/datepicker'
-import Fieldset from 'primevue/fieldset'
-import InputNumber from 'primevue/inputnumber'
-import InputText from 'primevue/inputtext'
-import Message from 'primevue/message'
-import Select from 'primevue/select'
-import Textarea from 'primevue/textarea'
+import { Button, Checkbox, DatePicker, Fieldset, InputNumber, InputText, Message, Select, Textarea } from 'primevue'
 import { computed, inject, watch } from 'vue'
 
 import { ORDER_CONTEXT_KEY } from '../../composables/orderContext.js'
diff --git a/vueManager/src/components/order/OrderProductOptionsChips.vue b/vueManager/src/components/order/OrderProductOptionsChips.vue
index ff8d04a47..fab729bdd 100644
--- a/vueManager/src/components/order/OrderProductOptionsChips.vue
+++ b/vueManager/src/components/order/OrderProductOptionsChips.vue
@@ -1,5 +1,6 @@
 <script setup>
-import Tag from 'primevue/tag'
+
+import { Tag } from 'primevue'
 import { computed } from 'vue'
 
 const props = defineProps({
diff --git a/vueManager/src/components/order/OrderProductsTab.vue b/vueManager/src/components/order/OrderProductsTab.vue
index ed91de6da..9b53618c9 100644
--- a/vueManager/src/components/order/OrderProductsTab.vue
+++ b/vueManager/src/components/order/OrderProductsTab.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Column from 'primevue/column'
-import DataTable from 'primevue/datatable'
+import { Button, Column, DataTable } from 'primevue'
 import { inject } from 'vue'
 
 import { ORDER_CONTEXT_KEY } from '../../composables/orderContext.js'
diff --git a/vueManager/src/components/order/OrderShipmentTab.vue b/vueManager/src/components/order/OrderShipmentTab.vue
index f23140697..deb0ae5ee 100644
--- a/vueManager/src/components/order/OrderShipmentTab.vue
+++ b/vueManager/src/components/order/OrderShipmentTab.vue
@@ -1,10 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Button from 'primevue/button'
-import Fieldset from 'primevue/fieldset'
-import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
-import { useToast } from 'primevue/usetoast'
+import { Button, Fieldset, InputText, Select, useToast } from 'primevue'
 import { computed, inject, ref, watch } from 'vue'
 
 import { ORDER_CONTEXT_KEY } from '../../composables/orderContext.js'
diff --git a/vueManager/src/components/product/ProductLinksTab.vue b/vueManager/src/components/product/ProductLinksTab.vue
index 375f24b95..9044f80f8 100644
--- a/vueManager/src/components/product/ProductLinksTab.vue
+++ b/vueManager/src/components/product/ProductLinksTab.vue
@@ -1,14 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import AutoComplete from 'primevue/autocomplete'
-import Button from 'primevue/button'
-import Column from 'primevue/column'
-import ConfirmDialog from 'primevue/confirmdialog'
-import DataTable from 'primevue/datatable'
-import Dialog from 'primevue/dialog'
-import Select from 'primevue/select'
-import { useConfirm } from 'primevue/useconfirm'
-import { useToast } from 'primevue/usetoast'
+import { AutoComplete, Button, Column, ConfirmDialog, DataTable, Dialog, Select, useConfirm, useToast } from 'primevue'
 import { computed, onMounted, ref } from 'vue'
 
 import request from '../../request.js'
diff --git a/vueManager/src/components/product/ProductOptionField.test.js b/vueManager/src/components/product/ProductOptionField.test.js
new file mode 100644
index 000000000..b83adbacb
--- /dev/null
+++ b/vueManager/src/components/product/ProductOptionField.test.js
@@ -0,0 +1,163 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent, h, ref } from 'vue'
+
+import request from '../../request.js'
+import ProductOptionField from './ProductOptionField.vue'
+
+vi.mock('../../request.js', () => ({
+  default: {
+    get: vi.fn(),
+  },
+}))
+
+/**
+ * Mirrors PrimeVue InputChips commit rules used by comboOptions:
+ * Enter, separator (comma), and blur (when addOnBlur) add the typed token.
+ */
+const InputChipsStub = defineComponent({
+  name: 'InputChips',
+  props: {
+    modelValue: { type: Array, default: () => [] },
+    separator: { type: String, default: null },
+    addOnBlur: { type: Boolean, default: false },
+    inputId: { type: String, default: '' },
+    placeholder: { type: String, default: '' },
+  },
+  emits: ['update:modelValue', 'add', 'remove', 'keyup'],
+  setup(props, { emit }) {
+    const draft = ref('')
+
+    function commit() {
+      const token = draft.value.trim()
+      if (!token) {
+        return
+      }
+      const next = [...(props.modelValue || []), token]
+      emit('update:modelValue', next)
+      emit('add', { value: token })
+      draft.value = ''
+    }
+
+    return () =>
+      h('div', { class: 'input-chips-stub' }, [
+        h('input', {
+          class: 'chips-draft',
+          id: props.inputId,
+          value: draft.value,
+          placeholder: props.placeholder,
+          onInput: event => {
+            let next = event.target.value
+            if (props.separator && next.includes(props.separator)) {
+              draft.value = next.split(props.separator)[0]
+              commit()
+              event.target.value = draft.value
+              return
+            }
+            draft.value = next
+          },
+          onKeydown: event => {
+            if (event.key === 'Enter') {
+              event.preventDefault()
+              commit()
+            }
+          },
+          onBlur: () => {
+            if (props.addOnBlur) {
+              commit()
+            }
+          },
+          onKeyup: event => emit('keyup', event),
+        }),
+        h('pre', { class: 'chips-model' }, JSON.stringify(props.modelValue)),
+      ])
+  },
+})
+
+function mountComboOptions(optionOverrides = {}) {
+  return mount(ProductOptionField, {
+    props: {
+      option: {
+        key: 'tags',
+        type: 'comboOptions',
+        caption: 'Tags',
+        value: [],
+        required: 0,
+        ...optionOverrides,
+      },
+    },
+    global: {
+      stubs: {
+        InputChips: InputChipsStub,
+        Checkbox: true,
+        DatePicker: true,
+        InputNumber: true,
+        InputText: true,
+        MultiSelect: true,
+        Select: true,
+        Textarea: true,
+      },
+    },
+  })
+}
+
+function hiddenPayload(wrapper) {
+  return wrapper.get('input[type="hidden"][name="options-tags"]').element.value
+}
+
+describe('ProductOptionField comboOptions (#702)', () => {
+  let wrapper
+
+  afterEach(() => {
+    wrapper?.unmount()
+    wrapper = null
+    vi.clearAllMocks()
+  })
+
+  it('adds a chip on Enter and writes it to the hidden JSON input', async () => {
+    wrapper = mountComboOptions()
+    const input = wrapper.get('input.chips-draft')
+    await input.setValue('alpha')
+    await input.trigger('keydown', { key: 'Enter' })
+
+    expect(JSON.parse(hiddenPayload(wrapper))).toEqual(['alpha'])
+    expect(wrapper.emitted('change')?.at(-1)?.[0]).toEqual({ key: 'tags', value: ['alpha'] })
+  })
+
+  it('adds a chip when a comma separator is typed', async () => {
+    wrapper = mountComboOptions()
+    const input = wrapper.get('input.chips-draft')
+    await input.setValue('beta,')
+
+    expect(JSON.parse(hiddenPayload(wrapper))).toEqual(['beta'])
+    expect(wrapper.emitted('change')?.at(-1)?.[0]).toEqual({ key: 'tags', value: ['beta'] })
+  })
+
+  it('adds a chip on blur when add-on-blur is enabled', async () => {
+    wrapper = mountComboOptions()
+    const input = wrapper.get('input.chips-draft')
+    await input.setValue('gamma')
+    await input.trigger('blur')
+
+    expect(JSON.parse(hiddenPayload(wrapper))).toEqual(['gamma'])
+    expect(wrapper.emitted('change')?.at(-1)?.[0]).toEqual({ key: 'tags', value: ['gamma'] })
+  })
+
+  it('loads suggestion pills on first keyup', async () => {
+    request.get.mockResolvedValue({ results: ['red', 'green'] })
+    wrapper = mountComboOptions()
+    const input = wrapper.get('input.chips-draft')
+    await input.setValue('r')
+    await input.trigger('keyup')
+    await flushPromises()
+
+    expect(request.get).toHaveBeenCalledWith('/api/mgr/options/suggestions', {
+      key: 'tags',
+      limit: 100,
+    })
+    expect(wrapper.findAll('button.combo-options-suggestion').map(b => b.text())).toEqual([
+      'red',
+      'green',
+    ])
+  })
+})
diff --git a/vueManager/src/components/product/ProductOptionField.vue b/vueManager/src/components/product/ProductOptionField.vue
index cf43cbf5f..9aeb446ae 100644
--- a/vueManager/src/components/product/ProductOptionField.vue
+++ b/vueManager/src/components/product/ProductOptionField.vue
@@ -1,13 +1,15 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Checkbox from 'primevue/checkbox'
-import DatePicker from 'primevue/datepicker'
-import InputChips from 'primevue/inputchips'
-import InputNumber from 'primevue/inputnumber'
-import InputText from 'primevue/inputtext'
-import MultiSelect from 'primevue/multiselect'
-import Select from 'primevue/select'
-import Textarea from 'primevue/textarea'
+import {
+  Checkbox,
+  DatePicker,
+  InputChips,
+  InputNumber,
+  InputText,
+  MultiSelect,
+  Select,
+  Textarea,
+} from 'primevue'
 import { computed, ref, watch } from 'vue'
 
 import request from '../../request.js'
@@ -126,6 +128,9 @@ const multiArrayValue = computed({
  * InputChips as clickable pills — the autocomplete flavor of the comboOptions type.
  * Loaded lazily on the first keystroke and re-filtered client-side as the user types
  * so we don't spam the server on every key.
+ *
+ * InputChips is deprecated in PrimeVue 4 but remains in the VueTools 1.2.0 barrel and
+ * matches Enter / comma / blur commit behavior expected by the placeholder.
  */
 const suggestions = ref([])
 const suggestionsLoaded = ref(false)
@@ -158,7 +163,7 @@ const filteredSuggestions = computed(() => {
   const typed = (comboOptionsInputEl?.value || '').trim().toLowerCase()
   return suggestions.value
     .filter(s => !picked.has(s))
-    .filter(s => typed === '' || s.toLowerCase().includes(typed))
+    .filter(s => typed === '' || String(s).toLowerCase().includes(typed))
     .slice(0, 20)
 })
 
diff --git a/vueManager/src/components/product/ProductTabs.vue b/vueManager/src/components/product/ProductTabs.vue
index 79d14ed26..d19f5f8b6 100644
--- a/vueManager/src/components/product/ProductTabs.vue
+++ b/vueManager/src/components/product/ProductTabs.vue
@@ -1,12 +1,6 @@
 <script setup>
 import { useLexicon } from '@vuetools/useLexicon'
-import Tab from 'primevue/tab'
-import TabList from 'primevue/tablist'
-import TabPanel from 'primevue/tabpanel'
-import TabPanels from 'primevue/tabpanels'
-import Tabs from 'primevue/tabs'
-import Toast from 'primevue/toast'
-import { useToast } from 'primevue/usetoast'
+import { Tab, TabList, TabPanel, TabPanels, Tabs, Toast, useToast } from 'primevue'
 import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 import ProductGallery from '../gallery/ProductGallery.vue'
diff --git a/vueManager/src/composables/uiGroup.js b/vueManager/src/composables/uiGroup.js
index 9d89c33ba..ce268fe72 100644
--- a/vueManager/src/composables/uiGroup.js
+++ b/vueManager/src/composables/uiGroup.js
@@ -23,7 +23,8 @@
  *
  * @see https://github.com/modx-pro/MiniShop3/issues/539
  */
-import { useToast } from 'primevue/usetoast'
+
+import { useToast } from 'primevue'
 import { inject } from 'vue'
 
 export const MS3_UI_GROUP = Symbol('ms3UiGroup')
diff --git a/vueManager/src/composables/uiGroup.test.js b/vueManager/src/composables/uiGroup.test.js
index 5953c41b6..b97259d49 100644
--- a/vueManager/src/composables/uiGroup.test.js
+++ b/vueManager/src/composables/uiGroup.test.js
@@ -8,7 +8,7 @@ const remove = vi.fn()
 const removeGroup = vi.fn()
 const removeAllGroups = vi.fn()
 
-vi.mock('primevue/usetoast', () => ({
+vi.mock('primevue', () => ({
   useToast: () => ({
     add,
     remove,
diff --git a/vueManager/src/composables/useActions.js b/vueManager/src/composables/useActions.js
index c511a2dc1..66ff36906 100644
--- a/vueManager/src/composables/useActions.js
+++ b/vueManager/src/composables/useActions.js
@@ -4,7 +4,7 @@
  * Provides convenient interface for working with grid actions
  */
 import { useLexicon } from '@vuetools/useLexicon'
-import { useConfirm } from 'primevue/useconfirm'
+import { useConfirm } from 'primevue'
 
 import actionRegistry from '../actionRegistry.js'
 import { resolveUiGroup, toUiGroup, useGroupedToast } from './uiGroup.js'
diff --git a/vueManager/src/composables/useCrudDialog.js b/vueManager/src/composables/useCrudDialog.js
index 89c4660f3..c620ca508 100644
--- a/vueManager/src/composables/useCrudDialog.js
+++ b/vueManager/src/composables/useCrudDialog.js
@@ -1,5 +1,5 @@
 import { useLexicon } from '@vuetools/useLexicon'
-import { useToast } from 'primevue/usetoast'
+import { useToast } from 'primevue'
 import { ref } from 'vue'
 
 /**
diff --git a/vueManager/src/composables/useOrderLogFormatters.js b/vueManager/src/composables/useOrderLogFormatters.js
index 9a2c9985c..3de4a87a3 100644
--- a/vueManager/src/composables/useOrderLogFormatters.js
+++ b/vueManager/src/composables/useOrderLogFormatters.js
@@ -1,3 +1,5 @@
+import { useLexicon } from '@vuetools/useLexicon'
+
 import { useOrderFormatters } from './useOrderFormatters.js'
 
 /**
@@ -5,15 +7,36 @@ import { useOrderFormatters } from './useOrderFormatters.js'
  * Pass `formatPrice` from `useOrderFormatters()` in `options` to avoid a second composable call.
  */
 export function useOrderLogFormatters(options = {}) {
+  const { _ } = useLexicon()
   const formatPrice = options.formatPrice ?? useOrderFormatters().formatPrice
 
-  function capitalizeFirst(str) {
-    if (!str) return ''
-    return str.charAt(0).toUpperCase() + str.slice(1)
+  const ACTION_SEVERITY = {
+    status: 'info',
+    products: 'success',
+    payment: 'warn',
+    address: 'secondary',
+    field: 'secondary',
+  }
+
+  function formatLogAction(action) {
+    if (!action) return '—'
+    const key = `log_action_${action}`
+    const label = _(key)
+    return label !== key ? label : action
+  }
+
+  function logActionSeverity(action) {
+    return ACTION_SEVERITY[action] || 'secondary'
+  }
+
+  function formatProductOperation(op) {
+    const key = `log_entry_product_op_${op}`
+    const label = _(key)
+    return label !== key ? label : op
   }
 
   function formatLogEntryObject(action, entry) {
-    if (!entry) return '-'
+    if (!entry) return '—'
 
     switch (action) {
       case 'status':
@@ -21,21 +44,21 @@ export function useOrderLogFormatters(options = {}) {
           return entry.new_status_name
         }
         if (entry.status_id) {
-          return `Status ID: ${entry.status_id}`
+          return _('log_entry_status_id').replace('{id}', String(entry.status_id))
         }
         break
 
       case 'products': {
-        const op = entry.operation || 'unknown'
+        const op = formatProductOperation(entry.operation || 'unknown')
         const productName = entry.product_name || ''
         const count = entry.count ? ` (×${entry.count})` : ''
-        return `${capitalizeFirst(op)}: ${productName}${count}`
+        return `${op}: ${productName}${count}`.trim()
       }
 
       case 'field': {
         if (entry.fields) {
           const fieldNames = Object.keys(entry.fields)
-          return `Fields: ${fieldNames.join(', ')}`
+          return _('log_entry_fields').replace('{fields}', fieldNames.join(', '))
         }
         break
       }
@@ -43,15 +66,15 @@ export function useOrderLogFormatters(options = {}) {
       case 'address': {
         if (entry.fields) {
           const fieldNames = Object.keys(entry.fields)
-          return `Address: ${fieldNames.join(', ')}`
+          return _('log_entry_address').replace('{fields}', fieldNames.join(', '))
         }
         break
       }
 
       case 'payment': {
-        const payOp = entry.operation || 'unknown'
+        const payOp = formatProductOperation(entry.operation || 'unknown')
         const amount = entry.amount || 0
-        return `${capitalizeFirst(payOp)}: ${formatPrice(amount)}`
+        return `${payOp}: ${formatPrice(amount)}`
       }
 
       default: {
@@ -59,33 +82,44 @@ export function useOrderLogFormatters(options = {}) {
           .filter(([, v]) => v !== null && v !== undefined)
           .map(([k, v]) => `${k}: ${typeof v === 'object' ? JSON.stringify(v) : v}`)
           .slice(0, 3)
-        return pairs.join(', ') || '-'
+        return pairs.join(', ') || '—'
       }
     }
 
     return JSON.stringify(entry)
   }
 
+  function resolveEntryPayload(data) {
+    if (!data) return null
+    if (data.entry_data != null) return data.entry_data
+    return data.entry
+  }
+
   function formatLogEntry(data) {
-    if (!data || !data.entry) return '-'
+    if (!data) return '—'
+
+    const raw = resolveEntryPayload(data)
+    if (raw == null) return '—'
 
-    if (typeof data.entry === 'string') {
+    if (typeof raw === 'string') {
       try {
-        const parsed = JSON.parse(data.entry)
+        const parsed = JSON.parse(raw)
         return formatLogEntryObject(data.action, parsed)
       } catch {
-        return data.entry
+        return raw
       }
     }
 
-    if (typeof data.entry === 'object') {
-      return formatLogEntryObject(data.action, data.entry)
+    if (typeof raw === 'object') {
+      return formatLogEntryObject(data.action, raw)
     }
 
-    return String(data.entry)
+    return String(raw)
   }
 
   return {
+    formatLogAction,
+    logActionSeverity,
     formatLogEntry,
   }
 }
diff --git a/vueManager/src/composables/useOrderView.js b/vueManager/src/composables/useOrderView.js
index 451a68b84..0cedc13a4 100644
--- a/vueManager/src/composables/useOrderView.js
+++ b/vueManager/src/composables/useOrderView.js
@@ -7,8 +7,7 @@
  * and the return shape consumed by OrderView.vue are preserved unchanged.
  */
 import { useLexicon } from '@vuetools/useLexicon'
-import { useConfirm } from 'primevue/useconfirm'
-import { useToast } from 'primevue/usetoast'
+import { useConfirm, useToast } from 'primevue'
 import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 import { useOrderCostRecalc } from './useOrderCostRecalc.js'
diff --git a/vueManager/src/composables/useResourceList.js b/vueManager/src/composables/useResourceList.js
index 78b5c2487..42821a060 100644
--- a/vueManager/src/composables/useResourceList.js
+++ b/vueManager/src/composables/useResourceList.js
@@ -1,5 +1,5 @@
 import { useLexicon } from '@vuetools/useLexicon'
-import { useToast } from 'primevue/usetoast'
+import { useToast } from 'primevue'
 
 import { createResourceList } from './resourceListCore.js'
 
diff --git a/vueManager/src/composables/useSelection.js b/vueManager/src/composables/useSelection.js
index c751009fb..a05a6d128 100644
--- a/vueManager/src/composables/useSelection.js
+++ b/vueManager/src/composables/useSelection.js
@@ -1,5 +1,5 @@
 import { useLexicon } from '@vuetools/useLexicon'
-import { useConfirm } from 'primevue/useconfirm'
+import { useConfirm } from 'primevue'
 import { computed, ref } from 'vue'
 
 import { resolveUiGroup, toUiGroup, useGroupedToast } from './uiGroup.js'
diff --git a/vueManager/src/composables/useSortableList.js b/vueManager/src/composables/useSortableList.js
index a0c0043be..0b9423eca 100644
--- a/vueManager/src/composables/useSortableList.js
+++ b/vueManager/src/composables/useSortableList.js
@@ -1,5 +1,5 @@
 import { useLexicon } from '@vuetools/useLexicon'
-import { useToast } from 'primevue/usetoast'
+import { useToast } from 'primevue'
 import { ref } from 'vue'
 
 import request from '../request.js'
diff --git a/vueManager/src/entries/api-test.js b/vueManager/src/entries/api-test.js
index 123095537..41f572881 100644
--- a/vueManager/src/entries/api-test.js
+++ b/vueManager/src/entries/api-test.js
@@ -7,12 +7,9 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import Aura from '@primeuix/themes/aura'
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import PrimeVue from 'primevue/config'
-import ConfirmationService from 'primevue/confirmationservice'
-import ToastService from 'primevue/toastservice'
+import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import VueApiTest from '../components/ApiTest.vue'
diff --git a/vueManager/src/entries/category-options.js b/vueManager/src/entries/category-options.js
index 3806632f2..fa29c6d8d 100644
--- a/vueManager/src/entries/category-options.js
+++ b/vueManager/src/entries/category-options.js
@@ -5,11 +5,8 @@
  * ms3-grid-category-option + ms3-window-option-add + ms3-window-copy-category.
  */
 
-import Aura from '@primeuix/themes/aura'
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
-import PrimeVue from 'primevue/config'
-import ConfirmationService from 'primevue/confirmationservice'
-import ToastService from 'primevue/toastservice'
+import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import CategoryOptionsTab from '../components/CategoryOptionsTab.vue'
@@ -37,7 +34,7 @@ function mountApp() {
     theme: {
       preset: Aura,
       options: {
-        darkModeSelector: '.dark-mode',
+        darkModeSelector: 'none',
         cssLayer: false,
       },
     },
diff --git a/vueManager/src/entries/category-products.js b/vueManager/src/entries/category-products.js
index 3691df92e..748d17e51 100644
--- a/vueManager/src/entries/category-products.js
+++ b/vueManager/src/entries/category-products.js
@@ -8,12 +8,9 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import Aura from '@primeuix/themes/aura'
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import PrimeVue from 'primevue/config'
-import ConfirmationService from 'primevue/confirmationservice'
-import ToastService from 'primevue/toastservice'
+import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import CategoryProductsGrid from '../components/CategoryProductsGrid.vue'
diff --git a/vueManager/src/entries/customers.js b/vueManager/src/entries/customers.js
index a8ba079b0..3428a6ca7 100644
--- a/vueManager/src/entries/customers.js
+++ b/vueManager/src/entries/customers.js
@@ -7,12 +7,9 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import Aura from '@primeuix/themes/aura'
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import PrimeVue from 'primevue/config'
-import ConfirmationService from 'primevue/confirmationservice'
-import ToastService from 'primevue/toastservice'
+import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import CustomersGrid from '../components/CustomersGrid.vue'
diff --git a/vueManager/src/entries/help.js b/vueManager/src/entries/help.js
index 9eec73fd1..107775978 100644
--- a/vueManager/src/entries/help.js
+++ b/vueManager/src/entries/help.js
@@ -5,8 +5,7 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import Aura from '@primeuix/themes/aura'
-import PrimeVue from 'primevue/config'
+import { Aura, PrimeVue } from 'primevue'
 import { createApp } from 'vue'
 
 import HelpPage from '../components/HelpPage.vue'
diff --git a/vueManager/src/entries/notifications.js b/vueManager/src/entries/notifications.js
index 44c0e198a..03c4fd6c1 100644
--- a/vueManager/src/entries/notifications.js
+++ b/vueManager/src/entries/notifications.js
@@ -7,12 +7,9 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import Aura from '@primeuix/themes/aura'
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import PrimeVue from 'primevue/config'
-import ConfirmationService from 'primevue/confirmationservice'
-import ToastService from 'primevue/toastservice'
+import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import NotificationsGrid from '../components/NotificationsGrid.vue'
diff --git a/vueManager/src/entries/order.js b/vueManager/src/entries/order.js
index 9b54957f4..1371ea7c8 100644
--- a/vueManager/src/entries/order.js
+++ b/vueManager/src/entries/order.js
@@ -5,12 +5,9 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import Aura from '@primeuix/themes/aura'
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import PrimeVue from 'primevue/config'
-import ConfirmationService from 'primevue/confirmationservice'
-import ToastService from 'primevue/toastservice'
+import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import OrderView from '../components/OrderView.vue'
diff --git a/vueManager/src/entries/orders.js b/vueManager/src/entries/orders.js
index 3a19ada0e..53a2d9e85 100644
--- a/vueManager/src/entries/orders.js
+++ b/vueManager/src/entries/orders.js
@@ -5,12 +5,9 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import Aura from '@primeuix/themes/aura'
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import PrimeVue from 'primevue/config'
-import ConfirmationService from 'primevue/confirmationservice'
-import ToastService from 'primevue/toastservice'
+import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import OrdersGrid from '../components/OrdersGrid.vue'
diff --git a/vueManager/src/entries/product-tabs.js b/vueManager/src/entries/product-tabs.js
index 259dcd364..988a40255 100644
--- a/vueManager/src/entries/product-tabs.js
+++ b/vueManager/src/entries/product-tabs.js
@@ -9,12 +9,9 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import Aura from '@primeuix/themes/aura'
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import PrimeVue from 'primevue/config'
-import ConfirmationService from 'primevue/confirmationservice'
-import ToastService from 'primevue/toastservice'
+import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import ProductTabs from '../components/product/ProductTabs.vue'
diff --git a/vueManager/src/entries/settings.js b/vueManager/src/entries/settings.js
index 5a6f58ce0..d6732c313 100644
--- a/vueManager/src/entries/settings.js
+++ b/vueManager/src/entries/settings.js
@@ -5,11 +5,8 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import Aura from '@primeuix/themes/aura'
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
-import PrimeVue from 'primevue/config'
-import ConfirmationService from 'primevue/confirmationservice'
-import ToastService from 'primevue/toastservice'
+import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import SettingsPage from '../components/SettingsPage.vue'
diff --git a/vueManager/src/entries/utilities.js b/vueManager/src/entries/utilities.js
index db8bccda4..a5ec7188d 100644
--- a/vueManager/src/entries/utilities.js
+++ b/vueManager/src/entries/utilities.js
@@ -5,12 +5,9 @@
 import '../scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import Aura from '@primeuix/themes/aura'
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import PrimeVue from 'primevue/config'
-import ConfirmationService from 'primevue/confirmationservice'
-import ToastService from 'primevue/toastservice'
+import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 import UtilitiesPage from '../components/UtilitiesPage.vue'
diff --git a/vueManager/src/main.js b/vueManager/src/main.js
index 6d82daf90..421143c9b 100644
--- a/vueManager/src/main.js
+++ b/vueManager/src/main.js
@@ -1,12 +1,9 @@
 import './scss/primevue.scss'
 import 'primeicons/primeicons.css'
 
-import Aura from '@primeuix/themes/aura'
 import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'
 import { createPinia } from 'pinia'
-import PrimeVue from 'primevue/config'
-import ConfirmationService from 'primevue/confirmationservice'
-import ToastService from 'primevue/toastservice'
+import { Aura, ConfirmationService, PrimeVue, ToastService } from 'primevue'
 import { createApp } from 'vue'
 
 /**
diff --git a/vueManager/vite.config.js b/vueManager/vite.config.js
index f2f7fd584..d41acfdf0 100644
--- a/vueManager/vite.config.js
+++ b/vueManager/vite.config.js
@@ -101,6 +101,23 @@ export default defineConfig(({ command }) => {
     '@vuetools/usePrimeVueLocale',
   ]
 
+  // Subpath imports (primevue/button) resolve to node_modules and ship a second
+  // @primeuix Theme copy. Theme tokens then land on the Import Map instance while
+  // components read the bundled one → missing --p-button-* / broken chrome.
+  // Always: import { Button, DataTable } from 'primevue'
+  const rejectPrimeVueSubpaths = {
+    name: 'ms3-reject-primevue-subpaths',
+    resolveId(id) {
+      if (id === 'primevue' || !id.startsWith('primevue/')) {
+        return null
+      }
+      return this.error(
+        `Import "${id}" is not allowed. Use a named import from "primevue" ` +
+          `(VueTools Import Map barrel) so theme and components share one Theme instance.`,
+      )
+    },
+  }
+
   if (command === 'serve') {
     return {
       build: {
@@ -110,7 +127,7 @@ export default defineConfig(({ command }) => {
           external: [...external, ...vuetoolsComposables],
         },
       },
-      plugins: [vue(), vueDevTools()],
+      plugins: [rejectPrimeVueSubpaths, vue(), vueDevTools()],
       resolve: {
         alias: {
           '@': fileURLToPath(new URL('./src', import.meta.url)),
@@ -133,7 +150,7 @@ export default defineConfig(({ command }) => {
         cssMinify: false, // Отключаем минификацию CSS чтобы сохранить Unicode символы в PrimeIcons
         minify: 'esbuild',
       },
-      plugins: [vue()],
+      plugins: [rejectPrimeVueSubpaths, vue()],
       resolve: {
         alias: {
           '@': fileURLToPath(new URL('./src', import.meta.url)),