Merge branch 'main' into main

2026-03-01 01:53:38 +01:00 · 2026-02-27 18:09:22 -05:00 · 2026-02-27 18:09:22 -05:00 · 40be94804c
commit 40be94804c
parent 5719819947 d56f106964
78 changed files with 2273 additions and 1487 deletions
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-24.13.1
+24.14.0
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -0,0 +1,57 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Launch client (Chrome)",
+      "request": "launch",
+      "type": "chrome",
+      "url": "http://localhost:8080",
+      "webRoot": "${workspaceFolder}/apps/client"
+    },
+    {
+      "name": "Launch server",
+      "type": "node",
+      "request": "launch",
+      "program": "${workspaceFolder}/apps/server/src/main.ts",
+      "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/tsx",
+      "env": {
+        "NODE_ENV": "development",
+        "TRILIUM_ENV": "dev",
+        "TRILIUM_DATA_DIR": "${input:trilium_data_dir}",
+        "TRILIUM_RESOURCE_DIR": "${workspaceFolder}/apps/server/src"
+      },
+      "autoAttachChildProcesses": true,
+      "cwd": "${workspaceFolder}",
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "skipFiles": ["<node_internals>/**", "${workspaceFolder}/node_modules/**"]
+    },
+    {
+      "name": "Launch Vitest with current test file",
+      "type": "node",
+      "request": "launch",
+      "autoAttachChildProcesses": true,
+      "program": "${workspaceFolder}/node_modules/vitest/vitest.mjs",
+      "args": ["run", "${relativeFile}"],
+      "smartStep": true,
+      "console": "integratedTerminal",
+      "skipFiles": ["<node_internals>/**", "**/node_modules/**"],
+      "cwd": "${workspaceFolder}"
+    }
+  ],
+  "compounds": [
+    {
+      "name": "Launch client (Chrome) and server",
+      "configurations": ["Launch server","Launch client (Chrome)"],
+      "stopAll": true
+    }
+  ],
+  "inputs": [
+    {
+      "id": "trilium_data_dir",
+      "type": "promptString",
+      "description": "Select Trilum Notes data directory",
+      "default": "${workspaceFolder}/apps/server/data"
+    }
+  ]
+}
--- a/apps/build-docs/package.json
+++ b/apps/build-docs/package.json
@ -14,9 +14,9 @@
  "keywords": [],
  "author": "Elian Doran <contact@eliandoran.me>",
  "license": "AGPL-3.0-only",
-  "packageManager": "pnpm@10.30.1",
+  "packageManager": "pnpm@10.30.2",
  "devDependencies": {
-    "@redocly/cli": "2.19.1",
+    "@redocly/cli": "2.19.2",
    "archiver": "7.0.1",
    "fs-extra": "11.3.3",
    "js-yaml": "4.1.1",
--- a/apps/client/package.json
+++ b/apps/client/package.json
@ -50,14 +50,14 @@
    "jquery": "4.0.0",
    "jquery.fancytree": "2.38.5",
    "jsplumb": "2.15.6",
-    "katex": "0.16.28",
+    "katex": "0.16.33",
    "knockout": "3.5.1",
    "leaflet": "1.9.4",
    "leaflet-gpx": "2.2.0",
    "mark.js": "8.11.1",
    "marked": "17.0.3",
    "mermaid": "11.12.3",
-    "mind-elixir": "5.9.0",
+    "mind-elixir": "5.9.1",
    "normalize.css": "8.0.1",
    "panzoom": "9.4.3",
    "preact": "10.28.4",
@ -73,7 +73,7 @@
    "@ckeditor/ckeditor5-inspector": "5.0.0",
    "@prefresh/vite": "2.4.12",
    "@types/bootstrap": "5.2.10",
-    "@types/jquery": "3.5.33",
+    "@types/jquery": "4.0.0",
    "@types/leaflet": "1.9.21",
    "@types/leaflet-gpx": "1.3.8",
    "@types/mark.js": "8.11.12",
--- a/apps/client/src/services/content_renderer.ts
+++ b/apps/client/src/services/content_renderer.ts
@ -192,7 +192,7 @@ function renderFile(entity: FNote | FAttachment, type: string, $renderedContent:
        throw new Error(`Can't recognize entity type of '${entity}'`);
    }

-    const $content = $('<div style="display: flex; flex-direction: column; height: 100%;">');
+    const $content = $('<div style="display: flex; flex-direction: column; height: 100%; justify-content: end;">');

    if (type === "pdf") {
        const $pdfPreview = $('<iframe class="pdf-preview" style="width: 100%; flex-grow: 100;"></iframe>');
--- a/apps/client/src/services/content_renderer_text.ts
+++ b/apps/client/src/services/content_renderer_text.ts
@ -120,7 +120,6 @@ async function renderChildrenList($renderedContent: JQuery<HTMLElement>, note: F
        return;
    }

-    $renderedContent.css("padding", "10px");
    $renderedContent.addClass("text-with-ellipsis");

    // just load the first 10 child notes
--- a/apps/client/src/services/utils.ts
+++ b/apps/client/src/services/utils.ts
@ -14,7 +14,9 @@ export function reloadFrontendApp(reason?: string) {
    }

    if (isElectron()) {
-        dynamicRequire("@electron/remote").BrowserWindow.getFocusedWindow()?.reload();
+        for (const window of dynamicRequire("@electron/remote").BrowserWindow.getAllWindows()) {
+            window.reload();
+        }
    } else {
        window.location.reload();
    }
--- a/apps/client/src/stylesheets/style.css
+++ b/apps/client/src/stylesheets/style.css
@ -2630,7 +2630,7 @@ iframe.print-iframe {
            }
        }

-        #root-widget.virtual-keyboard-opened .note-split:not(.active) {
+        body:not(.ios) #root-widget.virtual-keyboard-opened .note-split:not(.active) {
            max-height: 80px;
            opacity: 0.4;
        }
--- a/apps/client/src/stylesheets/theme-next-dark.css
+++ b/apps/client/src/stylesheets/theme-next-dark.css
@ -314,7 +314,8 @@
 */

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

    /* The background color of the active item in the note tree.
@ -365,7 +366,8 @@ body .todo-list input[type="checkbox"]:not(:checked):before {

 .note-split.with-hue,
 .quick-edit-dialog-wrapper.with-hue,
-.nested-note-list-item.with-hue {
+.nested-note-list-item.with-hue,
+.note-book-card.with-hue .note-book-header {
    --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%);
@ -375,3 +377,8 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
 .quick-edit-dialog-wrapper.with-hue *::selection {
    --selection-background-color: hsl(var(--custom-color-hue), 49.2%, 35%);
 }
+
+.note-book-card.with-hue {
+    --card-background-color: hsl(var(--custom-color-hue), 6%, 21%);
+    --card-background-hover-color: hsl(var(--custom-color-hue), 8%, 25%);
+}
--- a/apps/client/src/stylesheets/theme-next-light.css
+++ b/apps/client/src/stylesheets/theme-next-light.css
@ -308,7 +308,8 @@
 }

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

    /* The background color of the active item in the note tree.
@ -335,7 +336,8 @@

 .note-split.with-hue,
 .quick-edit-dialog-wrapper.with-hue,
-.nested-note-list-item.with-hue {
+.nested-note-list-item.with-hue,
+.note-book-card.with-hue .note-book-header {
    --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%);
@ -345,3 +347,8 @@
 .quick-edit-dialog-wrapper.with-hue *::selection {
    --selection-background-color: hsl(var(--custom-color-hue), 60%, 90%);
 }
+
+.note-book-card.with-hue {
+    --card-background-color: hsl(var(--custom-color-hue), 21%, 94%);
+    --card-background-hover-color: hsl(var(--custom-color-hue), 21%, 87%);
+}
--- a/apps/client/src/stylesheets/theme-next/base.css
+++ b/apps/client/src/stylesheets/theme-next/base.css
@ -643,139 +643,6 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
    transform: translateY(4%);
 }

-/*
- * NOTE LIST
- */
-
- .note-list .note-book-card {
-    --note-list-horizontal-padding: 22px;
-    --note-list-vertical-padding: 15px;
-    background-color: var(--card-background-color);
-    border: 1px solid var(--card-border-color) !important;
-    border-radius: 12px;
-    user-select: none;
-    padding: 0;
-    margin: 5px 10px 5px 0;
-}
-
-:root .note-list .note-book-card:hover {
-    background-color: var(--card-background-hover-color);
-    transition: background-color 200ms ease-out;
-}
-
-:root .note-list.grid-view .note-book-card:active {
-    transform: scale(.98);
-}
-
-.note-list.list-view .note-book-card {
-    box-shadow: 0 0 3px var(--card-shadow-color);
-}
-
-.note-list.list-view .note-book-card .note-book-header .note-icon {
-    vertical-align: middle;
-}
-
-.note-list-wrapper .note-book-card a {
-    color: inherit !important;
-}
-
-.note-list-wrapper .note-book-card .note-book-header {
-    font-size: 1em;
-    font-weight: bold;
-    padding: 0.5em 1rem;
-    border-bottom-color: var(--card-border-color);
-}
-
-.note-list-wrapper .note-book-card .note-book-header .note-icon {
-    font-size: 17px;
-    vertical-align: text-bottom;
-}
-
-.note-list-wrapper .note-book-card .note-book-header .note-book-title {
-    font-size: 1em;
-    color: var(--active-item-text-color);
-    vertical-align: middle;
-}
-
-.note-list-wrapper .note-book-card .note-book-header .rendered-note-attributes {
-    font-size: 0.7em;
-    font-weight: normal;
-    margin-bottom: 0;
-}
-
-.note-list-wrapper .note-book-card .note-book-header:last-child {
-    border-bottom: 0;
-}
-
-.note-list-wrapper .note-book-card .note-book-content {
-    padding: 0 !important;
-    font-size: 0.8rem;
-}
-
-.note-list-wrapper .note-book-card .note-book-content .rendered-content {
-    padding: 1rem;
-}
-
-.note-list-wrapper .note-book-card .note-book-content.type-image .rendered-content,
-.note-list-wrapper .note-book-card .note-book-content.type-pdf .rendered-content {
-    padding: 0;
-}
-
-.note-list-wrapper .note-book-card .note-book-content .rendered-content.text-with-ellipsis {
-    padding: 1rem !important;
-}
-
-.note-list-wrapper .note-book-card .note-book-content h1,
-.note-list-wrapper .note-book-card .note-book-content h2,
-.note-list-wrapper .note-book-card .note-book-content h3,
-.note-list-wrapper .note-book-card .note-book-content h4,
-.note-list-wrapper .note-book-card .note-book-content h5,
-.note-list-wrapper .note-book-card .note-book-content h6 {
-    font-size: 1rem;
-    color: var(--active-item-text-color);
-}
-
-.note-list-wrapper .note-book-card .note-book-content p:last-child {
-    margin-bottom: 0;
-}
-
-.note-list-wrapper .note-book-card .note-book-content.type-canvas .rendered-content,
-.note-list-wrapper .note-book-card .note-book-content.type-mindMap .rendered-content,
-.note-list-wrapper .note-book-card .note-book-content.type-code .rendered-content,
-.note-list-wrapper .note-book-card .note-book-content.type-video .rendered-content {
-    padding: 0;
-}
-
-.note-list-wrapper .note-book-card .note-book-content.type-code {
-    height: 100%;
-}
-
-.note-list-wrapper .note-book-card .note-book-content.type-code pre {
-    height: 100%;
-    padding: 1em;
-    margin-bottom: 0;
-}
-
-.note-list-wrapper .note-book-card .tn-icon {
-    color: var(--left-pane-icon-color) !important;
-}
-
-.note-list.grid-view .note-book-card:hover {
-    filter: contrast(105%);
-}
-
-.note-list.grid-view .ck-content {
-    line-height: 1.3;
-}
-
-.note-list.grid-view .ck-content p {
-    margin-bottom: 0.5em;
-}
-
-.note-list.grid-view .ck-content figure.image {
-    width: 25%;
-}
-
 /*
 * NOTE SEARCH SUGGESTIONS
 */
--- a/apps/client/src/stylesheets/theme-next/notes/text.css
+++ b/apps/client/src/stylesheets/theme-next/notes/text.css
@ -647,10 +647,10 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
    font-weight: 600;
 }

-.ck-content hr {
-    margin: 5px 0;
-    height: 1px;
-    background-color: var(--main-border-color);
+:root .ck-content hr {
+    margin-block: 5px;
+    height: 0;
+    border: thin solid var(--main-border-color);
    opacity: 1;
 }

--- a/apps/client/src/stylesheets/theme-next/shell.css
+++ b/apps/client/src/stylesheets/theme-next/shell.css
@ -372,10 +372,6 @@ body[dir=ltr] #launcher-container {
 .calendar-dropdown-widget .calendar-header [data-calendar-input="month"] {
    --input-background-color: transparent;
    --menu-background-color: transparent;
-
-    text-align: center;
-    font-size: 1.4em;
-    font-weight: 300;
 }

 .calendar-dropdown-widget .calendar-header input:not(:focus) {
@ -425,8 +421,6 @@ body[dir=ltr] #launcher-container {
 }

 .calendar-dropdown-widget .calendar-week span {
-    font-size: 0.85em;
-    font-weight: 500;
    color: var(--calendar-weekday-labels-color);
 }

@ -689,9 +683,10 @@ body.layout-vertical.background-effects div.quick-search .dropdown-menu {
    padding-inline-start: 12px;
 }

-#left-pane span.fancytree-node.fancytree-active {
+#left-pane span.fancytree-node.fancytree-active,
+#left-pane span.fancytree-node.fancytree-active:hover {
    position: relative;
-    background: transparent !important;
+    background: transparent;
    color: var(--custom-color, var(--left-pane-item-selected-color));
 }

