diff --git a/source/demyo-vue-frontend/src/helpers/fields.js b/source/demyo-vue-frontend/src/helpers/fields.js
index b7c83762..36ac1cdd 100644
--- a/source/demyo-vue-frontend/src/helpers/fields.js
+++ b/source/demyo-vue-frontend/src/helpers/fields.js
@@ -2,7 +2,8 @@ import sortBy from 'lodash/sortBy'
 import uniqBy from 'lodash/uniqBy'
 
 // TODO: Vue 3
-/*import {
+/*
+import {
 	Blockquote,
 	Bold,
 	BulletList,
@@ -37,10 +38,10 @@ export const tipTapExtensions = [
 	Bold,
 	HorizontalRule,
 	HardBreak
-]*/
+]
+*/
 export const tipTapExtensions = []
 
-
 /**
  * Extracts arrays of sub-models from a collection of models, merges them,
  * keep unique items (based on the ID) and sort them.
diff --git a/source/demyo-vue-frontend/src/plugins/vimg.js b/source/demyo-vue-frontend/src/plugins/vimg.js
index 8d874865..b8a5d943 100644
--- a/source/demyo-vue-frontend/src/plugins/vimg.js
+++ b/source/demyo-vue-frontend/src/plugins/vimg.js
@@ -1,3 +1,4 @@
-//import VueImg from 'v-img'
+// TODO: Vue 3: Replace this
+// import VueImg from 'v-img'
 
-//Vue.use(VueImg)
+// Vue.use(VueImg)
diff --git a/source/demyo-vue-frontend/vite.config.js b/source/demyo-vue-frontend/vite.config.js
index bfe6f0fb..d0e8c04a 100644
--- a/source/demyo-vue-frontend/vite.config.js
+++ b/source/demyo-vue-frontend/vite.config.js
@@ -56,12 +56,16 @@ export default ({ mode }) => {
 			alias: {
 				'@': path.resolve(__dirname, './src'),
 				'vue-i18n-bridge': 'vue-i18n-bridge/dist/vue-i18n-bridge.runtime.esm-bundler.js',
-				//vue: '@vue/compat'
+				// TODO: Vue 3: remove this
+				// vue: '@vue/compat'
 			}
 		},
 
 		plugins: [
-			vue(/*{
+			vue(
+				// TODO: Vue 3: remove this
+				/*
+				{
 				template: {
 					compilerOptions: {
 						compatConfig: {
@@ -69,7 +73,8 @@ export default ({ mode }) => {
 						}
 					}
 				}
-			}*/),
+			}
+			*/),
 			vuetify(),
 			visualizer()
 		],