diff --git a/core/attachments/attachments-ui/package.json b/core/attachments/attachments-ui/package.json
index 911c88a75..ae69ea305 100644
--- a/core/attachments/attachments-ui/package.json
+++ b/core/attachments/attachments-ui/package.json
@@ -26,11 +26,14 @@
     "@xwiki/cristal-api": "workspace:*",
     "@xwiki/cristal-attachments-api": "workspace:*",
     "@xwiki/cristal-date-ui": "workspace:*",
+    "@xwiki/cristal-document-api": "workspace:*",
     "@xwiki/cristal-dsapi": "workspace:*",
     "@xwiki/cristal-extra-tabs-api": "workspace:*",
     "@xwiki/cristal-file-preview-ui": "workspace:*",
     "@xwiki/cristal-info-actions-api": "workspace:*",
+    "@xwiki/cristal-model-api": "workspace:*",
     "@xwiki/cristal-model-click-listener": "workspace:*",
+    "@xwiki/cristal-model-reference-api": "workspace:*",
     "@xwiki/cristal-uiextension-api": "workspace:*",
     "@xwiki/cristal-user-ui": "workspace:*",
     "inversify": "6.2.0",
diff --git a/core/attachments/attachments-ui/src/vue/AttachmentsTab.vue b/core/attachments/attachments-ui/src/vue/AttachmentsTab.vue
index 9a14b1b0e..cd6b3db4b 100644
--- a/core/attachments/attachments-ui/src/vue/AttachmentsTab.vue
+++ b/core/attachments/attachments-ui/src/vue/AttachmentsTab.vue
@@ -23,6 +23,7 @@ import AttachmentsTable from "./AttachmentsTable.vue";
 import { AlertsService } from "@xwiki/cristal-alerts-api";
 import { CristalApp } from "@xwiki/cristal-api";
 import { AttachmentsService } from "@xwiki/cristal-attachments-api";
+import { DocumentService } from "@xwiki/cristal-document-api";
 import { inject, ref, watch } from "vue";
 import { useRoute } from "vue-router";
 
@@ -31,6 +32,10 @@ const attachmentsService = cristal
   .getContainer()
   .get<AttachmentsService>("AttachmentsService")!;
 
+const documentService = cristal
+  .getContainer()
+  .get<DocumentService>("DocumentService")!;
+
 const attachments = attachmentsService.list();
 const isLoading = attachmentsService.isLoading();
 const errorMessage = attachmentsService.getError();
@@ -38,14 +43,14 @@ const isUploading = attachmentsService.isUploading();
 
 // Watch for route change to refresh the tab when a user visits a new page.
 const route = useRoute();
+
+function getCurrentPageReference() {
+  return documentService.getCurrentDocumentReferenceString().value ?? "";
+}
+
 watch(
   () => route.params.page,
-  () =>
-    attachmentsService.refresh(
-      (route.params.page as string) ||
-        cristal.getCurrentPage() ||
-        "Main.WebHome",
-    ),
+  () => attachmentsService.refresh(getCurrentPageReference()),
   { immediate: true },
 );
 
