diff --git a/components/lib/accordiontab/style/AccordionTabStyle.js b/components/lib/accordiontab/style/AccordionTabStyle.js
index ff8b4c563..b978edc55 100644
--- a/components/lib/accordiontab/style/AccordionTabStyle.js
+++ b/components/lib/accordiontab/style/AccordionTabStyle.js
@@ -1 +1,5 @@
-export default {};
+import BaseStyle from 'primevue/base/style';
+
+export default BaseStyle.extend({
+    name: 'accordiontab'
+});
diff --git a/components/lib/animateonscroll/BaseAnimateOnScroll.js b/components/lib/animateonscroll/BaseAnimateOnScroll.js
index 3f34f4580..55a3bbba9 100644
--- a/components/lib/animateonscroll/BaseAnimateOnScroll.js
+++ b/components/lib/animateonscroll/BaseAnimateOnScroll.js
@@ -1,5 +1,8 @@
+import AnimateOnScrollStyle from 'primevue/animateonscroll/style';
 import BaseDirective from 'primevue/basedirective';
 
-const BaseAnimateOnScroll = BaseDirective.extend({});
+const BaseAnimateOnScroll = BaseDirective.extend({
+    style: AnimateOnScrollStyle
+});
 
 export default BaseAnimateOnScroll;
diff --git a/components/lib/animateonscroll/style/AnimateOnScrollStyle.js b/components/lib/animateonscroll/style/AnimateOnScrollStyle.js
index ff8b4c563..2bb2ef131 100644
--- a/components/lib/animateonscroll/style/AnimateOnScrollStyle.js
+++ b/components/lib/animateonscroll/style/AnimateOnScrollStyle.js
@@ -1 +1,5 @@
-export default {};
+import BaseStyle from 'primevue/base/style';
+
+export default BaseStyle.extend({
+    name: 'animateonscroll-directive'
+});
diff --git a/components/lib/badgedirective/style/BadgeDirectiveStyle.js b/components/lib/badgedirective/style/BadgeDirectiveStyle.js
index a65cc2827..1de903ed8 100644
--- a/components/lib/badgedirective/style/BadgeDirectiveStyle.js
+++ b/components/lib/badgedirective/style/BadgeDirectiveStyle.js
@@ -5,6 +5,6 @@ const classes = {
 };
 
 export default BaseStyle.extend({
-    name: 'badge',
+    name: 'badge-directive',
     classes
 });
diff --git a/components/lib/base/style/BaseStyle.js b/components/lib/base/style/BaseStyle.js
index 0e5cc4770..c62de86c7 100644
--- a/components/lib/base/style/BaseStyle.js
+++ b/components/lib/base/style/BaseStyle.js
@@ -38,7 +38,7 @@ export default {
         return this.css ? useStyle(ObjectUtils.minifyCSS(this.css), { name: this.name, ...options }) : {};
     },
     loadTheme(theme, options = {}) {
-        return theme ? useStyle(ObjectUtils.minifyCSS(theme), { name: `${this.name}-style`, ...options }) : {};
+        return theme ? useStyle(ObjectUtils.minifyCSS(theme), { name: this.name, ...options }) : {};
     },
     getCommonThemeCSS(params) {
         return Theme.getCommonCSS(this.name, params);
diff --git a/components/lib/basecomponent/BaseComponent.vue b/components/lib/basecomponent/BaseComponent.vue
index 1343bcb18..4f3e01603 100644
--- a/components/lib/basecomponent/BaseComponent.vue
+++ b/components/lib/basecomponent/BaseComponent.vue
@@ -1,6 +1,6 @@
 <script>
 import BaseStyle from 'primevue/base/style';
-import Theme from 'primevue/themes';
+import Theme, { ThemeService } from 'primevue/themes';
 import { ObjectUtils } from 'primevue/utils';
 import { mergeProps } from 'vue';
 import BaseComponentStyle from './style/BaseComponentStyle';
@@ -35,14 +35,6 @@ export default {
                     this.$options.style && this.$style.loadStyle(this.$styleOptions);
                 }
             }
