diff --git a/components/lib/accordion/Accordion.d.ts b/components/lib/accordion/Accordion.d.ts
index eba03e0d0..75ca204d3 100755
--- a/components/lib/accordion/Accordion.d.ts
+++ b/components/lib/accordion/Accordion.d.ts
@@ -232,8 +232,8 @@ export interface AccordionEmits {
  */
 declare class Accordion extends ClassComponent<AccordionProps, AccordionSlots, AccordionEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Accordion: GlobalComponentConstructor<Accordion>;
     }
 }
diff --git a/components/lib/accordiontab/AccordionTab.d.ts b/components/lib/accordiontab/AccordionTab.d.ts
index d97c144a5..f7ad00874 100755
--- a/components/lib/accordiontab/AccordionTab.d.ts
+++ b/components/lib/accordiontab/AccordionTab.d.ts
@@ -226,8 +226,8 @@ export interface AccordionTabEmits {}
  */
 declare class AccordionTab extends ClassComponent<AccordionTabProps, AccordionTabSlots, AccordionTabEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         AccordionTab: GlobalComponentConstructor<AccordionTab>;
     }
 }
diff --git a/components/lib/autocomplete/AutoComplete.d.ts b/components/lib/autocomplete/AutoComplete.d.ts
index 52165051b..e2c9dabeb 100755
--- a/components/lib/autocomplete/AutoComplete.d.ts
+++ b/components/lib/autocomplete/AutoComplete.d.ts
@@ -776,8 +776,8 @@ export interface AutoCompleteEmits {
  */
 declare class AutoComplete extends ClassComponent<AutoCompleteProps, AutoCompleteSlots, AutoCompleteEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         AutoComplete: GlobalComponentConstructor<AutoComplete>;
     }
 }
diff --git a/components/lib/avatar/Avatar.d.ts b/components/lib/avatar/Avatar.d.ts
index 99784b607..bf8341f8a 100644
--- a/components/lib/avatar/Avatar.d.ts
+++ b/components/lib/avatar/Avatar.d.ts
@@ -163,8 +163,8 @@ export interface AvatarEmits {
  */
 declare class Avatar extends ClassComponent<AvatarProps, AvatarSlots, AvatarEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Avatar: GlobalComponentConstructor<Avatar>;
     }
 }
diff --git a/components/lib/avatargroup/AvatarGroup.d.ts b/components/lib/avatargroup/AvatarGroup.d.ts
index 978fdead4..fa171ea43 100644
--- a/components/lib/avatargroup/AvatarGroup.d.ts
+++ b/components/lib/avatargroup/AvatarGroup.d.ts
@@ -112,8 +112,8 @@ export interface AvatarGroupEmits {}
  */
 declare class AvatarGroup extends ClassComponent<AvatarGroupProps, AvatarGroupSlots, AvatarGroupEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         AvatarGroup: GlobalComponentConstructor<AvatarGroup>;
     }
 }
diff --git a/components/lib/badge/Badge.d.ts b/components/lib/badge/Badge.d.ts
index 1d165b7fc..092031ec0 100644
--- a/components/lib/badge/Badge.d.ts
+++ b/components/lib/badge/Badge.d.ts
@@ -120,8 +120,8 @@ export interface BadgeEmits {}
  */
 declare class Badge extends ClassComponent<BadgeProps, BadgeSlots, BadgeEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Badge: GlobalComponentConstructor<Badge>;
     }
 }
diff --git a/components/lib/blockui/BlockUI.d.ts b/components/lib/blockui/BlockUI.d.ts
index a28e019e8..2edda21d6 100755
--- a/components/lib/blockui/BlockUI.d.ts
+++ b/components/lib/blockui/BlockUI.d.ts
@@ -160,8 +160,8 @@ export interface BlockUIEmits {
  */
 declare class BlockUI extends ClassComponent<BlockUIProps, BlockUISlots, BlockUIEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         BlockUI: GlobalComponentConstructor<BlockUI>;
     }
 }
diff --git a/components/lib/breadcrumb/Breadcrumb.d.ts b/components/lib/breadcrumb/Breadcrumb.d.ts
index eab425c6d..77e87024f 100755
--- a/components/lib/breadcrumb/Breadcrumb.d.ts
+++ b/components/lib/breadcrumb/Breadcrumb.d.ts
@@ -232,8 +232,8 @@ export interface BreadcrumbEmits {}
  */
 declare class Breadcrumb extends ClassComponent<BreadcrumbProps, BreadcrumbSlots, BreadcrumbEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Breadcrumb: GlobalComponentConstructor<Breadcrumb>;
     }
 }
diff --git a/components/lib/button/Button.d.ts b/components/lib/button/Button.d.ts
index eae282387..ffad1880b 100755
--- a/components/lib/button/Button.d.ts
+++ b/components/lib/button/Button.d.ts
@@ -243,8 +243,8 @@ export interface ButtonEmits {}
  */
 declare class Button extends ClassComponent<ButtonProps, ButtonSlots, ButtonEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Button: GlobalComponentConstructor<Button>;
     }
 }
diff --git a/components/lib/buttongroup/ButtonGroup.d.ts b/components/lib/buttongroup/ButtonGroup.d.ts
index c59c9f4f3..d844dba2b 100644
--- a/components/lib/buttongroup/ButtonGroup.d.ts
+++ b/components/lib/buttongroup/ButtonGroup.d.ts
@@ -104,8 +104,8 @@ export interface ButtonGroupEmits {}
  */
 declare class ButtonGroup extends ClassComponent<ButtonGroupProps, ButtonGroupSlots, ButtonGroupEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ButtonGroup: GlobalComponentConstructor<ButtonGroup>;
     }
 }
diff --git a/components/lib/calendar/BaseCalendar.vue b/components/lib/calendar/BaseCalendar.vue
index 5bbd95842..76be002c6 100644
--- a/components/lib/calendar/BaseCalendar.vue
+++ b/components/lib/calendar/BaseCalendar.vue
@@ -220,6 +220,18 @@ export default {
             type: Object,
             default: null
         },
+        todayButtonProps: {
+            type: Object,
+            default() {
+                return { severity: 'secondary', text: true };
+            }
+        },
+        clearButtonProps: {
+            type: Object,
+            default() {
+                return { severity: 'secondary', text: true };
+            }
+        },
         ariaLabelledby: {
             type: String,
             default: null
diff --git a/components/lib/calendar/Calendar.d.ts b/components/lib/calendar/Calendar.d.ts
index 09a955c45..fc4698fde 100755
--- a/components/lib/calendar/Calendar.d.ts
+++ b/components/lib/calendar/Calendar.d.ts
@@ -9,6 +9,7 @@
  */
 import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
+import { ButtonPassThroughOptions, ButtonProps } from '../button';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
 import { ClassComponent, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
@@ -126,7 +127,7 @@ export interface CalendarBlurEvent {
 
 /**
  * Custom passthrough(pt) options.
- * @see {@link CalendarProps.pt}
+ * @see {@link BaseCalendarProps.pt}
  */
 export interface CalendarPassThroughOptions {
     /**
@@ -308,12 +309,14 @@ export interface CalendarPassThroughOptions {
     buttonbar?: CalendarPassThroughOptionType;
     /**
      * Used to pass attributes to the today button's DOM element.
+     * @see {@link ButtonPassThroughOptions}
      */
-    todayButton?: CalendarPassThroughOptionType;
+    todayButton?: ButtonPassThroughOptions<CalendarSharedPassThroughMethodOptions>;
     /**
      * Used to pass attributes to the clear button's DOM element.
+     * @see {@link ButtonPassThroughOptions}
      */
-    clearButton?: CalendarPassThroughOptionType;
+    clearButton?: ButtonPassThroughOptions<CalendarSharedPassThroughMethodOptions>;
     /**
      * Used to pass attributes to the aria selected day's DOM element.
      */
@@ -490,19 +493,9 @@ export interface CalendarYearOptions {
 }
 
 /**
- * Defines valid properties in Calendar component.
+ * Defines valid base properties in Calendar component.
  */
-export interface CalendarProps {
-    /**
-     * Value of the component.
-     * @defaultValue null
-     */
-    modelValue?: string | Date | string[] | Date[] | undefined | null;
-    /**
-     * Defines the quantity of the selection.
-     * @defaultValue single
-     */
-    selectionMode?: 'single' | 'multiple' | 'range' | undefined;
+interface BaseCalendarProps {
     /**
      * Format of the date. Defaults to PrimeVue Locale configuration.
      */
@@ -760,6 +753,18 @@ export interface CalendarProps {
      * Style class of the overlay panel.
      */
     panelClass?: string | object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the today button component.
+     * @type {ButtonProps}
+     * @defaultValue { severity: 'secondary', text: true }
+     */
+    todayButtonProps?: object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the clear button component.
+     * @type {ButtonProps}
+     * @defaultValue { severity: 'secondary', text: true }
+     */
+    clearButtonProps?: object | undefined;
     /**
      * Establishes relationships between the component and label(s) where its value should be one or more element IDs.
      */
@@ -784,6 +789,57 @@ export interface CalendarProps {
      */
     unstyled?: boolean;
 }
+
+/**
+ * Defines valid single selection properties in Calendar component.
+ */
+interface CalendarPropsSingle extends BaseCalendarProps {
+    /**
+     * Value of the component.
+     * @defaultValue null
+     */
+    modelValue?: Date | undefined | null;
+    /**
+     * Defines the quantity of the selection.
+     * @defaultValue single
+     */
+    selectionMode?: 'single' | undefined;
+}
+
+/**
+ * Defines valid range selection properties in Calendar component.
+ */
+interface CalendarPropsRange extends BaseCalendarProps {
+    /**
+     * Value of the component.
+     * @defaultValue null
+     */
+    modelValue?: Array<Date | null> | undefined | null;
+    /**
+     * Defines the quantity of the selection.
+     * @defaultValue single
+     */
+    selectionMode?: 'range';
+}
+
+/**
+ * Defines valid multiple selection properties in Calendar component.
+ */
+interface CalendarPropsMultiple extends BaseCalendarProps {
+    /**
+     * Value of the component.
+     * @defaultValue null
+     */
+    modelValue?: Array<Date> | undefined | null;
+    /**
+     * Defines the quantity of the selection.
+     * @defaultValue single
+     */
+    selectionMode?: 'multiple';
+}
+
+export type CalendarProps = CalendarPropsSingle | CalendarPropsRange | CalendarPropsMultiple;
+
 /**
  * Defines valid options of the date slot in Calendar component.
  */
@@ -936,9 +992,9 @@ export interface CalendarSlots {
 export interface CalendarEmits {
     /**
      * Emitted when the value changes.
-     * @param {string | Date | string[] | Date[] | undefined} value - New value.
+     * @param {Date | Array<Date | null> | null} value - New value.
      */
-    'update:modelValue'(value: string | Date | string[] | Date[] | undefined): void;
+    'update:modelValue'(value: Date | Array<Date | null> | null): void;
     /**
      * Callback to invoke when input field is being typed.
      * @param {Event} event - Browser event
@@ -1006,8 +1062,8 @@ export interface CalendarEmits {
  */
 declare class Calendar extends ClassComponent<CalendarProps, CalendarSlots, CalendarEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Calendar: GlobalComponentConstructor<Calendar>;
     }
 }
diff --git a/components/lib/calendar/Calendar.vue b/components/lib/calendar/Calendar.vue
index e91469112..000c4230e 100755
--- a/components/lib/calendar/Calendar.vue
+++ b/components/lib/calendar/Calendar.vue
@@ -482,12 +482,8 @@
                         </div>
                     </div>
                     <div v-if="showButtonBar" :class="cx('buttonbar')" v-bind="ptm('buttonbar')">
-                        <button type="button" @click="onTodayButtonClick($event)" :class="cx('todayButton')" @keydown="onContainerButtonKeydown" v-bind="ptm('todayButton')" data-pc-group-section="button">
-                            {{ todayLabel }}
-                        </button>
-                        <button type="button" @click="onClearButtonClick($event)" :class="cx('clearButton')" @keydown="onContainerButtonKeydown" v-bind="ptm('clearButton')" data-pc-group-section="button">
-                            {{ clearLabel }}
-                        </button>
+                        <Button :label="todayLabel" @click="onTodayButtonClick($event)" :class="cx('todayButton')" @keydown="onContainerButtonKeydown" v-bind="todayButtonProps" :pt="ptm('todayButton')" data-pc-group-section="button" />
+                        <Button :label="clearLabel" @click="onClearButtonClick($event)" :class="cx('clearButton')" @keydown="onContainerButtonKeydown" v-bind="clearButtonProps" :pt="ptm('clearButton')" data-pc-group-section="button" />
                     </div>
                     <slot name="footer"></slot>
                 </div>
@@ -608,10 +604,6 @@ export default {
             if (!this.disabled) {
                 this.preventFocus = true;
                 this.initFocusableCell();
-
-                if (this.numberOfMonths === 1) {
-                    this.overlay.style.width = DomHandler.getOuterWidth(this.$el) + 'px';
-                }
             }
         } else {
             // this.input.value = this.formatValue(this.modelValue);
diff --git a/components/lib/card/Card.d.ts b/components/lib/card/Card.d.ts
index b64552c9d..00c244562 100755
--- a/components/lib/card/Card.d.ts
+++ b/components/lib/card/Card.d.ts
@@ -152,8 +152,8 @@ export interface CardEmits {}
  */
 declare class Card extends ClassComponent<CardProps, CardSlots, CardEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Card: GlobalComponentConstructor<Card>;
     }
 }
diff --git a/components/lib/carousel/Carousel.d.ts b/components/lib/carousel/Carousel.d.ts
index 826875bda..21b619de6 100755
--- a/components/lib/carousel/Carousel.d.ts
+++ b/components/lib/carousel/Carousel.d.ts
@@ -373,8 +373,8 @@ export interface CarouselEmits {
  */
 declare class Carousel extends ClassComponent<CarouselProps, CarouselSlots, CarouselEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Carousel: GlobalComponentConstructor<Carousel>;
     }
 }
diff --git a/components/lib/cascadeselect/CascadeSelect.d.ts b/components/lib/cascadeselect/CascadeSelect.d.ts
index d6aa6b4ae..bae223c0b 100644
--- a/components/lib/cascadeselect/CascadeSelect.d.ts
+++ b/components/lib/cascadeselect/CascadeSelect.d.ts
@@ -528,8 +528,8 @@ export interface CascadeSelectEmits {
  */
 declare class CascadeSelect extends ClassComponent<CascadeSelectProps, CascadeSelectSlots, CascadeSelectEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         CascadeSelect: GlobalComponentConstructor<CascadeSelect>;
     }
 }
diff --git a/components/lib/chart/Chart.d.ts b/components/lib/chart/Chart.d.ts
index 0ccc55ca8..c25209896 100755
--- a/components/lib/chart/Chart.d.ts
+++ b/components/lib/chart/Chart.d.ts
@@ -194,8 +194,8 @@ declare class Chart extends ClassComponent<ChartProps, ChartSlots, ChartEmits> {
     getChart(): any;
 }
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Chart: GlobalComponentConstructor<Chart>;
     }
 }
diff --git a/components/lib/checkbox/Checkbox.d.ts b/components/lib/checkbox/Checkbox.d.ts
index 2b0266c6a..50217b5e3 100755
--- a/components/lib/checkbox/Checkbox.d.ts
+++ b/components/lib/checkbox/Checkbox.d.ts
@@ -263,8 +263,8 @@ export interface CheckboxEmits {
  */
 declare class Checkbox extends ClassComponent<CheckboxProps, CheckboxSlots, CheckboxEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Checkbox: GlobalComponentConstructor<Checkbox>;
     }
 }
diff --git a/components/lib/chip/Chip.d.ts b/components/lib/chip/Chip.d.ts
index c0066555e..e54042784 100644
--- a/components/lib/chip/Chip.d.ts
+++ b/components/lib/chip/Chip.d.ts
@@ -204,8 +204,8 @@ export interface ChipEmits {
  */
 declare class Chip extends ClassComponent<ChipProps, ChipSlots, ChipEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Chip: GlobalComponentConstructor<Chip>;
     }
 }
