diff --git a/package.json b/package.json
index 0ee2d3a38b1..0c0a1e3bfd9 100755
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "primeng",
+    "name": "@wscott-retro/primeng",
     "version": "17.7.0",
     "license": "SEE LICENSE IN LICENSE.md",
     "scripts": {
@@ -20,11 +20,12 @@
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/primefaces/primeng.git"
+        "url": "https://github.com/wscott-retro/primeng.git"
     },
     "publishConfig": {
         "@wscott-retro:registry": "https://npm.pkg.github.com"
     },
+    "files": ["dist/resources"],
     "devDependencies": {
         "@angular-devkit/build-angular": "^17.0.5",
         "@angular-eslint/eslint-plugin": "17.1.1",
diff --git a/src/app/components/accordion/accordion.css b/src/app/components/accordion/accordion.css
index c576f092770..351c6849b67 100755
--- a/src/app/components/accordion/accordion.css
+++ b/src/app/components/accordion/accordion.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-accordion-header-link {
         cursor: pointer;
         display: flex;
@@ -32,4 +32,4 @@
     .p-accordion-toggle-icon {
         order: 0;
     }
-}
+
diff --git a/src/app/components/autocomplete/autocomplete.css b/src/app/components/autocomplete/autocomplete.css
index aa8619eff26..21bf39bf245 100755
--- a/src/app/components/autocomplete/autocomplete.css
+++ b/src/app/components/autocomplete/autocomplete.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-autocomplete {
         display: inline-flex;
         position: relative;
@@ -101,4 +101,4 @@
     .p-autocomplete-clearable {
         position: relative;
     }
-}
+
diff --git a/src/app/components/avatar/avatar.css b/src/app/components/avatar/avatar.css
index 551dff78fcf..f556df94d58 100755
--- a/src/app/components/avatar/avatar.css
+++ b/src/app/components/avatar/avatar.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-avatar {
         display: inline-flex;
         align-items: center;
@@ -25,4 +25,4 @@
         width: 100%;
         height: 100%;
     }
-}
+
diff --git a/src/app/components/avatargroup/avatargroup.css b/src/app/components/avatargroup/avatargroup.css
index 33c97ccb694..88e0bf7d5cf 100755
--- a/src/app/components/avatargroup/avatargroup.css
+++ b/src/app/components/avatargroup/avatargroup.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-avatar-group p-avatar + p-avatar {
         margin-left: -1rem;
     }
@@ -7,4 +7,4 @@
         display: flex;
         align-items: center;
     }
-}
+
diff --git a/src/app/components/badge/badge.css b/src/app/components/badge/badge.css
index 90a21511f9e..4b62bc5204b 100644
--- a/src/app/components/badge/badge.css
+++ b/src/app/components/badge/badge.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-badge {
         display: inline-block;
         border-radius: 10px;
@@ -31,4 +31,4 @@
         padding: 0;
         border-radius: 50%;
     }
-}
+
diff --git a/src/app/components/blockui/blockui.css b/src/app/components/blockui/blockui.css
index 67cd719da8b..f53f21d66ba 100755
--- a/src/app/components/blockui/blockui.css
+++ b/src/app/components/blockui/blockui.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-blockui {
         position: absolute;
         top: 0;
@@ -23,4 +23,4 @@
     .p-blockui-leave.p-component-overlay {
         background-color: transparent;
     }
-}
+
diff --git a/src/app/components/breadcrumb/breadcrumb.css b/src/app/components/breadcrumb/breadcrumb.css
index 8b62cea4647..61682bb39ca 100755
--- a/src/app/components/breadcrumb/breadcrumb.css
+++ b/src/app/components/breadcrumb/breadcrumb.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-breadcrumb {
         overflow-x: auto;
     }
@@ -30,4 +30,4 @@
     .p-breadcrumb::-webkit-scrollbar {
         display: none;
     }
-}
+
diff --git a/src/app/components/button/button.css b/src/app/components/button/button.css
index 7c2ca251cb1..3bd1f488420 100755
--- a/src/app/components/button/button.css
+++ b/src/app/components/button/button.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-button {
         margin: 0;
         display: inline-flex;
@@ -73,4 +73,4 @@
     p-button[iconpos='right'] spinnericon {
         order: 1;
     }
-}
+
diff --git a/src/app/components/calendar/calendar.css b/src/app/components/calendar/calendar.css
index bb2e30d40a6..ac53ff6229e 100755
--- a/src/app/components/calendar/calendar.css
+++ b/src/app/components/calendar/calendar.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-calendar {
         position: relative;
         display: inline-flex;
@@ -173,4 +173,4 @@
     .p-calendar-clearable {
         position: relative;
     }
-}
+
diff --git a/src/app/components/card/card.css b/src/app/components/card/card.css
index f3e561f53ef..7f3ca5a8262 100755
--- a/src/app/components/card/card.css
+++ b/src/app/components/card/card.css
@@ -1,5 +1,3 @@
-@layer primeng {
     .p-card-header img {
         width: 100%;
     }
-}
diff --git a/src/app/components/carousel/carousel.css b/src/app/components/carousel/carousel.css
index 799ef9e9d4c..8a0167b5732 100755
--- a/src/app/components/carousel/carousel.css
+++ b/src/app/components/carousel/carousel.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-carousel {
         display: flex;
         flex-direction: column;
@@ -68,4 +68,4 @@
     .p-items-hidden .p-carousel-item.p-carousel-item-active {
         visibility: visible;
     }
-}
+
diff --git a/src/app/components/cascadeselect/cascadeselect.css b/src/app/components/cascadeselect/cascadeselect.css
index 75f0b5dd54b..0117842cc96 100644
--- a/src/app/components/cascadeselect/cascadeselect.css
+++ b/src/app/components/cascadeselect/cascadeselect.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-cascadeselect {
         display: inline-flex;
         cursor: pointer;
@@ -95,4 +95,4 @@
     .p-overlay-modal .p-cascadeselect-item-active > .p-cascadeselect-sublist {
         left: 0;
     }
-}
+
diff --git a/src/app/components/checkbox/checkbox.css b/src/app/components/checkbox/checkbox.css
index e4741b28fe7..88428afb46d 100755
--- a/src/app/components/checkbox/checkbox.css
+++ b/src/app/components/checkbox/checkbox.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-checkbox {
         display: inline-flex;
         cursor: pointer;
@@ -27,4 +27,4 @@
     .p-checkbox-label {
         line-height: 1;
     }
-}
+
diff --git a/src/app/components/chip/chip.css b/src/app/components/chip/chip.css
index d9c03023a6f..87300177417 100755
--- a/src/app/components/chip/chip.css
+++ b/src/app/components/chip/chip.css
@@ -1,4 +1,3 @@
-@layer primeng {
     .p-chip {
         display: inline-flex;
         align-items: center;
@@ -23,4 +22,3 @@
     .p-chip img {
         border-radius: 50%;
     }
-}
diff --git a/src/app/components/chips/chips.css b/src/app/components/chips/chips.css
index 96104c7feb7..878ad013b21 100755
--- a/src/app/components/chips/chips.css
+++ b/src/app/components/chips/chips.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-chips {
         display: inline-flex;
     }
@@ -65,4 +65,4 @@
     .p-chips-clearable .p-inputtext {
         position: relative;
     }
-}
+
diff --git a/src/app/components/colorpicker/colorpicker.css b/src/app/components/colorpicker/colorpicker.css
index f79c5e8a8aa..dd0e7a65fbd 100755
--- a/src/app/components/colorpicker/colorpicker.css
+++ b/src/app/components/colorpicker/colorpicker.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-colorpicker {
         display: inline-block;
     }
@@ -80,4 +80,4 @@
         opacity: 0.85;
         cursor: pointer;
     }
-}
+
diff --git a/src/app/components/common/common.css b/src/app/components/common/common.css
index 6b23d729193..ac04947eed8 100755
--- a/src/app/components/common/common.css
+++ b/src/app/components/common/common.css
@@ -3,7 +3,7 @@
     padding-right: var(--scrollbar-width);
 }
 
