diff --git a/components/lib/accordion/BaseAccordion.vue b/components/lib/accordion/BaseAccordion.vue
index 1e52f77cc..360216b22 100644
--- a/components/lib/accordion/BaseAccordion.vue
+++ b/components/lib/accordion/BaseAccordion.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-accordion-header-action {
         cursor: pointer;
         display: flex;
diff --git a/components/lib/autocomplete/BaseAutoComplete.vue b/components/lib/autocomplete/BaseAutoComplete.vue
index d846d13e9..e22f60cdb 100644
--- a/components/lib/autocomplete/BaseAutoComplete.vue
+++ b/components/lib/autocomplete/BaseAutoComplete.vue
@@ -4,7 +4,7 @@ import { useStyle } from 'primevue/usestyle';
 import { ObjectUtils } from 'primevue/utils';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-autocomplete {
         display: inline-flex;
     }
diff --git a/components/lib/avatar/BaseAvatar.vue b/components/lib/avatar/BaseAvatar.vue
index ab244e831..3251c5c25 100644
--- a/components/lib/avatar/BaseAvatar.vue
+++ b/components/lib/avatar/BaseAvatar.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-avatar {
         display: inline-flex;
         align-items: center;
diff --git a/components/lib/avatargroup/BaseAvatarGroup.vue b/components/lib/avatargroup/BaseAvatarGroup.vue
index 1b92e6f1f..f19c0dab9 100644
--- a/components/lib/avatargroup/BaseAvatarGroup.vue
+++ b/components/lib/avatargroup/BaseAvatarGroup.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-avatar-group .p-avatar + .p-avatar {
         margin-left: -1rem;
     }
diff --git a/components/lib/badge/BaseBadge.vue b/components/lib/badge/BaseBadge.vue
index fdd607f40..3c055b738 100644
--- a/components/lib/badge/BaseBadge.vue
+++ b/components/lib/badge/BaseBadge.vue
@@ -4,7 +4,7 @@ import { useStyle } from 'primevue/usestyle';
 import { ObjectUtils } from 'primevue/utils';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-badge {
         display: inline-block;
         border-radius: 10px;
diff --git a/components/lib/badgedirective/BaseBadgeDirective.js b/components/lib/badgedirective/BaseBadgeDirective.js
index df3a40c78..1fb13c44b 100644
--- a/components/lib/badgedirective/BaseBadgeDirective.js
+++ b/components/lib/badgedirective/BaseBadgeDirective.js
@@ -2,7 +2,7 @@ import BaseDirective from 'primevue/basedirective';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-badge {
         display: inline-block;
         border-radius: 10px;
diff --git a/components/lib/basecomponent/BaseComponent.vue b/components/lib/basecomponent/BaseComponent.vue
index f93a99ac1..acc44edb0 100644
--- a/components/lib/basecomponent/BaseComponent.vue
+++ b/components/lib/basecomponent/BaseComponent.vue
@@ -231,7 +231,7 @@ const radioButtonStyles = `
 }
 `;
 const styles = `
-@layer primevue {
+@layer primevue.core {
 .p-component, .p-component * {
     box-sizing: border-box;
 }
diff --git a/components/lib/blockui/BaseBlockUI.vue b/components/lib/blockui/BaseBlockUI.vue
index 9ff0c0dc8..88dd7f9c7 100644
--- a/components/lib/blockui/BaseBlockUI.vue
+++ b/components/lib/blockui/BaseBlockUI.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-blockui-container {
         position: relative;
     }
diff --git a/components/lib/breadcrumb/BaseBreadcrumb.vue b/components/lib/breadcrumb/BaseBreadcrumb.vue
index f779f3925..36214edaf 100644
--- a/components/lib/breadcrumb/BaseBreadcrumb.vue
+++ b/components/lib/breadcrumb/BaseBreadcrumb.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-breadcrumb {
         overflow-x: auto;
     }
diff --git a/components/lib/calendar/BaseCalendar.vue b/components/lib/calendar/BaseCalendar.vue
index c9c8b26d4..f5eff6bdc 100644
--- a/components/lib/calendar/BaseCalendar.vue
+++ b/components/lib/calendar/BaseCalendar.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-calendar {
         display: inline-flex;
         max-width: 100%;
diff --git a/components/lib/carousel/BaseCarousel.vue b/components/lib/carousel/BaseCarousel.vue
index 192f6ea63..07fa5c4ba 100644
--- a/components/lib/carousel/BaseCarousel.vue
+++ b/components/lib/carousel/BaseCarousel.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-carousel {
         display: flex;
         flex-direction: column;
diff --git a/components/lib/cascadeselect/BaseCascadeSelect.vue b/components/lib/cascadeselect/BaseCascadeSelect.vue
index d1d91057f..814b6873a 100644
--- a/components/lib/cascadeselect/BaseCascadeSelect.vue
+++ b/components/lib/cascadeselect/BaseCascadeSelect.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-cascadeselect {
         display: inline-flex;
         cursor: pointer;
diff --git a/components/lib/chart/BaseChart.vue b/components/lib/chart/BaseChart.vue
index ce3f58bed..8973458f1 100644
--- a/components/lib/chart/BaseChart.vue
+++ b/components/lib/chart/BaseChart.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-chart {
         position: relative;
     }
diff --git a/components/lib/chip/BaseChip.vue b/components/lib/chip/BaseChip.vue
index 87e88bb37..02593631d 100644
--- a/components/lib/chip/BaseChip.vue
+++ b/components/lib/chip/BaseChip.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-chip {
         display: inline-flex;
         align-items: center;
diff --git a/components/lib/chips/BaseChips.vue b/components/lib/chips/BaseChips.vue
index 9acb6a8c5..cdd260005 100644
--- a/components/lib/chips/BaseChips.vue
+++ b/components/lib/chips/BaseChips.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-chips {
         display: inline-flex;
     }
diff --git a/components/lib/colorpicker/BaseColorPicker.vue b/components/lib/colorpicker/BaseColorPicker.vue
index 1b8c4a857..46f8c4538 100644
--- a/components/lib/colorpicker/BaseColorPicker.vue
+++ b/components/lib/colorpicker/BaseColorPicker.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-colorpicker-panel .p-colorpicker-color {
         background: linear-gradient(to top, #000 0%, rgb(0 0 0 / 0) 100%), linear-gradient(to right, #fff 0%, rgb(255 255 255 / 0) 100%)
     }
diff --git a/components/lib/confirmpopup/BaseConfirmPopup.vue b/components/lib/confirmpopup/BaseConfirmPopup.vue
index 0b00c897f..117d5c1fa 100644
--- a/components/lib/confirmpopup/BaseConfirmPopup.vue
+++ b/components/lib/confirmpopup/BaseConfirmPopup.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-confirm-popup {
         position: absolute;
         margin-top: 10px;
diff --git a/components/lib/contextmenu/BaseContextMenu.vue b/components/lib/contextmenu/BaseContextMenu.vue
index 2da54c6e3..6638c3754 100644
--- a/components/lib/contextmenu/BaseContextMenu.vue
+++ b/components/lib/contextmenu/BaseContextMenu.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-contextmenu ul {
         margin: 0;
         padding: 0;
diff --git a/components/lib/datatable/BaseDataTable.vue b/components/lib/datatable/BaseDataTable.vue
index c24f05d56..1cef013fa 100644
--- a/components/lib/datatable/BaseDataTable.vue
+++ b/components/lib/datatable/BaseDataTable.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-datatable {
         position: relative;
     }
diff --git a/components/lib/dialog/BaseDialog.vue b/components/lib/dialog/BaseDialog.vue
index e59f37382..9277a14ca 100644
--- a/components/lib/dialog/BaseDialog.vue
+++ b/components/lib/dialog/BaseDialog.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-dialog-mask.p-component-overlay {
         pointer-events: auto;
     }
diff --git a/components/lib/divider/BaseDivider.vue b/components/lib/divider/BaseDivider.vue
index 736d311ed..5857a1981 100644
--- a/components/lib/divider/BaseDivider.vue
+++ b/components/lib/divider/BaseDivider.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-divider-horizontal {
         display: flex;
         width: 100%;
diff --git a/components/lib/dock/BaseDock.vue b/components/lib/dock/BaseDock.vue
index d6c16c5c9..97a8ac628 100644
--- a/components/lib/dock/BaseDock.vue
+++ b/components/lib/dock/BaseDock.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-dock {
         position: absolute;
         z-index: 1;
diff --git a/components/lib/dropdown/BaseDropdown.vue b/components/lib/dropdown/BaseDropdown.vue
index 57e68d744..f6e66a98e 100644
--- a/components/lib/dropdown/BaseDropdown.vue
+++ b/components/lib/dropdown/BaseDropdown.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-dropdown {
         display: inline-flex;
         cursor: pointer;
diff --git a/components/lib/fieldset/BaseFieldset.vue b/components/lib/fieldset/BaseFieldset.vue
index d5203616c..733ad4543 100644
--- a/components/lib/fieldset/BaseFieldset.vue
+++ b/components/lib/fieldset/BaseFieldset.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-fieldset-legend > a,
     .p-fieldset-legend > span {
         display: flex;
diff --git a/components/lib/fileupload/BaseFileUpload.vue b/components/lib/fileupload/BaseFileUpload.vue
index 015f7b579..dba638d1b 100644
--- a/components/lib/fileupload/BaseFileUpload.vue
+++ b/components/lib/fileupload/BaseFileUpload.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-fileupload-content {
         position: relative;
     }
diff --git a/components/lib/galleria/BaseGalleria.vue b/components/lib/galleria/BaseGalleria.vue
index 6f3ddebda..29d835b02 100644
--- a/components/lib/galleria/BaseGalleria.vue
+++ b/components/lib/galleria/BaseGalleria.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-galleria-content {
         display: flex;
         flex-direction: column;
diff --git a/components/lib/image/BaseImage.vue b/components/lib/image/BaseImage.vue
index 713795095..62a4af638 100644
--- a/components/lib/image/BaseImage.vue
+++ b/components/lib/image/BaseImage.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-image-mask {
         display: flex;
         align-items: center;
diff --git a/components/lib/inlinemessage/BaseInlineMessage.vue b/components/lib/inlinemessage/BaseInlineMessage.vue
index bd70d6436..4f721ba14 100644
--- a/components/lib/inlinemessage/BaseInlineMessage.vue
+++ b/components/lib/inlinemessage/BaseInlineMessage.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-inline-message {
         display: inline-flex;
         align-items: center;
diff --git a/components/lib/inplace/BaseInplace.vue b/components/lib/inplace/BaseInplace.vue
index 36e3503b9..272ac8365 100644
--- a/components/lib/inplace/BaseInplace.vue
+++ b/components/lib/inplace/BaseInplace.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-inplace .p-inplace-display {
         display: inline;
         cursor: pointer;
diff --git a/components/lib/inputnumber/BaseInputNumber.vue b/components/lib/inputnumber/BaseInputNumber.vue
index 866d66cf5..cff21d0e5 100644
--- a/components/lib/inputnumber/BaseInputNumber.vue
+++ b/components/lib/inputnumber/BaseInputNumber.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-inputnumber {
         display: inline-flex;
     }
diff --git a/components/lib/inputswitch/BaseInputSwitch.vue b/components/lib/inputswitch/BaseInputSwitch.vue
index f55a49ac4..cb002d5e5 100644
--- a/components/lib/inputswitch/BaseInputSwitch.vue
+++ b/components/lib/inputswitch/BaseInputSwitch.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-inputswitch {
         display: inline-block;
     }
diff --git a/components/lib/knob/BaseKnob.vue b/components/lib/knob/BaseKnob.vue
index 9cab31dd9..ffc6bd9b9 100644
--- a/components/lib/knob/BaseKnob.vue
+++ b/components/lib/knob/BaseKnob.vue
@@ -8,7 +8,7 @@ const styles = `
         stroke-dashoffset: 0;
     }
 }
-@layer primevue {
+@layer primevue.core {
     .p-knob-range {
         fill: none;
         transition: stroke 0.1s ease-in;
diff --git a/components/lib/listbox/BaseListbox.vue b/components/lib/listbox/BaseListbox.vue
index 8badb6748..f3a5cc4c7 100644
--- a/components/lib/listbox/BaseListbox.vue
+++ b/components/lib/listbox/BaseListbox.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-listbox-list-wrapper {
         overflow: auto;
     }
diff --git a/components/lib/megamenu/BaseMegaMenu.vue b/components/lib/megamenu/BaseMegaMenu.vue
index 22d9eb7dd..c3f9a9b80 100644
--- a/components/lib/megamenu/BaseMegaMenu.vue
+++ b/components/lib/megamenu/BaseMegaMenu.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-megamenu {
         display: flex;
     }
diff --git a/components/lib/menu/BaseMenu.vue b/components/lib/menu/BaseMenu.vue
index 8f556ab52..4a822ce2c 100644
--- a/components/lib/menu/BaseMenu.vue
+++ b/components/lib/menu/BaseMenu.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-menu ul {
         margin: 0;
         padding: 0;
diff --git a/components/lib/menubar/BaseMenubar.vue b/components/lib/menubar/BaseMenubar.vue
index ae164a153..a534b9448 100644
--- a/components/lib/menubar/BaseMenubar.vue
+++ b/components/lib/menubar/BaseMenubar.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-menubar {
         display: flex;
         align-items: center;
diff --git a/components/lib/message/BaseMessage.vue b/components/lib/message/BaseMessage.vue
index f11279a2a..7092101b1 100644
--- a/components/lib/message/BaseMessage.vue
+++ b/components/lib/message/BaseMessage.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-message-wrapper {
         display: flex;
         align-items: center;
diff --git a/components/lib/multiselect/BaseMultiSelect.vue b/components/lib/multiselect/BaseMultiSelect.vue
index 5f88eb37d..0d67a8ce1 100644
--- a/components/lib/multiselect/BaseMultiSelect.vue
+++ b/components/lib/multiselect/BaseMultiSelect.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-multiselect {
         display: inline-flex;
         cursor: pointer;
diff --git a/components/lib/orderlist/BaseOrderList.vue b/components/lib/orderlist/BaseOrderList.vue
index 36950f340..3202dbd40 100644
--- a/components/lib/orderlist/BaseOrderList.vue
+++ b/components/lib/orderlist/BaseOrderList.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-orderlist {
         display: flex;
     }
diff --git a/components/lib/organizationchart/BaseOrganizationChart.vue b/components/lib/organizationchart/BaseOrganizationChart.vue
index 9cad4b9c8..af17b7f49 100644
--- a/components/lib/organizationchart/BaseOrganizationChart.vue
+++ b/components/lib/organizationchart/BaseOrganizationChart.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-organizationchart-table {
         border-spacing: 0;
         border-collapse: separate;
diff --git a/components/lib/overlaypanel/BaseOverlayPanel.vue b/components/lib/overlaypanel/BaseOverlayPanel.vue
index d50c7a2b2..892a21d11 100644
--- a/components/lib/overlaypanel/BaseOverlayPanel.vue
+++ b/components/lib/overlaypanel/BaseOverlayPanel.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-overlaypanel {
         margin-top: 10px;
     }
diff --git a/components/lib/paginator/BasePaginator.vue b/components/lib/paginator/BasePaginator.vue
index 8a8b00f81..10d540940 100644
--- a/components/lib/paginator/BasePaginator.vue
+++ b/components/lib/paginator/BasePaginator.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-paginator-default {
         display: flex;
     }
diff --git a/components/lib/panel/BasePanel.vue b/components/lib/panel/BasePanel.vue
index 37ffee917..ac0c890b6 100644
--- a/components/lib/panel/BasePanel.vue
+++ b/components/lib/panel/BasePanel.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-panel-header {
         display: flex;
         justify-content: space-between;
diff --git a/components/lib/panelmenu/BasePanelMenu.vue b/components/lib/panelmenu/BasePanelMenu.vue
index d0db19ec0..945b9a28d 100644
--- a/components/lib/panelmenu/BasePanelMenu.vue
+++ b/components/lib/panelmenu/BasePanelMenu.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-panelmenu .p-panelmenu-header-action {
         display: flex;
         align-items: center;
diff --git a/components/lib/password/BasePassword.vue b/components/lib/password/BasePassword.vue
index 6da5987f6..c5c1b8e91 100644
--- a/components/lib/password/BasePassword.vue
+++ b/components/lib/password/BasePassword.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-password {
         display: inline-flex;
     }
diff --git a/components/lib/picklist/BasePickList.vue b/components/lib/picklist/BasePickList.vue
index 8b017f1ac..696cc7c21 100644
--- a/components/lib/picklist/BasePickList.vue
+++ b/components/lib/picklist/BasePickList.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-picklist {
         display: flex;
     }
diff --git a/components/lib/progressbar/BaseProgressBar.vue b/components/lib/progressbar/BaseProgressBar.vue
index f731193d3..0e177a2c7 100644
--- a/components/lib/progressbar/BaseProgressBar.vue
+++ b/components/lib/progressbar/BaseProgressBar.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-progressbar {
         position: relative;
         overflow: hidden;
diff --git a/components/lib/progressspinner/BaseProgressSpinner.vue b/components/lib/progressspinner/BaseProgressSpinner.vue
index f5227670a..faa974e38 100644
--- a/components/lib/progressspinner/BaseProgressSpinner.vue
+++ b/components/lib/progressspinner/BaseProgressSpinner.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-progress-spinner {
         position: relative;
         margin: 0 auto;
diff --git a/components/lib/rating/BaseRating.vue b/components/lib/rating/BaseRating.vue
index 3bd3582c0..d92214480 100644
--- a/components/lib/rating/BaseRating.vue
+++ b/components/lib/rating/BaseRating.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-rating {
         position: relative;
         display: flex;
diff --git a/components/lib/ripple/BaseRipple.js b/components/lib/ripple/BaseRipple.js
index e305e72ef..2c39f2b98 100644
--- a/components/lib/ripple/BaseRipple.js
+++ b/components/lib/ripple/BaseRipple.js
@@ -9,7 +9,7 @@ const styles = `
     }
 }
 
-@layer primevue {
+@layer primevue.core {
     .p-ripple {
         overflow: hidden;
         position: relative;
diff --git a/components/lib/scrollpanel/BaseScrollPanel.vue b/components/lib/scrollpanel/BaseScrollPanel.vue
index 699aae84c..5f0264519 100644
--- a/components/lib/scrollpanel/BaseScrollPanel.vue
+++ b/components/lib/scrollpanel/BaseScrollPanel.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-scrollpanel-wrapper {
         overflow: hidden;
         width: 100%;
diff --git a/components/lib/scrolltop/BaseScrollTop.vue b/components/lib/scrolltop/BaseScrollTop.vue
index ee52caea4..d73e4000c 100644
--- a/components/lib/scrolltop/BaseScrollTop.vue
+++ b/components/lib/scrolltop/BaseScrollTop.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-scrolltop {
         position: fixed;
         bottom: 20px;
diff --git a/components/lib/sidebar/BaseSidebar.vue b/components/lib/sidebar/BaseSidebar.vue
index a197811e7..5a4c44865 100644
--- a/components/lib/sidebar/BaseSidebar.vue
+++ b/components/lib/sidebar/BaseSidebar.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-sidebar-mask {
         display: none;
         pointer-events: none;
diff --git a/components/lib/skeleton/BaseSkeleton.vue b/components/lib/skeleton/BaseSkeleton.vue
index c371de668..22e06794a 100644
--- a/components/lib/skeleton/BaseSkeleton.vue
+++ b/components/lib/skeleton/BaseSkeleton.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-skeleton {
         overflow: hidden;
     }
diff --git a/components/lib/slider/BaseSlider.vue b/components/lib/slider/BaseSlider.vue
index 6c0a188da..c49a636ef 100644
--- a/components/lib/slider/BaseSlider.vue
+++ b/components/lib/slider/BaseSlider.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-slider {
         position: relative;
     }
diff --git a/components/lib/speeddial/BaseSpeedDial.vue b/components/lib/speeddial/BaseSpeedDial.vue
index 40e073895..11e8b2355 100644
--- a/components/lib/speeddial/BaseSpeedDial.vue
+++ b/components/lib/speeddial/BaseSpeedDial.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-speeddial {
         position: absolute;
         display: flex;
diff --git a/components/lib/splitbutton/BaseSplitButton.vue b/components/lib/splitbutton/BaseSplitButton.vue
index eb78bc338..abe493f4c 100644
--- a/components/lib/splitbutton/BaseSplitButton.vue
+++ b/components/lib/splitbutton/BaseSplitButton.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-splitbutton {
         display: inline-flex;
         position: relative;
diff --git a/components/lib/splitter/BaseSplitter.vue b/components/lib/splitter/BaseSplitter.vue
index a74426526..b4ee6311a 100644
--- a/components/lib/splitter/BaseSplitter.vue
+++ b/components/lib/splitter/BaseSplitter.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-splitter {
         display: flex;
         flex-wrap: nowrap;
diff --git a/components/lib/splitterpanel/BaseSplitterPanel.vue b/components/lib/splitterpanel/BaseSplitterPanel.vue
index 3def7935d..2d7498db2 100644
--- a/components/lib/splitterpanel/BaseSplitterPanel.vue
+++ b/components/lib/splitterpanel/BaseSplitterPanel.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-splitter-panel {
         flex-grow: 1;
     }
diff --git a/components/lib/steps/BaseSteps.vue b/components/lib/steps/BaseSteps.vue
index de70e8506..e284dd7ad 100644
--- a/components/lib/steps/BaseSteps.vue
+++ b/components/lib/steps/BaseSteps.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-steps {
         position: relative;
     }
diff --git a/components/lib/tabmenu/BaseTabMenu.vue b/components/lib/tabmenu/BaseTabMenu.vue
index 946f46129..dbcc721c9 100644
--- a/components/lib/tabmenu/BaseTabMenu.vue
+++ b/components/lib/tabmenu/BaseTabMenu.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-tabmenu {
         overflow-x: auto;
     }
diff --git a/components/lib/tabview/BaseTabView.vue b/components/lib/tabview/BaseTabView.vue
index 0c53a228f..98125f45e 100644
--- a/components/lib/tabview/BaseTabView.vue
+++ b/components/lib/tabview/BaseTabView.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-tabview-nav-container {
         position: relative;
     }
diff --git a/components/lib/tag/BaseTag.vue b/components/lib/tag/BaseTag.vue
index 5e794f945..fb0bbcb19 100644
--- a/components/lib/tag/BaseTag.vue
+++ b/components/lib/tag/BaseTag.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-tag {
         display: inline-flex;
         align-items: center;
diff --git a/components/lib/terminal/BaseTerminal.vue b/components/lib/terminal/BaseTerminal.vue
index 2ab598401..a825aa8ee 100644
--- a/components/lib/terminal/BaseTerminal.vue
+++ b/components/lib/terminal/BaseTerminal.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-terminal {
         height: 18rem;
         overflow: auto;
diff --git a/components/lib/textarea/BaseTextarea.vue b/components/lib/textarea/BaseTextarea.vue
index 7866307f8..1b3195a1a 100644
--- a/components/lib/textarea/BaseTextarea.vue
+++ b/components/lib/textarea/BaseTextarea.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-inputtextarea-resizable {
         overflow: hidden;
         resize: none;
diff --git a/components/lib/tieredmenu/BaseTieredMenu.vue b/components/lib/tieredmenu/BaseTieredMenu.vue
index da2f00c79..4680cf169 100644
--- a/components/lib/tieredmenu/BaseTieredMenu.vue
+++ b/components/lib/tieredmenu/BaseTieredMenu.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-tieredmenu ul {
         margin: 0;
         padding: 0;
diff --git a/components/lib/timeline/BaseTimeline.vue b/components/lib/timeline/BaseTimeline.vue
index 78a512a49..34dda1a28 100644
--- a/components/lib/timeline/BaseTimeline.vue
+++ b/components/lib/timeline/BaseTimeline.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-timeline {
         display: flex;
         flex-grow: 1;
diff --git a/components/lib/toast/BaseToast.vue b/components/lib/toast/BaseToast.vue
index 87150bcca..fa8b7c5a4 100644
--- a/components/lib/toast/BaseToast.vue
+++ b/components/lib/toast/BaseToast.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-toast {
         width: 25rem;
         white-space: pre-line;
diff --git a/components/lib/toolbar/BaseToolbar.vue b/components/lib/toolbar/BaseToolbar.vue
index 60c6d5fd6..91a914b1b 100644
--- a/components/lib/toolbar/BaseToolbar.vue
+++ b/components/lib/toolbar/BaseToolbar.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-toolbar {
         display: flex;
         align-items: center;
diff --git a/components/lib/tooltip/BaseTooltip.js b/components/lib/tooltip/BaseTooltip.js
index b1366568f..b7a1370d0 100644
--- a/components/lib/tooltip/BaseTooltip.js
+++ b/components/lib/tooltip/BaseTooltip.js
@@ -2,7 +2,7 @@ import BaseDirective from 'primevue/basedirective';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-tooltip {
         position:absolute;
         display:none;
diff --git a/components/lib/tree/BaseTree.vue b/components/lib/tree/BaseTree.vue
index 85d1d75c2..ecbc9054c 100644
--- a/components/lib/tree/BaseTree.vue
+++ b/components/lib/tree/BaseTree.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-tree-container {
         margin: 0;
         padding: 0;
diff --git a/components/lib/treeselect/BaseTreeSelect.vue b/components/lib/treeselect/BaseTreeSelect.vue
index 49fc00227..c629634c2 100644
--- a/components/lib/treeselect/BaseTreeSelect.vue
+++ b/components/lib/treeselect/BaseTreeSelect.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-treeselect {
         display: inline-flex;
         cursor: pointer;
diff --git a/components/lib/treetable/BaseTreeTable.vue b/components/lib/treetable/BaseTreeTable.vue
index 7c81453b8..aea49d0c1 100644
--- a/components/lib/treetable/BaseTreeTable.vue
+++ b/components/lib/treetable/BaseTreeTable.vue
@@ -3,7 +3,7 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-@layer primevue {
+@layer primevue.core {
     .p-treetable {
         position: relative;
     }