diff --git a/components/lib/chips/Chips.d.ts b/components/lib/chips/Chips.d.ts
index 30a30a59b..c48fa60b5 100755
--- a/components/lib/chips/Chips.d.ts
+++ b/components/lib/chips/Chips.d.ts
@@ -302,8 +302,8 @@ export interface ChipsEmits {
  */
 declare class Chips extends ClassComponent<ChipsProps, ChipsSlots, ChipsEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Chips: GlobalComponentConstructor<Chips>;
     }
 }
diff --git a/components/lib/colorpicker/ColorPicker.d.ts b/components/lib/colorpicker/ColorPicker.d.ts
index f04e4e3ad..6ba38de47 100755
--- a/components/lib/colorpicker/ColorPicker.d.ts
+++ b/components/lib/colorpicker/ColorPicker.d.ts
@@ -239,8 +239,8 @@ export interface ColorPickerEmits {
  */
 declare class ColorPicker extends ClassComponent<ColorPickerProps, ColorPickerSlots, ColorPickerEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ColorPicker: GlobalComponentConstructor<ColorPicker>;
     }
 }
diff --git a/components/lib/column/Column.d.ts b/components/lib/column/Column.d.ts
index 3e246eb39..f09e0d1f2 100755
--- a/components/lib/column/Column.d.ts
+++ b/components/lib/column/Column.d.ts
@@ -983,8 +983,8 @@ declare class Column extends ClassComponent<ColumnProps, ColumnSlots, ColumnEmit
 
 export type ColumnNode = Column & { props: Column['$props'] };
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Column: GlobalComponentConstructor<Column>;
     }
 }
diff --git a/components/lib/columngroup/ColumnGroup.d.ts b/components/lib/columngroup/ColumnGroup.d.ts
index 10958e970..3834573b0 100755
--- a/components/lib/columngroup/ColumnGroup.d.ts
+++ b/components/lib/columngroup/ColumnGroup.d.ts
@@ -127,8 +127,8 @@ export interface ColumnGroupEmits {}
  */
 declare class ColumnGroup extends ClassComponent<ColumnGroupProps, ColumnGroupSlots, ColumnGroupEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ColumnGroup: GlobalComponentConstructor<ColumnGroup>;
     }
 }
diff --git a/components/lib/confirmdialog/ConfirmDialog.d.ts b/components/lib/confirmdialog/ConfirmDialog.d.ts
index 873e625c2..fc0587bb6 100644
--- a/components/lib/confirmdialog/ConfirmDialog.d.ts
+++ b/components/lib/confirmdialog/ConfirmDialog.d.ts
@@ -290,8 +290,8 @@ export interface ConfirmDialogEmits {}
  */
 declare class ConfirmDialog extends ClassComponent<ConfirmDialogProps, ConfirmDialogSlots, ConfirmDialogEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ConfirmDialog: GlobalComponentConstructor<ConfirmDialog>;
     }
 }
diff --git a/components/lib/confirmpopup/ConfirmPopup.d.ts b/components/lib/confirmpopup/ConfirmPopup.d.ts
index 4034ea61e..f9769896f 100644
--- a/components/lib/confirmpopup/ConfirmPopup.d.ts
+++ b/components/lib/confirmpopup/ConfirmPopup.d.ts
@@ -235,8 +235,8 @@ export interface ConfirmPopupEmits {}
  */
 declare class ConfirmPopup extends ClassComponent<ConfirmPopupProps, ConfirmPopupSlots, ConfirmPopupEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ConfirmPopup: GlobalComponentConstructor<ConfirmPopup>;
     }
 }
diff --git a/components/lib/contextmenu/ContextMenu.d.ts b/components/lib/contextmenu/ContextMenu.d.ts
index 8952a4eaa..da72e0158 100755
--- a/components/lib/contextmenu/ContextMenu.d.ts
+++ b/components/lib/contextmenu/ContextMenu.d.ts
@@ -402,8 +402,8 @@ declare class ContextMenu extends ClassComponent<ContextMenuProps, ContextMenuSl
     hide(): void;
 }
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ContextMenu: GlobalComponentConstructor<ContextMenu>;
     }
 }
diff --git a/components/lib/datatable/DataTable.d.ts b/components/lib/datatable/DataTable.d.ts
index 9f88f6fd8..8d95f3ab1 100755
--- a/components/lib/datatable/DataTable.d.ts
+++ b/components/lib/datatable/DataTable.d.ts
@@ -1517,8 +1517,8 @@ declare class DataTable extends ClassComponent<DataTableProps, DataTableSlots, D
     exportCSV(options?: DataTableExportCSVOptions, data?: any[]): void;
 }
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         DataTable: GlobalComponentConstructor<DataTable>;
     }
 }
diff --git a/components/lib/dataview/DataView.d.ts b/components/lib/dataview/DataView.d.ts
index 2f9cbd896..a5967c9d7 100755
--- a/components/lib/dataview/DataView.d.ts
+++ b/components/lib/dataview/DataView.d.ts
@@ -341,8 +341,8 @@ export interface DataViewEmits {
  */
 declare class DataView extends ClassComponent<DataViewProps, DataViewSlots, DataViewEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         DataView: GlobalComponentConstructor<DataView>;
     }
 }
diff --git a/components/lib/dataviewlayoutoptions/DataViewLayoutOptions.d.ts b/components/lib/dataviewlayoutoptions/DataViewLayoutOptions.d.ts
index dc87b7dfd..85d64a02c 100755
--- a/components/lib/dataviewlayoutoptions/DataViewLayoutOptions.d.ts
+++ b/components/lib/dataviewlayoutoptions/DataViewLayoutOptions.d.ts
@@ -176,8 +176,8 @@ export interface DataViewLayoutOptionsEmits {
  */
 declare class DataViewLayoutOptions extends ClassComponent<DataViewLayoutOptionsProps, DataViewLayoutOptionsSlots, DataViewLayoutOptionsEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         DataViewLayoutOptions: GlobalComponentConstructor<DataViewLayoutOptions>;
     }
 }
diff --git a/components/lib/deferredcontent/DeferredContent.d.ts b/components/lib/deferredcontent/DeferredContent.d.ts
index 470f5f976..dd9a1336f 100755
--- a/components/lib/deferredcontent/DeferredContent.d.ts
+++ b/components/lib/deferredcontent/DeferredContent.d.ts
@@ -132,8 +132,8 @@ export interface DeferredContentEmits {
  */
 declare class DeferredContent extends ClassComponent<DeferredContentProps, DeferredContentSlots, DeferredContentEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         DeferredContent: GlobalComponentConstructor<DeferredContent>;
     }
 }
diff --git a/components/lib/dialog/Dialog.d.ts b/components/lib/dialog/Dialog.d.ts
index 13df1dbc8..10292b456 100755
--- a/components/lib/dialog/Dialog.d.ts
+++ b/components/lib/dialog/Dialog.d.ts
@@ -415,8 +415,8 @@ export interface DialogEmits {
  */
 declare class Dialog extends ClassComponent<DialogProps, DialogSlots, DialogEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Dialog: GlobalComponentConstructor<Dialog>;
     }
 }
diff --git a/components/lib/divider/Divider.d.ts b/components/lib/divider/Divider.d.ts
index 7ebbde7ef..14cc0543d 100644
--- a/components/lib/divider/Divider.d.ts
+++ b/components/lib/divider/Divider.d.ts
@@ -128,8 +128,8 @@ export interface DividerEmits {}
  */
 declare class Divider extends ClassComponent<DividerProps, DividerSlots, DividerEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Divider: GlobalComponentConstructor<Divider>;
     }
 }
diff --git a/components/lib/dock/Dock.d.ts b/components/lib/dock/Dock.d.ts
index ce684207d..d8ee32d22 100644
--- a/components/lib/dock/Dock.d.ts
+++ b/components/lib/dock/Dock.d.ts
@@ -311,8 +311,8 @@ export interface DockEmits {
  */
 declare class Dock extends ClassComponent<DockProps, DockSlots, DockEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Dock: GlobalComponentConstructor<Dock>;
     }
 }
diff --git a/components/lib/dropdown/Dropdown.d.ts b/components/lib/dropdown/Dropdown.d.ts
index 98bfdcab5..75b742d7f 100755
--- a/components/lib/dropdown/Dropdown.d.ts
+++ b/components/lib/dropdown/Dropdown.d.ts
@@ -758,8 +758,8 @@ declare class Dropdown extends ClassComponent<DropdownProps, DropdownSlots, Drop
     hide: (isFocus?: boolean) => void;
 }
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Dropdown: GlobalComponentConstructor<Dropdown>;
     }
 }
diff --git a/components/lib/dynamicdialog/DynamicDialog.d.ts b/components/lib/dynamicdialog/DynamicDialog.d.ts
index 3c730db63..3db5a2e11 100644
--- a/components/lib/dynamicdialog/DynamicDialog.d.ts
+++ b/components/lib/dynamicdialog/DynamicDialog.d.ts
@@ -43,8 +43,8 @@ export interface DynamicDialogSlots {}
  */
 declare class DynamicDialog extends ClassComponent<DynamicDialogProps, DynamicDialogSlots, DynamicDialogEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         DynamicDialog: GlobalComponentConstructor<DynamicDialog>;
     }
 }
diff --git a/components/lib/editor/Editor.d.ts b/components/lib/editor/Editor.d.ts
index 1b1066008..e5d965e46 100755
--- a/components/lib/editor/Editor.d.ts
+++ b/components/lib/editor/Editor.d.ts
@@ -305,8 +305,8 @@ export interface EditorEmits {
  */
 declare class Editor extends ClassComponent<EditorProps, EditorSlots, EditorEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Editor: GlobalComponentConstructor<Editor>;
     }
 }
diff --git a/components/lib/fieldset/Fieldset.d.ts b/components/lib/fieldset/Fieldset.d.ts
index a6a6db652..823e60d25 100755
--- a/components/lib/fieldset/Fieldset.d.ts
+++ b/components/lib/fieldset/Fieldset.d.ts
@@ -211,8 +211,8 @@ export interface FieldsetEmits {
  */
 declare class Fieldset extends ClassComponent<FieldsetProps, FieldsetSlots, FieldsetEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Fieldset: GlobalComponentConstructor<Fieldset>;
     }
 }
diff --git a/components/lib/fileupload/FileUpload.d.ts b/components/lib/fileupload/FileUpload.d.ts
index 221569b44..6e81481cb 100755
--- a/components/lib/fileupload/FileUpload.d.ts
+++ b/components/lib/fileupload/FileUpload.d.ts
@@ -614,8 +614,8 @@ export interface FileUploadEmits {
  */
 declare class FileUpload extends ClassComponent<FileUploadProps, FileUploadSlots, FileUploadEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         FileUpload: GlobalComponentConstructor<FileUpload>;
     }
 }
diff --git a/components/lib/floatlabel/FloatLabel.d.ts b/components/lib/floatlabel/FloatLabel.d.ts
index e0cbb71a8..b1b440616 100644
--- a/components/lib/floatlabel/FloatLabel.d.ts
+++ b/components/lib/floatlabel/FloatLabel.d.ts
@@ -115,8 +115,8 @@ export interface FloatLabelEmits {}
  */
 declare class FloatLabel extends ClassComponent<FloatLabelProps, FloatLabelSlots, FloatLabelEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         FloatLabel: GlobalComponentConstructor<FloatLabel>;
     }
 }
diff --git a/components/lib/galleria/Galleria.d.ts b/components/lib/galleria/Galleria.d.ts
index dd64410b6..21757c800 100755
--- a/components/lib/galleria/Galleria.d.ts
+++ b/components/lib/galleria/Galleria.d.ts
@@ -526,8 +526,8 @@ export interface GalleriaEmits {
  */
 declare class Galleria extends ClassComponent<GalleriaProps, GalleriaSlots, GalleriaEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Galleria: GlobalComponentConstructor<Galleria>;
     }
 }