-        },
-        $theme: {
-            deep: true,
-            immediate: true,
-            handler(newValue) {
-                Theme.setTheme(newValue);
-                this._loadThemeStyles();
-            }
         }
     },
     beforeCreate() {
@@ -96,9 +88,9 @@ export default {
         _loadStyles() {
             BaseStyle.loadStyle(this.$styleOptions);
             this._loadGlobalStyles();
+            this._loadThemeStyles();
 
-            // apply theme settings
-            Theme.init();
+            ThemeService.on('theme:change', this._loadThemeStyles);
         },
         _loadGlobalStyles() {
             /*
@@ -113,26 +105,38 @@ export default {
 
             const globalCSS = this._useGlobalPT(this._getOptionValue, 'global.css', this.$params);
 
-            ObjectUtils.isNotEmpty(globalCSS) && BaseComponentStyle.loadGlobalStyle(globalCSS, this.$styleOptions);
+            ObjectUtils.isNotEmpty(globalCSS) && BaseStyle.loadStyle(globalCSS, { name: 'global', ...this.$styleOptions });
         },
         _loadThemeStyles() {
             // common
-            const { primitive, semantic, global } = this.$style?.getCommonThemeCSS?.(this.$themeParams) || {};
+            if (!Theme.isStyleNameLoaded('common')) {
+                const { primitive, semantic, global } = this.$style?.getCommonThemeCSS?.() || {};
 
-            BaseStyle.loadTheme(primitive, { name: 'primitive-variables', ...this.$styleOptions });
-            BaseStyle.loadTheme(semantic, { name: 'semantic-variables', ...this.$styleOptions });
-            BaseComponentStyle.loadGlobalTheme(global, this.$styleOptions);
+                BaseStyle.loadTheme(primitive, { name: 'primitive-variables', ...this.$styleOptions });
+                BaseStyle.loadTheme(semantic, { name: 'semantic-variables', ...this.$styleOptions });
+                BaseStyle.loadTheme(global, { name: 'global-style', ...this.$styleOptions });
+
+                Theme.setLoadedStyleName('common');
+            }
 
             // component
-            const { variables, style } = this.$style?.getComponentThemeCSS?.(this.$themeParams) || {};
+            if (!Theme.isStyleNameLoaded(this.$style?.name) && this.$style?.name) {
+                const { variables, style } = this.$style?.getComponentThemeCSS?.() || {};
 
-            this.$style?.loadTheme(variables, { name: `${this.$style.name}-variables`, ...this.$styleOptions });
-            this.$style?.loadTheme(style, this.$styleOptions);
+                this.$style?.loadTheme(variables, { name: `${this.$style.name}-variables`, ...this.$styleOptions });
+                this.$style?.loadTheme(style, { name: `${this.$style.name}-style`, ...this.$styleOptions });
+
+                Theme.setLoadedStyleName(this.$style.name);
+            }
 
             // layer order
-            const layerOrder = this.$style?.getLayerOrderThemeCSS?.();
+            if (!Theme.isStyleNameLoaded('layer-order')) {
+                const layerOrder = this.$style?.getLayerOrderThemeCSS?.();
 
-            BaseStyle.loadTheme(layerOrder, { name: 'layer-order', first: true, ...this.$styleOptions });
+                BaseStyle.loadTheme(layerOrder, { name: 'layer-order', first: true, ...this.$styleOptions });
+
+                Theme.setLoadedStyleName('layer-order');
+            }
         },
         _getHostInstance(instance) {
             return instance ? (this.$options.hostName ? (instance.$.type.name === this.$options.hostName ? instance : this._getHostInstance(instance.$parentInstance)) : instance.$parentInstance) : undefined;
@@ -229,7 +233,7 @@ export default {
         },
         ptmi(key = '', params = {}) {
             // inheritAttrs:true without `pt:*`
-            return mergeProps(this.$_attrsNoPT, this.ptm(key, params));
+            return mergeProps(this.$_attrsWithoutPT, this.ptm(key, params));
         },
         ptmo(obj = {}, key = '', params = {}) {
             return this._getPTValue(obj, key, { instance: this, ...params }, false);
@@ -286,15 +290,7 @@ export default {
                     props: parentInstance?.$props,
                     state: parentInstance?.$data,
                     attrs: parentInstance?.$attrs
-                },
-                /* @deprecated since v3.43.0. Use the `parent.instance` instead of the `parentInstance`.*/
-                parentInstance
-            };
-        },
-        $themeParams() {
-            return {
-                ...this.$params,
-                theme: this.$theme
+                }
             };
         },
         $_attrsPT() {
@@ -312,7 +308,7 @@ export default {
                     return result;
                 }, {});
         },