-@layer primeng {
+
     .p-component,
     .p-component * {
         box-sizing: border-box;
@@ -155,7 +155,7 @@
         -webkit-animation: p-icon-spin 2s infinite linear;
         animation: p-icon-spin 2s infinite linear;
     }
-}
+
 
 @-webkit-keyframes p-icon-spin {
     0% {
diff --git a/src/app/components/confirmpopup/confirmpopup.css b/src/app/components/confirmpopup/confirmpopup.css
index 30998582078..9223c34f589 100755
--- a/src/app/components/confirmpopup/confirmpopup.css
+++ b/src/app/components/confirmpopup/confirmpopup.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-confirm-popup {
         position: absolute;
         margin-top: 10px;
@@ -50,4 +50,4 @@
         display: flex;
         align-items: center;
     }
-}
+
diff --git a/src/app/components/contextmenu/contextmenu.css b/src/app/components/contextmenu/contextmenu.css
index 0c1b58c8201..c46c078819b 100755
--- a/src/app/components/contextmenu/contextmenu.css
+++ b/src/app/components/contextmenu/contextmenu.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-contextmenu {
         position: absolute;
     }
@@ -39,4 +39,4 @@
     .p-contextmenu .p-menuitem-link .p-icon-wrapper {
         margin-left: auto;
     }
-}
+
diff --git a/src/app/components/dataview/dataview.css b/src/app/components/dataview/dataview.css
index 9b6a9334c75..d12a57f22a9 100755
--- a/src/app/components/dataview/dataview.css
+++ b/src/app/components/dataview/dataview.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-dataview {
         position: relative;
     }
@@ -10,4 +10,4 @@
         justify-content: center;
         z-index: 2;
     }
-}
+
diff --git a/src/app/components/dialog/dialog.css b/src/app/components/dialog/dialog.css
index 48a9455108b..1a3ddd9a760 100755
--- a/src/app/components/dialog/dialog.css
+++ b/src/app/components/dialog/dialog.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-dialog-mask {
         position: fixed;
         top: 0;
@@ -136,4 +136,4 @@
         display: flex;
         align-items: center;
     }
-}
+
diff --git a/src/app/components/divider/divider.css b/src/app/components/divider/divider.css
index 2738f847c0b..917cd367d8f 100644
--- a/src/app/components/divider/divider.css
+++ b/src/app/components/divider/divider.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-divider-horizontal {
         display: flex;
         width: 100%;
@@ -83,4 +83,4 @@
     .p-divider-dotted.p-divider-horizontal:before {
         border-left-style: dotted;
     }
-}
+
diff --git a/src/app/components/dock/dock.css b/src/app/components/dock/dock.css
index c5d1a39e529..547f8c8b1e9 100755
--- a/src/app/components/dock/dock.css
+++ b/src/app/components/dock/dock.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-dock {
         position: absolute;
         z-index: 1;
@@ -104,4 +104,4 @@
     .p-dock-left .p-dock-list {
         flex-direction: column;
     }
-}
+
diff --git a/src/app/components/dropdown/dropdown.css b/src/app/components/dropdown/dropdown.css
index 66570af419f..12de1ae49e3 100755
--- a/src/app/components/dropdown/dropdown.css
+++ b/src/app/components/dropdown/dropdown.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-dropdown {
         display: inline-flex;
         cursor: pointer;
@@ -41,7 +41,7 @@
     .p-dropdown .p-dropdown-panel {
         min-width: 100%;
     }
-    
+
     .p-dropdown-items-wrapper {
         overflow: auto;
     }
@@ -85,4 +85,3 @@
     .p-fluid .p-dropdown .p-dropdown-label {
         width: 1%;
     }
-}
\ No newline at end of file
diff --git a/src/app/components/fieldset/fieldset.css b/src/app/components/fieldset/fieldset.css
index c61be72c0d9..f2bc15dd119 100755
--- a/src/app/components/fieldset/fieldset.css
+++ b/src/app/components/fieldset/fieldset.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-fieldset-legend > a,
     .p-fieldset-legend > span {
         display: flex;
@@ -24,4 +24,4 @@
     .p-fieldset-toggleable .p-toggleable-content {
         overflow: hidden;
     }
-}
+
diff --git a/src/app/components/fileupload/fileupload.css b/src/app/components/fileupload/fileupload.css
index eccb43d9dc3..38bc00e9777 100755
--- a/src/app/components/fileupload/fileupload.css
+++ b/src/app/components/fileupload/fileupload.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-fileupload-content {
         position: relative;
     }
@@ -44,4 +44,4 @@
     .p-fileupload-filename {
         word-break: break-all;
     }
-}
+
diff --git a/src/app/components/galleria/galleria.css b/src/app/components/galleria/galleria.css
index c996776c864..027d10ee17c 100755
--- a/src/app/components/galleria/galleria.css
+++ b/src/app/components/galleria/galleria.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-galleria-content {
         display: flex;
         flex-direction: column;
@@ -273,4 +273,4 @@
     .p-items-hidden .p-galleria-thumbnail-item.p-galleria-thumbnail-item-active {
         visibility: visible;
     }
-}
+
diff --git a/src/app/components/image/image.css b/src/app/components/image/image.css
index cab0d4246cb..244a1c57ab4 100755
--- a/src/app/components/image/image.css
+++ b/src/app/components/image/image.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-image-mask {
         display: flex;
         align-items: center;
@@ -67,4 +67,4 @@
         max-width: 100vw;
         max-height: 100vh;
     }
-}
+
diff --git a/src/app/components/inplace/inplace.css b/src/app/components/inplace/inplace.css
index 3e560777672..d9fd4703992 100755
--- a/src/app/components/inplace/inplace.css
+++ b/src/app/components/inplace/inplace.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-inplace .p-inplace-display {
         display: inline;
         cursor: pointer;
@@ -16,4 +16,4 @@
         flex: 1 1 auto;
         width: 1%;
     }
-}
+
diff --git a/src/app/components/inputmask/inputmask.css b/src/app/components/inputmask/inputmask.css
index 9dd41c31041..3318a6258d5 100644
--- a/src/app/components/inputmask/inputmask.css
+++ b/src/app/components/inputmask/inputmask.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-inputmask-clear-icon {
         position: absolute;
         top: 50%;
@@ -9,4 +9,4 @@
     .p-inputmask-clearable {
         position: relative;
     }
-}
+
diff --git a/src/app/components/inputnumber/inputnumber.css b/src/app/components/inputnumber/inputnumber.css
index 32bfc0e9c80..3b0a3586329 100755
--- a/src/app/components/inputnumber/inputnumber.css
+++ b/src/app/components/inputnumber/inputnumber.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     p-inputnumber,
     .p-inputnumber {
         display: inline-flex;
@@ -112,4 +112,4 @@
     .p-inputnumber-clearable {
         position: relative;
     }
-}
+
diff --git a/src/app/components/inputswitch/inputswitch.css b/src/app/components/inputswitch/inputswitch.css
index 6cc866516a7..bb1628f6708 100755
--- a/src/app/components/inputswitch/inputswitch.css
+++ b/src/app/components/inputswitch/inputswitch.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-inputswitch {
         position: relative;
         display: inline-block;
@@ -20,4 +20,4 @@
         content: '';
         top: 50%;
     }
-}
+
diff --git a/src/app/components/inputtext/inputtext.css b/src/app/components/inputtext/inputtext.css
index a125423f616..b173bdcee52 100755
--- a/src/app/components/inputtext/inputtext.css
+++ b/src/app/components/inputtext/inputtext.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-inputtext {
         margin: 0;
     }
@@ -104,4 +104,4 @@
         display: block;
         width: 100%;
     }
-}
+
diff --git a/src/app/components/inputtextarea/inputtextarea.css b/src/app/components/inputtextarea/inputtextarea.css
index 8268a70b0c8..a660ca06f1a 100755
--- a/src/app/components/inputtextarea/inputtextarea.css
+++ b/src/app/components/inputtextarea/inputtextarea.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-inputtextarea-resizable {
         overflow: hidden;
         resize: none;
@@ -7,4 +7,4 @@
     .p-fluid .p-inputtextarea {
         width: 100%;
     }
-}
+
diff --git a/src/app/components/knob/knob.css b/src/app/components/knob/knob.css
index 75c96121508..531841e4ec9 100644
--- a/src/app/components/knob/knob.css
+++ b/src/app/components/knob/knob.css
@@ -3,7 +3,6 @@
         stroke-dashoffset: 0;
     }
 }
-@layer primeng {
     .p-knob-range {
         fill: none;
         transition: stroke 0.1s ease-in;
@@ -17,4 +16,3 @@
         font-size: 1.3rem;
         text-align: center;
     }
-}
diff --git a/src/app/components/listbox/listbox.css b/src/app/components/listbox/listbox.css
index 05f0f975be2..796babd5241 100755
--- a/src/app/components/listbox/listbox.css
+++ b/src/app/components/listbox/listbox.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-listbox-list-wrapper {
         overflow: auto;
     }