diff --git a/components/lib/iconfield/IconField.d.ts b/components/lib/iconfield/IconField.d.ts
index 696fb08db..8ca6ebd54 100644
--- a/components/lib/iconfield/IconField.d.ts
+++ b/components/lib/iconfield/IconField.d.ts
@@ -118,8 +118,8 @@ export interface IconFieldEmits {}
  */
 declare class IconField extends ClassComponent<IconFieldProps, IconFieldSlots, IconFieldEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         IconField: GlobalComponentConstructor<IconField>;
     }
 }
diff --git a/components/lib/icons/angledoubledown/index.d.ts b/components/lib/icons/angledoubledown/index.d.ts
index 3d3f28dba..cb0234d39 100644
--- a/components/lib/icons/angledoubledown/index.d.ts
+++ b/components/lib/icons/angledoubledown/index.d.ts
@@ -3,8 +3,8 @@ import { Icon } from '../index';
 
 declare class AngleDoubleDownIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         AngleDoubleDownIcon: GlobalComponentConstructor<AngleDoubleDownIcon>;
     }
 }
diff --git a/components/lib/icons/angledoubleleft/index.d.ts b/components/lib/icons/angledoubleleft/index.d.ts
index b81bd406a..ffa75c79e 100644
--- a/components/lib/icons/angledoubleleft/index.d.ts
+++ b/components/lib/icons/angledoubleleft/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class AngleDoubleLeftIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         AngleDoubleLeftIcon: GlobalComponentConstructor<AngleDoubleLeftIcon>;
     }
 }
diff --git a/components/lib/icons/angledoubleright/index.d.ts b/components/lib/icons/angledoubleright/index.d.ts
index 20a97ac20..fbdeabfcd 100644
--- a/components/lib/icons/angledoubleright/index.d.ts
+++ b/components/lib/icons/angledoubleright/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class AngleDoubleRightIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         AngleDoubleRightIcon: GlobalComponentConstructor<AngleDoubleRightIcon>;
     }
 }
diff --git a/components/lib/icons/angledoubleup/index.d.ts b/components/lib/icons/angledoubleup/index.d.ts
index 642614d5f..ef26df0be 100644
--- a/components/lib/icons/angledoubleup/index.d.ts
+++ b/components/lib/icons/angledoubleup/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class AngleDoubleUpIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         AngleDoubleUpIcon: GlobalComponentConstructor<AngleDoubleUpIcon>;
     }
 }
diff --git a/components/lib/icons/angledown/index.d.ts b/components/lib/icons/angledown/index.d.ts
index 079531d54..1682a6ff6 100644
--- a/components/lib/icons/angledown/index.d.ts
+++ b/components/lib/icons/angledown/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class AngleDownIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         AngleDownIcon: GlobalComponentConstructor<AngleDownIcon>;
     }
 }
diff --git a/components/lib/icons/angleleft/index.d.ts b/components/lib/icons/angleleft/index.d.ts
index 6ddb1164d..82c0bfae2 100644
--- a/components/lib/icons/angleleft/index.d.ts
+++ b/components/lib/icons/angleleft/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class AngleLeftIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         AngleLeftIcon: GlobalComponentConstructor<AngleLeftIcon>;
     }
 }
diff --git a/components/lib/icons/angleright/index.d.ts b/components/lib/icons/angleright/index.d.ts
index 78aafbaa0..d9d00be6c 100644
--- a/components/lib/icons/angleright/index.d.ts
+++ b/components/lib/icons/angleright/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class AngleRightIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         AngleRightIcon: GlobalComponentConstructor<AngleRightIcon>;
     }
 }
diff --git a/components/lib/icons/angleup/index.d.ts b/components/lib/icons/angleup/index.d.ts
index 3e04985c5..7d91df093 100644
--- a/components/lib/icons/angleup/index.d.ts
+++ b/components/lib/icons/angleup/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class AngleUpIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         AngleUpIcon: GlobalComponentConstructor<AngleUpIcon>;
     }
 }
diff --git a/components/lib/icons/arrowdown/index.d.ts b/components/lib/icons/arrowdown/index.d.ts
index 3770b6f5e..cdce64bad 100644
--- a/components/lib/icons/arrowdown/index.d.ts
+++ b/components/lib/icons/arrowdown/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class ArrowDownIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ArrowDownIcon: GlobalComponentConstructor<ArrowDownIcon>;
     }
 }
diff --git a/components/lib/icons/arrowup/index.d.ts b/components/lib/icons/arrowup/index.d.ts
index c68801d43..8d410e0a6 100644
--- a/components/lib/icons/arrowup/index.d.ts
+++ b/components/lib/icons/arrowup/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class ArrowUpIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ArrowUpIcon: GlobalComponentConstructor<ArrowUpIcon>;
     }
 }
diff --git a/components/lib/icons/ban/index.d.ts b/components/lib/icons/ban/index.d.ts
index cb0da1937..5454cbeee 100644
--- a/components/lib/icons/ban/index.d.ts
+++ b/components/lib/icons/ban/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class BanIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         BanIcon: GlobalComponentConstructor<BanIcon>;
     }
 }
diff --git a/components/lib/icons/bars/index.d.ts b/components/lib/icons/bars/index.d.ts
index dcbb5f9e7..01302e39b 100644
--- a/components/lib/icons/bars/index.d.ts
+++ b/components/lib/icons/bars/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class BarsIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         BarsIcon: GlobalComponentConstructor<BarsIcon>;
     }
 }
diff --git a/components/lib/icons/blank/index.d.ts b/components/lib/icons/blank/index.d.ts
index 29ac9263b..3b32ead72 100644
--- a/components/lib/icons/blank/index.d.ts
+++ b/components/lib/icons/blank/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class BlankIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         BlankIcon: GlobalComponentConstructor<BlankIcon>;
     }
 }
diff --git a/components/lib/icons/calendar/index.d.ts b/components/lib/icons/calendar/index.d.ts
index f58f9aabd..8f974393b 100644
--- a/components/lib/icons/calendar/index.d.ts
+++ b/components/lib/icons/calendar/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class CalendarIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         CalendarIcon: GlobalComponentConstructor<CalendarIcon>;
     }
 }
diff --git a/components/lib/icons/check/index.d.ts b/components/lib/icons/check/index.d.ts
index 1aa5ef9c6..cab7a5338 100644
--- a/components/lib/icons/check/index.d.ts
+++ b/components/lib/icons/check/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class CheckIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         CheckIcon: GlobalComponentConstructor<CheckIcon>;
     }
 }
diff --git a/components/lib/icons/chevrondown/index.d.ts b/components/lib/icons/chevrondown/index.d.ts
index 4b3abd83b..e7fc946a4 100644
--- a/components/lib/icons/chevrondown/index.d.ts
+++ b/components/lib/icons/chevrondown/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class ChevronDownIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ChevronDownIcon: GlobalComponentConstructor<ChevronDownIcon>;
     }
 }
diff --git a/components/lib/icons/chevronleft/index.d.ts b/components/lib/icons/chevronleft/index.d.ts
index d53b77e74..dfa195fa8 100644
--- a/components/lib/icons/chevronleft/index.d.ts
+++ b/components/lib/icons/chevronleft/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class ChevronLeftIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ChevronLeftIcon: GlobalComponentConstructor<ChevronLeftIcon>;
     }
 }
diff --git a/components/lib/icons/chevronright/index.d.ts b/components/lib/icons/chevronright/index.d.ts
index 86a349334..e586e7d70 100644
--- a/components/lib/icons/chevronright/index.d.ts
+++ b/components/lib/icons/chevronright/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class ChevronRightIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ChevronRightIcon: GlobalComponentConstructor<ChevronRightIcon>;
     }
 }
diff --git a/components/lib/icons/chevronup/index.d.ts b/components/lib/icons/chevronup/index.d.ts
index 7ea2eb703..f0aa3d513 100644
--- a/components/lib/icons/chevronup/index.d.ts
+++ b/components/lib/icons/chevronup/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class ChevronUpIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ChevronUpIcon: GlobalComponentConstructor<ChevronUpIcon>;
     }
 }
diff --git a/components/lib/icons/exclamationtriangle/index.d.ts b/components/lib/icons/exclamationtriangle/index.d.ts
index c10a36919..f6eca9375 100644
--- a/components/lib/icons/exclamationtriangle/index.d.ts
+++ b/components/lib/icons/exclamationtriangle/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class ExclamationTriangleIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ExclamationTriangleIcon: GlobalComponentConstructor<ExclamationTriangleIcon>;
     }
 }
diff --git a/components/lib/icons/eye/index.d.ts b/components/lib/icons/eye/index.d.ts
index 911a2df16..aeeb38104 100644
--- a/components/lib/icons/eye/index.d.ts
+++ b/components/lib/icons/eye/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class EyeIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         EyeIcon: GlobalComponentConstructor<EyeIcon>;
     }
 }
diff --git a/components/lib/icons/eyeslash/index.d.ts b/components/lib/icons/eyeslash/index.d.ts
index f69989ea7..edf508717 100644
--- a/components/lib/icons/eyeslash/index.d.ts
+++ b/components/lib/icons/eyeslash/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class EyeSlashIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         EyeSlashIcon: GlobalComponentConstructor<EyeSlashIcon>;
     }
 }
diff --git a/components/lib/icons/filter/index.d.ts b/components/lib/icons/filter/index.d.ts
index c1dd50cc9..475d2ef12 100644
--- a/components/lib/icons/filter/index.d.ts
+++ b/components/lib/icons/filter/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class FilterIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         FilterIcon: GlobalComponentConstructor<FilterIcon>;
     }
 }
diff --git a/components/lib/icons/filterslash/index.d.ts b/components/lib/icons/filterslash/index.d.ts
index 562f4fddd..904c30a00 100644
--- a/components/lib/icons/filterslash/index.d.ts
+++ b/components/lib/icons/filterslash/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class FilterSlashIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         FilterSlashIcon: GlobalComponentConstructor<FilterSlashIcon>;
     }
 }
diff --git a/components/lib/icons/infocircle/index.d.ts b/components/lib/icons/infocircle/index.d.ts
index 246fc46f2..879752aa7 100644
--- a/components/lib/icons/infocircle/index.d.ts
+++ b/components/lib/icons/infocircle/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class InfoCircleIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         InfoCircleIcon: GlobalComponentConstructor<InfoCircleIcon>;
     }
 }
diff --git a/components/lib/icons/minus/index.d.ts b/components/lib/icons/minus/index.d.ts
index 72e4b222e..83fd7cbe3 100644
--- a/components/lib/icons/minus/index.d.ts
+++ b/components/lib/icons/minus/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class MinusIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         MinusIcon: GlobalComponentConstructor<MinusIcon>;
     }
 }
diff --git a/components/lib/icons/pencil/index.d.ts b/components/lib/icons/pencil/index.d.ts
index 7d7a9b619..0ecf0ae41 100644
--- a/components/lib/icons/pencil/index.d.ts
+++ b/components/lib/icons/pencil/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class PencilIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         PencilIcon: GlobalComponentConstructor<PencilIcon>;
     }
 }
diff --git a/components/lib/icons/plus/index.d.ts b/components/lib/icons/plus/index.d.ts
index 110c55c35..fe3b54a19 100644
--- a/components/lib/icons/plus/index.d.ts
+++ b/components/lib/icons/plus/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class PlusIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         PlusIcon: GlobalComponentConstructor<PlusIcon>;
     }
 }
diff --git a/components/lib/icons/refresh/index.d.ts b/components/lib/icons/refresh/index.d.ts
index af35799cb..c87d04657 100644
--- a/components/lib/icons/refresh/index.d.ts
+++ b/components/lib/icons/refresh/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class RefreshIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         RefreshIcon: GlobalComponentConstructor<RefreshIcon>;
     }
 }
diff --git a/components/lib/icons/search/index.d.ts b/components/lib/icons/search/index.d.ts
index 2016f7df6..19a2821c2 100644
--- a/components/lib/icons/search/index.d.ts
+++ b/components/lib/icons/search/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class SearchIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         SearchIcon: GlobalComponentConstructor<SearchIcon>;
     }
 }
diff --git a/components/lib/icons/searchminus/index.d.ts b/components/lib/icons/searchminus/index.d.ts
index 1fb951b16..adc423095 100644
--- a/components/lib/icons/searchminus/index.d.ts
+++ b/components/lib/icons/searchminus/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class SearchMinusIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         SearchMinusIcon: GlobalComponentConstructor<SearchMinusIcon>;
     }
 }
diff --git a/components/lib/icons/searchplus/index.d.ts b/components/lib/icons/searchplus/index.d.ts
index 27f241f06..2501c379b 100644
--- a/components/lib/icons/searchplus/index.d.ts
+++ b/components/lib/icons/searchplus/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class SearchPlusIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         SearchPlusIcon: GlobalComponentConstructor<SearchPlusIcon>;
     }
 }
diff --git a/components/lib/icons/sortalt/index.d.ts b/components/lib/icons/sortalt/index.d.ts
index 46c24b5c3..4f02ca0eb 100644
--- a/components/lib/icons/sortalt/index.d.ts
+++ b/components/lib/icons/sortalt/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class SortAltIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         SortAltIcon: GlobalComponentConstructor<SortAltIcon>;
     }
 }
diff --git a/components/lib/icons/sortamountdown/index.d.ts b/components/lib/icons/sortamountdown/index.d.ts
index 60ff8dc95..57d3ad0ac 100644
--- a/components/lib/icons/sortamountdown/index.d.ts
+++ b/components/lib/icons/sortamountdown/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class SortAmountDownIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         SortAmountDownIcon: GlobalComponentConstructor<SortAmountDownIcon>;
     }
 }
diff --git a/components/lib/icons/sortamountupalt/index.d.ts b/components/lib/icons/sortamountupalt/index.d.ts
index d1747f4b9..c19b03b07 100644
--- a/components/lib/icons/sortamountupalt/index.d.ts
+++ b/components/lib/icons/sortamountupalt/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class SortAmountUpAltIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         SortAmountUpAltIcon: GlobalComponentConstructor<SortAmountUpAltIcon>;
     }
 }
