Merge branch 'develop' into patch-1

2025-10-26 07:46:30 +01:00 · 2024-11-03 10:48:00 +01:00
parent 0192060ad2 611fb90a52
commit 80e6276d31
60 changed files with 1896 additions and 363 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,7 +43,7 @@ jobs:
      - name: Install dependencies
        run: npm ci
      - name: Update build info
-        run: npm run update-build-info
+        run: npm run update-build-info      
      - name: Run electron-forge
        run: npm run make-electron -- --arch=${{ matrix.arch }}
      - name: Prepare artifacts (Unix)
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -41,6 +41,8 @@ jobs:
        run: npm ci
      - name: Update build info
        run: npm run update-build-info
+      - name: Update nightly version
+        run: npm run ci-update-nightly-version
      - name: Run electron-forge
        run: npm run make-electron -- --arch=${{ matrix.arch }}
      - name: Prepare artifacts (Unix)
@@ -103,6 +105,7 @@ jobs:
      - name: Run Linux server build (x86_64)
        run: |
          npm run update-build-info
+          npm run ci-update-nightly-version
          ./bin/build-server.sh
      - name: Prepare artifacts
        if: runner.os != 'windows'
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # TriliumNext Notes

+![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)
+
 [English](./README.md) | [Chinese](./README-ZH_CN.md) | [Russian](./README.ru.md) | [Japanese](./README.ja.md) | [Italian](./README.it.md) | [Spanish](./README.es.md)

 TriliumNext Notes is an open-source, cross-platform hierarchical note taking application with focus on building large personal knowledge bases.
--- a/bin/copy-dist.ts
+++ b/bin/copy-dist.ts
@@ -47,6 +47,15 @@ const copy = async () => {
    await fs.copy(dir, path.join(DEST_DIR_SRC, path.basename(dir)));
  }  

+  /**
+   * Directories to be copied relative to the project root into <resource_dir>/src/public/app-dist.
+   */
+  const publicDirsToCopy = [ "./src/public/app/doc_notes" ];
+  const PUBLIC_DIR = path.join(DEST_DIR, "src", "public", "app-dist");
+  for (const dir of publicDirsToCopy) {
+    await fs.copy(dir, path.join(PUBLIC_DIR, path.basename(dir)));
+  }
+
  const nodeModulesFile = [
    "node_modules/react/umd/react.production.min.js",
    "node_modules/react/umd/react.development.js",
@@ -55,6 +64,7 @@ const copy = async () => {
    "node_modules/katex/dist/katex.min.js",
    "node_modules/katex/dist/contrib/mhchem.min.js",
    "node_modules/katex/dist/contrib/auto-render.min.js",
+    "node_modules/@highlightjs/cdn-assets/highlight.min.js"
  ];

  for (const file of nodeModulesFile) {
@@ -89,7 +99,9 @@ const copy = async () => {
    "node_modules/codemirror/addon/",
    "node_modules/codemirror/mode/",
    "node_modules/codemirror/keymap/",
-    "node_modules/mind-elixir/dist/"
+    "node_modules/mind-elixir/dist/",
+    "node_modules/@highlightjs/cdn-assets/languages",
+    "node_modules/@highlightjs/cdn-assets/styles"
  ];

  for (const folder of nodeModulesFolder) {
--- a/bin/update-nightly-version.ts
+++ b/bin/update-nightly-version.ts
@@ -0,0 +1,50 @@
+/**
+ * @module
+ * 
+ * The nightly version works uses the version described in `package.json`, just like any release.
+ * The problem with this approach is that production builds have a very aggressive cache, and
+ * usually running the nightly with this cached version of the application will mean that the
+ * user might run into module not found errors or styling errors caused by an old cache.
+ * 
+ * This script is supposed to be run in the CI, which will update locally the version field of
+ * `package.json` to contain the date. For example, `0.90.9-beta` will become `0.90.9-test-YYMMDD-HHMMSS`.
+ * 
+ */
+
+import { fileURLToPath } from "url";
+import { dirname, join } from "path";
+import fs from "fs";
+
+function processVersion(version) {
+    // Remove the beta suffix if any.
+    version = version.replace("-beta", "");
+
+    // Add the nightly suffix, plus the date.
+    const referenceDate = new Date()
+        .toISOString()
+        .substring(2, 19)
+        .replace(/[-:]*/g, "")
+        .replace("T", "-");
+    version = `${version}-test-${referenceDate}`;
+
+    return version;
+}
+
+function main() {
+    const scriptDir = dirname(fileURLToPath(import.meta.url));
+    const packageJsonPath = join(scriptDir, "..", "package.json");
+    
+    // Read the version from package.json and process it.
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
+    const currentVersion = packageJson.version;
+    const adjustedVersion = processVersion(currentVersion);
+    console.log("Current version is", currentVersion);
+    console.log("Adjusted version is", adjustedVersion);
+
+    // Write the adjusted version back in.
+    packageJson.version = adjustedVersion;
+    const formattedJson = JSON.stringify(packageJson, null, 4);    
+    fs.writeFileSync(packageJsonPath, formattedJson);
+}
+
+main();
--- a/db/demo.zip
+++ b/db/demo.zip
--- a/forge.config.cjs
+++ b/forge.config.cjs
@@ -15,7 +15,8 @@ module.exports = {
      ...getExtraResourcesForPlatform(),

      // Moved to resources (TriliumNext Notes.app/Contents/Resources on macOS)
-      "translations/"
+      "translations/",
+      "node_modules/@highlightjs/cdn-assets/styles"
    ],
    afterComplete: [(buildPath, _electronVersion, platform, _arch, callback) => {
      const extraResources = getExtraResourcesForPlatform();
--- a/libraries/ckeditor/ckeditor-content.css
+++ b/libraries/ckeditor/ckeditor-content.css
@@ -526,16 +526,19 @@
 /* @ckeditor/ckeditor5-code-block/theme/codeblock.css */
 .ck-content pre {
    padding: 1em;
-    color: hsl(0, 0%, 20.8%);
-    background: hsla(0, 0%, 78%, 0.3);
-    border: 1px solid hsl(0, 0%, 77%);
-    border-radius: 2px;
    text-align: left;
    direction: ltr;
    tab-size: 4;
    white-space: pre-wrap;
    font-style: normal;
    min-width: 200px;
+    border: 0px;
+    border-radius: 6px;
+    box-shadow: 1px 1px 6px rgba(0, 0, 0, 0.2);
+}
+.ck-content pre:not(.hljs) {
+    color: hsl(0, 0%, 20.8%);    
+    background: hsla(0, 0%, 78%, 0.3);
 }
 /* @ckeditor/ckeditor5-code-block/theme/codeblock.css */
 .ck-content pre code {
--- a/libraries/ckeditor/ckeditor.js
+++ b/libraries/ckeditor/ckeditor.js
--- a/libraries/ckeditor/ckeditor.js.map
+++ b/libraries/ckeditor/ckeditor.js.map
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
        "@braintree/sanitize-url": "7.1.0",
        "@electron/remote": "2.1.2",
        "@excalidraw/excalidraw": "0.17.6",
+        "@highlightjs/cdn-assets": "11.10.0",
        "archiver": "7.0.1",
        "async-mutex": "0.5.0",
        "autocomplete.js": "0.38.1",
@@ -34,7 +35,7 @@
        "electron-squirrel-startup": "1.0.1",
        "electron-window-state": "5.0.3",
        "escape-html": "1.0.3",
-        "eslint": "9.10.0",
+        "eslint": "9.14.0",
        "express": "4.21.1",
        "express-partial-content": "1.0.2",
        "express-rate-limit": "7.4.1",
@@ -46,7 +47,7 @@
        "html2plaintext": "2.1.4",
        "http-proxy-agent": "7.0.2",
        "https-proxy-agent": "7.0.5",
-        "i18next": "23.16.2",
+        "i18next": "23.16.4",
        "i18next-fs-backend": "2.3.2",
        "i18next-http-backend": "2.6.2",
        "image-type": "4.1.0",
@@ -64,9 +65,9 @@
        "knockout": "3.5.1",
        "mark.js": "8.11.1",
        "marked": "14.1.3",
-        "mermaid": "11.3.0",
+        "mermaid": "11.4.0",
        "mime-types": "2.1.35",
-        "mind-elixir": "4.2.3",
+        "mind-elixir": "4.2.4",
        "multer": "1.4.5-lts.1",
        "node-abi": "3.67.0",
        "normalize-strings": "1.1.1",
@@ -107,7 +108,7 @@
        "@electron-forge/maker-squirrel": "7.5.0",
        "@electron-forge/maker-zip": "7.5.0",
        "@electron-forge/plugin-auto-unpack-natives": "7.5.0",
-        "@playwright/test": "1.47.1",
+        "@playwright/test": "1.48.2",
        "@types/archiver": "6.0.2",
        "@types/better-sqlite3": "7.6.11",
        "@types/cls-hooked": "4.3.8",
@@ -152,10 +153,10 @@
        "rcedit": "4.0.1",
        "rimraf": "6.0.1",
        "ts-node": "10.9.2",
-        "tslib": "2.8.0",
-        "tsx": "4.19.1",
+        "tslib": "2.8.1",
+        "tsx": "4.19.2",
        "typescript": "5.6.3",
-        "webpack": "5.95.0",
+        "webpack": "5.96.1",
        "webpack-cli": "5.1.4"
      }
    },
@@ -2347,10 +2348,9 @@
      }
    },
    "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
-      "license": "MIT",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
      "engines": {
        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
      }
@@ -2368,6 +2368,14 @@
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      }
    },
+    "node_modules/@eslint/core": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.7.0.tgz",
+      "integrity": "sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
    "node_modules/@eslint/eslintrc": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz",
@@ -2404,9 +2412,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "9.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.10.0.tgz",
-      "integrity": "sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==",
+      "version": "9.14.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.14.0.tgz",
+      "integrity": "sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==",
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      }
@@ -2420,9 +2428,9 @@
      }
    },
    "node_modules/@eslint/plugin-kit": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz",
-      "integrity": "sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.2.tgz",
+      "integrity": "sha512-CXtq5nR4Su+2I47WPOlWud98Y5Lv8Kyxp2ukhgFx/eW6Blm18VXJO5WuQylPugRo8nbluoi6GvvxBLqHcvqUUw==",
      "dependencies": {
        "levn": "^0.4.1"
      },
@@ -2445,6 +2453,46 @@
      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
      "dev": true
    },
+    "node_modules/@highlightjs/cdn-assets": {
+      "version": "11.10.0",
+      "resolved": "https://registry.npmjs.org/@highlightjs/cdn-assets/-/cdn-assets-11.10.0.tgz",
+      "integrity": "sha512-vWXpu+Rdm0YMJmugFdUiL/9DmgYjEiV+d5DBqlXdApnGPSIeo6+LRS5Hpx6fvVsKkvR4RsLYD9rQ6DOLkj7OKA==",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node": {
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+      "dependencies": {
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
    "node_modules/@humanwhocodes/module-importer": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -2459,10 +2507,9 @@
      }
    },
    "node_modules/@humanwhocodes/retry": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz",
-      "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==",
-      "license": "Apache-2.0",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.0.tgz",
+      "integrity": "sha512-xnRgu9DxZbkWak/te3fcytNyp8MTbuiZIaueg2rgEvBuN55n04nwLYLU9TX/VVlusc9L2ZNXi99nUFNkHXtr5g==",
      "engines": {
        "node": ">=18.18"
      },
@@ -3042,6 +3089,7 @@
      "version": "2.1.5",
      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
      "dependencies": {
        "@nodelib/fs.stat": "2.0.5",
        "run-parallel": "^1.1.9"
@@ -3054,6 +3102,7 @@
      "version": "2.0.5",
      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
      "engines": {
        "node": ">= 8"
      }
@@ -3062,6 +3111,7 @@
      "version": "1.2.8",
      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
      "dependencies": {
        "@nodelib/fs.scandir": "2.1.5",
        "fastq": "^1.6.0"
@@ -3133,12 +3183,12 @@
      }
    },
    "node_modules/@playwright/test": {
-      "version": "1.47.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.47.1.tgz",
-      "integrity": "sha512-dbWpcNQZ5nj16m+A5UNScYx7HX5trIy7g4phrcitn+Nk83S32EBX/CLU4hiF4RGKX/yRc93AAqtfaXB7JWBd4Q==",
+      "version": "1.48.2",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.2.tgz",
+      "integrity": "sha512-54w1xCWfXuax7dz4W2M9uw0gDyh+ti/0K/MxcCUxChFh37kkdxPdfZDw5QBbuPUJHr1CiHJ1hXgSs+GgeQc5Zw==",
      "dev": true,
      "dependencies": {
-        "playwright": "1.47.1"
+        "playwright": "1.48.2"
      },
      "bin": {
        "playwright": "cli.js"
@@ -3317,12 +3367,242 @@
        "@types/express-serve-static-core": "*"
      }
    },
+    "node_modules/@types/d3": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
+      "integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
+      "dependencies": {
+        "@types/d3-array": "*",
+        "@types/d3-axis": "*",
+        "@types/d3-brush": "*",
+        "@types/d3-chord": "*",
+        "@types/d3-color": "*",
+        "@types/d3-contour": "*",
+        "@types/d3-delaunay": "*",
+        "@types/d3-dispatch": "*",
+        "@types/d3-drag": "*",
+        "@types/d3-dsv": "*",
+        "@types/d3-ease": "*",
+        "@types/d3-fetch": "*",
+        "@types/d3-force": "*",
+        "@types/d3-format": "*",
+        "@types/d3-geo": "*",
+        "@types/d3-hierarchy": "*",
+        "@types/d3-interpolate": "*",
+        "@types/d3-path": "*",
+        "@types/d3-polygon": "*",
+        "@types/d3-quadtree": "*",
+        "@types/d3-random": "*",
+        "@types/d3-scale": "*",
+        "@types/d3-scale-chromatic": "*",
+        "@types/d3-selection": "*",
+        "@types/d3-shape": "*",
+        "@types/d3-time": "*",
+        "@types/d3-time-format": "*",
+        "@types/d3-timer": "*",
+        "@types/d3-transition": "*",
+        "@types/d3-zoom": "*"
+      }
+    },
+    "node_modules/@types/d3-array": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
+      "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg=="
+    },
+    "node_modules/@types/d3-axis": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
+      "integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-brush": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
+      "integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-chord": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
+      "integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg=="
+    },
+    "node_modules/@types/d3-color": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
+      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A=="
+    },
+    "node_modules/@types/d3-contour": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
+      "integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
+      "dependencies": {
+        "@types/d3-array": "*",
+        "@types/geojson": "*"
+      }
+    },
+    "node_modules/@types/d3-delaunay": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+      "integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw=="
+    },
+    "node_modules/@types/d3-dispatch": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
+      "integrity": "sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ=="
+    },
+    "node_modules/@types/d3-drag": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
+      "integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-dsv": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
+      "integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g=="
+    },
+    "node_modules/@types/d3-ease": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
+      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA=="
+    },
+    "node_modules/@types/d3-fetch": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
+      "integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
+      "dependencies": {
+        "@types/d3-dsv": "*"
+      }
+    },
+    "node_modules/@types/d3-force": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz",
+      "integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw=="
+    },
+    "node_modules/@types/d3-format": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
+      "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g=="
+    },
+    "node_modules/@types/d3-geo": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
+      "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
+      "dependencies": {
+        "@types/geojson": "*"
+      }
+    },
+    "node_modules/@types/d3-hierarchy": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
+      "integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg=="
+    },
+    "node_modules/@types/d3-interpolate": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
+      "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
+      "dependencies": {
+        "@types/d3-color": "*"
+      }
+    },
+    "node_modules/@types/d3-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ=="
+    },
+    "node_modules/@types/d3-polygon": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
+      "integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA=="
+    },
+    "node_modules/@types/d3-quadtree": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
+      "integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg=="
+    },
+    "node_modules/@types/d3-random": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
+      "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ=="
+    },
+    "node_modules/@types/d3-scale": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz",
+      "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==",
+      "dependencies": {
+        "@types/d3-time": "*"
+      }
+    },
+    "node_modules/@types/d3-scale-chromatic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.3.tgz",
+      "integrity": "sha512-laXM4+1o5ImZv3RpFAsTRn3TEkzqkytiOY0Dz0sq5cnd1dtNlk6sHLon4OvqaiJb28T0S/TdsBI3Sjsy+keJrw=="
+    },
+    "node_modules/@types/d3-selection": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz",
+      "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w=="
+    },
+    "node_modules/@types/d3-shape": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz",
+      "integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==",
+      "dependencies": {
+        "@types/d3-path": "*"
+      }
+    },
+    "node_modules/@types/d3-time": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz",
+      "integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw=="
+    },
+    "node_modules/@types/d3-time-format": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
+      "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg=="
+    },
+    "node_modules/@types/d3-timer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
+      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw=="
+    },
+    "node_modules/@types/d3-transition": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz",
+      "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==",
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-zoom": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
+      "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
+      "dependencies": {
+        "@types/d3-interpolate": "*",
+        "@types/d3-selection": "*"
+      }
+    },
    "node_modules/@types/debounce": {
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/@types/debounce/-/debounce-1.2.4.tgz",
      "integrity": "sha512-jBqiORIzKDOToaF63Fm//haOCHuwQuLa2202RK4MozpA6lh93eCBc+/8+wZn5OzjJt3ySdc+74SXWXB55Ewtyw==",
      "dev": true
    },