@@ -37,4 +37,3 @@
     .p-listbox-filter {
         width: 100%;
     }
-}
diff --git a/src/app/components/megamenu/megamenu.css b/src/app/components/megamenu/megamenu.css
index 7057b962b72..4cb8a966e50 100755
--- a/src/app/components/megamenu/megamenu.css
+++ b/src/app/components/megamenu/megamenu.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-megamenu-root-list {
         margin: 0;
         padding: 0;
@@ -105,4 +105,4 @@
     .p-megamenu-col-12 {
         width: 100%;
     }
-}
+
diff --git a/src/app/components/menu/menu.css b/src/app/components/menu/menu.css
index 24e52435d69..c3966832086 100755
--- a/src/app/components/menu/menu.css
+++ b/src/app/components/menu/menu.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-menu-overlay {
         position: absolute;
         top: 0;
@@ -27,4 +27,4 @@
     .p-menu .p-menuitem-text {
         line-height: 1;
     }
-}
+
diff --git a/src/app/components/menubar/menubar.css b/src/app/components/menubar/menubar.css
index 8acb442cb1f..d5037041a08 100755
--- a/src/app/components/menubar/menubar.css
+++ b/src/app/components/menubar/menubar.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-menubar {
         display: flex;
         align-items: center;
@@ -78,4 +78,3 @@
         align-items: center;
         justify-content: center;
     }
-}
diff --git a/src/app/components/message/message.css b/src/app/components/message/message.css
index 3ff4ab27106..d3317443254 100755
--- a/src/app/components/message/message.css
+++ b/src/app/components/message/message.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-inline-message {
         display: inline-flex;
         align-items: center;
@@ -14,4 +14,4 @@
     .p-fluid .p-inline-message {
         display: flex;
     }
-}
+
diff --git a/src/app/components/messages/messages.css b/src/app/components/messages/messages.css
index 6dae4f94a4f..889e4982665 100755
--- a/src/app/components/messages/messages.css
+++ b/src/app/components/messages/messages.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-message-wrapper {
         display: flex;
         align-items: center;
@@ -20,4 +20,3 @@
     .p-messages .p-message.ng-animating {
         overflow: hidden;
     }
-}
diff --git a/src/app/components/multiselect/multiselect.css b/src/app/components/multiselect/multiselect.css
index a9b5679f6d5..6d737a1422e 100755
--- a/src/app/components/multiselect/multiselect.css
+++ b/src/app/components/multiselect/multiselect.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-multiselect {
         display: inline-flex;
         cursor: pointer;
@@ -113,4 +113,3 @@
     .p-multiselect-clearable {
         position: relative;
     }
-}
\ No newline at end of file
diff --git a/src/app/components/orderlist/orderlist.css b/src/app/components/orderlist/orderlist.css
index a4b898a9b87..1de4aa06392 100755
--- a/src/app/components/orderlist/orderlist.css
+++ b/src/app/components/orderlist/orderlist.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-orderlist {
         display: flex;
     }
@@ -75,4 +75,4 @@
     .p-orderlist-list.cdk-drop-list-dragging .p-orderlist-item:not(.cdk-drag-placeholder) {
         transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
     }
-}
+
diff --git a/src/app/components/organizationchart/organizationchart.css b/src/app/components/organizationchart/organizationchart.css
index 85ffeb92ce9..59c0a4a3609 100755
--- a/src/app/components/organizationchart/organizationchart.css
+++ b/src/app/components/organizationchart/organizationchart.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-organizationchart-table {
         border-spacing: 0;
         border-collapse: separate;
@@ -59,4 +59,4 @@
         visibility: hidden;
         display: inherit;
     }
-}
+
diff --git a/src/app/components/overlay/overlay.css b/src/app/components/overlay/overlay.css
index fb691ce8d6d..5b6a54ef1ca 100644
--- a/src/app/components/overlay/overlay.css
+++ b/src/app/components/overlay/overlay.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-overlay {
         position: absolute;
         top: 0;
@@ -77,4 +77,4 @@
         justify-content: flex-end;
         align-items: flex-end;
     }
-}
+
diff --git a/src/app/components/overlaypanel/overlaypanel.css b/src/app/components/overlaypanel/overlaypanel.css
index 2a2bb984805..64bf2d029ac 100755
--- a/src/app/components/overlaypanel/overlaypanel.css
+++ b/src/app/components/overlaypanel/overlaypanel.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-overlaypanel {
         position: absolute;
         margin-top: 10px;
@@ -60,4 +60,4 @@
     .p-overlaypanel.p-overlaypanel-flipped:before {
         border-bottom-color: transparent;
     }
-}
+
diff --git a/src/app/components/paginator/paginator.css b/src/app/components/paginator/paginator.css
index a86d6f19f6b..a14be0f3e0b 100755
--- a/src/app/components/paginator/paginator.css
+++ b/src/app/components/paginator/paginator.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-paginator {
         display: flex;
         align-items: center;
@@ -34,4 +34,4 @@
         z-index: 1;
         position: relative;
     }
-}
+
diff --git a/src/app/components/panel/panel.css b/src/app/components/panel/panel.css
index 3bd0f07e425..0c767f90e9b 100755
--- a/src/app/components/panel/panel.css
+++ b/src/app/components/panel/panel.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-panel-header {
         display: flex;
         align-items: center;
@@ -26,4 +26,4 @@
     .p-panel-toggleable .p-toggleable-content {
         overflow: hidden;
     }
-}
+
diff --git a/src/app/components/panelmenu/panelmenu.css b/src/app/components/panelmenu/panelmenu.css
index 0ae30e0d0d2..72e561f4330 100755
--- a/src/app/components/panelmenu/panelmenu.css
+++ b/src/app/components/panelmenu/panelmenu.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-panelmenu .p-panelmenu-header-action {
         display: flex;
         align-items: center;
@@ -42,4 +42,4 @@
     .p-panelmenu .p-submenu-list {
         overflow: hidden;
     }
-}
+
diff --git a/src/app/components/password/password.css b/src/app/components/password/password.css
index 7dd741617be..5d1bd909357 100755
--- a/src/app/components/password/password.css
+++ b/src/app/components/password/password.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-password {
         position: relative;
         display: inline-flex;
@@ -51,4 +51,4 @@
     .p-password-clearable {
         position: relative;
     }
-}
+
diff --git a/src/app/components/picklist/picklist.css b/src/app/components/picklist/picklist.css
index 3ef00411fd2..a60a18b232e 100755
--- a/src/app/components/picklist/picklist.css
+++ b/src/app/components/picklist/picklist.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-picklist {
         display: flex;
     }
@@ -57,4 +57,4 @@
     .p-picklist-list.cdk-drop-list-dragging .p-picklist-item:not(.cdk-drag-placeholder) {
         transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
     }
-}
+
diff --git a/src/app/components/progressbar/progressbar.css b/src/app/components/progressbar/progressbar.css
index 009b823f5a5..3ae921c1054 100755
--- a/src/app/components/progressbar/progressbar.css
+++ b/src/app/components/progressbar/progressbar.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-progressbar {
         position: relative;
         overflow: hidden;
@@ -49,7 +49,7 @@
         -webkit-animation-delay: 1.15s;
         animation-delay: 1.15s;
     }