diff --git a/components/lib/icons/spinner/index.d.ts b/components/lib/icons/spinner/index.d.ts
index d1b0d8ee7..7b2e35f2a 100644
--- a/components/lib/icons/spinner/index.d.ts
+++ b/components/lib/icons/spinner/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class SpinnerIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         SpinnerIcon: GlobalComponentConstructor<SpinnerIcon>;
     }
 }
diff --git a/components/lib/icons/star/index.d.ts b/components/lib/icons/star/index.d.ts
index ea8832dc8..c3f4749f3 100644
--- a/components/lib/icons/star/index.d.ts
+++ b/components/lib/icons/star/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class StarIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         StarIcon: GlobalComponentConstructor<StarIcon>;
     }
 }
diff --git a/components/lib/icons/starfill/index.d.ts b/components/lib/icons/starfill/index.d.ts
index d9a309e8b..5f6e6970a 100644
--- a/components/lib/icons/starfill/index.d.ts
+++ b/components/lib/icons/starfill/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class StarFillIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         StarFillIcon: GlobalComponentConstructor<StarFillIcon>;
     }
 }
diff --git a/components/lib/icons/thlarge/index.d.ts b/components/lib/icons/thlarge/index.d.ts
index f736f5b69..2c2231d29 100644
--- a/components/lib/icons/thlarge/index.d.ts
+++ b/components/lib/icons/thlarge/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class ThLargeIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ThLargeIcon: GlobalComponentConstructor<ThLargeIcon>;
     }
 }
diff --git a/components/lib/icons/times/index.d.ts b/components/lib/icons/times/index.d.ts
index 8df622b65..719de8110 100644
--- a/components/lib/icons/times/index.d.ts
+++ b/components/lib/icons/times/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class TimesIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         TimesIcon: GlobalComponentConstructor<TimesIcon>;
     }
 }
diff --git a/components/lib/icons/timescircle/index.d.ts b/components/lib/icons/timescircle/index.d.ts
index ecab9b280..6b69c4ca4 100644
--- a/components/lib/icons/timescircle/index.d.ts
+++ b/components/lib/icons/timescircle/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class TimesCircleIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         TimesCircleIcon: GlobalComponentConstructor<TimesCircleIcon>;
     }
 }
diff --git a/components/lib/icons/trash/index.d.ts b/components/lib/icons/trash/index.d.ts
index 3b9622fa3..0e16e6f82 100644
--- a/components/lib/icons/trash/index.d.ts
+++ b/components/lib/icons/trash/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class TrashIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         TrashIcon: GlobalComponentConstructor<TrashIcon>;
     }
 }
diff --git a/components/lib/icons/undo/index.d.ts b/components/lib/icons/undo/index.d.ts
index 30c20238e..d49b5799d 100644
--- a/components/lib/icons/undo/index.d.ts
+++ b/components/lib/icons/undo/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class UndoIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         UndoIcon: GlobalComponentConstructor<UndoIcon>;
     }
 }
diff --git a/components/lib/icons/upload/index.d.ts b/components/lib/icons/upload/index.d.ts
index c1bf1b27f..0c1320391 100644
--- a/components/lib/icons/upload/index.d.ts
+++ b/components/lib/icons/upload/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class UploadIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         UploadIcon: GlobalComponentConstructor<UploadIcon>;
     }
 }
diff --git a/components/lib/icons/windowmaximize/index.d.ts b/components/lib/icons/windowmaximize/index.d.ts
index 0ff26b742..2677c0971 100644
--- a/components/lib/icons/windowmaximize/index.d.ts
+++ b/components/lib/icons/windowmaximize/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class WindowMaximizeIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         WindowMaximizeIcon: GlobalComponentConstructor<WindowMaximizeIcon>;
     }
 }
diff --git a/components/lib/icons/windowminimize/index.d.ts b/components/lib/icons/windowminimize/index.d.ts
index 9eafc0be2..c5a50a2dd 100644
--- a/components/lib/icons/windowminimize/index.d.ts
+++ b/components/lib/icons/windowminimize/index.d.ts
@@ -3,8 +3,8 @@ import { GlobalComponentConstructor } from '../../ts-helpers';
 
 declare class WindowMinimizeIcon extends Icon {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         WindowMinimizeIcon: GlobalComponentConstructor<WindowMinimizeIcon>;
     }
 }
diff --git a/components/lib/image/Image.d.ts b/components/lib/image/Image.d.ts
index 7565272e9..7f0a26e5e 100644
--- a/components/lib/image/Image.d.ts
+++ b/components/lib/image/Image.d.ts
@@ -327,8 +327,8 @@ declare class Image extends ClassComponent<ImageProps, ImageSlots, ImageEmits> {
     error(): void;
 }
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Image: GlobalComponentConstructor<Image>;
     }
 }
diff --git a/components/lib/inlinemessage/InlineMessage.d.ts b/components/lib/inlinemessage/InlineMessage.d.ts
index e4c3a8af8..478615cdc 100755
--- a/components/lib/inlinemessage/InlineMessage.d.ts
+++ b/components/lib/inlinemessage/InlineMessage.d.ts
@@ -146,8 +146,8 @@ export interface InlineMessageEmits {}
  */
 declare class InlineMessage extends ClassComponent<InlineMessageProps, InlineMessageSlots, InlineMessageEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         InlineMessage: GlobalComponentConstructor<InlineMessage>;
     }
 }
diff --git a/components/lib/inplace/Inplace.d.ts b/components/lib/inplace/Inplace.d.ts
index a5b0eed39..d17323026 100755
--- a/components/lib/inplace/Inplace.d.ts
+++ b/components/lib/inplace/Inplace.d.ts
@@ -208,8 +208,8 @@ export interface InplaceEmits {
  */
 declare class Inplace extends ClassComponent<InplaceProps, InplaceSlots, InplaceEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Inplace: GlobalComponentConstructor<Inplace>;
     }
 }
diff --git a/components/lib/inputgroup/InputGroup.d.ts b/components/lib/inputgroup/InputGroup.d.ts
index 301100b26..76678dbc1 100644
--- a/components/lib/inputgroup/InputGroup.d.ts
+++ b/components/lib/inputgroup/InputGroup.d.ts
@@ -113,8 +113,8 @@ export interface InputGroupEmits {}
  */
 declare class InputGroup extends ClassComponent<InputGroupProps, InputGroupSlots, InputGroupEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         InputGroup: GlobalComponentConstructor<InputGroup>;
     }
 }
diff --git a/components/lib/inputgroupaddon/InputGroupAddon.d.ts b/components/lib/inputgroupaddon/InputGroupAddon.d.ts
index c2a026e9c..ad6a0ffef 100644
--- a/components/lib/inputgroupaddon/InputGroupAddon.d.ts
+++ b/components/lib/inputgroupaddon/InputGroupAddon.d.ts
@@ -113,8 +113,8 @@ export interface InputGroupAddonEmits {}
  */
 declare class InputGroupAddon extends ClassComponent<InputGroupAddonProps, InputGroupAddonSlots, InputGroupAddonEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         InputGroupAddon: GlobalComponentConstructor<InputGroupAddon>;
     }
 }
diff --git a/components/lib/inputicon/InputIcon.d.ts b/components/lib/inputicon/InputIcon.d.ts
index b31626188..8e9907984 100644
--- a/components/lib/inputicon/InputIcon.d.ts
+++ b/components/lib/inputicon/InputIcon.d.ts
@@ -108,8 +108,8 @@ export interface InputIconEmits {}
  */
 declare class InputIcon extends ClassComponent<InputIconProps, InputIconSlots, InputIconEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         InputIcon: GlobalComponentConstructor<InputIcon>;
     }
 }
diff --git a/components/lib/inputmask/InputMask.d.ts b/components/lib/inputmask/InputMask.d.ts
index eb3f7782a..22d30b519 100755
--- a/components/lib/inputmask/InputMask.d.ts
+++ b/components/lib/inputmask/InputMask.d.ts
@@ -212,8 +212,8 @@ export interface InputMaskEmits {
  */
 declare class InputMask extends ClassComponent<InputMaskProps, InputMaskSlots, InputMaskEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         InputMask: GlobalComponentConstructor<InputMask>;
     }
 }
diff --git a/components/lib/inputnumber/InputNumber.d.ts b/components/lib/inputnumber/InputNumber.d.ts
index 99cdebc3d..8d23d6d65 100755
--- a/components/lib/inputnumber/InputNumber.d.ts
+++ b/components/lib/inputnumber/InputNumber.d.ts
@@ -429,8 +429,8 @@ declare class InputNumber extends ClassComponent<InputNumberProps, InputNumberSl
     getFormatter: () => Intl.NumberFormat | undefined;
 }
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         InputNumber: GlobalComponentConstructor<InputNumber>;
     }
 }
diff --git a/components/lib/inputotp/InputOtp.d.ts b/components/lib/inputotp/InputOtp.d.ts
index 892c9bcbd..294a01e8e 100755
--- a/components/lib/inputotp/InputOtp.d.ts
+++ b/components/lib/inputotp/InputOtp.d.ts
@@ -266,8 +266,8 @@ export interface InputOtpEmits {
  */
 declare class InputOtp extends ClassComponent<InputOtpProps, InputOtpSlots, InputOtpEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         InputOtp: GlobalComponentConstructor<InputOtp>;
     }
 }
diff --git a/components/lib/inputswitch/InputSwitch.d.ts b/components/lib/inputswitch/InputSwitch.d.ts
index c6791e150..c348b37f0 100755
--- a/components/lib/inputswitch/InputSwitch.d.ts
+++ b/components/lib/inputswitch/InputSwitch.d.ts
@@ -207,8 +207,8 @@ export interface InputSwitchEmits {
  */
 declare class InputSwitch extends ClassComponent<InputSwitchProps, InputSwitchSlots, InputSwitchEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         InputSwitch: GlobalComponentConstructor<InputSwitch>;
     }
 }
diff --git a/components/lib/inputtext/InputText.d.ts b/components/lib/inputtext/InputText.d.ts
index 9255d07b5..124470fdf 100755
--- a/components/lib/inputtext/InputText.d.ts
+++ b/components/lib/inputtext/InputText.d.ts
@@ -147,8 +147,8 @@ export interface InputTextEmits {
  */
 declare class InputText extends ClassComponent<InputTextProps, InputTextSlots, InputTextEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         InputText: GlobalComponentConstructor<InputText>;
     }
 }
diff --git a/components/lib/knob/Knob.d.ts b/components/lib/knob/Knob.d.ts
index 45c440d0f..e99f5b6f0 100644
--- a/components/lib/knob/Knob.d.ts
+++ b/components/lib/knob/Knob.d.ts
@@ -242,8 +242,8 @@ export interface KnobEmits {
  */
 declare class Knob extends ClassComponent<KnobProps, KnobSlots, KnobEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Knob: GlobalComponentConstructor<Knob>;
     }
 }
diff --git a/components/lib/listbox/Listbox.d.ts b/components/lib/listbox/Listbox.d.ts
index b95c37d76..6bd88800d 100755
--- a/components/lib/listbox/Listbox.d.ts
+++ b/components/lib/listbox/Listbox.d.ts
@@ -567,8 +567,8 @@ export interface ListboxEmits {
  */
 declare class Listbox extends ClassComponent<ListboxProps, ListboxSlots, ListboxEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Listbox: GlobalComponentConstructor<Listbox>;
     }
 }
diff --git a/components/lib/megamenu/MegaMenu.d.ts b/components/lib/megamenu/MegaMenu.d.ts
index a63ffff6a..4de94700d 100755
--- a/components/lib/megamenu/MegaMenu.d.ts
+++ b/components/lib/megamenu/MegaMenu.d.ts
@@ -405,8 +405,8 @@ export interface MegaMenuEmits {
  */
 declare class MegaMenu extends ClassComponent<MegaMenuProps, MegaMenuSlots, MegaMenuEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         MegaMenu: GlobalComponentConstructor<MegaMenu>;
     }
 }
diff --git a/components/lib/menu/Menu.d.ts b/components/lib/menu/Menu.d.ts
index 9197a5449..21e97d871 100755
--- a/components/lib/menu/Menu.d.ts
+++ b/components/lib/menu/Menu.d.ts
@@ -359,8 +359,8 @@ declare class Menu extends ClassComponent<MenuProps, MenuSlots, MenuEmits> {
     hide(): void;
 }
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Menu: GlobalComponentConstructor<Menu>;
     }
 }
diff --git a/components/lib/menubar/Menubar.d.ts b/components/lib/menubar/Menubar.d.ts
index 2c6dc3436..5f87d1cd5 100755
--- a/components/lib/menubar/Menubar.d.ts
+++ b/components/lib/menubar/Menubar.d.ts
@@ -390,8 +390,8 @@ export interface MenubarEmits {}
  */
 declare class Menubar extends ClassComponent<MenubarProps, MenubarSlots, MenubarEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Menubar: GlobalComponentConstructor<Menubar>;
     }
 }
diff --git a/components/lib/message/Message.d.ts b/components/lib/message/Message.d.ts
index 1d366c0bb..9f2941df9 100755
--- a/components/lib/message/Message.d.ts
+++ b/components/lib/message/Message.d.ts
@@ -238,8 +238,8 @@ export interface MessageEmits {
  */
 declare class Message extends ClassComponent<MessageProps, MessageSlots, MessageEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Message: GlobalComponentConstructor<Message>;
     }
 }
diff --git a/components/lib/metergroup/MeterGroup.d.ts b/components/lib/metergroup/MeterGroup.d.ts
index 74135e7cb..8f2fbca52 100644
--- a/components/lib/metergroup/MeterGroup.d.ts
+++ b/components/lib/metergroup/MeterGroup.d.ts
@@ -293,8 +293,8 @@ export interface MeterGroupEmits {}
  */
 declare class MeterGroup extends ClassComponent<MeterGroupProps, MeterGroupSlots, MeterGroupEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         MeterGroup: GlobalComponentConstructor<MeterGroup>;
     }
 }
