diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 36b6406c5..87ce6031a 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -1,3 +1,4 @@
+import { markRaw, defineAsyncComponent } from 'vue';
 import {CoreRESTClient} from '../RESTClient.js';
 import accessibility from "../directives/accessibility.js";
 
@@ -70,7 +71,7 @@ export default {
 						return console.error('Component missing for ' + key);
 
 					tabs[key] = {
-						component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
+						component: markRaw(defineAsyncComponent(() => import(item.component))),
 						title: item.title || key,
 						config: item.config,
 						key
@@ -82,7 +83,7 @@ export default {
 						return console.error('Component missing for ' + key);
 
 					tabs[key] = {
-						component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
+						component: markRaw(defineAsyncComponent(() => import(item.component))),
 						title: item.title || key,
 						config: item.config,
 						key
diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
index 6c27f87bb..d7b89eb86 100644
--- a/public/js/mixins/Phrasen.js
+++ b/public/js/mixins/Phrasen.js
@@ -1,3 +1,5 @@
+import { ref, unref, triggerRef } from 'vue';
+
 const categories = {};
 const loadingModules = {};
 
@@ -12,8 +14,8 @@ function reloadRefs(category) {
 	while (loadingModules[category].length) {
 		var v = loadingModules[category].pop();
 		v[0].value = getValueForLoadedPhrase(category, v[1], v[2]);
-		Vue.triggerRef(v[0]);
-		/*Vue.unref(v);*/
+		triggerRef(v[0]);
+		/*unref(v);*/
 	}
 }
 function loadLazy(category, val, phrase, params) {
@@ -70,16 +72,16 @@ const phrasen = {
 			
 			if (!categories[category] || Object.keys(categories[category]).length === 0) {
 				categories[category] = undefined;
-				let val = Vue.ref(initialval);
+				let val = ref(initialval);
 				loadLazy(category, val, phrase, params);
 				return val;
 			}
 		}
 		var result = getValueForLoadedPhrase(category, phrase, params);
-		return Vue.ref(result);
+		return ref(result);
 	},
 	t(category, phrase, params) {
-		return Vue.unref(this.t_ref(category, phrase, params));
+		return unref(this.t_ref(category, phrase, params));
 	}
 };
 
diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index eca2e6944..2b698561e 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -92,16 +92,24 @@
  * @param mixed		message
  * @return void
  */
+/*
 import PvConfig from "../../../index.ci.php/public/js/components/primevue/config/config.esm.min.js";
 import PvToast from "../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";
 import PvConfirm from "../../../index.ci.php/public/js/components/primevue/confirmdialog/confirmdialog.esm.min.js";
 import PvConfirmationService from "../../../index.ci.php/public/js/components/primevue/confirmationservice/confirmationservice.esm.min.js";
+*/
+
+import { createApp } from 'vue';
+import PvConfig from 'primevue/config';
+import PvToast from 'primevue/toast';
+import PvConfirm from 'primevue/confirmdialog';
+import PvConfirmationService from 'primevue/confirmationservice';
 
 import {CoreRESTClient} from '../RESTClient.js';
 
 const helperAppContainer = document.createElement('div');
 
-const helperApp = Vue.createApp({
+const helperApp = createApp({
 	components: {
 		PvToast,
 		PvConfirm