-}
+
 
 @-webkit-keyframes p-progressbar-indeterminate-anim {
     0% {
diff --git a/src/app/components/progressspinner/progressspinner.css b/src/app/components/progressspinner/progressspinner.css
index 9092d69f1a6..353dd78c5c7 100755
--- a/src/app/components/progressspinner/progressspinner.css
+++ b/src/app/components/progressspinner/progressspinner.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-progress-spinner {
         position: relative;
         margin: 0 auto;
@@ -33,7 +33,7 @@
         animation: p-progress-spinner-dash 1.5s ease-in-out infinite, p-progress-spinner-color 6s ease-in-out infinite;
         stroke-linecap: round;
     }
-}
+
 
 @keyframes p-progress-spinner-rotate {
     100% {
diff --git a/src/app/components/radiobutton/radiobutton.css b/src/app/components/radiobutton/radiobutton.css
index 7bd8a90360e..615210bdae0 100755
--- a/src/app/components/radiobutton/radiobutton.css
+++ b/src/app/components/radiobutton/radiobutton.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-radiobutton {
         display: inline-flex;
         cursor: pointer;
@@ -35,4 +35,4 @@
     .p-radiobutton-label {
         line-height: 1;
     }
-}
+
diff --git a/src/app/components/rating/rating.css b/src/app/components/rating/rating.css
index c755b715ca2..67c85131a7f 100755
--- a/src/app/components/rating/rating.css
+++ b/src/app/components/rating/rating.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-rating {
         display: inline-flex;
     }
@@ -10,4 +10,4 @@
     .p-rating.p-rating-readonly .p-rating-icon {
         cursor: default;
     }
-}
+
diff --git a/src/app/components/ripple/ripple.css b/src/app/components/ripple/ripple.css
index 811262ded4a..510bb729490 100644
--- a/src/app/components/ripple/ripple.css
+++ b/src/app/components/ripple/ripple.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-ripple {
         overflow: hidden;
         position: relative;
@@ -19,7 +19,7 @@
     .p-ripple-disabled .p-ink {
         display: none !important;
     }
-}
+
 
 @keyframes ripple {
     100% {
diff --git a/src/app/components/scroller/scroller.css b/src/app/components/scroller/scroller.css
index 7df9403016d..5e50f1c919e 100644
--- a/src/app/components/scroller/scroller.css
+++ b/src/app/components/scroller/scroller.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     p-scroller {
         flex: 1;
         outline: 0 none;
@@ -55,4 +55,4 @@
     .p-scroller-inline .p-scroller-content {
         position: static;
     }
-}
+
diff --git a/src/app/components/scrollpanel/scrollpanel.css b/src/app/components/scrollpanel/scrollpanel.css
index 84d19e50c1d..25b7c0812ad 100755
--- a/src/app/components/scrollpanel/scrollpanel.css
+++ b/src/app/components/scrollpanel/scrollpanel.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-scrollpanel-wrapper {
         overflow: hidden;
         width: 100%;
@@ -47,4 +47,4 @@
     .p-scrollpanel-grabbed {
         user-select: none;
     }
-}
+
diff --git a/src/app/components/scrolltop/scrolltop.css b/src/app/components/scrolltop/scrolltop.css
index 840a514a877..da4d95ade35 100644
--- a/src/app/components/scrolltop/scrolltop.css
+++ b/src/app/components/scrolltop/scrolltop.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-scrolltop {
         position: fixed;
         bottom: 20px;
@@ -15,4 +15,4 @@
     .p-scrolltop-sticky.p-link {
         margin-left: auto;
     }
-}
+
diff --git a/src/app/components/sidebar/sidebar.css b/src/app/components/sidebar/sidebar.css
index b99d1f5e4a1..31e1a30ba8f 100755
--- a/src/app/components/sidebar/sidebar.css
+++ b/src/app/components/sidebar/sidebar.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-sidebar {
         position: fixed;
         transition: transform 0.3s;
@@ -103,4 +103,4 @@
             width: 20rem;
         }
     }
-}
+
diff --git a/src/app/components/skeleton/skeleton.css b/src/app/components/skeleton/skeleton.css
index 0ba87206225..6f080870d47 100644
--- a/src/app/components/skeleton/skeleton.css
+++ b/src/app/components/skeleton/skeleton.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-skeleton {
         position: relative;
         overflow: hidden;
@@ -23,7 +23,7 @@
     .p-skeleton-none::after {
         animation: none;
     }
-}
+
 
 @keyframes p-skeleton-animation {
     from {
diff --git a/src/app/components/slidemenu/slidemenu.css b/src/app/components/slidemenu/slidemenu.css
index 2b92f6373e3..0cf61efcb32 100755
--- a/src/app/components/slidemenu/slidemenu.css
+++ b/src/app/components/slidemenu/slidemenu.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-slidemenu .p-slidemenu-root-list {
         position: relative;
         top: 0;
@@ -97,4 +97,4 @@
     .p-slidemenu-backward span {
         vertical-align: middle;
     }
-}
+
diff --git a/src/app/components/slider/slider.css b/src/app/components/slider/slider.css
index 6ca7433da2d..82b2386aeb4 100755
--- a/src/app/components/slider/slider.css
+++ b/src/app/components/slider/slider.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-slider {
         position: relative;
     }
@@ -38,4 +38,4 @@
         left: 0;
         width: 100%;
     }
-}
+
diff --git a/src/app/components/speeddial/speeddial.css b/src/app/components/speeddial/speeddial.css
index f6f7dd57b38..0eb10cd729c 100755
--- a/src/app/components/speeddial/speeddial.css
+++ b/src/app/components/speeddial/speeddial.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-speeddial {
         position: absolute;
         display: flex;
@@ -109,4 +109,4 @@
     .p-speeddial-direction-right .p-speeddial-list {
         flex-direction: row;
     }
-}
+
diff --git a/src/app/components/spinner/spinner.css b/src/app/components/spinner/spinner.css
index 0ca2b584239..5f6108644f4 100755
--- a/src/app/components/spinner/spinner.css
+++ b/src/app/components/spinner/spinner.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .ui-spinner {
         display: inline-block;
         overflow: visible;
@@ -60,4 +60,4 @@
     .ui-fluid .ui-spinner .ui-spinner-button .ui-spinner-button-icon {
         left: 0.7em;
     }
-}
+
diff --git a/src/app/components/splitbutton/splitbutton.css b/src/app/components/splitbutton/splitbutton.css
index b95f56ee19b..d053a53ee94 100755
--- a/src/app/components/splitbutton/splitbutton.css
+++ b/src/app/components/splitbutton/splitbutton.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-splitbutton {
         display: inline-flex;
         position: relative;
@@ -30,4 +30,4 @@
     .p-fluid .p-splitbutton {
         display: flex;
     }
-}
+
diff --git a/src/app/components/splitter/splitter.css b/src/app/components/splitter/splitter.css
index c265335f1da..9c0ad9b660c 100644
--- a/src/app/components/splitter/splitter.css
+++ b/src/app/components/splitter/splitter.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-splitter {
         display: flex;
         flex-wrap: nowrap;
@@ -62,4 +62,4 @@
         width: 24px;
         height: 100%;
     }
-}
+
diff --git a/src/app/components/steps/steps.css b/src/app/components/steps/steps.css
index 15abf80aa8b..bf16ab94ded 100755
--- a/src/app/components/steps/steps.css
+++ b/src/app/components/steps/steps.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-steps {
         position: relative;
     }
@@ -46,4 +46,4 @@
     .p-steps-title {
         display: block;
     }
-}
+
diff --git a/src/app/components/table/table.css b/src/app/components/table/table.css
index 6d55f24793e..7eef45b8561 100755
--- a/src/app/components/table/table.css
+++ b/src/app/components/table/table.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-datatable {
         position: relative;
     }
@@ -246,4 +246,4 @@
         top: 0;
         left: 0;
     }
-}
+
diff --git a/src/app/components/tabmenu/tabmenu.css b/src/app/components/tabmenu/tabmenu.css
index 062d291951a..1a592c2457d 100755
--- a/src/app/components/tabmenu/tabmenu.css
+++ b/src/app/components/tabmenu/tabmenu.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-tabmenu-nav-container {
         position: relative;
     }
@@ -77,4 +77,4 @@
     .p-tabmenuitem:not(.p-hidden) {
         display: flex;
     }
-}
+
diff --git a/src/app/components/tabview/tabview.css b/src/app/components/tabview/tabview.css
index 00152ebc2d2..1cf38cd77c8 100755
--- a/src/app/components/tabview/tabview.css
+++ b/src/app/components/tabview/tabview.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-tabview-nav-container {
         position: relative;
     }
@@ -73,4 +73,4 @@
     .p-tabview-close {
         z-index: 1;
     }