+    "node_modules/@types/dompurify": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.5.tgz",
+      "integrity": "sha512-1Wg0g3BtQF7sSb27fJQAKck1HECM6zV1EB66j8JH9i3LCjYabJa0FSdiSgsD5K/RbrsR0SiraKacLB+T8ZVYAg==",
+      "dependencies": {
+        "@types/trusted-types": "*"
+      }
+    },
    "node_modules/@types/ejs": {
      "version": "3.1.5",
      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz",
@@ -3341,11 +3621,30 @@
      "integrity": "sha512-qZ72SFTgUAZ5a7Tj6kf2SHLetiH5S6f8G5frB2SPQ3EyF02kxdyBFf4Tz4banE3xCgGnKgWLt//a6VuYHKYJTg==",
      "dev": true
    },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
    "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
    },
    "node_modules/@types/express": {
      "version": "4.17.21",
@@ -3402,6 +3701,11 @@
        "@types/node": "*"
      }
    },
+    "node_modules/@types/geojson": {
+      "version": "7946.0.14",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
+      "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg=="
+    },
    "node_modules/@types/glob": {
      "version": "7.1.3",
      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
@@ -3477,10 +3781,9 @@
      }
    },
    "node_modules/@types/json-schema": {
-      "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-      "dev": true
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
    },
    "node_modules/@types/keyv": {
      "version": "3.1.3",
@@ -3750,6 +4053,11 @@
      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
      "dev": true
    },
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="
+    },
    "node_modules/@types/turndown": {
      "version": "5.0.5",
      "resolved": "https://registry.npmjs.org/@types/turndown/-/turndown-5.0.5.tgz",
@@ -4038,10 +4346,9 @@
      }
    },
    "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
-      "license": "MIT",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -4049,15 +4356,6 @@
        "node": ">=0.4.0"
      }
    },
-    "node_modules/acorn-import-attributes": {
-      "version": "1.9.5",
-      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
-      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
    "node_modules/acorn-jsx": {
      "version": "5.3.2",
      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -5003,9 +5301,9 @@
      }
    },
    "node_modules/browserslist": {
-      "version": "4.23.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
      "dev": true,
      "funding": [
        {
@@ -5022,10 +5320,10 @@
        }
      ],
      "dependencies": {
-        "caniuse-lite": "^1.0.30001587",
-        "electron-to-chromium": "^1.4.668",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
+        "caniuse-lite": "^1.0.30001669",
+        "electron-to-chromium": "^1.5.41",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.1"
      },
      "bin": {
        "browserslist": "cli.js"
@@ -5311,9 +5609,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001594",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001594.tgz",
-      "integrity": "sha512-VblSX6nYqyJVs8DKFMldE2IVCJjZ225LW00ydtUWwh5hk9IfkTOffO6r8gJNsH0qqqeAF8KrbMYA2VEwTlGW5g==",
+      "version": "1.0.30001676",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001676.tgz",
+      "integrity": "sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==",
      "dev": true,
      "funding": [
        {
@@ -6512,9 +6810,9 @@
      }
    },
    "node_modules/d3-geo": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz",
-      "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
+      "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
      "dependencies": {
        "d3-array": "2.5.0 - 3"
      },
@@ -6723,11 +7021,11 @@
      }
    },
    "node_modules/dagre-d3-es": {
-      "version": "7.0.10",
-      "resolved": "https://registry.npmjs.org/dagre-d3-es/-/dagre-d3-es-7.0.10.tgz",
-      "integrity": "sha512-qTCQmEhcynucuaZgY5/+ti3X/rnszKZhEQH/ZdWdtP1tA/y3VoHJzcVrO9pjjJCNpigfscAtoUB5ONcd2wNn0A==",
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/dagre-d3-es/-/dagre-d3-es-7.0.11.tgz",
+      "integrity": "sha512-tvlJLyQf834SylNKax8Wkzco/1ias1OPw8DcUMDE7oUIoSEW25riQVuiu/0OWEFqT0cxHT3Pa9/D82Jr47IONw==",
      "dependencies": {
-        "d3": "^7.8.2",
+        "d3": "^7.9.0",
        "lodash-es": "^4.17.21"
      }
    },
@@ -6898,11 +7196,11 @@
      }
    },
    "node_modules/delaunator": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz",
-      "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
+      "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
      "dependencies": {
-        "robust-predicates": "^3.0.0"
+        "robust-predicates": "^3.0.2"
      }
    },
    "node_modules/delayed-stream": {
@@ -7540,9 +7838,9 @@
      }
    },
    "node_modules/electron-to-chromium": {
-      "version": "1.4.693",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.693.tgz",
-      "integrity": "sha512-/if4Ueg0GUQlhCrW2ZlXwDAm40ipuKo+OgeHInlL8sbjt+hzISxZK949fZeJaVsheamrzANXvw1zQTvbxTvSHw==",
+      "version": "1.5.50",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.50.tgz",
+      "integrity": "sha512-eMVObiUQ2LdgeO1F/ySTXsvqvxb6ZH2zPGaMYsWzRDdOddUa77tdmI0ltg+L16UpbWdhPmuF3wIQYyQq65WfZw==",
      "dev": true
    },
    "node_modules/electron-window-state": {
@@ -7778,9 +8076,9 @@
      }
    },
    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
      "dev": true,
      "engines": {
        "node": ">=6"
@@ -7812,27 +8110,30 @@
      }
    },
    "node_modules/eslint": {
-      "version": "9.10.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.10.0.tgz",
-      "integrity": "sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw==",
+      "version": "9.14.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.14.0.tgz",
+      "integrity": "sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.11.0",
+        "@eslint-community/regexpp": "^4.12.1",
        "@eslint/config-array": "^0.18.0",
+        "@eslint/core": "^0.7.0",
        "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.10.0",
-        "@eslint/plugin-kit": "^0.1.0",
+        "@eslint/js": "9.14.0",
+        "@eslint/plugin-kit": "^0.2.0",
+        "@humanfs/node": "^0.16.6",
        "@humanwhocodes/module-importer": "^1.0.1",
-        "@humanwhocodes/retry": "^0.3.0",
-        "@nodelib/fs.walk": "^1.2.8",
+        "@humanwhocodes/retry": "^0.4.0",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
        "ajv": "^6.12.4",
        "chalk": "^4.0.0",
        "cross-spawn": "^7.0.2",
        "debug": "^4.3.2",
        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.0.2",
-        "eslint-visitor-keys": "^4.0.0",
-        "espree": "^10.1.0",
+        "eslint-scope": "^8.2.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
        "esquery": "^1.5.0",
        "esutils": "^2.0.2",
        "fast-deep-equal": "^3.1.3",
@@ -7842,13 +8143,11 @@
        "ignore": "^5.2.0",
        "imurmurhash": "^0.1.4",
        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
        "json-stable-stringify-without-jsonify": "^1.0.1",
        "lodash.merge": "^4.6.2",
        "minimatch": "^3.1.2",
        "natural-compare": "^1.4.0",
        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
        "text-table": "^0.2.0"
      },
      "bin": {
@@ -7892,10 +8191,9 @@
      }
    },
    "node_modules/eslint-visitor-keys": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
-      "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
-      "license": "Apache-2.0",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      },
@@ -7916,10 +8214,9 @@
      }
    },
    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz",
-      "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==",
-      "license": "BSD-2-Clause",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
      "dependencies": {
        "esrecurse": "^4.3.0",
        "estraverse": "^5.2.0"
@@ -8023,14 +8320,13 @@
      }
    },
    "node_modules/espree": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz",
-      "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==",
-      "license": "BSD-2-Clause",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
      "dependencies": {
-        "acorn": "^8.12.0",
+        "acorn": "^8.14.0",
        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.0.0"
+        "eslint-visitor-keys": "^4.2.0"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -8562,6 +8858,7 @@
      "version": "1.17.1",
      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "dev": true,
      "dependencies": {
        "reusify": "^1.0.4"
      }
@@ -9727,9 +10024,9 @@
      }
    },
    "node_modules/i18next": {
-      "version": "23.16.2",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.16.2.tgz",
-      "integrity": "sha512-dFyxwLXxEQK32f6tITBMaRht25mZPJhQ0WbC0p3bO2mWBal9lABTMqSka5k+GLSRWLzeJBKDpH7BeIA9TZI7Jg==",
+      "version": "23.16.4",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.16.4.tgz",
+      "integrity": "sha512-9NIYBVy9cs4wIqzurf7nLXPyf3R78xYbxExVqHLK9od3038rjpyOEzW+XB130kZ1N4PZ9inTtJ471CRJ4Ituyg==",
      "funding": [
        {
          "type": "individual",
@@ -10671,15 +10968,6 @@
        "node": ">=0.12.0"
      }
    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
    "node_modules/is-plain-obj": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -11915,19 +12203,21 @@
      }
    },
    "node_modules/mermaid": {
-      "version": "11.3.0",
-      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.3.0.tgz",
-      "integrity": "sha512-fFmf2gRXLtlGzug4wpIGN+rQdZ30M8IZEB1D3eZkXNqC7puhqeURBcD/9tbwXsqBO+A6Nzzo3MSSepmnw5xSeg==",
+      "version": "11.4.0",
+      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.4.0.tgz",
+      "integrity": "sha512-mxCfEYvADJqOiHfGpJXLs4/fAjHz448rH0pfY5fAoxiz70rQiDSzUUy4dNET2T08i46IVpjohPd6WWbzmRHiPA==",
      "dependencies": {
        "@braintree/sanitize-url": "^7.0.1",
        "@iconify/utils": "^2.1.32",
        "@mermaid-js/parser": "^0.3.0",
+        "@types/d3": "^7.4.3",
+        "@types/dompurify": "^3.0.5",
        "cytoscape": "^3.29.2",
        "cytoscape-cose-bilkent": "^4.1.0",
        "cytoscape-fcose": "^2.2.0",
        "d3": "^7.9.0",
        "d3-sankey": "^0.12.3",
-        "dagre-d3-es": "7.0.10",
+        "dagre-d3-es": "7.0.11",
        "dayjs": "^1.11.10",
        "dompurify": "^3.0.11 <3.1.7",
        "katex": "^0.16.9",
@@ -12040,9 +12330,9 @@
      }
    },
    "node_modules/mind-elixir": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/mind-elixir/-/mind-elixir-4.2.3.tgz",
-      "integrity": "sha512-o/t9/mrJkRu0PE5UjXBv8ZZuhwSdm6C1Hw65v/+bIlB2CS2MOGZ/GNPvU3U4kPDu6LnCZ0kw0L7hoVfHhrZLtw=="
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/mind-elixir/-/mind-elixir-4.2.4.tgz",
+      "integrity": "sha512-wYJN45TcdznUaX8lKBbHqgiKd6jY4aK+JoCCT82m8uKB9DiOv4RGf4O5MrziH6mkP1/fAZHQztFfr49PUILAzQ=="
    },
    "node_modules/minimalistic-assert": {
      "version": "1.0.1",
@@ -12443,9 +12733,9 @@
      }
    },
    "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
      "dev": true
    },
    "node_modules/nodemon": {
@@ -13146,9 +13436,9 @@
      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
    },
    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
    },
    "node_modules/picomatch": {
      "version": "2.3.1",
@@ -13212,12 +13502,12 @@
      }
    },
    "node_modules/playwright": {
-      "version": "1.47.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.1.tgz",
-      "integrity": "sha512-SUEKi6947IqYbKxRiqnbUobVZY4bF1uu+ZnZNJX9DfU1tlf2UhWfvVjLf01pQx9URsOr18bFVUKXmanYWhbfkw==",
+      "version": "1.48.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.2.tgz",
+      "integrity": "sha512-NjYvYgp4BPmiwfe31j4gHLa3J7bD2WiBz8Lk2RoSsmX38SVIARZ18VYjxLjAcDsAhA+F4iSEXTSGgjua0rrlgQ==",
      "dev": true,
      "dependencies": {
-        "playwright-core": "1.47.1"
+        "playwright-core": "1.48.2"
      },
      "bin": {
        "playwright": "cli.js"
@@ -13230,9 +13520,9 @@
      }
    },
    "node_modules/playwright-core": {
-      "version": "1.47.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.1.tgz",
-      "integrity": "sha512-i1iyJdLftqtt51mEk6AhYFaAJCDx0xQ/O5NU8EKaWFgMjItPVma542Nh/Aq8aLCjIJSzjaiEQGW/nyqLkGF1OQ==",
+      "version": "1.48.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.2.tgz",
+      "integrity": "sha512-sjjw+qrLFlriJo64du+EK0kJgZzoQPsabGF4lBvsid+3CNIZIYLgnMj9V6JY5VhM2Peh20DJWIVpVljLLnlawA==",
      "dev": true,
      "bin": {
        "playwright-core": "cli.js"
@@ -13519,6 +13809,7 @@
      "version": "1.2.3",
      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
      "funding": [
        {
          "type": "github",
@@ -14106,6 +14397,7 @@
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
      "engines": {
        "iojs": ">=1.0.0",
        "node": ">=0.10.0"
@@ -14283,6 +14575,7 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
      "funding": [
        {
          "type": "github",
@@ -15659,9 +15952,9 @@
      }
    },
    "node_modules/tslib": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
-      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA=="
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
    },
    "node_modules/tsscmp": {
      "version": "1.0.6",
@@ -15672,9 +15965,9 @@
      }
    },
    "node_modules/tsx": {
-      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.1.tgz",
-      "integrity": "sha512-0flMz1lh74BR4wOvBjuh9olbnwqCPc35OOlfyzHba0Dc+QNUeWX/Gq2YTbnwcWPO3BMd8fkzRVrHcsR+a7z7rA==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.2.tgz",
+      "integrity": "sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g==",
      "dev": true,
      "dependencies": {
        "esbuild": "~0.23.0",
@@ -15919,9 +16212,9 @@
      }
    },
    "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
      "dev": true,
      "funding": [
        {
@@ -15938,8 +16231,8 @@
        }
      ],
      "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.0"
      },
      "bin": {
        "update-browserslist-db": "cli.js"
@@ -16162,18 +16455,18 @@
      }
    },
    "node_modules/webpack": {
-      "version": "5.95.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
-      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
+      "version": "5.96.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
+      "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
      "dev": true,
      "dependencies": {
-        "@types/estree": "^1.0.5",
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
        "@webassemblyjs/ast": "^1.12.1",
        "@webassemblyjs/wasm-edit": "^1.12.1",
        "@webassemblyjs/wasm-parser": "^1.12.1",
-        "acorn": "^8.7.1",
-        "acorn-import-attributes": "^1.9.5",
-        "browserslist": "^4.21.10",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
        "chrome-trace-event": "^1.0.2",
        "enhanced-resolve": "^5.17.1",
        "es-module-lexer": "^1.2.1",
--- a/package.json
+++ b/package.json
@@ -46,12 +46,14 @@
    "integration-edit-db": "cross-env TRILIUM_INTEGRATION_TEST=edit TRILIUM_PORT=8081 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
    "integration-mem-db": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
    "integration-mem-db-dev": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
-    "generate-document": "cross-env nodemon src/tools/generate_document.ts 1000"
+    "generate-document": "cross-env nodemon src/tools/generate_document.ts 1000",
+    "ci-update-nightly-version": "tsx ./bin/update-nightly-version.ts"
  },
  "dependencies": {
    "@braintree/sanitize-url": "7.1.0",
    "@electron/remote": "2.1.2",
    "@excalidraw/excalidraw": "0.17.6",
+    "@highlightjs/cdn-assets": "11.10.0",
    "archiver": "7.0.1",
    "async-mutex": "0.5.0",
    "autocomplete.js": "0.38.1",
@@ -74,7 +76,7 @@
    "electron-squirrel-startup": "1.0.1",
    "electron-window-state": "5.0.3",
    "escape-html": "1.0.3",
-    "eslint": "9.10.0",
+    "eslint": "9.14.0",
    "express": "4.21.1",
    "express-partial-content": "1.0.2",
    "express-rate-limit": "7.4.1",
@@ -86,7 +88,7 @@
    "html2plaintext": "2.1.4",
    "http-proxy-agent": "7.0.2",
    "https-proxy-agent": "7.0.5",
-    "i18next": "23.16.2",
+    "i18next": "23.16.4",
    "i18next-fs-backend": "2.3.2",
    "i18next-http-backend": "2.6.2",
    "image-type": "4.1.0",
@@ -104,9 +106,9 @@
    "knockout": "3.5.1",
    "mark.js": "8.11.1",
    "marked": "14.1.3",
-    "mermaid": "11.3.0",
+    "mermaid": "11.4.0",
    "mime-types": "2.1.35",
-    "mind-elixir": "4.2.3",
+    "mind-elixir": "4.2.4",
    "multer": "1.4.5-lts.1",
    "node-abi": "3.67.0",
    "normalize-strings": "1.1.1",
@@ -144,7 +146,7 @@
    "@electron-forge/maker-squirrel": "7.5.0",
    "@electron-forge/maker-zip": "7.5.0",
    "@electron-forge/plugin-auto-unpack-natives": "7.5.0",
-    "@playwright/test": "1.47.1",
+    "@playwright/test": "1.48.2",
    "@types/archiver": "6.0.2",
    "@types/better-sqlite3": "7.6.11",
    "@types/cls-hooked": "4.3.8",
@@ -189,10 +191,10 @@
    "rcedit": "4.0.1",
    "rimraf": "6.0.1",
    "ts-node": "10.9.2",
-    "tslib": "2.8.0",
-    "tsx": "4.19.1",
+    "tslib": "2.8.1",
+    "tsx": "4.19.2",
    "typescript": "5.6.3",
-    "webpack": "5.95.0",
+    "webpack": "5.96.1",
    "webpack-cli": "5.1.4"
  }
 }
--- a/src/becca/entities/rows.ts
+++ b/src/becca/entities/rows.ts
@@ -38,9 +38,18 @@ export interface RecentNoteRow {
    utcDateCreated?: string;
 }

+/**
+ * Database representation of an option.
+ * 
+ * Options are key-value pairs that are used to store information such as user preferences (for example
+ * the current theme, sync server information), but also information about the state of the application).
+ */
 export interface OptionRow {
+    /** The name of the option. */
    name: string;
+    /** The value of the option. */
    value: string;
+    /** `true` if the value should be synced across multiple instances (e.g. locale) or `false` if it should be local-only (e.g. theme). */
    isSynced: boolean;
    utcDateModified?: string;
 }
--- a/src/public/app/components/tab_manager.js
+++ b/src/public/app/components/tab_manager.js
@@ -551,7 +551,7 @@ export default class TabManager extends Component {
            await this.removeNoteContext(ntxIdToRemove);
        }
    }