@@ -57,12 +62,7 @@ const alertsService = cristal
 
 async function upload(files: File[]) {
   try {
-    await attachmentsService.upload(
-      (route.params.page as string) ||
-        cristal.getCurrentPage() ||
-        ("Main.WebHome" as string),
-      files,
-    );
+    await attachmentsService.upload(getCurrentPageReference(), files);
     attachmentUpload.value?.reset();
   } catch (e) {
     if (e instanceof Error) {
diff --git a/core/attachments/attachments-ui/src/vue/AttachmentsTable.vue b/core/attachments/attachments-ui/src/vue/AttachmentsTable.vue
index 00d0c6698..5dbefb44b 100644
--- a/core/attachments/attachments-ui/src/vue/AttachmentsTable.vue
+++ b/core/attachments/attachments-ui/src/vue/AttachmentsTable.vue
@@ -3,6 +3,8 @@ import messages from "../translations";
 import { Attachment } from "@xwiki/cristal-attachments-api";
 import { Date } from "@xwiki/cristal-date-ui";
 import { FileSize } from "@xwiki/cristal-file-preview-ui";
+import { AttachmentReference, EntityType } from "@xwiki/cristal-model-api";
+import { ModelReferenceParserProvider } from "@xwiki/cristal-model-reference-api";
 import { User } from "@xwiki/cristal-user-ui";
 import { computed, inject } from "vue";
 import { useI18n } from "vue-i18n";
@@ -21,6 +23,10 @@ const props = defineProps<{
 
 const cristal = inject<CristalApp>("cristal")!;
 const listener = cristal.getContainer().get<ClickListener>("ClickListener");
+const modelReferenceParser = cristal
+  .getContainer()
+  .get<ModelReferenceParserProvider>("ModelReferenceParserProvider")
+  .get()!;
 
 function attachmentPreview(url: string, event: Event) {
   event.preventDefault();
@@ -35,6 +41,19 @@ const hasAuthor = computed(() => {
       .length > 0
   );
 });
+
+function attachmentName(name: string) {
+  try {
+    return (
+      modelReferenceParser.parse(
+        name,
+        EntityType.ATTACHMENT,
+      ) as AttachmentReference
+    ).name;
+  } catch {
+    return "";
+  }
+}
 </script>
 <template>
   <span v-if="isLoading">{{ t("attachments.tab.loading") }}</span>
@@ -61,8 +80,9 @@ const hasAuthor = computed(() => {
           <a
             :href="attachment.href"
             @click="attachmentPreview(attachment.href, $event)"
-            >{{ attachment.name }}</a
           >
+            {{ attachmentName(attachment.name) }}
+          </a>
         </td>
         <td>
           <span class="mobile-column-name">
diff --git a/core/authentication/authentication-nextcloud/package.json b/core/authentication/authentication-nextcloud/package.json
new file mode 100644
index 000000000..24a22b7a0
--- /dev/null
+++ b/core/authentication/authentication-nextcloud/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "@xwiki/cristal-authentication-nextcloud",
+  "version": "0.12.0",
+  "license": "LGPL 2.1",
+  "author": "XWiki Org Community <contact@xwiki.org>",
+  "homepage": "https://cristal.xwiki.org/",
+  "repository": {
+    "type": "git",
+    "directory": "/core/authentication/authentication-nextcloud",
+    "url": "https://github.com/xwiki-contrib/cristal/"
+  },
+  "bugs": {
+    "url": "https://jira.xwiki.org/projects/CRISTAL/"
+  },
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "main": "./src/index.ts",
+  "scripts": {
+    "build": "tsc --project tsconfig.json && vite build",
+    "clean": "rimraf dist",
+    "lint": "eslint \"./src/**/*.{ts,tsx,vue}\" --max-warnings=0"
+  },
+  "devDependencies": {
+    "typescript": "5.6.3",
+    "vite": "6.0.3"
+  },
+  "publishConfig": {
+    "exports": {
+      ".": {
+        "import": "./dist/index.es.js",
+        "require": "./dist/index.umd.js",
+        "types": "./dist/index.d.ts"
+      }
+    },
+    "main": "./dist/index.es.js",
+    "types": "./dist/index.d.ts"
+  }
+}
diff --git a/core/authentication/authentication-nextcloud/src/index.ts b/core/authentication/authentication-nextcloud/src/index.ts
new file mode 100644
index 000000000..ce82cd499
--- /dev/null
+++ b/core/authentication/authentication-nextcloud/src/index.ts
@@ -0,0 +1,25 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+// TODO: replace with an actual authentication for nextcloud, see CRISTAL-267
+const USERNAME = "test";
+const PASSWORD = "test";
+
+export { PASSWORD, USERNAME };
diff --git a/core/authentication/authentication-nextcloud/tsconfig.json b/core/authentication/authentication-nextcloud/tsconfig.json
new file mode 100644
index 000000000..9ea278a11
--- /dev/null
+++ b/core/authentication/authentication-nextcloud/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "resolveJsonModule": true
+  },
+  "extends": "../../../tsconfig.json",
+  "include": [
+    "./src/index.ts",
+    "./src/**/*"
+  ]
+}
\ No newline at end of file
diff --git a/core/authentication/authentication-nextcloud/tsdoc.json b/core/authentication/authentication-nextcloud/tsdoc.json
new file mode 100644
index 000000000..81c5a8a2a
--- /dev/null
+++ b/core/authentication/authentication-nextcloud/tsdoc.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
+  "extends": ["../../../tsdoc.json"]
+}
diff --git a/core/authentication/authentication-nextcloud/vite.config.ts b/core/authentication/authentication-nextcloud/vite.config.ts
new file mode 100644
index 000000000..c31aed033
--- /dev/null
+++ b/core/authentication/authentication-nextcloud/vite.config.ts
@@ -0,0 +1,23 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import { generateConfig } from "../../../vite.config";
+
+export default generateConfig(import.meta.url);
diff --git a/core/backends/backend-nextcloud/package.json b/core/backends/backend-nextcloud/package.json
index 6dc10d4ba..55c844c0b 100644
--- a/core/backends/backend-nextcloud/package.json
+++ b/core/backends/backend-nextcloud/package.json
@@ -24,6 +24,7 @@
   "dependencies": {
     "@xwiki/cristal-api": "workspace:*",
     "@xwiki/cristal-authentication-api": "workspace:*",
+    "@xwiki/cristal-authentication-nextcloud": "workspace:*",
     "@xwiki/cristal-backend-api": "workspace:*",
     "inversify": "6.2.0"
   },
diff --git a/core/backends/backend-nextcloud/src/nextcloudStorage.ts b/core/backends/backend-nextcloud/src/nextcloudStorage.ts
index dcba07074..59e2f8fd6 100644
--- a/core/backends/backend-nextcloud/src/nextcloudStorage.ts
+++ b/core/backends/backend-nextcloud/src/nextcloudStorage.ts
@@ -24,15 +24,12 @@ import {
   PageAttachment,
   PageData,
 } from "@xwiki/cristal-api";
+import { PASSWORD, USERNAME } from "@xwiki/cristal-authentication-nextcloud";
 import { AbstractStorage } from "@xwiki/cristal-backend-api";
 import { inject, injectable } from "inversify";
 import type { Logger } from "@xwiki/cristal-api";
 import type { UserDetails } from "@xwiki/cristal-authentication-api";
 
-// TODO: To be replaced by an actual authentication with CRISTAL-267
-const USERNAME = "test";
-const PASSWORD = "test";
-
 /**
  * Access Nextcloud storage through http.
  * Read and write files to a ~/.cristal directory where all persistent data is
diff --git a/core/document/document-api/package.json b/core/document/document-api/package.json
index 28310ea5d..ae392c7ac 100644
--- a/core/document/document-api/package.json
+++ b/core/document/document-api/package.json
@@ -23,6 +23,7 @@
   },
   "dependencies": {
     "@xwiki/cristal-api": "workspace:*",
+    "@xwiki/cristal-model-api": "workspace:*",
     "vue": "3.5.13"
   },
   "devDependencies": {
diff --git a/core/document/document-api/src/index.ts b/core/document/document-api/src/index.ts
index 5ad062b72..2a7fb2f88 100644
--- a/core/document/document-api/src/index.ts
+++ b/core/document/document-api/src/index.ts
@@ -19,6 +19,7 @@
  */
 
 import type { PageData } from "@xwiki/cristal-api";
+import type { DocumentReference } from "@xwiki/cristal-model-api";
 import type { Ref } from "vue";
 
 /**
@@ -37,6 +38,20 @@ interface DocumentService {
    */
   getCurrentDocument(): Ref<PageData | undefined>;
 
+  /**
+   * Returns a reference the document reference for the current document.
+   *
+   * @since 0.13
+   */
+  getCurrentDocumentReference(): Ref<DocumentReference | undefined>;
+
+  /**
+   * Returns a serialized string of {@link getCurrentDocumentReference}.
+   *
+   * @since 0.13
+   */
+  getCurrentDocumentReferenceString(): Ref<string | undefined>;
+
   /**
    * @returns the revision of the current document, or undefined if it's the last one
    * @since 0.12
diff --git a/core/document/document-default/package.json b/core/document/document-default/package.json
index 8ad0e61be..2a0af2432 100644
--- a/core/document/document-default/package.json
+++ b/core/document/document-default/package.json
@@ -24,6 +24,8 @@
   "dependencies": {
     "@xwiki/cristal-api": "workspace:*",
     "@xwiki/cristal-document-api": "workspace:*",
+    "@xwiki/cristal-model-api": "workspace:*",
+    "@xwiki/cristal-model-reference-api": "workspace:*",
     "inversify": "6.2.0",
     "pinia": "2.3.0",
     "vue": "3.5.13"
diff --git a/core/document/document-default/src/defaultDocumentService.ts b/core/document/document-default/src/defaultDocumentService.ts
index 183dbd723..92051dd8e 100644
--- a/core/document/document-default/src/defaultDocumentService.ts
+++ b/core/document/document-default/src/defaultDocumentService.ts
@@ -18,6 +18,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
+import { EntityType } from "@xwiki/cristal-model-api";
 import { inject, injectable } from "inversify";
 import { Store, StoreDefinition, defineStore, storeToRefs } from "pinia";
 import { Ref } from "vue";
@@ -26,6 +27,11 @@ import type {
   DocumentChange,
   DocumentService,
 } from "@xwiki/cristal-document-api";
+import type { DocumentReference } from "@xwiki/cristal-model-api";
+import type {
+  ModelReferenceParserProvider,
+  ModelReferenceSerializerProvider,
+} from "@xwiki/cristal-model-reference-api";
 
 type Id = "document";
 type State = {
@@ -42,8 +48,16 @@ type State = {
 type WrappedRefs<Type> = {
   readonly [Property in keyof Type]: Ref<Type[Property]>;
 };
-type StateRefs = WrappedRefs<State>;
-type Getters = Record<string, never>;
+type StateRefs = WrappedRefs<
+  State & {
+    documentReference: DocumentReference | undefined;
+    documentReferenceString: string | undefined;
+  }
+>;
+type Getters = {
+  documentReference(): DocumentReference | undefined;
+  documentReferenceString(): string | undefined;
+};
 type Actions = {
   /**
    * Switch the loading state to true;
@@ -66,6 +80,13 @@ type DocumentStoreDefinition = StoreDefinition<Id, State, Getters, Actions>;
 type DocumentStore = Store<Id, State, Getters, Actions>;
 
 function createStore(cristal: CristalApp): DocumentStoreDefinition {
+  const modelReferenceParserProvider = cristal
+    .getContainer()
+    .get<ModelReferenceParserProvider>("ModelReferenceParserProvider");
+  const modelReferenceSerializerProvider = cristal
+    .getContainer()
+    .get<ModelReferenceSerializerProvider>("ModelReferenceSerializerProvider");
+
   return defineStore<Id, State, Getters, Actions>("document", {
     state() {
       return {
@@ -77,6 +98,21 @@ function createStore(cristal: CristalApp): DocumentStoreDefinition {
         error: undefined,
       };
     },
+    getters: {
+      documentReference() {
+        return modelReferenceParserProvider
+          .get()
+          ?.parse(
+            this.lastDocumentReference ?? "",
+            EntityType.DOCUMENT,
+          ) as DocumentReference;
+      },
+      documentReferenceString(): string | undefined {
+        return modelReferenceSerializerProvider
+          .get()
+          ?.serialize(this.documentReference);
+      },
+    },
     actions: {
       // Loading must be in its own separate action because action changes are
       // only applied to the store at the end of an action.
@@ -141,6 +177,14 @@ export class DefaultDocumentService implements DocumentService {
     return this.refs.document;
   }
 
+  getCurrentDocumentReference(): Ref<DocumentReference | undefined> {
+    return this.refs.documentReference;
+  }
+
+  getCurrentDocumentReferenceString(): Ref<string | undefined> {
+    return this.refs.documentReferenceString;
+  }
+
   getCurrentDocumentRevision(): Ref<string | undefined> {
     return this.refs.revision;
   }
@@ -154,7 +198,9 @@ export class DefaultDocumentService implements DocumentService {
   }
 
   setCurrentDocument(documentReference: string, revision?: string): void {
-    this.store.update(documentReference, true, revision);
+    if (this.store) {
+      this.store.update(documentReference, true, revision);
+    }
   }
 
   refreshCurrentDocument(): void {
diff --git a/core/link-suggest/link-suggest-api/src/linkSuggestService.ts b/core/link-suggest/link-suggest-api/src/linkSuggestService.ts
index 1d6aff59f..34ef44c91 100644
--- a/core/link-suggest/link-suggest-api/src/linkSuggestService.ts
+++ b/core/link-suggest/link-suggest-api/src/linkSuggestService.ts
@@ -18,7 +18,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
-import { Link } from "./index";
+import { Link, LinkType } from "./index";
 
 /**
  * Provide the operation to get links suggestions.
@@ -28,8 +28,15 @@ interface LinkSuggestService {
   /**
    * Returns a list of page links from a text query.
    * @param query - a textual search value (e.g., PageName)
+   * @param linkType - when provided, only results matching the provided type are returned
+   * @param mimetype - when provided, only results matching the provided mimetype are returned. Only used when
+   *     linkType is {@link LinkType.ATTACHMENT} (e.g., "image/*" or "application/pdf")
    */
-  getLinks(query: string): Promise<Link[]>;
+  getLinks(
+    query: string,
+    linkType?: LinkType,
+    mimetype?: string,
+  ): Promise<Link[]>;
 }
 
 export { type LinkSuggestService };
diff --git a/core/link-suggest/link-suggest-nextcloud/package.json b/core/link-suggest/link-suggest-nextcloud/package.json
index 09b504696..4457a1bce 100644
--- a/core/link-suggest/link-suggest-nextcloud/package.json
+++ b/core/link-suggest/link-suggest-nextcloud/package.json
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "@xwiki/cristal-api": "workspace:*",
+    "@xwiki/cristal-authentication-nextcloud": "workspace:*",
     "@xwiki/cristal-link-suggest-api": "workspace:*",
     "inversify": "6.2.0",
     "xml-escape": "1.1.0"
diff --git a/core/link-suggest/link-suggest-nextcloud/src/nextcloudLinkSuggestService.ts b/core/link-suggest/link-suggest-nextcloud/src/nextcloudLinkSuggestService.ts
index 8e2c7cf51..355fdb73f 100644
--- a/core/link-suggest/link-suggest-nextcloud/src/nextcloudLinkSuggestService.ts
+++ b/core/link-suggest/link-suggest-nextcloud/src/nextcloudLinkSuggestService.ts
@@ -18,16 +18,13 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
+import { PASSWORD, USERNAME } from "@xwiki/cristal-authentication-nextcloud";
 import { Link, LinkType } from "@xwiki/cristal-link-suggest-api";
 import { inject, injectable } from "inversify";
 import xmlescape from "xml-escape";
 import type { CristalApp } from "@xwiki/cristal-api";
 import type { LinkSuggestService } from "@xwiki/cristal-link-suggest-api";
 
-// TODO: To be replaced by an actual authentication with CRISTAL-267
-const USERNAME = "test";
-const PASSWORD = "test";
-
 /**
  * @since 0.11
  */
@@ -99,7 +96,7 @@ export class NextcloudLinkSuggestService implements LinkSuggestService {
           const displayName =
             responseNode.querySelector("displayname")!.textContent!;
           const reference = dHref.replace(/^.+\/\.cristal/, "");
-          const url = `.${reference}`;
+          const url = `${this.cristalApp.getWikiConfig().baseURL}${dHref}`;
 
           if (isFolder) {
             // handle folder
diff --git a/core/link-suggest/link-suggest-xwiki/package.json b/core/link-suggest/link-suggest-xwiki/package.json
index cc252e70c..d5fd7afb5 100644
--- a/core/link-suggest/link-suggest-xwiki/package.json
+++ b/core/link-suggest/link-suggest-xwiki/package.json
@@ -24,7 +24,10 @@
   },
   "dependencies": {
     "@xwiki/cristal-api": "workspace:*",
+    "@xwiki/cristal-authentication-api": "workspace:*",
     "@xwiki/cristal-link-suggest-api": "workspace:*",
+    "@xwiki/cristal-model-reference-api": "workspace:*",
+    "@xwiki/cristal-model-remote-url-api": "workspace:*",
     "inversify": "6.2.0"
   },
   "peerDependencies": {
diff --git a/core/link-suggest/link-suggest-xwiki/src/components/componentsInit.ts b/core/link-suggest/link-suggest-xwiki/src/components/componentsInit.ts
index 673c2789e..2b6274606 100644
--- a/core/link-suggest/link-suggest-xwiki/src/components/componentsInit.ts
+++ b/core/link-suggest/link-suggest-xwiki/src/components/componentsInit.ts
@@ -21,7 +21,10 @@
 import { Link, LinkType, name } from "@xwiki/cristal-link-suggest-api";
 import { Container, inject, injectable } from "inversify";
 import type { CristalApp } from "@xwiki/cristal-api";
+import type { AuthenticationManagerProvider } from "@xwiki/cristal-authentication-api";
 import type { LinkSuggestService } from "@xwiki/cristal-link-suggest-api";
+import type { ModelReferenceParserProvider } from "@xwiki/cristal-model-reference-api";
+import type { RemoteURLSerializerProvider } from "@xwiki/cristal-model-remote-url-api";
 
 /**
  * Default implementation of the link suggestion service, for XWiki.
@@ -31,58 +34,146 @@ import type { LinkSuggestService } from "@xwiki/cristal-link-suggest-api";
  */
 @injectable()
 class XWikiLinkSuggestService implements LinkSuggestService {
-  private cristalApp: CristalApp;
+  constructor(
+    @inject<CristalApp>("CristalApp") private readonly cristalApp: CristalApp,
+    @inject<RemoteURLSerializerProvider>("RemoteURLSerializerProvider")
+    private readonly remoteURLSerializerProvider: RemoteURLSerializerProvider,
+    @inject<ModelReferenceParserProvider>("ModelReferenceParserProvider")
+    private readonly modelReferenceParserProvider: ModelReferenceParserProvider,
+    @inject<AuthenticationManagerProvider>("AuthenticationManagerProvider")
+    private authenticationManagerProvider: AuthenticationManagerProvider,
+  ) {}
 
-  constructor(@inject<CristalApp>("CristalApp") cristalApp: CristalApp) {
-    this.cristalApp = cristalApp;
+  async getLinks(
+    query: string,
+    type?: LinkType,
+    mimetype?: string,
+  ): Promise<Link[]> {
+    const json = await this.executeQuery(type, mimetype, query);
+
+    return json
+      .map(this.mapToLink.bind(this))
+      .filter((it: unknown) => it !== undefined)
+      .filter(this.filterLinks(type, mimetype));
   }
 
-  async getLinks(query: string): Promise<Link[]> {
-    // TODO: currently only proposing links available to guest
+  private async executeQuery(
+    type: LinkType | undefined | LinkType.PAGE | LinkType.ATTACHMENT,
+    mimetype: string | undefined,
+    query: string,
+  ) {
     const baseURL = this.cristalApp.getWikiConfig().baseURL;
-    const getParams = new URLSearchParams({
-      sheet: "CKEditor.LinkSuggestions",
-      outputSyntax: "plain",
-      language: "en", // TODO: add support for multiple languages
-      input: query,
-    }).toString();
-    const response = await fetch(`${baseURL}/bin/get/Main/?${getParams}`, {
-      headers: {
-        Accept: "application/json",
+    const fqs = this.initializeSolrQueryParameters(type, mimetype);
+    const params: Record<string, string> = {
+      query: fqs.map((it) => `fq=${it}`).join("\n"),
+      nb: "20",
+      media: "json",
+      input: `*${query}*`,
+    };
+
+    const getParams = new URLSearchParams(params).toString();
+    const response = await fetch(
+      `${baseURL}/bin/get/XWiki/SuggestSolrService?${getParams}`,
+      {
+        headers: {
+          ...(await this.getCredentials()),
+        },
       },
-    });
+    );
+
+    return await response.json();
+  }
+
+  private initializeSolrQueryParameters(
+    type: LinkType | LinkType.PAGE | LinkType.ATTACHMENT | undefined,
+    mimetype: string | undefined,
+  ) {
+    const fqs = ["locale:*", "wiki:xwiki"];
+
+    if (type) {
+      if (type == LinkType.ATTACHMENT) {
+        fqs.push("type:ATTACHMENT");
+      } else {
+        fqs.push("type:PAGE");
+      }
+    }
+
+    if (mimetype) {
+      fqs.push(`mimetype:((${mimetype}))`);
+    }
+    return fqs;
+  }
+
+  private filterLinks(
+    type: LinkType | undefined | LinkType.PAGE | LinkType.ATTACHMENT,
+    mimetype: string | undefined,
+  ) {
+    return (link: Link) => {
+      if (type == undefined) {
+        return true;
+      } else {
+        const expectedType = link.type == type;
+        if (!expectedType) {
+          return false;
+        }
+        if (mimetype) {
+          // TODO...
+          return expectedType;
+        } else {
+          return true;
+        }
+      }
+    };
+  }
 
-    const json = await response.json();
+  private mapToLink(result: {
+    id: string;
+    filename: string[];
+    type: string;
+    title_: string;
+    name: string;
+    reference: string;
+  }) {
+    const reference = result.reference;
+    const type = result.type;
+    const xwikiURL =
+      this.remoteURLSerializerProvider
+        .get()
+        ?.serialize(
+          this.modelReferenceParserProvider.get()?.parse(reference),
+        ) ?? "";
 
-    return json.map(
-      ({
-        id,
-        url,
+    if (type == "ATTACHMENT") {
+      return {
+        type: LinkType.ATTACHMENT,
+        id: result.id,
+        url: xwikiURL,
+        reference,
+        label: result.filename[0],
+        hint: result.filename[0],
+      };
+    } else if (type == "DOCUMENT") {
+      const label = result.title_;
+      return {
+        type: LinkType.PAGE,
+        id: result.id,
+        url: xwikiURL,
         reference,
         label,
-        hint,
-        type,
-      }: {
-        id: string;
-        url: string;
-        reference: string;
-        label: string;
-        hint: string;
-        type: string;
-      }) => {
-        const xwikiURL =
-          this.cristalApp.getWikiConfig().baseURL + url.replace(/^\/xwiki/, "");
-        const link: Link = {
-          id,
-          url: xwikiURL,
-          reference,
-          label,
-          hint,
-          type: type == "doc" ? LinkType.PAGE : LinkType.ATTACHMENT,
-        };
-        return link;
-      },
-    );
+        hint: label,
+      };
+    }
+  }
+
+  private async getCredentials(): Promise<{ Authorization?: string }> {
+    const authorizationHeader = await this.authenticationManagerProvider
+      .get()
+      ?.getAuthorizationHeader();
+    const headers: { Authorization?: string } = {};
+    if (authorizationHeader) {
+      headers["Authorization"] = authorizationHeader;
+    }
+    return headers;
   }
 }
 
diff --git a/core/markdown/markdown-api/package.json b/core/markdown/markdown-api/package.json
new file mode 100644
index 000000000..31cdc451a
--- /dev/null
+++ b/core/markdown/markdown-api/package.json
@@ -0,0 +1,43 @@
+{
+  "name": "@xwiki/cristal-markdown-api",
+  "version": "0.12.0",
+  "license": "LGPL 2.1",
+  "author": "XWiki Org Community <contact@xwiki.org>",
+  "homepage": "https://cristal.xwiki.org/",
+  "repository": {
+    "type": "git",
+    "directory": "core/markdown/markdown-api",
+    "url": "https://github.com/xwiki-contrib/cristal/"
+  },
+  "bugs": {
+    "url": "https://jira.xwiki.org/projects/CRISTAL/"
+  },
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "main": "./src/index.ts",
+  "scripts": {
+    "build": "tsc --project tsconfig.json && vite build",
+    "clean": "rimraf dist",
+    "lint": "eslint \"./src/**/*.{ts,tsx,vue}\" --max-warnings=0"
+  },
+  "devDependencies": {
+    "typescript": "5.6.3",
+    "vite": "6.0.3"
+  },
+  "publishConfig": {
+    "exports": {
+      ".": {
+        "import": "./dist/index.es.js",
+        "require": "./dist/index.umd.js",
+        "types": "./dist/index.d.ts"
+      }
+    },
+    "main": "./dist/index.es.js",
+    "types": "./dist/index.d.ts"
+  },
+  "dependencies": {
+    "@xwiki/cristal-document-api": "workspace:*"
+  }
+}
diff --git a/core/markdown/markdown-api/src/index.ts b/core/markdown/markdown-api/src/index.ts
new file mode 100644
index 000000000..9c3794535
--- /dev/null
+++ b/core/markdown/markdown-api/src/index.ts
@@ -0,0 +1,23 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import type { MarkdownRenderer } from "./markdownRenderer";
+
+export { MarkdownRenderer };
diff --git a/core/markdown/markdown-api/src/markdownRenderer.ts b/core/markdown/markdown-api/src/markdownRenderer.ts
new file mode 100644
index 000000000..b2736d0ba
--- /dev/null
+++ b/core/markdown/markdown-api/src/markdownRenderer.ts
@@ -0,0 +1,33 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+/**
+ * Provides operation to render Markdown to HTML.
+ *
+ * @since 0.13
+ */
+export interface MarkdownRenderer {
+  /**
+   * Converts the provided Markdown into an HTML 5.0 string.
+   *
+   * @param markdown - the Markdown string
+   */
+  render(markdown: string): string;
+}
diff --git a/core/markdown/markdown-api/tsconfig.json b/core/markdown/markdown-api/tsconfig.json
new file mode 100644
index 000000000..9ea278a11
--- /dev/null
+++ b/core/markdown/markdown-api/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "resolveJsonModule": true
+  },
+  "extends": "../../../tsconfig.json",
+  "include": [
+    "./src/index.ts",
+    "./src/**/*"
+  ]
+}
\ No newline at end of file
diff --git a/core/markdown/markdown-api/tsdoc.json b/core/markdown/markdown-api/tsdoc.json
new file mode 100644
index 000000000..81c5a8a2a
--- /dev/null
+++ b/core/markdown/markdown-api/tsdoc.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
+  "extends": ["../../../tsdoc.json"]
+}
diff --git a/core/markdown/markdown-api/vite.config.ts b/core/markdown/markdown-api/vite.config.ts
new file mode 100644
index 000000000..c31aed033
--- /dev/null
+++ b/core/markdown/markdown-api/vite.config.ts
@@ -0,0 +1,23 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import { generateConfig } from "../../../vite.config";
+
+export default generateConfig(import.meta.url);
diff --git a/core/markdown/markdown-default/package.json b/core/markdown/markdown-default/package.json
new file mode 100644
index 000000000..520f72d58
--- /dev/null
+++ b/core/markdown/markdown-default/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "@xwiki/cristal-markdown-default",
+  "version": "0.12.0",
+  "license": "LGPL 2.1",
+  "author": "XWiki Org Community <contact@xwiki.org>",
+  "homepage": "https://cristal.xwiki.org/",
+  "repository": {
+    "type": "git",
+    "directory": "core/markdown/markdown-default",
+    "url": "https://github.com/xwiki-contrib/cristal/"
+  },
+  "bugs": {
+    "url": "https://jira.xwiki.org/projects/CRISTAL/"
+  },
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "main": "./src/index.ts",
+  "scripts": {
+    "build": "tsc --project tsconfig.json && vite build",
+    "clean": "rimraf dist",
+    "lint": "eslint \"./src/**/*.{ts,tsx,vue}\" --max-warnings=0"
+  },
+  "dependencies": {
+    "@xwiki/cristal-markdown-api": "workspace:*",
+    "@xwiki/cristal-model-api": "workspace:*",
+    "@xwiki/cristal-model-reference-api": "workspace:*",
+    "@xwiki/cristal-model-remote-url-api": "workspace:*",
+    "inversify": "6.2.0",
+    "markdown-it": "14.1.0"
+  },
+  "peerDependencies": {
+    "reflect-metadata": "0.2.2"
+  },
+  "devDependencies": {
+    "@types/markdown-it": "14.1.2",
+    "reflect-metadata": "0.2.2",
+    "typescript": "5.6.3",
+    "vite": "6.0.3"
+  },
+  "publishConfig": {
+    "exports": {
+      ".": {
+        "import": "./dist/index.es.js",
+        "require": "./dist/index.umd.js",
+        "types": "./dist/index.d.ts"
+      }
+    },
+    "main": "./dist/index.es.js",
+    "types": "./dist/index.d.ts"
+  }
+}
diff --git a/core/markdown/markdown-default/src/index.ts b/core/markdown/markdown-default/src/index.ts
new file mode 100644
index 000000000..b6f7a4c1d
--- /dev/null
+++ b/core/markdown/markdown-default/src/index.ts
@@ -0,0 +1,76 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+import { parseInternalImages } from "./parseInternalImages";
+import { parseInternalLinks } from "./parseInternalLinks";
+import { MarkdownRenderer } from "@xwiki/cristal-markdown-api";
+import { Container, inject, injectable } from "inversify";
+import markdownit from "markdown-it";
+import type { ModelReferenceParserProvider } from "@xwiki/cristal-model-reference-api";
+import type { RemoteURLSerializerProvider } from "@xwiki/cristal-model-remote-url-api";
+import type MarkdownIt from "markdown-it";
+
+/**
+ * Default implementation based on markdown-it.
+ * @since 0.13
+ */
+@injectable()
+class DefaultMarkdownRenderer implements MarkdownRenderer {
+  private md: MarkdownIt;
+
+  constructor(
+    @inject<ModelReferenceParserProvider>("ModelReferenceParserProvider")
+    private readonly modelReferenceParserProvider: ModelReferenceParserProvider,
+    @inject<RemoteURLSerializerProvider>("RemoteURLSerializerProvider")
+    private readonly remoteURLSerializerProvider: RemoteURLSerializerProvider,
+  ) {
+    this.md = markdownit();
+    const modelReferenceParser = this.modelReferenceParserProvider.get()!;
+    const remoteURLSerializer = this.remoteURLSerializerProvider.get()!;
+    this.md.core.ruler.before(
+      "inline",
+      "markdown-internal-links",
+      parseInternalLinks(modelReferenceParser, remoteURLSerializer),
+    );
+    // This declaration needs to happen after markdown-internal-links, otherwise an error is thrown because
+    // markdown-internal-links is not found. But, "markdown-internal-images" is executed before
+    // "markdown-internal-links"
+    this.md.core.ruler.before(
+      "markdown-internal-links",
+      "markdown-internal-images",
+      parseInternalImages(modelReferenceParser, remoteURLSerializer),
+    );
+  }
+
+  render(markdown: string): string {
+    return this.md.render(markdown);
+  }
+}
+
+class ComponentInit {
+  constructor(container: Container) {
+    container
+      .bind<MarkdownRenderer>("MarkdownRenderer")
+      .to(DefaultMarkdownRenderer)
+      .inSingletonScope()
+      .whenTargetIsDefault();
+  }
+}
+
+export { ComponentInit, parseInternalImages, parseInternalLinks };
diff --git a/core/markdown/markdown-default/src/parseInternalImages.ts b/core/markdown/markdown-default/src/parseInternalImages.ts
new file mode 100644
index 000000000..ab99ff16f
--- /dev/null
+++ b/core/markdown/markdown-default/src/parseInternalImages.ts
@@ -0,0 +1,135 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import { EntityType } from "@xwiki/cristal-model-api";
+import type { ModelReferenceParser } from "@xwiki/cristal-model-reference-api";
+import type { RemoteURLSerializer } from "@xwiki/cristal-model-remote-url-api";
+import type { StateCore } from "markdown-it";
+
+const INTERNAL_IMAGE_REGEX =
+  /!\[\[((?<text>[^\]|]+)\|)?(?<reference>[^\]|]+)]]/g;
+
+type InternalImage = { text?: string; reference: string };
+
+/**
+ * Takes the substring of content between start and end (and from start until the end if end is empty).
+ * Add the extracted substring to the tokens if the string is not empty.
+ * @param content - the content to update
+ * @param tokens - the tokens to append
+ * @param start - the start index
+ * @param end - the end index
+ */
+function appendIfNotEmpty(
+  content: string,
+  tokens: (string | InternalImage)[],
+  start: number,
+  end?: number,
+) {
+  const preString = content.substring(start, end);
+  if (preString.length > 0) {
+    tokens.push(preString);
+  }
+  return preString;
+}
+
+/**
+ * Returns true if at least an internal link was found, false otherwise.
+ * @param internalTokens - an array of tokens
+ */
+function hasLink(internalTokens: (string | InternalImage)[]) {
+  return (
+    internalTokens.length > 1 ||
+    (internalTokens.length == 1 && typeof internalTokens[0] !== "string")
+  );
+}
+
+/**
+ * Parse a string in look for internal links. Returns an array of string or InternalLink types.
+ * @param content - a string to parse
+ */
+// TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule.
+// eslint-disable-next-line max-statements
+function parseStringForInternalLinks(
+  content: string,
+): (string | InternalImage)[] {
+  const tokens = [];
+
+  // The offset of the content before the previously matched internal link (or the beginning of the string).
+  let offset = 0;
+
+  const matches = content.matchAll(INTERNAL_IMAGE_REGEX);
+  for (const match of matches) {
+    const preString = appendIfNotEmpty(content, tokens, offset, match.index);
+    const text = match.groups?.text;
+    const reference: string = match.groups?.reference || "";
+    tokens.push({ text, reference });
+    // Shift the offset to the index right after the end of the current internal link.
+    offset += match[0].length + preString.length;
+  }
+
+  // Put the end of the text, after the last internal link found.
+  appendIfNotEmpty(content, tokens, offset);
+  return tokens;
+}
+
+export function parseInternalImages(
+  modelReferenceParser: ModelReferenceParser,
+  remoteURLSerializer: RemoteURLSerializer,
+) {
+  return function (state: StateCore): void {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    state.tokens.forEach((blockToken: any) => {
+      if (blockToken.type == "inline") {
+        const internalTokens = parseStringForInternalLinks(blockToken.content);
+
+        // We replace the content of the current block node only if at least a link has been found.
+        if (hasLink(internalTokens)) {
+          blockToken.content = "";
+          // TODO: reduce the number of statements in the following method and reactivate the disabled eslint
+          // rule.
+          // eslint-disable-next-line max-statements
+          blockToken.children = internalTokens.flatMap((v) => {
+            if (typeof v == "string") {
+              const token = new state.Token("text", "span", 0);
+              token.content = v;
+              return [token];
+            } else {
+              const { text, reference } = v;
+
+              const openToken = new state.Token("image_open", "img", 1);
+              openToken.attrSet(
+                "src",
+                remoteURLSerializer.serialize(
+                  modelReferenceParser.parse(reference, EntityType.ATTACHMENT),
+                ) ?? "",
+              );
+              if (text) {
+                openToken.attrSet("alt", text);
+              }
+              const closeToken = new state.Token("link_close", "a", -1);
+
+              return [openToken, closeToken];
+            }
+          });
+        }
+      }
+    });
+  };
+}
diff --git a/core/markdown/markdown-default/src/parseInternalLinks.ts b/core/markdown/markdown-default/src/parseInternalLinks.ts
new file mode 100644
index 000000000..ef334491d
--- /dev/null
+++ b/core/markdown/markdown-default/src/parseInternalLinks.ts
@@ -0,0 +1,135 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import type { ModelReferenceParser } from "@xwiki/cristal-model-reference-api";
+import type { RemoteURLSerializer } from "@xwiki/cristal-model-remote-url-api";
+import type { StateCore } from "markdown-it";
+
+const INTERNAL_LINK_REGEX = /\[\[((?<text>[^\]|]+)\|)?(?<reference>[^\]|]+)]]/g;
+
+type InternalLink = { text?: string; reference: string };
+
+/**
+ * Takes the substring of content between start and end (and from start until the end if end is empty).
+ * Add the extracted substring to the tokens if the string is not empty.
+ * @param content - the content to update
+ * @param tokens - the tokens to append
+ * @param start - the start index
+ * @param end - the end index
+ */
+function appendIfNotEmpty(
+  content: string,
+  tokens: (string | InternalLink)[],
+  start: number,
+  end?: number,
+) {
+  const preString = content.substring(start, end);
+  if (preString.length > 0) {
+    tokens.push(preString);
+  }
+  return preString;
+}
+
+/**
+ * Returns true if at least an internal link was found, false otherwise.
+ * @param internalTokens - an array of tokens
+ */
+function hasLink(internalTokens: (string | InternalLink)[]) {
+  return (
+    internalTokens.length > 1 ||
+    (internalTokens.length == 1 && typeof internalTokens[0] !== "string")
+  );
+}
+
+/**
+ * Parse a string in look for internal links. Returns a array of string or InternalLink types.
+ * @param content - a string to parse
+ */
+// TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule.
+// eslint-disable-next-line max-statements
+function parseStringForInternalLinks(
+  content: string,
+): (string | InternalLink)[] {
+  const tokens = [];
+
+  // The offset of the content before the previously matched internal link (or the beginning of the string).
+  let offset = 0;
+
+  const matches = content.matchAll(INTERNAL_LINK_REGEX);
+  for (const match of matches) {
+    const preString = appendIfNotEmpty(content, tokens, offset, match.index);
+    const text = match.groups?.text;
+    const reference: string = match.groups?.reference || "";
+    tokens.push({ text, reference });
+    // Shift the offset to the index right after the end of the current internal link.
+    offset += match[0].length + preString.length;
+  }
+
+  // Put the end of the text, after the last internal link found.
+  appendIfNotEmpty(content, tokens, offset);
+  return tokens;
+}
+
+export function parseInternalLinks(
+  modelReferenceParser: ModelReferenceParser,
+  remoteURLSerializer: RemoteURLSerializer,
+) {
+  return function (state: StateCore): void {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    state.tokens.forEach((blockToken: any) => {
+      if (blockToken.type == "inline") {
+        const internalTokens = parseStringForInternalLinks(blockToken.content);
+
+        // We replace the content of the current block node only if at least a link has been found.
+        if (hasLink(internalTokens)) {
+          blockToken.content = "";
+          // TODO: reduce the number of statements in the following method and reactivate the disabled eslint
+          // rule.
+          // eslint-disable-next-line max-statements
+          blockToken.children = internalTokens.flatMap((v) => {
+            if (typeof v == "string") {
+              const token = new state.Token("text", "span", 0);
+              token.content = v;
+              return [token];
+            } else {
+              const { text, reference } = v;
+
+              const openToken = new state.Token("link_open", "a", 1);
+              openToken.attrSet(
+                "href",
+                remoteURLSerializer.serialize(
+                  modelReferenceParser.parse(reference),
+                ) ?? "",
+              );
+              openToken.attrPush(["class", "internal-link"]);
+              const contentToken = new state.Token("text", "", 0);
+              contentToken.content = text || reference;
+              const closeToken = new state.Token("link_close", "a", -1);
+              // This is useful for the serializer, who is going to have access to this value to determine
+              // how to serialize the link
+              closeToken.attrPush(["class", "internal-link"]);
+              return [openToken, contentToken, closeToken];
+            }
+          });
+        }
+      }
+    });
+  };
+}
diff --git a/core/markdown/markdown-default/tsconfig.json b/core/markdown/markdown-default/tsconfig.json
new file mode 100644
index 000000000..9ea278a11
--- /dev/null
+++ b/core/markdown/markdown-default/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "resolveJsonModule": true
+  },
+  "extends": "../../../tsconfig.json",
+  "include": [
+    "./src/index.ts",
+    "./src/**/*"
+  ]
+}
\ No newline at end of file
diff --git a/core/markdown/markdown-default/tsdoc.json b/core/markdown/markdown-default/tsdoc.json
new file mode 100644
index 000000000..81c5a8a2a
--- /dev/null
+++ b/core/markdown/markdown-default/tsdoc.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
+  "extends": ["../../../tsdoc.json"]
+}
diff --git a/core/markdown/markdown-default/vite.config.ts b/core/markdown/markdown-default/vite.config.ts
new file mode 100644
index 000000000..c31aed033
--- /dev/null
+++ b/core/markdown/markdown-default/vite.config.ts
@@ -0,0 +1,23 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import { generateConfig } from "../../../vite.config";
+
+export default generateConfig(import.meta.url);
diff --git a/core/model/model-api/src/index.ts b/core/model/model-api/src/index.ts
index 5b6a72247..2bcbb01a8 100644
--- a/core/model/model-api/src/index.ts
+++ b/core/model/model-api/src/index.ts
@@ -69,10 +69,16 @@ class DocumentReference implements EntityReference {
   type: EntityType = EntityType.DOCUMENT;
   space?: SpaceReference;
   name: string;
+  /**
+   * Indicates whether the current document reference is terminal.
+   * @since 0.13
+   */
+  terminal: boolean;
 
-  constructor(name: string, space?: SpaceReference) {
+  constructor(name: string, space?: SpaceReference, terminal?: boolean) {
     this.space = space;
     this.name = name;
+    this.terminal = terminal ?? false;
   }
 }
 
diff --git a/core/model/model-click-listener/src/DefaultClickListener.ts b/core/model/model-click-listener/src/DefaultClickListener.ts
index 9fe737c0c..d11e530db 100644
--- a/core/model/model-click-listener/src/DefaultClickListener.ts
+++ b/core/model/model-click-listener/src/DefaultClickListener.ts
@@ -85,6 +85,9 @@ class DefaultClickListener implements ClickListener {
         }
       } else {
         console.debug(`[${url}] is not a valid xwiki entity link`);
+        if (href) {
+          this.legacyHandleURL(href);
+        }
       }
     } catch (e) {
       console.log(
diff --git a/core/model/model-reference/model-reference-api/src/modelReferenceParser.ts b/core/model/model-reference/model-reference-api/src/modelReferenceParser.ts
index 501787321..82ce22b0c 100644
--- a/core/model/model-reference/model-reference-api/src/modelReferenceParser.ts
+++ b/core/model/model-reference/model-reference-api/src/modelReferenceParser.ts
@@ -18,12 +18,16 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
-import { EntityReference } from "@xwiki/cristal-model-api";
+import { EntityReference, EntityType } from "@xwiki/cristal-model-api";
 
 /**
  * @since 0.12
  */
 interface ModelReferenceParser {
-  parser(reference: string): EntityReference;
+  /**
+   * @param reference - an entity reference
+   * @param type - (since 0.13) an optional type, helping to remove ambiguity when parsing the reference
+   */
+  parse(reference: string, type?: EntityType): EntityReference;
 }
 export type { ModelReferenceParser };
diff --git a/core/model/model-reference/model-reference-filesystem/src/filesystemModelReferenceParser.ts b/core/model/model-reference/model-reference-filesystem/src/filesystemModelReferenceParser.ts
index 8af24e62a..e0910e305 100644
--- a/core/model/model-reference/model-reference-filesystem/src/filesystemModelReferenceParser.ts
+++ b/core/model/model-reference/model-reference-filesystem/src/filesystemModelReferenceParser.ts
@@ -18,13 +18,38 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
-import { EntityReference } from "@xwiki/cristal-model-api";
+import {
+  AttachmentReference,
+  DocumentReference,
+  EntityReference,
+  SpaceReference,
+} from "@xwiki/cristal-model-api";
 import { ModelReferenceParser } from "@xwiki/cristal-model-reference-api";
 import { injectable } from "inversify";
 
 @injectable()
 export class FileSystemModelReferenceParser implements ModelReferenceParser {
-  parser(): EntityReference {
-    throw new Error("Method not implemented.");
+  parse(reference: string): EntityReference {
+    const segments = reference.split("/");
+    if (segments[segments.length - 2] == "attachments") {
+      return new AttachmentReference(
+        segments[segments.length - 1],
+        new DocumentReference(
+          segments[segments.length - 3],
+          new SpaceReference(
+            undefined,
+            ...segments.slice(0, segments.length - 3),
+          ),
+        ),
+      );
+    } else {
+      return new DocumentReference(
+        segments[segments.length - 1],
+        new SpaceReference(
+          undefined,
+          ...segments.slice(0, segments.length - 1),
+        ),
+      );
+    }
   }
 }
diff --git a/core/model/model-reference/model-reference-nextcloud/src/nextcloudModelReferenceParser.ts b/core/model/model-reference/model-reference-nextcloud/src/nextcloudModelReferenceParser.ts
index 665cae9f2..53eb18a85 100644
--- a/core/model/model-reference/model-reference-nextcloud/src/nextcloudModelReferenceParser.ts
+++ b/core/model/model-reference/model-reference-nextcloud/src/nextcloudModelReferenceParser.ts
@@ -18,13 +18,41 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
-import { EntityReference } from "@xwiki/cristal-model-api";
+import {
+  AttachmentReference,
+  DocumentReference,
+  EntityReference,
+  SpaceReference,
+} from "@xwiki/cristal-model-api";
 import { ModelReferenceParser } from "@xwiki/cristal-model-reference-api";
 import { injectable } from "inversify";
 
 @injectable()
 export class NextcloudModelReferenceParser implements ModelReferenceParser {
-  parser(): EntityReference {
-    throw new Error("Method not implemented.");
+  parse(reference: string): EntityReference {
+    let segments = reference.split("/");
+    if (segments[0] == "") {
+      segments = segments.slice(1);
+    }
+    if (segments[segments.length - 2] == "attachments") {
+      return new AttachmentReference(
+        segments[segments.length - 1],
+        new DocumentReference(
+          segments[segments.length - 3],
+          new SpaceReference(
+            undefined,
+            ...segments.slice(0, segments.length - 3),
+          ),
+        ),
+      );
+    } else {
+      return new DocumentReference(
+        segments[segments.length - 1],
+        new SpaceReference(
+          undefined,
+          ...segments.slice(0, segments.length - 1),
+        ),
+      );
+    }
   }
 }
diff --git a/core/model/model-reference/model-reference-nextcloud/src/nextcloudModelReferenceSerializer.ts b/core/model/model-reference/model-reference-nextcloud/src/nextcloudModelReferenceSerializer.ts
index d7832e823..cc252c288 100644
--- a/core/model/model-reference/model-reference-nextcloud/src/nextcloudModelReferenceSerializer.ts
+++ b/core/model/model-reference/model-reference-nextcloud/src/nextcloudModelReferenceSerializer.ts
@@ -52,7 +52,7 @@ export class NextcloudModelReferenceSerializer
         const documentReference = reference as DocumentReference;
         const spaces = this.serialize(documentReference.space);
         const name = documentReference.name;
-        if (spaces === undefined) {
+        if (spaces === undefined || spaces == "") {
           return name;
         } else {
           return `${spaces}/${name}`;
diff --git a/core/model/model-reference/model-reference-xwiki/package.json b/core/model/model-reference/model-reference-xwiki/package.json
index c7458b57f..6f5a38546 100644
--- a/core/model/model-reference/model-reference-xwiki/package.json
+++ b/core/model/model-reference/model-reference-xwiki/package.json
@@ -24,15 +24,20 @@
     "test": "vitest --run"
   },
   "dependencies": {
+    "@xwiki/cristal-document-api": "workspace:*",
     "@xwiki/cristal-model-api": "workspace:*",
     "@xwiki/cristal-model-reference-api": "workspace:*",
-    "inversify": "6.2.0"
+    "inversify": "6.2.0",
+    "lodash": "4.17.21"
   },
   "devDependencies": {
+    "@types/lodash": "4.17.13",
     "reflect-metadata": "0.2.2",
     "typescript": "5.6.3",
     "vite": "6.0.3",
-    "vitest": "2.1.8"
+    "vitest": "2.1.8",
+    "vitest-mock-extended": "2.0.2",
+    "vue": "3.5.13"
   },
   "publishConfig": {
     "exports": {
diff --git a/core/model/model-reference/model-reference-xwiki/src/__tests__/xWikiModelReferenceParser.test.ts b/core/model/model-reference/model-reference-xwiki/src/__tests__/xWikiModelReferenceParser.test.ts
new file mode 100644
index 000000000..446f34f41
--- /dev/null
+++ b/core/model/model-reference/model-reference-xwiki/src/__tests__/xWikiModelReferenceParser.test.ts
@@ -0,0 +1,103 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import "reflect-metadata";
+import { XWikiModelReferenceParser } from "../xWikiModelReferenceParser";
+import {
+  AttachmentReference,
+  DocumentReference,
+  EntityType,
+  SpaceReference,
+} from "@xwiki/cristal-model-api";
+import { describe, expect, test } from "vitest";
+import { mock } from "vitest-mock-extended";
+import { ref } from "vue";
+import type { DocumentService } from "@xwiki/cristal-document-api";
+import type { Ref } from "vue";
+
+describe("xWikiModelReferenceParser", () => {
+  const documentService = mock<DocumentService>({
+    getCurrentDocumentReference(): Ref<DocumentReference | undefined> {
+      return ref(
+        new DocumentReference(
+          "WebHome",
+          new SpaceReference(undefined, "TestSpace"),
+        ),
+      );
+    },
+  });
+
+  const parser = new XWikiModelReferenceParser(documentService);
+  const currentSpace = new SpaceReference(undefined, "TestSpace");
+  test.each([
+    ["WebHome", undefined, new DocumentReference("WebHome", currentSpace)],
+    [
+      "attach:TestSpace.png",
+      undefined,
+      new AttachmentReference(
+        "TestSpace.png",
+        new DocumentReference("WebHome", currentSpace),
+      ),
+    ],
+    [
+      "TestSpace.png",
+      EntityType.ATTACHMENT,
+      new AttachmentReference(
+        "TestSpace.png",
+        new DocumentReference(
+          "WebHome",
+          new SpaceReference(undefined, "TestSpace"),
+        ),
+      ),
+    ],
+    [
+      "TestSpace.TestSubSpace.WebHome@TestSubSpace.png",
+      EntityType.ATTACHMENT,
+      new AttachmentReference(
+        "TestSubSpace.png",
+        new DocumentReference(
+          "WebHome",
+          new SpaceReference(undefined, "TestSpace", "TestSubSpace"),
+        ),
+      ),
+    ],
+    [
+      "attach:TestSpace.TestSubSpace.WebHome@TestSubSpace.png",
+      undefined,
+      new AttachmentReference(
+        "TestSubSpace.png",
+        new DocumentReference(
+          "WebHome",
+          new SpaceReference(undefined, "TestSpace", "TestSubSpace"),
+        ),
+      ),
+    ],
+    [
+      "TestSpace.TestSubSpace.WebHome",
+      undefined,
+      new DocumentReference(
+        "WebHome",
+        new SpaceReference(undefined, "TestSpace", "TestSubSpace"),
+      ),
+    ],
+  ])("%s -> %s", (reference, type, expected) => {
+    expect(parser.parse(reference, type)).toEqual(expected);
+  });
+});
diff --git a/core/model/model-reference/model-reference-xwiki/src/__tests__/defaultLocalURLSerializer.test.ts b/core/model/model-reference/model-reference-xwiki/src/__tests__/xWikiModelReferenceSerializer.ts
similarity index 98%
rename from core/model/model-reference/model-reference-xwiki/src/__tests__/defaultLocalURLSerializer.test.ts
rename to core/model/model-reference/model-reference-xwiki/src/__tests__/xWikiModelReferenceSerializer.ts
index c5a1cd632..15a03fba1 100644
--- a/core/model/model-reference/model-reference-xwiki/src/__tests__/defaultLocalURLSerializer.test.ts
+++ b/core/model/model-reference/model-reference-xwiki/src/__tests__/xWikiModelReferenceSerializer.ts
@@ -27,7 +27,7 @@ import {
 } from "@xwiki/cristal-model-api";
 import { describe, expect, it } from "vitest";
 
-describe("defaultLocalURLSerializer", () => {
+describe("xWikiLocalURLSerializer", () => {
   const serializer = new XWikiModelReferenceSerializer();
   it("serialize a wiki", () => {
     expect(serializer.serialize(new WikiReference("wiki"))).to.eq("wiki");
diff --git a/core/model/model-reference/model-reference-xwiki/src/xWikiModelReferenceParser.ts b/core/model/model-reference/model-reference-xwiki/src/xWikiModelReferenceParser.ts
index 6b406f746..a6b492123 100644
--- a/core/model/model-reference/model-reference-xwiki/src/xWikiModelReferenceParser.ts
+++ b/core/model/model-reference/model-reference-xwiki/src/xWikiModelReferenceParser.ts
@@ -18,13 +18,64 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
-import { EntityReference } from "@xwiki/cristal-model-api";
+import {
+  AttachmentReference,
+  DocumentReference,
+  EntityReference,
+  EntityType,
+  SpaceReference,
+} from "@xwiki/cristal-model-api";
 import { ModelReferenceParser } from "@xwiki/cristal-model-reference-api";
-import { injectable } from "inversify";
+import { inject, injectable } from "inversify";
+
+import { isEqual } from "lodash";
+import type { DocumentService } from "@xwiki/cristal-document-api";
 
 @injectable()
 export class XWikiModelReferenceParser implements ModelReferenceParser {
-  parser(): EntityReference {
-    throw new Error("Method not implemented.");
+  constructor(
+    @inject<DocumentService>("DocumentService")
+    private readonly documentService: DocumentService,
+  ) {}
+
+  parse(reference: string, type?: EntityType): EntityReference {
+    const splits = reference.split(":");
+    const noWiki = splits[splits.length - 1];
+    if (
+      noWiki.includes("@") ||
+      splits.includes("attach") ||
+      type == EntityType.ATTACHMENT
+    ) {
+      const strings = noWiki.split("@");
+      if (strings.length == 1) {
+        const doc = this.getCurrentDocumentReference();
+        return new AttachmentReference(strings[0], doc);
+      } else {
+        const doc = this.parseDocumentReference(strings[0]);
+        return new AttachmentReference(strings[1], doc);
+      }
+    } else {
+      return this.parseDocumentReference(noWiki);
+    }
+  }
+
+  private parseDocumentReference(noWiki: string) {
+    const segments = noWiki.split(".");
+    if (isEqual(segments, ["WebHome"])) {
+      const currentDocumentReference = this.getCurrentDocumentReference();
+      return new DocumentReference(segments[0], currentDocumentReference.space);
+    } else {
+      return new DocumentReference(
+        segments[segments.length - 1],
+        new SpaceReference(
+          undefined,
+          ...segments.slice(0, segments.length - 1),
+        ),
+      );
+    }
+  }
+
+  private getCurrentDocumentReference() {
+    return this.documentService.getCurrentDocumentReference().value!;
   }
 }
diff --git a/core/model/model-reference/model-reference-xwiki/src/xWikiModelReferenceSerializer.ts b/core/model/model-reference/model-reference-xwiki/src/xWikiModelReferenceSerializer.ts
index 1f5c82e67..fd13613e3 100644
--- a/core/model/model-reference/model-reference-xwiki/src/xWikiModelReferenceSerializer.ts
+++ b/core/model/model-reference/model-reference-xwiki/src/xWikiModelReferenceSerializer.ts
@@ -73,7 +73,7 @@ export class XWikiModelReferenceSerializer implements ModelReferenceSerializer {
         const attachmentReference = reference as AttachmentReference;
         const document = this.serialize(attachmentReference.document);
         const name = attachmentReference.name;
-        return `${document}@${name}`;
+        return `attach:${document}@${name}`;
       }
       default:
         throw new Error(`Unknown reference type [${type}]`);
diff --git a/core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-default/src/filesystemRemoteURLSerializer.ts b/core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-default/src/filesystemRemoteURLSerializer.ts
index abd522c59..8626e3bad 100644
--- a/core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-default/src/filesystemRemoteURLSerializer.ts
+++ b/core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-default/src/filesystemRemoteURLSerializer.ts
@@ -18,13 +18,39 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
+import {
+  AttachmentReference,
+  DocumentReference,
+  EntityReference,
+  EntityType,
+} from "@xwiki/cristal-model-api";
 import { RemoteURLSerializer } from "@xwiki/cristal-model-remote-url-api";
+import { protocol } from "@xwiki/cristal-model-remote-url-filesystem-api";
 import { injectable } from "inversify";
 
 @injectable()
 class FileSystemRemoteURLSerializer implements RemoteURLSerializer {
-  serialize(): string | undefined {
-    throw new Error("to be implemented ");
+  serialize(reference?: EntityReference): string | undefined {
+    if (!reference) {
+      return undefined;
+    }
+    switch (reference.type) {
+      case EntityType.WIKI:
+        throw new Error("Not implemented");
+      case EntityType.SPACE:
+        throw new Error("Not implemented");
+      case EntityType.DOCUMENT: {
+        const documentReference = reference as DocumentReference;
+        const spaces = documentReference.space?.names.join("/");
+        return `${protocol}://${spaces}/${documentReference.name}`;
+      }
+      case EntityType.ATTACHMENT: {
+        const attachmentReference = reference as AttachmentReference;
+        const documentReference = attachmentReference.document;
+        const spaces = documentReference.space?.names.map(encodeURI).join("/");
+        return `${protocol}://${spaces}/${documentReference.name}/attachments/${attachmentReference.name}`;
+      }
+    }
   }
 }
 
diff --git a/core/model/model-remote-url/model-remote-url-nextcloud/package.json b/core/model/model-remote-url/model-remote-url-nextcloud/package.json
index 2b252a958..14f1e2463 100644
--- a/core/model/model-remote-url/model-remote-url-nextcloud/package.json
+++ b/core/model/model-remote-url/model-remote-url-nextcloud/package.json
@@ -23,6 +23,8 @@
     "lint": "eslint \"./src/**/*.{ts,tsx,vue}\" --max-warnings=0"
   },
   "dependencies": {
+    "@xwiki/cristal-api": "workspace:*",
+    "@xwiki/cristal-authentication-nextcloud": "workspace:*",
     "@xwiki/cristal-model-api": "workspace:*",
     "@xwiki/cristal-model-remote-url-api": "workspace:*",
     "inversify": "6.2.0"
diff --git a/core/model/model-remote-url/model-remote-url-nextcloud/src/nextcloudRemoteURLParser.ts b/core/model/model-remote-url/model-remote-url-nextcloud/src/nextcloudRemoteURLParser.ts
index 5806f2d78..eca494615 100644
--- a/core/model/model-remote-url/model-remote-url-nextcloud/src/nextcloudRemoteURLParser.ts
+++ b/core/model/model-remote-url/model-remote-url-nextcloud/src/nextcloudRemoteURLParser.ts
@@ -18,6 +18,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
+import { USERNAME } from "@xwiki/cristal-authentication-nextcloud";
 import {
   AttachmentReference,
   DocumentReference,
@@ -25,22 +26,22 @@ import {
   SpaceReference,
 } from "@xwiki/cristal-model-api";
 import { RemoteURLParser } from "@xwiki/cristal-model-remote-url-api";
-import { injectable } from "inversify";
+import { inject, injectable } from "inversify";
+import type { CristalApp } from "@xwiki/cristal-api";
 
 @injectable()
 class NextcloudRemoteURLParser implements RemoteURLParser {
+  constructor(
+    @inject<CristalApp>("CristalApp") private readonly cristalApp: CristalApp,
+  ) {}
+
   parse(urlStr: string): EntityReference | undefined {
-    if (urlStr.includes("://")) {
+    const baseRestURL = this.getWikiConfig().baseRestURL;
+    if (urlStr.includes("://") && !urlStr.startsWith(baseRestURL)) {
       return undefined;
     }
-    let segments = decodeURIComponent(urlStr).split("/");
-    if (segments[0] === "" || segments[0] === ".") {
-      segments = segments.slice(1);
-    }
-
-    if (segments[segments.length - 1] === "") {
-      segments = segments.slice(0, segments.length - 1);
-    }
+    urlStr = urlStr.replace(`${baseRestURL}/${USERNAME}/.cristal/`, "");
+    const segments = this.computeSegments(urlStr);
 
     if (
       segments.length >= 3 &&
@@ -48,24 +49,44 @@ class NextcloudRemoteURLParser implements RemoteURLParser {
     ) {
       return new AttachmentReference(
         segments[segments.length - 1],
-        new DocumentReference(
+        this.buildDocumentReference(
           segments[segments.length - 3],
-          new SpaceReference(
-            undefined,
-            ...segments.splice(0, segments.length - 3),
-          ),
+          segments.splice(0, segments.length - 3),
         ),
       );
     } else {
-      return new DocumentReference(
+      return this.buildDocumentReference(
         segments[segments.length - 1],
-        new SpaceReference(
-          undefined,
-          ...segments.splice(0, segments.length - 1),
-        ),
+        segments.splice(0, segments.length - 1),
       );
     }
   }
+
+  private computeSegments(urlStr: string) {
+    let segments = decodeURIComponent(urlStr).split("/");
+    if (segments[0] === "" || segments[0] === ".") {
+      segments = segments.slice(1);
+    }
+
+    if (segments[segments.length - 1] === "") {
+      segments = segments.slice(0, segments.length - 1);
+    }
+    return segments;
+  }
+
+  private buildDocumentReference(
+    documentReferenceName: string,
+    spaces: string[],
+  ) {
+    return new DocumentReference(
+      documentReferenceName,
+      new SpaceReference(undefined, ...spaces),
+    );
+  }
+
+  private getWikiConfig() {
+    return this.cristalApp.getWikiConfig();
+  }
 }
 
 export { NextcloudRemoteURLParser };
diff --git a/core/model/model-remote-url/model-remote-url-nextcloud/src/nextcloudRemoteURLSerializer.ts b/core/model/model-remote-url/model-remote-url-nextcloud/src/nextcloudRemoteURLSerializer.ts
index 9238a6816..a35fc353c 100644
--- a/core/model/model-remote-url/model-remote-url-nextcloud/src/nextcloudRemoteURLSerializer.ts
+++ b/core/model/model-remote-url/model-remote-url-nextcloud/src/nextcloudRemoteURLSerializer.ts
@@ -18,13 +18,48 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
+import { USERNAME } from "@xwiki/cristal-authentication-nextcloud";
+import {
+  AttachmentReference,
+  DocumentReference,
+  EntityReference,
+  EntityType,
+} from "@xwiki/cristal-model-api";
 import { RemoteURLSerializer } from "@xwiki/cristal-model-remote-url-api";
-import { injectable } from "inversify";
+import { inject, injectable } from "inversify";
+import type { CristalApp } from "@xwiki/cristal-api";
 
 @injectable()
 class NextcloudRemoteURLSerializer implements RemoteURLSerializer {
-  serialize(): string | undefined {
-    throw new Error("to be implemented ");
+  constructor(
+    @inject<CristalApp>("CristalApp") private readonly cristalApp: CristalApp,
+  ) {}
+
+  serialize(reference?: EntityReference): string | undefined {
+    if (!reference) {
+      return undefined;
+    }
+    switch (reference.type) {
+      case EntityType.WIKI:
+        throw new Error("Not implemented");
+      case EntityType.SPACE:
+        throw new Error("Not implemented");
+      case EntityType.DOCUMENT: {
+        const documentReference = reference as DocumentReference;
+        const spaces = documentReference.space?.names.join("/");
+        return `${this.getBaseRestURL()}/${USERNAME}/.cristal/${spaces}/${documentReference.name}`;
+      }
+      case EntityType.ATTACHMENT: {
+        const attachmentReference = reference as AttachmentReference;
+        const documentReference = attachmentReference.document;
+        const spaces = documentReference.space?.names.map(encodeURI).join("/");
+        return `${this.getBaseRestURL()}/${USERNAME}/.cristal/${spaces}/${documentReference.name}/attachments/${attachmentReference.name}`;
+      }
+    }
+  }
+
+  private getBaseRestURL() {
+    return this.cristalApp.getWikiConfig().baseRestURL;
   }
 }
 
diff --git a/core/model/model-remote-url/model-remote-url-xwiki/src/xWikiRemoteURLSerializer.ts b/core/model/model-remote-url/model-remote-url-xwiki/src/xWikiRemoteURLSerializer.ts
index 94b6e4727..b6132c7d7 100644
--- a/core/model/model-remote-url/model-remote-url-xwiki/src/xWikiRemoteURLSerializer.ts
+++ b/core/model/model-remote-url/model-remote-url-xwiki/src/xWikiRemoteURLSerializer.ts
@@ -18,13 +18,59 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
+import {
+  AttachmentReference,
+  DocumentReference,
+  EntityReference,
+  EntityType,
+} from "@xwiki/cristal-model-api";
 import { RemoteURLSerializer } from "@xwiki/cristal-model-remote-url-api";
-import { injectable } from "inversify";
+import { inject, injectable } from "inversify";
+import type { CristalApp } from "@xwiki/cristal-api";
 
 @injectable()
 class XWikiRemoteURLSerializer implements RemoteURLSerializer {
-  serialize(): string | undefined {
-    throw new Error("to be implemented ");
+  constructor(
+    @inject<CristalApp>("CristalApp") private readonly cristalApp: CristalApp,
+  ) {}
+
+  serialize(reference?: EntityReference): string | undefined {
+    if (!reference) {
+      return undefined;
+    }
+    switch (reference.type) {
+      case EntityType.WIKI:
+        throw new Error("Not implemented");
+      case EntityType.SPACE:
+        throw new Error("Not implemented");
+      case EntityType.DOCUMENT: {
+        return this.serializeDocument(reference);
+      }
+      case EntityType.ATTACHMENT: {
+        return this.serializeAttachment(reference);
+      }
+    }
+  }
+
+  private serializeAttachment(reference: EntityReference) {
+    const baseURL = this.cristalApp.getWikiConfig().baseURL;
+    const attachmentReference = reference as AttachmentReference;
+    const documentReference = attachmentReference.document;
+    const spaces = documentReference.space?.names.map(encodeURI).join("/");
+    return `${baseURL}/bin/download/${spaces}/${encodeURI(documentReference.name)}/${encodeURI(
+      attachmentReference.name,
+    )}`;
+  }
+
+  private serializeDocument(reference: EntityReference) {
+    const baseURL = this.cristalApp.getWikiConfig().baseURL;
+    const documentReference = reference as DocumentReference;
+    const spaces = documentReference.space?.names.map(encodeURI).join("/");
+    if (documentReference.name == "WebHome") {
+      return `${baseURL}/bin/view/${spaces}/`;
+    } else {
+      return `${baseURL}/bin/view/${spaces}/${encodeURI(documentReference.name)}`;
+    }
   }
 }
 
diff --git a/core/navigation-tree/navigation-tree-nextcloud/package.json b/core/navigation-tree/navigation-tree-nextcloud/package.json
index c6f1e4c04..5a907e64b 100644
--- a/core/navigation-tree/navigation-tree-nextcloud/package.json
+++ b/core/navigation-tree/navigation-tree-nextcloud/package.json
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "@xwiki/cristal-api": "workspace:*",
+    "@xwiki/cristal-authentication-nextcloud": "workspace:*",
     "@xwiki/cristal-model-api": "workspace:*",
     "@xwiki/cristal-navigation-tree-api": "workspace:*",
     "@xwiki/cristal-navigation-tree-default": "workspace:*",
diff --git a/core/navigation-tree/navigation-tree-nextcloud/src/components/componentsInit.ts b/core/navigation-tree/navigation-tree-nextcloud/src/components/componentsInit.ts
index 67e0ca7e0..f60e0850d 100644
--- a/core/navigation-tree/navigation-tree-nextcloud/src/components/componentsInit.ts
+++ b/core/navigation-tree/navigation-tree-nextcloud/src/components/componentsInit.ts
@@ -18,6 +18,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
+import { PASSWORD, USERNAME } from "@xwiki/cristal-authentication-nextcloud";
 import { SpaceReference } from "@xwiki/cristal-model-api";
 import { name as NavigationTreeSourceName } from "@xwiki/cristal-navigation-tree-api";
 import { getParentNodesIdFromPath } from "@xwiki/cristal-navigation-tree-default";
@@ -28,10 +29,6 @@ import type {
   NavigationTreeSource,
 } from "@xwiki/cristal-navigation-tree-api";
 
-// TODO: To be replaced by an actual authentication with CRISTAL-267
-const USERNAME = "test";
-const PASSWORD = "test";
-
 /**
  * Implementation of NavigationTreeSource for the Nextcloud backend.
  *
diff --git a/core/tiptap-extensions/tiptap-extension-image/package.json b/core/tiptap-extensions/tiptap-extension-image/package.json
new file mode 100644
index 000000000..a2c7b808a
--- /dev/null
+++ b/core/tiptap-extensions/tiptap-extension-image/package.json
@@ -0,0 +1,63 @@
+{
+  "name": "@xwiki/cristal-tiptap-extension-image",
+  "version": "0.12.0",
+  "license": "LGPL 2.1",
+  "author": "XWiki Org Community <contact@xwiki.org>",
+  "homepage": "https://cristal.xwiki.org/",
+  "repository": {
+    "type": "git",
+    "directory": "/core/tiptap-extension/tiptap-extension-image",
+    "url": "https://github.com/xwiki-contrib/cristal/"
+  },
+  "bugs": {
+    "url": "https://jira.xwiki.org/projects/CRISTAL/"
+  },
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "main": "./src/index.ts",
+  "scripts": {
+    "build": "vue-tsc --project tsconfig.json && vite build",
+    "lint": "eslint \"./src/**/*.{ts,tsx}\" --max-warnings=0"
+  },
+  "dependencies": {
+    "@tiptap/extension-image": "2.10.3",
+    "@tiptap/pm": "2.10.3",
+    "@tiptap/vue-3": "2.10.3",
+    "@xwiki/cristal-api": "workspace:*",
+    "@xwiki/cristal-attachments-api": "workspace:*",
+    "@xwiki/cristal-document-api": "workspace:*",
+    "@xwiki/cristal-link-suggest-api": "workspace:*",
+    "@xwiki/cristal-model-api": "workspace:*",
+    "@xwiki/cristal-model-reference-api": "workspace:*",
+    "@xwiki/cristal-model-remote-url-api": "workspace:*",
+    "@xwiki/cristal-tiptap-link-suggest-ui": "workspace:*",
+    "lodash": "4.17.21",
+    "prosemirror-markdown": "1.13.1",
+    "vue-tippy": "6.5.0",
+    "vue3-draggable-resizable": "1.6.5"
+  },
+  "peerDependencies": {
+    "@tiptap/core": "2.10.3",
+    "reflect-metadata": "0.2.2",
+    "vue": "3.5.13"
+  },
+  "devDependencies": {
+    "@tiptap/core": "2.10.3",
+    "@types/lodash": "4.17.13",
+    "vue": "3.5.13",
+    "vue-tsc": "2.1.10"
+  },
+  "publishConfig": {
+    "exports": {
+      ".": {
+        "import": "./dist/index.es.js",
+        "require": "./dist/index.umd.js",
+        "types": "./dist/index.d.ts"
+      }
+    },
+    "main": "./dist/index.es.js",
+    "types": "./dist/index.d.ts"
+  }
+}
diff --git a/core/tiptap-extensions/tiptap-extension-image/src/CristalTiptapImage.ts b/core/tiptap-extensions/tiptap-extension-image/src/CristalTiptapImage.ts
new file mode 100644
index 000000000..0ca4117f0
--- /dev/null
+++ b/core/tiptap-extensions/tiptap-extension-image/src/CristalTiptapImage.ts
@@ -0,0 +1,99 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+import ImageView from "./vue/ImageView.vue";
+import Image from "@tiptap/extension-image";
+import { VueNodeViewRenderer } from "@tiptap/vue-3";
+import { EntityReference } from "@xwiki/cristal-model-api";
+import { ModelReferenceSerializer } from "@xwiki/cristal-model-reference-api";
+import { RemoteURLParser } from "@xwiki/cristal-model-remote-url-api";
+import type { Node } from "@tiptap/pm/model";
+import type { MarkdownSerializerState } from "prosemirror-markdown";
+
+function serializeExternal(node: Node, state: MarkdownSerializerState) {
+  state.write("![");
+  if (node.attrs.alt) {
+    state.write(node.attrs.alt);
+  }
+  state.write("](");
+  state.write(node.attrs.src);
+  state.write(")");
+  state.closeBlock(node);
+}
+
+/**
+ * We need to override the default image view to be able to easily add widgets (i.e., visual elements that are not
+ * part of the persisted DOM) using Vue.
+ */
+const initTiptapImage = function (
+  serializer: ModelReferenceSerializer,
+  parser: RemoteURLParser,
+) {
+  function parseLink(mark: Node): EntityReference | undefined {
+    try {
+      return parser.parse(mark.attrs.src as string);
+    } catch {
+      return undefined;
+    }
+  }
+
+  function serializeInternal(
+    node: Node,
+    state: MarkdownSerializerState,
+    entityRefence: EntityReference,
+  ) {
+    state.write("![[");
+    if (node.attrs.alt) {
+      state.write(node.attrs.alt);
+      state.write("|");
+    }
+    state.write(serializer.serialize(entityRefence)!);
+    state.write("]]");
+    state.closeBlock(node);
+  }
+
+  return Image.extend({
+    addAttributes() {
+      return {
+        ...this.parent?.(),
+        width: undefined,
+        height: undefined,
+      };
+    },
+    addNodeView() {
+      return VueNodeViewRenderer(ImageView);
+    },
+    addStorage() {
+      return {
+        markdown: {
+          serialize(state: MarkdownSerializerState, node: Node) {
+            const entityReference = parseLink(node);
+            if (entityReference) {
+              serializeInternal(node, state, entityReference);
+            } else {
+              serializeExternal(node, state);
+            }
+          },
+        },
+      };
+    },
+  });
+};
+
+export { initTiptapImage };
diff --git a/core/tiptap-extensions/tiptap-extension-image/src/ImageInsert.ts b/core/tiptap-extensions/tiptap-extension-image/src/ImageInsert.ts
new file mode 100644
index 000000000..41008c41a
--- /dev/null
+++ b/core/tiptap-extensions/tiptap-extension-image/src/ImageInsert.ts
@@ -0,0 +1,29 @@
+import ImageInsertView from "./vue/ImageInsertView.vue";
+import { Node, mergeAttributes } from "@tiptap/core";
+import { VueNodeViewRenderer } from "@tiptap/vue-3";
+
+const ImageInsertNode = Node.create({
+  name: "imageInsert",
+  group: "block",
+  parseHTML() {
+    return [{ tag: "image-insert-components" }];
+  },
+  renderHTML({ HTMLAttributes }) {
+    return ["image-insert-components", mergeAttributes(HTMLAttributes)];
+  },
+  addNodeView() {
+    return VueNodeViewRenderer(ImageInsertView);
+  },
+  addStorage() {
+    return {
+      markdown: {
+        serialize: () => {
+          // This element is only a temporary placeholder to pick and image, it is not ment to part of the persisted
+          // syntax.
+        },
+      },
+    };
+  },
+});
+
+export { ImageInsertNode };
diff --git a/core/tiptap-extensions/tiptap-extension-image/src/index.ts b/core/tiptap-extensions/tiptap-extension-image/src/index.ts
new file mode 100644
index 000000000..9e74ad4c7
--- /dev/null
+++ b/core/tiptap-extensions/tiptap-extension-image/src/index.ts
@@ -0,0 +1,24 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import { initTiptapImage } from "./CristalTiptapImage";
+import { ImageInsertNode } from "./ImageInsert";
+
+export { ImageInsertNode, initTiptapImage };
diff --git a/core/tiptap-extensions/tiptap-extension-image/src/vue/ImageInsertView.vue b/core/tiptap-extensions/tiptap-extension-image/src/vue/ImageInsertView.vue
new file mode 100644
index 000000000..f72dc6724
--- /dev/null
+++ b/core/tiptap-extensions/tiptap-extension-image/src/vue/ImageInsertView.vue
@@ -0,0 +1,269 @@
+<script setup lang="ts">
+import { NodeViewWrapper } from "@tiptap/vue-3";
+import { CristalApp } from "@xwiki/cristal-api";
+import { AttachmentsService } from "@xwiki/cristal-attachments-api";
+import { DocumentService } from "@xwiki/cristal-document-api";
+import {
+  Link,
+  LinkSuggestServiceProvider,
+  LinkType,
+} from "@xwiki/cristal-link-suggest-api";
+import {
+  AttachmentReference,
+  DocumentReference,
+} from "@xwiki/cristal-model-api";
+import { ModelReferenceParserProvider } from "@xwiki/cristal-model-reference-api";
+import { RemoteURLSerializerProvider } from "@xwiki/cristal-model-remote-url-api";
+import { LinkSuggestItem } from "@xwiki/cristal-tiptap-link-suggest-ui";
+import { debounce } from "lodash";
+import { Ref, inject, ref, useTemplateRef, watch } from "vue";
+import { Tippy } from "vue-tippy";
+import type { NodeViewProps } from "@tiptap/vue-3";
+import "@tiptap/extension-image";
+
+const cristal = inject<CristalApp>("cristal")!;
+const attachmentsService = cristal
+  .getContainer()
+  .get<AttachmentsService>("AttachmentsService");
+const modelReferenceParser = cristal
+  .getContainer()
+  .get<ModelReferenceParserProvider>("ModelReferenceParserProvider")
+  .get();
+const remoteURLSerializer = cristal
+  .getContainer()
+  .get<RemoteURLSerializerProvider>("RemoteURLSerializerProvider")
+  .get();
+const documentService = cristal
+  .getContainer()
+  .get<DocumentService>("DocumentService")!;
+
+const loading = attachmentsService.isLoading();
+
+const imageNameQueryInput = useTemplateRef<HTMLInputElement>(
+  "imageNameQueryInput",
+);
+
+const fileUpload = useTemplateRef<HTMLInputElement>("fileUpload");
+const newImage = useTemplateRef<HTMLElement>("newImage");
+
+const { editor, getPos } = defineProps<NodeViewProps>();
+
+function insertImage(src: string) {
+  // Replace the current placeholder with the selected image
+  editor
+    .chain()
+    .setNodeSelection(getPos())
+    .command(({ commands }) => {
+      const nodes = editor.state.schema.nodes;
+      const type = nodes.paragraph;
+      commands.insertContent({
+        type: type.name,
+        content: [
+          {
+            type: nodes.image.name,
+            attrs: { src },
+          },
+        ],
+      });
+      return true;
+    })
+    .run();
+}
+
+const imageNameQuery = defineModel<string>("imageNameQuery");
+
+const links: Ref<Link[]> = ref([]);
+const linksSearchError: Ref<string | undefined> = ref(undefined);
+const linksSearchLoading: Ref<boolean> = ref(false);
+
+const linkSuggestServiceProvider = cristal
+  .getContainer()
+  .get<LinkSuggestServiceProvider>("LinkSuggestServiceProvider");
+const linkSuggestService = linkSuggestServiceProvider.get()!;
+
+async function searchAttachments(query: string) {
+  if (linkSuggestService) {
+    links.value = await linkSuggestService.getLinks(
+      query,
+      LinkType.ATTACHMENT,
+      "image/*",
+    );
+  }
+}
+
+watch(
+  imageNameQuery,
+  debounce(async () => {
+    if (imageNameQuery.value && imageNameQuery.value.length) {
+      const query = imageNameQuery.value;
+      await searchAttachments(query);
+    }
+  }, 500),
+);
+// Start a first empty search on the first load, to not let the content empty.
+searchAttachments("");
+
+function insertTextAsLink() {
+  if (imageNameQuery.value) {
+    insertImage(imageNameQuery.value);
+  }
+}
+
+function convertLink(link: Link) {
+  const attachmentReference = modelReferenceParser?.parse(
+    link.reference,
+  ) as AttachmentReference;
+  const documentReference = attachmentReference.document;
+  const segments = documentReference.space?.names.slice(0) ?? [];
+  // TODO: replace with an actual construction of segments from a reference
+  if (documentReference.terminal) {
+    segments.push(documentReference.name);
+  }
+  return {
+    type: link.type,
+    title: link.label,
+    segments,
+    imageURL: remoteURLSerializer?.serialize(attachmentReference),
+  };
+}
+
+function triggerUpload() {
+  fileUpload.value?.click();
+}
+
+function getCurrentPageName() {
+  return documentService.getCurrentDocumentReferenceString().value ?? "";
+}
+
+async function fileSelected() {
+  const files = fileUpload.value?.files;
+  if (files && files.length > 0) {
+    const fileItem = files.item(0)!;
+    const currentPageName = getCurrentPageName();
+    await attachmentsService.upload(currentPageName, [fileItem]);
+
+    const parser = modelReferenceParser?.parse(currentPageName);
+
+    const src = remoteURLSerializer?.serialize(
+      new AttachmentReference(fileItem.name, parser as DocumentReference),
+    );
+    if (src) {
+      insertImage(src);
+    }
+  }
+}
+</script>
+
+<template>
+  <node-view-wrapper>
+    <tippy
+      :interactive="true"
+      :show-on-create="true"
+      :allow-h-t-m-l="true"
+      :hide-on-click="false"
+      :delay="500"
+    >
+      <template #default>
+        <div ref="newImage" class="image-insert-view">
+          Upload or select and attachment.
+        </div>
+      </template>
+
+      <template #content>
+        <div class="image-insert-view-content no-drag-handle">
+          <div v-if="loading">Loading...</div>
+          <ul v-else>
+            <li class="item">
+              <x-btn @click="triggerUpload">Upload</x-btn>
+              <input
+                v-show="false"
+                ref="fileUpload"
+                type="file"
+                accept="image/*"
+                @change="fileSelected"
+              />
+            </li>
+            <li class="item">
+              <input
+                ref="imageNameQueryInput"
+                v-model="imageNameQuery"
+                type="text"
+                placeholder="Image name or image URL"
+                @keydown.enter="insertTextAsLink"
+              />
+            </li>
+            <li v-if="linksSearchLoading" class="item">Loading...</li>
+            <li v-else-if="linksSearchError" class="item">
+              {{ linksSearchError }}
+            </li>
+            <li v-else-if="links.length == 0 && imageNameQuery" class="item">
+              {{ links }}
+            </li>
+            <template v-else>
+              <!-- factorize with c-tiptap-link-suggest -->
+              <li
+                v-for="link in links"
+                :key="link.id"
+                :class="['item', 'selectable-item']"
+                @keydown.enter="insertImage(link.url)"
+                @click="insertImage(link.url)"
+              >
+                <link-suggest-item
+                  :link="convertLink(link)"
+                ></link-suggest-item>
+              </li>
+            </template>
+          </ul>
+        </div>
+      </template>
+    </tippy>
+  </node-view-wrapper>
+</template>
+
+<style scoped>
+.image-insert-view {
+  background-color: var(--cr-color-neutral-100);
+  border-radius: var(--cr-border-radius-large);
+  border: solid var(--sl-input-border-width) var(--sl-input-border-color);
+  padding: var(--cr-spacing-x-small) var(--cr-spacing-x-small);
+}
+
+.image-insert-view-content {
+  padding: 0;
+  position: relative;
+  border-radius: var(--cr-tooltip-border-radius);
+  background: white;
+  overflow: hidden auto;
+  box-shadow:
+    0 0 0 1px rgba(0, 0, 0, 0.1),
+    0 10px 20px rgba(0, 0, 0, 0.1);
+  max-height: 300px;
+  width: 300px;
+}
+
+.image-insert-view-content input {
+  width: 100%;
+}
+
+.image-insert-view-content ul {
+  list-style: none;
+}
+
+.image-insert-view-content .item {
+  display: block;
+  background: transparent;
+  border: none;
+  padding: var(--cr-spacing-x-small);
+  width: 100%;
+  text-align: start;
+}
+
+.image-insert-view-content .selectable-item:hover {
+  background-color: white;
+}
+
+.image-insert-view-content .selectable-item:hover {
+  background-color: var(--cr-color-neutral-200);
+  cursor: pointer;
+}
+</style>
diff --git a/core/tiptap-extensions/tiptap-extension-image/src/vue/ImageView.vue b/core/tiptap-extensions/tiptap-extension-image/src/vue/ImageView.vue
new file mode 100644
index 000000000..14f3f78d2
--- /dev/null
+++ b/core/tiptap-extensions/tiptap-extension-image/src/vue/ImageView.vue
@@ -0,0 +1,148 @@
+<script setup lang="ts">
+import { NodeViewWrapper } from "@tiptap/vue-3";
+import { Ref, computed, ref } from "vue";
+import Vue3DraggableResizable from "vue3-draggable-resizable";
+import type { NodeViewProps } from "@tiptap/vue-3";
+
+const { node, updateAttributes } = defineProps<NodeViewProps>();
+
+const src = computed(() => {
+  return node.attrs.src;
+});
+
+const alt = computed(() => {
+  return node.attrs.alt;
+});
+
+type ImageDimensions = { width: number; height: number };
+
+async function computeImageSize(src: string): Promise<ImageDimensions> {
+  const img = new Image();
+
+  let resolve;
+  let reject;
+
+  const p: Promise<ImageDimensions> = new Promise((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+
+  img.onload = () => {
+    resolve!({ width: img.width, height: img.height });
+  };
+
+  img.onerror = () => {
+    reject!();
+  };
+
+  img.src = src;
+
+  return p;
+}
+
+const loading: Ref<boolean> = ref(true);
+const imageLoadingError: Ref<string | undefined> = ref(undefined);
+const originalImageDimensions: Ref<ImageDimensions | undefined> =
+  ref(undefined);
+const hasChanged = ref(false);
+
+computeImageSize(node.attrs.src)
+  .then((dimensions) => {
+    originalImageDimensions.value = recompute(dimensions);
+  })
+  .catch(() => {})
+  .finally(() => (loading.value = false));
+
+const w = computed({
+  get() {
+    return node.attrs.width ?? originalImageDimensions.value?.width;
+  },
+  set(value) {
+    updateAttributes({
+      width: value,
+    });
+  },
+});
+const h = computed({
+  get() {
+    return node.attrs.height ?? originalImageDimensions.value?.height;
+  },
+  set(value) {
+    updateAttributes({
+      height: value,
+    });
+  },
+});
+
+const isActive = defineModel<boolean>("isActive", { default: false });
+
+function setActive() {
+  isActive.value = true;
+}
+
+const computedStyle = computed(() => {
+  if (!hasChanged.value) {
+    return {
+      width: `${originalImageDimensions.value?.width}px`,
+      height: `${originalImageDimensions.value?.height}px`,
+    };
+  } else {
+    return {};
+  }
+});
+
+function recompute({ width, height }: ImageDimensions) {
+  const maxWidth = 960;
+
+  if (width > maxWidth) {
+    const ratio = width / maxWidth;
+    width = maxWidth;
+    height = height / ratio;
+  }
+  return { width, height };
+}
+
+function onResize({ w: wp, h: hp }: { w: number; h: number }) {
+  const { width, height } = recompute({ width: wp, height: hp });
+  w.value = width;
+  h.value = height;
+  hasChanged.value = true;
+}
+</script>
+<template>
+  <node-view-wrapper @click="setActive">
+    <div v-if="loading">Loading...</div>
+    <div v-else-if="imageLoadingError !== undefined">
+      {{ imageLoadingError }}
+    </div>
+    <div v-else class="image-container" :style="computedStyle">
+      <!-- Resizing is currently deactivated as no backend supportit -->
+      <vue3-draggable-resizable
+        v-model:active="isActive"
+        :parent="true"
+        :draggable="false"
+        :resizable="false"
+        :h="h"
+        :w="w"
+        :handles="['br']"
+        :lock-aspect-ratio="true"
+        @resize-end="onResize"
+      >
+        <img :src="src" :alt="alt" class="img" />
+      </vue3-draggable-resizable>
+    </div>
+  </node-view-wrapper>
+</template>
+
+<style scoped>
+.img {
+  width: 100%;
+  height: 100%;
+}
+
+.image-container,
+.image-container > div {
+  position: relative;
+  display: block;
+}
+</style>
diff --git a/core/tiptap-extensions/tiptap-extension-image/tsconfig.json b/core/tiptap-extensions/tiptap-extension-image/tsconfig.json
new file mode 100644
index 000000000..0d24a110c
--- /dev/null
+++ b/core/tiptap-extensions/tiptap-extension-image/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "resolveJsonModule": true,
+    "isolatedDeclarations": false
+  },
+  "extends": "../../../tsconfig.json",
+  "include": [
+    "./src/index.ts",
+    "./src/**/*"
+  ]
+}
diff --git a/core/tiptap-extensions/tiptap-extension-image/vite.config.ts b/core/tiptap-extensions/tiptap-extension-image/vite.config.ts
new file mode 100644
index 000000000..5cea1fd60
--- /dev/null
+++ b/core/tiptap-extensions/tiptap-extension-image/vite.config.ts
@@ -0,0 +1,23 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import { generateConfigVue } from "../../../vite.config";
+
+export default generateConfigVue(import.meta.url);
diff --git a/core/tiptap-extensions/tiptap-link-suggest-ui/package.json b/core/tiptap-extensions/tiptap-link-suggest-ui/package.json
new file mode 100644
index 000000000..0093b1222
--- /dev/null
+++ b/core/tiptap-extensions/tiptap-link-suggest-ui/package.json
@@ -0,0 +1,48 @@
+{
+  "name": "@xwiki/cristal-tiptap-link-suggest-ui",
+  "version": "0.12.0",
+  "license": "LGPL 2.1",
+  "author": "XWiki Org Community <contact@xwiki.org>",
+  "homepage": "https://cristal.xwiki.org/",
+  "repository": {
+    "type": "git",
+    "directory": "/core/tiptap-extension/tiptap-extension-image",
+    "url": "https://github.com/xwiki-contrib/cristal/"
+  },
+  "bugs": {
+    "url": "https://jira.xwiki.org/projects/CRISTAL/"
+  },
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "main": "./src/index.ts",
+  "scripts": {
+    "build": "vue-tsc --project tsconfig.json && vite build",
+    "lint": "eslint \"./src/**/*.{ts,tsx}\" --max-warnings=0"
+  },
+  "dependencies": {
+    "@xwiki/cristal-icons": "workspace:*",
+    "@xwiki/cristal-link-suggest-api": "workspace:*"
+  },
+  "peerDependencies": {
+    "@tiptap/core": "2.10.3",
+    "reflect-metadata": "0.2.2",
+    "vue": "3.5.13"
+  },
+  "devDependencies": {
+    "vue": "3.5.13",
+    "vue-tsc": "2.1.10"
+  },
+  "publishConfig": {
+    "exports": {
+      ".": {
+        "import": "./dist/index.es.js",
+        "require": "./dist/index.umd.js",
+        "types": "./dist/index.d.ts"
+      }
+    },
+    "main": "./dist/index.es.js",
+    "types": "./dist/index.d.ts"
+  }
+}
diff --git a/core/tiptap-extensions/tiptap-link-suggest-ui/src/index.ts b/core/tiptap-extensions/tiptap-link-suggest-ui/src/index.ts
new file mode 100644
index 000000000..d75813e2d
--- /dev/null
+++ b/core/tiptap-extensions/tiptap-link-suggest-ui/src/index.ts
@@ -0,0 +1,22 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+import LinkSuggestItem from "./vue/LinkSuggestItem.vue";
+
+export { LinkSuggestItem };
diff --git a/core/tiptap-extensions/tiptap-link-suggest-ui/src/vue/LinkSuggestItem.vue b/core/tiptap-extensions/tiptap-link-suggest-ui/src/vue/LinkSuggestItem.vue
new file mode 100644
index 000000000..920b13e67
--- /dev/null
+++ b/core/tiptap-extensions/tiptap-link-suggest-ui/src/vue/LinkSuggestItem.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { CIcon, Size } from "@xwiki/cristal-icons";
+import { LinkType } from "@xwiki/cristal-link-suggest-api";
+defineProps<{
+  link: {
+    type: LinkType;
+    title: string;
+    segments: string[];
+    imageURL?: string;
+  };
+}>();
+</script>
+
+<template>
+  <c-icon
+    class="icon-type"
+    :size="Size.Small"
+    :name="link.type == LinkType.PAGE ? 'file-earmark' : 'paperclip'"
+  />
+  <img v-if="link.imageURL" :src="link.imageURL" alt="" />
+  {{ link.title }}
+  <XBreadcrumb
+    :items="
+      link.segments.map((segment) => {
+        return { label: segment };
+      })
+    "
+  ></XBreadcrumb>
+</template>
+
+<style scoped>
+img {
+  float: left;
+  max-width: 4em;
+  max-height: 4em;
+}
+</style>
diff --git a/core/tiptap-extensions/tiptap-link-suggest-ui/tsconfig.json b/core/tiptap-extensions/tiptap-link-suggest-ui/tsconfig.json
new file mode 100644
index 000000000..0d24a110c
--- /dev/null
+++ b/core/tiptap-extensions/tiptap-link-suggest-ui/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "resolveJsonModule": true,
+    "isolatedDeclarations": false
+  },
+  "extends": "../../../tsconfig.json",
+  "include": [
+    "./src/index.ts",
+    "./src/**/*"
+  ]
+}
diff --git a/core/tiptap-extensions/tiptap-link-suggest-ui/vite.config.ts b/core/tiptap-extensions/tiptap-link-suggest-ui/vite.config.ts
new file mode 100644
index 000000000..5cea1fd60
--- /dev/null
+++ b/core/tiptap-extensions/tiptap-link-suggest-ui/vite.config.ts
@@ -0,0 +1,23 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import { generateConfigVue } from "../../../vite.config";
+
+export default generateConfigVue(import.meta.url);
diff --git a/editors/tiptap/package.json b/editors/tiptap/package.json
index 44f92c70f..77fc6d8ab 100644
--- a/editors/tiptap/package.json
+++ b/editors/tiptap/package.json
@@ -32,7 +32,6 @@
     "@tiptap/extension-collaboration": "2.10.3",
     "@tiptap/extension-collaboration-cursor": "2.10.3",
     "@tiptap/extension-heading": "2.10.3",
-    "@tiptap/extension-image": "2.10.3",
     "@tiptap/extension-link": "2.10.3",
     "@tiptap/extension-placeholder": "2.10.3",
     "@tiptap/extension-table": "2.10.3",
@@ -48,8 +47,13 @@
     "@xwiki/cristal-document-api": "workspace:*",
     "@xwiki/cristal-icons": "workspace:*",
     "@xwiki/cristal-link-suggest-api": "workspace:*",
+    "@xwiki/cristal-markdown-default": "workspace:*",
+    "@xwiki/cristal-model-api": "workspace:*",
     "@xwiki/cristal-model-reference-api": "workspace:*",
+    "@xwiki/cristal-model-remote-url-api": "workspace:*",
     "@xwiki/cristal-skin": "workspace:*",
+    "@xwiki/cristal-tiptap-extension-image": "workspace:*",
+    "@xwiki/cristal-tiptap-link-suggest-ui": "workspace:*",
     "avvvatars-vue": "1.1.0",
     "eventemitter3": "5.0.1",
     "inversify": "6.2.0",
@@ -61,7 +65,6 @@
     "tiptap-markdown": "0.8.10",
     "utility-types": "3.11.0",
     "vue": "3.5.13",
-    "vue-router": "4.5.0",
     "yjs": "13.6.20"
   },
   "peerDependencies": {
diff --git a/editors/tiptap/src/components/extensions/bubble-menu.ts b/editors/tiptap/src/components/extensions/bubble-menu.ts
index 7de06a7e8..74cc225c5 100644
--- a/editors/tiptap/src/components/extensions/bubble-menu.ts
+++ b/editors/tiptap/src/components/extensions/bubble-menu.ts
@@ -17,121 +17,43 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-
-import CTiptapLinkEdit from "../../vue/c-tiptap-link-edit.vue";
-import { Range } from "@tiptap/core";
-import { Level } from "@tiptap/extension-heading";
-import { EditorState } from "@tiptap/pm/state";
-import { Primitive } from "@tiptap/vue-3";
+import { getImageMenuActions } from "./bubble-menu/image-actions";
+import { getTextMenuActions } from "./bubble-menu/text-actions";
+import type { BubbleMenuAction } from "./bubble-menu/BubbleMenuAction";
 import type { Editor } from "@tiptap/core";
-import type { Component } from "vue";
 
 // TODO: also add condition, for instance some actions shouldn't be proposed on
 // code.
+
 /**
- * Bubble menu action descriptor.
- *
- * @since 0.8
+ * @since 0.13
  */
-export interface BubbleMenuAction {
-  title: string;
-  additionalComponent?: Component;
-  command: (
-    params: { editor: Editor; range: Range },
-    props?: Record<string, Primitive>,
-  ) => void;
-  isActive: (state: EditorState) => boolean;
-  icon: string;
-}
-
-function getBoldAction(editor: Editor): BubbleMenuAction {
-  return {
-    title: "Bold",
-    icon: "type-bold",
-    command({ editor }) {
-      editor.commands.toggleBold();
-    },
-    isActive: () => editor.schema.marks.bold !== undefined,
-  };
-}
-
-function getItalic(editor: Editor): BubbleMenuAction {
-  return {
-    title: "Italic",
-    icon: "type-italic",
-    command({ editor }) {
-      editor.commands.toggleItalic();
-    },
-    isActive: () => editor.schema.marks.italic != undefined,
-  };
+enum ElementType {
+  TEXT,
+  IMAGE,
 }
 
-function getCode(editor: Editor): BubbleMenuAction {
-  return {
-    title: "Code",
-    icon: "code",
-    command({ editor }) {
-      editor.commands.toggleCode();
-    },
-    isActive: () => editor.schema.marks.code != undefined,
-  };
-}
-
-function getHeadingAction(level: Level, editor: Editor): BubbleMenuAction {
-  return {
-    title: `H${level}`,
-    icon: `type-h${level}`,
-    command({ editor }) {
-      editor.chain().toggleHeading({ level }).run();
-    },
-    isActive: () => editor.schema.nodes.heading != undefined,
-  };
-}
-
-export function getLinkAction(editor: Editor): BubbleMenuAction {
-  return {
-    title: "Link",
-    icon: "link-45deg",
-    additionalComponent: CTiptapLinkEdit,
-    // @ts-expect-error TODO the types needs to be refined
-    command(
-      { editor },
-      { linkValue, removeLink }: { linkValue?: string; removeLink?: boolean },
-    ) {
-      if (linkValue) {
-        editor
-          .chain()
-          .focus()
-          .extendMarkRange("link")
-          .setLink({ href: linkValue })
-          .run();
-      }
+export default function getMenuActions(
+  editor: Editor,
+  type: ElementType = ElementType.TEXT,
+): BubbleMenuAction[] {
+  let actions;
+  switch (type) {
+    case ElementType.TEXT:
+      actions = getTextMenuActions(editor);
+      break;
+    case ElementType.IMAGE:
+      actions = getImageMenuActions(editor);
+      break;
+  }
 
-      if (removeLink) {
-        editor.commands.unsetLink();
-      }
-    },
-    isActive: () => editor.schema.marks.link != undefined,
-  };
-}
-
-export default function getMenuActions(editor: Editor): BubbleMenuAction[] {
-  const numbers: Level[] = [1, 2, 3, 4, 5, 6];
-  const headings: BubbleMenuAction[] = numbers.map((level) =>
-    getHeadingAction(level, editor),
-  );
-  const action = [
-    ...headings,
-    getBoldAction(editor),
-    getItalic(editor),
-    getCode(editor),
-    getLinkAction(editor),
-  ];
   // Keep only actions at can be activated in the current context:
   // Actions with marks and nodes that are not available should not be available
   // Some actions can also be deactivated when the current selection does not
   // allow it (e.g., not possible to define bold text inside a code block).
-  return action.filter((action) => {
+  return actions.filter((action) => {
     return action.isActive(editor.state);
   });
 }
+
+export { ElementType };
diff --git a/editors/tiptap/src/components/extensions/bubble-menu/BubbleMenuAction.ts b/editors/tiptap/src/components/extensions/bubble-menu/BubbleMenuAction.ts
new file mode 100644
index 000000000..46a317518
--- /dev/null
+++ b/editors/tiptap/src/components/extensions/bubble-menu/BubbleMenuAction.ts
@@ -0,0 +1,40 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import { EditorState, SelectionRange } from "@tiptap/pm/state";
+import { Primitive } from "@tiptap/vue-3";
+import type { Editor } from "@tiptap/core";
+import type { Component } from "vue";
+
+/**
+ * Bubble menu action descriptor.
+ *
+ * @since 0.8
+ */
+export interface BubbleMenuAction {
+  title: string;
+  additionalComponent?: Component;
+  command: (
+    params: { editor: Editor; range: SelectionRange },
+    props?: Record<string, Primitive>,
+  ) => void;
+  isActive: (state: EditorState) => boolean;
+  icon: string;
+}
diff --git a/editors/tiptap/src/components/extensions/bubble-menu/image-actions.ts b/editors/tiptap/src/components/extensions/bubble-menu/image-actions.ts
new file mode 100644
index 000000000..58f775793
--- /dev/null
+++ b/editors/tiptap/src/components/extensions/bubble-menu/image-actions.ts
@@ -0,0 +1,56 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+import { BubbleMenuAction } from "./BubbleMenuAction";
+import type { Editor } from "@tiptap/core";
+
+function getReplaceAction(editor: Editor): BubbleMenuAction {
+  return {
+    title: "Replace",
+    icon: "arrow-left-right",
+    command() {
+      editor
+        .chain()
+        .focus()
+        .deleteCurrentNode()
+        .insertContent({
+          type: "imageInsert",
+        })
+        .run();
+    },
+    isActive: () => true,
+  };
+}
+
+function getDeleteAction(editor: Editor): BubbleMenuAction {
+  return {
+    title: "Delete",
+    icon: "trash",
+    command() {
+      editor.commands.deleteSelection();
+    },
+    isActive: () => true,
+  };
+}
+
+function getImageMenuActions(editor: Editor): BubbleMenuAction[] {
+  return [getReplaceAction(editor), getDeleteAction(editor)];
+}
+
+export { getImageMenuActions };
diff --git a/editors/tiptap/src/components/extensions/bubble-menu/text-actions.ts b/editors/tiptap/src/components/extensions/bubble-menu/text-actions.ts
new file mode 100644
index 000000000..7aecdbab9
--- /dev/null
+++ b/editors/tiptap/src/components/extensions/bubble-menu/text-actions.ts
@@ -0,0 +1,110 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+import CTiptapLinkEdit from "../../../vue/c-tiptap-link-edit.vue";
+import { Level } from "@tiptap/extension-heading";
+import type { BubbleMenuAction } from "./BubbleMenuAction";
+import type { Editor } from "@tiptap/core";
+
+function getBoldAction(editor: Editor): BubbleMenuAction {
+  return {
+    title: "Bold",
+    icon: "type-bold",
+    command({ editor }) {
+      editor.commands.toggleBold();
+    },
+    isActive: () => editor.schema.marks.bold !== undefined,
+  };
+}
+
+function getItalic(editor: Editor): BubbleMenuAction {
+  return {
+    title: "Italic",
+    icon: "type-italic",
+    command({ editor }) {
+      editor.commands.toggleItalic();
+    },
+    isActive: () => editor.schema.marks.italic != undefined,
+  };
+}
+
+function getCode(editor: Editor): BubbleMenuAction {
+  return {
+    title: "Code",
+    icon: "code",
+    command({ editor }) {
+      editor.commands.toggleCode();
+    },
+    isActive: () => editor.schema.marks.code != undefined,
+  };
+}
+
+function getHeadingAction(level: Level, editor: Editor): BubbleMenuAction {
+  return {
+    title: `H${level}`,
+    icon: `type-h${level}`,
+    command({ editor }) {
+      editor.chain().toggleHeading({ level }).run();
+    },
+    isActive: () => editor.schema.nodes.heading != undefined,
+  };
+}
+
+function getLinkAction(editor: Editor): BubbleMenuAction {
+  return {
+    title: "Link",
+    icon: "link-45deg",
+    additionalComponent: CTiptapLinkEdit,
+    // @ts-expect-error TODO the types needs to be refined
+    command(
+      { editor },
+      { linkValue, removeLink }: { linkValue?: string; removeLink?: boolean },
+    ) {
+      if (linkValue) {
+        editor
+          .chain()
+          .focus()
+          .extendMarkRange("link")
+          .setLink({ href: linkValue })
+          .run();
+      }
+
+      if (removeLink) {
+        editor.commands.unsetLink();
+      }
+    },
+    isActive: () => editor.schema.marks.link != undefined,
+  };
+}
+
+function getTextMenuActions(editor: Editor): BubbleMenuAction[] {
+  const numbers: Level[] = [1, 2, 3, 4, 5, 6];
+  const headings: BubbleMenuAction[] = numbers.map((level) =>
+    getHeadingAction(level, editor),
+  );
+  return [
+    ...headings,
+    getBoldAction(editor),
+    getItalic(editor),
+    getCode(editor),
+    getLinkAction(editor),
+  ];
+}
+
+export { getLinkAction, getTextMenuActions };
diff --git a/editors/tiptap/src/components/extensions/link-suggest.ts b/editors/tiptap/src/components/extensions/link-suggest.ts
index 075ee831b..80d7b3624 100644
--- a/editors/tiptap/src/components/extensions/link-suggest.ts
+++ b/editors/tiptap/src/components/extensions/link-suggest.ts
@@ -29,6 +29,12 @@ import Suggestion from "@tiptap/suggestion";
 import { Editor, Extension, Range } from "@tiptap/vue-3";
 import { SkinManager } from "@xwiki/cristal-api";
 import { Link } from "@xwiki/cristal-link-suggest-api";
+import {
+  AttachmentReference,
+  DocumentReference,
+  EntityType,
+} from "@xwiki/cristal-model-api";
+import { ModelReferenceParser } from "@xwiki/cristal-model-reference-api";
 import { Container } from "inversify";
 import { createPinia } from "pinia";
 import { App, createApp } from "vue";
@@ -66,6 +72,7 @@ function loadLinkSuggest(
   skinManager: SkinManager,
   container: Container,
   linkSuggest?: LinkSuggestService,
+  modelReferenceParser?: ModelReferenceParser,
 ) {
   return Extension.create({
     name: "link-suggest",
@@ -77,7 +84,7 @@ function loadLinkSuggest(
             // props.command({ editor, range, props });
             // TODO: probably unused?
           },
-          items: getSuggestionItems(linkSuggest),
+          items: getSuggestionItems(linkSuggest, modelReferenceParser),
           render: renderItems(skinManager, container, linkSuggest),
         },
       };
@@ -98,7 +105,10 @@ function loadLinkSuggest(
  * Build a function returning an array of link suggestions from a string.
  * @param linkSuggest - the link suggestion service to use
  */
-function initSuggestionsService(linkSuggest: LinkSuggestService | undefined) {
+function initSuggestionsService(
+  linkSuggest?: LinkSuggestService,
+  modelReferenceParser?: ModelReferenceParser,
+) {
   // Return an array of suggestions from a query
   // TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule.
   // eslint-disable-next-line max-statements
@@ -129,7 +139,19 @@ function initSuggestionsService(linkSuggest: LinkSuggestService | undefined) {
       .map((link) => {
         // FIXME: relate to link management is reference management, here too we
         // need to think me precisely of the architecture we want for this.
-        const segments = link.reference.split(/\./);
+        const entityReference = modelReferenceParser?.parse(link.reference);
+
+        let documentReference;
+        if (entityReference?.type == EntityType.ATTACHMENT) {
+          documentReference = (entityReference as AttachmentReference).document;
+        } else {
+          documentReference = entityReference as DocumentReference;
+        }
+        const segments = documentReference.space?.names.slice(0) ?? [];
+        // TODO: replace with an actual construction of segments from a reference
+        if (documentReference.terminal) {
+          segments.push(documentReference.name);
+        }
         return {
           title: link.label,
           segments,
@@ -146,8 +168,11 @@ function initSuggestionsService(linkSuggest: LinkSuggestService | undefined) {
  * extension initialization of the link-suggest extension
  * @param linkSuggest - the link suggestion service to use
  */
-function getSuggestionItems(linkSuggest?: LinkSuggestService) {
-  return initSuggestionsService(linkSuggest);
+function getSuggestionItems(
+  linkSuggest?: LinkSuggestService,
+  modelReferenceParser?: ModelReferenceParser,
+) {
+  return initSuggestionsService(linkSuggest, modelReferenceParser);
 }
 
 function renderItems(
diff --git a/editors/tiptap/src/components/extensions/slash.ts b/editors/tiptap/src/components/extensions/slash.ts
index 315a8361a..a47d96fe9 100644
--- a/editors/tiptap/src/components/extensions/slash.ts
+++ b/editors/tiptap/src/components/extensions/slash.ts
@@ -159,6 +159,24 @@ function getCodeBlockAction(): ActionDescriptor {
   };
 }
 
+function getImageAction(): ActionDescriptor {
+  return {
+    title: "Image",
+    icon: "image",
+    hint: "Image",
+    command({ editor, range }) {
+      editor
+        .chain()
+        .focus()
+        .deleteRange(range)
+        .insertContent({
+          type: "imageInsert",
+        })
+        .run();
+    },
+  };
+}
+
 function getAllActions(): ActionCategoryDescriptor[] {
   const getHeadingActions = [1, 2, 3, 4, 5, 6].map((level) =>
     getHeadingAction(level),
@@ -174,6 +192,7 @@ function getAllActions(): ActionCategoryDescriptor[] {
         getTableAction(),
         getBlockquoteAction(),
         getCodeBlockAction(),
+        getImageAction(),
       ],
     },
   ];
diff --git a/editors/tiptap/src/extensions/link.ts b/editors/tiptap/src/extensions/link.ts
index 538cc0ced..c052e1fa2 100644
--- a/editors/tiptap/src/extensions/link.ts
+++ b/editors/tiptap/src/extensions/link.ts
@@ -19,38 +19,56 @@
  */
 
 import Link from "@tiptap/extension-link";
+import { EntityReference } from "@xwiki/cristal-model-api";
+import { ModelReferenceSerializer } from "@xwiki/cristal-model-reference-api";
+import { RemoteURLParser } from "@xwiki/cristal-model-remote-url-api";
 import type { Mark } from "@tiptap/pm/model";
 
 /**
- * Extends the default tiptap extension link with custom markdown serializion
+ * Extends the default tiptap extension link with custom Markdown serialization
  * rules to handle internal links.
  */
-export default Link.extend({
-  addStorage() {
-    return {
-      markdown: {
-        serialize: {
-          open(state: unknown, mark: Mark) {
-            return mark.attrs.class?.includes("internal-link")
-              ? "[["
-              : // TODO: replace with a call to the default spec.
-                "[";
-          },
-          close: function (state: unknown, mark: Mark) {
-            if (mark.attrs.class?.includes("internal-link")) {
-              return `|${mark.attrs.href}]]`;
-            } else {
-              // TODO: replace with a call to the default spec.
-              return `](${mark.attrs.href.replace(/[()"]/g, "\\$&")}${
-                mark.attrs.title
-                  ? ` "${mark.attrs.title.replace(/"/g, '\\"')}"`
-                  : ""
-              })`;
-            }
+export default function initLinkExtension(
+  serializer: ModelReferenceSerializer,
+  parser: RemoteURLParser,
+) {
+  function parseLink(mark: Mark): EntityReference | undefined {
+    try {
+      return parser.parse(mark.attrs.href as string);
+    } catch {
+      return undefined;
+    }
+  }
+
+  return Link.extend({
+    addStorage() {
+      return {
+        markdown: {
+          serialize: {
+            open(state: unknown, mark: Mark) {
+              const reference = parseLink(mark);
+              if (reference) {
+                return "[[";
+              } else {
+                return "[";
+              }
+            },
+            close: function (state: unknown, mark: Mark) {
+              if (parseLink(mark)) {
+                return `|${serializer.serialize(parser.parse(mark.attrs.href))}]]`;
+              } else {
+                // TODO: replace with a call to the default spec.
+                return `](${mark.attrs.href.replace(/[()"]/g, "\\$&")}${
+                  mark.attrs.title
+                    ? ` "${mark.attrs.title.replace(/"/g, '\\"')}"`
+                    : ""
+                })`;
+              }
+            },
+            mixable: true,
           },
-          mixable: true,
         },
-      },
-    };
-  },
-});
+      };
+    },
+  });
+}
diff --git a/editors/tiptap/src/extensions/markdown.ts b/editors/tiptap/src/extensions/markdown.ts
index e7e72ea2c..99db2e6bc 100644
--- a/editors/tiptap/src/extensions/markdown.ts
+++ b/editors/tiptap/src/extensions/markdown.ts
@@ -18,126 +18,42 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
+import {
+  parseInternalImages,
+  parseInternalLinks,
+} from "@xwiki/cristal-markdown-default";
+import { ModelReferenceParser } from "@xwiki/cristal-model-reference-api";
+import { RemoteURLSerializer } from "@xwiki/cristal-model-remote-url-api";
 import MarkdownIt from "markdown-it";
 import { Markdown } from "tiptap-markdown";
 
-const INTERNAL_LINK_REGEX = /\[\[((?<text>[^\]|]+)\|)?(?<reference>[^\]|]+)]]/g;
-
-type InternalLink = { text?: string; reference: string };
-
-/**
- * Takes the substring of content between start and end (and from start until the end if end is empty).
- * Add the extracted substring to the tokens if the string is not empty.
- * @param content - the content to update
- * @param tokens - the tokens to append
- * @param start - the start index
- * @param end - the end index
- */
-function appendIfNotEmpty(
-  content: string,
-  tokens: (string | { reference: string; text: string | undefined })[],
-  start: number,
-  end?: number,
+export default function (
+  modelReferenceParser: ModelReferenceParser,
+  remoteURLSerializer: RemoteURLSerializer,
 ) {
-  const preString = content.substring(start, end);
-  if (preString.length > 0) {
-    tokens.push(preString);
-  }
-  return preString;
+  return Markdown.extend({
+    onBeforeCreate() {
+      const content = this.editor.options.content;
+      this.parent?.();
+      this.editor.storage.markdown.parser.md =
+        this.editor.storage.markdown.parser.md.use((md: MarkdownIt) => {
+          md.core.ruler.before(
+            "inline",
+            "markdown-internal-links",
+            parseInternalLinks(modelReferenceParser, remoteURLSerializer),
+          );
+          // Is it important for the images to be parsed before the links, otherwise the exclamation mark prefixing the
+          // image links is just ignored as the rest of the syntax is the same.
+          md.core.ruler.before(
+            "markdown-internal-links",
+            "markdown-internal-images",
+            parseInternalImages(modelReferenceParser, remoteURLSerializer),
+          );
+        });
+      // TODO: this is not optimal as the parent is also parsing the content but without the additional plugins.
+      // But his is also avoiding quite a lot of code duplication so keeping it like this for now.
+      this.editor.options.content =
+        this.editor.storage.markdown.parser.parse(content);
+    },
+  });
 }
-
-/**
- * Parse a string in look for internal links. Returns a array of string or InternalLink types.
- * @param content - a string to parse
- */
-// TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule.
-// eslint-disable-next-line max-statements
-function parseStringForInternalLinks(
-  content: string,
-): (string | InternalLink)[] {
-  const tokens = [];
-
-  // The offset of the content before the previously matched internal link (or the beginning of the string).
-  let offset = 0;
-
-  const matches = content.matchAll(INTERNAL_LINK_REGEX);
-  for (const match of matches) {
-    const preString = appendIfNotEmpty(content, tokens, offset, match.index);
-    const text = match.groups?.text;
-    const reference: string = match.groups?.reference || "";
-    tokens.push({ text, reference });
-    // Shift the offset to the index right after the end of the current internal link.
-    offset += match[0].length + preString.length;
-  }
-
-  // Put the end of the text, after the last internal link found.
-  appendIfNotEmpty(content, tokens, offset);
-  return tokens;
-}
-
-/**
- * Returns true if at least an internal link was found, false otherwise.
- * @param internalTokens - an array of tokens
- */
-function hasLink(internalTokens: (string | InternalLink)[]) {
-  return (
-    internalTokens.length > 1 ||
-    (internalTokens.length == 1 && typeof internalTokens[0] !== "string")
-  );
-}
-
-export default Markdown.extend({
-  onBeforeCreate() {
-    const content = this.editor.options.content;
-    this.parent?.();
-    this.editor.storage.markdown.parser.md =
-      this.editor.storage.markdown.parser.md.use((md: MarkdownIt) => {
-        md.core.ruler.before(
-          "inline",
-          "markdown-internal-links",
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          (state: any) => {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            state.tokens.forEach((blockToken: any) => {
-              if (blockToken.type == "inline") {
-                const internalTokens = parseStringForInternalLinks(
-                  blockToken.content,
-                );
-
-                // We replace the content of the current block node only if at least a link has been found.
-                if (hasLink(internalTokens)) {
-                  blockToken.content = "";
-                  // TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule.
-                  // eslint-disable-next-line max-statements
-                  blockToken.children = internalTokens.flatMap((v) => {
-                    if (typeof v == "string") {
-                      const token = new state.Token("text", "span", 0);
-                      token.content = v;
-                      return [token];
-                    } else {
-                      const { text, reference } = v;
-
-                      const openToken = new state.Token("link_open", "a", 1);
-                      openToken.attrSet("href", reference);
-                      openToken.attrPush(["class", "internal-link"]);
-                      const contentToken = new state.Token("text", "", 0);
-                      contentToken.content = text || reference;
-                      const closeToken = new state.Token("link_close", "a", -1);
-                      // This is useful for the serializer, who is going to have access to this value to determine
-                      // how to serialize the link
-                      closeToken.attrPush(["class", "internal-link"]);
-                      return [openToken, contentToken, closeToken];
-                    }
-                  });
-                }
-              }
-            });
-          },
-        );
-      });
-    // TODO: this is not optimal as the parent is also parsing the content but without the additional plugins.
-    // But his is also avoiding quite a lot of code duplication so keeping it like this for now.
-    this.editor.options.content =
-      this.editor.storage.markdown.parser.parse(content);
-  },
-});
diff --git a/editors/tiptap/src/vue/c-edit-tiptap.vue b/editors/tiptap/src/vue/c-edit-tiptap.vue
index 16f7a15c6..3bc70478d 100644
--- a/editors/tiptap/src/vue/c-edit-tiptap.vue
+++ b/editors/tiptap/src/vue/c-edit-tiptap.vue
@@ -24,9 +24,8 @@ import CTiptapBubbleMenu from "./c-tiptap-bubble-menu.vue";
 import { loadLinkSuggest } from "../components/extensions/link-suggest";
 import { Slash } from "../components/extensions/slash";
 import { CollaborationKit, User } from "../extensions/collaboration";
-import Link from "../extensions/link";
-import Markdown from "../extensions/markdown";
-import Image from "@tiptap/extension-image";
+import initLinkExtension from "../extensions/link";
+import initMarkdown from "../extensions/markdown";
 import Placeholder from "@tiptap/extension-placeholder";
 import Table from "@tiptap/extension-table";
 import TableCell from "@tiptap/extension-table-cell";
@@ -36,20 +35,34 @@ import StarterKit from "@tiptap/starter-kit";
 import { Editor, EditorContent } from "@tiptap/vue-3";
 import { CristalApp, PageData } from "@xwiki/cristal-api";
 import { name as documentServiceName } from "@xwiki/cristal-document-api";
+import {
+  ModelReferenceParserProvider,
+  ModelReferenceSerializer,
+  ModelReferenceSerializerProvider,
+} from "@xwiki/cristal-model-reference-api";
+import {
+  RemoteURLParser,
+  RemoteURLParserProvider,
+  RemoteURLSerializerProvider,
+} from "@xwiki/cristal-model-remote-url-api";
 import { CArticle } from "@xwiki/cristal-skin";
+import {
+  ImageInsertNode,
+  initTiptapImage,
+} from "@xwiki/cristal-tiptap-extension-image";
+import { Container } from "inversify";
 import { debounce } from "lodash";
 import GlobalDragHandle from "tiptap-extension-global-drag-handle";
-import { computed, inject, ref, watch } from "vue";
-import { useRoute } from "vue-router";
+import { inject, ref, watch } from "vue";
 import type { StorageProvider } from "@xwiki/cristal-backend-api";
 import type { DocumentService } from "@xwiki/cristal-document-api";
 import type {
   LinkSuggestService,
   LinkSuggestServiceProvider,
 } from "@xwiki/cristal-link-suggest-api";
-import type { ComputedRef, Ref } from "vue";
+import type { Markdown } from "tiptap-markdown";
+import type { Ref } from "vue";
 
-const route = useRoute();
 const cristal: CristalApp = inject<CristalApp>("cristal")!;
 
 const documentService = cristal
@@ -66,16 +79,12 @@ const content = ref("");
 const title = ref("");
 const titlePlaceholder = ref("");
 
-const currentPageName: ComputedRef<string> = computed(() => {
-  // TODO: define a proper abstraction.
-  return (
-    (route.params.page as string) || cristal.getCurrentPage() || "Main.WebHome"
-  );
-});
+const currentPageName: Ref<string | undefined> =
+  documentService.getCurrentDocumentReferenceString();
 
 const viewRouterParams = {
   name: "view",
-  params: { page: currentPageName.value },
+  params: { page: currentPageName.value ?? "" },
 };
 const view = () => {
   // Destroy the editor instance.
@@ -94,7 +103,7 @@ const save = async (authors: User[]) => {
     .get<StorageProvider>("StorageProvider")
     .get();
   await storage.save(
-    currentPageName.value,
+    currentPageName.value ?? "",
     editor.value?.storage.markdown.getMarkdown(),
     title.value,
     "html",
@@ -102,7 +111,7 @@ const save = async (authors: User[]) => {
   // If this save operation just created the document, the current document
   // will be undefined. So we update it.
   if (!currentPage.value) {
-    documentService.setCurrentDocument(currentPageName.value);
+    documentService.setCurrentDocument(currentPageName.value ?? "");
   }
   documentService.notifyDocumentChange("update", currentPage.value!);
 };
@@ -146,6 +155,81 @@ const currentUser = {
 
 let editor: Ref<Editor | undefined> = ref(undefined);
 
+function editorInit(
+  container: Container,
+  linkSuggest: LinkSuggestService | undefined,
+  MarkdownExtension: typeof Markdown,
+  realtimeURL: string | undefined,
+  serializer: ModelReferenceSerializer,
+  parser: RemoteURLParser,
+) {
+  return new Editor({
+    content: content.value || "",
+    extensions: [
+      GlobalDragHandle,
+      StarterKit.configure({
+        // Disable the default history in order to use Collaboration's history management so that users undo / redo
+        // only their own changes.
+        history: false,
+      }),
+      Placeholder.configure({
+        placeholder: "Type '/' to show the available actions",
+      }),
+      ImageInsertNode,
+      initTiptapImage(serializer, parser).configure({ inline: true }),
+      Table,
+      TableRow,
+      TableHeader,
+      TableCell,
+      Slash,
+      // TODO: I did it that way for simplicity but this should really be
+      // moved to an actual inversify component.
+      loadLinkSuggest(cristal.getSkinManager(), container, linkSuggest),
+      MarkdownExtension.configure({
+        html: true,
+      }),
+      initLinkExtension(serializer, parser).configure({
+        openOnClick: "whenNotEditable",
+        // TODO: the protocols should be injected by extension.
+        protocols: ["http", "https", "cristalfs"],
+      }),
+      CollaborationKit.configure({
+        channel: currentPageName.value,
+        user: currentUser,
+        saveCallback: save,
+        baseUrl: realtimeURL,
+      }),
+    ],
+  });
+}
+
+function loadComponentsFromLoadEditor() {
+  const container = cristal.getContainer();
+  const linkSuggest = container
+    .get<LinkSuggestServiceProvider>("LinkSuggestServiceProvider")
+    .get();
+  const modelReferenceParser = container
+    .get<ModelReferenceParserProvider>("ModelReferenceParserProvider")
+    .get()!;
+  const remoteURLSerialize = container
+    .get<RemoteURLSerializerProvider>("RemoteURLSerializerProvider")
+    .get()!;
+  const remoteURLParser = container
+    .get<RemoteURLParserProvider>("RemoteURLParserProvider")
+    .get()!;
+  const modelReferenceSerializer = container
+    .get<ModelReferenceSerializerProvider>("ModelReferenceSerializerProvider")
+    .get()!;
+  return {
+    container,
+    linkSuggest,
+    modelReferenceParser,
+    remoteURLSerialize,
+    remoteURLParser,
+    modelReferenceSerializer,
+  };
+}
+
 async function loadEditor(page: PageData | undefined) {
   // Push the content to the document.
   // TODO: move to a components based implementation
@@ -153,55 +237,31 @@ async function loadEditor(page: PageData | undefined) {
     content.value =
       page?.syntax == "markdown/1.2" ? page?.source : page?.html || "";
     title.value = page?.headlineRaw || "";
-    titlePlaceholder.value = page?.name || currentPageName.value;
-
-    const linkSuggestServiceProvider = cristal
-      .getContainer()
-      .get<LinkSuggestServiceProvider>("LinkSuggestServiceProvider");
-    const linkSuggest: LinkSuggestService | undefined =
-      linkSuggestServiceProvider.get();
+    titlePlaceholder.value = page?.name ?? currentPageName.value ?? "";
+    const {
+      container,
+      linkSuggest,
+      modelReferenceParser,
+      remoteURLSerialize,
+      remoteURLParser,
+      modelReferenceSerializer,
+    } = loadComponentsFromLoadEditor();
 
     const realtimeURL = cristal.getWikiConfig().realtimeURL;
 
-    editor.value = new Editor({
-      content: content.value || "",
-      extensions: [
-        GlobalDragHandle,
-        StarterKit.configure({
-          // Disable the default history in order to use Collaboration's history management so that users undo / redo
-          // only their own changes.
-          history: false,
-        }),
-        Placeholder.configure({
-          placeholder: "Type '/' to show the available actions",
-        }),
-        Image,
-        Table,
-        TableRow,
-        TableHeader,
-        TableCell,
-        Slash,
-        // TODO: I did it that way for simplicity but this should really be
-        // moved to an actual inversify component.
-        loadLinkSuggest(
-          cristal.getSkinManager(),
-          cristal.getContainer(),
-          linkSuggest,
-        ),
-        Markdown.configure({
-          html: true,
-        }),
-        Link.configure({
-          openOnClick: "whenNotEditable",
-        }),
-        CollaborationKit.configure({
-          channel: currentPageName.value,
-          user: currentUser,
-          saveCallback: save,
-          baseUrl: realtimeURL,
-        }),
-      ],
-    });
+    const MarkdownExtension = initMarkdown(
+      modelReferenceParser,
+      remoteURLSerialize,
+    );
+
+    editor.value = editorInit(
+      container,
+      linkSuggest,
+      MarkdownExtension,
+      realtimeURL,
+      modelReferenceSerializer,
+      remoteURLParser,
+    );
   }
 }
 
@@ -408,6 +468,11 @@ TODO: should be moved to a css specific to the empty line placeholder plugin.
   cursor: grab;
 }
 
+/* Allow to disable drag handle for a sub-part of the dom. */
+.edit :deep(.no-drag-handle .drag-handle) {
+  display: none;
+}
+
 .editor :deep(.drag-handle:active) {
   cursor: grabbing;
 }
diff --git a/editors/tiptap/src/vue/c-tiptap-bubble-menu.vue b/editors/tiptap/src/vue/c-tiptap-bubble-menu.vue
index 182c68180..f56ca4d92 100644
--- a/editors/tiptap/src/vue/c-tiptap-bubble-menu.vue
+++ b/editors/tiptap/src/vue/c-tiptap-bubble-menu.vue
@@ -20,16 +20,22 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 <script setup lang="ts">
 import CTiptapLinkEdit from "./c-tiptap-link-edit.vue";
 import getMenuActions, {
-  BubbleMenuAction,
-  getLinkAction,
+  ElementType,
 } from "../components/extensions/bubble-menu";
+import { getLinkAction } from "../components/extensions/bubble-menu/text-actions";
 import { isTextSelection } from "@tiptap/core";
 import { ResolvedPos } from "@tiptap/pm/model";
-import { EditorState } from "@tiptap/pm/state";
+import {
+  EditorState,
+  NodeSelection,
+  Selection,
+  SelectionRange,
+} from "@tiptap/pm/state";
 import { EditorView } from "@tiptap/pm/view";
-import { BubbleMenu, Range } from "@tiptap/vue-3";
+import { BubbleMenu } from "@tiptap/vue-3";
 import { CIcon, Size } from "@xwiki/cristal-icons";
 import { ComputedRef, Ref, computed, ref, shallowRef } from "vue";
+import type { BubbleMenuAction } from "../components/extensions/bubble-menu/BubbleMenuAction";
 import type { Editor } from "@tiptap/core";
 import type { Component } from "vue";
 
@@ -37,9 +43,12 @@ const props = defineProps<{
   editor: Editor;
 }>();
 
-const actions: ComputedRef<BubbleMenuAction[]> = computed(() =>
-  getMenuActions(props.editor),
-);
+const actions: ComputedRef<BubbleMenuAction[]> = computed(() => {
+  const elementType = isImageFromSelection(props.editor.state.selection)
+    ? ElementType.IMAGE
+    : ElementType.TEXT;
+  return getMenuActions(props.editor, elementType);
+});
 
 const additionalComponent: Ref<Component | undefined> = shallowRef();
 
@@ -47,7 +56,7 @@ const additionalComponentProps: Ref<
   | {
       action: BubbleMenuAction;
       editor: Editor;
-      range: Range;
+      range: SelectionRange;
       url: string;
       isAmbiguous: boolean;
     }
@@ -144,6 +153,12 @@ function closeAdditionalComponent() {
   additionalComponentProps.value = undefined;
 }
 
+function isImageFromSelection(selection: Selection): boolean {
+  return (
+    selection instanceof NodeSelection && selection.node?.type.name == "image"
+  );
+}
+
 /*
  * Compute whether the bubble menu must be shown, either because the selection
  * is empty and inside a link element, or because
@@ -168,13 +183,13 @@ const shouldShow = ({
   // Doubleclick an empty paragraph returns a node size of 2.
   // So we check also for an empty text size.
   const isEmptyTextBlock =
-    !doc.textBetween(from, to).length && isTextSelection(state.selection);
+    doc.textBetween(from, to).length == 0 || !isTextSelection(selection);
 
   const hasEditorFocus = view.hasFocus();
 
   const isLink =
-    state.selection.$head.marks().find((m) => m.type.name == "link") !==
-    undefined;
+    selection.$head.marks().find((m) => m.type.name == "link") !== undefined;
+  const isImage = isImageFromSelection(selection);
 
   // Don't show if the editor is not editable or don't have focus.
   if (!editor.isEditable || !hasEditorFocus) {
@@ -183,7 +198,11 @@ const shouldShow = ({
 
   // Show if the selection is not empty and the selection is not an empty text
   // block, or it the selection is empty but inside a link.
-  return (!emptySelection && !isEmptyTextBlock) || (emptySelection && isLink);
+  return (
+    (!emptySelection && !isEmptyTextBlock) ||
+    isImage ||
+    (emptySelection && isLink)
+  );
 };
 
 const linkAction = getLinkAction(props.editor);
@@ -224,9 +243,8 @@ const linkAction = getLinkAction(props.editor);
     ></CTiptapLinkEdit>
 
     <!--
-    It is possible for an action to provide an additional component.
-    This is useful if the action needs some additional actions (e.g., the link
-    action requires a link value).
+    It is possible for an action to provide an additional component. This is useful if the node or mark needs some
+    additional actions (e.g., the link action requires a link value).
     -->
     <template
       v-if="
diff --git a/editors/tiptap/src/vue/c-tiptap-link-edit.vue b/editors/tiptap/src/vue/c-tiptap-link-edit.vue
index b0c8560da..8dab194e7 100644
--- a/editors/tiptap/src/vue/c-tiptap-link-edit.vue
+++ b/editors/tiptap/src/vue/c-tiptap-link-edit.vue
@@ -19,7 +19,6 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 -->
 <script setup lang="ts">
 import CTiptapLinkSuggest from "./c-tiptap-link-suggest.vue";
-import { BubbleMenuAction } from "../components/extensions/bubble-menu";
 import {
   LinkSuggestionActionDescriptor,
   initSuggestionsService,
@@ -27,11 +26,13 @@ import {
 import linkSuggestStore, {
   LinkSuggestStore,
 } from "../stores/link-suggest-store";
-import { Range } from "@tiptap/vue-3";
+import { SelectionRange } from "@tiptap/pm/state";
 import { CIcon, Size } from "@xwiki/cristal-icons";
+import { ModelReferenceParserProvider } from "@xwiki/cristal-model-reference-api";
 import { ContentTools } from "@xwiki/cristal-skin";
 import { debounce } from "lodash";
 import { Ref, inject, onMounted, onUpdated, ref, toRefs, watch } from "vue";
+import type { BubbleMenuAction } from "../components/extensions/bubble-menu/BubbleMenuAction";
 import type { Editor } from "@tiptap/core";
 import type { CristalApp } from "@xwiki/cristal-api";
 import type {
@@ -52,7 +53,7 @@ const props = withDefaults(
     // The current editor
     editor: Editor;
     // The current range selection
-    range: Range;
+    range: SelectionRange;
     // The current url
     url?: string;
     // When true, indicated that the selection is ambiguous and does not allow
@@ -111,6 +112,10 @@ const linkSuggestServiceProvider = cristal
   .get<LinkSuggestServiceProvider>("LinkSuggestServiceProvider");
 let linkSuggest: LinkSuggestService | undefined =
   linkSuggestServiceProvider.get();
+const modelReferenceParser = cristal
+  .getContainer()
+  .get<ModelReferenceParserProvider>("ModelReferenceParserProvider")
+  .get();
 
 const store: LinkSuggestStore = linkSuggestStore();
 
@@ -122,7 +127,10 @@ store.updateProps({
 });
 
 const debouncedWatch = debounce(async (query: string) => {
-  const links = await initSuggestionsService(linkSuggest)({ query });
+  const links = await initSuggestionsService(
+    linkSuggest,
+    modelReferenceParser!,
+  )({ query });
   store.updateText(query);
   store.updateLinks(links);
 }, 400);
diff --git a/editors/tiptap/src/vue/c-tiptap-link-suggest.vue b/editors/tiptap/src/vue/c-tiptap-link-suggest.vue
index d9e9123c2..e04c1f9d7 100644
--- a/editors/tiptap/src/vue/c-tiptap-link-suggest.vue
+++ b/editors/tiptap/src/vue/c-tiptap-link-suggest.vue
@@ -19,13 +19,10 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 -->
 <script setup lang="ts">
 import { listNavigation } from "./list-navigation-helper";
-import {
-  LinkSuggestionActionDescriptor,
-  LinkType,
-} from "../components/extensions/link-suggest";
+import { LinkSuggestionActionDescriptor } from "../components/extensions/link-suggest";
 import linkSuggestStore from "../stores/link-suggest-store";
 import { SuggestionProps } from "@tiptap/suggestion";
-import { CIcon, Size } from "@xwiki/cristal-icons";
+import { LinkSuggestItem } from "@xwiki/cristal-tiptap-link-suggest-ui";
 import { storeToRefs } from "pinia";
 import tippy, { GetReferenceClientRect, Instance, Props } from "tippy.js";
 import { computed, onMounted, onUnmounted, onUpdated, ref, watch } from "vue";
@@ -148,22 +145,10 @@ defineExpose({
           :class="['item', index - 1 == linkIndex ? 'is-selected' : '']"
           @click="apply(linkIndex + 1)"
         >
-          <c-icon
-            class="icon-type"
-            :size="Size.Small"
-            :name="link.type == LinkType.PAGE ? 'file-earmark' : 'paperclip'"
-          />
-          {{ link.title }}
-          <XBreadcrumb
-            :items="
-              link.segments.map((segment) => {
-                return { label: segment };
-              })
-            "
-          ></XBreadcrumb>
+          <link-suggest-item :link="link"></link-suggest-item>
         </button>
       </template>
-      <span v-else class="information"> No suggestion service available </span>
+      <span v-else class="information">No suggestion service available</span>
     </div>
   </div>
 </template>
diff --git a/electron/link-suggest/link-suggest-filesystem/package.json b/electron/link-suggest/link-suggest-filesystem/package.json
new file mode 100644
index 000000000..bb751221f
--- /dev/null
+++ b/electron/link-suggest/link-suggest-filesystem/package.json
@@ -0,0 +1,52 @@
+{
+  "name": "@xwiki/cristal-link-suggest-filesystem",
+  "version": "0.12.0",
+  "license": "LGPL 2.1",
+  "author": "XWiki Org Community <contact@xwiki.org>",
+  "homepage": "https://cristal.xwiki.org/",
+  "repository": {
+    "type": "git",
+    "directory": "core/link-suggest/link-suggest-filesystem",
+    "url": "https://github.com/xwiki-contrib/cristal/"
+  },
+  "bugs": {
+    "url": "https://jira.xwiki.org/projects/CRISTAL/"
+  },
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "main": "./src/index.ts",
+  "scripts": {
+    "build": "tsc --project tsconfig.json && vite build",
+    "clean": "rimraf dist",
+    "lint": "eslint \"./src/**/*.{ts,tsx,vue}\" --max-warnings=0"
+  },
+  "dependencies": {
+    "@xwiki/cristal-api": "workspace:*",
+    "@xwiki/cristal-link-suggest-api": "workspace:*",
+    "@xwiki/cristal-model-api": "workspace:*",
+    "@xwiki/cristal-model-reference-api": "workspace:*",
+    "@xwiki/cristal-model-remote-url-api": "workspace:*",
+    "inversify": "6.2.0"
+  },
+  "peerDependencies": {
+    "reflect-metadata": "0.2.2"
+  },
+  "devDependencies": {
+    "reflect-metadata": "0.2.2",
+    "typescript": "5.6.3",
+    "vite": "6.0.3"
+  },
+  "publishConfig": {
+    "exports": {
+      ".": {
+        "import": "./dist/index.es.js",
+        "require": "./dist/index.umd.js",
+        "types": "./dist/index.d.ts"
+      }
+    },
+    "main": "./dist/index.es.js",
+    "types": "./dist/index.d.ts"
+  }
+}
diff --git a/electron/link-suggest/link-suggest-filesystem/src/components/componentsInit.ts b/electron/link-suggest/link-suggest-filesystem/src/components/componentsInit.ts
new file mode 100644
index 000000000..03cd76e76
--- /dev/null
+++ b/electron/link-suggest/link-suggest-filesystem/src/components/componentsInit.ts
@@ -0,0 +1,34 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import { FilesystemLinkSuggestService } from "./filesystemLinkSuggestService";
+import { name } from "@xwiki/cristal-link-suggest-api";
+import { Container } from "inversify";
+import type { LinkSuggestService } from "@xwiki/cristal-link-suggest-api";
+
+export class ComponentInit {
+  constructor(container: Container) {
+    container
+      .bind<LinkSuggestService>(name)
+      .to(FilesystemLinkSuggestService)
+      .inSingletonScope()
+      .whenTargetNamed("FileSystem");
+  }
+}
diff --git a/electron/link-suggest/link-suggest-filesystem/src/components/filesystemLinkSuggestService.ts b/electron/link-suggest/link-suggest-filesystem/src/components/filesystemLinkSuggestService.ts
new file mode 100644
index 000000000..dc1f322e9
--- /dev/null
+++ b/electron/link-suggest/link-suggest-filesystem/src/components/filesystemLinkSuggestService.ts
@@ -0,0 +1,100 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+import { PageAttachment, PageData } from "@xwiki/cristal-api";
+import {
+  Link,
+  LinkSuggestService,
+  LinkType,
+} from "@xwiki/cristal-link-suggest-api";
+import { EntityType } from "@xwiki/cristal-model-api";
+import { inject, injectable } from "inversify";
+import type { CristalApp } from "@xwiki/cristal-api";
+import type { ModelReferenceParserProvider } from "@xwiki/cristal-model-reference-api";
+import type { RemoteURLSerializerProvider } from "@xwiki/cristal-model-remote-url-api";
+
+declare const fileSystemStorage: {
+  search(
+    query: string,
+    type?: LinkType,
+    mimetype?: string,
+  ): Promise<
+    (
+      | { type: EntityType.ATTACHMENT; value: PageAttachment }
+      | { type: EntityType.DOCUMENT; value: PageData }
+    )[]
+  >;
+};
+
+/**
+ * Default implementation of the link suggestion service, for the file system backend.
+ * The current implementation is based on full scan and does not scale
+ * @since 0.13
+ */
+@injectable()
+export class FilesystemLinkSuggestService implements LinkSuggestService {
+  constructor(
+    @inject<CristalApp>("CristalApp") private readonly cristalApp: CristalApp,
+    @inject<RemoteURLSerializerProvider>("RemoteURLSerializerProvider")
+    private readonly remoteURLSerializerProvider: RemoteURLSerializerProvider,
+    @inject<ModelReferenceParserProvider>("ModelReferenceParserProvider")
+    private readonly modelReferenceParserProvider: ModelReferenceParserProvider,
+  ) {
+    console.log(
+      this.cristalApp,
+      this.remoteURLSerializerProvider,
+      this.modelReferenceParserProvider,
+    );
+  }
+
+  async getLinks(
+    query: string,
+    type?: LinkType,
+    mimetype?: string,
+  ): Promise<Link[]> {
+    const attachments = await fileSystemStorage.search(query, type, mimetype);
+    // TODO: convert to links.
+    return attachments.map((result) => {
+      switch (result.type) {
+        case EntityType.ATTACHMENT: {
+          const attachment = result.value;
+          return {
+            id: attachment.id,
+            reference: attachment.reference,
+            url: attachment.href,
+            type: LinkType.ATTACHMENT,
+            hint: "",
+            label: attachment.id,
+          };
+        }
+        case EntityType.DOCUMENT: {
+          const document = result.value;
+          return {
+            id: document.id,
+            reference: document.id,
+            url: document.id,
+            type: LinkType.PAGE,
+            hint: "",
+            label: document.id,
+          };
+        }
+      }
+    });
+  }
+}
diff --git a/electron/link-suggest/link-suggest-filesystem/src/index.ts b/electron/link-suggest/link-suggest-filesystem/src/index.ts
new file mode 100644
index 000000000..6a7f4cc49
--- /dev/null
+++ b/electron/link-suggest/link-suggest-filesystem/src/index.ts
@@ -0,0 +1,23 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import { ComponentInit } from "./components/componentsInit";
+
+export { ComponentInit };
diff --git a/electron/link-suggest/link-suggest-filesystem/tsconfig.json b/electron/link-suggest/link-suggest-filesystem/tsconfig.json
new file mode 100644
index 000000000..9ea278a11
--- /dev/null
+++ b/electron/link-suggest/link-suggest-filesystem/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "resolveJsonModule": true
+  },
+  "extends": "../../../tsconfig.json",
+  "include": [
+    "./src/index.ts",
+    "./src/**/*"
+  ]
+}
\ No newline at end of file
diff --git a/electron/link-suggest/link-suggest-filesystem/tsdoc.json b/electron/link-suggest/link-suggest-filesystem/tsdoc.json
new file mode 100644
index 000000000..81c5a8a2a
--- /dev/null
+++ b/electron/link-suggest/link-suggest-filesystem/tsdoc.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
+  "extends": ["../../../tsdoc.json"]
+}
diff --git a/electron/link-suggest/link-suggest-filesystem/vite.config.ts b/electron/link-suggest/link-suggest-filesystem/vite.config.ts
new file mode 100644
index 000000000..c31aed033
--- /dev/null
+++ b/electron/link-suggest/link-suggest-filesystem/vite.config.ts
@@ -0,0 +1,23 @@
+/*
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import { generateConfig } from "../../../vite.config";
+
+export default generateConfig(import.meta.url);
diff --git a/electron/renderer/package.json b/electron/renderer/package.json
index a24d0dbbd..0dffec69e 100644
--- a/electron/renderer/package.json
+++ b/electron/renderer/package.json
@@ -24,6 +24,7 @@
     "@xwiki/cristal-electron-storage": "workspace:*",
     "@xwiki/cristal-hierarchy-filesystem": "workspace:*",
     "@xwiki/cristal-lib": "workspace:*",
+    "@xwiki/cristal-link-suggest-filesystem": "workspace:*",
     "@xwiki/cristal-model-reference-filesystem": "workspace:*",
     "@xwiki/cristal-model-remote-url-filesystem-default": "workspace:*",
     "@xwiki/cristal-navigation-tree-filesystem": "workspace:*",
diff --git a/electron/renderer/src/index.ts b/electron/renderer/src/index.ts
index 5305868f7..3b7a69d6c 100644
--- a/electron/renderer/src/index.ts
+++ b/electron/renderer/src/index.ts
@@ -24,6 +24,7 @@ import { ComponentInit as XWikiAuthenticationComponentInit } from "@xwiki/crista
 import { ComponentInit as ElectronStorageComponentInit } from "@xwiki/cristal-electron-storage";
 import { ComponentInit as FileSystemPageHierarchyComponentInit } from "@xwiki/cristal-hierarchy-filesystem";
 import { CristalAppLoader, loadConfig } from "@xwiki/cristal-lib";
+import { ComponentInit as FileSystemLinkSuggestComponentInit } from "@xwiki/cristal-link-suggest-filesystem";
 import { ComponentInit as ModelReferenceFilesystemComponentInit } from "@xwiki/cristal-model-reference-filesystem";
 import { ComponentInit as ModelRemoteURLFilesystemComponentInit } from "@xwiki/cristal-model-remote-url-filesystem-default";
 import { ComponentInit as FileSystemNavigationTreeComponentInit } from "@xwiki/cristal-navigation-tree-filesystem";
@@ -52,5 +53,6 @@ CristalAppLoader.init(
     new XWikiAuthenticationComponentInit(container);
     new ModelReferenceFilesystemComponentInit(container);
     new ModelRemoteURLFilesystemComponentInit(container);
+    new FileSystemLinkSuggestComponentInit(container);
   },
 );
diff --git a/electron/storage/package.json b/electron/storage/package.json
index 1192737db..57b50a49b 100644
--- a/electron/storage/package.json
+++ b/electron/storage/package.json
@@ -29,6 +29,8 @@
   "dependencies": {
     "@xwiki/cristal-api": "workspace:*",
     "@xwiki/cristal-backend-api": "workspace:*",
+    "@xwiki/cristal-link-suggest-api": "workspace:*",
+    "@xwiki/cristal-model-api": "workspace:*",
     "@xwiki/cristal-model-remote-url-filesystem-api": "workspace:*",
     "inversify": "6.2.0",
     "mime": "4.0.6"
diff --git a/electron/storage/src/electron/main/index.ts b/electron/storage/src/electron/main/index.ts
index 1fe437d99..eed09b84a 100644
--- a/electron/storage/src/electron/main/index.ts
+++ b/electron/storage/src/electron/main/index.ts
@@ -19,10 +19,13 @@
  */
 
 import { PageAttachment, PageData } from "@xwiki/cristal-api";
+import { LinkType } from "@xwiki/cristal-link-suggest-api";
+import { EntityType } from "@xwiki/cristal-model-api";
 import { protocol as cristalFSProtocol } from "@xwiki/cristal-model-remote-url-filesystem-api";
 import { app, ipcMain, net, protocol, shell } from "electron";
 import mime from "mime";
 import fs from "node:fs";
+import { readdir } from "node:fs/promises";
 import os from "node:os";
 import { basename, dirname, join, relative } from "node:path";
 
@@ -41,6 +44,7 @@ function resolvePagePath(page: string): string {
 function resolveAttachmentsPath(page: string): string {
   return resolvePath(page, "attachments");
 }
+
 function resolveAttachmentPath(page: string, filename: string): string {
   return resolvePath(page, "attachments", filename);
 }
@@ -54,6 +58,38 @@ async function isFile(path: string) {
   }
   return stat?.isFile();
 }
+
+function hasMimetype(path: string, mimetype: string) {
+  const mimetypeFile = mime.getType(path);
+  if (!mimetypeFile) {
+    return false;
+  }
+
+  const [p1, p2] = mimetypeFile.split("/");
+  const [q1, q2] = mimetype.split("/");
+  return (q1 == "*" || q1 == p1) && (q2 == "*" || q2 == p2);
+}
+
+async function isAttachment(path: string, mimetype?: string) {
+  if (!(await isFile(path))) {
+    return false;
+  }
+
+  const isInAttachmentsDirectory = basename(dirname(path)) == "attachments";
+  if (isInAttachmentsDirectory && mimetype) {
+    return hasMimetype(path, mimetype);
+  }
+  return isInAttachmentsDirectory;
+}
+
+async function isPage(path: string) {
+  if (!(await isFile(path))) {
+    return false;
+  }
+
+  return basename(path) == "page.json";
+}
+
 async function isDirectory(path: string) {
   let stat = undefined;
   try {
@@ -73,7 +109,9 @@ async function pathExists(path: string) {
   return true;
 }
 
-async function readPage(path: string): Promise<PageData | undefined> {
+async function readPage(
+  path: string,
+): Promise<{ type: EntityType.DOCUMENT; value: PageData } | undefined> {
   if (!(await isWithin(HOME_PATH_FULL, path))) {
     throw new Error(`[${path}] is not in in [${HOME_PATH_FULL}]`);
   }
@@ -86,9 +124,13 @@ async function readPage(path: string): Promise<PageData | undefined> {
       parse.name = basename(dirname(path));
     }
     return {
-      ...parse,
-      lastAuthor: { name: os.userInfo().username },
-      lastModificationDate: new Date(pageStats.mtimeMs),
+      type: EntityType.DOCUMENT,
+      value: {
+        ...parse,
+        lastAuthor: { name: os.userInfo().username },
+        lastModificationDate: new Date(pageStats.mtimeMs),
+        id: relative(HOME_PATH_FULL, dirname(path)),
+      },
     };
   } else {
     return undefined;
@@ -102,12 +144,14 @@ async function readAttachments(
     throw new Error(`[${path}] is not in in [${HOME_PATH_FULL}]`);
   }
   if (await isDirectory(path)) {
-    const pageContent = await fs.promises.readdir(path);
+    const attachments = await fs.promises.readdir(path);
     return (
       await Promise.all(
-        pageContent.map((attachment) => readAttachment(join(path, attachment))),
+        attachments.map((attachment) => readAttachment(join(path, attachment))),
       )
-    ).filter((it) => it !== undefined);
+    )
+      .filter((it) => it !== undefined)
+      .map((it) => it.value);
   } else {
     return undefined;
   }
@@ -115,7 +159,7 @@ async function readAttachments(
 
 async function readAttachment(
   path: string,
-): Promise<PageAttachment | undefined> {
+): Promise<{ type: EntityType.ATTACHMENT; value: PageAttachment } | undefined> {
   if (!(await isWithin(HOME_PATH_FULL, path))) {
     throw new Error(`[${path}] is not in in [${HOME_PATH_FULL}]`);
   }
@@ -124,13 +168,16 @@ async function readAttachment(
     const stats = await fs.promises.stat(path);
     const mimetype = mime.getType(path) || "";
     return {
-      id: basename(path),
-      mimetype,
-      reference: basename(path),
-      href: `${cristalFSProtocol}://${relative(HOME_PATH_FULL, path)}`,
-      date: stats.mtime,
-      size: stats.size,
-      author: undefined,
+      type: EntityType.ATTACHMENT,
+      value: {
+        id: basename(path),
+        mimetype,
+        reference: relative(HOME_PATH_FULL, path),
+        href: `${cristalFSProtocol}://${relative(HOME_PATH_FULL, path)}`,
+        date: stats.mtime,
+        size: stats.size,
+        author: undefined,
+      },
     };
   } else {
     return undefined;
@@ -187,7 +234,7 @@ async function savePage(
   // Set the flag to w+ so that the file is created if it does not already
   // exist, or fully replaced when it does.
   await fs.promises.writeFile(path, newJSON, { flag: "w+" });
-  return readPage(path);
+  return (await readPage(path))?.value;
 }
 
 async function saveAttachment(path: string, filePath: string) {
@@ -236,6 +283,59 @@ async function deletePage(path: string): Promise<void> {
   await shell.trashItem(path.replace(/\/page.json$/, ""));
 }
 
+async function asyncFilter<T>(arr: T[], predicate: (i: T) => Promise<boolean>) {
+  // First compute the async result for each element
+  const results = await Promise.all(arr.map(predicate));
+
+  // The filter out on the async results, retrieving the async results by index
+  return arr.filter((_v, index) => results[index]);
+}
+
+async function search(
+  query: string,
+  type?: LinkType,
+  mimetype?: string,
+): Promise<
+  (
+    | { type: EntityType.ATTACHMENT; value: PageAttachment }
+    | { type: EntityType.DOCUMENT; value: PageData }
+  )[]
+> {
+  const attachments = (await readdir(HOME_PATH_FULL, { recursive: true })).map(
+    (it) => join(HOME_PATH_FULL, it),
+  );
+  const allEntities = await asyncFilter(attachments, async (path: string) => {
+    if (type == LinkType.ATTACHMENT) {
+      return isAttachment(path, mimetype);
+    } else if (type == LinkType.PAGE) {
+      return isPage(path);
+    } else {
+      return (await isAttachment(path, mimetype)) || (await isPage(path)); // TODO: filter out
+    }
+  });
+
+  const searchedEntities = await asyncFilter(allEntities, async (it) => {
+    if (await isAttachment(it)) {
+      return basename(it).includes(query);
+    } else if (await isPage(it)) {
+      return basename(dirname(it)).includes(query);
+    } else {
+      return false;
+    }
+  });
+  return (
+    await Promise.all(
+      searchedEntities.map(async (it) => {
+        if (await isPage(it)) {
+          return readPage(it);
+        } else {
+          return readAttachment(it);
+        }
+      }),
+    )
+  ).filter((it) => it !== undefined);
+}
+
 // TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule.
 // eslint-disable-next-line max-statements
 export default function load(): void {
@@ -256,14 +356,14 @@ export default function load(): void {
   ipcMain.handle("resolveAttachmentsPath", (event, { page }) => {
     return resolveAttachmentsPath(page);
   });
-  ipcMain.handle("readPage", (event, { path }) => {
-    return readPage(path);
+  ipcMain.handle("readPage", async (event, { path }) => {
+    return (await readPage(path))?.value;
   });
   ipcMain.handle("readAttachments", (event, { path }) => {
     return readAttachments(path);
   });
-  ipcMain.handle("readAttachment", (event, { path }) => {
-    return readAttachment(path);
+  ipcMain.handle("readAttachment", async (event, { path }) => {
+    return (await readAttachment(path))?.value;
   });
   ipcMain.handle("savePage", (event, { path, content, title }) => {
     return savePage(path, content, title);
@@ -280,4 +380,7 @@ export default function load(): void {
   ipcMain.handle("deletePage", (event, { path }) => {
     return deletePage(path);
   });
+  ipcMain.handle("search", (event, { query, type, mimetype }) => {
+    return search(query, type, mimetype);
+  });
 }
diff --git a/electron/storage/src/electron/preload/apiTypes.ts b/electron/storage/src/electron/preload/apiTypes.ts
index bef62f43d..a893e2682 100644
--- a/electron/storage/src/electron/preload/apiTypes.ts
+++ b/electron/storage/src/electron/preload/apiTypes.ts
@@ -19,6 +19,8 @@
  */
 
 import { PageAttachment, PageData } from "@xwiki/cristal-api";
+import { LinkType } from "@xwiki/cristal-link-suggest-api";
+import { EntityType } from "@xwiki/cristal-model-api";
 
 export interface APITypes {
   resolvePath(page: string): Promise<string>;
@@ -40,4 +42,22 @@ export interface APITypes {
   listChildren(page: string): Promise<Array<string>>;
 
   deletePage(path: string): Promise<void>;
+
+  /**
+   *
+   * @param query - search query
+   * @param type - the type of attach
+   * @param mimetype - the expected mimetype, only applied for attachments
+   * @since 0.13
+   */
+  search(
+    query: string,
+    type?: LinkType,
+    mimetype?: string,
+  ): Promise<
+    (
+      | { type: EntityType.ATTACHMENT; value: PageAttachment }
+      | { type: EntityType.DOCUMENT; value: PageData }
+    )[]
+  >;
 }
diff --git a/electron/storage/src/electron/preload/index.ts b/electron/storage/src/electron/preload/index.ts
index 595674782..8243bf515 100644
--- a/electron/storage/src/electron/preload/index.ts
+++ b/electron/storage/src/electron/preload/index.ts
@@ -20,6 +20,8 @@
 
 import { APITypes } from "./apiTypes";
 import { PageAttachment, PageData } from "@xwiki/cristal-api";
+import { LinkType } from "@xwiki/cristal-link-suggest-api";
+import { EntityType } from "@xwiki/cristal-model-api";
 import { contextBridge, ipcRenderer, webUtils } from "electron";
 
 const api: APITypes = {
@@ -59,5 +61,17 @@ const api: APITypes = {
   deletePage(path: string): Promise<void> {
     return ipcRenderer.invoke("deletePage", { path });
   },
+  search(
+    query: string,
+    type?: LinkType,
+    mimetype?: string,
+  ): Promise<
+    (
+      | { type: EntityType.ATTACHMENT; value: PageAttachment }
+      | { type: EntityType.DOCUMENT; value: PageData }
+    )[]
+  > {
+    return ipcRenderer.invoke("search", { query, type, mimetype });
+  },
 };
 contextBridge.exposeInMainWorld("fileSystemStorage", api);
diff --git a/lib/package.json b/lib/package.json
index d89dcb1a6..3153229b0 100644
--- a/lib/package.json
+++ b/lib/package.json
@@ -63,6 +63,7 @@
     "@xwiki/cristal-link-suggest-nextcloud": "workspace:*",
     "@xwiki/cristal-link-suggest-xwiki": "workspace:*",
     "@xwiki/cristal-macros": "workspace:*",
+    "@xwiki/cristal-markdown-default": "workspace:*",
     "@xwiki/cristal-model-click-listener": "workspace:*",
     "@xwiki/cristal-model-reference-api": "workspace:*",
     "@xwiki/cristal-model-reference-nextcloud": "workspace:*",
diff --git a/lib/src/staticBuild.ts b/lib/src/staticBuild.ts
index 713e4a288..fd1cd3814 100644
--- a/lib/src/staticBuild.ts
+++ b/lib/src/staticBuild.ts
@@ -49,6 +49,7 @@ import { ComponentInit as LinkSuggestComponentInit } from "@xwiki/cristal-link-s
 import { ComponentInit as NextcloudLinkSuggestComponentInit } from "@xwiki/cristal-link-suggest-nextcloud";
 import { ComponentInit as XWikiLinkSuggestComponentInit } from "@xwiki/cristal-link-suggest-xwiki";
 import { ComponentInit as MacrosComponentInit } from "@xwiki/cristal-macros";
+import { ComponentInit as MarkdownDefaultComponentInit } from "@xwiki/cristal-markdown-default";
 import { ComponentInit as ClickListenerComponentInit } from "@xwiki/cristal-model-click-listener";
 import { ComponentInit as ModelReferenceAPIComponentInit } from "@xwiki/cristal-model-reference-api";
 import { ComponentInit as ModelReferenceNextcloudComponentInit } from "@xwiki/cristal-model-reference-nextcloud";
@@ -128,6 +129,7 @@ export class StaticBuild {
       new ModelReferenceNextcloudComponentInit(container);
       new ModelReferenceXWikiComponentInit(container);
       new DateAPIComponentInit(container);
+      new MarkdownDefaultComponentInit(container);
     }
     if (additionalComponents) {
       additionalComponents(container);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 77f8f852b..78b0cb4ef 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -274,6 +274,9 @@ importers:
       '@xwiki/cristal-date-ui':
         specifier: workspace:*
         version: link:../../date/date-ui
+      '@xwiki/cristal-document-api':
+        specifier: workspace:*
+        version: link:../../document/document-api
       '@xwiki/cristal-dsapi':
         specifier: workspace:*
         version: link:../../../ds/api
@@ -286,9 +289,15 @@ importers:
       '@xwiki/cristal-info-actions-api':
         specifier: workspace:*
         version: link:../../info-actions/info-actions-api
+      '@xwiki/cristal-model-api':
+        specifier: workspace:*
+        version: link:../../model/model-api
       '@xwiki/cristal-model-click-listener':
         specifier: workspace:*
         version: link:../../model/model-click-listener
+      '@xwiki/cristal-model-reference-api':
+        specifier: workspace:*
+        version: link:../../model/model-reference/model-reference-api
       '@xwiki/cristal-uiextension-api':
         specifier: workspace:*
         version: link:../../uiextension/uiextension-api
@@ -355,6 +364,15 @@ importers:
         specifier: 6.0.3
         version: 6.0.3(@types/node@22.10.2)(tsx@4.19.2)(yaml@2.6.1)
 
+  core/authentication/authentication-nextcloud:
+    devDependencies:
+      typescript:
+        specifier: 5.6.3
+        version: 5.6.3
+      vite:
+        specifier: 6.0.3
+        version: 6.0.3(@types/node@22.10.2)(tsx@4.19.2)(yaml@2.6.1)
+
   core/authentication/authentication-ui:
     dependencies:
       '@xwiki/cristal-api':
@@ -515,6 +533,9 @@ importers:
       '@xwiki/cristal-authentication-api':
         specifier: workspace:*
         version: link:../../authentication/authentication-api
+      '@xwiki/cristal-authentication-nextcloud':
+        specifier: workspace:*
+        version: link:../../authentication/authentication-nextcloud
       '@xwiki/cristal-backend-api':
         specifier: workspace:*
         version: link:../backend-api
@@ -650,6 +671,9 @@ importers:
       '@xwiki/cristal-api':
         specifier: workspace:*
         version: link:../../../api
+      '@xwiki/cristal-model-api':
+        specifier: workspace:*
+        version: link:../../model/model-api
       vue:
         specifier: 3.5.13
         version: 3.5.13(typescript@5.6.3)
@@ -669,6 +693,12 @@ importers:
       '@xwiki/cristal-document-api':
         specifier: workspace:*
         version: link:../document-api
+      '@xwiki/cristal-model-api':
+        specifier: workspace:*
+        version: link:../../model/model-api
+      '@xwiki/cristal-model-reference-api':
+        specifier: workspace:*
+        version: link:../../model/model-reference/model-reference-api
       inversify:
         specifier: 6.2.0
         version: 6.2.0(reflect-metadata@0.2.2)
@@ -1194,6 +1224,9 @@ importers:
       '@xwiki/cristal-api':
         specifier: workspace:*
         version: link:../../../api
+      '@xwiki/cristal-authentication-nextcloud':
+        specifier: workspace:*
+        version: link:../../authentication/authentication-nextcloud
       '@xwiki/cristal-link-suggest-api':
         specifier: workspace:*
         version: link:../link-suggest-api
@@ -1222,13 +1255,69 @@ importers:
       '@xwiki/cristal-api':
         specifier: workspace:*
         version: link:../../../api
+      '@xwiki/cristal-authentication-api':
+        specifier: workspace:*
+        version: link:../../authentication/authentication-api
       '@xwiki/cristal-link-suggest-api':
         specifier: workspace:*
         version: link:../link-suggest-api
+      '@xwiki/cristal-model-reference-api':
+        specifier: workspace:*
+        version: link:../../model/model-reference/model-reference-api
+      '@xwiki/cristal-model-remote-url-api':
+        specifier: workspace:*
+        version: link:../../model/model-remote-url/model-remote-url-api
+      inversify:
+        specifier: 6.2.0
+        version: 6.2.0(reflect-metadata@0.2.2)
+    devDependencies:
+      reflect-metadata:
+        specifier: 0.2.2
+        version: 0.2.2
+      typescript:
+        specifier: 5.6.3
+        version: 5.6.3
+      vite:
+        specifier: 6.0.3
+        version: 6.0.3(@types/node@22.10.2)(tsx@4.19.2)(yaml@2.6.1)
+
+  core/markdown/markdown-api:
+    dependencies:
+      '@xwiki/cristal-document-api':
+        specifier: workspace:*
+        version: link:../../document/document-api
+    devDependencies:
+      typescript:
+        specifier: 5.6.3
+        version: 5.6.3
+      vite:
+        specifier: 6.0.3
+        version: 6.0.3(@types/node@22.10.2)(tsx@4.19.2)(yaml@2.6.1)
+
+  core/markdown/markdown-default:
+    dependencies:
+      '@xwiki/cristal-markdown-api':
+        specifier: workspace:*
+        version: link:../markdown-api
+      '@xwiki/cristal-model-api':
+        specifier: workspace:*
+        version: link:../../model/model-api
+      '@xwiki/cristal-model-reference-api':
+        specifier: workspace:*
+        version: link:../../model/model-reference/model-reference-api
+      '@xwiki/cristal-model-remote-url-api':
+        specifier: workspace:*
+        version: link:../../model/model-remote-url/model-remote-url-api
       inversify:
         specifier: 6.2.0
         version: 6.2.0(reflect-metadata@0.2.2)
+      markdown-it:
+        specifier: 14.1.0
+        version: 14.1.0
     devDependencies:
+      '@types/markdown-it':
+        specifier: 14.1.2
+        version: 14.1.2
       reflect-metadata:
         specifier: 0.2.2
         version: 0.2.2
@@ -1369,6 +1458,9 @@ importers:
 
   core/model/model-reference/model-reference-xwiki:
     dependencies:
+      '@xwiki/cristal-document-api':
+        specifier: workspace:*
+        version: link:../../../document/document-api
       '@xwiki/cristal-model-api':
         specifier: workspace:*
         version: link:../../model-api
@@ -1378,7 +1470,13 @@ importers:
       inversify:
         specifier: 6.2.0
         version: 6.2.0(reflect-metadata@0.2.2)
+      lodash:
+        specifier: 4.17.21
+        version: 4.17.21
     devDependencies:
+      '@types/lodash':
+        specifier: 4.17.13
+        version: 4.17.13
       reflect-metadata:
         specifier: 0.2.2
         version: 0.2.2
@@ -1391,6 +1489,12 @@ importers:
       vitest:
         specifier: 2.1.8
         version: 2.1.8(@types/node@22.10.2)(happy-dom@15.11.7)
+      vitest-mock-extended:
+        specifier: 2.0.2
+        version: 2.0.2(typescript@5.6.3)(vitest@2.1.8(@types/node@22.10.2)(happy-dom@15.11.7))
+      vue:
+        specifier: 3.5.13
+        version: 3.5.13(typescript@5.6.3)
 
   core/model/model-remote-url/model-remote-url-api:
     dependencies:
@@ -1450,6 +1554,12 @@ importers:
 
   core/model/model-remote-url/model-remote-url-nextcloud:
     dependencies:
+      '@xwiki/cristal-api':
+        specifier: workspace:*
+        version: link:../../../../api
+      '@xwiki/cristal-authentication-nextcloud':
+        specifier: workspace:*
+        version: link:../../../authentication/authentication-nextcloud
       '@xwiki/cristal-model-api':
         specifier: workspace:*
         version: link:../../model-api
@@ -1597,6 +1707,9 @@ importers:
       '@xwiki/cristal-api':
         specifier: workspace:*
         version: link:../../../api
+      '@xwiki/cristal-authentication-nextcloud':
+        specifier: workspace:*
+        version: link:../../authentication/authentication-nextcloud
       '@xwiki/cristal-model-api':
         specifier: workspace:*
         version: link:../../model/model-api
@@ -1747,6 +1860,92 @@ importers:
         specifier: 2.1.10
         version: 2.1.10(typescript@5.6.3)
 
+  core/tiptap-extensions/tiptap-extension-image:
+    dependencies:
+      '@tiptap/extension-image':
+        specifier: 2.10.3
+        version: 2.10.3(@tiptap/core@2.10.3(@tiptap/pm@2.10.3))
+      '@tiptap/pm':
+        specifier: 2.10.3
+        version: 2.10.3
+      '@tiptap/vue-3':
+        specifier: 2.10.3
+        version: 2.10.3(@tiptap/core@2.10.3(@tiptap/pm@2.10.3))(@tiptap/pm@2.10.3)(vue@3.5.13(typescript@5.6.3))
+      '@xwiki/cristal-api':
+        specifier: workspace:*
+        version: link:../../../api
+      '@xwiki/cristal-attachments-api':
+        specifier: workspace:*
+        version: link:../../attachments/attachments-api
+      '@xwiki/cristal-document-api':
+        specifier: workspace:*
+        version: link:../../document/document-api
+      '@xwiki/cristal-link-suggest-api':
+        specifier: workspace:*
+        version: link:../../link-suggest/link-suggest-api
+      '@xwiki/cristal-model-api':
+        specifier: workspace:*
+        version: link:../../model/model-api
+      '@xwiki/cristal-model-reference-api':
+        specifier: workspace:*
+        version: link:../../model/model-reference/model-reference-api
+      '@xwiki/cristal-model-remote-url-api':
+        specifier: workspace:*
+        version: link:../../model/model-remote-url/model-remote-url-api
+      '@xwiki/cristal-tiptap-link-suggest-ui':
+        specifier: workspace:*
+        version: link:../tiptap-link-suggest-ui
+      lodash:
+        specifier: 4.17.21
+        version: 4.17.21
+      prosemirror-markdown:
+        specifier: 1.13.1
+        version: 1.13.1
+      reflect-metadata:
+        specifier: 0.2.2
+        version: 0.2.2
+      vue-tippy:
+        specifier: 6.5.0
+        version: 6.5.0(vue@3.5.13(typescript@5.6.3))
+      vue3-draggable-resizable:
+        specifier: 1.6.5
+        version: 1.6.5
+    devDependencies:
+      '@tiptap/core':
+        specifier: 2.10.3
+        version: 2.10.3(@tiptap/pm@2.10.3)
+      '@types/lodash':
+        specifier: 4.17.13
+        version: 4.17.13
+      vue:
+        specifier: 3.5.13
+        version: 3.5.13(typescript@5.6.3)
+      vue-tsc:
+        specifier: 2.1.10
+        version: 2.1.10(typescript@5.6.3)
+
+  core/tiptap-extensions/tiptap-link-suggest-ui:
+    dependencies:
+      '@tiptap/core':
+        specifier: 2.10.3
+        version: 2.10.3(@tiptap/pm@2.10.3)
+      '@xwiki/cristal-icons':
+        specifier: workspace:*
+        version: link:../../icons
+      '@xwiki/cristal-link-suggest-api':
+        specifier: workspace:*
+        version: link:../../link-suggest/link-suggest-api
+      reflect-metadata:
+        specifier: 0.2.2
+        version: 0.2.2
+    devDependencies:
+      vue:
+        specifier: 3.5.13
+        version: 3.5.13(typescript@5.6.3)
+      vue-tsc:
+        specifier: 2.1.10
+        version: 2.1.10(typescript@5.6.3)
+
   core/uiextension/uiextension-api:
     dependencies:
       vue:
@@ -2033,9 +2232,6 @@ importers:
       '@tiptap/extension-heading':
         specifier: 2.10.3
         version: 2.10.3(@tiptap/core@2.10.3(@tiptap/pm@2.10.3))
-      '@tiptap/extension-image':
-        specifier: 2.10.3
-        version: 2.10.3(@tiptap/core@2.10.3(@tiptap/pm@2.10.3))
       '@tiptap/extension-link':
         specifier: 2.10.3
         version: 2.10.3(@tiptap/core@2.10.3(@tiptap/pm@2.10.3))(@tiptap/pm@2.10.3)
@@ -2081,12 +2277,27 @@ importers:
       '@xwiki/cristal-link-suggest-api':
         specifier: workspace:*
         version: link:../../core/link-suggest/link-suggest-api
+      '@xwiki/cristal-markdown-default':
+        specifier: workspace:*
+        version: link:../../core/markdown/markdown-default
+      '@xwiki/cristal-model-api':
+        specifier: workspace:*
+        version: link:../../core/model/model-api
       '@xwiki/cristal-model-reference-api':
         specifier: workspace:*
         version: link:../../core/model/model-reference/model-reference-api
+      '@xwiki/cristal-model-remote-url-api':
+        specifier: workspace:*
+        version: link:../../core/model/model-remote-url/model-remote-url-api
       '@xwiki/cristal-skin':
         specifier: workspace:*
         version: link:../../skin
+      '@xwiki/cristal-tiptap-extension-image':
+        specifier: workspace:*
+        version: link:../../core/tiptap-extensions/tiptap-extension-image
+      '@xwiki/cristal-tiptap-link-suggest-ui':
+        specifier: workspace:*
+        version: link:../../core/tiptap-extensions/tiptap-link-suggest-ui
       avvvatars-vue:
         specifier: 1.1.0
         version: 1.1.0(patch_hash=usix32k57inq7lu5l5hlwk33gm)(vue@3.5.13(typescript@5.6.3))
@@ -2120,9 +2331,6 @@ importers:
       vue:
         specifier: 3.5.13
         version: 3.5.13(typescript@5.6.3)
-      vue-router:
-        specifier: 4.5.0
-        version: 4.5.0(vue@3.5.13(typescript@5.6.3))
       yjs:
         specifier: 13.6.20
         version: 13.6.20
@@ -2259,6 +2467,37 @@ importers:
         specifier: 6.0.3
         version: 6.0.3(@types/node@22.10.2)(tsx@4.19.2)(yaml@2.6.1)
 
+  electron/link-suggest/link-suggest-filesystem:
+    dependencies:
+      '@xwiki/cristal-api':
+        specifier: workspace:*
+        version: link:../../../api
+      '@xwiki/cristal-link-suggest-api':
+        specifier: workspace:*
+        version: link:../../../core/link-suggest/link-suggest-api
+      '@xwiki/cristal-model-api':
+        specifier: workspace:*
+        version: link:../../../core/model/model-api
+      '@xwiki/cristal-model-reference-api':
+        specifier: workspace:*
+        version: link:../../../core/model/model-reference/model-reference-api
+      '@xwiki/cristal-model-remote-url-api':
+        specifier: workspace:*
+        version: link:../../../core/model/model-remote-url/model-remote-url-api
+      inversify:
+        specifier: 6.2.0
+        version: 6.2.0(reflect-metadata@0.2.2)
+    devDependencies:
+      reflect-metadata:
+        specifier: 0.2.2
+        version: 0.2.2
+      typescript:
+        specifier: 5.6.3
+        version: 5.6.3
+      vite:
+        specifier: 6.0.3
+        version: 6.0.3(@types/node@22.10.2)(tsx@4.19.2)(yaml@2.6.1)
+
   electron/main:
     dependencies:
       '@xwiki/cristal-browser-electron':
@@ -2326,6 +2565,9 @@ importers:
       '@xwiki/cristal-lib':
         specifier: workspace:*
         version: link:../../lib
+      '@xwiki/cristal-link-suggest-filesystem':
+        specifier: workspace:*
+        version: link:../link-suggest/link-suggest-filesystem
       '@xwiki/cristal-model-reference-filesystem':
         specifier: workspace:*
         version: link:../../core/model/model-reference/model-reference-filesystem
@@ -2363,6 +2605,12 @@ importers:
       '@xwiki/cristal-backend-api':
         specifier: workspace:*
         version: link:../../core/backends/backend-api
+      '@xwiki/cristal-link-suggest-api':
+        specifier: workspace:*
+        version: link:../../core/link-suggest/link-suggest-api
+      '@xwiki/cristal-model-api':
+        specifier: workspace:*
+        version: link:../../core/model/model-api
       '@xwiki/cristal-model-remote-url-filesystem-api':
         specifier: workspace:*
         version: link:../../core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-api
@@ -2552,6 +2800,9 @@ importers:
       '@xwiki/cristal-macros':
         specifier: workspace:*
         version: link:../macros
+      '@xwiki/cristal-markdown-default':
+        specifier: workspace:*
+        version: link:../core/markdown/markdown-default
       '@xwiki/cristal-model-click-listener':
         specifier: workspace:*
         version: link:../core/model/model-click-listener
@@ -2861,6 +3112,9 @@ importers:
       '@xwiki/cristal-info-actions-ui':
         specifier: workspace:*
         version: link:../core/info-actions/info-actions-ui
+      '@xwiki/cristal-markdown-api':
+        specifier: workspace:*
+        version: link:../core/markdown/markdown-api
       '@xwiki/cristal-model-api':
         specifier: workspace:*
         version: link:../core/model/model-api
@@ -2888,9 +3142,6 @@ importers:
       inversify:
         specifier: 6.2.0
         version: 6.2.0(reflect-metadata@0.2.2)
-      marked:
-        specifier: 15.0.4
-        version: 15.0.4
       reflect-metadata:
         specifier: 0.2.2
         version: 0.2.2
@@ -2913,6 +3164,9 @@ importers:
       '@xwiki/cristal-dev-test-utils':
         specifier: workspace:*
         version: link:../dev/test-utils
+      ts-essentials:
+        specifier: 10.0.3
+        version: 10.0.3(typescript@5.6.3)
       typescript:
         specifier: 5.6.3
         version: 5.6.3
@@ -2922,6 +3176,9 @@ importers:
       vitest:
         specifier: 2.1.8
         version: 2.1.8(@types/node@22.10.2)(happy-dom@15.11.7)
+      vitest-mock-extended:
+        specifier: 2.0.2
+        version: 2.0.2(typescript@5.6.3)(vitest@2.1.8(@types/node@22.10.2)(happy-dom@15.11.7))
       vue-tsc:
         specifier: 2.1.10
         version: 2.1.10(typescript@5.6.3)
@@ -3121,11 +3378,6 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/parser@7.25.7':
-    resolution: {integrity: sha512-aZn7ETtQsjjGG5HruveUK06cU3Hljuhd9Iojm4M8WWv3wLE6OkE5PWbDUkItmMgegmccaITudyuW5RPYrYlgWw==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-
   '@babel/parser@7.26.3':
     resolution: {integrity: sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==}
     engines: {node: '>=6.0.0'}
@@ -4634,15 +4886,9 @@ packages:
   '@volar/typescript@2.4.8':
     resolution: {integrity: sha512-6xkIYJ5xxghVBhVywMoPMidDDAFT1OoQeXwa27HSgJ6AiIKRe61RXLoik+14Z7r0JvnblXVsjsRLmCr42SGzqg==}
 
-  '@vue/compiler-core@3.5.12':
-    resolution: {integrity: sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==}
-
   '@vue/compiler-core@3.5.13':
     resolution: {integrity: sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==}
 
-  '@vue/compiler-dom@3.5.12':
-    resolution: {integrity: sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==}
-
   '@vue/compiler-dom@3.5.13':
     resolution: {integrity: sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==}
 
@@ -4688,9 +4934,6 @@ packages:
     peerDependencies:
       vue: 3.5.13
 
-  '@vue/shared@3.5.12':
-    resolution: {integrity: sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==}
-
   '@vue/shared@3.5.13':
     resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==}
 
@@ -7192,9 +7435,6 @@ packages:
   prosemirror-keymap@1.2.2:
     resolution: {integrity: sha512-EAlXoksqC6Vbocqc0GtzCruZEzYgrn+iiGnNjsJsH4mrnIGex4qbLdWWNza3AW5W36ZRrlBID0eM6bdKH4OStQ==}
 
-  prosemirror-markdown@1.12.0:
-    resolution: {integrity: sha512-6F5HS8Z0HDYiS2VQDZzfZP6A0s/I0gbkJy8NCzzDMtcsz3qrfqyroMMeoSjAmOhDITyon11NbXSzztfKi+frSQ==}
-
   prosemirror-markdown@1.13.1:
     resolution: {integrity: sha512-Sl+oMfMtAjWtlcZoj/5L/Q39MpEnVZ840Xo330WJWUvgyhNmLBLN7MsHn07s53nG/KImevWHSE6fEj4q/GihHw==}
 
@@ -8143,12 +8383,20 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
+  vue-tippy@6.5.0:
+    resolution: {integrity: sha512-U44UDETTLuZWZGosagslEwgimWQdt1JVSxfWStVPnVdeqo2jo9X5zW3SB04k7JaTFosdgrDhFsUDrd6n42Nh7Q==}
+    peerDependencies:
+      vue: ^3.2.0
+
   vue-tsc@2.1.10:
     resolution: {integrity: sha512-RBNSfaaRHcN5uqVqJSZh++Gy/YUzryuv9u1aFWhsammDJXNtUiJMNoJ747lZcQ68wUQFx6E73y4FY3D8E7FGMA==}
     hasBin: true
     peerDependencies:
       typescript: '>=5.0.0'
 
+  vue3-draggable-resizable@1.6.5:
+    resolution: {integrity: sha512-31142E31fGNnq3HKqvmFLSsqIbhck7TyGuQWhUKrDw6DOcGAuRx4ddRjaxvT6fe7dgeKH53qAh+i0ZlWtPLl2g==}
+
   vue@3.5.13:
     resolution: {integrity: sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==}
     peerDependencies:
@@ -8392,10 +8640,6 @@ snapshots:
     dependencies:
       '@babel/types': 7.24.0
 
-  '@babel/parser@7.25.7':
-    dependencies:
-      '@babel/types': 7.26.3
-
   '@babel/parser@7.26.3':
     dependencies:
       '@babel/types': 7.26.3
@@ -8407,7 +8651,7 @@ snapshots:
   '@babel/template@7.24.0':
     dependencies:
       '@babel/code-frame': 7.24.2
-      '@babel/parser': 7.24.4
+      '@babel/parser': 7.26.3
       '@babel/types': 7.24.0
 
   '@babel/traverse@7.23.7':
@@ -9933,14 +10177,6 @@ snapshots:
       path-browserify: 1.0.1
       vscode-uri: 3.0.8
 
-  '@vue/compiler-core@3.5.12':
-    dependencies:
-      '@babel/parser': 7.26.3
-      '@vue/shared': 3.5.12
-      entities: 4.5.0
-      estree-walker: 2.0.2
-      source-map-js: 1.2.1
-
   '@vue/compiler-core@3.5.13':
     dependencies:
       '@babel/parser': 7.26.3
@@ -9949,11 +10185,6 @@ snapshots:
       estree-walker: 2.0.2
       source-map-js: 1.2.1
 
-  '@vue/compiler-dom@3.5.12':
-    dependencies:
-      '@vue/compiler-core': 3.5.12
-      '@vue/shared': 3.5.12
-
   '@vue/compiler-dom@3.5.13':
     dependencies:
       '@vue/compiler-core': 3.5.13
@@ -9961,7 +10192,7 @@ snapshots:
 
   '@vue/compiler-sfc@3.5.13':
     dependencies:
-      '@babel/parser': 7.25.7
+      '@babel/parser': 7.26.3
       '@vue/compiler-core': 3.5.13
       '@vue/compiler-dom': 3.5.13
       '@vue/compiler-ssr': 3.5.13
@@ -9986,9 +10217,9 @@ snapshots:
   '@vue/language-core@2.1.10(typescript@5.6.3)':
     dependencies:
       '@volar/language-core': 2.4.8
-      '@vue/compiler-dom': 3.5.12
+      '@vue/compiler-dom': 3.5.13
       '@vue/compiler-vue2': 2.7.16
-      '@vue/shared': 3.5.12
+      '@vue/shared': 3.5.13
       alien-signals: 0.2.0
       minimatch: 9.0.4
       muggle-string: 0.4.1
@@ -10031,8 +10262,6 @@ snapshots:
       '@vue/shared': 3.5.13
       vue: 3.5.13(typescript@5.6.3)
 
-  '@vue/shared@3.5.12': {}
-
   '@vue/shared@3.5.13': {}
 
   '@vue/test-utils@2.4.6':
@@ -12958,11 +13187,6 @@ snapshots:
       prosemirror-state: 1.4.3
       w3c-keyname: 2.2.8
 
-  prosemirror-markdown@1.12.0:
-    dependencies:
-      markdown-it: 14.1.0
-      prosemirror-model: 1.23.0
-
   prosemirror-markdown@1.13.1:
     dependencies:
       '@types/markdown-it': 14.1.2
@@ -13591,7 +13815,7 @@ snapshots:
       '@types/markdown-it': 13.0.8
       markdown-it: 14.1.0
       markdown-it-task-lists: 2.1.1
-      prosemirror-markdown: 1.12.0
+      prosemirror-markdown: 1.13.1
 
   tmp-promise@3.0.3:
     dependencies:
@@ -14007,6 +14231,11 @@ snapshots:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.13(typescript@5.6.3)
 
+  vue-tippy@6.5.0(vue@3.5.13(typescript@5.6.3)):
+    dependencies:
+      tippy.js: 6.3.7
+      vue: 3.5.13(typescript@5.6.3)
+
   vue-tsc@2.1.10(typescript@5.6.3):
     dependencies:
       '@volar/typescript': 2.4.8
@@ -14014,6 +14243,8 @@ snapshots:
       semver: 7.6.3
       typescript: 5.6.3
 
+  vue3-draggable-resizable@1.6.5: {}
+
   vue@3.5.13(typescript@5.6.3):
     dependencies:
       '@vue/compiler-dom': 3.5.13
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index a1931eb67..07ce103da 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -31,6 +31,7 @@ packages:
   - "core/icons"
   - "core/info-actions/*"
   - "core/link-suggest/*"
+  - "core/markdown/*"
   - "core/model/model-api"
   - "core/model/model-click-listener"
   - "core/model/model-local-url"
@@ -39,6 +40,7 @@ packages:
   - "core/model/model-remote-url/model-remote-url-filesystem/*"
   - "core/navigation-tree/*"
   - "core/page-actions/*"
+  - "core/tiptap-extensions/*"
   - "core/uiextension/*"
   - "core/user/*"
   - "core/xwiki/*"
@@ -55,6 +57,7 @@ packages:
   - "electron/renderer"
   - "electron/storage"
   - "electron/browser"
+  - "electron/link-suggest/*"
   - "extension-manager"
   - "extensions/menubuttons"
   - "lib"
diff --git a/rendering/rendering/src/components/MarkdownToHTMLConverter.ts b/rendering/rendering/src/components/MarkdownToHTMLConverter.ts
index 477759f5a..e53e9a16c 100644
--- a/rendering/rendering/src/components/MarkdownToHTMLConverter.ts
+++ b/rendering/rendering/src/components/MarkdownToHTMLConverter.ts
@@ -26,6 +26,11 @@ import { baseUrl } from "marked-base-url";
 import type { Converter } from "../api/converter";
 import type { Logger, WikiConfig } from "@xwiki/cristal-api";
 
+/**
+ * @deprecated use \@xwiki/cristal-markdown-api and \@xwiki/cristal-markdown-default instead, the macro parsing
+ * implemented using marked should be migrated from marked to markdown-it. We move to markdown-it because it is easier
+ * to integrate with tiptap.
+ */
 @injectable()
 export class MarkdownToHTMLConverter implements Converter {
   public static converterName = "md_html";
diff --git a/skin/package.json b/skin/package.json
index e362593ab..9a62e317e 100644
--- a/skin/package.json
+++ b/skin/package.json
@@ -39,6 +39,7 @@
     "@xwiki/cristal-icons": "workspace:*",
     "@xwiki/cristal-info-actions-api": "workspace:*",
     "@xwiki/cristal-info-actions-ui": "workspace:*",
+    "@xwiki/cristal-markdown-api": "workspace:*",
     "@xwiki/cristal-model-api": "workspace:*",
     "@xwiki/cristal-model-click-listener": "workspace:*",
     "@xwiki/cristal-model-reference-api": "workspace:*",
@@ -48,7 +49,6 @@
     "@xwiki/cristal-uiextension-ui": "workspace:*",
     "@xwiki/cristal-user-ui": "workspace:*",
     "inversify": "6.2.0",
-    "marked": "15.0.4",
     "reflect-metadata": "0.2.2",
     "vue": "3.5.13",
     "vue-i18n": "10.0.5",
@@ -58,9 +58,11 @@
     "@vue/test-utils": "2.4.6",
     "@xwiki/cristal-dev-config": "workspace:*",
     "@xwiki/cristal-dev-test-utils": "workspace:*",
+    "ts-essentials": "10.0.3",
     "typescript": "5.6.3",
     "vite": "6.0.3",
     "vitest": "2.1.8",
+    "vitest-mock-extended": "2.0.2",
     "vue-tsc": "2.1.10"
   },
   "publishConfig": {
diff --git a/skin/src/vue/__tests__/c-content.test.ts b/skin/src/vue/__tests__/c-content.test.ts
index 13a34ae54..47c6f1e5f 100644
--- a/skin/src/vue/__tests__/c-content.test.ts
+++ b/skin/src/vue/__tests__/c-content.test.ts
@@ -27,9 +27,14 @@ import {
   wrapInSuspense,
 } from "@xwiki/cristal-dev-test-utils";
 import { DocumentService } from "@xwiki/cristal-document-api";
-import { PageHierarchyResolverProvider } from "@xwiki/cristal-hierarchy-api";
+import {
+  PageHierarchyResolver,
+  PageHierarchyResolverProvider,
+} from "@xwiki/cristal-hierarchy-api";
+import { MarkdownRenderer } from "@xwiki/cristal-markdown-api";
 import { ClickListener } from "@xwiki/cristal-model-click-listener";
 import { Container } from "inversify";
+import { DeepPartial } from "ts-essentials";
 import { beforeAll, describe, expect, it, vi } from "vitest";
 import { ref } from "vue";
 import { useRoute } from "vue-router";
@@ -47,14 +52,18 @@ function mountCComponent(params: {
 
   const container = new Container();
 
-  const mockDoumentService = makeInjectable(
-    class {
+  const mockDocumentService = makeInjectable(
+    class MockDocumentService implements DeepPartial<DocumentService> {
       isLoading() {
         return ref(isLoading);
       }
 
       getError() {
-        return ref(error);
+        if (error) {
+          return ref<Error>(new Error(error));
+        } else {
+          return ref<undefined>();
+        }
       }
 
       getCurrentDocument() {
@@ -64,15 +73,20 @@ function mountCComponent(params: {
       getCurrentDocumentRevision() {
         return ref(undefined);
       }
+
+      getCurrentDocumentReferenceString() {
+        return ref("The.Page.Reference");
+      }
     },
   );
 
   const pageHierarchyResolver = vi.fn().mockImplementation(() => {
-    return {
-      getPageHierarchy() {
-        return Promise.resolve([]);
+    const newVar: DeepPartial<PageHierarchyResolver> = {
+      async getPageHierarchy() {
+        return [];
       },
     };
+    return newVar;
   });
 
   const pageHierarchyResolverProvider = vi.fn().mockImplementation(() => {
@@ -83,7 +97,7 @@ function mountCComponent(params: {
     };
   });
 
-  container.bind<DocumentService>("DocumentService").to(mockDoumentService);
+  container.bind<DocumentService>("DocumentService").to(mockDocumentService);
   container
     .bind<PageHierarchyResolverProvider>("PageHierarchyResolverProvider")
     .to(makeInjectable(pageHierarchyResolverProvider));
@@ -96,6 +110,10 @@ function mountCComponent(params: {
       }),
     ),
   );
+  class MockMarkdownRenderer implements DeepPartial<MarkdownRenderer> {}
+  container
+    .bind<MarkdownRenderer>("MarkdownRenderer")
+    .to(makeInjectable(vi.fn().mockImplementation(() => MockMarkdownRenderer)));
 
   return mount(wrapInSuspense(CContent, {}), {
     provide: {
@@ -117,6 +135,7 @@ function mountCComponent(params: {
         RouterLink: true,
         XAlert: true,
         XBreadcrumb: true,
+        "i18n-t": true,
       },
     },
   });
@@ -155,7 +174,9 @@ describe("c-context", () => {
   it("display an error message", () => {
     const errorMessage = "ErrorMessage";
     const component = mountCComponent({ error: errorMessage });
-    expect(component.find(".content-error").text()).eq(errorMessage);
+    expect(component.find(".content-error").text()).eq(
+      `Error: ${errorMessage}`,
+    );
   });
 
   it("display page with empty content", () => {
diff --git a/skin/src/vue/c-content.vue b/skin/src/vue/c-content.vue
index f6f45cab9..1ca4217da 100644
--- a/skin/src/vue/c-content.vue
+++ b/skin/src/vue/c-content.vue
@@ -25,24 +25,21 @@ import { PageData } from "@xwiki/cristal-api";
 import { name as documentServiceName } from "@xwiki/cristal-document-api";
 import { CIcon, Size } from "@xwiki/cristal-icons";
 import { PageActions } from "@xwiki/cristal-page-actions-ui";
-import { marked } from "marked";
 import { computed, inject, onUpdated, ref } from "vue";
 import { useI18n } from "vue-i18n";
-import { useRoute } from "vue-router";
 import type { CristalApp } from "@xwiki/cristal-api";
 import type { DocumentService } from "@xwiki/cristal-document-api";
+import type { MarkdownRenderer } from "@xwiki/cristal-markdown-api";
 import type { ComputedRef, Ref } from "vue";
 
 const { t } = useI18n({
   messages,
 });
 
-const route = useRoute();
-
 const cristal: CristalApp = inject<CristalApp>("cristal")!;
-const documentService = cristal
-  .getContainer()
-  .get<DocumentService>(documentServiceName);
+const container = cristal.getContainer();
+const documentService = container.get<DocumentService>(documentServiceName);
+const markdownRenderer = container.get<MarkdownRenderer>("MarkdownRenderer");
 
 const loading = documentService.isLoading();
 const error: Ref<Error | undefined> = documentService.getError();
@@ -50,12 +47,7 @@ const currentPage: Ref<PageData | undefined> =
   documentService.getCurrentDocument();
 const currentPageRevision: Ref<string | undefined> =
   documentService.getCurrentDocumentRevision();
-const currentPageName: ComputedRef<string> = computed(() => {
-  // TODO: define a proper abstraction.
-  return (
-    (route.params.page as string) || cristal.getCurrentPage() || "Main.WebHome"
-  );
-});
+const currentPageName = documentService.getCurrentDocumentReferenceString();
 
 const contentRoot = ref(undefined);
 
@@ -65,11 +57,7 @@ const content: ComputedRef<string | undefined> = computed(() => {
     if (cpn.html && cpn.html.trim() !== "") {
       return cpn.html as string;
     } else if (cpn.source) {
-      // TODO: currently blindly convert the content to markdown.
-      console.log("marked", marked, cpn.source);
-      const parse = marked.parse(cpn.source);
-      console.log("parse", parse);
-      return parse as string;
+      return markdownRenderer.render(cpn.source);
     } else {
       return "";
     }
@@ -127,7 +115,7 @@ onUpdated(() => {
         </router-link>
         <page-actions
           :current-page="currentPage"
-          :current-page-name="currentPageName"
+          :current-page-name="currentPageName ?? ''"
           :disabled="currentPageRevision !== undefined || !currentPage?.canEdit"
         ></page-actions>
       </div>
@@ -169,6 +157,11 @@ onUpdated(() => {
   padding: 0;
 }
 
+:global(.doc-content img) {
+  max-width: 100%;
+  height: auto;
+}
+
 .doc-title {
   grid-area: doc-title;
   margin: 0;