-}
+
diff --git a/src/app/components/tag/tag.css b/src/app/components/tag/tag.css
index 87e0cc6a369..709527074c1 100644
--- a/src/app/components/tag/tag.css
+++ b/src/app/components/tag/tag.css
@@ -1,4 +1,3 @@
-@layer primeng {
     .p-tag {
         display: inline-flex;
         align-items: center;
@@ -14,4 +13,3 @@
     .p-tag.p-tag-rounded {
         border-radius: 10rem;
     }
-}
diff --git a/src/app/components/terminal/terminal.css b/src/app/components/terminal/terminal.css
index 103a40241da..79ad4cd240d 100755
--- a/src/app/components/terminal/terminal.css
+++ b/src/app/components/terminal/terminal.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-terminal {
         height: 18rem;
         overflow: auto;
@@ -21,4 +21,4 @@
     .p-terminal-input::-ms-clear {
         display: none;
     }
-}
+
diff --git a/src/app/components/tieredmenu/tieredmenu.css b/src/app/components/tieredmenu/tieredmenu.css
index e7d8051507d..2560b504d3b 100755
--- a/src/app/components/tieredmenu/tieredmenu.css
+++ b/src/app/components/tieredmenu/tieredmenu.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-tieredmenu-overlay {
         position: absolute;
         top: 0;
@@ -52,4 +52,4 @@
     .p-tieredmenu .p-menuitem-active > p-tieredmenusub > .p-submenu-list.p-submenu-list-flipped {
         left: -100%;
     }
-}
+
diff --git a/src/app/components/timeline/timeline.css b/src/app/components/timeline/timeline.css
index e8475978679..0ba20271f4c 100755
--- a/src/app/components/timeline/timeline.css
+++ b/src/app/components/timeline/timeline.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-timeline {
         display: flex;
         flex-grow: 1;
@@ -109,4 +109,4 @@
     .p-timeline-horizontal.p-timeline-alternate .p-timeline-event:nth-child(even) {
         flex-direction: column-reverse;
     }
-}
+
diff --git a/src/app/components/toast/toast.css b/src/app/components/toast/toast.css
index 7a657005935..6cb58044195 100755
--- a/src/app/components/toast/toast.css
+++ b/src/app/components/toast/toast.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-toast {
         position: fixed;
         width: 25rem;
@@ -68,4 +68,4 @@
     .p-toast-icon-close.p-link {
         cursor: pointer;
     }
-}
+
diff --git a/src/app/components/toolbar/toolbar.css b/src/app/components/toolbar/toolbar.css
index 7e15a448162..c566187f75b 100755
--- a/src/app/components/toolbar/toolbar.css
+++ b/src/app/components/toolbar/toolbar.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-toolbar {
         display: flex;
         align-items: center;
@@ -16,4 +16,4 @@
         display: flex;
         align-items: center;
     }
-}
+
diff --git a/src/app/components/tooltip/tooltip.css b/src/app/components/tooltip/tooltip.css
index e6fa79e11d9..bcc1f0b476d 100755
--- a/src/app/components/tooltip/tooltip.css
+++ b/src/app/components/tooltip/tooltip.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-tooltip {
         position: absolute;
         display: none;
@@ -62,4 +62,4 @@
         margin-left: -0.25rem;
         border-width: 0 0.25em 0.25rem;
     }
-}
+
diff --git a/src/app/components/tree/tree.css b/src/app/components/tree/tree.css
index d63be17864f..0a7e7ed3996 100755
--- a/src/app/components/tree/tree.css
+++ b/src/app/components/tree/tree.css
@@ -1,4 +1,3 @@
-@layer primeng {
     .p-tree-container {
         margin: 0;
         padding: 0;
@@ -150,9 +149,8 @@
     .p-tree.p-tree-horizontal table {
         height: 0;
     }
-    
+
     /* Virtual Scroll */
     .p-scroller .p-tree-container {
         overflow: visible;
     }
-}
diff --git a/src/app/components/treeselect/treeselect.css b/src/app/components/treeselect/treeselect.css
index 1c688074663..c057a5944f1 100755
--- a/src/app/components/treeselect/treeselect.css
+++ b/src/app/components/treeselect/treeselect.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-treeselect {
         display: inline-flex;
         cursor: pointer;
@@ -95,4 +95,4 @@
     .p-treeselect-clearable {
         position: relative;
     }
-}
+
diff --git a/src/app/components/treetable/treetable.css b/src/app/components/treetable/treetable.css
index 26ad51e310f..2429e902728 100755
--- a/src/app/components/treetable/treetable.css
+++ b/src/app/components/treetable/treetable.css
@@ -1,4 +1,4 @@
-@layer primeng {
+
     .p-treetable {
         position: relative;
     }
@@ -202,4 +202,3 @@
         top: 0;
         left: 0;
     }
-}
diff --git a/src/assets/components/themes/arya-blue/theme.css b/src/assets/components/themes/arya-blue/theme.css
index 826904c446f..31bff8b80ff 100644
--- a/src/assets/components/themes/arya-blue/theme.css
+++ b/src/assets/components/themes/arya-blue/theme.css
@@ -272,7 +272,6 @@
   color: #64B5F6;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6302,9 +6301,8 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-/* Customizations to the designer theme should be defined here */
-@layer primeng {
+
+
   .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
     background-color: #64B5F6;
   }
@@ -6322,4 +6320,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #64B5F6;
   }
-}
+
diff --git a/src/assets/components/themes/arya-green/theme.css b/src/assets/components/themes/arya-green/theme.css
index e03fffa3598..0cdcb33d21b 100644
--- a/src/assets/components/themes/arya-green/theme.css
+++ b/src/assets/components/themes/arya-green/theme.css
@@ -272,7 +272,7 @@
   color: #81C784;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6302,9 +6302,8 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-/* Customizations to the designer theme should be defined here */
-@layer primeng {
+
+
   .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
     background-color: #81C784;
   }
@@ -6322,4 +6321,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #81C784;
   }
-}
+
diff --git a/src/assets/components/themes/arya-orange/theme.css b/src/assets/components/themes/arya-orange/theme.css
index 8cd8c32ab51..c96ac0287f7 100644
--- a/src/assets/components/themes/arya-orange/theme.css
+++ b/src/assets/components/themes/arya-orange/theme.css
@@ -272,7 +272,7 @@
   color: #FFD54F;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6302,9 +6302,8 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-/* Customizations to the designer theme should be defined here */
-@layer primeng {
+
+
   .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
     background-color: #FFD54F;
   }
@@ -6322,4 +6321,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #FFD54F;
   }
-}
+
diff --git a/src/assets/components/themes/arya-purple/theme.css b/src/assets/components/themes/arya-purple/theme.css
index 8eceecc17ab..63bfa618ca9 100644
--- a/src/assets/components/themes/arya-purple/theme.css
+++ b/src/assets/components/themes/arya-purple/theme.css
@@ -272,7 +272,7 @@
   color: #BA68C8;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6302,9 +6302,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
     background-color: #BA68C8;
   }
@@ -6322,4 +6322,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #BA68C8;
   }
-}
+
diff --git a/src/assets/components/themes/bootstrap4-dark-blue/theme.css b/src/assets/components/themes/bootstrap4-dark-blue/theme.css
index 2e8030b48c6..e32fb8a885b 100644
--- a/src/assets/components/themes/bootstrap4-dark-blue/theme.css
+++ b/src/assets/components/themes/bootstrap4-dark-blue/theme.css
@@ -272,7 +272,6 @@
   color: #8dd0ff;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6314,6 +6313,6 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Vendor extensions to the designer enhanced bootstrap compatibility */
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/bootstrap4-dark-purple/theme.css b/src/assets/components/themes/bootstrap4-dark-purple/theme.css
index 9e574382dc0..77207e77264 100644
--- a/src/assets/components/themes/bootstrap4-dark-purple/theme.css
+++ b/src/assets/components/themes/bootstrap4-dark-purple/theme.css
@@ -272,7 +272,6 @@
   color: #c298d8;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6314,6 +6313,6 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Vendor extensions to the designer enhanced bootstrap compatibility */
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/bootstrap4-light-blue/theme.css b/src/assets/components/themes/bootstrap4-light-blue/theme.css
index 9933f933730..3c8464a3859 100644
--- a/src/assets/components/themes/bootstrap4-light-blue/theme.css
+++ b/src/assets/components/themes/bootstrap4-light-blue/theme.css
@@ -272,7 +272,6 @@
   color: #007bff;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6314,6 +6313,6 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Vendor extensions to the designer enhanced bootstrap compatibility */
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/bootstrap4-light-purple/theme.css b/src/assets/components/themes/bootstrap4-light-purple/theme.css
index 18860fef36a..9b31eba4c86 100644
--- a/src/assets/components/themes/bootstrap4-light-purple/theme.css
+++ b/src/assets/components/themes/bootstrap4-light-purple/theme.css
@@ -272,7 +272,6 @@
   color: #883cae;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6314,6 +6313,6 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Vendor extensions to the designer enhanced bootstrap compatibility */
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/fluent-light/theme.css b/src/assets/components/themes/fluent-light/theme.css
index 731b7ba30d5..bdea272cdd1 100644
--- a/src/assets/components/themes/fluent-light/theme.css
+++ b/src/assets/components/themes/fluent-light/theme.css
@@ -272,7 +272,6 @@
   color: #0078d4;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6254,9 +6253,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-button-label {
     font-weight: 600;
   }
@@ -6457,4 +6456,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #0078d4;
   }
