diff --git a/lib/pkp b/lib/pkp
index 23e3b5ecd68..9399ba794e5 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 23e3b5ecd689bd3eff6a2ce708ca6c96ff1d6539
+Subproject commit 9399ba794e5b001e01989ed839eefd6d0a337307
diff --git a/lib/ui-library b/lib/ui-library
index 80b6f648aae..42feca5d955 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 80b6f648aae73eda3ca1701c7f72cd936b48d7da
+Subproject commit 42feca5d95526564b13cfa012200656a2ac23599
diff --git a/package-lock.json b/package-lock.json
index c194d4c70a1..223d95e70fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "hasInstallScript": true,
       "dependencies": {
         "@headlessui/vue": "^1.7.16",
+        "@highlightjs/vue-plugin": "^2.1.0",
         "@lk77/vue3-color": "^3.0.6",
         "@tinymce/tinymce-vue": "^5.1.1",
         "@vue-a11y/announcer": "^3.1.5",
@@ -33,8 +34,7 @@
         "vue": "^3.3.8",
         "vue-chartjs": "^5.2.0",
         "vue-draggable-plus": "^0.2.4",
-        "vue-scrollto": "^2.20.0",
-        "vue3-highlightjs": "^1.0.5"
+        "vue-scrollto": "^2.20.0"
       },
       "devDependencies": {
         "@rushstack/eslint-patch": "^1.3.3",
@@ -663,6 +663,15 @@
         "vue": "^3.2.0"
       }
     },
+    "node_modules/@highlightjs/vue-plugin": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@highlightjs/vue-plugin/-/vue-plugin-2.1.0.tgz",
+      "integrity": "sha512-E+bmk4ncca+hBEYRV2a+1aIzIV0VSY/e5ArjpuSN9IO7wBJrzUE2u4ESCwrbQD7sAy+jWQjkV5qCCWgc+pu7CQ==",
+      "peerDependencies": {
+        "highlight.js": "^11.0.1",
+        "vue": "^3"
+      }
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.11",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
@@ -6840,25 +6849,6 @@
         "bezier-easing": "2.1.0"
       }
     },
-    "node_modules/vue3-highlightjs": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/vue3-highlightjs/-/vue3-highlightjs-1.0.5.tgz",
-      "integrity": "sha512-Q4YNPXu0X5VMBnwPVOk+IQf1Ohp9jFdMitEAmzaz8qVVefcQpN6Dx4BnDGKxja3TLDVF+EgL136wC8YzmoCX9w==",
-      "dependencies": {
-        "highlight.js": "^10.3.2"
-      },
-      "peerDependencies": {
-        "vue": "^3.0.0"
-      }
-    },
-    "node_modules/vue3-highlightjs/node_modules/highlight.js": {
-      "version": "10.7.3",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
-      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -7345,6 +7335,12 @@
       "integrity": "sha512-nKT+nf/q6x198SsyK54mSszaQl/z+QxtASmgMEJtpxSX2Q0OPJX0upS/9daDyiECpeAsvjkoOrm2O/6PyBQ+Qg==",
       "requires": {}
     },
+    "@highlightjs/vue-plugin": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@highlightjs/vue-plugin/-/vue-plugin-2.1.0.tgz",
+      "integrity": "sha512-E+bmk4ncca+hBEYRV2a+1aIzIV0VSY/e5ArjpuSN9IO7wBJrzUE2u4ESCwrbQD7sAy+jWQjkV5qCCWgc+pu7CQ==",
+      "requires": {}
+    },
     "@humanwhocodes/config-array": {
       "version": "0.11.11",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
@@ -11616,21 +11612,6 @@
         "bezier-easing": "2.1.0"
       }
     },
-    "vue3-highlightjs": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/vue3-highlightjs/-/vue3-highlightjs-1.0.5.tgz",
-      "integrity": "sha512-Q4YNPXu0X5VMBnwPVOk+IQf1Ohp9jFdMitEAmzaz8qVVefcQpN6Dx4BnDGKxja3TLDVF+EgL136wC8YzmoCX9w==",
-      "requires": {
-        "highlight.js": "^10.3.2"
-      },
-      "dependencies": {
-        "highlight.js": {
-          "version": "10.7.3",
-          "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
-          "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="
-        }
-      }
-    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
diff --git a/package.json b/package.json
index c60f2ed8cc3..7ae2cf8058e 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@headlessui/vue": "^1.7.16",
+    "@highlightjs/vue-plugin": "^2.1.0",
     "@lk77/vue3-color": "^3.0.6",
     "@tinymce/tinymce-vue": "^5.1.1",
     "@vue-a11y/announcer": "^3.1.5",
@@ -38,8 +39,7 @@
     "vue": "^3.3.8",
     "vue-chartjs": "^5.2.0",
     "vue-draggable-plus": "^0.2.4",
-    "vue-scrollto": "^2.20.0",
-    "vue3-highlightjs": "^1.0.5"
+    "vue-scrollto": "^2.20.0"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.3.3",