Popup editor (#6292)

2025-10-20 07:08:55 +02:00 · 2025-07-12 00:30:33 +03:00 · 2025-07-12 00:30:33 +03:00 · 84cdfec415
commit 84cdfec415
parent b6f50b6af0 91572ab8b9
100 changed files with 2186 additions and 759 deletions
--- a/apps/client/src/components/app_context.ts
+++ b/apps/client/src/components/app_context.ts
@ -122,6 +122,7 @@ export type CommandMappings = {
    showImportDialog: CommandData & { noteId: string };
    openNewNoteSplit: NoteCommandData;
    openInWindow: NoteCommandData;
+    openInPopup: CommandData & { noteIdOrPath: string; };
    openNoteInNewTab: CommandData;
    openNoteInNewSplit: CommandData;
    openNoteInNewWindow: CommandData;
@ -140,6 +141,7 @@ export type CommandMappings = {
    };
    openInTab: ContextMenuCommandData;
    openNoteInSplit: ContextMenuCommandData;
+    openNoteInPopup: ContextMenuCommandData;
    toggleNoteHoisting: ContextMenuCommandData;
    insertNoteAfter: ContextMenuCommandData;
    insertChildNote: ContextMenuCommandData;
--- a/apps/client/src/layouts/desktop_layout.ts
+++ b/apps/client/src/layouts/desktop_layout.ts
@ -46,28 +46,7 @@ import SharedInfoWidget from "../widgets/shared_info.js";
 import FindWidget from "../widgets/find.js";
 import TocWidget from "../widgets/toc.js";
 import HighlightsListWidget from "../widgets/highlights_list.js";
-import BulkActionsDialog from "../widgets/dialogs/bulk_actions.js";
-import AboutDialog from "../widgets/dialogs/about.js";
-import HelpDialog from "../widgets/dialogs/help.js";
-import RecentChangesDialog from "../widgets/dialogs/recent_changes.js";
-import BranchPrefixDialog from "../widgets/dialogs/branch_prefix.js";
-import SortChildNotesDialog from "../widgets/dialogs/sort_child_notes.js";
 import PasswordNoteSetDialog from "../widgets/dialogs/password_not_set.js";
-import IncludeNoteDialog from "../widgets/dialogs/include_note.js";
-import NoteTypeChooserDialog from "../widgets/dialogs/note_type_chooser.js";
-import JumpToNoteDialog from "../widgets/dialogs/jump_to_note.js";
-import AddLinkDialog from "../widgets/dialogs/add_link.js";
-import CloneToDialog from "../widgets/dialogs/clone_to.js";
-import MoveToDialog from "../widgets/dialogs/move_to.js";
-import ImportDialog from "../widgets/dialogs/import.js";
-import ExportDialog from "../widgets/dialogs/export.js";
-import MarkdownImportDialog from "../widgets/dialogs/markdown_import.js";
-import ProtectedSessionPasswordDialog from "../widgets/dialogs/protected_session_password.js";
-import RevisionsDialog from "../widgets/dialogs/revisions.js";
-import DeleteNotesDialog from "../widgets/dialogs/delete_notes.js";
-import InfoDialog from "../widgets/dialogs/info.js";
-import ConfirmDialog from "../widgets/dialogs/confirm.js";
-import PromptDialog from "../widgets/dialogs/prompt.js";
 import FloatingButtons from "../widgets/floating_buttons/floating_buttons.js";
 import RelationMapButtons from "../widgets/floating_buttons/relation_map_buttons.js";
 import SvgExportButton from "../widgets/floating_buttons/svg_export_button.js";
@ -83,7 +62,7 @@ import CopyImageReferenceButton from "../widgets/floating_buttons/copy_image_ref
 import ScrollPaddingWidget from "../widgets/scroll_padding.js";
 import ClassicEditorToolbar from "../widgets/ribbon_widgets/classic_editor_toolbar.js";
 import options from "../services/options.js";
-import utils, { hasTouchBar } from "../services/utils.js";
+import utils from "../services/utils.js";
 import GeoMapButtons from "../widgets/floating_buttons/geo_map_button.js";
 import ContextualHelpButton from "../widgets/floating_buttons/help_button.js";
 import CloseZenButton from "../widgets/close_zen_button.js";
@ -229,7 +208,7 @@ export default class DesktopLayout {
                                                                .child(new PromotedAttributesWidget())
                                                                .child(new SqlTableSchemasWidget())
                                                                .child(new NoteDetailWidget())
-                                                                .child(new NoteListWidget())
+                                                                .child(new NoteListWidget(false))
                                                                .child(new SearchResultWidget())
                                                                .child(new SqlResultWidget())
                                                                .child(new ScrollPaddingWidget())
--- a/apps/client/src/layouts/layout_commons.ts
+++ b/apps/client/src/layouts/layout_commons.ts
@ -22,6 +22,14 @@ import RevisionsDialog from "../widgets/dialogs/revisions.js";
 import DeleteNotesDialog from "../widgets/dialogs/delete_notes.js";
 import InfoDialog from "../widgets/dialogs/info.js";
 import IncorrectCpuArchDialog from "../widgets/dialogs/incorrect_cpu_arch.js";
+import PopupEditorDialog from "../widgets/dialogs/popup_editor.js";
+import FlexContainer from "../widgets/containers/flex_container.js";
+import NoteIconWidget from "../widgets/note_icon.js";
+import NoteTitleWidget from "../widgets/note_title.js";
+import ClassicEditorToolbar from "../widgets/ribbon_widgets/classic_editor_toolbar.js";
+import PromotedAttributesWidget from "../widgets/ribbon_widgets/promoted_attributes.js";
+import NoteDetailWidget from "../widgets/note_detail.js";
+import NoteListWidget from "../widgets/note_list.js";

 export function applyModals(rootContainer: RootContainer) {
    rootContainer
@ -47,4 +55,15 @@ export function applyModals(rootContainer: RootContainer) {
        .child(new ConfirmDialog())
        .child(new PromptDialog())
        .child(new IncorrectCpuArchDialog())
+        .child(new PopupEditorDialog()
+                .child(new FlexContainer("row")
+                    .class("title-row")
+                    .css("align-items", "center")
+                    .cssBlock(".title-row > * { margin: 5px; }")
+                    .child(new NoteIconWidget())
+                    .child(new NoteTitleWidget()))
+                .child(new ClassicEditorToolbar())
+                .child(new PromotedAttributesWidget())
+                .child(new NoteDetailWidget())
+                .child(new NoteListWidget(true)))
 }
--- a/apps/client/src/layouts/mobile_layout.ts
+++ b/apps/client/src/layouts/mobile_layout.ts
@ -162,7 +162,7 @@ export default class MobileLayout {
                                    .filling()
                                    .contentSized()
                                    .child(new NoteDetailWidget())
-                                    .child(new NoteListWidget())
+                                    .child(new NoteListWidget(false))
                                    .child(new FilePropertiesWidget().css("font-size", "smaller"))
                            )
                            .child(new MobileEditorToolbar())
--- a/apps/client/src/menus/link_context_menu.ts
+++ b/apps/client/src/menus/link_context_menu.ts
@ -16,7 +16,8 @@ function getItems(): MenuItem<CommandNames>[] {
    return [
        { title: t("link_context_menu.open_note_in_new_tab"), command: "openNoteInNewTab", uiIcon: "bx bx-link-external" },
        { title: t("link_context_menu.open_note_in_new_split"), command: "openNoteInNewSplit", uiIcon: "bx bx-dock-right" },
-        { title: t("link_context_menu.open_note_in_new_window"), command: "openNoteInNewWindow", uiIcon: "bx bx-window-open" }
+        { title: t("link_context_menu.open_note_in_new_window"), command: "openNoteInNewWindow", uiIcon: "bx bx-window-open" },
+        { title: t("link_context_menu.open_note_in_popup"), command: "openNoteInPopup", uiIcon: "bx bx-edit" }
    ];
 }

@ -40,6 +41,8 @@ function handleLinkContextMenuItem(command: string | undefined, notePath: string
        appContext.triggerCommand("openNewNoteSplit", { ntxId, notePath, hoistedNoteId, viewScope });
    } else if (command === "openNoteInNewWindow") {
        appContext.triggerCommand("openInWindow", { notePath, hoistedNoteId, viewScope });
+    } else if (command === "openNoteInPopup") {
+        appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath })
    }
 }

--- a/apps/client/src/menus/tree_context_menu.ts
+++ b/apps/client/src/menus/tree_context_menu.ts
@ -70,8 +70,8 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree

        const items: (MenuItem<TreeCommandNames> | null)[] = [
            { title: `${t("tree-context-menu.open-in-a-new-tab")}`, command: "openInTab", uiIcon: "bx bx-link-external", enabled: noSelectedNotes },
-
            { title: t("tree-context-menu.open-in-a-new-split"), command: "openNoteInSplit", uiIcon: "bx bx-dock-right", enabled: noSelectedNotes },
+            { title: t("tree-context-menu.open-in-popup"), command: "openNoteInPopup", uiIcon: "bx bx-edit", enabled: noSelectedNotes },

            isHoisted
                ? null
@ -246,6 +246,8 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
            const { ntxId } = subContexts?.[subContexts.length - 1] ?? {};

            this.treeWidget.triggerCommand("openNewNoteSplit", { ntxId, notePath });
+        } else if (command === "openNoteInPopup") {
+            appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath })
        } else if (command === "convertNoteToAttachment") {
            if (!(await dialogService.confirm(t("tree-context-menu.convert-to-attachment-confirm")))) {
                return;
--- a/apps/client/src/services/dialog.ts
+++ b/apps/client/src/services/dialog.ts
@ -4,14 +4,14 @@ import type { ConfirmDialogOptions, ConfirmDialogResult, ConfirmWithMessageOptio
 import type { PromptDialogOptions } from "../widgets/dialogs/prompt.js";
 import { focusSavedElement, saveFocusedElement } from "./focus.js";

-export async function openDialog($dialog: JQuery<HTMLElement>, closeActDialog = true) {
+export async function openDialog($dialog: JQuery<HTMLElement>, closeActDialog = true, config?: Partial<Modal.Options>) {
    if (closeActDialog) {
        closeActiveDialog();
        glob.activeDialog = $dialog;
    }

    saveFocusedElement();
-    Modal.getOrCreateInstance($dialog[0]).show();
+    Modal.getOrCreateInstance($dialog[0], config).show();

    $dialog.on("hidden.bs.modal", () => {
        const $autocompleteEl = $(".aa-input");
--- a/apps/client/src/services/link.ts
+++ b/apps/client/src/services/link.ts
@ -231,6 +231,7 @@ export function parseNavigationStateFromUrl(url: string | undefined) {
    let ntxId: string | null = null;
    let hoistedNoteId: string | null = null;
    let searchString: string | null = null;
+    let openInPopup = false;

    if (paramString) {
        for (const pair of paramString.split("&")) {
@ -246,6 +247,8 @@ export function parseNavigationStateFromUrl(url: string | undefined) {
                searchString = value; // supports triggering search from URL, e.g. #?searchString=blabla
            } else if (["viewMode", "attachmentId"].includes(name)) {
                (viewScope as any)[name] = value;
+            } else if (name === "popup") {
+                openInPopup = true;
            } else {
                console.warn(`Unrecognized hash parameter '${name}'.`);
            }
@ -266,7 +269,8 @@ export function parseNavigationStateFromUrl(url: string | undefined) {
        ntxId,
        hoistedNoteId,
        viewScope,
-        searchString
+        searchString,
+        openInPopup
    };
 }

@ -299,11 +303,12 @@ function goToLinkExt(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDownEvent
        }
    }

-    const { notePath, viewScope } = parseNavigationStateFromUrl(hrefLink);
+    const { notePath, viewScope, openInPopup } = parseNavigationStateFromUrl(hrefLink);

    const ctrlKey = evt && utils.isCtrlKey(evt);
    const shiftKey = evt?.shiftKey;
    const isLeftClick = !evt || ("which" in evt && evt.which === 1);
+    // Right click is handled separately.
    const isMiddleClick = evt && "which" in evt && evt.which === 2;
    const targetIsBlank = ($link?.attr("target") === "_blank");
    const openInNewTab = (isLeftClick && ctrlKey) || isMiddleClick || targetIsBlank;
@ -311,7 +316,9 @@ function goToLinkExt(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDownEvent
    const openInNewWindow = isLeftClick && evt?.shiftKey && !ctrlKey;

    if (notePath) {
-        if (openInNewWindow) {
+        if (openInPopup) {
+            appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath });
+        } else if (openInNewWindow) {
            appContext.triggerCommand("openInWindow", { notePath, viewScope });
        } else if (openInNewTab) {
            appContext.tabManager.openTabWithNoteWithHoisting(notePath, {
@ -387,6 +394,12 @@ function linkContextMenu(e: PointerEvent) {
        return;
    }

+    if (utils.isCtrlKey(e) && e.button === 2) {
+        appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath });
+        e.preventDefault();
+        return;
+    }
+
    e.preventDefault();

    linkContextMenuService.openContextMenu(notePath, e, viewScope, null);
--- a/apps/client/src/services/note_tooltip.ts
+++ b/apps/client/src/services/note_tooltip.ts
@ -168,7 +168,10 @@ async function renderTooltip(note: FNote | null) {
        if (isContentEmpty) {
            classes.push("note-no-content");
        }
-        content = `<h5 class="${classes.join(" ")}"><a href="#${note.noteId}" data-no-context-menu="true">${noteTitleWithPathAsSuffix.prop("outerHTML")}</a></h5>`;
+        content = `\
+            <h5 class="${classes.join(" ")}">
+                <a href="#${note.noteId}" data-no-context-menu="true">${noteTitleWithPathAsSuffix.prop("outerHTML")}</a>
+            </h5>`;
    }

    content = `${content}<div class="note-tooltip-attributes">${$renderedAttributes[0].outerHTML}</div>`;
@ -176,6 +179,7 @@ async function renderTooltip(note: FNote | null) {
        content += $renderedContent[0].outerHTML;
    }

+    content += `<a class="open-popup-button" title="${t("note_tooltip.quick-edit")}" href="#${note.noteId}?popup"><span class="bx bx-edit" /></a>`;
    return content;
 }

--- a/apps/client/src/stylesheets/style.css
+++ b/apps/client/src/stylesheets/style.css
@ -540,6 +540,7 @@ button.btn-sm {
    /* Making this narrower because https://github.com/zadam/trilium/issues/502 (problem only in smaller font sizes) */
    min-width: 0;
    padding: 0;
+    z-index: 1000;
 }

 pre:not(.hljs) {
@ -771,6 +772,14 @@ table.promoted-attributes-in-tooltip th {
    font-size: small;
 }

+.note-tooltip-content .open-popup-button {
+    position: absolute;
+    right: 15px;
+    bottom: 8px;
+    font-size: 1.2em;
+    color: inherit;
+}
+
 .note-tooltip-attributes {
    display: -webkit-box;
    -webkit-box-orient: vertical;
--- a/apps/client/src/translations/en/translation.json
+++ b/apps/client/src/translations/en/translation.json
@ -1600,7 +1600,8 @@
    "import-into-note": "Import into note",
    "apply-bulk-actions": "Apply bulk actions",
    "converted-to-attachments": "{{count}} notes have been converted to attachments.",
-    "convert-to-attachment-confirm": "Are you sure you want to convert note selected notes into attachments of their parent notes?"
+    "convert-to-attachment-confirm": "Are you sure you want to convert note selected notes into attachments of their parent notes?",
+    "open-in-popup": "Quick edit"
  },
  "shared_info": {
    "shared_publicly": "This note is shared publicly on",
@ -1832,7 +1833,8 @@
  "link_context_menu": {
    "open_note_in_new_tab": "Open note in a new tab",
    "open_note_in_new_split": "Open note in a new split",
-    "open_note_in_new_window": "Open note in a new window"
+    "open_note_in_new_window": "Open note in a new window",
+    "open_note_in_popup": "Quick edit"
  },
  "electron_integration": {
    "desktop-application": "Desktop Application",
@ -1852,7 +1854,8 @@
    "full-text-search": "Full text search"
  },
  "note_tooltip": {
-    "note-has-been-deleted": "Note has been deleted."
+    "note-has-been-deleted": "Note has been deleted.",
+    "quick-edit": "Quick edit"
  },
  "geo-map": {
    "create-child-note-title": "Create a new child note and add it to the map",
--- a/apps/client/src/widgets/containers/container.ts
+++ b/apps/client/src/widgets/containers/container.ts
@ -1,5 +1,5 @@
-import type { default as Component, TypedComponent } from "../../components/component.js";
-import BasicWidget, { TypedBasicWidget } from "../basic_widget.js";
+import type { TypedComponent } from "../../components/component.js";
+import { TypedBasicWidget } from "../basic_widget.js";

 export default class Container<T extends TypedComponent<any>> extends TypedBasicWidget<T> {
    doRender() {
--- a/apps/client/src/widgets/dialogs/popup_editor.ts
+++ b/apps/client/src/widgets/dialogs/popup_editor.ts
@ -0,0 +1,157 @@
+import type { EventNames, EventData } from "../../components/app_context.js";
+import NoteContext from "../../components/note_context.js";
+import { openDialog } from "../../services/dialog.js";
+import BasicWidget from "../basic_widget.js";
+import Container from "../containers/container.js";
+import TypeWidget from "../type_widgets/type_widget.js";
+
+const TPL = /*html*/`\
+<div class="popup-editor-dialog modal fade mx-auto" tabindex="-1" role="dialog">
+    <style>
+        body.desktop .modal.popup-editor-dialog .modal-dialog {
+            max-width: 75vw;
+        }
+
+        .modal.popup-editor-dialog .modal-header .modal-title {
+            font-size: 1.1em;
+        }
+
+        .modal.popup-editor-dialog .modal-body {
+            padding: 0;
+            height: 75vh;
+            overflow: auto;
+        }
+
+        .modal.popup-editor-dialog .note-detail-editable-text {
+            padding: 0 1em;
+        }
+
+        .modal.popup-editor-dialog .title-row,
+        .modal.popup-editor-dialog .modal-title,
+        .modal.popup-editor-dialog .note-icon-widget {
+            height: 32px;
+        }
+
+        .modal.popup-editor-dialog .note-icon-widget {
+            width: 32px;
+            margin: 0;
+            padding: 0;
+        }
+
+        .modal.popup-editor-dialog .note-icon-widget button.note-icon,
+        .modal.popup-editor-dialog .note-title-widget input.note-title {
+            font-size: 1em;
+        }
+
+        .modal.popup-editor-dialog .classic-toolbar-widget {
+            position: sticky;
+            top: 0;
+            left: 0;
+            right: 0;
+            background: var(--modal-background-color);
+            z-index: 1000;
+        }
+
+        .modal.popup-editor-dialog .note-detail-file {
+            padding: 0;
+        }
+    </style>
+
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <div class="modal-title">
+                    <!-- This is where the first child will be injected -->
+                </div>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+
+            <div class="modal-body">
+                <!-- This is where all but the first child will be injected. -->
+            </div>
+        </div>
+    </div>
+</div>
+`;
+
+export default class PopupEditorDialog extends Container<BasicWidget> {
+
+    private noteContext: NoteContext;
+    private $modalHeader!: JQuery<HTMLElement>;
+    private $modalBody!: JQuery<HTMLElement>;
+
+    constructor() {
+        super();
+        this.noteContext = new NoteContext("_popup-editor");
+    }
+
+    doRender() {
+        // This will populate this.$widget with the content of the children.
+        super.doRender();
+
+        // Now we wrap it in the modal.
+        const $newWidget = $(TPL);
+        this.$modalHeader = $newWidget.find(".modal-title");
+        this.$modalBody = $newWidget.find(".modal-body");
+
+        const children = this.$widget.children();
+        this.$modalHeader.append(children[0]);
+        this.$modalBody.append(children.slice(1));
+        this.$widget = $newWidget;
+        this.setVisibility(false);
+    }
+
+    async openInPopupEvent({ noteIdOrPath }: EventData<"openInPopup">) {
+        const $dialog = await openDialog(this.$widget, false, {
+            focus: false
+        });
+
+        await this.noteContext.setNote(noteIdOrPath);
+
+        const activeEl = document.activeElement;
+        if (activeEl && "blur" in activeEl) {
+            (activeEl as HTMLElement).blur();
+        }
+
+        $dialog.on("shown.bs.modal", async () => {
+            // Reduce the z-index of modals so that ckeditor popups are properly shown on top of it.
+            // The backdrop instance is not shared so it's OK to make a one-off modification.
+            $("body > .modal-backdrop").css("z-index", "998");
+            $dialog.css("z-index", "999");
+
+            await this.handleEventInChildren("activeContextChanged", { noteContext: this.noteContext });
+            this.setVisibility(true);
+            await this.handleEventInChildren("focusOnDetail", { ntxId: this.noteContext.ntxId });
+        });
+        $dialog.on("hidden.bs.modal", () => {
+            const $typeWidgetEl = $dialog.find(".note-detail-printable");
+            if ($typeWidgetEl.length) {
+                const typeWidget = glob.getComponentByEl($typeWidgetEl[0]) as TypeWidget;
+                typeWidget.cleanup();
+            }
+
+            this.setVisibility(false);
+        });
+    }
+
+    setVisibility(visible: boolean) {
+        const $bodyItems = this.$modalBody.find("> div");
+        if (visible) {
+            $bodyItems.fadeIn();
+            this.$modalHeader.children().show();
+        } else {
+            $bodyItems.hide();
+            this.$modalHeader.children().hide();
+        }
+    }
+
+    handleEventInChildren<T extends EventNames>(name: T, data: EventData<T>): Promise<unknown[] | unknown> | null {
+        // Avoid events related to the current tab interfere with our popup.
+        if (["noteSwitched", "noteSwitchedAndActivated"].includes(name)) {
+            return Promise.resolve();
+        }
+
+        return super.handleEventInChildren(name, data);
+    }
+
+}
--- a/apps/client/src/widgets/floating_buttons/help_button.ts
+++ b/apps/client/src/widgets/floating_buttons/help_button.ts
@ -31,8 +31,8 @@ export const byNoteType: Record<Exclude<NoteType, "book">, string | null> = {
 };

 export const byBookType: Record<ViewTypeOptions, string | null> = {
-    list: null,
-    grid: null,
+    list: "mULW0Q3VojwY",
+    grid: "8QqnMzx393bx",
    calendar: "xWbu3jpNWapp",
    table: "2FvYrpmOXm29",
    geoMap: "81SGnPGMk7Xc"
--- a/apps/client/src/widgets/note_detail.ts
+++ b/apps/client/src/widgets/note_detail.ts
@ -195,7 +195,7 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
        // https://github.com/zadam/trilium/issues/2522
        const isBackendNote = this.noteContext?.noteId === "_backendLog";
        const isSqlNote = this.mime === "text/x-sqlite;schema=trilium";
-        const isFullHeightNoteType = ["canvas", "webView", "noteMap", "mindMap", "mermaid"].includes(this.type ?? "");
+        const isFullHeightNoteType = ["canvas", "webView", "noteMap", "mindMap", "mermaid", "file"].includes(this.type ?? "");
        const isFullHeight = (!this.noteContext?.hasNoteList() && isFullHeightNoteType && !isSqlNote)
            || this.noteContext?.viewScope?.viewMode === "attachments"
            || isBackendNote;
--- a/apps/client/src/widgets/note_list.ts
+++ b/apps/client/src/widgets/note_list.ts
@ -40,16 +40,32 @@ export default class NoteListWidget extends NoteContextAwareWidget {
    private shownNoteId?: string | null;
    private viewMode?: ViewMode<any> | null;
    private attributeDetailWidget: AttributeDetailWidget;
+    private displayOnlyCollections: boolean;

-    constructor() {
+    /**
+     * @param displayOnlyCollections if set to `true` then only collection-type views are displayed such as geo-map and the calendar. The original book types grid and list will be ignored.
+     */
+    constructor(displayOnlyCollections: boolean) {
        super();
        this.attributeDetailWidget = new AttributeDetailWidget()
                .contentSized()
                .setParent(this);
+        this.displayOnlyCollections = displayOnlyCollections;
    }

    isEnabled() {
-        return super.isEnabled() && this.noteContext?.hasNoteList();
+        if (!super.isEnabled()) {
+            return false;
+        }
+
+        if (this.displayOnlyCollections && this.note?.type !== "book") {
+            const viewType = this.note?.getLabelValue("viewType");
+            if (!viewType || ["grid", "list"].includes(viewType)) {
+                return false;
+            }
+        }
+
+        return this.noteContext?.hasNoteList();
    }

    doRender() {
--- a/apps/client/src/widgets/note_tree.ts
+++ b/apps/client/src/widgets/note_tree.ts
@ -240,24 +240,25 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
        this.$tree.on("mousedown", ".fancytree-title", (e) => {
            if (e.which === 2) {
                const node = $.ui.fancytree.getNode(e as unknown as Event);
-
                const notePath = treeService.getNotePath(node);

                if (notePath) {
+                    e.stopPropagation();
+                    e.preventDefault();
+
                    appContext.tabManager.openTabWithNoteWithHoisting(notePath, {
                        activate: e.shiftKey ? true : false
                    });
                }
-
+            }
+        });
+        this.$tree.on("mouseup", ".fancytree-title", (e) => {
+            // Prevent middle click from pasting in the editor.
+            if (e.which === 2) {
                e.stopPropagation();
                e.preventDefault();
            }
        });
-        this.$tree.on("auxclick", (e) => {
-            // Prevent middle click from pasting in the editor.
-            e.stopPropagation();
-            e.preventDefault();
-        });

        this.$treeSettingsPopup = this.$widget.find(".tree-settings-popup");
        this.$hideArchivedNotesCheckbox = this.$treeSettingsPopup.find(".hide-archived-notes");
@ -712,7 +713,13 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
            });
        } else {
            this.$tree.on("contextmenu", ".fancytree-node", (e) => {
+                if (!utils.isCtrlKey(e)) {
                    this.showContextMenu(e);
+                } else {
+                    const node = $.ui.fancytree.getNode(e as unknown as Event);
+                    const notePath = treeService.getNotePath(node);
+                    appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath });
+                }
                return false; // blocks default browser right click menu
            });

--- a/apps/client/src/widgets/ribbon_widgets/classic_editor_toolbar.ts
+++ b/apps/client/src/widgets/ribbon_widgets/classic_editor_toolbar.ts
@ -48,6 +48,18 @@ export default class ClassicEditorToolbar extends NoteContextAwareWidget {
        this.contentSized();
    }

+    isEnabled(): boolean | null | undefined {
+        if (options.get("textNoteEditorType") !== "ckeditor-classic") {
+            return false;
+        }
+
+        if (!this.note || this.note.type !== "text") {
+            return false;
+        }
+
+        return true;
+    }
+
    async getTitle() {
        return {
            show: await this.#shouldDisplay(),
@ -58,11 +70,7 @@ export default class ClassicEditorToolbar extends NoteContextAwareWidget {
    }

    async #shouldDisplay() {
-        if (options.get("textNoteEditorType") !== "ckeditor-classic") {
-            return false;
-        }
-
-        if (!this.note || this.note.type !== "text") {
+        if (!this.isEnabled()) {
            return false;
        }

--- a/apps/client/src/widgets/ribbon_widgets/promoted_attributes.ts
+++ b/apps/client/src/widgets/ribbon_widgets/promoted_attributes.ts
@ -69,11 +69,6 @@ interface AttributeResult {
    attributeId: string;
 }

-/**
- * This widget is quite special because it's used in the desktop ribbon, but in mobile outside of ribbon.
- * This works without many issues (apart from autocomplete), but it should be kept in mind when changing things
- * and testing.
- */
 export default class PromotedAttributesWidget extends NoteContextAwareWidget {

    private $container!: JQuery<HTMLElement>;
--- a/apps/client/src/widgets/type_widgets/editable_text.ts
+++ b/apps/client/src/widgets/type_widgets/editable_text.ts
@ -178,13 +178,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
            });

            if (isClassicEditor) {
-                let $classicToolbarWidget;
-                if (!utils.isMobile()) {
-                    const $parentSplit = this.$widget.parents(".note-split.type-text");
-                    $classicToolbarWidget = $parentSplit.find("> .ribbon-container .classic-toolbar-widget");
-                } else {
-                    $classicToolbarWidget = $("body").find(".classic-toolbar-widget");
-                }
+                const $classicToolbarWidget = this.findClassicToolbar();

                $classicToolbarWidget.empty();
                if ($classicToolbarWidget.length) {
@ -515,6 +509,22 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
        }
    }

+    findClassicToolbar(): JQuery<HTMLElement> {
+        if (!utils.isMobile()) {
+            const $parentSplit = this.$widget.parents(".note-split.type-text");
+
+            if ($parentSplit.length) {
+                // The editor is in a normal tab.
+                return $parentSplit.find("> .ribbon-container .classic-toolbar-widget");
+            } else {
+                // The editor is in a popup.
+                return this.$widget.closest(".modal-body").find(".classic-toolbar-widget");
+            }
+        } else {
+            return $("body").find(".classic-toolbar-widget");
+        }
+    }
+
    buildTouchBarCommand(data: CommandListenerData<"buildTouchBar">) {
        const { TouchBar, buildIcon } = data;
        const { TouchBarSegmentedControl, TouchBarGroup, TouchBarButton } = TouchBar;
--- a/apps/client/src/widgets/type_widgets/empty.ts
+++ b/apps/client/src/widgets/type_widgets/empty.ts
@ -3,7 +3,6 @@ import TypeWidget from "./type_widget.js";
 import appContext from "../../components/app_context.js";
 import searchService from "../../services/search.js";
 import { t } from "../../services/i18n.js";
-import type FNote from "../../entities/fnote.js";

 const TPL = /*html*/`
 <div class="note-detail-empty note-detail-printable">
--- a/apps/client/src/widgets/type_widgets/file.ts
+++ b/apps/client/src/widgets/type_widgets/file.ts
@ -22,7 +22,8 @@ const TPL = /*html*/`
            padding: 0;
        }

-        .note-split.full-content-width .note-detail-file[data-preview-type="video"] {
+        .note-detail.full-height .note-detail-file[data-preview-type="pdf"],
+        .note-detail.full-height .note-detail-file[data-preview-type="video"] {
            overflow: hidden;
        }

--- a/apps/client/src/widgets/view_widgets/calendar_view.ts
+++ b/apps/client/src/widgets/view_widgets/calendar_view.ts
@ -225,6 +225,7 @@ export default class CalendarView extends ViewMode<{}> {
                    $(mainContainer ?? e.el).append($(promotedAttributesHtml));
                }
            },
+            // Called upon when clicking the day number in the calendar, opens or creates the day note but only if in a calendar root.
            dateClick: async (e) => {
                if (!this.isCalendarRoot) {
                    return;
@ -232,7 +233,8 @@ export default class CalendarView extends ViewMode<{}> {

                const note = await date_notes.getDayNote(e.dateStr);
                if (note) {
-                    appContext.tabManager.getActiveContext()?.setNote(note.noteId);
+                    appContext.triggerCommand("openInPopup", { noteIdOrPath: note.noteId });
+                    appContext.triggerCommand("refreshNoteList", { noteId: this.parentNote.noteId });
                }
            },
            datesSet: (e) => this.#onDatesSet(e),
@ -533,7 +535,7 @@ export default class CalendarView extends ViewMode<{}> {
            const eventData: EventInput = {
                title: title,
                start: startDate,
-                url: `#${note.noteId}`,
+                url: `#${note.noteId}?popup`,
                noteId: note.noteId,
                color: color ?? undefined,
                iconClass: note.getLabelValue("iconClass"),
--- a/apps/client/src/widgets/view_widgets/geo_view/index.ts
+++ b/apps/client/src/widgets/view_widgets/geo_view/index.ts
@ -29,6 +29,11 @@ const TPL = /*html*/`
            z-index: 1;
        }

+        .leaflet-top,
+        .leaflet-bottom {
+            z-index: 997;
+        }
+
        .geo-map-container.placing-note {
            cursor: crosshair;
        }
--- a/apps/client/src/widgets/view_widgets/geo_view/markers.ts
+++ b/apps/client/src/widgets/view_widgets/geo_view/markers.ts
@ -36,10 +36,17 @@ export default function processNoteWithMarker(map: Map, note: FNote, location: s
            return true;
        }
    });
+
    newMarker.on("contextmenu", (e) => {
        openContextMenu(note.noteId, e, isEditable);
    });

+    if (!isEditable) {
+        newMarker.on("click", (e) => {
+            appContext.triggerCommand("openInPopup", { noteIdOrPath: note.noteId });
+        });
+    }
+
    return newMarker;
 }

--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -6,7 +6,6 @@ class="image">
  <img style="aspect-ratio:1144/660;" src="Sharing_image.png" width="1144"
  height="660">
  </figure>
-  
  <h2>Features, interaction and limitations</h2>
  <ul>
    <li>Searching by note title.</li>
@ -70,24 +69,28 @@ class="image">
          <th><a class="reference-link" href="#root/_help_m523cpzocqaD">Saved Search</a>
          </th>
          <td>Not supported.</td>
+          <td>&nbsp;</td>
        </tr>
        <tr>
          <th><a class="reference-link" href="#root/_help_iRwzGnHPzonm">Relation Map</a>
          </th>
          <td>Not supported.</td>
+          <td>&nbsp;</td>
        </tr>
        <tr>
          <th><a class="reference-link" href="#root/_help_bdUJEHsAPYQR">Note Map</a>
          </th>
          <td>Not supported.</td>
+          <td>&nbsp;</td>
        </tr>
        <tr>
          <th><a class="reference-link" href="#root/_help_HcABDtFCkbFN">Render Note</a>
          </th>
          <td>Not supported.</td>
+          <td>&nbsp;</td>
        </tr>
        <tr>
-          <th><a class="reference-link" href="#root/_help_GTwFsgaA0lCt">Book</a>
+          <th><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_GTwFsgaA0lCt">Collections</a>
          </th>
          <td>
            <ul>
@ -132,6 +135,7 @@ class="image">
          <th><a class="reference-link" href="#root/_help_1vHRoWCEjj0L">Web View</a>
          </th>
          <td>Not supported.</td>
+          <td>&nbsp;</td>
        </tr>
        <tr>
          <th><a class="reference-link" href="#root/_help_gBbsAeiuUxI5">Mind Map</a>
@ -144,9 +148,10 @@ class="image">
          </td>
        </tr>
        <tr>
-          <th><a class="reference-link" href="#root/_help_81SGnPGMk7Xc">Geo Map</a>
+          <th><a class="reference-link" href="#root/_help_81SGnPGMk7Xc">Geo Map View</a>
          </th>
          <td>Not supported.</td>
+          <td>&nbsp;</td>
        </tr>
        <tr>
          <th><a class="reference-link" href="#root/_help_W8vYD3Q1zjCR">File</a>
@ -184,11 +189,9 @@ class="image">
        <img src="Sharing_share-single-note.png" alt="Share Note">
      </p>
    </li>
-    <li>
-      <p><strong>Access the Shared Note</strong>: The link provided will open the
+    <li><strong>Access the Shared Note</strong>: The link provided will open the
      note in your browser. If your server is not configured with a public IP,
-        the URL will refer to <code>localhost (127.0.0.1)</code>.</p>
-    </li>
+      the URL will refer to <code>localhost (127.0.0.1)</code>.</li>
  </ol>
  <h2>Sharing a Note Subtree</h2>
  <p>When you share a note, you actually share the entire subtree of notes
@ -340,7 +343,6 @@ for (const attr of parentNote.attributes) {
      </tbody>
    </table>
  </figure>
-  
  <h2>Credits</h2>
  <p>Since v0.95.0, a new theme was introduced (and enabled by default) which
    greatly improves the visual aspect of the Share feature, as well as its
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1 @@
+<p>This is a clone of a note. Go to its <a href="../UI%20Elements/Quick%20edit.html">primary location</a>.</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -1,3 +1,7 @@
+<figure class="image">
+  <img style="aspect-ratio:990/590;" src="Note List_image.png" width="990"
+  height="590">
+</figure>
 <p>When a note has one or more child notes, they will be listed at the end
  of the note for easy navigation.</p>
 <h2>Configuration</h2>
@ -11,47 +15,11 @@
    the desired number.</li>
 </ul>
 <h2>View types</h2>
+<p>The view types dictate how the child notes are represented.</p>
 <p>By default, the notes will be displayed in a grid, however there are also
  some other view types available.</p>
-<aside class="admonition tip">
 <p>Generally the view type can only be changed in a&nbsp;<a class="reference-link"
-    href="#root/_help_GTwFsgaA0lCt">Book</a>&nbsp;note from the&nbsp;<a class="reference-link"
-    href="#root/_help_BlN9DFI679QC">Ribbon</a>, but it can also be changed
-    manually on any type of note using the <code>#viewType</code> attribute.</p>
-</aside>
-<h3>Grid view</h3>
-<figure class="image image-style-align-center">
-  <img style="aspect-ratio:1025/655;" src="1_Note List_image.png" width="1025"
-  height="655">
-</figure>
-<p>This view presents the child notes in a grid format, allowing for a more
-  visual navigation experience.</p>
-<ul>
-  <li>For&nbsp;<a class="reference-link" href="#root/_help_iPIMuisry3hd">Text</a>&nbsp;notes,
-    the text can be slighly scrollable via the mouse wheel to reveal more context.</li>
-  <li>For&nbsp;<a class="reference-link" href="#root/_help_6f9hih2hXXZk">Code</a>&nbsp;notes,
-    syntax highlighting is applied.</li>
-  <li>For&nbsp;<a class="reference-link" href="#root/_help_W8vYD3Q1zjCR">File</a>&nbsp;notes,
-    a preview is made available for audio, video and PDF notes.</li>
-  <li>If the note does not have a content, a list of its child notes will be
-    displayed instead.</li>
-</ul>
-<p>This is the default view type.</p>
-<h3>List view</h3>
-<figure class="image image-style-align-center">
-  <img style="aspect-ratio:1013/526;" src="Note List_image.png" width="1013"
-  height="526">
-</figure>
-<p>In the list view mode, each note is displayed in a single row with only
-  the title and the icon of the note being visible by the default. By pressing
-  the expand button it's possible to view the content of the note, as well
-  as the children of the note (recursively).</p>
-<h3>Calendar view</h3>
-<figure class="image image-style-align-center">
-  <img style="aspect-ratio:1090/598;" src="2_Note List_image.png" width="1090"
-  height="598">
-</figure>
-<p>In the calendar view, child notes are represented as events, with a start
-  date and optionally an end date. The view also has interaction support
-  such as moving or creating new events. See&nbsp;<a class="reference-link"
-  href="#root/_help_xWbu3jpNWapp">Calendar View</a>&nbsp;for more information.</p>
+  href="#root/_help_GTwFsgaA0lCt">Collections</a>&nbsp;note from the&nbsp;
+  <a
+  class="reference-link" href="#root/_help_BlN9DFI679QC">Ribbon</a>, but it can also be changed manually on any type of note using
+    the <code>#viewType</code> attribute.</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -2,8 +2,8 @@
  <img style="aspect-ratio:767/606;" src="4_Calendar View_image.png" width="767"
  height="606">
 </figure>
-<p>The Calendar view of Book notes will display each child note in a calendar
-  that has a start date and optionally an end date, as an event.</p>
+<p>The Calendar view will display each child note in a calendar that has
+  a start date and optionally an end date, as an event.</p>
 <p>The Calendar view has multiple display modes:</p>
 <ul>
  <li>Week view, where all the 7 days of the week (or 5 if the weekends are
@ -14,8 +14,9 @@
  <li>Year view, which displays the entire year for quick reference.</li>
  <li>List view, which displays all the events of a given month in sequence.</li>
 </ul>
-<p>Unlike other Book view types, the Calendar view also allows some kind
-  of interaction, such as moving events around as well as creating new ones.</p>
+<p>Unlike other Collection view types, the Calendar view also allows some
+  kind of interaction, such as moving events around as well as creating new
+  ones.</p>
 <h2>Creating a calendar</h2>
 <figure class="table">
  <table>
@ -32,22 +33,21 @@
        <td>
          <img src="2_Calendar View_image.png">
        </td>
-        <td>The Calendar View works only for Book note types. To create a new note,
-          right click on the note tree on the left and select Insert note after,
-          or Insert child note and then select <em>Book</em>.</td>
+        <td>The Calendar View works only for Collection note types. To create a new
+          note, right click on the note tree on the left and select Insert note after,
+          or Insert child note and then select <em>Collection</em>.</td>
      </tr>
      <tr>
        <td>2</td>
        <td>
          <img src="3_Calendar View_image.png">
        </td>
-        <td>Once created, the “View type” of the Book needs changed to “Calendar”,
-          by selecting the “Book Properties” tab in the ribbon.</td>
+        <td>Once created, the “View type” of the Collection needs changed to “Calendar”,
+          by selecting the “Collection Properties” tab in the ribbon.</td>
      </tr>
    </tbody>
  </table>
 </figure>
-
 <h2>Creating a new event/note</h2>
 <ul>
  <li>Clicking on a day will create a new child note and assign it to that particular
@ -63,7 +63,7 @@
    <img src="Calendar View_image.png">
  </li>
  <li>Creating new notes from the calendar will respect the <code>~child:template</code> relation
-    if set on the book note.</li>
+    if set on the Collection note.</li>
 </ul>
 <h2>Interacting with events</h2>
 <ul>
@ -71,16 +71,30 @@
    <br>
    <img src="7_Calendar View_image.png">
  </li>
-  <li>Left clicking the event will go to that note. Middle clicking will open
-    the note in a new tab and right click will offer more options including
-    opening the note in a new split or window.</li>
+  <li>Left clicking the event will open a&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_ZjLYv08Rp3qC">Quick edit</a>&nbsp;to
+    edit the note in a popup while allowing easy return to the calendar by
+    just dismissing the popup.
+    <ul>
+      <li>Middle clicking will open the note in a new tab.</li>
+      <li>Right click will offer more options including opening the note in a new
+        split or window.</li>
+    </ul>
+  </li>
  <li>Drag and drop an event on the calendar to move it to another day.</li>
  <li>The length of an event can be changed by placing the mouse to the right
    edge of the event and dragging the mouse around.</li>
 </ul>
-<h2>Configuring the calendar</h2>
-<p>The following attributes can be added to the book type:</p>
-<figure class="table">
+<h2>Configuring the calendar view</h2>
+<p>In the <em>Collections </em>tab in the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_BlN9DFI679QC">Ribbon</a>,
+  it's possible to adjust the following:</p>
+<ul>
+  <li>Hide weekends from the week view.</li>
+  <li>Display week numbers on the calendar.</li>
+</ul>
+<h2>Configuring the calendar using attributes</h2>
+<p>The following attributes can be added to the Collection type:</p>
+<figure
+class="table">
  <table>
    <thead>
      <tr>
@ -129,7 +143,7 @@
  </figure>
  <p>In addition, the first day of the week can be either Sunday or Monday
    and can be adjusted from the application settings.</p>
-<h2>Configuring the calendar events</h2>
+  <h2>Configuring the calendar events using attributes</h2>
  <p>For each note of the calendar, the following attributes can be used:</p>
  <figure
  class="table">
@ -239,15 +253,14 @@ class="table">
      </tbody>
    </table>
    </figure>
-  
    <h2>How the calendar works</h2>
    <p>
      <img src="11_Calendar View_image.png">
    </p>
-  <p>The calendar displays all the child notes of the book that have a <code>#startDate</code>.
-    An <code>#endDate</code> can optionally be added.</p>
+    <p>The calendar displays all the child notes of the Collection that have
+      a <code>#startDate</code>. An <code>#endDate</code> can optionally be added.</p>
    <p>If editing the start date and end date from the note itself is desirable,
-    the following attributes can be added to the book note:</p><pre><code class="language-text-x-trilium-auto">#viewType=calendar #label:startDate(inheritable)="promoted,alias=Start Date,single,date"
+      the following attributes can be added to the Collection note:</p><pre><code class="language-text-x-trilium-auto">#viewType=calendar #label:startDate(inheritable)="promoted,alias=Start Date,single,date"
 #label:endDate(inheritable)="promoted,alias=End Date,single,date"
 #hidePromotedAttributes </code></pre>
    <p>This will result in:</p>
@ -261,7 +274,7 @@ class="table">
    <h3>Using with the Journal / calendar</h3>
    <p>It is possible to integrate the calendar view into the Journal with day
      notes. In order to do so change the note type of the Journal note (calendar
-    root) to Book and then select the Calendar View.</p>
+      root) to Collection and then select the Calendar View.</p>
    <p>Based on the <code>#calendarRoot</code> (or <code>#workspaceCalendarRoot</code>)
      attribute, the calendar will know that it's in a calendar and apply the
      following:</p>
@ -276,14 +289,15 @@ class="table">
        not having a <code>dateNote</code> attribute. Children of the child notes
        will not be displayed.</li>
    </ul>
+    <p>
      <img src="8_Calendar View_image.png" width="1217" height="724">
-  
+    </p>
    <h3>Using a different attribute as event title</h3>
    <p>By default, events are displayed on the calendar by their note title.
      However, it is possible to configure a different attribute to be displayed
      instead.</p>
    <p>To do so, assign <code>#calendar:title</code> to the child note (not the
-    calendar/book note), with the value being <code>name</code> where <code>name</code> can
+      calendar/Collection note), with the value being <code>name</code> where <code>name</code> can
      be any label (make not to add the <code>#</code> prefix). The attribute can
      also come through inheritance such as a template attribute. If the note
      does not have the requested label, the title of the note will be used instead.</p>
@ -311,7 +325,6 @@ class="table">
        </tbody>
      </table>
      </figure>
-    
      <h3>Using a relation attribute as event title</h3>
      <p>Similarly to using an attribute, use <code>#calendar:title</code> and set
        it to <code>name</code> where <code>name</code> is the name of the relation
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -1,8 +1,8 @@
 <aside class="admonition important">
  <p>Starting with Trilium v0.97.0, the geo map has been converted from a standalone
    <a
-    href="#root/pOsGYCXsbNQG/_help_KSZ04uQ2D1St">note type</a>to a type of view for the&nbsp;<a class="reference-link"
-      href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/_help_0ESUbbAxVnoK">Note List</a>.&nbsp;</p>
+    href="#root/_help_KSZ04uQ2D1St">note type</a>to a type of view for the&nbsp;<a class="reference-link"
+      href="#root/_help_0ESUbbAxVnoK">Note List</a>.&nbsp;</p>
 </aside>
 <figure class="image image-style-align-center">
  <img style="aspect-ratio:892/675;" src="9_Geo Map View_image.png" width="892"
@ -119,13 +119,13 @@
 </ol>
 <h3>Adding an existing note on note from the note tree</h3>
 <ol>
-  <li>Select the desired note in the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_oPVyFC7WL2Lp">Note Tree</a>.</li>
+  <li>Select the desired note in the&nbsp;<a class="reference-link" href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>.</li>
  <li>Hold the mouse on the note and drag it to the map to the desired location.</li>
  <li>The map should be updated with the new marker.</li>
 </ol>
 <p>This works for:</p>
 <ul>
-  <li>Notes that are not part of the geo map, case in which a <a href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/_help_IakOLONlIfGI">clone</a> will
+  <li>Notes that are not part of the geo map, case in which a <a href="#root/_help_IakOLONlIfGI">clone</a> will
    be created.</li>
  <li>Notes that are a child of the geo map but not yet positioned on the map.</li>
  <li>Notes that are a child of the geo map and also positioned, case in which
@ -148,19 +148,18 @@
  page (<kbd>Ctrl</kbd>+<kbd>R</kbd> ) to cancel it.</p>
 <h2>Interaction with the markers</h2>
 <ul>
-  <li>Hovering over a marker will display the content of the note it belongs
-    to.
+  <li>Hovering over a marker will display a&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_lgKX7r3aL30x">Note Tooltip</a>&nbsp;with
+    the content of the note it belongs to.
    <ul>
      <li>Clicking on the note title in the tooltip will navigate to the note in
        the current view.</li>
    </ul>
  </li>
  <li>Middle-clicking the marker will open the note in a new tab.</li>
-  <li>Right-clicking the marker will open a contextual menu allowing:
-    <ul>
-      <li>&nbsp;</li>
-    </ul>
-  </li>
+  <li>Right-clicking the marker will open a contextual menu (as described below).</li>
+  <li>If the map is in read-only mode, clicking on a marker will open a&nbsp;
+    <a
+    class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_ZjLYv08Rp3qC">Quick edit</a>&nbsp;popup for the corresponding note.</li>
 </ul>
 <h2>Contextual menu</h2>
 <p>It's possible to press the right mouse button to display a contextual
@ -377,13 +376,13 @@ class="table" style="width:100%;">
  <p>When a map is in read-only all editing features will be disabled such
    as:</p>
  <ul>
-    <li>The add button in the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_XpOYSgsLkTJy">Floating buttons</a>.</li>
+    <li>The add button in the&nbsp;<a class="reference-link" href="#root/_help_XpOYSgsLkTJy">Floating buttons</a>.</li>
    <li>Dragging markers.</li>
    <li>Editing from the contextual menu (removing locations or adding new items).</li>
  </ul>
  <p>To enable read-only mode simply press the <em>Lock</em> icon from the&nbsp;
    <a
-    class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_XpOYSgsLkTJy">Floating buttons</a>. To disable it, press the button again.</p>
+    class="reference-link" href="#root/_help_XpOYSgsLkTJy">Floating buttons</a>. To disable it, press the button again.</p>
  <h2>Troubleshooting</h2>
  <figure class="image image-style-align-right image_resized" style="width:34.06%;">
    <img style="aspect-ratio:678/499;" src="13_Geo Map View_image.png" width="678"
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1,30 @@
+<figure class="image">
+  <img style="aspect-ratio:990/590;" src="Grid View_image.png" width="990"
+  height="590">
+</figure>
+<p>This view presents the child notes in a grid format, allowing for a more
+  visual navigation experience.</p>
+<p>Each tile contains:</p>
+<ul>
+  <li>The title of a note.</li>
+  <li>A snippet of the content.</li>
+  <li>For empty notes, the sub-children are also displayed, allowing for quick
+    navigation.</li>
+</ul>
+<p>Depending on the type of note:</p>
+<ul>
+  <li>For&nbsp;<a class="reference-link" href="#root/_help_iPIMuisry3hd">Text</a>&nbsp;notes,
+    the text can be slightly scrollable via the mouse wheel to reveal more
+    context.</li>
+  <li>For&nbsp;<a class="reference-link" href="#root/_help_6f9hih2hXXZk">Code</a>&nbsp;notes,
+    syntax highlighting is applied.</li>
+  <li>For&nbsp;<a class="reference-link" href="#root/_help_W8vYD3Q1zjCR">File</a>&nbsp;notes,
+    a preview is made available for audio, video and PDF notes.</li>
+  <li>If the note does not have a content, a list of its child notes will be
+    displayed instead.</li>
+</ul>
+<p>The grid view is also used by default in the&nbsp;<a class="reference-link"
+  href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/_help_0ESUbbAxVnoK">Note List</a>&nbsp;of
+  every note, making it easy to navigate to children notes.</p>
+<h2>Configuration</h2>
+<p>Unlike most other view types, the grid view is not actually configurable.</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1,20 @@
+<figure class="image">
+  <img style="aspect-ratio:1387/758;" src="List View_image.png" width="1387"
+  height="758">
+</figure>
+<p>List view is similar to&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/GTwFsgaA0lCt/_help_8QqnMzx393bx">Grid View</a>,
+  but in the list view mode, each note is displayed in a single row with
+  only the title and the icon of the note being visible by the default. By
+  pressing the expand button it's possible to view the content of the note,
+  as well as the children of the note (recursively).</p>
+<p>In the example above, the "Node.js" note on the left panel contains several
+  child notes. The right panel displays the content of these child notes
+  as a single continuous document.</p>
+<h2>Interaction</h2>
+<ul>
+  <li>Each note can be expanded or collapsed by clicking on the arrow to the
+    left of the title.</li>
+  <li>In the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_BlN9DFI679QC">Ribbon</a>,
+    in the <em>Collection</em> tab there are options to expand and to collapse
+    all notes easily.</li>
+</ul>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -11,8 +11,8 @@
  select <em>Insert child note</em> and look for the <em>Table item</em>.</p>
 <h3>Adding columns</h3>
 <p>Each column is a <a href="#root/_help_OFXdgB2nNk1F">promoted attribute</a> that
-  is defined on the Book note. Ideally, the promoted attributes need to be
-  inheritable in order to show up in the child notes.</p>
+  is defined on the Collection note. Ideally, the promoted attributes need
+  to be inheritable in order to show up in the child notes.</p>
 <p>To create a new column, simply press <em>Add new column</em> at the bottom
  of the table.</p>
 <p>There are also a few predefined columns:</p>
@ -24,7 +24,7 @@
  <li>The title of the note.</li>
 </ul>
 <h3>Adding new rows</h3>
-<p>Each row is actually a note that is a child of the book note.</p>
+<p>Each row is actually a note that is a child of the Collection note.</p>
 <p>To create a new note, press <em>Add new row</em> at the bottom of the table.
  By default it will try to edit the title of the newly created note.</p>
 <p>Alternatively, the note can be created from the<a class="reference-link"
@ -68,12 +68,12 @@
    class="reference-link" href="#root/_help_OFXdgB2nNk1F">Promoted Attributes</a>.
      <ol>
        <li>But only the promoted attributes that are defined at the level of the
-          Book note are actually taken into consideration.</li>
+          Collection note are actually taken into consideration.</li>
        <li>There are plans to recursively look for columns across the sub-hierarchy.</li>
      </ol>
  </li>
  <li>Hierarchy is not yet supported, so the table will only show the items
-    that are direct children of the <em>Book</em> note.</li>
+    that are direct children of the <em>Collection</em> note.</li>
  <li>Multiple labels and relations are not supported. If a&nbsp;<a class="reference-link"
    href="#root/_help_OFXdgB2nNk1F">Promoted Attributes</a>&nbsp;is defined
    with a <em>Multi value</em> specificity, they will be ignored.</li>
@ -81,10 +81,9 @@
 <h2>Use in search</h2>
 <p>The table view can be used in a&nbsp;<a class="reference-link" href="#root/_help_m523cpzocqaD">Saved Search</a>&nbsp;by
  adding the <code>#viewType=table</code> attribute.</p>
-<p>Unlike when used in a book, saved searches are not limited to the sub-hierarchy
-  of a note and allows for advanced queries thanks to the power of the&nbsp;
-  <a
-  class="reference-link" href="#root/_help_eIg8jdvaoNNd">Search</a>.</p>
+<p>Unlike when used in a Collection, saved searches are not limited to the
+  sub-hierarchy of a note and allows for advanced queries thanks to the power
+  of the&nbsp;<a class="reference-link" href="#root/_help_eIg8jdvaoNNd">Search</a>.</p>
 <p>However, there are also some limitations:</p>
 <ul>
  <li>It's not possible to reorder notes.</li>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -54,7 +54,7 @@
    hide the Mermaid source code and display the diagram preview in full-size.
    In this case, the read-only mode can be easily toggled on or off via a
    dedicated button in the&nbsp;<a class="reference-link" href="#root/_help_XpOYSgsLkTJy">Floating buttons</a>&nbsp;area.</li>
-  <li><a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/0ESUbbAxVnoK/_help_81SGnPGMk7Xc">Geo Map View</a>&nbsp;will
+  <li><a class="reference-link" href="#root/_help_81SGnPGMk7Xc">Geo Map View</a>&nbsp;will
    disallow all interaction that would otherwise change the map (dragging
    notes, adding new items).</li>
 </ul>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1,37 @@
+<figure class="image image-style-align-right">
+  <img style="aspect-ratio:505/261;" src="Note Tooltip_image.png" width="505"
+  height="261">
+</figure>
+<p>The note tooltip is a convenience feature which displays a popup when
+  hovering over an <a href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/QEAPj01N5f7w/_help_hrZ1D00cLbal">internal link</a> to
+  another note.</p>
+<p>The following information is displayed:</p>
+<ul>
+  <li>The note path, at the top of the popup.</li>
+  <li>The title of the note.
+    <ul>
+      <li>Clicking on the title will open the note in the current tab.</li>
+      <li>Holding <kbd>Ctrl</kbd> pressed while clicking the title will open in a
+        new tab instead of the current one.</li>
+    </ul>
+  </li>
+  <li>A snippet of the content will be displayed as well.</li>
+  <li>A button to <a href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_ZjLYv08Rp3qC">quickly edit</a> the
+    note in a popup.</li>
+</ul>
+<p>The tooltip can be found in multiple places, including:</p>
+<ul>
+  <li>In&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_iPIMuisry3hd">Text</a>&nbsp;notes,
+    when hovering over&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/QEAPj01N5f7w/_help_hrZ1D00cLbal">Internal (reference) links</a>&nbsp;.</li>
+  <li><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_GTwFsgaA0lCt">Collections</a>: 
+    <ul>
+      <li><a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/0ESUbbAxVnoK/_help_81SGnPGMk7Xc">Geo Map View</a>,
+        when hovering over a marker.</li>
+      <li><a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/0ESUbbAxVnoK/_help_xWbu3jpNWapp">Calendar View</a>,
+        when hovering over an event.</li>
+      <li><a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/0ESUbbAxVnoK/_help_2FvYrpmOXm29">Table View</a>,
+        when hovering over a note title, or over a <a href="#root/pOsGYCXsbNQG/tC7s2alapj8V/zEY4DaJG4YT5/_help_Cq5X6iKQop6R">relation</a>.</li>
+    </ul>
+  </li>
+</ul>
+<p>&nbsp;</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -30,5 +30,8 @@
  in the context menu, or with the associated keyboard <a href="#root/_help_A9Oc6YKKc65v">shortcuts</a>: <code>CTRL-C</code> (
  <a
  href="#root/_help_IakOLONlIfGI">copy</a>), <kbd>Ctrl</kbd> + <kbd>X</kbd> (cut) and <kbd>Ctrl</kbd> + <kbd>V</kbd> (paste).</p>
-<p>See&nbsp;<a class="reference-link" href="#root/_help_YtSN43OrfzaA">Note Tree Menu</a>&nbsp;for
+<p>See&nbsp;<a class="reference-link" href="#root/_help_YtSN43OrfzaA">Note tree contextual menu</a>&nbsp;for
  more information.</p>
+<h2>Keyboard shortcuts</h2>
+<p>The note tree comes with multiple keyboard shortcuts to make editing faster,
+  consult the dedicated&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/oPVyFC7WL2Lp/_help_DvdZhoQZY9Yd">Keyboard shortcuts</a>&nbsp;section.</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1,33 @@
+<p>The&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;comes
+  with multiple keyboard shortcuts to make editing faster:</p>
+<ul>
+  <li>Opening notes:
+    <ul>
+      <li><kbd>Click</kbd> to open the note in the current tab.</li>
+      <li><kbd>Ctrl</kbd>+<kbd>Click</kbd> or <kbd>Middle click</kbd> to open the note
+        in a new tab.</li>
+      <li><kbd>Ctrl</kbd>+<kbd>Right click</kbd> to open the note in&nbsp;<a class="reference-link"
+        href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_ZjLYv08Rp3qC">Quick edit</a>.</li>
+    </ul>
+  </li>
+  <li>Navigation within the tree:
+    <ul>
+      <li><kbd>Up</kbd> and <kbd>Down</kbd> to navigate between notes.</li>
+      <li><kbd>Left</kbd> to collapse a note, or <kbd>Right</kbd> to expand it.</li>
+    </ul>
+  </li>
+  <li>Clipboard management:
+    <ul>
+      <li><kbd>Ctrl</kbd>+<kbd>C</kbd> to copy a note.</li>
+      <li><kbd>Ctrl</kbd>+<kbd>X</kbd> to cut a note.</li>
+      <li><kbd>Ctrl</kbd>+<kbd>V</kbd> to paste it somewhere.</li>
+    </ul>
+  </li>
+  <li>For&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/oPVyFC7WL2Lp/_help_yTjUdsOi4CIE">Multiple selection</a>:
+    <ul>
+      <li><kbd>Alt</kbd>+<kbd>Click</kbd>to add a single note to the current selection.</li>
+      <li><kbd>Shift</kbd>+<kbd>Click</kbd>to select a range of notes, starting
+        from the current note (the highlighted one) to the one that is being clicked.</li>
+    </ul>
+  </li>
+</ul>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1,70 @@
+<figure class="image image-style-align-right image_resized" style="width:53.13%;">
+  <img style="aspect-ratio:895/694;" src="Quick edit_image.png" width="895"
+  height="694">
+</figure>
+<p><em>Quick edit </em>provides an alternative to the standard tab-based
+  navigation and editing.</p>
+<p>Instead of clicking on a note which switches the&nbsp;<a class="reference-link"
+  href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;to
+  the newly selected note, or navigating between two different&nbsp;<a class="reference-link"
+  href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_3seOhtN8uLIY">Tabs</a>,
+  the <em>Quick edit</em> feature opens as a popup window that can be easily
+  dismissed.</p>
+<p>This feature is also well integrated with&nbsp;<a class="reference-link"
+  href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_GTwFsgaA0lCt">Collections</a>&nbsp;such
+  as the calendar view, which makes it easy to edit entries without having
+  to go back and forth between the child note and the calendar.</p>
+<h2>Feature highlights</h2>
+<ul>
+  <li>All note types are supported, including&nbsp;<a class="reference-link"
+    href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_GTwFsgaA0lCt">Collections</a>.</li>
+  <li>Note that the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/_help_0ESUbbAxVnoK">Note List</a>&nbsp;will
+    not be displayed, except for notes of type&nbsp;<a class="reference-link"
+    href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_GTwFsgaA0lCt">Collections</a>.</li>
+  <li>For&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_iPIMuisry3hd">Text</a>&nbsp;notes,
+    depending on user preference, both the floating and classic editors are
+    supported. See&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/_help_nRhnJkTT8cPs">Formatting toolbar</a>.</li>
+  <li>The title and the note and the icon are editable, just like a normal tab.</li>
+  <li>The&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/zEY4DaJG4YT5/_help_OFXdgB2nNk1F">Promoted Attributes</a>&nbsp;are
+    also displayed.
+    <ul>
+      <li>This integrates well with&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_GTwFsgaA0lCt">Collections</a>&nbsp;where
+        there are predefined attributes such as the <em>Start date</em> and <em>End date</em>,
+        allowing for easy editing.</li>
+    </ul>
+  </li>
+</ul>
+<h2>Accessing the quick edit</h2>
+<ul>
+  <li>&nbsp;From the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_oPVyFC7WL2Lp">Note Tree</a>:
+    <ul>
+      <li>Right click on a note and select <em>Quick edit</em>.</li>
+      <li>or, press <kbd>Ctrl</kbd>+<kbd>Right click</kbd> on a note.</li>
+    </ul>
+  </li>
+  <li>On&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/QEAPj01N5f7w/_help_hrZ1D00cLbal">Internal (reference) links</a>: 
+    <ul>
+      <li>Right click and select <em>Quick edit</em>.</li>
+      <li>or, press <kbd>Ctrl</kbd>+<kbd>Right click</kbd> on the link.</li>
+    </ul>
+  </li>
+  <li>On a&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_lgKX7r3aL30x">Note Tooltip</a>,
+    press the quick edit icon.</li>
+  <li>In&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_GTwFsgaA0lCt">Collections</a>:
+    <ul>
+      <li>For&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/0ESUbbAxVnoK/_help_xWbu3jpNWapp">Calendar View</a>:
+        <ul>
+          <li>Clicking on an event will open that event for quick editing.</li>
+          <li>If the calendar is for the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/5668rwcirq1t/_help_l0tKav7yLHGF">Day Notes</a>&nbsp;root,
+            clicking on the day number will open the popup for that day note.</li>
+        </ul>
+      </li>
+      <li>For&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/0ESUbbAxVnoK/_help_81SGnPGMk7Xc">Geo Map View</a>:
+        <ul>
+          <li>Clicking on a marker will open that marker, but only if the map is in
+            read-only mode.</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+</ul>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1,82 @@
+<p>This section presents the most important changes by version. For a full
+  set of changes, please consult the change log of each release. For purposes
+  of brevity, beta versions are skipped and the features gathered to the
+  nearest stable version.</p>
+<ul>
+  <li>v0.97.0:
+    <ul>
+      <li>Books are now&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_GTwFsgaA0lCt">Collections</a>.</li>
+      <li><a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/0ESUbbAxVnoK/_help_2FvYrpmOXm29">Table View</a>&nbsp;is
+        a new collection type displaying notes and attributes in an editable grid.</li>
+      <li><a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/wArbEsdSae6g/_help_ZjLYv08Rp3qC">Quick edit</a>&nbsp;is
+        introduced, adding a new way to edit notes in a popup instead of opening
+        a new tab. It also integrates well with&nbsp;<a class="reference-link"
+        href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_GTwFsgaA0lCt">Collections</a>.</li>
+    </ul>
+  </li>
+  <li>v0.96.0:
+    <ul>
+      <li><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_iPIMuisry3hd">Text</a>&nbsp;gain
+        premium features thanks to a collaboration with the CKEditor team:
+        <ul>
+          <li><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/gLt3vA97tMcp/_help_ZlN4nump6EbW">Slash Commands</a>
+          </li>
+          <li><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/gLt3vA97tMcp/_help_pwc194wlRzcH">Text Snippets</a>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li>v0.95.0:
+    <ul>
+      <li>A more friendly theme was introduced for&nbsp;<a class="reference-link"
+        href="#root/pOsGYCXsbNQG/tC7s2alapj8V/_help_R9pX4DGra2Vt">Sharing</a>,
+        with search, expandable tree, night mode and more.</li>
+    </ul>
+  </li>
+  <li>v0.94.0:
+    <ul>
+      <li>Added integration with&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/_help_LMAv4Uy3Wk6J">AI</a>&nbsp;(using
+        self-hosted LLMs such as Ollama or industry standards such as ChatGPT).</li>
+    </ul>
+  </li>
+  <li>v0.92.5:
+    <ul>
+      <li>Windows binaries are now signed.</li>
+      <li><a class="reference-link" href="#root/pOsGYCXsbNQG/Otzi9La2YAUX/WOcw2SLH6tbX/_help_7DAiwaf8Z7Rz">Multi-Factor Authentication</a>&nbsp;was
+        introduced.</li>
+    </ul>
+  </li>
+  <li>v0.92.4:
+    <ul>
+      <li>macOS binaries are now signed.</li>
+      <li><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_iPIMuisry3hd">Text</a>&nbsp;notes
+        can now have adjustable&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/_help_veGu4faJErEM">Content language &amp; Right-to-left support</a>.</li>
+      <li><a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/_help_NRnIZmSMc5sj">Export as PDF</a>
+      </li>
+      <li><a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/_help_rC3pL2aptaRE">Zen mode</a>
+      </li>
+      <li><a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/0ESUbbAxVnoK/_help_xWbu3jpNWapp">Calendar View</a>,
+        allowing notes to be displayed in a monthly grid based on start and end
+        dates.</li>
+    </ul>
+  </li>
+  <li>v0.91.5:
+    <ul>
+      <li>Significant improvements for mobile.</li>
+      <li><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/_help_AgjCISero73a">Footnotes</a>&nbsp;are
+        now supported in&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_iPIMuisry3hd">Text</a>&nbsp;notes.</li>
+      <li>Mermaid diagrams can now be inserted inline within&nbsp;<a class="reference-link"
+        href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_iPIMuisry3hd">Text</a>&nbsp;notes.</li>
+      <li>The TriliumNext theme is introduced, bringing a more modern design to
+        the application.</li>
+      <li><a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/0ESUbbAxVnoK/_help_81SGnPGMk7Xc">Geo Map View</a>,
+        displaying notes as markers on a geographical map for easy trip planning.</li>
+    </ul>
+  </li>
+  <li>v0.90.8:
+    <ul>
+      <li>A new note type was introduced:&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_gBbsAeiuUxI5">Mind Map</a>&nbsp;</li>
+    </ul>
+  </li>
+</ul>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -84,7 +84,7 @@ style="width:100%;">
          kind of content, provided there is a script behind it to generate it.</td>
      </tr>
      <tr>
-        <td><a class="reference-link" href="#root/_help_GTwFsgaA0lCt">Book</a>
+        <td><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_GTwFsgaA0lCt">Collections</a>
        </td>
        <td>
          <p>Displays the children of the note either as a grid, a list, or for a more
@ -116,7 +116,7 @@ style="width:100%;">
        <td>Easy for brainstorming ideas, by placing them in a hierarchical layout.</td>
      </tr>
      <tr>
-        <td><a class="reference-link" href="#root/_help_81SGnPGMk7Xc">Geo Map</a>
+        <td><a class="reference-link" href="#root/_help_81SGnPGMk7Xc">Geo Map View</a>
        </td>
        <td>Displays the children of the note as a geographical map, one use-case
          would be to plan vacations. It even has basic support for tracks. Notes
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -1,20 +0,0 @@
-<p>A <strong>Book Note</strong> in Trilium is a special type of <a href="#root/_help_BFs8mudNFgCS">note</a> designed
-  to display the contents of its child notes sequentially, creating a linear,
-  book-like reading experience. This format is particularly useful for viewing
-  multiple smaller notes in a cohesive, continuous manner.</p>
-<p>
-  <img src="Book_image.png">
-</p>
-<p>In the example above, the "node.js" note on the left panel contains several
-  child notes. The right panel displays the content of these child notes
-  as a single continuous document.</p>
-<h2>Features</h2>
-<p>The Book Note format compiles the contents of all child notes into one
-  continuous view. This makes it ideal for reading extensive information
-  broken into smaller, manageable segments.</p>
-<p>It uses the&nbsp;<a class="reference-link" href="#root/_help_0ESUbbAxVnoK">Note List</a>&nbsp;mechanism
-  to display the child notes, allowing the use of any of the view types (grid,
-  list, calendar).</p>
-<p>To adjust the view type, see the dedicated <em>Book</em> tab in the&nbsp;
-  <a
-  class="reference-link" href="#root/_help_BlN9DFI679QC">Ribbon</a>.</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1,54 @@
+<p>Collections are a unique type of notes that don't have a content, but
+  instead display its child notes in various presentation methods.</p>
+<p>Classic collections are read-only mode and compiles the contents of all
+  child notes into one continuous view. This makes it ideal for reading extensive
+  information broken into smaller, manageable segments.</p>
+<ul>
+  <li><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/GTwFsgaA0lCt/_help_8QqnMzx393bx">Grid View</a>&nbsp;which
+    is the default presentation method for child notes (see&nbsp;<a class="reference-link"
+    href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/_help_0ESUbbAxVnoK">Note List</a>),
+    where the notes are displayed as tiles with their title and content being
+    visible.&nbsp;</li>
+  <li><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/GTwFsgaA0lCt/_help_mULW0Q3VojwY">List View</a>&nbsp;is
+    similar to&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/GTwFsgaA0lCt/_help_8QqnMzx393bx">Grid View</a>,
+    but it displays the notes one under the other with the content being expandable/collapsible,
+    but also works recursively.</li>
+</ul>
+<p>More specialized collections were introduced, such as the:</p>
+<ul>
+  <li><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/GTwFsgaA0lCt/_help_xWbu3jpNWapp">Calendar View</a>&nbsp;which
+    displays a week, month or year calendar with the notes being shown as events.
+    New events can be added easily by dragging across the calendar.&nbsp;</li>
+  <li><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/GTwFsgaA0lCt/_help_81SGnPGMk7Xc">Geo Map View</a>&nbsp;which
+    displays a geographical map in which the notes are represented as markers/pins
+    on the map. New events can be easily added by pointing on the map.</li>
+  <li><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/GTwFsgaA0lCt/_help_2FvYrpmOXm29">Table View</a>&nbsp;displays
+    each note as a row in a table, with&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/zEY4DaJG4YT5/_help_OFXdgB2nNk1F">Promoted Attributes</a>&nbsp;being
+    shown as well. This makes it easy to visualize attributes of notes, as
+    well as making them easily editable.</li>
+</ul>
+<p>For a quick presentation of all the supported view types, see the child
+  notes of this help page, including screenshots.</p>
+<h2>Configuration</h2>
+<p>To adjust the view type, see the dedicated <em>Collections </em>tab in
+  the&nbsp;<a class="reference-link" href="#root/_help_BlN9DFI679QC">Ribbon</a>.</p>
+<h2>Use in saved search</h2>
+<p>Since collections are based on the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/_help_0ESUbbAxVnoK">Note List</a>&nbsp;mechanism,
+  it's possible to apply the same configuration to&nbsp;<a class="reference-link"
+  href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_m523cpzocqaD">Saved Search</a>&nbsp;to
+  do advanced querying and presenting the result in an adequate matter such
+  as a calendar, a table or even a map.</p>
+<h2>Under the hood</h2>
+<p>Collections by themselves are simply notes with no content that rely on
+  the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/_help_0ESUbbAxVnoK">Note List</a>&nbsp;mechanism
+  (the one that lists the children notes at the bottom of a note) to display
+  information.</p>
+<p>By default, new collections use predefined&nbsp;<a class="reference-link"
+  href="#root/pOsGYCXsbNQG/tC7s2alapj8V/_help_KC1HB96bqqHX">Templates</a>&nbsp;that
+  are stored safely in the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/_help_2mUhVmZK8RF3">Hidden Notes</a>&nbsp;to
+  define some basic configuration such as the type of view, but also some&nbsp;
+  <a
+  class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/zEY4DaJG4YT5/_help_OFXdgB2nNk1F">Promoted Attributes</a>&nbsp;to make editing easier.</p>
+<p>Collections don't store their configuration (e.g. the position on the
+  map, the hidden columns in a table) in the content of the note itself,
+  but as attachments.</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1 @@
+<p>This is a clone of a note. Go to its <a href="../../Basic%20Concepts%20and%20Features/Notes/Note%20List/Calendar%20View.html">primary location</a>.</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1 @@
+<p>This is a clone of a note. Go to its <a href="../../Basic%20Concepts%20and%20Features/Notes/Note%20List/Geo%20Map%20View.html">primary location</a>.</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1 @@
+<p>This is a clone of a note. Go to its <a href="../../Basic%20Concepts%20and%20Features/Notes/Note%20List/Grid%20View.html">primary location</a>.</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1 @@
+<p>This is a clone of a note. Go to its <a href="../../Basic%20Concepts%20and%20Features/Notes/Note%20List/List%20View.html">primary location</a>.</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1 @@
+<p>This is a clone of a note. Go to its <a href="../../Basic%20Concepts%20and%20Features/Notes/Note%20List/Table%20View.html">primary location</a>.</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -1,75 +1,9 @@
-<h2>External links</h2>
-<p>An external link is a standard web link targeting for example a website.
-  For example, <a href="https://en.wikipedia.org/wiki/South_China_Sea">https://en.wikipedia.org/wiki/South_China_Sea</a> is
-  an external link to a Wikipedia page.</p>
-<p>To create a link without a custom text:</p>
+<p>There are two types of links:</p>
 <ul>
-  <li>Press
-    <img src="2_Links_image.png" width="15" height="16">in the&nbsp;<a class="reference-link" href="#root/_help_nRhnJkTT8cPs">Formatting toolbar</a>:
-    <ul>
-      <li>A popup will appear, type or paste the URL in the box.</li>
-      <li>Press <kbd>Enter</kbd> or the check mark icon to confirm.</li>
-    </ul>
-  </li>
-  <li>Alternatively, press <kbd>Ctrl</kbd>+<kbd>K</kbd> to trigger the aforementioned
-    popup.</li>
-  <li>A simpler way is to paste the raw link and press space to turn it automatically
-    into a link.</li>
-</ul>
-<p>To create a link with a custom text:</p>
-<ul>
-  <li>First, type and select the text which will be turned into a link.</li>
-  <li>Follow the previous steps to open the link interface (via the formatting
-    toolbar, or <kbd>Ctrl</kbd>+<kbd>K</kbd>).</li>
-  <li>Alternatively, simply paste (<kbd>Ctrl</kbd>+<kbd>V</kbd>) over the selected
-    text to turn it into a link.</li>
-</ul>
-<p>Once a link is inserted:</p>
-<ul>
-  <li>The text inside the link can be changed if needed but the link itself
-    will remain.</li>
-  <li>To modify the link, click on the link to display the popup and press the
-    <img
-    src="Links_image.png" width="18" height="18"> <em>Edit link</em> button.</li>
-  <li>To remove a link, click on it and press the
-    <img src="3_Links_image.png"
-    width="18" height="18"> <em>Unlink</em> button.</li>
-</ul>
-<p>You can follow external link by either double clicking (will open new
-  tab/window) it or right clicking on them and choosing "Open in new tab".</p>
-<h2>Internal links to notes</h2>
-<p>Unlike external notes, internal links (links to other notes) can be created
-  at the current position by :</p>
-<ol>
-  <li>Pressing <kbd>Ctrl</kbd> + <kbd>L</kbd> or the
-    <img src="1_Links_image.png"
-    width="20" height="17">button from the&nbsp;<a class="reference-link" href="#root/_help_nRhnJkTT8cPs">Formatting toolbar</a>.</li>
-  <li>Filling in the desired note to link. It's also possible to create notes
-    from this dialog by typing a non-existing note title and selecting <em>Create and link child note</em>.</li>
-</ol>
-<p>There are two link types, adjustable when creating the link to the note:</p>
-<ol>
-  <li><em>link title mirrors the note's current title</em>
-    <ol>
-      <li>This is sometimes also called "reference link".</li>
-      <li>Title of such links cannot be changed, instead it is always mirroring
-        the title of linked note.</li>
-      <li>The icon of the note is also displayed.</li>
-      <li>The link title will automatically update if the title of the note is changed.</li>
-    </ol>
-  </li>
-  <li><em>link title can be changed arbitrarily</em>
-    <ol>
-      <li>This is the traditional hyperlink, where the text of the link can be different
-        to the note title.</li>
-    </ol>
-  </li>
-</ol>
-<p>Once an internal link is created:</p>
-<ul>
-  <li>You can follow the note link by double clicking it.</li>
-  <li>Alternatively if you only wish to quickly preview the content, you can
-    hover over the link and will see read only preview.</li>
+  <li><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/QEAPj01N5f7w/_help_3IDVtesTQ8ds">External links</a>,
+    for standard hyperlinks to websites or other resources.</li>
+  <li><a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/iPIMuisry3hd/QEAPj01N5f7w/_help_hrZ1D00cLbal">Internal (reference) links</a>&nbsp;for
+    links to other notes within Trilium.</li>
 </ul>
 <h2>Pasting links</h2>
 <ul>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1,38 @@
+<p>An external link is a standard web link targeting for example a website.
+  For example, <a href="https://en.wikipedia.org/wiki/South_China_Sea">https://en.wikipedia.org/wiki/South_China_Sea</a> is
+  an external link to a Wikipedia page.</p>
+<p>To create a link without a custom text:</p>
+<ul>
+  <li>Press
+    <img src="1_External links_image.png" width="15" height="16">in the&nbsp;<a class="reference-link" href="#root/_help_nRhnJkTT8cPs">Formatting toolbar</a>:
+    <ul>
+      <li>A popup will appear, type or paste the URL in the box.</li>
+      <li>Press <kbd>Enter</kbd> or the check mark icon to confirm.</li>
+    </ul>
+  </li>
+  <li>Alternatively, press <kbd>Ctrl</kbd>+<kbd>K</kbd> to trigger the aforementioned
+    popup.</li>
+  <li>A simpler way is to paste the raw link and press space to turn it automatically
+    into a link.</li>
+</ul>
+<p>To create a link with a custom text:</p>
+<ul>
+  <li>First, type and select the text which will be turned into a link.</li>
+  <li>Follow the previous steps to open the link interface (via the formatting
+    toolbar, or <kbd>Ctrl</kbd>+<kbd>K</kbd>).</li>
+  <li>Alternatively, simply paste (<kbd>Ctrl</kbd>+<kbd>V</kbd>) over the selected
+    text to turn it into a link.</li>
+</ul>
+<p>Once a link is inserted:</p>
+<ul>
+  <li>The text inside the link can be changed if needed but the link itself
+    will remain.</li>
+  <li>To modify the link, click on the link to display the popup and press the
+    <img
+    src="External links_image.png" width="18" height="18"> <em>Edit link</em> button.</li>
+  <li>To remove a link, click on it and press the
+    <img src="2_External links_image.png"
+    width="18" height="18"> <em>Unlink</em> button.</li>
+</ul>
+<p>You can follow external link by either double clicking (will open new
+  tab/window) it or right clicking on them and choosing "Open in new tab".</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -0,0 +1,33 @@
+<p>Unlike external notes, internal links (links to other notes) can be created
+  at the current position by :</p>
+<ol>
+  <li>Pressing <kbd>Ctrl</kbd> + <kbd>L</kbd> or the
+    <img src="Internal (reference) links.png"
+    width="20" height="17">button from the&nbsp;<a class="reference-link" href="#root/_help_nRhnJkTT8cPs">Formatting toolbar</a>.</li>
+  <li>Filling in the desired note to link. It's also possible to create notes
+    from this dialog by typing a non-existing note title and selecting <em>Create and link child note</em>.</li>
+</ol>
+<p>There are two link types, adjustable when creating the link to the note:</p>
+<ol>
+  <li><em>link title mirrors the note's current title</em>
+    <ol>
+      <li>This is sometimes also called "reference link".</li>
+      <li>Title of such links cannot be changed, instead it is always mirroring
+        the title of linked note.</li>
+      <li>The icon of the note is also displayed.</li>
+      <li>The link title will automatically update if the title of the note is changed.</li>
+    </ol>
+  </li>
+  <li><em>link title can be changed arbitrarily</em>
+    <ol>
+      <li>This is the traditional hyperlink, where the text of the link can be different
+        to the note title.</li>
+    </ol>
+  </li>
+</ol>
+<p>Once an internal link is created:</p>
+<ul>
+  <li>You can follow the note link by double clicking it.</li>
+  <li>Alternatively if you only wish to quickly preview the content, you can
+    hover over the link and will see read only preview.</li>
+</ul>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
--- a/Guide/!!!meta.json
+++ b/Guide/!!!meta.json
--- a/Usage/Sharing.md
+++ b/Usage/Sharing.md
@ -16,7 +16,7 @@ Trilium allows you to share selected notes as **publicly accessible** read-only

 ### By note type

-<figure class="table" style="width:100%;"><table class="ck-table-resized"><colgroup><col style="width:19.92%;"><col style="width:41.66%;"><col style="width:38.42%;"></colgroup><thead><tr><th>&nbsp;</th><th>Supported features</th><th>Limitations</th></tr></thead><tbody><tr><th><a class="reference-link" href="../Note%20Types/Text.md">Text</a></th><td><ul><li>Table of contents.</li><li>Syntax highlight of code blocks, provided a language is selected (does not work if “Auto-detected” is enabled).</li><li>Rendering for math equations.</li></ul></td><td><ul><li>Including notes is not supported.</li><li>Inline Mermaid diagrams are not rendered.</li></ul></td></tr><tr><th><a class="reference-link" href="../Note%20Types/Code.md">Code</a></th><td><ul><li>Basic support (displaying the contents of the note in a monospace font).</li></ul></td><td><ul><li>No syntax highlight.</li></ul></td></tr><tr><th><a class="reference-link" href="../Note%20Types/Saved%20Search.md">Saved Search</a></th><td>Not supported.</td></tr><tr><th><a class="reference-link" href="../Note%20Types/Relation%20Map.md">Relation Map</a></th><td>Not supported.</td></tr><tr><th><a class="reference-link" href="../Note%20Types/Note%20Map.md">Note Map</a></th><td>Not supported.</td></tr><tr><th><a class="reference-link" href="../Note%20Types/Render%20Note.md">Render Note</a></th><td>Not supported.</td></tr><tr><th><a class="reference-link" href="../Note%20Types/Book.md">Book</a></th><td><ul><li>The child notes are displayed in a fixed format.&nbsp;</li></ul></td><td><ul><li>More advanced view types such as the calendar view are not supported.</li></ul></td></tr><tr><th><a class="reference-link" href="../Note%20Types/Mermaid%20Diagrams.md">Mermaid Diagrams</a></th><td><ul><li>The diagram is displayed as a vector image.</li></ul></td><td><ul><li>No further interaction supported.</li></ul></td></tr><tr><th><a class="reference-link" href="../Note%20Types/Canvas.md">Canvas</a></th><td><ul><li>The diagram is displayed as a vector image.</li></ul></td><td><ul><li>No further interaction supported.</li></ul></td></tr><tr><th><a class="reference-link" href="../Note%20Types/Web%20View.md">Web View</a></th><td>Not supported.</td></tr><tr><th><a class="reference-link" href="../Note%20Types/Mind%20Map.md">Mind Map</a></th><td>The diagram is displayed as a vector image.</td><td><ul><li>No further interaction supported.</li></ul></td></tr><tr><th><a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List/Geo%20Map%20View.md">Geo Map</a></th><td>Not supported.</td></tr><tr><th><a class="reference-link" href="../Note%20Types/File.md">File</a></th><td>Basic interaction (downloading the file).</td><td><ul><li>No further interaction supported.</li></ul></td></tr></tbody></table></figure>
+<figure class="table" style="width:100%;"><table class="ck-table-resized"><colgroup><col style="width:19.92%;"><col style="width:41.66%;"><col style="width:38.42%;"></colgroup><thead><tr><th>&nbsp;</th><th>Supported features</th><th>Limitations</th></tr></thead><tbody><tr><th><a class="reference-link" href="../Note%20Types/Text.md">Text</a></th><td><ul><li>Table of contents.</li><li>Syntax highlight of code blocks, provided a language is selected (does not work if “Auto-detected” is enabled).</li><li>Rendering for math equations.</li></ul></td><td><ul><li>Including notes is not supported.</li><li>Inline Mermaid diagrams are not rendered.</li></ul></td></tr><tr><th><a class="reference-link" href="../Note%20Types/Code.md">Code</a></th><td><ul><li>Basic support (displaying the contents of the note in a monospace font).</li></ul></td><td><ul><li>No syntax highlight.</li></ul></td></tr><tr><th><a class="reference-link" href="../Note%20Types/Saved%20Search.md">Saved Search</a></th><td>Not supported.</td><td>&nbsp;</td></tr><tr><th><a class="reference-link" href="../Note%20Types/Relation%20Map.md">Relation Map</a></th><td>Not supported.</td><td>&nbsp;</td></tr><tr><th><a class="reference-link" href="../Note%20Types/Note%20Map.md">Note Map</a></th><td>Not supported.</td><td>&nbsp;</td></tr><tr><th><a class="reference-link" href="../Note%20Types/Render%20Note.md">Render Note</a></th><td>Not supported.</td><td>&nbsp;</td></tr><tr><th><a class="reference-link" href="../Note%20Types/Collections.md">Collections</a></th><td><ul><li>The child notes are displayed in a fixed format.&nbsp;</li></ul></td><td><ul><li>More advanced view types such as the calendar view are not supported.</li></ul></td></tr><tr><th><a class="reference-link" href="../Note%20Types/Mermaid%20Diagrams.md">Mermaid Diagrams</a></th><td><ul><li>The diagram is displayed as a vector image.</li></ul></td><td><ul><li>No further interaction supported.</li></ul></td></tr><tr><th><a class="reference-link" href="../Note%20Types/Canvas.md">Canvas</a></th><td><ul><li>The diagram is displayed as a vector image.</li></ul></td><td><ul><li>No further interaction supported.</li></ul></td></tr><tr><th><a class="reference-link" href="../Note%20Types/Web%20View.md">Web View</a></th><td>Not supported.</td><td>&nbsp;</td></tr><tr><th><a class="reference-link" href="../Note%20Types/Mind%20Map.md">Mind Map</a></th><td>The diagram is displayed as a vector image.</td><td><ul><li>No further interaction supported.</li></ul></td></tr><tr><th><a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List/Geo%20Map%20View.md">Geo Map View</a></th><td>Not supported.</td><td>&nbsp;</td></tr><tr><th><a class="reference-link" href="../Note%20Types/File.md">File</a></th><td>Basic interaction (downloading the file).</td><td><ul><li>No further interaction supported.</li></ul></td></tr></tbody></table></figure>

 While the sharing feature is powerful, it has some limitations:

--- a/Features/Navigation/Quick
+++ b/Features/Navigation/Quick
@ -0,0 +1,2 @@
+# Quick edit
+This is a clone of a note. Go to its [primary location](../UI%20Elements/Quick%20edit.md).
--- a/Features/Notes/1_Note
+++ b/Features/Notes/1_Note
--- a/Features/Notes/2_Note
+++ b/Features/Notes/2_Note
--- a/Features/Notes/Note
+++ b/Features/Notes/Note
@ -1,4 +1,6 @@
 # Note List
+<figure class="image"><img style="aspect-ratio:990/590;" src="Note List_image.png" width="990" height="590"></figure>
+
 When a note has one or more child notes, they will be listed at the end of the note for easy navigation.

 ## Configuration
@ -8,32 +10,8 @@ When a note has one or more child notes, they will be listed at the end of the n

 ## View types

+The view types dictate how the child notes are represented.
+
 By default, the notes will be displayed in a grid, however there are also some other view types available.

-> [!TIP]
-> Generally the view type can only be changed in a <a class="reference-link" href="../../Note%20Types/Book.md">Book</a> note from the <a class="reference-link" href="../UI%20Elements/Ribbon.md">Ribbon</a>, but it can also be changed manually on any type of note using the `#viewType` attribute.
-
-### Grid view
-
-<figure class="image image-style-align-center"><img style="aspect-ratio:1025/655;" src="1_Note List_image.png" width="1025" height="655"></figure>
-
-This view presents the child notes in a grid format, allowing for a more visual navigation experience.
-
-*   For <a class="reference-link" href="../../Note%20Types/Text.md">Text</a> notes, the text can be slighly scrollable via the mouse wheel to reveal more context.
-*   For <a class="reference-link" href="../../Note%20Types/Code.md">Code</a> notes, syntax highlighting is applied.
-*   For <a class="reference-link" href="../../Note%20Types/File.md">File</a> notes, a preview is made available for audio, video and PDF notes.
-*   If the note does not have a content, a list of its child notes will be displayed instead.
-
-This is the default view type.
-
-### List view
-
-<figure class="image image-style-align-center"><img style="aspect-ratio:1013/526;" src="Note List_image.png" width="1013" height="526"></figure>
-
-In the list view mode, each note is displayed in a single row with only the title and the icon of the note being visible by the default. By pressing the expand button it's possible to view the content of the note, as well as the children of the note (recursively).
-
-### Calendar view
-
-<figure class="image image-style-align-center"><img style="aspect-ratio:1090/598;" src="2_Note List_image.png" width="1090" height="598"></figure>
-
-In the calendar view, child notes are represented as events, with a start date and optionally an end date. The view also has interaction support such as moving or creating new events. See <a class="reference-link" href="Note%20List/Calendar%20View.md">Calendar View</a> for more information.
+Generally the view type can only be changed in a <a class="reference-link" href="../../Note%20Types/Collections.md">Collections</a> note from the <a class="reference-link" href="../UI%20Elements/Ribbon.md">Ribbon</a>, but it can also be changed manually on any type of note using the `#viewType` attribute.
--- a/Features/Notes/Note
+++ b/Features/Notes/Note
@ -1,7 +1,7 @@
 # Calendar View
 <figure class="image image-style-align-center"><img style="aspect-ratio:767/606;" src="4_Calendar View_image.png" width="767" height="606"></figure>

-The Calendar view of Book notes will display each child note in a calendar that has a start date and optionally an end date, as an event.
+The Calendar view will display each child note in a calendar that has a start date and optionally an end date, as an event.

 The Calendar view has multiple display modes:

@ -10,11 +10,11 @@ The Calendar view has multiple display modes:
 *   Year view, which displays the entire year for quick reference.
 *   List view, which displays all the events of a given month in sequence.

-Unlike other Book view types, the Calendar view also allows some kind of interaction, such as moving events around as well as creating new ones.
+Unlike other Collection view types, the Calendar view also allows some kind of interaction, such as moving events around as well as creating new ones.

 ## Creating a calendar

-<figure class="table"><table><thead><tr><th>&nbsp;</th><th>&nbsp;</th><th>&nbsp;</th></tr></thead><tbody><tr><td>1</td><td><img src="2_Calendar View_image.png"></td><td>The Calendar View works only for Book note types. To create a new note, right click on the note tree on the left and select Insert note after, or Insert child note and then select <em>Book</em>.</td></tr><tr><td>2</td><td><img src="3_Calendar View_image.png"></td><td>Once created, the “View type” of the Book needs changed to “Calendar”, by selecting the “Book Properties” tab in the ribbon.</td></tr></tbody></table></figure>
+<figure class="table"><table><thead><tr><th>&nbsp;</th><th>&nbsp;</th><th>&nbsp;</th></tr></thead><tbody><tr><td>1</td><td><img src="2_Calendar View_image.png"></td><td>The Calendar View works only for Collection note types. To create a new note, right click on the note tree on the left and select Insert note after, or Insert child note and then select <em>Collection</em>.</td></tr><tr><td>2</td><td><img src="3_Calendar View_image.png"></td><td>Once created, the “View type” of the Collection needs changed to “Calendar”, by selecting the “Collection Properties” tab in the ribbon.</td></tr></tbody></table></figure>

 ## Creating a new event/note

@ -22,25 +22,34 @@ Unlike other Book view types, the Calendar view also allows some kind of interac
    *   You will be asked for the name of the new note. If the popup is dismissed by pressing the close button or escape, then the note will not be created.
 *   It's possible to drag across multiple days to set both the start and end date of a particular note.  
    ![](Calendar%20View_image.png)
-*   Creating new notes from the calendar will respect the `~child:template` relation if set on the book note.
+*   Creating new notes from the calendar will respect the `~child:template` relation if set on the Collection note.

 ## Interacting with events

 *   Hovering the mouse over an event will display information about the note.  
    ![](7_Calendar%20View_image.png)
-*   Left clicking the event will go to that note. Middle clicking will open the note in a new tab and right click will offer more options including opening the note in a new split or window.
+*   Left clicking the event will open a <a class="reference-link" href="../../UI%20Elements/Quick%20edit.md">Quick edit</a> to edit the note in a popup while allowing easy return to the calendar by just dismissing the popup.
+    *   Middle clicking will open the note in a new tab.
+    *   Right click will offer more options including opening the note in a new split or window.
 *   Drag and drop an event on the calendar to move it to another day.
 *   The length of an event can be changed by placing the mouse to the right edge of the event and dragging the mouse around.

-## Configuring the calendar
+## Configuring the calendar view

-The following attributes can be added to the book type:
+In the _Collections_ tab in the <a class="reference-link" href="../../UI%20Elements/Ribbon.md">Ribbon</a>, it's possible to adjust the following:
+
+*   Hide weekends from the week view.
+*   Display week numbers on the calendar.
+
+## Configuring the calendar using attributes
+
+The following attributes can be added to the Collection type:

 <figure class="table"><table><thead><tr><th>Name</th><th>Description</th></tr></thead><tbody><tr><td><code>#calendar:hideWeekends</code></td><td>When present (regardless of value), it will hide Saturday and Sundays from the calendar.</td></tr><tr><td><code>#calendar:weekNumbers</code></td><td>When present (regardless of value), it will show the number of the week on the calendar.</td></tr><tr><td><code>#calendar:view</code></td><td><p>Which view to display in the calendar:</p><ul><li><code>timeGridWeek</code> for the <em>week</em> view;</li><li><code>dayGridMonth</code> for the <em>month</em> view;</li><li><code>multiMonthYear</code> for the <em>year</em> view;</li><li><code>listMonth</code> for the <em>list</em> view.</li></ul><p>Any other value will be dismissed and the default view (month) will be used instead.</p><p>The value of this label is automatically updated when changing the view using the UI buttons.</p></td></tr><tr><td><code>~child:template</code></td><td>Defines the template for newly created notes in the calendar (via dragging or clicking).</td></tr></tbody></table></figure>

 In addition, the first day of the week can be either Sunday or Monday and can be adjusted from the application settings.

-## Configuring the calendar events
+## Configuring the calendar events using attributes

 For each note of the calendar, the following attributes can be used:

@ -50,9 +59,9 @@ For each note of the calendar, the following attributes can be used:

 ![](11_Calendar%20View_image.png)

-The calendar displays all the child notes of the book that have a `#startDate`. An `#endDate` can optionally be added.
+The calendar displays all the child notes of the Collection that have a `#startDate`. An `#endDate` can optionally be added.

-If editing the start date and end date from the note itself is desirable, the following attributes can be added to the book note:
+If editing the start date and end date from the note itself is desirable, the following attributes can be added to the Collection note:

 ```
 #viewType=calendar #label:startDate(inheritable)="promoted,alias=Start Date,single,date"
@ -70,7 +79,7 @@ When not used in a Journal, the calendar is recursive. That is, it will look for

 ### Using with the Journal / calendar

-It is possible to integrate the calendar view into the Journal with day notes. In order to do so change the note type of the Journal note (calendar root) to Book and then select the Calendar View.
+It is possible to integrate the calendar view into the Journal with day notes. In order to do so change the note type of the Journal note (calendar root) to Collection and then select the Calendar View.

 Based on the `#calendarRoot` (or `#workspaceCalendarRoot`) attribute, the calendar will know that it's in a calendar and apply the following:

@ -85,7 +94,7 @@ Based on the `#calendarRoot` (or `#workspaceCalendarRoot`) attribute, the calend

 By default, events are displayed on the calendar by their note title. However, it is possible to configure a different attribute to be displayed instead.

-To do so, assign `#calendar:title` to the child note (not the calendar/book note), with the value being `name` where `name` can be any label (make not to add the `#` prefix). The attribute can also come through inheritance such as a template attribute. If the note does not have the requested label, the title of the note will be used instead.
+To do so, assign `#calendar:title` to the child note (not the calendar/Collection note), with the value being `name` where `name` can be any label (make not to add the `#` prefix). The attribute can also come through inheritance such as a template attribute. If the note does not have the requested label, the title of the note will be used instead.

 <figure class="table" style="width:100%;"><table><thead><tr><th>&nbsp;</th><th>&nbsp;</th></tr></thead><tbody><tr><td><pre><code class="language-text-x-trilium-auto">#startDate=2025-02-11 #endDate=2025-02-13 #name="My vacation" #calendar:title="name"</code></pre></td><td><p>&nbsp;</p><figure class="image image-style-align-center"><img style="aspect-ratio:445/124;" src="5_Calendar View_image.png" width="445" height="124"></figure></td></tr></tbody></table></figure>

--- a/Features/Notes/Note
+++ b/Features/Notes/Note
@ -60,10 +60,11 @@ If moved by mistake, there is currently no way to undo the change. If the mouse

 ## Interaction with the markers

-*   Hovering over a marker will display the content of the note it belongs to.
+*   Hovering over a marker will display a <a class="reference-link" href="../../UI%20Elements/Note%20Tooltip.md">Note Tooltip</a> with the content of the note it belongs to.
    *   Clicking on the note title in the tooltip will navigate to the note in the current view.
 *   Middle-clicking the marker will open the note in a new tab.
-*   Right-clicking the marker will open a contextual menu allowing:
+*   Right-clicking the marker will open a contextual menu (as described below).
+*   If the map is in read-only mode, clicking on a marker will open a <a class="reference-link" href="../../UI%20Elements/Quick%20edit.md">Quick edit</a> popup for the corresponding note.

 ## Contextual menu

--- a/Features/Notes/Note
+++ b/Features/Notes/Note
@ -0,0 +1,23 @@
+# Grid View
+<figure class="image"><img style="aspect-ratio:990/590;" src="Grid View_image.png" width="990" height="590"></figure>
+
+This view presents the child notes in a grid format, allowing for a more visual navigation experience.
+
+Each tile contains:
+
+*   The title of a note.
+*   A snippet of the content.
+*   For empty notes, the sub-children are also displayed, allowing for quick navigation.
+
+Depending on the type of note:
+
+*   For <a class="reference-link" href="../../../Note%20Types/Text.md">Text</a> notes, the text can be slightly scrollable via the mouse wheel to reveal more context.
+*   For <a class="reference-link" href="../../../Note%20Types/Code.md">Code</a> notes, syntax highlighting is applied.
+*   For <a class="reference-link" href="../../../Note%20Types/File.md">File</a> notes, a preview is made available for audio, video and PDF notes.
+*   If the note does not have a content, a list of its child notes will be displayed instead.
+
+The grid view is also used by default in the <a class="reference-link" href="../Note%20List.md">Note List</a> of every note, making it easy to navigate to children notes.
+
+## Configuration
+
+Unlike most other view types, the grid view is not actually configurable.
--- a/Features/Notes/Note
+++ b/Features/Notes/Note
--- a/Features/Notes/Note
+++ b/Features/Notes/Note
@ -0,0 +1,11 @@
+# List View
+<figure class="image"><img style="aspect-ratio:1387/758;" src="List View_image.png" width="1387" height="758"></figure>
+
+List view is similar to <a class="reference-link" href="Grid%20View.md">Grid View</a>, but in the list view mode, each note is displayed in a single row with only the title and the icon of the note being visible by the default. By pressing the expand button it's possible to view the content of the note, as well as the children of the note (recursively).
+
+In the example above, the "Node.js" note on the left panel contains several child notes. The right panel displays the content of these child notes as a single continuous document.
+
+## Interaction
+
+*   Each note can be expanded or collapsed by clicking on the arrow to the left of the title.
+*   In the <a class="reference-link" href="../../UI%20Elements/Ribbon.md">Ribbon</a>, in the _Collection_ tab there are options to expand and to collapse all notes easily.
--- a/Features/Notes/Note
+++ b/Features/Notes/Note
--- a/Features/Notes/Note
+++ b/Features/Notes/Note
@ -11,7 +11,7 @@ Right click the <a class="reference-link" href="../../UI%20Elements/Note%20Tree

 ### Adding columns

-Each column is a [promoted attribute](../../../Advanced%20Usage/Attributes/Promoted%20Attributes.md) that is defined on the Book note. Ideally, the promoted attributes need to be inheritable in order to show up in the child notes.
+Each column is a [promoted attribute](../../../Advanced%20Usage/Attributes/Promoted%20Attributes.md) that is defined on the Collection note. Ideally, the promoted attributes need to be inheritable in order to show up in the child notes.

 To create a new column, simply press _Add new column_ at the bottom of the table.

@ -23,7 +23,7 @@ There are also a few predefined columns:

 ### Adding new rows

-Each row is actually a note that is a child of the book note.
+Each row is actually a note that is a child of the Collection note.

 To create a new note, press _Add new row_ at the bottom of the table. By default it will try to edit the title of the newly created note.

@ -62,16 +62,16 @@ Currently, it's possible to reorder notes even if sorting is used, but the resul
 The table functionality is still in its early stages, as such it faces quite a few important limitations:

 1.  As mentioned previously, the columns of the table are defined as <a class="reference-link" href="../../../Advanced%20Usage/Attributes/Promoted%20Attributes.md">Promoted Attributes</a>.
-    1.  But only the promoted attributes that are defined at the level of the Book note are actually taken into consideration.
+    1.  But only the promoted attributes that are defined at the level of the Collection note are actually taken into consideration.
    2.  There are plans to recursively look for columns across the sub-hierarchy.
-2.  Hierarchy is not yet supported, so the table will only show the items that are direct children of the _Book_ note.
+2.  Hierarchy is not yet supported, so the table will only show the items that are direct children of the _Collection_ note.
 3.  Multiple labels and relations are not supported. If a <a class="reference-link" href="../../../Advanced%20Usage/Attributes/Promoted%20Attributes.md">Promoted Attributes</a> is defined with a _Multi value_ specificity, they will be ignored.

 ## Use in search

 The table view can be used in a <a class="reference-link" href="../../../Note%20Types/Saved%20Search.md">Saved Search</a> by adding the `#viewType=table` attribute.

-Unlike when used in a book, saved searches are not limited to the sub-hierarchy of a note and allows for advanced queries thanks to the power of the <a class="reference-link" href="../../Navigation/Search.md">Search</a>.
+Unlike when used in a Collection, saved searches are not limited to the sub-hierarchy of a note and allows for advanced queries thanks to the power of the <a class="reference-link" href="../../Navigation/Search.md">Search</a>.

 However, there are also some limitations:

--- a/Features/Notes/Note
+++ b/Features/Notes/Note
--- a/Elements/Note
+++ b/Elements/Note
@ -0,0 +1,21 @@
+# Note Tooltip
+<figure class="image image-style-align-right"><img style="aspect-ratio:505/261;" src="Note Tooltip_image.png" width="505" height="261"></figure>
+
+The note tooltip is a convenience feature which displays a popup when hovering over an [internal link](../../Note%20Types/Text/Links/Internal%20\(reference\)%20links.md) to another note.
+
+The following information is displayed:
+
+*   The note path, at the top of the popup.
+*   The title of the note.
+    *   Clicking on the title will open the note in the current tab.
+    *   Holding <kbd>Ctrl</kbd> pressed while clicking the title will open in a new tab instead of the current one.
+*   A snippet of the content will be displayed as well.
+*   A button to [quickly edit](Quick%20edit.md) the note in a popup.
+
+The tooltip can be found in multiple places, including:
+
+*   In <a class="reference-link" href="../../Note%20Types/Text.md">Text</a> notes, when hovering over <a class="reference-link" href="../../Note%20Types/Text/Links/Internal%20(reference)%20links.md">Internal (reference) links</a> .
+*   <a class="reference-link" href="../../Note%20Types/Collections.md">Collections</a>: 
+    *   <a class="reference-link" href="../Notes/Note%20List/Geo%20Map%20View.md">Geo Map View</a>, when hovering over a marker.
+    *   <a class="reference-link" href="../Notes/Note%20List/Calendar%20View.md">Calendar View</a>, when hovering over an event.
+    *   <a class="reference-link" href="../Notes/Note%20List/Table%20View.md">Table View</a>, when hovering over a note title, or over a [relation](../../Advanced%20Usage/Attributes/Relations.md).
--- a/Tooltip_image.png
+++ b/Tooltip_image.png
--- a/Elements/Note
+++ b/Elements/Note
@ -22,4 +22,8 @@ You can easily rearrange the note tree by dragging and dropping notes, as demons

 You can also move notes using the familiar cut and paste functions available in the context menu, or with the associated keyboard [shortcuts](../Keyboard%20Shortcuts.md): `CTRL-C` ( [copy](../Notes/Cloning%20Notes.md)), <kbd>Ctrl</kbd> + <kbd>X</kbd> (cut) and <kbd>Ctrl</kbd> + <kbd>V</kbd> (paste).

-See <a class="reference-link" href="Note%20Tree/Note%20tree%20contextual%20menu.md">Note Tree Menu</a> for more information.
+See <a class="reference-link" href="Note%20Tree/Note%20tree%20contextual%20menu.md">Note tree contextual menu</a> for more information.
+
+## Keyboard shortcuts
+
+The note tree comes with multiple keyboard shortcuts to make editing faster, consult the dedicated <a class="reference-link" href="Note%20Tree/Keyboard%20shortcuts.md">Keyboard shortcuts</a> section.
--- a/Tree/Keyboard
+++ b/Tree/Keyboard
@ -0,0 +1,17 @@
+# Keyboard shortcuts
+The <a class="reference-link" href="../Note%20Tree.md">Note Tree</a> comes with multiple keyboard shortcuts to make editing faster:
+
+*   Opening notes:
+    *   <kbd>Click</kbd> to open the note in the current tab.
+    *   <kbd>Ctrl</kbd>+<kbd>Click</kbd> or <kbd>Middle click</kbd> to open the note in a new tab.
+    *   <kbd>Ctrl</kbd>+<kbd>Right click</kbd> to open the note in <a class="reference-link" href="../Quick%20edit.md">Quick edit</a>.
+*   Navigation within the tree:
+    *   <kbd>Up</kbd> and <kbd>Down</kbd> to navigate between notes.
+    *   <kbd>Left</kbd> to collapse a note, or <kbd>Right</kbd> to expand it.
+*   Clipboard management:
+    *   <kbd>Ctrl</kbd>+<kbd>C</kbd> to copy a note.
+    *   <kbd>Ctrl</kbd>+<kbd>X</kbd> to cut a note.
+    *   <kbd>Ctrl</kbd>+<kbd>V</kbd> to paste it somewhere.
+*   For <a class="reference-link" href="Multiple%20selection.md">Multiple selection</a>:
+    *   <kbd>Alt</kbd>+<kbd>Click</kbd>to add a single note to the current selection.
+    *   <kbd>Shift</kbd>+<kbd>Click</kbd>to select a range of notes, starting from the current note (the highlighted one) to the one that is being clicked.
--- a/Elements/Quick
+++ b/Elements/Quick
@ -0,0 +1,33 @@
+# Quick edit
+<figure class="image image-style-align-right image_resized" style="width:53.13%;"><img style="aspect-ratio:895/694;" src="Quick edit_image.png" width="895" height="694"></figure>
+
+_Quick edit_ provides an alternative to the standard tab-based navigation and editing.
+
+Instead of clicking on a note which switches the <a class="reference-link" href="Note%20Tree.md">Note Tree</a> to the newly selected note, or navigating between two different <a class="reference-link" href="Tabs.md">Tabs</a>, the _Quick edit_ feature opens as a popup window that can be easily dismissed.
+
+This feature is also well integrated with <a class="reference-link" href="../../Note%20Types/Collections.md">Collections</a> such as the calendar view, which makes it easy to edit entries without having to go back and forth between the child note and the calendar.
+
+## Feature highlights
+
+*   All note types are supported, including <a class="reference-link" href="../../Note%20Types/Collections.md">Collections</a>.
+*   Note that the <a class="reference-link" href="../Notes/Note%20List.md">Note List</a> will not be displayed, except for notes of type <a class="reference-link" href="../../Note%20Types/Collections.md">Collections</a>.
+*   For <a class="reference-link" href="../../Note%20Types/Text.md">Text</a> notes, depending on user preference, both the floating and classic editors are supported. See <a class="reference-link" href="../../Note%20Types/Text/Formatting%20toolbar.md">Formatting toolbar</a>.
+*   The title and the note and the icon are editable, just like a normal tab.
+*   The <a class="reference-link" href="../../Advanced%20Usage/Attributes/Promoted%20Attributes.md">Promoted Attributes</a> are also displayed.
+    *   This integrates well with <a class="reference-link" href="../../Note%20Types/Collections.md">Collections</a> where there are predefined attributes such as the _Start date_ and _End date_, allowing for easy editing.
+
+## Accessing the quick edit
+
+*   From the <a class="reference-link" href="Note%20Tree.md">Note Tree</a>:
+    *   Right click on a note and select _Quick edit_.
+    *   or, press <kbd>Ctrl</kbd>+<kbd>Right click</kbd> on a note.
+*   On <a class="reference-link" href="../../Note%20Types/Text/Links/Internal%20(reference)%20links.md">Internal (reference) links</a>: 
+    *   Right click and select _Quick edit_.
+    *   or, press <kbd>Ctrl</kbd>+<kbd>Right click</kbd> on the link.
+*   On a <a class="reference-link" href="Note%20Tooltip.md">Note Tooltip</a>, press the quick edit icon.
+*   In <a class="reference-link" href="../../Note%20Types/Collections.md">Collections</a>:
+    *   For <a class="reference-link" href="../Notes/Note%20List/Calendar%20View.md">Calendar View</a>:
+        *   Clicking on an event will open that event for quick editing.
+        *   If the calendar is for the <a class="reference-link" href="../../Advanced%20Usage/Advanced%20Showcases/Day%20Notes.md">Day Notes</a> root, clicking on the day number will open the popup for that day note.
+    *   For <a class="reference-link" href="../Notes/Note%20List/Geo%20Map%20View.md">Geo Map View</a>:
+        *   Clicking on a marker will open that marker, but only if the map is in read-only mode.
--- a/edit_image.png
+++ b/edit_image.png
--- a/Highlights.md
+++ b/Highlights.md
@ -0,0 +1,32 @@
+# Feature Highlights
+This section presents the most important changes by version. For a full set of changes, please consult the change log of each release. For purposes of brevity, beta versions are skipped and the features gathered to the nearest stable version.
+
+*   v0.97.0:
+    *   Books are now <a class="reference-link" href="Note%20Types/Collections.md">Collections</a>.
+    *   <a class="reference-link" href="Basic%20Concepts%20and%20Features/Notes/Note%20List/Table%20View.md">Table View</a> is a new collection type displaying notes and attributes in an editable grid.
+    *   <a class="reference-link" href="Basic%20Concepts%20and%20Features/UI%20Elements/Quick%20edit.md">Quick edit</a> is introduced, adding a new way to edit notes in a popup instead of opening a new tab. It also integrates well with <a class="reference-link" href="Note%20Types/Collections.md">Collections</a>.
+*   v0.96.0:
+    *   <a class="reference-link" href="Note%20Types/Text.md">Text</a> gain premium features thanks to a collaboration with the CKEditor team:
+        *   <a class="reference-link" href="Note%20Types/Text/Premium%20features/Slash%20Commands.md">Slash Commands</a>
+        *   <a class="reference-link" href="Note%20Types/Text/Premium%20features/Text%20Snippets.md">Text Snippets</a>
+*   v0.95.0:
+    *   A more friendly theme was introduced for <a class="reference-link" href="Advanced%20Usage/Sharing.md">Sharing</a>, with search, expandable tree, night mode and more.
+*   v0.94.0:
+    *   Added integration with <a class="reference-link" href="AI">AI</a> (using self-hosted LLMs such as Ollama or industry standards such as ChatGPT).
+*   v0.92.5:
+    *   Windows binaries are now signed.
+    *   <a class="reference-link" href="Installation%20%26%20Setup/Server%20Installation/Multi-Factor%20Authentication.md">Multi-Factor Authentication</a> was introduced.
+*   v0.92.4:
+    *   macOS binaries are now signed.
+    *   <a class="reference-link" href="Note%20Types/Text.md">Text</a> notes can now have adjustable <a class="reference-link" href="Note%20Types/Text/Content%20language%20%26%20Right-to-le.md">Content language &amp; Right-to-left support</a>.
+    *   <a class="reference-link" href="Basic%20Concepts%20and%20Features/Notes/Export%20as%20PDF.md">Export as PDF</a>
+    *   <a class="reference-link" href="Basic%20Concepts%20and%20Features/Zen%20mode.md">Zen mode</a>
+    *   <a class="reference-link" href="Basic%20Concepts%20and%20Features/Notes/Note%20List/Calendar%20View.md">Calendar View</a>, allowing notes to be displayed in a monthly grid based on start and end dates.
+*   v0.91.5:
+    *   Significant improvements for mobile.
+    *   <a class="reference-link" href="Note%20Types/Text/Footnotes.md">Footnotes</a> are now supported in <a class="reference-link" href="Note%20Types/Text.md">Text</a> notes.
+    *   Mermaid diagrams can now be inserted inline within <a class="reference-link" href="Note%20Types/Text.md">Text</a> notes.
+    *   The TriliumNext theme is introduced, bringing a more modern design to the application.
+    *   <a class="reference-link" href="Basic%20Concepts%20and%20Features/Notes/Note%20List/Geo%20Map%20View.md">Geo Map View</a>, displaying notes as markers on a geographical map for easy trip planning.
+*   v0.90.8:
+    *   A new note type was introduced: <a class="reference-link" href="Note%20Types/Mind%20Map.md">Mind Map</a>
--- a/Guide/Note
+++ b/Guide/Note
@ -25,4 +25,4 @@ It is possible to change the type of a note after it has been created via the _B

 The following note types are supported by Trilium:

-<figure class="table" style="width:100%;"><table class="ck-table-resized"><colgroup><col style="width:29.42%;"><col style="width:70.58%;"></colgroup><thead><tr><th>Note Type</th><th>Description</th></tr></thead><tbody><tr><td><a class="reference-link" href="Note%20Types/Text.md">Text</a></td><td>The default note type, which allows for rich text formatting, images, admonitions and right-to-left support.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Code.md">Code</a></td><td>Uses a mono-space font and can be used to store larger chunks of code or plain text than a text note, and has better syntax highlighting.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Saved%20Search.md">Saved Search</a></td><td>Stores the information about a search (the search text, criteria, etc.) for later use. Can be used for quick filtering of a large amount of notes, for example. The search can easily be triggered.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Relation%20Map.md">Relation Map</a></td><td>Allows easy creation of notes and relations between them. Can be used for mainly relational data such as a family tree.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Note%20Map.md">Note Map</a></td><td>Displays the relationships between the notes, whether via relations or their hierarchical structure.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Render%20Note.md">Render Note</a></td><td>Used in&nbsp;<a class="reference-link" href="Scripting.md">Scripting</a>, it displays the HTML content of another note. This allows displaying any kind of content, provided there is a script behind it to generate it.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Book.md">Book</a></td><td><p>Displays the children of the note either as a grid, a list, or for a more specialized case: a calendar.</p><p>Generally useful for easy reading of short notes.</p></td></tr><tr><td><a class="reference-link" href="Note%20Types/Mermaid%20Diagrams.md">Mermaid Diagrams</a></td><td>Displays diagrams such as bar charts, flow charts, state diagrams, etc. Requires a bit of technical knowledge since the diagrams are written in a specialized format.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Canvas.md">Canvas</a></td><td>Allows easy drawing of sketches, diagrams, handwritten content. Uses the same technology behind <a href="https://excalidraw.com">excalidraw.com</a>.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Web%20View.md">Web View</a></td><td>Displays the content of an external web page, similar to a browser.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Mind%20Map.md">Mind Map</a></td><td>Easy for brainstorming ideas, by placing them in a hierarchical layout.</td></tr><tr><td><a class="reference-link" href="Basic%20Concepts%20and%20Features/Notes/Note%20List/Geo%20Map%20View.md">Geo Map</a></td><td>Displays the children of the note as a geographical map, one use-case would be to plan vacations. It even has basic support for tracks. Notes can also be created from it.</td></tr><tr><td><a class="reference-link" href="Note%20Types/File.md">File</a></td><td>Represents an uploaded file such as PDFs, images, video or audio files.</td></tr></tbody></table></figure>
+<figure class="table" style="width:100%;"><table class="ck-table-resized"><colgroup><col style="width:29.42%;"><col style="width:70.58%;"></colgroup><thead><tr><th>Note Type</th><th>Description</th></tr></thead><tbody><tr><td><a class="reference-link" href="Note%20Types/Text.md">Text</a></td><td>The default note type, which allows for rich text formatting, images, admonitions and right-to-left support.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Code.md">Code</a></td><td>Uses a mono-space font and can be used to store larger chunks of code or plain text than a text note, and has better syntax highlighting.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Saved%20Search.md">Saved Search</a></td><td>Stores the information about a search (the search text, criteria, etc.) for later use. Can be used for quick filtering of a large amount of notes, for example. The search can easily be triggered.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Relation%20Map.md">Relation Map</a></td><td>Allows easy creation of notes and relations between them. Can be used for mainly relational data such as a family tree.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Note%20Map.md">Note Map</a></td><td>Displays the relationships between the notes, whether via relations or their hierarchical structure.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Render%20Note.md">Render Note</a></td><td>Used in&nbsp;<a class="reference-link" href="Scripting.md">Scripting</a>, it displays the HTML content of another note. This allows displaying any kind of content, provided there is a script behind it to generate it.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Collections.md">Collections</a></td><td><p>Displays the children of the note either as a grid, a list, or for a more specialized case: a calendar.</p><p>Generally useful for easy reading of short notes.</p></td></tr><tr><td><a class="reference-link" href="Note%20Types/Mermaid%20Diagrams.md">Mermaid Diagrams</a></td><td>Displays diagrams such as bar charts, flow charts, state diagrams, etc. Requires a bit of technical knowledge since the diagrams are written in a specialized format.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Canvas.md">Canvas</a></td><td>Allows easy drawing of sketches, diagrams, handwritten content. Uses the same technology behind <a href="https://excalidraw.com">excalidraw.com</a>.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Web%20View.md">Web View</a></td><td>Displays the content of an external web page, similar to a browser.</td></tr><tr><td><a class="reference-link" href="Note%20Types/Mind%20Map.md">Mind Map</a></td><td>Easy for brainstorming ideas, by placing them in a hierarchical layout.</td></tr><tr><td><a class="reference-link" href="Basic%20Concepts%20and%20Features/Notes/Note%20List/Geo%20Map%20View.md">Geo Map View</a></td><td>Displays the children of the note as a geographical map, one use-case would be to plan vacations. It even has basic support for tracks. Notes can also be created from it.</td></tr><tr><td><a class="reference-link" href="Note%20Types/File.md">File</a></td><td>Represents an uploaded file such as PDFs, images, video or audio files.</td></tr></tbody></table></figure>
--- a/Types/Book.md
+++ b/Types/Book.md
@ -1,14 +0,0 @@
-# Book
-A **Book Note** in Trilium is a special type of [note](../Basic%20Concepts%20and%20Features/Notes.md) designed to display the contents of its child notes sequentially, creating a linear, book-like reading experience. This format is particularly useful for viewing multiple smaller notes in a cohesive, continuous manner.
-
-![](Book_image.png)
-
-In the example above, the "node.js" note on the left panel contains several child notes. The right panel displays the content of these child notes as a single continuous document.
-
-## Features
-
-The Book Note format compiles the contents of all child notes into one continuous view. This makes it ideal for reading extensive information broken into smaller, manageable segments.
-
-It uses the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List.md">Note List</a> mechanism to display the child notes, allowing the use of any of the view types (grid, list, calendar).
-
-To adjust the view type, see the dedicated _Book_ tab in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Ribbon.md">Ribbon</a>.
--- a/Types/Book_image.png
+++ b/Types/Book_image.png
--- a/Types/Collections.md
+++ b/Types/Collections.md
@ -0,0 +1,31 @@
+# Collections
+Collections are a unique type of notes that don't have a content, but instead display its child notes in various presentation methods.
+
+Classic collections are read-only mode and compiles the contents of all child notes into one continuous view. This makes it ideal for reading extensive information broken into smaller, manageable segments.
+
+*   <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List/Grid%20View.md">Grid View</a> which is the default presentation method for child notes (see <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List.md">Note List</a>), where the notes are displayed as tiles with their title and content being visible.
+*   <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List/List%20View.md">List View</a> is similar to <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List/Grid%20View.md">Grid View</a>, but it displays the notes one under the other with the content being expandable/collapsible, but also works recursively.
+
+More specialized collections were introduced, such as the:
+
+*   <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List/Calendar%20View.md">Calendar View</a> which displays a week, month or year calendar with the notes being shown as events. New events can be added easily by dragging across the calendar.
+*   <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List/Geo%20Map%20View.md">Geo Map View</a> which displays a geographical map in which the notes are represented as markers/pins on the map. New events can be easily added by pointing on the map.
+*   <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List/Table%20View.md">Table View</a> displays each note as a row in a table, with <a class="reference-link" href="../Advanced%20Usage/Attributes/Promoted%20Attributes.md">Promoted Attributes</a> being shown as well. This makes it easy to visualize attributes of notes, as well as making them easily editable.
+
+For a quick presentation of all the supported view types, see the child notes of this help page, including screenshots.
+
+## Configuration
+
+To adjust the view type, see the dedicated _Collections_ tab in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Ribbon.md">Ribbon</a>.
+
+## Use in saved search
+
+Since collections are based on the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List.md">Note List</a> mechanism, it's possible to apply the same configuration to <a class="reference-link" href="Saved%20Search.md">Saved Search</a> to do advanced querying and presenting the result in an adequate matter such as a calendar, a table or even a map.
+
+## Under the hood
+
+Collections by themselves are simply notes with no content that rely on the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List.md">Note List</a> mechanism (the one that lists the children notes at the bottom of a note) to display information.
+
+By default, new collections use predefined <a class="reference-link" href="../Advanced%20Usage/Templates.md">Templates</a> that are stored safely in the <a class="reference-link" href="../Advanced%20Usage/Hidden%20Notes.md">Hidden Notes</a> to define some basic configuration such as the type of view, but also some <a class="reference-link" href="../Advanced%20Usage/Attributes/Promoted%20Attributes.md">Promoted Attributes</a> to make editing easier.
+
+Collections don't store their configuration (e.g. the position on the map, the hidden columns in a table) in the content of the note itself, but as attachments.
--- a/Types/Collections/Calendar
+++ b/Types/Collections/Calendar
@ -0,0 +1,2 @@
+# Calendar View
+This is a clone of a note. Go to its [primary location](../../Basic%20Concepts%20and%20Features/Notes/Note%20List/Calendar%20View.md).
--- a/Types/Collections/Geo
+++ b/Types/Collections/Geo
@ -0,0 +1,2 @@
+# Geo Map View
+This is a clone of a note. Go to its [primary location](../../Basic%20Concepts%20and%20Features/Notes/Note%20List/Geo%20Map%20View.md).
--- a/Types/Collections/Grid
+++ b/Types/Collections/Grid
@ -0,0 +1,2 @@
+# Grid View
+This is a clone of a note. Go to its [primary location](../../Basic%20Concepts%20and%20Features/Notes/Note%20List/Grid%20View.md).
--- a/Types/Collections/List
+++ b/Types/Collections/List
@ -0,0 +1,2 @@
+# List View
+This is a clone of a note. Go to its [primary location](../../Basic%20Concepts%20and%20Features/Notes/Note%20List/List%20View.md).
--- a/Types/Collections/Table
+++ b/Types/Collections/Table
@ -0,0 +1,2 @@
+# Table View
+This is a clone of a note. Go to its [primary location](../../Basic%20Concepts%20and%20Features/Notes/Note%20List/Table%20View.md).
--- a/Types/Text/Links.md
+++ b/Types/Text/Links.md
@ -1,51 +1,8 @@
 # Links
-## External links
+There are two types of links:

-An external link is a standard web link targeting for example a website. For example, [https://en.wikipedia.org/wiki/South\_China\_Sea](https://en.wikipedia.org/wiki/South_China_Sea) is an external link to a Wikipedia page.
-
-To create a link without a custom text:
-
-*   Press <img src="2_Links_image.png" width="15" height="16"> in the <a class="reference-link" href="Formatting%20toolbar.md">Formatting toolbar</a>:
-    *   A popup will appear, type or paste the URL in the box.
-    *   Press <kbd>Enter</kbd> or the check mark icon to confirm.
-*   Alternatively, press <kbd>Ctrl</kbd>+<kbd>K</kbd> to trigger the aforementioned popup.
-*   A simpler way is to paste the raw link and press space to turn it automatically into a link.
-
-To create a link with a custom text:
-
-*   First, type and select the text which will be turned into a link.
-*   Follow the previous steps to open the link interface (via the formatting toolbar, or <kbd>Ctrl</kbd>+<kbd>K</kbd>).
-*   Alternatively, simply paste (<kbd>Ctrl</kbd>+<kbd>V</kbd>) over the selected text to turn it into a link.
-
-Once a link is inserted:
-
-*   The text inside the link can be changed if needed but the link itself will remain.
-*   To modify the link, click on the link to display the popup and press the <img src="Links_image.png" width="18" height="18"> _Edit link_ button.
-*   To remove a link, click on it and press the <img src="3_Links_image.png" width="18" height="18"> _Unlink_ button.
-
-You can follow external link by either double clicking (will open new tab/window) it or right clicking on them and choosing "Open in new tab".
-
-## Internal links to notes
-
-Unlike external notes, internal links (links to other notes) can be created at the current position by :
-
-1.  Pressing <kbd>Ctrl</kbd> + <kbd>L</kbd> or the <img src="1_Links_image.png" width="20" height="17"> button from the <a class="reference-link" href="Formatting%20toolbar.md">Formatting toolbar</a>.
-2.  Filling in the desired note to link. It's also possible to create notes from this dialog by typing a non-existing note title and selecting _Create and link child note_.
-
-There are two link types, adjustable when creating the link to the note:
-
-1.  _link title mirrors the note's current title_
-    1.  This is sometimes also called "reference link".
-    2.  Title of such links cannot be changed, instead it is always mirroring the title of linked note.
-    3.  The icon of the note is also displayed.
-    4.  The link title will automatically update if the title of the note is changed.
-2.  _link title can be changed arbitrarily_
-    1.  This is the traditional hyperlink, where the text of the link can be different to the note title.
-
-Once an internal link is created:
-
-*   You can follow the note link by double clicking it.
-*   Alternatively if you only wish to quickly preview the content, you can hover over the link and will see read only preview.
+*   <a class="reference-link" href="Links/External%20links.md">External links</a>, for standard hyperlinks to websites or other resources.
+*   <a class="reference-link" href="Links/Internal%20(reference)%20links.md">Internal (reference) links</a> for links to other notes within Trilium.

 ## Pasting links

--- a/Types/Text/2_Links_image.png
+++ b/Types/Text/2_Links_image.png
--- a/Types/Text/3_Links_image.png
+++ b/Types/Text/3_Links_image.png
--- a/Types/Text/Links/External
+++ b/Types/Text/Links/External
@ -0,0 +1,24 @@
+# External links
+An external link is a standard web link targeting for example a website. For example, [https://en.wikipedia.org/wiki/South\_China\_Sea](https://en.wikipedia.org/wiki/South_China_Sea) is an external link to a Wikipedia page.
+
+To create a link without a custom text:
+
+*   Press <img src="1_External links_image.png" width="15" height="16"> in the <a class="reference-link" href="../Formatting%20toolbar.md">Formatting toolbar</a>:
+    *   A popup will appear, type or paste the URL in the box.
+    *   Press <kbd>Enter</kbd> or the check mark icon to confirm.
+*   Alternatively, press <kbd>Ctrl</kbd>+<kbd>K</kbd> to trigger the aforementioned popup.
+*   A simpler way is to paste the raw link and press space to turn it automatically into a link.
+
+To create a link with a custom text:
+
+*   First, type and select the text which will be turned into a link.
+*   Follow the previous steps to open the link interface (via the formatting toolbar, or <kbd>Ctrl</kbd>+<kbd>K</kbd>).
+*   Alternatively, simply paste (<kbd>Ctrl</kbd>+<kbd>V</kbd>) over the selected text to turn it into a link.
+
+Once a link is inserted:
+
+*   The text inside the link can be changed if needed but the link itself will remain.
+*   To modify the link, click on the link to display the popup and press the <img src="External links_image.png" width="18" height="18"> _Edit link_ button.
+*   To remove a link, click on it and press the <img src="2_External links_image.png" width="18" height="18"> _Unlink_ button.
+
+You can follow external link by either double clicking (will open new tab/window) it or right clicking on them and choosing "Open in new tab".
--- a/Types/Text/Links_image.png
+++ b/Types/Text/Links_image.png
--- a/Types/Text/Links/Internal
+++ b/Types/Text/Links/Internal
@ -0,0 +1,20 @@
+# Internal (reference) links
+Unlike external notes, internal links (links to other notes) can be created at the current position by :
+
+1.  Pressing <kbd>Ctrl</kbd> + <kbd>L</kbd> or the <img src="Internal (reference) links.png" width="20" height="17"> button from the <a class="reference-link" href="../Formatting%20toolbar.md">Formatting toolbar</a>.
+2.  Filling in the desired note to link. It's also possible to create notes from this dialog by typing a non-existing note title and selecting _Create and link child note_.
+
+There are two link types, adjustable when creating the link to the note:
+
+1.  _link title mirrors the note's current title_
+    1.  This is sometimes also called "reference link".
+    2.  Title of such links cannot be changed, instead it is always mirroring the title of linked note.
+    3.  The icon of the note is also displayed.
+    4.  The link title will automatically update if the title of the note is changed.
+2.  _link title can be changed arbitrarily_
+    1.  This is the traditional hyperlink, where the text of the link can be different to the note title.
+
+Once an internal link is created:
+
+*   You can follow the note link by double clicking it.
+*   Alternatively if you only wish to quickly preview the content, you can hover over the link and will see read only preview.
--- a/Types/Text/1_Links_image.png
+++ b/Types/Text/1_Links_image.png
				`@ -0,0 +1 @@`
				`<p>This is a clone of a note. Go to its <a href="../UI%20Elements/Quick%20edit.html">primary location</a>.</p>`