-        $_attrsNoPT() {
+        $_attrsWithoutPT() {
             // $attrs without `pt:*`
             return Object.entries(this.$attrs || {})
                 .filter(([key]) => !key?.startsWith('pt:'))
diff --git a/components/lib/basecomponent/style/BaseComponentStyle.js b/components/lib/basecomponent/style/BaseComponentStyle.js
index 398b739b6..39b19c433 100644
--- a/components/lib/basecomponent/style/BaseComponentStyle.js
+++ b/components/lib/basecomponent/style/BaseComponentStyle.js
@@ -1,8 +1,5 @@
 import BaseStyle from 'primevue/base/style';
-import { useStyle } from 'primevue/usestyle';
 
 export default BaseStyle.extend({
-    name: 'common',
-    loadGlobalStyle: (globalCSS, options = {}) => useStyle(globalCSS, { name: 'global', ...options }),
-    loadGlobalTheme: (globalTheme, options = {}) => useStyle(globalTheme, { name: 'global-style', ...options })
+    name: 'common'
 });
diff --git a/components/lib/basedirective/BaseDirective.js b/components/lib/basedirective/BaseDirective.js
index 1588642ee..0c019d596 100644
--- a/components/lib/basedirective/BaseDirective.js
+++ b/components/lib/basedirective/BaseDirective.js
@@ -1,5 +1,5 @@
 import BaseStyle from 'primevue/base/style';
-import Theme from 'primevue/themes';
+import Theme, { ThemeService } from 'primevue/themes';
 import { ObjectUtils } from 'primevue/utils';
 import { mergeProps } from 'vue';
 
@@ -80,31 +80,39 @@ const BaseDirective = {
         BaseStyle.loadStyle({ nonce: config?.csp?.nonce });
         !el.$instance?.isUnstyled() && el.$instance?.$style?.loadStyle({ nonce: config?.csp?.nonce });
 
-        // apply theme settings
-        Theme.init();
-        Theme.setTheme(el.$instance?.theme());
         BaseDirective._loadThemeStyles(el.$instance, { nonce: config?.csp?.nonce });
+        ThemeService.on('theme:change', () => BaseDirective._loadThemeStyles(el.$instance, { nonce: config?.csp?.nonce }));
     },
     _loadThemeStyles: (instance = {}, useStyleOptions) => {
-        const themeParams = instance.themeParams();
-
         // common
-        const { primitive, semantic, global } = instance.$style?.getCommonThemeCSS?.(themeParams) || {};
+        if (!Theme.isStyleNameLoaded('common')) {
+            const { primitive, semantic, global } = instance.$style?.getCommonThemeCSS?.() || {};
 
-        BaseStyle.loadTheme(primitive, { name: 'primitive-variables', ...useStyleOptions });
-        BaseStyle.loadTheme(semantic, { name: 'semantic-variables', ...useStyleOptions });
-        BaseStyle.loadTheme(global, { name: 'global-style', ...useStyleOptions });
+            BaseStyle.loadTheme(primitive, { name: 'primitive-variables', ...useStyleOptions });
+            BaseStyle.loadTheme(semantic, { name: 'semantic-variables', ...useStyleOptions });
+            BaseStyle.loadTheme(global, { name: 'global-style', ...useStyleOptions });
 
-        // component
-        const { variables, style } = instance.$style?.getDirectiveThemeCSS?.(themeParams) || {};
+            Theme.setLoadedStyleName('common');
+        }
 
-        instance.$style?.loadTheme(variables, { name: `${instance.$name}-directive-variables`, ...useStyleOptions });
-        instance.$style?.loadTheme(style, { name: `${instance.$name}-directive-style`, ...useStyleOptions });
+        // directive
+        if (!Theme.isStyleNameLoaded(instance.$style?.name) && instance.$style?.name) {
+            const { variables, style } = instance.$style?.getDirectiveThemeCSS?.() || {};
+
+            instance.$style?.loadTheme(variables, { name: `${instance.$style.name}-variables`, ...useStyleOptions });
+            instance.$style?.loadTheme(style, { name: `${instance.$style.name}-style`, ...useStyleOptions });
+
+            Theme.setLoadedStyleName(instance.$style.name);
+        }
 
         // layer order
-        const layerOrder = instance.$style?.getLayerOrderThemeCSS?.();
+        if (!Theme.isStyleNameLoaded('layer-order')) {
+            const layerOrder = instance.$style?.getLayerOrderThemeCSS?.();
 
-        BaseStyle.loadTheme(layerOrder, { name: 'layer-order', first: true, ...useStyleOptions });
+            BaseStyle.loadTheme(layerOrder, { name: 'layer-order', first: true, ...useStyleOptions });
+
+            Theme.setLoadedStyleName('layer-order');
+        }
     },
     _hook: (directiveName, hookName, el, binding, vnode, prevVnode) => {
         const name = `on${ObjectUtils.toCapitalCase(hookName)}`;
@@ -142,8 +150,7 @@ const BaseDirective = {
                 /* computed instance variables */
                 defaultPT: () => BaseDirective._getPT(config?.pt, undefined, (value) => value?.directives?.[name]),
                 isUnstyled: () => (el.$instance?.$binding?.value?.unstyled !== undefined ? el.$instance?.$binding?.value?.unstyled : config?.unstyled),
-                theme: () => config?.theme,
-                themeParams: () => ({ theme: el.$instance?.theme }),
+                theme: () => el.$instance?.$config?.theme,
                 /* instance's methods */
                 ptm: (key = '', params = {}) => BaseDirective._getPTValue(el.$instance, el.$instance?.$binding?.value?.pt, key, { ...params }),
                 ptmo: (obj = {}, key = '', params = {}) => BaseDirective._getPTValue(el.$instance, obj, key, params, false),
diff --git a/components/lib/chart/style/ChartStyle.js b/components/lib/chart/style/ChartStyle.js
index 8fa6b3480..fb8ecda79 100644
--- a/components/lib/chart/style/ChartStyle.js
+++ b/components/lib/chart/style/ChartStyle.js
@@ -10,6 +10,6 @@ const classes = {
 
 export default BaseStyle.extend({
     name: 'chart',
-    inlineStyles,
-    classes
+    classes,
+    inlineStyles
 });
diff --git a/components/lib/column/style/ColumnStyle.js b/components/lib/column/style/ColumnStyle.js
index ff8b4c563..017ec90d5 100644
--- a/components/lib/column/style/ColumnStyle.js
+++ b/components/lib/column/style/ColumnStyle.js
@@ -1 +1,5 @@
-export default {};
+import BaseStyle from 'primevue/base/style';
+
+export default BaseStyle.extend({
+    name: 'column'
+});
diff --git a/components/lib/columngroup/style/ColumnGroupStyle.js b/components/lib/columngroup/style/ColumnGroupStyle.js
index ff8b4c563..18c3f4b07 100644
--- a/components/lib/columngroup/style/ColumnGroupStyle.js
+++ b/components/lib/columngroup/style/ColumnGroupStyle.js
@@ -1 +1,5 @@
-export default {};
+import BaseStyle from 'primevue/base/style';
+
+export default BaseStyle.extend({
+    name: 'columngroup'
+});
diff --git a/components/lib/config/PrimeVue.js b/components/lib/config/PrimeVue.js
index 47318c884..19dda3140 100644
--- a/components/lib/config/PrimeVue.js
+++ b/components/lib/config/PrimeVue.js
@@ -2,7 +2,7 @@ import { FilterMatchMode } from 'primevue/api';
 import Theme, { ThemeService } from 'primevue/themes';
 import PrimeOne from 'primevue/themes/primeone';
 import Aura from 'primevue/themes/primeone/aura';
-import { inject, reactive, watch } from 'vue';
+import { inject, reactive, ref, watch } from 'vue';
 
 export const defaultOptions = {
     ripple: false,
@@ -168,52 +168,37 @@ export function usePrimeVue() {
     return PrimeVue;
 }
 
-function switchTheme(currentTheme, newTheme, linkElementId, callback) {
-    if (currentTheme !== newTheme) {
-        const linkElement = document.getElementById(linkElementId);
+function setupTheme(app, PrimeVue) {
+    const isChanged = ref(false);
 
-        if (linkElement) {
-            const cloneLinkElement = linkElement.cloneNode(true);
-            const newThemeUrl = linkElement.getAttribute('href').replace(currentTheme, newTheme);
+    watch(
+        PrimeVue.config.theme,
+        (newValue) => {
+            if (!isChanged.value) {
+                Theme.setTheme(newValue);
+            }
 
-            cloneLinkElement.setAttribute('id', linkElementId + '-clone');
-            cloneLinkElement.setAttribute('href', newThemeUrl);
-            cloneLinkElement.addEventListener('load', () => {
-                linkElement.remove();
-                cloneLinkElement.setAttribute('id', linkElementId);
+            isChanged.value = false;
+        },
+        { immediate: true, deep: true }
+    );
 
-                if (callback) {
-                    callback();
-                }
-            });
-            linkElement.parentNode && linkElement.parentNode.insertBefore(cloneLinkElement, linkElement.nextSibling);
-        }
-    }
+    ThemeService.on('theme:change', function (newTheme) {
+        isChanged.value = true;
+        app.config.globalProperties.$primevue.config.theme = newTheme;
+    });
 }
 
 export default {
     install: (app, options) => {
-        let configOptions = options ? { ...defaultOptions, ...options } : { ...defaultOptions };
+        const configOptions = options ? { ...defaultOptions, ...options } : { ...defaultOptions };
         const PrimeVue = {
-            config: reactive(configOptions),
-            changeTheme: switchTheme
+            config: reactive(configOptions)
         };
 
-        watch(
-            PrimeVue.config,
-            (newValue) => {
-                Theme.setPConfig(newValue);
-            },
-            { immediate: true }
-        );
-
         app.config.globalProperties.$primevue = PrimeVue;
         app.provide(PrimeVueSymbol, PrimeVue);
 
-        ThemeService.on('theme:change', (newTheme) => {
-            app.config.globalProperties.$primevue.config.theme = newTheme;
-        }).on('preset:change', (newPreset) => {
-            app.config.globalProperties.$primevue.config.theme.preset = newPreset;
-        });
+        setupTheme(app, PrimeVue);
     }
 };
diff --git a/components/lib/deferredcontent/style/DeferredContentStyle.js b/components/lib/deferredcontent/style/DeferredContentStyle.js
index ff8b4c563..7a4e543fd 100644
--- a/components/lib/deferredcontent/style/DeferredContentStyle.js
+++ b/components/lib/deferredcontent/style/DeferredContentStyle.js
@@ -1 +1,5 @@
-export default {};
+import BaseStyle from 'primevue/base/style';
+
+export default BaseStyle.extend({
+    name: 'deferredcontent'
+});
diff --git a/components/lib/dynamicdialog/style/DynamicDialogStyle.js b/components/lib/dynamicdialog/style/DynamicDialogStyle.js
index ff8b4c563..533a35adc 100644
--- a/components/lib/dynamicdialog/style/DynamicDialogStyle.js
+++ b/components/lib/dynamicdialog/style/DynamicDialogStyle.js
@@ -1 +1,5 @@
-export default {};
+import BaseStyle from 'primevue/base/style';
+
+export default BaseStyle.extend({
+    name: 'dynamicdialog'
+});
diff --git a/components/lib/focustrap/style/FocusTrapStyle.js b/components/lib/focustrap/style/FocusTrapStyle.js
index ff8b4c563..ea23215b9 100644
--- a/components/lib/focustrap/style/FocusTrapStyle.js
+++ b/components/lib/focustrap/style/FocusTrapStyle.js
@@ -1 +1,5 @@
-export default {};
+import BaseStyle from 'primevue/base/style';
+
+export default BaseStyle.extend({
+    name: 'focustrap-directive'
+});
diff --git a/components/lib/inputicon/style/InputIcoonStyle.d.ts b/components/lib/inputicon/style/InputIconStyle.d.ts
similarity index 100%
rename from components/lib/inputicon/style/InputIcoonStyle.d.ts
rename to components/lib/inputicon/style/InputIconStyle.d.ts
diff --git a/components/lib/portal/style/PortalStyle.js b/components/lib/portal/style/PortalStyle.js
index ff8b4c563..396a98c8c 100644
--- a/components/lib/portal/style/PortalStyle.js
+++ b/components/lib/portal/style/PortalStyle.js
@@ -1 +1,5 @@
-export default {};
+import BaseStyle from 'primevue/base/style';
+
+export default BaseStyle.extend({
+    name: 'portal'
+});
diff --git a/components/lib/ripple/style/RippleStyle.js b/components/lib/ripple/style/RippleStyle.js
index b7de684f9..d6367d9f5 100644
--- a/components/lib/ripple/style/RippleStyle.js
+++ b/components/lib/ripple/style/RippleStyle.js
@@ -5,6 +5,6 @@ const classes = {
 };
 
 export default BaseStyle.extend({
-    name: 'ripple',
+    name: 'ripple-directive',
     classes
 });
diff --git a/components/lib/row/style/RowStyle.js b/components/lib/row/style/RowStyle.js
index ff8b4c563..b731ba8c9 100644
--- a/components/lib/row/style/RowStyle.js
+++ b/components/lib/row/style/RowStyle.js
@@ -1 +1,5 @@
-export default {};
+import BaseStyle from 'primevue/base/style';
+
+export default BaseStyle.extend({
+    name: 'row'
+});
diff --git a/components/lib/stepperpanel/style/StepperPanelStyle.js b/components/lib/stepperpanel/style/StepperPanelStyle.js
index ff8b4c563..a3d90ebad 100644
--- a/components/lib/stepperpanel/style/StepperPanelStyle.js
+++ b/components/lib/stepperpanel/style/StepperPanelStyle.js
@@ -1 +1,5 @@
-export default {};
+import BaseStyle from 'primevue/base/style';
+
+export default BaseStyle.extend({
+    name: 'stepperpanel'
+});
diff --git a/components/lib/styleclass/BaseStyleClass.js b/components/lib/styleclass/BaseStyleClass.js
index d4d57a33e..131427fca 100644
--- a/components/lib/styleclass/BaseStyleClass.js
+++ b/components/lib/styleclass/BaseStyleClass.js
@@ -1,5 +1,8 @@
 import BaseDirective from 'primevue/basedirective';
+import StyleClassStyle from 'primevue/styleclass/style';
 
-const BaseStyleClass = BaseDirective.extend({});
+const BaseStyleClass = BaseDirective.extend({
+    style: StyleClassStyle
+});
 
 export default BaseStyleClass;
diff --git a/components/lib/styleclass/style/StyleClassStyle.js b/components/lib/styleclass/style/StyleClassStyle.js
index ff8b4c563..52ef8d3c9 100644
--- a/components/lib/styleclass/style/StyleClassStyle.js
+++ b/components/lib/styleclass/style/StyleClassStyle.js
@@ -1 +1,5 @@
-export default {};
+import BaseStyle from 'primevue/base/style';
+
+export default BaseStyle.extend({
+    name: 'styleclass-directive'
+});
diff --git a/components/lib/tabpanel/style/TabPanelStyle.js b/components/lib/tabpanel/style/TabPanelStyle.js
index ff8b4c563..012759215 100644
--- a/components/lib/tabpanel/style/TabPanelStyle.js
+++ b/components/lib/tabpanel/style/TabPanelStyle.js
@@ -1 +1,5 @@
-export default {};
+import BaseStyle from 'primevue/base/style';
+
+export default BaseStyle.extend({
+    name: 'tabpanel'
+});
diff --git a/components/lib/themes/config/index.js b/components/lib/themes/config/index.js
index 907c351cf..92c348ca1 100644
--- a/components/lib/themes/config/index.js
+++ b/components/lib/themes/config/index.js
@@ -16,21 +16,27 @@ export default {
             }*/
         }
     },
-    _pConfig: undefined,
     _theme: undefined,
-    _initialized: false,
     _layerNames: new Set(),
+    _loadedStyleNames: new Set(),
     _tokens: {},
-    init() {
-        if (!this._initialized) {
-            this._tokens = ThemeUtils.createTokens(this.preset, this.defaults);
-            ThemeService.emit('theme:init', this.theme);
-        }
+    update(newValues = {}) {
+        const { theme } = newValues;
 
-        this._initialized = true;
+        if (theme) {
+            this._theme = {
+                ...theme,
+                options: {
+                    ...this.defaults.options,
+                    ...theme.options
+                }
+            };
+            this._tokens = ThemeUtils.createTokens(theme?.preset, this.defaults);
+            this.clearLoadedStyleNames();
+        }
     },
     get theme() {
-        return this._theme || this._pConfig?.theme;
+        return this._theme;
     },
     get base() {
         return this.theme?.base || {};
@@ -44,28 +50,11 @@ export default {
     get tokens() {
         return this._tokens;
     },
-    getPConfig() {
-        return this._pConfig;
-    },
-    setPConfig(newValue) {
-        this._pConfig = newValue;
-    },
-    getTokenValue(tokenPath) {
-        return ThemeUtils.getTokenValue(this.tokens, tokenPath, this.defaults);
-    },
     getTheme() {
         return this.theme;
     },
     setTheme(newValue) {
-        this._theme = {
-            ...newValue,
-            options: {
-                ...this.defaults.options,
-                ...newValue.options
-            }
-        };
-        this._tokens = ThemeUtils.createTokens(newValue?.preset, this.defaults);
-
+        this.update({ theme: newValue });
         ThemeService.emit('theme:change', newValue);
     },
     getPreset() {
@@ -75,13 +64,33 @@ export default {
         this._theme = { ...this.theme, preset: newValue };
         this._tokens = ThemeUtils.createTokens(newValue, this.defaults);
 
+        this.clearLoadedStyleNames();
         ThemeService.emit('preset:change', newValue);
+        ThemeService.emit('theme:change', this.theme);
     },
     getLayerNames() {
         return [...this._layerNames];
     },
     setLayerNames(layerName) {
-        this._layerNames?.add(layerName);
+        this._layerNames.add(layerName);
+    },
+    getLoadedStyleNames() {
+        return this._loadedStyleNames;
+    },
+    isStyleNameLoaded(name) {
+        return this._loadedStyleNames.has(name);
+    },
+    setLoadedStyleName(name) {
+        this._loadedStyleNames.add(name);
+    },
+    deleteLoadedStyleName(name) {
+        this._loadedStyleNames.delete(name);
+    },
+    clearLoadedStyleNames() {
+        this._loadedStyleNames.clear();
+    },
+    getTokenValue(tokenPath) {
+        return ThemeUtils.getTokenValue(this.tokens, tokenPath, this.defaults);
     },
     getCommonCSS(name = '', params) {
         return ThemeUtils.getCommon({ name, theme: this.theme, params, defaults: this.defaults, set: { layerNames: this.setLayerNames.bind(this) } });
diff --git a/components/lib/themes/helpers/dt.js b/components/lib/themes/helpers/dt.js
index 905085240..23812203c 100644
--- a/components/lib/themes/helpers/dt.js
+++ b/components/lib/themes/helpers/dt.js
@@ -3,9 +3,9 @@ import Theme, { SharedUtils } from 'primevue/themes';
 const types = ['value', 'variable'];
 
 export const $dt = (tokenPath, param1, param2) => {
-    const config = Theme.getPConfig();
+    const theme = Theme.getTheme();
 
-    return types.includes(param1) ? dt(config?.theme, tokenPath, undefined, param1) : dt(config?.theme, tokenPath, param1, param2);
+    return types.includes(param1) ? dt(theme, tokenPath, undefined, param1) : dt(theme, tokenPath, param1, param2);
 };
 
 export const dt = (theme = {}, tokenPath, fallback, type = 'variable') => {
@@ -23,11 +23,11 @@ export const dt = (theme = {}, tokenPath, fallback, type = 'variable') => {
 };
 
 export const $dtp = (tokenPath) => {
-    const config = Theme.getPConfig();
+    const theme = Theme.getTheme();
 
-    const variable = dt(config?.theme, tokenPath, undefined, 'variable');
+    const variable = dt(theme, tokenPath, undefined, 'variable');
     const name = variable.match(/--[\w-]+/g)?.[0];
-    const value = dt(config?.theme, tokenPath, undefined, 'value');
+    const value = dt(theme, tokenPath, undefined, 'value');
 
     return {
         variable,
diff --git a/nuxt-vite.config.js b/nuxt-vite.config.js
index 72d60aee2..fab1bf9fb 100644
--- a/nuxt-vite.config.js
+++ b/nuxt-vite.config.js
@@ -94,6 +94,7 @@ const STYLE_ALIAS = {
     'primevue/steps/style': path.resolve(__dirname, './components/lib/steps/style/StepsStyle.js'),
     'primevue/stepper/style': path.resolve(__dirname, './components/lib/stepper/style/StepperStyle.js'),
     'primevue/stepperpanel/style': path.resolve(__dirname, './components/lib/stepperpanel/style/StepperPanelStyle.js'),
+    'primevue/styleclass/style': path.resolve(__dirname, './components/lib/styleclass/style/StyleClassStyle.js'),
     'primevue/tabmenu/style': path.resolve(__dirname, './components/lib/tabmenu/style/TabMenuStyle.js'),
     'primevue/tabpanel/style': path.resolve(__dirname, './components/lib/tabpanel/style/TabPanelStyle.js'),
     'primevue/tabview/style': path.resolve(__dirname, './components/lib/tabview/style/TabViewStyle.js'),
diff --git a/plugins/app-state.js b/plugins/app-state.js
index 3c402e404..f12d2bafa 100644
--- a/plugins/app-state.js
+++ b/plugins/app-state.js
@@ -1,3 +1,5 @@
+import { reactive } from 'vue';
+
 const $appState = {
     install: (Vue, options) => {
         Vue.config.globalProperties.$appState = reactive({
diff --git a/rollup.config.js b/rollup.config.js
index c537a0e66..7258cdfc8 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -155,6 +155,7 @@ const CORE_STYLE_DEPENDENCIES = {
     'primevue/stepper/style': 'primevue.stepper.style',
     'primevue/stepperpanel/style': 'primevue.stepperpanel.style',
     'primevue/steps/style': 'primevue.steps.style',
+    'primevue/styleclass/style': 'primevue.styleclass.style',
     'primevue/tabmenu/style': 'primevue.tabmenu.style',
     'primevue/tabpanel/style': 'primevue.tabpanel.style',
     'primevue/tabview/style': 'primevue.tabview.style',