diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index 00da589c1..bdeb2b810 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -108,6 +108,17 @@
 	// Vue 3 JS
 	if ($vue3 === true) generateJSsInclude('vendor/vuejs/vuejs3/vue.global.prod.js');
 
+	// PrimeVue
+	if ($primevue3)
+	{
+		generateJSsInclude('vendor/npm-asset/primevue/core/core.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/organizationchart/organizationchart.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/treetable/treetable.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/column/column.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/calendar/calendar.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/skeleton/skeleton.min.js');
+	}
+
 	// --------------------------------------------------------------------------------------------------------
 	// From public folder
 
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index 6390a5115..e0d85cdde 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -85,6 +85,22 @@
 			// Tinymce 5 CSS
 			if ($tinymce5 === true) generateCSSsInclude('public/css/TinyMCE5.css');
 
+			// PrimeVUE
+			if ($primevue3 == true)
+			{
+				generateCSSsInclude('vendor/npm-asset/primevue/resources/themes/bootstrap4-light-blue/theme.css');
+				generateCSSsInclude('vendor/npm-asset/primevue/resources/primevue.min.css');
+				generateCSSsInclude('vendor/npm-asset/primeicons/primeicons.css');
+			/*	
+				<link
+					href="https://unpkg.com/primeflex@^3/primeflex.min.css"
+			
+					rel="stylesheet"
+				/>
+				<link href="https://unpkg.com/primeicons/primeicons.css" rel="stylesheet" />
+*/
+			}
+
 			// --------------------------------------------------------------------------------------------------------
 			// From public folder
 
diff --git a/composer.json b/composer.json
index 60297021a..632fc4947 100644
--- a/composer.json
+++ b/composer.json
@@ -338,70 +338,8 @@
 			}
 		},
 		{
-			"type": "package",
-			"package": {
-				"name": "primevue3/core",
-				"version": "3.15.1",
-				"dist": {
-					"url": "https://unpkg.com/primevue@^3/core/core.min.js",
-					"type": "file"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "primevue3/organizationchart",
-				"version": "3.15.1",
-				"dist": {
-					"url": "https://unpkg.com/primevue@^3/organizationchart/organizationchart.min.js",
-					"type": "file"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "primevue3/treetable",
-				"version": "3.15.1",
-				"dist": {
-					"url": "https://unpkg.com/primevue@^3/treetable/treetable.min.js",
-					"type": "file"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "primevue3/column",
-				"version": "3.15.1",
-				"dist": {
-					"url": "https://unpkg.com/primevue@^3/column/column.min.js",
-					"type": "file"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "primevue3/calendar",
-				"version": "3.15.1",
-				"dist": {
-					"url": "https://unpkg.com/primevue@^3/calendar/calendar.min.js",
-					"type": "file"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "primevue3/skeleton",
-				"version": "3.15.1",
-				"dist": {
-					"url": "https://unpkg.com/primevue@^3/skeleton/skeleton.min.js",
-					"type": "file"
-				}
-			}
+			"type": "composer",
+			"url": "https://asset-packagist.org"
 		}
 	],
 	"require": {
@@ -470,12 +408,9 @@
 
 		"vuejs/vuejs3": "3.2.33",
 
-		"primevue3/core": "3.1.15",
-		"primevue3/organizationchart": "3.1.15",
-		"primevue3/treetable": "3.1.15",
-		"primevue3/column": "3.1.15",
-		"primevue3/calendar": "3.1.15",
-		"primevue3/skeleton": "3.1.15"
+		"npm-asset/primevue": "3.15.*",
+		"npm-asset/primeicons": "5.0.0"
+
 	},
 	"config": {
 		"bin-dir": "vendor/bin"
diff --git a/composer.lock b/composer.lock
index ed10129aa..3cff0b018 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1745,70 +1745,28 @@
             "type": "library"
         },
         {
-            "name": "primevue3/core",
-            "version": "3.1.15",
+            "name": "npm-asset/primeicons",
+            "version": "5.0.0",
             "dist": {
-                "type": "file",
-                "url": "https://unpkg.com/primevue@^3/core/core.min.js",
-                "reference": null,
-                "shasum": null
+                "type": "tar",
+                "url": "https://registry.npmjs.org/primeicons/-/primeicons-5.0.0.tgz"
             },
-            "type": "library"
+            "type": "npm-asset",
+            "license": [
+                "MIT"
+            ]
         },
         {
-            "name": "primevue3/organizationchart",
-            "version": "3.1.15",
+            "name": "npm-asset/primevue",
+            "version": "3.15.0",
             "dist": {
-                "type": "file",
-                "url": "https://unpkg.com/primevue@^3/organizationchart/organizationchart.min.js",
-                "reference": null,
-                "shasum": null
+                "type": "tar",
+                "url": "https://registry.npmjs.org/primevue/-/primevue-3.15.0.tgz"
             },
-            "type": "library"
-        },
-        {
-            "name": "primevue3/treetable",
-            "version": "3.1.15",
-            "dist": {
-                "type": "file",
-                "url": "https://unpkg.com/primevue@^3/treetable/treetable.min.js",
-                "reference": null,
-                "shasum": null
-            },
-            "type": "library"
-        },
-        {
-            "name": "primevue3/column",
-            "version": "3.1.15",
-            "dist": {
-                "type": "file",
-                "url": "https://unpkg.com/primevue@^3/column/column.min.js",
-                "reference": null,
-                "shasum": null
-            },
-            "type": "library"
-        },
-        {
-            "name": "primevue3/calendar",
-            "version": "3.1.15",
-            "dist": {
-                "type": "file",
-                "url": "https://unpkg.com/primevue@^3/calendar/calendar.min.js",
-                "reference": null,
-                "shasum": null
-            },
-            "type": "library"
-        },
-        {
-            "name": "primevue3/skeleton",
-            "version": "3.1.15",
-            "dist": {
-                "type": "file",
-                "url": "https://unpkg.com/primevue@^3/skeleton/skeleton.min.js",
-                "reference": null,
-                "shasum": null
-            },
-            "type": "library"
+            "type": "npm-asset",
+            "license": [
+                "MIT"
+            ]
         }
     ],
     "packages-dev": [
@@ -1827,7 +1785,7 @@
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "php": "^5.3.2 || ^7.0 || ^8.0 || ^8.1"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.3",