@ -704,6 +699,14 @@ body.layout-vertical.background-effects div.quick-search .dropdown-menu {
    }
 }

+/*
+ * .fancytree-node pseudo-elements:
+ *
+ *      - ::before: the active tree item decorator.
+ *      - ::after:  the selected tree item background. A pseudo-element is used instead of the
+ *                  element's background color, to allow alpha compositing for the hover state.
+ */
+
 #left-pane span.fancytree-node.fancytree-active::before {
    position: absolute;
    content: "";
@ -718,6 +721,24 @@ body.layout-vertical.background-effects div.quick-search .dropdown-menu {
    z-index: -1;
 }

+#left-pane span.fancytree-node.fancytree-selected {
+    --left-pane-item-selected-shadow-size: 4px;
+
+    position: relative;
+    background-color: transparent;
+    border-radius: 0;
+}
+
+#left-pane span.fancytree-node.fancytree-selected::after {
+    display: block;
+    position: absolute;
+    z-index: -2;
+    content: "";
+    inset: 0;
+    background: var(--selection-background-color);
+    animation: left-pane-item-select 100ms ease-out;
+}
+
 #left-pane span.fancytree-node.protected > span.fancytree-custom-icon {
    position: relative;
    filter: unset !important;
@ -780,7 +801,8 @@ body[dir=rtl] #left-pane span.fancytree-node.protected > span.fancytree-custom-i
    opacity: 0.5;
 }

-#left-pane .tree-item-button {
+#left-pane .tree-item-button,
+#left-pane span.fancytree-node.fancytree-selected .fancytree-custom-icon {
    margin-inline-end: 6px;
    border: unset;
    border-radius: 50%;
@ -791,7 +813,8 @@ body[dir=rtl] #left-pane span.fancytree-node.protected > span.fancytree-custom-i
        box-shadow 200ms ease-out;
 }

-#left-pane .tree-item-button:hover {
+#left-pane .tree-item-button:hover,
+#left-pane span.fancytree-node.fancytree-selected .fancytree-custom-icon:hover {
    background: var(--left-pane-item-action-button-hover-background);
    box-shadow: var(--left-pane-item-action-button-hover-shadow);
    transition:
@ -799,10 +822,41 @@ body[dir=rtl] #left-pane span.fancytree-node.protected > span.fancytree-custom-i
        box-shadow 100ms ease-in;
 }

-#left-pane span.fancytree-node.fancytree-active .tree-item-button:hover {
+#left-pane span.fancytree-node.fancytree-active .tree-item-button:hover,
+#left-pane span.fancytree-node.fancytree-active.fancytree-selected .fancytree-custom-icon:hover {
    box-shadow: var(--left-pane-item-selected-action-button-hover-shadow);
 }

+/* Selected item bulk action button */
+
+@keyframes bulk-action-button-blink {
+    from {
+        opacity: 1;
+    }
+    to {
+        opacity: .3;
+    }
+}
+
+#left-pane span.fancytree-node.fancytree-selected .fancytree-custom-icon {
+    margin: 0;
+}
+
+#left-pane span.fancytree-node.fancytree-selected .fancytree-custom-icon::before {
+    border: 0;
+    font-size: .65em;
+}
+
+#left-pane span.fancytree-node.fancytree-selected:hover .fancytree-custom-icon:not(:hover)::before {
+    animation: bulk-action-button-blink 500ms linear infinite alternate;
+}
+
+#left-pane span.fancytree-node.fancytree-selected.protected .fancytree-custom-icon::after {
+    /* Protected note indicator */
+    display: none;
+}
+
+
 #context-menu-container {
    /* The context menu of the tree */
    --menu-item-icon-vert-offset: -1px;
--- a/apps/client/src/stylesheets/tree.css
+++ b/apps/client/src/stylesheets/tree.css
@ -140,10 +140,22 @@ ul.fancytree-container {
    background-color: inherit;
 }

+
 .fancytree-custom-icon {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 1em;
+    height: 1em;
    font-size: 1.2em;
 }

+/* Fallback icon */
+:where(.fancytree-custom-icon)::before {
+    content: "?";
+}
+
+/* Protected note icon badge */
 span.fancytree-node.protected > span.fancytree-custom-icon {
    filter: drop-shadow(2px 2px 2px var(--main-text-color));
 }
@ -185,7 +197,7 @@ span.fancytree-node.fancytree-active-clone:not(.fancytree-active) .fancytree-tit

 span.fancytree-active {
    color: var(--active-item-text-color);
-    background-color: var(--active-item-background-color) !important;
+    background-color: var(--active-item-background-color);
    border-color: transparent; /* invisible border */
    border-radius: 5px;
 }
@ -195,20 +207,15 @@ span.fancytree-active .fancytree-title {
    border: 0;
 }

-span.fancytree-selected {
-    border-color: var(--main-border-color) !important;
-    border-radius: 5px;
-}
-
-span.fancytree-selected .fancytree-title {
-    text-decoration: underline;
-    font-style: italic;
+span.fancytree-node.fancytree-selected {
+    background-color: var(--selection-background-color);
+    border-radius: 0;
 }

 span.fancytree-selected .fancytree-custom-icon::before {
    font-family: "boxicons";
-    content: "\eb43";
-    border: 1px solid var(--main-border-color);
+    content: "\ef05";
+    border: 1px solid var(--main-text-color);
    border-radius: 3px;
 }

--- a/apps/client/src/translations/cn/translation.json
+++ b/apps/client/src/translations/cn/translation.json
@ -1534,7 +1534,8 @@
    "task-list": "任务列表",
    "new-feature": "新建",
    "collections": "集合",
-    "book": "集合"
+    "book": "集合",
+    "ai-chat": "AI聊天"
  },
  "protect_note": {
    "toggle-on": "保护笔记",
@ -1630,7 +1631,8 @@
  },
  "search_result": {
    "no_notes_found": "没有找到符合搜索条件的笔记。",
-    "search_not_executed": "尚未执行搜索。请点击上方的\"搜索\"按钮查看结果。"
+    "search_not_executed": "尚未执行搜索。",
+    "search_now": "立即搜索"
  },
  "spacer": {
    "configure_launchbar": "配置启动栏"
@ -2005,7 +2007,9 @@
    "app-restart-required": "（需重启程序以应用更改）"
  },
  "pagination": {
-    "total_notes": "{{count}} 篇笔记"
+    "total_notes": "{{count}} 篇笔记",
+    "prev_page": "上一页",
+    "next_page": "下一页"
  },
  "collections": {
    "rendering_error": "出现错误无法显示内容。"
--- a/apps/client/src/translations/ga/translation.json
+++ b/apps/client/src/translations/ga/translation.json
@ -1679,7 +1679,8 @@
  },
  "search_result": {
    "no_notes_found": "Ní bhfuarthas aon nótaí do na paraiméadair chuardaigh tugtha.",
-    "search_not_executed": "Níl an cuardach curtha i gcrích fós. Cliceáil ar an gcnaipe \"Cuardaigh\" thuas chun na torthaí a fheiceáil."
+    "search_not_executed": "Níl an cuardach curtha i gcrích fós.",
+    "search_now": "Cuardaigh anois"
  },
  "spacer": {
    "configure_launchbar": "Cumraigh an Barra Seoladh"
--- a/apps/client/src/translations/id/translation.json
+++ b/apps/client/src/translations/id/translation.json
@ -83,7 +83,10 @@
    "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).",
-    "broken_relations_to_be_deleted": "Hubungan berikut akan diputus dan dihapus ({{ relationCount}})"
+    "broken_relations_to_be_deleted": "Hubungan berikut akan diputus dan dihapus ({{ relationCount}})",
+    "cancel": "Batalkan",
+    "ok": "Setuju",
+    "deleted_relation_text": "Catatan {{- note}} (yang akan dihapus) dirujuk oleh relasi {{- relation}} yang berasal dari {{- source}}."
  },
  "clone_to": {
    "clone_notes_to": "Duplikat catatan ke…",
@ -96,5 +99,12 @@
    "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}}\""
+  },
+  "search_result": {
+    "search_now": "Cari sekarang"
+  },
+  "export": {
+    "export_note_title": "Mengeluarkan catatan",
+    "close": "Tutup"
  }
 }
--- a/apps/client/src/translations/it/translation.json
+++ b/apps/client/src/translations/it/translation.json
@ -118,7 +118,7 @@
    "export_type_subtree": "Questa nota e tutti i suoi discendenti",
    "format_html": "HTML - raccomandato in quanto mantiene tutti i formati",
    "format_html_zip": "HTML in archivio ZIP - questo è raccomandato in quanto conserva tutta la formattazione.",
-    "format_markdown": "MArkdown - questo conserva la maggior parte della formattazione.",
+    "format_markdown": "Markdown: preserva la maggior parte della formattazione.",
    "export_type_single": "Solo questa nota, senza le sottostanti",
    "format_opml": "OPML - formato per scambio informazioni outline. Formattazione, immagini e files non sono inclusi.",
    "opml_version_1": "OPML v.1.0 - solo testo semplice",
@ -592,7 +592,7 @@
    "collapseExpand": "collassa/espande il nodo",
    "notSet": "non impostato",
    "goBackForwards": "indietro/avanti nella cronologia",
-    "showJumpToNoteDialog": "mostra <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">finestra di dialogo “Vai a”</a>",
+    "showJumpToNoteDialog": "mostra <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">\"Vai a\"</a>",
    "title": "Scheda riassuntiva",
    "noteNavigation": "Nota navigazione",
    "scrollToActiveNote": "scorri fino alla nota attiva",
@ -1715,7 +1715,8 @@
    "beta-feature": "Beta",
    "task-list": "Elenco delle attività",
    "new-feature": "Nuovo",
-    "collections": "Collezioni"
+    "collections": "Collezioni",
+    "ai-chat": "Chat con IA"
  },
  "protect_note": {
    "toggle-on": "Proteggi la nota",
@ -1793,7 +1794,8 @@
  },
  "search_result": {
    "no_notes_found": "Non sono state trovate note per i parametri di ricerca specificati.",
-    "search_not_executed": "La ricerca non è stata ancora eseguita. Clicca sul pulsante \"Cerca\" qui sopra per visualizzare i risultati."
+    "search_not_executed": "La ricerca non è stata ancora eseguita.",
+    "search_now": "Cerca ora"
  },
  "spacer": {
    "configure_launchbar": "Configura Launchbar"
@ -2020,7 +2022,9 @@
    "percentage": "%"
  },
  "pagination": {
-    "total_notes": "{{count}} note"
+    "total_notes": "{{count}} note",
+    "prev_page": "Pagina precedente",
+    "next_page": "Pagina successiva"
  },
  "collections": {
    "rendering_error": "Impossibile mostrare il contenuto a causa di un errore."
--- a/apps/client/src/translations/ja/translation.json
+++ b/apps/client/src/translations/ja/translation.json
@ -599,7 +599,8 @@
    "beta-feature": "Beta",
    "task-list": "タスクリスト",
    "new-feature": "New",
-    "collections": "コレクション"
+    "collections": "コレクション",
+    "ai-chat": "AI チャット"
  },
  "edited_notes": {
    "no_edited_notes_found": "この日の編集されたノートはまだありません...",
--- a/apps/client/src/widgets/NoteDetail.tsx
+++ b/apps/client/src/widgets/NoteDetail.tsx
@ -1,7 +1,6 @@
 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";

--- a/apps/client/src/widgets/Toast.css
+++ b/apps/client/src/widgets/Toast.css
@ -5,7 +5,7 @@
    align-items: center;
    position: absolute;
    width: 100%;
-    top: 20px;
+    top: calc(env(safe-area-inset-top) + 20px);
    pointer-events: none;
    contain: none;
 }
--- a/apps/client/src/widgets/collections/Pagination.tsx
+++ b/apps/client/src/widgets/collections/Pagination.tsx
@ -9,7 +9,8 @@ import Button from "../react/Button";
 import "./Pagination.css";
 import clsx from "clsx";