diff --git a/components/lib/multiselect/MultiSelect.d.ts b/components/lib/multiselect/MultiSelect.d.ts
index bd8bc0146..cf1d221f2 100755
--- a/components/lib/multiselect/MultiSelect.d.ts
+++ b/components/lib/multiselect/MultiSelect.d.ts
@@ -854,8 +854,8 @@ declare class MultiSelect extends ClassComponent<MultiSelectProps, MultiSelectSl
     hide(isFocus?: boolean): void;
 }
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         MultiSelect: GlobalComponentConstructor<MultiSelect>;
     }
 }
diff --git a/components/lib/orderlist/BaseOrderList.vue b/components/lib/orderlist/BaseOrderList.vue
index ace03efa5..62e2eb1b9 100644
--- a/components/lib/orderlist/BaseOrderList.vue
+++ b/components/lib/orderlist/BaseOrderList.vue
@@ -46,9 +46,27 @@ export default {
             type: Boolean,
             default: false
         },
-        severity: {
-            type: String,
-            default: 'secondary'
+        buttonProps: {
+            type: Object,
+            default() {
+                return { severity: 'secondary' };
+            }
+        },
+        moveUpButtonProps: {
+            type: null,
+            default: null
+        },
+        moveTopButtonProps: {
+            type: null,
+            default: null
+        },
+        moveDownButtonProps: {
+            type: null,
+            default: null
+        },
+        moveBottomButtonProps: {
+            type: null,
+            default: null
         },
         tabindex: {
             type: Number,
diff --git a/components/lib/orderlist/OrderList.d.ts b/components/lib/orderlist/OrderList.d.ts
index 7d12987c8..d0afa09a2 100755
--- a/components/lib/orderlist/OrderList.d.ts
+++ b/components/lib/orderlist/OrderList.d.ts
@@ -9,10 +9,10 @@
  */
 import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
-import { ButtonPassThroughOptions } from '../button';
+import { ButtonPassThroughOptions, ButtonProps } from '../button';
 import { ListboxPassThroughOptions } from '../listbox';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { ClassComponent, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type OrderListPassThroughOptionType = OrderListPassThroughAttributes | ((options: OrderListPassThroughMethodOptions) => OrderListPassThroughAttributes | string) | string | null | undefined;
 
@@ -231,10 +231,27 @@ export interface OrderListProps {
      */
     tabindex?: number | string | undefined;
     /**
-     * Defines the style of the button.
-     * @defaultValue secondary
+     * Used to pass all properties of the ButtonProps to the move up button inside the component.
+     * @type {ButtonProps}
+     * @defaultValue { severity: 'secondary' }
      */
-    severity?: HintedString<'secondary' | 'success' | 'info' | 'warning' | 'help' | 'danger' | 'contrast'> | undefined;
+    buttonProps?: object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the move up button inside the component.
+     */
+    moveUpButtonProps?: object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the move top button inside the component.
+     */
+    moveTopButtonProps?: object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the move down button inside the component.
+     */
+    moveDownButtonProps?: object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the move bottom button inside the component.
+     */
+    moveBottomButtonProps?: object | undefined;
     /**
      * Defines a string value that labels an interactive list element.
      */
@@ -347,8 +364,8 @@ export interface OrderListEmits {
  */
 declare class OrderList extends ClassComponent<OrderListProps, OrderListSlots, OrderListEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         OrderList: GlobalComponentConstructor<OrderList>;
     }
 }
diff --git a/components/lib/orderlist/OrderList.vue b/components/lib/orderlist/OrderList.vue
index 55ff3b6ce..716e9f8cd 100755
--- a/components/lib/orderlist/OrderList.vue
+++ b/components/lib/orderlist/OrderList.vue
@@ -2,28 +2,28 @@
     <div :class="cx('root')" v-bind="ptmi('root')">
         <div :class="cx('controls')" v-bind="ptm('controls')">
             <slot name="controlsstart"></slot>
-            <Button @click="moveUp" :aria-label="moveUpAriaLabel" :disabled="moveDisabled()" :severity="severity" :pt="ptm('moveUpButton')" :unstyled="unstyled">
+            <Button @click="moveUp" :aria-label="moveUpAriaLabel" :disabled="moveDisabled()" v-bind="{ ...buttonProps, ...moveUpButtonProps }" :pt="ptm('moveUpButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="moveupicon">
                         <AngleUpIcon v-bind="ptm('moveUpButton')['icon']" data-pc-section="moveupicon" />
                     </slot>
                 </template>
             </Button>
-            <Button @click="moveTop" :aria-label="moveTopAriaLabel" :disabled="moveDisabled()" :severity="severity" :pt="ptm('moveTopButton')" :unstyled="unstyled">
+            <Button @click="moveTop" :aria-label="moveTopAriaLabel" :disabled="moveDisabled()" v-bind="{ ...buttonProps, ...moveTopButtonProps }" :pt="ptm('moveTopButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="movetopicon">
                         <AngleDoubleUpIcon v-bind="ptm('moveTopButton')['icon']" data-pc-section="movetopicon" />
                     </slot>
                 </template>
             </Button>
-            <Button @click="moveDown" :aria-label="moveDownAriaLabel" :disabled="moveDisabled()" :severity="severity" :pt="ptm('moveDownButton')" :unstyled="unstyled">
+            <Button @click="moveDown" :aria-label="moveDownAriaLabel" :disabled="moveDisabled()" v-bind="{ ...buttonProps, ...moveDownButtonProps }" :pt="ptm('moveDownButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="movedownicon">
                         <AngleDownIcon v-bind="ptm('moveDownButton')['icon']" data-pc-section="movedownicon" />
                     </slot>
                 </template>
             </Button>
-            <Button @click="moveBottom" :aria-label="moveBottomAriaLabel" :disabled="moveDisabled()" :severity="severity" :pt="ptm('moveBottomButton')" :unstyled="unstyled">
+            <Button @click="moveBottom" :aria-label="moveBottomAriaLabel" :disabled="moveDisabled()" v-bind="{ ...buttonProps, ...moveBottomButtonProps }" :pt="ptm('moveBottomButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="movebottomicon">
                         <AngleDoubleDownIcon v-bind="ptm('moveBottomButton')['icon']" data-pc-section="movebottomicon" />
diff --git a/components/lib/organizationchart/OrganizationChart.d.ts b/components/lib/organizationchart/OrganizationChart.d.ts
index d538e8a61..7284241c6 100755
--- a/components/lib/organizationchart/OrganizationChart.d.ts
+++ b/components/lib/organizationchart/OrganizationChart.d.ts
@@ -341,8 +341,8 @@ export interface OrganizationChartEmits {
  */
 declare class OrganizationChart extends ClassComponent<OrganizationChartProps, OrganizationChartSlots, OrganizationChartEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         OrganizationChart: GlobalComponentConstructor<OrganizationChart>;
     }
 }
diff --git a/components/lib/overlaypanel/OverlayPanel.d.ts b/components/lib/overlaypanel/OverlayPanel.d.ts
index 4a9213332..d94a6ea37 100755
--- a/components/lib/overlaypanel/OverlayPanel.d.ts
+++ b/components/lib/overlaypanel/OverlayPanel.d.ts
@@ -250,8 +250,8 @@ declare class OverlayPanel extends ClassComponent<OverlayPanelProps, OverlayPane
     hide(): void;
 }
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         OverlayPanel: GlobalComponentConstructor<OverlayPanel>;
     }
 }
diff --git a/components/lib/paginator/Paginator.d.ts b/components/lib/paginator/Paginator.d.ts
index 966a2b185..6ff17e20b 100755
--- a/components/lib/paginator/Paginator.d.ts
+++ b/components/lib/paginator/Paginator.d.ts
@@ -376,8 +376,8 @@ export interface PaginatorEmits {
  */
 declare class Paginator extends ClassComponent<PaginatorProps, PaginatorSlots, PaginatorEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Paginator: GlobalComponentConstructor<Paginator>;
     }
 }
diff --git a/components/lib/panel/Panel.d.ts b/components/lib/panel/Panel.d.ts
index d85f4f325..319f84dae 100755
--- a/components/lib/panel/Panel.d.ts
+++ b/components/lib/panel/Panel.d.ts
@@ -243,8 +243,8 @@ export interface PanelEmits {
  */
 declare class Panel extends ClassComponent<PanelProps, PanelSlots, PanelEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Panel: GlobalComponentConstructor<Panel>;
     }
 }
diff --git a/components/lib/panelmenu/PanelMenu.d.ts b/components/lib/panelmenu/PanelMenu.d.ts
index 5b71563af..2c8d5f41c 100755
--- a/components/lib/panelmenu/PanelMenu.d.ts
+++ b/components/lib/panelmenu/PanelMenu.d.ts
@@ -405,8 +405,8 @@ export interface PanelMenuEmits {
  */
 declare class PanelMenu extends ClassComponent<PanelMenuProps, PanelMenuSlots, PanelMenuEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         PanelMenu: GlobalComponentConstructor<PanelMenu>;
     }
 }
diff --git a/components/lib/password/Password.d.ts b/components/lib/password/Password.d.ts
index b803db01d..6c305c8ac 100755
--- a/components/lib/password/Password.d.ts
+++ b/components/lib/password/Password.d.ts
@@ -379,8 +379,8 @@ export interface PasswordEmits {
  */
 declare class Password extends ClassComponent<PasswordProps, PasswordSlots, PasswordEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Password: GlobalComponentConstructor<Password>;
     }
 }
diff --git a/components/lib/picklist/BasePickList.vue b/components/lib/picklist/BasePickList.vue
index c6b3e74b3..9f73886cf 100644
--- a/components/lib/picklist/BasePickList.vue
+++ b/components/lib/picklist/BasePickList.vue
@@ -54,9 +54,43 @@ export default {
             type: Boolean,
             default: true
         },