-
+    
    async closeOtherTabsCommand({ntxId}) {
        for (const ntxIdToRemove of this.mainNoteContexts.map(nc => nc.ntxId)) {
            if (ntxIdToRemove !== ntxId) {
@@ -560,6 +560,18 @@ export default class TabManager extends Component {
        }
    }

+    async closeRightTabsCommand({ntxId}) {
+        const ntxIds = this.mainNoteContexts.map(nc => nc.ntxId);
+        const index = ntxIds.indexOf(ntxId);
+
+        if (index !== -1) {
+            const idsToRemove = ntxIds.slice(index + 1);
+            for (const ntxIdToRemove of idsToRemove) {
+                await this.removeNoteContext(ntxIdToRemove);
+            }
+        }
+    }
+
    async closeTabCommand({ntxId}) {
        await this.removeNoteContext(ntxId);
    }
--- a/src/public/app/services/clipboard.js
+++ b/src/public/app/services/clipboard.js
@@ -3,6 +3,7 @@ import toastService from "./toast.js";
 import froca from "./froca.js";
 import linkService from "./link.js";
 import utils from "./utils.js";
+import { t } from "./i18n.js";

 let clipboardBranchIds = [];
 let clipboardMode = null;
--- a/src/public/app/services/content_renderer.js
+++ b/src/public/app/services/content_renderer.js
@@ -10,6 +10,7 @@ import treeService from "./tree.js";
 import FNote from "../entities/fnote.js";
 import FAttachment from "../entities/fattachment.js";
 import imageContextMenuService from "../menus/image_context_menu.js";
+import { applySyntaxHighlight } from "./syntax_highlight.js";

 let idCounter = 1;

@@ -105,6 +106,8 @@ async function renderText(note, $renderedContent) {
        for (const el of referenceLinks) {
            await linkService.loadReferenceLinkTitle($(el));
        }
+
+        await applySyntaxHighlight($renderedContent);
    } else {
        await renderChildrenList($renderedContent, note);
    }
--- a/src/public/app/services/glob.js
+++ b/src/public/app/services/glob.js
@@ -50,11 +50,11 @@ function setupGlobs() {
    };

    window.addEventListener("unhandledrejection", (e) => {
-        const string = e.reason.message.toLowerCase();
+        const string = e?.reason?.message?.toLowerCase();

        let message = "Uncaught error: ";

-        if (string.includes("script error")) {
+        if (string?.includes("script error")) {
            message += 'No details available';
        } else {
            message += [
--- a/src/public/app/services/library_loader.js
+++ b/src/public/app/services/library_loader.js
@@ -1,3 +1,7 @@
+import mimeTypesService from "./mime_types.js";
+import optionsService from "./options.js";
+import { getStylesheetUrl } from "./syntax_highlight.js";
+
 const CKEDITOR = {"js": ["libraries/ckeditor/ckeditor.js"]};

 const CODE_MIRROR = {
@@ -84,18 +88,44 @@ const MIND_ELIXIR = {
    ]
 };

+const HIGHLIGHT_JS = {
+    js: () => {
+        const mimeTypes = mimeTypesService.getMimeTypes();
+        const scriptsToLoad = new Set();
+        scriptsToLoad.add("node_modules/@highlightjs/cdn-assets/highlight.min.js");
+        for (const mimeType of mimeTypes) {
+            if (mimeType.enabled && mimeType.highlightJs) {
+                scriptsToLoad.add(`node_modules/@highlightjs/cdn-assets/languages/${mimeType.highlightJs}.min.js`);
+            }
+        }
+        
+        const currentTheme = optionsService.get("codeBlockTheme");
+        loadHighlightingTheme(currentTheme);
+
+        return Array.from(scriptsToLoad);
+    }
+};
+
 async function requireLibrary(library) {
    if (library.css) {
        library.css.map(cssUrl => requireCss(cssUrl));
    }

    if (library.js) {
-        for (const scriptUrl of library.js) {
+        for (const scriptUrl of unwrapValue(library.js)) {
            await requireScript(scriptUrl);
        }
    }
 }

+function unwrapValue(value) {
+    if (typeof value === "function") {
+        return value();
+    }
+
+    return value;
+}
+
 // we save the promises in case of the same script being required concurrently multiple times
 const loadedScriptPromises = {};

@@ -127,9 +157,36 @@ async function requireCss(url, prependAssetPath = true) {
    }
 }

+let highlightingThemeEl = null;
+function loadHighlightingTheme(theme) {
+    if (!theme) {        
+        return;
+    }
+
+    if (theme === "none") {
+        // Deactivate the theme.
+        if (highlightingThemeEl) {
+            highlightingThemeEl.remove();
+            highlightingThemeEl = null;
+        }
+        return;
+    }
+    
+    if (!highlightingThemeEl) {
+        highlightingThemeEl = $(`<link rel="stylesheet" type="text/css" />`);
+        $("head").append(highlightingThemeEl);
+    }
+    
+    const url = getStylesheetUrl(theme);
+    if (url) {
+        highlightingThemeEl.attr("href", url);
+    }
+}
+
 export default {
    requireCss,
    requireLibrary,
+    loadHighlightingTheme,
    CKEDITOR,
    CODE_MIRROR,
    ESLINT,
@@ -143,5 +200,6 @@ export default {
    EXCALIDRAW,
    MARKJS,
    I18NEXT,
-    MIND_ELIXIR
+    MIND_ELIXIR,
+    HIGHLIGHT_JS
 }
--- a/src/public/app/services/mime_types.js
+++ b/src/public/app/services/mime_types.js
@@ -1,162 +1,167 @@
 import options from "./options.js";

+/**
+ * A pseudo-MIME type which is used in the editor to automatically determine the language used in code blocks via heuristics.
+ */
+const MIME_TYPE_AUTO = "text-x-trilium-auto";
+
 const MIME_TYPES_DICT = [
-    { default: true, title: "Plain text", mime: "text/plain" },
+    { default: true, title: "Plain text", mime: "text/plain", highlightJs: "plaintext" },
    { title: "APL", mime: "text/apl" },
    { title: "ASN.1", mime: "text/x-ttcn-asn" },
    { title: "ASP.NET", mime: "application/x-aspx" },
    { title: "Asterisk", mime: "text/x-asterisk" },
-    { title: "Brainfuck", mime: "text/x-brainfuck" },
-    { default: true, title: "C", mime: "text/x-csrc" },
-    { default: true, title: "C#", mime: "text/x-csharp" },
-    { default: true, title: "C++", mime: "text/x-c++src" },
-    { title: "Clojure", mime: "text/x-clojure" },
+    { title: "Brainfuck", mime: "text/x-brainfuck", highlightJs: "brainfuck" },
+    { default: true, title: "C", mime: "text/x-csrc", highlightJs: "c" },
+    { default: true, title: "C#", mime: "text/x-csharp", highlightJs: "csharp" },
+    { default: true, title: "C++", mime: "text/x-c++src", highlightJs: "cpp" },
+    { title: "Clojure", mime: "text/x-clojure", highlightJs: "clojure" },
    { title: "ClojureScript", mime: "text/x-clojurescript" },
    { title: "Closure Stylesheets (GSS)", mime: "text/x-gss" },
-    { title: "CMake", mime: "text/x-cmake" },
+    { title: "CMake", mime: "text/x-cmake", highlightJs: "cmake" },
    { title: "Cobol", mime: "text/x-cobol" },
-    { title: "CoffeeScript", mime: "text/coffeescript" },
-    { title: "Common Lisp", mime: "text/x-common-lisp" },
+    { title: "CoffeeScript", mime: "text/coffeescript", highlightJs: "coffeescript" },
+    { title: "Common Lisp", mime: "text/x-common-lisp", highlightJs: "lisp" },
    { title: "CQL", mime: "text/x-cassandra" },
-    { title: "Crystal", mime: "text/x-crystal" },
-    { default: true, title: "CSS", mime: "text/css" },
+    { title: "Crystal", mime: "text/x-crystal", highlightJs: "crystal" },
+    { default: true, title: "CSS", mime: "text/css", highlightJs: "css" },
    { title: "Cypher", mime: "application/x-cypher-query" },
    { title: "Cython", mime: "text/x-cython" },
-    { title: "D", mime: "text/x-d" },
-    { title: "Dart", mime: "application/dart" },
-    { title: "diff", mime: "text/x-diff" },
-    { title: "Django", mime: "text/x-django" },
-    { title: "Dockerfile", mime: "text/x-dockerfile" },
+    { title: "D", mime: "text/x-d", highlightJs: "d" },
+    { title: "Dart", mime: "application/dart", highlightJs: "dart" },
+    { title: "diff", mime: "text/x-diff", highlightJs: "diff" },
+    { title: "Django", mime: "text/x-django", highlightJs: "django" },
+    { title: "Dockerfile", mime: "text/x-dockerfile", highlightJs: "dockerfile" },
    { title: "DTD", mime: "application/xml-dtd" },
    { title: "Dylan", mime: "text/x-dylan" },
-    { title: "EBNF", mime: "text/x-ebnf" },
+    { title: "EBNF", mime: "text/x-ebnf", highlightJs: "ebnf" },
    { title: "ECL", mime: "text/x-ecl" },
    { title: "edn", mime: "application/edn" },
    { title: "Eiffel", mime: "text/x-eiffel" },
-    { title: "Elm", mime: "text/x-elm" },
+    { title: "Elm", mime: "text/x-elm", highlightJs: "elm" },
    { title: "Embedded Javascript", mime: "application/x-ejs" },
-    { title: "Embedded Ruby", mime: "application/x-erb" },
-    { title: "Erlang", mime: "text/x-erlang" },
+    { title: "Embedded Ruby", mime: "application/x-erb", highlightJs: "erb" },
+    { title: "Erlang", mime: "text/x-erlang", highlightJs: "erlang" },
    { title: "Esper", mime: "text/x-esper" },
-    { title: "F#", mime: "text/x-fsharp" },
+    { title: "F#", mime: "text/x-fsharp", highlightJs: "fsharp" },
    { title: "Factor", mime: "text/x-factor" },
    { title: "FCL", mime: "text/x-fcl" },
    { title: "Forth", mime: "text/x-forth" },
-    { title: "Fortran", mime: "text/x-fortran" },
+    { title: "Fortran", mime: "text/x-fortran", highlightJs: "fortran" },
    { title: "Gas", mime: "text/x-gas" },
-    { title: "Gherkin", mime: "text/x-feature" },
-    { title: "GitHub Flavored Markdown", mime: "text/x-gfm" },
-    { default: true, title: "Go", mime: "text/x-go" },
-    { default: true, title: "Groovy", mime: "text/x-groovy" },
-    { title: "HAML", mime: "text/x-haml" },
-    { default: true, title: "Haskell", mime: "text/x-haskell" },
+    { title: "Gherkin", mime: "text/x-feature", highlightJs: "gherkin" },
+    { title: "GitHub Flavored Markdown", mime: "text/x-gfm", highlightJs: "markdown" },
+    { default: true, title: "Go", mime: "text/x-go", highlightJs: "go" },
+    { default: true, title: "Groovy", mime: "text/x-groovy", highlightJs: "groovy" },
+    { title: "HAML", mime: "text/x-haml", highlightJs: "haml" },
+    { default: true, title: "Haskell", mime: "text/x-haskell", highlightJs: "haskell" },
    { title: "Haskell (Literate)", mime: "text/x-literate-haskell" },
-    { title: "Haxe", mime: "text/x-haxe" },
-    { default: true, title: "HTML", mime: "text/html" },
-    { default: true, title: "HTTP", mime: "message/http" },
+    { title: "Haxe", mime: "text/x-haxe", highlightJs: "haxe" },
+    { default: true, title: "HTML", mime: "text/html", highlightJs: "xml" },
+    { default: true, title: "HTTP", mime: "message/http", highlightJs: "http" },
    { title: "HXML", mime: "text/x-hxml" },
    { title: "IDL", mime: "text/x-idl" },
-    { default: true, title: "Java", mime: "text/x-java" },
-    { title: "Java Server Pages", mime: "application/x-jsp" },
+    { default: true, title: "Java", mime: "text/x-java", highlightJs: "java" },
+    { title: "Java Server Pages", mime: "application/x-jsp", highlightJs: "java" },
    { title: "Jinja2", mime: "text/jinja2" },
-    { default: true, title: "JS backend", mime: "application/javascript;env=backend" },
-    { default: true, title: "JS frontend", mime: "application/javascript;env=frontend" },
-    { default: true, title: "JSON", mime: "application/json" },
-    { title: "JSON-LD", mime: "application/ld+json" },
-    { title: "JSX", mime: "text/jsx" },
-    { title: "Julia", mime: "text/x-julia" },
-    { default: true, title: "Kotlin", mime: "text/x-kotlin" },
-    { title: "LaTeX", mime: "text/x-latex" },
-    { title: "LESS", mime: "text/x-less" },
-    { title: "LiveScript", mime: "text/x-livescript" },
-    { title: "Lua", mime: "text/x-lua" },
-    { title: "MariaDB SQL", mime: "text/x-mariadb" },
-    { default: true, title: "Markdown", mime: "text/x-markdown" },
-    { title: "Mathematica", mime: "text/x-mathematica" },
+    { default: true, title: "JS backend", mime: "application/javascript;env=backend", highlightJs: "javascript" },
+    { default: true, title: "JS frontend", mime: "application/javascript;env=frontend", highlightJs: "javascript" },
+    { default: true, title: "JSON", mime: "application/json", highlightJs: "json" },
+    { title: "JSON-LD", mime: "application/ld+json", highlightJs: "json" },
+    { title: "JSX", mime: "text/jsx", highlightJs: "javascript" },
+    { title: "Julia", mime: "text/x-julia", highlightJs: "julia" },
+    { default: true, title: "Kotlin", mime: "text/x-kotlin", highlightJs: "kotlin" },
+    { title: "LaTeX", mime: "text/x-latex", highlightJs: "latex" },
+    { title: "LESS", mime: "text/x-less", highlightJs: "less" },
+    { title: "LiveScript", mime: "text/x-livescript", highlightJs: "livescript" },
+    { title: "Lua", mime: "text/x-lua", highlightJs: "lua" },
+    { title: "MariaDB SQL", mime: "text/x-mariadb", highlightJs: "sql" },
+    { default: true, title: "Markdown", mime: "text/x-markdown", highlightJs: "markdown" },
+    { title: "Mathematica", mime: "text/x-mathematica", highlightJs: "mathematica" },
    { title: "mbox", mime: "application/mbox" },
    { title: "mIRC", mime: "text/mirc" },
    { title: "Modelica", mime: "text/x-modelica" },
-    { title: "MS SQL", mime: "text/x-mssql" },
+    { title: "MS SQL", mime: "text/x-mssql", highlightJs: "sql" },
    { title: "mscgen", mime: "text/x-mscgen" },
    { title: "msgenny", mime: "text/x-msgenny" },
    { title: "MUMPS", mime: "text/x-mumps" },
-    { title: "MySQL", mime: "text/x-mysql" },
-    { title: "Nginx", mime: "text/x-nginx-conf" },
-    { title: "NSIS", mime: "text/x-nsis" },
+    { title: "MySQL", mime: "text/x-mysql", highlightJs: "sql" },
+    { title: "Nginx", mime: "text/x-nginx-conf", highlightJs: "nginx" },
+    { title: "NSIS", mime: "text/x-nsis", highlightJs: "nsis" },
    { title: "NTriples", mime: "application/n-triples" },
-    { title: "Objective-C", mime: "text/x-objectivec" },
-    { title: "OCaml", mime: "text/x-ocaml" },
+    { title: "Objective-C", mime: "text/x-objectivec", highlightJs: "objectivec" },
+    { title: "OCaml", mime: "text/x-ocaml", highlightJs: "ocaml" },
    { title: "Octave", mime: "text/x-octave" },
    { title: "Oz", mime: "text/x-oz" },
-    { title: "Pascal", mime: "text/x-pascal" },
+    { title: "Pascal", mime: "text/x-pascal", highlightJs: "delphi" },
    { title: "PEG.js", mime: "null" },
    { default: true, title: "Perl", mime: "text/x-perl" },
    { title: "PGP", mime: "application/pgp" },
    { default: true, title: "PHP", mime: "text/x-php" },
    { title: "Pig", mime: "text/x-pig" },
-    { title: "PLSQL", mime: "text/x-plsql" },
-    { title: "PostgreSQL", mime: "text/x-pgsql" },
-    { title: "PowerShell", mime: "application/x-powershell" },
-    { title: "Properties files", mime: "text/x-properties" },
-    { title: "ProtoBuf", mime: "text/x-protobuf" },
+    { title: "PLSQL", mime: "text/x-plsql", highlightJs: "sql" },
+    { title: "PostgreSQL", mime: "text/x-pgsql", highlightJs: "pgsql" },
+    { title: "PowerShell", mime: "application/x-powershell", highlightJs: "powershell" },
+    { title: "Properties files", mime: "text/x-properties", highlightJs: "properties" },
+    { title: "ProtoBuf", mime: "text/x-protobuf", highlightJs: "protobuf" },
    { title: "Pug", mime: "text/x-pug" },
-    { title: "Puppet", mime: "text/x-puppet" },
-    { default: true, title: "Python", mime: "text/x-python" },
-    { title: "Q", mime: "text/x-q" },
-    { title: "R", mime: "text/x-rsrc" },
+    { title: "Puppet", mime: "text/x-puppet", highlightJs: "puppet" },
+    { default: true, title: "Python", mime: "text/x-python", highlightJs: "python" },
+    { title: "Q", mime: "text/x-q", highlightJs: "q" },
+    { title: "R", mime: "text/x-rsrc", highlightJs: "r" },
    { title: "reStructuredText", mime: "text/x-rst" },
    { title: "RPM Changes", mime: "text/x-rpm-changes" },
    { title: "RPM Spec", mime: "text/x-rpm-spec" },
-    { default: true, title: "Ruby", mime: "text/x-ruby" },
-    { title: "Rust", mime: "text/x-rustsrc" },
-    { title: "SAS", mime: "text/x-sas" },
+    { default: true, title: "Ruby", mime: "text/x-ruby", highlightJs: "ruby" },
+    { title: "Rust", mime: "text/x-rustsrc", highlightJs: "rust" },
+    { title: "SAS", mime: "text/x-sas", highlightJs: "sas" },
    { title: "Sass", mime: "text/x-sass" },
    { title: "Scala", mime: "text/x-scala" },
    { title: "Scheme", mime: "text/x-scheme" },
-    { title: "SCSS", mime: "text/x-scss" },
-    { default: true, title: "Shell (bash)", mime: "text/x-sh" },
+    { title: "SCSS", mime: "text/x-scss", highlightJs: "scss" },
+    { default: true, title: "Shell (bash)", mime: "text/x-sh", highlightJs: "shell" },
    { title: "Sieve", mime: "application/sieve" },
    { title: "Slim", mime: "text/x-slim" },
-    { title: "Smalltalk", mime: "text/x-stsrc" },
+    { title: "Smalltalk", mime: "text/x-stsrc", highlightJs: "smalltalk" },
    { title: "Smarty", mime: "text/x-smarty" },
-    { title: "SML", mime: "text/x-sml" },
+    { title: "SML", mime: "text/x-sml", highlightJs: "sml" },
    { title: "Solr", mime: "text/x-solr" },
    { title: "Soy", mime: "text/x-soy" },
    { title: "SPARQL", mime: "application/sparql-query" },
    { title: "Spreadsheet", mime: "text/x-spreadsheet" },
-    { default: true, title: "SQL", mime: "text/x-sql" },
-    { title: "SQLite", mime: "text/x-sqlite" },
-    { default: true, title: "SQLite (Trilium)", mime: "text/x-sqlite;schema=trilium" },
+    { default: true, title: "SQL", mime: "text/x-sql", highlightJs: "sql" },
+    { title: "SQLite", mime: "text/x-sqlite", highlightJs: "sql" },
+    { default: true, title: "SQLite (Trilium)", mime: "text/x-sqlite;schema=trilium", highlightJs: "sql" },
    { title: "Squirrel", mime: "text/x-squirrel" },
    { title: "sTeX", mime: "text/x-stex" },
-    { title: "Stylus", mime: "text/x-styl" },
+    { title: "Stylus", mime: "text/x-styl", highlightJs: "stylus" },
    { default: true, title: "Swift", mime: "text/x-swift" },
    { title: "SystemVerilog", mime: "text/x-systemverilog" },
-    { title: "Tcl", mime: "text/x-tcl" },
+    { title: "Tcl", mime: "text/x-tcl", highlightJs: "tcl" },
    { title: "Textile", mime: "text/x-textile" },
    { title: "TiddlyWiki ", mime: "text/x-tiddlywiki" },
    { title: "Tiki wiki", mime: "text/tiki" },
-    { title: "TOML", mime: "text/x-toml" },
+    { title: "TOML", mime: "text/x-toml", highlightJs: "ini" },
    { title: "Tornado", mime: "text/x-tornado" },
    { title: "troff", mime: "text/troff" },
    { title: "TTCN", mime: "text/x-ttcn" },
    { title: "TTCN_CFG", mime: "text/x-ttcn-cfg" },
    { title: "Turtle", mime: "text/turtle" },
-    { title: "Twig", mime: "text/x-twig" },
-    { title: "TypeScript", mime: "application/typescript" },
+    { title: "Twig", mime: "text/x-twig", highlightJs: "twig" },
+    { title: "TypeScript", mime: "application/typescript", highlightJs: "typescript" },
    { title: "TypeScript-JSX", mime: "text/typescript-jsx" },
-    { title: "VB.NET", mime: "text/x-vb" },
-    { title: "VBScript", mime: "text/vbscript" },
+    { title: "VB.NET", mime: "text/x-vb", highlightJs: "vbnet" },
+    { title: "VBScript", mime: "text/vbscript", highlightJs: "vbscript" },
    { title: "Velocity", mime: "text/velocity" },
-    { title: "Verilog", mime: "text/x-verilog" },
-    { title: "VHDL", mime: "text/x-vhdl" },
+    { title: "Verilog", mime: "text/x-verilog", highlightJs: "verilog" },
+    { title: "VHDL", mime: "text/x-vhdl", highlightJs: "vhdl" },
    { title: "Vue.js Component", mime: "text/x-vue" },
    { title: "Web IDL", mime: "text/x-webidl" },
-    { default: true, title: "XML", mime: "text/xml" },
-    { title: "XQuery", mime: "application/xquery" },
+    { default: true, title: "XML", mime: "text/xml", highlightJs: "xml" },
+    { title: "XQuery", mime: "application/xquery", highlightJs: "xquery" },
    { title: "xu", mime: "text/x-xu" },
    { title: "Yacas", mime: "text/x-yacas" },
-    { default: true, title: "YAML", mime: "text/x-yaml" },
+    { default: true, title: "YAML", mime: "text/x-yaml", highlightJs: "yaml" },
    { title: "Z80", mime: "text/x-z80" }
 ];

@@ -173,7 +178,7 @@ function loadMimeTypes() {
    }
 }

-async function getMimeTypes() {
+function getMimeTypes() {
    if (mimeTypes === null) {
        loadMimeTypes();
    }
@@ -181,7 +186,46 @@ async function getMimeTypes() {
    return mimeTypes;
 }

-export default {
-    getMimeTypes,
-    loadMimeTypes
+let mimeToHighlightJsMapping = null;
+
+/**
+ * Obtains the corresponding language tag for highlight.js for a given MIME type.
+ * 
+ * The mapping is built the first time this method is built and then the results are cached for better performance.
+ * 
+ * @param {string} mimeType The MIME type of the code block, in the CKEditor-normalized format (e.g. `text-c-src` instead of `text/c-src`).
+ * @returns the corresponding highlight.js tag, for example `c` for `text-c-src`.
+ */
+function getHighlightJsNameForMime(mimeType) {    
+    if (!mimeToHighlightJsMapping) {
+        const mimeTypes = getMimeTypes();
+        mimeToHighlightJsMapping = {};
+        for (const mimeType of mimeTypes) {
+            // The mime stored by CKEditor is text-x-csrc instead of text/x-csrc so we keep this format for faster lookup.
+            const normalizedMime = normalizeMimeTypeForCKEditor(mimeType.mime);
+            mimeToHighlightJsMapping[normalizedMime] = mimeType.highlightJs;
+        }
+    }
+
+    return mimeToHighlightJsMapping[mimeType];
+}
+
+/**
+ * Given a MIME type in the usual format (e.g. `text/csrc`), it returns a MIME type that can be passed down to the CKEditor
+ * code plugin.
+ * 
+ * @param {string} mimeType The MIME type to normalize, in the usual format (e.g. `text/c-src`).
+ * @returns the normalized MIME type (e.g. `text-c-src`).
+ */
+function normalizeMimeTypeForCKEditor(mimeType) {
+    return mimeType.toLowerCase()
+        .replace(/[\W_]+/g,"-");
+}
+
+export default {
+    MIME_TYPE_AUTO,
+    getMimeTypes,
+    loadMimeTypes,
+    getHighlightJsNameForMime,
+    normalizeMimeTypeForCKEditor
 }
--- a/src/public/app/services/note_list_renderer.js
+++ b/src/public/app/services/note_list_renderer.js
@@ -366,7 +366,7 @@ class NoteListRenderer {
                    separateWordSearch: false,
                    caseSensitive: false
                });
-            }
+            }            

            $content.append($renderedContent);
            $content.addClass(`type-${type}`);
--- a/src/public/app/services/sync.js
+++ b/src/public/app/services/sync.js
@@ -1,3 +1,4 @@
+import { t } from './i18n.js';
 import server from './server.js';
 import toastService from "./toast.js";

--- a/src/public/app/services/syntax_highlight.js
+++ b/src/public/app/services/syntax_highlight.js
@@ -0,0 +1,79 @@
+import library_loader from "./library_loader.js";
+import mime_types from "./mime_types.js";
+import options from "./options.js";
+
+export function getStylesheetUrl(theme) {
+    if (!theme) {
+        return null;
+    }
+
+    const defaultPrefix = "default:";
+    if (theme.startsWith(defaultPrefix)) {        
+        return `${window.glob.assetPath}/node_modules/@highlightjs/cdn-assets/styles/${theme.substr(defaultPrefix.length)}.min.css`;
+    }
+
+    return null;
+}
+
+/**
+ * Identifies all the code blocks (as `pre code`) under the specified hierarchy and uses the highlight.js library to obtain the highlighted text which is then applied on to the code blocks.
+ * 
+ * @param $container the container under which to look for code blocks and to apply syntax highlighting to them.
+ */
+export async function applySyntaxHighlight($container) {
+    if (!isSyntaxHighlightEnabled()) {
+        return;
+    }
+
+    await library_loader.requireLibrary(library_loader.HIGHLIGHT_JS);
+
+    const codeBlocks = $container.find("pre code");
+    for (const codeBlock of codeBlocks) {
+        $(codeBlock).parent().toggleClass("hljs");
+
+        const text = codeBlock.innerText;
+
+        const normalizedMimeType = extractLanguageFromClassList(codeBlock);
+        if (!normalizedMimeType) {
+            continue;
+        }
+
+        let highlightedText = null;
+        if (normalizedMimeType === mime_types.MIME_TYPE_AUTO) {
+            highlightedText = hljs.highlightAuto(text);
+        } else if (normalizedMimeType) {
+            const language = mime_types.getHighlightJsNameForMime(normalizedMimeType);
+            highlightedText = hljs.highlight(text, { language });
+        }
+        
+        if (highlightedText) {            
+            codeBlock.innerHTML = highlightedText.value;
+        }
+    }
+}
+
+/**
+ * Indicates whether syntax highlighting should be enabled for code blocks, by querying the value of the `codeblockTheme` option.
+ * @returns whether syntax highlighting should be enabled for code blocks.
+ */
+export function isSyntaxHighlightEnabled() {
+    const theme = options.get("codeBlockTheme");
+    return theme && theme !== "none";
+}
+
+/**
+ * Given a HTML element, tries to extract the `language-` class name out of it.
+ * 
+ * @param {string} el the HTML element from which to extract the language tag.
+ * @returns the normalized MIME type (e.g. `text-css` instead of `language-text-css`).
+ */
+function extractLanguageFromClassList(el) {
+    const prefix = "language-";
+    for (const className of el.classList) {
+        if (className.startsWith(prefix)) {
+            return className.substr(prefix.length);
+        }
+    }
+
+    return null;
+}
--- a/src/public/app/widgets/dialogs/delete_notes.js
+++ b/src/public/app/widgets/dialogs/delete_notes.js
@@ -25,7 +25,7 @@ const TPL = `
                </div>

                <div class="delete-notes-list-wrapper">
-                    <h4>${t('delete_notes.notes_to_be_deleted')} (<span class="deleted-notes-count"></span>)</h4>
+                    <h4>${t('delete_notes.notes_to_be_deleted', { noteCount: '<span class="deleted-notes-count"></span>' })}</h4>

                    <ul class="delete-notes-list" style="max-height: 200px; overflow: auto;"></ul>
                </div>
@@ -36,7 +36,7 @@ const TPL = `

                <div class="broken-relations-wrapper">
                    <div class="alert alert-danger">
-                        <h4>${t('delete_notes.broken_relations_to_be_deleted')} (<span class="broke-relations-count"></span>)</h4>
+                        <h4>${t('delete_notes.broken_relations_to_be_deleted', { relationCount: '<span class="broke-relations-count"></span>'})}</h4>

                        <ul class="broken-relations-list" style="max-height: 200px; overflow: auto;"></ul>
                    </div>
@@ -126,11 +126,11 @@ export default class DeleteNotesDialog extends BasicWidget {

        for (const attr of response.brokenRelations) {
            this.$brokenRelationsList.append(
-                $("<li>")
-                    .append(`${t('delete_notes.note')} `)
-                    .append(await linkService.createLink(attr.value))
-                    .append(` ${t('delete_notes.to_be_deleted', {attrName: attr.name})} `)
-                    .append(await linkService.createLink(attr.noteId))
+                $("<li>").html(t("delete_notes.deleted_relation_text", {
+                    note: (await linkService.createLink(attr.value)).html(),
+                    relation: `<code>${attr.name}</code>`,
+                    source: (await linkService.createLink(attr.noteId)).html()
+                }))
            );
        }
    }
--- a/src/public/app/widgets/note_context_aware_widget.js
+++ b/src/public/app/widgets/note_context_aware_widget.js
@@ -50,6 +50,9 @@ class NoteContextAwareWidget extends BasicWidget {
    /**
     * @inheritdoc
     * 
+     * <p>
+     * If the widget is not enabled, it will not receive `refreshWithNote` updates.
+     * 
     * @returns {boolean} true when an active note exists
     */
    isEnabled() {
--- a/src/public/app/widgets/note_detail.js
+++ b/src/public/app/widgets/note_detail.js
@@ -30,6 +30,7 @@ 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 { getStylesheetUrl, isSyntaxHighlightEnabled } from "../services/syntax_highlight.js";

 const TPL = `
 <div class="note-detail">
@@ -255,6 +256,19 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
        }

        const {assetPath} = window.glob;
+        const cssToLoad = [
+            `${assetPath}/node_modules/codemirror/lib/codemirror.css`,
+            `${assetPath}/libraries/ckeditor/ckeditor-content.css`,
+            `${assetPath}/node_modules/bootstrap/dist/css/bootstrap.min.css`,
+            `${assetPath}/node_modules/katex/dist/katex.min.css`,
+            `${assetPath}/stylesheets/print.css`,
+            `${assetPath}/stylesheets/relation_map.css`,
+            `${assetPath}/stylesheets/ckeditor-theme.css`
+        ];
+
+        if (isSyntaxHighlightEnabled()) {
+            cssToLoad.push(getStylesheetUrl("default:vs"));
+        }

        this.$widget.find('.note-detail-printable:visible').printThis({
            header: $("<div>")
@@ -273,15 +287,7 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
 </script>
 `,
            importCSS: false,
-            loadCSS: [
-                `${assetPath}/node_modules/codemirror/lib/codemirror.css`,
-                `${assetPath}/libraries/ckeditor/ckeditor-content.css`,
-                `${assetPath}/node_modules/bootstrap/dist/css/bootstrap.min.css`,
-                `${assetPath}/node_modules/katex/dist/katex.min.css`,
-                `${assetPath}/stylesheets/print.css`,
-                `${assetPath}/stylesheets/relation_map.css`,
-                `${assetPath}/stylesheets/ckeditor-theme.css`
-            ],
+            loadCSS: cssToLoad,
            debug: true
        });
    }
--- a/src/public/app/widgets/note_type.js
+++ b/src/public/app/widgets/note_type.js
@@ -101,7 +101,7 @@ export default class NoteTypeWidget extends NoteContextAwareWidget {
            this.$noteTypeDropdown.append($typeLink);
        }

-        for (const mimeType of await mimeTypesService.getMimeTypes()) {
+        for (const mimeType of mimeTypesService.getMimeTypes()) {
            if (!mimeType.enabled) {
                continue;
            }
@@ -128,7 +128,7 @@ export default class NoteTypeWidget extends NoteContextAwareWidget {

    async findTypeTitle(type, mime) {
        if (type === 'code') {
-            const mimeTypes = await mimeTypesService.getMimeTypes();
+            const mimeTypes = mimeTypesService.getMimeTypes();
            const found = mimeTypes.find(mt => mt.mime === mime);

            return found ? found.title : mime;
--- a/src/public/app/widgets/tab_row.js
+++ b/src/public/app/widgets/tab_row.js
@@ -260,8 +260,10 @@ export default class TabRowWidget extends BasicWidget {
                y: e.pageY,
                items: [
                    {title: t('tab_row.close'), command: "closeTab", uiIcon: "bx bx-x"},
-                    {title: t('tab_row.close_other_tabs'), command: "closeOtherTabs", uiIcon: "bx bx-x"},
-                    {title: t('tab_row.close_all_tabs'), command: "closeAllTabs", uiIcon: "bx bx-x"},
+                    {title: t('tab_row.close_other_tabs'), command: "closeOtherTabs", uiIcon: "bx bx-empty", enabled: appContext.tabManager.noteContexts.length !== 1},
+                    {title: t('tab_row.close_right_tabs'), command: "closeRightTabs", uiIcon: "bx bx-empty", enabled: appContext.tabManager.noteContexts.at(-1).ntxId !== ntxId},
+                    {title: t('tab_row.close_all_tabs'), command: "closeAllTabs", uiIcon: "bx bx-empty"},
+                    { title: "----" },
                    {title: t('tab_row.move_tab_to_new_window'), command: "moveTabToNewWindow", uiIcon: "bx bx-window-open"}
                ],
                selectMenuItemHandler: ({command}) => {
--- a/src/public/app/widgets/type_widgets/abstract_text_type_widget.js
+++ b/src/public/app/widgets/type_widgets/abstract_text_type_widget.js
@@ -4,8 +4,15 @@ import froca from "../../services/froca.js";
 import linkService from "../../services/link.js";
 import contentRenderer from "../../services/content_renderer.js";
 import utils from "../../services/utils.js";
+import options from "../../services/options.js";

 export default class AbstractTextTypeWidget extends TypeWidget {
+
+    doRender() {
+        super.doRender();
+        this.refreshCodeBlockOptions();
+    }
+
    setupImageOpening(singleClickOpens) {
        this.$widget.on("dblclick", "img", e => this.openImageInCurrentTab($(e.target)));

@@ -108,4 +115,16 @@ export default class AbstractTextTypeWidget extends TypeWidget {
            });
        }
    }
+
+    refreshCodeBlockOptions() {
+        const wordWrap = options.is("codeBlockWordWrap");
+        this.$widget.toggleClass("word-wrap", wordWrap);
+    }
+
+    async entitiesReloadedEvent({loadResults}) {
+        if (loadResults.isOptionReloaded("codeBlockWordWrap")) {
+            this.refreshCodeBlockOptions();            
+        }
+    }
+
 }
--- a/src/public/app/widgets/type_widgets/ckeditor/syntax_highlight.js
+++ b/src/public/app/widgets/type_widgets/ckeditor/syntax_highlight.js
@@ -0,0 +1,354 @@
+/*
+ * This code is an adaptation of https://github.com/antoniotejada/Trilium-SyntaxHighlightWidget with additional improvements, such as:
+ * 
+ *  - support for selecting the language manually;
+ *  - support for determining the language automatically, if a special language is selected ("Auto-detected");
+ *  - limit for highlighting.
+ * 
+ * TODO: Generally this class can be done directly in the CKEditor repository.
+ */
+
+import library_loader from "../../../services/library_loader.js";
+import mime_types from "../../../services/mime_types.js";
+import { isSyntaxHighlightEnabled } from "../../../services/syntax_highlight.js";
+
+export async function initSyntaxHighlighting(editor) {
+    if (!isSyntaxHighlightEnabled) {
+        return;
+    }
+
+    await library_loader.requireLibrary(library_loader.HIGHLIGHT_JS);
+    initTextEditor(editor);
+}
+
+const HIGHLIGHT_MAX_BLOCK_COUNT = 500;
+
+const tag = "SyntaxHighlightWidget";
+const debugLevels = ["error", "warn", "info", "log", "debug"];
+const debugLevel = "debug";
+
+let warn = function() {};
+if (debugLevel >= debugLevels.indexOf("warn")) {
+    warn = console.warn.bind(console, tag + ": ");
+}
+
+let info = function() {};
+if (debugLevel >= debugLevels.indexOf("info")) {
+    info = console.info.bind(console, tag + ": ");
+}
+
+let log = function() {};
+if (debugLevel >= debugLevels.indexOf("log")) {
+    log = console.log.bind(console, tag + ": ");
+}
+
+let dbg = function() {};
+if (debugLevel >= debugLevels.indexOf("debug")) {
+    dbg = console.debug.bind(console, tag + ": ");
+}
+
+function assert(e, msg) {
+    console.assert(e, tag + ": " + msg);
+}
+
+// TODO: Should this be scoped to note?
+let markerCounter = 0;
+
+function initTextEditor(textEditor) {
+    log("initTextEditor");
+
+    let widget = this;
+    const document = textEditor.model.document;
+
+    // Create a conversion from model to view that converts 
+    // hljs:hljsClassName:uniqueId into a span with hljsClassName
+    // See the list of hljs class names at
+    // https://github.com/highlightjs/highlight.js/blob/6b8c831f00c4e87ecd2189ebbd0bb3bbdde66c02/docs/css-classes-reference.rst
+
+    textEditor.conversion.for('editingDowncast').markerToHighlight( {
+        model: "hljs",
+        view: ( { markerName } ) => {
+            dbg("markerName " + markerName);
+            // markerName has the pattern addMarker:cssClassName:uniqueId
+            const [ , cssClassName, id ] = markerName.split( ':' );
+
+            // The original code at 
+            // https://github.com/ckeditor/ckeditor5/blob/master/packages/ckeditor5-find-and-replace/src/findandreplaceediting.js
+            // has this comment
+            //      Marker removal from the view has a bug: 
+            //      https://github.com/ckeditor/ckeditor5/issues/7499
+            //      A minimal option is to return a new object for each converted marker...
+            return {
+                name: 'span',
+                classes: [ cssClassName ],
+                attributes: {
+                    // ...however, adding a unique attribute should be future-proof..
+                    'data-syntax-result': id
+                },
+            };
+        }
+    });
+    
+
+    // XXX This is done at BalloonEditor.create time, so it assumes this
+    //     document is always attached to this textEditor, empirically that
+    //     seems to be the case even with two splits showing the same note,
+    //     it's not clear if CKEditor5 has apis to attach and detach
+    //     documents around
+    document.registerPostFixer(function(writer) {
+        log("postFixer");
+        // Postfixers are a simpler way of tracking changes than onchange
+        // See
+        // https://github.com/ckeditor/ckeditor5/blob/b53d2a4b49679b072f4ae781ac094e7e831cfb14/packages/ckeditor5-block-quote/src/blockquoteediting.js#L54
+        const changes = document.differ.getChanges();
+        let dirtyCodeBlocks = new Set();
+
+        for (const change of changes) {
+            dbg("change " + JSON.stringify(change));
+
+            if ((change.type == "insert") && (change.name == "codeBlock")) {
+                // A new code block was inserted
+                const codeBlock = change.position.nodeAfter;
+                // Even if it's a new codeblock, it needs dirtying in case
+                // it already has children, like when pasting one or more
+                // full codeblocks, undoing a delete, changing the language,
+                // etc (the postfixer won't get later changes for those).
+                log("dirtying inserted codeBlock " + JSON.stringify(codeBlock.toJSON()));
+                dirtyCodeBlocks.add(codeBlock);
+                
+            } else if (change.type == "remove" && (change.name == "codeBlock")) {
+                // An existing codeblock was removed, do nothing. Note the
+                // node is no longer in the editor so the codeblock cannot
+                // be inspected here. No need to dirty the codeblock since
+                // it has been removed
+                log("removing codeBlock at path " + JSON.stringify(change.position.toJSON()));
+                
+            } else if (((change.type == "remove") || (change.type == "insert")) && 
+                        change.position.parent.is('element', 'codeBlock')) {
+                // Text was added or removed from the codeblock, force a
+                // highlight
+                const codeBlock = change.position.parent;
+                log("dirtying codeBlock " + JSON.stringify(codeBlock.toJSON()));
+                dirtyCodeBlocks.add(codeBlock);
+            }
+        }
+        for (let codeBlock of dirtyCodeBlocks) {
+            highlightCodeBlock(codeBlock, writer);
+        }
+        // Adding markers doesn't modify the document data so no need for
+        // postfixers to run again
+        return false;
+    });
+
+    // This assumes the document is empty and a explicit call to highlight
+    // is not necessary here. Empty documents have a single children of type
+    // paragraph with no text
+    assert((document.getRoot().childCount == 1) && 
+        (document.getRoot().getChild(0).name == "paragraph") &&
+         document.getRoot().getChild(0).isEmpty);
+    
+}
+
+/**
+ * This implements highlighting via ephemeral markers (not stored in the
+ * document). 
+ *
+ * XXX Another option would be to use formatting markers, which would have
+ *     the benefit of making it work for readonly notes. On the flip side,
+ *     the formatting would be stored with the note and it would need a 
+ *     way to remove that formatting when editing back the note.
+ */
+function highlightCodeBlock(codeBlock, writer) {
+    log("highlighting codeblock " + JSON.stringify(codeBlock.toJSON()));
+    const model = codeBlock.root.document.model;
+
+    // Can't invoke addMarker with an already existing marker name,
+    // clear all highlight markers first. Marker names follow the
+    // pattern hljs:cssClassName:uniqueId, eg hljs:hljs-comment:1
+    const codeBlockRange = model.createRangeIn(codeBlock);
+    for (const marker of model.markers.getMarkersIntersectingRange(codeBlockRange)) {
+        dbg("removing marker " + marker.name);
+        writer.removeMarker(marker.name);
+    }
+
+    // Don't highlight if plaintext (note this needs to remove the markers
+    // above first, in case this was a switch from non plaintext to
+    // plaintext)
+    const mimeType = codeBlock.getAttribute("language");
+    if (mimeType == "text-plain") {
+        // XXX There's actually a plaintext language that could be used
+        //     if you wanted the non-highlight formatting of
+        //     highlight.js css applied, see
+        //     https://github.com/highlightjs/highlight.js/issues/700
+        log("not highlighting plaintext codeblock");
+        return;
+    }
+
+    // Find the corresponding language for the given mimetype.
+    const highlightJsLanguage = mime_types.getHighlightJsNameForMime(mimeType);
+
+    if (mimeType !== mime_types.MIME_TYPE_AUTO && !highlightJsLanguage) {
+        console.warn(`Unsupported highlight.js for mime type ${mimeType}.`);
+        return;
+    }
+
+    // Don't highlight if the code is too big, as the typing performance will be highly degraded.
+    if (codeBlock.childCount >= HIGHLIGHT_MAX_BLOCK_COUNT) {
+        return;
+    }
+        
+    // highlight.js needs the full text without HTML tags, eg for the
+    // text
+    // #include <stdio.h>
+    // the highlighted html is
+    // <span class="hljs-meta">#<span class="hljs-keyword">include</span> <span class="hljs-string">&lt;stdio.h&gt;</span></span>
+    // But CKEditor codeblocks have <br> instead of \n
+
+    // Do a two pass algorithm:
+    // - First pass collect the codeblock children text, change <br> to
+    //   \n
+    // - invoke highlight.js on the collected text generating html
+    // - Second pass parse the highlighted html spans and match each
+    //   char to the CodeBlock text. Issue addMarker CKEditor calls for
+    //   each span
+
+    // XXX This is brittle and assumes how highlight.js generates html
+    //     (blanks, which characters escapes, etc), a better approach
+    //     would be to use highlight.js beta api TreeTokenizer?
+
+    // Collect all the text nodes to pass to the highlighter Text is
+    // direct children of the codeBlock
+    let text = "";
+    for (let i = 0; i < codeBlock.childCount; ++i) {
+        let child = codeBlock.getChild(i);
+
+        // We only expect text and br elements here
+        if (child.is("$text")) {
+            dbg("child text " + child.data);
+            text += child.data;
+
+        } else if (child.is("element") && 
+                    (child.name == "softBreak")) {
+            dbg("softBreak");
+            text += "\n";
+
+        } else {
+            warn("Unkown child " + JSON.stringify(child.toJSON()));
+        }
+    }
+
+    let highlightRes;
+    if (mimeType === mime_types.MIME_TYPE_AUTO) {
+        highlightRes = hljs.highlightAuto(text);
+    } else {
+        highlightRes = hljs.highlight(text, { language: highlightJsLanguage });
+    }
+    dbg("text\n" + text);
+    dbg("html\n" + highlightRes.value);
+
+    let iHtml = 0;
+    let html = highlightRes.value;
+    let spanStack = [];
+    let iChild = -1;
+    let childText = "";
+    let child = null;
+    let iChildText = 0;
+
+    while (iHtml < html.length) {
+        // Advance the text index and fetch a new child if necessary
+        if (iChildText >= childText.length) {
+            iChild++;
+            if (iChild < codeBlock.childCount) {
+                dbg("Fetching child " + iChild);
+                child = codeBlock.getChild(iChild);
+                if (child.is("$text")) {
+                    dbg("child text " + child.data);
+                    childText = child.data;
+                    iChildText = 0;
+                } else if (child.is("element", "softBreak")) {
+                    dbg("softBreak");
+                    iChildText = 0;
+                    childText = "\n";
+                } else {
+                    warn("child unknown!!!");
+                }
+            } else {
+                // Don't bail if beyond the last children, since there's
+                // still html text, it must be a closing span tag that
+                // needs to be dealt with below
+                childText = "";
+            }
+        } 
+
+        // This parsing is made slightly simpler and faster by only
+        // expecting <span> and </span> tags in the highlighted html
+        if ((html[iHtml] == "<") && (html[iHtml+1] != "/")) {
+            // new span, note they can be nested eg C preprocessor lines
+            // are inside a hljs-meta span, hljs-title function names
+            // inside a hljs-function span, etc
+            let iStartQuot = html.indexOf("\"", iHtml+1);
+            let iEndQuot = html.indexOf("\"", iStartQuot+1);
+            let className = html.slice(iStartQuot+1, iEndQuot);
+            // XXX highlight js uses scope for Python "title function_",
+            //     etc for now just use the first style only 
+            // See https://highlightjs.readthedocs.io/en/latest/css-classes-reference.html#a-note-on-scopes-with-sub-scopes
+            let iBlank = className.indexOf(" "); 
+            if (iBlank > 0) {
+                className = className.slice(0, iBlank);
+            }
+            dbg("Found span start " + className);
+
+            iHtml = html.indexOf(">", iHtml) + 1;
+
+            // push the span 
+            let posStart = writer.createPositionAt(codeBlock, child.startOffset + iChildText);
+            spanStack.push({ "className" : className, "posStart": posStart});
+
+        } else if ((html[iHtml] == "<") && (html[iHtml+1] == "/")) {
+            // Done with this span, pop the span and mark the range
+            iHtml = html.indexOf(">", iHtml+1) + 1;
+
+            let stackTop = spanStack.pop();
+            let posStart = stackTop.posStart;
+            let className = stackTop.className;
+            let posEnd = writer.createPositionAt(codeBlock, child.startOffset + iChildText);
+            let range = writer.createRange(posStart, posEnd);
+            let markerName = "hljs:" + className + ":" + markerCounter;
+            // Use an incrementing number for the uniqueId, random of
+            // 10000000 is known to cause collisions with a few
+            // codeblocks of 10s of lines on real notes (each line is
+            // one or more marker).
+            // Wrap-around for good measure so all numbers are positive
+            // XXX Another option is to catch the exception and retry or
+            //     go through the markers and get the largest + 1
+            markerCounter = (markerCounter + 1) & 0xFFFFFF;
+            dbg("Found span end " + className);
+            dbg("Adding marker " + markerName + ": " + JSON.stringify(range.toJSON()));
+            writer.addMarker(markerName, {"range": range, "usingOperation": false});
+
+        } else {
+            // Text, we should also have text in the children
+            assert(
+                ((iChild < codeBlock.childCount) && (iChildText < childText.length)), 
+                "Found text in html with no corresponding child text!!!!"
+            );
+            if (html[iHtml] == "&") {
+                // highlight.js only encodes
+                // .replace(/&/g, '&amp;')
+                // .replace(/</g, '&lt;')
+                // .replace(/>/g, '&gt;')
+                // .replace(/"/g, '&quot;')
+                // .replace(/'/g, '&#x27;');
+                // see https://github.com/highlightjs/highlight.js/blob/7addd66c19036eccd7c602af61f1ed84d215c77d/src/lib/utils.js#L5
+                let iAmpEnd = html.indexOf(";", iHtml);
+                dbg(html.slice(iHtml, iAmpEnd));
+                iHtml = iAmpEnd + 1;
+            } else {
+                // regular text
+                dbg(html[iHtml]);
+                iHtml++;
+            }
+            iChildText++;
+        }
+    }
+}
--- a/src/public/app/widgets/type_widgets/content_widget.js
+++ b/src/public/app/widgets/type_widgets/content_widget.js
@@ -34,6 +34,7 @@ import BackendLogWidget from "./content/backend_log.js";
 import AttachmentErasureTimeoutOptions from "./options/other/attachment_erasure_timeout.js";
 import RibbonOptions from "./options/appearance/ribbon.js";
 import LocalizationOptions from "./options/appearance/i18n.js";
+import CodeBlockOptions from "./options/appearance/code_block.js";

 const TPL = `<div class="note-detail-content-widget note-detail-printable">
    <style>
@@ -59,6 +60,7 @@ const CONTENT_WIDGETS = {
        LocalizationOptions,
        ThemeOptions,
        FontsOptions,
+        CodeBlockOptions,
        ZoomFactorOptions,
        NativeTitleBarOptions,
        MaxContentWidthOptions,
--- a/src/public/app/widgets/type_widgets/editable_text.js
+++ b/src/public/app/widgets/type_widgets/editable_text.js
@@ -10,6 +10,9 @@ import AbstractTextTypeWidget from "./abstract_text_type_widget.js";
 import link from "../../services/link.js";
 import appContext from "../../components/app_context.js";
 import dialogService from "../../services/dialog.js";
+import { initSyntaxHighlighting } from "./ckeditor/syntax_highlight.js";
+import options from "../../services/options.js";
+import { isSyntaxHighlightEnabled } from "../../services/syntax_highlight.js";

 const ENABLE_INSPECTOR = false;

@@ -87,6 +90,23 @@ const TPL = `
 </div>
 `;

+function buildListOfLanguages() {
+    const userLanguages = (mimeTypesService.getMimeTypes())
+        .filter(mt => mt.enabled)
+        .map(mt => ({
+                language: mimeTypesService.normalizeMimeTypeForCKEditor(mt.mime),
+                label: mt.title
+            }));
+
+    return [
+        {
+            language: mimeTypesService.MIME_TYPE_AUTO,
+            label: t("editable-text.auto-detect-language")
+        },
+        ...userLanguages
+    ];
+}
+
 export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
    static getType() { return "editableText"; }

@@ -106,13 +126,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
    async initEditor() {
        await libraryLoader.requireLibrary(libraryLoader.CKEDITOR);

-        const codeBlockLanguages =
-            (await mimeTypesService.getMimeTypes())
-                .filter(mt => mt.enabled)
-                .map(mt => ({
-                        language: mt.mime.toLowerCase().replace(/[\W_]+/g,"-"),
-                        label: mt.title
-                    }));
+        const codeBlockLanguages = buildListOfLanguages();

        // CKEditor since version 12 needs the element to be visible before initialization. At the same time,
        // we want to avoid flicker - i.e., show editor only once everything is ready. That's why we have separate
@@ -157,6 +171,8 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
        this.watchdog.setCreator(async (elementOrData, editorConfig) => {
            const editor = await BalloonEditor.create(elementOrData, editorConfig);

+            await initSyntaxHighlighting(editor);
+
            editor.model.document.on('change:data', () => this.spacedUpdate.scheduleUpdate());

            if (glob.isDev && ENABLE_INSPECTOR) {
--- a/src/public/app/widgets/type_widgets/empty.js
+++ b/src/public/app/widgets/type_widgets/empty.js
@@ -18,14 +18,28 @@ const TPL = `
            width: 130px;
            text-align: center;
            margin: 10px;
-            padding; 10px;
            border: 1px transparent solid;
        }
-        
+
        .workspace-notes .workspace-note:hover {
            cursor: pointer;
            border: 1px solid var(--main-border-color);
        }
+
+        .note-detail-empty-results .aa-dropdown-menu {
+            max-height: 50vh;
+            overflow: scroll;
+            border: var(--bs-border-width) solid var(--bs-border-color);
+            border-top: 0;
+        }
+
+        .empty-tab-search .note-autocomplete-input {
+            border-bottom-left-radius: 0;
+        }
+
+        .empty-tab-search .input-clearer-button {
+            border-bottom-right-radius: 0;
+        }
        
        .workspace-icon {
            text-align: center;
@@ -33,14 +47,14 @@ const TPL = `
        }
    </style>

-    <div class="form-group">
+    <div class="workspace-notes"></div>
+    <div class="form-group empty-tab-search">
        <label>${t('empty.open_note_instruction')}</label>
-        <div class="input-group">
+        <div class="input-group mt-1">
            <input class="form-control note-autocomplete" placeholder="${t('empty.search_placeholder')}">
        </div>
    </div>
-    
-    <div class="workspace-notes"></div>
+    <div class="note-detail-empty-results"></div>
 </div>`;

 export default class EmptyTypeWidget extends TypeWidget {
@@ -51,10 +65,12 @@ export default class EmptyTypeWidget extends TypeWidget {

        this.$widget = $(TPL);
        this.$autoComplete = this.$widget.find(".note-autocomplete");
+        this.$results = this.$widget.find(".note-detail-empty-results");

        noteAutocompleteService.initNoteAutocomplete(this.$autoComplete, {
            hideGoToSelectedNoteButton: true,
-            allowCreatingNotes: true
+            allowCreatingNotes: true,
+            container: this.$results
        })
            .on('autocomplete:noteselected', function(event, suggestion, dataset) {
                if (!suggestion.notePath) {
@@ -66,6 +82,7 @@ export default class EmptyTypeWidget extends TypeWidget {

        this.$workspaceNotes = this.$widget.find('.workspace-notes');

+        noteAutocompleteService.showRecentNotes(this.$autoComplete);
        super.doRender();
    }

--- a/src/public/app/widgets/type_widgets/options/appearance/code_block.js
+++ b/src/public/app/widgets/type_widgets/options/appearance/code_block.js
@@ -0,0 +1,119 @@
+import { t } from "../../../../services/i18n.js";
+import library_loader from "../../../../services/library_loader.js";
+import server from "../../../../services/server.js";
+import OptionsWidget from "../options_widget.js";
+
+const SAMPLE_LANGUAGE = "javascript";
+const SAMPLE_CODE = `\
+const n = 10;
+greet(n); // Print "Hello World" for n times
+
+/**
+ * Displays a "Hello World!" message for a given amount of times, on the standard console. The "Hello World!" text will be displayed once per line.
+ * 
+ * @param {number} times    The number of times to print the \`Hello World!\` message.
+ */
+function greet(times) {
+  for (let i = 0; i++; i < times) {
+    console.log("Hello World!");
+  }
+}
+`
+
+const TPL = `
+<div class="options-section">
+    <h4>${t("highlighting.title")}</h4>
+
+    <p>${t("highlighting.description")}</p>
+
+    <div class="form-group row">
+        <div class="col-6">
+            <label>${t("highlighting.color-scheme")}</label>
+            <select class="theme-select form-select"></select>
+        </div>
+
+        <div class="col-6 side-checkbox">
+            <label class="form-check">
+                <input type="checkbox" class="word-wrap form-check-input" />
+                ${t("code_block.word_wrapping")}
+            </label>
+        </div>
+    </div>
+
+    <div class="form-group row">
+        <div class="note-detail-readonly-text-content ck-content code-sample-wrapper">
+            <pre class="hljs"><code class="code-sample">${SAMPLE_CODE}</code></pre>
+        </div>
+    </div>
+
+    <style>
+        .code-sample-wrapper {
+            margin-top: 1em;
+        }
+    </style>
+</div>
+`;
+
+/**
+ * Contains appearance settings for code blocks within text notes, such as the theme for the syntax highlighter.
+ */
+export default class CodeBlockOptions extends OptionsWidget {
+    doRender() {        
+        this.$widget = $(TPL);        
+        this.$themeSelect = this.$widget.find(".theme-select");
+        this.$themeSelect.on("change", async () => {
+            const newTheme = this.$themeSelect.val();
+            library_loader.loadHighlightingTheme(newTheme);
+            await server.put(`options/codeBlockTheme/${newTheme}`);
+        });
+        
+        this.$wordWrap = this.$widget.find("input.word-wrap");
+        this.$wordWrap.on("change", () => this.updateCheckboxOption("codeBlockWordWrap", this.$wordWrap));
+
+        // Set up preview
+        this.$sampleEl = this.$widget.find(".code-sample");        
+    }
+
+    #setupPreview(shouldEnableSyntaxHighlight) {
+        const text = SAMPLE_CODE;
+        if (shouldEnableSyntaxHighlight) {
+            library_loader
+                .requireLibrary(library_loader.HIGHLIGHT_JS)
+                .then(() => {
+                    const highlightedText = hljs.highlight(text, {
+                        language: SAMPLE_LANGUAGE
+                    });
+                    this.$sampleEl.html(highlightedText.value);
+                });
+        } else {
+            this.$sampleEl.text(text);
+        }
+    }
+
+    async optionsLoaded(options) {
+        const themeGroups = await server.get("options/codeblock-themes");
+        this.$themeSelect.empty();
+
+        for (const [ key, themes ] of Object.entries(themeGroups)) {
+            const $group = (key ? $("<optgroup>").attr("label", key) : null);
+
+            for (const theme of themes) {
+                const option = $("<option>")
+                    .attr("value", theme.val)
+                    .text(theme.title);
+
+                if ($group) {
+                    $group.append(option);
+                } else {
+                    this.$themeSelect.append(option);
+                }
+            }
+            this.$themeSelect.append($group);
+        }
+        this.$themeSelect.val(options.codeBlockTheme);
+        this.setCheckboxState(this.$wordWrap, options.codeBlockWordWrap);
+        this.$widget.closest(".note-detail-printable").toggleClass("word-wrap", options.codeBlockWordWrap === "true");
+
+        this.#setupPreview(options.codeBlockTheme !== "none");
+    }
+}
--- a/src/public/app/widgets/type_widgets/options/appearance/fonts.js
+++ b/src/public/app/widgets/type_widgets/options/appearance/fonts.js
@@ -133,14 +133,17 @@ export default class FontsOptions extends OptionsWidget {
        this.$widget.find(".reload-frontend-button").on("click", () => utils.reloadFrontendApp("changes from appearance options"));
    }

+    isEnabled() {
+        return this._isEnabled;
+    }
+
    async optionsLoaded(options) {
-        if (options.overrideThemeFonts !== 'true') {
-            this.toggleInt(false);
+        this._isEnabled = (options.overrideThemeFonts === 'true');
+        this.toggleInt(this._isEnabled);
+        if (!this._isEnabled) {
            return;
        }

-        this.toggleInt(true);
-
        this.$mainFontSize.val(options.mainFontSize);
        this.fillFontFamilyOptions(this.$mainFontFamily, options.mainFontFamily);

--- a/src/public/app/widgets/type_widgets/options/appearance/theme.js
+++ b/src/public/app/widgets/type_widgets/options/appearance/theme.js
@@ -13,11 +13,11 @@ const TPL = `
            <select class="theme-select form-select"></select>
        </div>
        
-        <div class="col-6">
-            <label>${t("theme.override_theme_fonts_label")}</label>
-            <div class="form-check">
+        <div class="col-6 side-checkbox">
+            <label class="form-check">
                <input type="checkbox" class="override-theme-fonts form-check-input">
-            </div>
+                ${t("theme.override_theme_fonts_label")}
+            </label>
        </div>
    </div>
 </div>`;
--- a/src/public/app/widgets/type_widgets/options/code_notes/code_mime_types.js
+++ b/src/public/app/widgets/type_widgets/options/code_notes/code_mime_types.js
@@ -20,7 +20,7 @@ export default class CodeMimeTypesOptions extends OptionsWidget {
    async optionsLoaded(options) {
        this.$mimeTypes.empty();

-        for (const mimeType of await mimeTypesService.getMimeTypes()) {
+        for (const mimeType of mimeTypesService.getMimeTypes()) {
            const id = "code-mime-type-" + (idCtr++);

            this.$mimeTypes.append($("<li>")
--- a/src/public/app/widgets/type_widgets/options/options_widget.js
+++ b/src/public/app/widgets/type_widgets/options/options_widget.js
@@ -44,6 +44,20 @@ export default class OptionsWidget extends NoteContextAwareWidget {

    optionsLoaded(options) {}

+    async refresh() {
+        this.toggleInt(this.isEnabled());
+        try {
+            await this.refreshWithNote(this.note);
+        } catch (e) {
+            // Ignore errors when user is refreshing or navigating away.
+            if (e === "rejected by browser") {
+                return;
+            }
+
+            throw e;
+        }
+    }
+
    async refreshWithNote(note) {
        const options = await server.get('options');

--- a/src/public/app/widgets/type_widgets/read_only_text.js
+++ b/src/public/app/widgets/type_widgets/read_only_text.js
@@ -1,5 +1,6 @@
 import AbstractTextTypeWidget from "./abstract_text_type_widget.js";
 import libraryLoader from "../../services/library_loader.js";
+import { applySyntaxHighlight } from "../../services/syntax_highlight.js";

 const TPL = `
 <div class="note-detail-readonly-text note-detail-printable">
@@ -89,7 +90,7 @@ export default class ReadOnlyTextTypeWidget extends AbstractTextTypeWidget {
        // we load CKEditor also for read only notes because they contain content styles required for correct rendering of even read only notes
        // we could load just ckeditor-content.css but that causes CSS conflicts when both build CSS and this content CSS is loaded at the same time
        // (see https://github.com/zadam/trilium/issues/1590 for example of such conflict)
-        await libraryLoader.requireLibrary(libraryLoader.CKEDITOR);
+        await libraryLoader.requireLibrary(libraryLoader.CKEDITOR);        

        const blob = await note.getBlob();

@@ -110,6 +111,8 @@ export default class ReadOnlyTextTypeWidget extends AbstractTextTypeWidget {

            renderMathInElement(this.$content[0], {trust: true});
        }
+
+        await applySyntaxHighlight(this.$content);
    }

    async refreshIncludedNoteEvent({noteId}) {
--- a/src/public/stylesheets/print.css
+++ b/src/public/stylesheets/print.css
@@ -20,4 +20,10 @@
        vertical-align: middle;
    }

+    pre {
+        box-shadow: unset !important;
+        border: .75pt solid gray !important;
+        border-radius: 2pt !important;
+    }
+
 }
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -382,7 +382,7 @@ button.btn, button.btn-sm {
    padding: 0;
 }

-pre:not(.CodeMirror-line) {
+pre:not(.CodeMirror-line):not(.hljs) {
    color: var(--main-text-color) !important;
    white-space: pre-wrap;
    font-size: 100%;
@@ -807,6 +807,65 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href
    vertical-align: baseline !important;
 }

+.ck-content pre {
+    border: 0;
+    border-radius: 6px;
+    box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.1), 0px 0px 2px rgba(0, 0, 0, 0.2);
+    padding: 0 !important;
+    margin-top: 2px !important;
+    overflow: unset;
+}
+
+html .note-detail-editable-text :not(figure, .include-note):first-child {
+    /* Create some space for the top-side shadow */
+    margin-top: 1px !important;
+}
+
+.ck.ck-editor__editable pre[data-language]::after {
+    --ck-color-code-block-label-background: rgba(128, 128, 128, .5);
+    border-radius: 0 0 5px 5px;
+    padding: 0px 10px;
+    letter-spacing: .5px;
+    font-weight: bold;
+}
+
+.ck-content pre code {
+    display: block;
+    padding: 1em;
+    overflow: auto;
+}
+
+.ck-content pre code::-webkit-scrollbar {
+    height: 6px;
+}
+
+.ck-content pre code::-webkit-scrollbar-thumb {
+    height: 4px;
+    border: none !important;
+    background: gray !important;
+}
+
+.ck-content pre code::-webkit-scrollbar-track, ::-webkit-scrollbar-thumb {
+    cursor: default;
+}
+
+.note-detail-printable:not(.word-wrap) pre code {
+    white-space: pre;
+    margin-right: 1em;
+}
+
+.code-sample-wrapper .hljs {
+    transition: background-color linear 100ms;
+}
+
+.side-checkbox {
+    display: flex;
+    align-items: end;
+    padding-top: .375rem;
+    padding-bottom: .375rem;
+    line-height: 1.5;
+}
+
 .ck-content .todo-list .todo-list__label > input:before {
    border: 1px solid var(--muted-text-color) !important;
 }
@@ -1173,4 +1232,4 @@ textarea {

 .jump-to-note-results .aa-suggestions {
    padding: 1rem;
-}
+}
--- a/src/public/stylesheets/theme-dark.css
+++ b/src/public/stylesheets/theme-dark.css
@@ -92,3 +92,7 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
 .btn-close {
    filter: invert(1);
 }
+
+.ck-content pre {
+    box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.6) !important;
+}
--- a/src/public/translations/cn/translation.json
+++ b/src/public/translations/cn/translation.json
@@ -72,13 +72,12 @@
    "delete_all_clones_description": "同时删除所有克隆（可以在最近修改中撤消）",
    "erase_notes_description": "通常（软）删除仅标记笔记为已删除，可以在一段时间内通过最近修改对话框撤消。选中此选项将立即擦除笔记，不可撤销。",
    "erase_notes_warning": "永久擦除笔记（无法撤销），包括所有克隆。这将强制应用程序重新加载。",
-    "notes_to_be_deleted": "将删除以下笔记（<span class=\"deleted-notes-count\"></span>）",
+    "notes_to_be_deleted": "将删除以下笔记 ({{- noteCount}})",
    "no_note_to_delete": "没有笔记将被删除（仅克隆）。",
-    "broken_relations_to_be_deleted": "将删除以下关系并断开连接（<span class=\"broke-relations-count\"></span>）",
+    "broken_relations_to_be_deleted": "将删除以下关系并断开连接 ({{- relationCount}})",
    "cancel": "取消",
    "ok": "确定",
-    "note": "笔记",
-    "to_be_deleted": " (将被删除的笔记) 被以下关系 <code>{{attrName}}</code> 引用, 来自 "
+    "deleted_relation_text": "笔记 {{- note}} (将被删除的笔记) 被以下关系 {{- relation}} 引用, 来自 {{- source}}。"
  },
  "export": {
    "export_note_title": "导出笔记",
--- a/src/public/translations/en/translation.json
+++ b/src/public/translations/en/translation.json
@@ -75,16 +75,15 @@
  },
  "delete_notes": {
    "delete_notes_preview": "Delete notes preview",
-    "delete_all_clones_description": "delete also all clones (can be undone in recent changes)",
+    "delete_all_clones_description": "Delete also all clones (can be undone in recent changes)",
    "erase_notes_description": "Normal (soft) deletion only marks the notes as deleted and they can be undeleted (in recent changes dialog) within a period of time. Checking this option will erase the notes immediately and it won't be possible to undelete the notes.",
-    "erase_notes_warning": "erase notes permanently (can't be undone), including all clones. This will force application reload.",
-    "notes_to_be_deleted": "Following notes will be deleted (<span class=\"deleted-notes-count\"></span>)",
+    "erase_notes_warning": "Erase notes permanently (can't be undone), including all clones. This will force application reload.",
+    "notes_to_be_deleted": "Following notes will be deleted ({{- noteCount}})",
    "no_note_to_delete": "No note will be deleted (only clones).",
-    "broken_relations_to_be_deleted": "Following relations will be broken and deleted (<span class=\"broke-relations-count\"></span>)",
+    "broken_relations_to_be_deleted": "Following relations will be broken and deleted ({{- relationCount}})",
    "cancel": "Cancel",
    "ok": "OK",
-    "note": "Note",
-    "to_be_deleted": " (to be deleted) is referenced by relation <code>{{attrName}}</code> originating from "
+    "deleted_relation_text": "Note {{- note}} (to be deleted) is referenced by relation {{- relation}} originating from {{- source}}."
  },
  "export": {
    "export_note_title": "Export note",
@@ -1054,7 +1053,7 @@
    "edited_notes_message": "Edited Notes ribbon tab will automatically open on day notes"
  },
  "theme": {
-    "title": "Theme",
+    "title": "Application Theme",
    "theme_label": "Theme",
    "override_theme_fonts_label": "Override theme fonts",
    "light_theme": "Light",
@@ -1434,6 +1433,7 @@
    "add_new_tab": "Add new tab",
    "close": "Close",
    "close_other_tabs": "Close other tabs",
+    "close_right_tabs": "Close tabs to the right",
    "close_all_tabs": "Close all tabs",
    "move_tab_to_new_window": "Move this tab to a new window",
    "new_tab": "New tab"
@@ -1497,5 +1497,16 @@
    "move-to-visible-launchers": "Move to visible launchers",
    "move-to-available-launchers": "Move to available launchers",
    "duplicate-launcher": "Duplicate launcher"
+  },
+  "editable-text": {
+    "auto-detect-language": "Auto-detected"
+  },
+  "highlighting": {
+    "title": "Code Syntax Highlighting for Text Notes",
+    "description": "Controls the syntax highlighting for code blocks inside text notes, code notes will not be affected.",
+    "color-scheme": "Color Scheme"
+  },
+  "code_block": {
+    "word_wrapping": "Word wrapping"
  }
 }
--- a/src/public/translations/es/translation.json
+++ b/src/public/translations/es/translation.json
@@ -75,16 +75,15 @@
  },
  "delete_notes": {
    "delete_notes_preview": "Eliminar vista previa de notas",
-    "delete_all_clones_description": "eliminar también todos los clones (se puede deshacer en cambios recientes)",
+    "delete_all_clones_description": "Eliminar también todos los clones (se puede deshacer en cambios recientes)",
    "erase_notes_description": "La eliminación normal (suave) solo marca las notas como eliminadas y se pueden recuperar (en el cuadro de diálogo de cambios recientes) dentro de un periodo de tiempo. Al marcar esta opción se borrarán las notas inmediatamente y no será posible recuperarlas.",
-    "erase_notes_warning": "eliminar notas permanentemente (no se puede deshacer), incluidos todos los clones. Esto forzará la recarga de la aplicación.",
-    "notes_to_be_deleted": "Las siguientes notas serán eliminadas (<span class=\"deleted-notes-count\"></span>)",
+    "erase_notes_warning": "Eliminar notas permanentemente (no se puede deshacer), incluidos todos los clones. Esto forzará la recarga de la aplicación.",
+    "notes_to_be_deleted": "Las siguientes notas serán eliminadas ({{- noteCount}})",
    "no_note_to_delete": "No se eliminará ninguna nota (solo clones).",
-    "broken_relations_to_be_deleted": "Las siguientes relaciones se romperán y serán eliminadas (<span class=\"broke-relations-count\"></span>)",
+    "broken_relations_to_be_deleted": "Las siguientes relaciones se romperán y serán eliminadas ({{- relationCount}})",
    "cancel": "Cancelar",
    "ok": "Aceptar",
-    "note": "Nota",
-    "to_be_deleted": " (para ser eliminada) está referenciado por la relación <code>{{attrName}}</code> que se origina en "
+    "deleted_relation_text": "Nota {{- note}} (para ser eliminada) está referenciado por la relación {{- relation}} que se origina en {{- source}}."
  },
  "export": {
    "export_note_title": "Exportar nota",
@@ -896,7 +895,8 @@
    "label_rock_or_pop": "sólo una de las etiquetas debe estar presente",
    "label_year_comparison": "comparación numérica (también >, >=, <).",
    "label_date_created": "notas creadas en el último mes",
-    "error": "Error de búsqueda: {{error}}"
+    "error": "Error de búsqueda: {{error}}",
+    "search_prefix": "Buscar:"
  },
  "attachment_detail": {
    "open_help_page": "Abrir página de ayuda en archivos adjuntos",
@@ -1433,6 +1433,7 @@
    "add_new_tab": "Agregar nueva pestaña",
    "close": "Cerrar",
    "close_other_tabs": "Cerrar otras pestañas",
+    "close_right_tabs": "Cerrar pestañas a la derecha",
    "close_all_tabs": "Cerras todas las pestañas",
    "move_tab_to_new_window": "Mover esta pestaña a una nueva ventana",
    "new_tab": "Nueva pestaña"
@@ -1496,5 +1497,16 @@
    "move-to-visible-launchers": "Mover a lanzadores visibles",
    "move-to-available-launchers": "Mover a lanzadores disponibles",
    "duplicate-launcher": "Duplicar lanzador"
+  },
+  "editable-text": {
+    "auto-detect-language": "Detectado automaticamente"
+  },
+  "highlighting": {
+    "title": "Resaltado de sintaxis de de código para Notas de Texto",
+    "description": "Controla el resaltado de sintaxis para bloques de código dentro de las notas de texto, las notas de código no serán afectadas.",
+    "color-scheme": "Esquema de color"
+  },
+  "code_block": {
+    "word_wrapping": "Ajuste de palabras"
  }
 }
--- a/src/public/translations/fr/translation.json
+++ b/src/public/translations/fr/translation.json
@@ -77,14 +77,13 @@
    "delete_notes_preview": "Supprimer la note",
    "delete_all_clones_description": "supprime également tous les clones (peut être annulé depuis les Modifications récentes)",
    "erase_notes_description": "La suppression normale (douce) marque uniquement les notes comme supprimées et elles peuvent être restaurées (dans la boîte de dialogue des Modifications récentes) dans un délai donné. Cocher cette option effacera les notes immédiatement et il ne sera pas possible de les restaurer.",
-    "erase_notes_warning": "efface les notes de manière permanente (ne peut pas être annulée), y compris tous les clones. Cela forcera le rechargement de l’application.",
-    "notes_to_be_deleted": "Les notes suivantes seront supprimées (<span class=\"deleted-notes-count\"></span>)",
+    "erase_notes_warning": "Efface les notes de manière permanente (ne peut pas être annulée), y compris tous les clones. Cela forcera le rechargement de l’application.",
+    "notes_to_be_deleted": "Les notes suivantes seront supprimées ({{- noteCount}})",
    "no_note_to_delete": "Aucune note ne sera supprimée (uniquement les clones).",
-    "broken_relations_to_be_deleted": "Les relations suivantes seront rompues et supprimées (<span class=\"broke-relations-count\"></span>)",
+    "broken_relations_to_be_deleted": "Les relations suivantes seront rompues et supprimées ({{- relationCount}})",
    "cancel": "Annuler",
    "ok": "OK",
-    "note": "Note",
-    "to_be_deleted": " (à supprimer) est référencé par la relation <code>{{attrName}}</code> provenant de "
+    "deleted_relation_text": "Note {{- note}} (à supprimer) est référencé par la relation {{- relation}} provenant de {{- source}}."
  },
  "export": {
    "export_note_title": "Exporter la note",
--- a/src/public/translations/ro/translation.json
+++ b/src/public/translations/ro/translation.json
@@ -414,17 +414,16 @@
    "undelete_notes_instruction": "După ștergere, se pot recupera din ecranul Schimbări recente."
  },
  "delete_notes": {
-    "broken_relations_to_be_deleted": "Următoarele relații vor fi întrerupte și șterse (<span class=\"broke-relations-count\"></span>)",
+    "broken_relations_to_be_deleted": "Următoarele relații vor fi întrerupte și șterse ({{- relationCount}})",
    "cancel": "Anulează",
    "delete_all_clones_description": "Șterge și toate clonele (se pot recupera în ecranul Schimbări recente)",
-    "delete_notes_preview": "Șterge previzualizările notițelor",
+    "delete_notes_preview": "Previzualizare ștergerea notițelor",
    "erase_notes_description": "Ștergerea obișnuită doar marchează notițele ca fiind șterse și pot fi recuperate (în ecranul Schimbări recente) pentru o perioadă de timp. Dacă se bifează această opțiune, notițele vor fi șterse imediat fără posibilitatea de a le recupera.",
-    "erase_notes_warning": "șterge notițele permanent (nu se mai pot recupera), incluzând toate clonele. Va forța reîncărcarea aplicației.",
+    "erase_notes_warning": "Șterge notițele permanent (nu se mai pot recupera), incluzând toate clonele. Va forța reîncărcarea aplicației.",
    "no_note_to_delete": "Nicio notiță nu va fi ștearsă (doar clonele).",
-    "note": "Notiță",
-    "notes_to_be_deleted": "Următoarele notițe vor fi șterse (<span class=\"deleted-notes-count\"></span>)",
+    "notes_to_be_deleted": "Următoarele notițe vor fi șterse ({{- noteCount}})",
    "ok": "OK",
-    "to_be_deleted": " (pentru ștergere) este referențiat(ă) de relația <code>{{attrName}}</code> originând de la "
+    "deleted_relation_text": "Notița {{- note}} ce va fi ștearsă este referențiată de relația {{- relation}}, originând din {{- source}}."
  },
  "delete_relation": {
    "allowed_characters": "Se permit caractere alfanumerice, underline și două puncte.",
@@ -554,7 +553,7 @@
    "open_sql_console": "Deschide consola SQL",
    "open_sql_console_history": "Deschide istoricul consolei SQL",
    "options": "Opțiuni",
-    "reload_frontend": "Reîncarcă interfață",
+    "reload_frontend": "Reîncarcă interfața",
    "reload_hint": "Reîncărcarea poate ajuta atunci când există ceva probleme vizuale fără a trebui repornită întreaga aplicație.",
    "reset_zoom_level": "Resetează nivelul de zoom",
    "show_backend_log": "Afișează log-ul din backend",
@@ -1182,7 +1181,7 @@
    "light_theme": "Temă luminoasă",
    "override_theme_fonts_label": "Suprascrie fonturile temei",
    "theme_label": "Temă",
-    "title": "Temă"
+    "title": "Tema aplicației"
  },
  "toast": {
    "critical-error": {
@@ -1439,7 +1438,8 @@
    "close_other_tabs": "Închide celelalte taburi",
    "close_tab": "Închide tab",
    "move_tab_to_new_window": "Mută acest tab în altă fereastră",
-    "new_tab": "Tab nou"
+    "new_tab": "Tab nou",
+    "close_right_tabs": "Închide taburile din dreapta"
  },
  "toc": {
    "options": "Setări",
@@ -1497,5 +1497,16 @@
    "move-to-available-launchers": "Mută în Lansatoare disponibile",
    "move-to-visible-launchers": "Mută în Lansatoare vizibile",
    "reset": "Resetează"
+  },
+  "editable-text": {
+    "auto-detect-language": "Automat"
+  },
+  "highlighting": {
+    "color-scheme": "Temă de culori",
+    "title": "Evidențiere de sintaxă pentru notițele de tip text",
+    "description": "Controlează evidențierea de sintaxă pentru blocurile de cod în interiorul notițelor text, notițele de tip cod nu vor fi afectate de aceste setări."
+  },
+  "code_block": {
+    "word_wrapping": "Încadrare text"
  }
 }
--- a/src/routes/api/options.ts
+++ b/src/routes/api/options.ts
@@ -6,6 +6,7 @@ import searchService from "../../services/search/services/search.js";
 import ValidationError from "../../errors/validation_error.js";
 import { Request } from 'express';
 import { changeLanguage } from "../../services/i18n.js";
+import { listSyntaxHighlightingThemes } from "../../services/code_block_theme.js";

 // options allowed to be updated directly in the Options dialog
 const ALLOWED_OPTIONS = new Set([
@@ -15,6 +16,8 @@ const ALLOWED_OPTIONS = new Set([
    'revisionSnapshotNumberLimit',
    'zoomFactor',
    'theme',
+    'codeBlockTheme',
+    "codeBlockWordWrap",
    'syncServerHost',
    'syncServerTimeout',
    'syncProxy',
@@ -138,6 +141,10 @@ function getUserThemes() {
    return ret;
 }

+function getSyntaxHighlightingThemes() {
+    return listSyntaxHighlightingThemes();
+}
+
 function getSupportedLocales() {
    // TODO: Currently hardcoded, needs to read the list of available languages.
    return [
@@ -176,5 +183,6 @@ export default {
    updateOption,
    updateOptions,
    getUserThemes,
+    getSyntaxHighlightingThemes,
    getSupportedLocales
 };
--- a/src/routes/api/sync.ts
+++ b/src/routes/api/sync.ts
@@ -12,14 +12,15 @@ import syncOptions from "../../services/sync_options.js";
 import utils from "../../services/utils.js";
 import ws from "../../services/ws.js";
 import { Request } from 'express';
-import { EntityChange, EntityChangeRecord } from '../../services/entity_changes_interface.js';
+import { EntityChange } from '../../services/entity_changes_interface.js';
 import ValidationError from "../../errors/validation_error.js";
 import consistencyChecksService from "../../services/consistency_checks.js";
+import { t } from "i18next";

 async function testSync() {
    try {
        if (!syncOptions.isSyncSetup()) {
-            return { success: false, message: "Sync server host is not configured. Please configure sync first." };
+            return { success: false, message: t("test_sync.not-configured") };
        }

        await syncService.login();
@@ -28,7 +29,7 @@ async function testSync() {
        // this is important in case when sync server has been just initialized
        syncService.sync();

-        return { success: true, message: "Sync server handshake has been successful, sync has been started." };
+        return { success: true, message: t("test_sync.successful") };
    }
    catch (e: any) {
        return {
--- a/src/routes/assets.ts
+++ b/src/routes/assets.ts
@@ -102,6 +102,7 @@ function register(app: express.Application) {
    app.use(`/${assetPath}/node_modules/codemirror/keymap/`, persistentCacheStatic(path.join(srcRoot, '..', 'node_modules/codemirror/keymap/')));

    app.use(`/${assetPath}/node_modules/mind-elixir/dist/`, persistentCacheStatic(path.join(srcRoot, "..", "node_modules/mind-elixir/dist/")));
+    app.use(`/${assetPath}/node_modules/@highlightjs/cdn-assets/`, persistentCacheStatic(path.join(srcRoot, "..", "node_modules/@highlightjs/cdn-assets/")));
 }

 export default {
--- a/src/routes/routes.ts
+++ b/src/routes/routes.ts
@@ -218,6 +218,7 @@ function register(app: express.Application) {
    apiRoute(PUT, '/api/options/:name/:value*', optionsApiRoute.updateOption);
    apiRoute(PUT, '/api/options', optionsApiRoute.updateOptions);
    apiRoute(GET, '/api/options/user-themes', optionsApiRoute.getUserThemes);
+    apiRoute(GET, '/api/options/codeblock-themes', optionsApiRoute.getSyntaxHighlightingThemes);
    apiRoute(GET, '/api/options/locales', optionsApiRoute.getSupportedLocales);

    apiRoute(PST, '/api/password/change', passwordApiRoute.changePassword);
--- a/src/services/code_block_theme.ts
+++ b/src/services/code_block_theme.ts
@@ -0,0 +1,98 @@
+/**
+ * @module
+ * 
+ * Manages the server-side functionality of the code blocks feature, mostly for obtaining the available themes for syntax highlighting.
+ */
+
+import fs from "fs";
+import themeNames from "./code_block_theme_names.json" with { type: "json" }
+import { t } from "i18next";
+import { join } from "path";
+import { getResourceDir } from "./utils.js";
+import env from "./env.js";
+
+/**
+ * Represents a color scheme for the code block syntax highlight.
+ */
+interface ColorTheme {
+    /** The ID of the color scheme which should be stored in the options. */
+    val: string;
+    /** A user-friendly name of the theme. The name is already localized. */
+    title: string;
+}
+
+/**
+ * Returns all the supported syntax highlighting themes for code blocks, in groups.
+ * 
+ * The return value is an object where the keys represent groups in their human-readable name (e.g. "Light theme")
+ * and the values are an array containing the information about every theme. There is also a special group with no
+ * title (empty string) which should be displayed at the top of the listing pages, without a group.
+ * 
+ * @returns the supported themes, grouped.
+ */
+export function listSyntaxHighlightingThemes() {
+    const stylesDir = (env.isDev() ? "node_modules/@highlightjs/cdn-assets/styles" : "styles");
+    const path = join(getResourceDir(), stylesDir);
+    const systemThemes = readThemesFromFileSystem(path);
+
+    return {
+        "": [
+            {
+                val: "none",
+                title: t("code_block.theme_none")
+            }
+        ],
+        ...groupThemesByLightOrDark(systemThemes)
+    }
+}
+
+/**
+ * Reads all the predefined themes by listing all minified CSSes from a given directory.
+ * 
+ * The theme names are mapped against a known list in order to provide more descriptive names such as "Visual Studio 2015 (Dark)" instead of "vs2015".
+ * 
+ * @param path the path to read from. Usually this is the highlight.js `styles` directory.
+ * @returns the list of themes.
+ */
+function readThemesFromFileSystem(path: string): ColorTheme[] {
+    return fs.readdirSync(path)
+        .filter((el) => el.endsWith(".min.css"))
+        .map((name) => {
+            const nameWithoutExtension = name.replace(".min.css", "");            
+            let title = nameWithoutExtension.replace(/-/g, " ");
+
+            if (title in themeNames) {
+                title = (themeNames as Record<string, string>)[title];
+            }
+            
+            return {
+                val: `default:${nameWithoutExtension}`,
+                title: title
+            };
+        });
+}
+
+/**
+ * Groups a list of themes by dark or light themes. This is done simply by checking whether "Dark" is present in the given theme, otherwise it's considered a light theme.
+ * This generally only works if the theme has a known human-readable name (see {@link #readThemesFromFileSystem()})
+ * 
+ * @param listOfThemes the list of themes to be grouped.
+ * @returns the grouped themes by light or dark.
+ */
+function groupThemesByLightOrDark(listOfThemes: ColorTheme[]) {
+    const darkThemes = [];
+    const lightThemes = [];
+
+    for (const theme of listOfThemes) {
+        if (theme.title.includes("Dark")) {
+            darkThemes.push(theme);
+        } else {
+            lightThemes.push(theme);
+        }
+    }
+
+    const output: Record<string, ColorTheme[]> = {};
+    output[t("code_block.theme_group_light")] = lightThemes;
+    output[t("code_block.theme_group_dark")] = darkThemes;
+    return output;
+}
--- a/src/services/code_block_theme_names.json
+++ b/src/services/code_block_theme_names.json
@@ -0,0 +1,75 @@
+{
+    "1c light": "1C (Light)",
+    "a11y dark": "a11y (Dark)",
+    "a11y light": "a11y (Light)",
+    "agate": "Agate (Dark)",
+    "an old hope": "An Old Hope (Dark)",
+    "androidstudio": "Android Studio (Dark)",
+    "arduino light": "Arduino (Light)",
+    "arta": "Arta (Dark)",
+    "ascetic": "Ascetic (Light)",
+    "atom one dark reasonable": "Atom One with ReasonML support (Dark)",
+    "atom one dark": "Atom One (Dark)",
+    "atom one light": "Atom One (Light)",
+    "brown paper": "Brown Paper (Light)",
+    "codepen embed": "CodePen Embed (Dark)",
+    "color brewer": "Color Brewer (Light)",
+    "dark": "Dark",
+    "default": "Original highlight.js Theme (Light)",
+    "devibeans": "devibeans (Dark)",
+    "docco": "Docco (Light)",
+    "far": "FAR (Dark)",
+    "felipec": "FelipeC (Dark)",
+    "foundation": "Foundation 4 Docs (Light)",
+    "github dark dimmed": "GitHub Dimmed (Dark)",
+    "github dark": "GitHub (Dark)",
+    "github": "GitHub (Light)",
+    "gml": "GML (Dark)",
+    "googlecode": "Google Code (Light)",
+    "gradient dark": "Gradient (Dark)",
+    "gradient light": "Gradient (Light)",
+    "grayscale": "Grayscale (Light)",
+    "hybrid": "hybrid (Dark)",
+    "idea": "Idea (Light)",
+    "intellij light": "IntelliJ (Light)",
+    "ir black": "IR Black (Dark)",
+    "isbl editor dark": "ISBL Editor (Dark)",
+    "isbl editor light": "ISBL Editor (Light)",
+    "kimbie dark": "Kimbie (Dark)",
+    "kimbie light": "Kimbie (Light)",
+    "lightfair": "Lightfair (Light)",
+    "lioshi": "Lioshi (Dark)",
+    "magula": "Magula (Light)",
+    "mono blue": "Mono Blue (Light)",
+    "monokai sublime": "Monokai Sublime (Dark)",
+    "monokai": "Monokai (Dark)",
+    "night owl": "Night Owl (Dark)",
+    "nnfx dark": "NNFX (Dark)",
+    "nnfx light": "NNFX (Light)",
+    "nord": "Nord (Dark)",
+    "obsidian": "Obsidian (Dark)",
+    "panda syntax dark": "Panda (Dark)",
+    "panda syntax light": "Panda (Light)",
+    "paraiso dark": "Paraiso (Dark)",
+    "paraiso light": "Paraiso (Light)",
+    "pojoaque": "Pojoaque (Dark)",
+    "purebasic": "PureBasic (Light)",
+    "qtcreator dark": "Qt Creator (Dark)",
+    "qtcreator light": "Qt Creator (Light)",
+    "rainbow": "Rainbow (Dark)",
+    "routeros": "RouterOS Script (Light)",
+    "school book": "School Book (Light)",
+    "shades of purple": "Shades of Purple (Dark)",
+    "srcery": "Srcery (Dark)",
+    "stackoverflow dark": "Stack Overflow (Dark)",
+    "stackoverflow light": "Stack Overflow (Light)",
+    "sunburst": "Sunburst (Dark)",
+    "tokyo night dark": "Tokyo Night (Dark)",
+    "tokyo night light": "Tokyo Night (Light)",
+    "tomorrow night blue": "Tomorrow Night Blue (Dark)",
+    "tomorrow night bright": "Tomorrow Night Bright (Dark)",
+    "vs": "Visual Studio (Light)",
+    "vs2015": "Visual Studio 2015 (Dark)",
+    "xcode": "Xcode (Light)",
+    "xt256": "xt256 (Dark)"
+}
--- a/src/services/export/zip.ts
+++ b/src/services/export/zip.ts
@@ -58,8 +58,16 @@ async function exportToZip(taskContext: TaskContext, branch: BBranch, format: "h

    function getDataFileName(type: string | null, mime: string, baseFileName: string, existingFileNames: Record<string, number>): string {
        let fileName = baseFileName.trim();
+
+        // Crop fileName to avoid its length exceeding 30 and prevent cutting into the extension.
        if (fileName.length > 30) {
-            fileName = fileName.substr(0, 30).trim();
+            // We use regex to match the extension to preserve multiple dots in extensions (e.g. .tar.gz).
+            let match = fileName.match(/(\.[a-zA-Z0-9_.!#-]+)$/);
+            let ext = match ? match[0] : ''; 
+            // Crop the extension if extension length exceeds 30
+            const croppedExt = ext.slice(-30);
+            // Crop the file name section and append the cropped extension
+            fileName = fileName.slice(0, 30 - croppedExt.length) + croppedExt;
        }

        let existingExtension = path.extname(fileName).toLowerCase();
@@ -76,6 +84,9 @@ async function exportToZip(taskContext: TaskContext, branch: BBranch, format: "h
        else if (mime === 'application/x-javascript' || mime === 'text/javascript') {
            newExtension = 'js';
        }
+        else if (type === 'canvas' || mime === 'application/json') {
+            newExtension = 'json';
+        }
        else if (existingExtension.length > 0) { // if the page already has an extension, then we'll just keep it
            newExtension = null;
        }
--- a/src/services/i18n.ts
+++ b/src/services/i18n.ts
@@ -2,10 +2,8 @@ import i18next from "i18next";
 import Backend from "i18next-fs-backend";
 import options from "./options.js";
 import sql_init from "./sql_init.js";
-import { fileURLToPath } from "url";
-import { dirname, join } from "path";
-import utils from "./utils.js";
-import env from "./env.js";
+import { join } from "path";
+import { getResourceDir } from "./utils.js";

 export async function initializeTranslations() {
  const resourceDir = getResourceDir();
@@ -21,14 +19,6 @@ export async function initializeTranslations() {
  });
 }

-function getResourceDir() {
-  if (utils.isElectron() && !env.isDev()) {
-    return process.resourcesPath;
-  } else {
-    return join(dirname(fileURLToPath(import.meta.url)), "..", "..");
-  }
-}
-
 function getCurrentLanguage() {
  let language;
  if (sql_init.isDbInitialized()) {
--- a/src/services/options.ts
+++ b/src/services/options.ts
@@ -1,8 +1,27 @@
+/**
+ * @module
+ * 
+ * Options are key-value pairs that are used to store information such as user preferences (for example
+ * the current theme, sync server information), but also information about the state of the application.
+ * 
+ * Although options internally are represented as strings, their value can be interpreted as a number or
+ * boolean by calling the appropriate methods from this service (e.g. {@link #getOptionInt}).\
+ * 
+ * Generally options are shared across multiple instances of the application via the sync mechanism,
+ * however it is possible to have options that are local to an instance. For example, the user can select
+ * a theme on a device and it will not affect other devices.
+ */
+
 import becca from "../becca/becca.js";
 import BOption from "../becca/entities/boption.js";
 import { OptionRow } from '../becca/entities/rows.js';
 import sql from "./sql.js";

+/**
+ * A dictionary where the keys are the option keys (e.g. `theme`) and their corresponding values.
+ */
+export type OptionMap = Record<string | number, string>;
+
 function getOptionOrNull(name: string): string | null {
    let option;

@@ -69,6 +88,13 @@ function setOption(name: string, value: string | number | boolean) {
    }
 }

+/**
+ * Creates a new option in the database, with the given name, value and whether it should be synced.
+ * 
+ * @param name the name of the option to be created.
+ * @param value the value of the option, as a string. It can then be interpreted as other types such as a number of boolean.
+ * @param isSynced `true` if the value should be synced across multiple instances (e.g. locale) or `false` if it should be local-only (e.g. theme).
+ */
 function createOption(name: string, value: string, isSynced: boolean) {
    new BOption({
        name: name,
@@ -82,7 +108,7 @@ function getOptions() {
 }

 function getOptionMap() {
-    const map: Record<string | number, string> = {};
+    const map: OptionMap = {};

    for (const option of Object.values(becca.options)) {
        map[option.name] = option.value;
--- a/src/services/options_init.ts
+++ b/src/services/options_init.ts
@@ -1,4 +1,5 @@
 import optionService from "./options.js";
+import type { OptionMap } from "./options.js";
 import appInfo from "./app_info.js";
 import utils from "./utils.js";
 import log from "./log.js";
@@ -11,17 +12,35 @@ function initDocumentOptions() {
    optionService.createOption('documentSecret', utils.randomSecureToken(16), false);
 }

+/**
+ * Contains additional options to be initialized for a new database, containing the information entered by the user.
+ */
 interface NotSyncedOpts {
    syncServerHost?: string;
    syncProxy?: string;
 }

+/**
+ * Represents a correspondence between an option and its default value, to be initialized when the database is missing that particular option (after a migration from an older version, or when creating a new database).
+ */
 interface DefaultOption {
    name: string;
-    value: string;
+    /**
+     * The value to initialize the option with, if the option is not already present in the database.
+     * 
+     * If a function is passed in instead, the function is called if the option does not exist (with access to the current options) and the return value is used instead. Useful to migrate a new option with a value depending on some other option that might be initialized.
+     */
+    value: string | ((options: OptionMap) => string);
    isSynced: boolean;
 }

+/**
+ * Initializes the default options for new databases only.
+ * 
+ * @param initialized `true` if the database has been fully initialized (i.e. a new database was created), or `false` if the database is created for sync.
+ * @param theme the theme to set as default, based on a user's system preference.
+ * @param opts additional options to be initialized, for example the sync configuration.
+ */
 async function initNotSyncedOptions(initialized: boolean, theme: string, opts: NotSyncedOpts = {}) {
    optionService.createOption('openNoteContexts', JSON.stringify([
        {
@@ -47,6 +66,9 @@ async function initNotSyncedOptions(initialized: boolean, theme: string, opts: N
    optionService.createOption('syncProxy', opts.syncProxy || '', false);
 }

+/**
+ * Contains all the default options that must be initialized on new and existing databases (at startup). The value can also be determined based on other options, provided they have already been initialized.
+ */
 const defaultOptions: DefaultOption[] = [
    { name: 'revisionSnapshotTimeInterval', value: '600', isSynced: true },
    { name: 'revisionSnapshotNumberLimit', value: '-1', isSynced: true },
@@ -99,9 +121,24 @@ const defaultOptions: DefaultOption[] = [

    // Internationalization
    { name: 'locale', value: 'en', isSynced: true },
-    { name: 'firstDayOfWeek', value: '1', isSynced: true }
+    { name: 'firstDayOfWeek', value: '1', isSynced: true },
+
+    // Code block configuration
+    { name: "codeBlockTheme", value: (optionsMap) => {
+        if (optionsMap.theme === "light") {
+            return "default:stackoverflow-light";
+        } else {
+            return "default:stackoverflow-dark";
+        }
+    }, isSynced: false },
+    { name: "codeBlockWordWrap", value: "false", isSynced: true }
 ];

+/**
+ * Initializes the options, by checking which options from {@link #allDefaultOptions()} are missing and registering them. It will also check some environment variables such as safe mode, to make any necessary adjustments.
+ * 
+ * This method is called regardless of whether a new database is created, or an existing database is used.
+ */
 function initStartupOptions() {
    const optionsMap = optionService.getOptionMap();

@@ -109,9 +146,15 @@ function initStartupOptions() {

    for (const {name, value, isSynced} of allDefaultOptions) {
        if (!(name in optionsMap)) {
-            optionService.createOption(name, value, isSynced);
+            let resolvedValue;
+            if (typeof value === "function") {
+                resolvedValue = value(optionsMap);
+            } else {
+                resolvedValue = value;
+            }

-            log.info(`Created option "${name}" with default value "${value}"`);
+            optionService.createOption(name, resolvedValue, isSynced);
+            log.info(`Created option "${name}" with default value "${resolvedValue}"`);
        }
    }

--- a/src/services/utils.ts
+++ b/src/services/utils.ts
@@ -7,6 +7,9 @@ import escape from "escape-html";
 import sanitize from "sanitize-filename";
 import mimeTypes from "mime-types";
 import path from "path";
+import { fileURLToPath } from "url";
+import env from "./env.js";
+import { dirname, join } from "path";

 const randtoken = generator({source: 'crypto'});

@@ -315,6 +318,20 @@ function isString(x: any) {
    return Object.prototype.toString.call(x) === "[object String]";
 }

+/**
+ * Returns the directory for resources. On Electron builds this corresponds to the `resources` subdirectory inside the distributable package.
+ * On development builds, this simply refers to the root directory of the application.
+ * 
+ * @returns the resource dir.
+ */
+export function getResourceDir() {
+    if (isElectron() && !env.isDev()) {
+        return process.resourcesPath;
+    } else {
+        return join(dirname(fileURLToPath(import.meta.url)), "..", "..");
+    }    
+}
+
 export default {
    randomSecureToken,
    randomString,
--- a/translations/en/server.json
+++ b/translations/en/server.json
@@ -183,5 +183,14 @@
  },
  "special_notes": {
    "search_prefix": "Search:"
+  },
+  "code_block": {
+    "theme_none": "No syntax highlighting",
+    "theme_group_light": "Light themes",
+    "theme_group_dark": "Dark themes"
+  },
+  "test_sync": {
+    "not-configured": "Sync server host is not configured. Please configure sync first.",
+    "successful": "Sync server handshake has been successful, sync has been started."
  }
 }
--- a/translations/es/server.json
+++ b/translations/es/server.json
@@ -180,5 +180,17 @@
    "october": "Octubre",
    "november": "Noviembre",
    "december": "Diciembre"
+  },
+  "special_notes": {
+    "search_prefix": "Buscar:"
+  },
+  "code_block": {
+    "theme_none": "Sin resaltado de sintaxis",
+    "theme_group_light": "Temas claros",
+    "theme_group_dark": "Temas oscuros"
+  },
+  "test_sync": {
+    "not-configured": "El servidor de sincronización no está configurado. Por favor configure primero la sincronización.",
+    "successful": "El protocolo de enlace del servidor de sincronización ha sido exitoso, la sincronización ha comenzado."
  }
 }
--- a/translations/ro/server.json
+++ b/translations/ro/server.json
@@ -183,5 +183,14 @@
  },
  "special_notes": {
    "search_prefix": "Căutare:"
+  },
+  "code_block": {
+    "theme_none": "Fără evidențiere de sintaxă",
+    "theme_group_dark": "Teme întunecate",
+    "theme_group_light": "Teme luminoase"
+  },
+  "test_sync": {
+    "not-configured": "Calea către serverul de sincronizare nu este configurată. Configurați sincronizarea înainte.",
+    "successful": "Comunicarea cu serverul de sincronizare a avut loc cu succes, s-a început sincronizarea."
  }
 }