-}
+
diff --git a/src/assets/components/themes/lara-dark-amber/theme.css b/src/assets/components/themes/lara-dark-amber/theme.css
index 1a9a2436445..6a55218b1cd 100644
--- a/src/assets/components/themes/lara-dark-amber/theme.css
+++ b/src/assets/components/themes/lara-dark-amber/theme.css
@@ -289,7 +289,7 @@
   color: #fbbf24;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6096,8 +6096,8 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6200,4 +6200,4 @@
     background: #fbbf24;
     color: #030712;
   }
-}
+
diff --git a/src/assets/components/themes/lara-dark-blue/theme.css b/src/assets/components/themes/lara-dark-blue/theme.css
index 06e494801ad..b81aab73a18 100644
--- a/src/assets/components/themes/lara-dark-blue/theme.css
+++ b/src/assets/components/themes/lara-dark-blue/theme.css
@@ -289,7 +289,6 @@
   color: #60a5fa;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6271,8 +6270,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6367,4 +6365,4 @@
     background: #60a5fa;
     color: #030712;
   }
-}
+
diff --git a/src/assets/components/themes/lara-dark-cyan/theme.css b/src/assets/components/themes/lara-dark-cyan/theme.css
index aefeb0a333c..7b045df8980 100644
--- a/src/assets/components/themes/lara-dark-cyan/theme.css
+++ b/src/assets/components/themes/lara-dark-cyan/theme.css
@@ -289,7 +289,6 @@
   color: #22d3ee;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6096,8 +6095,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6200,4 +6198,4 @@
     background: #22d3ee;
     color: #030712;
   }
-}
+
diff --git a/src/assets/components/themes/lara-dark-green/theme.css b/src/assets/components/themes/lara-dark-green/theme.css
index e51d74a5178..54189191dfa 100644
--- a/src/assets/components/themes/lara-dark-green/theme.css
+++ b/src/assets/components/themes/lara-dark-green/theme.css
@@ -289,7 +289,6 @@
   color: #34d399;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6096,8 +6095,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6200,4 +6198,4 @@
     background: #34d399;
     color: #030712;
   }
-}
+
diff --git a/src/assets/components/themes/lara-dark-indigo/theme.css b/src/assets/components/themes/lara-dark-indigo/theme.css
index 6fb191d2c89..4a652a861a6 100644
--- a/src/assets/components/themes/lara-dark-indigo/theme.css
+++ b/src/assets/components/themes/lara-dark-indigo/theme.css
@@ -289,7 +289,6 @@
   color: #818cf8;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6271,8 +6270,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6367,4 +6365,4 @@
     background: #818cf8;
     color: #030712;
   }
-}
+
diff --git a/src/assets/components/themes/lara-dark-pink/theme.css b/src/assets/components/themes/lara-dark-pink/theme.css
index 3bb4e01dc36..c42fbb1a83f 100644
--- a/src/assets/components/themes/lara-dark-pink/theme.css
+++ b/src/assets/components/themes/lara-dark-pink/theme.css
@@ -289,7 +289,6 @@
   color: #f472b6;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6096,8 +6095,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6200,4 +6198,4 @@
     background: #f472b6;
     color: #030712;
   }
-}
+
diff --git a/src/assets/components/themes/lara-dark-purple/theme.css b/src/assets/components/themes/lara-dark-purple/theme.css
index 278966af800..4f21e860a63 100644
--- a/src/assets/components/themes/lara-dark-purple/theme.css
+++ b/src/assets/components/themes/lara-dark-purple/theme.css
@@ -289,7 +289,6 @@
   color: #a78bfa;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6271,8 +6270,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6367,4 +6365,4 @@
     background: #a78bfa;
     color: #030712;
   }
-}
+
diff --git a/src/assets/components/themes/lara-dark-teal/theme.css b/src/assets/components/themes/lara-dark-teal/theme.css
index 8118d1b873b..1f4590dfe25 100644
--- a/src/assets/components/themes/lara-dark-teal/theme.css
+++ b/src/assets/components/themes/lara-dark-teal/theme.css
@@ -289,7 +289,6 @@
   color: #2dd4bf;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6271,8 +6270,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6367,4 +6365,4 @@
     background: #2dd4bf;
     color: #030712;
   }
-}
+
diff --git a/src/assets/components/themes/lara-light-amber/theme.css b/src/assets/components/themes/lara-light-amber/theme.css
index 2109183c552..ac3813e38f5 100644
--- a/src/assets/components/themes/lara-light-amber/theme.css
+++ b/src/assets/components/themes/lara-light-amber/theme.css
@@ -289,7 +289,6 @@
   color: #f59e0b;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6096,8 +6095,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6185,4 +6183,4 @@
     background: #f59e0b;
     color: #ffffff;
   }
-}
+
diff --git a/src/assets/components/themes/lara-light-blue/theme.css b/src/assets/components/themes/lara-light-blue/theme.css
index 2a62954fab8..ae3b681f921 100644
--- a/src/assets/components/themes/lara-light-blue/theme.css
+++ b/src/assets/components/themes/lara-light-blue/theme.css
@@ -289,7 +289,6 @@
   color: #3B82F6;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6271,8 +6270,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6352,4 +6350,3 @@
     background: #3B82F6;
     color: #ffffff;
   }
-}
diff --git a/src/assets/components/themes/lara-light-cyan/theme.css b/src/assets/components/themes/lara-light-cyan/theme.css
index 04dd95032c7..ace3c60a9ac 100644
--- a/src/assets/components/themes/lara-light-cyan/theme.css
+++ b/src/assets/components/themes/lara-light-cyan/theme.css
@@ -289,7 +289,6 @@
   color: #06b6d4;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6096,8 +6095,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6185,4 +6183,3 @@
     background: #06b6d4;
     color: #ffffff;
   }
-}
diff --git a/src/assets/components/themes/lara-light-green/theme.css b/src/assets/components/themes/lara-light-green/theme.css
index 245596a2b5f..cba43071cd0 100644
--- a/src/assets/components/themes/lara-light-green/theme.css
+++ b/src/assets/components/themes/lara-light-green/theme.css
@@ -289,7 +289,6 @@
   color: #10b981;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6096,8 +6095,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6185,4 +6183,4 @@
     background: #10b981;
     color: #ffffff;
   }
-}
+
diff --git a/src/assets/components/themes/lara-light-indigo/theme.css b/src/assets/components/themes/lara-light-indigo/theme.css
index 2974a643020..a71fd4995cf 100644
--- a/src/assets/components/themes/lara-light-indigo/theme.css
+++ b/src/assets/components/themes/lara-light-indigo/theme.css
@@ -289,7 +289,7 @@
   color: #6366F1;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6271,8 +6271,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6352,4 +6351,4 @@
     background: #6366F1;
     color: #ffffff;
   }
-}
+
diff --git a/src/assets/components/themes/lara-light-pink/theme.css b/src/assets/components/themes/lara-light-pink/theme.css
index e72eb7f3454..4037ccdc242 100644
--- a/src/assets/components/themes/lara-light-pink/theme.css
+++ b/src/assets/components/themes/lara-light-pink/theme.css
@@ -289,7 +289,6 @@
   color: #ec4899;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6096,8 +6095,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6185,4 +6183,4 @@
     background: #ec4899;
     color: #ffffff;
   }
-}
+
diff --git a/src/assets/components/themes/lara-light-purple/theme.css b/src/assets/components/themes/lara-light-purple/theme.css
index 8b0976b250f..e527ce4fb7a 100644
--- a/src/assets/components/themes/lara-light-purple/theme.css
+++ b/src/assets/components/themes/lara-light-purple/theme.css
@@ -289,7 +289,7 @@
   color: #8B5CF6;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6271,8 +6271,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6352,4 +6351,4 @@
     background: #8B5CF6;
     color: #ffffff;
   }
-}
+
diff --git a/src/assets/components/themes/lara-light-teal/theme.css b/src/assets/components/themes/lara-light-teal/theme.css
index 359f03e5362..85f56d65ee2 100644
--- a/src/assets/components/themes/lara-light-teal/theme.css
+++ b/src/assets/components/themes/lara-light-teal/theme.css
@@ -289,7 +289,6 @@
   color: #14b8a6;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6271,8 +6270,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-button-label {
     font-weight: 700;
   }
@@ -6352,4 +6350,4 @@
     background: #14b8a6;
     color: #ffffff;
   }