-        severity: {
-            type: String,
-            default: 'secondary'
+        buttonProps: {
+            type: Object,
+            default() {
+                return { severity: 'secondary' };
+            }
+        },
+        moveUpButtonProps: {
+            type: null,
+            default: null
+        },
+        moveTopButtonProps: {
+            type: null,
+            default: null
+        },
+        moveDownButtonProps: {
+            type: null,
+            default: null
+        },
+        moveBottomButtonProps: {
+            type: null,
+            default: null
+        },
+        moveToTargetProps: {
+            type: null,
+            default: null
+        },
+        moveAllToTargetProps: {
+            type: null,
+            default: null
+        },
+        moveToSourceProps: {
+            type: null,
+            default: null
+        },
+        moveAllToSourceProps: {
+            type: null,
+            default: null
         },
         tabindex: {
             type: Number,
diff --git a/components/lib/picklist/PickList.d.ts b/components/lib/picklist/PickList.d.ts
index 85ba42000..09c0aee09 100755
--- a/components/lib/picklist/PickList.d.ts
+++ b/components/lib/picklist/PickList.d.ts
@@ -11,7 +11,7 @@ import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { ButtonPassThroughOptions } from '../button';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { ClassComponent, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type PickListPassThroughOptionType = PickListPassThroughAttributes | ((options: PickListPassThroughMethodOptions) => PickListPassThroughAttributes | string) | string | null | undefined;
 
@@ -365,10 +365,43 @@ export interface PickListProps {
      */
     showTargetControls?: boolean | undefined;
     /**
-     * Defines the style of the button.
-     * @defaultValue secondary
+     * Used to pass all properties of the ButtonProps to the move up button inside the component.
+     * @type {ButtonProps}
+     * @defaultValue { severity: 'secondary' }
      */
-    severity?: HintedString<'secondary' | 'success' | 'info' | 'warning' | 'help' | 'danger' | 'contrast'> | undefined;
+    buttonProps?: object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the move up button inside the component.
+     */
+    moveUpButtonProps?: object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the move top button inside the component.
+     */
+    moveTopButtonProps?: object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the move down button inside the component.
+     */
+    moveDownButtonProps?: object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the move bottom button inside the component.
+     */
+    moveBottomButtonProps?: object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the move to target button inside the component.
+     */
+    moveToTargetProps?: object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the move all to target button inside the component.
+     */
+    moveAllToTargetProps?: object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the move to source button inside the component.
+     */
+    moveToSourceProps?: object | undefined;
+    /**
+     * Used to pass all properties of the ButtonProps to the move all to source button inside the component.
+     */
+    moveAllToSourceProps?: object | undefined;
     /**
      * Index of the list element in tabbing order.
      */
@@ -561,8 +594,8 @@ export interface PickListEmits {
  */
 declare class PickList extends ClassComponent<PickListProps, PickListSlots, PickListEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         PickList: GlobalComponentConstructor<PickList>;
     }
 }
diff --git a/components/lib/picklist/PickList.vue b/components/lib/picklist/PickList.vue
index 1c7078303..76102f40d 100755
--- a/components/lib/picklist/PickList.vue
+++ b/components/lib/picklist/PickList.vue
@@ -2,28 +2,28 @@
     <div :class="cx('root')" v-bind="ptmi('root')">
         <div v-if="showSourceControls" :class="cx('sourceControls')" v-bind="ptm('sourceControls')" data-pc-group-section="controls">
             <slot name="sourcecontrolsstart"></slot>
-            <Button :aria-label="moveUpAriaLabel" :disabled="moveDisabled(0)" :severity="severity" @click="moveUp($event, 0)" :pt="ptm('sourceMoveUpButton')" :unstyled="unstyled">
+            <Button :aria-label="moveUpAriaLabel" :disabled="moveDisabled(0)" @click="moveUp($event, 0)" v-bind="{ ...buttonProps, ...moveUpButtonProps }" :pt="ptm('sourceMoveUpButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="moveupicon">
                         <AngleUpIcon v-bind="ptm('sourceMoveUpButton')['icon']" data-pc-section="moveupicon" />
                     </slot>
                 </template>
             </Button>
-            <Button :aria-label="moveTopAriaLabel" :disabled="moveDisabled(0)" :severity="severity" @click="moveTop($event, 0)" :pt="ptm('sourceMoveTopButton')" :unstyled="unstyled">
+            <Button :aria-label="moveTopAriaLabel" :disabled="moveDisabled(0)" @click="moveTop($event, 0)" v-bind="{ ...buttonProps, ...moveTopButtonProps }" :pt="ptm('sourceMoveTopButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="movetopicon">
                         <AngleDoubleUpIcon v-bind="ptm('sourceMoveTopButton')['icon']" data-pc-section="movetopicon" />
                     </slot>
                 </template>
             </Button>
-            <Button :aria-label="moveDownAriaLabel" :disabled="moveDisabled(0)" :severity="severity" @click="moveDown($event, 0)" :pt="ptm('sourceMoveDownButton')" :unstyled="unstyled">
+            <Button :aria-label="moveDownAriaLabel" :disabled="moveDisabled(0)" @click="moveDown($event, 0)" v-bind="{ ...buttonProps, ...moveDownButtonProps }" :pt="ptm('sourceMoveDownButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="movedownicon">
                         <AngleDownIcon v-bind="ptm('sourceMoveDownButton')['icon']" data-pc-section="movedownicon" />
                     </slot>
                 </template>
             </Button>
-            <Button :aria-label="moveBottomAriaLabel" :disabled="moveDisabled(0)" :severity="severity" @click="moveBottom($event, 0)" :pt="ptm('sourceMoveBottomButton')" :unstyled="unstyled">
+            <Button :aria-label="moveBottomAriaLabel" :disabled="moveDisabled(0)" @click="moveBottom($event, 0)" v-bind="{ ...buttonProps, ...moveBottomButtonProps }" :pt="ptm('sourceMoveBottomButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="movebottomicon">
                         <AngleDoubleDownIcon v-bind="ptm('sourceMoveBottomButton')['icon']" data-pc-section="movebottomicon" />
@@ -67,28 +67,28 @@
         </div>
         <div :class="cx('buttons')" v-bind="ptm('buttons')" data-pc-group-section="controls">
             <slot name="movecontrolsstart"></slot>
-            <Button :aria-label="moveToTargetAriaLabel" :severity="severity" @click="moveToTarget" :disabled="moveDisabled(0)" :pt="ptm('moveToTargetButton')" :unstyled="unstyled">
+            <Button :aria-label="moveToTargetAriaLabel" @click="moveToTarget" :disabled="moveDisabled(0)" v-bind="{ ...buttonProps, ...moveToTargetProps }" :pt="ptm('moveToTargetButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="movetotargeticon" :viewChanged="viewChanged">
                         <component :is="viewChanged ? 'AngleDownIcon' : 'AngleRightIcon'" v-bind="ptm('moveToTargetButton')['icon']" data-pc-section="movetotargeticon" />
                     </slot>
                 </template>
             </Button>
-            <Button :aria-label="moveAllToTargetAriaLabel" :severity="severity" @click="moveAllToTarget" :disabled="moveAllDisabled('sourceList')" :pt="ptm('moveAllToTargetButton')" :unstyled="unstyled">
+            <Button :aria-label="moveAllToTargetAriaLabel" @click="moveAllToTarget" :disabled="moveAllDisabled('sourceList')" v-bind="{ ...buttonProps, ...moveAllToTargetProps }" :pt="ptm('moveAllToTargetButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="movealltotargeticon" :viewChanged="viewChanged">
                         <component :is="viewChanged ? 'AngleDoubleDownIcon' : 'AngleDoubleRightIcon'" v-bind="ptm('moveAllToTargetButton')['icon']" data-pc-section="movealltotargeticon" />
                     </slot>
                 </template>
             </Button>
-            <Button :aria-label="moveToSourceAriaLabel" :severity="severity" @click="moveToSource" :disabled="moveDisabled(1)" :pt="ptm('moveToSourceButton')" :unstyled="unstyled">
+            <Button :aria-label="moveToSourceAriaLabel" @click="moveToSource" :disabled="moveDisabled(1)" v-bind="{ ...buttonProps, ...moveToSourceProps }" :pt="ptm('moveToSourceButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="movetosourceicon" :viewChanged="viewChanged">
                         <component :is="viewChanged ? 'AngleUpIcon' : 'AngleLeftIcon'" v-bind="ptm('moveToSourceButton')['icon']" data-pc-section="movetosourceicon" />
                     </slot>
                 </template>
             </Button>
-            <Button :aria-label="moveAllToSourceAriaLabel" :severity="severity" @click="moveAllToSource" :disabled="moveAllDisabled('targetList')" :pt="ptm('moveAllToSourceButton')" :unstyled="unstyled">
+            <Button :aria-label="moveAllToSourceAriaLabel" @click="moveAllToSource" :disabled="moveAllDisabled('targetList')" v-bind="{ ...buttonProps, ...moveAllToSourceProps }" :pt="ptm('moveAllToSourceButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="movealltosourceicon" :viewChanged="viewChanged">
                         <component :is="viewChanged ? 'AngleDoubleUpIcon' : 'AngleDoubleLeftIcon'" v-bind="ptm('moveAllToSourceButton')['icon']" data-pc-section="movealltosourceicon" />
@@ -132,28 +132,28 @@
         </div>
         <div v-if="showTargetControls" :class="cx('targetControls')" v-bind="ptm('targetControls')" data-pc-group-section="controls">
             <slot name="targetcontrolsstart"></slot>
-            <Button :aria-label="moveUpAriaLabel" :disabled="moveDisabled(1)" :severity="severity" @click="moveUp($event, 1)" :pt="ptm('targetMoveUpButton')" :unstyled="unstyled">
+            <Button :aria-label="moveUpAriaLabel" :disabled="moveDisabled(1)" @click="moveUp($event, 1)" v-bind="{ ...buttonProps, ...moveUpButtonProps }" :pt="ptm('targetMoveUpButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="moveupicon">
                         <AngleUpIcon v-bind="ptm('targetMoveUpButton')['icon']" data-pc-section="moveupicon" />
                     </slot>
                 </template>
             </Button>
-            <Button :aria-label="moveTopAriaLabel" :disabled="moveDisabled(1)" :severity="severity" @click="moveTop($event, 1)" :pt="ptm('targetMoveTopButton')" :unstyled="unstyled">
+            <Button :aria-label="moveTopAriaLabel" :disabled="moveDisabled(1)" @click="moveTop($event, 1)" v-bind="{ ...buttonProps, ...moveTopButtonProps }" :pt="ptm('targetMoveTopButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="movetopicon">
                         <AngleDoubleUpIcon v-bind="ptm('targetMoveTopButton')['icon']" data-pc-section="movetopicon" />
                     </slot>
                 </template>
             </Button>
-            <Button :aria-label="moveDownAriaLabel" :disabled="moveDisabled(1)" :severity="severity" @click="moveDown($event, 1)" :pt="ptm('targetMoveDownButton')" :unstyled="unstyled">
+            <Button :aria-label="moveDownAriaLabel" :disabled="moveDisabled(1)" @click="moveDown($event, 1)" v-bind="{ ...buttonProps, ...moveDownButtonProps }" :pt="ptm('targetMoveDownButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="movedownicon">
                         <AngleDownIcon v-bind="ptm('targetMoveDownButton')['icon']" data-pc-section="movedownicon" />
                     </slot>
                 </template>
             </Button>
-            <Button :aria-label="moveBottomAriaLabel" :disabled="moveDisabled(1)" :severity="severity" @click="moveBottom($event, 1)" :pt="ptm('targetMoveBottomButton')" :unstyled="unstyled">
+            <Button :aria-label="moveBottomAriaLabel" :disabled="moveDisabled(1)" @click="moveBottom($event, 1)" v-bind="{ ...buttonProps, ...moveBottomButtonProps }" :pt="ptm('targetMoveBottomButton')" :unstyled="unstyled">
                 <template #icon>
                     <slot name="movebottomicon">
                         <AngleDoubleDownIcon v-bind="ptm('targetMoveBottomButton')['icon']" data-pc-section="movebottomicon" />
diff --git a/components/lib/portal/Portal.d.ts b/components/lib/portal/Portal.d.ts
index 9d5c7434a..3c3d47d5d 100644
--- a/components/lib/portal/Portal.d.ts
+++ b/components/lib/portal/Portal.d.ts
@@ -28,8 +28,8 @@ export declare type PortalEmits = {};
 
 declare class Portal extends ClassComponent<PortalProps, PortalSlots, PortalEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Portal: GlobalComponentConstructor<Portal>;
     }
 }
diff --git a/components/lib/progressbar/ProgressBar.d.ts b/components/lib/progressbar/ProgressBar.d.ts
index 9c72cd266..e7d9acad3 100755
--- a/components/lib/progressbar/ProgressBar.d.ts
+++ b/components/lib/progressbar/ProgressBar.d.ts
@@ -130,8 +130,8 @@ export interface ProgressBarEmits {}
  */
 declare class ProgressBar extends ClassComponent<ProgressBarProps, ProgressBarSlots, ProgressBarEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ProgressBar: GlobalComponentConstructor<ProgressBar>;
     }
 }
diff --git a/components/lib/progressspinner/ProgressSpinner.d.ts b/components/lib/progressspinner/ProgressSpinner.d.ts
index ed8563e72..34fdc0491 100755
--- a/components/lib/progressspinner/ProgressSpinner.d.ts
+++ b/components/lib/progressspinner/ProgressSpinner.d.ts
@@ -128,8 +128,8 @@ export interface ProgressSpinnerEmits {}
  */
 declare class ProgressSpinner extends ClassComponent<ProgressSpinnerProps, ProgressSpinnerSlots, ProgressSpinnerEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ProgressSpinner: GlobalComponentConstructor<ProgressSpinner>;
     }
 }
diff --git a/components/lib/radiobutton/RadioButton.d.ts b/components/lib/radiobutton/RadioButton.d.ts
index 8f2573c56..b38a30278 100755
--- a/components/lib/radiobutton/RadioButton.d.ts
+++ b/components/lib/radiobutton/RadioButton.d.ts
@@ -229,8 +229,8 @@ export interface RadioButtonEmits {
  */
 declare class RadioButton extends ClassComponent<RadioButtonProps, RadioButtonSlots, RadioButtonEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         RadioButton: GlobalComponentConstructor<RadioButton>;
     }
 }
diff --git a/components/lib/rating/Rating.d.ts b/components/lib/rating/Rating.d.ts
index 35afa4aa0..ac6d7b7a2 100755
--- a/components/lib/rating/Rating.d.ts
+++ b/components/lib/rating/Rating.d.ts
@@ -299,8 +299,8 @@ export interface RatingEmits {
  */
 declare class Rating extends ClassComponent<RatingProps, RatingSlots, RatingEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Rating: GlobalComponentConstructor<Rating>;
     }
 }
diff --git a/components/lib/row/Row.d.ts b/components/lib/row/Row.d.ts
index 3a1a295a4..f4d596ffc 100755
--- a/components/lib/row/Row.d.ts
+++ b/components/lib/row/Row.d.ts
@@ -107,8 +107,8 @@ export interface RowEmits {}
  */
 declare class Row extends ClassComponent<RowProps, RowSlots, RowEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Row: GlobalComponentConstructor<Row>;
     }
 }
diff --git a/components/lib/scrollpanel/ScrollPanel.d.ts b/components/lib/scrollpanel/ScrollPanel.d.ts
index 7e47dba31..1b4081ee2 100644
--- a/components/lib/scrollpanel/ScrollPanel.d.ts
+++ b/components/lib/scrollpanel/ScrollPanel.d.ts
@@ -160,8 +160,8 @@ export interface ScrollPanelEmits {}
  */
 declare class ScrollPanel extends ClassComponent<ScrollPanelProps, ScrollPanelSlots, ScrollPanelEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ScrollPanel: GlobalComponentConstructor<ScrollPanel>;
     }
 }
diff --git a/components/lib/scrolltop/ScrollTop.d.ts b/components/lib/scrolltop/ScrollTop.d.ts
index 7ce0dd98b..44b8bd335 100644
--- a/components/lib/scrolltop/ScrollTop.d.ts
+++ b/components/lib/scrolltop/ScrollTop.d.ts
@@ -157,8 +157,8 @@ export interface ScrollTopEmits {}
  */
 declare class ScrollTop extends ClassComponent<ScrollTopProps, ScrollTopSlots, ScrollTopEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ScrollTop: GlobalComponentConstructor<ScrollTop>;
     }
 }
diff --git a/components/lib/selectbutton/SelectButton.d.ts b/components/lib/selectbutton/SelectButton.d.ts
index 482a0b2d3..1fff8e668 100755
--- a/components/lib/selectbutton/SelectButton.d.ts
+++ b/components/lib/selectbutton/SelectButton.d.ts
@@ -257,8 +257,8 @@ export interface SelectButtonEmits {
  */
 declare class SelectButton extends ClassComponent<SelectButtonProps, SelectButtonSlots, SelectButtonEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         SelectButton: GlobalComponentConstructor<SelectButton>;
     }
 }
diff --git a/components/lib/sidebar/Sidebar.d.ts b/components/lib/sidebar/Sidebar.d.ts
index af1a1a65c..870de69f8 100755
--- a/components/lib/sidebar/Sidebar.d.ts
+++ b/components/lib/sidebar/Sidebar.d.ts
@@ -255,8 +255,8 @@ export interface SidebarEmits {
  */
 declare class Sidebar extends ClassComponent<SidebarProps, SidebarSlots, SidebarEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Sidebar: GlobalComponentConstructor<Sidebar>;
     }
 }
diff --git a/components/lib/skeleton/Skeleton.d.ts b/components/lib/skeleton/Skeleton.d.ts
index 9ce3290c2..da97dab7e 100644
--- a/components/lib/skeleton/Skeleton.d.ts
+++ b/components/lib/skeleton/Skeleton.d.ts
@@ -134,8 +134,8 @@ export interface SkeletonEmits {}
  */
 declare class Skeleton extends ClassComponent<SkeletonProps, SkeletonSlots, SkeletonEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Skeleton: GlobalComponentConstructor<Skeleton>;
     }
 }
