Relese 26.2.2 (#3077)

Fix font loading on older Qt versions

.env.example

@@ -0,0 +1,5 @@
+# Copy to .env and fill in for dev tooling
+
+# Crowdin Personal Access Token scoped to at least `project.report` (Read only)
+# Needed for `qtlimport --credits-since`
+CROWDIN_REPORT_READ_TOKEN=

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @vkbo @saga-soft-bot

.github/pull_request_template.md

@@ -2,19 +2,17 @@
 Please check the following before you make a pull request:
 
 * The branch you are making the pull request from (in your own fork) has a unique and descriptive
-  name. Do not make a pull request directly from your copy of `main`.
-* If you are submitting translation files, only submit the files that you have added translations
-  to, not the other .ts files that may have been updated in the process.
+  name. Do not make a pull request directly from your copy of `main` or `release`.
 * Make sure your contribution follows the style guide and other requirements mentioned in the
   CONTRIBUTING.md file in the repository.
 * Fill in the Summary section below, and if relevant, mention the issue numbers related to the PR.
 -->
 
-**Summary:**
+### Summary
 
-**Related Issue(s):**
+### Related Issue(s)
 
-**Reviewer's Checklist:**
+### Reviewer's Checklist
 
 * [ ] The header of all files contain a reference to the repository license
 * [ ] The overall test coverage is increased or remains the same as before

.github/workflows/auto_approve.yml

@@ -0,0 +1,24 @@
+name: Auto-Approve
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+
+concurrency:
+  group: auto-approve-${{ github.event.pull_request.number }}
+
+jobs:
+  approve:
+    name: Approve Owner PRs
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false && github.event.pull_request.user.login == 'vkbo'
+    steps:
+      - name: Approve Pull Request
+        env:
+          GH_TOKEN: ${{ secrets.SAGA_SOFT_BOT_TOKEN }}
+          PR_URL: ${{ github.event.pull_request.html_url }}
+        run: gh pr review "$PR_URL" --approve

.github/workflows/build_all.yml

@@ -0,0 +1,33 @@
+name: Build All
+
+on: workflow_dispatch
+
+jobs:
+  buildAssets:
+    uses: ./.github/workflows/part_assets.yml
+    with:
+      icons-free: true
+      icons-non-free: true
+    permissions:
+      contents: read
+
+  buildLinux-AppImage:
+    needs: buildAssets
+    uses: ./.github/workflows/part_appimage.yml
+    secrets: inherit
+    permissions:
+      contents: read
+
+  buildLinux-Flatpak:
+    needs: buildAssets
+    uses: ./.github/workflows/part_flatpak.yml
+    secrets: inherit
+    permissions:
+      contents: read
+
+  buildWin-X64:
+    needs: buildAssets
+    uses: ./.github/workflows/part_win_x64.yml
+    secrets: inherit
+    permissions:
+      contents: read

.github/workflows/build_assets.yml

@@ -1,39 +0,0 @@
-name: BuildAssets
-
-on: workflow_call
-
-jobs:
-  buildAssets:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Python Setup
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-          architecture: x64
-
-      - name: Install Packages (apt)
-        run: |
-          sudo apt update
-          sudo apt install qttools5-dev-tools latexmk texlive texlive-latex-extra
-
-      - name: Checkout Source
-        uses: actions/checkout@v4
-
-      - name: Install Packages (pip)
-        run: pip install -U -r requirements.txt -r docs/requirements.txt
-
-      - name: Build Assets
-        run: |
-          python pkgutils.py build-assets
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: nw-assets
-          path: |
-            novelwriter/assets/manual*.pdf
-            novelwriter/assets/sample.zip
-            novelwriter/assets/i18n/*.qm
-          if-no-files-found: error
-          retention-days: 14

.github/workflows/build_linux.yml

@@ -1,46 +0,0 @@
-name: BuildLinux
-
-on: workflow_dispatch
-
-jobs:
-  buildAssets:
-    uses: ./.github/workflows/build_assets.yml
-
-  buildLinux-AppImage:
-    needs: buildAssets
-    runs-on: ubuntu-latest
-    env:
-      PYTHON_VERSION: "3.13"
-      LINUX_TAG: "manylinux_2_28_x86_64"
-    steps:
-      - name: Python Setup
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-          architecture: x64
-
-      - name: Install Packages (pip)
-        run: pip install python-appimage
-
-      - name: Checkout Source
-        uses: actions/checkout@v4
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: nw-assets
-          path: novelwriter/assets
-
-      - name: Build AppImage
-        id: build
-        run: |
-          echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT
-          python pkgutils.py build-appimage --linux-tag $LINUX_TAG --python-version $PYTHON_VERSION
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-Linux-AppImage
-          path: dist_appimage/*.AppImage*
-          if-no-files-found: error
-          retention-days: 14

.github/workflows/build_linux_images.yml

@@ -0,0 +1,26 @@
+name: Build Linux Images
+
+on: workflow_dispatch
+
+jobs:
+  buildAssets:
+    uses: ./.github/workflows/part_assets.yml
+    with:
+      icons-free: true
+      icons-non-free: true
+    permissions:
+      contents: read
+
+  buildLinux-AppImage:
+    needs: buildAssets
+    uses: ./.github/workflows/part_appimage.yml
+    secrets: inherit
+    permissions:
+      contents: read
+
+  buildLinux-Flatpak:
+    needs: buildAssets
+    uses: ./.github/workflows/part_flatpak.yml
+    secrets: inherit
+    permissions:
+      contents: read

.github/workflows/build_linux_native.yml

@@ -0,0 +1,150 @@
+name: Build Linux Native
+
+on:
+  workflow_dispatch:
+    inputs:
+      publish:
+        required: false
+        description: "Publish to Cloudsmith?"
+        type: boolean
+        default: false
+      build_number:
+        required: false
+        description: "Build Number"
+        type: string
+        default: "0"
+      debian12:
+        required: false
+        description: "Debian 12 (Bookworm)"
+        type: boolean
+        default: true
+      debian13:
+        required: false
+        description: "Debian 13 (Trixie)"
+        type: boolean
+        default: true
+      ubuntu2404:
+        required: false
+        description: "Ubuntu 24.04 (Noble)"
+        type: boolean
+        default: true
+      ubuntu2604:
+        required: false
+        description: "Ubuntu 26.04 (Resolute)"
+        type: boolean
+        default: true
+      ubuntu2610:
+        required: false
+        description: "Ubuntu 26.10 (Stonking)"
+        type: boolean
+        default: true
+      mint22:
+        required: false
+        description: "Linux Mint 22 (Wilma)"
+        type: boolean
+        default: true
+
+jobs:
+  buildAssets:
+    uses: ./.github/workflows/part_assets.yml
+    with:
+      icons-free: true
+      icons-non-free: true
+    permissions:
+      contents: read
+
+  buildAndPublish-Debian12:
+    name: Debian 12 (Bookworm)
+    needs: buildAssets
+    uses: ./.github/workflows/part_debian.yml
+    with:
+      publish: ${{ inputs.publish }}
+      build_number: ${{ inputs.build_number }}
+      codename: bookworm
+      family: debian
+      image: debian:12
+    secrets: inherit
+    if: ${{ inputs.debian12 }}
+    permissions:
+      id-token: write
+      contents: read
+
+  buildAndPublish-Debian13:
+    name: Debian 13 (Trixie)
+    needs: buildAssets
+    uses: ./.github/workflows/part_debian.yml
+    with:
+      publish: ${{ inputs.publish }}
+      build_number: ${{ inputs.build_number }}
+      codename: trixie
+      family: debian
+      image: debian:13
+    secrets: inherit
+    if: ${{ inputs.debian13 }}
+    permissions:
+      id-token: write
+      contents: read
+
+  buildAndPublish-Ubuntu2404:
+    name: Ubuntu 24.04 (Noble)
+    needs: buildAssets
+    uses: ./.github/workflows/part_debian.yml
+    with:
+      publish: ${{ inputs.publish }}
+      build_number: ${{ inputs.build_number }}
+      codename: noble
+      family: ubuntu
+      image: ubuntu:24.04
+    secrets: inherit
+    if: ${{ inputs.ubuntu2404 }}
+    permissions:
+      id-token: write
+      contents: read
+
+  buildAndPublish-Ubuntu2604:
+    name: Ubuntu 26.04 (Resolute)
+    needs: buildAssets
+    uses: ./.github/workflows/part_debian.yml
+    with:
+      publish: ${{ inputs.publish }}
+      build_number: ${{ inputs.build_number }}
+      codename: resolute
+      family: ubuntu
+      image: ubuntu:26.04
+    secrets: inherit
+    if: ${{ inputs.ubuntu2604 }}
+    permissions:
+      id-token: write
+      contents: read
+
+  buildAndPublish-Ubuntu2610:
+    name: Ubuntu 26.10 (Stonking)
+    needs: buildAssets
+    uses: ./.github/workflows/part_debian.yml
+    with:
+      publish: ${{ inputs.publish }}
+      build_number: ${{ inputs.build_number }}
+      codename: stonking
+      family: ubuntu
+      image: ubuntu:26.10
+    secrets: inherit
+    if: ${{ inputs.ubuntu2610 }}
+    permissions:
+      id-token: write
+      contents: read
+
+  buildAndPublish-Mint22:
+    name: Linux Mint 22 (Wilma)
+    needs: buildAssets
+    uses: ./.github/workflows/part_debian.yml
+    with:
+      publish: ${{ inputs.publish }}
+      build_number: ${{ inputs.build_number }}
+      codename: wilma
+      family: linuxmint
+      image: linuxmintd/mint22-amd64
+    secrets: inherit
+    if: ${{ inputs.mint22 }}
+    permissions:
+      id-token: write
+      contents: read

.github/workflows/build_mac.yml

@@ -1,69 +1,26 @@
-name: BuildMacOS
+name: Build MacOS
 
 on: workflow_dispatch
 
 jobs:
   buildAssets:
-    uses: ./.github/workflows/build_assets.yml
+    uses: ./.github/workflows/part_assets.yml
+    with:
+      icons-free: true
+      icons-non-free: true
+    permissions:
+      contents: read
 
   buildMac-AMD64:
     needs: buildAssets
-    runs-on: macos-latest
-    env:
-      PYTHON_VERSION: "3.13"
-      PACKAGE_ARCH: x86_64
-      MINICONDA_ARCH: x86_64
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: nw-assets
-          path: novelwriter/assets
-
-      - name: Build App Bundle
-        id: build
-        run: |
-          echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT
-          ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH
-
-      - name: Upload DMG
-        uses: actions/upload-artifact@v4
-        with:
-          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-MacOS-AMD64-DMG
-          path: dist_macos/*.dmg*
-          if-no-files-found: error
-          retention-days: 14
+    uses: ./.github/workflows/part_macos_amd64.yml
+    secrets: inherit
+    permissions:
+      contents: read
 
   buildMac-M1:
     needs: buildAssets
-    runs-on: macos-latest
-    env:
-      PYTHON_VERSION: "3.13"
-      PACKAGE_ARCH: aarch64
-      MINICONDA_ARCH: arm64
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: nw-assets
-          path: novelwriter/assets
-
-      - name: Build App Bundle
-        id: build
-        run: |
-          echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT
-          ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH
-
-      - name: Upload DMG
-        uses: actions/upload-artifact@v4
-        with:
-          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-MacOS-M1-DMG
-          path: dist_macos/*.dmg*
-          if-no-files-found: error
-          retention-days: 14
+    uses: ./.github/workflows/part_macos_m1.yml
+    secrets: inherit
+    permissions:
+      contents: read

.github/workflows/build_win.yml

@@ -1,62 +1,19 @@
-name: BuildWindows
+name: Build Windows
 
 on: workflow_dispatch
 
 jobs:
   buildAssets:
-    uses: ./.github/workflows/build_assets.yml
+    uses: ./.github/workflows/part_assets.yml
+    with:
+      icons-free: true
+      icons-non-free: true
+    permissions:
+      contents: read
 
-  buildWin64:
+  buildWin-X64:
     needs: buildAssets
-    runs-on: windows-latest
-    steps:
-      - name: Python Setup
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-          architecture: x64
-
-      - name: Checkout Source
-        uses: actions/checkout@v4
-
-      - name: Download Assets
-        uses: actions/download-artifact@v4
-        with:
-          name: nw-assets
-          path: novelwriter/assets
-
-      - name: Build Setup Installer
-        id: build
-        run: |
-          echo "BUILD_VERSION=$(python pkgutils.py version)" >> $Env:GITHUB_OUTPUT
-          python pkgutils.py build-win-exe
-
-      - name: Upload Unsigned Artifacts
-        id: upload-unsigned-artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-Win-Setup
-          path: dist/*.exe
-          if-no-files-found: error
-          retention-days: 14
-
-      - name: Submit Signing Request
-        uses: signpath/github-action-submit-signing-request@v1
-        with:
-          api-token: "${{ secrets.SIGNPATH_API_TOKEN }}"
-          organization-id: "0471e52c-66fa-4e9a-bfb9-36167095ca3f"
-          project-slug: "novelWriter"
-          signing-policy-slug: "release-signing "
-          github-artifact-id: "${{ steps.upload-unsigned-artifact.outputs.artifact-id }}"
-          wait-for-completion: true
-          output-artifact-directory: "dist/"
-          parameters: |
-            version: "${{ steps.build.outputs.BUILD_VERSION }}"
-
-      - name: Upload Signed Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-Win-Setup-Signed
-          path: dist/*.exe
-          if-no-files-found: error
-          retention-days: 14
+    uses: ./.github/workflows/part_win_x64.yml
+    secrets: inherit
+    permissions:
+      contents: read

.github/workflows/build_win_launcher.yml

@@ -1,13 +1,15 @@
-name: BuildWindowsLauncher
+name: Build Windows Launcher
 
 on: workflow_dispatch
 
 jobs:
   buildLauncherWin64:
     runs-on: windows-latest
+    permissions:
+      contents: read
     steps:
       - name: Checkout Source
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: Build Launcher
         id: build
@@ -17,7 +19,7 @@ jobs:
 
       - name: Upload Unsigned Artifacts
         id: upload-unsigned-artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: launcher
           path: setup/windows/novelWriter.exe
@@ -25,7 +27,7 @@ jobs:
           retention-days: 14
 
       - name: Submit Signing Request
-        uses: signpath/github-action-submit-signing-request@v1
+        uses: signpath/github-action-submit-signing-request@v2
         with:
           api-token: "${{ secrets.SIGNPATH_API_TOKEN }}"
           organization-id: "0471e52c-66fa-4e9a-bfb9-36167095ca3f"
@@ -37,7 +39,7 @@ jobs:
           output-artifact-directory: "."
 
       - name: Upload Signed Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: launcher-signed
           path: novelWriter.exe

.github/workflows/i18n.yml

@@ -1,32 +1,41 @@
 name: i18n
 
 on:
-  push:
+  pull_request:
     branches:
-      - i18n/*
+      - main
+      - release
+    paths:
+      - i18n/*.ts
 
 jobs:
   buildI18n:
+    name: Build i18n
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
       - name: Python Setup
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
-          python-version: "3.13"
+          python-version: "3.14"
           architecture: x64
-      - name: Install Packages (apt)
+
+      - name: Checkout Source
+        uses: actions/checkout@v7
+
+      - name: Install System Packages
         run: |
           sudo apt update
           sudo apt install qttools5-dev-tools
-      - name: Checkout Source
-        uses: actions/checkout@v4
+
       - name: Build Assets
         run: python pkgutils.py qtlrelease
+
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: nw-i18n
-          path: |
-            novelwriter/assets/i18n/*.qm
+          path: novelwriter/assets/i18n/*.qm
           if-no-files-found: error
           retention-days: 7

.github/workflows/lock_threads.yml

@@ -1,34 +0,0 @@
-name: LockThreads
-
-on:
-  schedule:
-    - cron: "14 3 */3 * *"
-
-permissions:
-  issues: write
-  pull-requests: write
-
-concurrency:
-  group: lock-threads
-
-jobs:
-  action:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v5
-        with:
-          github-token: ${{ github.token }}
-          issue-inactive-days: 120
-          issue-comment: >
-            This issue has been automatically locked since there has not been
-            any recent activity after it was closed. Please open a new issue
-            for related bugs or feature requests.
-          issue-lock-reason: "resolved"
-          pr-inactive-days: 120
-          # pr-comment: >
-          #   This pull request thread has been automatically locked since there
-          #   has not been any recent activity after it was closed. Please open
-          #   an issue for any related bugs or feature requests.
-          pr-lock-reason: "resolved"
-          process-only: "issue, pr"
-          log-output: true

.github/workflows/part_appimage.yml

@@ -0,0 +1,141 @@
+name: Part AppImage
+
+on: workflow_call
+
+jobs:
+  buildLinux-AppImage:
+    # Needs to stay on 22.04 as long as we're using manylinux_2_28
+    # as libxcb-cursor0 in 22.04 supports glibc >= 2.17
+    name: Build AppImage
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+    env:
+      PYTHON_VERSION: "3.14"
+      LINUX_TAG: "manylinux_2_28"
+      LINUX_ARCH: "x86_64"
+    steps:
+      - name: Python Setup
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.14"
+          architecture: x64
+
+      - name: Install Packages (apt)
+        run: |
+          sudo apt update
+          sudo apt install libxcb-cursor0
+
+      - name: Install Packages (pip)
+        run: pip install python-appimage setuptools
+
+      - name: Checkout Source
+        uses: actions/checkout@v7
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v8
+        with:
+          name: nw-assets
+          path: novelwriter/assets
+
+      - name: Build AppImage
+        id: build
+        run: |
+          wget https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-$LINUX_ARCH.AppImage
+          chmod +x appimagetool-$LINUX_ARCH.AppImage
+          export APPIMAGE_TOOL_EXEC="$(pwd)/appimagetool-$LINUX_ARCH.AppImage"
+          echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT
+          python pkgutils.py build-appimage $LINUX_TAG $LINUX_ARCH $PYTHON_VERSION
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-Linux-AppImage
+          path: dist_appimage/*.AppImage*
+          if-no-files-found: error
+          retention-days: 14
+
+  smokeTest:
+    name: Smoke Test AppImage (${{ matrix.distro }})
+    needs: buildLinux-AppImage
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - distro: Ubuntu 22.04
+            image: ubuntu:22.04
+          - distro: Debian 12
+            image: debian:12
+          - distro: Fedora 40
+            image: fedora:40
+          - distro: Arch Linux
+            image: archlinux:latest
+          - distro: Manjaro
+            image: manjarolinux/base:latest
+    container:
+      image: ${{ matrix.image }}
+    steps:
+      - name: Install Runtime Dependencies
+        run: |
+          if command -v apt-get >/dev/null 2>&1; then
+            apt-get update
+            apt-get install -y ca-certificates libgl1 libxkbcommon0 libegl1 libfontconfig1 libglib2.0-0 libdbus-1-3
+          elif command -v dnf >/dev/null 2>&1; then
+            dnf install -y ca-certificates coreutils mesa-libGL mesa-libEGL libxkbcommon fontconfig glib2 dbus-libs
+          elif command -v pacman >/dev/null 2>&1; then
+            pacman -Syu --noconfirm --needed ca-certificates coreutils mesa libxkbcommon fontconfig glib2 dbus
+          fi
+
+      - name: Download AppImage Artifact
+        uses: actions/download-artifact@v8
+        with:
+          pattern: novelWriter-*-Linux-AppImage
+          merge-multiple: true
+          path: appimage-dist
+
+      - name: Run AppImage Smoke Test
+        run: |
+          set -eu
+          APPIMAGE_FILE="$(find appimage-dist -maxdepth 1 -name '*.AppImage' | head -n1)"
+          if [ -z "$APPIMAGE_FILE" ]; then
+            echo "No AppImage artifact found"
+            exit 1
+          fi
+
+          chmod +x "$APPIMAGE_FILE"
+          export QT_QPA_PLATFORM=offscreen
+          export QT_NO_XDG_DESKTOP_PORTAL=1
+          export APPIMAGE_EXTRACT_AND_RUN=1
+
+          set +e
+          timeout 25s "$APPIMAGE_FILE" > smoke.log 2>&1
+          EXIT_CODE=$?
+          set -e
+
+          if [ "$EXIT_CODE" -eq 139 ]; then
+            echo "AppImage crashed with segmentation fault"
+            exit 1
+          fi
+
+          if grep -Eiq 'segmentation fault|core dumped' smoke.log; then
+            echo "Crash signature found in smoke log"
+            exit 1
+          fi
+
+          if [ "$EXIT_CODE" -ne 0 ] && [ "$EXIT_CODE" -ne 124 ]; then
+            echo "Unexpected exit code: $EXIT_CODE"
+            cat smoke.log
+            exit 1
+          fi
+
+      - name: Upload Smoke Logs
+        if: always()
+        uses: actions/upload-artifact@v7
+        with:
+          name: appimage-smoke-log-${{ matrix.distro }}
+          path: smoke.log
+          if-no-files-found: ignore
+          retention-days: 14

.github/workflows/part_assets.yml

@@ -0,0 +1,62 @@
+name: Part Assets
+
+on:
+  workflow_call:
+    inputs:
+      icons-free:
+        required: true
+        type: boolean
+      icons-non-free:
+        required: true
+        type: boolean
+
+jobs:
+  buildAssets:
+    name: Build Assets
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v7
+
+      - name: Install System Packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qttools5-dev-tools latexmk texlive texlive-latex-extra
+
+      - name: Install UV and Python
+        uses: astral-sh/setup-uv@v10.0.1
+        with:
+          python-version: "3.14"
+          enable-cache: true
+
+      - name: Install Dependencies
+        run: |
+          uv sync --no-dev --group docs
+
+      - name: Build Assets
+        run: |
+          uv run --no-sync pkgutils.py build-assets
+
+      - name: Build Free Icons
+        if: ${{ inputs.icons-free }}
+        run: |
+          uv run --no-sync pkgutils.py icons free
+
+      - name: Build Non-Free Icons
+        if: ${{ inputs.icons-non-free }}
+        run: |
+          uv run --no-sync pkgutils.py icons non-free
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: nw-assets
+          path: |
+            novelwriter/assets/manual*.pdf
+            novelwriter/assets/sample.zip
+            novelwriter/assets/i18n/*.qm
+            novelwriter/assets/icons/*.icons
+          if-no-files-found: error
+          retention-days: 14

.github/workflows/part_debian.yml

@@ -0,0 +1,82 @@
+name: Part Debian
+
+on:
+  workflow_call:
+    inputs:
+      publish:
+        required: false
+        type: boolean
+        default: false
+      build_number:
+        required: false
+        type: string
+        default: "0"
+      codename:
+        required: true
+        type: string
+      family:
+        required: true
+        type: string
+      image:
+        required: true
+        type: string
+    secrets:
+      CLOUDSMITH_API_KEY:
+        required: false
+
+jobs:
+  buildPackage:
+    name: Build Debian Package
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    container:
+      image: ${{ inputs.image }}
+    steps:
+      - name: Install Checkout Prerequisites
+        run: |
+          apt-get update
+          apt-get install -y git ca-certificates python3
+
+      - name: Checkout Source
+        uses: actions/checkout@v7
+
+      - name: Download Assets Artifact
+        uses: actions/download-artifact@v8
+        with:
+          name: nw-assets
+          path: novelwriter/assets
+
+      - name: Install Native Packages
+        run: apt-get install -y $(python3 pkgutils.py build-deb-depends ${{ inputs.codename }})
+
+      - name: Build Package
+        run: python3 pkgutils.py build-deb ${{ inputs.codename }} --build ${{ inputs.build_number }} --install-source Cloudsmith
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: nw-deb-${{ inputs.codename }}
+          path: dist_upload/*
+          if-no-files-found: error
+          retention-days: 14
+
+      - name: Set up Cloudsmith CLI with OIDC
+        if: ${{ inputs.publish }}
+        uses: cloudsmith-io/cloudsmith-cli-action@v3
+        with:
+          oidc-namespace: "saga-soft"
+          oidc-service-slug: "github-actions-lcpr"
+          verify-auth: true
+
+      - name: Publish to Cloudsmith
+        if: ${{ inputs.publish }}
+        run: |
+          CHANNEL="$(python3 pkgutils.py channel)"
+          REPO="stable"
+          if [ "$CHANNEL" = "pre" ]; then
+            REPO="testing"
+          fi
+          DEB_FILE="$(find dist_upload -name '*.deb')"
+          cloudsmith push deb "saga-soft/$REPO/${{ inputs.family }}/${{ inputs.codename }}" "$DEB_FILE" --republish

.github/workflows/part_flatpak.yml

@@ -0,0 +1,46 @@
+name: Part Flatpak
+
+on: workflow_call
+
+jobs:
+  buildLinux-Flatpak:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y flatpak flatpak-builder
+          flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
+
+      - name: Checkout Source
+        uses: actions/checkout@v7
+
+      - name: Install UV and Python
+        uses: astral-sh/setup-uv@v10.0.1
+        with:
+          python-version: "3.14"
+          enable-cache: true
+
+      - name: Install Dependencies
+        run: |
+          uv sync --no-dev --group build
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v8
+        with:
+          name: nw-assets
+          path: novelwriter/assets
+
+      - name: Build Flatpak
+        id: build
+        run: |
+          echo "BUILD_VERSION=$(uv run pkgutils.py version)" >> $GITHUB_OUTPUT
+          uv run --no-sync pkgutils.py build-flatpak
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-Linux-Flatpak
+          path: dist_flatpak/*.flatpak*
+          if-no-files-found: error
+          retention-days: 14

.github/workflows/part_macos_amd64.yml

@@ -0,0 +1,37 @@
+name: Part MacOS AMD64
+
+on: workflow_call
+
+jobs:
+  buildMac-AMD64:
+    name: Build on MACOS AMD64
+    runs-on: macos-latest
+    permissions:
+      contents: read
+    env:
+      PYTHON_VERSION: "3.13"
+      PACKAGE_ARCH: x86_64
+      MINICONDA_ARCH: x86_64
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v7
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v8
+        with:
+          name: nw-assets
+          path: novelwriter/assets
+
+      - name: Build App Bundle
+        id: build
+        run: |
+          echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT
+          ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH
+
+      - name: Upload DMG
+        uses: actions/upload-artifact@v7
+        with:
+          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-MacOS-AMD64-DMG
+          path: dist_macos/*.dmg*
+          if-no-files-found: error
+          retention-days: 14

.github/workflows/part_macos_m1.yml

@@ -0,0 +1,37 @@
+name: Part MacOS M1
+
+on: workflow_call
+
+jobs:
+  buildMac-M1:
+    name: Build on MacOS AARCH64
+    runs-on: macos-latest
+    permissions:
+      contents: read
+    env:
+      PYTHON_VERSION: "3.13"
+      PACKAGE_ARCH: aarch64
+      MINICONDA_ARCH: arm64
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v7
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v8
+        with:
+          name: nw-assets
+          path: novelwriter/assets
+
+      - name: Build App Bundle
+        id: build
+        run: |
+          echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT
+          ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH
+
+      - name: Upload DMG
+        uses: actions/upload-artifact@v7
+        with:
+          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-MacOS-M1-DMG
+          path: dist_macos/*.dmg*
+          if-no-files-found: error
+          retention-days: 14

.github/workflows/part_win_x64.yml

@@ -0,0 +1,64 @@
+name: Part Windows X64
+
+on: workflow_call
+
+jobs:
+  buildWin-X64:
+    name: Build on Windows
+    runs-on: windows-2022
+    permissions:
+      contents: read
+    steps:
+      - name: Python Setup
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.14"
+          architecture: x64
+
+      - name: Install Packages (pip)
+        run: pip install tzdata
+
+      - name: Checkout Source
+        uses: actions/checkout@v7
+
+      - name: Download Assets
+        uses: actions/download-artifact@v8
+        with:
+          name: nw-assets
+          path: novelwriter/assets
+
+      - name: Build Setup Installer
+        id: build
+        run: |
+          echo "BUILD_VERSION=$(python pkgutils.py version)" >> $Env:GITHUB_OUTPUT
+          python pkgutils.py build-win-exe
+
+      - name: Upload Unsigned Artifacts
+        id: upload-unsigned-artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-Win-Setup
+          path: dist/*.exe
+          if-no-files-found: error
+          retention-days: 14
+
+      - name: Submit Signing Request
+        uses: signpath/github-action-submit-signing-request@v1
+        with:
+          api-token: "${{ secrets.SIGNPATH_API_TOKEN }}"
+          organization-id: "0471e52c-66fa-4e9a-bfb9-36167095ca3f"
+          project-slug: "novelWriter"
+          signing-policy-slug: "release-signing "
+          github-artifact-id: "${{ steps.upload-unsigned-artifact.outputs.artifact-id }}"
+          wait-for-completion: true
+          output-artifact-directory: "dist/"
+          parameters: |
+            version: "${{ steps.build.outputs.BUILD_VERSION }}"
+
+      - name: Upload Signed Artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-Win-Setup-Signed
+          path: dist/*.exe
+          if-no-files-found: error
+          retention-days: 14

.github/workflows/policy.yml

@@ -0,0 +1,17 @@
+name: Policy Checks
+
+on:
+  pull_request:
+    branches:
+      - main
+      - release
+
+jobs:
+  commitPolicy:
+    name: Commit Policy
+    uses: saga-soft/automation/.github/workflows/saga-soft-policy.yml@main
+    permissions:
+      contents: read
+      pull-requests: read
+    with:
+      policy-url: https://github.com/saga-soft/novelWriter/blob/main/AI_POLICY.md

.github/workflows/syntax.yml

@@ -1,4 +1,4 @@
-name: Linting
+name: Syntax
 
 on:
   push:
@@ -12,26 +12,30 @@ on:
 
 jobs:
   checkSyntax:
+    name: Linting and Type Checking
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
-      - name: Python Setup
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3
-          architecture: x64
       - name: Checkout Source
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
+
+      - name: Install UV and Python
+        uses: astral-sh/setup-uv@v10.0.1
+        with:
+          enable-cache: true
+
       - name: Install Dependencies
-        run: pip install -r requirements.txt -r requirements-dev.txt
+        run: |
+          uv sync --no-dev --group lint
+
       - name: Ruff Check
         run: |
-          ruff --version
-          ruff check
+          uv run --no-sync ruff --version
+          uv run --no-sync ruff format --check
+          uv run --no-sync ruff check --output-format github
+
       - name: Pyright Check
         run: |
-          pyright --version
-          pyright
-      - name: Isort Check
-        run: |
-          isort --version
-          isort --check .
+          uv run --no-sync pyright --version
+          uv run --no-sync pyright

.github/workflows/test_linux.yml

@@ -1,46 +0,0 @@
-name: Linux
-
-on:
-  push:
-    branches:
-      - main
-      - release
-  pull_request:
-    branches:
-      - main
-      - release
-
-jobs:
-  testLinux:
-    strategy:
-      matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
-      fail-fast: false
-    runs-on: ubuntu-latest
-    steps:
-      - name: Python Setup
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          architecture: x64
-      - name: Install Packages (apt)
-        run: |
-          sudo apt update
-          sudo apt install libenchant-2-dev qttools5-dev-tools
-      - name: Checkout Source
-        uses: actions/checkout@v4
-      - name: Install Dependencies (pip)
-        run: |
-          pip install -U -r requirements.txt -r tests/requirements.txt
-      - name: Run Build Commands
-        run: |
-          python pkgutils.py qtlrelease
-          python pkgutils.py sample
-      - name: Run Tests
-        run: |
-          export QT_QPA_PLATFORM=offscreen
-          python -m pytest -v --cov=novelwriter --timeout=60
-      - name: Upload to Codecov
-        uses: codecov/codecov-action@v5
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/test_mac.yml

@@ -1,37 +0,0 @@
-name: MacOS
-
-on:
-  push:
-    branches:
-      - main
-      - release
-  pull_request:
-    branches:
-      - main
-      - release
-
-jobs:
-  testMac:
-    runs-on: macos-13
-    steps:
-      - name: Python Setup
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-          architecture: x64
-      - name: Install Packages (brew)
-        run: |
-          brew install enchant
-      - name: Checkout Source
-        uses: actions/checkout@v4
-      - name: Install Dependencies (pip)
-        run: |
-          pip install -U pyobjc -r requirements.txt -r tests/requirements.txt
-      - name: Run Tests
-        run: |
-          export QT_QPA_PLATFORM=offscreen
-          python -m pytest -v --cov=novelwriter --timeout=60
-      - name: Upload to Codecov
-        uses: codecov/codecov-action@v5
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/test_win.yml

@@ -1,33 +0,0 @@
-name: Windows
-
-on:
-  push:
-    branches:
-      - main
-      - release
-  pull_request:
-    branches:
-      - main
-      - release
-
-jobs:
-  testWin:
-    runs-on: windows-latest
-    steps:
-      - name: Python Setup
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-          architecture: x64
-      - name: Checkout Source
-        uses: actions/checkout@v4
-      - name: Install Dependencies (pip)
-        run: |
-          pip install -U -r requirements.txt -r tests/requirements.txt
-      - name: Run Tests
-        run: |
-          python -m pytest -v --cov=novelwriter --timeout=60
-      - name: Upload to Codecov
-        uses: codecov/codecov-action@v5
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/tests.yml

@@ -0,0 +1,305 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - main
+      - release
+  pull_request:
+    branches:
+      - main
+      - release
+
+jobs:
+  testLinux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version:
+          - "3.11"
+          - "3.12"
+          - "3.13"
+          - "3.14"
+          - "3.15"
+      fail-fast: false
+    name: Linux Python ${{ matrix.python-version }}
+    permissions:
+      contents: read
+    env:
+      COVERAGE_FILE: .coverage.py${{ matrix.python-version }}
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v7
+
+      - name: Install System Packages
+        run: |
+          sudo apt update
+          sudo apt install qttools5-dev-tools
+
+      - name: Install UV and Python
+        uses: astral-sh/setup-uv@v10.0.1
+        with:
+          python-version: ${{ matrix.python-version }}
+          enable-cache: true
+
+      - name: Install Dependencies
+        run: |
+          uv sync --no-dev --group test
+
+      - name: Build Assets
+        run: |
+          uv run --no-sync pkgutils.py qtlrelease
+          uv run --no-sync pkgutils.py sample
+
+      - name: Run Tests
+        run: |
+          export QT_QPA_PLATFORM=offscreen
+          uv run --no-sync coverage run -m pytest -v --timeout=60
+          uv run --no-sync coverage report --skip-covered --show-missing
+
+      - name: Upload Coverage Data
+        uses: actions/upload-artifact@v7
+        with:
+          name: coverage-data-py${{ matrix.python-version }}
+          path: ${{ env.COVERAGE_FILE }}
+          include-hidden-files: true
+          retention-days: 1
+
+  testMac:
+    runs-on: macos-latest
+    name: MacOS Python 3.14
+    permissions:
+      contents: read
+    env:
+      COVERAGE_FILE: .coverage.mac
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v7
+
+      - name: Install System Packages
+        run: |
+          brew install enchant
+
+      - name: Install UV and Python
+        uses: astral-sh/setup-uv@v10.0.1
+        with:
+          python-version: "3.14"
+          enable-cache: true
+
+      - name: Install Dependencies
+        run: |
+          uv sync --no-dev --group test
+
+      - name: Build Assets
+        run: |
+          uv run --no-sync pkgutils.py sample
+
+      - name: Run Tests
+        run: |
+          export QT_QPA_PLATFORM=offscreen
+          uv run --no-sync coverage run -m pytest -v --timeout=60
+          uv run --no-sync coverage report --skip-covered --show-missing
+
+      - name: Upload Coverage Data
+        uses: actions/upload-artifact@v7
+        with:
+          name: coverage-data-mac
+          path: ${{ env.COVERAGE_FILE }}
+          include-hidden-files: true
+          retention-days: 1
+
+  testWin:
+    runs-on: windows-latest
+    name: Windows Python 3.14
+    permissions:
+      contents: read
+    env:
+      COVERAGE_FILE: .coverage.win
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v7
+
+      - name: Install UV and Python
+        uses: astral-sh/setup-uv@v10.0.1
+        with:
+          python-version: "3.14"
+          enable-cache: true
+
+      - name: Install Dependencies
+        run: |
+          uv sync --no-dev --group test
+
+      - name: Build Assets
+        run: |
+          uv run --no-sync pkgutils.py sample
+
+      - name: Run Tests
+        run: |
+          uv run --no-sync coverage run -m pytest -v --timeout=60
+          uv run --no-sync coverage report --skip-covered --show-missing
+
+      - name: Upload Coverage Data
+        uses: actions/upload-artifact@v7
+        with:
+          name: coverage-data-win
+          path: ${{ env.COVERAGE_FILE }}
+          include-hidden-files: true
+          retention-days: 1
+
+  coverageReport:
+    name: PR Coverage Report
+    needs:
+      - testLinux
+      - testMac
+      - testWin
+    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v7
+
+      - name: Download Coverage Data
+        uses: actions/download-artifact@v8
+        with:
+          pattern: coverage-data-*
+          merge-multiple: true
+
+      - name: Install UV
+        uses: astral-sh/setup-uv@v10.0.1
+
+      - name: Combine Coverage Data
+        run: |
+          uvx coverage combine
+          uvx coverage report --skip-covered
+
+      - name: Build Comment Body
+        run: |
+          {
+            echo '<!-- coverage-report -->'
+            echo '### Coverage Report (Linux, macOS, Windows)'
+            echo
+            uvx coverage report --skip-covered --show-missing --format=markdown --precision=3
+            echo
+            echo "**Total: $(uvx coverage report --format=total --precision=3)%**"
+          } > coverage-comment.md
+
+      - name: Post PR Comment
+        env:
+          GH_TOKEN: ${{ github.token }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          REPO: ${{ github.repository }}
+        run: |
+          comment_id=$(gh api "repos/$REPO/issues/$PR_NUMBER/comments" --paginate --jq '.[] | select(.body | startswith("<!-- coverage-report -->")) | .id' | head -n1)
+          if [ -n "$comment_id" ]; then
+            gh api --method PATCH "repos/$REPO/issues/comments/$comment_id" -F body=@coverage-comment.md
+          else
+            gh pr comment "$PR_NUMBER" --body-file coverage-comment.md
+          fi
+
+  coverageSummary:
+    name: Action Coverage Report
+    needs:
+      - testLinux
+      - testMac
+      - testWin
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v7
+
+      - name: Download Coverage Data
+        uses: actions/download-artifact@v8
+        with:
+          pattern: coverage-data-*
+          merge-multiple: true
+
+      - name: Install UV
+        uses: astral-sh/setup-uv@v10.0.1
+
+      - name: Combine Coverage Data
+        run: |
+          uvx coverage combine
+          uvx coverage report --skip-covered
+
+      - name: Write Coverage Summary
+        run: |
+          {
+            echo '### Coverage Report (Linux, macOS, Windows)'
+            echo
+            uvx coverage report --skip-covered --show-missing --format=markdown --precision=3
+            echo
+            echo "**Total: $(uvx coverage report --format=total --precision=3)%**"
+          } >> "$GITHUB_STEP_SUMMARY"
+
+  testUbuntu24:
+    name: Ubuntu 24.04 & Sys Packages
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v7
+
+      - name: Install System Packages
+        run: |
+          sudo apt update
+          sudo apt install \
+            python3-pyqt6 \
+            python3-pyqt6.qtsvg \
+            python3-pytest \
+            python3-pytestqt \
+            python3-enchant \
+            python3-pytest-timeout \
+            qt6-image-formats-plugins
+
+      - name: Build Assets
+        run: |
+          python3 pkgutils.py sample
+
+      - name: Run Tests
+        run: |
+          export QT_QPA_PLATFORM=offscreen
+          python3 -m pytest -v --timeout=60
+
+  testFedoraLatest:
+    name: Fedora 44 & Sys Packages
+    runs-on: ubuntu-latest
+    container:
+      image: fedora:44
+    permissions:
+      contents: read
+    steps:
+      - name: Install System Packages
+        run: |
+          dnf -y update
+          dnf -y install \
+            git \
+            python3-enchant \
+            python3-pyqt6 \
+            python3-pytest \
+            python3-pytest-qt \
+            python3-pytest-timeout \
+            qt6-linguist \
+            qt6-qtimageformats
+
+      - name: Checkout Source
+        uses: actions/checkout@v7
+
+      - name: Run Build Commands
+        run: |
+          python pkgutils.py qtlrelease
+          python pkgutils.py sample
+
+      - name: Run Tests
+        run: |
+          export QT_QPA_PLATFORM=offscreen
+          python3 -m pytest -v --timeout=60

.gitignore

@@ -12,7 +12,9 @@ setup.iss
 /novelWriter.pyw
 /setup/macos/Info.plist
 /setup/windows/build
+.flatpak-builder
 .venv
+.env
 
 # Translations
 /novelwriter/assets/i18n/*.qm
@@ -20,13 +22,14 @@ setup.iss
 i18n/*.qm
 i18n/*.qph
 
+# Icons Themes Except Material Symbols
+/novelwriter/assets/icons/*.icons
+!/novelwriter/assets/icons/material_*.icons
+
 # Documentation
 /docs/build/
 /docs/source/locales/**/*.mo
-/novelwriter/assets/help/
 /novelwriter/assets/manual*.pdf
-*.qch
-*.qhc
 .~lock.*
 
 # Python Temp
@@ -35,27 +38,25 @@ __pycache__
 
 # Sample Project
 /novelwriter/assets/sample.zip
-/sample/cache
 /sample/meta
-*.bak
-*.lock
-ToC.txt
+/sample/**/*.bak
+/sample/*.lock
+/sample/ToC.txt
 
 # PyTest
 /prof/
 /htmlcov/
 /tests/temp
-/tests/lipsum/cache
-/tests/lipsum/meta
+/tests/_temp
 /.pytest_cache
 /pytestdebug.log
 
 # Coverage
 /.coverage
+/.coveragerc
 /coverage.*
 
 # Other
-/test.py
 .config
 .local
 *.patch
@@ -63,3 +64,15 @@ ToC.txt
 # IDE
 .vscode
 .ruff_cache
+
+# No AI files
+AGENTS.md
+CLAUSE.md
+GEMINI.md
+.claude/
+.cursor*
+.codex/
+.gemini/
+
+# Debug
+/debug/

CODE_OF_CONDUCT.md

@@ -1,132 +1,49 @@
-# Contributor Covenant Code of Conduct
+# Code of Conduct
 
-## Our Pledge
+## Purpose
 
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
+This repository should be welcoming and safe for everyone participating in good faith.
 
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
+All contributors and participants must be treated with respect, regardless of characteristics such
+as race, ethnicity, caste, colour, age, physical characteristics, neurodiversity, disability, sex
+or gender, gender identity or expression, sexual orientation, language, philosophy or religion,
+national or social origin, socio-economic position, level of education, or other status.
 
-## Our Standards
+## Expected Behaviour
 
-Examples of behavior that contributes to a positive environment for our
-community include:
+1. Be respectful and constructive in pull requests, issues, discussions, and comments
+2. Focus critique on ideas and code, not people
+3. Assume good faith, and communicate clearly and honestly
+4. Accept feedback gracefully and take responsibility for your contributions
 
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
+## Unacceptable Behaviour
 
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
+1. Harassment, abuse, intimidation, or threats
+2. Insults, personal attacks, or demeaning language
+3. Discrimination, stereotyping, or hateful conduct
+4. Sexualised or otherwise inappropriate conduct
+5. Sharing private or identifying information without permission
+6. Impersonation, deliberate misrepresentation, or other deceptive behaviour
+7. Spam or promotional content unrelated to the project
 
 ## Scope
 
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
+This Code of Conduct applies to interactions in this GitHub repository, including pull requests,
+issues, discussions, reviews, and comments.
+
+## Reporting
+
+If you believe this Code of Conduct has been violated, contact the repository owner via
+[github.com/vkbo](https://github.com/vkbo).
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at issues (at)
-novelwriter.io. All complaints will be reviewed and investigated promptly and
-fairly.
+Moderation options on GitHub are limited. Depending on severity and pattern of behaviour, the owner
+may edit or delete content, close or lock threads, and block users from further participation.
 
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
+Content that may violate GitHub platform rules may also be reported to GitHub for review.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
+This document is adapted from the Contributor Covenant 3.0:
+[https://www.contributor-covenant.org/version/3/0/](https://www.contributor-covenant.org/version/3/0/).

CONTRIBUTING.md

@@ -12,15 +12,75 @@ just make a pull request directly.
 * Bugfixes for new or existing bugs. Please also report new bugs in the issue tracker even if you
   also provide a fix. It makes it easier to keep track of what has been fixed and when.
 * Translations made via the [Crowdin project page](https://crowdin.com/project/novelwriter).
+* Translations of the documentation. These need to use Sphinx i18n tooling. Please start a
+  discussion before beginning such work as it requires some coordination.
 * Improvements to the documentation. Particularly if the documentation is unclear. Please don't
   make any larger changes to the documentation without discussing them with the maintainer first.
 * Adaptations, installation or packaging features targeting specific operating systems.
+* Using AI as a coding assistant is fine as long as the code is of good quality and the scope of
+  change is small, but do not generate large chunks of code. Generated code is not only hard to
+  maintain, but also poses licensing issues.
 
 **Please do not:**
 
 * Make a pull request that restructures or reformats existing code. If you think some part of the
   code could be improved, please make an issue thread or start a discussion. The same applies to
   any text document in the repository.
+* Make pull requests with AI generated code. This is not a project suitable for vibe coding.
+  Outright slop will result in the account being blocked.
+
+
+## Running from Source
+
+This project uses [uv](https://docs.astral.sh/uv/) to maintain dependencies. In order to run
+novelWriter directly from checked out source, simply call from the root folder with:
+
+```bash
+uv run novelwriter
+```
+
+To set up a development environment with all needed dependencies, run:
+
+```bash
+uv sync
+```
+
+Many tasks, like building assets from source, are handled by the `pkgutils.py` helper tool.
+This tool requires no dependencies, so you can either run it directly with Python, or `uv run`.
+
+```bash
+python pkgutils.py --help
+```
+
+The translation files needed at runtime can be built with:
+
+```bash
+python pkgutils.py qtlrelease
+```
+
+Material design icons are included with the source. Optional icon themes can be built with:
+
+```bash
+python pkgutils.py icons optional
+```
+
+
+### Running Tests
+
+* New code must not break any existing tests.
+* New code must come with tests that cover the code in full. This includes branch coverage. If the
+  code has branches that only runs on some OSes, they only need to be covered when test are run on
+  that OS. The test suite runs on Linux, Windows and MacOS.
+* It is ok to use `pragma` comments with `no cover` and `no branch` if the code is not expected to
+  touch those areas or branches.
+
+A helper script is provided for running tests. It simplifies coverage reporting and a few other
+things. Run the following to see all details:
+
+```bash
+uv run run_tests.py --help
+```
+
 
 ## Picking the Correct Branch for a Pull Request
 
@@ -29,81 +89,58 @@ If you are submitting a fix to a current release you must do so from the `releas
 make such a fix on the `main` branch, **it cannot be included in a patch release**. This also
 applies to the documentation for the latest release published on the main website.
 
-New features are only accepted on full releases, so a feature pull request must be made to the
-`main` branch. However, if the `main` branch is very close to a new full release, pull requests may
-not be merged until the release is completed.
+New features are only added in full releases, so a feature pull request must be made to the `main`
+branch. However, if the `main` branch is very close to a new full release, pull requests may not be
+merged until the release is completed.
 
-## Pull Request Check List
+This project uses GitHub milestones to plan releases, and only pull requests included in the
+current release cycle will be merged to `main`. Milestone tickets are not set in stone and are
+often moved to other milestones.
+
+
+### Pull Request Check List
 
 Make sure the pull request follows these rules:
 
 * The `main` branch is the default branch. For general changes, please make a new branch in your
   own fork from the current `main` branch. Do not make pull requests from your copy of the `main`
-  branch.
+  branch. The same applies to the `release` branch.
 * Please provide a description of the changes in the pull request under the summary section of the
-  pull request template, and reference any related issues by providing the issue number.
+  pull request template, and reference any related issues by providing the issue number. Do not
+  post links to issue numbers as that breaks the integration. Stating the issue number is enough.
 * Do not change the version number.
-* Do not submit files that were not actively changed but have otherwise been modified. This is
-  mostly an issue with translation files. The language tool may update all files in the `i18n`
-  folder.
+* Make sure the formatting and linting tools have been run before the pull request is made.
 
-## General Rules
 
-These are the guidelines for the project. The source code of novelWriter broadly follows the
-[PEP8](https://www.python.org/dev/peps/pep-0008) style guide, but with a few exceptions.
+## Code Style
 
-### Tests
+This code base uses camelCase convention for function and variable names. This differs from the
+common convention of snake_case in Python. The reason for this is that novelWriter is built on the
+Qt framework, where everything is camelCase.
 
-* New code must not break any existing tests.
-* New code must come with tests that cover the code in full. If the code has branches that only
-  runs on some OSes, they must be covered when test are run on that OS. The test suite runs on
-  Linux, Windows and MacOS.
+Pretty much everything else regarding formatting is handled by the linter and formatter. This
+project uses [ruff](https://docs.astral.sh/ruff/) for linting and formatting and
+[pyright](https://github.com/microsoft/pyright) for type checking. The settings for these tools
+are defined in `pyproject.toml`, and any submitted code must pass the following three commands:
 
-### Code Formatting
+```bash
+uv run ruff check
+uv run ruff format
+uv run pyright
+```
 
-* Do not run automatic formatting tools like `black` or `ruff` on the code. Auto-formatting using
-  `ruff` is planned, but there are a couple of features missing in it, so it is currently only used
-  for linting. Auto-formatting with `isort` is configured in `pyproject.toml` and can be used.
-* The pull request code *must* pass the `ruff` linting rules specified in `pyproject.toml`.
-* In general, do not make large scale formatting changes to the code.
+### Line Length
 
-### Type Annotations
+* The line length of the source code is enforced by the formatter, and is set to 120 characters.
+  Docstrings should be wrapped manually at 79 characters for better readability.
+* For text files, the text should be wrapped 120 character or less. The exception is Markdown image
+  tags and URLs which can run past that limit.
 
-* All functions and parameters must be type annotated, and so must variables and attributes if the
-  type cannot be inferred from the initial value. Typing rules are set in `pyproject.toml` and a
-  pull request must pass `pyright` with these settings.
-* Do not use the `Any` type when an actual type exists. `Any` is allowed for functions that
-  actually handles any kind of input and returns a standard type.
-* Do not use deprecated capitalised annotations like `Dict`, `List`, `Tuple`, etc.
-* Type annotated code must be runnable on all supported Python versions.
 
 ### Internationalisation
 
 * All comments and docstrings in the code must be in English.
 * All text presented to the user must be wrapped in calls to Qt's translation framework, and the
-  spelling of this text *must* be UK English. US English spelling is not allowed for these strings.
+  spelling of this text *must* be British English. US English spelling *is not allowed* for these
+  strings.
 * Commit descriptions and pull requests must also be in English.
-
-### Line Length
-
-* Source code lines can extend to the upper limit of 99 characters. Generally, if a code statement
-  requires multiple lines, the lines should wrap at 79 characters if possible. If wrapping can be
-  avoided by going to 99, then that is generally preferable. Readability has priority.
-* For text files, the text should be wrapped at 99 character. The exception is Markdown image tags
-  and URLs which can run past that limit.
-
-### Spaces, Indentation and Alignment
-
-* Only indentation by multiples of 4 spaces is allowed.
-* No trailing spaces should occur on any line in the source code, including empty lines.
-* Common line wrapping methods are allowed in the code except `\`, but avoid deep indentations.
-* Aligning operators and attributes in columns with multiple spaces is not allowed by PEP8. The
-  rule is relaxed a bit here. Alignment is allowed when populating large dictionaries or setting
-  many class attributes. It does improve readability in such cases, but should not be overused.
-
-### General Code Rules
-
-* Use f-string style for string formatting as the first choice, and `.format` functions if there is
-  a good reason for it. Do not use `%` style formatting except for logging output. For logging, `%`
-  must be used (it's a limitation in the logging library unfortunately).
-* Functions should be on camelCase form for consistency with the Qt library code.

CREDITS.md

@@ -6,11 +6,14 @@
 
 ## Contributors
 
+Larger contributions were made by:
+
 * Early Concept: Marian Lückhof
 * Internationalisation: Bruno Meneguello
 * Setup and Packaging: Rachel Powers
+* Vim Mode: Alexis Dumelie
 
-For other contributions, see the project's [Contributors](https://github.com/vkbo/novelWriter/graphs/contributors) page.
+For other contributions, see the project's [Contributors](https://github.com/saga-soft/novelWriter/graphs/contributors) page.
 
 ## Artwork
 
@@ -21,6 +24,7 @@ The artwork on the Welcome dialog was created by Louis Durrant.
 The default language is English (UK) with English (US) as an option. These are the original
 translators for the languages currently available:
 
+* **Catalan:** Jaume Planas (jaumeplanas)
 * **Czech:** Tomáš Zmek (perteus)
 * **Dutch:** Martijn van der Kleijn (mvdkleijn)
 * **French:** Jan Lüdke (jyhelle)
@@ -36,6 +40,7 @@ translators for the languages currently available:
 
 Additional larger translation contributions:
 
+* **Dutch:** Lise Blok (risingphoenix73)
 * **French:** Albert Aribaud (aaribaud)
 * **Portuguese:** Oli Maia (olimaia)
 
@@ -55,19 +60,67 @@ The following libraries are dependencies of novelWriter:
 * **Enchant** by Dom Lachowicz
 * **PyEnchant** by Dimitri Merejkowsky
 
-## Assets
+## Icon Themes
 
-Some of the assets bundled with novelWriter were adapted from the following sources:
+The default icon theme is a subset of icons from:
 
-* **Material Symbols** icons by Google Inc (Apache 2.0)
-* **Remix** icons by RemixIcon (Apache 2.0)
-* **Font Awesome** icons by Fonticons Inc (CC BY 4.0)
-* **Tomorrow** syntax themes by Chris Kempson (MIT License)
-* **Owl** syntax themes by Sarah Drasner (MIT License)
-* **Solarized** themes by Ethan Schoonover (MIT License)
-* **Cyberpunk Night** theme by Anders Lemvigh (CC BY-SA 4.0)
-* **Dracula** theme by Zeno Rocha (MIT License)
-* **Snazzy Light** theme by Florian Reuschel (MIT License)
+* **Material Symbols** by Google Inc (Apache 2.0)
+
+Additional icon themes may or may not be bundled with novelWriter, depending on license
+constraints. These themes include a subset of icons from:
+
+* **Font Awesome** by Fonticons Inc (CC BY 4.0)
+* **Remix** by RemixIcon (Apache 2.0 w/non-free clause)
+* **Lucide** by Cole Bemis and Lucide Contributors (ISC License)
+
+## Colour Themes
+
+Colour themes included with novelWriter were adapted from the following sources:
+
+* **Aura** themes by Dalton Menezes
+* **B2T** themes by Bram de Haan
+* **B4T** themes by Bram de Haan
+* **Catppuccin** themes by Catppuccin Org
+* **Dracula** theme by Zeno Rocha
+* **Espresso** theme by Sainnhe Park and Antoine Cotten
+* **Everforest** themes by Sainnhe Park
+* **Horizon** themes by Jonathan Olaleye
+* **New Moon** theme by Tania Rascia
+* **Noctis** themes by Liviu Schera and contributors
+* **Nord** theme by Sven Greb
+* **Owl** themes by Sarah Drasner
+* **Primer** themes by GitHub, Inc. and Myian
+* **Rosé Pine** themes by Rosé Pine
+* **Snazzy Light** theme by Florian Reuschel
+* **Solarized** themes by Ethan Schoonover
+* **Tango** themes by the Tango Desktop Project
+* **Tomorrow** themes by Chris Kempson
+
+Other themes were created for novelWriter:
+
+* **Aura Bright** theme by Myian
+* **Blue Streak** themes by Veronica Berglyd Olsen
+* **Castle** themes by Myian
+* **Chalky Soil** theme by Myian
+* **Chernozem** theme by Myian
+* **Cyberpunk Night** theme by Anders Lemvigh
+* **Dark Arts** theme by Myian
+* **Floral** themes by Myian
+* **Friendly** themes by Myian
+* **Full Moon** theme by Myian
+* **Jewel Case** themes by Myian
+* **LCARS** theme by Veronica Berglyd Olsen
+* **Nordlicht** theme by Myian
+* **Otium** themes by Myian
+* **Paragon** theme by Myian
+* **Ruby** themes by Myian
+* **Selenium** themes by Myian
+* **Sepia** themes by Myian
+* **Sultana** themes by Myian
+* **Today** themes by Veronica Berglyd Olsen
+* **Vivid** themes by Myian
+* **Warpgate** theme by Myian
+* **Waterlily** themes by Myian
 
 ## Fonts
 

MANIFEST.in

@@ -1,6 +0,0 @@
-include pkgutils.py
-include LICENSE.md
-include CREDITS.md
-include CHANGELOG.md
-recursive-include novelwriter/assets *
-recursive-include setup *

README.md

@@ -1,22 +1,16 @@
 # novelWriter
 
-[![Linux](https://github.com/vkbo/novelWriter/actions/workflows/test_linux.yml/badge.svg)](https://github.com/vkbo/novelWriter/actions/workflows/test_linux.yml)
-[![Windows](https://github.com/vkbo/novelWriter/actions/workflows/test_win.yml/badge.svg)](https://github.com/vkbo/novelWriter/actions/workflows/test_win.yml)
-[![MacOS](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml/badge.svg)](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml)
-[![Linting](https://github.com/vkbo/novelWriter/actions/workflows/syntax.yml/badge.svg)](https://github.com/vkbo/novelWriter/actions/workflows/syntax.yml)
-[![CodeCov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter)
+[![Tests](https://github.com/saga-soft/novelWriter/actions/workflows/tests.yml/badge.svg)](https://github.com/saga-soft/novelWriter/actions/workflows/tests.yml)
+[![Linting](https://github.com/saga-soft/novelWriter/actions/workflows/syntax.yml/badge.svg)](https://github.com/saga-soft/novelWriter/actions/workflows/syntax.yml)
+[![Cloudsmith](https://img.shields.io/badge/OSS%20hosting%20by-cloudsmith-blue?logo=cloudsmith&style=flat&link=https%3A%2F%2Fcloudsmith.com)](https://cloudsmith.com)
 
-<img align="left" style="margin: 0 0 4px 0;" src="https://raw.githubusercontent.com/vkbo/novelWriter/main/setup/novelwriter_readme.png">
+<img align="left" style="margin: 0 0 4px 0;" src="https://raw.githubusercontent.com/saga-soft/novelWriter/main/setup/novelwriter_readme.png">
 
 novelWriter is a plain text editor designed for writing novels assembled from many smaller text
 documents. It uses a minimal formatting syntax inspired by Markdown, and adds a meta data syntax
 for comments, synopsis, and cross-referencing. It's designed to be a simple text editor that allows
 for easy organisation of text and notes, using human readable text files as storage for robustness.
-
-The project storage is suitable for version control software, and also well suited for file
-synchronisation tools. All text is saved as plain text files with a meta data header. The core
-project structure is stored in a single project XML file. Other meta data is primarily saved as
-JSON files.
+The project format is well suited both for version control software and file synchronisation tools.
 
 For more details, and how to install and use novelWriter, please see the main website and
 documentation.
@@ -29,54 +23,65 @@ documentation.
 * PyPi Project: [pypi.org/project/novelWriter](https://pypi.org/project/novelWriter)
 * Social Media: [fosstodon.org/@novelwriter](https://fosstodon.org/@novelwriter)
 
-## Sponsors
+_This project is developed and maintained with care by actual humans._
+
+## Sponsors & Attribution
 
 <table style="border: none;">
 <tr>
-  <td><img align="left" style="height: 25px;" src="https://raw.githubusercontent.com/vkbo/novelWriter/main/setup/signpath_logo.png"></td>
+  <td><img align="left" style="width: 25px;" src="https://raw.githubusercontent.com/saga-soft/novelWriter/main/setup/signpath_logo.png"></td>
   <td>Free code signing on Windows provided by <a href="https://about.signpath.io/">SignPath.io</a>, certificate by <a href="https://signpath.org/">SignPath Foundation</a>.</td>
 </tr>
+<tr>
+  <td><img align="left" style="width: 25px;" src="https://raw.githubusercontent.com/saga-soft/novelWriter/main/setup/cloudsmith_logo.png"></td>
+  <td>Free package repository hosting is graciously provided by <a href="https://cloudsmith.com">Cloudsmith</a>.</td>
+</tr>
 </table>
 
+
 ## Implementation
 
-novelWriter is written with Python and Qt6 with PyQt6 Python binding. It is released on Linux,
-Windows and MacOS. It can in principle run on any Operating System that also supports Qt, PyQt and
-Python.
+novelWriter is written in Python and uses Qt6 with PyQt6 Python binding as the UI framework. It is
+released on Linux, Windows and MacOS. It can in principle run on any Operating System that also
+supports Qt, PyQt and Python.
 
 <p align="center">
-  <img width="80%" src="https://raw.githubusercontent.com/vkbo/novelWriter/main/setup/screenshot.png">
+  <img width="80%" src="https://raw.githubusercontent.com/saga-soft/novelWriter/main/setup/screenshot.png">
 </p>
 
+
 ## Project Contributions
 
 Please don't make feature pull requests without first having discussed them with the maintainer.
-You can make a feature request in the [issues tracker](https://github.com/vkbo/novelWriter/issues),
-or if the idea isn't fully formed, start a [discussion](https://github.com/vkbo/novelWriter/discussions).
-Please also don't make pull requests to reformat or rewrite existing code unless there is a very good reason for doing so.
+You can make a feature request in the [issues tracker](https://github.com/saga-soft/novelWriter/issues),
+or if the idea isn't fully formed, start a [discussion](https://github.com/saga-soft/novelWriter/discussions).
+Please also don't make pull requests to reformat or rewrite existing code unless there is a very
+good reason for doing so. Please do not submit AI generated content.
 
 Fixes and patches are welcome. Contributions related to packaging and installing novelWriter will
 also be appreciated, but please make an issue or a discussion topic first. Before contributing any
 code, please also read the full
-[Contributing Guide](https://github.com/vkbo/novelWriter/blob/main/CONTRIBUTING.md).
+[Contributing Guide](https://github.com/saga-soft/novelWriter/blob/main/CONTRIBUTING.md).
 
-Project credits are available in [CREDITS.md](https://github.com/vkbo/novelWriter/blob/main/CREDITS.md).
+Project credits are available in [CREDITS.md](https://github.com/saga-soft/novelWriter/blob/main/CREDITS.md).
 
 **Note:** New features and pre-releases are made on the `main` branch. Full releases are made from
 the `release` branch. So if you're submitting a fix to a current release, **including changes to
 documentation**, they must be made to the `release` branch.
 
+
 ### Translations
 
 New translations are always welcome. This project uses Crowdin to maintain translations, and you
 can contribute translations at the [Crowdin project page](https://crowdin.com/project/novelwriter).
 If you have any questions, feel free to post them to the
-[Translations of novelWriter](https://github.com/vkbo/novelWriter/issues/93) issue thread.
+[Translations of novelWriter](https://github.com/saga-soft/novelWriter/issues/93) issue thread.
+
 
 ## Licence
 
 This is Open Source software, and novelWriter is licenced under GPLv3. See the
 [GNU General Public License website](https://www.gnu.org/licenses/gpl-3.0.en.html) for more
-details, or consult the [License](https://github.com/vkbo/novelWriter/blob/main/LICENSE.md)
+details, or consult the [License](https://github.com/saga-soft/novelWriter/blob/main/LICENSE.md)
 document. Bundled assets and their licences are listed in the
-[Credits](https://github.com/vkbo/novelWriter/blob/main/CREDITS.md) document.
+[Credits](https://github.com/saga-soft/novelWriter/blob/main/CREDITS.md) document.

codecov.yml

@@ -1,22 +0,0 @@
-codecov:
-  require_ci_to_pass: yes
-
-coverage:
-  precision: 2
-  round: nearest
-  range: "70...95"
-
-  status:
-    project:
-      default:
-        threshold: 1%
-    patch: no
-    changes: no
-
-parsers:
-  gcov:
-    branch_detection:
-      conditional: yes
-      loop: yes
-      method: no
-      macro: no

docs/requirements.txt

@@ -1,8 +0,0 @@
-docutils>=0.17.1
-pygments>=2.7
-sphinx-book-theme
-sphinx-copybutton
-sphinx-design
-sphinx-favicon
-sphinx-intl
-sphinx>=5.0

docs/source/conf.py

@@ -1,7 +1,7 @@
 """
 Configuration file for the Sphinx documentation builder.
 Documentation: http://www.sphinx-doc.org/en/master/config
-"""
+"""  # noqa
 
 # -- Imports -----------------------------------------------------------------
 
@@ -14,23 +14,22 @@ import time
 project = "novelWriter"
 copyright = f"{datetime.date.today().year}"  # noqa: A001
 
-tmp_authors = ["Veronica Berglyd Olsen"]
-if additional := os.environ.get("SPHINX_I18N_AUTHORS"):
-    tmp_authors.extend(a.strip() for a in additional.split(","))
+if override_authors := os.environ.get("SPHINX_I18N_AUTHORS"):
+    author = override_authors
+else:
+    author = "Veronica Berglyd Olsen"
 
-author = ", ".join(tmp_authors)
-
-initFile = os.path.join(
-    os.path.dirname(__file__), os.pardir, os.pardir,
-    "novelwriter", "__init__.py"
-)
-with open(initFile, encoding="utf-8") as inFile:
-    for aLine in inFile:
-        if aLine.startswith("__version__"):
-            release = aLine.split('"')[1].strip()
-            break
-    else:
-        release = "unknown"
+if override_version := os.environ.get("SPHINX_I18N_VERSION"):
+    release = override_version
+else:
+    initFile = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, "novelwriter", "__init__.py")
+    with open(initFile, encoding="utf-8") as inFile:
+        for aLine in inFile:
+            if aLine.startswith("__version__"):
+                release = "20" + aLine.split('"')[1].strip()
+                break
+        else:
+            release = "unknown"
 
 version = release.partition("-")[0]
 
@@ -42,7 +41,7 @@ time.tzset()
 needs_sphinx = "5.0"
 extensions = ["sphinx_design", "sphinx_copybutton"]
 templates_path = ["_templates"]
-source_suffix = ".rst"
+source_suffix = {".rst": "restructuredtext"}
 master_doc = "index"
 today_fmt = "%A, %d %B %Y at %H:%M"
 language = "en"
@@ -63,12 +62,12 @@ html_theme_options = {
     },
     "show_toc_level": 2,
     "show_navbar_depth": 1,
-    "repository_url": "https://github.com/vkbo/novelwriter",
+    "repository_url": "https://github.com/saga-soft/novelwriter",
     "navigation_with_keys": True,
     "use_repository_button": True,
     "use_issues_button": True,
-    "pygment_light_style": "tango",
-    "pygment_dark_style": "dracula",
+    "pygments_light_style": "tango",
+    "pygments_dark_style": "dracula",
 }
 html_sidebars = {
     "**": ["navbar-logo", "sidebar-title", "sbt-sidebar-nav"],
@@ -79,13 +78,8 @@ html_sidebars = {
 latex_elements = {
     "papersize": "a4paper",
     "pointsize": "11pt",
-    "preamble": (
-        "\\usepackage[utf8]{inputenc}\n"
-        "\\DeclareUnicodeCharacter{2212}{\\textendash}\n"
-    ),
+    "preamble": ("\\usepackage[utf8]{inputenc}\n\\DeclareUnicodeCharacter{2212}{\\textendash}\n"),
     "figure_align": "htbp",
 }
 latex_logo = "_static/novelwriter-pdf.png"
-latex_documents = [(
-    master_doc, "manual.tex", None, author, "manual"
-)]
+latex_documents = [(master_doc, "manual.tex", None, author, "manual")]

docs/source/features/shortcuts.rst

@@ -19,7 +19,7 @@ Main Window Shortcuts
    :header: "Shortcut", "Description"
 
    ":kbd:`F1`",           "Open the online user manual"
-   ":kbd:`F5`",           "Open the **Build Manuscript** tool"
+   ":kbd:`F5`",           "Open the **Manuscript Build** tool"
    ":kbd:`F6`",           "Open the **Writing Statistics** tool"
    ":kbd:`F8`",           "Toggle **Focus Mode**"
    ":kbd:`F9`",           "Re-build the project's index"
@@ -88,7 +88,6 @@ Text Formatting Shortcuts
    ":kbd:`Ctrl+'`",       "Wrap selected text, or word under cursor, in single quotes"
    ":kbd:`Ctrl+""`",      "Wrap selected text, or word under cursor, in double quotes"
    ":kbd:`Ctrl+/`",       "Toggle comment format for block or selected text"
-   ":kbd:`Ctrl+0`",       "Remove format for block or selected text"
    ":kbd:`Ctrl+1`",       "Change block format to heading level 1"
    ":kbd:`Ctrl+2`",       "Change block format to heading level 2"
    ":kbd:`Ctrl+3`",       "Change block format to heading level 3"
@@ -101,6 +100,7 @@ Text Formatting Shortcuts
    ":kbd:`Ctrl+B`",       "Format selected text, or word under cursor, with bold"
    ":kbd:`Ctrl+D`",       "Format selected text, or word under cursor, with strike through"
    ":kbd:`Ctrl+I`",       "Format selected text, or word under cursor, with italic"
+   ":kbd:`Ctrl+M`",       "Highlight selected text, or word under cursor"
    ":kbd:`Ctrl+Shift+/`", "Remove format for block or selected text"
    ":kbd:`Ctrl+Shift+D`", "Toggle ignored text format for block or selected text"
 
@@ -111,23 +111,34 @@ Other Editor Shortcuts
 .. csv-table::
    :header: "Shortcut", "Description"
 
-   ":kbd:`F7`",             "Re-run the spell checker on the document"
-   ":kbd:`Ctrl+.`",         "Open the context menu at the current cursor location"
-   ":kbd:`Ctrl+A`",         "Select all text in the document"
-   ":kbd:`Ctrl+C`",         "Copy selected text to clipboard"
-   ":kbd:`Ctrl+K`",         "Activate the insert commands (see list in :ref:`docs_features_shortcuts_insert`)"
-   ":kbd:`Ctrl+R`",         "Open or reload the current document in the viewer"
-   ":kbd:`Ctrl+S`",         "Save the current document"
-   ":kbd:`Ctrl+V`",         "Paste text from clipboard to cursor position"
-   ":kbd:`Ctrl+W`",         "Close the current document"
-   ":kbd:`Ctrl+X`",         "Cut selected text to clipboard"
-   ":kbd:`Ctrl+Y`",         "Redo latest undo"
-   ":kbd:`Ctrl+Z`",         "Undo latest changes"
-   ":kbd:`Ctrl+Backspace`", "Delete the word before the cursor"
-   ":kbd:`Ctrl+Del`",       "Delete the word after the cursor"
-   ":kbd:`Ctrl+F7`",        "Toggle spell checking"
-   ":kbd:`Ctrl+Return`",    "Open the tag or reference under the cursor in the viewer"
-   ":kbd:`Ctrl+Shift+A`",   "Select all text in the current paragraph"
+   ":kbd:`F7`",                "Re-run the spell checker on the document"
+   ":kbd:`Ctrl+.`",            "Open the context menu at the current cursor location"
+   ":kbd:`Ctrl+A`",            "Select all text in the document"
+   ":kbd:`Ctrl+C`",            "Copy selected text to clipboard"
+   ":kbd:`Ctrl+K`",            "Activate the insert commands (see list in :ref:`docs_features_shortcuts_insert`)"
+   ":kbd:`Ctrl+R`",            "Open or reload the current document in the viewer"
+   ":kbd:`Ctrl+S`",            "Save the current document"
+   ":kbd:`Ctrl+V`",            "Paste text from clipboard to cursor position"
+   ":kbd:`Ctrl+W`",            "Close the current document"
+   ":kbd:`Ctrl+X`",            "Cut selected text to clipboard"
+   ":kbd:`Ctrl+Y`",            "Redo latest undo"
+   ":kbd:`Ctrl+Z`",            "Undo latest changes"
+   ":kbd:`Ctrl+0`",            "Reset zoom"
+   ":kbd:`Ctrl++`",            "Zoom in"
+   ":kbd:`Ctrl+=`",            "Zoom in"
+   ":kbd:`Ctrl+-`",            "Zoom out"
+   ":kbd:`Ctrl+_`",            "Zoom out"
+   ":kbd:`Ctrl+Backspace`",    "Delete the word before the cursor"
+   ":kbd:`Ctrl+Del`",          "Delete the word after the cursor"
+   ":kbd:`Ctrl+F7`",           "Toggle spell checking"
+   ":kbd:`Ctrl+Return`",       "Open the tag or reference under the cursor in the viewer"
+   ":kbd:`Ctrl+Shift+Return`", "Open the tag or reference under the cursor in the editor"
+   ":kbd:`Ctrl+Shift+A`",      "Select all text in the current paragraph"
+   ":kbd:`Ctrl+Shift+V`",      "Paste text as plain text from clipboard to cursor position"
+   ":kbd:`Ctrl+Left`",         "Move to previous word."
+   ":kbd:`Ctrl+Right`",        "Move to next word."
+   ":kbd:`Ctrl+Up`",           "Move to previous paragraph."
+   ":kbd:`Ctrl+Down`",         "Move to next paragraph."
 
 
 .. _docs_features_shortcuts_insert:
@@ -188,5 +199,10 @@ Document Viewer Shortcuts
    ":kbd:`Alt+Left`",     "Move backward in the view history"
    ":kbd:`Alt+Right`",    "Move forward in the view history"
    ":kbd:`Ctrl+C`",       "Copy selected text to clipboard"
+   ":kbd:`Ctrl+0`",       "Reset zoom"
+   ":kbd:`Ctrl++`",       "Zoom in"
+   ":kbd:`Ctrl+=`",       "Zoom in"
+   ":kbd:`Ctrl+-`",       "Zoom out"
+   ":kbd:`Ctrl+_`",       "Zoom out"
    ":kbd:`Ctrl+Shift+A`", "Select all text in the current paragraph"
    ":kbd:`Ctrl+Shift+R`", "Close the document viewer"

docs/source/features/story_comments.rst

@@ -51,7 +51,7 @@ Other analytical models propose tracking a scene's pace, how it affects the mood
 which element(s) of the story's genre are being satisfied. An author can use this mechanism to
 track any element of a scene. Some examples include time of day, how much time passes in the scene,
 or even the physical form of a shape-shifting character. If a story involves magic, one could track
-which wand a main character has in hand. It's up to tha author.
+which wand a main character has in hand. It's up to the author.
 
 When the story and other scene metadata is extracted into a tabular form, it is possible to get a
 comprehensive overview of the story and to identify possible issues. For example, so many

docs/source/features/vim_mode.rst

@@ -0,0 +1,115 @@
+.. _docs_features_vim_mode:
+
+********
+Vim Mode
+********
+
+.. _Vim: https://www.vim.org/
+
+Vim_ is a keyboard-centric text editor. "Vim mode" refers to another editor implementing the
+ability to perform a subset of vim motions. This will allow you to write, select, edit, copy,
+paste, navigate, etc, efficiently by using keyboard commands.
+
+Vim is modal. Three such modes have been implemented in novelWriter:
+
+- **Normal** mode is the default mode used to navigate text.
+- **Insert** mode is where you can write text like in a 'normal' text editor.
+- **Visual** mode is for selecting text, with:
+
+  - **Visual** mode for per character selection.
+  - **V-Line** mode for per-line selection.
+
+The vim mode setting is found in the **Features** section of the **Preferences**.
+
+.. note::
+
+   Vim mode is an advanced feature. When you enable it, the text editor will behave very
+   differently than a standard text editor. A label in the footer of the editor will show which of
+   the vim modes it is in.
+
+
+Mode Switching
+==============
+
+To switch between the various vim modes, these keystrokes implemented:
+
+.. csv-table::
+   :header: "From Mode", "To Mode", "Keystrokes"
+
+   "Normal", "Insert", ":kbd:`i`, :kbd:`I`, :kbd:`a`, :kbd:`A`, :kbd:`o`, :kbd:`O`"
+   "Insert", "Normal", ":kbd:`Esc`"
+   "Normal", "Visual", ":kbd:`v`, :kbd:`V`"
+
+You can exit visual mode back to normal mode by pressing :kbd:`Esc`, but all visual mode commands
+that logically "terminate" the visual mode usage will return you to normal mode.
+
+For instance, press :kbd:`V` to enter V-Line mode, select next word with :kbd:`w`. press :kbd:`y`
+to yank (copy), you are now automatically put back in normal mode as you have completed selecting
+your text.
+
+
+Implemented Keystrokes (Vim Motions)
+====================================
+
+The table below shows the vim motions currently implemented in novelWriter.
+
+.. csv-table::
+   :header: "Motion", "Mode(s)", "Description"
+
+   ":kbd:`i`",  "Normal → Insert", "Enter insert mode"
+   ":kbd:`I`",  "Normal → Insert", "Jump to first non-blank of line and enter insert"
+   ":kbd:`v`",  "Normal → Visual", "Enter character-wise visual mode"
+   ":kbd:`V`",  "Normal → V-Line", "Enter line-wise visual mode"
+   ":kbd:`dd`", "Normal",          "Delete (cut) current line"
+   ":kbd:`x`",  "Normal",          "Delete character under cursor"
+   ":kbd:`w`",  "Normal / Visual", "Move to next word start"
+   ":kbd:`b`",  "Normal / Visual", "Move to previous word start"
+   ":kbd:`e`",  "Normal / Visual", "Move to next word end"
+   ":kbd:`dw`", "Normal",          "Delete from cursor to next word start"
+   ":kbd:`de`", "Normal",          "Delete from cursor to next word end"
+   ":kbd:`db`", "Normal",          "Delete from cursor to previous word start"
+   ":kbd:`d$`", "Normal",          "Delete from cursor to end of line"
+   ":kbd:`yw`", "Normal",          "Yank (copy) from cursor to next word start"
+   ":kbd:`gg`", "Normal / Visual", "Jump to first line"
+   ":kbd:`G`",  "Normal / Visual", "Jump to last line"
+   ":kbd:`yy`", "Normal",          "Yank current line"
+   ":kbd:`p`",  "Normal",          "Paste after current line"
+   ":kbd:`P`",  "Normal",          "Paste before current line"
+   ":kbd:`o`",  "Normal → Insert", "Open new line below and enter insert"
+   ":kbd:`O`",  "Normal → Insert", "Open new line above and enter insert"
+   ":kbd:`$`",  "Normal / Visual", "Move to end of line"
+   ":kbd:`a`",  "Normal → Insert", "Enter insert after cursor"
+   ":kbd:`A`",  "Normal → Insert", "Enter insert at end of line"
+   ":kbd:`u`",  "Normal",          "Undo last change"
+   ":kbd:`zz`", "Normal",          "Centre cursor vertically"
+   ":kbd:`h`",  "Normal / Visual", "Move left"
+   ":kbd:`j`",  "Normal / Visual", "Move down"
+   ":kbd:`k`",  "Normal / Visual", "Move up"
+   ":kbd:`l`",  "Normal / Visual", "Move right"
+   ":kbd:`d`",  "Visual / V-Line", "Delete selection"
+   ":kbd:`x`",  "Visual / V-Line", "Delete selection"
+   ":kbd:`y`",  "Visual / V-Line", "Yank selection"
+   ":kbd:`0`",  "Visual",          "Move to start of line (extend selection)"
+
+
+Known Issues
+============
+
+* Currently, :kbd:`dd` on an empty line will not delete, but using :kbd:`x` will.
+* :kbd:`vypyy` will have :kbd:`ypyy` in command memory and thus not register :kbd:`yy`. Expected
+  behavior would be visual mode, yank, paste, yank line.
+* Differing behavior from vim: the :kbd:`e` command behaves a bit differently with regards to the
+  last character of a word. The behavior is inconsistent with vim but functional and still logical
+  to use. The cursor is placed at the end of the word after the last character rather than on the
+  last character.
+
+  .. code-block::
+
+     test
+        ^ Cursor placed here in vim
+     test
+         ^ Cursor placed here in novelWriter vim mode
+
+  You will only really ever notice this behavior if you try to combine the :kbd:`e` command with
+  another. For instance, :kbd:`de` will not delete the last character but delete forward as it
+  starts one character after the word boundary.

docs/source/index.rst

@@ -22,10 +22,10 @@ storage for robustness.
 * Documentation: https://docs.novelwriter.io
 * Public Releases: https://releases.novelwriter.io
 * Internationalisation: https://crowdin.com/project/novelwriter
-* Source Code: https://github.com/vkbo/novelWriter
-* Source Releases: https://github.com/vkbo/novelWriter/releases
-* Issue Tracker: https://github.com/vkbo/novelWriter/issues
-* Feature Discussions: https://github.com/vkbo/novelWriter/discussions
+* Source Code: https://github.com/saga-soft/novelWriter
+* Source Releases: https://github.com/saga-soft/novelWriter/releases
+* Issue Tracker: https://github.com/saga-soft/novelWriter/issues
+* Feature Discussions: https://github.com/saga-soft/novelWriter/discussions
 * PyPi Project: https://pypi.org/project/novelWriter
 * Social Media: https://fosstodon.org/@novelwriter
 
@@ -59,6 +59,7 @@ storage for robustness.
    user_interface/editor_viewer
    user_interface/split_and_merge
    user_interface/manuscript
+   user_interface/formatting
    user_interface/statistics
 
 .. toctree::
@@ -68,6 +69,7 @@ storage for robustness.
    features/dialogue
    features/story_comments
    features/shortcuts
+   features/vim_mode
 
 .. toctree::
    :caption: In-Depth Topics
@@ -75,6 +77,7 @@ storage for robustness.
 
    more/counting
    more/typography
+   more/dictionaries
    more/customise
    more/handling_errors
    more/project_format

docs/source/locales/authors_fr.conf

@@ -1,2 +0,0 @@
-# French translation authors, one name per line
-Jean-Michel Heras

docs/source/locales/config.toml

@@ -0,0 +1,3 @@
+[fr]
+version = "2.7"
+authors = ["Jean-Michel Heras", "Veronica Berglyd Olsen"]

docs/source/locales/fr/LC_MESSAGES/index.po

@@ -96,21 +96,20 @@ msgid "Internationalisation: https://crowdin.com/project/novelwriter"
 msgstr "Internationalisation: https://crowdin.com/project/novelwriter"
 
 #: ../../source/index.rst:25
-msgid "Source Code: https://github.com/vkbo/novelWriter"
-msgstr "Code source : https://github.com/vkbo/novelWriter"
+msgid "Source Code: https://github.com/saga-soft/novelWriter"
+msgstr "Code source : https://github.com/saga-soft/novelWriter"
 
 #: ../../source/index.rst:26
-msgid "Source Releases: https://github.com/vkbo/novelWriter/releases"
-msgstr "Source Releases: https://github.com/vkbo/novelWriter/releases"
+msgid "Source Releases: https://github.com/saga-soft/novelWriter/releases"
+msgstr "Source Releases: https://github.com/saga-soft/novelWriter/releases"
 
 #: ../../source/index.rst:27
-msgid "Issue Tracker: https://github.com/vkbo/novelWriter/issues"
-msgstr "Issue Tracker: https://github.com/vkbo/novelWriter/issues"
+msgid "Issue Tracker: https://github.com/saga-soft/novelWriter/issues"
+msgstr "Issue Tracker: https://github.com/saga-soft/novelWriter/issues"
 
 #: ../../source/index.rst:28
-msgid "Feature Discussions: https://github.com/vkbo/novelWriter/discussions"
-msgstr ""
-"Feature Discussions: https://github.com/vkbo/novelWriter/discussions"
+msgid "Feature Discussions: https://github.com/saga-soft/novelWriter/discussions"
+msgstr "Feature Discussions: https://github.com/saga-soft/novelWriter/discussions"
 
 #: ../../source/index.rst:29
 msgid "PyPi Project: https://pypi.org/project/novelWriter"

docs/source/locales/fr/LC_MESSAGES/more/customise.po

@@ -183,29 +183,29 @@ msgstr ""
 #: ../../source/more/customise.rst:78
 msgid ""
 "The existing syntax themes are stored in `novelwriter/assets/syntax "
-"<https://github.com/vkbo/novelWriter/tree/main/novelwriter/assets/"
+"<https://github.com/saga-soft/novelWriter/tree/main/novelwriter/assets/"
 "syntax>`_."
 msgstr ""
 "Les thèmes syntaxiques existants sont stockés dans `novelwriter/assets/"
-"syntax <https://github.com/vkbo/novelWriter/tree/main/novelwriter/assets/"
+"syntax <https://github.com/saga-soft/novelWriter/tree/main/novelwriter/assets/"
 "syntax>`_."
 
 #: ../../source/more/customise.rst:80
 msgid ""
 "The existing GUI themes are stored in `novelwriter/assets/themes <https://"
-"github.com/vkbo/novelWriter/tree/main/novelwriter/assets/themes>`_."
+"github.com/saga-soft/novelWriter/tree/main/novelwriter/assets/themes>`_."
 msgstr ""
 "Les thèmes GUI existants sont stockés dans `novelwriter/assets/themes "
-"<https://github.com/vkbo/novelWriter/tree/main/novelwriter/assets/"
+"<https://github.com/saga-soft/novelWriter/tree/main/novelwriter/assets/"
 "themes>`_."
 
 #: ../../source/more/customise.rst:82
 msgid ""
 "The existing icon themes are stored in `novelwriter/assets/icons <https://"
-"github.com/vkbo/novelWriter/tree/main/novelwriter/assets/icons>`_."
+"github.com/saga-soft/novelWriter/tree/main/novelwriter/assets/icons>`_."
 msgstr ""
 "Les thèmes d'icônes existants sont stockés dans `novelwriter/assets/icons "
-"<https://github.com/vkbo/novelWriter/tree/main/novelwriter/assets/icons>`_."
+"<https://github.com/saga-soft/novelWriter/tree/main/novelwriter/assets/icons>`_."
 
 #: ../../source/more/customise.rst:85
 msgid ""

docs/source/more/counting.rst

@@ -15,7 +15,7 @@ generated preview.
 Text Word Counts and Stats
 ==========================
 
-These are the rules for the main counts available for for each document in a project.
+These are the rules for the main counts available for each document in a project.
 
 For all counts, the following rules apply.
 
@@ -82,17 +82,17 @@ The following counts are available:
    The number of characters in all lines, including any comments and meta data text. Paragraph
    breaks are not counted, but in-paragraph hard line breaks are.
 
-**Character in Text**
+**Characters in Text**
    The number of characters in body text paragraphs. Paragraph breaks are not counted, but
    in-paragraph hard line breaks are.
 
 **Characters in Headings**
    The number of characters in headings.
 
-**Character in Text, No Spaces**
+**Characters in Text, No Spaces**
    The number of characters in body text paragraphs considered part of a word or punctuation. That
    is, white space characters are not counted.
 
-**Character in Headings, No Spaces**
+**Characters in Headings, No Spaces**
    The number of characters in headings considered part of a word or punctuation. That is, white
    space characters are not counted.

docs/source/more/customise.rst

@@ -1,94 +1,35 @@
 .. _docs_more_custom:
 
-**************
-Customisations
-**************
+*************
+Custom Themes
+*************
 
-.. _Enchant: https://rrthomas.github.io/enchant/
-.. _Free Desktop: https://cgit.freedesktop.org/libreoffice/dictionaries/tree/
-
-There are a few ways you can customise novelWriter yourself. Currently, you can add new GUI themes,
-your own syntax themes, and install additional dictionaries.
-
-
-.. _docs_more_custom_dict:
-
-Spell Check Dictionaries
-========================
-
-novelWriter uses Enchant_ as the spell checking tool. Depending on your operating system, it may or
-may not load all installed spell check dictionaries automatically.
-
-
-Linux and MacOS
----------------
-
-On Linux and MacOS, you generally only have to install hunspell, aspell or myspell dictionaries on
-your system like you do for other applications. See your distro or OS documentation for how to do
-this. These dictionaries should show up as available spell check languages in novelWriter.
-
-
-Windows
--------
-
-For Windows, English is included with the installation. For other languages you have to download
-and add dictionaries yourself.
-
-**Install Tool**
-
-A small tool to assist with this can be found under **Tools > Add Dictionaries**. It will import
-spell checking dictionaries from Free Office or Libre Office extensions. The dictionaries are then
-installed in the install location for the Enchant library and should thus work for any application
-that uses Enchant for spell checking.
-
-**Manual Install**
-
-If you prefer to do this manually or want to use a different source than the ones mentioned above,
-You need to get compatible dictionary files for your language. You need two files files ending with
-``.aff`` and ``.dic``. These files must then be copied to the following location: 
-
-``C:\Users\<USER>\AppData\Local\enchant\hunspell``
-
-This assumes your user profile is stored at ``C:\Users\<USER>``. The last one or two folders may
-not exist, so you may need to create them.
-
-You can find the various dictionaries on the `Free Desktop`_ website.
-
-.. note::
-   The Free Desktop link points to a repository, and what may look like file links inside the
-   dictionary folder are actually links to web pages. If you right-click and download those, you
-   get HTML files, not dictionaries!
-
-   In order to download the actual dictionary files, right-click the "plain" label at the end of
-   each line and download that.
+There are a few ways you can customise novelWriter yourself. Currently, you can relatively easily
+add new GUI themes. You can also add new icon themes, although this is not as straightforward.
 
 
 .. _docs_more_custom_theme:
 
-Syntax and GUI Themes
-=====================
+Colour Themes
+=============
 
-Adding your own GUI and syntax themes is relatively easy, although it requires that you manually
-edit config files with colour values. The themes are defined by simple plain text config files with
-meta data and colour settings.
+Adding your own colour themes is relatively easy, although it requires that you manually edit
+config files with colour values. The themes are defined in plain text files with meta data and
+colour settings, using the toml format,
 
 In order to make your own versions, first copy one of the existing files to your local computer and
 modify it as you like.
 
-* The existing syntax themes are stored in
-  `novelwriter/assets/syntax <https://github.com/vkbo/novelWriter/tree/main/novelwriter/assets/syntax>`_.
-* The existing GUI themes are stored in
-  `novelwriter/assets/themes <https://github.com/vkbo/novelWriter/tree/main/novelwriter/assets/themes>`_.
-* The existing icon themes are stored in
-  `novelwriter/assets/icons <https://github.com/vkbo/novelWriter/tree/main/novelwriter/assets/icons>`_.
+The existing colour themes are stored in
+`novelwriter/assets/themes <https://github.com/saga-soft/novelWriter/tree/main/novelwriter/assets/themes>`_.
 
 Remember to also change the name of your theme by modifying the ``name`` setting at the top of the
 file, otherwise you may not be able to distinguish them in **Preferences**.
 
 For novelWriter to be able to locate the custom theme files, you must copy them to the
-:ref:`docs_technical_locations_data` location in your home or user area. There should be a folder there named
-``syntax`` for syntax themes, just ``themes`` for GUI themes, and ``icons`` for icon themes. These
-folders are created the first time you start novelWriter.
+:ref:`docs_technical_locations_data` location in your home or user area. There should be a folder
+there named ``themes`` for colour themes. These folders are created the first time you start
+novelWriter.
 
 Once the files are copied there, they should show up in **Preferences** with the label you
 set as ``name`` inside the file.
@@ -99,71 +40,156 @@ set as ``name`` inside the file.
    files up to date.
 
 
-Custom GUI and Icons Theme
---------------------------
+The Theme File Format
+---------------------
 
-A GUI theme ``.conf`` file consists of the following settings:
+A colour theme ``.toml`` file consists of the following settings:
 
-.. code-block:: cfg
+.. code-block:: toml
+   :caption: The theme file for the "Default Light Theme"
 
    [Main]
-   name        = My Custom Theme
-   description = A description of my custom theme
-   author      = Jane Doe
-   credit      = John Doe
-   url         = https://example.com
-   license     = CC BY-SA 4.0
-   licenseurl  = https://creativecommons.org/licenses/by-sa/4.0/
+   name   = "Default Light Theme"
+   mode   = "light"
+   author = "Veronica Berglyd Olsen"
+   credit = "Veronica Berglyd Olsen"
+   url    = "https://github.com/saga-soft/novelWriter"
 
-   [Icons]
-   default         = 100, 100, 100
-   faded           = 100, 100, 100
-   red             = 255,   0,   0
-   orange          = 255, 128,   0
-   yellow          = 255, 255,   0
-   green           =   0, 255,   0
-   aqua            =   0, 255, 255
-   blue            =   0,   0, 255
-   purple          = 255,   0, 255
+   [Base]
+   base    = "#fcfcfc"
+   default = "#303030"
+   faded   = "#6c6c6c"
+   red     = "#a62a2d"
+   orange  = "#b36829"
+   yellow  = "#a39c34"
+   green   = "#296629"
+   cyan    = "#269999"
+   blue    = "#3a70a6"
+   purple  = "#b35ab3"
 
    [Project]
-   root            =   0, 255, 255
-   folder          = 255, 255,   0
-   file            = 100, 100, 100
-   title           =   0, 255,   0
-   chapter         = 255,   0,   0
-   scene           =   0,   0, 255
-   note            = 255, 255,   0
+   root     = "blue"
+   folder   = "yellow"
+   file     = "default"
+   title    = "green"
+   chapter  = "red"
+   scene    = "blue"
+   note     = "yellow"
+   active   = "green"
+   inactive = "red"
+   disabled = "faded"
+
+   [Icon]
+   tool      = "default"
+   sidebar   = "default"
+   accept    = "green"
+   reject    = "red"
+   action    = "blue"
+   option    = "orange"
+   apply     = "green"
+   create    = "yellow"
+   destroy   = "faded"
+   reset     = "green"
+   add       = "green"
+   change    = "green"
+   remove    = "red"
+   shortcode = "default"
+   markdown  = "orange"
+   system    = "yellow"
+   info      = "blue"
+   warning   = "orange"
+   error     = "red"
 
    [Palette]
-   window          = 100, 100, 100
-   windowtext      = 100, 100, 100
-   base            = 100, 100, 100
-   alternatebase   = 100, 100, 100
-   text            = 100, 100, 100
-   tooltipbase     = 100, 100, 100
-   tooltiptext     = 100, 100, 100
-   button          = 100, 100, 100
-   buttontext      = 100, 100, 100
-   brighttext      = 100, 100, 100
-   highlight       = 100, 100, 100
-   highlightedtext = 100, 100, 100
-   link            = 100, 100, 100
-   linkvisited     = 100, 100, 100
+   window          = "base:D105"
+   windowText      = "default"
+   base            = "base"
+   alternateBase   = "#e0e0e0"
+   text            = "default"
+   tooltipBase     = "#ffffc0"
+   tooltipText     = "#15150d"
+   button          = "#efefef"
+   buttonText      = "default"
+   brightText      = "base"
+   highlight       = "#3087c6"
+   highlightedText = "base"
+   link            = "blue"
+   linkVisited     = "blue"
+   accent          = "#3087c6"
 
    [GUI]
-   helptext        =   0,   0,   0
-   fadedtext       = 128, 128, 128
-   errortext       = 255,   0,   0
+   helpText     = "#5c5c5c"
+   fadedText    = "#6c6c6c"
+   errorText    = "red"
+   accentText   = "blue"
+   activeButton = "blue:96"
+   activeBase   = "#d7d7d7"
+   searchMatch  = "orange:96"
 
-In the Main section you must at least define the ``name`` settings.
+   [Syntax]
+   background     = "base"
+   text           = "default"
+   line           = "default:32"
+   link           = "blue"
+   headerText     = "green"
+   headerTag      = "green:L135"
+   emphasis       = "orange"
+   whitespace     = "orange:64"
+   dialog         = "blue"
+   altDialog      = "red"
+   note           = "yellow:D125"
+   hidden         = "faded"
+   shortcode      = "blue"
+   keyword        = "red"
+   tag            = "green"
+   value          = "green"
+   optional       = "blue"
+   spellCheckLine = "red"
+   errorLine      = "green"
+   replaceTag     = "green"
+   modifier       = "blue"
+   textHighlight  = "yellow:72"
 
-The Palette values correspond to the Qt enum values for ``QPalette::ColorRole``, see the
-`Qt documentation <https://doc.qt.io/qt-6/qpalette.html#ColorRole-enum>`_ for more details. The
-colour values are RGB numbers on the format ``r, g, b`` where each is an integer from ``0`` to
-``255``. Omitted values are not loaded and will use default values. If the ``helptext`` colour is
-not defined, it is computed as a colour between the ``window`` and ``windowtext`` colour.
-Additional shades of some of the colours are also computed. These are mainly used for 3D effects.
+
+Theme Sections
+--------------
+
+.. _ColorRole: https://doc.qt.io/qt-6/qpalette.html#ColorRole-enum
+
+The theme file is made up of different sections depending on what part of novelWriter the theme
+affects.
+
+.. csv-table:: Theme Sections Overview
+   :header: "Section", "Description"
+   :class: "tight-table"
+
+   "``[Main]``",    "Meta data about the theme, You must at least set ``name``, ``mode`` and ``author``, and ``mode`` must be either ``light`` or ``dark``."
+   "``[Base]``",    "The base colours of the theme. These are also selectable colours in various places inside the app, like for icon colours in **Preferences**."
+   "``[Project]``", "The colours used for icons and markers for the different project item types."
+   "``[Icon]``",    "The colours used for icons and buttons on the user interface. The names correspond to button and icon roles."
+   "``[Palette]``", "The colours used for styling the user interface. The values correspond to the ColorRole_ values in the Qt library."
+   "``[GUI]``",     "The colours used for styling additional elements of the user interface."
+   "``[Syntax]``",  "The colours used for syntax highlighting in documents."
+
+
+Colour Value Formats
+--------------------
+
+There are several ways to enter colour values:
+
+.. csv-table:: Colour Formats
+   :header: "Syntax", "Description"
+   :widths: 15, 85
+   :class: "tight-table"
+
+   "``#RRGGBB``",    "A CSS style hexadecimal values, like ``#ff0000`` for red."
+   "``#RRGGBBAA``",  "A CSS style hexadecimal values with transparency, like ``#ff00007f`` for half-transparent red."
+   "``name``",       "A name referring to one of the colours already specified under the ``[Base]`` section, like ``red``. Note that you should not use named colours in the ``[Base]`` section itself as that may have unintended results."
+   "``name:255``",   "A name referring to one of the colours already specified under the ``[Base]`` section, with a transparency value added. The value must be in the range ``0`` to ``255``, like ``red:127`` for half-transparent red."
+   "``name:L100``",  "A name referring to one of the colours already specified under the ``[Base]`` section, where the L-number is a percentage value that makes it lighter. The value must be greater than ``0``. ``L100`` means no change."
+   "``name:D100``",  "A name referring to one of the colours already specified under the ``[Base]`` section, where the D-number is a percentage value that makes it darker. The value must be greater than ``0``. ``D100`` means no change."
+   "``r, g, b``",    "A set of red, green and blue numbers in the range ``0`` to ``255``, like ``255, 0, 0`` for red."
+   "``r, g, b, a``", "A set of red, green, blue and alpha numbers in the range ``0`` to ``255``, like ``255, 0, 0, 127`` for half-transparent red."
 
 .. versionadded:: 2.5
    The ``fadedtext`` and ``errortext`` theme colour entries were added.
@@ -172,60 +198,113 @@ Additional shades of some of the colours are also computed. These are mainly use
    The ``icontheme`` setting was dropped as the icon theme is now its own setting.
    The ``[Icons]`` and ``[Project]`` sections were added, and the ``status*`` settings removed.
 
+.. versionadded:: 2.8
+   The ``[Syntax]`` section was moved into the main theme file. Previously, these settings were in
+   their own file. The ``[Icons]`` section was renamed to ``[Base]``, and a new ``[Icon]`` section
+   added for button and icon roles. Added the ``line`` and ``whitespace`` settings. Dropped the
+   ``license``, ``licenseurl``, and ``description`` settings. The  ``author`` field is now required
+   if the theme is included in the app, but not for user themes.
 
-Custom Syntax Theme
--------------------
+.. versionadded:: 26.2
+   The ``accentText``, ``activeButton``, ``activeBase`` and ``searchMatch`` settings were added to
+   the ``[GUI]`` section. The file format was also converted from conf to toml, and a number of the
+   colour settings were renamed to camelCase format. The following values were renamed:
 
-A syntax theme ``.conf`` file consists of the following settings:
+   * ``altaction`` to ``option``
+   * ``systemio`` to ``system``
+   * ``windowtext`` to ``windowText``
+   * ``alternatebase`` to ``alternateBase``
+   * ``tooltipbase`` to ``tooltipBase``
+   * ``tooltiptext`` to ``tooltipText``
+   * ``buttontext`` to ``buttonText``
+   * ``brighttext`` to ``brightText``
+   * ``highlightedtext`` to ``highlightedText``
+   * ``linkvisited`` to ``linkVisited``
+   * ``helptext`` to ``helpText``
+   * ``fadedtext`` to ``fadedText``
+   * ``errortext`` to ``errorText``
+   * ``headertext`` to ``headerText``
+   * ``headertag`` to ``headerTag``
+   * ``altdialog`` to ``altDialog``
+   * ``spellcheckline`` to ``spellCheckLine``
+   * ``errorline`` to ``errorLine``
+   * ``replacetag`` to ``replaceTag``
+   * ``texthighlight`` to ``textHighlight``
+
+
+Icon Themes
+===========
+
+Icon themes are *not* straightforward to add, but if you want to make the effort, this section
+describes how to do it.
+
+The existing icon themes are stored in
+`novelwriter/assets/icons <https://github.com/saga-soft/novelWriter/tree/main/novelwriter/assets/icons>`_.
+
+As with colour themes, remember to change the name of your theme by modifying the ``name`` setting
+at the top of the file, otherwise you may not be able to distinguish them in **Preferences**.
+
+For novelWriter to be able to locate the custom theme files, you must copy them to the
+:ref:`docs_technical_locations_data` location in your home or user area. There should be a folder
+there ``icons`` for icon themes. These folders are created the first time you start novelWriter.
+
+
+The Icons File Format
+---------------------
+
+Icon themes are kept in files with the ``.icons`` file extension. The file format is a custom
+format with entries on the form ``section:key = value``.
 
 .. code-block:: cfg
+   :caption: The icons file for "Material Symbols - Rounded Medium" (truncated)
 
-   [Main]
-   name       = My Syntax Theme
-   author     = Jane Doe
-   credit     = John Doe
-   url        = https://example.com
-   license    = CC BY-SA 4.0
-   licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
+   # Meta
+   meta:name    = Material Symbols - Rounded Medium
+   meta:author  = Google Inc
+   meta:license = Apache 2.0
 
-   [Syntax]
-   background     = 255, 255, 255
-   text           =   0,   0,   0
-   link           =   0,   0,   0
-   headertext     =   0,   0,   0
-   headertag      =   0,   0,   0
-   emphasis       =   0,   0,   0
-   dialog         =   0,   0,   0
-   altdialog      =   0,   0,   0
-   note           =   0,   0,   0
-   hidden         =   0,   0,   0
-   shortcode      =   0,   0,   0
-   keyword        =   0,   0,   0
-   tag            =   0,   0,   0
-   value          =   0,   0,   0
-   optional       =   0,   0,   0
-   spellcheckline =   0,   0,   0
-   errorline      =   0,   0,   0
-   replacetag     =   0,   0,   0
-   modifier       =   0,   0,   0
-   texthighlight  = 255, 255, 255, 128
+   # Icons
+   icon:alert_error     = <svg ...>
+   icon:alert_info      = <svg ...>
+   icon:alert_question  = <svg ...>
+   icon:alert_warn      = <svg ...>
+   icon:cls_archive     = <svg ...>
+   icon:cls_character   = <svg ...>
+   icon:cls_custom      = <svg ...>
+   icon:cls_entity      = <svg ...>
+   icon:cls_none        = <svg ...>
+   icon:cls_novel       = <svg ...>
+   icon:cls_object      = <svg ...>
+   icon:cls_plot        = <svg ...>
+   icon:cls_template    = <svg ...>
+   icon:cls_timeline    = <svg ...>
+   icon:cls_trash       = <svg ...>
+   icon:cls_world       = <svg ...>
 
-In the Main section, you must define at least the ``name`` setting. The Syntax colour values are
-RGB(A) numbers of the format ``r, g, b, a`` where each is an integer from ``0`` to ``255``. The
-fourth value is the alpha channel, which can be omitted.
+The icon keys are associated with icon placement locations inside novelWriter, and the template for
+them is defined in the script that generates the default icon themes.
 
-Omitted syntax colours default to black, except ``background`` which defaults to white, and
-``texthighlight`` which defaults to white with half transparency.
+The script can be found under
+`utils/icon_themes.py <https://github.com/saga-soft/novelWriter/blob/main/utils/icon_themes.py>`__
+in the source code.
 
-.. versionadded:: 2.2
-   The ``shortcode`` syntax colour entry was added.
+This file includes all the code needed to generate the themes that are included in novelWriter. The
+icon keys are mapped to icon keys from the specific themes in JSON files in the ``icon_themes``
+folder next to the script. This is the recommended way to generate these themes. Doing it manually
+is not advisable.
 
-.. versionadded:: 2.3
-   The ``optional`` syntax colour entry was added.
 
-.. versionadded:: 2.4
-   The ``texthighlight`` syntax colour entry was added.
+Icon Value Format
+-----------------
 
-.. versionadded:: 2.5
-   The ``dialog``, ``altdialog``, ``note`` and ``tag`` syntax colour entries were added.
-   ``straightquotes``, ``doublequotes`` and ``singlequotes`` were removed.
+As can be seen from the example, an icon is defined in the ``icon`` section with a key and an
+in-line SVG XML block. The XML must fit on one line and obey the following rules:
+
+#. It must be single colour, that is, the fill colour attribute must be able to colourise the
+   entire icon.
+#. The fill colour attribute *must* be defined and must be set to: ``fill="#000000"``. This value
+   is replaced by the relevant theme colour when the icon is processed in novelWriter.
+ 
+.. versionadded:: 2.7
+   The icon theme files were added. Previously, icons were stored as individual SVG files with a
+   config file mapping the file names to the internal icon keys.

docs/source/more/dictionaries.rst

@@ -0,0 +1,47 @@
+.. _docs_more_dictionaries:
+
+************************
+Spell Check Dictionaries
+************************
+
+.. _Enchant: https://rrthomas.github.io/enchant/
+
+Spell checking is provided by the Enchant_ library. Depending on your operating system, it may or
+may not load all installed spell check dictionaries automatically.
+
+
+Linux and MacOS
+===============
+
+On Linux and MacOS, you generally only have to install hunspell, aspell or myspell dictionaries on
+your system like you do for other applications. See your distro or OS documentation for how to do
+this. These dictionaries should show up as available spell check languages in novelWriter.
+
+
+Windows
+=======
+
+For Windows, English is included with the installation. For other languages you have to download
+and add dictionaries yourself.
+
+
+Install Tool
+------------
+
+A small tool to assist with this can be found under **Tools > Add Dictionaries**. It will import
+spell checking dictionaries from Free Office or Libre Office extensions. The dictionaries are then
+installed in the install location for the Enchant library and should thus work for any application
+that uses Enchant for spell checking.
+
+
+Manual Install
+--------------
+
+If you prefer to do this manually or want to use a different source than the ones mentioned above,
+You need to get compatible dictionary files for your language. You need two files ending with
+``.aff`` and ``.dic``. These files must then be copied to the following location: 
+
+``C:\Users\<USER>\AppData\Local\enchant\hunspell``
+
+This assumes your user profile is stored at ``C:\Users\<USER>``. The last one or two folders may
+not exist, so you may need to create them.

docs/source/more/typography.rst

@@ -76,7 +76,7 @@ right single quotation marks, depending on the font. There is a Wikipedia articl
 
 .. note::
 
-   On export with the **Build Manuscript** tool, these apostrophes will be replaced
+   On export with the **Manuscript Build** tool, these apostrophes will be replaced
    automatically with the corresponding right hand single quote symbol as is generally recommended.
    Therefore it doesn't really matter if you only use them to correct syntax highlighting in some
    places, and not others.

docs/source/technical/source.rst

@@ -4,9 +4,10 @@
 Running from Source
 *******************
 
-.. _GitHub: https://github.com/vkbo/novelWriter/releases
+.. _GitHub: https://github.com/saga-soft/novelWriter/releases
 .. _PyPi: https://pypi.org/project/novelWriter/
 .. _Sphinx Docs: https://www.sphinx-doc.org/
+.. _uv: https://docs.astral.sh/uv/
 
 This chapter describes various ways of running novelWriter directly from the source code, and how
 to build the various components like the translation files and documentation.
@@ -28,6 +29,7 @@ by running:
 
 .. _docs_technical_source_depend:
 
+
 Dependencies
 ============
 
@@ -43,11 +45,20 @@ The following Python packages are needed to run all features of novelWriter:
 If you want spell checking, you must install the ``PyEnchant`` package. The spell check library
 must be at least 3.0 to work with Windows. On Linux, 2.0 also works fine.
 
-If you install from PyPi, these dependencies should be installed automatically. If you install from
-source, dependencies can still be installed from PyPi with:
+If you install novelWriter from PyPi, these dependencies should be installed automatically.
+
+You can run novelWriter directly from source with uv_ or another similar tool:
 
 .. code-block:: bash
 
+   uv run novelwriter
+
+If you prefer to install dependencies using ``pip``, you must first generate the
+``requirements.txt`` file:
+
+.. code-block:: bash
+
+   python pkgutils.py gen-req
    pip install -r requirements.txt
 
 .. note::
@@ -136,12 +147,14 @@ running:
 Building the Documentation
 ==========================
 
-A local copy of this documentation can be generated as HTML. This requires installing some Python
-packages from PyPi:
+A local copy of this documentation can be generated as HTML.
+
+If you're using ``pip``, you must first generate the ``requirements.txt`` file:
 
 .. code-block:: bash
 
-   pip install -r docs/requirements.txt
+   python pkgutils.py gen-req docs
+   pip install -r requirements.txt
 
 The documentation can then be built from the root folder in the source code by running:
 
@@ -149,6 +162,12 @@ The documentation can then be built from the root folder in the source code by r
 
    make -C docs html
 
+Or you can run directly with uv_ or similar tools:
+
+.. code-block:: bash
+
+   uv run make -C docs html
+
 If successful, the documentation should be available in the ``docs/build/html`` folder and you can
 open the ``index.html`` file in your browser.
 

docs/source/technical/storage.rst

@@ -190,4 +190,4 @@ Statistics** tool. If this file is lost, the history it contains is also lost, b
 no impact on the project.
 
 Each session is recorded as a JSON object on a single line of the file. Each session record is
-appended tot he file.
+appended to the file.

docs/source/technical/tests.rst

@@ -4,23 +4,12 @@
 Running Tests
 *************
 
+.. _uv: https://docs.astral.sh/uv/
+
 The novelWriter source code is well covered by tests. The test framework used for the development
 is ``pytest`` with the use of an extension for Qt.
 
 
-Dependencies
-============
-
-The dependencies for running the tests can be installed with:
-
-.. code-block:: bash
-
-   pip install -r tests/requirements.txt
-
-This will install a couple of extra packages for coverage and test management. The minimum
-requirement is ``pytest`` and ``pytest-qt``.
-
-
 Simple Test Run
 ===============
 
@@ -28,19 +17,35 @@ To run the tests, you simply need to execute the following from the root of the
 
 .. code-block:: bash
 
-   pytest
+   uv run pytest
+
+This uses uv_. See below for manually installing dependencies using ``pip``.
 
 Since several of the tests involve opening up the novelWriter GUI, you may want to disable the GUI
 for the duration of the test run. Moving your mouse while the tests are running may otherwise
 interfere with the execution of some tests.
 
-You can disable the renderring of the GUI by setting the flag ``QT_QPA_PLATFORM=offscreen``:
+You can disable the rendering of the GUI by setting the flag ``QT_QPA_PLATFORM=offscreen``:
 
 .. code-block:: bash
 
    export QT_QPA_PLATFORM=offscreen pytest
 
 
+Dependencies
+------------
+
+To generate the requirements file and install dependencies using ``pip``, run:
+
+.. code-block:: bash
+
+   python pkgutils.py gen-req app test
+   pip install -r tests/requirements.txt
+
+This will install a couple of extra packages for coverage and test management. The minimum
+requirement is ``pytest`` and ``pytest-qt``.
+
+
 Advanced Options
 ================
 

docs/source/usage/advanced_formatting.rst

@@ -56,6 +56,20 @@ activated by clicking the left-most icon button in the editor header.
 .. versionadded:: 2.2
 
 
+.. _docs_usage_formatting_shortcodes_break:
+
+Forced Line Break
+-----------------
+
+Inserting ``[br]`` in the text will ensure a line break is always inserted in that place, even if
+you turn off **Preserve Hard Line Breaks** in your **Manuscript Build** settings.
+
+You can add a manual line break after it too, for a better visual representation in the editor, but
+keep in mind that this line break is removed before the text is processed, so the text on either
+side of the ``[br]`` shortcode will be considered as belonging to the same line. This can affect
+how alignment is treated. See :ref:`docs_usage_align_indent_forced` for more details.
+
+
 .. _docs_usage_formatting_breaks:
 
 Vertical Space and Page Breaks

docs/source/usage/alignment_and_indent.rst

@@ -53,18 +53,33 @@ the entire paragraph. For the following text, all lines will be centred:
 
 .. code-block:: md
 
-   >> I am the very model of a modern Major-General
+   >> I am the very model of a modern Major-General <<
    I've information vegetable, animal, and mineral
    I know the kings of England, and I quote the fights historical
-   From Marathon to Waterloo, in order categorical <<
+   From Marathon to Waterloo, in order categorical
+
+If you have multiple conflicting alignments on a paragraph, only one is applied. The order of
+precedence is:
+
+#. Left alignment
+#. Right alignment
+#. Centred text
+#. Justified text
+
+.. note::
+
+   It is strongly recommended that you keep the **Preserve Hard Line Breaks** setting enabled in
+   your manuscript build settings. This setting assumes all single line breaks in your text are
+   intended. Turning this off makes adding line breaks more complicated, but it is still possible.
+   See :ref:`docs_usage_align_indent_forced`.
 
 
 Alignment with First Line Indent
 ================================
 
 If you have first line indent enabled in your manuscript build settings, you probably want to
-disable it for text in verses. Adding any alignment tags will cause the first line indent to be
-switched off for that paragraph.
+disable it for text in verses. Adding any alignment tags on a paragraph will cause the first
+line indent to be switched off for that paragraph.
 
 :bdg-info:`Example`
 
@@ -76,3 +91,35 @@ The following text will always be aligned against the left margin:
    I've information vegetable, animal, and mineral
    I know the kings of England, and I quote the fights historical
    From Marathon to Waterloo, in order categorical
+
+
+.. _docs_usage_align_indent_forced:
+
+Alignment with Forced Line Breaks
+=================================
+
+If you turn off **Preserve Hard Line Breaks** in your manuscript build settings, you can still
+force line breaks in paragraphs using the ``[br]`` shortcode. For clarity in the text, you can add
+a line break after it as well. It doesn't result in two line breaks.
+
+Keep in mind that when the text is processed, the lines on either side of a ``[br]`` shortcode are
+combined, and any trailing hard line break is *ignored*. This means that when such a paragraph is
+processed, these line breaks count as the same line. This affects how alignment tags are handled.
+For instance, this text becomes centred instead of left aligned.
+
+.. code-block:: md
+
+   >> I am the very model of a modern Major-General[br]
+   I've information vegetable, animal, and mineral[br]
+   I know the kings of England, and I quote the fights historical[br]
+   From Marathon to Waterloo, in order categorical <<
+
+Since this is understood as one line, this is the only way you can actually centre this paragraph.
+
+.. caution::
+
+   Due to this difference in how text with ``[br]`` tags are processed, it is generally better to
+   stick with the **Preserve Hard Line Breaks** setting enabled. It ensures a better correspondence
+   between what you see in the editor and what output you get.
+
+See also :ref:`docs_usage_formatting_shortcodes_break`.

docs/source/usage/basic_formatting.rst

@@ -64,19 +64,31 @@ A minimal set of Markdown text emphasis styles are supported for text paragraphs
 ``**text**``
    The text is rendered as strongly emphasised text (bold).
 
+``*text*`` (optional)
+   The text is also rendered as strongly emphasised text (bold).
+
 ``~~text~~``
    Strike through text.
 
+``==text==``
+   The text is highlighted.
+
 In Markdown guides it is often recommended to differentiate between strong emphasis and emphasis
 by using ``**`` for strong and ``_`` for emphasis, although Markdown generally also supports ``__``
 for strong and ``*`` for emphasis. However, since the differentiation makes the highlighting and
 conversion significantly simpler and faster, in novelWriter this is a rule, not just a
 recommendation.
 
-In addition, the following rules apply:
+As of version 2026.1, it is possible to enable ``*text*`` for bold text. This has become a very
+common notation in many user interfaces, and is now also supported by novelWriter. It can be
+enabled in **Preferences** in the **Text Editing** section. Enabling this will not disable
+``**text**`` as bold, but will allow both formats. It will, however, change the format button and
+:kbd:`Ctrl+B` to use a single asterisk instead of two.
 
-1. The emphasis and strike through formatting tags do not allow spaces between the words and the
-   tag itself. That is, ``**text**`` is valid, ``**text **`` is not.
+In general, the following rules apply:
+
+1. The emphasis, strike through and highlight formatting tags do not allow spaces between the words
+   and the tag itself. That is, ``**text**`` is valid, ``**text **`` is not.
 2. More generally, the delimiters must be on the outer edge of words. That is, ``some **text in
    bold** here`` is valid, ``some** text in bold** here`` is not.
 3. If using both ``**`` and ``_`` to wrap the same text, the underscore must be the **inner**

docs/source/usage/chapters_and_scenes.rst

@@ -45,7 +45,7 @@ manuscript. The chapter and scenes headings are also displayed in the
 ``## Chapter Title``
    This is a heading level two. This heading indicates the start of a new chapter. Chapter numbers
    can be inserted automatically when building the manuscript, so you don't have to do this in the
-   title. See :ref:`docs_ui_manuscript_head_numbers` for more details.
+   title. See :ref:`docs_ui_manuscript_formatting_head_numbers` for more details.
 
 ``### Scene Title``
    This is a heading level three. This heading indicates the start of a new scene. Scene numbers or
@@ -78,11 +78,11 @@ want to keep the use cases in mind while writing.
 ``###! Scene Title``
    This is an alternative scene heading that can be formatted differently in the **Manuscript
    Build** tool. It is intended for separating "soft" and "hard" scene breaks. Aside from this, it
-   behaves identically to a regular scene heading. See :ref:`docs_ui_manuscript_head_hard_soft`
-   for more details.
+   behaves identically to a regular scene heading.
+   See :ref:`docs_ui_manuscript_formatting_head_hard_soft` for more details.
 
 The formatting of these headings can be customised quite extensively in the
-:ref:`Manuscript Tool <docs_ui_manuscript>`, which is covered in a separate part of the
+:ref:`Manuscript Tool <docs_ui_manuscript_formatting>`, which is covered in a separate part of the
 documentation.
 
 .. note::
@@ -94,3 +94,8 @@ Page breaks can be automatically added before titles, partition, chapter and sce
 the **Manuscript Build** tool when you build your project to a format that supports page breaks.
 If you want page breaks in other places, you have to specify them manually.
 See :ref:`docs_usage_formatting_breaks` for more details.
+
+.. note::
+
+   When you build a manuscript from your project, the level of the headings in your document will
+   change. See :ref:`docs_ui_manuscript_formatting_head_promote` for more details.

docs/source/usage/howto.rst

@@ -4,7 +4,7 @@
 Tips & Tricks
 *************
 
-.. _Discussions Page: https://github.com/vkbo/novelWriter/discussions
+.. _Discussions Page: https://github.com/saga-soft/novelWriter/discussions
 
 This is a list of hopefully helpful little tips on how to get the most out of novelWriter.
 
@@ -13,8 +13,8 @@ This is a list of hopefully helpful little tips on how to get the most out of no
    contribute, or start a discussion on the project's `Discussions Page`_.
 
 
-Managing the Project
-====================
+Your Project
+============
 
 .. dropdown:: How do I create a project from a template?
    :animate: fade-in-slide-down
@@ -42,6 +42,57 @@ Managing the Project
    Settings** from the respective configuration tabs. You can then import these labels in another
    project.
 
+.. dropdown:: How do I add introductory text to chapters?
+   :animate: fade-in-slide-down
+
+   Sometimes chapters have a short preface, like a brief piece of text or a quote to set the stage
+   before the first scene begins.
+
+   If you add separate files for chapters and scenes, the chapter file is the perfect place to add
+   such text. Separating chapter and scene files also allows you to make scene files child
+   documents of the chapter.
+
+.. dropdown:: How do I distinguishing between soft and hard scene breaks?
+   :animate: fade-in-slide-down
+
+   Depending on your writing style, you may need to separate between soft and hard scene breaks
+   within chapters. Like for instance if you switch point-of-view character often.
+
+   In such cases you may want to use different scene headings for hard and soft scene breaks. The
+   **Manuscript Build** tool will let you define a different format for scenes using the ``###``
+   and ``###!`` heading codes when you generate your manuscript. You can for instance add the
+   common "``* * *``" for hard breaks and select to hide soft scene breaks, which will just insert
+   an empty paragraph in their place. See :ref:`docs_ui_manuscript_settings` for more details.
+
+   .. versionadded:: 2.4
+
+.. dropdown:: How can I set the language for my manuscript?
+   :animate: fade-in-slide-down
+
+   The language set for manuscript documents like Open Document and Word Document is taken from
+   your project language setting in **Project Settings**. Only some languages are available here,
+   but you can override the language information by setting the "Override Document Language" value
+   in your Manuscript Build settings to a valid language code. The code uses the
+   `IETF BCP 47 language tag <https://en.wikipedia.org/wiki/IETF_language_tag>`__ format.
+
+   Examples: ``en`` for English, ``de`` for German, etc.
+
+   If you want to help add new languages to novelWriter, see: :ref:`docs_contributing`.
+
+   .. versionadded:: 2.8
+
+
+The Application
+===============
+
+.. dropdown:: How can I increase the line height?
+   :animate: fade-in-slide-down
+
+   Unfortunately, in this case, novelWriter uses the plain text editor component of the underlying
+   framework (called Qt) which doesn't support changing the line height. However, you can choose an
+   editor font with larger leading (the spacing between the lines). A good font for this case is
+   `Noto <https://fonts.google.com/noto>`__, which comes in both Sans-Serif and Serif.
+
 
 Layout Tricks
 =============
@@ -79,34 +130,6 @@ Layout Tricks
    See :ref:`docs_usage_align_indent` for more details.
 
 
-Organising Your Text
-====================
-
-.. dropdown:: How do I add introductory text to chapters?
-   :animate: fade-in-slide-down
-
-   Sometimes chapters have a short preface, like a brief piece of text or a quote to set the stage
-   before the first scene begins.
-
-   If you add separate files for chapters and scenes, the chapter file is the perfect place to add
-   such text. Separating chapter and scene files also allows you to make scene files child
-   documents of the chapter.
-
-.. dropdown:: How do I distinguishing between soft and hard scene breaks?
-   :animate: fade-in-slide-down
-
-   Depending on your writing style, you may need to separate between soft and hard scene breaks
-   within chapters. Like for instance if you switch point-of-view character often.
-
-   In such cases you may want to use different scene headings for hard and soft scene breaks. The
-   **Build Manuscript** tool will let you define a different format for scenes using the ``###``
-   and ``###!`` heading codes when you generate your manuscript. You can for instance add the
-   common "``* * *``" for hard breaks and select to hide soft scene breaks, which will just insert
-   an empty paragraph in their place. See :ref:`docs_ui_manuscript_settings` for more details.
-
-   .. versionadded:: 2.4
-
-
 Other Tools
 ===========
 

docs/source/usage/introduction.rst

@@ -5,9 +5,11 @@ Introduction
 ************
 
 .. _Markdown: https://en.wikipedia.org/wiki/Markdown
+.. _Contributing Guide: https://github.com/saga-soft/novelWriter/blob/main/CONTRIBUTING.md
+.. _Crowdin: https://crowdin.com/project/novelwriter
 
-In a nutshell, novelWriter is a plain text editor that lets you organise one or more novels and
-associated notes as many smaller documents. You can at any time generate standard document formats
+In a nutshell, novelWriter is a plain text editor that lets you organise one or more novels, and
+associated notes, as many smaller documents. You can at any time generate standard document formats
 from these plain text documents. Whether it is an outline of your story, a draft, a complete
 manuscript, or even a collection of your character notes or other notes.
 
@@ -51,7 +53,26 @@ comments, and an auto-complete menu can help you here too. More about this later
    writing. It is also *not* a full-featured Markdown editor.
 
    In addition, novelWriter is not intended as a tool for organising research for writing, and
-   therefore lacks formatting features you may need for this purpose. The notes feature in is
+   therefore lacks formatting features you may need for this purpose. The notes feature is
    mainly intended for character profiles and plot outlines. It is recommended to use a proper
    note-taking tool for research. This is anyway more practical as you may use the same research
    for multiple projects.
+
+
+.. _docs_contributing:
+
+Contributing
+============
+
+This project relies on contributions to add new features. In particular, adding translations into
+other languages, or updating translations for existing languages, is particularly useful.
+
+For code contributions, please read the official `Contributing Guide`_.
+
+For translations, please use the project page on Crowdin_. For each language, there are two
+translation sets. One for the application itself, labelled "Main GUI". This is a fairly large
+dataset to translate. A smaller set called "Project Exports" is also available. The latter is what
+makes a language available in **Project Settings** in the application. It is a fairly small set to
+translate, and you can choose to translate only this set if you wish. If the language you wish to
+contribute to is not available in the list, you can message the maintainer on the Crowdin page to
+add new languages to the project.

docs/source/usage/organising_project.rst

@@ -15,7 +15,7 @@ side of the main window.
 
 Each line in the project tree shows the name of each item, its word count (or alternatively
 character count), an icon for :ref:`docs_usage_project_active`, and a custom icon for
-:ref:`docs_usage_project_status` of each item. These latter two are covered alter in this section.
+:ref:`docs_usage_project_status` of each item. These latter two are covered later in this section.
 
 You can add, view and edit documents in the project tree by right-clicking on them. Some features
 are also located in the buttons along the top, next to the **Project Content** label.
@@ -47,8 +47,8 @@ Root Folder Types
 
 **Novel** (Story)
    This is where you put the documents that are part of your story. You can create multiple Novel
-   folders if you wish, but various parts of the application assumes each Novel folder belong to
-   one novel.
+   folders if you wish, but various parts of the application assumes each Novel folder belongs to
+   only one novel.
 
    The Novel folder is somewhat special in that it can contain documents for chapters, scenes and
    story partitions. How this is indicated is covered in the section :ref:`docs_usage_headings`.
@@ -166,6 +166,9 @@ a character note template, you can add a **Templates** root folder to your proje
 added to this root folder will show up in the **Add Item** menu in the project tree toolbar. When
 selected, a new document is created with its content copied from the chosen template.
 
+If the first line of the template file is a title line, the title text will be replaced with the
+text of the document label when it is first created.
+
 .. versionadded:: 2.3
 
 

docs/source/user_interface/editor_viewer.rst

@@ -23,7 +23,7 @@ it selected, or drag and drop it onto the editor panel. This will open the docum
 editor.
 
 The editor has a maximise button, which toggles the **Focus Mode**, and a close button in the
-top--right corner. On the top--left side you will find a tools button that opens a toolbar with a
+top-right corner. On the top-left side you will find a tools button that opens a toolbar with a
 few buttons for applying text formatting, a drop down menu for navigating between headings, and a
 search button to open the search dialog.
 
@@ -55,7 +55,7 @@ edited from the **Project Word List** tool available from the **Tools** menu.
 .. note::
 
    Generally, spell checking dictionaries are collected from your operating system, but on Windows
-   they are not. See :ref:`docs_more_custom_dict` for how to add spell checking dictionaries on
+   they are not. See :ref:`docs_more_dictionaries` for how to add spell checking dictionaries on
    Windows.
 
 
@@ -102,11 +102,12 @@ Pressing :kbd:`Return` while in the search box will search for the next occurren
 highlighted text and move to the next result.
 
 There are a number of settings for the search tool available as toggle switches above the search
-box. They allow you to search for, in order: matched case only, whole word results only, search
-using regular expressions, loop search when reaching the end of the document, and move to the next
-document when reaching the end. There is also a switch that will try to match the case of the word
-when the replacement is made. That is, it will try to keep the word upper, lower, or capitalised to
-match the word being replaced.
+box. They allow you to enable, in order: auto-replace of symbols as you type in the search and
+replace boxes (see :ref:`docs_ui_edit_view_auto`), matched case only, whole word results only,
+search using regular expressions, loop search when reaching the end of the document, and move to
+the next document when reaching the end. There is also a switch that will try to match the case of
+the word when the replacement is made. That is, it will try to keep the word upper, lower, or
+capitalised to match the word being replaced.
 
 
 .. _docs_ui_edit_view_auto:
@@ -153,14 +154,14 @@ middle-clicking on the document will also open it in the viewer.
 
 The document viewed does not have to be the same document as the one currently being edited.
 However, If you *are* viewing the same document, pressing :kbd:`Ctrl+R` from the editor will update
-the document with your latest changes. You can also press the reload button in the top--right
+the document with your latest changes. You can also press the reload button in the top-right
 corner of the viewer panel, next to the close button, to achieve the same thing.
 
 In the viewer, references become clickable links. Clicking them will replace the content of the
 viewer with the content of the document the reference points to.
 
 The document viewer keeps a history of viewed documents, which you can navigate with the arrow
-buttons in the top--left corner of the viewer. If your mouse has backward and forward navigation
+buttons in the top-left corner of the viewer. If your mouse has backward and forward navigation
 buttons, these can be used as well. They work just like the backward and forward features in a
 browser. The left-most button is a dropdown menu for quickly navigation between headings in the
 document. The edit button on the right will open the viewed document in the editor.

docs/source/user_interface/formatting.rst

@@ -0,0 +1,213 @@
+.. _docs_ui_manuscript_formatting:
+
+*************************
+Formatting the Manuscript
+*************************
+
+The **Manuscript Build Settings** tool has a **Headings** page and a separate **Formatting** page.
+This chapter covers both.
+
+
+.. _docs_ui_manuscript_formatting_head:
+
+Headings
+========
+
+.. figure:: images/fig_build_settings_headings.png
+   :width: 80%
+
+   The **Headings** page of the **Manuscript Build Settings** dialog.
+
+The **Headings** page of the **Manuscript Build Settings** dialog allows you to set how the
+headings in your Novel Documents are formatted. By default, the title is just copied as-is,
+indicated by the ``{Title}`` format. You can change this to, for instance, add chapter numbers and
+scene numbers, or insert character names, as shown in the figure above.
+
+Clicking the edit button next to a format will copy the formatting string into the edit box where
+it can be modified, and where a syntax highlighter will help indicate which parts are automatically
+generated by the build tool. The :guilabel:`Insert` button is a dropdown list of these formats, and
+selecting one will insert it at the position of the cursor.
+
+Any text you add that isn't highlighted in colours will remain in your formatted titles.
+``{Title}`` will always be replaced by the text in the heading from your documents.
+
+.. csv-table:: Heading Formats
+   :header: "Code", "Description"
+   :class: "tight-table"
+
+   "``{BR}``",             "Insert a line break."
+   "``{Title}``",          "Insert the original title text."
+   "``{Chapter}``",        "Insert a chapter number."
+   "``{Chapter:Word}``",   "Insert a chapter number as a word."
+   "``{Chapter:URoman}``", "Insert a chapter number as an upper case Roman numeral."
+   "``{Chapter:LRoman}``", "Insert a chapter number as a lower case Roman numeral."
+   "``{Scene}``",          "Insert a scene number within the current chapter."
+   "``{Scene:Abs}``",      "Insert a scene number unique to the whole manuscript."
+   "``{Char:POV}``",       "Insert the point-of-view character's :ref:`display name <docs_usage_tags_refs_tags>`."
+   "``{Char:Focus}``",     "Insert the focus character's :ref:`display name <docs_usage_tags_refs_tags>`."
+
+You can preview the result of these format strings by clicking :guilabel:`Apply`, and then clicking
+:guilabel:`Preview` in the **Manuscript Build** tool main window.
+
+.. note::
+
+   The language used for generating chapter numbers is defined by the project language set in
+   **Project Settings**. This feature relies on translation files existing for each language.
+   If you want to help add new languages to novelWriter, see: :ref:`docs_contributing`.
+
+
+.. _docs_ui_manuscript_formatting_head_numbers:
+
+Automatic Numbering
+-------------------
+
+The headings formatter allows you to automatically insert chapter and scene numbers into your
+headings. The automatic chapter number counter will skip all chapter headings marked as unnumbered
+using the heading format described in :ref:`docs_usage_headings_levels`.
+
+Scene numbers are mostly intended for use in a draft manuscript. You can either insert absolute
+scene numbers that count every scene in the novel, or you can insert per-chapter scene numbers
+that reset to 1 for each new chapter.
+
+:bdg-info:`Example`
+
+This will create a chapter title on the format "Chapter 1: Title Text":
+
+.. code-block:: md
+
+   Chapter {Chapter}: {Title}
+
+This will create a scene title on the format "Scene 1.1: Title Text":
+
+.. code-block:: md
+
+   Scene {Chapter}.{Scene}: {Title}
+
+
+Scene Separators
+----------------
+
+If you don't want any titles for your scenes (or for your sections if you have them), you can leave
+the formatting boxes empty. If so, an empty paragraph will be inserted between the scenes or
+sections instead, resulting in a gap in the text. You can also enable the :guilabel:`Hide` setting,
+which will ignore them completely. That is, there won't even be an extra gap inserted.
+
+Alternatively, if you want a separator text between them, like the common ``* * *``, you can enter
+the desired separator text as the format. If the format is any piece of static text, it will always
+be treated as a separator. A static separator is only inserted between scenes, as opposed to a
+formatted heading which is also inserted before the first scene of a chapter.
+
+A special case of the static separator is the horizontal line, which is inserted by using the
+``----`` format. There is also an option for it in the :guilabel:`Insert` dropdown list. This will
+replace all the text in the edit box with four hyphens. Only if the format is exactly four hyphens
+will it be treated as a horizontal line.
+
+In the output formats, the horizontal line is rendered as a line at 50% the text width or the page
+width. The exception is for Markdown output, where it is printed as-is.
+
+
+.. _docs_ui_manuscript_formatting_head_hard_soft:
+
+Hard and Soft Scenes
+--------------------
+
+If you wish to distinguish between so-called soft and hard scene breaks, you can use the
+alternative scene heading format in your text. You can then give these headings a different
+formatting in the **Headings** settings.
+
+See :ref:`docs_usage_headings_levels` for more information on how to format alternative scene
+headings in your text.
+
+
+.. _docs_ui_manuscript_formatting_head_promote:
+
+Heading Level Promotion
+-----------------------
+
+When you build the manuscript, novel headings are promoted one level relative to the level
+specified in the source documents as typed in the editor. The promotion follows these rules:
+
+#. The main novel title and partition titles are converted to regular text paragraphs with a larger
+   font size.
+#. Chapter titles are promoted to the top-most heading of the document, that is level 1.
+#. Scenes and Section titles, if used, are promoted to level 2 and 3, respectively.
+#. Headings in note documents are left as-is.
+
+
+.. _docs_ui_manuscript_formatting_head_styling:
+
+Title Styling
+-------------
+
+The **Manuscript Build Settings** dialog also provides layout options for controlling how headings
+are visually presented in the output. These options allow you to add page breaks and centre
+headings at specific heading levels.
+
+The layout options are presented in a grid showing the following heading styles:
+
+- **Title** – The novel's main title
+- **Partition** – Partition headings (for dividing the novel into major sections)
+- **Chapter** – Chapter headings
+- **Scene** – Scene headings
+
+For each of these, you can toggle:
+
+- **Centre** – Centre the heading text on the page
+- **Page Break** – Insert a page break before the heading
+
+These settings apply to the formatted heading output and affect all document formats that support
+page breaks and text alignment.
+
+
+.. _docs_ui_manuscript_formatting_options:
+
+Formatting Options
+==================
+
+The **Formatting** section in the **Manuscript Build Settings** dialog is split into groups, each
+accessible from its own entry in the sidebar. The sections below summarise what each group
+controls.
+
+**Text Content**
+   Controls which parts of the text in each selected document are included in the output. These
+   options do not select documents, that is done in the **Selection** page. They only control
+   which content elements within each document are rendered. The available switches are:
+   "Include body text", "Include synopsis", "Include comments", "Include story structure",
+   "Include manuscript notes", and "Include keywords". A text field for specifying keywords to
+   ignore is also provided, as well as an option to "Add titles for note root folders".
+
+**Text Format**
+   Controls the base appearance of rendered text. Set the "Text font" and "Line height", and
+   toggle options for "Justify text margins", "Justify text on manual line breaks",
+   "Replace Unicode characters", "Replace tabs with spaces", "Preserve hard line breaks", and
+   "Apply dialogue highlighting".
+
+**Heading Format**
+   Controls visual formatting applied to all headings in the output. Toggle "Add colours to
+   headings", "Bold headings", and "Uppercase headings".
+
+**First Line Indent**
+   Controls paragraph indentation. Toggle "Enable indent", set the "Indent width", and choose
+   whether to "Indent first paragraph" (the paragraph immediately following a heading).
+
+**Size & Margins**
+   Controls font sizes and spacing for each element in the output. Entries cover "Title and
+   Partition", "Heading 1 and Chapter", "Heading 2 and Scene", "Heading 3 and Section",
+   "Heading 4", "Text paragraph", and "Scene separator". Each entry has a size field and top and
+   bottom margin fields. The option "Add empty lines instead of margins" replaces spacing with
+   blank lines, which is useful for formats that do not support paragraph margins.
+
+**Page Layout**
+   Controls paper settings for formats that support page layout, such as Open Document and PDF.
+   Set the "Unit" (centimetres, millimetres or inches), "Page size", and "Page margins"
+   (top, bottom, left, and right).
+
+**Document Style**
+   Controls document-level settings for office type documents. Set the "Page header" format, the
+   "Page counter offset", and optionally override the document language with "Override document
+   language".
+
+**HTML Options**
+   Controls settings specific to HTML output. Toggle "Add CSS styles" to include inline
+   stylesheet rules, and "Preserve tab characters" to keep tabs rather than converting them to
+   spaces.

docs/source/user_interface/main_window.rst

@@ -18,7 +18,7 @@ time you need them. For reference, a list of all shortcuts can be found in the
 :ref:`docs_features_shortcuts` section.
 
 On the left side of the main window you will find a sidebar. This bar has buttons for the standard
-views you can switch between, a quick link to the **Build Manuscript** tool, and a set of
+views you can switch between, a quick link to the **Manuscript Build** tool, and a set of
 project-related tools and quick access to settings at the bottom.
 
 
@@ -186,17 +186,11 @@ See :ref:`docs_features_shortcuts` for more details.
 Colour Themes
 =============
 
-By default, novelWriter uses a light colour theme. You can also choose between a standard dark
-theme that have neutral colours, or a series of other included themes, from **Preferences**. 
+By default, novelWriter should pick a dark or light theme based on the colour mode of your
+operating system. You can select which colour mode to use from the application sidebar.
+
+The default light and dark theme can be changed from **Preferences**. There are a number of themes
+to choose from. There are also some high contrast themes available.
 
 If you wish, you *can* create your own colour themes, and even have them added to the application.
 See :ref:`docs_more_custom_theme` for more details.
-
-Switching the GUI colour theme does not affect the colours of the editor and viewer. They have
-separate themes selectable from the "Document colour theme" setting in **Preferences**. They are
-separated because there are a lot more options to choose from for the editor and viewer.
-
-.. note::
-
-   If you switch between light and dark mode on the GUI, you should also switch editor theme to
-   match, otherwise icons may be hard to see in the editor and viewer.

docs/source/user_interface/manuscript.rst

@@ -26,12 +26,12 @@ The Manuscript Build Tool
 =========================
 
 .. figure:: images/fig_manuscript_build.png
-   :width: 80%
+   :width: 90%
 
    The **Manuscript Build** tool main window.
 
 The main window of the **Manuscript Build** tool contains a list of all the builds you have
-defined, a selection of settings, and a few buttons to generate preview, open the print dialog, or
+defined, a selection of settings, and a few buttons to generate a preview, open the print dialog, or
 run the build to create a manuscript document.
 
 
@@ -39,7 +39,7 @@ Outline and Word Counts
 -----------------------
 
 .. figure:: images/fig_manuscript_build_outline.png
-   :width: 80%
+   :width: 90%
 
    The **Manuscript Build** tool main window with the **Outline** visible.
 
@@ -64,9 +64,11 @@ by double-clicking or by selecting it and pressing the edit button in the toolba
 .. tip::
 
    You can keep the **Manuscript Build Settings** dialog open while testing the different options,
-   and just hit the :guilabel:`Apply` button. You can test the result of your settings change by
-   pressing the :guilabel:`Preview` button in the main **Manuscript Build** window. When you're
-   happy with the result, you can close the settings.
+   and just hit the :guilabel:`Apply` button to update the preview in the main **Manuscript Build**
+   window. When you're happy with the result, you can close the settings.
+
+For detailed information on how to format headings, including how to add chapter numbers, scene
+numbers, and other dynamic content, see :ref:`docs_ui_manuscript_formatting`.
 
 
 .. _docs_ui_manuscript_selection:
@@ -79,126 +81,100 @@ Document Selection
 
    The **Selections** page of the **Manuscript Build Settings** dialog.
 
-The **Selections** page of the **Manuscript Build Settings** dialog allows you to fine tune which
-documents are included in the build. The included documents are indicated by an icon in the last
-column. On the right you have some filter options for selecting content of a specific type, and a
-set of switches for which root folders to include.
+The **Selections** page allows you to fine tune which documents are included in the build. The
+included documents are indicated by an icon in the last column. The interface is split into two
+parts: a project tree on the left showing all documents, and filter options on the right.
 
 You can override the result of these filters by marking one or more documents and selecting to
 explicitly include or exclude them by using the buttons below the tree view. The last button can be
 used to reset the override and return control to the filter settings.
 
-In the figure, the orange icon and the blue icon indicates which documents are included, and the
+In the figure, the orange icon and the blue icon indicate which documents are included, and the
 red icon indicates that a document is explicitly excluded.
 
 By default, inactive documents are excluded, but you can override this in the filter settings.
 See :ref:`docs_usage_project_active` for more details.
 
 
-.. _docs_ui_manuscript_head:
+Root Folder Selection
+^^^^^^^^^^^^^^^^^^^^^
 
-Formatting Headings
--------------------
+At the bottom of the filter options on the right, you will find a set of switches for each root
+folder in your project. These allow you to quickly include or exclude entire root folders from the
+build. For example, you can use this to exclude all your notes if you only want the novel content,
+or exclude all story content if you want to build an outline of your notes instead.
 
-.. figure:: images/fig_build_settings_headings.png
-   :width: 80%
-
-   The **Headings** page of the **Manuscript Build Settings** dialog.
-
-The **Headings** page of the **Manuscript Build Settings** dialog allows you to set how the
-headings in your Novel Documents are formatted. By default, the title is just copied as-is,
-indicated by the ``{Title}`` format. You can change this to for instance add chapter numbers and
-scene numbers, or insert character names, like shown in the figure above.
-
-Clicking the edit button next to a format will copy the formatting string into the edit box where
-it can be modified, and where a syntax highlighter will help indicate which parts are automatically
-generated by the build tool. The :guilabel:`Insert` button is a dropdown list of these formats, and
-selecting one will insert it at the position of the cursor.
-
-Any text you add that isn't highlighted in colours will remain in your formatted titles.
-``{Title}`` will always be replaced by the text in the heading from your documents.
-
-.. csv-table:: Heading Formats
-   :header: "Code", "Description"
-   :class: "tight-table"
-
-   "``{BR}``",             "Insert a line break."
-   "``{Title}``",          "Insert the original title text."
-   "``{Chapter}``",        "Insert a chapter number."
-   "``{Chapter:Word}``",   "Insert a chapter number as a word."
-   "``{Chapter:URoman}``", "Insert a chapter number as an upper case Roman numeral."
-   "``{Chapter:LRoman}``", "Insert a chapter number as an lower case Roman numeral."
-   "``{Scene}``",          "Insert a scene number within the current chapter."
-   "``{Scene:Abs}``",      "Insert a scene number unique to the whole manuscript."
-   "``{Char:POV}``",       "Insert the point-of-view character's :ref:`display name <docs_usage_tags_refs_tags>`."
-   "``{Char:Focus}``",     "Insert the focus character's :ref:`display name <docs_usage_tags_refs_tags>`."
-
-You can preview the result of these format strings by clicking :guilabel:`Apply`, and then clicking
-:guilabel:`Preview` in the **Manuscript Build** tool main window.
+When a root folder switch is off, all documents within that folder are excluded regardless of the
+other filter settings.
 
 
-.. _docs_ui_manuscript_head_numbers:
+.. _docs_ui_manuscript_content:
 
-Automatic Numbering
-^^^^^^^^^^^^^^^^^^^
+Content Filtering
+-----------------
 
-The headings formatter allows you to automatically insert chapter and scene numbers into your
-headings. The automatic chapter number counter will skip all chapter headings marked as unnumbered
-using the heading format described in :ref:`docs_usage_headings_levels`.
+The options in **Document Selection** and **Root Folder Selection** decide which whole documents
+are part of the build.
 
-Scene numbers are mostly intended for use in a draft manuscript. You can either insert absolute
-scene numbers that counts every scene in the novel, or you can insert per-chapter scene numbers
-that reset to 1 for each new chapter.
+The content filtering options in the **Formatting** page are different: they only control which
+parts of the selected documents are included in the output.
 
-:bdg-info:`Example`
-
-This will create a chapter title on the format "Chapter 1: Title Text":
-
-.. code-block:: md
-
-   Chapter {Chapter}: {Title}
-
-This will create a scene title on the format "Scene 1.1: Title Text":
-
-.. code-block:: md
-
-   Scene {Chapter}.{Scene}: {Title}
+For further content filtering options, see :ref:`docs_ui_manuscript_formatting_options`.
 
 
-Scene Separators
-^^^^^^^^^^^^^^^^
+.. _docs_ui_manuscript_build_manage:
 
-If you don't want any titles for your scenes (or for your sections if you have them), you can leave
-the formatting boxes empty. If so, an empty paragraph will be inserted between the scenes or
-sections instead, resulting in a gap in the text. You can also enable the :guilabel:`Hide` setting,
-which will ignore them completely. That is, there won't even be an extra gap inserted.
+Build Management
+----------------
 
-Alternatively, if you want a separator text between them, like the common ``* * *``, you can enter
-the desired separator text as the format. If the format is any piece of static text, it will always
-be treated as a separator. A static separator is only inserted between scenes, as opposed to a
-formatted heading which is also inserted before the first scene of a chapter.
+The main **Manuscript Build** tool window provides several controls for managing your build
+definitions:
+
+**Create a New Build**
+   Press the :guilabel:`Add` button (or plus icon) in the toolbar to create a new build definition.
+   A new build will be created with default settings that you can then customise.
+
+**Edit a Build**
+   Double-click on a build in the list, or select it and press the :guilabel:`Edit` button to open
+   the **Manuscript Build Settings** dialog.
+
+**Duplicate a Build**
+   Select a build and press the :guilabel:`Duplicate` button (or copy icon) to create a copy of it.
+   This is useful for creating variations of a build without starting from scratch. The duplicated
+   build will have "2" appended to its name.
+
+**Delete a Build**
+   Select a build and press the :guilabel:`Delete` button (or minus icon) to remove it. This action
+   cannot be undone, so make sure you have saved any settings you want to keep.
+
+**Reorder Builds**
+   You can drag and drop builds in the list to change their order. The order is saved automatically
+   when you close the tool.
 
 
-.. _docs_ui_manuscript_head_hard_soft:
+.. _docs_ui_manuscript_stats:
 
-Hard and Soft Scenes
-^^^^^^^^^^^^^^^^^^^^
-
-If you wish to distinguish between so-called soft and hard scene breaks, you can use the
-alternative scene heading format in your text. You can then give these headings a different
-formatting in the **Headings** settings.
-
-See :ref:`docs_usage_headings_levels` for more info on how to format alternative scene headings in
-your text.
-
-
-Output Settings
+Statistics View
 ---------------
 
-The **Formatting** sections of the **Manuscript Build Settings** dialog control a number of other
-settings for the output. This includes formatting, but also what content is included. You can for
-instance select to include comments, synopsis. tags and reference, and even exclude the body text
-itself.
+Below the preview panel, there is a collapsible statistics widget showing word and character counts
+for the current build. Press the expand button (arrow icon) to toggle between a minimal and detailed
+view.
+
+The **Minimal View** shows:
+
+- Total word count
+- Total character count
+
+The **Detailed View** shows:
+
+- Total words, words in titles, words in text
+- Total characters, characters in titles, characters in text
+- Total word characters (letters and numbers only), broken down by section
+
+These statistics are calculated from the text you have included in the document after all
+formatting has been applied, making them more accurate than the counts available in the project
+tree. For a detailed explanation of how text is counted, see :ref:`docs_more_counting`.
 
 
 .. _docs_ui_manuscript_build:
@@ -209,9 +185,9 @@ Building Manuscript Documents
 .. figure:: images/fig_build_build.png
    :width: 80%
 
-   The **Manuscript Build** dialog used for writing the actual manuscript documents.
+   The **Build Manuscript** dialog used for writing the actual manuscript documents.
 
-When you press the :guilabel:`Build` button on the **Build Manuscript** tool main window, a special
+When you press the :guilabel:`Build` button on the **Manuscript Build** tool main window, a special
 file dialog opens up. This is where you pick your desired output format and where to write the
 file.
 
@@ -247,6 +223,10 @@ novelWriter HTML
    is suitable for further processing by document conversion tools like Pandoc_, for importing in
    word processors, or for printing from browser.
 
+Electronic Publication E-book (EPub)
+   The EPub format writes a single ``.epub`` file with minimal style formatting. You can include
+   your notes in this format, but each notes root folder will be packaged as a chapter.
+
 Standard/Extended Markdown
    The Markdown format comes in both Standard and Extended flavour. The *only* difference in terms
    of novelWriter functionality is the support for strike through text, which is not supported by
@@ -274,7 +254,7 @@ order they appear in the project tree. Each document is then split up into a lis
 entry per paragraph it contains.
 
 These files are mainly intended for scripted post-processing for those who want that option. A JSON
-file can be imported directly into a Python dict object or a PHP array, to mentions a few options.
+file can be imported directly into a Python dict object or a PHP array, to name a few options.
 
 
 .. _docs_ui_manuscript_print:

i18n/README.md

@@ -114,23 +114,6 @@ You can now test the translation in novelWriter. The Preferences dialog should l
 language, so go ahead and select it.
 
 
-### Missing QtBase Translations
-
-The default Qt dialogs also have translations, for instance for standard buttons like "Yes", "No",
-"Ok", "Cancel", etc. Generally, these translation files are installed with the Qt libraries on your
-system, and novelWriter will collect those translations from there. However, these translations are
-missing for many languages.
-
-As a starting point, there is no need to translate any entries in the `.ts` files that are under
-elements starting with the letter "Q", like "QPlatformTheme", "QWizard", etc. If these turn up in
-English in novelWriter after activating a translation, it means they are probably missing in the Qt
-library, and you may also need to translate these.
-
-These additional translation entries are generated from a file named `i18n/qtbase.py`, which is not
-a file that novelWriter uses. It is there only to generate these additional entries for the `.ts`
-files.
-
-
 ## Project Localisation
 
 Projects can have a different language setting than the GUI itself. The files with format

i18n/qtbase.py

@@ -1,49 +0,0 @@
-"""
-Qt Base Translation File
-========================
-
-This file causes Qt Linguist to generate translation entries for the Qt
-elements that need translation in novelWriter for those languages who do
-not yet have a qtbase_xx.qm file shipped with Qt.
-
-If a qtbase_xx.qm file already exists, do not add a translation for the
-entries generated from this file.
-"""
-
-from PyQt6.QtCore import QT_TRANSLATE_NOOP
-
-# QDialogButtonBox
-# ================
-
-QT_TRANSLATE_NOOP("QDialogButtonBox", "OK")
-
-# QGnomeTheme
-# ===========
-
-QT_TRANSLATE_NOOP("QGnomeTheme", "&OK")
-QT_TRANSLATE_NOOP("QGnomeTheme", "&Save")
-QT_TRANSLATE_NOOP("QGnomeTheme", "&Cancel")
-QT_TRANSLATE_NOOP("QGnomeTheme", "&Close")
-QT_TRANSLATE_NOOP("QGnomeTheme", "Close without Saving")
-
-# QPlatformTheme
-# ==============
-
-QT_TRANSLATE_NOOP("QPlatformTheme", "OK")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Save")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Save All")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Open")
-QT_TRANSLATE_NOOP("QPlatformTheme", "&Yes")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Yes to &All")
-QT_TRANSLATE_NOOP("QPlatformTheme", "&No")
-QT_TRANSLATE_NOOP("QPlatformTheme", "N&o to All")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Abort")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Retry")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Ignore")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Close")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Cancel")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Discard")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Help")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Apply")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Reset")
-QT_TRANSLATE_NOOP("QPlatformTheme", "Restore Defaults")

novelWriter.py

@@ -1,21 +1,15 @@
 #!/usr/bin/env python3
 """
-novelWriter – Start Script
+novelWriter - Start Script
 ==========================
-"""
+"""  # noqa
+
 import os
 import sys
 
-try:
-    import PyQt6.QtCore
-    import PyQt6.QtGui
-    import PyQt6.QtWidgets  # noqa: F401
-except Exception:
-    print("ERROR: Failed to load dependency PyQt6")
-    sys.exit(1)
-
 os.curdir = os.path.abspath(os.path.dirname(__file__))
 
 if __name__ == "__main__":
     import novelwriter
+
     novelwriter.main(sys.argv[1:])

novelwriter/__init__.py

@@ -1,10 +1,7 @@
 """
-novelWriter – Init File
+novelWriter - Init File
 =======================
 
-File History:
-Created: 2018-09-22 [0.0.1]  main
-
 This file is a part of novelWriter
 Copyright (C) 2018 Veronica Berglyd Olsen and novelWriter contributors
 
@@ -20,9 +17,11 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
-"""
+"""  # noqa
+
 from __future__ import annotations
 
+import gc
 import getopt
 import logging
 import os
@@ -43,17 +42,19 @@ if TYPE_CHECKING:
 # Package Meta
 # ============
 
+# fmt: off
 __package__    = "novelwriter"
-__copyright__  = "Copyright 2018-2025 Veronica Berglyd Olsen"
+__copyright__  = "Copyright 2018-2026 Veronica Berglyd Olsen"
 __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.7"
-__hexversion__ = "0x020700f0"
-__date__       = "2025-06-01"
+__version__    = "26.2.2"
+__hexversion__ = "0x260202f0"
+__date__       = "2026-10-11"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
+# fmt: on
 
 logger = logging.getLogger(__name__)
 
@@ -67,12 +68,12 @@ CONFIG = Config()
 SHARED = SharedData()
 
 # ANSI Colours
-RED    = "\033[91m"
-GREEN  = "\033[92m"
+RED = "\033[91m"
+GREEN = "\033[92m"
 YELLOW = "\033[93m"
-BLUE   = "\033[94m"
-WHITE  = "\033[97m"
-END    = "\033[0m"
+BLUE = "\033[94m"
+WHITE = "\033[97m"
+END = "\033[0m"
 
 # Log Format Components
 TIME = "[{asctime:}]"
@@ -84,7 +85,7 @@ TEXT = "{message:}"
 
 # Read Environment
 FORCE_COLOR = bool(os.environ.get("FORCE_COLOR"))
-NO_COLOR    = bool(os.environ.get("NO_COLOR"))
+NO_COLOR = bool(os.environ.get("NO_COLOR"))
 
 
 def main(sysArgs: list | None = None) -> GuiMain | None:
@@ -94,17 +95,7 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
 
     # Valid Input Options
     shortOpt = "hvidc"
-    longOpt = [
-        "help",
-        "version",
-        "info",
-        "debug",
-        "color",
-        "style=",
-        "config=",
-        "data=",
-        "meminfo"
-    ]
+    longOpt = ["help", "version", "info", "debug", "color", "config=", "data=", "meminfo"]
 
     helpMsg = (
         f"novelWriter {__version__} ({__date__})\n"
@@ -130,19 +121,17 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
         " -d, --debug    Print debug output. Includes --info.\n"
         " -c, --color    Add ANSI colors to log output.\n"
         "     --meminfo  Show memory usage information in the status bar.\n"
-        "     --style=   Sets Qt style flag. Defaults to 'Fusion'.\n"
         "     --config=  Alternative config file.\n"
         "     --data=    Alternative user data path.\n"
     )
 
     # Defaults
-    logLevel = logging.WARN
+    logLevel = logging.WARNING
     fmtColor = FORCE_COLOR
-    fmtLong  = False
+    fmtLong = False
     confPath = None
     dataPath = None
-    qtStyle  = "Fusion"
-    cmdOpen  = None
+    cmdOpen = None
 
     # Parse Options
     try:
@@ -172,20 +161,20 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
             fmtColor = not NO_COLOR
         elif inOpt == "--meminfo":
             CONFIG.memInfo = True
-        elif inOpt == "--style":
-            qtStyle = inArg
         elif inOpt == "--config":
             confPath = inArg
         elif inOpt == "--data":
             dataPath = inArg
+        else:  # pragma: no cover
+            pass
 
     if fmtColor:
         # This will overwrite the default level names, and also ensure that
         # they can be converted back to integer levels
-        logging.addLevelName(logging.DEBUG,    f"{BLUE}DEBUG{END}")
-        logging.addLevelName(logging.INFO,     f"{GREEN}INFO{END}")
-        logging.addLevelName(logging.WARNING,  f"{YELLOW}WARNING{END}")
-        logging.addLevelName(logging.ERROR,    f"{RED}ERROR{END}")
+        logging.addLevelName(logging.DEBUG, f"{BLUE}DEBUG{END}")
+        logging.addLevelName(logging.INFO, f"{GREEN}INFO{END}")
+        logging.addLevelName(logging.WARNING, f"{YELLOW}WARNING{END}")
+        logging.addLevelName(logging.ERROR, f"{RED}ERROR{END}")
         logging.addLevelName(logging.CRITICAL, f"{RED}CRITICAL{END}")
 
     logTxt = f"{LVLC}  {TEXT}" if fmtColor else f"{LVLP}  {TEXT}"
@@ -203,37 +192,34 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
 
     logger.info("Starting novelWriter %s (%s) %s", __version__, __hexversion__, __date__)
 
+    # Disable GC, running in GuiMain instead (#2927)
+    gc.disable()
+
     # Check Packages and Versions
     errorData = []
     errorCode = 0
-    if sys.hexversion < 0x030a00f0:
-        errorData.append(
-            f"At least Python 3.10 is required, found {CONFIG.verPyString}"
-        )
+    if sys.hexversion < 0x030B00F0:
+        errorData.append(f"At least Python 3.11 is required, found {CONFIG.verPyString}")
         errorCode |= 0x04
     if CONFIG.verQtValue < 0x060400:
-        errorData.append(
-            f"At least Qt6 version 6.4 is required, found {CONFIG.verQtString}"
-        )
+        errorData.append(f"At least Qt6 version 6.4 is required, found {CONFIG.verQtString}")
         errorCode |= 0x08
     if CONFIG.verPyQtValue < 0x060400:
-        errorData.append(
-            f"At least PyQt6 version 6.4 is required, found {CONFIG.verPyQtString}"
-        )
+        errorData.append(f"At least PyQt6 version 6.4 is required, found {CONFIG.verPyQtString}")
         errorCode |= 0x10
 
     if errorData:
         errApp = QApplication([])
         errDlg = QErrorMessage()
         errDlg.resize(500, 300)
-        errDlg.showMessage((
-            "<h3>A critical error was encountered</h3>"
-            "<p>novelWriter cannot start due to the following issues:<p>"
-            "<p>&nbsp;-&nbsp;{0}</p>"
-            "<p>Shutting down ...</p>"
-        ).format(
-            "<br>&nbsp;-&nbsp;".join(errorData)
-        ))
+        errDlg.showMessage(
+            (
+                "<h3>A critical error was encountered</h3>"
+                "<p>novelWriter cannot start due to the following issues:<p>"
+                "<p>&nbsp;-&nbsp;{0}</p>"
+                "<p>Shutting down ...</p>"
+            ).format("<br>&nbsp;-&nbsp;".join(errorData))
+        )
         for errLine in errorData:
             logger.critical(errLine)
         errApp.exec()
@@ -242,9 +228,12 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
     # Finish initialising config
     CONFIG.initConfig(confPath, dataPath)
 
-    if sys.platform == "darwin":
+    if sys.platform == "linux":
+        QApplication.setDesktopFileName(CONFIG.appHandle)
+    elif sys.platform == "darwin":
         try:
             from Foundation import NSBundle  # type: ignore
+
             bundle = NSBundle.mainBundle()
             info = bundle.localizedInfoDictionary() or bundle.infoDictionary()
             info["CFBundleName"] = "novelWriter"
@@ -253,8 +242,8 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
     elif sys.platform == "win32":
         try:
             import ctypes
-            appID = f"io.novelwriter.{__version__}"
-            ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(appID)  # type: ignore
+
+            ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID("io.novelwriter.app")  # type: ignore
         except Exception:
             pass  # Quietly ignore error
 
@@ -263,7 +252,7 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
     from novelwriter.guimain import GuiMain
 
     # Create App
-    app = _createApp(qtStyle)
+    app = _createApp()
 
     # Connect the exception handler before making the main GUI
     sys.excepthook = exceptionHandler
@@ -289,17 +278,20 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
 
     nwGUI.postLaunchTasks(cmdOpen)
 
-    sys.exit(app.exec())
+    code = app.exec()
+    logger.info("novelWriter exited with code %d", code)
+    sys.exit(code)
 
 
-def _createApp(style: str) -> QApplication:
+def _createApp() -> QApplication:
     """Create the app. This is done in a function to make it easier to
     block app creation during testing.
     """
-    app = QApplication([CONFIG.appName, f"-style={style}"])
+    app = QApplication([CONFIG.appName])
+    app.setStyle("Fusion")
     app.setApplicationName(CONFIG.appName)
     app.setApplicationVersion(__version__)
     app.setOrganizationDomain(__domain__)
     app.setOrganizationName(__domain__)
-    app.setDesktopFileName(CONFIG.appName)
+
     return app

novelwriter/assets/i18n/project_ca_ES.json

@@ -0,0 +1,121 @@
+{
+  "Synopsis": "Sinopsi",
+  "Short Description": "Descripció breu",
+  "Footnotes": "Notes de peu de pàgina",
+  "Comment": "Comentari",
+  "Story Structure": "Estructura de la història",
+  "Note": "Anotació",
+  "Notes": "Anotacions",
+  "Tag": "Etiqueta",
+  "Point of View": "Punt de vista",
+  "Focus": "Focus",
+  "Characters": "Personatges",
+  "Plot": "Trama",
+  "Timeline": "Cronologia",
+  "Locations": "Llocs",
+  "Objects": "Objectes",
+  "Entities": "Entitats",
+  "Custom": "Personalitzat",
+  "Mentions": "Mencions",
+  "New Page": "Pàgina nova",
+  "0": "Zero",
+  "1": "U",
+  "2": "Dos",
+  "3": "Tres",
+  "4": "Quatre",
+  "5": "Cinc",
+  "6": "Sis",
+  "7": "Set",
+  "8": "Vuit",
+  "9": "Nou",
+  "10": "Deu",
+  "11": "Onze",
+  "12": "Dotze",
+  "13": "Tretze",
+  "14": "Catorze",
+  "15": "Quinze",
+  "16": "Setze",
+  "17": "Disset",
+  "18": "Divuit",
+  "19": "Dinou",
+  "20": "Vint",
+  "21": "Vint-i-U",
+  "22": "Vint-i-Dos",
+  "23": "Vint-i-Tres",
+  "24": "Vint-i-Quatre",
+  "25": "Vint-i-Cinc",
+  "26": "Vint-i-Sis",
+  "27": "Vint-i-Set",
+  "28": "Vint-i-Vuit",
+  "29": "Vint-i-Nou",
+  "30": "Trenta",
+  "31": "Trenta-U",
+  "32": "Trenta-Dos",
+  "33": "Trenta-Tres",
+  "34": "Trenta-Quatre",
+  "35": "Trenta-Cinc",
+  "36": "Trenta-Sis",
+  "37": "Trenta-Set",
+  "38": "Trenta-Vuit",
+  "39": "Trenta-Nou",
+  "40": "Quaranta",
+  "41": "Quaranta-U",
+  "42": "Quaranta-Dos",
+  "43": "Quaranta-Tres",
+  "44": "Quaranta-Quatre",
+  "45": "Quaranta-Cinc",
+  "46": "Quaranta-Sis",
+  "47": "Quaranta-Set",
+  "48": "Quaranta-Vuit",
+  "49": "Quaranta-Nou",
+  "50": "Cinquanta",
+  "51": "Cinquanta-U",
+  "52": "Cinquanta-Dos",
+  "53": "Cinquanta-Tres",
+  "54": "Cinquanta-Quatre",
+  "55": "Cinquanta-Cinc",
+  "56": "Cinquanta-Sis",
+  "57": "Cinquanta-Set",
+  "58": "Cinquanta-Vuit",
+  "59": "Cinquanta-Nou",
+  "60": "Seixanta",
+  "61": "Seixanta-U",
+  "62": "Seixanta-Dos",
+  "63": "Seixanta-Tres",
+  "64": "Seixanta-Quatre",
+  "65": "Seixanta-Cinc",
+  "66": "Seixanta-Sis",
+  "67": "Seixanta-Set",
+  "68": "Seixanta-Vuit",
+  "69": "Seixanta-Nou",
+  "70": "Setanta",
+  "71": "Setanta-U",
+  "72": "Setanta-Dos",
+  "73": "Setanta-Tres",
+  "74": "Setanta-Quatre",
+  "75": "Setanta-Cinc",
+  "76": "Setanta-Sis",
+  "77": "Setanta-Set",
+  "78": "Setanta-Vuit",
+  "79": "Setanta-Nou",
+  "80": "Vuitanta",
+  "81": "Vuitanta-U",
+  "82": "Vuitanta-Dos",
+  "83": "Vuitanta-Tres",
+  "84": "Vuitanta-Quatre",
+  "85": "Vuitanta-Cinc",
+  "86": "Vuitanta-Sis",
+  "87": "Vuitanta-Set",
+  "88": "Vuitanta-Vuit",
+  "89": "Vuitanta-Nou",
+  "90": "Noranta",
+  "91": "Noranta-U",
+  "92": "Noranta-Dos",
+  "93": "Noranta-Tres",
+  "94": "Noranta-Quatre",
+  "95": "Noranta-Cinc",
+  "96": "Noranta-Sis",
+  "97": "Noranta-Set",
+  "98": "Noranta-Vuit",
+  "99": "Noranta-Nou"
+}

novelwriter/assets/i18n/project_cs_CZ.json

@@ -3,6 +3,8 @@
   "Short Description": "Krátký popis",
   "Footnotes": "Poznámky pod čarou",
   "Comment": "Komentář",
+  "Story Structure": "Struktura příběhu",
+  "Note": "Poznámka",
   "Notes": "Poznámka",
   "Tag": "Štítek",
   "Point of View": "Úhel pohledu",
@@ -14,6 +16,7 @@
   "Objects": "Objekty",
   "Entities": "Subjekty",
   "Custom": "Vlastní",
+  "Mentions": "Zmínky",
   "New Page": "Nová stránka",
   "0": "Nula",
   "1": "Jedna",

novelwriter/assets/i18n/project_de_DE.json

@@ -2,8 +2,8 @@
   "Synopsis": "Zusammenfassung",
   "Short Description": "Kurzbeschreibung",
   "Footnotes": "Fußnoten",
-  "Comment": "Kommentar",
-  "Story Structure": "Struktur",
+  "Comment": "Anmerkung",
+  "Story Structure": "Erzählstruktur",
   "Note": "Notiz",
   "Notes": "Notizen",
   "Tag": "Schlagwort",
@@ -16,6 +16,7 @@
   "Objects": "Objekte",
   "Entities": "Organisationen",
   "Custom": "Benutzerdefiniert",
+  "Mentions": "Erwähnt",
   "New Page": "Neue Seite",
   "0": "Null",
   "1": "Eins",

novelwriter/assets/i18n/project_en_GB.json

@@ -16,7 +16,7 @@
   "Objects": "Objects",
   "Entities": "Entities",
   "Custom": "Custom",
-  "New Page": "New Page",
+  "Mentions": "Mentions",
   "0": "Zero",
   "1": "One",
   "2": "Two",

novelwriter/assets/i18n/project_en_US.json

@@ -16,6 +16,7 @@
   "Objects": "Objects",
   "Entities": "Entities",
   "Custom": "Custom",
+  "Mentions": "Mentions",
   "New Page": "New Page",
   "0": "Zero",
   "1": "One",

novelwriter/assets/i18n/project_es_419.json

@@ -3,6 +3,8 @@
   "Short Description": "Breve Descripción",
   "Footnotes": "Notas al pie",
   "Comment": "Comentario",
+  "Story Structure": "Estructura Narrativa",
+  "Note": "Nota",
   "Notes": "Notas",
   "Tag": "Etiqueta",
   "Point of View": "Punto de Vista",
@@ -13,7 +15,8 @@
   "Locations": "Lugares",
   "Objects": "Objetos",
   "Entities": "Entidades",
-  "Custom": "Otros",
+  "Custom": "Personalizado",
+  "Mentions": "Menciones",
   "New Page": "Nueva Página",
   "0": "Cero",
   "1": "Uno",
@@ -46,15 +49,15 @@
   "28": "Veintiocho",
   "29": "Veintinueve",
   "30": "Treinta",
-  "31": "Treinta y ",
-  "32": "Treinta y ",
-  "33": "Treinta y ",
-  "34": "Treinta y ",
-  "35": "Treinta y ",
-  "36": "Treinta y ",
-  "37": "Treinta y ",
-  "38": "Treinta y ",
-  "39": "Treinta y ",
+  "31": "Treinta y uno",
+  "32": "Treinta y dos",
+  "33": "Treinta y tres",
+  "34": "Treinta y cuatro",
+  "35": "Treinta y cinco",
+  "36": "Treinta y seis",
+  "37": "Treinta y siete",
+  "38": "Treinta y ocho",
+  "39": "Treinta y nueve",
   "40": "Cuarenta",
   "41": "Cuarenta y uno",
   "42": "Cuarenta y dos",

novelwriter/assets/i18n/project_fr_FR.json

@@ -3,6 +3,8 @@
   "Short Description": "Description sommaire",
   "Footnotes": "Notes de bas de page",
   "Comment": "Commentaire",
+  "Story Structure": "Structure de l'histoire",
+  "Note": "Note",
   "Notes": "Notes",
   "Tag": "Étiquette",
   "Point of View": "Point de vue",
@@ -14,6 +16,7 @@
   "Objects": "Objets",
   "Entities": "Entités",
   "Custom": "Personnalisé",
+  "Mentions": "Mentions",
   "New Page": "Nouvelle page",
   "0": "Zéro",
   "1": "Un",

novelwriter/assets/i18n/project_it_IT.json

@@ -16,6 +16,7 @@
   "Objects": "Oggetti",
   "Entities": "Enti",
   "Custom": "Personalizzato",
+  "Mentions": "Menzioni",
   "New Page": "Nuova pagina",
   "0": "Zero",
   "1": "Uno",

novelwriter/assets/i18n/project_ja_JP.json

@@ -16,6 +16,7 @@
   "Objects": "オブジェクト",
   "Entities": "エンティティ",
   "Custom": "カスタム",
+  "Mentions": "メンション",
   "New Page": "新規ページ",
   "0": "零",
   "1": "一",

novelwriter/assets/i18n/project_nb_NO.json

@@ -16,6 +16,7 @@
   "Objects": "Objekter",
   "Entities": "Enheter",
   "Custom": "Annet",
+  "Mentions": "Nevnt",
   "New Page": "Ny side",
   "0": "null",
   "1": "én",

novelwriter/assets/i18n/project_nl_NL.json

@@ -1,11 +1,13 @@
 {
   "Synopsis": "Synopsis",
-  "Short Description": "Korte beschrijving",
+  "Short Description": "Korte Omschrijving",
   "Footnotes": "Voetnoten",
   "Comment": "Opmerking",
+  "Story Structure": "Verhaalstructuur",
+  "Note": "Notitie",
   "Notes": "Notities",
   "Tag": "Label",
-  "Point of View": "Perspectief",
+  "Point of View": "Standpunt",
   "Focus": "Focus",
   "Characters": "Personages",
   "Plot": "Plot",
@@ -14,7 +16,8 @@
   "Objects": "Objecten",
   "Entities": "Entiteiten",
   "Custom": "Aangepast",
-  "New Page": "Nieuwe pagina",
+  "Mentions": "Vermeldingen",
+  "New Page": "Nieuwe Pagina",
   "0": "nul",
   "1": "één",
   "2": "twee",

novelwriter/assets/i18n/project_nn_NO.json

@@ -16,6 +16,7 @@
   "Objects": "Objekt",
   "Entities": "Eining",
   "Custom": "Anna",
+  "Mentions": "Nevnt",
   "New Page": "Ny side",
   "0": "null",
   "1": "ein",

novelwriter/assets/i18n/project_pl_PL.json

@@ -16,6 +16,7 @@
   "Objects": "Obiekty",
   "Entities": "Podmioty",
   "Custom": "Różne",
+  "Mentions": "Wzmianki",
   "New Page": "Nowa strona",
   "0": "zero",
   "1": "pierwszy",

novelwriter/assets/i18n/project_pt_BR.json

@@ -16,6 +16,7 @@
   "Objects": "Objetos",
   "Entities": "Entidades",
   "Custom": "Outros",
+  "Mentions": "Menções",
   "New Page": "Nova página",
   "0": "Zero",
   "1": "Um",

novelwriter/assets/i18n/project_ru_RU.json

@@ -3,6 +3,8 @@
   "Short Description": "Краткое описание",
   "Footnotes": "Примечания",
   "Comment": "Комментарий",
+  "Story Structure": "Структура повествования",
+  "Note": "Заметка",
   "Notes": "Заметки",
   "Tag": "Тэг",
   "Point of View": "Точка зрения",
@@ -14,6 +16,7 @@
   "Objects": "Объекты",
   "Entities": "Сущности",
   "Custom": "Другое",
+  "Mentions": "Упоминания",
   "New Page": "Новая страница",
   "0": "Ноль",
   "1": "Один",

novelwriter/assets/i18n/project_zh_CN.json

@@ -16,6 +16,7 @@
   "Objects": "物品",
   "Entities": "条目",
   "Custom": "自定义",
+  "Mentions": "提及",
   "New Page": "新建页面",
   "0": "零",
   "1": "一",