-}
+
diff --git a/src/assets/components/themes/luna-amber/theme.css b/src/assets/components/themes/luna-amber/theme.css
index 1e165c183e4..7db718a8f05 100644
--- a/src/assets/components/themes/luna-amber/theme.css
+++ b/src/assets/components/themes/luna-amber/theme.css
@@ -272,7 +272,6 @@
   color: #FFE082;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6266,5 +6265,5 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/luna-blue/theme.css b/src/assets/components/themes/luna-blue/theme.css
index 0b83a4ee11a..8da127104de 100644
--- a/src/assets/components/themes/luna-blue/theme.css
+++ b/src/assets/components/themes/luna-blue/theme.css
@@ -272,7 +272,6 @@
   color: #81D4FA;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6266,5 +6265,5 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/luna-green/theme.css b/src/assets/components/themes/luna-green/theme.css
index ec637309407..f21995676e1 100644
--- a/src/assets/components/themes/luna-green/theme.css
+++ b/src/assets/components/themes/luna-green/theme.css
@@ -272,7 +272,6 @@
   color: #C5E1A5;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6266,5 +6265,5 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/luna-pink/theme.css b/src/assets/components/themes/luna-pink/theme.css
index 9f8cc241d35..e965934b0db 100644
--- a/src/assets/components/themes/luna-pink/theme.css
+++ b/src/assets/components/themes/luna-pink/theme.css
@@ -272,7 +272,6 @@
   color: #F48FB1;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6266,5 +6265,5 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/md-dark-deeppurple/theme.css b/src/assets/components/themes/md-dark-deeppurple/theme.css
index 917acca6a2a..4497ccc3c53 100644
--- a/src/assets/components/themes/md-dark-deeppurple/theme.css
+++ b/src/assets/components/themes/md-dark-deeppurple/theme.css
@@ -295,7 +295,6 @@
   color: #CE93D8;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6325,8 +6324,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-accordion .p-accordion-tab {
     box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
     margin-bottom: 0;
@@ -7843,5 +7841,5 @@
   .p-splitter .p-splitter-gutter.p-splitter-gutter-resizing .p-splitter-gutter-handle {
     transform: scale(1);
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/md-dark-indigo/theme.css b/src/assets/components/themes/md-dark-indigo/theme.css
index d3a215d5b96..41f435018b7 100644
--- a/src/assets/components/themes/md-dark-indigo/theme.css
+++ b/src/assets/components/themes/md-dark-indigo/theme.css
@@ -295,7 +295,6 @@
   color: #9FA8DA;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6325,8 +6324,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-accordion .p-accordion-tab {
     box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
     margin-bottom: 0;
@@ -7843,5 +7841,5 @@
   .p-splitter .p-splitter-gutter.p-splitter-gutter-resizing .p-splitter-gutter-handle {
     transform: scale(1);
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/md-light-deeppurple/theme.css b/src/assets/components/themes/md-light-deeppurple/theme.css
index 95fc4f3f7ac..120eebda69b 100644
--- a/src/assets/components/themes/md-light-deeppurple/theme.css
+++ b/src/assets/components/themes/md-light-deeppurple/theme.css
@@ -295,7 +295,6 @@
   color: #673AB7;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6325,8 +6324,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-accordion .p-accordion-tab {
     box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
     margin-bottom: 0;
@@ -7843,5 +7841,5 @@
   .p-splitter .p-splitter-gutter.p-splitter-gutter-resizing .p-splitter-gutter-handle {
     transform: scale(1);
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/md-light-indigo/theme.css b/src/assets/components/themes/md-light-indigo/theme.css
index a34f6ec02b9..8b7c79e052b 100644
--- a/src/assets/components/themes/md-light-indigo/theme.css
+++ b/src/assets/components/themes/md-light-indigo/theme.css
@@ -295,7 +295,6 @@
   color: #3F51B5;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6325,8 +6324,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-accordion .p-accordion-tab {
     box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
     margin-bottom: 0;
@@ -7843,5 +7841,5 @@
   .p-splitter .p-splitter-gutter.p-splitter-gutter-resizing .p-splitter-gutter-handle {
     transform: scale(1);
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/mdc-dark-deeppurple/theme.css b/src/assets/components/themes/mdc-dark-deeppurple/theme.css
index 5895ad080df..cc3dd03c6a9 100644
--- a/src/assets/components/themes/mdc-dark-deeppurple/theme.css
+++ b/src/assets/components/themes/mdc-dark-deeppurple/theme.css
@@ -295,7 +295,6 @@
   color: #CE93D8;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6325,8 +6324,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-accordion .p-accordion-tab {
     box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
     margin-bottom: 0;
@@ -7843,5 +7841,5 @@
   .p-splitter .p-splitter-gutter.p-splitter-gutter-resizing .p-splitter-gutter-handle {
     transform: scale(1);
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/mdc-dark-indigo/theme.css b/src/assets/components/themes/mdc-dark-indigo/theme.css
index 113d1c42c7d..7510358d253 100644
--- a/src/assets/components/themes/mdc-dark-indigo/theme.css
+++ b/src/assets/components/themes/mdc-dark-indigo/theme.css
@@ -295,7 +295,6 @@
   color: #9FA8DA;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6325,8 +6324,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-accordion .p-accordion-tab {
     box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
     margin-bottom: 0;
@@ -7843,5 +7841,5 @@
   .p-splitter .p-splitter-gutter.p-splitter-gutter-resizing .p-splitter-gutter-handle {
     transform: scale(1);
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/mdc-light-deeppurple/theme.css b/src/assets/components/themes/mdc-light-deeppurple/theme.css
index ed44bc5132d..972c9a38b44 100644
--- a/src/assets/components/themes/mdc-light-deeppurple/theme.css
+++ b/src/assets/components/themes/mdc-light-deeppurple/theme.css
@@ -295,7 +295,6 @@
   color: #673AB7;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6325,8 +6324,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-accordion .p-accordion-tab {
     box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
     margin-bottom: 0;
@@ -7843,5 +7841,5 @@
   .p-splitter .p-splitter-gutter.p-splitter-gutter-resizing .p-splitter-gutter-handle {
     transform: scale(1);
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/mdc-light-indigo/theme.css b/src/assets/components/themes/mdc-light-indigo/theme.css
index f0f9a852550..3ac4a3643bb 100644
--- a/src/assets/components/themes/mdc-light-indigo/theme.css
+++ b/src/assets/components/themes/mdc-light-indigo/theme.css
@@ -295,7 +295,7 @@
   color: #3F51B5;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6325,8 +6325,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-accordion .p-accordion-tab {
     box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
     margin-bottom: 0;
@@ -7843,5 +7842,5 @@
   .p-splitter .p-splitter-gutter.p-splitter-gutter-resizing .p-splitter-gutter-handle {
     transform: scale(1);
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/mira/theme.css b/src/assets/components/themes/mira/theme.css
index 098569d429d..9a0e6b2f8a0 100644
--- a/src/assets/components/themes/mira/theme.css
+++ b/src/assets/components/themes/mira/theme.css
@@ -298,7 +298,6 @@
   color: #5e81ac;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6328,9 +6327,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-inputtext:enabled:hover {
     background-color: #eceff4;
   }
@@ -6529,4 +6528,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #5e81ac;
   }
-}
+
diff --git a/src/assets/components/themes/nano/theme.css b/src/assets/components/themes/nano/theme.css
index a9b3c4b7abc..f40c8fef802 100644
--- a/src/assets/components/themes/nano/theme.css
+++ b/src/assets/components/themes/nano/theme.css
@@ -272,7 +272,6 @@
   color: #1174c0;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6302,4 +6301,4 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
diff --git a/src/assets/components/themes/nova-accent/theme.css b/src/assets/components/themes/nova-accent/theme.css
index 15c76b69f7a..9eec3acd90e 100644
--- a/src/assets/components/themes/nova-accent/theme.css
+++ b/src/assets/components/themes/nova-accent/theme.css
@@ -272,7 +272,7 @@
   color: #007ad9;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6254,8 +6254,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-panel .p-panel-header .p-panel-header-icon {
     color: #ffffff;
   }
@@ -6269,7 +6268,7 @@
   .p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
     color: #5ab7ff;
   }
-}
+
 .p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background-color: #27a0ff;
   border-color: #27a0ff;
diff --git a/src/assets/components/themes/nova-alt/theme.css b/src/assets/components/themes/nova-alt/theme.css
index a7c600cbbbe..cf9786961bd 100644
--- a/src/assets/components/themes/nova-alt/theme.css
+++ b/src/assets/components/themes/nova-alt/theme.css
@@ -272,7 +272,7 @@
   color: #007ad9;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6266,8 +6266,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-panel .p-panel-header .p-panel-header-icon {
     color: #ffffff;
   }
@@ -6281,7 +6280,7 @@
   .p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
     color: #b4b4b4;
   }