-interface PaginationContext {
+export interface PaginationContext {
+    className?: string;
    page: number;
    setPage: Dispatch<StateUpdater<number>>;
    pageNotes?: FNote[];
@ -18,11 +19,11 @@ interface PaginationContext {
    totalNotes: number;
 }

-export function Pager({ page, pageSize, setPage, pageCount, totalNotes }: Omit<PaginationContext, "pageNotes">) {
+export function Pager({ className, page, pageSize, setPage, pageCount, totalNotes }: Omit<PaginationContext, "pageNotes">) {
    if (pageCount < 2) return;

    return (
-        <div className="note-list-pager-container">
+        <div className={clsx("note-list-pager-container", className)}>
            <div className="note-list-pager">
                <ActionButton
                    icon="bx bx-chevron-left"
--- a/apps/client/src/widgets/collections/board/index.css
+++ b/apps/client/src/widgets/collections/board/index.css
@ -14,7 +14,7 @@
  height: 100%;
  display: flex;
  gap: 1em;
-  padding-inline: 12px;
+  margin-inline: var(--content-margin-inline);
  padding-block: 4px;
  align-items: flex-start;
  overflow-x: auto;
--- a/apps/client/src/widgets/collections/calendar/index.css
+++ b/apps/client/src/widgets/collections/calendar/index.css
@ -52,7 +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;
+    padding: 0 var(--content-margin-inline);
 }

 .calendar-container .fc-list-sticky .fc-list-day > * {
--- a/apps/client/src/widgets/collections/legacy/ListOrGridView.css
+++ b/apps/client/src/widgets/collections/legacy/ListOrGridView.css
@ -2,142 +2,40 @@
    overflow: visible;
    position: relative;
    height: 100%;
+
+    .note-list-wrapper {
+        height: 100%;
+        overflow: auto;
+    }
+
+    &.grid-view .note-list-container {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 10px;
+    }
+
+    .note-list-bottom-pager {
+        margin-block: 8px;
+    }
+
+    &:not(:has(.note-list-bottom-pager)) {
+        margin-bottom: 48px;
+    }
 }

-.note-book-card {
-    border-radius: 10px;
-    background-color: var(--accented-background-color);
-    padding: 10px 15px 15px 8px;
-    margin: 5px 5px 5px 5px;
-    overflow: hidden;
-    display: flex;
-    flex-direction: column;
-    flex-shrink: 0;
-    flex-grow: 1;
-}
+/* #region List view / Grid view common styles */

-.note-book-card.archived {
-    opacity: 0.5;
-}
-
-.note-book-card:not(.expanded) .note-book-content {
-    padding: 10px
-}
-
-.note-book-card.expanded .note-book-content {
-    display: block;
-    min-height: 0;
-    height: 100%;
-    padding-top: 10px;
-}
-
-.note-book-content .rendered-content {
-    height: 100%;
-}
-
-.note-book-header {
-    border-bottom: 1px solid var(--main-border-color);
-    margin-bottom: 0;
-    padding-bottom: .5rem;
-    word-break: break-all;
-    flex-shrink: 0;
-}
-
-/* not-expanded title is limited to one line only */
-.note-book-card:not(.expanded) .note-book-header {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
-
-.note-book-header .rendered-note-attributes {
-    font-size: medium;
-}
-
-.note-book-header .rendered-note-attributes:before {
-    content: "\00a0\00a0";
-}
-
-.note-book-header .note-icon {
-    font-size: 100%;
-    display: inline-block;
-    padding-inline-end: 7px;
-    position: relative;
-}
-
-.note-book-card .note-book-card {
-    border: 1px solid var(--main-border-color);
-}
-
-.note-book-content.type-image, .note-book-content.type-file, .note-book-content.type-protectedSession {
+.nested-note-list-item h5,
+.note-book-card .note-book-header {
    display: flex;
    align-items: center;
-    justify-content: center;
-    text-align: center;
-    padding: 10px;
-    flex-grow: 1;
-}
-
-.note-book-content.type-image img, .note-book-content.type-canvas svg {
-    max-width: 100%;
-    max-height: 100%;
-    object-fit: contain;
-}
-
-.note-book-card.type-image .note-book-content img,
-.note-book-card.type-text .note-book-content img,
-.note-book-card.type-canvas .note-book-content img {
-    max-width: 100%;
-    max-height: 100%;
-}
-
-.note-book-header {
-    flex-grow: 0;
-}
-
-.note-list-wrapper {
-    height: 100%;
-    overflow: auto;
-}
-
-/* #region List view */
-
-@keyframes note-preview-show {
-    from {
-        opacity: 0;
-    } to {
-        opacity: 1;
-    }
-}
-
-.nested-note-list {
-    --card-nested-section-indent: 25px;
-
-    &.search-results {
-        --card-nested-section-indent: 32px;
-    }
-}
-
-/* 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;
-    }
+    font-size: 1em;
+    font-weight: normal;
+    margin: 0;

    .tn-icon {
-        margin-inline-end: 8px;
-        color: var(--note-list-view-icon-color);
        font-size: 1.2em;
+        margin-inline-end: 8px;
    }

    .note-book-title {
@ -147,52 +45,24 @@
        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 {
+    .note-book-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 {
+.nested-note-list-item.use-note-color,
+.note-book-card.use-note-color .note-book-header {
    span.tn-icon + span,
-    .note-list-attributes {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
+    .tn-icon,
+    .rendered-note-attributes {
+        color: var(--custom-color);
    }
 }

-/* List item (search results view) */
-.nested-note-list.search-results .nested-note-list-item {
+/* Search result view */
+.nested-note-list.search-results .nested-note-list-item,
+.note-list-container.search-results .note-book-card .note-book-header {
    span.tn-icon + span > span {
        display: flex;
        flex-direction: column-reverse;
@ -204,6 +74,7 @@
    }

    .note-path {
+        opacity: 0.5;
        margin-left: 0;
        font-size: .85em;
        line-height: .85em;
@ -225,7 +96,7 @@
        color: var(--note-icon-custom-color, var(--note-list-view-large-icon-color));
    }

-    h5 .ck-find-result {
+    .ck-find-result {
        background: var(--note-list-view-search-result-highlight-background);
        color: var(--note-list-view-search-result-highlight-color);
        font-weight: 600;
@ -233,21 +104,114 @@
    }
 }

+@keyframes note-preview-show {
+    from {
+        opacity: 0;
+    } to {
+        opacity: 1;
+    }
+}
+
+.nested-note-list .note-book-content,
+.note-list-container .note-book-content {
+    display: none;
+    animation: note-preview-show .35s ease-out;
+    will-change: opacity;
+
+    &.note-book-content-ready {
+        display: block;
+    }
+
+    .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-book-content {
+    height: 100%;
+
+    &.type-image, &.type-file, &.type-protectedSession {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        text-align: center;
+        padding: 10px;
+        flex-grow: 1;
+    }
+
+    &.type-image img, &.type-canvas svg {
+        max-width: 100%;
+        max-height: 100%;
+        object-fit: contain;
+    }
+}
+
+.note-content-preview:has(.note-book-content:empty) {
+    display: none;
+}
+
+/* #endregion */
+
+/* #region List view */
+
+.nested-note-list {
+    --card-nested-section-indent: 25px;
+
+    &.search-results {
+        --card-nested-section-indent: 32px;
+    }
+}
+
+/* List item */
+.nested-note-list-item {
+
+    .note-expander {
+        margin-inline-end: 4px;
+        font-size: x-large;
+        cursor: pointer;
+    }
+
+    .tn-icon {
+        color: var(--note-list-view-icon-color);
+    }
+
+    .note-list-attributes {
+        flex-grow: 1;
+        margin-inline-start: 1em;
+        text-align: right;
+        font-size: .75em;
+        opacity: .75;
+    }
+
+    &.archived {
+        span.tn-icon + span,
+        .tn-icon {
+            opacity: .6;
+        }
+    }
+}
+
+.nested-note-list:not(.search-results) h5,
+.note-book-card:not(.search-results) h5 {
+    span.tn-icon + span,
+    .note-list-attributes {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+}
+
 /* 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;
@ -285,54 +249,190 @@
        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 {
+
+.note-list .note-book-card {
+    --note-list-horizontal-padding: 22px;
+    --note-list-vertical-padding: 15px;
+
    display: flex;
-    flex-wrap: wrap;
-}
-
-.note-list.grid-view .note-book-card {
+    flex-direction: column;
+    flex-shrink: 0;
+    flex-grow: 1;
    flex-basis: 300px;
-    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;
+    padding: 0;
+    overflow: hidden;
+    user-select: none;
+
+    body.mobile & {
+        flex-basis: 150px;
+    }
+
+    &:hover {
+        background-color: var(--card-background-hover-color);
+        filter: contrast(105%);
+        transition: background-color 200ms ease-out;
+    }
+
+    &:not(:has(:is(.note-book-item-menu:active, .btn-primary:active))):active {
+        transform: scale(.98);
+    }
+
+    &.archived {
+        opacity: 0.5;
+    }
+
+    .note-book-header {
+        margin-bottom: 0;
+        border-bottom: 1px solid var(--card-border-color, var(--main-border-color));
+        padding-bottom: .5rem;
+        word-break: break-all;
+        flex-shrink: 0;
+        padding: .5rem 1rem;
+        padding-inline-end: 8px;
+
+        .tn-icon + span {
+            flex-grow: 1;
+            a {
+                font-weight: 500;
+            }
+        }
+    }
+
+    & .note-book-content {
+        &.type-image .note-book-content img,
+        &.type-text .note-book-content img,
+        &.type-canvas .note-book-content img {
+            max-width: 100%;
+            max-height: 100%;
+        }
+
+        .rendered-content {
+            height: 100%;
+        }
+
+        .rendered-content:has(.file-footer) {
+            padding: 0;
+        }
+
+        img {
+            max-height: 220px;
+            object-fit: contain;
+        }
+
+        .file-footer {
+            display: flex;
+            gap: 8px;
+            justify-content: space-between;
+            padding: 0;
+
+            .btn.btn-primary {
+                flex: 1;
+                margin: 0;
+                box-shadow: unset;
+                background: transparent;
+                border: 0;
+                border-radius: 0;
+                padding: 8px;
+                color: var(--main-text-color);
+
+                &:hover {
+                    background: var(--more-accented-background-color);
+                }
+
+                &:active {
+                    transform: none;
+                }
+            }
+        }
+    }
 }

-.note-list.grid-view .note-book-card img {
-    max-height: 220px;
-    object-fit: contain;
+.note-book-card .note-book-content {
+    padding: 0;
+    flex: 1;
+    overflow: hidden;
+    font-size: 0.8rem;
+
+    &.note-book-content-overflowing {
+        mask-image: linear-gradient(to bottom, black calc(100% - 75px), transparent 100%);
+        mask-repeat: no-repeat;
+        mask-size: 100% 100%;
+    }
+    
+    .ck-content p {
+        margin-bottom: 0.5em;
+        line-height: 1.3;
+    }
+
+    .ck-content figure.image {
+        width: 25%;
+    }
+
+    .ck-content .table {
+        display: flex;
+        flex-direction: column-reverse;
+        overflow-x: scroll;
+        --scrollbar-thickness: 0;
+        scrollbar-width: none;
+        
+        table {
+            width: max-content;
+            table-layout: auto;
+        }
+
+        figcaption {
+            display: block;
+            position: sticky;
+            left: 0;
+            width: 100%;
+        }
+    }
+
+    .rendered-content,
+    .rendered-content.text-with-ellipsis {
+        padding: .5rem 1rem 1rem 1rem;
+    }
+
+    &.type-image .rendered-content,
+    &.type-pdf .rendered-content {
+        padding: 0;
+    }
+
+    &.type-video video {
+        max-height: 200px;
+    }
+
+    h1, h2, h3, h4, h5, h6 {
+        font-size: 1rem;
+        color: var(--active-item-text-color);
+    }
+
+    p:last-child {
+        margin-bottom: 0;
+    }
+
+    &.type-canvas .rendered-content,
+    &.type-mindMap .rendered-content,
+    &.type-code .rendered-content,
+    &.type-video .rendered-content {
+        padding: 0;
+    }
+
+    &.type-code {
+        height: 100%;
+    }
+
+    &.type-code pre {
+        height: 100%;
+        padding: 1em;
+        margin-bottom: 0;
+    }
 }

-.note-list.grid-view .note-book-card:hover {
-    cursor: pointer;
-    border: 1px solid var(--main-border-color);
-    background: var(--more-accented-background-color);
-}
-
-.note-list.grid-view .note-path {
-    margin-left: 0.5em;
-    vertical-align: middle;
-    opacity: 0.5;
-}
-/* #endregion */
+/* #endregion */
--- a/apps/client/src/widgets/collections/legacy/ListOrGridView.tsx
+++ b/apps/client/src/widgets/collections/legacy/ListOrGridView.tsx
@ -1,7 +1,7 @@
 import "./ListOrGridView.css";
-import { Card, CardSection } from "../../react/Card";
+import { Card, CardFrame, CardSection } from "../../react/Card";

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

 import FNote from "../../../entities/fnote";
 import attribute_renderer from "../../../services/attribute_renderer";
@ -13,13 +13,15 @@ import { useImperativeSearchHighlighlighting, useNoteLabel, useNoteLabelBoolean,
 import Icon from "../../react/Icon";
 import NoteLink from "../../react/NoteLink";
 import { ViewModeProps } from "../interface";
-import { Pager, usePagination } from "../Pagination";
+import { Pager, usePagination, PaginationContext } 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";
+import { ComponentChildren, TargetedMouseEvent } from "preact";
+
+const contentSizeObserver = new ResizeObserver(onContentResized);

 export function ListView({ note, noteIds: unfilteredNoteIds, highlightedTokens }: ViewModeProps<{}>) {
    const expandDepth = useExpansionDepth(note);
@ -27,32 +29,18 @@ export function ListView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
    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">
-            <CollectionProperties
-                note={note}
-                centerChildren={<Pager {...pagination} />}
-            />
-
-            { 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}
-                            note={childNote} parentNote={note}
-                            expandDepth={expandDepth} highlightedTokens={highlightedTokens}
-                            currentLevel={1} includeArchived={includeArchived} />
-                    ))}
-                </Card>
-
-                <Pager {...pagination} />
-            </div>}
-        </div>
-    );
+    return <NoteList note={note} viewMode="list-view" noteIds={noteIds} pagination={pagination}>
+        <Card className={clsx("nested-note-list", {"search-results": (noteType === "search")})}>
+            {pageNotes?.map(childNote => (
+                <ListNoteCard
+                    key={childNote.noteId}
+                    note={childNote} parentNote={note}
+                    expandDepth={expandDepth} highlightedTokens={highlightedTokens}
+                    currentLevel={1} includeArchived={includeArchived} />
+            ))}
+        </Card>
+    </NoteList>;
 }

 export function GridView({ note, noteIds: unfilteredNoteIds, highlightedTokens }: ViewModeProps<{}>) {
@ -60,28 +48,47 @@ export function GridView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
    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">
-                {!hasCollectionProperties && <Pager {...pagination} />}
-
-                <div class="note-list-container use-tn-links">
-                    {pageNotes?.map(childNote => (
-                        <GridNoteCard note={childNote} parentNote={note} highlightedTokens={highlightedTokens} includeArchived={includeArchived} />
-                    ))}
-                </div>
-
-                <Pager {...pagination} />
-            </div>
+    return <NoteList note={note} viewMode="grid-view" noteIds={noteIds} pagination={pagination}>
+        <div className={clsx("note-list-container use-tn-links", {"search-results": (noteType === "search")})}>
+            {pageNotes?.map(childNote => (
+                <GridNoteCard key={childNote.noteId}
+                                note={childNote}
+                                parentNote={note}
+                                highlightedTokens={highlightedTokens}
+                                includeArchived={includeArchived} />
+            ))}
        </div>
-    );
+    </NoteList>
+}
+
+interface NoteListProps {
+    note: FNote,
+    viewMode: "list-view" | "grid-view",
+    noteIds: string[],
+    pagination: PaginationContext,
+    children: ComponentChildren
+}
+
+function NoteList(props: NoteListProps) {
+    const noteType = useNoteProperty(props.note, "type");
+    const hasCollectionProperties = ["book", "search"].includes(noteType ?? "");
+
+    return <div className={clsx("note-list", props.viewMode)}>
+        <CollectionProperties
+            note={props.note}
+            centerChildren={<Pager className="note-list-top-pager" {...props.pagination} />}
+        />
+
+        {props.noteIds.length > 0 && <div className="note-list-wrapper">
+            {!hasCollectionProperties && <Pager {...props.pagination} />}
+            
+            {props.children}
+
+            <Pager className="note-list-bottom-pager" {...props.pagination} />
+        </div>}
+
+    </div>
 }

 function ListNoteCard({ note, parentNote, highlightedTokens, currentLevel, expandDepth, includeArchived }: {
@ -139,39 +146,47 @@ function ListNoteCard({ note, parentNote, highlightedTokens, currentLevel, expan
                          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)} 
-                />
+                <NoteMenuButton notePath={notePath} />
            </h5>
        </CardSection>
    );
 }

-function GridNoteCard({ note, parentNote, highlightedTokens, includeArchived }: { note: FNote, parentNote: FNote, highlightedTokens: string[] | null | undefined, includeArchived: boolean }) {
-    const titleRef = useRef<HTMLSpanElement>(null);
-    const [ noteTitle, setNoteTitle ] = useState<string>();
-    const notePath = getNotePath(parentNote, note);
+interface GridNoteCardProps {
+    note: FNote;
+    parentNote: FNote;
+    highlightedTokens: string[] | null | undefined;
+    includeArchived: boolean;
+}
+
+function GridNoteCard(props: GridNoteCardProps) {
+    const notePath = getNotePath(props.parentNote, props.note);

    return (
-        <div
-            className={`note-book-card no-tooltip-preview block-link ${note.isArchived ? "archived" : ""}`}
-            data-href={`#${notePath}`}
-            data-note-id={note.noteId}
-            onClick={(e) => link.goToLink(e)}
+        <CardFrame className={clsx("note-book-card", "no-tooltip-preview", "block-link", props.note.getColorClass(), {
+                "archived": props.note.isArchived
+             })}
+             data-href={`#${notePath}`}
+             data-note-id={props.note.noteId}
+             onClick={(e) => link.goToLink(e)}
        >
-            <h5 className="note-book-header">
-                <Icon className="note-icon" icon={note.getIcon()} />
-                <NoteLink className="note-book-title" notePath={notePath} noPreview showNotePath={parentNote.type === "search"} highlightedTokens={highlightedTokens} />
-                <NoteAttributes note={note} />
+            <h5 className={clsx("note-book-header")}>
+                <Icon className="note-icon" icon={props.note.getIcon()} />
+                <NoteLink className="note-book-title"
+                          notePath={notePath}
+                          noPreview
+                          showNotePath={props.parentNote.type === "search"}
+                          highlightedTokens={props.highlightedTokens}
+                />
+                {!props.note.isOptions() && <NoteMenuButton notePath={notePath} />}
+                
            </h5>
-            <NoteContent
-                note={note}
-                trim
-                highlightedTokens={highlightedTokens}
-                includeArchivedNotes={includeArchived}
+            <NoteContent note={props.note}
+                         trim
+                         highlightedTokens={props.highlightedTokens}
+                         includeArchivedNotes={props.includeArchived}
            />
-        </div>
+        </CardFrame>
    );
 }

@ -199,6 +214,17 @@ export function NoteContent({ note, trim, noChildrenList, highlightedTokens, inc
    const [ready, setReady] = useState(false);
    const [noteType, setNoteType] = useState<string>("none");

+    useEffect(() => {
+        const contentElement = contentRef.current;
+        if (!contentElement) return;
+
+        contentSizeObserver.observe(contentElement);
+
+        return () => {
+            contentSizeObserver.unobserve(contentElement);
+        }
+    }, []);
+
    useEffect(() => {
        content_renderer.getRenderedContent(note, {
            trim,
@ -252,6 +278,18 @@ function NoteChildren({ note, parentNote, highlightedTokens, currentLevel, expan
    />);
 }

+function NoteMenuButton(props: {notePath: string}) {
+    const openMenu = useCallback((e: TargetedMouseEvent<HTMLElement>) => {
+        linkContextMenuService.openContextMenu(props.notePath, e);
+        e.stopPropagation()
+    }, [props.notePath]);
+
+    return  <ActionButton className="note-book-item-menu"
+                          icon="bx bx-dots-vertical-rounded" text=""
+                          onClick={openMenu} 
+            />
+}
+
 function getNotePath(parentNote: FNote, childNote: FNote) {
    if (parentNote.type === "search") {
        // for search note parent, we want to display a non-search path
@ -275,7 +313,9 @@ function useExpansionDepth(note: FNote) {

 }

-function openNoteMenu(notePath, e: TargetedMouseEvent<HTMLElement>) {
-    linkContextMenuService.openContextMenu(notePath, e);
-    e.stopPropagation()
-}
+function onContentResized(entries: ResizeObserverEntry[], observer: ResizeObserver): void {
+    for (const contentElement of entries) {
+        const isOverflowing = ((contentElement.target.scrollHeight > contentElement.target.clientHeight))
+        contentElement.target.classList.toggle("note-book-content-overflowing", isOverflowing);
+    }
+}
--- a/apps/client/src/widgets/collections/table/index.css
+++ b/apps/client/src/widgets/collections/table/index.css
@ -13,6 +13,7 @@

 .table-view-container {
    height: 100%;
+    margin-inline-start: var(--content-margin-inline);
 }

 .search-result-widget-content .table-view {
--- a/apps/client/src/widgets/containers/root_container.ts
+++ b/apps/client/src/widgets/containers/root_container.ts
@ -3,7 +3,7 @@ import { LOCALES } from "@triliumnext/commons";
 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 utils, { isIOS, 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";
@ -13,15 +13,20 @@ import FlexContainer from "./flex_container.js";
 *
 * For convenience, the root container has a few class selectors that can be used to target some global state:
 *
+ * - `#root-container.light-theme`, indicates whether the current color scheme is light.
+ * - `#root-container.dark-theme`, indicates whether the current color scheme is dark.
 * - `#root-container.virtual-keyboard-opened`, on mobile devices if the virtual keyboard is open.
 * - `#root-container.horizontal-layout`, if the current layout is horizontal.
 * - `#root-container.vertical-layout`, if the current layout is horizontal.
 */
 export default class RootContainer extends FlexContainer<BasicWidget> {

+    private originalWindowHeight: number;
+
    constructor(isHorizontalLayout: boolean) {
        super(isHorizontalLayout ? "column" : "row");

+        this.originalWindowHeight = window.innerHeight ?? 0;
        this.id("root-widget");
        this.css("height", "100dvh");
    }
@ -31,6 +36,8 @@ export default class RootContainer extends FlexContainer<BasicWidget> {
            window.visualViewport?.addEventListener("resize", () => this.#onMobileResize());
        }

+        this.#initTheme();
+        this.#setDeviceSpecificClasses();
        this.#setMaxContentWidth();
        this.#setMotion();
        this.#setShadows();
@ -63,9 +70,24 @@ export default class RootContainer extends FlexContainer<BasicWidget> {
        }
    }

+    #initTheme() {
+        const colorSchemeChangeObserver = matchMedia("(prefers-color-scheme: dark)")
+        colorSchemeChangeObserver.addEventListener("change", () => this.#updateColorScheme());
+        this.#updateColorScheme();
+        
+        document.body.setAttribute("data-theme-id", options.get("theme"));
+    }
+
+    #updateColorScheme() {
+        const colorScheme = readCssVar(document.body, "theme-style").asString();
+        
+        document.body.classList.toggle("light-theme", colorScheme === "light");
+        document.body.classList.toggle("dark-theme", colorScheme === "dark");
+    }
+
    #onMobileResize() {
        const viewportHeight = window.visualViewport?.height ?? window.innerHeight;
-        const windowHeight = window.innerHeight;
+        const windowHeight = Math.max(window.innerHeight, this.originalWindowHeight); // inner height changes when keyboard is opened, we need to compare with the original height to detect it.

        // If viewport is significantly smaller, keyboard is likely open
        const isKeyboardOpened = windowHeight - viewportHeight > 150;
@ -117,6 +139,12 @@ export default class RootContainer extends FlexContainer<BasicWidget> {
        document.body.dir = correspondingLocale?.rtl ? "rtl" : "ltr";
    }

+    #setDeviceSpecificClasses() {
+        if (isIOS()) {
+            document.body.classList.add("ios");
+        }
+    }
+
    #initPWATopbarColor() {
        if (!utils.isPWA()) return;
        const tracker = $("#background-color-tracker");
--- a/apps/client/src/widgets/launch_bar/CalendarWidget.css
+++ b/apps/client/src/widgets/launch_bar/CalendarWidget.css
@ -35,7 +35,7 @@
 .calendar-dropdown-widget .calendar-header {
    align-items: center;
    display: flex;
-    padding: 0 0.5rem 0.5rem 0.5rem;
+    padding: 0 0.5rem 1rem 0.5rem;
 }

 .calendar-dropdown-widget .calendar-header>div {
@ -65,8 +65,13 @@
    border: 0;
    border-inline-start: unset;
    background-color: var(--menu-background-color);
-    font-weight: bold;
    outline: 0;
+    font-weight: 300;
+    font-size: 1.4em;
+}
+
+.calendar-dropdown-widget .calendar-header .dropdown-toggle {
+    justify-content: center;
 }

 .calendar-dropdown-widget .calendar-header .dropdown-toggle::after {
@ -82,18 +87,20 @@
 .calendar-dropdown-widget .calendar-week span {
    flex-direction: column;
    flex: 0 0 12.5%;
-    font-size: 1rem;
-    font-weight: bold;
    max-width: 12.5%;
    padding-top: 5px;
    padding-bottom: 5px;
    text-align: center;
    text-transform: uppercase;
+    font-size: .85em;
+    font-weight: 500;
 }

 .calendar-dropdown-widget .calendar-body {
    display: flex;
    flex-wrap: wrap;
+    min-height: 250px;
+    align-items: center;
 }

 .calendar-dropdown-widget .calendar-week-number {
--- a/apps/client/src/widgets/layout/NoteTitleActions.css
+++ b/apps/client/src/widgets/layout/NoteTitleActions.css
@ -4,10 +4,11 @@ body.experimental-feature-new-layout {
    }

    .title-actions {
-        --title-actions-padding-start: 12px;
-        --title-actions-padding-end: 8px;
+        --title-actions-padding-start: var(--content-margin-inline);
+        --title-actions-padding-end: var(--content-margin-inline);

        display: flex;
+        width: 100%;
        max-width: var(--max-content-width);
        flex-direction: column;
        gap: 0.5em;
--- a/apps/client/src/widgets/layout/NoteTypeSwitcher.css
+++ b/apps/client/src/widgets/layout/NoteTypeSwitcher.css
@ -11,7 +11,6 @@

    position: relative;
    top: 5px;
-    padding: .25em 0;
    display: flex;
    align-items: center;
    overflow-x: auto;
--- a/apps/client/src/widgets/note_bars/CollectionProperties.css
+++ b/apps/client/src/widgets/note_bars/CollectionProperties.css
@ -1,5 +1,5 @@
 .collection-properties {
-    padding: 0.55em 12px;
+    padding: 0.55em var(--content-margin-inline);
    display: flex;
    gap: 0.25em;
    align-items: center;
--- a/apps/client/src/widgets/note_title.tsx
+++ b/apps/client/src/widgets/note_title.tsx
@ -26,6 +26,7 @@ export default function NoteTitleWidget(props: {className?: string}) {
            || note === undefined
            || (note.isProtected && !protected_session_holder.isProtectedSessionAvailable())
            || isLaunchBarConfig(note.noteId)
+            || note.noteId.startsWith("_help_")
            || viewScope?.viewMode !== "default";
        setReadOnly(isReadOnly);
    }, [ note, note?.noteId, note?.isProtected, viewScope?.viewMode ]);
--- a/apps/client/src/widgets/note_wrapper.ts
+++ b/apps/client/src/widgets/note_wrapper.ts
@ -1,11 +1,11 @@
-import FlexContainer from "./containers/flex_container.js";
-import utils from "../services/utils.js";
-import attributeService from "../services/attributes.js";
-import type BasicWidget from "./basic_widget.js";
 import type { EventData } from "../components/app_context.js";
 import type NoteContext from "../components/note_context.js";
 import type FNote from "../entities/fnote.js";
+import attributeService from "../services/attributes.js";
 import { getLocaleById } from "../services/i18n.js";
+import utils from "../services/utils.js";
+import type BasicWidget from "./basic_widget.js";
+import FlexContainer from "./containers/flex_container.js";

 export default class NoteWrapperWidget extends FlexContainer<BasicWidget> {

@ -43,11 +43,16 @@ export default class NoteWrapperWidget extends FlexContainer<BasicWidget> {

    refresh() {
        const isHiddenExt = this.isHiddenExt(); // preserve through class reset
+        const isActive = this.$widget.hasClass("active");

        this.$widget.removeClass();

        this.toggleExt(!isHiddenExt);

+        if (isActive) {
+            this.$widget.addClass("active");
+        }
+
        this.$widget.addClass("component note-split");

        const note = this.noteContext?.note;
@ -92,6 +97,11 @@ export default class NoteWrapperWidget extends FlexContainer<BasicWidget> {
    #hasBackgroundEffects(note: FNote): boolean {
        const MIME_TYPES_WITH_BACKGROUND_EFFECTS = [
            "application/pdf"
+        ];
+
+        const COLLECTIONS_WITH_BACKGROUND_EFFECTS = [
+            "grid",
+            "list"
        ]

        if (note.isOptions()) {
@ -102,6 +112,10 @@ export default class NoteWrapperWidget extends FlexContainer<BasicWidget> {
            return true;
        }

+        if (note.type === "book" && COLLECTIONS_WITH_BACKGROUND_EFFECTS.includes(note.getLabelValue("viewType") ?? "none")) {
+            return true;
+        }
+
        return false;
    }

--- a/apps/client/src/widgets/react/Card.css
+++ b/apps/client/src/widgets/react/Card.css
@ -1,4 +1,4 @@
-:where(.tn-card) {
+:where(.tn-card, .tn-card-frame) {
    --card-border-radius: 8px;
    --card-padding-block: 8px;
    --card-padding-inline: 16px;
@ -6,6 +6,22 @@
    --card-nested-section-indent: 30px;
 }

+.tn-card-frame,
+.tn-card-body .tn-card-section {
+    padding: var(--card-padding-block) var(--card-padding-inline);
+    border: 1px solid var(--card-border-color, var(--main-border-color));
+    background: var(--card-background-color);
+
+    &.tn-card-highlight-on-hover:hover {
+        background-color: var(--card-background-hover-color);
+        transition: background-color .2s ease-out;
+    }
+}
+
+.tn-card-frame {
+    border-radius: var(--card-border-radius);
+}
+
 .tn-card-heading {
    margin-bottom: 10px;
    font-size: .75rem;
@ -20,10 +36,6 @@
    gap: var(--card-section-gap);

    .tn-card-section {
-        padding: var(--card-padding-block) var(--card-padding-inline);
-        border: 1px solid var(--card-border-color, var(--main-border-color));
-        background: var(--card-background-color);
-
        &:first-of-type {
            border-top-left-radius: var(--card-border-radius);
            border-top-right-radius: var(--card-border-radius);
@ -38,10 +50,5 @@
            padding-left: calc(var(--card-padding-inline) + var(--card-nested-section-indent) * var(--tn-card-section-nesting-level));
            background-color: color-mix(in srgb, var(--card-background-color) calc(100% / (var(--tn-card-section-nesting-level) + 1)) , transparent);
        }
-
-        &.tn-card-section-highlight-on-hover:hover {
-            background-color: var(--card-background-hover-color);
-            transition: background-color .2s ease-out;
-        }
    }
 }
--- a/apps/client/src/widgets/react/Card.tsx
+++ b/apps/client/src/widgets/react/Card.tsx
@ -1,9 +1,29 @@
 import "./Card.css";
 import { ComponentChildren, createContext } from "preact";
-import { JSX } from "preact";
+import { JSX, HTMLAttributes } from "preact";
 import { useContext } from "preact/hooks";
 import clsx from "clsx";

+// #region Card Frame
+
+export interface CardFrameProps extends HTMLAttributes<HTMLDivElement> {
+    className?: string;
+    highlightOnHover?: boolean;
+    children: ComponentChildren;
+}
+
+export function CardFrame({className, highlightOnHover, children, ...rest}: CardFrameProps) {
+    return <div {...rest}
+                className={clsx("tn-card-frame", className, {
+                    "tn-card-highlight-on-hover": highlightOnHover
+                })}>
+
+        {children}
+    </div>;
+}
+
+// #endregion
+
 // #region Card

 export interface CardProps {
@ -45,7 +65,7 @@ export function CardSection(props: {children: ComponentChildren} & CardSectionPr
    return <>
        <section className={clsx("tn-card-section", props.className, {
                    "tn-card-section-nested": nestingLevel > 0,
-                    "tn-card-section-highlight-on-hover": props.highlightOnHover || props.onAction
+                    "tn-card-highlight-on-hover": props.highlightOnHover || props.onAction
                 })}
                 style={{"--tn-card-section-nesting-level": (nestingLevel) ? nestingLevel : null}}
                 onClick={props.onAction}>
--- a/apps/client/src/widgets/react/hooks.tsx
+++ b/apps/client/src/widgets/react/hooks.tsx
@ -1383,3 +1383,28 @@ export function useGetContextDataFrom<K extends keyof NoteContextDataMap>(
    return data;
 }

+export function useColorScheme() {
+    const themeStyle = getThemeStyle();
+    const defaultValue = themeStyle === "auto" ? (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) : themeStyle === "dark";
+    const [ prefersDark, setPrefersDark ] = useState(defaultValue);
+
+    useEffect(() => {
+        if (themeStyle !== "auto") return;
+        const mediaQueryList = window.matchMedia("(prefers-color-scheme: dark)");
+        const listener = (e: MediaQueryListEvent) => setPrefersDark(e.matches);
+
+        mediaQueryList.addEventListener("change", listener);
+        return () => mediaQueryList.removeEventListener("change", listener);
+    }, [ themeStyle ]);
+
+    return prefersDark ? "dark" : "light";
+}
+
+function getThemeStyle() {
+    const style = window.getComputedStyle(document.body);
+    const themeStyle = style.getPropertyValue("--theme-style");
+    if (style.getPropertyValue("--theme-style-auto") !== "true" && (themeStyle === "light" || themeStyle === "dark")) {
+        return themeStyle as "light" | "dark";
+    }
+    return "auto";
+}
--- a/apps/client/src/widgets/scroll_padding.tsx
+++ b/apps/client/src/widgets/scroll_padding.tsx
@ -8,6 +8,7 @@ export default function ScrollPadding() {
    const [height, setHeight] = useState<number>(10);
    const isEnabled = ["text", "code"].includes(note?.type ?? "")
        && viewScope?.viewMode === "default"
+        && note?.isContentAvailable()
        && !note?.isTriliumSqlite();

    const refreshHeight = () => {
--- a/apps/client/src/widgets/search_result.css
+++ b/apps/client/src/widgets/search_result.css
@ -4,8 +4,8 @@
    contain: none !important;
 }

-.search-result-widget .note-list {
-    padding: 10px;
+.search-result-widget .note-list-wrapper {
+    margin-inline: var(--content-margin-inline);
 }

 .note-split.type-search .scrolling-container {
--- a/apps/client/src/widgets/type_widgets/ContentWidget.css
+++ b/apps/client/src/widgets/type_widgets/ContentWidget.css
@ -4,4 +4,5 @@

 .note-detail.full-height .note-detail-content-widget-content {
    padding: 0;
+    height: 100%;
 }
--- a/apps/client/src/widgets/type_widgets/MindMap.tsx
+++ b/apps/client/src/widgets/type_widgets/MindMap.tsx
@ -6,12 +6,12 @@ import "./MindMap.css";
 import nodeMenu from "@mind-elixir/node-menu";
 import { DISPLAYABLE_LOCALE_IDS } from "@triliumnext/commons";
 import { snapdom } from "@zumer/snapdom";
-import { default as VanillaMindElixir,MindElixirData, MindElixirInstance, Operation, Options } from "mind-elixir";
+import { default as VanillaMindElixir,MindElixirData, MindElixirInstance, Operation, Options, THEME as LIGHT_THEME, DARK_THEME } from "mind-elixir";
 import { HTMLAttributes, RefObject } from "preact";
 import { useCallback, useEffect, useRef } from "preact/hooks";

 import utils from "../../services/utils";
-import { useEditorSpacedUpdate, useNoteLabelBoolean, useSyncedRef, useTriliumEvent, useTriliumEvents, useTriliumOption } from "../react/hooks";
+import { useColorScheme, useEditorSpacedUpdate, useNoteLabelBoolean, useSyncedRef, useTriliumEvent, useTriliumEvents, useTriliumOption } from "../react/hooks";
 import { refToJQuerySelector } from "../react/react_utils";
 import { TypeWidgetProps } from "./type_widget";

@ -85,9 +85,11 @@ export default function MindMap({ note, ntxId, noteContext }: TypeWidgetProps) {
        },
        onContentChange: (content) => {
            let newContent: MindElixirData;
+
            if (content) {
                try {
                    newContent = JSON.parse(content) as MindElixirData;
+                    delete newContent.theme;    // The theme is managed internally by the widget, so we remove it from the loaded content to avoid inconsistencies.
                } catch (e) {
                    console.warn(e);
                    console.debug("Wrong JSON content: ", content);
@ -151,6 +153,7 @@ function MindElixir({ containerRef: externalContainerRef, containerProps, apiRef
    const containerRef = useSyncedRef<HTMLDivElement>(externalContainerRef, null);
    const apiRef = useRef<MindElixirInstance>(null);
    const [ locale ] = useTriliumOption("locale");
+    const colorScheme = useColorScheme();

    function reinitialize() {
        if (!containerRef.current) return;
@ -158,7 +161,8 @@ function MindElixir({ containerRef: externalContainerRef, containerProps, apiRef
        const mind = new VanillaMindElixir({
            el: containerRef.current,
            locale: LOCALE_MAPPINGS[locale as DISPLAYABLE_LOCALE_IDS] ?? undefined,
-            editable
+            editable,
+            theme: LIGHT_THEME
        });

        if (editable) {
@ -179,6 +183,14 @@ function MindElixir({ containerRef: externalContainerRef, containerProps, apiRef
        };
    }, []);

+    // React to theme changes.
+    useEffect(() => {
+        if (!apiRef.current) return;
+        const newTheme = colorScheme === "dark" ? DARK_THEME : LIGHT_THEME;
+        if (apiRef.current.theme === newTheme) return; // Avoid unnecessary theme changes, which can be expensive to render.
+        apiRef.current.changeTheme(newTheme);
+    }, [ colorScheme ]);
+
    useEffect(() => {
        const data = apiRef.current?.getData();
        reinitialize();
--- a/apps/client/src/widgets/type_widgets/ProtectedSession.css
+++ b/apps/client/src/widgets/type_widgets/ProtectedSession.css
@ -3,4 +3,8 @@
    margin-inline: 40px;
    flex-direction: column;
    justify-content: center;
+
+    label {
+        margin-bottom: 8px;
+    }
 }
--- a/apps/client/src/widgets/type_widgets/canvas/Canvas.tsx
+++ b/apps/client/src/widgets/type_widgets/canvas/Canvas.tsx
@ -1,7 +1,7 @@
 import { Excalidraw } from "@excalidraw/excalidraw";
 import { TypeWidgetProps } from "../type_widget";
 import "@excalidraw/excalidraw/index.css";
-import { useNoteLabelBoolean, useTriliumOption } from "../../react/hooks";
+import { useColorScheme, useNoteLabelBoolean, useTriliumOption } from "../../react/hooks";
 import { useCallback, useMemo, useRef } from "preact/hooks";
 import { type ExcalidrawImperativeAPI, type AppState } from "@excalidraw/excalidraw/types";
 import options from "../../../services/options";
@ -19,12 +19,9 @@ window.EXCALIDRAW_ASSET_PATH = `${window.location.pathname}/node_modules/@excali
 export default function Canvas({ note, noteContext }: TypeWidgetProps) {
    const apiRef = useRef<ExcalidrawImperativeAPI>(null);
    const [ isReadOnly ] = useNoteLabelBoolean(note, "readOnly");
-    const themeStyle = useMemo(() => {
-        const documentStyle = window.getComputedStyle(document.documentElement);
-        return documentStyle.getPropertyValue("--theme-style")?.trim() as AppState["theme"];
-    }, []);
+    const colorScheme = useColorScheme();
    const [ locale ] = useTriliumOption("locale");
-    const persistence = useCanvasPersistence(note, noteContext, apiRef, themeStyle, isReadOnly);
+    const persistence = useCanvasPersistence(note, noteContext, apiRef, colorScheme, isReadOnly);

    /** Use excalidraw's native zoom instead of the global zoom. */
    const onWheel = useCallback((e: MouseEvent) => {
@ -54,7 +51,7 @@ export default function Canvas({ note, noteContext }: TypeWidgetProps) {
            <div className="excalidraw-wrapper">
                <Excalidraw
                    excalidrawAPI={api => apiRef.current = api}
-                    theme={themeStyle}
+                    theme={colorScheme}
                    viewModeEnabled={isReadOnly || options.is("databaseReadonly")}
                    zenModeEnabled={false}
                    isCollaborating={false}
--- a/apps/client/src/widgets/type_widgets/file/PdfViewer.tsx
+++ b/apps/client/src/widgets/type_widgets/file/PdfViewer.tsx
@ -1,13 +1,36 @@
 import type { HTMLAttributes, RefObject } from "preact";
 import { useCallback, useEffect, useRef } from "preact/hooks";
-
+import Inter from "./../../../fonts/Inter/Inter-VariableFont_opsz,wght.ttf";
 import { useSyncedRef, useTriliumOption, useTriliumOptionBool } from "../../react/hooks";

+interface FontDefinition {
+    name: string;
+    url: string;
+}
+
+const FONTS: FontDefinition[] = [
+    {name: "Inter", url: Inter},
+]
+
 const VARIABLE_WHITELIST = new Set([
    "root-background",
    "main-background-color",
    "main-border-color",
-    "main-text-color"
+    "main-text-color",
+    "theme-style",
+    "menu-background-color",
+    "dropdown-backdrop-filter",
+    "dropdown-border-radius",
+    "dropdown-border-color",
+    "dropdown-shadow-opacity",
+    "menu-padding-size",
+    "menu-text-color",
+    "hover-item-background-color",
+    "hover-item-text-color",
+    "menu-item-icon-color",
+    "input-focus-outline-color",
+    "input-background-color",
+    "input-text-color"
 ]);

 interface PdfViewerProps extends Pick<HTMLAttributes<HTMLIFrameElement>, "tabIndex"> {
@ -55,8 +78,12 @@ function useStyleInjection(iframeRef: RefObject<HTMLIFrameElement>) {
        style.id = 'client-root-vars';
        style.textContent = cssVarsToString(getRootCssVariables());
        styleRef.current = style;
-
        doc.head.appendChild(style);
+
+        const fontStyles = doc.createElement("style");
+        fontStyles.textContent = FONTS.map(injectFont).join("\n");
+        doc.head.appendChild(fontStyles);
+        
    }, [ iframeRef ]);

    // React to changes.
@ -92,3 +119,12 @@ function cssVarsToString(vars: Record<string, string>) {
        .map(([k, v]) => `  ${k}: ${v};`)
        .join('\n')}\n}`;
 }
+
+function injectFont(font: FontDefinition) {
+    return `
+        @font-face {
+            font-family: '${font.name}';
+            src: url('${font.url}');
+        }
+    `;
+}
--- a/apps/client/src/widgets/type_widgets/helpers/SetupForm.css
+++ b/apps/client/src/widgets/type_widgets/helpers/SetupForm.css
@ -19,4 +19,12 @@
    .tn-link {
        margin-top: 1em;
    }
+
+    label {
+        margin-bottom: 8px;
+    }
+
+    .input-group {
+        margin: 0;
+    }
 }
--- a/apps/client/src/widgets/type_widgets/text/mobile_editor_toolbar.css
+++ b/apps/client/src/widgets/type_widgets/text/mobile_editor_toolbar.css
@ -2,22 +2,14 @@ body.mobile {
    .classic-toolbar-outer-container {
        contain: none !important;
    }
-    
+
    .classic-toolbar-outer-container.visible {
        height: 38px;
-        background-color: var(--main-background-color);
        position: relative;
        overflow: visible;
        flex-shrink: 0;
    }
-    
-    #root-widget.virtual-keyboard-opened .classic-toolbar-outer-container.ios {
-        position: absolute;
-        inset-inline-start: 0;
-        inset-inline-end: 0;
-        bottom: 0;
-    }
-    
+
    .classic-toolbar-widget {
        position: absolute;
        bottom: 0;
@ -28,27 +20,27 @@ body.mobile {
        display: flex;
        align-items: flex-end;
        user-select: none;
+        touch-action: pan-x;
        scrollbar-width: 0 !important;
    }
-    
+
    .classic-toolbar-widget::-webkit-scrollbar:horizontal {
        height: 0 !important;
    }
-    
+
    .classic-toolbar-widget.dropdown-active {
        height: 50vh;
    }
-    
+
    .classic-toolbar-widget .ck.ck-toolbar {
-        --ck-color-toolbar-background: transparent;
+        --ck-color-toolbar-background: var(--main-background-color);
        --ck-color-button-default-background: transparent;
        --ck-color-button-default-disabled-background: transparent;
        position: absolute;
-        background-color: transparent;
        border: none;
    }
-    
+
    .classic-toolbar-widget .ck.ck-button.ck-disabled {
        opacity: 0.3;
    }
-}
+}
--- a/apps/client/src/widgets/type_widgets/text/mobile_editor_toolbar.tsx
+++ b/apps/client/src/widgets/type_widgets/text/mobile_editor_toolbar.tsx
@ -66,11 +66,22 @@ export default function MobileEditorToolbar({ inPopupEditor }: MobileEditorToolb
 }

 function usePositioningOniOS(enabled: boolean, wrapperRef: MutableRef<HTMLDivElement | null>) {
+    // Capture the baseline offset (Safari nav bar height) before the keyboard opens.
+    const baselineOffset = useRef(window.innerHeight - (window.visualViewport?.height ?? window.innerHeight));
+
    const adjustPosition = useCallback(() => {
        if (!wrapperRef.current) return;
-        const bottom = window.innerHeight - (window.visualViewport?.height || 0);
-        wrapperRef.current.style.bottom = `${bottom}px`;
-    }, []);
+        const viewport = window.visualViewport;
+        if (!viewport) return;
+        // Subtract the baseline so only the keyboard's contribution remains.
+        const bottom = window.innerHeight - viewport.height - viewport.offsetTop;
+        if (bottom - baselineOffset.current <= 0) {
+            // Keyboard is hidden — clear the inline style so CSS controls positioning.
+            wrapperRef.current.style.removeProperty("bottom");
+        } else {
+            wrapperRef.current.style.bottom = `${bottom}px`;
+        }
+    }, [ wrapperRef ]);

    useEffect(() => {
        if (!isIOS() || !enabled) return;
@ -82,7 +93,7 @@ function usePositioningOniOS(enabled: boolean, wrapperRef: MutableRef<HTMLDivEle
            window.visualViewport?.removeEventListener("resize", adjustPosition);
            window.removeEventListener("scroll", adjustPosition);
        };
-    }, [ enabled ]);
+    }, [ enabled, adjustPosition ]);
 }

 /**
--- a/apps/desktop/electron-forge/trilium-no-cert-check.sh
+++ b/apps/desktop/electron-forge/trilium-no-cert-check.sh
@ -3,5 +3,5 @@
 DIR=`dirname "$0"`
 export NODE_TLS_REJECT_UNAUTHORIZED=0

-"$DIR/trilium"
+exec "$DIR/trilium"

--- a/apps/desktop/electron-forge/trilium-portable.sh
+++ b/apps/desktop/electron-forge/trilium-portable.sh
@ -3,5 +3,5 @@
 DIR=`dirname "$0"`
 export TRILIUM_DATA_DIR="$DIR/trilium-data"

-"$DIR/trilium"
+exec "$DIR/trilium"

--- a/apps/desktop/electron-forge/trilium-safe-mode.sh
+++ b/apps/desktop/electron-forge/trilium-safe-mode.sh
@ -3,5 +3,5 @@
 DIR=`dirname "$0"`
 export TRILIUM_SAFE_MODE=1

-"$DIR/trilium" --disable-gpu
+exec "$DIR/trilium" --disable-gpu

--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@ -35,7 +35,7 @@
    "@triliumnext/commons": "workspace:*",
    "@triliumnext/server": "workspace:*",
    "copy-webpack-plugin": "13.0.1",
-    "electron": "40.6.0",
+    "electron": "40.6.1",
    "@electron-forge/cli": "7.11.1",
    "@electron-forge/maker-deb": "7.11.1",
    "@electron-forge/maker-dmg": "7.11.1",
--- a/apps/edit-docs/package.json
+++ b/apps/edit-docs/package.json
@ -12,7 +12,7 @@
    "@triliumnext/desktop": "workspace:*",
    "@types/fs-extra": "11.0.4",
    "copy-webpack-plugin": "13.0.1",
-    "electron": "40.6.0",
+    "electron": "40.6.1",
    "fs-extra": "11.3.3"
  },
  "scripts": {
--- a/apps/server/Dockerfile
+++ b/apps/server/Dockerfile
@ -1,4 +1,4 @@
-FROM node:24.13.1-bullseye-slim AS builder
+FROM node:24.14.0-bullseye-slim AS builder
 RUN corepack enable

 # Install native dependencies since we might be building cross-platform.
@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
 # We have to use --no-frozen-lockfile due to CKEditor patches
 RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild

-FROM node:24.13.1-bullseye-slim
+FROM node:24.14.0-bullseye-slim
 # Install only runtime dependencies
 RUN apt-get update && \
    apt-get install -y --no-install-recommends \
--- a/apps/server/Dockerfile.alpine
+++ b/apps/server/Dockerfile.alpine
@ -1,4 +1,4 @@
-FROM node:24.13.1-alpine AS builder
+FROM node:24.14.0-alpine AS builder
 RUN corepack enable

 # Install native dependencies since we might be building cross-platform.
@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
 # We have to use --no-frozen-lockfile due to CKEditor patches
 RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild

-FROM node:24.13.1-alpine
+FROM node:24.14.0-alpine
 # Install runtime dependencies
 RUN apk add --no-cache su-exec shadow

--- a/apps/server/Dockerfile.alpine.rootless
+++ b/apps/server/Dockerfile.alpine.rootless
@ -1,4 +1,4 @@
-FROM node:24.13.1-alpine AS builder
+FROM node:24.14.0-alpine AS builder
 RUN corepack enable

 # Install native dependencies since we might be building cross-platform.
@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
 # We have to use --no-frozen-lockfile due to CKEditor patches
 RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild

-FROM node:24.13.1-alpine
+FROM node:24.14.0-alpine
 # Create a non-root user with configurable UID/GID
 ARG USER=trilium
 ARG UID=1001
--- a/apps/server/Dockerfile.rootless
+++ b/apps/server/Dockerfile.rootless
@ -1,4 +1,4 @@
-FROM node:24.13.1-bullseye-slim AS builder
+FROM node:24.14.0-bullseye-slim AS builder
 RUN corepack enable

 # Install native dependencies since we might be building cross-platform.
@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
 # We have to use --no-frozen-lockfile due to CKEditor patches
 RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild

-FROM node:24.13.1-bullseye-slim
+FROM node:24.14.0-bullseye-slim
 # Create a non-root user with configurable UID/GID
 ARG USER=trilium
 ARG UID=1001
--- a/apps/server/package.json
+++ b/apps/server/package.json
@ -62,7 +62,7 @@
    "@types/serve-favicon": "2.5.7",
    "@types/serve-static": "2.2.0",
    "@types/stream-throttle": "0.1.4",
-    "@types/supertest": "6.0.3",
+    "@types/supertest": "7.2.0",
    "@types/tmp": "0.2.6",
    "@types/turndown": "5.0.6",
    "@types/ws": "8.18.1",
@ -82,7 +82,7 @@
    "debounce": "3.0.0",
    "debug": "4.4.3",
    "ejs": "4.0.1",
-    "electron": "40.6.0",
+    "electron": "40.6.1",
    "electron-debug": "4.1.0",
    "electron-window-state": "5.0.3",
    "escape-html": "1.0.3",
--- a/apps/server/scripts/build-server.sh
+++ b/apps/server/scripts/build-server.sh
@ -43,7 +43,7 @@ rm -rf $BUILD_DIR/node/lib/node_modules/{npm,corepack} \
    $BUILD_DIR/node_modules/electron* \
    $BUILD_DIR/electron*.{js,map}

-printf "#!/bin/sh\n./node/bin/node main.cjs\n" > $BUILD_DIR/trilium.sh
+printf "#!/bin/sh\nexec ./node/bin/node main.cjs\n" > $BUILD_DIR/trilium.sh
 chmod 755 $BUILD_DIR/trilium.sh

 VERSION=`jq -r ".version" package.json`
--- a/apps/server/src/app.ts
+++ b/apps/server/src/app.ts
@ -88,7 +88,7 @@ export default async function buildApp() {

    const sessionParser = (await import("./routes/session_parser.js")).default;
    app.use(sessionParser);
-    app.use(favicon(path.join(assetsDir, "icon.ico")));
+    app.use(favicon(path.join(assetsDir, isDev ? "icon-dev.ico" : "icon.ico")));

    if (openID.isOpenIDEnabled())
        app.use(auth(openID.generateOAuthConfig()));
--- a/apps/server/src/services/export/markdown.spec.ts
+++ b/apps/server/src/services/export/markdown.spec.ts
@ -179,10 +179,10 @@ describe("Markdown export", () => {
            > [!IMPORTANT]
            > This is a very important information.
            >${space}
-            > |     |     |
+            > |  |  |
            > | --- | --- |
-            > | 1   | 2   |
-            > | 3   | 4   |
+            > | 1 | 2 |
+            > | 3 | 4 |

            > [!CAUTION]
            > This is a caution.
@ -374,10 +374,10 @@ describe("Markdown export", () => {
            </figure>
        `;
        const expected = trimIndentation`\
-            |     |     |
+            |  |  |
            | --- | --- |
-            | Hi  | there |
-            | Hi  | there |`;
+            | Hi | there |
+            | Hi | there |`;
        expect(markdownExportService.toMarkdown(html)).toBe(expected);
    });

--- a/apps/server/src/services/hidden_subtree.spec.ts
+++ b/apps/server/src/services/hidden_subtree.spec.ts
@ -192,5 +192,16 @@ describe("Hidden Subtree", () => {
            llmNote = becca.getNote(noteId);
            expect(llmNote).toBeFalsy();
        });
+
+        it("fixes attribute of wrong type", () => {
+            const template = becca.getNoteOrThrow("_template_table");
+            cls.init(() => {
+                template.setAttribute("relation", "template", "root");
+                hiddenSubtreeService.checkHiddenSubtree();
+            });
+            const attr = template.getAttributes().find(a => a.name === "template");
+            expect(attr).toBeDefined();
+            expect(attr?.type).toBe("label");
+        });
    });
 });
--- a/apps/server/src/services/hidden_subtree.ts
+++ b/apps/server/src/services/hidden_subtree.ts
@ -467,8 +467,10 @@ function checkHiddenSubtreeRecursively(parentNoteId: string, item: HiddenSubtree
            }

            // Ensure value is consistent.
-            if (attribute.value !== attrDef.value) {
-                note.setAttributeValueById(attribute.attributeId, attrDef.value);
+            if (attribute.value !== attrDef.value || attribute.type !== attrDef.type) {
+                attribute.type = attrDef.type;
+                attribute.value = attrDef.value ?? "";
+                attribute.save();
            }
        }
    }
--- a/apps/web-clipper/package.json
+++ b/apps/web-clipper/package.json
@ -13,10 +13,10 @@
    "postinstall": "wxt prepare"
  },
  "keywords": [],
-  "packageManager": "pnpm@10.30.1",
+  "packageManager": "pnpm@10.30.2",
  "devDependencies": {
-    "@wxt-dev/auto-icons": "1.1.0",
-    "wxt": "0.20.17"
+    "@wxt-dev/auto-icons": "1.1.1",
+    "wxt": "0.20.18"
  },
  "dependencies": {
    "cash-dom": "8.1.5"
--- a/apps/website/package.json
+++ b/apps/website/package.json
@ -18,7 +18,7 @@
 	},
 	"devDependencies": {
 		"@preact/preset-vite": "2.10.3",
-		"eslint": "10.0.1",
+		"eslint": "10.0.2",
 		"eslint-config-preact": "2.0.0",
 		"typescript": "5.9.3",
 		"user-agent-data-types": "0.4.2",
--- a/package.json
+++ b/package.json
@ -50,7 +50,7 @@
    "@triliumnext/server": "workspace:*",
    "@types/express": "5.0.6",
    "@types/js-yaml": "4.0.9",
-    "@types/node": "24.10.13",
+    "@types/node": "24.10.14",
    "@vitest/browser-webdriverio": "4.0.18",
    "@vitest/coverage-v8": "4.0.18",
    "@vitest/ui": "4.0.18",
@ -58,10 +58,10 @@
    "cross-env": "10.1.0",
    "dpdm": "4.0.1",
    "esbuild": "0.27.3",
-    "eslint": "10.0.1",
+    "eslint": "10.0.2",
    "eslint-config-preact": "2.0.0",
    "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-playwright": "2.7.0",
+    "eslint-plugin-playwright": "2.7.1",
    "eslint-plugin-simple-import-sort": "12.1.1",
    "happy-dom": "20.7.0",
    "http-server": "14.1.1",
@ -73,7 +73,7 @@
    "tslib": "2.8.1",
    "tsx": "4.21.0",
    "typescript": "5.9.3",
-    "typescript-eslint": "8.56.0",
+    "typescript-eslint": "8.56.1",
    "upath": "2.0.1",
    "vite": "7.3.1",
    "vite-plugin-dts": "4.5.4",
@ -93,7 +93,7 @@
    "url": "https://github.com/TriliumNext/Trilium/issues"
  },
  "homepage": "https://triliumnotes.org",
-  "packageManager": "pnpm@10.30.1",
+  "packageManager": "pnpm@10.30.2",
  "pnpm": {
    "patchedDependencies": {
      "@ckeditor/ckeditor5-mention": "patches/@ckeditor__ckeditor5-mention.patch",
--- a/packages/ckeditor5-admonition/package.json
+++ b/packages/ckeditor5-admonition/package.json
@ -24,16 +24,16 @@
    "@ckeditor/ckeditor5-dev-build-tools": "54.3.3",
    "@ckeditor/ckeditor5-inspector": ">=4.1.0",
    "@ckeditor/ckeditor5-package-tools": "5.0.1",
-    "@typescript-eslint/eslint-plugin": "8.56.0",
-    "@typescript-eslint/parser": "8.56.0",
+    "@typescript-eslint/eslint-plugin": "8.56.1",
+    "@typescript-eslint/parser": "8.56.1",
    "@vitest/browser": "4.0.18",
    "@vitest/coverage-istanbul": "4.0.18",
    "ckeditor5": "47.4.0",
-    "eslint": "10.0.1",
+    "eslint": "10.0.2",
    "eslint-config-ckeditor5": ">=9.1.0",
    "http-server": "14.1.1",
    "lint-staged": "16.2.7",
-    "stylelint": "17.3.0",
+    "stylelint": "17.4.0",
    "stylelint-config-ckeditor5": ">=9.1.0",
    "ts-node": "10.9.2",
    "typescript": "5.9.3",
--- a/packages/ckeditor5-footnotes/package.json
+++ b/packages/ckeditor5-footnotes/package.json
@ -25,16 +25,16 @@
    "@ckeditor/ckeditor5-dev-build-tools": "54.3.3",
    "@ckeditor/ckeditor5-inspector": ">=4.1.0",
    "@ckeditor/ckeditor5-package-tools": "5.0.1",
-    "@typescript-eslint/eslint-plugin": "8.56.0",
-    "@typescript-eslint/parser": "8.56.0",
+    "@typescript-eslint/eslint-plugin": "8.56.1",
+    "@typescript-eslint/parser": "8.56.1",
    "@vitest/browser": "4.0.18",
    "@vitest/coverage-istanbul": "4.0.18",
    "ckeditor5": "47.4.0",
-    "eslint": "10.0.1",
+    "eslint": "10.0.2",
    "eslint-config-ckeditor5": ">=9.1.0",
    "http-server": "14.1.1",
    "lint-staged": "16.2.7",
-    "stylelint": "17.3.0",
+    "stylelint": "17.4.0",
    "stylelint-config-ckeditor5": ">=9.1.0",
    "ts-node": "10.9.2",
    "typescript": "5.9.3",
--- a/packages/ckeditor5-keyboard-marker/package.json
+++ b/packages/ckeditor5-keyboard-marker/package.json
@ -27,16 +27,16 @@
    "@ckeditor/ckeditor5-dev-build-tools": "54.3.3",
    "@ckeditor/ckeditor5-inspector": ">=4.1.0",
    "@ckeditor/ckeditor5-package-tools": "5.0.1",
-    "@typescript-eslint/eslint-plugin": "8.56.0",
-    "@typescript-eslint/parser": "8.56.0",
+    "@typescript-eslint/eslint-plugin": "8.56.1",
+    "@typescript-eslint/parser": "8.56.1",
    "@vitest/browser": "4.0.18",
    "@vitest/coverage-istanbul": "4.0.18",
    "ckeditor5": "47.4.0",
-    "eslint": "10.0.1",
+    "eslint": "10.0.2",
    "eslint-config-ckeditor5": ">=9.1.0",
    "http-server": "14.1.1",
    "lint-staged": "16.2.7",
-    "stylelint": "17.3.0",
+    "stylelint": "17.4.0",
    "stylelint-config-ckeditor5": ">=9.1.0",
    "ts-node": "10.9.2",
    "typescript": "5.9.3",
--- a/packages/ckeditor5-math/package.json
+++ b/packages/ckeditor5-math/package.json
@ -27,16 +27,16 @@
    "@ckeditor/ckeditor5-dev-build-tools": "54.3.3",
    "@ckeditor/ckeditor5-inspector": ">=4.1.0",
    "@ckeditor/ckeditor5-package-tools": "5.0.1",
-    "@typescript-eslint/eslint-plugin": "8.56.0",
-    "@typescript-eslint/parser": "8.56.0",
+    "@typescript-eslint/eslint-plugin": "8.56.1",
+    "@typescript-eslint/parser": "8.56.1",
    "@vitest/browser": "4.0.18",
    "@vitest/coverage-istanbul": "4.0.18",
    "ckeditor5": "47.4.0",
-    "eslint": "10.0.1",
+    "eslint": "10.0.2",
    "eslint-config-ckeditor5": ">=9.1.0",
    "http-server": "14.1.1",
    "lint-staged": "16.2.7",
-    "stylelint": "17.3.0",
+    "stylelint": "17.4.0",
    "stylelint-config-ckeditor5": ">=9.1.0",
    "ts-node": "10.9.2",
    "typescript": "5.9.3",
--- a/packages/ckeditor5-mermaid/package.json
+++ b/packages/ckeditor5-mermaid/package.json
@ -27,16 +27,16 @@
    "@ckeditor/ckeditor5-dev-build-tools": "54.3.3",
    "@ckeditor/ckeditor5-inspector": ">=4.1.0",
    "@ckeditor/ckeditor5-package-tools": "5.0.1",
-    "@typescript-eslint/eslint-plugin": "8.56.0",
-    "@typescript-eslint/parser": "8.56.0",
+    "@typescript-eslint/eslint-plugin": "8.56.1",
+    "@typescript-eslint/parser": "8.56.1",
    "@vitest/browser": "4.0.18",
    "@vitest/coverage-istanbul": "4.0.18",
    "ckeditor5": "47.4.0",
-    "eslint": "10.0.1",
+    "eslint": "10.0.2",
    "eslint-config-ckeditor5": ">=9.1.0",
    "http-server": "14.1.1",
    "lint-staged": "16.2.7",
-    "stylelint": "17.3.0",
+    "stylelint": "17.4.0",
    "stylelint-config-ckeditor5": ">=9.1.0",
    "ts-node": "10.9.2",
    "typescript": "5.9.3",
--- a/packages/ckeditor5/package.json
+++ b/packages/ckeditor5/package.json
@ -16,7 +16,7 @@
    "ckeditor5-premium-features": "47.4.0"
  },
  "devDependencies": {
-    "@smithy/middleware-retry": "4.4.33",
-    "@types/jquery": "3.5.33"
+    "@smithy/middleware-retry": "4.4.37",
+    "@types/jquery": "4.0.0"
  }
 }
--- a/packages/ckeditor5/src/plugins/indent_block_shortcut.ts
+++ b/packages/ckeditor5/src/plugins/indent_block_shortcut.ts
@ -21,7 +21,6 @@ export default class IndentBlockShortcutPlugin extends Plugin {
                command.execute();
            }
        }, {
-            priority: "highest",
            context: node => isWidget( node ) || node.is( 'editableElement' ),
        });
    }
--- a/packages/codemirror/package.json
+++ b/packages/codemirror/package.json
@ -50,6 +50,6 @@
    "codemirror-lang-elixir": "4.0.0",
    "codemirror-lang-hcl": "0.1.0",
    "codemirror-lang-mermaid": "0.5.0",
-    "eslint-linter-browserify": "10.0.1"
+    "eslint-linter-browserify": "10.0.2"
  }
 }
--- a/packages/pdfjs-viewer/src/custom.css
+++ b/packages/pdfjs-viewer/src/custom.css
@ -1,31 +1,181 @@
-:root {
-    color-scheme: var(--tn-theme-style);
+/* #region General */

-    --body-bg-color: transparent;
-    --toolbar-bg-color: transparent;
+:root {    
    --main-color: var(--tn-main-text-color);
+    --body-bg-color: transparent;
    --toolbar-border-color: var(--tn-main-border-color);
+    --toolbar-icon-bg-color: var(--tn-main-text-color);
+    --toolbar-bg-color: transparent;
    --toolbar-icon-opacity: 1;
+    --toggled-btn-bg-color: var(--tn-hover-item-background-color);
+    --doorhanger-bg-color: var(--tn-menu-background-color);
+    --doorhanger-separator-color: var(--tn-main-border-color);

    --page-margin: 12px auto;
    --spreadHorizontalWrapped-margin-LR: 4px;
+
+    color-scheme: var(--tn-theme-style);
 }

-.pdfViewer {
-    .page,
-    .page > .canvasWrapper,
-    .page > .canvasWrapper > canvas {
-        border-radius: 6px;
-    }
+:root button,
+:root dialog,
+:root #toolbarContainer,
+:root .toolbarButton,
+:root #scaleSelect,
+:root .toolbarButtonWithContainer .editorParamsToolbar .editorParamsLabel,
+:root #toolbarContainer #toolbarViewer input,
+:root #editorUndoBar,
+:root .dialogButton {
+    font-family: "Inter";
+}

-    .page {
-        border: 1px solid var(--tn-main-border-color);
-        box-shadow: 7px 7px 15px #00000010;
+#secondaryToolbar,
+#documentPropertiesDialog,
+#findbar.doorHanger,
+.doorHangerRight,
+#printServiceDialog {
+    border: 1px solid var(--tn-dropdown-border-color);
+    border-radius: var(--tn-dropdown-border-radius);
+    background-color: var(--tn-menu-background-color);
+    padding: var(--tn-menu-padding-size);
+    box-shadow: 0px 10px 20px rgba(0, 0, 0, var(--tn-dropdown-shadow-opacity));
+    backdrop-filter: var(--tn-dropdown-backdrop-filter);
+}
+
+.doorHangerRight,
+.doorHangerLeft,
+.doorHanger {
+    &::after, &::before {
+        display: none;
    }
 }

+:root .toggle-button {
+    --toggle-border-color: transparent;
+    --toggle-background-color: var(--tn-input-background-color);
+    --toggle-background-color-hover: var(--toggle-background-color);
+    --toggle-dot-background-color: var(--tn-input-text-color);
+    --toggle-background-color-pressed: var(--tn-input-text-color);
+    --toggle-background-color-pressed-hover: var(--toggle-background-color-pressed);
+    cursor: pointer;
+}
+
+:root .colorPicker {
+    --hover-outline-color: var(--tn-input-focus-outline-color);
+    --selected-outline-color: var(--tn-main-text-color);
+}
+
+/* #endregion */
+
 /* #region Toolbar */

+.toolbarButton {
+    &:not(.labeled):active::before {
+        transform: scale(.85) !important;
+    }
+
+    &:hover {
+        background: var(--tn-hover-item-background-color);
+        border-radius: 6px;
+        color: var(--tn-hover-item-text-color);
+    }
+
+    &.toggled::before {
+        color: var(--tn-menu-item-icon-color);
+    }
+}
+
+#findbar {
+}
+
+#scaleSelectContainer {
+    --dropdown-btn-bg-color: transparent;
+    --button-hover-color: var(--tn-hover-item-background-color);
+    border-radius: 6px;
+
+    select:focus {
+        background: var(--tn-main-background-color);
+    }
+}
+
+/* Toolbar editor dropdowns */
+:root .editorParamsToolbar:not(.menu),
+:root #highlightParamsToolbarContainer {
+    padding: 10px 16px;
+}
+
+/* Toolbar dropdowns */
+:root .editorParamsToolbar {
+    .menu {
+        padding: 8px;
+    }
+
+    .editorParamsToolbarContainer {
+        padding: 0;
+    }
+}
+
+/* Overflow menu */
+:root #secondaryToolbar {
+    --toolbar-icon-bg-color: var(--tn-menu-item-icon-color);
+    --toolbar-icon-hover-bg-color: var(--tn-menu-item-icon-color);
+    --toggled-btn-bg-color: transparent;
+    --toggled-btn-color: currentColor;
+    --doorhanger-icon-opacity: 1;
+    padding: var(--tn-menu-padding-size);
+    
+    .toolbarButton.labeled {
+        color: var(--tn-menu-text-color);
+
+        font-size: 13px;
+    }
+}
+
+/* Horizontal menu dividers */
+:root #highlightParamsToolbarContainer #editorHighlightVisibility .divider,
+:root .horizontalToolbarSeparator {
+    position: relative;
+    overflow: visible;
+    background: unset;
+    border: none;
+
+    &:before {
+        content: "";
+        position: absolute;
+        left: 0;
+        right: 0;
+        border-top: 1px solid var(--tn-main-border-color);
+    }
+}
+
+/* Radio menu items */
+#cursorToolButtons .toolbarButton,
+#scrollModeButtons .toolbarButton,
+#spreadModeButtons .toolbarButton {
+    --toggled-hover-active-btn-color: var(--tn-hover-item-background-color);
+    position: relative;
+
+    &::after {
+        display: block;
+        content: "";
+        position: absolute;
+        right: 0;
+        width: 2em;
+        height: 100%;
+        /* https://pictogrammers.com/library/mdi/icon/radiobox-blank/ */
+        mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3e%3ctitle%3eradiobox-blank%3c/title%3e%3cpath d='M12%2c20A8%2c8 0 0%2c1 4%2c12A8%2c8 0 0%2c1 12%2c4A8%2c8 0 0%2c1 20%2c12A8%2c8 0 0%2c1 12%2c20M12%2c2A10%2c10 0 0%2c0 2%2c12A10%2c10 0 0%2c0 12%2c22A10%2c10 0 0%2c0 22%2c12A10%2c10 0 0%2c0 12%2c2Z' /%3e%3c/svg%3e");
+        mask-size: 16px;
+        mask-repeat: no-repeat;
+        mask-position: center center;
+        background-color: var(--tn-main-text-color);
+    }
+
+    &.toggled::after {
+        /* https://pictogrammers.com/library/mdi/icon/radiobox-marked/ */
+        mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3e%3ctitle%3eradiobox-marked%3c/title%3e%3cpath d='M12%2c20A8%2c8 0 0%2c1 4%2c12A8%2c8 0 0%2c1 12%2c4A8%2c8 0 0%2c1 20%2c12A8%2c8 0 0%2c1 12%2c20M12%2c2A10%2c10 0 0%2c0 2%2c12A10%2c10 0 0%2c0 12%2c22A10%2c10 0 0%2c0 22%2c12A10%2c10 0 0%2c0 12%2c2M12%2c7A5%2c5 0 0%2c0 7%2c12A5%2c5 0 0%2c0 12%2c17A5%2c5 0 0%2c0 17%2c12A5%2c5 0 0%2c0 12%2c7Z' /%3e%3c/svg%3e");
+    }
+}
+
 /* Permanently removed buttons */
 #viewsManagerToggleButton,
 #downloadButton,
@ -43,10 +193,51 @@

 /* #region Properties Dialog */

-/* Hide irrelevant properties */
-#documentPropertiesDialog > .row:has(#fileNameField),
-#documentPropertiesDialog > .row:has(#linearizedField) {
-    display: none;
+#documentPropertiesDialog {
+    --separator-color: transparent;
+    
+    user-select: none;
+    padding: 1em;
+
+    .row {
+        line-height: 1.5;
+
+        > span {
+            font-weight: bold;
+            opacity: .5;
+        }
+
+        > p {
+            user-select: all;
+        }
+    }
+
+    /* Hide irrelevant properties */
+    > .row:has(#fileNameField),
+    > .row:has(#linearizedField) {
+        display: none;
+    }
 }

 /* #endregion */
+
+/* #region Viewer Area */
+
+.pdfViewer {
+    .page,
+    .page > .canvasWrapper,
+    .page > .canvasWrapper > canvas {
+        border-radius: 6px;
+    }
+
+    .page {
+        border: 1px solid var(--tn-main-border-color);
+        box-shadow: 7px 7px 15px #00000010;
+    }
+}
+
+#viewsManager {
+    display: none;
+}
+
+/* #endregion */
--- a/packages/share-theme/package.json
+++ b/packages/share-theme/package.json
@ -25,17 +25,17 @@
  "license": "Apache-2.0",
  "dependencies": {
    "fuse.js": "7.1.0",
-    "katex": "0.16.28",
+    "katex": "0.16.33",
    "mermaid": "11.12.3"
  },
  "devDependencies": {
    "@digitak/esrun": "3.2.26",
    "@triliumnext/ckeditor5": "workspace:*",
-    "@typescript-eslint/eslint-plugin": "8.56.0",
-    "@typescript-eslint/parser": "8.56.0",
+    "@typescript-eslint/eslint-plugin": "8.56.1",
+    "@typescript-eslint/parser": "8.56.1",
    "dotenv": "17.3.1",
    "esbuild": "0.27.3",
-    "eslint": "10.0.1",
+    "eslint": "10.0.2",
    "highlight.js": "11.11.1",
    "typescript": "5.9.3"
  }
--- a/packages/turndown-plugin-gfm/src/lib/tables.js
+++ b/packages/turndown-plugin-gfm/src/lib/tables.js
@ -96,7 +96,8 @@ rules.table = {
      var columnCount = tableColCount(node);
      var emptyHeader = ''
      if (columnCount && !secondLineIsDivider) {
-        emptyHeader = '|' + '     |'.repeat(columnCount) + '\n' + '|'
+        // MD060 compact style: 2 spaces between pipes for empty cells
+        emptyHeader = '|' + '  |'.repeat(columnCount) + '\n' + '|'
        for (var columnIndex = 0; columnIndex < columnCount; ++columnIndex) {
          emptyHeader += ' ' + getBorder(getColumnAlignment(node, columnIndex)) + ' |';
        }
@ -157,13 +158,15 @@ function isFirstTbody (element) {
  )
 }

+// Format table cells following MD060 compact style:
+// Each cell has 1 space padding on left and right (prefix + content + ' |').
+// Empty cells result in 2 spaces between pipes (1 left + 1 right padding).
 function cell (content, node = null, index = null) {
  if (index === null) index = indexOf.call(node.parentNode.childNodes, node)
  var prefix = ' '
  if (index === 0) prefix = '| '
  let filteredContent = content.trim().replace(/\n\r/g, '<br>').replace(/\n/g, "<br>");
  filteredContent = filteredContent.replace(/\|+/g, '\\|')
-  while (filteredContent.length < 3) filteredContent += ' ';
  if (node) filteredContent = handleColSpan(filteredContent, node, ' ');
  return prefix + filteredContent + ' |'
 }
@ -259,7 +262,7 @@ function nodeParentTable(node) {
 function handleColSpan(content, node, emptyChar) {
  const colspan = node.getAttribute('colspan') || 1;
  for (let i = 1; i < colspan; i++) {
-    content += ' | ' + emptyChar.repeat(3);
+    content += ' |' + emptyChar;
  }
  return content
 }
--- a/packages/turndown-plugin-gfm/test/index.html
+++ b/packages/turndown-plugin-gfm/test/index.html
@ -141,11 +141,11 @@
 </div>
 <pre class="expected">| Column 1 | Column 2 | Column 3 | Column 4 |
 | --- | --- | --- | --- |
-|     | Row 1, Column 2 | Row 1, Column 3 | Row 1, Column 4 |
-| Row 2, Column 1 |     | Row 2, Column 3 | Row 2, Column 4 |
-| Row 3, Column 1 | Row 3, Column 2 |     | Row 3, Column 4 |
-| Row 4, Column 1 | Row 4, Column 2 | Row 4, Column 3 |     |
-|     |     |     | Row 5, Column 4 |</pre>
+|  | Row 1, Column 2 | Row 1, Column 3 | Row 1, Column 4 |
+| Row 2, Column 1 |  | Row 2, Column 3 | Row 2, Column 4 |
+| Row 3, Column 1 | Row 3, Column 2 |  | Row 3, Column 4 |
+| Row 4, Column 1 | Row 4, Column 2 | Row 4, Column 3 |  |
+|  |  |  | Row 5, Column 4 |</pre>
 </div>

 <div class="case" data-name="empty rows">
@ -174,7 +174,7 @@
 <pre class="expected">| Heading 1 | Heading 2 |
 | --- | --- |
 | Row 1 | Row 1 |
-|     |     |
+|  |  |
 | Row 3 | Row 3 |</pre>
 </div>

@ -259,7 +259,7 @@
      <tbody><tr><th>Heading</th></tr></tbody>
    </table>
  </div>
-  <pre class="expected">|     |
+  <pre class="expected">|  |
 | --- |
 | Heading |
 | --- |</pre>
@ -272,7 +272,7 @@
      <tr><td>Row 2 Cell 1</td><td>Row 2 Cell 2</td></tr>
    </table>
  </div>
-  <pre class="expected">|     |     |
+  <pre class="expected">|  |  |
 | --- | --- |
 | Row 1 Cell 1 | Row 1 Cell 2 |
 | Row 2 Cell 1 | Row 2 Cell 2 |</pre>
@ -291,7 +291,7 @@
      </tr>
    </table>
  </div>
-  <pre class="expected">|     |     |
+  <pre class="expected">|  |  |
 | --- | --- |
 | Heading | Not a heading |
 | Heading | Not a heading |</pre>
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
 @ -1 +1 @@
 .13.1
 .14.0