diff --git a/nuxt.config.js b/nuxt.config.js
index 474f8c633..fc10650c2 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -22,12 +22,13 @@ export default defineNuxtConfig({
         '/installation': { redirect: { to: '/vite', statusCode: 301 } }
     },
     primevue: {
+        usePrimeVue: false,
         options: {
             ripple: true
         },
         unstyled: false,
         layerOrder: 'primevue',
-        importTheme: { from: '@/themes/app-theme.js' },
+        //importTheme: { from: '@/themes/app-theme.js' },
         resolvePath: function ({ as, from, type }) {
             const resolvedPath = from.replace('primevue', '@/components/lib');
 
diff --git a/plugins/app-state.js b/plugins/app-state.js
index f12d2bafa..ca651f711 100644
--- a/plugins/app-state.js
+++ b/plugins/app-state.js
@@ -1,3 +1,5 @@
+import Noir from '@/themes/app-theme.js';
+import PrimeVue from 'primevue/config';
 import { reactive } from 'vue';
 
 const $appState = {
@@ -17,4 +19,5 @@ const $appState = {
 
 export default defineNuxtPlugin((nuxtApp) => {
     nuxtApp.vueApp.use($appState);
+    nuxtApp.vueApp.use(PrimeVue, { theme: Noir });
 });