-}
+
 .p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background-color: #494949;
   border: 1px solid #494949;
diff --git a/src/assets/components/themes/nova/theme.css b/src/assets/components/themes/nova/theme.css
index 9ea0568c619..6356a2736c3 100644
--- a/src/assets/components/themes/nova/theme.css
+++ b/src/assets/components/themes/nova/theme.css
@@ -272,7 +272,6 @@
   color: #007ad9;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6266,8 +6265,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-panel .p-panel-header .p-panel-header-icon {
     color: #848484;
   }
@@ -6281,5 +6279,5 @@
   .p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
     color: #333333;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/rhea/theme.css b/src/assets/components/themes/rhea/theme.css
index c7e7d738112..d7036fe8b23 100644
--- a/src/assets/components/themes/rhea/theme.css
+++ b/src/assets/components/themes/rhea/theme.css
@@ -272,7 +272,6 @@
   color: #7b95a3;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6254,8 +6253,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-panel .p-panel-header .p-panel-header-icon {
     color: #ffffff;
   }
@@ -6269,5 +6267,5 @@
   .p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
     color: #ffffff;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/src/assets/components/themes/saga-blue/theme.css b/src/assets/components/themes/saga-blue/theme.css
index 2778c14c019..f60372ca9eb 100644
--- a/src/assets/components/themes/saga-blue/theme.css
+++ b/src/assets/components/themes/saga-blue/theme.css
@@ -272,7 +272,7 @@
   color: #2196F3;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6302,9 +6302,8 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
     background-color: #2196F3;
   }
@@ -6319,4 +6318,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #2196F3;
   }
-}
+
diff --git a/src/assets/components/themes/saga-green/theme.css b/src/assets/components/themes/saga-green/theme.css
index 05b613de6f2..2f401871756 100644
--- a/src/assets/components/themes/saga-green/theme.css
+++ b/src/assets/components/themes/saga-green/theme.css
@@ -272,7 +272,7 @@
   color: #4CAF50;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6302,9 +6302,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
     background-color: #4CAF50;
   }
@@ -6319,4 +6319,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #4CAF50;
   }
-}
+
diff --git a/src/assets/components/themes/saga-orange/theme.css b/src/assets/components/themes/saga-orange/theme.css
index 04d12a5607f..6332c1146cb 100644
--- a/src/assets/components/themes/saga-orange/theme.css
+++ b/src/assets/components/themes/saga-orange/theme.css
@@ -272,7 +272,7 @@
   color: #FFC107;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6302,9 +6302,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
     background-color: #FFC107;
   }
diff --git a/src/assets/components/themes/saga-purple/theme.css b/src/assets/components/themes/saga-purple/theme.css
index 3c23e8fd166..07749c32bd3 100644
--- a/src/assets/components/themes/saga-purple/theme.css
+++ b/src/assets/components/themes/saga-purple/theme.css
@@ -272,7 +272,6 @@
   color: #9C27B0;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6302,9 +6301,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
     background-color: #9C27B0;
   }
@@ -6319,4 +6318,3 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #9C27B0;
   }
-}
diff --git a/src/assets/components/themes/soho-dark/theme.css b/src/assets/components/themes/soho-dark/theme.css
index c29ee539461..a7d69d218b5 100644
--- a/src/assets/components/themes/soho-dark/theme.css
+++ b/src/assets/components/themes/soho-dark/theme.css
@@ -294,7 +294,6 @@
   color: #b19df7;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6276,8 +6275,7 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-@layer primeng {
+
   .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
     background-color: #b19df7;
   }
@@ -6295,4 +6293,3 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #b19df7;
   }
-}
diff --git a/src/assets/components/themes/soho-light/theme.css b/src/assets/components/themes/soho-light/theme.css
index 742464f83cf..b0259039cc7 100644
--- a/src/assets/components/themes/soho-light/theme.css
+++ b/src/assets/components/themes/soho-light/theme.css
@@ -294,7 +294,7 @@
   color: #7254f3;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6276,9 +6276,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
     color: #ffffff;
@@ -6349,4 +6349,3 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #7254f3;
   }
-}
diff --git a/src/assets/components/themes/tailwind-light/theme.css b/src/assets/components/themes/tailwind-light/theme.css
index 476678bf5ad..1576d096323 100644
--- a/src/assets/components/themes/tailwind-light/theme.css
+++ b/src/assets/components/themes/tailwind-light/theme.css
@@ -308,7 +308,7 @@
   color: #4f46e5;
 }
 
-@layer primeng {
+
   * {
     box-sizing: border-box;
   }
@@ -6338,9 +6338,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-inputtext, .p-togglebutton, .p-selectbutton, .p-inputgroup {
     box-shadow: 0 0 #0000, 0 0 #0000, 0 1px 2px 0 rgba(0, 0, 0, 0.05);
   }
@@ -6415,4 +6415,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #4f46e5;
   }
-}
+
diff --git a/src/assets/components/themes/vela-blue/theme.css b/src/assets/components/themes/vela-blue/theme.css
index 970d2e5ac47..2f3c00701cf 100644
--- a/src/assets/components/themes/vela-blue/theme.css
+++ b/src/assets/components/themes/vela-blue/theme.css
@@ -272,7 +272,6 @@
   color: #64B5F6;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6302,9 +6301,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
     background-color: #64B5F6;
   }
@@ -6322,4 +6321,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #64B5F6;
   }
-}
+
diff --git a/src/assets/components/themes/vela-green/theme.css b/src/assets/components/themes/vela-green/theme.css
index 6c562cb81aa..223b68d8175 100644
--- a/src/assets/components/themes/vela-green/theme.css
+++ b/src/assets/components/themes/vela-green/theme.css
@@ -272,7 +272,6 @@
   color: #81C784;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6302,9 +6301,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
     background-color: #81C784;
   }
@@ -6322,4 +6321,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #81C784;
   }
-}
+
diff --git a/src/assets/components/themes/vela-orange/theme.css b/src/assets/components/themes/vela-orange/theme.css
index 683e53f2acc..62700594e17 100644
--- a/src/assets/components/themes/vela-orange/theme.css
+++ b/src/assets/components/themes/vela-orange/theme.css
@@ -272,7 +272,6 @@
   color: #FFD54F;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6302,9 +6301,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
     background-color: #FFD54F;
   }
@@ -6322,4 +6321,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #FFD54F;
   }
-}
+
diff --git a/src/assets/components/themes/vela-purple/theme.css b/src/assets/components/themes/vela-purple/theme.css
index 6247fddd7d9..c88de5df208 100644
--- a/src/assets/components/themes/vela-purple/theme.css
+++ b/src/assets/components/themes/vela-purple/theme.css
@@ -272,7 +272,6 @@
   color: #BA68C8;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6302,9 +6301,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
     background-color: #BA68C8;
   }
@@ -6322,4 +6321,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #BA68C8;
   }
-}
+
diff --git a/src/assets/components/themes/viva-dark/theme.css b/src/assets/components/themes/viva-dark/theme.css
index 1dd6045cb43..a11846c257b 100644
--- a/src/assets/components/themes/viva-dark/theme.css
+++ b/src/assets/components/themes/viva-dark/theme.css
@@ -302,7 +302,6 @@
   color: #9eade6;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6332,10 +6331,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-/* Customizations to the designer theme should be defined here */
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-button .p-button-label {
     font-weight: 600;
   }
@@ -6456,4 +6454,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #9eade6;
   }
-}
+
diff --git a/src/assets/components/themes/viva-light/theme.css b/src/assets/components/themes/viva-light/theme.css
index 1e1b0a3a47a..de8906d1abb 100644
--- a/src/assets/components/themes/viva-light/theme.css
+++ b/src/assets/components/themes/viva-light/theme.css
@@ -303,7 +303,6 @@
   color: #5472d4;
 }
 
-@layer primeng {
   * {
     box-sizing: border-box;
   }
@@ -6333,10 +6332,9 @@
     font-feature-settings: var(--font-feature-settings, normal);
     font-size: 1rem;
   }
-}
-/* Customizations to the designer theme should be defined here */
+
 /* Customizations to the designer theme should be defined here */
-@layer primeng {
+
   .p-button .p-button-label {
     font-weight: 600;
   }
@@ -6457,4 +6455,4 @@
   .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
     box-shadow: inset 0 -2px 0 0 #5472d4;
   }
-}
+