diff --git a/components/lib/slider/Slider.d.ts b/components/lib/slider/Slider.d.ts
index 384fd9df7..23d5bc35b 100755
--- a/components/lib/slider/Slider.d.ts
+++ b/components/lib/slider/Slider.d.ts
@@ -200,8 +200,8 @@ export interface SliderEmits {
  */
 declare class Slider extends ClassComponent<SliderProps, SliderSlots, SliderEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Slider: GlobalComponentConstructor<Slider>;
     }
 }
diff --git a/components/lib/speeddial/SpeedDial.d.ts b/components/lib/speeddial/SpeedDial.d.ts
index b4e09bd41..242ac9fd0 100644
--- a/components/lib/speeddial/SpeedDial.d.ts
+++ b/components/lib/speeddial/SpeedDial.d.ts
@@ -383,8 +383,8 @@ export interface SpeedDialEmits {
  */
 declare class SpeedDial extends ClassComponent<SpeedDialProps, SpeedDialSlots, SpeedDialEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         SpeedDial: GlobalComponentConstructor<SpeedDial>;
     }
 }
diff --git a/components/lib/splitbutton/SplitButton.d.ts b/components/lib/splitbutton/SplitButton.d.ts
index 8fe7c3467..097074f5a 100755
--- a/components/lib/splitbutton/SplitButton.d.ts
+++ b/components/lib/splitbutton/SplitButton.d.ts
@@ -313,8 +313,8 @@ export interface SplitButtonEmits {
  */
 declare class SplitButton extends ClassComponent<SplitButtonProps, SplitButtonSlots, SplitButtonEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         SplitButton: GlobalComponentConstructor<SplitButton>;
     }
 }
diff --git a/components/lib/splitter/Splitter.d.ts b/components/lib/splitter/Splitter.d.ts
index 48db88f46..0d78aee3b 100644
--- a/components/lib/splitter/Splitter.d.ts
+++ b/components/lib/splitter/Splitter.d.ts
@@ -234,8 +234,8 @@ export interface SplitterEmits {
  */
 declare class Splitter extends ClassComponent<SplitterProps, SplitterSlots, SplitterEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Splitter: GlobalComponentConstructor<Splitter>;
     }
 }
diff --git a/components/lib/splitterpanel/SplitterPanel.d.ts b/components/lib/splitterpanel/SplitterPanel.d.ts
index c97024f6f..b712a2a61 100644
--- a/components/lib/splitterpanel/SplitterPanel.d.ts
+++ b/components/lib/splitterpanel/SplitterPanel.d.ts
@@ -132,8 +132,8 @@ export interface SplitterPanelEmits {}
  */
 declare class SplitterPanel extends ClassComponent<SplitterPanelProps, SplitterPanelSlots, SplitterPanelEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         SplitterPanel: GlobalComponentConstructor<SplitterPanel>;
     }
 }
diff --git a/components/lib/stepper/Stepper.d.ts b/components/lib/stepper/Stepper.d.ts
index 92294cf35..dbc0c6287 100644
--- a/components/lib/stepper/Stepper.d.ts
+++ b/components/lib/stepper/Stepper.d.ts
@@ -188,8 +188,8 @@ export interface StepperEmits {
  */
 declare class Stepper extends ClassComponent<StepperProps, StepperSlots, StepperEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Stepper: GlobalComponentConstructor<Stepper>;
     }
 }
diff --git a/components/lib/stepperpanel/StepperPanel.d.ts b/components/lib/stepperpanel/StepperPanel.d.ts
index 2aace3c97..8ae25f541 100644
--- a/components/lib/stepperpanel/StepperPanel.d.ts
+++ b/components/lib/stepperpanel/StepperPanel.d.ts
@@ -277,8 +277,8 @@ export interface StepperPanelEmits {}
  */
 declare class StepperPanel extends ClassComponent<StepperPanelProps, StepperPanelSlots, StepperPanelEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         StepperPanel: GlobalComponentConstructor<StepperPanel>;
     }
 }
diff --git a/components/lib/steps/Steps.d.ts b/components/lib/steps/Steps.d.ts
index 74263c6ae..3000ef80b 100755
--- a/components/lib/steps/Steps.d.ts
+++ b/components/lib/steps/Steps.d.ts
@@ -226,8 +226,8 @@ export interface StepsEmits {}
  */
 declare class Steps extends ClassComponent<StepsProps, StepsSlots, StepsEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Steps: GlobalComponentConstructor<Steps>;
     }
 }
diff --git a/components/lib/tabmenu/TabMenu.d.ts b/components/lib/tabmenu/TabMenu.d.ts
index f605814ab..964c4623b 100755
--- a/components/lib/tabmenu/TabMenu.d.ts
+++ b/components/lib/tabmenu/TabMenu.d.ts
@@ -269,8 +269,8 @@ export interface TabMenuEmits {
  */
 declare class TabMenu extends ClassComponent<TabMenuProps, TabMenuSlots, TabMenuEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         TabMenu: GlobalComponentConstructor<TabMenu>;
     }
 }
diff --git a/components/lib/tabpanel/TabPanel.d.ts b/components/lib/tabpanel/TabPanel.d.ts
index 9db1a185d..63ec9fc5b 100755
--- a/components/lib/tabpanel/TabPanel.d.ts
+++ b/components/lib/tabpanel/TabPanel.d.ts
@@ -192,8 +192,8 @@ export interface TabPanelEmits {}
  */
 declare class TabPanel extends ClassComponent<TabPanelProps, TabPanelSlots, TabPanelEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         TabPanel: GlobalComponentConstructor<TabPanel>;
     }
 }
diff --git a/components/lib/tabview/TabView.d.ts b/components/lib/tabview/TabView.d.ts
index 51883f1dd..cad7381fa 100755
--- a/components/lib/tabview/TabView.d.ts
+++ b/components/lib/tabview/TabView.d.ts
@@ -278,8 +278,8 @@ export interface TabViewEmits {
  */
 declare class TabView extends ClassComponent<TabViewProps, TabViewSlots, TabViewEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         TabView: GlobalComponentConstructor<TabView>;
     }
 }
diff --git a/components/lib/tag/Tag.d.ts b/components/lib/tag/Tag.d.ts
index a3575caaf..abab5f8db 100644
--- a/components/lib/tag/Tag.d.ts
+++ b/components/lib/tag/Tag.d.ts
@@ -142,8 +142,8 @@ export interface TagEmits {}
  */
 declare class Tag extends ClassComponent<TagProps, TagSlots, TagEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Tag: GlobalComponentConstructor<Tag>;
     }
 }
diff --git a/components/lib/terminal/Terminal.d.ts b/components/lib/terminal/Terminal.d.ts
index 8581c9977..a01c4a4f9 100755
--- a/components/lib/terminal/Terminal.d.ts
+++ b/components/lib/terminal/Terminal.d.ts
@@ -164,8 +164,8 @@ export interface TerminalEmits {}
  */
 declare class Terminal extends ClassComponent<TerminalProps, TerminalSlots, TerminalEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Terminal: GlobalComponentConstructor<Terminal>;
     }
 }
diff --git a/components/lib/textarea/Textarea.d.ts b/components/lib/textarea/Textarea.d.ts
index 21e86e43b..9b271c869 100755
--- a/components/lib/textarea/Textarea.d.ts
+++ b/components/lib/textarea/Textarea.d.ts
@@ -154,8 +154,8 @@ export interface TextareaEmits {
  */
 declare class Textarea extends ClassComponent<TextareaProps, TextareaSlots, TextareaEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Textarea: GlobalComponentConstructor<Textarea>;
     }
 }
diff --git a/components/lib/themes/utils/themeUtils.js b/components/lib/themes/utils/themeUtils.js
index cf51f3151..5ecea88ab 100644
--- a/components/lib/themes/utils/themeUtils.js
+++ b/components/lib/themes/utils/themeUtils.js
@@ -165,35 +165,49 @@ export default {
             } else {
                 tokens[currentKey] ||= {
                     paths: [],
-                    computed(colorScheme) {
-                        // @todo
-                        const scheme = colorScheme;
+                    computed(colorScheme, tokenPathMap = {}) {
+                        if (colorScheme) {
+                            const path = this.paths.find((p) => p.scheme === colorScheme) || this.paths.find((p) => p.scheme === 'none');
 
-                        return this.paths.find((p) => p.scheme === scheme || p.scheme === 'none')?.computed();
+                            return path?.computed(colorScheme, tokenPathMap['paths']);
+                        }
+
+                        return this.paths.map((p) => p.computed(p.scheme, tokenPathMap));
                     }
                 };
                 tokens[currentKey].paths.push({
                     path: currentPath,
                     value,
                     scheme: currentPath.includes('colorScheme.light') ? 'light' : currentPath.includes('colorScheme.dark') ? 'dark' : 'none',
-                    computed(colorScheme) {
+                    computed(colorScheme, tokenPathMap = {}) {
                         const regex = /{([^}]*)}/g;
+                        let computedValue = value;
+
+                        tokenPathMap['path'] = this.path;
+                        tokenPathMap['paths'] ||= {};
 
                         if (SharedUtils.object.test(regex, value)) {
                             const val = value.trim();
                             const _val = val.replaceAll(regex, (v) => {
                                 const path = v.replace(/{|}/g, '');
 
-                                return tokens[path]?.computed(colorScheme);
+                                return tokens[path]?.computed(colorScheme, tokenPathMap)?.value;
                             });
 
                             const calculationRegex = /(\d+\w*\s+[\+\-\*\/]\s+\d+\w*)/g;
                             const cleanedVarRegex = /var\([^)]+\)/g;
 
-                            return SharedUtils.object.test(calculationRegex, _val.replace(cleanedVarRegex, '0')) ? `calc(${_val})` : _val;
+                            computedValue = SharedUtils.object.test(calculationRegex, _val.replace(cleanedVarRegex, '0')) ? `calc(${_val})` : _val;
                         }
 
-                        return value;
+                        SharedUtils.object.isEmpty(tokenPathMap['paths']) && delete tokenPathMap['paths'];
+
+                        return {
+                            colorScheme,
+                            tokenPath: this.path,
+                            tokenPathMap,
+                            value: computedValue.includes('undefined') ? undefined : computedValue
+                        };
                     }
                 });
             }
@@ -211,7 +225,7 @@ export default {
         const token = normalizePath(path);
         const colorScheme = path.includes('colorScheme.light') ? 'light' : path.includes('colorScheme.dark') ? 'dark' : undefined;
 
-        return tokens[token]?.computed(colorScheme);
+        return [tokens[token]?.computed(colorScheme)].flat();
     },
     _toVariables(theme, options) {
         return toVariables(theme, { prefix: options?.prefix });
diff --git a/components/lib/tieredmenu/TieredMenu.d.ts b/components/lib/tieredmenu/TieredMenu.d.ts
index 9878db799..2d2c24cd2 100755
--- a/components/lib/tieredmenu/TieredMenu.d.ts
+++ b/components/lib/tieredmenu/TieredMenu.d.ts
@@ -408,8 +408,8 @@ declare class TieredMenu extends ClassComponent<TieredMenuProps, TieredMenuSlots
     hide(): void;
 }
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         TieredMenu: GlobalComponentConstructor<TieredMenu>;
     }
 }
diff --git a/components/lib/timeline/Timeline.d.ts b/components/lib/timeline/Timeline.d.ts
index 1ee99fcc6..2a2520e5c 100644
--- a/components/lib/timeline/Timeline.d.ts
+++ b/components/lib/timeline/Timeline.d.ts
@@ -218,8 +218,8 @@ export interface TimelineEmits {}
  */
 declare class Timeline extends ClassComponent<TimelineProps, TimelineSlots, TimelineEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Timeline: GlobalComponentConstructor<Timeline>;
     }
 }
diff --git a/components/lib/toast/Toast.d.ts b/components/lib/toast/Toast.d.ts
index 068a7970b..229f03021 100755
--- a/components/lib/toast/Toast.d.ts
+++ b/components/lib/toast/Toast.d.ts
@@ -353,8 +353,8 @@ export interface ToastEmits {
  */
 declare class Toast extends ClassComponent<ToastProps, ToastSlots, ToastEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Toast: GlobalComponentConstructor<Toast>;
     }
 }
diff --git a/components/lib/togglebutton/ToggleButton.d.ts b/components/lib/togglebutton/ToggleButton.d.ts
index c62525fe4..69e5f80b9 100755
--- a/components/lib/togglebutton/ToggleButton.d.ts
+++ b/components/lib/togglebutton/ToggleButton.d.ts
@@ -233,8 +233,8 @@ export interface ToggleButtonEmits {
  */
 declare class ToggleButton extends ClassComponent<ToggleButtonProps, ToggleButtonSlots, ToggleButtonEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         ToggleButton: GlobalComponentConstructor<ToggleButton>;
     }
 }
diff --git a/components/lib/toolbar/Toolbar.d.ts b/components/lib/toolbar/Toolbar.d.ts
index 76bb6aee7..e1b6c7ffc 100755
--- a/components/lib/toolbar/Toolbar.d.ts
+++ b/components/lib/toolbar/Toolbar.d.ts
@@ -138,8 +138,8 @@ export interface ToolbarEmits {}
  */
 declare class Toolbar extends ClassComponent<ToolbarProps, ToolbarSlots, ToolbarEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Toolbar: GlobalComponentConstructor<Toolbar>;
     }
 }
diff --git a/components/lib/tree/Tree.d.ts b/components/lib/tree/Tree.d.ts
index 268c4fefb..60bc0a8fa 100755
--- a/components/lib/tree/Tree.d.ts
+++ b/components/lib/tree/Tree.d.ts
@@ -457,8 +457,8 @@ export interface TreeEmits {
  */
 declare class Tree extends ClassComponent<TreeProps, TreeSlots, TreeEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         Tree: GlobalComponentConstructor<Tree>;
     }
 }
