Merge remote-tracking branch 'origin/main' into feat/llm-tool-improvement

2026-05-06 07:07:04 +02:00 · 2025-08-08 21:35:13 -07:00
parent 4c01d7d8f1 eeeecb3988
commit 89fcfabd3c
550 changed files with 123960 additions and 22234 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -2,3 +2,5 @@

 github: [eliandoran]
 custom: ["https://paypal.me/eliandoran"]
+liberapay: ElianDoran
+buy_me_a_coffee: eliandoran
--- a/.github/instructions/nx.instructions.md
+++ b/.github/instructions/nx.instructions.md
@@ -0,0 +1,40 @@
+---
+applyTo: '**'
+---
+
+// This file is automatically generated by Nx Console
+
+You are in an nx workspace using Nx 21.3.9 and pnpm as the package manager.
+
+You have access to the Nx MCP server and the tools it provides. Use them. Follow these guidelines in order to best help the user:
+
+# General Guidelines
+- When answering questions, use the nx_workspace tool first to gain an understanding of the workspace architecture
+- For questions around nx configuration, best practices or if you're unsure, use the nx_docs tool to get relevant, up-to-date docs!! Always use this instead of assuming things about nx configuration
+- If the user needs help with an Nx configuration or project graph error, use the 'nx_workspace' tool to get any errors
+- To help answer questions about the workspace structure or simply help with demonstrating how tasks depend on each other, use the 'nx_visualize_graph' tool
+
+# Generation Guidelines
+If the user wants to generate something, use the following flow:
+
+- learn about the nx workspace and any specifics the user needs by using the 'nx_workspace' tool and the 'nx_project_details' tool if applicable
+- get the available generators using the 'nx_generators' tool
+- decide which generator to use. If no generators seem relevant, check the 'nx_available_plugins' tool to see if the user could install a plugin to help them
+- get generator details using the 'nx_generator_schema' tool
+- you may use the 'nx_docs' tool to learn more about a specific generator or technology if you're unsure
+- decide which options to provide in order to best complete the user's request. Don't make any assumptions and keep the options minimalistic
+- open the generator UI using the 'nx_open_generate_ui' tool
+- wait for the user to finish the generator
+- read the generator log file using the 'nx_read_generator_log' tool
+- use the information provided in the log file to answer the user's question or continue with what they were doing
+
+# Running Tasks Guidelines
+If the user wants help with tasks or commands (which include keywords like "test", "build", "lint", or other similar actions), use the following flow:
+- Use the 'nx_current_running_tasks_details' tool to get the list of tasks (this can include tasks that were completed, stopped or failed).
+- If there are any tasks, ask the user if they would like help with a specific task then use the 'nx_current_running_task_output' tool to get the terminal output for that task/command
+- Use the terminal output from 'nx_current_running_task_output' to see what's wrong and help the user fix their problem. Use the appropriate tools if necessary
+- If the user would like to rerun the task or command, always use `nx run <taskId>` to rerun in the terminal. This will ensure that the task will run in the nx context and will be run the same way it originally executed
+- If the task was marked as "continuous" do not offer to rerun the task. This task is already running and the user can see the output in the terminal. You can use 'nx_current_running_task_output' to get the output of the task to verify the output. 
+
+
+
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -0,0 +1,17 @@
+name: Checks
+on:
+  push:
+  pull_request_target:
+    types: [synchronize]
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Check if PRs have conflicts
+        uses: eps1lon/actions-label-merge-conflict@v3
+        with:
+          dirtyLabel: "merge-conflicts"
+          repoToken: "${{ secrets.MERGE_CONFLICT_LABEL_PAT }}"
--- a/.github/workflows/main-docker.yml
+++ b/.github/workflows/main-docker.yml
@@ -223,7 +223,7 @@ jobs:
      - build
    steps:
      - name: Download digests
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
        with:
          path: /tmp/digests
          pattern: digests-*
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -107,7 +107,7 @@ jobs:
            docs/Release Notes

      - name: Download all artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
        with:
          merge-multiple: true
          pattern: release-*
--- a/.github/workflows/unblock_signing.yml
+++ b/.github/workflows/unblock_signing.yml
@@ -0,0 +1,11 @@
+name: Unblock signing
+on:
+  workflow_dispatch:
+
+jobs:
+  unblock-win-signing:
+    runs-on: win-signing
+    steps:
+      - run: |
+          cat ${{ vars.WINDOWS_SIGN_ERROR_LOG }}
+          rm ${{ vars.WINDOWS_SIGN_ERROR_LOG }}
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,2 @@
-Adam Zivner <adam.zivner@gmail.com>
-Adam Zivner <zadam.apps@gmail.com>
+zadam <adam.zivner@gmail.com>
+zadam <zadam.apps@gmail.com>
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22.17.0
+22.18.0
--- a/.vscode/mcp.json
+++ b/.vscode/mcp.json
@@ -0,0 +1,8 @@
+{
+  "servers": {
+    "nx-mcp": {
+      "type": "http",
+      "url": "http://localhost:9461/mcp"
+    }
+  }
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -28,5 +28,13 @@
    "typescript.validate.enable": true,
    "typescript.tsserver.experimental.enableProjectDiagnostics": true,
    "typescript.tsdk": "node_modules/typescript/lib",
-    "typescript.enablePromptUseWorkspaceTsdk": true
+    "typescript.enablePromptUseWorkspaceTsdk": true,
+    "search.exclude": {
+        "**/node_modules": true,
+        "docs/**/*.html": true,
+        "docs/**/*.png": true,
+        "apps/server/src/assets/doc_notes/**": true,
+        "apps/edit-docs/demo/**": true
+    },
+    "nxConsole.generateAiAgentRules": true
 }
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -0,0 +1,161 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Overview
+
+Trilium Notes is a hierarchical note-taking application with advanced features like synchronization, scripting, and rich text editing. It's built as a TypeScript monorepo using NX, with multiple applications and shared packages.
+
+## Development Commands
+
+### Setup
+- `pnpm install` - Install all dependencies
+- `corepack enable` - Enable pnpm if not available
+
+### Running Applications
+- `pnpm run server:start` - Start development server (http://localhost:8080)
+- `pnpm nx run server:serve` - Alternative server start command
+- `pnpm nx run desktop:serve` - Run desktop Electron app
+- `pnpm run server:start-prod` - Run server in production mode
+
+### Building
+- `pnpm nx build <project>` - Build specific project (server, client, desktop, etc.)
+- `pnpm run client:build` - Build client application
+- `pnpm run server:build` - Build server application
+- `pnpm run electron:build` - Build desktop application
+
+### Testing
+- `pnpm test:all` - Run all tests (parallel + sequential)
+- `pnpm test:parallel` - Run tests that can run in parallel
+- `pnpm test:sequential` - Run tests that must run sequentially (server, ckeditor5-mermaid, ckeditor5-math)
+- `pnpm nx test <project>` - Run tests for specific project
+- `pnpm coverage` - Generate coverage reports
+
+### Linting & Type Checking
+- `pnpm nx run <project>:lint` - Lint specific project
+- `pnpm nx run <project>:typecheck` - Type check specific project
+
+## Architecture Overview
+
+### Monorepo Structure
+- **apps/**: Runnable applications
+  - `client/` - Frontend application (shared by server and desktop)
+  - `server/` - Node.js server with web interface
+  - `desktop/` - Electron desktop application
+  - `web-clipper/` - Browser extension for saving web content
+  - Additional tools: `db-compare`, `dump-db`, `edit-docs`
+
+- **packages/**: Shared libraries
+  - `commons/` - Shared interfaces and utilities
+  - `ckeditor5/` - Custom rich text editor with Trilium-specific plugins
+  - `codemirror/` - Code editor customizations
+  - `highlightjs/` - Syntax highlighting
+  - Custom CKEditor plugins: `ckeditor5-admonition`, `ckeditor5-footnotes`, `ckeditor5-math`, `ckeditor5-mermaid`
+
+### Core Architecture Patterns
+
+#### Three-Layer Cache System
+- **Becca** (Backend Cache): Server-side entity cache (`apps/server/src/becca/`)
+- **Froca** (Frontend Cache): Client-side mirror of backend data (`apps/client/src/services/froca.ts`)
+- **Shaca** (Share Cache): Optimized cache for shared/published notes (`apps/server/src/share/`)
+
+#### Entity System
+Core entities are defined in `apps/server/src/becca/entities/`:
+- `BNote` - Notes with content and metadata
+- `BBranch` - Hierarchical relationships between notes (allows multiple parents)
+- `BAttribute` - Key-value metadata attached to notes
+- `BRevision` - Note version history
+- `BOption` - Application configuration
+
+#### Widget-Based UI
+Frontend uses a widget system (`apps/client/src/widgets/`):
+- `BasicWidget` - Base class for all UI components
+- `NoteContextAwareWidget` - Widgets that respond to note changes
+- `RightPanelWidget` - Widgets displayed in the right panel
+- Type-specific widgets in `type_widgets/` directory
+
+#### API Architecture
+- **Internal API**: REST endpoints in `apps/server/src/routes/api/`
+- **ETAPI**: External API for third-party integrations (`apps/server/src/etapi/`)
+- **WebSocket**: Real-time synchronization (`apps/server/src/services/ws.ts`)
+
+### Key Files for Understanding Architecture
+
+1. **Application Entry Points**:
+   - `apps/server/src/main.ts` - Server startup
+   - `apps/client/src/desktop.ts` - Client initialization
+
+2. **Core Services**:
+   - `apps/server/src/becca/becca.ts` - Backend data management
+   - `apps/client/src/services/froca.ts` - Frontend data synchronization
+   - `apps/server/src/services/backend_script_api.ts` - Scripting API
+
+3. **Database Schema**:
+   - `apps/server/src/assets/db/schema.sql` - Core database structure
+
+4. **Configuration**:
+   - `nx.json` - NX workspace configuration
+   - `package.json` - Project dependencies and scripts
+
+## Note Types and Features
+
+Trilium supports multiple note types, each with specialized widgets:
+- **Text**: Rich text with CKEditor5 (markdown import/export)
+- **Code**: Syntax-highlighted code editing with CodeMirror
+- **File**: Binary file attachments
+- **Image**: Image display with editing capabilities
+- **Canvas**: Drawing/diagramming with Excalidraw
+- **Mermaid**: Diagram generation
+- **Relation Map**: Visual note relationship mapping
+- **Web View**: Embedded web pages
+- **Doc/Book**: Hierarchical documentation structure
+
+## Development Guidelines
+
+### Testing Strategy
+- Server tests run sequentially due to shared database
+- Client tests can run in parallel
+- E2E tests use Playwright for both server and desktop apps
+- Build validation tests check artifact integrity
+
+### Scripting System
+Trilium provides powerful user scripting capabilities:
+- Frontend scripts run in browser context
+- Backend scripts run in Node.js context with full API access
+- Script API documentation available in `docs/Script API/`
+
+### Internationalization
+- Translation files in `apps/client/src/translations/`
+- Supported languages: English, German, Spanish, French, Romanian, Chinese
+
+### Security Considerations
+- Per-note encryption with granular protected sessions
+- CSRF protection for API endpoints
+- OpenID and TOTP authentication support
+- Sanitization of user-generated content
+
+## Common Development Tasks
+
+### Adding New Note Types
+1. Create widget in `apps/client/src/widgets/type_widgets/`
+2. Register in `apps/client/src/services/note_types.ts`
+3. Add backend handling in `apps/server/src/services/notes.ts`
+
+### Extending Search
+- Search expressions handled in `apps/server/src/services/search/`
+- Add new search operators in search context files
+
+### Custom CKEditor Plugins
+- Create new package in `packages/` following existing plugin structure
+- Register in `packages/ckeditor5/src/plugins.ts`
+
+### Database Migrations
+- Add migration scripts in `apps/server/src/migrations/`
+- Update schema in `apps/server/src/assets/db/schema.sql`
+
+## Build System Notes
+- Uses NX for monorepo management with build caching
+- Vite for fast development builds
+- ESBuild for production optimization
+- pnpm workspaces for dependency management
+- Docker support with multi-stage builds
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # Trilium Notes

-![GitHub Sponsors](https://img.shields.io/github/sponsors/eliandoran?style=flat-square)
-![Docker Pulls](https://img.shields.io/docker/pulls/triliumnext/notes?style=flat-square)
-![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/triliumnext/notes/total?style=flat-square)
-[![RelativeCI](https://badges.relative-ci.com/badges/Di5q7dz9daNDZ9UXi0Bp?branch=develop&style=flat-square)](https://app.relative-ci.com/projects/Di5q7dz9daNDZ9UXi0Bp)
+![GitHub Sponsors](https://img.shields.io/github/sponsors/eliandoran) ![LiberaPay patrons](https://img.shields.io/liberapay/patrons/ElianDoran)  
+![Docker Pulls](https://img.shields.io/docker/pulls/triliumnext/notes)
+![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/triliumnext/notes/total)  
+[![RelativeCI](https://badges.relative-ci.com/badges/Di5q7dz9daNDZ9UXi0Bp?branch=develop)](https://app.relative-ci.com/projects/Di5q7dz9daNDZ9UXi0Bp) [![Translation status](https://hosted.weblate.org/widget/trilium/svg-badge.svg)](https://hosted.weblate.org/engage/trilium/)

 [English](./README.md) | [Chinese](./docs/README-ZH_CN.md) | [Russian](./docs/README.ru.md) | [Japanese](./docs/README.ja.md) | [Italian](./docs/README.it.md) | [Spanish](./docs/README.es.md)

@@ -115,12 +115,20 @@ To install TriliumNext on your own server (including via Docker from [Dockerhub]

 ## 💻 Contribute

+### Translations
+
+If you are a native speaker, help us translate Trilium by heading over to our [Weblate page](https://hosted.weblate.org/engage/trilium/).
+
+Here's the language coverage we have so far:
+
+[![Translation status](https://hosted.weblate.org/widget/trilium/multi-auto.svg)](https://hosted.weblate.org/engage/trilium/)
+
 ### Code

 Download the repository, install dependencies using `pnpm` and then run the server (available at http://localhost:8080):
 ```shell
-git clone https://github.com/TriliumNext/Notes.git
-cd Notes
+git clone https://github.com/TriliumNext/Trilium.git
+cd Trilium
 pnpm install
 pnpm run server:start
 ```
@@ -129,8 +137,8 @@ pnpm run server:start

 Download the repository, install dependencies using `pnpm` and then run the environment required to edit the documentation:
 ```shell
-git clone https://github.com/TriliumNext/Notes.git
-cd Notes
+git clone https://github.com/TriliumNext/Trilium.git
+cd Trilium
 pnpm install
 pnpm nx run edit-docs:edit-docs
 ```
@@ -138,8 +146,8 @@ pnpm nx run edit-docs:edit-docs
 ### Building the Executable
 Download the repository, install dependencies using `pnpm` and then build the desktop app for Windows:
 ```shell
-git clone https://github.com/TriliumNext/Notes.git
-cd Notes
+git clone https://github.com/TriliumNext/Trilium.git
+cd Trilium
 pnpm install
 pnpm nx --project=desktop electron-forge:make -- --arch=x64 --platform=win32
 ```
--- a/_regroup/package.json
+++ b/_regroup/package.json
@@ -35,13 +35,13 @@
    "chore:generate-openapi": "tsx bin/generate-openapi.js"
  },
  "devDependencies": {    
-    "@playwright/test": "1.53.2",
-    "@stylistic/eslint-plugin": "5.1.0",        
+    "@playwright/test": "1.54.2",
+    "@stylistic/eslint-plugin": "5.2.2",        
    "@types/express": "5.0.3",    
-    "@types/node": "22.16.0",    
+    "@types/node": "22.17.0",    
    "@types/yargs": "17.0.33",
    "@vitest/coverage-v8": "3.2.4",
-    "eslint": "9.30.1",
+    "eslint": "9.32.0",
    "eslint-plugin-simple-import-sort": "12.1.1",
    "esm": "3.2.25",
    "jsdoc": "4.0.4",
@@ -49,7 +49,7 @@
    "rcedit": "4.0.1",
    "rimraf": "6.0.1",    
    "tslib": "2.8.1",    
-    "typedoc": "0.28.7",
+    "typedoc": "0.28.9",
    "typedoc-plugin-missing-exports": "4.0.0"
  },
  "optionalDependencies": {
--- a/apps/client/.env
+++ b/apps/client/.env
@@ -1,4 +1,5 @@
 # The development license key for premium CKEditor features.
 # Note: This key must only be used for the Trilium Notes project.
 # Expires on: 2025-09-13
-VITE_CKEDITOR_KEY=eyJhbGciOiJFUzI1NiJ9.eyJleHAiOjE3NTc3MjE1OTksImp0aSI6ImFiN2E0NjZmLWJlZGMtNDNiYy1iMzU4LTk0NGQ0YWJhY2I3ZiIsImRpc3RyaWJ1dGlvbkNoYW5uZWwiOlsic2giLCJkcnVwYWwiXSwid2hpdGVMYWJlbCI6dHJ1ZSwiZmVhdHVyZXMiOlsiRFJVUCIsIkNNVCIsIkRPIiwiRlAiLCJTQyIsIlRPQyIsIlRQTCIsIlBPRSIsIkNDIiwiTUYiLCJTRUUiLCJFQ0giLCJFSVMiXSwidmMiOiI1MzlkOWY5YyJ9.2rvKPql4hmukyXhEtWPZ8MLxKvzPIwzCdykO653g7IxRRZy2QJpeRszElZx9DakKYZKXekVRAwQKgHxwkgbE_w
+VITE_CKEDITOR_KEY=eyJhbGciOiJFUzI1NiJ9.eyJleHAiOjE3NTc3MjE1OTksImp0aSI6ImFiN2E0NjZmLWJlZGMtNDNiYy1iMzU4LTk0NGQ0YWJhY2I3ZiIsImRpc3RyaWJ1dGlvbkNoYW5uZWwiOlsic2giLCJkcnVwYWwiXSwid2hpdGVMYWJlbCI6dHJ1ZSwiZmVhdHVyZXMiOlsiRFJVUCIsIkNNVCIsIkRPIiwiRlAiLCJTQyIsIlRPQyIsIlRQTCIsIlBPRSIsIkNDIiwiTUYiLCJTRUUiLCJFQ0giLCJFSVMiXSwidmMiOiI1MzlkOWY5YyJ9.2rvKPql4hmukyXhEtWPZ8MLxKvzPIwzCdykO653g7IxRRZy2QJpeRszElZx9DakKYZKXekVRAwQKgHxwkgbE_w
+VITE_CKEDITOR_ENABLE_INSPECTOR=false
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@triliumnext/client",
-  "version": "0.96.0",
+  "version": "0.97.2",
  "description": "JQuery-based client for TriliumNext, used for both web and desktop (via Electron)",
  "private": true,
  "license": "AGPL-3.0-only",
@@ -10,7 +10,7 @@
    "url": "https://github.com/TriliumNext/Notes"
  },
  "dependencies": {
-    "@eslint/js": "9.30.1",
+    "@eslint/js": "9.32.0",
    "@excalidraw/excalidraw": "0.18.0",
    "@fullcalendar/core": "6.1.18",
    "@fullcalendar/daygrid": "6.1.18",
@@ -18,8 +18,9 @@
    "@fullcalendar/list": "6.1.18",
    "@fullcalendar/multimonth": "6.1.18",
    "@fullcalendar/timegrid": "6.1.18",
+    "@maplibre/maplibre-gl-leaflet": "0.1.3",
    "@mermaid-js/layout-elk": "0.1.8",
-    "@mind-elixir/node-menu": "1.0.5",
+    "@mind-elixir/node-menu": "5.0.0",
    "@popperjs/core": "2.11.8",
    "@triliumnext/ckeditor5": "workspace:*",
    "@triliumnext/codemirror": "workspace:*",
@@ -35,10 +36,9 @@
    "draggabilly": "3.0.0",
    "force-graph": "1.50.1",
    "globals": "16.3.0",
-    "i18next": "25.3.0",
+    "i18next": "25.3.2",
    "i18next-http-backend": "3.0.2",
    "jquery": "3.7.1",
-    "jquery-hotkeys": "0.2.2",
    "jquery.fancytree": "2.38.5",
    "jsplumb": "2.15.6",
    "katex": "0.16.22",
@@ -46,29 +46,30 @@
    "leaflet": "1.9.4",
    "leaflet-gpx": "2.2.0",
    "mark.js": "8.11.1",
-    "marked": "16.0.0",
-    "mermaid": "11.8.0",
-    "mind-elixir": "4.6.2",
+    "marked": "16.1.2",
+    "mermaid": "11.9.0",
+    "mind-elixir": "5.0.4",
    "normalize.css": "8.0.1",
    "panzoom": "9.4.3",
-    "preact": "10.26.9",
+    "preact": "10.27.0",
    "split.js": "1.6.5",
    "svg-pan-zoom": "3.6.2",
    "tabulator-tables": "6.3.1",
    "vanilla-js-wheel-zoom": "9.0.4"
  },
  "devDependencies": {
-    "@ckeditor/ckeditor5-inspector": "4.1.0",
+    "@ckeditor/ckeditor5-inspector": "5.0.0",
+    "@preact/preset-vite": "2.10.2",
    "@types/bootstrap": "5.2.10",
    "@types/jquery": "3.5.32",
-    "@types/leaflet": "1.9.19",
+    "@types/leaflet": "1.9.20",
    "@types/leaflet-gpx": "1.3.7",
    "@types/mark.js": "8.11.12",
-    "@types/tabulator-tables": "6.2.6",
+    "@types/tabulator-tables": "6.2.9",
    "copy-webpack-plugin": "13.0.0",
    "happy-dom": "18.0.1",
    "script-loader": "0.7.2",
-    "vite-plugin-static-copy": "3.1.0"
+    "vite-plugin-static-copy": "3.1.1"
  },
  "nx": {
    "name": "client",
--- a/apps/client/src/components/app_context.ts
+++ b/apps/client/src/components/app_context.ts
@@ -28,6 +28,8 @@ import TouchBarComponent from "./touch_bar.js";
 import type { CKTextEditor } from "@triliumnext/ckeditor5";
 import type CodeMirror from "@triliumnext/codemirror";
 import { StartupChecks } from "./startup_checks.js";
+import type { CreateNoteOpts } from "../services/note_create.js";
+import { ColumnComponent } from "tabulator-tables";

 interface Layout {
    getRootWidget: (appContext: AppContext) => RootWidget;
@@ -122,6 +124,7 @@ export type CommandMappings = {
    showImportDialog: CommandData & { noteId: string };
    openNewNoteSplit: NoteCommandData;
    openInWindow: NoteCommandData;
+    openInPopup: CommandData & { noteIdOrPath: string; };
    openNoteInNewTab: CommandData;
    openNoteInNewSplit: CommandData;
    openNoteInNewWindow: CommandData;
@@ -130,6 +133,8 @@ export type CommandMappings = {
    hideLeftPane: CommandData;
    showCpuArchWarning: CommandData;
    showLeftPane: CommandData;
+    showAttachments: CommandData;
+    showSearchHistory: CommandData;
    hoistNote: CommandData & { noteId: string };
    leaveProtectedSession: CommandData;
    enterProtectedSession: CommandData;
@@ -140,6 +145,7 @@ export type CommandMappings = {
    };
    openInTab: ContextMenuCommandData;
    openNoteInSplit: ContextMenuCommandData;
+    openNoteInPopup: ContextMenuCommandData;
    toggleNoteHoisting: ContextMenuCommandData;
    insertNoteAfter: ContextMenuCommandData;
    insertChildNote: ContextMenuCommandData;
@@ -169,7 +175,7 @@ export type CommandMappings = {
    deleteNotes: ContextMenuCommandData;
    importIntoNote: ContextMenuCommandData;
    exportNote: ContextMenuCommandData;
-    searchInSubtree: ContextMenuCommandData;
+    searchInSubtree: CommandData & { notePath: string; };
    moveNoteUp: ContextMenuCommandData;
    moveNoteDown: ContextMenuCommandData;
    moveNoteUpInHierarchy: ContextMenuCommandData;
@@ -258,10 +264,76 @@ export type CommandMappings = {
    closeThisNoteSplit: CommandData;
    moveThisNoteSplit: CommandData & { isMovingLeft: boolean };
    jumpToNote: CommandData;
+    commandPalette: CommandData;
+
+    // Keyboard shortcuts
+    backInNoteHistory: CommandData;
+    forwardInNoteHistory: CommandData;
+    forceSaveRevision: CommandData;
+    scrollToActiveNote: CommandData;
+    quickSearch: CommandData;
+    collapseTree: CommandData;
+    createNoteAfter: CommandData;
+    createNoteInto: CommandData;
+    addNoteAboveToSelection: CommandData;
+    addNoteBelowToSelection: CommandData;
+    openNewTab: CommandData;
+    activateNextTab: CommandData;
+    activatePreviousTab: CommandData;
+    openNewWindow: CommandData;
+    toggleTray: CommandData;
+    firstTab: CommandData;
+    secondTab: CommandData;
+    thirdTab: CommandData;
+    fourthTab: CommandData;
+    fifthTab: CommandData;
+    sixthTab: CommandData;
+    seventhTab: CommandData;
+    eigthTab: CommandData;
+    ninthTab: CommandData;
+    lastTab: CommandData;
+    showNoteSource: CommandData;
+    showSQLConsole: CommandData;
+    showBackendLog: CommandData;
+    showCheatsheet: CommandData;
+    showHelp: CommandData;
+    addLinkToText: CommandData;
+    followLinkUnderCursor: CommandData;
+    insertDateTimeToText: CommandData;
+    pasteMarkdownIntoText: CommandData;
+    cutIntoNote: CommandData;
+    addIncludeNoteToText: CommandData;
+    editReadOnlyNote: CommandData;
+    toggleRibbonTabClassicEditor: CommandData;
+    toggleRibbonTabBasicProperties: CommandData;
+    toggleRibbonTabBookProperties: CommandData;
+    toggleRibbonTabFileProperties: CommandData;
+    toggleRibbonTabImageProperties: CommandData;
+    toggleRibbonTabOwnedAttributes: CommandData;
+    toggleRibbonTabInheritedAttributes: CommandData;
+    toggleRibbonTabPromotedAttributes: CommandData;
+    toggleRibbonTabNoteMap: CommandData;
+    toggleRibbonTabNoteInfo: CommandData;
+    toggleRibbonTabNotePaths: CommandData;
+    toggleRibbonTabSimilarNotes: CommandData;
+    toggleRightPane: CommandData;
+    printActiveNote: CommandData;
+    exportAsPdf: CommandData;
+    openNoteExternally: CommandData;
+    renderActiveNote: CommandData;
+    unhoist: CommandData;
+    reloadFrontendApp: CommandData;
+    openDevTools: CommandData;
+    findInText: CommandData;
+    toggleLeftPane: CommandData;
+    toggleFullscreen: CommandData;
+    zoomOut: CommandData;
+    zoomIn: CommandData;
+    zoomReset: CommandData;
+    copyWithoutFormatting: CommandData;

    // Geomap
    deleteFromMap: { noteId: string };
-    openGeoLocation: { noteId: string; event: JQuery.MouseDownEvent };

    toggleZenMode: CommandData;

@@ -275,6 +347,21 @@ export type CommandMappings = {

    geoMapCreateChildNote: CommandData;

+    // Table view
+    addNewRow: CommandData & {
+        customOpts: CreateNoteOpts;
+        parentNotePath?: string;
+    };
+    addNewTableColumn: CommandData & {
+        columnToEdit?: ColumnComponent;
+        referenceColumn?: ColumnComponent;
+        direction?: "before" | "after";
+        type?: "label" | "relation";
+    };
+    deleteTableColumn: CommandData & {
+        columnToDelete?: ColumnComponent;
+    };
+
    buildTouchBar: CommandData & {
        TouchBar: typeof TouchBar;
        buildIcon(name: string): NativeImage;
--- a/apps/client/src/components/entrypoints.ts
+++ b/apps/client/src/components/entrypoints.ts
@@ -30,13 +30,6 @@ interface CreateChildrenResponse {
 export default class Entrypoints extends Component {
    constructor() {
        super();
-
-        if (jQuery.hotkeys) {
-            // hot keys are active also inside inputs and content editables
-            jQuery.hotkeys.options.filterInputAcceptingElements = false;
-            jQuery.hotkeys.options.filterContentEditable = false;
-            jQuery.hotkeys.options.filterTextInputs = false;
-        }
    }

    openDevToolsCommand() {
@@ -113,7 +106,9 @@ export default class Entrypoints extends Component {
            if (win.isFullScreenable()) {
                win.setFullScreen(!win.isFullScreen());
            }
-        } // outside of electron this is handled by the browser
+        } else {
+            document.documentElement.requestFullscreen();
+        }
    }

    reloadFrontendAppCommand() {
--- a/apps/client/src/components/note_context.ts
+++ b/apps/client/src/components/note_context.ts
@@ -325,8 +325,9 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
            return false;
        }

-        // Some book types must always display a note list, even if no children.
-        if (["calendar", "table"].includes(note.getLabelValue("viewType") ?? "")) {
+        // Collections must always display a note list, even if no children.
+        const viewType = note.getLabelValue("viewType") ?? "grid";
+        if (!["list", "grid"].includes(viewType)) {
            return true;
        }

--- a/apps/client/src/desktop.ts
+++ b/apps/client/src/desktop.ts
@@ -13,7 +13,6 @@ import type ElectronRemote from "@electron/remote";
 import type Electron from "electron";
 import "./stylesheets/bootstrap.scss";
 import "boxicons/css/boxicons.min.css";
-import "jquery-hotkeys";
 import "autocomplete.js/index_jquery.js";

 await appContext.earlyInit();
--- a/apps/client/src/entities/fnote.ts
+++ b/apps/client/src/entities/fnote.ts
@@ -27,7 +27,6 @@ const NOTE_TYPE_ICONS = {
    doc: "bx bxs-file-doc",
    contentWidget: "bx bxs-widget",
    mindMap: "bx bx-sitemap",
-    geoMap: "bx bx-map-alt",
    aiChat: "bx bx-bot"
 };

@@ -36,7 +35,7 @@ const NOTE_TYPE_ICONS = {
 * end user. Those types should be used only for checking against, they are
 * not for direct use.
 */
-export type NoteType = "file" | "image" | "search" | "noteMap" | "launcher" | "doc" | "contentWidget" | "text" | "relationMap" | "render" | "canvas" | "mermaid" | "book" | "webView" | "code" | "mindMap" | "geoMap" | "aiChat";
+export type NoteType = "file" | "image" | "search" | "noteMap" | "launcher" | "doc" | "contentWidget" | "text" | "relationMap" | "render" | "canvas" | "mermaid" | "book" | "webView" | "code" | "mindMap" | "aiChat";

 export interface NotePathRecord {
    isArchived: boolean;
@@ -257,6 +256,20 @@ class FNote {
        return this.children;
    }

+    async getSubtreeNoteIds() {
+        let noteIds: (string | string[])[] = [];
+        for (const child of await this.getChildNotes()) {
+            noteIds.push(child.noteId);
+            noteIds.push(await child.getSubtreeNoteIds());
+        }
+        return noteIds.flat();
+    }
+
+    async getSubtreeNotes() {
+        const noteIds = await this.getSubtreeNoteIds();
+        return this.froca.getNotes(noteIds);
+    }
+
    async getChildNotes() {
        return await this.froca.getNotes(this.children);
    }
--- a/apps/client/src/layouts/desktop_layout.ts
+++ b/apps/client/src/layouts/desktop_layout.ts
@@ -46,28 +46,7 @@ import SharedInfoWidget from "../widgets/shared_info.js";
 import FindWidget from "../widgets/find.js";
 import TocWidget from "../widgets/toc.js";
 import HighlightsListWidget from "../widgets/highlights_list.js";
-import BulkActionsDialog from "../widgets/dialogs/bulk_actions.js";
-import AboutDialog from "../widgets/dialogs/about.js";
-import HelpDialog from "../widgets/dialogs/help.js";
-import RecentChangesDialog from "../widgets/dialogs/recent_changes.js";
-import BranchPrefixDialog from "../widgets/dialogs/branch_prefix.js";
-import SortChildNotesDialog from "../widgets/dialogs/sort_child_notes.js";
 import PasswordNoteSetDialog from "../widgets/dialogs/password_not_set.js";
-import IncludeNoteDialog from "../widgets/dialogs/include_note.js";
-import NoteTypeChooserDialog from "../widgets/dialogs/note_type_chooser.js";
-import JumpToNoteDialog from "../widgets/dialogs/jump_to_note.js";
-import AddLinkDialog from "../widgets/dialogs/add_link.js";
-import CloneToDialog from "../widgets/dialogs/clone_to.js";
-import MoveToDialog from "../widgets/dialogs/move_to.js";
-import ImportDialog from "../widgets/dialogs/import.js";
-import ExportDialog from "../widgets/dialogs/export.js";
-import MarkdownImportDialog from "../widgets/dialogs/markdown_import.js";
-import ProtectedSessionPasswordDialog from "../widgets/dialogs/protected_session_password.js";
-import RevisionsDialog from "../widgets/dialogs/revisions.js";
-import DeleteNotesDialog from "../widgets/dialogs/delete_notes.js";
-import InfoDialog from "../widgets/dialogs/info.js";
-import ConfirmDialog from "../widgets/dialogs/confirm.js";
-import PromptDialog from "../widgets/dialogs/prompt.js";
 import FloatingButtons from "../widgets/floating_buttons/floating_buttons.js";
 import RelationMapButtons from "../widgets/floating_buttons/relation_map_buttons.js";
 import SvgExportButton from "../widgets/floating_buttons/svg_export_button.js";
@@ -83,7 +62,7 @@ import CopyImageReferenceButton from "../widgets/floating_buttons/copy_image_ref
 import ScrollPaddingWidget from "../widgets/scroll_padding.js";
 import ClassicEditorToolbar from "../widgets/ribbon_widgets/classic_editor_toolbar.js";
 import options from "../services/options.js";
-import utils, { hasTouchBar } from "../services/utils.js";
+import utils from "../services/utils.js";
 import GeoMapButtons from "../widgets/floating_buttons/geo_map_button.js";
 import ContextualHelpButton from "../widgets/floating_buttons/help_button.js";
 import CloseZenButton from "../widgets/close_zen_button.js";
@@ -229,7 +208,7 @@ export default class DesktopLayout {
                                                                .child(new PromotedAttributesWidget())
                                                                .child(new SqlTableSchemasWidget())
                                                                .child(new NoteDetailWidget())
-                                                                .child(new NoteListWidget())
+                                                                .child(new NoteListWidget(false))
                                                                .child(new SearchResultWidget())
                                                                .child(new SqlResultWidget())
                                                                .child(new ScrollPaddingWidget())
--- a/apps/client/src/layouts/layout_commons.ts
+++ b/apps/client/src/layouts/layout_commons.ts
@@ -22,6 +22,14 @@ import RevisionsDialog from "../widgets/dialogs/revisions.js";
 import DeleteNotesDialog from "../widgets/dialogs/delete_notes.js";
 import InfoDialog from "../widgets/dialogs/info.js";
 import IncorrectCpuArchDialog from "../widgets/dialogs/incorrect_cpu_arch.js";
+import PopupEditorDialog from "../widgets/dialogs/popup_editor.js";
+import FlexContainer from "../widgets/containers/flex_container.js";
+import NoteIconWidget from "../widgets/note_icon.js";
+import NoteTitleWidget from "../widgets/note_title.js";
+import ClassicEditorToolbar from "../widgets/ribbon_widgets/classic_editor_toolbar.js";
+import PromotedAttributesWidget from "../widgets/ribbon_widgets/promoted_attributes.js";
+import NoteDetailWidget from "../widgets/note_detail.js";
+import NoteListWidget from "../widgets/note_list.js";

 export function applyModals(rootContainer: RootContainer) {
    rootContainer
@@ -47,4 +55,15 @@ export function applyModals(rootContainer: RootContainer) {
        .child(new ConfirmDialog())
        .child(new PromptDialog())
        .child(new IncorrectCpuArchDialog())
+        .child(new PopupEditorDialog()
+                .child(new FlexContainer("row")
+                    .class("title-row")
+                    .css("align-items", "center")
+                    .cssBlock(".title-row > * { margin: 5px; }")
+                    .child(new NoteIconWidget())
+                    .child(new NoteTitleWidget()))
+                .child(new ClassicEditorToolbar())
+                .child(new PromotedAttributesWidget())
+                .child(new NoteDetailWidget())
+                .child(new NoteListWidget(true)))
 }
--- a/apps/client/src/layouts/mobile_layout.ts
+++ b/apps/client/src/layouts/mobile_layout.ts
@@ -162,7 +162,7 @@ export default class MobileLayout {
                                    .filling()
                                    .contentSized()
                                    .child(new NoteDetailWidget())
-                                    .child(new NoteListWidget())
+                                    .child(new NoteListWidget(false))
                                    .child(new FilePropertiesWidget().css("font-size", "smaller"))
                            )
                            .child(new MobileEditorToolbar())
--- a/apps/client/src/menus/context_menu.ts
+++ b/apps/client/src/menus/context_menu.ts
@@ -17,11 +17,22 @@ interface MenuSeparatorItem {
    title: "----";
 }

+export interface MenuItemBadge {
+    title: string;
+    className?: string;
+}
+
 export interface MenuCommandItem<T> {
    title: string;
    command?: T;
    type?: string;
+    /**
+     * The icon to display in the menu item.
+     *
+     * If not set, no icon is displayed and the item will appear shifted slightly to the left if there are other items with icons. To avoid this, use `bx bx-empty`.
+     */
    uiIcon?: string;
+    badges?: MenuItemBadge[];
    templateNoteId?: string;
    enabled?: boolean;
    handler?: MenuHandler<T>;
@@ -29,6 +40,7 @@ export interface MenuCommandItem<T> {
    shortcut?: string;
    spellingSuggestion?: string;
    checked?: boolean;
+    columns?: number;
 }

 export type MenuItem<T> = MenuCommandItem<T> | MenuSeparatorItem;
@@ -161,6 +173,18 @@ class ContextMenu {
                    .append(" &nbsp; ") // some space between icon and text
                    .append(item.title);

+                if ("badges" in item && item.badges) {
+                    for (let badge of item.badges) {
+                        const badgeElement = $(`<span class="badge">`).text(badge.title);
+
+                        if (badge.className) {
+                            badgeElement.addClass(badge.className);
+                        }
+
+                        $link.append(badgeElement);
+                    }
+                }
+
                if ("shortcut" in item && item.shortcut) {
                    $link.append($("<kbd>").text(item.shortcut));
                }
@@ -217,6 +241,9 @@ class ContextMenu {
                    $link.addClass("dropdown-toggle");

                    const $subMenu = $("<ul>").addClass("dropdown-menu");
+                    if (!this.isMobile && item.columns) {
+                        $subMenu.css("column-count", item.columns);
+                    }

                    this.addItems($subMenu, item.items);

--- a/apps/client/src/menus/link_context_menu.ts
+++ b/apps/client/src/menus/link_context_menu.ts
@@ -16,7 +16,8 @@ function getItems(): MenuItem<CommandNames>[] {
    return [
        { title: t("link_context_menu.open_note_in_new_tab"), command: "openNoteInNewTab", uiIcon: "bx bx-link-external" },
        { title: t("link_context_menu.open_note_in_new_split"), command: "openNoteInNewSplit", uiIcon: "bx bx-dock-right" },
-        { title: t("link_context_menu.open_note_in_new_window"), command: "openNoteInNewWindow", uiIcon: "bx bx-window-open" }
+        { title: t("link_context_menu.open_note_in_new_window"), command: "openNoteInNewWindow", uiIcon: "bx bx-window-open" },
+        { title: t("link_context_menu.open_note_in_popup"), command: "openNoteInPopup", uiIcon: "bx bx-edit" }
    ];
 }

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

--- a/apps/client/src/menus/tree_context_menu.ts
+++ b/apps/client/src/menus/tree_context_menu.ts
@@ -23,7 +23,7 @@ let lastTargetNode: HTMLElement | null = null;

 // This will include all commands that implement ContextMenuCommandData, but it will not work if it additional options are added via the `|` operator,
 // so they need to be added manually.
-export type TreeCommandNames = FilteredCommandNames<ContextMenuCommandData> | "openBulkActionsDialog";
+export type TreeCommandNames = FilteredCommandNames<ContextMenuCommandData> | "openBulkActionsDialog" | "searchInSubtree";

 export default class TreeContextMenu implements SelectMenuItemEventListener<TreeCommandNames> {
    private treeWidget: NoteTreeWidget;
@@ -70,8 +70,8 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree

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

            isHoisted
                ? null
@@ -92,7 +92,8 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
                command: "insertNoteAfter",
                uiIcon: "bx bx-plus",
                items: insertNoteAfterEnabled ? await noteTypesService.getNoteTypeItems("insertNoteAfter") : null,
-                enabled: insertNoteAfterEnabled && noSelectedNotes && notOptionsOrHelp
+                enabled: insertNoteAfterEnabled && noSelectedNotes && notOptionsOrHelp,
+                columns: 2
            },

            {
@@ -100,7 +101,8 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
                command: "insertChildNote",
                uiIcon: "bx bx-plus",
                items: notSearch ? await noteTypesService.getNoteTypeItems("insertChildNote") : null,
-                enabled: notSearch && noSelectedNotes && notOptionsOrHelp
+                enabled: notSearch && noSelectedNotes && notOptionsOrHelp,
+                columns: 2
            },

            { title: "----" },
@@ -127,12 +129,6 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
                        enabled: isNotRoot && parentNotSearch && noSelectedNotes && notOptionsOrHelp
                    },
                    { title: t("tree-context-menu.convert-to-attachment"), command: "convertNoteToAttachment", uiIcon: "bx bx-paperclip", enabled: isNotRoot && !isHoisted && notOptionsOrHelp },
-                    {
-                        title: `${t("tree-context-menu.duplicate-subtree")} <kbd data-command="duplicateSubtree">`,
-                        command: "duplicateSubtree",
-                        uiIcon: "bx bx-outline",
-                        enabled: parentNotSearch && isNotRoot && !isHoisted && notOptionsOrHelp
-                    },

                    { title: "----" },

@@ -186,6 +182,13 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree

            { title: `${t("tree-context-menu.clone-to")} <kbd data-command="cloneNotesTo"></kbd>`, command: "cloneNotesTo", uiIcon: "bx bx-duplicate", enabled: isNotRoot && !isHoisted },

+            {
+                title: `${t("tree-context-menu.duplicate")} <kbd data-command="duplicateSubtree">`,
+                command: "duplicateSubtree",
+                uiIcon: "bx bx-outline",
+                enabled: parentNotSearch && isNotRoot && !isHoisted && notOptionsOrHelp
+            },
+
            {
                title: `${t("tree-context-menu.delete")} <kbd data-command="deleteNotes"></kbd>`,
                command: "deleteNotes",
@@ -244,6 +247,8 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
            const { ntxId } = subContexts?.[subContexts.length - 1] ?? {};

            this.treeWidget.triggerCommand("openNewNoteSplit", { ntxId, notePath });
+        } else if (command === "openNoteInPopup") {
+            appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath })
        } else if (command === "convertNoteToAttachment") {
            if (!(await dialogService.confirm(t("tree-context-menu.convert-to-attachment-confirm")))) {
                return;
--- a/apps/client/src/services/attribute_renderer.ts
+++ b/apps/client/src/services/attribute_renderer.ts
@@ -79,7 +79,19 @@ async function renderAttributes(attributes: FAttribute[], renderIsInheritable: b
    return $container;
 }

-const HIDDEN_ATTRIBUTES = ["originalFileName", "fileSize", "template", "inherit", "cssClass", "iconClass", "pageSize", "viewType", "geolocation", "docName"];
+const HIDDEN_ATTRIBUTES = [
+    "originalFileName",
+    "fileSize",
+    "template",
+    "inherit",
+    "cssClass",
+    "iconClass",
+    "pageSize",
+    "viewType",
+    "geolocation",
+    "docName",
+    "webViewSrc"
+];

 async function renderNormalAttributes(note: FNote) {
    const promotedDefinitionAttributes = note.getPromotedDefinitionAttributes();
--- a/apps/client/src/services/attributes.ts
+++ b/apps/client/src/services/attributes.ts
@@ -12,11 +12,12 @@ async function addLabel(noteId: string, name: string, value: string = "", isInhe
    });
 }

-export async function setLabel(noteId: string, name: string, value: string = "") {
+export async function setLabel(noteId: string, name: string, value: string = "", isInheritable = false) {
    await server.put(`notes/${noteId}/set-attribute`, {
        type: "label",
        name: name,
-        value: value
+        value: value,
+        isInheritable
    });
 }

--- a/apps/client/src/services/branches.ts
+++ b/apps/client/src/services/branches.ts
@@ -95,7 +95,15 @@ async function moveToParentNote(branchIdsToMove: string[], newParentBranchId: st
    }
 }

-async function deleteNotes(branchIdsToDelete: string[], forceDeleteAllClones = false) {
+/**
+ * Shows the delete confirmation screen
+ *
+ * @param branchIdsToDelete the list of branch IDs to delete.
+ * @param forceDeleteAllClones whether to check by default the "Delete also all clones" checkbox.
+ * @param moveToParent whether to automatically go to the parent note path after a succesful delete. Usually makes sense if deleting the active note(s).
+ * @returns promise that returns false if the operation was cancelled or there was nothing to delete, true if the operation succeeded.
+ */
+async function deleteNotes(branchIdsToDelete: string[], forceDeleteAllClones = false, moveToParent = true) {
    branchIdsToDelete = filterRootNote(branchIdsToDelete);

    if (branchIdsToDelete.length === 0) {
@@ -110,10 +118,12 @@ async function deleteNotes(branchIdsToDelete: string[], forceDeleteAllClones = f
        return false;
    }

-    try {
-        await activateParentNotePath();
-    } catch (e) {
-        console.error(e);
+    if (moveToParent) {
+        try {
+            await activateParentNotePath();
+        } catch (e) {
+            console.error(e);
+        }
    }

    const taskId = utils.randomString(10);
--- a/apps/client/src/services/bulk_action.ts
+++ b/apps/client/src/services/bulk_action.ts
@@ -15,6 +15,8 @@ import AddRelationBulkAction from "../widgets/bulk_actions/relation/add_relation
 import RenameNoteBulkAction from "../widgets/bulk_actions/note/rename_note.js";
 import { t } from "./i18n.js";
 import type FNote from "../entities/fnote.js";
+import toast from "./toast.js";
+import { BulkAction } from "@triliumnext/commons";

 const ACTION_GROUPS = [
    {
@@ -89,6 +91,17 @@ function parseActions(note: FNote) {
        .filter((action) => !!action);
 }

+export async function executeBulkActions(targetNoteIds: string[], actions: BulkAction[], includeDescendants = false) {
+    await server.post("bulk-action/execute", {
+        noteIds: targetNoteIds,
+        includeDescendants,
+        actions
+    });
+
+    await ws.waitForMaxKnownEntityChangeId();
+    toast.showMessage(t("bulk_actions.bulk_actions_executed"), 3000);
+}
+
 export default {
    addAction,
    parseActions,
--- a/apps/client/src/services/command_registry.ts
+++ b/apps/client/src/services/command_registry.ts
@@ -0,0 +1,295 @@
+import { ActionKeyboardShortcut } from "@triliumnext/commons";
+import appContext, { type CommandNames } from "../components/app_context.js";
+import type NoteTreeWidget from "../widgets/note_tree.js";
+import { t, translationsInitializedPromise } from "./i18n.js";
+import keyboardActions from "./keyboard_actions.js";
+import utils from "./utils.js";
+
+export interface CommandDefinition {
+    id: string;
+    name: string;
+    description?: string;
+    icon?: string;
+    shortcut?: string;
+    commandName?: CommandNames;
+    handler?: () => Promise<unknown> | null | undefined | void;
+    aliases?: string[];
+    source?: "manual" | "keyboard-action";
+    /** Reference to the original keyboard action for scope checking. */
+    keyboardAction?: ActionKeyboardShortcut;
+}
+
+class CommandRegistry {
+    private commands: Map<string, CommandDefinition> = new Map();
+    private aliases: Map<string, string> = new Map();
+
+    constructor() {
+        this.loadCommands();
+    }
+
+    private async loadCommands() {
+        await translationsInitializedPromise;
+        this.registerDefaultCommands();
+        await this.loadKeyboardActionsAsync();
+    }
+
+    private registerDefaultCommands() {
+        this.register({
+            id: "export-note",
+            name: t("command_palette.export_note_title"),
+            description: t("command_palette.export_note_description"),
+            icon: "bx bx-export",
+            handler: () => {
+                const notePath = appContext.tabManager.getActiveContextNotePath();
+                if (notePath) {
+                    appContext.triggerCommand("showExportDialog", {
+                        notePath,
+                        defaultType: "single"
+                    });
+                }
+            }
+        });
+
+        this.register({
+            id: "show-attachments",
+            name: t("command_palette.show_attachments_title"),
+            description: t("command_palette.show_attachments_description"),
+            icon: "bx bx-paperclip",
+            handler: () => appContext.triggerCommand("showAttachments")
+        });
+
+        // Special search commands with custom logic
+        this.register({
+            id: "search-notes",
+            name: t("command_palette.search_notes_title"),
+            description: t("command_palette.search_notes_description"),
+            icon: "bx bx-search",
+            handler: () => appContext.triggerCommand("searchNotes", {})
+        });
+
+        this.register({
+            id: "search-in-subtree",
+            name: t("command_palette.search_subtree_title"),
+            description: t("command_palette.search_subtree_description"),
+            icon: "bx bx-search-alt",
+            handler: () => {
+                const notePath = appContext.tabManager.getActiveContextNotePath();
+                if (notePath) {
+                    appContext.triggerCommand("searchInSubtree", { notePath });
+                }
+            }
+        });
+
+        this.register({
+            id: "show-search-history",
+            name: t("command_palette.search_history_title"),
+            description: t("command_palette.search_history_description"),
+            icon: "bx bx-history",
+            handler: () => appContext.triggerCommand("showSearchHistory")
+        });
+
+        this.register({
+            id: "show-launch-bar",
+            name: t("command_palette.configure_launch_bar_title"),
+            description: t("command_palette.configure_launch_bar_description"),
+            icon: "bx bx-sidebar",
+            handler: () => appContext.triggerCommand("showLaunchBarSubtree")
+        });
+    }
+
+    private async loadKeyboardActionsAsync() {
+        try {
+            const actions = await keyboardActions.getActions();
+            this.registerKeyboardActions(actions);
+        } catch (error) {
+            console.error("Failed to load keyboard actions:", error);
+        }
+    }
+
+    private registerKeyboardActions(actions: ActionKeyboardShortcut[]) {
+        for (const action of actions) {
+            // Skip actions that we've already manually registered
+            if (this.commands.has(action.actionName)) {
+                continue;
+            }
+
+            // Skip actions that don't have a description (likely separators)
+            if (!action.description) {
+                continue;
+            }
+
+            // Skip Electron-only actions if not in Electron environment
+            if (action.isElectronOnly && !utils.isElectron()) {
+                continue;
+            }
+
+            // Skip actions that should not appear in the command palette
+            if (action.ignoreFromCommandPalette) {
+                continue;
+            }
+
+            // Get the primary shortcut (first one in the list)
+            const primaryShortcut = action.effectiveShortcuts?.[0];
+
+            let name = action.friendlyName;
+            if (action.scope === "note-tree") {
+                name = t("command_palette.tree-action-name", { name: action.friendlyName });
+            }
+
+            // Create a command definition from the keyboard action
+            const commandDef: CommandDefinition = {
+                id: action.actionName,
+                name,
+                description: action.description,
+                icon: action.iconClass,
+                shortcut: primaryShortcut ? this.formatShortcut(primaryShortcut) : undefined,
+                commandName: action.actionName as CommandNames,
+                source: "keyboard-action",
+                keyboardAction: action
+            };
+
+            this.register(commandDef);
+        }
+    }
+
+    private formatShortcut(shortcut: string): string {
+        // Convert electron accelerator format to display format
+        return shortcut
+            .replace(/CommandOrControl/g, 'Ctrl')
+            .replace(/\+/g, ' + ');
+    }
+
+    register(command: CommandDefinition) {
+        this.commands.set(command.id, command);
+
+        // Register aliases
+        if (command.aliases) {
+            for (const alias of command.aliases) {
+                this.aliases.set(alias.toLowerCase(), command.id);
+            }
+        }
+    }
+
+    getCommand(id: string): CommandDefinition | undefined {
+        return this.commands.get(id);
+    }
+
+    getAllCommands(): CommandDefinition[] {
+        const commands = Array.from(this.commands.values());
+
+        // Sort commands by name
+        commands.sort((a, b) => a.name.localeCompare(b.name));
+
+        return commands;
+    }
+
+    searchCommands(query: string): CommandDefinition[] {
+        const normalizedQuery = query.toLowerCase();
+        const results: { command: CommandDefinition; score: number }[] = [];
+
+        for (const command of this.commands.values()) {
+            let score = 0;
+
+            // Exact match on name
+            if (command.name.toLowerCase() === normalizedQuery) {
+                score = 100;
+            }
+            // Name starts with query
+            else if (command.name.toLowerCase().startsWith(normalizedQuery)) {
+                score = 80;
+            }
+            // Name contains query
+            else if (command.name.toLowerCase().includes(normalizedQuery)) {
+                score = 60;
+            }
+            // Description contains query
+            else if (command.description?.toLowerCase().includes(normalizedQuery)) {
+                score = 40;
+            }
+            // Check aliases
+            else if (command.aliases?.some(alias => alias.toLowerCase().includes(normalizedQuery))) {
+                score = 50;
+            }
+
+            if (score > 0) {
+                results.push({ command, score });
+            }
+        }
+
+        // Sort by score (highest first) and then by name
+        results.sort((a, b) => {
+            if (a.score !== b.score) {
+                return b.score - a.score;
+            }
+            return a.command.name.localeCompare(b.command.name);
+        });
+
+        return results.map(r => r.command);
+    }
+
+    async executeCommand(commandId: string) {
+        const command = this.getCommand(commandId);
+        if (!command) {
+            console.error(`Command not found: ${commandId}`);
+            return;
+        }
+
+        // Execute custom handler if provided
+        if (command.handler) {
+            await command.handler();
+            return;
+        }
+
+        // Handle keyboard action with scope-aware execution
+        if (command.keyboardAction && command.commandName) {
+            if (command.keyboardAction.scope === "note-tree") {
+                this.executeWithNoteTreeFocus(command.commandName);
+            } else if (command.keyboardAction.scope === "text-detail") {
+                this.executeWithTextDetail(command.commandName);
+            } else {
+                appContext.triggerCommand(command.commandName, {
+                    ntxId: appContext.tabManager.activeNtxId
+                });
+            }
+            return;
+        }
+
+        // Fallback for commands without keyboard action reference
+        if (command.commandName) {
+            appContext.triggerCommand(command.commandName, {
+                ntxId: appContext.tabManager.activeNtxId
+            });
+            return;
+        }
+
+        console.error(`Command ${commandId} has no handler or commandName`);
+    }
+
+    private executeWithNoteTreeFocus(actionName: CommandNames) {
+        const tree = document.querySelector(".tree-wrapper") as HTMLElement;
+        if (!tree) {
+            return;
+        }
+
+        const treeComponent = appContext.getComponentByEl(tree) as NoteTreeWidget;
+        const activeNode = treeComponent.getActiveNode();
+        treeComponent.triggerCommand(actionName, {
+            ntxId: appContext.tabManager.activeNtxId,
+            node: activeNode
+        });
+    }
+
+    private async executeWithTextDetail(actionName: CommandNames) {
+        const typeWidget = await appContext.tabManager.getActiveContext()?.getTypeWidget();
+        if (!typeWidget) {
+            return;
+        }
+
+        typeWidget.triggerCommand(actionName, {
+            ntxId: appContext.tabManager.activeNtxId
+        });
+    }
+}
+
+const commandRegistry = new CommandRegistry();
+export default commandRegistry;
--- a/apps/client/src/services/content_renderer.ts
+++ b/apps/client/src/services/content_renderer.ts
@@ -65,6 +65,9 @@ async function getRenderedContent(this: {} | { ctx: string }, entity: FNote | FA

        $renderedContent.append($("<div>").append("<div>This note is protected and to access it you need to enter password.</div>").append("<br/>").append($button));
    } else if (entity instanceof FNote) {
+        $renderedContent
+            .css("display", "flex")
+            .css("flex-direction", "column");
        $renderedContent.append(
            $("<div>")
                .css("display", "flex")
@@ -72,8 +75,33 @@ async function getRenderedContent(this: {} | { ctx: string }, entity: FNote | FA
                .css("align-items", "center")
                .css("height", "100%")
                .css("font-size", "500%")
+                .css("flex-grow", "1")
                .append($("<span>").addClass(entity.getIcon()))
        );
+
+        if (entity.type === "webView" && entity.hasLabel("webViewSrc")) {
+            const $footer = $("<footer>")
+                .addClass("webview-footer");
+            const $openButton = $(`
+                <button class="file-open btn btn-primary" type="button">
+                    <span class="bx bx-link-external"></span>
+                    ${t("content_renderer.open_externally")}
+                </button>
+            `)
+                .appendTo($footer)
+                .on("click", () => {
+                    const webViewSrc = entity.getLabelValue("webViewSrc");
+                    if (webViewSrc) {
+                        if (utils.isElectron()) {
+                            const electron = utils.dynamicRequire("electron");
+                            electron.shell.openExternal(webViewSrc);
+                        } else {
+                            window.open(webViewSrc, '_blank', 'noopener,noreferrer');
+                        }
+                    }
+                });
+            $footer.appendTo($renderedContent);
+        }
    }

    if (entity instanceof FNote) {
--- a/apps/client/src/services/dialog.ts
+++ b/apps/client/src/services/dialog.ts
@@ -4,14 +4,14 @@ import type { ConfirmDialogOptions, ConfirmDialogResult, ConfirmWithMessageOptio
 import type { PromptDialogOptions } from "../widgets/dialogs/prompt.js";
 import { focusSavedElement, saveFocusedElement } from "./focus.js";

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

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

    $dialog.on("hidden.bs.modal", () => {
        const $autocompleteEl = $(".aa-input");
@@ -41,8 +41,14 @@ async function info(message: string) {
    return new Promise((res) => appContext.triggerCommand("showInfoDialog", { message, callback: res }));
 }

+/**
+ * Displays a confirmation dialog with the given message.
+ *
+ * @param message the message to display in the dialog.
+ * @returns A promise that resolves to true if the user confirmed, false otherwise.
+ */
 async function confirm(message: string) {
-    return new Promise((res) =>
+    return new Promise<boolean>((res) =>
        appContext.triggerCommand("showConfirmDialog", <ConfirmWithMessageOptions>{
            message,
            callback: (x: false | ConfirmDialogOptions) => res(x && x.confirmed)
--- a/apps/client/src/services/glob.ts
+++ b/apps/client/src/services/glob.ts
@@ -49,6 +49,13 @@ function setupGlobs() {
        const string = e?.reason?.message?.toLowerCase();

        let message = "Uncaught error: ";
+        let errorObjectString;
+
+        try {
+            errorObjectString = JSON.stringify(e.reason)
+        } catch (error: any) {
+            errorObjectString = error.toString();
+        }

        if (string?.includes("script error")) {
            message += "No details available";
@@ -57,7 +64,7 @@ function setupGlobs() {
                `Message: ${e.reason.message}`,
                `Line: ${e.reason.lineNumber}`,
                `Column: ${e.reason.columnNumber}`,
-                `Error object: ${JSON.stringify(e.reason)}`,
+                `Error object: ${errorObjectString}`,
                `Stack: ${e.reason && e.reason.stack}`
            ].join(", ");
        }
--- a/apps/client/src/services/i18n.ts
+++ b/apps/client/src/services/i18n.ts
@@ -6,6 +6,11 @@ import type { Locale } from "@triliumnext/commons";

 let locales: Locale[] | null;

+/**
+ * A deferred promise that resolves when translations are initialized.
+ */
+export let translationsInitializedPromise = $.Deferred();
+
 export async function initLocale() {
    const locale = (options.get("locale") as string) || "en";

@@ -19,6 +24,8 @@ export async function initLocale() {
        },
        returnEmptyString: false
    });
+
+    translationsInitializedPromise.resolve();
 }

 export function getAvailableLocales() {
--- a/apps/client/src/services/keyboard_actions.ts
+++ b/apps/client/src/services/keyboard_actions.ts
@@ -2,21 +2,15 @@ import server from "./server.js";
 import appContext, { type CommandNames } from "../components/app_context.js";
 import shortcutService from "./shortcuts.js";
 import type Component from "../components/component.js";
+import type { ActionKeyboardShortcut } from "@triliumnext/commons";

-const keyboardActionRepo: Record<string, Action> = {};
+const keyboardActionRepo: Record<string, ActionKeyboardShortcut> = {};

-// TODO: Deduplicate with server.
-export interface Action {
-    actionName: CommandNames;
-    effectiveShortcuts: string[];
-    scope: string;
-}
-
-const keyboardActionsLoaded = server.get<Action[]>("keyboard-actions").then((actions) => {
+const keyboardActionsLoaded = server.get<ActionKeyboardShortcut[]>("keyboard-actions").then((actions) => {
    actions = actions.filter((a) => !!a.actionName); // filter out separators

    for (const action of actions) {
-        action.effectiveShortcuts = action.effectiveShortcuts.filter((shortcut) => !shortcut.startsWith("global:"));
+        action.effectiveShortcuts = (action.effectiveShortcuts ?? []).filter((shortcut) => !shortcut.startsWith("global:"));

        keyboardActionRepo[action.actionName] = action;
    }
@@ -38,7 +32,7 @@ async function setupActionsForElement(scope: string, $el: JQuery<HTMLElement>, c
    const actions = await getActionsForScope(scope);

    for (const action of actions) {
-        for (const shortcut of action.effectiveShortcuts) {
+        for (const shortcut of action.effectiveShortcuts ?? []) {
            shortcutService.bindElShortcut($el, shortcut, () => component.triggerCommand(action.actionName, { ntxId: appContext.tabManager.activeNtxId }));
        }
    }
@@ -46,7 +40,7 @@ async function setupActionsForElement(scope: string, $el: JQuery<HTMLElement>, c

 getActionsForScope("window").then((actions) => {
    for (const action of actions) {
-        for (const shortcut of action.effectiveShortcuts) {
+        for (const shortcut of action.effectiveShortcuts ?? []) {
            shortcutService.bindGlobalShortcut(shortcut, () => appContext.triggerCommand(action.actionName, { ntxId: appContext.tabManager.activeNtxId }));
        }
    }
@@ -80,7 +74,7 @@ function updateDisplayedShortcuts($container: JQuery<HTMLElement>) {
        const action = await getAction(actionName, true);

        if (action) {
-            const keyboardActions = action.effectiveShortcuts.join(", ");
+            const keyboardActions = (action.effectiveShortcuts ?? []).join(", ");

            if (keyboardActions || $(el).text() !== "not set") {
                $(el).text(keyboardActions);
@@ -99,7 +93,7 @@ function updateDisplayedShortcuts($container: JQuery<HTMLElement>) {

        if (action) {
            const title = $(el).attr("title");
-            const shortcuts = action.effectiveShortcuts.join(", ");
+            const shortcuts = (action.effectiveShortcuts ?? []).join(", ");

            if (title?.includes(shortcuts)) {
                return;
--- a/apps/client/src/services/link.ts
+++ b/apps/client/src/services/link.ts
@@ -231,6 +231,7 @@ export function parseNavigationStateFromUrl(url: string | undefined) {
    let ntxId: string | null = null;
    let hoistedNoteId: string | null = null;
    let searchString: string | null = null;
+    let openInPopup = false;

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

@@ -277,13 +281,21 @@ function goToLink(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDownEvent) {
    return goToLinkExt(evt, hrefLink, $link);
 }

-function goToLinkExt(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDownEvent | React.PointerEvent<HTMLCanvasElement>, hrefLink: string | undefined, $link?: JQuery<HTMLElement> | null) {
+/**
+ * Handles navigation to a link, which can be an internal note path (e.g., `#root/1234`) or an external URL (e.g., `https://example.com`).
+ *
+ * @param evt the event that triggered the link navigation, or `null` if the link was clicked programmatically. Used to determine if the link should be opened in a new tab/window, based on the button presses.
+ * @param hrefLink the link to navigate to, which can be a note path (e.g., `#root/1234`) or an external URL with any supported protocol (e.g., `https://example.com`).
+ * @param $link the jQuery element of the link that was clicked, used to determine if the link is an anchor link (e.g., `#fn1` or `#fnref1`) and to handle it accordingly.
+ * @returns `true` if the link was handled (i.e., the element was found and scrolled to), or a falsy value otherwise.
+ */
+function goToLinkExt(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDownEvent | React.PointerEvent<HTMLCanvasElement> | null, hrefLink: string | undefined, $link?: JQuery<HTMLElement> | null) {
    if (hrefLink?.startsWith("data:")) {
        return true;
    }

-    evt.preventDefault();
-    evt.stopPropagation();
+    evt?.preventDefault();
+    evt?.stopPropagation();

    if (hrefLink && hrefLink.startsWith("#") && !hrefLink.startsWith("#root/") && $link) {
        if (handleAnchor(hrefLink, $link)) {
@@ -291,19 +303,22 @@ function goToLinkExt(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDownEvent
        }
    }

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

-    const ctrlKey = utils.isCtrlKey(evt);
-    const shiftKey = evt.shiftKey;
-    const isLeftClick = "which" in evt && evt.which === 1;
-    const isMiddleClick = "which" in evt && evt.which === 2;
+    const ctrlKey = evt && utils.isCtrlKey(evt);
+    const shiftKey = evt?.shiftKey;
+    const isLeftClick = !evt || ("which" in evt && evt.which === 1);
+    // Right click is handled separately.
+    const isMiddleClick = evt && "which" in evt && evt.which === 2;
    const targetIsBlank = ($link?.attr("target") === "_blank");
    const openInNewTab = (isLeftClick && ctrlKey) || isMiddleClick || targetIsBlank;
    const activate = (isLeftClick && ctrlKey && shiftKey) || (isMiddleClick && shiftKey);
-    const openInNewWindow = isLeftClick && evt.shiftKey && !ctrlKey;
+    const openInNewWindow = isLeftClick && evt?.shiftKey && !ctrlKey;

    if (notePath) {
-        if (openInNewWindow) {
+        if (isLeftClick && openInPopup) {
+            appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath });
+        } else if (openInNewWindow) {
            appContext.triggerCommand("openInWindow", { notePath, viewScope });
        } else if (openInNewTab) {
            appContext.tabManager.openTabWithNoteWithHoisting(notePath, {
@@ -311,7 +326,7 @@ function goToLinkExt(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDownEvent
                viewScope
            });
        } else if (isLeftClick) {
-            const ntxId = $(evt.target as any)
+            const ntxId = $(evt?.target as any)
                .closest("[data-ntx-id]")
                .attr("data-ntx-id");

@@ -379,12 +394,18 @@ function linkContextMenu(e: PointerEvent) {
        return;
    }

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

    linkContextMenuService.openContextMenu(notePath, e, viewScope, null);
 }

-export async function loadReferenceLinkTitle($el: JQuery<HTMLElement>, href: string | null | undefined = null) {
+async function loadReferenceLinkTitle($el: JQuery<HTMLElement>, href: string | null | undefined = null) {
    const $link = $el[0].tagName === "A" ? $el : $el.find("a");

    href = href || $link.attr("href");
--- a/apps/client/src/services/note_autocomplete.ts
+++ b/apps/client/src/services/note_autocomplete.ts
@@ -3,6 +3,7 @@ import appContext from "../components/app_context.js";
 import noteCreateService from "./note_create.js";
 import froca from "./froca.js";
 import { t } from "./i18n.js";
+import commandRegistry from "./command_registry.js";
 import type { MentionFeedObjectItem } from "@triliumnext/ckeditor5";

 // this key needs to have this value, so it's hit by the tooltip
@@ -29,9 +30,12 @@ export interface Suggestion {
    notePathTitle?: string;
    notePath?: string;
    highlightedNotePathTitle?: string;
-    action?: string | "create-note" | "search-notes" | "external-link";
+    action?: string | "create-note" | "search-notes" | "external-link" | "command";
    parentNoteId?: string;
    icon?: string;
+    commandId?: string;
+    commandDescription?: string;
+    commandShortcut?: string;
 }

 interface Options {
@@ -40,7 +44,12 @@ interface Options {
    allowCreatingNotes?: boolean;
    allowJumpToSearchNotes?: boolean;
    allowExternalLinks?: boolean;
+    /** If set, hides the right-side button corresponding to go to selected note. */
    hideGoToSelectedNoteButton?: boolean;
+    /** If set, hides all right-side buttons in the autocomplete dropdown */
+    hideAllButtons?: boolean;
+    /** If set, enables command palette mode */
+    isCommandPalette?: boolean;
 }

 async function autocompleteSourceForCKEditor(queryText: string) {
@@ -70,6 +79,31 @@ async function autocompleteSourceForCKEditor(queryText: string) {
 }

 async function autocompleteSource(term: string, cb: (rows: Suggestion[]) => void, options: Options = {}) {
+    // Check if we're in command mode
+    if (options.isCommandPalette && term.startsWith(">")) {
+        const commandQuery = term.substring(1).trim();
+        
+        // Get commands (all if no query, filtered if query provided)
+        const commands = commandQuery.length === 0 
+            ? commandRegistry.getAllCommands()
+            : commandRegistry.searchCommands(commandQuery);
+            
+        // Convert commands to suggestions
+        const commandSuggestions: Suggestion[] = commands.map(cmd => ({
+            action: "command",
+            commandId: cmd.id,
+            noteTitle: cmd.name,
+            notePathTitle: `>${cmd.name}`,
+            highlightedNotePathTitle: cmd.name,
+            commandDescription: cmd.description,
+            commandShortcut: cmd.shortcut,
+            icon: cmd.icon
+        }));
+        
+        cb(commandSuggestions);
+        return;
+    }
+
    const fastSearch = options.fastSearch === false ? false : true;
    if (fastSearch === false) {
        if (term.trim().length === 0) {
@@ -143,6 +177,12 @@ function showRecentNotes($el: JQuery<HTMLElement>) {
    $el.trigger("focus");
 }

+function showAllCommands($el: JQuery<HTMLElement>) {
+    searchDelay = 0;
+    $el.setSelectedNotePath("");
+    $el.autocomplete("val", ">").autocomplete("open");
+}
+
 function fullTextSearch($el: JQuery<HTMLElement>, options: Options) {
    const searchString = $el.autocomplete("val") as unknown as string;
    if (options.fastSearch === false || searchString?.trim().length === 0) {
@@ -190,9 +230,11 @@ function initNoteAutocomplete($el: JQuery<HTMLElement>, options?: Options) {

    const $goToSelectedNoteButton = $("<a>").addClass("input-group-text go-to-selected-note-button bx bx-arrow-to-right");

-    $el.after($clearTextButton).after($showRecentNotesButton).after($fullTextSearchButton);
+    if (!options.hideAllButtons) {
+        $el.after($clearTextButton).after($showRecentNotesButton).after($fullTextSearchButton);
+    }

-    if (!options.hideGoToSelectedNoteButton) {
+    if (!options.hideGoToSelectedNoteButton && !options.hideAllButtons) {
        $el.after($goToSelectedNoteButton);
    }

@@ -265,7 +307,24 @@ function initNoteAutocomplete($el: JQuery<HTMLElement>, options?: Options) {
                },
                displayKey: "notePathTitle",
                templates: {
-                    suggestion: (suggestion) => `<span class="${suggestion.icon ?? "bx bx-note"}"></span> ${suggestion.highlightedNotePathTitle}`
+                    suggestion: (suggestion) => {
+                        if (suggestion.action === "command") {
+                            let html = `<div class="command-suggestion">`;
+                            html += `<span class="command-icon ${suggestion.icon || "bx bx-terminal"}"></span>`;
+                            html += `<div class="command-content">`;
+                            html += `<div class="command-name">${suggestion.highlightedNotePathTitle}</div>`;
+                            if (suggestion.commandDescription) {
+                                html += `<div class="command-description">${suggestion.commandDescription}</div>`;
+                            }
+                            html += `</div>`;
+                            if (suggestion.commandShortcut) {
+                                html += `<kbd class="command-shortcut">${suggestion.commandShortcut}</kbd>`;
+                            }
+                            html += '</div>';
+                            return html;
+                        }
+                        return `<span class="${suggestion.icon ?? "bx bx-note"}"></span> ${suggestion.highlightedNotePathTitle}`;
+                    }
                },
                // we can't cache identical searches because notes can be created / renamed, new recent notes can be added
                cache: false
@@ -275,6 +334,12 @@ function initNoteAutocomplete($el: JQuery<HTMLElement>, options?: Options) {

    // TODO: Types fail due to "autocomplete:selected" not being registered in type definitions.
    ($el as any).on("autocomplete:selected", async (event: Event, suggestion: Suggestion) => {
+        if (suggestion.action === "command") {
+            $el.autocomplete("close");
+            $el.trigger("autocomplete:commandselected", [suggestion]);
+            return;
+        }
+
        if (suggestion.action === "external-link") {
            $el.setSelectedNotePath(null);
            $el.setSelectedExternalLink(suggestion.externalLink);
@@ -391,6 +456,7 @@ export default {
    autocompleteSourceForCKEditor,
    initNoteAutocomplete,
    showRecentNotes,
+    showAllCommands,
    setText,
    init
 };
--- a/apps/client/src/services/note_create.ts
+++ b/apps/client/src/services/note_create.ts
@@ -11,7 +11,7 @@ import type FBranch from "../entities/fbranch.js";
 import type { ChooseNoteTypeResponse } from "../widgets/dialogs/note_type_chooser.js";
 import type { CKTextEditor } from "@triliumnext/ckeditor5";

-interface CreateNoteOpts {
+export interface CreateNoteOpts {
    isProtected?: boolean;
    saveSelection?: boolean;
    title?: string | null;
--- a/apps/client/src/services/note_list_renderer.ts
+++ b/apps/client/src/services/note_list_renderer.ts
@@ -1,40 +1,31 @@
 import type FNote from "../entities/fnote.js";
+import BoardView from "../widgets/view_widgets/board_view/index.js";
 import CalendarView from "../widgets/view_widgets/calendar_view.js";
+import GeoView from "../widgets/view_widgets/geo_view/index.js";
 import ListOrGridView from "../widgets/view_widgets/list_or_grid_view.js";
 import TableView from "../widgets/view_widgets/table_view/index.js";
 import type { ViewModeArgs } from "../widgets/view_widgets/view_mode.js";
 import type ViewMode from "../widgets/view_widgets/view_mode.js";

-export type ViewTypeOptions = "list" | "grid" | "calendar" | "table";
+const allViewTypes = ["list", "grid", "calendar", "table", "geoMap", "board"] as const;
+export type ArgsWithoutNoteId = Omit<ViewModeArgs, "noteIds">;
+export type ViewTypeOptions = typeof allViewTypes[number];

 export default class NoteListRenderer {

    private viewType: ViewTypeOptions;
-    public viewMode: ViewMode<any> | null;
+    private args: ArgsWithoutNoteId;
+    public viewMode?: ViewMode<any>;

-    constructor(args: ViewModeArgs) {
+    constructor(args: ArgsWithoutNoteId) {
+        this.args = args;
        this.viewType = this.#getViewType(args.parentNote);
-
-        switch (this.viewType) {
-            case "list":
-            case "grid":
-                this.viewMode = new ListOrGridView(this.viewType, args);
-                break;
-            case "calendar":
-                this.viewMode = new CalendarView(args);
-                break;
-            case "table":
-                this.viewMode = new TableView(args);
-                break;
-            default:
-                this.viewMode = null;
-        }
    }

    #getViewType(parentNote: FNote): ViewTypeOptions {
        const viewType = parentNote.getLabelValue("viewType");

-        if (!["list", "grid", "calendar", "table"].includes(viewType || "")) {
+        if (!(allViewTypes as readonly string[]).includes(viewType || "")) {
            // when not explicitly set, decide based on the note type
            return parentNote.type === "search" ? "list" : "grid";
        } else {
@@ -43,15 +34,38 @@ export default class NoteListRenderer {
    }

    get isFullHeight() {
-        return this.viewMode?.isFullHeight;
+        switch (this.viewType) {
+            case "list":
+            case "grid":
+                return false;
+            default:
+                return true;
+        }
    }

    async renderList() {
-        if (!this.viewMode) {
-            return null;
-        }
+        const args = this.args;
+        const viewMode = this.#buildViewMode(args);
+        this.viewMode = viewMode;
+        await viewMode.beforeRender();
+        return await viewMode.renderList();
+    }

-        return await this.viewMode.renderList();
+    #buildViewMode(args: ViewModeArgs) {
+        switch (this.viewType) {
+            case "calendar":
+                return new CalendarView(args);
+            case "table":
+                return new TableView(args);
+            case "geoMap":
+                return new GeoView(args);
+            case "board":
+                return new BoardView(args);
+            case "list":
+            case "grid":
+            default:
+                return new ListOrGridView(this.viewType, args);
+        }
    }

 }
--- a/apps/client/src/services/note_tooltip.ts
+++ b/apps/client/src/services/note_tooltip.ts
@@ -13,8 +13,8 @@ let openTooltipElements: JQuery<HTMLElement>[] = [];
 let dismissTimer: ReturnType<typeof setTimeout>;

 function setupGlobalTooltip() {
-    $(document).on("mouseenter", "a", mouseEnterHandler);
-    $(document).on("mouseenter", "[data-href]", mouseEnterHandler);
+    $(document).on("mouseenter", "a:not(.no-tooltip-preview)", mouseEnterHandler);
+    $(document).on("mouseenter", "[data-href]:not(.no-tooltip-preview)", mouseEnterHandler);

    // close any note tooltip after click, this fixes the problem that sometimes tooltips remained on the screen
    $(document).on("click", (e) => {
@@ -168,7 +168,10 @@ async function renderTooltip(note: FNote | null) {
        if (isContentEmpty) {
            classes.push("note-no-content");
        }
-        content = `<h5 class="${classes.join(" ")}"><a href="#${note.noteId}" data-no-context-menu="true">${noteTitleWithPathAsSuffix.prop("outerHTML")}</a></h5>`;
+        content = `\
+            <h5 class="${classes.join(" ")}">
+                <a href="#${note.noteId}" data-no-context-menu="true">${noteTitleWithPathAsSuffix.prop("outerHTML")}</a>
+            </h5>`;
    }

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

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

--- a/apps/client/src/services/note_types.ts
+++ b/apps/client/src/services/note_types.ts
@@ -1,49 +1,118 @@
-import server from "./server.js";
-import froca from "./froca.js";
 import { t } from "./i18n.js";
-import type { MenuItem } from "../menus/context_menu.js";
+import froca from "./froca.js";
+import server from "./server.js";
+import type { MenuCommandItem, MenuItem, MenuItemBadge } from "../menus/context_menu.js";
+import type { NoteType } from "../entities/fnote.js";
 import type { TreeCommandNames } from "../menus/tree_context_menu.js";

+export interface NoteTypeMapping {
+    type: NoteType;
+    mime?: string;
+    title: string;
+    icon?: string;
+    /** Indicates whether this type should be marked as a newly introduced feature. */
+    isNew?: boolean;
+    /** Indicates that this note type is part of a beta feature. */
+    isBeta?: boolean;
+    /** Indicates that this note type cannot be created by the user. */
+    reserved?: boolean;
+    /** Indicates that once a note of this type is created, its type can no longer be changed. */
+    static?: boolean;
+}
+
+export const NOTE_TYPES: NoteTypeMapping[] = [
+    // The suggested note type ordering method: insert the item into the corresponding group,
+    // then ensure the items within the group are ordered alphabetically.
+
+    // The default note type (always the first item)
+    { type: "text", mime: "text/html", title: t("note_types.text"), icon: "bx-note" },
+
+    // Text notes group
+    { type: "book", mime: "", title: t("note_types.book"), icon: "bx-book" },
+
+    // Graphic notes
+    { type: "canvas", mime: "application/json", title: t("note_types.canvas"), icon: "bx-pen" },
+    { type: "mermaid", mime: "text/mermaid", title: t("note_types.mermaid-diagram"), icon: "bx-selection" },
+
+    // Map notes
+    { type: "mindMap", mime: "application/json", title: t("note_types.mind-map"), icon: "bx-sitemap" },
+    { type: "noteMap", mime: "", title: t("note_types.note-map"), icon: "bxs-network-chart", static: true },
+    { type: "relationMap", mime: "application/json", title: t("note_types.relation-map"), icon: "bxs-network-chart" },
+
+    // Misc note types
+    { type: "render", mime: "", title: t("note_types.render-note"), icon: "bx-extension" },
+    { type: "search", title: t("note_types.saved-search"), icon: "bx-file-find", static: true },
+    { type: "webView", mime: "", title: t("note_types.web-view"), icon: "bx-globe-alt" },
+
+    // Code notes
+    { type: "code", mime: "text/plain", title: t("note_types.code"), icon: "bx-code" },
+
+    // Reserved types (cannot be created by the user)
+    { type: "contentWidget", mime: "", title: t("note_types.widget"), reserved: true },
+    { type: "doc", mime: "", title: t("note_types.doc"), reserved: true },
+    { type: "file", title: t("note_types.file"), reserved: true },
+    { type: "image", title: t("note_types.image"), reserved: true },
+    { type: "launcher", mime: "", title: t("note_types.launcher"), reserved: true },
+    { type: "aiChat", mime: "application/json", title: t("note_types.ai-chat"), reserved: true }
+];
+
+/** The maximum age in days for a template to be marked with the "New" badge */
+const NEW_TEMPLATE_MAX_AGE = 3;
+
+/** The length of a day in milliseconds. */
+const DAY_LENGTH = 1000 * 60 * 60 * 24;
+
+/** The menu item badge used to mark new note types and templates */
+const NEW_BADGE: MenuItemBadge = {
+    title: t("note_types.new-feature"),
+    className: "new-note-type-badge"
+};
+
+/** The menu item badge used to mark note types that are part of a beta feature */
+const BETA_BADGE = {
+    title: t("note_types.beta-feature")
+};
+
 const SEPARATOR = { title: "----" };

+const creationDateCache = new Map<string, Date>();
+let rootCreationDate: Date | undefined;
+
 async function getNoteTypeItems(command?: TreeCommandNames) {
    const items: MenuItem<TreeCommandNames>[] = [
-        // The suggested note type ordering method: insert the item into the corresponding group,
-        // then ensure the items within the group are ordered alphabetically.
-        // Please keep the order synced with the listing found also in aps/client/src/widgets/note_types.ts.
-
-        // The default note type (always the first item)
-        { title: t("note_types.text"), command, type: "text", uiIcon: "bx bx-note" },
-        
-        // Text notes group
-        { title: t("note_types.book"), command, type: "book", uiIcon: "bx bx-book" },
-
-        // Graphic notes
-        { title: t("note_types.canvas"), command, type: "canvas", uiIcon: "bx bx-pen" },
-        { title: t("note_types.mermaid-diagram"), command, type: "mermaid", uiIcon: "bx bx-selection" },
-        
-        // Map notes
-        { title: t("note_types.geo-map"), command, type: "geoMap", uiIcon: "bx bx-map-alt" },
-        { title: t("note_types.mind-map"), command, type: "mindMap", uiIcon: "bx bx-sitemap" },
-        { title: t("note_types.note-map"), command, type: "noteMap", uiIcon: "bx bxs-network-chart" },
-        { title: t("note_types.relation-map"), command, type: "relationMap", uiIcon: "bx bxs-network-chart" },
-
-        // Misc note types
-        { title: t("note_types.render-note"), command, type: "render", uiIcon: "bx bx-extension" },
-        { title: t("note_types.saved-search"), command, type: "search", uiIcon: "bx bx-file-find" },
-        { title: t("note_types.web-view"), command, type: "webView", uiIcon: "bx bx-globe-alt" },
-
-        // Code notes
-        { title: t("note_types.code"), command, type: "code", uiIcon: "bx bx-code" },
-
-        // Templates
-        ...await getBuiltInTemplates(command),
+        ...getBlankNoteTypes(command),
+        ...await getBuiltInTemplates(t("note_types.collections"), command, true),
+        ...await getBuiltInTemplates(null, command, false),
        ...await getUserTemplates(command)
    ];

    return items;
 }

+function getBlankNoteTypes(command?: TreeCommandNames): MenuItem<TreeCommandNames>[] {
+    return NOTE_TYPES
+        .filter((nt) => !nt.reserved && nt.type !== "book")
+        .map((nt) => {
+            const menuItem: MenuCommandItem<TreeCommandNames> = {
+                title: nt.title,
+                command,
+                type: nt.type,
+                uiIcon: "bx " + nt.icon,
+                badges: []
+            }
+
+            if (nt.isNew) {
+                menuItem.badges?.push(NEW_BADGE);
+            }
+
+            if (nt.isBeta) {
+                menuItem.badges?.push(BETA_BADGE);
+            }
+
+            return menuItem;
+        });
+}
+
 async function getUserTemplates(command?: TreeCommandNames) {
    const templateNoteIds = await server.get<string[]>("search-templates");
    const templateNotes = await froca.getNotes(templateNoteIds);
@@ -54,19 +123,26 @@ async function getUserTemplates(command?: TreeCommandNames) {
    const items: MenuItem<TreeCommandNames>[] = [
        SEPARATOR
    ];
+
    for (const templateNote of templateNotes) {
-        items.push({
+        const item: MenuItem<TreeCommandNames> = {
            title: templateNote.title,
            uiIcon: templateNote.getIcon(),
            command: command,
            type: templateNote.type,
            templateNoteId: templateNote.noteId
-        });
+        };
+
+        if (await isNewTemplate(templateNote.noteId)) {
+            item.badges = [NEW_BADGE];
+        }
+
+        items.push(item);
    }
    return items;
 }

-async function getBuiltInTemplates(command?: TreeCommandNames) {
+async function getBuiltInTemplates(title: string | null, command: TreeCommandNames | undefined, filterCollections: boolean) {
    const templatesRoot = await froca.getNote("_templates");
    if (!templatesRoot) {
        console.warn("Unable to find template root.");
@@ -78,21 +154,85 @@ async function getBuiltInTemplates(command?: TreeCommandNames) {
        return [];
    }

-    const items: MenuItem<TreeCommandNames>[] = [
-        SEPARATOR
-    ];
-    for (const templateNote of childNotes) {
+    const items: MenuItem<TreeCommandNames>[] = [];
+    if (title) {
        items.push({
+            title: title,
+            enabled: false,
+            uiIcon: "bx bx-empty"
+        });
+    } else {
+        items.push(SEPARATOR);
+    }
+
+    for (const templateNote of childNotes) {
+        if (templateNote.hasLabel("collection") !== filterCollections) {
+            continue;
+        }
+
+        const item: MenuItem<TreeCommandNames> = {
            title: templateNote.title,
            uiIcon: templateNote.getIcon(),
            command: command,
            type: templateNote.type,
            templateNoteId: templateNote.noteId
-        });
+        };
+
+        if (await isNewTemplate(templateNote.noteId)) {
+            item.badges = [NEW_BADGE];
+        }
+
+        items.push(item);
    }
    return items;
 }

+async function isNewTemplate(templateNoteId) {
+    if (rootCreationDate === undefined) {
+        // Retrieve the root note creation date
+        try {
+            let rootNoteInfo: any = await server.get("notes/root");
+            if ("dateCreated" in rootNoteInfo) {
+                rootCreationDate = new Date(rootNoteInfo.dateCreated);
+            }
+        } catch (ex) {
+            console.error(ex);
+        }
+    }
+
+    // Try to retrieve the template's creation date from the cache
+    let creationDate: Date | undefined = creationDateCache.get(templateNoteId);
+
+    if (creationDate === undefined) {
+        // The creation date isn't available in the cache, try to retrieve it from the server
+        try {
+            const noteInfo: any = await server.get("notes/" + templateNoteId);
+            if ("dateCreated" in noteInfo) {
+                creationDate = new Date(noteInfo.dateCreated);
+                creationDateCache.set(templateNoteId, creationDate);
+            }
+        } catch (ex) {
+            console.error(ex);
+        }
+    }
+
+    if (creationDate) {
+        if (rootCreationDate && creationDate.getTime() - rootCreationDate.getTime() < 30000) {
+            // Ignore templates created within 30 seconds after the root note is created.
+            // This is useful to prevent predefined templates from being marked
+            // as 'New' after setting up a new database.
+            return false;
+        }
+
+        // Determine the difference in days between now and the template's creation date
+        const age = (new Date().getTime() - creationDate.getTime()) / DAY_LENGTH;
+        // Return true if the template is at most NEW_TEMPLATE_MAX_AGE days old
+        return (age <= NEW_TEMPLATE_MAX_AGE);
+    } else {
+        return false;
+    }
+}
+
 export default {
    getNoteTypeItems
 };
--- a/apps/client/src/services/promoted_attribute_definition_parser.ts
+++ b/apps/client/src/services/promoted_attribute_definition_parser.ts
@@ -1,4 +1,4 @@
-export type LabelType = "text" | "number" | "boolean" | "date" | "datetime" | "time" | "url";
+export type LabelType = "text" | "number" | "boolean" | "date" | "datetime" | "time" | "url" | "color";
 type Multiplicity = "single" | "multi";

 export interface DefinitionObject {
@@ -17,7 +17,7 @@ function parse(value: string) {
    for (const token of tokens) {
        if (token === "promoted") {
            defObj.isPromoted = true;
-        } else if (["text", "number", "boolean", "date", "datetime", "time", "url"].includes(token)) {
+        } else if (["text", "number", "boolean", "date", "datetime", "time", "url", "color"].includes(token)) {
            defObj.labelType = token as LabelType;
        } else if (["single", "multi"].includes(token)) {
            defObj.multiplicity = token as Multiplicity;
--- a/apps/client/src/services/shortcuts.spec.ts
+++ b/apps/client/src/services/shortcuts.spec.ts
@@ -0,0 +1,323 @@
+import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
+import shortcuts, { keyMatches, matchesShortcut } from "./shortcuts.js";
+
+// Mock utils module
+vi.mock("./utils.js", () => ({
+    default: {
+        isDesktop: () => true
+    }
+}));
+
+// Mock jQuery globally since it's used in the shortcuts module
+const mockElement = {
+    addEventListener: vi.fn(),
+    removeEventListener: vi.fn()
+};
+
+const mockJQuery = vi.fn(() => [mockElement]);
+(mockJQuery as any).length = 1;
+mockJQuery[0] = mockElement;
+
+(global as any).$ = mockJQuery as any;
+global.document = mockElement as any;
+
+describe("shortcuts", () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+
+    afterEach(() => {
+        // Clean up any active bindings after each test
+        shortcuts.removeGlobalShortcut("test-namespace");
+    });
+
+    describe("normalizeShortcut", () => {
+        it("should normalize shortcut to lowercase and remove whitespace", () => {
+            expect(shortcuts.normalizeShortcut("Ctrl + A")).toBe("ctrl+a");
+            expect(shortcuts.normalizeShortcut("  SHIFT + F1  ")).toBe("shift+f1");
+            expect(shortcuts.normalizeShortcut("Alt+Space")).toBe("alt+space");
+        });
+
+        it("should handle empty or null shortcuts", () => {
+            expect(shortcuts.normalizeShortcut("")).toBe("");
+            expect(shortcuts.normalizeShortcut(null as any)).toBe(null);
+            expect(shortcuts.normalizeShortcut(undefined as any)).toBe(undefined);
+        });
+
+        it("should handle shortcuts with multiple spaces", () => {
+            expect(shortcuts.normalizeShortcut("Ctrl   +   Shift   +   A")).toBe("ctrl+shift+a");
+        });
+
+        it("should warn about malformed shortcuts", () => {
+            const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+
+            shortcuts.normalizeShortcut("ctrl+");
+            shortcuts.normalizeShortcut("+a");
+            shortcuts.normalizeShortcut("ctrl++a");
+
+            expect(consoleSpy).toHaveBeenCalledTimes(3);
+            consoleSpy.mockRestore();
+        });
+    });
+
+    describe("keyMatches", () => {
+        const createKeyboardEvent = (key: string, code?: string) => ({
+            key,
+            code: code || `Key${key.toUpperCase()}`
+        } as KeyboardEvent);
+
+        it("should match regular letter keys using key code", () => {
+            const event = createKeyboardEvent("a", "KeyA");
+            expect(keyMatches(event, "a")).toBe(true);
+            expect(keyMatches(event, "A")).toBe(true);
+        });
+
+        it("should match number keys using digit codes", () => {
+            const event = createKeyboardEvent("1", "Digit1");
+            expect(keyMatches(event, "1")).toBe(true);
+        });
+
+        it("should match special keys using key mapping", () => {
+            expect(keyMatches({ key: "Enter" } as KeyboardEvent, "return")).toBe(true);
+            expect(keyMatches({ key: "Enter" } as KeyboardEvent, "enter")).toBe(true);
+            expect(keyMatches({ key: "Delete" } as KeyboardEvent, "del")).toBe(true);
+            expect(keyMatches({ key: "Escape" } as KeyboardEvent, "esc")).toBe(true);
+            expect(keyMatches({ key: " " } as KeyboardEvent, "space")).toBe(true);
+            expect(keyMatches({ key: "ArrowUp" } as KeyboardEvent, "up")).toBe(true);
+        });
+
+        it("should match function keys", () => {
+            expect(keyMatches({ key: "F1" } as KeyboardEvent, "f1")).toBe(true);
+            expect(keyMatches({ key: "F12" } as KeyboardEvent, "f12")).toBe(true);
+        });
+
+        it("should handle undefined or null keys", () => {
+            const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+
+            expect(keyMatches({} as KeyboardEvent, null as any)).toBe(false);
+            expect(keyMatches({} as KeyboardEvent, undefined as any)).toBe(false);
+
+            expect(consoleSpy).toHaveBeenCalled();
+            consoleSpy.mockRestore();
+        });
+    });
+
+    describe("matchesShortcut", () => {
+        const createKeyboardEvent = (options: {
+            key: string;
+            code?: string;
+            ctrlKey?: boolean;
+            altKey?: boolean;
+            shiftKey?: boolean;
+            metaKey?: boolean;
+        }) => ({
+            key: options.key,
+            code: options.code || `Key${options.key.toUpperCase()}`,
+            ctrlKey: options.ctrlKey || false,
+            altKey: options.altKey || false,
+            shiftKey: options.shiftKey || false,
+            metaKey: options.metaKey || false
+        } as KeyboardEvent);
+
+        it("should match simple key shortcuts", () => {
+            const event = createKeyboardEvent({ key: "a", code: "KeyA" });
+            expect(matchesShortcut(event, "a")).toBe(true);
+        });
+
+        it("should match shortcuts with modifiers", () => {
+            const event = createKeyboardEvent({ key: "a", code: "KeyA", ctrlKey: true });
+            expect(matchesShortcut(event, "ctrl+a")).toBe(true);
+
+            const shiftEvent = createKeyboardEvent({ key: "a", code: "KeyA", shiftKey: true });
+            expect(matchesShortcut(shiftEvent, "shift+a")).toBe(true);
+        });
+
+        it("should match complex modifier combinations", () => {
+            const event = createKeyboardEvent({
+                key: "a",
+                code: "KeyA",
+                ctrlKey: true,
+                shiftKey: true
+            });
+            expect(matchesShortcut(event, "ctrl+shift+a")).toBe(true);
+        });
+
+        it("should not match when modifiers don't match", () => {
+            const event = createKeyboardEvent({ key: "a", code: "KeyA", ctrlKey: true });
+            expect(matchesShortcut(event, "alt+a")).toBe(false);
+            expect(matchesShortcut(event, "a")).toBe(false);
+        });
+
+        it("should handle alternative modifier names", () => {
+            const ctrlEvent = createKeyboardEvent({ key: "a", code: "KeyA", ctrlKey: true });
+            expect(matchesShortcut(ctrlEvent, "control+a")).toBe(true);
+
+            const metaEvent = createKeyboardEvent({ key: "a", code: "KeyA", metaKey: true });
+            expect(matchesShortcut(metaEvent, "cmd+a")).toBe(true);
+            expect(matchesShortcut(metaEvent, "command+a")).toBe(true);
+        });
+
+        it("should handle empty or invalid shortcuts", () => {
+            const event = createKeyboardEvent({ key: "a", code: "KeyA" });
+            expect(matchesShortcut(event, "")).toBe(false);
+            expect(matchesShortcut(event, null as any)).toBe(false);
+        });
+
+        it("should handle invalid events", () => {
+            const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+
+            expect(matchesShortcut(null as any, "a")).toBe(false);
+            expect(matchesShortcut({} as KeyboardEvent, "a")).toBe(false);
+
+            expect(consoleSpy).toHaveBeenCalled();
+            consoleSpy.mockRestore();
+        });
+
+        it("should warn about invalid shortcut formats", () => {
+            const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+            const event = createKeyboardEvent({ key: "a", code: "KeyA" });
+
+            matchesShortcut(event, "ctrl+");
+            matchesShortcut(event, "+");
+
+            expect(consoleSpy).toHaveBeenCalled();
+            consoleSpy.mockRestore();
+        });
+    });
+
+    describe("bindGlobalShortcut", () => {
+        it("should bind a global shortcut", () => {
+            const handler = vi.fn();
+            shortcuts.bindGlobalShortcut("ctrl+a", handler, "test-namespace");
+
+            expect(mockElement.addEventListener).toHaveBeenCalledWith("keydown", expect.any(Function));
+        });
+
+        it("should not bind shortcuts when handler is null", () => {
+            shortcuts.bindGlobalShortcut("ctrl+a", null, "test-namespace");
+
+            expect(mockElement.addEventListener).not.toHaveBeenCalled();
+        });
+
+        it("should remove previous bindings when namespace is reused", () => {
+            const handler1 = vi.fn();
+            const handler2 = vi.fn();
+
+            shortcuts.bindGlobalShortcut("ctrl+a", handler1, "test-namespace");
+            expect(mockElement.addEventListener).toHaveBeenCalledTimes(1);
+
+            shortcuts.bindGlobalShortcut("ctrl+b", handler2, "test-namespace");
+            expect(mockElement.removeEventListener).toHaveBeenCalledTimes(1);
+            expect(mockElement.addEventListener).toHaveBeenCalledTimes(2);
+        });
+    });
+
+    describe("bindElShortcut", () => {
+        it("should bind shortcut to specific element", () => {
+            const mockEl = { addEventListener: vi.fn(), removeEventListener: vi.fn() };
+            const mockJQueryEl = [mockEl] as any;
+            mockJQueryEl.length = 1;
+
+            const handler = vi.fn();
+            shortcuts.bindElShortcut(mockJQueryEl, "ctrl+a", handler, "test-namespace");
+
+            expect(mockEl.addEventListener).toHaveBeenCalledWith("keydown", expect.any(Function));
+        });
+
+        it("should fall back to document when element is empty", () => {
+            const emptyJQuery = [] as any;
+            emptyJQuery.length = 0;
+
+            const handler = vi.fn();
+            shortcuts.bindElShortcut(emptyJQuery, "ctrl+a", handler, "test-namespace");
+
+            expect(mockElement.addEventListener).toHaveBeenCalledWith("keydown", expect.any(Function));
+        });
+    });
+
+    describe("removeGlobalShortcut", () => {
+        it("should remove shortcuts for a specific namespace", () => {
+            const handler = vi.fn();
+            shortcuts.bindGlobalShortcut("ctrl+a", handler, "test-namespace");
+
+            shortcuts.removeGlobalShortcut("test-namespace");
+
+            expect(mockElement.removeEventListener).toHaveBeenCalledWith("keydown", expect.any(Function));
+        });
+    });
+
+    describe("event handling", () => {
+        it.skip("should call handler when shortcut matches", () => {
+            const handler = vi.fn();
+            shortcuts.bindGlobalShortcut("ctrl+a", handler, "test-namespace");
+
+            // Get the listener that was registered
+            expect(mockElement.addEventListener.mock.calls).toHaveLength(1);
+            const [, listener] = mockElement.addEventListener.mock.calls[0];
+
+            // First verify that matchesShortcut works directly
+            const testEvent = {
+                type: "keydown",
+                key: "a",
+                code: "KeyA",
+                ctrlKey: true,
+                altKey: false,
+                shiftKey: false,
+                metaKey: false,
+                preventDefault: vi.fn(),
+                stopPropagation: vi.fn()
+            } as any;
+
+            // Test matchesShortcut directly first
+            expect(matchesShortcut(testEvent, "ctrl+a")).toBe(true);
+
+            // Now test the actual listener
+            listener(testEvent);
+
+            expect(handler).toHaveBeenCalled();
+            expect(testEvent.preventDefault).toHaveBeenCalled();
+            expect(testEvent.stopPropagation).toHaveBeenCalled();
+        });
+
+        it("should not call handler for non-keyboard events", () => {
+            const handler = vi.fn();
+            shortcuts.bindGlobalShortcut("ctrl+a", handler, "test-namespace");
+
+            const [, listener] = mockElement.addEventListener.mock.calls[0];
+
+            // Simulate a non-keyboard event
+            const event = {
+                type: "click"
+            } as any;
+
+            listener(event);
+
+            expect(handler).not.toHaveBeenCalled();
+        });
+
+        it("should not call handler when shortcut doesn't match", () => {
+            const handler = vi.fn();
+            shortcuts.bindGlobalShortcut("ctrl+a", handler, "test-namespace");
+
+            const [, listener] = mockElement.addEventListener.mock.calls[0];
+
+            // Simulate a non-matching keydown event
+            const event = {
+                type: "keydown",
+                key: "b",
+                code: "KeyB",
+                ctrlKey: true,
+                altKey: false,
+                shiftKey: false,
+                metaKey: false,
+                preventDefault: vi.fn(),
+                stopPropagation: vi.fn()
+            } as any;
+
+            listener(event);
+
+            expect(handler).not.toHaveBeenCalled();
+            expect(event.preventDefault).not.toHaveBeenCalled();
+        });
+    });
+});
--- a/apps/client/src/services/shortcuts.ts
+++ b/apps/client/src/services/shortcuts.ts
@@ -1,7 +1,18 @@
 import utils from "./utils.js";

 type ElementType = HTMLElement | Document;
-type Handler = (e: JQuery.TriggeredEvent<ElementType | Element, string, ElementType | Element, ElementType | Element>) => void;
+type Handler = (e: KeyboardEvent) => void;
+
+interface ShortcutBinding {
+    element: HTMLElement | Document;
+    shortcut: string;
+    handler: Handler;
+    namespace: string | null;
+    listener: (evt: Event) => void;
+}
+
+// Store all active shortcut bindings for management
+const activeBindings: Map<string, ShortcutBinding[]> = new Map();

 function removeGlobalShortcut(namespace: string) {
    bindGlobalShortcut("", null, namespace);
@@ -15,38 +26,167 @@ function bindElShortcut($el: JQuery<ElementType | Element>, keyboardShortcut: st
    if (utils.isDesktop()) {
        keyboardShortcut = normalizeShortcut(keyboardShortcut);

-        let eventName = "keydown";
-
+        // If namespace is provided, remove all previous bindings for this namespace
        if (namespace) {
-            eventName += `.${namespace}`;
-
-            // if there's a namespace, then we replace the existing event handler with the new one
-            $el.off(eventName);
+            removeNamespaceBindings(namespace);
        }

-        // method can be called to remove the shortcut (e.g. when keyboardShortcut label is deleted)
-        if (keyboardShortcut) {
-            $el.bind(eventName, keyboardShortcut, (e) => {
-                if (handler) {
-                    handler(e);
+        // Method can be called to remove the shortcut (e.g. when keyboardShortcut label is deleted)
+        if (keyboardShortcut && handler) {
+            const element = $el.length > 0 ? $el[0] as (HTMLElement | Document) : document;
+
+            const listener = (evt: Event) => {
+                // Only handle keyboard events
+                if (evt.type !== 'keydown' || !(evt instanceof KeyboardEvent)) {
+                    return;
                }

-                e.preventDefault();
-                e.stopPropagation();
-            });
+                const e = evt as KeyboardEvent;
+                if (matchesShortcut(e, keyboardShortcut)) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    handler(e);
+                }
+            };
+
+            // Add the event listener
+            element.addEventListener('keydown', listener);
+
+            // Store the binding for later cleanup
+            const binding: ShortcutBinding = {
+                element,
+                shortcut: keyboardShortcut,
+                handler,
+                namespace,
+                listener
+            };
+
+            const key = namespace || 'global';
+            if (!activeBindings.has(key)) {
+                activeBindings.set(key, []);
+            }
+            activeBindings.get(key)!.push(binding);
        }
    }
 }

+function removeNamespaceBindings(namespace: string) {
+    const bindings = activeBindings.get(namespace);
+    if (bindings) {
+        // Remove all event listeners for this namespace
+        bindings.forEach(binding => {
+            binding.element.removeEventListener('keydown', binding.listener);
+        });
+        activeBindings.delete(namespace);
+    }
+}
+
+export function matchesShortcut(e: KeyboardEvent, shortcut: string): boolean {
+    if (!shortcut) return false;
+
+    // Ensure we have a proper KeyboardEvent with key property
+    if (!e || typeof e.key !== 'string') {
+        console.warn('matchesShortcut called with invalid event:', e);
+        return false;
+    }
+
+    const parts = shortcut.toLowerCase().split('+');
+    const key = parts[parts.length - 1]; // Last part is the actual key
+    const modifiers = parts.slice(0, -1); // Everything before is modifiers
+
+    // Defensive check - ensure we have a valid key
+    if (!key || key.trim() === '') {
+        console.warn('Invalid shortcut format:', shortcut);
+        return false;
+    }
+
+    // Check if the main key matches
+    if (!keyMatches(e, key)) {
+        return false;
+    }
+
+    // Check modifiers
+    const expectedCtrl = modifiers.includes('ctrl') || modifiers.includes('control');
+    const expectedAlt = modifiers.includes('alt');
+    const expectedShift = modifiers.includes('shift');
+    const expectedMeta = modifiers.includes('meta') || modifiers.includes('cmd') || modifiers.includes('command');
+
+    return e.ctrlKey === expectedCtrl &&
+           e.altKey === expectedAlt &&
+           e.shiftKey === expectedShift &&
+           e.metaKey === expectedMeta;
+}
+
+export function keyMatches(e: KeyboardEvent, key: string): boolean {
+    // Defensive check for undefined/null key
+    if (!key) {
+        console.warn('keyMatches called with undefined/null key');
+        return false;
+    }
+
+    // Handle special key mappings and aliases
+    const keyMap: { [key: string]: string[] } = {
+        'return': ['Enter'],
+        'enter': ['Enter'],  // alias for return
+        'del': ['Delete'],
+        'delete': ['Delete'], // alias for del
+        'esc': ['Escape'],
+        'escape': ['Escape'], // alias for esc
+        'space': [' ', 'Space'],
+        'tab': ['Tab'],
+        'backspace': ['Backspace'],
+        'home': ['Home'],
+        'end': ['End'],
+        'pageup': ['PageUp'],
+        'pagedown': ['PageDown'],
+        'up': ['ArrowUp'],
+        'down': ['ArrowDown'],
+        'left': ['ArrowLeft'],
+        'right': ['ArrowRight']
+    };
+
+    // Function keys
+    for (let i = 1; i <= 19; i++) {
+        keyMap[`f${i}`] = [`F${i}`];
+    }
+
+    const mappedKeys = keyMap[key.toLowerCase()];
+    if (mappedKeys) {
+        return mappedKeys.includes(e.key) || mappedKeys.includes(e.code);
+    }
+
+    // For number keys, use the physical key code regardless of modifiers
+    // This works across all keyboard layouts
+    if (key >= '0' && key <= '9') {
+        return e.code === `Digit${key}`;
+    }
+
+    // For letter keys, use the physical key code for consistency
+    if (key.length === 1 && key >= 'a' && key <= 'z') {
+        return e.code === `Key${key.toUpperCase()}`;
+    }
+
+    // For regular keys, check both key and code as fallback
+    return e.key.toLowerCase() === key.toLowerCase() ||
+           e.code.toLowerCase() === key.toLowerCase();
+}
+
 /**
- * Normalize to the form expected by the jquery.hotkeys.js
+ * Simple normalization - just lowercase and trim whitespace
 */
 function normalizeShortcut(shortcut: string): string {
    if (!shortcut) {
        return shortcut;
    }

-    return shortcut.toLowerCase().replace("enter", "return").replace("delete", "del").replace("ctrl+alt", "alt+ctrl").replace("meta+alt", "alt+meta"); // alt needs to be first;
+    const normalized = shortcut.toLowerCase().trim().replace(/\s+/g, '');
+
+    // Warn about potentially problematic shortcuts
+    if (normalized.endsWith('+') || normalized.startsWith('+') || normalized.includes('++')) {
+        console.warn('Potentially malformed shortcut:', shortcut, '-> normalized to:', normalized);
+    }
+
+    return normalized;
 }

 export default {
--- a/apps/client/src/services/spaced_update.ts
+++ b/apps/client/src/services/spaced_update.ts
@@ -51,6 +51,14 @@ export default class SpacedUpdate {
        this.lastUpdated = Date.now();
    }

+    /**
+     * Sets the update interval for the spaced update.
+     * @param interval The update interval in milliseconds.
+     */
+    setUpdateInterval(interval: number) {
+        this.updateInterval = interval;
+    }
+
    triggerUpdate() {
        if (!this.changed) {
            return;
--- a/apps/client/src/services/syntax_highlight.ts
+++ b/apps/client/src/services/syntax_highlight.ts
@@ -36,7 +36,9 @@ export function applyCopyToClipboardButton($codeBlock: JQuery<HTMLElement>) {
    const $copyButton = $("<button>")
        .addClass("bx component icon-action tn-tool-button bx-copy copy-button")
        .attr("title", t("code_block.copy_title"))
-        .on("click", () => {
+        .on("click", (e) => {
+            e.stopPropagation();
+
            if (!isShare) {
                copyTextWithToast($codeBlock.text());
            } else {
--- a/apps/client/src/setup.ts
+++ b/apps/client/src/setup.ts
@@ -1,5 +1,4 @@
 import "jquery";
-import "jquery-hotkeys";
 import utils from "./services/utils.js";
 import ko from "knockout";
 import "./stylesheets/bootstrap.scss";
--- a/apps/client/src/share.ts
+++ b/apps/client/src/share.ts
@@ -29,6 +29,14 @@ async function formatCodeBlocks() {
    await formatCodeBlocks($("#content"));
 }

+async function setupTextNote() {
+    formatCodeBlocks();
+    applyMath();
+
+    const setupMermaid = (await import("./share/mermaid.js")).default;
+    setupMermaid();
+}
+
 /**
 * Fetch note with given ID from backend
 *
@@ -47,8 +55,11 @@ async function fetchNote(noteId: string | null = null) {
 document.addEventListener(
    "DOMContentLoaded",
    () => {
-        formatCodeBlocks();
-        applyMath();
+        const noteType = determineNoteType();
+
+        if (noteType === "text") {
+            setupTextNote();
+        }

        const toggleMenuButton = document.getElementById("toggleMenuButton");
        const layout = document.getElementById("layout");
@@ -60,6 +71,12 @@ document.addEventListener(
    false
 );

+function determineNoteType() {
+    const bodyClass = document.body.className;
+    const match = bodyClass.match(/type-([^\s]+)/);
+    return match ? match[1] : null;
+}
+
 // workaround to prevent webpack from removing "fetchNote" as dead code:
 // add fetchNote as property to the window object
 Object.defineProperty(window, "fetchNote", {
--- a/apps/client/src/share/mermaid.ts
+++ b/apps/client/src/share/mermaid.ts
@@ -0,0 +1,17 @@
+import mermaid from "mermaid";
+
+export default function setupMermaid() {
+    for (const codeBlock of document.querySelectorAll("#content pre code.language-mermaid")) {
+        const parentPre = codeBlock.parentElement;
+        if (!parentPre) {
+            continue;
+        }
+
+        const mermaidDiv = document.createElement("div");
+        mermaidDiv.classList.add("mermaid");
+        mermaidDiv.innerHTML = codeBlock.innerHTML;
+        parentPre.replaceWith(mermaidDiv);
+    }
+
+    mermaid.init();
+}
--- a/apps/client/src/stylesheets/ckeditor-theme.css
+++ b/apps/client/src/stylesheets/ckeditor-theme.css
@@ -81,8 +81,8 @@ body {

    /* -- Overrides the default colors used by the ckeditor5-image package. --------------------- */

-    --ck-color-image-caption-background: var(--main-background-color);
-    --ck-color-image-caption-text: var(--main-text-color);
+    --ck-content-color-image-caption-background: var(--main-background-color);
+    --ck-content-color-image-caption-text: var(--main-text-color);

    /* -- Overrides the default colors used by the ckeditor5-widget package. -------------------- */

--- a/apps/client/src/stylesheets/print.css
+++ b/apps/client/src/stylesheets/print.css
@@ -320,3 +320,8 @@ h6 {
    page-break-after: avoid;
    break-after: avoid;
 }
+
+figure.table {
+    /* Workaround for https://github.com/ckeditor/ckeditor5/issues/18903. Remove once official fix is released */
+    display: table !important;
+}
--- a/apps/client/src/stylesheets/style.css
+++ b/apps/client/src/stylesheets/style.css
@@ -139,12 +139,6 @@ textarea,
    color: var(--muted-text-color);
 }

-/* Restore default apperance */
-input[type="number"],
-input[type="checkbox"] {
-    appearance: auto !important;
-}
-
 /* Add a gap between consecutive radios / check boxes */
 label.tn-radio + label.tn-radio,
 label.tn-checkbox + label.tn-checkbox {
@@ -192,6 +186,13 @@ samp {
    font-family: var(--monospace-font-family) !important;
 }

+.badge {
+    --bs-badge-color: var(--muted-text-color);
+
+    margin-left: 8px;
+    background: var(--accented-background-color);
+}
+
 .input-group-text {
    background-color: var(--accented-background-color) !important;
    color: var(--muted-text-color) !important;
@@ -320,7 +321,8 @@ button kbd {
    }
 }

-.dropdown-menu {
+.dropdown-menu,
+.tabulator-popup-container {
    color: var(--menu-text-color) !important;
    font-size: inherit;
    background-color: var(--menu-background-color) !important;
@@ -330,7 +332,13 @@ button kbd {
    --bs-dropdown-link-active-bg: var(--active-item-background-color) !important;
 }

-body.desktop .dropdown-menu {
+.dropdown-menu .dropdown-divider {
+    break-before: avoid;
+    break-after: avoid;
+}
+
+body.desktop .dropdown-menu,
+body.desktop .tabulator-popup-container {
    border: 1px solid var(--dropdown-border-color);
    box-shadow: 0px 10px 20px rgba(0, 0, 0, var(--dropdown-shadow-opacity));
    animation: dropdown-menu-opening 100ms ease-in;
@@ -373,7 +381,8 @@ body.desktop .dropdown-menu {
 }

 .dropdown-menu a:hover:not(.disabled),
-.dropdown-item:hover:not(.disabled, .dropdown-item-container) {
+.dropdown-item:hover:not(.disabled, .dropdown-item-container),
+.tabulator-menu-item:hover {
    color: var(--hover-item-text-color) !important;
    background-color: var(--hover-item-background-color) !important;
    border-color: var(--hover-item-border-color) !important;
@@ -528,6 +537,7 @@ button.btn-sm {
    /* Making this narrower because https://github.com/zadam/trilium/issues/502 (problem only in smaller font sizes) */
    min-width: 0;
    padding: 0;
+    z-index: 1000;
 }

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

+.note-tooltip-content .open-popup-button {
+    position: absolute;
+    right: 15px;
+    bottom: 8px;
+    font-size: 1.2em;
+    color: inherit;
+}
+
 .note-tooltip-attributes {
    display: -webkit-box;
    -webkit-box-orient: vertical;
@@ -900,6 +918,13 @@ div[data-notify="container"] {
    font-family: var(--monospace-font-family);
 }

+.ck-content {
+    --ck-content-font-family: var(--detail-font-family);
+    --ck-content-font-size: 1.1em;
+    --ck-content-font-color: var(--main-text-color);
+    --ck-content-line-height: var(--bs-body-line-height);
+}
+
 .ck-content .table table th {
    background-color: var(--accented-background-color);
 }
@@ -1186,12 +1211,14 @@ body.mobile .dropdown-submenu > .dropdown-menu {
 }

 #context-menu-container,
-#context-menu-container .dropdown-menu {
-    padding: 3px 0 0;
+#context-menu-container .dropdown-menu,
+.tabulator-popup-container {
+    padding: 3px 0;
    z-index: 2000;
 }

-#context-menu-container .dropdown-item {
+#context-menu-container .dropdown-item,
+.tabulator-menu .tabulator-menu-item {
    padding: 0 7px 0 10px;
    cursor: pointer;
    user-select: none;
@@ -1753,6 +1780,54 @@ textarea {
    padding: 1rem;
 }

+/* Command palette styling */
+.jump-to-note-dialog .command-suggestion {
+    display: flex;
+    align-items: center;
+    gap: 0.75rem;
+    font-size: 0.9em;
+}
+
+.jump-to-note-dialog .aa-suggestion .command-suggestion,
+.jump-to-note-dialog .aa-suggestion .command-suggestion div {
+    padding: 0;
+}
+
+.jump-to-note-dialog .aa-cursor .command-suggestion,
+.jump-to-note-dialog .aa-suggestion:hover .command-suggestion {
+    border-left-color: var(--link-color);
+    background-color: var(--hover-background-color);
+}
+
+.jump-to-note-dialog .command-icon {
+    color: var(--muted-text-color);
+    font-size: 1.125rem;
+    flex-shrink: 0;
+    margin-top: 0.125rem;
+}
+
+.jump-to-note-dialog .command-content {
+    flex-grow: 1;
+    min-width: 0;
+}
+
+.jump-to-note-dialog .command-name {
+    font-weight: bold;
+}
+
+.jump-to-note-dialog .command-description {
+    font-size: 0.8em;
+    line-height: 1.3;
+    opacity: 0.75;
+}
+
+.jump-to-note-dialog kbd.command-shortcut {
+    background-color: transparent;
+    color: inherit;
+    opacity: 0.75;
+    font-family: inherit !important;
+}
+
 .empty-table-placeholder {
    text-align: center;
    color: var(--muted-text-color);
@@ -1862,12 +1937,14 @@ body.zen .note-title-widget input {

 /* Content renderer */

-footer.file-footer {
+footer.file-footer,
+footer.webview-footer {
    display: flex;
    justify-content: center;
 }

-footer.file-footer button {
+footer.file-footer button,
+footer.webview-footer button {
    margin: 5px;
 }

--- a/apps/client/src/stylesheets/table.css
+++ b/apps/client/src/stylesheets/table.css
@@ -0,0 +1,199 @@
+.tabulator {
+    --table-background-color: var(--main-background-color);
+
+    --col-header-background-color: var(--main-background-color);
+    --col-header-hover-background-color: var(--accented-background-color);
+    --col-header-text-color: var(--main-text-color);
+    --col-header-arrow-active-color: var(--main-text-color);
+    --col-header-arrow-inactive-color: var(--more-accented-background-color);
+    --col-header-separator-border: none;
+    --col-header-bottom-border: 2px solid var(--main-border-color);
+
+    --row-background-color: var(--main-background-color);
+    --row-alternate-background-color: var(--main-background-color);
+    --row-moving-background-color: var(--accented-background-color);
+    --row-text-color: var(--main-text-color);
+    --row-delimiter-color: var(--more-accented-background-color);
+    
+    --cell-horiz-padding-size: 8px;
+    --cell-vert-padding-size: 8px;
+    
+    --cell-editable-hover-outline-color: var(--main-border-color);
+    --cell-read-only-text-color: var(--muted-text-color);
+    
+    --cell-editing-border-color: var(--main-border-color);
+    --cell-editing-border-width: 2px;
+    --cell-editing-background-color: var(--ck-color-selector-focused-cell-background);
+    --cell-editing-text-color: initial;
+
+    background: unset;
+    border: unset;
+}
+
+.tabulator .tabulator-tableholder .tabulator-table {
+    background: var(--table-background-color);
+}
+
+/* Column headers */
+
+.tabulator div.tabulator-header {
+    border-bottom: var(--col-header-bottom-border);
+    background: var(--col-header-background-color);
+    color: var(--col-header-text-color);
+}
+
+.tabulator .tabulator-col-content {
+    padding: 8px 4px !important;
+}
+
+@media (hover: hover) and (pointer: fine) {
+  .tabulator .tabulator-header .tabulator-col.tabulator-sortable.tabulator-col-sorter-element:hover {
+    background-color: var(--col-header-hover-background-color);
+  }
+}
+
+.tabulator div.tabulator-header .tabulator-col.tabulator-moving {
+    border: none;
+    background: var(--col-header-hover-background-color);
+}
+
+.tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort] .tabulator-col-content .tabulator-col-sorter .tabulator-arrow {
+    border-bottom-color: var(--col-header-arrow-active-color);
+    border-top-color: var(--col-header-arrow-active-color);
+}
+
+.tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort="none"] .tabulator-col-content .tabulator-col-sorter .tabulator-arrow {
+    border-bottom-color: var(--col-header-arrow-inactive-color);
+}
+
+.tabulator div.tabulator-header .tabulator-frozen.tabulator-frozen-left {
+    margin-left: var(--cell-editing-border-width);
+}
+
+.tabulator div.tabulator-header .tabulator-col,
+.tabulator div.tabulator-header .tabulator-frozen.tabulator-frozen-left {
+    background: var(--col-header-background-color);
+    border-right: var(--col-header-separator-border);
+}
+
+/* Table body */
+
+.tabulator-tableholder {
+    padding-top: 10px;
+    height: unset !important; /* Don't extend on the full height */
+}
+
+/* Rows */
+
+.tabulator-row .tabulator-cell {
+    padding: var(--cell-vert-padding-size) var(--cell-horiz-padding-size);
+}
+
+.tabulator-row .tabulator-cell input {
+    padding-left: var(--cell-horiz-padding-size) !important;
+    padding-right: var(--cell-horiz-padding-size) !important;
+}
+
+.tabulator-row {
+    background: transparent;
+    border-top: none;
+    border-bottom: 1px solid var(--row-delimiter-color);
+    color: var(--row-text-color);
+}
+
+.tabulator-row.tabulator-row-odd {
+    background: var(--row-background-color);
+}
+
+.tabulator-row.tabulator-row-even {
+    background: var(--row-alternate-background-color);
+}
+
+.tabulator-row.tabulator-moving {
+    border-color: transparent;
+    background-color: var(--row-moving-background-color);
+}
+
+/* Cell */
+
+.tabulator-row .tabulator-cell.tabulator-frozen.tabulator-frozen-left {
+    margin-right: var(--cell-editing-border-width);
+}
+
+.tabulator-row .tabulator-cell.tabulator-frozen.tabulator-frozen-left,
+.tabulator-row .tabulator-cell {
+    border-right-color: transparent;
+}
+
+.tabulator-row .tabulator-cell:not(.tabulator-editable) {
+    color: var(--cell-read-only-text-color);
+}
+
+.tabulator:not(.tabulator-editing) .tabulator-row .tabulator-cell.tabulator-editable:hover {
+    outline: 2px solid var(--cell-editable-hover-outline-color);
+    outline-offset: -1px;
+}
+
+.tabulator-row .tabulator-cell.tabulator-editing {
+    border-color: transparent;
+}
+
+.tabulator-row:not(.tabulator-moving) .tabulator-cell.tabulator-editing {
+    outline: calc(var(--cell-editing-border-width) - 1px) solid var(--cell-editing-border-color);
+    border-color: var(--cell-editing-border-color);
+    background: var(--cell-editing-background-color);
+}
+
+.tabulator-row:not(.tabulator-moving) .tabulator-cell.tabulator-editing > * {
+    color: var(--cell-editing-text-color);
+}
+
+.tabulator .tree-collapse,
+.tabulator .tree-expand {
+    color: var(--row-text-color);
+}
+
+/* Align items without children/expander to the ones with. */
+.tabulator-cell[tabulator-field="title"] > span:first-child,         /* 1st level */
+.tabulator-cell[tabulator-field="title"] > div:first-child + span {  /* sub-level */
+    padding-left: 21px;
+}
+
+/* Checkbox cells */
+
+.tabulator .tabulator-cell:has(svg),
+.tabulator .tabulator-cell:has(input[type="checkbox"]) {
+    padding-left: 8px;
+    display: inline-flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: flex-start;
+}
+
+.tabulator .tabulator-cell input[type="checkbox"] {
+    margin: 0;
+}
+
+.tabulator .tabulator-footer {
+    color: var(--main-text-color);
+}
+
+/* Context menus */
+
+.tabulator-popup-container {
+    min-width: 10em;
+    border-radius: var(--bs-border-radius);
+}
+
+.tabulator-menu .tabulator-menu-item {
+    border: 1px solid transparent;
+    color: var(--menu-text-color);
+    font-size: 16px;
+}
+
+/* Footer */
+
+:root .tabulator .tabulator-footer {
+    border-top: unset;
+    padding: 10px 0;
+}
--- a/apps/client/src/stylesheets/theme-next-dark.css
+++ b/apps/client/src/stylesheets/theme-next-dark.css
@@ -178,6 +178,9 @@

    --alert-bar-background: #6b6b6b3b;

+    --badge-background-color: #ffffff1a;
+    --badge-text-color: var(--muted-text-color);
+
    --promoted-attribute-card-background-color: var(--card-background-color);
    --promoted-attribute-card-shadow-color: #000000b3;

--- a/apps/client/src/stylesheets/theme-next-light.css
+++ b/apps/client/src/stylesheets/theme-next-light.css
@@ -171,6 +171,9 @@

    --alert-bar-background: #32637b29;

+    --badge-background-color: #00000011;
+    --badge-text-color: var(--muted-text-color);
+
    --promoted-attribute-card-background-color: var(--card-background-color);
    --promoted-attribute-card-shadow-color: #00000033;

--- a/apps/client/src/stylesheets/theme-next/base.css
+++ b/apps/client/src/stylesheets/theme-next/base.css
@@ -4,6 +4,7 @@
@import url(./pages.css);
@import url(./ribbon.css);
@import url(./notes/text.css);
+@import url(./notes/collections/table.css);

@font-face {
    font-family: "Inter";
@@ -171,9 +172,19 @@ html body .dropdown-item[disabled] {
    opacity: var(--menu-item-disabled-opacity);
 }

+/* Badges */
+:root .badge {
+    --bs-badge-color: var(--badge-text-color);
+    --bs-badge-font-weight: 500;
+
+    background: var(--badge-background-color);
+    text-transform: uppercase;
+    letter-spacing: .2pt;
+}
+
 /* Menu item icon */
 .dropdown-item .bx {
-    transform: translateY(var(--menu-item-icon-vert-offset));
+    translate: 0 var(--menu-item-icon-vert-offset);
    color: var(--menu-item-icon-color) !important;
    font-size: 1.1em;
 }
@@ -447,6 +458,11 @@ body.mobile .dropdown-menu .dropdown-item.submenu-open .dropdown-toggle::after {
    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;
 }
--- a/apps/client/src/stylesheets/theme-next/dialogs.css
+++ b/apps/client/src/stylesheets/theme-next/dialogs.css
@@ -128,10 +128,15 @@ div.tn-tool-dialog {

 .jump-to-note-dialog .modal-header {
    padding: unset !important;
+    padding-bottom: 26px !important;
 }

 .jump-to-note-dialog .modal-body {
-    padding: 26px 0 !important;
+    padding: 0 !important;
+}
+
+.jump-to-note-dialog .modal-footer {
+    padding-top: 26px;
 }

 /* Search box wrapper */
--- a/apps/client/src/stylesheets/theme-next/notes/collections/table.css
+++ b/apps/client/src/stylesheets/theme-next/notes/collections/table.css
@@ -0,0 +1,13 @@
+:root .tabulator {
+    --col-header-hover-background-color: var(--hover-item-background-color);
+    --col-header-arrow-active-color: var(--active-item-text-color);
+    --col-header-arrow-inactive-color: var(--main-border-color);
+
+    --row-moving-background-color: var(--more-accented-background-color);
+
+    --cell-editable-hover-outline-color: var(--input-focus-outline-color);
+
+    --cell-editing-border-color: var(--input-focus-outline-color);
+    --cell-editing-background-color: var(--input-background-color);
+    --cell-editing-text-color: var(--input-text-color);
+}
--- a/apps/client/src/stylesheets/theme-next/shell.css
+++ b/apps/client/src/stylesheets/theme-next/shell.css
@@ -71,12 +71,13 @@ body.background-effects.platform-win32.layout-vertical #vertical-main-container
 /* #endregion */

 /* Matches when the left pane is collapsed */
-#horizontal-main-container:has(#left-pane.hidden-int) {
+#horizontal-main-container.left-pane-hidden {
    --center-pane-border-radius: 0;
    --tab-first-item-horiz-offset: 5px;
 }

-:has(#left-pane.hidden-int) #launcher-pane.vertical {
+/* Add a border to the vertical launch bar if collapsed. */
+body.layout-vertical #horizontal-main-container.left-pane-hidden #launcher-pane.vertical {
    border-right: 2px solid var(--left-pane-collapsed-border-color);
 }

@@ -1300,9 +1301,9 @@ div.promoted-attribute-cell .tn-checkbox {
    height: 1cap;
 }

-/* The <div> containing the checkbox for a promoted boolean attribute */
-div.promoted-attribute-cell div:has(input[type="checkbox"]) {
-    order: -1; /* Relocate the checkbox before the label */
+/* Relocate the checkbox before the label */
+div.promoted-attribute-cell.promoted-attribute-label-boolean > div:first-of-type {
+    order: -1;
    margin-right: 1.5em;
 }

@@ -1677,4 +1678,42 @@ div.find-replace-widget div.find-widget-found-wrapper > span {
 #right-pane .highlights-list li:active {
    background: transparent;
    transition: none;
+}
+
+/** Canvas **/
+
+.excalidraw {
+    --border-radius-lg: 6px;
+}
+
+.excalidraw .Island {
+    backdrop-filter: var(--dropdown-backdrop-filter);
+}
+
+.excalidraw .Island.App-toolbar {
+    --island-bg-color: var(--floating-button-background-color);
+    --shadow-island: 1px 1px 1px var(--floating-button-shadow-color);
+}
+
+.excalidraw .dropdown-menu {
+    border: unset !important;
+    box-shadow: unset !important;    
+    background-color: transparent !important;
+    --island-bg-color: var(--menu-background-color);
+    --shadow-island: 0px 10px 20px rgba(0, 0, 0, var(--dropdown-shadow-opacity));
+    --default-border-color: var(--bs-dropdown-divider-bg);
+    --button-hover-bg: var(--hover-item-background-color);
+}
+
+.excalidraw .dropdown-menu .dropdown-menu-container {
+    border-radius: var(--dropdown-border-radius);
+}
+
+.excalidraw .dropdown-menu .dropdown-menu-container > div:not([class]):not(:last-child) {
+    margin-left: calc(var(--padding) * var(--space-factor) * -1) !important;
+    margin-right: calc(var(--padding) * var(--space-factor) * -1) !important;
+}
+
+.excalidraw .dropdown-menu:before {
+    content: unset !important;
 }
--- a/apps/client/src/translations/ca/translation.json
+++ b/apps/client/src/translations/ca/translation.json
@@ -0,0 +1,214 @@
+{
+    "about": {
+        "title": "Sobre Trilium Notes",
+        "close": "Tanca",
+        "homepage": "Pàgina principal:"
+    },
+    "add_link": {
+        "note": "Nota",
+        "close": "Tanca"
+    },
+    "branch_prefix": {
+        "close": "Tanca",
+        "prefix": "Prefix: ",
+        "save": "Desa"
+    },
+    "bulk_actions": {
+        "close": "Tanca",
+        "labels": "Etiquetes",
+        "relations": "Relacions",
+        "notes": "Notes",
+        "other": "Altres"
+    },
+    "clone_to": {
+        "close": "Tanca"
+    },
+    "confirm": {
+        "confirmation": "Confirmació",
+        "close": "Tanca",
+        "cancel": "Cancel·la",
+        "ok": "OK"
+    },
+    "delete_notes": {
+        "close": "Tanca",
+        "cancel": "Cancel·la",
+        "ok": "OK"
+    },
+    "export": {
+        "close": "Tanca",
+        "export": "Exporta"
+    },
+    "help": {
+        "close": "Tanca",
+        "troubleshooting": "Solució de problemes",
+        "other": "Altres"
+    },
+    "import": {
+        "close": "Tanca",
+        "options": "Opcions",
+        "import": "Importa"
+    },
+    "include_note": {
+        "close": "Tanca",
+        "label_note": "Nota"
+    },
+    "info": {
+        "closeButton": "Tanca",
+        "okButton": "OK"
+    },
+    "jump_to_note": {
+        "close": "Tanca"
+    },
+    "markdown_import": {
+        "close": "Tanca"
+    },
+    "move_to": {
+        "close": "Tanca"
+    },
+    "note_type_chooser": {
+        "close": "Tanca",
+        "templates": "Plantilles:"
+    },
+    "password_not_set": {
+        "close": "Tanca"
+    },
+    "prompt": {
+        "title": "Sol·licitud",
+        "close": "Tanca",
+        "defaultTitle": "Sol·licitud"
+    },
+    "protected_session_password": {
+        "close_label": "Tanca"
+    },
+    "recent_changes": {
+        "close": "Tanca",
+        "undelete_link": "recuperar"
+    },
+    "revisions": {
+        "close": "Tanca",
+        "restore_button": "Restaura",
+        "delete_button": "Suprimeix",
+        "download_button": "Descarrega",
+        "mime": "MIME: ",
+        "preview": "Vista prèvia:"
+    },
+    "sort_child_notes": {
+        "close": "Tanca",
+        "title": "títol",
+        "ascending": "ascendent",
+        "descending": "descendent",
+        "folders": "Carpetes"
+    },
+    "upload_attachments": {
+        "close": "Tanca",
+        "options": "Opcions",
+        "upload": "Puja"
+    },
+    "attribute_detail": {
+        "name": "Nom",
+        "value": "Valor",
+        "promoted": "Destacat",
+        "promoted_alias": "Àlies",
+        "multiplicity": "Multiplicitat",
+        "label_type": "Tipus",
+        "text": "Text",
+        "number": "Número",
+        "boolean": "Booleà",
+        "date": "Data",
+        "time": "Hora",
+        "url": "URL",
+        "precision": "Precisió",
+        "digits": "dígits",
+        "inheritable": "Heretable",
+        "delete": "Suprimeix",
+        "color_type": "Color"
+    },
+    "rename_label": {
+        "to": "Per"
+    },
+    "move_note": {
+        "to": "a"
+    },
+    "add_relation": {
+        "to": "a"
+    },
+    "rename_relation": {
+        "to": "Per"
+    },
+    "update_relation_target": {
+        "to": "a"
+    },
+    "attachments_actions": {
+        "download": "Descarrega"
+    },
+    "calendar": {
+        "mon": "Dl",
+        "tue": "Dt",
+        "wed": "dc",
+        "thu": "Dj",
+        "fri": "Dv",
+        "sat": "Ds",
+        "sun": "Dg",
+        "january": "Gener",
+        "febuary": "Febrer",
+        "march": "Març",
+        "april": "Abril",
+        "may": "Maig",
+        "june": "Juny",
+        "july": "Juliol",
+        "august": "Agost",
+        "september": "Setembre",
+        "october": "Octubre",
+        "november": "Novembre",
+        "december": "Desembre"
+    },
+    "global_menu": {
+        "menu": "Menú",
+        "options": "Opcions",
+        "zoom": "Zoom",
+        "advanced": "Avançat",
+        "logout": "Tanca la sessió"
+    },
+    "zpetne_odkazy": {
+        "relation": "relació"
+    },
+    "note_icon": {
+        "category": "Categoria:",
+        "search": "Cerca:"
+    },
+    "basic_properties": {
+        "editable": "Editable",
+        "language": "Llengua"
+    },
+    "book_properties": {
+        "grid": "Graella",
+        "list": "Llista",
+        "collapse": "Replega",
+        "expand": "Desplega",
+        "calendar": "Calendari",
+        "table": "Taula",
+        "board": "Tauler"
+    },
+    "edited_notes": {
+        "deleted": "(suprimit)"
+    },
+    "file_properties": {
+        "download": "Descarrega",
+        "open": "Obre",
+        "title": "Fitxer"
+    },
+    "image_properties": {
+        "download": "Descarrega",
+        "open": "Obre",
+        "title": "Imatge"
+    },
+    "note_info_widget": {
+        "created": "Creat",
+        "modified": "Modificat",
+        "type": "Tipus",
+        "calculate": "calcula"
+    },
+    "note_paths": {
+        "archived": "Arxivat"
+    }
+}
--- a/apps/client/src/translations/cn/translation.json
+++ b/apps/client/src/translations/cn/translation.json
--- a/apps/client/src/translations/de/translation.json
+++ b/apps/client/src/translations/de/translation.json
--- a/apps/client/src/translations/el/translation.json
+++ b/apps/client/src/translations/el/translation.json
@@ -0,0 +1,19 @@
+{
+    "about": {
+        "title": "Πληροφορίες για το Trilium Notes",
+        "close": "Κλείσιμο",
+        "homepage": "Αρχική Σελίδα:",
+        "app_version": "Έκδοση εφαρμογής:",
+        "db_version": "Έκδοση βάσης δεδομένων:",
+        "sync_version": "Έκδοση πρωτοκόλου συγχρονισμού:",
+        "build_date": "Ημερομηνία χτισίματος εφαρμογής:",
+        "build_revision": "Αριθμός αναθεώρησης χτισίματος:",
+        "data_directory": "Φάκελος δεδομένων:"
+    },
+    "toast": {
+        "critical-error": {
+            "title": "Κρίσιμο σφάλμα",
+            "message": "Συνέβη κάποιο κρίσιμο σφάλμα, το οποίο δεν επιτρέπει στην εφαρμογή χρήστη να ξεκινήσει:\n\n{{message}}\n\nΤο πιθανότερο είναι να προκλήθηκε από κάποιο script που απέτυχε απρόοπτα. Δοκιμάστε να ξεκινήσετε την εφαρμογή σε ασφαλή λειτουργία για να λύσετε το πρόβλημα."
+        }
+    }
+}
--- a/apps/client/src/translations/en/translation.json
+++ b/apps/client/src/translations/en/translation.json
@@ -211,7 +211,7 @@
    "okButton": "OK"
  },
  "jump_to_note": {
-    "search_placeholder": "search for note by its name",
+    "search_placeholder": "Search for note by its name or type > for commands...",
    "close": "Close",
    "search_button": "Search in full text <kbd>Ctrl+Enter</kbd>"
  },
@@ -443,7 +443,8 @@
    "other_notes_with_name": "Other notes with {{attributeType}} name \"{{attributeName}}\"",
    "and_more": "... and {{count}} more.",
    "print_landscape": "When exporting to PDF, changes the orientation of the page to landscape instead of portrait.",
-    "print_page_size": "When exporting to PDF, changes the size of the page. Supported values: <code>A0</code>, <code>A1</code>, <code>A2</code>, <code>A3</code>, <code>A4</code>, <code>A5</code>, <code>A6</code>, <code>Legal</code>, <code>Letter</code>, <code>Tabloid</code>, <code>Ledger</code>."
+    "print_page_size": "When exporting to PDF, changes the size of the page. Supported values: <code>A0</code>, <code>A1</code>, <code>A2</code>, <code>A3</code>, <code>A4</code>, <code>A5</code>, <code>A6</code>, <code>Legal</code>, <code>Letter</code>, <code>Tabloid</code>, <code>Ledger</code>.",
+    "color_type": "Color"
  },
  "attribute_editor": {
    "help_text_body1": "To add label, just type e.g. <code>#rock</code> or if you want to add also value then e.g. <code>#year = 2020</code>",
@@ -758,10 +759,12 @@
    "expand_all_children": "Expand all children",
    "collapse": "Collapse",
    "expand": "Expand",
-    "book_properties": "Book Properties",
+    "book_properties": "Collection Properties",
    "invalid_view_type": "Invalid view type '{{type}}'",
    "calendar": "Calendar",
-    "table": "Table"
+    "table": "Table",
+    "geo-map": "Geo Map",
+    "board": "Board"
  },
  "edited_notes": {
    "no_edited_notes_found": "No edited notes on this day yet...",
@@ -838,7 +841,8 @@
    "unknown_label_type": "Unknown label type '{{type}}'",
    "unknown_attribute_type": "Unknown attribute type '{{type}}'",
    "add_new_attribute": "Add new attribute",
-    "remove_this_attribute": "Remove this attribute"
+    "remove_this_attribute": "Remove this attribute",
+    "remove_color": "Remove the color label"
  },
  "script_executor": {
    "query": "Query",
@@ -961,7 +965,7 @@
    "no_attachments": "This note has no attachments."
  },
  "book": {
-    "no_children_help": "This note of type Book doesn't have any child notes so there's nothing to display. See <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> for details."
+    "no_children_help": "This collection doesn't have any child notes so there's nothing to display. See <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> for details."
  },
  "editable_code": {
    "placeholder": "Type the content of your code note here..."
@@ -1024,7 +1028,7 @@
    "title": "Consistency Checks",
    "find_and_fix_button": "Find and fix consistency issues",
    "finding_and_fixing_message": "Finding and fixing consistency issues...",
-    "issues_fixed_message": "Consistency issues should be fixed."
+    "issues_fixed_message": "Any consistency issue which may have been found is now fixed."
  },
  "database_anonymization": {
    "title": "Database Anonymization",
@@ -1594,12 +1598,13 @@
    "move-to": "Move to...",
    "paste-into": "Paste into",
    "paste-after": "Paste after",
-    "duplicate-subtree": "Duplicate subtree",
+    "duplicate": "Duplicate",
    "export": "Export",
    "import-into-note": "Import into note",
    "apply-bulk-actions": "Apply bulk actions",
    "converted-to-attachments": "{{count}} notes have been converted to attachments.",
-    "convert-to-attachment-confirm": "Are you sure you want to convert note selected notes into attachments of their parent notes?"
+    "convert-to-attachment-confirm": "Are you sure you want to convert note selected notes into attachments of their parent notes?",
+    "open-in-popup": "Quick edit"
  },
  "shared_info": {
    "shared_publicly": "This note is shared publicly on",
@@ -1613,7 +1618,7 @@
    "relation-map": "Relation Map",
    "note-map": "Note Map",
    "render-note": "Render Note",
-    "book": "Book",
+    "book": "Collection",
    "mermaid-diagram": "Mermaid Diagram",
    "canvas": "Canvas",
    "web-view": "Web View",
@@ -1627,7 +1632,9 @@
    "geo-map": "Geo Map",
    "beta-feature": "Beta",
    "ai-chat": "AI Chat",
-    "task-list": "Task List"
+    "task-list": "Task List",
+    "new-feature": "New",
+    "collections": "Collections"
  },
  "protect_note": {
    "toggle-on": "Protect the note",
@@ -1829,7 +1836,8 @@
  "link_context_menu": {
    "open_note_in_new_tab": "Open note in a new tab",
    "open_note_in_new_split": "Open note in a new split",
-    "open_note_in_new_window": "Open note in a new window"
+    "open_note_in_new_window": "Open note in a new window",
+    "open_note_in_popup": "Quick edit"
  },
  "electron_integration": {
    "desktop-application": "Desktop Application",
@@ -1849,7 +1857,8 @@
    "full-text-search": "Full text search"
  },
  "note_tooltip": {
-    "note-has-been-deleted": "Note has been deleted."
+    "note-has-been-deleted": "Note has been deleted.",
+    "quick-edit": "Quick edit"
  },
  "geo-map": {
    "create-child-note-title": "Create a new child note and add it to the map",
@@ -1858,7 +1867,8 @@
  },
  "geo-map-context": {
    "open-location": "Open location",
-    "remove-from-map": "Remove from map"
+    "remove-from-map": "Remove from map",
+    "add-note": "Add a marker at this location"
  },
  "help-button": {
    "title": "Open the relevant help page"
@@ -1937,6 +1947,66 @@
  },
  "table_view": {
    "new-row": "New row",
-    "new-column": "New column"
+    "new-column": "New column",
+    "sort-column-by": "Sort by \"{{title}}\"",
+    "sort-column-ascending": "Ascending",
+    "sort-column-descending": "Descending",
+    "sort-column-clear": "Clear sorting",
+    "hide-column": "Hide column \"{{title}}\"",
+    "show-hide-columns": "Show/hide columns",
+    "row-insert-above": "Insert row above",
+    "row-insert-below": "Insert row below",
+    "row-insert-child": "Insert child note",
+    "add-column-to-the-left": "Add column to the left",
+    "add-column-to-the-right": "Add column to the right",
+    "edit-column": "Edit column",
+    "delete_column_confirmation": "Are you sure you want to delete this column? The corresponding attribute will be removed from all notes.",
+    "delete-column": "Delete column",
+    "new-column-label": "Label",
+    "new-column-relation": "Relation"
+  },
+  "book_properties_config": {
+    "hide-weekends": "Hide weekends",
+    "display-week-numbers": "Display week numbers",
+    "map-style": "Map style:",
+    "max-nesting-depth": "Max nesting depth:",
+    "raster": "Raster",
+    "vector_light": "Vector (Light)",
+    "vector_dark": "Vector (Dark)",
+    "show-scale": "Show scale"
+  },
+  "table_context_menu": {
+    "delete_row": "Delete row"
+  },
+  "board_view": {
+    "delete-note": "Delete Note",
+    "move-to": "Move to",
+    "insert-above": "Insert above",
+    "insert-below": "Insert below",
+    "delete-column": "Delete column",
+    "delete-column-confirmation": "Are you sure you want to delete this column? The corresponding attribute will be deleted in the notes under this column as well.",
+    "new-item": "New item",
+    "add-column": "Add Column"
+  },
+  "command_palette": {
+    "tree-action-name": "Tree: {{name}}",
+    "export_note_title": "Export Note",
+    "export_note_description": "Export current note",
+    "show_attachments_title": "Show Attachments",
+    "show_attachments_description": "View note attachments",
+    "search_notes_title": "Search Notes",
+    "search_notes_description": "Open advanced search",
+    "search_subtree_title": "Search in Subtree",
+    "search_subtree_description": "Search within current subtree",
+    "search_history_title": "Show Search History",
+    "search_history_description": "View previous searches",
+    "configure_launch_bar_title": "Configure Launch Bar",
+    "configure_launch_bar_description": "Open the launch bar configuration, to add or remove items."
+  },
+  "content_renderer": {
+    "open_externally": "Open externally"
+  },
+  "modal": {
+    "close": "Close"
  }
 }
--- a/apps/client/src/translations/es/translation.json
+++ b/apps/client/src/translations/es/translation.json
--- a/apps/client/src/translations/fr/translation.json
+++ b/apps/client/src/translations/fr/translation.json
--- a/apps/client/src/translations/it/translation.json
+++ b/apps/client/src/translations/it/translation.json
@@ -0,0 +1,379 @@
+{
+    "about": {
+        "close": "Chiudi",
+        "app_version": "Versione dell'app:",
+        "db_version": "Versione DB:",
+        "sync_version": "Versione Sync:",
+        "data_directory": "Cartella dati:",
+        "title": "Informazioni su Trilium Notes",
+        "build_date": "Data della build:",
+        "build_revision": "Revisione della build:",
+        "homepage": "Homepage:"
+    },
+    "toast": {
+        "critical-error": {
+            "title": "Errore critico",
+            "message": "Si è verificato un errore critico che impedisce l'avvio dell'applicazione client:\n\n{{message}}\n\nQuesto è probabilmente causato da un errore di script inaspettato. Prova a avviare l'applicazione in modo sicuro e controlla il problema."
+        },
+        "bundle-error": {
+            "title": "Non si è riusciti a caricare uno script personalizzato",
+            "message": "Lo script della nota con ID \"{{id}}\", dal titolo \"{{title}}\" non è stato inizializzato a causa di:\n\n{{message}}"
+        },
+        "widget-error": {
+            "title": "Impossibile inizializzare un widget",
+            "message-custom": "Il widget personalizzato della nota con ID \"{{id}}\", dal titolo \"{{title}}\" non è stato inizializzato a causa di:\n\n{{message}}",
+            "message-unknown": "Un widget sconosciuto non è stato inizializzato a causa di:\n\n{{message}}"
+        }
+    },
+    "add_link": {
+        "add_link": "Aggiungi un collegamento",
+        "close": "Chiudi",
+        "note": "Nota",
+        "search_note": "cerca una nota per nome",
+        "link_title_mirrors": "il titolo del collegamento rispecchia il titolo della nota corrente",
+        "link_title_arbitrary": "il titolo del collegamento può essere modificato arbitrariamente",
+        "link_title": "Titolo del collegamento",
+        "button_add_link": "Aggiungi il collegamento <kbd>invio</kbd>",
+        "help_on_links": "Aiuto sui collegamenti"
+    },
+    "branch_prefix": {
+        "edit_branch_prefix": "Modifica il prefisso del ramo",
+        "help_on_tree_prefix": "Aiuto sui prefissi dell'Albero",
+        "close": "Chiudi",
+        "prefix": "Prefisso: ",
+        "save": "Salva",
+        "branch_prefix_saved": "Il prefisso del ramo è stato salvato."
+    },
+    "bulk_actions": {
+        "bulk_actions": "Azioni massive",
+        "close": "Chiudi",
+        "affected_notes": "Note influenzate",
+        "include_descendants": "Includi i discendenti della nota selezionata",
+        "available_actions": "Azioni disponibili",
+        "chosen_actions": "Azioni scelte",
+        "execute_bulk_actions": "Esegui le azioni massive",
+        "bulk_actions_executed": "Le azioni massive sono state eseguite con successo.",
+        "none_yet": "Ancora nessuna... aggiungi una azione cliccando su una di quelle disponibili sopra.",
+        "labels": "Etichette",
+        "relations": "Relazioni",
+        "notes": "Note",
+        "other": "Altro"
+    },
+    "clone_to": {
+        "clone_notes_to": "Clona note in...",
+        "close": "Chiudi",
+        "help_on_links": "Aiuto sui collegamenti",
+        "notes_to_clone": "Note da clonare",
+        "target_parent_note": "Nodo padre obiettivo",
+        "search_for_note_by_its_name": "cerca una nota per nome",
+        "cloned_note_prefix_title": "Le note clonate saranno mostrate nell'albero delle note con il dato prefisso",
+        "prefix_optional": "Prefisso (opzionale)",
+        "clone_to_selected_note": "Clona sotto la nota selezionata <kbd>invio</kbd>",
+        "no_path_to_clone_to": "Nessun percorso per clonare dentro.",
+        "note_cloned": "La nota \"{{clonedTitle}}\" è stata clonata in \"{{targetTitle}}\""
+    },
+    "confirm": {
+        "close": "Chiudi",
+        "cancel": "Annulla",
+        "ok": "OK",
+        "confirmation": "Conferma",
+        "are_you_sure_remove_note": "Sei sicuro di voler rimuovere la nota \"{{title}}\" dalla mappa delle relazioni? ",
+        "if_you_dont_check": "Se non lo selezioni, la nota sarà rimossa solamente dalla mappa delle relazioni.",
+        "also_delete_note": "Rimuove anche la nota"
+    },
+    "delete_notes": {
+        "ok": "OK",
+        "close": "Chiudi",
+        "delete_notes_preview": "Anteprima di eliminazione delle note",
+        "delete_all_clones_description": "Elimina anche tutti i cloni (può essere disfatto tramite i cambiamenti recenti)",
+        "erase_notes_description": "L'eliminazione normale (soft) marca le note come eliminate e potranno essere recuperate entro un certo lasso di tempo (dalla finestra dei cambiamenti recenti). Selezionando questa opzione le note si elimineranno immediatamente e non sarà possibile recuperarle.",
+        "erase_notes_warning": "Elimina le note in modo permanente (non potrà essere disfatto), compresi tutti i cloni. Ciò forzerà un nuovo caricamento dell'applicazione.",
+        "cancel": "Annulla",
+        "notes_to_be_deleted": "Le seguenti note saranno eliminate ({{- noteCount}})",
+        "no_note_to_delete": "Nessuna nota sarà eliminata (solo i cloni).",
+        "broken_relations_to_be_deleted": "Le seguenti relazioni saranno interrotte ed eliminate ({{- relationCount}})",
+        "deleted_relation_text": "La nota {{- note}} (da eliminare) è referenziata dalla relazione {{- relation}} originata da {{- source}}."
+    },
+    "info": {
+        "okButton": "OK",
+        "closeButton": "Chiudi"
+    },
+    "export": {
+        "close": "Chiudi",
+        "export_note_title": "Esporta la nota",
+        "export_status": "Stato dell'esportazione",
+        "export": "Esporta",
+        "choose_export_type": "Scegli prima il tipo di esportazione, per favore",
+        "export_in_progress": "Esportazione in corso: {{progressCount}}",
+        "export_finished_successfully": "Esportazione terminata con successo.",
+        "format_pdf": "PDF- allo scopo di stampa o esportazione."
+    },
+    "help": {
+        "close": "Chiudi",
+        "fullDocumentation": "Aiuto (la documentazione completa è disponibile <a class=\"external\" href=\"https://triliumnext.github.io/Docs/\">online</a>)"
+    },
+    "import": {
+        "close": "Chiudi"
+    },
+    "include_note": {
+        "close": "Chiudi"
+    },
+    "jump_to_note": {
+        "close": "Chiudi"
+    },
+    "markdown_import": {
+        "close": "Chiudi"
+    },
+    "move_to": {
+        "close": "Chiudi"
+    },
+    "note_type_chooser": {
+        "close": "Chiudi"
+    },
+    "password_not_set": {
+        "close": "Chiudi",
+        "body1": "Le note protette sono crittografate utilizzando una password utente, ma la password non è stata ancora impostata.",
+        "body2": "Per proteggere le note, fare clic su <a class=\"open-password-options-button\" href=\"javascript:\">qui</a> per aprire la finestra di dialogo Opzioni e impostare la password."
+    },
+    "protected_session_password": {
+        "close_label": "Chiudi"
+    },
+    "prompt": {
+        "close": "Chiudi"
+    },
+    "recent_changes": {
+        "close": "Chiudi"
+    },
+    "revisions": {
+        "close": "Chiudi"
+    },
+    "abstract_bulk_action": {
+        "remove_this_search_action": "Rimuovi questa azione di ricerca"
+    },
+    "etapi": {
+        "new_token_title": "Nuovo token ETAPI",
+        "new_token_message": "Inserire il nuovo nome del token"
+    },
+    "electron_integration": {
+        "zoom-factor": "Fattore di ingrandimento",
+        "desktop-application": "Applicazione Desktop"
+    },
+    "note_autocomplete": {
+        "search-for": "Cerca \"{{term}}\"",
+        "create-note": "Crea e collega la nota figlia \"{{term}}\"",
+        "insert-external-link": "Inserisci il collegamento esterno a \"{{term}}\"",
+        "clear-text-field": "Pulisci il campo di testo",
+        "show-recent-notes": "Mostra le note recenti",
+        "full-text-search": "Ricerca full text"
+    },
+    "note_tooltip": {
+        "note-has-been-deleted": "La nota è stata eliminata.",
+        "quick-edit": "Modifica veloce"
+    },
+    "geo-map": {
+        "create-child-note-title": "Crea una nota figlia e aggiungila alla mappa",
+        "create-child-note-instruction": "Clicca sulla mappa per creare una nuova nota qui o premi Escape per uscire.",
+        "unable-to-load-map": "Impossibile caricare la mappa."
+    },
+    "geo-map-context": {
+        "open-location": "Apri la posizione",
+        "remove-from-map": "Rimuovi dalla mappa",
+        "add-note": "Aggiungi un marcatore in questa posizione"
+    },
+    "debug": {
+        "debug": "Debug"
+    },
+    "database_anonymization": {
+        "light_anonymization": "Anonimizzazione parziale",
+        "title": "Anonimizzazione del Database",
+        "full_anonymization": "Anonimizzazione completa",
+        "full_anonymization_description": "Questa azione creerà una nuova copia del database e lo anonimizzerà (rimuove tutti i contenuti delle note, lasciando solo la struttura e qualche metadato non sensibile) per condividerlo online allo scopo di debugging, senza paura di far trapelare i tuoi dati personali.",
+        "save_fully_anonymized_database": "Salva il database completamente anonimizzato",
+        "light_anonymization_description": "Questa azione creerà una nuova copia del database e lo anonimizzerà in parzialmente — in particolare, solo il contenuto delle note sarà rimosso, ma i titoli e gli attributi rimarranno. Inoltre, note con script personalizzati JS di frontend/backend e widget personalizzati lasciando rimarranno. Ciò mette a disposizione più contesto per il debug dei problemi.",
+        "choose_anonymization": "Puoi decidere da solo se fornire un database completamente o parzialmente anonimizzato. Anche un database completamente anonimizzato è molto utile, sebbene in alcuni casi i database parzialmente anonimizzati possono accelerare il processo di identificazione dei bug e la loro correzione.",
+        "no_anonymized_database_yet": "Nessun database ancora anonimizzato.",
+        "save_lightly_anonymized_database": "Salva il database parzialmente anonimizzato",
+        "successfully_created_fully_anonymized_database": "Database completamente anonimizzato creato in {{anonymizedFilePath}}",
+        "successfully_created_lightly_anonymized_database": "Database parzialmente anonimizzato creato in {{anonymizedFilePath}}"
+    },
+    "cpu_arch_warning": {
+        "title": "Per favore scarica la versione ARM64",
+        "continue_anyway": "Continua Comunque",
+        "dont_show_again": "Non mostrare più questo avviso",
+        "download_link": "Scarica la Versione Nativa"
+    },
+    "editorfeatures": {
+        "title": "Caratteristiche",
+        "emoji_completion_enabled": "Abilita il completamento automatico delle Emoji",
+        "note_completion_enabled": "Abilita il completamento automatico delle note"
+    },
+    "table_view": {
+        "new-row": "Nuova riga",
+        "new-column": "Nuova colonna",
+        "sort-column-by": "Ordina per \"{{title}}\"",
+        "sort-column-ascending": "Ascendente",
+        "sort-column-descending": "Discendente",
+        "sort-column-clear": "Cancella l'ordinamento",
+        "hide-column": "Nascondi la colonna \"{{title}}\"",
+        "show-hide-columns": "Mostra/nascondi le colonne",
+        "row-insert-above": "Inserisci una riga sopra",
+        "row-insert-below": "Inserisci una riga sotto"
+    },
+    "abstract_search_option": {
+        "remove_this_search_option": "Rimuovi questa opzione di ricerca",
+        "failed_rendering": "Opzione di ricerca di rendering non riuscita: {{dto}} con errore: {{error}} {{stack}}"
+    },
+    "ancestor": {
+        "label": "Antenato"
+    },
+    "add_label": {
+        "add_label": "Aggiungi etichetta",
+        "label_name_placeholder": "nome dell'etichetta",
+        "new_value_placeholder": "nuovo valore",
+        "to_value": "al valore"
+    },
+    "update_label_value": {
+        "to_value": "al valore",
+        "label_name_placeholder": "nome dell'etichetta"
+    },
+    "delete_label": {
+        "delete_label": "Elimina etichetta",
+        "label_name_placeholder": "nome dell'etichetta",
+        "label_name_title": "Sono ammessi i caratteri alfanumerici, il carattere di sottolineato e i due punti."
+    },
+    "tree-context-menu": {
+        "move-to": "Muovi in...",
+        "cut": "Taglia"
+    },
+    "electron_context_menu": {
+        "cut": "Taglia",
+        "copy": "Copia",
+        "paste": "Incolla",
+        "copy-link": "Copia collegamento",
+        "paste-as-plain-text": "Incolla come testo semplice"
+    },
+    "editing": {
+        "editor_type": {
+            "multiline-toolbar": "Mostra la barra degli strumenti su più linee se non entra."
+        }
+    },
+    "edit_button": {
+        "edit_this_note": "Modifica questa nota"
+    },
+    "shortcuts": {
+        "shortcuts": "Scorciatoie"
+    },
+    "shared_switch": {
+        "toggle-on-title": "Condividi la nota",
+        "toggle-off-title": "Non condividere la nota"
+    },
+    "search_string": {
+        "search_prefix": "Cerca:"
+    },
+    "attachment_detail": {
+        "open_help_page": "Apri la pagina di aiuto sugli allegati"
+    },
+    "search_definition": {
+        "ancestor": "antenato",
+        "debug": "debug",
+        "action": "azione",
+        "add_search_option": "Aggiungi un opzione di ricerca:",
+        "search_string": "cerca la stringa",
+        "limit": "limite"
+    },
+    "modal": {
+        "close": "Chiudi"
+    },
+    "board_view": {
+        "insert-below": "Inserisci sotto",
+        "delete-column": "Elimina la colonna",
+        "delete-column-confirmation": "Sei sicuro di vole eliminare questa colonna? Il corrispondente attributo sarà eliminato anche nelle note sotto questa colonna."
+    },
+    "backup": {
+        "enable_weekly_backup": "Abilita le archiviazioni settimanali",
+        "enable_monthly_backup": "Abilita le archiviazioni mensili",
+        "backup_recommendation": "Si raccomanda di mantenere attive le archiviazioni, sebbene ciò possa rendere l'avvio dell'applicazione lento con database grandi e/o dispositivi di archiviazione lenti.",
+        "backup_now": "Archivia adesso",
+        "backup_database_now": "Archivia il database adesso",
+        "existing_backups": "Backup esistenti",
+        "date-and-time": "Data e ora",
+        "path": "Percorso",
+        "database_backed_up_to": "Il database è stato archiviato in {{backupFilePath}}",
+        "enable_daily_backup": "Abilita le archiviazioni giornaliere",
+        "no_backup_yet": "Ancora nessuna archiviazione"
+    },
+    "backend_log": {
+        "refresh": "Aggiorna"
+    },
+    "consistency_checks": {
+        "find_and_fix_button": "Trova e correggi i problemi di coerenza",
+        "finding_and_fixing_message": "In cerca e correzione dei problemi di coerenza...",
+        "issues_fixed_message": "Qualsiasi problema di coerenza che possa essere stato trovato ora è corretto."
+    },
+    "database_integrity_check": {
+        "check_button": "Controllo dell'integrità del database",
+        "checking_integrity": "Controllo dell'integrità del database in corso...",
+        "title": "Controllo di Integrità del database",
+        "description": "Controllerà che il database non sia corrotto a livello SQLite. Può durare un po' di tempo, a seconda della grandezza del DB.",
+        "integrity_check_failed": "Controllo di integrità fallito: {{results}}"
+    },
+    "sync": {
+        "title": "Sincronizza",
+        "force_full_sync_button": "Forza una sincronizzazione completa",
+        "failed": "Sincronizzazione fallita: {{message}}"
+    },
+    "sync_2": {
+        "config_title": "Configurazione per la Sincronizzazione",
+        "proxy_label": "Server Proxy per la sincronizzazione (opzionale)",
+        "test_title": "Test di sincronizzazione",
+        "timeout": "Timeout per la sincronizzazione",
+        "timeout_unit": "millisecondi",
+        "save": "Salva",
+        "help": "Aiuto"
+    },
+    "search_engine": {
+        "save_button": "Salva"
+    },
+    "sql_table_schemas": {
+        "tables": "Tabelle"
+    },
+    "tab_row": {
+        "close_tab": "Chiudi la scheda",
+        "add_new_tab": "Aggiungi una nuova scheda",
+        "close": "Chiudi",
+        "close_other_tabs": "Chiudi le altre schede",
+        "close_right_tabs": "Chiudi le schede a destra",
+        "close_all_tabs": "Chiudi tutte le schede",
+        "reopen_last_tab": "Riapri l'ultima scheda chiusa",
+        "move_tab_to_new_window": "Sposta questa scheda in una nuova finestra",
+        "copy_tab_to_new_window": "Copia questa scheda in una nuova finestra",
+        "new_tab": "Nuova scheda"
+    },
+    "toc": {
+        "table_of_contents": "Sommario"
+    },
+    "table_of_contents": {
+        "title": "Sommario"
+    },
+    "tray": {
+        "title": "Vassoio di Sistema",
+        "enable_tray": "Abilita il vassoio (Trilium necessita di essere riavviato affinché la modifica abbia effetto)"
+    },
+    "heading_style": {
+        "title": "Stile dell'Intestazione",
+        "plain": "Normale",
+        "underline": "Sottolineato",
+        "markdown": "Stile Markdown"
+    },
+    "highlights_list": {
+        "title": "Punti salienti"
+    },
+    "highlights_list_2": {
+        "title": "Punti salienti",
+        "options": "Opzioni"
+    },
+    "quick-search": {
+        "placeholder": "Ricerca rapida",
+        "searching": "Ricerca in corso..."
+    }
+}
--- a/apps/client/src/translations/ja/translation.json
+++ b/apps/client/src/translations/ja/translation.json
@@ -0,0 +1,23 @@
+{
+    "about": {
+        "title": "Trilium Notesについて",
+        "close": "閉じる",
+        "homepage": "ホームページ:",
+        "app_version": "アプリのヴァージョン:",
+        "db_version": "データベースのヴァージョン:",
+        "sync_version": "同期のヴァージョン:",
+        "build_date": "Build の日時:",
+        "build_revision": "Build のヴァージョン:",
+        "data_directory": "データの場所:"
+    },
+    "toast": {
+        "critical-error": {
+            "title": "致命的なエラー",
+            "message": "致命的なエラーのせいでアプリをスタートできません:\n\n{{message}}\n\nおそらくスクリプトが予期しないバグを含んでいると思われます。アプリをセーフモードでスタートしてみて下さい。"
+        },
+        "widget-error": {
+            "title": "ウィジェットを初期化できませんでした",
+            "message-custom": "ノートID”{{id}}”, ノートタイトル “{{title}}” のカスタムウィジェットを初期化できませんでした:\n\n{{message}}"
+        }
+    }
+}
--- a/apps/client/src/translations/pt_br/translation.json
+++ b/apps/client/src/translations/pt_br/translation.json
@@ -1,10 +1,416 @@
 {
-  "revisions": {
-    "delete_button": ""
-  },
-  "code_block": {
-    "theme_none": "Sem destaque de sintaxe",
-    "theme_group_light": "Temas claros",
-    "theme_group_dark": "Temas escuros"
-  }
+    "code_block": {
+        "theme_none": "Sem destaque de sintaxe",
+        "theme_group_light": "Temas claros",
+        "theme_group_dark": "Temas escuros"
+    },
+    "about": {
+        "title": "Sobre o Trilium Notes",
+        "close": "Fechar",
+        "homepage": "Página inicial:",
+        "app_version": "Versão do App:",
+        "db_version": "Versão do db:",
+        "sync_version": "Versão de sincronização:",
+        "build_date": "Data de compilação:",
+        "build_revision": "Revisão da compilação:",
+        "data_directory": "Diretório de dados:"
+    },
+    "toast": {
+        "critical-error": {
+            "title": "Erro crítico",
+            "message": "Ocorreu um erro crítico que impede a inicialização do aplicativo cliente:\n\n{{message}}\n\nIsso provavelmente foi causado por um script que falhou de maneira inesperada. Tente iniciar o aplicativo no modo seguro e resolva o problema."
+        },
+        "widget-error": {
+            "title": "Falha ao inicializar um widget",
+            "message-custom": "O widget personalizado da nota com ID \"{{id}}\", intitulada \"{{title}}\", não pôde ser inicializado devido a:\n\n{{message}}",
+            "message-unknown": "Widget desconhecido não pôde ser inicializado devido a:\n\n{{message}}"
+        },
+        "bundle-error": {
+            "title": "Falha para carregar o script customizado",
+            "message": "O script da nota com ID \"{{id}}\", intitulada \"{{title}}\", não pôde ser executado devido a:\n\n{{message}}"
+        }
+    },
+    "add_link": {
+        "add_link": "Adicionar link",
+        "help_on_links": "Ajuda sobre links",
+        "close": "Fechar",
+        "note": "Nota",
+        "search_note": "pesquisar nota pelo nome",
+        "link_title_mirrors": "o título do link reflete o título atual da nota",
+        "link_title_arbitrary": "o título do link pode ser alterado livremente",
+        "link_title": "Titulo do link",
+        "button_add_link": "Adicionar link <kbd>enter</kbd>"
+    },
+    "branch_prefix": {
+        "close": "Fechar",
+        "prefix": "Prefixo: ",
+        "save": "Salvar",
+        "edit_branch_prefix": "Editar Prefixo do Branch",
+        "help_on_tree_prefix": "Ajuda sobre o prefixo da árvore de notas",
+        "branch_prefix_saved": "O prefixo de ramificação foi salvo."
+    },
+    "bulk_actions": {
+        "bulk_actions": "Ações em massa",
+        "close": "Fechar",
+        "affected_notes": "Notas Afetadas",
+        "include_descendants": "Incluir notas filhas das notas selecionadas",
+        "available_actions": "Ações disponíveis",
+        "chosen_actions": "Ações selecionadas",
+        "execute_bulk_actions": "Executar ações em massa",
+        "bulk_actions_executed": "As ações em massa foram concluídas com sucesso.",
+        "none_yet": "Nenhuma até agora... adicione uma ação clicando em uma das disponíveis acima.",
+        "labels": "Etiquetas",
+        "relations": "Relações",
+        "notes": "Notas",
+        "other": "Outros"
+    },
+    "clone_to": {
+        "clone_notes_to": "Clonar notas para...",
+        "close": "Fechar",
+        "help_on_links": "Ajuda sobre links",
+        "notes_to_clone": "Notas para clonar",
+        "search_for_note_by_its_name": "pesquisar nota pelo nome",
+        "cloned_note_prefix_title": "A nota clonada aparecerá na árvore de notas com o prefixo fornecido",
+        "prefix_optional": "Prefixo (opcional)",
+        "no_path_to_clone_to": "Nenhum caminho para clonar.",
+        "target_parent_note": "Nota pai-alvo",
+        "clone_to_selected_note": "Clonar para a nota selecionada <kbd>enter</kbd>",
+        "note_cloned": "A nota \"{{clonedTitle}}\" foi clonada para \"{{targetTitle}}\""
+    },
+    "ai_llm": {
+        "n_notes_queued_0": "{{ count }} nota enfileirada para indexação",
+        "n_notes_queued_1": "{{ count }} notas enfileiradas para indexação",
+        "n_notes_queued_2": "{{ count }} notas enfileiradas para indexação",
+        "notes_indexed_0": "{{ count }} nota indexada",
+        "notes_indexed_1": "{{ count }} notas indexadas",
+        "notes_indexed_2": "{{ count }} notas indexadas"
+    },
+    "confirm": {
+        "confirmation": "Confirmação",
+        "close": "Fechar",
+        "cancel": "Cancelar",
+        "ok": "OK",
+        "are_you_sure_remove_note": "Tem certeza de que deseja remover a nota '{{title}}' do mapa de relações? ",
+        "if_you_dont_check": "Se você não marcar isso, a nota será removida apenas do mapa de relações.",
+        "also_delete_note": "Também excluir a nota"
+    },
+    "delete_notes": {
+        "delete_notes_preview": "Excluir pré-visualização de notas",
+        "close": "Fechar",
+        "delete_all_clones_description": "Excluir também todos os clones (pode ser desfeito em alterações recentes)",
+        "erase_notes_description": "A exclusão normal (suave) apenas marca as notas como excluídas, permitindo que sejam recuperadas (no diálogo de alterações recentes) dentro de um período de tempo. Se esta opção for marcada, as notas serão apagadas imediatamente e não será possível restaurá-las.",
+        "erase_notes_warning": "Apagar notas permanentemente (não pode ser desfeito), incluindo todos os clones. Isso forçará o recarregamento do aplicativo.",
+        "notes_to_be_deleted": "As seguintes notas serão excluídas ({{- noteCount}})",
+        "no_note_to_delete": "Nenhuma nota será excluída (apenas os clones).",
+        "broken_relations_to_be_deleted": "As seguintes relações serão quebradas e excluídas ({{- relationCount}})",
+        "cancel": "Cancelar",
+        "ok": "OK",
+        "deleted_relation_text": "A nota {{- note}} (a ser excluída) está referenciada pela relação {{- relation}} originada de {{- source}}."
+    },
+    "export": {
+        "export_note_title": "Exportar nota",
+        "close": "Fechar",
+        "export_type_subtree": "Esta nota e todos os seus descendentes",
+        "format_html": "HTML – recomendado, pois mantém toda a formatação",
+        "format_html_zip": "HTML em arquivo ZIP – recomendado, pois isso preserva toda a formatação.",
+        "format_markdown": "Markdown – isso preserva a maior parte da formatação.",
+        "format_opml": "OPML - formato de intercâmbio de outliners apenas para texto. Formatação, imagens e arquivos não estão incluídos.",
+        "opml_version_1": "OPML v1.0 – apenas texto simples",
+        "opml_version_2": "OPML v2.0 – permite também HTML",
+        "export_type_single": "Apenas esta nota, sem seus descendentes",
+        "export": "Exportar",
+        "choose_export_type": "Por favor, escolha primeiro o tipo de exportação",
+        "export_status": "Status da exportação",
+        "export_in_progress": "Exportação em andamento: {{progressCount}}",
+        "export_finished_successfully": "Exportação concluída com sucesso.",
+        "format_pdf": "PDF – para impressão ou compartilhamento."
+    },
+    "help": {
+        "fullDocumentation": "Ajuda (a documentação completa está disponível <a class=\"external\" href=\"https://triliumnext.github.io/Docs/\">online</a>)",
+        "close": "Fechar",
+        "noteNavigation": "Navegação de notas",
+        "goUpDown": "<kbd>UP</kbd>, <kbd>DOWN</kbd> – subir/descer na lista de notas",
+        "collapseExpand": "<kbd>ESQUERDA</kbd>, <kbd>DIREITA</kbd> – recolher/expandir nó",
+        "notSet": "não definido",
+        "goBackForwards": "voltar / avançar no histórico",
+        "showJumpToNoteDialog": "mostrar diálogo <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">\"Ir para\"</a>",
+        "scrollToActiveNote": "rolar até a nota atual",
+        "jumpToParentNote": "<kbd>Backspace</kbd> – ir para a nota pai",
+        "collapseWholeTree": "recolher toda a árvore de notas",
+        "collapseSubTree": "recolher subárvore",
+        "tabShortcuts": "Atalhos de abas",
+        "newTabNoteLink": "<kbd>Ctrl+clique</kbd> – (ou <kbd>clique com o botão do meio do mouse</kbd>) em um link de nota abre a nota em uma nova aba",
+        "newTabWithActivationNoteLink": "<kbd>Ctrl+Shift+clique</kbd> – (ou <kbd>Shift+clique com o botão do meio do mouse</kbd>) em um link de nota abre e ativa a nota em uma nova aba",
+        "onlyInDesktop": "Apenas na versão para desktop (compilação Electron)",
+        "openEmptyTab": "abrir aba vazia",
+        "closeActiveTab": "fechar aba ativa",
+        "activateNextTab": "ativar próxima aba",
+        "activatePreviousTab": "ativar aba anterior",
+        "creatingNotes": "Criando notas",
+        "createNoteAfter": "criar nova nota após a nota atual",
+        "createNoteInto": "criar nova subnota dentro da nota atual",
+        "editBranchPrefix": "editar <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/tree-concepts.html#prefix\">prefixo</a> do clone da nota ativa",
+        "movingCloningNotes": "Movendo / clonando notas",
+        "moveNoteUpDown": "mover nota para cima/baixo na lista de notas",
+        "moveNoteUpHierarchy": "mover nota para cima na hierarquia",
+        "multiSelectNote": "selecionar múltiplas notas acima/abaixo",
+        "selectAllNotes": "selecionar todas as notas no nível atual",
+        "selectNote": "<kbd>Shift+clique</kbd> - selecionar nota",
+        "copyNotes": "copiar nota ativa (ou seleção atual) para a área de transferência (usado para <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/cloning-notes.html#cloning-notes\">clonar</a>)",
+        "cutNotes": "recortar nota atual (ou seleção atual) para a área de transferência (usado para mover notas)",
+        "pasteNotes": "colar nota(s) como subnota dentro da nota ativa (o que pode ser mover ou clonar dependendo se foi copiado ou recortado para a área de transferência)",
+        "deleteNotes": "excluir nota / subárvore",
+        "editingNotes": "Edição de notas",
+        "editNoteTitle": "no painel de árvore, a navegação mudará do painel de árvore para o título da nota. Pressionar Enter no título da nota mudará o foco para o editor de texto. <kbd>Ctrl+.</kbd> mudará o foco de volta do editor para o painel de árvore.",
+        "createEditLink": "<kbd>Ctrl+K</kbd> - criar / editar link externo",
+        "createInternalLink": "criar link interno",
+        "followLink": "seguir link sob o cursor",
+        "insertDateTime": "inserir data e hora atual na posição do cursor",
+        "jumpToTreePane": "ir para a árvore de notas e rolar até a nota ativa",
+        "markdownAutoformat": "Autoformatação estilo Markdown",
+        "headings": "<code>##</code>, <code>###</code>, <code>####</code> etc. seguidos de espaço para títulos",
+        "bulletList": "<code>*</code> ou <code>-</code> seguidos de espaço para lista com marcadores",
+        "numberedList": "<code>1.</code> ou <code>1)</code> seguidos de espaço para lista numerada",
+        "blockQuote": "comece uma linha com <code>></code> seguido de espaço para citação em bloco",
+        "troubleshooting": "Solução de problemas",
+        "reloadFrontend": "recarregar o frontend do Trilium",
+        "showDevTools": "mostrar ferramentas de desenvolvedor",
+        "showSQLConsole": "mostrar console SQL",
+        "other": "Outros",
+        "quickSearch": "focar no campo de pesquisa rápida",
+        "inPageSearch": "pesquisa na página"
+    },
+    "import": {
+        "importIntoNote": "Importar para a nota",
+        "close": "Fechar",
+        "chooseImportFile": "Escolher arquivo para importar",
+        "importDescription": "O conteúdo do(s) arquivo(s) selecionado(s) será importado como nota(s) filha(s) em",
+        "options": "Opções",
+        "safeImportTooltip": "Arquivos de exportação Trilium<code> .zip</code> podem conter scripts executáveis que podem apresentar comportamentos prejudiciais. A importação segura desativará a execução automática de todos os scripts importados. Desmarque “Importação segura” apenas se o arquivo de importação contiver scripts executáveis e você confiar totalmente no conteúdo do arquivo importado.",
+        "safeImport": "Importação segura",
+        "explodeArchivesTooltip": "Se esta opção estiver marcada, o Trilium irá ler arquivos <code>.zip</code>, <code>.enex</code> e <code>.opml</code> e criar notas a partir dos arquivos contidos nesses arquivos compactados. Se estiver desmarcada, o Trilium irá anexar os próprios arquivos compactados à nota.",
+        "explodeArchives": "Ler conteúdos de arquivos <code>.zip</code>, <code>.enex</code> e <code>.opml</code>.",
+        "shrinkImagesTooltip": "<p>Se você marcar esta opção, o Trilium tentará reduzir o tamanho das imagens importadas por meio de escala e otimização, o que pode afetar a qualidade visual das imagens. Se desmarcada, as imagens serão importadas sem alterações.</p><p>Isso não se aplica a importações de arquivos <code>.zip</code> com metadados, pois presume-se que esses arquivos já estejam otimizados.</p>",
+        "shrinkImages": "Reduzir imagens",
+        "textImportedAsText": "Importar arquivos HTML, Markdown e TXT como notas de texto caso não esteja claro pelos metadados",
+        "codeImportedAsCode": "Importar arquivos de código reconhecidos (por exemplo, <code>.json</code>) como notas de código caso não esteja claro pelos metadados",
+        "replaceUnderscoresWithSpaces": "Substituir sublinhados por espaços nos nomes das notas importadas",
+        "import": "Importar",
+        "failed": "Falha na importação: {{message}}.",
+        "html_import_tags": {
+            "title": "Tags de importação HTML",
+            "description": "Configurar quais tags HTML devem ser preservadas ao importar notas. As tags que não estiverem nesta lista serão removidas durante a importação. Algumas tags (como 'script') são sempre removidas por motivos de segurança.",
+            "placeholder": "Digite as tags HTML, uma por linha",
+            "reset_button": "Redefinir para lista padrão"
+        },
+        "import-status": "Status da importação",
+        "in-progress": "Importação em andamento: {{progress}}",
+        "successful": "Importação concluída com sucesso."
+    },
+    "include_note": {
+        "dialog_title": "Incluir nota",
+        "close": "Fechar",
+        "label_note": "Nota",
+        "placeholder_search": "pesquisar nota pelo nome",
+        "box_size_prompt": "Dimensão da caixa da nota incluída:",
+        "box_size_small": "pequeno (~ 10 linhas)",
+        "box_size_medium": "médio (~ 30 linhas)",
+        "box_size_full": "completo (a caixa exibe o texto completo)",
+        "button_include": "Incluir nota <kbd>enter</kbd>"
+    },
+    "info": {
+        "modalTitle": "Mensagem informativa",
+        "closeButton": "Fechar",
+        "okButton": "OK"
+    },
+    "jump_to_note": {
+        "search_placeholder": "Pesquise uma nota pelo nome ou digite > para comandos...",
+        "close": "Fechar",
+        "search_button": "Pesquisar em texto completo <kbd>Ctrl+Enter</kbd>"
+    },
+    "markdown_import": {
+        "dialog_title": "Importar Markdown",
+        "close": "Fechar",
+        "modal_body_text": "Por motivos de segurança (sandbox do navegador), o JavaScript não pode acessar diretamente a área de transferência. Por favor, cole o conteúdo Markdown na área de texto abaixo e clique em Importar",
+        "import_button": "Importar Ctrl+Enter",
+        "import_success": "O conteúdo Markdown foi importado para o documento."
+    },
+    "move_to": {
+        "dialog_title": "Mover notas para...",
+        "close": "Fechar",
+        "notes_to_move": "Notas para mover",
+        "target_parent_note": "Nota pai-alvo",
+        "search_placeholder": "pesquisar nota pelo nome",
+        "move_button": "Mover para a nota selecionada <kbd>enter</kbd>",
+        "error_no_path": "Nenhum caminho para mover.",
+        "move_success_message": "As notas selecionadas foram movidas para "
+    },
+    "note_type_chooser": {
+        "change_path_prompt": "Alterar onde criar a nova nota:",
+        "search_placeholder": "buscar caminho pelo nome (valor padrão se não for preenchido)",
+        "modal_title": "Escolher tipo de nota",
+        "close": "Fechar",
+        "modal_body": "Escolha o tipo/modelo da nova nota:",
+        "templates": "Modelos:"
+    },
+    "password_not_set": {
+        "title": "A senha não está definida",
+        "close": "Fechar",
+        "body1": "Notas protegidas são criptografadas usando uma senha do usuário, mas a senha ainda não foi definida.",
+        "body2": "Para poder proteger notas, clique <a class=\"open-password-options-button\" href=\"javascript:\">aqui</a> para abrir a caixa de diálogo de Opções e definir sua senha."
+    },
+    "prompt": {
+        "title": "Prompt",
+        "close": "Fechar",
+        "ok": "OK <kbd>enter</kbd>",
+        "defaultTitle": "Prompt"
+    },
+    "protected_session_password": {
+        "modal_title": "Sessão Protegida",
+        "help_title": "Ajuda sobre notas protegidas",
+        "close_label": "Fechar",
+        "form_label": "Para prosseguir com a ação solicitada, você precisa iniciar uma sessão protegida digitando a senha:",
+        "start_button": "Iniciar sessão protegida <kbd>enter</kbd>"
+    },
+    "recent_changes": {
+        "title": "Alterações recentes",
+        "erase_notes_button": "Remover permanentemente as notas excluídas agora",
+        "close": "Fechar",
+        "deleted_notes_message": "As notas excluídas foram removidas permanentemente.",
+        "no_changes_message": "Nenhuma alteração ainda...",
+        "undelete_link": "Restaurar",
+        "confirm_undelete": "Você deseja restaurar esta nota e suas subnotas?"
+    },
+    "revisions": {
+        "note_revisions": "Versões da nota",
+        "delete_all_revisions": "Excluir todas as versões desta nota",
+        "delete_all_button": "Excluir todas as versões",
+        "help_title": "Ajuda sobre as versões da nota",
+        "close": "Fechar",
+        "revision_last_edited": "Esta versão foi editada pela última vez em {{date}}",
+        "confirm_delete_all": "Você quer excluir todas as versões desta nota?",
+        "no_revisions": "Ainda não há versões para esta nota...",
+        "restore_button": "Recuperar",
+        "confirm_restore": "Deseja restaurar esta versão? Isso irá substituir o título e o conteúdo atuais da nota por esta versão.",
+        "delete_button": "Excluir",
+        "confirm_delete": "Deseja excluir esta versão?",
+        "revisions_deleted": "As versões da nota foram removidas.",
+        "revision_restored": "A versão da nota foi restaurada.",
+        "revision_deleted": "A versão da nota foi excluída.",
+        "snapshot_interval": "Intervalo de captura das versões da nota: {{seconds}}s.",
+        "maximum_revisions": "Limite de capturas das versões da nota: {{number}}.",
+        "settings": "Configurações de versões da nota",
+        "download_button": "Download",
+        "mime": "MIME: ",
+        "file_size": "Tamanho do arquivo:",
+        "preview": "Visualizar:",
+        "preview_not_available": "A visualização não está disponível para este tipo de nota."
+    },
+    "sort_child_notes": {
+        "sort_children_by": "Ordenar notas filhas por...",
+        "close": "Fechar",
+        "sorting_criteria": "Critérios de ordenação",
+        "title": "título",
+        "date_created": "data de criação",
+        "date_modified": "data de modificação",
+        "sorting_direction": "Direção de ordenação",
+        "ascending": "crescente",
+        "descending": "decrescente",
+        "folders": "Pastas",
+        "sort_folders_at_top": "colocar pastas no topo",
+        "natural_sort": "Ordenação Natural",
+        "sort_with_respect_to_different_character_sorting": "classificar de acordo com diferentes regras de ordenação de caracteres e colação em diferentes idiomas ou regiões.",
+        "natural_sort_language": "Linguagem da ordenação natural",
+        "the_language_code_for_natural_sort": "O código do idioma para ordenação natural, por exemplo, \"zh-CN\" para chinês.",
+        "sort": "Ordenar <kbd>enter</kbd>"
+    },
+    "upload_attachments": {
+        "upload_attachments_to_note": "Enviar anexos para a nota",
+        "close": "Fechar",
+        "choose_files": "Escolher arquivos",
+        "files_will_be_uploaded": "Os arquivos serão enviados como anexos para",
+        "options": "Opções",
+        "shrink_images": "Reduzir imagens",
+        "upload": "Enviar",
+        "tooltip": "Se você marcar esta opção, o Trilium tentará reduzir as imagens enviadas redimensionando e otimizando, o que pode afetar a qualidade visual percebida. Se desmarcada, as imagens serão enviadas sem alterações."
+    },
+    "attribute_detail": {
+        "attr_detail_title": "Título Detalhado do Atributo",
+        "close_button_title": "Cancelar alterações e fechar",
+        "attr_is_owned_by": "O atributo pertence a",
+        "attr_name_title": "O nome do atributo pode ser composto apenas por caracteres alfanuméricos, dois-pontos e sublinhado",
+        "name": "Nome",
+        "value": "Valor",
+        "target_note_title": "Relação é uma conexão nomeada entre a nota de origem e a nota de destino.",
+        "target_note": "Nota de destino",
+        "promoted_title": "O atributo promovido é exibido de forma destacada na nota.",
+        "promoted": "Promovido",
+        "promoted_alias_title": "O nome a ser exibido na interface de atributos promovidos.",
+        "promoted_alias": "Alias",
+        "multiplicity_title": "Multiplicidade define quantos atributos com o mesmo nome podem ser criados — no máximo 1 ou mais de 1.",
+        "multiplicity": "Multiplicidade",
+        "single_value": "Valor único",
+        "multi_value": "Valor múltiplo",
+        "label_type_title": "O tipo do rótulo ajudará o Trilium a escolher a interface adequada para inserir o valor do rótulo.",
+        "label_type": "Tipo",
+        "text": "Texto",
+        "number": "Número",
+        "boolean": "Booleano",
+        "date": "Data",
+        "date_time": "Data e Hora",
+        "time": "Hora",
+        "url": "URL",
+        "precision_title": "Qual número de dígitos após o ponto decimal deve estar disponível na interface de configuração de valor.",
+        "precision": "Precisão",
+        "digits": "dígitos",
+        "inverse_relation_title": "Configuração opcional para definir a qual relação esta é oposta. Exemplo: Pai - Filho são relações inversas entre si.",
+        "inverse_relation": "Relação inversa",
+        "inheritable_title": "O atributo herdável será transmitido para todos os descendentes deste ramo.",
+        "inheritable": "Herdável",
+        "save_and_close": "Salvar e fechar <kbd>Ctrl+Enter</kbd>",
+        "delete": "Excluir",
+        "related_notes_title": "Outras notas com este rótulo",
+        "more_notes": "Mais notas",
+        "label": "Detalhe do rótulo",
+        "label_definition": "Detalhe da definição do rótulo",
+        "relation": "Detalhe da relação",
+        "relation_definition": "Detalhe da definição da relação",
+        "disable_versioning": "desativa a versão automática. Útil, por exemplo, para notas grandes, mas sem importância – como grandes bibliotecas JS usadas para scripts",
+        "calendar_root": "marca a nota que deve ser usada como raiz para notas diárias. Apenas uma deve ser marcada assim.",
+        "archived": "notas com este rótulo não serão exibidas por padrão nos resultados de busca (também nos diálogos Ir para, Adicionar link, etc).",
+        "exclude_from_export": "notas (junto com sua subárvore) não serão incluídas em nenhuma exportação de notas",
+        "run": "define em quais eventos o script deve ser executado. Os valores possíveis são:\n<ul>\n<li>frontendStartup - quando o frontend do Trilium inicia (ou é atualizado), mas não no celular.</li>\n<li>mobileStartup - quando o frontend do Trilium inicia (ou é atualizado), no celular.</li>\n<li>backendStartup - quando o backend do Trilium inicia</li>\n<li>hourly - executa uma vez por hora. Você pode usar o rótulo adicional <code>runAtHour</code> para especificar em qual hora.</li>\n<li>daily - executa uma vez por dia</li>\n</ul>",
+        "run_on_instance": "Define em qual instância do Trilium isso deve ser executado. Por padrão, todas as instâncias.",
+        "run_at_hour": "Em qual hora isso deve ser executado. Deve ser usado junto com <code>#run=hourly</code>. Pode ser definido várias vezes para executar mais de uma vez ao dia.",
+        "disable_inclusion": "scripts com este rótulo não serão incluídos na execução do script pai.",
+        "sorted": "mantém as notas filhas ordenadas alfabeticamente pelo título",
+        "sort_direction": "ASC (padrão) ou DESC",
+        "sort_folders_first": "Pastas (notas com filhos) devem ser ordenadas no topo",
+        "top": "mantenha a nota fornecida no topo em seu pai (aplica-se apenas a pais ordenados)",
+        "hide_promoted_attributes": "Ocultar atributos promovidos nesta nota",
+        "read_only": "o editor está em modo somente leitura. Funciona apenas para notas de texto e código.",
+        "auto_read_only_disabled": "notas de texto/código podem ser automaticamente configuradas para modo de leitura quando são muito grandes. Você pode desabilitar esse comportamento por nota adicionando este rótulo à nota",
+        "app_css": "marca notas CSS que são carregadas no aplicativo Trilium e, portanto, podem ser usadas para modificar a aparência do Trilium.",
+        "app_theme": "marca notas CSS que são temas completos do Trilium e, portanto, estão disponíveis nas opções do Trilium.",
+        "app_theme_base": "defina como \"next\", \"next-light\" ou \"next-dark\" para usar o tema TriliumNext correspondente (auto, claro ou escuro) como base para um tema personalizado, em vez do tema legado.",
+        "css_class": "o valor deste rótulo é então adicionado como classe CSS ao nó que representa a nota específica na árvore. Isso pode ser útil para temas avançados. Pode ser usado em notas de modelo.",
+        "icon_class": "o valor deste rótulo é adicionado como uma classe CSS ao ícone na árvore, o que pode ajudar a distinguir visualmente as notas na árvore. Um exemplo pode ser bx bx-home – os ícones são retirados do boxicons. Pode ser usado em notas de modelo.",
+        "page_size": "número de itens por página na listagem de notas",
+        "custom_request_handler": "veja <a href=\"javascript:\" data-help-page=\"custom-request-handler.html\">Manipulador de requisição personalizada</a>",
+        "custom_resource_provider": "veja <a href=\"javascript:\" data-help-page=\"custom-request-handler.html\">Manipulador de requisição personalizada</a>",
+        "widget": "marca esta nota como um widget personalizado que será adicionado à árvore de componentes do Trilium",
+        "workspace": "marca esta nota como um espaço de trabalho, o que permite fácil hoisting",
+        "workspace_icon_class": "define a classe CSS do ícone box que será usada na aba quando esta nota for hoisted",
+        "workspace_tab_background_color": "cor CSS usada na aba da nota quando esta nota é hoisted",
+        "workspace_calendar_root": "Define a raiz do calendário por espaço de trabalho",
+        "workspace_template": "Esta nota aparecerá na seleção de modelos disponíveis ao criar uma nova nota, mas apenas quando estiver destacada em um espaço de trabalho que contenha este modelo",
+        "search_home": "novas notas de pesquisa serão criadas como filhas desta nota",
+        "workspace_search_home": "novas notas de pesquisa serão criadas como filhas desta nota quando ela for destacada para algum ancestral desta nota de área de trabalho",
+        "inbox": "localização padrão da caixa de entrada para novas notas – quando você cria uma nota usando o botão \"nova nota\" na barra lateral, as notas serão criadas como notas filhas na nota marcada com o rótulo <code>#inbox</code>.",
+        "workspace_inbox": "local padrão da caixa de entrada para novas notas quando esta nota for destacada para algum ancestral desta nota de área de trabalho",
+        "sql_console_home": "localização padrão das notas do console SQL",
+        "bookmark_folder": "nota com este rótulo aparecerá nos favoritos como uma pasta (permitindo acesso aos seus filhos)",
+        "share_hidden_from_tree": "esta nota está oculta na árvore de navegação à esquerda, mas ainda pode ser acessada via sua URL",
+        "share_external_link": "a nota funcionará como um link para um site externo na árvore de compartilhamento"
+    }
 }
--- a/apps/client/src/translations/ro/translation.json
+++ b/apps/client/src/translations/ro/translation.json
--- a/apps/client/src/translations/ru/translation.json
+++ b/apps/client/src/translations/ru/translation.json
--- a/apps/client/src/translations/sr/translation.json
+++ b/apps/client/src/translations/sr/translation.json
@@ -0,0 +1,517 @@
+{
+    "about": {
+        "title": "O Trilium Belеškama",
+        "close": "Zatvori",
+        "homepage": "Početna stranica:",
+        "app_version": "Verzija aplikacije:",
+        "db_version": "Verzija baze podataka:",
+        "sync_version": "Verzija sinhronizacije:",
+        "build_date": "Datum izgradnje:",
+        "build_revision": "Revizija izgradnje:",
+        "data_directory": "Direktorijum sa podacima:"
+    },
+    "toast": {
+        "critical-error": {
+            "title": "Kritična greška",
+            "message": "Došlo je do kritične greške koja sprečava pokretanje klijentske aplikacije.\n\n{{message}}\n\nOva greška je najverovatnije izazvana neočekivanim problemom prilikom izvršavanja skripte. Pokušajte da pokrenete aplikaciju u bezbednom režimu i da pronađete šta izaziva grešku."
+        },
+        "widget-error": {
+            "title": "Pokretanje vidžeta nije uspelo",
+            "message-custom": "Prilagođeni viđet sa beleške sa ID-jem \"{{id}}\", nazivom \"{{title}}\" nije uspeo da se pokrene zbog:\n\n{{message}}",
+            "message-unknown": "Nepoznati vidžet nije mogao da se pokrene zbog:\n\n{{message}}"
+        },
+        "bundle-error": {
+            "title": "Pokretanje prilagođene skripte neuspešno",
+            "message": "Skripta iz beleške sa ID-jem \"{{id}}\", naslovom \"{{title}}\" nije mogla da se izvrši zbog:\n\n{{message}}"
+        }
+    },
+    "add_link": {
+        "add_link": "Dodaj link",
+        "help_on_links": "Pomoć na linkovima",
+        "close": "Zatvori",
+        "note": "Beleška",
+        "search_note": "potražite belešku po njenom imenu",
+        "link_title_mirrors": "naziv linka preslikava trenutan naziv beleške",
+        "link_title_arbitrary": "naziv linka se može proizvoljno menjati",
+        "link_title": "Naziv linka",
+        "button_add_link": "Dodaj link <kbd>enter</kbd>"
+    },
+    "branch_prefix": {
+        "edit_branch_prefix": "Izmeni prefiks grane",
+        "help_on_tree_prefix": "Pomoć na prefiksu Drveta",
+        "close": "Zatvori",
+        "prefix": "Prefiks: ",
+        "save": "Sačuvaj",
+        "branch_prefix_saved": "Prefiks grane je sačuvan."
+    },
+    "bulk_actions": {
+        "bulk_actions": "Grupne akcije",
+        "close": "Zatvori",
+        "affected_notes": "Pogođene beleške",
+        "include_descendants": "Obuhvati potomke izabranih beleški",
+        "available_actions": "Dostupne akcije",
+        "chosen_actions": "Izabrane akcije",
+        "execute_bulk_actions": "Izvrši grupne akcije",
+        "bulk_actions_executed": "Grupne akcije su uspešno izvršene.",
+        "none_yet": "Nijedna za sad... dodajte akciju tako što ćete pritisnuti na neku od dostupnih akcija iznad.",
+        "labels": "Oznake",
+        "relations": "Odnosi",
+        "notes": "Beleške",
+        "other": "Ostalo"
+    },
+    "clone_to": {
+        "clone_notes_to": "Klonirajte beleške u...",
+        "close": "Zatvori",
+        "help_on_links": "Pomoć na linkovima",
+        "notes_to_clone": "Beleške za kloniranje",
+        "target_parent_note": "Ciljna nadređena beleška",
+        "search_for_note_by_its_name": "potražite belešku po njenom imenu",
+        "cloned_note_prefix_title": "Klonirana beleška će biti prikazana u drvetu beleški sa datim prefiksom",
+        "prefix_optional": "Prefiks (opciono)",
+        "clone_to_selected_note": "Kloniranje u izabranu belešku <kbd>enter</kbd>",
+        "no_path_to_clone_to": "Nema putanje za kloniranje.",
+        "note_cloned": "Beleška \"{{clonedTitle}}\" je klonirana u \"{{targetTitle}}\""
+    },
+    "confirm": {
+        "confirmation": "Potvrda",
+        "close": "Zatvori",
+        "cancel": "Otkaži",
+        "ok": "U redu",
+        "are_you_sure_remove_note": "Da li ste sigurni da želite da uklonite belešku \"{{title}}\" iz mape odnosa? ",
+        "if_you_dont_check": "Ako ne izaberete ovo, beleška će biti uklonjena samo sa mape odnosa.",
+        "also_delete_note": "Takođe obriši belešku"
+    },
+    "delete_notes": {
+        "delete_notes_preview": "Obriši pregled beleške",
+        "close": "Zatvori",
+        "delete_all_clones_description": "Obriši i sve klonove (može biti poništeno u skorašnjim izmenama)",
+        "erase_notes_description": "Normalno (blago) brisanje samo označava beleške kao obrisane i one mogu biti vraćene (u dijalogu skorašnjih izmena) u određenom vremenskom periodu. Biranje ove opcije će momentalno obrisati beleške i ove beleške neće biti moguće vratiti.",
+        "erase_notes_warning": "Trajno obriši beleške (ne može se opozvati), uključujući sve klonove. Ovo će prisiliti aplikaciju da se ponovo pokrene.",
+        "notes_to_be_deleted": "Sledeće beleške će biti obrisane ({{- noteCount}})",
+        "no_note_to_delete": "Nijedna beleška neće biti obrisana (samo klonovi).",
+        "broken_relations_to_be_deleted": "Sledeći odnosi će biti prekinuti i obrisani ({{- relationCount}})",
+        "cancel": "Otkaži",
+        "ok": "U redu",
+        "deleted_relation_text": "Beleška {{- note}} (za brisanje) je referencirana sa odnosom {{- relation}} koji potiče iz {{- source}}."
+    },
+    "export": {
+        "export_note_title": "Izvezi belešku",
+        "close": "Zatvori",
+        "export_type_subtree": "Ova beleška i svi njeni potomci",
+        "format_html": "HTML - preporučuje se jer čuva formatiranje",
+        "format_html_zip": "HTML u ZIP arhivi - ovo se preporučuje jer se na taj način čuva celokupno formatiranje.",
+        "format_markdown": "Markdown - ovo čuva većinu formatiranja.",
+        "format_opml": "OPML - format za razmenu okvira samo za tekst. Formatiranje, slike i datoteke nisu uključeni.",
+        "opml_version_1": "OPML v1.0 - samo običan tekst",
+        "opml_version_2": "OPML v2.0 - dozvoljava i HTML",
+        "export_type_single": "Samo ovu belešku bez njenih potomaka",
+        "export": "Izvoz",
+        "choose_export_type": "Molimo vas da prvo izaberete tip izvoza",
+        "export_status": "Status izvoza",
+        "export_in_progress": "Izvoz u toku: {{progressCount}}",
+        "export_finished_successfully": "Izvoz je uspešno završen.",
+        "format_pdf": "PDF - za namene štampanja ili deljenja."
+    },
+    "help": {
+        "fullDocumentation": "Pomoć (puna dokumentacija je dostupna <a class=\"external\" href=\"https://triliumnext.github.io/Docs/\">online</a>)",
+        "close": "Zatvori",
+        "noteNavigation": "Navigacija beleški",
+        "goUpDown": "<kbd>UP</kbd>, <kbd>DOWN</kbd> - kretanje gore/dole u listi sa beleškama",
+        "collapseExpand": "<kbd>LEFT</kbd>, <kbd>RIGHT</kbd> - sakupi/proširi čvor",
+        "notSet": "nije podešeno",
+        "goBackForwards": "idi u nazad/napred kroz istoriju",
+        "showJumpToNoteDialog": "prikaži <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">\"Idi na\" dijalog</a>",
+        "scrollToActiveNote": "skroluj do aktivne beleške",
+        "jumpToParentNote": "<kbd>Backspace</kbd> - idi do nadređene beleške",
+        "collapseWholeTree": "sakupi celo drvo beleški",
+        "collapseSubTree": "sakupi pod-drvo",
+        "tabShortcuts": "Prečice na karticama",
+        "newTabNoteLink": "<kbd>Ctrl+click</kbd> - (ili <kbd>middle mouse click</kbd>) na link beleške otvara belešku u novoj kartici",
+        "newTabWithActivationNoteLink": "<kbd>Ctrl+Shift+click</kbd> - (ili <kbd>Shift+middle mouse click</kbd>) na link beleške otvara i aktivira belešku u novoj kartici",
+        "onlyInDesktop": "Samo na dektop-u (Electron verzija)",
+        "openEmptyTab": "otvori praznu karticu",
+        "closeActiveTab": "zatvori aktivnu karticu",
+        "activateNextTab": "aktiviraj narednu karticu",
+        "activatePreviousTab": "aktiviraj prethodnu karticu",
+        "creatingNotes": "Pravljenje beleški",
+        "createNoteAfter": "napravi novu belešku nakon aktivne beleške",
+        "createNoteInto": "napravi novu pod-belešku u aktivnoj belešci",
+        "editBranchPrefix": "izmeni <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/tree-concepts.html#prefix\">prefiks</a> klona aktivne beleške",
+        "movingCloningNotes": "Premeštanje / kloniranje beleški",
+        "moveNoteUpDown": "pomeri belešku gore/dole u listi beleški",
+        "moveNoteUpHierarchy": "pomeri belešku na gore u hijerarhiji",
+        "multiSelectNote": "višestruki izbor beleški iznad/ispod",
+        "selectAllNotes": "izaberi sve beleške u trenutnom nivou",
+        "selectNote": "<kbd>Shift+click</kbd> - izaberi belešku",
+        "copyNotes": "kopiraj aktivnu belešku (ili trenutni izbor) u privremenu memoriju (koristi se za <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/cloning-notes.html#cloning-notes\">kloniranje</a>)",
+        "cutNotes": "iseci trenutnu belešku (ili trenutni izbor) u privremenu memoriju (koristi se za premeštanje beleški)",
+        "pasteNotes": "nalepi belešku/e kao podbelešku u aktivnoj belešci (koja se ili premešta ili klonira u zavisnosti od toga da li je beleška kopirana ili isečena u privremenu memoriju)",
+        "deleteNotes": "obriši belešku / podstablo",
+        "editingNotes": "Izmena beleški",
+        "editNoteTitle": "u ravni drveta će se prebaciti sa ravni drveta na naslov beleške. Ulaz sa naslova beleške će prebaciti fokus na uređivač teksta. <kbd>Ctrl+.</kbd> će se vratiti sa uređivača na ravan drveta.",
+        "createEditLink": "<kbd>Ctrl+K</kbd> - napravi / izmeni spoljašnji link",
+        "createInternalLink": "napravi unutrašnji link",
+        "followLink": "prati link ispod kursora",
+        "insertDateTime": "ubaci trenutan datum i vreme na poziciju kursora",
+        "jumpToTreePane": "idi na ravan stabla i pomeri se do aktivne beleške",
+        "markdownAutoformat": "Autoformatiranje kao u Markdown-u",
+        "headings": "<code>##</code>, <code>###</code>, <code>####</code>  itd. praćeno razmakom za naslove",
+        "bulletList": "<code>*</code> ili <code>-</code> praćeno razmakom za listu sa tačkama",
+        "numberedList": "<code>1.</code> ili <code>1)</code> praćeno razmakom za numerisanu listu",
+        "blockQuote": "započnite liniju sa <code>></code> praćeno sa razmakom za blok citat",
+        "troubleshooting": "Rešavanje problema",
+        "reloadFrontend": "ponovo učitaj Trilium frontend",
+        "showDevTools": "prikaži alate za programere",
+        "showSQLConsole": "prikaži SQL konzolu",
+        "other": "Ostalo",
+        "quickSearch": "fokus na unos za brzu pretragu",
+        "inPageSearch": "pretraga unutar stranice"
+    },
+    "import": {
+        "importIntoNote": "Uvezi u belešku",
+        "close": "Zatvori",
+        "chooseImportFile": "Izaberi datoteku za uvoz",
+        "importDescription": "Sadržaj izabranih datoteka će biti uvezen kao podbeleške u",
+        "options": "Opcije",
+        "safeImportTooltip": "Trilium <code>.zip</code> izvozne datoteke mogu da sadrže izvršne skripte koje mogu imati štetno ponašanje. Bezbedan uvoz će deaktivirati automatsko izvršavanje svih uvezenih skripti. Isključite \"Bezbedan uvoz\" samo ako uvezena arhiva treba da sadrži izvršne skripte i ako potpuno verujete sadržaju uvezene datoteke.",
+        "safeImport": "Bezbedan uvoz",
+        "explodeArchivesTooltip": "Ako je ovo označeno onda će Trilium pročitati <code>.zip</code>, <code>.enex</code> i <code>.opml</code> datoteke i napraviti beleške od datoteka unutar tih arhiva. Ako nije označeno, Trilium će same arhive priložiti belešci.",
+        "explodeArchives": "Pročitaj sadržaj <code>.zip</code>, <code>.enex</code> i <code>.opml</code> arhiva.",
+        "shrinkImagesTooltip": "<p>Ako označite ovu opciju, Trilium će pokušati da smanji uvezene slike skaliranjem i optimizacijom što će možda uticati na kvalitet slike. Ako nije označeno, slike će biti uvezene bez promena.</p><p>Ovo se ne primenjuje na <code>.zip</code> uvoze sa metapodacima jer se tada podrazumeva da su te datoteke već optimizovane.</p>",
+        "shrinkImages": "Smanji slike",
+        "textImportedAsText": "Uvezi HTML, Markdown i TXT kao tekstualne beleške ako je nejasno iz metapodataka",
+        "codeImportedAsCode": "Uvezi prepoznate datoteke sa kodom (poput <code>.json</code>) ako beleške sa kodom ako nije jasno iz metapodataka",
+        "replaceUnderscoresWithSpaces": "Zameni podvlake sa razmacima u nazivima uvezenih beleški",
+        "import": "Uvezi",
+        "failed": "Uvoz nije uspeo: {{message}}.",
+        "html_import_tags": {
+            "title": "HTML oznake za uvoz",
+            "description": "Podesite koje HTML oznake trebaju biti sačuvane kada se uvoze beleške. Oznake koje se ne nalaze na listi će biti uklonjene tokom uvoza. Pojedine oznake (poput 'script') se uvek uklanjaju zbog bezbednosti.",
+            "placeholder": "Unesite HTML oznake, po jednu u svaki red",
+            "reset_button": "Vrati na podrazumevanu listu"
+        },
+        "import-status": "Status uvoza",
+        "in-progress": "Uvoz u toku: {{progress}}",
+        "successful": "Uvoz je uspešno završen."
+    },
+    "include_note": {
+        "dialog_title": "Uključi belešku",
+        "close": "Zatvori",
+        "label_note": "Beleška",
+        "placeholder_search": "pretraži belešku po njenom imenu",
+        "box_size_prompt": "Veličina kutije priložene beleške:",
+        "box_size_small": "mala (~ 10 redova)",
+        "box_size_medium": "srednja (~ 30 redova)",
+        "box_size_full": "puna (kutija prikazuje ceo tekst)",
+        "button_include": "Uključi belešku <kbd>enter</kbd>"
+    },
+    "info": {
+        "modalTitle": "Informativna poruka",
+        "closeButton": "Zatvori",
+        "okButton": "U redu"
+    },
+    "jump_to_note": {
+        "search_placeholder": "Pretraži belešku po njenom imenu ili unesi > za komande...",
+        "close": "Zatvori",
+        "search_button": "Pretraga u punom tekstu <kbd>Ctrl+Enter</kbd>"
+    },
+    "markdown_import": {
+        "dialog_title": "Uvoz za Markdown",
+        "close": "Zatvori",
+        "modal_body_text": "Zbog Sandbox-a pretraživača nije moguće direktno učitati privremenu memoriju iz JavaScript-a. Molimo vas da nalepite Markdown za uvoz u tekstualno polje ispod i kliknete na dugme za uvoz",
+        "import_button": "Uvoz Ctrl+Enter",
+        "import_success": "Markdown sadržaj je učitan u dokument."
+    },
+    "move_to": {
+        "dialog_title": "Premesti beleške u ...",
+        "close": "Zatvori",
+        "notes_to_move": "Beleške za premeštanje",
+        "target_parent_note": "Ciljana nadbeleška",
+        "search_placeholder": "potraži belešku po njenom imenu",
+        "move_button": "Pređi na izabranu belešku <kbd>enter</kbd>",
+        "error_no_path": "Nema putanje za premeštanje.",
+        "move_success_message": "Izabrane beleške su premeštene u "
+    },
+    "note_type_chooser": {
+        "change_path_prompt": "Promenite gde će se napraviti nova beleška:",
+        "search_placeholder": "pretraži putanju po njenom imenu (podrazumevano ako je prazno)",
+        "modal_title": "Izaberite tip beleške",
+        "close": "Zatvori",
+        "modal_body": "Izaberite tip beleške / šablon za novu belešku:",
+        "templates": "Šabloni:"
+    },
+    "password_not_set": {
+        "title": "Lozinka nije podešena",
+        "close": "Zatvori",
+        "body1": "Zaštićene beleške su enkriptovane sa korisničkom lozinkom, ali lozinka još uvek nije podešena.",
+        "body2": "Za biste mogli da sačuvate beleške, kliknite <a class=\"open-password-options-button\" href=\"javascript:\">ovde</a> da otvorite dijalog sa Opcijama i podesite svoju lozinku."
+    },
+    "prompt": {
+        "title": "Upit",
+        "close": "Zatvori",
+        "ok": "U redu <kbd>enter</kbd>",
+        "defaultTitle": "Upit"
+    },
+    "protected_session_password": {
+        "modal_title": "Zaštićena sesija",
+        "help_title": "Pomoć za Zaštićene beleške",
+        "close_label": "Zatvori",
+        "form_label": "Da biste nastavili sa traženom akcijom moraćete započeti zaštićenu sesiju tako što ćete uneti lozinku:",
+        "start_button": "Započni zaštićenu sesiju <kbd>enter</kbd>"
+    },
+    "recent_changes": {
+        "title": "Nedavne promene",
+        "erase_notes_button": "Obriši izabrane beleške odmah",
+        "close": "Zatvori",
+        "deleted_notes_message": "Obrisane beleške su uklonjene.",
+        "no_changes_message": "Još uvek nema izmena...",
+        "undelete_link": "poništi brisanje",
+        "confirm_undelete": "Da li želite da poništite brisanje ove beleške i njenih podbeleški?"
+    },
+    "revisions": {
+        "note_revisions": "Revizije beleški",
+        "delete_all_revisions": "Obriši sve revizije ove beleške",
+        "delete_all_button": "Obriši sve revizije",
+        "help_title": "Pomoć za Revizije beleški",
+        "close": "Zatvori",
+        "revision_last_edited": "Ova revizija je poslednji put izmenjena {{date}}",
+        "confirm_delete_all": "Da li želite da obrišete sve revizije ove beleške?",
+        "no_revisions": "Još uvek nema revizija za ovu belešku...",
+        "restore_button": "Vrati",
+        "confirm_restore": "Da li želite da vratite ovu reviziju? Ovo će prepisati trenutan naslov i sadržaj beleške sa ovom revizijom.",
+        "delete_button": "Obriši",
+        "confirm_delete": "Da li želite da obrišete ovu reviziju?",
+        "revisions_deleted": "Revizije beleške su obrisane.",
+        "revision_restored": "Revizija beleške je vraćena.",
+        "revision_deleted": "Revizija beleške je obrisana.",
+        "snapshot_interval": "Interval snimanja revizije beleške: {{seconds}}s.",
+        "maximum_revisions": "Ograničenje broja slika revizije beleške: {{number}}.",
+        "settings": "Podešavanja revizija beleški",
+        "download_button": "Preuzmi",
+        "mime": "MIME: ",
+        "file_size": "Veličina datoteke:",
+        "preview": "Pregled:",
+        "preview_not_available": "Pregled nije dostupan za ovaj tip beleške."
+    },
+    "sort_child_notes": {
+        "sort_children_by": "Sortiranje podbeleški po...",
+        "close": "Zatvori",
+        "sorting_criteria": "Kriterijum za sortiranje",
+        "title": "naslov",
+        "date_created": "datum kreiranja",
+        "date_modified": "datum izmene",
+        "sorting_direction": "Smer sortiranja",
+        "ascending": "uzlazni",
+        "descending": "silazni",
+        "folders": "Fascikle",
+        "sort_folders_at_top": "sortiraj fascikle na vrh",
+        "natural_sort": "Prirodno sortiranje",
+        "sort_with_respect_to_different_character_sorting": "sortiranje sa poštovanjem različitih pravila sortiranja karaktera i kolacija u različitim jezicima ili regionima.",
+        "natural_sort_language": "Jezik za prirodno sortiranje",
+        "the_language_code_for_natural_sort": "Kod jezika za prirodno sortiranje, npr. \"zh-CN\" za Kineski.",
+        "sort": "Sortiraj <kbd>enter</kbd>"
+    },
+    "upload_attachments": {
+        "upload_attachments_to_note": "Otpremite priloge uz belešku",
+        "close": "Zatvori",
+        "choose_files": "Izaberite datoteke",
+        "files_will_be_uploaded": "Datoteke će biti otpremljene kao prilozi u",
+        "options": "Opcije",
+        "shrink_images": "Smanji slike",
+        "upload": "Otpremi",
+        "tooltip": "Ako je označeno, Trilium će pokušati da smanji otpremljene slike skaliranjem i optimizacijom što može uticati na kvalitet slike. Ako nije označeno, slike će biti otpremljene bez izmena."
+    },
+    "attribute_detail": {
+        "attr_detail_title": "Naslov detalja atributa",
+        "close_button_title": "Otkaži izmene i zatvori",
+        "attr_is_owned_by": "Atribut je u vlasništvu",
+        "attr_name_title": "Naziv atributa može biti sastavljen samo od alfanumeričkih znakova, dvotačke i donje crte",
+        "name": "Naziv",
+        "value": "Vrednost",
+        "target_note_title": "Relacija je imenovana veza između izvorne beleške i ciljne beleške.",
+        "target_note": "Ciljna beleška",
+        "promoted_title": "Promovisani atribut je istaknut na belešci.",
+        "promoted": "Promovisan",
+        "promoted_alias_title": "Naziv koji će biti prikazan u korisničkom interfejsu promovisanih atributa.",
+        "promoted_alias": "Pseudonim",
+        "multiplicity_title": "Multiplicitet definiše koliko atributa sa istim nazivom se može napraviti - najviše 1 ili više od 1.",
+        "multiplicity": "Multiplicitet",
+        "single_value": "Jednostruka vrednost",
+        "multi_value": "Višestruka vrednost",
+        "label_type_title": "Tip oznake će pomoći Triliumu da izabere odgovarajući interfejs za unos vrednosti oznake.",
+        "label_type": "Tip",
+        "text": "Tekst",
+        "number": "Broj",
+        "boolean": "Boolean",
+        "date": "Datum",
+        "date_time": "Datum i vreme",
+        "time": "Vreme",
+        "url": "URL",
+        "precision_title": "Broj cifara posle zareza treba biti dostupan u interfejsu za postavljanje vrednosti.",
+        "precision": "Preciznost",
+        "digits": "cifre",
+        "inverse_relation_title": "Opciono podešavanje za definisanje kojoj relaciji je ova suprotna. Primer: Otac - Sin su inverzne relacije jedna drugoj.",
+        "inverse_relation": "Inverzna relacija",
+        "inheritable_title": "Atributi koji mogu da se nasleđuju će biti nasleđeni od strane svih potomaka unutar ovog stabla.",
+        "inheritable": "Nasledno",
+        "save_and_close": "Sačuvaj i zatvori <kbd>Ctrl+Enter</kbd>",
+        "delete": "Obriši",
+        "related_notes_title": "Druge beleške sa ovom oznakom",
+        "more_notes": "Još beleški",
+        "label": "Detalji oznake",
+        "label_definition": "Detalji definicije oznake",
+        "relation": "Detalji relacije",
+        "relation_definition": "Detalji definicije relacije",
+        "disable_versioning": "onemogućava auto-verzionisanje. Korisno za npr. velike, ali nebitne beleške - poput velikih JS biblioteka koje se koriste za skripte",
+        "calendar_root": "obeležava belešku koju treba koristiti kao osnova za dnevne beleške. Samo jedna beleška treba da bude označena kao takva.",
+        "archived": "beleške sa ovom oznakom neće biti podrazumevano vidljive u rezultatima pretrage (kao ni u dijalozima za Idi na, Dodaj link, itd.).",
+        "exclude_from_export": "beleške (sa svojim podstablom) neće biti uključene u bilo koji izvoz beleški",
+        "run": "definiše u kojim događajima se skripta pokreće. Moguće vrednosti su:\n<ul>\n<li>frontendStartup - kada se pokrene Trilium frontend (ili se osveži), ali ne na mobilnom uređaju.</li>\n<li>mobileStartup - kada se pokrene Trilium frontend (ili se osveži), na mobilnom uređaju..</li>\n<li>backendStartup - kada se Trilium backend pokrene</li>\n<li>hourly - pokreće se svaki sat. Može se koristiti dodatna oznaka <code>runAtHour</code> da se označi u kom satu.</li>\n<li>daily - pokreće se jednom dnevno</li>\n</ul>",
+        "run_on_instance": "Definiše u kojoj instanci Trilium-a ovo treba da se pokreće. Podrazumevano podešavanje je na svim instancama.",
+        "run_at_hour": "U kom satu ovo treba da se pokreće. Treba se koristiti zajedno sa <code>#run=hourly</code>. Može biti definisano više puta za više pokretanja u toku dana.",
+        "disable_inclusion": "skripte sa ovom oznakom neće biti uključene u izvršavanju nadskripte.",
+        "sorted": "čuva podbeleške sortirane alfabetski po naslovu",
+        "sort_direction": "Uzlazno (podrazumevano) ili silazno",
+        "sort_folders_first": "Fascikle (beleške sa podbeleškama) treba da budu sortirane na vrhu",
+        "top": "zadrži datu belešku na vrhu njene nadbeleške (primenjuje se samo na sortiranim nadbeleškama)",
+        "hide_promoted_attributes": "Sakrij promovisane atribute na ovoj belešci",
+        "read_only": "uređivač je u režimu samo za čitanje. Radi samo za tekst i beleške sa kodom.",
+        "auto_read_only_disabled": "beleške sa tekstom/kodom se mogu automatski podesiti u režim za čitanje kada su prevelike. Ovo ponašanje možete onemogućiti pojedinačno za belešku dodavanjem ove oznake na belešku",
+        "app_css": "označava CSS beleške koje nisu učitane u Trilium aplikaciju i zbog toga se mogu koristiti za menjanje izgleda Triliuma.",
+        "app_theme": "označava CSS beleške koje su pune Trilium teme i stoga su dostupne u Trilium podešavanjima.",
+        "app_theme_base": "podesite na „sledeće“, „sledeće-svetlo“ ili „sledeće-tamno“ da biste koristili odgovarajuću TriliumNext temu (automatsku, svetlu ili tamnu) kao osnovu za prilagođenu temu, umesto podrazumevane teme.",
+        "css_class": "vrednost ove oznake se zatim dodaje kao CSS klasa čvoru koji predstavlja datu belešku u stablu. Ovo može biti korisno za napredno temiranje. Može se koristiti u šablonima beleški.",
+        "workspace": "označava ovu belešku kao radni prostor što omogućava lako podizanje",
+        "workspace_icon_class": "definiše CSS klasu ikone okvira koja će se koristiti u kartici kada se podigne na ovoj belešci",
+        "workspace_tab_background_color": "CSS boja korišćena u kartici beleške kada se prebaci na ovu belešku",
+        "workspace_calendar_root": "Definiše koren kalendara za svaki radni prostor",
+        "workspace_template": "Ova beleška će se pojaviti u izboru dostupnih šablona prilikom kreiranja nove beleške, ali samo kada se podigne u radni prostor koji sadrži ovaj šablon",
+        "search_home": "nove beleške o pretrazi biće kreirane kao podređeni delovi ove beleške",
+        "workspace_search_home": "nove beleške o pretrazi biće kreirane kao podređeni delovi ove beleške kada se podignu na nekog pretka ove beleške iz radnog prostora",
+        "inbox": "podrazumevana lokacija u prijemnom sandučetu za nove beleške - kada kreirate belešku pomoću dugmeta „nova beleška“ u bočnoj traci, beleške će biti kreirane kao podbeleške u belešci označenoj sa oznakom <code>#inbox</code>.",
+        "workspace_inbox": "podrazumevana lokacija prijemnog sandučeta za nove beleške kada se prebace na nekog pretka ove beleške iz radnog prostora",
+        "sql_console_home": "podrazmevana lokacija beleški SQL konzole",
+        "bookmark_folder": "beleška sa ovom oznakom će se pojaviti u obeleživačima kao fascikla (omogućavajući pristup njenim podređenim fasciklama)",
+        "share_hidden_from_tree": "ova beleška je skrivena u levom navigacionom stablu, ali je i dalje dostupna preko svoje URL adrese",
+        "share_external_link": "beleška će služiti kao veza ka eksternoj veb stranici u stablu deljenja",
+        "share_alias": "definišite alias pomoću kog će beleška biti dostupna na https://your_trilium_host/share/[your_alias]",
+        "share_omit_default_css": "CSS kod podrazumevane stranice za deljenje će biti izostavljen. Koristite ga kada pravite opsežne promene stila.",
+        "share_root": "obeležava belešku koja se prikazuje na /share korenu.",
+        "share_description": "definišite tekst koji će se dodati HTML meta oznaci za opis",
+        "share_raw": "beleška će biti prikazana u svom sirovom (raw) formatu, bez HTML omotača",
+        "share_disallow_robot_indexing": "zabraniće robotsko indeksiranje ove beleške putem zaglavlja <code>X-Robots-Tag: noindex</code>",
+        "share_credentials": "potrebni su kredencijali za pristup ovoj deljenoj belešci. Očekuje se da vrednost bude u formatu „korisničko ime:lozinka“. Ne zaboravite da ovo označite kao nasledno da bi se primenilo na podbeleške/slike.",
+        "share_index": "beleška sa ovom oznakom će izlistati sve korene deljenih beleški",
+        "display_relations": "imena relacija razdvojenih zarezima koja treba da budu prikazana. Sva ostala će biti skrivena.",
+        "hide_relations": "imena relacija razdvojenih zarezima koja treba da budu skrivena. Sva ostala će biti prikazana.",
+        "title_template": "podrazumevani naslov beleški kreiranih kao deca ove beleške. Vrednost se procenjuje kao JavaScript string \n                        i stoga se može obogatiti dinamičkim sadržajem putem ubrizganih promenljivih <code>now</code> and <code>parentNote</code>. Primeri:\n                        \n                        <ul>\n                            <li><code>${parentNote.getLabelValue('authorName')}'s literary works</code></li>\n                            <li><code>Log for ${now.format('YYYY-MM-DD HH:mm:ss')}</code></li>\n                        </ul>\n                        \n                        Pogledati <a href=\"https://triliumnext.github.io/Docs/Wiki/default-note-title.html\">wiki sa detaljima</a>, API dokumentacija za <a href=\"https://zadam.github.io/trilium/backend_api/Note.html\">parentNote</a> i <a href=\"https://day.js.org/docs/en/display/format\">now</a> za detalje.",
+        "template": "Ova beleška će biti prikazana u izboru dostupnih šablona prilikom pravljenja nove beleške",
+        "toc": "<code>#toc</code> ili <code>#toc=show</code> će pristiliti Sadržaj (Table of Contents) da bude prikazan, <code>#toc=hide</code> prisiliti njegovo sakrivanje. Ako oznaka ne postoji, ponašanje će biti usklađeno sa globalnim podešavanjem",
+        "color": "definiše boju beleške u stablu beleški, linkovima itd. Koristite bilo koju važeću CSS vrednost boje kao što je „crvena“ ili #a13d5f",
+        "keyboard_shortcut": "Definiše prečicu na tastaturi koja će odmah preći na ovu belešku. Primer: „ctrl+alt+e“. Potrebno je ponovno učitavanje frontenda da bi promena stupila na snagu.",
+        "keep_current_hoisting": "Otvaranje ove veze neće promeniti podizanje čak i ako beleška nije prikazana u trenutno podignutom podstablu.",
+        "execute_button": "Naslov dugmeta koje će izvršiti trenutnu belešku sa kodom",
+        "execute_description": "Duži opis trenutne beleške sa kodom prikazan je zajedno sa dugmetom za izvršavanje",
+        "exclude_from_note_map": "Beleške sa ovom oznakom biće skrivene sa mape beleški",
+        "new_notes_on_top": "Nove beleške će biti napravljene na vrhu matične beleške, a ne na dnu.",
+        "hide_highlight_widget": "Sakrij vidžet sa listom istaknutih",
+        "run_on_note_creation": "izvršava se kada se beleška napravi na serverskoj strani. Koristite ovu relaciju ako želite da pokrenete skriptu za sve beleške napravljene u okviru određenog podstabla. U tom slučaju, kreirajte je na korenu beleške podstabla i učinite je naslednom. Nova beleška napravljena unutar podstabla (bilo koje dubine) pokrenuće skriptu.",
+        "run_on_child_note_creation": "izvršava se kada se napravi nova beleška ispod beleške gde je ova relacija definisana",
+        "run_on_note_title_change": "izvršava se kada se promeni naslov beleške (uključuje i pravljenje beleške)",
+        "run_on_note_content_change": "izvršava se kada se promeni sadržaj beleške (uključuje i pravljenje beleške).",
+        "run_on_note_change": "izvršava se kada se promeni beleška (uključuje i pravljenje beleške). Ne uključuje promene sadržaja",
+        "icon_class": "vrednost ove oznake se dodaje kao CSS klasa ikoni na stablu što može pomoći u vizuelnom razlikovanju beleški u stablu. Primer može biti bx bx-home - ikone su preuzete iz boxicons. Može se koristiti u šablonima beleški.",
+        "page_size": "broj stavki po stranici u listi beleški",
+        "custom_request_handler": "pogledajte <a href=\"javascript:\" data-help-page=\"custom-request-handler.html\">Prilagođeni obrađivač zahteva</a>",
+        "custom_resource_provider": "pogledajte <a href=\"javascript:\" data-help-page=\"custom-request-handler.html\">Prilagođeni obrađivač zahteva</a>",
+        "widget": "označava ovu belešku kao prilagođeni vidžet koji će biti dodat u stablo komponenti Trilijuma",
+        "run_on_note_deletion": "izvršava se kada se beleška briše",
+        "run_on_branch_creation": "izvršava se kada se pravi grana. Grana je veza između matične i podređene beleške i pravi se npr. prilikom kloniranja ili premeštanja beleške.",
+        "run_on_branch_change": "izvršava se kada se grana ažurira.",
+        "run_on_branch_deletion": "izvršava se kada se grana briše. Grana je veza između nadređene beleške i podređene beleške i briše se npr. prilikom premeštanja beleške (stara grana/veza se briše).",
+        "run_on_attribute_creation": "izvršava se kada se pravi novi atribut za belešku koji definiše ovu relaciju",
+        "run_on_attribute_change": " izvršava se kada se promeni atribut beleške koja definiše ovu relaciju. Ovo se pokreće i kada se atribut obriše",
+        "relation_template": "atributi beleške će biti nasleđeni čak i bez odnosa roditelj-dete, sadržaj i podstablo beleške će biti dodati instanci beleške ako je prazna. Pogledajte dokumentaciju za detalje.",
+        "inherit": "Atributi beleške će biti nasleđeni čak i bez odnosa roditelj-dete. Pogledajte relaciju šablona za sličan koncept. Pogledajte nasleđivanje atributa u dokumentaciji.",
+        "render_note": "Beleške tipa „render HTML note“ će biti prikazane korišćenjem beleške za kod (HTML ili skripte) i potrebno je pomoću ove relacije ukazati na to koja beleška treba da se prikaže",
+        "widget_relation": "meta ove relacije će biti izvršena i prikazana kao vidžet u bočnoj traci",
+        "share_css": "CSS napomena koja će biti ubrizgana na stranicu za deljenje. CSS napomena mora biti i u deljenom podstablu. Razmotrite i korišćenje „share_hidden_from_tree“ i „share_omit_default_css“.",
+        "share_js": "JavaScript beleška koja će biti ubrizgana na stranicu za deljenje. JS beleška takođe mora biti u deljenom podstablu. Razmislite o korišćenju „share_hidden_from_tree“.",
+        "share_template": "Ugrađena JavaScript beleška koja će se koristiti kao šablon za prikazivanje deljene beleške. U slučaju neuspeha vraća se na podrazumevani šablon. Razmislite o korišćenju „share_hidden_from_tree“.",
+        "share_favicon": "Favicon beleška koju treba postaviti na deljenu stranicu. Obično je potrebno da je podesite da deli koren i učinite je naslednom. Favicon beleška takođe mora biti u deljenom podstablu. Razmislite o korišćenju „share_hidden_from_tree“.",
+        "is_owned_by_note": "je u vlasništvu beleške",
+        "other_notes_with_name": "Ostale beleške sa {{attributeType}} nazivom „{{attributeName}}“",
+        "and_more": "... i još {{count}}.",
+        "print_landscape": "Prilikom izvoza u PDF, menja orijentaciju stranice u pejzažnu umesto uspravne.",
+        "print_page_size": "Prilikom izvoza u PDF, menja veličinu stranice. Podržane vrednosti: <code>A0</code>, <code>A1</code>, <code>A2</code>, <code>A3</code>, <code>A4</code>, <code>A5</code>, <code>A6</code>, <code>Legal</code>, <code>Letter</code>, <code>Tabloid</code>, <code>Ledger</code>.",
+        "color_type": "Boja"
+    },
+    "ai_llm": {
+        "n_notes_queued_0": "{{ count }} beleška stavljena u red za indeksiranje",
+        "n_notes_queued_1": "{{ count }} beleški stavljeno u red za indeksiranje",
+        "n_notes_queued_2": "{{ count }} beleški stavljeno u red za indeksiranje",
+        "notes_indexed_0": "{{ count }} beleška je indeksirana",
+        "notes_indexed_1": "{{ count }} beleški je indeksirano",
+        "notes_indexed_2": "{{ count }} beleški je indeksirano"
+    },
+    "attribute_editor": {
+        "help_text_body1": "Da biste dodali oznaku, samo unesite npr. <code>#rock</code> ili ako želite da dodate i vrednost, onda npr. <code>#year = 2020</code>",
+        "help_text_body2": "Za relaciju, unesite <code>~author = @</code> što bi trebalo da otvori automatsko dovršavanje gde možete potražiti željenu belešku.",
+        "help_text_body3": "Alternativno, možete dodati oznaku i relaciju pomoću dugmeta <code>+</code> sa desne strane.",
+        "save_attributes": "Sačuvaj atribute <enter>",
+        "add_a_new_attribute": "Dodajte novi atribut",
+        "add_new_label": "Dodajte novu oznaku <kbd data-command=\"addNewLabel\"></kbd>",
+        "add_new_relation": "Dodajte novu relaciju <kbd data-command=\"addNewRelation\"></kbd>",
+        "add_new_label_definition": "Dodajte novu definiciju oznake",
+        "add_new_relation_definition": "Dodajte novu definiciju relacije",
+        "placeholder": "Ovde unesite oznake i relacije"
+    },
+    "abstract_bulk_action": {
+        "remove_this_search_action": "Ukloni ovu radnju pretrage"
+    },
+    "execute_script": {
+        "execute_script": "Izvrši skriptu",
+        "help_text": "Možete izvršiti jednostavne skripte na podudarnim beleškama.",
+        "example_1": "Na primer, da biste dodali string u naslov beleške, koristite ovu malu skriptu:",
+        "example_2": "Složeniji primer bi bio brisanje svih atributa podudarnih beleški:"
+    },
+    "add_label": {
+        "add_label": "Dodaj oznaku",
+        "label_name_placeholder": "ime oznake",
+        "label_name_title": "Alfanumerički znakovi, donja crta i dvotačka su dozvoljeni znakovi.",
+        "to_value": "za vrednost",
+        "new_value_placeholder": "nova vrednost",
+        "help_text": "Na svim podudarnim beleškama:",
+        "help_text_item1": "dodajte datu oznaku ako beleška još uvek nema jednu",
+        "help_text_item2": "ili izmenite vrednost postojeće oznake",
+        "help_text_note": "Takođe možete pozvati ovu metodu bez vrednosti, u tom slučaju će oznaka biti dodeljena belešci bez vrednosti."
+    },
+    "delete_label": {
+        "delete_label": "Obriši oznaku",
+        "label_name_placeholder": "ime oznake",
+        "label_name_title": "Alfanumerički znakovi, donja crtica i dvotačka su dozvoljeni znakovi."
+    },
+    "rename_label": {
+        "rename_label": "Preimenuj oznaku",
+        "rename_label_from": "Preimenuj oznaku iz",
+        "old_name_placeholder": "stari naziv",
+        "to": "U",
+        "new_name_placeholder": "novi naziv",
+        "name_title": "Alfanumerički znakovi, donja crtica i dvotačka su dozvoljeni znakovi."
+    },
+    "update_label_value": {
+        "update_label_value": "Ažuriraj vrednost oznake",
+        "label_name_placeholder": "ime oznake",
+        "label_name_title": "Alfanumerički znakovi, donja crtica i dvotačka su dozvoljeni znakovi.",
+        "to_value": "u vrednost",
+        "new_value_placeholder": "nova vrednost",
+        "help_text": "Na svim podudarnim beleškama, promenite vrednost postojeće oznake.",
+        "help_text_note": "Takođe možete pozvati ovu metodu bez vrednosti, u tom slučaju će oznaka biti dodeljena belešci bez vrednosti."
+    },
+    "delete_note": {
+        "delete_note": "Obriši belešku",
+        "delete_matched_notes": "Obriši podudarne beleške",
+        "delete_matched_notes_description": "Ovo će obrisati podudarne beleške.",
+        "undelete_notes_instruction": "Nakon brisanja, moguće ga je poništiti iz dijaloga Nedavne izmene."
+    }
+}
--- a/apps/client/src/translations/tr/translation.json
+++ b/apps/client/src/translations/tr/translation.json
@@ -0,0 +1,71 @@
+{
+    "about": {
+        "close": "Kapat",
+        "homepage": "Giriş sayfası:",
+        "app_version": "Uygulama versiyonu:",
+        "db_version": "Veritabanı versiyonu:"
+    },
+    "add_link": {
+        "close": "Kapat"
+    },
+    "branch_prefix": {
+        "close": "Kapat",
+        "save": "Kaydet"
+    },
+    "bulk_actions": {
+        "close": "Kapat"
+    },
+    "clone_to": {
+        "close": "Kapat"
+    },
+    "confirm": {
+        "close": "Kapat"
+    },
+    "recent_changes": {
+        "close": "Kapat"
+    },
+    "delete_notes": {
+        "close": "Kapat"
+    },
+    "export": {
+        "close": "Kapat"
+    },
+    "help": {
+        "close": "Kapat"
+    },
+    "include_note": {
+        "close": "Kapat"
+    },
+    "import": {
+        "close": "Kapat",
+        "chooseImportFile": "İçe aktarım dosyası",
+        "importDescription": "Seçilen dosya(lar) alt not olarak içe aktarılacaktır"
+    },
+    "info": {
+        "closeButton": "Kapat"
+    },
+    "jump_to_note": {
+        "close": "Kapat"
+    },
+    "markdown_import": {
+        "close": "Kapat"
+    },
+    "move_to": {
+        "close": "Kapat"
+    },
+    "note_type_chooser": {
+        "close": "Kapat"
+    },
+    "password_not_set": {
+        "close": "Kapat"
+    },
+    "prompt": {
+        "close": "Kapat"
+    },
+    "protected_session_password": {
+        "close_label": "Kapat"
+    },
+    "revisions": {
+        "close": "Kapat"
+    }
+}
--- a/apps/client/src/translations/tw/translation.json
+++ b/apps/client/src/translations/tw/translation.json
--- a/apps/client/src/types-assets.d.ts
+++ b/apps/client/src/types-assets.d.ts
@@ -3,6 +3,11 @@ declare module "*.png" {
    export default path;
 }

+declare module "*.json" {
+    var content: any;
+    export default content;
+}
+
 declare module "*?url" {
    var path: string;
    export default path;
--- a/apps/client/src/types.d.ts
+++ b/apps/client/src/types.d.ts
@@ -97,16 +97,6 @@ declare global {
        setNote(noteId: string);
    }

-    interface JQueryStatic {
-        hotkeys: {
-            options: {
-                filterInputAcceptingElements: boolean;
-                filterContentEditable: boolean;
-                filterTextInputs: boolean;
-            }
-        }
-    }
-
    var logError: (message: string, e?: Error | string) => void;
    var logInfo: (message: string) => void;
    var glob: CustomGlobals;
--- a/apps/client/src/widgets/attribute_widgets/attribute_detail.ts
+++ b/apps/client/src/widgets/attribute_widgets/attribute_detail.ts
@@ -78,7 +78,7 @@ const TPL = /*html*/`
        }
    </style>

-    <div style="display: flex; justify-content: space-between; margin-bottom: 8px;">
+    <div style="display: flex; justify-content: space-between; align-items: start; margin-bottom: 8px;">
        <h5 class="attr-detail-title">${t("attribute_detail.attr_detail_title")}</h5>

        <span class="bx bx-x close-attr-detail-button tn-tool-button" title="${t("attribute_detail.close_button_title")}"></span>
@@ -142,6 +142,7 @@ const TPL = /*html*/`
                  <option value="datetime">${t("attribute_detail.date_time")}</option>
                  <option value="time">${t("attribute_detail.time")}</option>
                  <option value="url">${t("attribute_detail.url")}</option>
+                  <option value="color">${t("attribute_detail.color_type")}</option>
                </select>
            </td>
        </tr>
@@ -295,6 +296,8 @@ interface AttributeDetailOpts {
    x: number;
    y: number;
    focus?: "name";
+    parent?: HTMLElement;
+    hideMultiplicity?: boolean;
 }

 interface SearchRelatedResponse {
@@ -477,7 +480,7 @@ export default class AttributeDetailWidget extends NoteContextAwareWidget {
        });
    }

-    async showAttributeDetail({ allAttributes, attribute, isOwned, x, y, focus }: AttributeDetailOpts) {
+    async showAttributeDetail({ allAttributes, attribute, isOwned, x, y, focus, hideMultiplicity }: AttributeDetailOpts) {
        if (!attribute) {
            this.hide();

@@ -528,7 +531,7 @@ export default class AttributeDetailWidget extends NoteContextAwareWidget {
        this.$rowPromotedAlias.toggle(!!definition.isPromoted);
        this.$inputPromotedAlias.val(definition.promotedAlias || "").attr("disabled", disabledFn);

-        this.$rowMultiplicity.toggle(["label-definition", "relation-definition"].includes(this.attrType || ""));
+        this.$rowMultiplicity.toggle(["label-definition", "relation-definition"].includes(this.attrType || "") && !hideMultiplicity);
        this.$inputMultiplicity.val(definition.multiplicity || "").attr("disabled", disabledFn);

        this.$rowLabelType.toggle(this.attrType === "label-definition");
@@ -560,19 +563,22 @@ export default class AttributeDetailWidget extends NoteContextAwareWidget {

        this.toggleInt(true);

-        const offset = this.parent?.$widget.offset() || { top: 0, left: 0 };
+        const offset = this.parent?.$widget?.offset() || { top: 0, left: 0 };
        const detPosition = this.getDetailPosition(x, offset);
        const outerHeight = this.$widget.outerHeight();
        const height = $(window).height();

-        if (detPosition && outerHeight && height) {
-            this.$widget
-                .css("left", detPosition.left)
-                .css("right", detPosition.right)
-                .css("top", y - offset.top + 70)
-                .css("max-height", outerHeight + y > height - 50 ? height - y - 50 : 10000);
+        if (!detPosition || !outerHeight || !height) {
+            console.warn("Can't position popup, is it attached?");
+            return;
        }

+        this.$widget
+            .css("left", detPosition.left)
+            .css("right", detPosition.right)
+            .css("top", y - offset.top + 70)
+            .css("max-height", outerHeight + y > height - 50 ? height - y - 50 : 10000);
+
        if (focus === "name") {
            this.$inputName.trigger("focus").trigger("select");
        }
--- a/apps/client/src/widgets/attribute_widgets/attribute_editor.ts
+++ b/apps/client/src/widgets/attribute_widgets/attribute_editor.ts
@@ -4,7 +4,7 @@ import noteAutocompleteService, { type Suggestion } from "../../services/note_au
 import server from "../../services/server.js";
 import contextMenuService from "../../menus/context_menu.js";
 import attributeParser, { type Attribute } from "../../services/attribute_parser.js";
-import { AttributeEditor, type EditorConfig, type Element, type MentionFeed, type Node, type Position } from "@triliumnext/ckeditor5";
+import { AttributeEditor, type EditorConfig, type ModelElement, type MentionFeed, type ModelNode, type ModelPosition } from "@triliumnext/ckeditor5";
 import froca from "../../services/froca.js";
 import attributeRenderer from "../../services/attribute_renderer.js";
 import noteCreateService from "../../services/note_create.js";
@@ -417,16 +417,16 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget implem
        this.$editor.tooltip("show");
    }

-    getClickIndex(pos: Position) {
+    getClickIndex(pos: ModelPosition) {
        let clickIndex = pos.offset - (pos.textNode?.startOffset ?? 0);

-        let curNode: Node | Text | Element | null = pos.textNode;
+        let curNode: ModelNode | Text | ModelElement | null = pos.textNode;

        while (curNode?.previousSibling) {
            curNode = curNode.previousSibling;

-            if ((curNode as Element).name === "reference") {
-                clickIndex += (curNode.getAttribute("notePath") as string).length + 1;
+            if ((curNode as ModelElement).name === "reference") {
+                clickIndex += (curNode.getAttribute("href") as string).length + 1;
            } else if ("data" in curNode) {
                clickIndex += (curNode.data as string).length;
            }
--- a/apps/client/src/widgets/buttons/command_button.ts
+++ b/apps/client/src/widgets/buttons/command_button.ts
@@ -1,9 +1,10 @@
+import { ActionKeyboardShortcut } from "@triliumnext/commons";
 import type { CommandNames } from "../../components/app_context.js";
-import keyboardActionsService, { type Action } from "../../services/keyboard_actions.js";
+import keyboardActionsService from "../../services/keyboard_actions.js";
 import AbstractButtonWidget, { type AbstractButtonWidgetSettings } from "./abstract_button.js";
 import type { ButtonNoteIdProvider } from "./button_from_note.js";

-let actions: Action[];
+let actions: ActionKeyboardShortcut[];

 keyboardActionsService.getActions().then((as) => (actions = as));

@@ -49,7 +50,7 @@ export default class CommandButtonWidget extends AbstractButtonWidget<CommandBut

        const action = actions.find((act) => act.actionName === this._command);

-        if (action && action.effectiveShortcuts.length > 0) {
+        if (action?.effectiveShortcuts && action.effectiveShortcuts.length > 0) {
            return `${title} (${action.effectiveShortcuts.join(", ")})`;
        } else {
            return title;
--- a/apps/client/src/widgets/buttons/note_actions.ts
+++ b/apps/client/src/widgets/buttons/note_actions.ts
@@ -186,10 +186,10 @@ export default class NoteActionsWidget extends NoteContextAwareWidget {

        this.$convertNoteIntoAttachmentButton.toggle(note.isEligibleForConversionToAttachment());

-        this.toggleDisabled(this.$findInTextButton, ["text", "code", "book", "mindMap"].includes(note.type));
+        this.toggleDisabled(this.$findInTextButton, ["text", "code", "book", "mindMap", "doc"].includes(note.type));

        this.toggleDisabled(this.$showAttachmentsButton, !isInOptions);
-        this.toggleDisabled(this.$showSourceButton, ["text", "code", "relationMap", "mermaid", "canvas", "mindMap", "geoMap"].includes(note.type));
+        this.toggleDisabled(this.$showSourceButton, ["text", "code", "relationMap", "mermaid", "canvas", "mindMap"].includes(note.type));

        const canPrint = ["text", "code"].includes(note.type);
        this.toggleDisabled(this.$printActiveNoteButton, canPrint);
--- a/apps/client/src/widgets/containers/container.ts
+++ b/apps/client/src/widgets/containers/container.ts
@@ -1,5 +1,5 @@
-import type { default as Component, TypedComponent } from "../../components/component.js";
-import BasicWidget, { TypedBasicWidget } from "../basic_widget.js";
+import type { TypedComponent } from "../../components/component.js";
+import { TypedBasicWidget } from "../basic_widget.js";

 export default class Container<T extends TypedComponent<any>> extends TypedBasicWidget<T> {
    doRender() {
--- a/apps/client/src/widgets/containers/left_pane_container.ts
+++ b/apps/client/src/widgets/containers/left_pane_container.ts
@@ -5,7 +5,7 @@ import type Component from "../../components/component.js";

 export default class LeftPaneContainer extends FlexContainer<Component> {
    private currentLeftPaneVisible: boolean;
-    
+
    constructor() {
        super("column");

@@ -24,6 +24,7 @@ export default class LeftPaneContainer extends FlexContainer<Component> {
        this.currentLeftPaneVisible = leftPaneVisible ?? !this.currentLeftPaneVisible;
        const visible = this.isEnabled();
        this.toggleInt(visible);
+        this.parent?.$widget.toggleClass("left-pane-hidden", !visible);

        if (visible) {
            this.triggerEvent("focusTree", {});
--- a/apps/client/src/widgets/containers/ribbon_container.ts
+++ b/apps/client/src/widgets/containers/ribbon_container.ts
@@ -268,7 +268,7 @@ export default class RibbonContainer extends NoteContextAwareWidget {
                    const action = actions.find((act) => act.actionName === toggleCommandName);
                    const title = $(this).attr("data-title");

-                    if (action && action.effectiveShortcuts.length > 0) {
+                    if (action?.effectiveShortcuts && action.effectiveShortcuts.length > 0) {
                        return `${title} (${action.effectiveShortcuts.join(", ")})`;
                    } else {
                        return title ?? "";
--- a/apps/client/src/widgets/dialogs/about.ts
+++ b/apps/client/src/widgets/dialogs/about.ts
@@ -1,117 +0,0 @@
-import { formatDateTime } from "../../utils/formatters.js";
-import { t } from "../../services/i18n.js";
-import BasicWidget from "../basic_widget.js";
-import openService from "../../services/open.js";
-import server from "../../services/server.js";
-import utils from "../../services/utils.js";
-import { openDialog } from "../../services/dialog.js";
-
-interface AppInfo {
-    appVersion: string;
-    dbVersion: number;
-    syncVersion: number;
-    buildDate: string;
-    buildRevision: string;
-    dataDirectory: string;
-}
-
-const TPL = /*html*/`
-<div class="about-dialog modal fade mx-auto" tabindex="-1" role="dialog">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">${t("about.title")}</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="${t("about.close")}"></button>
-            </div>
-            <div class="modal-body">
-                <table class="table table-borderless">
-                    <tr>
-                        <th>${t("about.homepage")}</th>
-                        <td><a class="tn-link" href="https://github.com/TriliumNext/Trilium" class="external">https://github.com/TriliumNext/Trilium</a></td>
-                    </tr>
-                    <tr>
-                        <th>${t("about.app_version")}</th>
-                        <td class="app-version"></td>
-                    </tr>
-                    <tr>
-                        <th>${t("about.db_version")}</th>
-                        <td class="db-version"></td>
-                    </tr>
-                    <tr>
-                        <th>${t("about.sync_version")}</th>
-                        <td class="sync-version"></td>
-                    </tr>
-                    <tr>
-                        <th>${t("about.build_date")}</th>
-                        <td class="build-date"></td>
-                    </tr>
-                    <tr>
-                        <th>${t("about.build_revision")}</th>
-                        <td><a class="tn-link build-revision external" href="" target="_blank"></a></td>
-                    </tr>
-                    <tr>
-                        <th>${t("about.data_directory")}</th>
-                        <td class="data-directory"></td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </div>
-</div>
-
-<style>
-.about-dialog a {
-    word-break: break-all;
-}
-</style>
-`;
-
-export default class AboutDialog extends BasicWidget {
-    private $appVersion!: JQuery<HTMLElement>;
-    private $dbVersion!: JQuery<HTMLElement>;
-    private $syncVersion!: JQuery<HTMLElement>;
-    private $buildDate!: JQuery<HTMLElement>;
-    private $buildRevision!: JQuery<HTMLElement>;
-    private $dataDirectory!: JQuery<HTMLElement>;
-
-    doRender(): void {
-        this.$widget = $(TPL);
-        this.$appVersion = this.$widget.find(".app-version");
-        this.$dbVersion = this.$widget.find(".db-version");
-        this.$syncVersion = this.$widget.find(".sync-version");
-        this.$buildDate = this.$widget.find(".build-date");
-        this.$buildRevision = this.$widget.find(".build-revision");
-        this.$dataDirectory = this.$widget.find(".data-directory");
-    }
-
-    async refresh() {
-        const appInfo = await server.get<AppInfo>("app-info");
-
-        this.$appVersion.text(appInfo.appVersion);
-        this.$dbVersion.text(appInfo.dbVersion.toString());
-        this.$syncVersion.text(appInfo.syncVersion.toString());
-        this.$buildDate.text(formatDateTime(appInfo.buildDate));
-        this.$buildRevision.text(appInfo.buildRevision);
-        this.$buildRevision.attr("href", `https://github.com/TriliumNext/Trilium/commit/${appInfo.buildRevision}`);
-        if (utils.isElectron()) {
-            this.$dataDirectory.html(
-                $("<a></a>", {
-                    href: "#",
-                    class: "tn-link",
-                    text: appInfo.dataDirectory
-                }).prop("outerHTML")
-            );
-            this.$dataDirectory.find("a").on("click", (event: JQuery.ClickEvent) => {
-                event.preventDefault();
-                openService.openDirectory(appInfo.dataDirectory);
-            });
-        } else {
-            this.$dataDirectory.text(appInfo.dataDirectory);
-        }
-    }
-
-    async openAboutDialogEvent() {
-        await this.refresh();
-        openDialog(this.$widget);
-    }
-}
--- a/apps/client/src/widgets/dialogs/about.tsx
+++ b/apps/client/src/widgets/dialogs/about.tsx
@@ -0,0 +1,91 @@
+import { openDialog } from "../../services/dialog.js";
+import ReactBasicWidget from "../react/ReactBasicWidget.js";
+import Modal from "../react/Modal.js";
+import { t } from "../../services/i18n.js";
+import { formatDateTime } from "../../utils/formatters.js";
+import server from "../../services/server.js";
+import utils from "../../services/utils.js";
+import openService from "../../services/open.js";
+import { useState } from "preact/hooks";
+import type { CSSProperties } from "preact/compat";
+import type { AppInfo } from "@triliumnext/commons";
+
+function AboutDialogComponent() {
+    let [appInfo, setAppInfo] = useState<AppInfo | null>(null);
+
+    async function onShown() {
+        const appInfo = await server.get<AppInfo>("app-info");
+        setAppInfo(appInfo);
+    }
+
+    const forceWordBreak: CSSProperties = { wordBreak: "break-all" };
+
+    return (
+        <Modal className="about-dialog" size="lg" title={t("about.title")} onShown={onShown}>
+            {(appInfo !== null) ? (
+                <table className="table table-borderless">
+                    <tbody>
+                        <tr>
+                            <th>{t("about.homepage")}</th>
+                            <td><a className="tn-link external" href="https://github.com/TriliumNext/Trilium" style={forceWordBreak}>https://github.com/TriliumNext/Trilium</a></td>
+                        </tr>
+                        <tr>
+                            <th>{t("about.app_version")}</th>
+                            <td className="app-version">{appInfo.appVersion}</td>
+                        </tr>
+                        <tr>
+                            <th>{t("about.db_version")}</th>
+                            <td className="db-version">{appInfo.dbVersion}</td>
+                        </tr>
+                        <tr>
+                            <th>{t("about.sync_version")}</th>
+                            <td className="sync-version">{appInfo.syncVersion}</td>
+                        </tr>
+                        <tr>
+                            <th>{t("about.build_date")}</th>
+                            <td className="build-date">{formatDateTime(appInfo.buildDate)}</td>
+                        </tr>
+                        <tr>
+                            <th>{t("about.build_revision")}</th>
+                            <td>
+                                <a className="tn-link build-revision external" href={`https://github.com/TriliumNext/Trilium/commit/${appInfo.buildRevision}`} target="_blank" style={forceWordBreak}>{appInfo.buildRevision}</a>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>{t("about.data_directory")}</th>
+                            <td className="data-directory">
+                                <DirectoryLink directory={appInfo.dataDirectory} style={forceWordBreak} />
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            ) : (
+                <div className="loading-spinner"></div>
+            )}
+        </Modal>
+    );
+}
+
+function DirectoryLink({ directory, style }: { directory: string, style?: CSSProperties }) {
+    if (utils.isElectron()) {
+        const onClick = (e: MouseEvent) => {
+            e.preventDefault();
+            openService.openDirectory(directory);
+        };
+
+        return <a className="tn-link" href="#" onClick={onClick} style={style}></a>
+    } else {
+        return <span style={style}>{directory}</span>;
+    }
+}
+
+export default class AboutDialog extends ReactBasicWidget {
+
+    get component() {
+        return <AboutDialogComponent />;
+    }
+
+    async openAboutDialogEvent() {
+        openDialog(this.$widget);
+    }
+}
--- a/apps/client/src/widgets/dialogs/jump_to_note.ts
+++ b/apps/client/src/widgets/dialogs/jump_to_note.ts
@@ -6,6 +6,7 @@ import BasicWidget from "../basic_widget.js";
 import shortcutService from "../../services/shortcuts.js";
 import { Modal } from "bootstrap";
 import { openDialog } from "../../services/dialog.js";
+import commandRegistry from "../../services/command_registry.js";

 const TPL = /*html*/`<div class="jump-to-note-dialog modal mx-auto" tabindex="-1" role="dialog">
    <div class="modal-dialog modal-lg" role="document">
@@ -34,7 +35,8 @@ export default class JumpToNoteDialog extends BasicWidget {
    private modal!: bootstrap.Modal;
    private $autoComplete!: JQuery<HTMLElement>;
    private $results!: JQuery<HTMLElement>;
-    private $showInFullTextButton!: JQuery<HTMLElement>;
+    private $modalFooter!: JQuery<HTMLElement>;
+    private isCommandMode: boolean = false;

    constructor() {
        super();
@@ -48,13 +50,44 @@ export default class JumpToNoteDialog extends BasicWidget {

        this.$autoComplete = this.$widget.find(".jump-to-note-autocomplete");
        this.$results = this.$widget.find(".jump-to-note-results");
-        this.$showInFullTextButton = this.$widget.find(".show-in-full-text-button");
-        this.$showInFullTextButton.on("click", (e) => this.showInFullText(e));
+        this.$modalFooter = this.$widget.find(".modal-footer");
+        this.$modalFooter.find(".show-in-full-text-button").on("click", (e) => this.showInFullText(e));

        shortcutService.bindElShortcut(this.$widget, "ctrl+return", (e) => this.showInFullText(e));
+
+        // Monitor input changes to detect command mode switches
+        this.$autoComplete.on("input", () => {
+            this.updateCommandModeState();
+        });
+    }
+
+    private updateCommandModeState() {
+        const currentValue = String(this.$autoComplete.val() || "");
+        const newCommandMode = currentValue.startsWith(">");
+
+        if (newCommandMode !== this.isCommandMode) {
+            this.isCommandMode = newCommandMode;
+            this.updateButtonVisibility();
+        }
+    }
+
+    private updateButtonVisibility() {
+        if (this.isCommandMode) {
+            this.$modalFooter.hide();
+        } else {
+            this.$modalFooter.show();
+        }
    }

    async jumpToNoteEvent() {
+        await this.openDialog();
+    }
+
+    async commandPaletteEvent() {
+        await this.openDialog(true);
+    }
+
+    private async openDialog(commandMode = false) {
        const dialogPromise = openDialog(this.$widget);
        if (utils.isMobile()) {
            dialogPromise.then(($dialog) => {
@@ -81,50 +114,89 @@ export default class JumpToNoteDialog extends BasicWidget {
        }

        // first open dialog, then refresh since refresh is doing focus which should be visible
-        this.refresh();
+        this.refresh(commandMode);

        this.lastOpenedTs = Date.now();
    }

-    async refresh() {
+    async refresh(commandMode = false) {
        noteAutocompleteService
            .initNoteAutocomplete(this.$autoComplete, {
                allowCreatingNotes: true,
                hideGoToSelectedNoteButton: true,
                allowJumpToSearchNotes: true,
-                container: this.$results[0]
+                container: this.$results[0],
+                isCommandPalette: true
            })
            // clear any event listener added in previous invocation of this function
            .off("autocomplete:noteselected")
+            .off("autocomplete:commandselected")
            .on("autocomplete:noteselected", function (event, suggestion, dataset) {
                if (!suggestion.notePath) {
                    return false;
                }

                appContext.tabManager.getActiveContext()?.setNote(suggestion.notePath);
+            })
+            .on("autocomplete:commandselected", async (event, suggestion, dataset) => {
+                if (!suggestion.commandId) {
+                    return false;
+                }
+
+                this.modal.hide();
+                await commandRegistry.executeCommand(suggestion.commandId);
            });

-        // if you open the Jump To dialog soon after using it previously, it can often mean that you
-        // actually want to search for the same thing (e.g., you opened the wrong note at first try)
-        // so we'll keep the content.
-        // if it's outside of this time limit, then we assume it's a completely new search and show recent notes instead.
-        if (Date.now() - this.lastOpenedTs > KEEP_LAST_SEARCH_FOR_X_SECONDS * 1000) {
-            noteAutocompleteService.showRecentNotes(this.$autoComplete);
+        if (commandMode) {
+            // Start in command mode - manually trigger command search
+            this.$autoComplete.autocomplete("val", ">");
+            this.isCommandMode = true;
+            this.updateButtonVisibility();
+
+            // Manually populate with all commands immediately
+            noteAutocompleteService.showAllCommands(this.$autoComplete);
+
+            this.$autoComplete.trigger("focus");
        } else {
-            this.$autoComplete
-                // hack, the actual search value is stored in <pre> element next to the search input
-                // this is important because the search input value is replaced with the suggestion note's title
-                .autocomplete("val", this.$autoComplete.next().text())
-                .trigger("focus")
-                .trigger("select");
+            // if you open the Jump To dialog soon after using it previously, it can often mean that you
+            // actually want to search for the same thing (e.g., you opened the wrong note at first try)
+            // so we'll keep the content.
+            // if it's outside of this time limit, then we assume it's a completely new search and show recent notes instead.
+            if (Date.now() - this.lastOpenedTs > KEEP_LAST_SEARCH_FOR_X_SECONDS * 1000) {
+                this.isCommandMode = false;
+                this.updateButtonVisibility();
+                noteAutocompleteService.showRecentNotes(this.$autoComplete);
+            } else {
+                this.$autoComplete
+                    // hack, the actual search value is stored in <pre> element next to the search input
+                    // this is important because the search input value is replaced with the suggestion note's title
+                    .autocomplete("val", this.$autoComplete.next().text())
+                    .trigger("focus")
+                    .trigger("select");
+
+                // Update command mode state based on the restored value
+                this.updateCommandModeState();
+
+                // If we restored a command mode value, manually trigger command display
+                if (this.isCommandMode) {
+                    // Clear the value first, then set it to ">" to trigger a proper change
+                    this.$autoComplete.autocomplete("val", "");
+                    noteAutocompleteService.showAllCommands(this.$autoComplete);
+                }
+            }
        }
    }

-    showInFullText(e: JQuery.TriggeredEvent) {
+    showInFullText(e: JQuery.TriggeredEvent | KeyboardEvent) {
        // stop from propagating upwards (dangerous, especially with ctrl+enter executable javascript notes)
        e.preventDefault();
        e.stopPropagation();

+        // Don't perform full text search in command mode
+        if (this.isCommandMode) {
+            return;
+        }
+
        const searchString = String(this.$autoComplete.val());

        this.triggerCommand("searchNotes", { searchString });
--- a/apps/client/src/widgets/dialogs/note_type_chooser.ts
+++ b/apps/client/src/widgets/dialogs/note_type_chooser.ts
@@ -154,13 +154,21 @@ export default class NoteTypeChooserDialog extends BasicWidget {
                this.$noteTypeDropdown.append($('<h6 class="dropdown-header">').append(t("note_type_chooser.templates")));
            } else {
                const commandItem = noteType as MenuCommandItem<CommandNames>;
-                this.$noteTypeDropdown.append(
-                    $('<a class="dropdown-item" tabindex="0">')
-                        .attr("data-note-type", commandItem.type || "")
-                        .attr("data-template-note-id", commandItem.templateNoteId || "")
-                        .append($("<span>").addClass(commandItem.uiIcon || ""))
-                        .append(` ${noteType.title}`)
-                );
+                const listItem = $('<a class="dropdown-item" tabindex="0">')
+                    .attr("data-note-type", commandItem.type || "")
+                    .attr("data-template-note-id", commandItem.templateNoteId || "")
+                    .append($("<span>").addClass(commandItem.uiIcon || ""))
+                    .append(` ${noteType.title}`);
+
+                if (commandItem.badges) {
+                    for (let badge of commandItem.badges) {
+                        listItem.append($(`<span class="badge">`)
+                                .addClass(badge.className || "")
+                                .text(badge.title));
+                    }
+                }
+
+                this.$noteTypeDropdown.append(listItem);
            }
        }

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

-        this.$form.on("submit", async () => {
+        this.$form.on("submit", async (e) => {
+            e.preventDefault();
+
            const sortBy = this.$form.find("input[name='sort-by']:checked").val();
            const sortDirection = this.$form.find("input[name='sort-direction']:checked").val();
            const foldersFirst = this.$form.find("input[name='sort-folders-first']").is(":checked");
--- a/apps/client/src/widgets/find.ts
+++ b/apps/client/src/widgets/find.ts
@@ -97,6 +97,7 @@ const TPL = /*html*/`
    </div>
 </div>`;

+const SUPPORTED_NOTE_TYPES = ["text", "code", "render", "mindMap", "doc"];
 export default class FindWidget extends NoteContextAwareWidget {

    private searchTerm: string | null;
@@ -188,7 +189,7 @@ export default class FindWidget extends NoteContextAwareWidget {
            return;
        }

-        if (!["text", "code", "render", "mindMap"].includes(this.note?.type ?? "")) {
+        if (!SUPPORTED_NOTE_TYPES.includes(this.note?.type ?? "")) {
            return;
        }

@@ -251,6 +252,7 @@ export default class FindWidget extends NoteContextAwareWidget {
                const readOnly = await this.noteContext?.isReadOnly();
                return readOnly ? this.htmlHandler : this.textHandler;
            case "mindMap":
+            case "doc":
                return this.htmlHandler;
            default:
                console.warn("FindWidget: Unsupported note type for find widget", this.note?.type);
@@ -354,7 +356,7 @@ export default class FindWidget extends NoteContextAwareWidget {
    }

    isEnabled() {
-        return super.isEnabled() && ["text", "code", "render", "mindMap"].includes(this.note?.type ?? "");
+        return super.isEnabled() && SUPPORTED_NOTE_TYPES.includes(this.note?.type ?? "");
    }

    async entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) {
--- a/apps/client/src/widgets/floating_buttons/geo_map_button.ts
+++ b/apps/client/src/widgets/floating_buttons/geo_map_button.ts
@@ -23,7 +23,9 @@ const TPL = /*html*/`\
 export default class GeoMapButtons extends NoteContextAwareWidget {

    isEnabled() {
-        return super.isEnabled() && this.note?.type === "geoMap";
+        return super.isEnabled()
+            && this.note?.getLabelValue("viewType") === "geoMap"
+            && !this.note.hasLabel("readOnly");
    }

    doRender() {
--- a/apps/client/src/widgets/floating_buttons/help_button.ts
+++ b/apps/client/src/widgets/floating_buttons/help_button.ts
@@ -17,7 +17,6 @@ export const byNoteType: Record<Exclude<NoteType, "book">, string | null> = {
    contentWidget: null,
    doc: null,
    file: null,
-    geoMap: "81SGnPGMk7Xc",
    image: null,
    launcher: null,
    mermaid: null,
@@ -32,10 +31,12 @@ export const byNoteType: Record<Exclude<NoteType, "book">, string | null> = {
 };

 export const byBookType: Record<ViewTypeOptions, string | null> = {
-    list: null,
-    grid: null,
+    list: "mULW0Q3VojwY",
+    grid: "8QqnMzx393bx",
    calendar: "xWbu3jpNWapp",
-    table: "2FvYrpmOXm29"
+    table: "2FvYrpmOXm29",
+    geoMap: "81SGnPGMk7Xc",
+    board: "CtBQqbwXDx1w"
 };

 export default class ContextualHelpButton extends NoteContextAwareWidget {
--- a/apps/client/src/widgets/floating_buttons/toggle_read_only_button.ts
+++ b/apps/client/src/widgets/floating_buttons/toggle_read_only_button.ts
@@ -39,10 +39,20 @@ export default class ToggleReadOnlyButton extends OnClickButtonWidget {
    }

    isEnabled() {
-        return super.isEnabled()
-            && this.note?.type === "mermaid"
-            && this.note?.isContentAvailable()
-            && this.noteContext?.viewScope?.viewMode === "default";
+        if (!super.isEnabled()) {
+            return false;
+        }
+
+        if (!this?.note?.isContentAvailable()) {
+            return false;
+        }
+
+        if (this.noteContext?.viewScope?.viewMode !== "default") {
+            return false;
+        }
+
+        return this.note.type === "mermaid" ||
+            (this.note.getLabelValue("viewType") === "geoMap");
    }

 }
--- a/apps/client/src/widgets/geo_map.ts
+++ b/apps/client/src/widgets/geo_map.ts
@@ -1,58 +0,0 @@
-import type { Map } from "leaflet";
-import L from "leaflet";
-import "leaflet/dist/leaflet.css";
-import NoteContextAwareWidget from "./note_context_aware_widget.js";
-
-const TPL = /*html*/`\
-<div class="geo-map-widget">
-    <style>
-        .note-detail-geo-map,
-        .geo-map-widget,
-        .geo-map-container {
-            height: 100%;
-            overflow: hidden;
-        }
-
-        .leaflet-top,
-        .leaflet-bottom {
-            z-index: 900;
-        }
-    </style>
-
-    <div class="geo-map-container"></div>
-</div>`;
-
-export type Leaflet = typeof L;
-export type InitCallback = (L: Leaflet) => void;
-
-export default class GeoMapWidget extends NoteContextAwareWidget {
-
-    map?: Map;
-    $container!: JQuery<HTMLElement>;
-    private initCallback?: InitCallback;
-
-    constructor(widgetMode: "type", initCallback?: InitCallback) {
-        super();
-        this.initCallback = initCallback;
-    }
-
-    doRender() {
-        this.$widget = $(TPL);
-
-        this.$container = this.$widget.find(".geo-map-container");
-
-        const map = L.map(this.$container[0], {
-            worldCopyJump: true
-        });
-
-        this.map = map;
-        if (this.initCallback) {
-            this.initCallback(L);
-        }
-
-        L.tileLayer("https://tile.openstreetmap.org/{z}/{x}/{y}.png", {
-            attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
-            detectRetina: true
-        }).addTo(map);
-    }
-}
--- a/apps/client/src/widgets/note_detail.ts
+++ b/apps/client/src/widgets/note_detail.ts
@@ -28,7 +28,6 @@ import ContentWidgetTypeWidget from "./type_widgets/content_widget.js";
 import AttachmentListTypeWidget from "./type_widgets/attachment_list.js";
 import AttachmentDetailTypeWidget from "./type_widgets/attachment_detail.js";
 import MindMapWidget from "./type_widgets/mind_map.js";
-import GeoMapTypeWidget from "./type_widgets/geo_map.js";
 import utils from "../services/utils.js";
 import type { NoteType } from "../entities/fnote.js";
 import type TypeWidget from "./type_widgets/type_widget.js";
@@ -71,7 +70,6 @@ const typeWidgetClasses = {
    attachmentDetail: AttachmentDetailTypeWidget,
    attachmentList: AttachmentListTypeWidget,
    mindMap: MindMapWidget,
-    geoMap: GeoMapTypeWidget,
    aiChat: AiChatTypeWidget,

    // Split type editors
@@ -197,7 +195,7 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
        // https://github.com/zadam/trilium/issues/2522
        const isBackendNote = this.noteContext?.noteId === "_backendLog";
        const isSqlNote = this.mime === "text/x-sqlite;schema=trilium";
-        const isFullHeightNoteType = ["canvas", "webView", "noteMap", "mindMap", "geoMap", "mermaid"].includes(this.type ?? "");
+        const isFullHeightNoteType = ["canvas", "webView", "noteMap", "mindMap", "mermaid", "file"].includes(this.type ?? "");
        const isFullHeight = (!this.noteContext?.hasNoteList() && isFullHeightNoteType && !isSqlNote)
            || this.noteContext?.viewScope?.viewMode === "attachments"
            || isBackendNote;
--- a/apps/client/src/widgets/note_list.ts
+++ b/apps/client/src/widgets/note_list.ts
@@ -1,10 +1,8 @@
 import NoteContextAwareWidget from "./note_context_aware_widget.js";
 import NoteListRenderer from "../services/note_list_renderer.js";
 import type FNote from "../entities/fnote.js";
-import type { CommandListener, CommandListenerData, CommandMappings, CommandNames, EventData } from "../components/app_context.js";
+import type { CommandListener, CommandListenerData, CommandMappings, CommandNames, EventData, EventNames } from "../components/app_context.js";
 import type ViewMode from "./view_widgets/view_mode.js";
-import AttributeDetailWidget from "./attribute_widgets/attribute_detail.js";
-import { Attribute } from "../services/attribute_parser.js";

 const TPL = /*html*/`
 <div class="note-list-widget">
@@ -39,24 +37,36 @@ export default class NoteListWidget extends NoteContextAwareWidget {
    private noteIdRefreshed?: string;
    private shownNoteId?: string | null;
    private viewMode?: ViewMode<any> | null;
-    private attributeDetailWidget: AttributeDetailWidget;
+    private displayOnlyCollections: boolean;

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

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

    doRender() {
        this.$widget = $(TPL);
        this.contentSized();
        this.$content = this.$widget.find(".note-list-widget-content");
-        this.$widget.append(this.attributeDetailWidget.render());

        const observer = new IntersectionObserver(
            (entries) => {
@@ -75,23 +85,6 @@ export default class NoteListWidget extends NoteContextAwareWidget {
        setTimeout(() => observer.observe(this.$widget[0]), 10);
    }

-    addNoteListItemEvent() {
-        const attr: Attribute = {
-            type: "label",
-            name: "label:myLabel",
-            value: "promoted,single,text"
-        };
-
-        this.attributeDetailWidget!.showAttributeDetail({
-            attribute: attr,
-            allAttributes: [ attr ],
-            isOwned: true,
-            x: 100,
-            y: 200,
-            focus: "name"
-        });
-    }
-
    checkRenderStatus() {
        // console.log("this.isIntersecting", this.isIntersecting);
        // console.log(`${this.noteIdRefreshed} === ${this.noteId}`, this.noteIdRefreshed === this.noteId);
@@ -107,8 +100,7 @@ export default class NoteListWidget extends NoteContextAwareWidget {
        const noteListRenderer = new NoteListRenderer({
            $parent: this.$content,
            parentNote: note,
-            parentNotePath: this.notePath,
-            noteIds: note.getChildNoteIds()
+            parentNotePath: this.notePath
        });
        this.$widget.toggleClass("full-height", noteListRenderer.isFullHeight);
        await noteListRenderer.renderList();
@@ -153,12 +145,6 @@ export default class NoteListWidget extends NoteContextAwareWidget {
            this.refresh();
            this.checkRenderStatus();
        }
-
-        // Inform the view mode of changes and refresh if needed.
-        if (this.viewMode && this.viewMode.onEntitiesReloaded(e)) {
-            this.refresh();
-            this.checkRenderStatus();
-        }
    }

    buildTouchBarCommand(data: CommandListenerData<"buildTouchBar">) {
@@ -176,4 +162,17 @@ export default class NoteListWidget extends NoteContextAwareWidget {
        return super.triggerCommand(name, data);
    }

+    handleEventInChildren<T extends EventNames>(name: T, data: EventData<T>): Promise<unknown[] | unknown> | null {
+        super.handleEventInChildren(name, data);
+
+        if (this.viewMode) {
+            const ret = this.viewMode.handleEvent(name, data);
+            if (ret) {
+                return ret;
+            }
+        }
+
+        return null;
+    }
+
 }
--- a/apps/client/src/widgets/note_tree.ts
+++ b/apps/client/src/widgets/note_tree.ts
@@ -186,6 +186,15 @@ interface RefreshContext {
    noteIdsToReload: Set<string>;
 }

+/**
+ * The information contained within a drag event.
+ */
+export interface DragData {
+    noteId: string;
+    branchId: string;
+    title: string;
+}
+
 export default class NoteTreeWidget extends NoteContextAwareWidget {
    private $tree!: JQuery<HTMLElement>;
    private $treeActions!: JQuery<HTMLElement>;
@@ -231,15 +240,21 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
        this.$tree.on("mousedown", ".fancytree-title", (e) => {
            if (e.which === 2) {
                const node = $.ui.fancytree.getNode(e as unknown as Event);
-
                const notePath = treeService.getNotePath(node);

                if (notePath) {
+                    e.stopPropagation();
+                    e.preventDefault();
+
                    appContext.tabManager.openTabWithNoteWithHoisting(notePath, {
                        activate: e.shiftKey ? true : false
                    });
                }
-
+            }
+        });
+        this.$tree.on("mouseup", ".fancytree-title", (e) => {
+            // Prevent middle click from pasting in the editor.
+            if (e.which === 2) {
                e.stopPropagation();
                e.preventDefault();
            }
@@ -698,7 +713,13 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
            });
        } else {
            this.$tree.on("contextmenu", ".fancytree-node", (e) => {
-                this.showContextMenu(e);
+                if (!utils.isCtrlKey(e)) {
+                    this.showContextMenu(e);
+                } else {
+                    const node = $.ui.fancytree.getNode(e as unknown as Event);
+                    const notePath = treeService.getNotePath(node);
+                    appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath });
+                }
                return false; // blocks default browser right click menu
            });

@@ -706,9 +727,9 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
                for (const key in hotKeys) {
                    const handler = hotKeys[key];

-                    $(this.tree.$container).on("keydown", null, key, (evt) => {
+                    shortcutService.bindElShortcut($(this.tree.$container), key, () => {
                        const node = this.tree.getActiveNode();
-                        return handler(node, evt);
+                        return handler(node, {} as JQuery.KeyDownEvent);
                        // return false from the handler will stop default handling.
                    });
                }
@@ -1531,7 +1552,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
        const hotKeyMap: Record<string, (node: Fancytree.FancytreeNode, e: JQuery.KeyDownEvent) => boolean> = {};

        for (const action of actions) {
-            for (const shortcut of action.effectiveShortcuts) {
+            for (const shortcut of action.effectiveShortcuts ?? []) {
                hotKeyMap[shortcutService.normalizeShortcut(shortcut)] = (node) => {
                    const notePath = treeService.getNotePath(node);

--- a/apps/client/src/widgets/note_type.ts
+++ b/apps/client/src/widgets/note_type.ts
@@ -1,60 +1,15 @@
-import server from "../services/server.js";
+import { Dropdown } from "bootstrap";
+import { NOTE_TYPES } from "../services/note_types.js";
+import { t } from "../services/i18n.js";
+import dialogService from "../services/dialog.js";
 import mimeTypesService from "../services/mime_types.js";
 import NoteContextAwareWidget from "./note_context_aware_widget.js";
-import dialogService from "../services/dialog.js";
-import { t } from "../services/i18n.js";
-import type FNote from "../entities/fnote.js";
-import type { NoteType } from "../entities/fnote.js";
+import server from "../services/server.js";
 import type { EventData } from "../components/app_context.js";
-import { Dropdown } from "bootstrap";
+import type { NoteType } from "../entities/fnote.js";
+import type FNote from "../entities/fnote.js";

-interface NoteTypeMapping {
-    type: NoteType;
-    mime?: string;
-    title: string;
-    isBeta?: boolean;
-    selectable: boolean;
-}
-
-const NOTE_TYPES: NoteTypeMapping[] = [
-    // The suggested note type ordering method: insert the item into the corresponding group,
-    // then ensure the items within the group are ordered alphabetically.
-    // Please keep the order synced with the listing found also in apps/client/src/services/note_types.ts.
-
-    // The default note type (always the first item)
-    { type: "text", mime: "text/html", title: t("note_types.text"), selectable: true },
-
-    // Text notes group
-    { type: "book", mime: "", title: t("note_types.book"), selectable: true },
-
-    // Graphic notes
-    { type: "canvas", mime: "application/json", title: t("note_types.canvas"), selectable: true },
-    { type: "mermaid", mime: "text/mermaid", title: t("note_types.mermaid-diagram"), selectable: true },
-
-    // Map notes
-    { type: "geoMap", mime: "application/json", title: t("note_types.geo-map"), isBeta: true, selectable: true },
-    { type: "mindMap", mime: "application/json", title: t("note_types.mind-map"), selectable: true },
-    { type: "relationMap", mime: "application/json", title: t("note_types.relation-map"), selectable: true },
-
-    // Misc note types
-    { type: "render", mime: "", title: t("note_types.render-note"), selectable: true },
-    { type: "webView", mime: "", title: t("note_types.web-view"), selectable: true },
-
-    // Code notes
-    { type: "code", mime: "text/plain", title: t("note_types.code"), selectable: true },
-
-    // Reserved types (cannot be created by the user)
-    { type: "contentWidget", mime: "", title: t("note_types.widget"), selectable: false },
-    { type: "doc", mime: "", title: t("note_types.doc"), selectable: false },
-    { type: "file", title: t("note_types.file"), selectable: false },
-    { type: "image", title: t("note_types.image"), selectable: false },
-    { type: "launcher", mime: "", title: t("note_types.launcher"), selectable: false },
-    { type: "noteMap", mime: "", title: t("note_types.note-map"), selectable: false },
-    { type: "search", title: t("note_types.saved-search"), selectable: false },
-    { type: "aiChat", mime: "application/json", title: t("note_types.ai-chat"), selectable: false }
-];
-
-const NOT_SELECTABLE_NOTE_TYPES = NOTE_TYPES.filter((nt) => !nt.selectable).map((nt) => nt.type);
+const NOT_SELECTABLE_NOTE_TYPES = NOTE_TYPES.filter((nt) => nt.reserved || nt.static).map((nt) => nt.type);

 const TPL = /*html*/`
 <div class="dropdown note-type-widget">
@@ -64,13 +19,6 @@ const TPL = /*html*/`
            overflow-y: auto;
            overflow-x: hidden;
        }
-
-        .note-type-dropdown .badge {
-            margin-left: 8px;
-            background: var(--accented-background-color);
-            font-weight: normal;
-            color: var(--menu-text-color);
-        }
    </style>
    <button type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn btn-sm dropdown-toggle select-button note-type-button">
        <span class="note-type-desc"></span>
@@ -117,10 +65,15 @@ export default class NoteTypeWidget extends NoteContextAwareWidget {
            return;
        }

-        for (const noteType of NOTE_TYPES.filter((nt) => nt.selectable)) {
+        for (const noteType of NOTE_TYPES.filter((nt) => !nt.reserved && !nt.static)) {
            let $typeLink: JQuery<HTMLElement>;

            const $title = $("<span>").text(noteType.title);
+
+            if (noteType.isNew) {
+                $title.append($(`<span class="badge new-note-type-badge">`).text(t("note_types.new-feature")));
+            }
+
            if (noteType.isBeta) {
                $title.append($(`<span class="badge">`).text(t("note_types.beta-feature")));
            }
--- a/apps/client/src/widgets/note_wrapper.ts
+++ b/apps/client/src/widgets/note_wrapper.ts
@@ -64,7 +64,7 @@ export default class NoteWrapperWidget extends FlexContainer<BasicWidget> {
    }

    #isFullWidthNote(note: FNote) {
-        if (["image", "mermaid", "book", "render", "canvas", "webView", "mindMap", "geoMap"].includes(note.type)) {
+        if (["image", "mermaid", "book", "render", "canvas", "webView", "mindMap"].includes(note.type)) {
            return true;
        }

--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .17.0
 .18.0