diff --git a/components/lib/treeselect/TreeSelect.d.ts b/components/lib/treeselect/TreeSelect.d.ts
index d6039f5d1..f0456c019 100644
--- a/components/lib/treeselect/TreeSelect.d.ts
+++ b/components/lib/treeselect/TreeSelect.d.ts
@@ -441,8 +441,8 @@ declare class TreeSelect extends ClassComponent<TreeSelectProps, TreeSelectSlots
     hide: () => void;
 }
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         TreeSelect: GlobalComponentConstructor<TreeSelect>;
     }
 }
diff --git a/components/lib/treetable/TreeTable.d.ts b/components/lib/treetable/TreeTable.d.ts
index e968f77d7..b231fbd4f 100755
--- a/components/lib/treetable/TreeTable.d.ts
+++ b/components/lib/treetable/TreeTable.d.ts
@@ -809,8 +809,8 @@ export interface TreeTableEmits {
  */
 declare class TreeTable extends ClassComponent<TreeTableProps, TreeTableSlots, TreeTableEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         TreeTable: GlobalComponentConstructor<TreeTable>;
     }
 }
diff --git a/components/lib/tristatecheckbox/TriStateCheckbox.d.ts b/components/lib/tristatecheckbox/TriStateCheckbox.d.ts
index d65a96c87..c1a72df0e 100755
--- a/components/lib/tristatecheckbox/TriStateCheckbox.d.ts
+++ b/components/lib/tristatecheckbox/TriStateCheckbox.d.ts
@@ -264,8 +264,8 @@ export interface TriStateCheckboxEmits {
  */
 declare class TriStateCheckbox extends ClassComponent<TriStateCheckboxProps, TriStateCheckboxSlots, TriStateCheckboxEmits> {}
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         TriStateCheckbox: GlobalComponentConstructor<TriStateCheckbox>;
     }
 }
diff --git a/components/lib/virtualscroller/VirtualScroller.d.ts b/components/lib/virtualscroller/VirtualScroller.d.ts
index 41275f9ff..7a65bd8e9 100644
--- a/components/lib/virtualscroller/VirtualScroller.d.ts
+++ b/components/lib/virtualscroller/VirtualScroller.d.ts
@@ -519,8 +519,8 @@ declare class VirtualScroller extends ClassComponent<VirtualScrollerProps, Virtu
     getRenderedRange(): VirtualScrollerRangeMethod;
 }
 
-declare module '@vue/runtime-core' {
-    interface GlobalComponents {
+declare module 'vue' {
+    export interface GlobalComponents {
         VirtualScroller: GlobalComponentConstructor<VirtualScroller>;
     }
 }
diff --git a/doc/common/apidoc/index.json b/doc/common/apidoc/index.json
index 21a1207a6..225ec410e 100644
--- a/doc/common/apidoc/index.json
+++ b/doc/common/apidoc/index.json
@@ -7359,7 +7359,7 @@
                 },
                 "CalendarPassThroughOptions": {
                     "description": "Custom passthrough(pt) options.",
-                    "relatedProp": "CalendarProps.pt",
+                    "relatedProp": "undefined.BaseCalendarProps.pt",
                     "props": [
                         {
                             "name": "root",
@@ -8036,517 +8036,6 @@
                     ],
                     "methods": []
                 },
-                "CalendarProps": {
-                    "description": "Defines valid properties in Calendar component.",
-                    "relatedProp": "",
-                    "props": [
-                        {
-                            "name": "modelValue",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "null | string | string[] | Date | Date[]",
-                            "default": "null",
-                            "description": "Value of the component."
-                        },
-                        {
-                            "name": "selectionMode",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "\"multiple\" | \"range\" | \"single\"",
-                            "default": "single",
-                            "description": "Defines the quantity of the selection."
-                        },
-                        {
-                            "name": "dateFormat",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "",
-                            "description": "Format of the date. Defaults to PrimeVue Locale configuration."
-                        },
-                        {
-                            "name": "inline",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "When enabled, displays the calendar as inline instead of an overlay."
-                        },
-                        {
-                            "name": "showOtherMonths",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "true",
-                            "description": "Whether to display dates in other months (non-selectable) at the start or end of the current month. To make these days selectable use the selectOtherMonths option."
-                        },
-                        {
-                            "name": "selectOtherMonths",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "Whether days in other months shown before or after the current month are selectable. This only applies if the showOtherMonths option is set to true."
-                        },
-                        {
-                            "name": "showIcon",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "When enabled, displays a button with icon next to input."
-                        },
-                        {
-                            "name": "iconDisplay",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "\"input\" | \"button\"",
-                            "default": "'button'",
-                            "description": "Icon position of the component. This only applies if the showIcon option is set to true."
-                        },
-                        {
-                            "name": "icon",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "",
-                            "description": "Icon of the calendar button.",
-                            "deprecated": "since v3.27.0. Use 'dropdownicon' slot."
-                        },
-                        {
-                            "name": "previousIcon",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "",
-                            "description": "Icon to show in the previous button.",
-                            "deprecated": "since v3.27.0. Use 'previousicon' slot."
-                        },
-                        {
-                            "name": "nextIcon",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "",
-                            "description": "Icon to show in the next button.",
-                            "deprecated": "since v3.27.0. Use 'nexticon' slot."
-                        },
-                        {
-                            "name": "incrementIcon",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "",
-                            "description": "Icon to show in each of the increment buttons.",
-                            "deprecated": "since v3.27.0. Use 'incrementicon' slot."
-                        },
-                        {
-                            "name": "decrementIcon",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "",
-                            "description": "Icon to show in each of the decrement buttons.",
-                            "deprecated": "since v3.27.0. Use 'decrementicon' slot."
-                        },
-                        {
-                            "name": "numberOfMonths",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "number",
-                            "default": "1",
-                            "description": "Number of months to display."
-                        },
-                        {
-                            "name": "responsiveOptions",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "CalendarResponsiveOptions[]",
-                            "default": "",
-                            "description": "An array of options for responsive design."
-                        },
-                        {
-                            "name": "breakpoint",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "769px",
-                            "description": "The breakpoint to define the maximum width boundary for datepicker panel."
-                        },
-                        {
-                            "name": "view",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "\"month\" | \"year\" | \"date\"",
-                            "default": "date",
-                            "description": "Type of view to display."
-                        },
-                        {
-                            "name": "touchUI",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "When enabled, calendar overlay is displayed as optimized for touch devices."
-                        },
-                        {
-                            "name": "monthNavigator",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "Whether the month should be rendered as a dropdown instead of text.",
-                            "deprecated": "since version 3.9.0, Navigator is always on."
-                        },
-                        {
-                            "name": "yearNavigator",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "Whether the year should be rendered as a dropdown instead of text.",
-                            "deprecated": "since version 3.9.0, Navigator is always on."
-                        },
-                        {
-                            "name": "yearRange",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "false",
-                            "description": "The range of years displayed in the year drop-down in (nnnn:nnnn) format such as (2000:2020).",
-                            "deprecated": "since version 3.9.0, Years are based on decades by default."
-                        },
-                        {
-                            "name": "minDate",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "Date",
-                            "default": "",
-                            "description": "The minimum selectable date."
-                        },
-                        {
-                            "name": "maxDate",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "Date",
-                            "default": "",
-                            "description": "The maximum selectable date."
-                        },
-                        {
-                            "name": "disabledDates",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "Date[]",
-                            "default": "",
-                            "description": "Array with dates to disable."
-                        },
-                        {
-                            "name": "disabledDays",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "number[]",
-                            "default": "",
-                            "description": "Array with disabled weekday numbers."
-                        },
-                        {
-                            "name": "maxDateCount",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "number",
-                            "default": "",
-                            "description": "Maximum number of selectable dates in multiple mode."
-                        },
-                        {
-                            "name": "showOnFocus",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "true",
-                            "description": "When disabled, datepicker will not be visible with input focus."
-                        },
-                        {
-                            "name": "autoZIndex",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "true",
-                            "description": "Whether to automatically manage layering."
-                        },
-                        {
-                            "name": "baseZIndex",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "number",
-                            "default": "0",
-                            "description": "Base zIndex value to use in layering."
-                        },
-                        {
-                            "name": "showButtonBar",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "Whether to display today and clear buttons at the footer."
-                        },
-                        {
-                            "name": "shortYearCutoff",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "+10",
-                            "description": "The cutoff year for determining the century for a date."
-                        },
-                        {
-                            "name": "showTime",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "Whether to display timepicker."
-                        },
-                        {
-                            "name": "timeOnly",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "Whether to display timepicker only."
-                        },
-                        {
-                            "name": "hourFormat",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "\"12\" | \"24\"",
-                            "default": "24",
-                            "description": "Specifies hour format."
-                        },
-                        {
-                            "name": "stepHour",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "number",
-                            "default": "1",
-                            "description": "Hours to change per step."
-                        },
-                        {
-                            "name": "stepMinute",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "number",
-                            "default": "1",
-                            "description": "Minutes to change per step."
-                        },
-                        {
-                            "name": "stepSecond",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "number",
-                            "default": "1",
-                            "description": "Seconds to change per step."
-                        },
-                        {
-                            "name": "showSeconds",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "Whether to show the seconds in time picker."
-                        },
-                        {
-                            "name": "hideOnDateTimeSelect",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "Whether to hide the overlay on date selection when showTime is enabled."
-                        },
-                        {
-                            "name": "hideOnRangeSelection",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "Whether to hide the overlay on date selection is completed when selectionMode is range."
-                        },
-                        {
-                            "name": "timeSeparator",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": ":",
-                            "description": "Separator of time selector."
-                        },
-                        {
-                            "name": "showWeek",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "When enabled, calendar will show week numbers."
-                        },
-                        {
-                            "name": "manualInput",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "true",
-                            "description": "Whether to allow entering the date manually via typing."
-                        },
-                        {
-                            "name": "invalid",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "When present, it specifies that the component should have invalid state style."
-                        },
-                        {
-                            "name": "disabled",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "When present, it specifies that the component should be disabled."
-                        },
-                        {
-                            "name": "variant",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "\"filled\" | \"outlined\"",
-                            "default": "outlined",
-                            "description": "Specifies the input variant of the component."
-                        },
-                        {
-                            "name": "readonly",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "When present, it specifies that an input field is read-only."
-                        },
-                        {
-                            "name": "placeholder",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "",
-                            "description": "Placeholder text for the input."
-                        },
-                        {
-                            "name": "appendTo",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "HTMLElement | HintedString<\"body\" | \"self\">",
-                            "default": "body",
-                            "description": "A valid query selector or an HTMLElement to specify where the overlay gets attached."
-                        },
-                        {
-                            "name": "id",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "",
-                            "description": "Identifier of the element."
-                        },
-                        {
-                            "name": "inputId",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "",
-                            "description": "Identifier of the underlying input element."
-                        },
-                        {
-                            "name": "inputStyle",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "object",
-                            "default": "",
-                            "description": "Inline style of the input field."
-                        },
-                        {
-                            "name": "inputClass",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string | object",
-                            "default": "",
-                            "description": "Style class of the input field."
-                        },
-                        {
-                            "name": "inputProps",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "InputHTMLAttributes",
-                            "default": "",
-                            "description": "Used to pass all properties of the HTMLInputElement to the focusable input element inside the component."
-                        },
-                        {
-                            "name": "panelStyle",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "object",
-                            "default": "",
-                            "description": "Inline style of the overlay panel."
-                        },
-                        {
-                            "name": "panelClass",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string | object",
-                            "default": "",
-                            "description": "Style class of the overlay panel."
-                        },
-                        {
-                            "name": "panelProps",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "HTMLAttributes",
-                            "default": "",
-                            "description": "Used to pass all properties of the HTMLDivElement to the overlay panel inside the component."
-                        },
-                        {
-                            "name": "ariaLabelledby",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "",
-                            "description": "Establishes relationships between the component and label(s) where its value should be one or more element IDs."
-                        },
-                        {
-                            "name": "ariaLabel",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "string",
-                            "default": "",
-                            "description": "Establishes a string value that labels the component."
-                        },
-                        {
-                            "name": "pt",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "PassThrough<CalendarPassThroughOptions>",
-                            "default": "",
-                            "description": "Used to pass attributes to DOM elements inside the component."
-                        },
-                        {
-                            "name": "ptOptions",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "PassThroughOptions",
-                            "default": "",
-                            "description": "Used to configure passthrough(pt) options of the component."
-                        },
-                        {
-                            "name": "unstyled",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "boolean",
-                            "default": "false",
-                            "description": "When enabled, it removes component related styles in the core."
-                        }
-                    ],
-                    "methods": []
-                },
                 "CalendarDateSlotOptions": {
                     "description": "Defines valid options of the date slot in Calendar component.",
                     "relatedProp": "",
@@ -8745,7 +8234,7 @@
                                 {
                                     "name": "value",
                                     "optional": false,
-                                    "type": "undefined | string | string[] | Date | Date[]",
+                                    "type": "null | Date | (null | Date)[]",
                                     "description": "New value."
                                 }
                             ],
@@ -8892,6 +8381,9 @@
                 },
                 "CalendarPassThroughTransitionType": {
                     "values": "TransitionProps | (options: CalendarPassThroughMethodOptions) => TransitionProps | undefined"
+                },
+                "CalendarProps": {
+                    "values": "CalendarPropsSingle | CalendarPropsRange | CalendarPropsMultiple"
                 }
             }
         }
diff --git a/doc/splitbutton/BasicDoc.vue b/doc/splitbutton/BasicDoc.vue
index 5e138e593..b61f88a0b 100644
--- a/doc/splitbutton/BasicDoc.vue
+++ b/doc/splitbutton/BasicDoc.vue
@@ -96,13 +96,13 @@ const items = [
     {
         label: 'Update',
         command: () => {
-            this.$toast.add({ severity: 'success', summary: 'Updated', detail: 'Data Updated', life: 3000 });
+            toast.add({ severity: 'success', summary: 'Updated', detail: 'Data Updated', life: 3000 });
         }
     },
     {
         label: 'Delete',
         command: () => {
-            this.$toast.add({ severity: 'warn', summary: 'Delete', detail: 'Data Deleted', life: 3000 });
+            toast.add({ severity: 'warn', summary: 'Delete', detail: 'Data Deleted', life: 3000 });
         }
     },
     {