Release 2.4 Beta 1 (#1778)

.github/workflows/build.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Python Setup
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           architecture: x64
@@ -18,7 +18,7 @@ jobs:
           sudo apt install qttools5-dev-tools latexmk texlive texlive-latex-extra
 
       - name: Checkout Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Packages (pip)
         run: pip install -r docs/source/requirements.txt
@@ -27,7 +27,7 @@ jobs:
         run: python pkgutils.py qtlrelease sample manual
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: nw-assets
           path: |
@@ -46,7 +46,7 @@ jobs:
         linux-tag: ["manylinux_2_24_x86_64", "manylinux_2_28_x86_64"]
     steps:
       - name: Python Setup
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           architecture: x64
@@ -55,10 +55,10 @@ jobs:
         run: pip install python-appimage
 
       - name: Checkout Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nw-assets
           path: novelwriter/assets
@@ -67,12 +67,10 @@ jobs:
         run: python pkgutils.py build-appimage --linux-tag ${{ matrix.linux-tag }} --python-version ${{ matrix.python-version }}
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: novelWriter-Packages
-          path: |
-            dist_appimage/novelWriter*.AppImage
-            dist_appimage/novelWriter*.AppImage.sha256
+          name: AppImage-${{ matrix.python-version }}-${{ matrix.linux-tag }}
+          path: dist_appimage
           if-no-files-found: error
           retention-days: 1
 
@@ -81,10 +79,10 @@ jobs:
     runs-on: macos-12
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nw-assets
           path: novelwriter/assets
@@ -93,11 +91,9 @@ jobs:
         run: ./setup/macos/build.sh
 
       - name: Upload DMG
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: novelWriter-Packages
-          path: |
-            dist_macos/novelWriter*.dmg
-            dist_macos/novelWriter*.dmg.sha256
+          name: MacOS-DMG
+          path: dist_macos
           if-no-files-found: error
           retention-days: 1

.github/workflows/syntax.yml

@@ -15,14 +15,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Python Setup
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3
           architecture: x64
       - name: Checkout Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install flake8
-        run: pip install flake8
+        run: pip install flake8 flake8-pep585
       - name: Syntax Check
         run: |
           flake8 --version

.github/workflows/test_linux.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Python Setup
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
@@ -27,7 +27,7 @@ jobs:
           sudo apt update
           sudo apt install libenchant-2-dev qttools5-dev-tools aspell-en
       - name: Checkout Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Dependencies (pip)
         run: |
           pip install -U -r requirements.txt -r tests/requirements.txt

.github/workflows/test_mac.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Python Setup
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           architecture: x64
@@ -23,7 +23,7 @@ jobs:
         run: |
           brew install enchant
       - name: Checkout Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Dependencies (pip)
         run: |
           pip install -U pyobjc -r requirements.txt -r tests/requirements.txt

.github/workflows/test_win.yml

@@ -15,12 +15,12 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Python Setup
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           architecture: x64
       - name: Checkout Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Dependencies (pip)
         run: |
           pip install -U -r requirements.txt -r tests/requirements.txt

.gitignore

@@ -50,3 +50,6 @@ ToC.txt
 # Coverage
 /.coverage
 /coverage.*
+
+# Other
+/test.py

CHANGELOG.md

@@ -1,5 +1,293 @@
 # novelWriter Changelog
 
+## Version 2.4 Beta 1 [2024-03-26]
+
+### Release Notes
+
+This is a beta release of the next release version, and is intended for testing purposes. Please be
+careful when using this version on live writing projects, and make sure you take frequent backups.
+
+Please check the changelog for an overview of changes. The full release notes will be added to the
+final release.
+
+### Detailed Changelog
+
+**Major Features**
+
+* A global search feature has been added to the main sidebar. The search panel replaces the project
+  and novel tree when activated. PR #1775. Issue #894.
+* A new shortcode to highlight text has been added. PR #1715. Issue #705.
+* A new heading format for hard scene breaks has been added. It uses `###!` heading markup. The
+  only affect this has in the GUI is that these headings can be independently formatted in the
+  Manuscript tool. PR #1753. Issue #1050.
+* The document editor and viewer now have a dropdown menu in the header listing all headings of the
+  current document for quick navigation. The list is capped at 30 entries. PR #1764. issue #1059.
+
+**Build Tool Improvements**
+
+* The Manuscript Build Tool now has a word stats section below the preview that shows a number of
+  word and character counts for the previewed text. PR #1717. Issues #1114 and #1116.
+* The Manuscript Build Tool now shows an outline of the previewed document as a tab next to the
+  build settings list. PR #1768. Issue #1765.
+* Tabs handling in HTML output now has a separate setting from the other format. PR #1723.
+* Hard line breaks can now be excluded from Markdown builds. PR #1723. Issue #944.
+* It is now possible to control the centring and page breaks of partition, chapter and scene
+  headings. PR #1723. Issues #1117 and #1661.
+* Special titles (`#!`) can now be used in notes as well. PR #1723.
+* Meta data categories can be filtered out from the manuscript. PR #1723. issue #1132.
+* Any heading in a novel document can now be hidden in the manuscript. PR #1759. Issue #1756.
+* First line of a paragraph can now be indented in the manuscript. PR #1761. Issue #906.
+* Each meta data entry in HTML builds have a new class assigned to it that matches the tag used in
+  the text. PR #1767. Issue #1134.
+
+**Other Improvements**
+
+* The percentage progress counter in the editor document footer now counts progress per character
+  instead of per line. This is only noticeable on short documents. PR #1725.
+* Some improvements have been made to terms on the GUI and some strings have been simplified in
+  order to be easier to understand and to translate. PR #1727. Issue #1726.
+* Dates are now formatted according to the selected locale, if such a locale is available. If not,
+  it falls back to the local system locale. PR #1755. Issue #1739.
+
+**Code Improvements**
+
+* The tokenization of the novelWriter markup format has been refactored and improved. PR #1724.
+* A way to read project documents fast has been added. It is useful many places in the code where
+  only the text is needed, not the meta data. PR #1777.
+
+----
+
+## Version 2.3.1 [2024-03-17]
+
+### Release Notes
+
+This is a patch release that fixes several issues with translations into other languages than the
+default English, and adds completed translations for French.
+
+### Detailed Changelog
+
+**Internationalisation**
+
+* Fix untranslated text on the "Project Word List" dialog. PR #1744. Issue #1746.
+* Fix untranslated text on the dialog that pops up after an upgrade, PR #1754. Issue #1749.
+* Fix error in Norwegian translation. PR #1744.
+* Allow the translated text for adding chapter and scenes on the Welcome dialog to flow around the
+  number selector since the number is inserted into the sentence, and not all languages will split
+  the sentence around the number like is done in English. PR #1754. Issue #1750.
+* French translation updated by Albert Aribaud (@aaribaud). PR #1760.
+* Minor updates to other translations for the 2.3.1 fixes by other contributors. PR #1760.
+
+**Other Changes**
+
+* Bump the revision of the project file format to 1.5 Revision 3 from Revision 2. This should have
+  been done in the 2.3 release due to the addition of the Templates root folder type. PR #1748.
+
+----
+
+## Version 2.3 [2024-03-10]
+
+### Release Notes
+
+This release introduces a new Welcome dialog that replaces both the previous Open Project dialog
+and the New Project Wizard. The Welcome dialog has received a friendly custom art design created by
+Louis Durrant.
+
+The Preferences, Project Settings, Project Details, and About dialogs have received completely new
+designs and layouts, and the Manuscript Build Settings dialog has been updated to match.
+
+Among new features is a new Templates root folder where the writer can store template documents to
+be used when creating new project documents and notes. It is now also possible to include Point of
+View and Focus character names in chapter titles in Manuscripts. A new feature to ignore text has
+also been added. It behaves similarly to comments, but is never included in a manuscript even if
+comments in the manuscript are enabled.
+
+See the website for complete [Release Notes](https://novelwriter.io/releases/release_2_3.html).
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fix an issue where the Tags and References panel below the document viewer was not cleared if a
+  project was opened, closed, and a new project with no tags defined were opened again. PR #1720.
+  Issue #1718.
+* Fixed an issue where multi-selecting documents in Trash would give the option to again move items
+  to Trash. The menu now properly offers the option to permanently delete the documents. PR #1728.
+* Fixed an issue where multi-select for deletion would only process the item right-clicked, and not
+  all the selected items. PR #1728.
+* Changed the error message that pops up when trying to open a project from the Welcome dialog that
+  no longer exists. The error message should no indicate that the project was not found, as opposed
+  to unreadable. PR #1740. Issue #1737.
+
+**Improvements**
+
+* The build tool no longer inserts a scene separator immediately after a partition heading, and
+  should now behave the same way as for chapters. If there is text before the first scene break,
+  the text flows continuously without a separator. PR #1716. Issue #1704.
+* Added one new GUI theme named "Cyberpunk Night" by @alemvigh. Also added a matching "Cyberpunk
+  Night" document editor theme by @alemvigh, and a new Tango theme by @vkbo. PR #1738. Issue #1730.
+* When the Welcome dialog fails to open a project, and there is not already a project open in the
+  app, the Welcome dialog appears again. PR #1740. Issue #1737.
+
+**Internationalisation**
+
+* Norwegian and US English translations updated by @vkbo. PR #1714.
+* Japanese translation updated by @hebekeg. PR #1714.
+* Italian translation updated by Lou Cyper (loucyper1). PR #1714.
+* Dutch translation updated by Annelotte and Martijn van der Kleijn (mvdkleijn). PR #1714.
+* Latin American Spanish translation updated by @tmarplatt. PR #1741.
+* German translation updated by Myian (@HeyMyian). PR #1741.
+
+**Other Changes**
+
+* Removed the novelwriter-cli entry point that was in any case broken. PR #1734. Issue #1732.
+
+----
+
+## Version 2.3 RC 1 [2024-02-24]
+
+### Release Notes
+
+This is a release candidate of the next release version, and is intended for testing purposes.
+Please be careful when using this version on live writing projects, and make sure you take frequent
+backups.
+
+Please check the changelog for an overview of changes. The full release notes will be added to the
+final release.
+
+### Detailed Changelog
+
+**Improvements**
+
+* Redesign the buttons on the new Welcome dialog so that they only show buttons related to the
+  visible page. Drop the additional buttons on the New Project page. Issue #1706.
+  PRs #1707 and #1709.
+* Drop the Language setting on the Welcome dialog's New Project page. PR #1707.
+* Hide the additional settings for Fresh Projects on the New Project page of the new Welcome
+  dialog. Issue #1705. PR #1707.
+* Update the Templates root folder icon. PR #1709.
+* Scene separators are now hidden after a new title in manuscript builds, also when there are no
+  chapters. Issue #1704. PR #1711.
+* Scene and chapter counters are now reset when a novel title is encountered. PR #1711.
+
+----
+
+## Version 2.3 Beta 1 [2024-02-16]
+
+### Release Notes
+
+This is a beta release of the next release version, and is intended for testing purposes. Please be
+careful when using this version on live writing projects, and make sure you take frequent backups.
+
+Please check the changelog for an overview of changes. The full release notes will be added to the
+final release.
+
+### Detailed Changelog
+
+**Major Features**
+
+* A new Welcome dialog has been added. The dialog replaces the Open Project dialog and the New
+  Project Wizard. The Welcome dialog features artwork created by Louis Durrant, and a custom design
+  for the project list. New projects can be created by a form available from the same dialog, and
+  features a simplified set of options. Issue #1506. PRs #1647, #1681 and #1689.
+* It is now possible to create a new project by copying the content of another project, or a Zip
+  file of a project, including a backup. This option is available from the New Project feature of
+  the Welcome dialog. Issue #841. PRs #1680 and #1684.
+* The Preferences dialog has been completely redesigned. All options are now available in a single,
+  scrollable list with appropriate section headers. All sections are available as navigation
+  buttons along the side, and it is also possible to search for settings in a search box at the
+  top. The design matches that created for the Manuscript Build Settings dialog added in 2.1.
+  Issues #1603 and #1604. PR #1652.
+* The Project Details dialog has been redesigned to match the other new dialogs. It has also been
+  modified to properly handle multiple novel folders. The novel selector is placed at the top of
+  the dialog, and affects all data in the tabs. The Novel Title info has been removed. PR #1665.
+* The Manuscript Build Settings dialog has been updated to use the new config layout classes, which
+  are more flexible in terms of content flow. PR #1674.
+* A new root folder type called "Templates" has been added. Any document added here will show up in
+  the Add Item menu in the Project Tree view under a "From Template" submenu. Selecting such an
+  entry will create a new document at the selected location in the project, and populate it with
+  the content of the template file. Issues #996 and #1125. PR #1688.
+* The About novelWriter dialog has been simplified to only show some key information and the
+  credits text. A link to the releases page is available for checking release notes. Keeping the
+  release notes online means it is easier to update them, and make them more visually interesting
+  as the formatting of the dialog box is limited. PR #1695.
+* The old Check for Updates dialog has been removed. Checking for new releases of novelWriter can
+  be done directly in the Welcome dialog or the About dialog by clicking "Check Now" next to the
+  "Latest Version" label. PR #1696.
+
+**Minor Features**
+
+* A new drop down menu in the References panel below the Document Viewer has an option to filter
+  out inactive notes in the various tag lists in the tabs on the panel. Issue #1653. PR #1654.
+* The Novel Title fields, which no longer makes much sense after it was possible to add multiple
+  novel folders to a project, has been fully dropped. Issue #1655. PR #1669.
+* The document header for ODT manuscript files can now be customised. Issue #1505. PR #1675.
+* The Manuscript Build tool can now insert characters (Point of View or Focus) into chapter headers
+  and other headers. By default, it inserts the tag value, but the display name for a tag can be
+  set with a `|` character in the `@tag` definition if a different text is desired. Issue #1468.
+  PR #1677.
+* A new modified comment format for the editor has been added. Instead of the regular comment using
+  `%`, this one uses `%~`. The only difference is that the latter will never be exported to a
+  manuscript at all, while regular comments can be exported when a setting is enabled. Issue #1075.
+  PR #1690.
+* It is now possible to change a document's label from the first heading in the document by
+  right-clicking on it and selecting "Rename to heading". Issue #1443. PR #1692.
+* The content of the Project Word List can now be exported and imported using plain text files.
+  Issue #1560. PR #1691.
+* The content of the Outline View can now be exported to a CSV file to be opened in any spreadsheet
+  application. Issue #1507. PR #1697.
+
+**Usability**
+
+* A Create New submenu in the Project Tree context menu has been added, which give quick access to
+  the items at the top level of the Add Item menu. Issue #1519. PR #1679.
+* When multiple paragraphs are selected in the editor, and any of the comment features are toggled,
+  or formatting is reset, the action is applied to all selected paragraphs, not just the first.
+  Issue #1042 and #1687. PR #1690.
+
+**Packaging**
+
+* The in-app version format is now identical to the version tag, and the format for Ubuntu
+  pre-release packages has been updated so that they are compatible with release packages. That is,
+  if you add both the release and pre-release repos from Launchpad, release packages will now
+  properly replace pre-release packages when running apt upgrade. PR #1659.
+
+**Code Improvements**
+
+* The Storage class has been refactored. It is the class that handles the project storage folder
+  for a novelWriter project. The refactoring is a step towards allowing single file storage for
+  projects as an alternative to project folders. Issue #977. PR #1635.
+* All theme colours are now proper QColor objects from the start, which avoids the need to create
+  a large number of these where they are used. PR #1656.
+* A nwProject.bak file is no longer kept in the project folder. It never really served any purpose.
+  The project file is still written to a temp file before the old file is replaced, which prevents
+  partial overwrites. PR #1670.
+* Other minor code improvements in PRs #1693 and 1694.
+
+----
+
+## Version 2.2.1 [2024-01-27]
+
+### Release Notes
+
+This is a patch release that fixes an issue where the Project View would sometimes switch to the
+Novel View when a new item was created. This patch also includes updated translations for German
+and Chinese.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fix a bug in the toggle for the tree view on the left would trigger each time a new project item
+  was created. Issue #1649. PR #1648.
+* Fix an issue where multiple Manuscript and Writing Stats dialogs could be opened. PR #1671.
+
+**Internationalisation**
+
+* Updated German translation, by @HeyMyian. PR #1666.
+* Updated Chinese translation, by @ruixuan658 and @longqzh. PR #1666.
+
+----
+
 ## Version 2.2 [2023-12-17]
 
 ### Release Notes

CREDITS.md

@@ -12,6 +12,10 @@
 
 For other contributions, see the project's [Contributors](https://github.com/vkbo/novelWriter/graphs/contributors) page.
 
+## Artwork
+
+The artwork on the Welcome dialog was created by [Louis Durrant](https://louisdurrant.art).
+
 ## Translations
 
 The default language is English (UK) with English (US) as an option. These are the original
@@ -54,9 +58,11 @@ Some of the assets bundled with novelWriter were adapted from the following sour
 
 ## Fonts
 
-The font used for the main novelWriter logo, mimetype and text banners is:
+The font used for the main novelWriter logo, mimetype and text banners is Pridi. Other fonts are
+used on buttons and icons.
 
 * Pridi by Cadson Demak (Open Font License, Version 1.1)
+* Source Sans Pro by Paul D. Hunt (SIL Open Font License)
 
 ## Special Mentions
 

docs/source/index.rst

@@ -5,9 +5,9 @@ novelWriter User Guide
 | **Release Version:** |release|
 | **Updated:** |today|
 
-novelWriter is an open source 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 is designed to be a simple text
+novelWriter is an open source plain text editor designed for writing novels assembled from
+individual text documents. It uses a minimal formatting syntax inspired by Markdown, and adds a
+meta data syntax for comments, synopsis, and cross-referencing. It is 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.
 
@@ -23,13 +23,14 @@ See the :ref:`a_breakdown_storage` section for more details.
 
 Any operating system that can run Python 3 and has the Qt 5 libraries should be able to run
 novelWriter. It runs fine on Linux, Windows and MacOS, and users have tested it on other platforms
-as well. novelWriter can also be run directly from the Python source, or installed from packages or
-with pip. See :ref:`a_started` for more details.
+as well. novelWriter can be run directly from the Python source, or installed from packages or with
+pip. See :ref:`a_started` for more details.
 
 **Useful Links**
 
 * Website: https://novelwriter.io
 * 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
@@ -66,7 +67,6 @@ with pip. See :ref:`a_started` for more details.
    usage_format
    usage_shortcuts
    usage_typography
-   usage_projectformat
 
 .. toctree::
    :maxdepth: 1
@@ -80,7 +80,15 @@ with pip. See :ref:`a_started` for more details.
 
 .. toctree::
    :maxdepth: 1
-   :caption: Additional Topics
+   :caption: Additional Details
+   :hidden:
+
+   more_projectformat
+   more_counting
+
+.. toctree::
+   :maxdepth: 1
+   :caption: Technical Topics
    :hidden:
 
    tech_locations

docs/source/int_customise.rst

@@ -36,7 +36,8 @@ and add dictionaries yourself.
 
 A small tool to assist with this can be found under :guilabel:`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.
+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**
 
@@ -96,7 +97,7 @@ set as ``name`` inside the file.
    suitable one.
 
 
-Gustom GUI and Icons Theme
+Custom GUI and Icons Theme
 --------------------------
 
 A GUI theme ``.conf`` file consists of the following settings:
@@ -139,10 +140,10 @@ In the Main section you must at least define the ``name`` and ``icontheme`` sett
 ``typicons_light`` or ``typicons_dark``, or to an icon theme in your custom icons directory. The
 setting must match the icon theme's folder name.
 
-The Palette values correspond to the Qt enum values for QPalette::ColorRole, see the
+The Palette values correspond to the Qt enum values for ``QPalette::ColorRole``, see the
 `Qt documentation <https://doc.qt.io/qt-5.15/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  to 255.
-Omitted values are not loaded and will use default values.
+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.
 
 
 Custom Syntax Theme
@@ -174,15 +175,25 @@ A syntax theme ``.conf`` file consists of the following settings:
    shortcode      =   0,   0,   0
    keyword        =   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
 
 In the Main section, you must define at least the ``name`` setting. The Syntax colour values are
-RGB numbers of the format ``r, g, b`` where each is an integer from  to 255. Omitted values default
-to black, except ``background`` which defaults to white,
+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.
+
+Omitted syntax colours default to black, except ``background`` which defaults to white, and
+``texthighlight`` which defaults to white with half transparency.
 
 .. versionadded:: 2.2
-   The `shortcode` syntax colour entry was added, so you need to update your custom themes if you
-   made any before version 2.2.
+   The `shortcode` syntax colour entry was added.
+
+.. versionadded:: 2.3
+   The `optional` syntax colour entry was added.
+
+.. versionadded:: 2.4
+   The `texthighlight` syntax colour entry was added.

docs/source/int_glossary.rst

@@ -50,7 +50,7 @@ Glossary
    Headings
       Each level of headings in :term:`Novel Documents` have a specific meaning in terms of the
       structure of the story. That is, they determine what novelWriter considers a partition, a
-      chapter, a scene or a text section. For :term:`Project Notes`, the header levels don't
+      chapter, a scene or a text section. For :term:`Project Notes`, the heading levels don't
       matter. For more details on headings in novel documents, see :ref:`a_struct_heads`.
 
    Keyword

docs/source/int_howto.rst

@@ -25,7 +25,7 @@ Managing the Project
    :guilabel:`Merge Documents in Folder`.
 
    In the dialog that pops up, the documents will be in the same order as in the folder, but you
-   can also rearrange them here of you wish. See :ref:`a_ui_tree_split_merge` for more details.
+   can rearrange them here of you wish. See :ref:`a_ui_tree_split_merge` for more details.
 
 
 Layout Tricks
@@ -42,7 +42,7 @@ Layout Tricks
    in columns using the tab key, and it should look the same when viewed next to the editor.
 
    This is most suitable for your notes, as the result in exported documents cannot be guaranteed
-   to match.
+   to match. Especially if you don't use the same font in your manuscript as in the editor.
 
 
 Organising Your Text
@@ -56,7 +56,9 @@ Organising Your Text
 
    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 (added in novelWriter 2.0).
+   documents of the chapter.
+
+   .. versionadded:: 2.0
 
 .. dropdown:: Distinguishing Soft and Hard Scene Breaks
    :animate: fade-in-slide-down
@@ -64,12 +66,19 @@ Organising Your Text
    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 the scene heading for hard scene breaks and section headings
-   for soft scene breaks. the :guilabel:`Build Manuscript` tool will let you add separate
+   In such cases you may want to use a scene heading for hard scene breaks and a section heading
+   for soft scene breaks. The :guilabel:`Build Manuscript` tool will let you add separate
    formatting for the two when you generate your manuscript. You can for instance add the common
    "``* * *``" for hard breaks and select to hide section breaks, which will just insert an empty
    paragraph in their place. See :ref:`a_manuscript_settings` for more details.
 
+   Keep in mind that this is not what the section heading is intended for, so the app will not
+   understand the section heading as a scene, but it will be formatted correctly in the manuscript.
+
+   .. versionadded:: 2.4
+      You can now distinguish between soft and hard scene breaks with a modified scene header. See
+      :ref:`a_manuscript_settings_head_hard` for more details.
+
 
 Other Tools
 ===========

docs/source/int_introduction.rst

@@ -8,9 +8,18 @@ Key Features
 .. _Markdown: https://en.wikipedia.org/wiki/Markdown
 
 At its core, novelWriter is a multi-document plain text editor. It uses a markup syntax inspired by
-Markdown_ to apply simple formatting to the text. It is designed for writing fiction, so the
-formatting features available are limited to those relevant for this purpose. It is *not* suitable
-for technical writing, and it is *not* a full-featured Markdown editor.
+Markdown_ to apply simple formatting to the text. It also allows for some extended formatting codes
+using a shortcode format. See :ref:`a_fmt_shortcodes` for more details.
+
+.. admonition:: Limitations
+
+   novelWriter is designed for writing fiction, so the formatting features available are limited to
+   those relevant for this purpose. It is **not** suitable for technical writing, and it is **not**
+   a full-featured Markdown editor.
+
+   It is also not intended as a tool to organise research for writing, and therefore lacks
+   formatting features you may need for this purpose. The notes feature in novelWriter is mainly
+   intended for character profiles and plot outlines.
 
 Your novel project is organised as a collection of separate plain text documents instead of a
 single, large document. The idea is to make it easier to reorganise your project structure without
@@ -20,10 +29,10 @@ There are two kinds of documents in your project: :term:`Novel Documents` are do
 part of your story. The other kind of documents are :term:`Project Notes`. These are intended for
 your notes about your characters, your world building, and so on.
 
-You can at any point split the individual documents by their headers up into multiple documents, or
-merge multiple documents into single documents. This makes it easier to use variations of the
+You can at any point split the individual documents by their headings up into multiple documents,
+or merge multiple documents into single documents. This makes it easier to use variations of the
 Snowflake_ method for writing. You can start by writing larger structure-focused documents, like
-one per act for instance, and later effortlessly split these up into scenes by their headers.
+one per act for instance, and later effortlessly split these up into chapters or scenes.
 
 Below are some key features of novelWriter.
 
@@ -45,15 +54,15 @@ Below are some key features of novelWriter.
    build the project into a manuscript, they are all glued together in the top-to-bottom order in
    which they appear in the project tree. You can use as few text documents as you like, but
    splitting the project up into chapters and scenes means you can easily reorder them using the
-   drag-and-drop feature of the project tree. You can also start out with a few documents and then
-   later split them into multiple documents based on their headers.
+   drag-and-drop feature of the project tree. You can also start out with fewer documents and then
+   later split them into multiple documents based on chapter and scene headings.
 
 **Multi-novel project support**
-   As of novelWriter 2.0, you can have multiple Novel type root folders in a project. This allows
-   you to keep a series of individual novels with the same characters and world building in the
-   same project, and create manuscripts for them individually.
+   You can have multiple Novel type root folders in a project. This allows you to keep a series of
+   individual novels with the same characters and world building in the same project, and create
+   manuscripts for them individually.
 
-**Keep track of your plot elements**
+**Keep track of your story elements**
    All notes in your project can be assigned a :term:`tag` that you can :term:`reference` from any
    other document or note. In fact, you can add a new tag under each heading of a note if you need
    to be able to reference specific sections of it.
@@ -69,10 +78,10 @@ Below are some key features of novelWriter.
 **Get an overview of your story elements**
    Under the document viewer panel you will find a series of tabs that shows the different story
    elements you have created tags for. The tabs are sorted into Characters, Plots, etc, depending
-   on which categories you are using in your story. This panel can be hidden when you don't need it
-   to free up space.
+   on which categories you are using in your story. This panel can be hidden to free up space when
+   you don't need it.
 
-**Building your manuscript**
+**Assembling your manuscript**
    Whether you want to assemble a manuscript, or export all your notes, or generate an outline of
    your chapters and scenes with a synopsis, you can use the :guilabel:`Build Manuscript` tool to
    do so. The tool lets you select what information you want to include in the generated document,

docs/source/int_overview.rst

@@ -11,9 +11,9 @@ Overview
       :width: 220
 
 novelWriter is built as a cross-platform application using `Python 3 <https://www.python.org/>`_ as
-the programming language, and `Qt 5 <https://www.qt.io/>`_ for the user interface.
+the programming language, and `Qt 5 <https://www.qt.io/>`_ framework for the user interface.
 
-novelWriter is built for Linux first, and this is where it works best. However, it also runs fine
+novelWriter is built for Linux first, so this is where it works best. However, it also runs fine
 on Windows and MacOS due to the cross-platform framework it's built on. The author of the
 application doesn't own a Mac, so on-going Mac support is dependent on user feedback and user
 contributions.
@@ -22,7 +22,7 @@ Spell checking in novelWriter is provided by a third party library called
 `Enchant <https://abiword.github.io/enchant/>`_. Please see the section on :ref:`a_custom_dict` for
 how to install spell checking languages.
 
-For install instructions, see :ref:`a_started`.
+For install instructions for novelWriter, see :ref:`a_started`.
 
 
 Using novelWriter
@@ -58,12 +58,6 @@ read on.
    your language, and other special characters. If you use any symbols aside from these, their
    intended use is explained here.
 
-:ref:`a_prjfmt` – Optional
-   This chapter is more technical and has an overview of changes made to the way your project data
-   is stored. The format has changed a bit from time to time, and sometimes the changes require
-   that you make small modifications to your project. Everything you need to know is listed in this
-   chapter.
-
 
 Organising Your Projects
 ========================
@@ -90,3 +84,11 @@ meta data for it to extract.
 :ref:`a_manuscript` - Recommended Reading
    This chapter explains how the :guilabel:`Manuscript Build` tool works, how you can control the
    way chapter titles are formatted, and how scene and section breaks are handled.
+
+
+Additional Details & Technical Topics
+=====================================
+
+The Additional Details and the Technical Topics sections contain more in-depth information about
+how various bits of novelWriter works. This information is not essential to getting started using
+novelWriter.

docs/source/int_started.rst

@@ -6,7 +6,7 @@ Getting Started
 
 .. _Enchant: https://abiword.github.io/enchant/
 .. _GitHub: https://github.com/vkbo/novelWriter
-.. _main website: https://novelwriter.io
+.. _Downloads page: https://download.novelwriter.io
 .. _PPA: https://launchpad.net/~vkbo/+archive/ubuntu/novelwriter
 .. _Pre-Release PPA: https://launchpad.net/~vkbo/+archive/ubuntu/novelwriter-pre
 .. _PyPi: https://pypi.org/project/novelWriter/
@@ -15,9 +15,10 @@ Getting Started
 .. _AppImage: https://appimage.org/
 
 Ready-made packages and installers for novelWriter are available for all major platforms, including
-Linux, Windows and MacOS. See below for install instructions for each platform.
+Linux, Windows and MacOS, from the `Downloads page`_. See below for install instructions for each
+platform.
 
-You can also install novelWriter from the Python Package Index (PyPi). See :ref:`a_started_pip`.
+You can also install novelWriter from the Python Package Index (PyPi_). See :ref:`a_started_pip`.
 Installing from PyPi does not set up icon launchers, so you will either have to do this yourself,
 or start novelWriter from the command line.
 
@@ -32,7 +33,7 @@ Installing on Windows
 =====================
 
 You can install novelWriter with both Python and library dependencies embedded using the Windows
-Installer (setup.exe) file from the `main website`_, or from the Releases_ page on GitHub_.
+Installer (setup.exe) file from the `Downloads page`_, or from the Releases_ page on GitHub_.
 Installing it should be straightforward.
 
 If you have any issues, try uninstalling the previous version and making a fresh install. If you
@@ -51,8 +52,8 @@ multiple installations has been known to cause problems.
 Installing on Linux
 ===================
 
-A Debian package can be downloaded from the `main website`_, or from the Releases_ page on GitHub_.
-This package should work on both Debian, Ubuntu and Linux Mint, at least.
+A Debian package can be downloaded from the `Downloads page`_, or from the Releases_ page on
+GitHub_. This package should work on both Debian, Ubuntu and Linux Mint, at least.
 
 If you prefer, you can also add the novelWriter repository on Launchpad to your package manager.
 
@@ -82,7 +83,7 @@ Instead, run the following commands to add the repository and key:
 .. code-block:: bash
 
    sudo gpg --no-default-keyring --keyring /usr/share/keyrings/novelwriter-ppa-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys F19F1FCE50043114
-   echo "deb [signed-by=/usr/share/keyrings/novelwriter-ppa-keyring.gpg] http://ppa.launchpad.net/vkbo/novelwriter/ubuntu jammy main" | sudo tee /etc/apt/sources.list.d/novelwriter.list
+   echo "deb [signed-by=/usr/share/keyrings/novelwriter-ppa-keyring.gpg] http://ppa.launchpad.net/vkbo/novelwriter/ubuntu noble main" | sudo tee /etc/apt/sources.list.d/novelwriter.list
 
 Then run the update and install commands as for Ubuntu:
 
@@ -112,8 +113,8 @@ completely standalone images for the app that include the necessary environment
 They can of course be run on any Linux distro, if you prefer this to native packages.
 
 .. note::
-   novelWriter generally don't support Python versions that have reached end of life. If your Linux
-   distro still uses older Python versions and novelWriter won't run, you may want to try the
+   novelWriter generally doesn't support Python versions that have reached end of life. If your
+   Linux distro still uses older Python versions and novelWriter won't run, you may want to try the
    AppImage instead.
 
 
@@ -123,14 +124,14 @@ Installing on MacOS
 ===================
 
 You can install novelWriter with both its Python and library dependencies embedded using the DMG
-application image file from the `main website`_, or from the Releases_ page on GitHub_. Installing
-it should be straightforward.
+application image file from the `Downloads page`_, or from the Releases_ page on GitHub_.
+Installing it should be straightforward.
 
 * Download the DMG file and open it. Then drag the novelWriter icon to the :guilabel:`Applications`
   folder on the right. This will install it into your :guilabel:`Applications`.
 * The first time you try to launch it, it will say that the bundle cannot be verified, simply press
   the :guilabel:`Open` button to add an exception.
-* If you are not presented with an :guilabel:`Open` button in the dialog launch the application
+* If you are not presented with an :guilabel:`Open` button in the dialog, launch the application
   again by right clicking on the application in Finder and selecting :guilabel:`Open` from the
   context menu.
 
@@ -149,7 +150,7 @@ Installing from PyPi
 ====================
 
 novelWriter is also available on the Python Package Index, or PyPi_. This install method works on
-all supported operating systems.
+all supported operating systems with a suitable Python environment.
 
 To install from PyPi you must first have the ``python`` and ``pip`` commands available on your
 system. You can download Python from `python.org`_. It is recommended that you install the latest

docs/source/more_counting.rst

@@ -0,0 +1,98 @@
+.. _a_counting:
+
+********************
+Word and Text Counts
+********************
+
+This is an overview of how words and other counts of your text are performed. The counting rules
+should be relatively standard, and are compared to Libre Office Writer rules.
+
+The counts provided in the app on the raw text is meant to be approximate. For more accurate
+counts, you need to build your manuscript in the :guilabel:`Manuscript Tool` and check the counts
+on the generated preview.
+
+
+Text Word Counts and Stats
+==========================
+
+These are the rules for the main counts available for for each document in a project.
+
+For all counts, the following rules apply.
+
+#. Short (–) and long (—) dashes are considered word separators.
+#. Any line starting with ``%`` or ``@`` is ignored.
+#. Trailing white spaces are ignored, including line breaks.
+#. Leading ``>`` and trailing ``<`` are ignored with any spaces next to them.
+#. Valid shortcodes and other commands wrapped in brackets ``[]`` are ignored.
+#. In-line Markdown syntax in text paragraphs is treated as part of the text.
+
+After the above preparation of the text, the following counts are available.
+
+**Character Count**
+   The character count is the sum of characters per line, including leading and in-text white space
+   characters, but excluding trailing white space characters. Shortcodes in the text are not
+   included, but Markdown codes are. Only headers and text are counted.
+
+**Word Count**
+   The words count is the sum of blocks of continuous character per line separated by any number of
+   white space characters or dashes. Only headers and text are counted.
+
+**Paragraph Count**
+   The paragraph count is the number of text blocks separated by one or more empty line. A line
+   consisting only of white spaces is considered empty.
+
+
+Manuscript Counts
+=================
+
+These are the rules for the counts available for a manuscript in the :guilabel:`Manuscript Tool`.
+The rules have been tuned to agree with LibreOffice Writer, but will vary slightly depending on the
+content of your text. LibreOffice Writer also counts the text in the page header, which the
+Manuscript Tool does not.
+
+The content of each line is counted after all formatting has been processed, so the result will be
+more accurate than the counts for text documents elsewhere in the app. The following rules apply:
+
+#. Short (–) and long (—) dashes are considered word separators.
+#. Leading and trailing white spaces are generally included, but paragraph breaks are not.
+#. Hard line breaks within paragraph are considered white space characters.
+#. All formatting codes are ignored, including shortcodes, commands and Markdown.
+#. Scene and section separators are counted.
+#. Comments and meta data lines are counted after they are formatted.
+#. Headers are counted after they are formatted with custom formats.
+
+The following counts are available:
+
+**Header Count**
+   The number of headers in the manuscript.
+
+**Paragraph Count**
+   The number of body text paragraphs in the manuscript.
+
+**Total Word Count**
+   The number of words in the manuscript, including any comments and meta data text.
+
+**Text Word Count**
+   The number of words in body text paragraphs, excluding all other text.
+
+**Header Word Count**
+   The number of words in headers, including inserted formatting like chapter numbers, etc.
+
+**Total Character Count**
+   The number of characters on all lines, including any comments and meta data text. Paragraph
+   breaks are not counted, but in-paragraph hard line breaks are.
+
+**Text Character Count**
+   The number of characters in body text paragraphs. Paragraph breaks are not counted, but
+   in-paragraph hard line breaks are.
+
+**Header Character Count**
+   The number of characters in headings.
+
+**Text Words Character Count**
+   The number of characters in body text paragraphs considered part of a word or punctuation. That
+   is, white space characters are not counted.
+
+**Header Words Character Count**
+   The number of characters in headers considered part of a word or punctuation. That is, white
+   space characters are not counted.

docs/source/project_manuscript.rst

@@ -10,7 +10,7 @@ You can activate it from the sidebar, the :guilabel:`Tools` menu, or by pressing
 
 .. versionadded:: 2.1
    This tool is new for version 2.1. A simpler tool was used for earlier versions. The simpler tool
-   only allows you to define a single set of options for the build, but otherwise has much the same
+   only allows you to define a single set of options for the build, but otherwise had much the same
    functionality.
 
 
@@ -63,6 +63,8 @@ In the figure, the green arrow icon and the blue pin icon indicates which docume
 and the red forbidden icon indicates that a document is explicitly excluded.
 
 
+.. _a_manuscript_settings_head:
+
 Formatting Headings
 -------------------
 
@@ -73,7 +75,7 @@ Formatting Headings
 The :guilabel:`Headings` page of the :guilabel:`Manuscript Build Settings` dialog allows you to set
 how the headings in your :term:`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 like shown int he figure above.
+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
@@ -86,6 +88,7 @@ Any text you add that isn't highlighted in colours will remain in your formatted
 You can preview the result of these format strings by clicking :guilabel:`Apply`, and then clicking
 :guilabel:`Preview` in the :guilabel:`Manuscript Build` tool main window.
 
+
 Scene Separators
 ^^^^^^^^^^^^^^^^
 
@@ -99,6 +102,19 @@ the desired separator text as the format. If the format is any piece of static t
 be treated as a separator.
 
 
+.. _a_manuscript_settings_head_hard:
+
+Hard and Soft Scenes
+^^^^^^^^^^^^^^^^^^^^
+
+If you wish to distinguish between so-called soft and hard scene breaks, where a hard scene break
+is understood as a scene break that changes point-of-view character, you can use the modified scene
+heading format in your text. You can then give these headings a different formatting in the
+:guilabel:`Headings` settings.
+
+See :ref:`a_fmt_head` for more info on how to format headings in your text.
+
+
 Output Settings
 ---------------
 
@@ -152,7 +168,7 @@ novelWriter Markup
 
 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 strikethrough text, which is not supported by
+   of novelWriter functionality is the support for strike through text, which is not supported by
    the Standard flavour.
 
 

docs/source/project_overview.rst

@@ -4,21 +4,25 @@
 Novel Projects
 **************
 
-New projects can be created from the :guilabel:`Project` menu by selecting :guilabel:`New Project`.
-This will open the :guilabel:`New Project Wizard` that will assist you in creating a bare bone
-project suited to your needs.
+New projects can be created from the :guilabel:`Project` menu by selecting
+:guilabel:`Create or Open Project`. This will open the :guilabel:`Welcome` dialog, where you can
+select the :guilabel:`New` button that will assist you in creating a new project.
 
 A novelWriter project requires a dedicated folder for storing its files on the local file system.
 If you're interested in the details, you can have a look at the chapter :ref:`a_storage`.
 
-A list of recently opened projects is maintained, and displayed in the :guilabel:`Open Project`
+A list of recently opened projects is maintained, and displayed in the :guilabel:`Welcome`
 dialog. A project can be removed from this list by selecting it and pressing the :kbd:`Del` key or
-by clicking the :guilabel:`Remove` button.
+by right-clicking it and selecting the :guilabel:`Remove Project` option.
+
+.. figure:: images/fig_welcome.jpg
+
+   The project list (left) and new project form (right) of the :guilabel:`Welcome` dialog.
 
 Project-specific settings are available in :guilabel:`Project Settings` in the :guilabel:`Project`
-menu. See further details below in the :ref:`a_proj_settings` section. Details about the project,
-including word counts, and a table of contents with word and page counts, is available through the
-:guilabel:`Project Details` dialog.
+menu. See further details below in the :ref:`a_proj_settings` section. Details about the project's
+novel text, including word counts, and a table of contents with word and page counts, is available
+through the :guilabel:`Novel Details` dialog.
 
 
 .. _a_proj_roots:
@@ -58,8 +62,9 @@ details, see the :ref:`a_references` chapter.
    Character notes go in this root folder type. These are especially important if you want to use
    the :guilabel:`Outline View` to see which character appears where, which part of the story is
    told from a specific character's point-of-view, or focusing on a particular character's
-   storyline. Tags in this type of folder can be referenced using the ``@pov`` keyword for
-   point-of-view characters, ``@focus`` for a focus character, or the ``@char`` keyword for any
+   storyline. The character names can also be inserted into for instance chapter titles when you
+   create your manuscript. Tags in this type of folder can be referenced using the ``@pov`` keyword
+   for point-of-view characters, ``@focus`` for a focus character, or the ``@char`` keyword for any
    other character present.
 
 :guilabel:`Locations`
@@ -105,8 +110,8 @@ trash folder can then be deleted permanently, either individually, or by emptyin
 the menu. Documents in the trash folder are removed from the :term:`project index` and cannot be
 referenced.
 
-A document or a folder can be deleted from the :guilabel:`Project` menu, or by pressing
-:kbd:`Ctrl+Shift+Del`. Root folders can only be deleted when they are empty.
+A document or a folder can be moved to trash from the :guilabel:`Project` menu, or by pressing
+:kbd:`Ctrl+Shift+Del`. Root folders can only be removed when they are empty.
 
 
 .. _a_proj_roots_out:
@@ -129,9 +134,9 @@ Recovered Documents
 -------------------
 
 If novelWriter crashes or otherwise exits without saving the project state, or if you're using a
-file synchronisation tool that runs out of sync, there may be files in the project folder that
-aren't tracked in the core project file. These files, when discovered, are recovered and added back
-into the project.
+file synchronisation tool that runs out of sync, there may be files in the project storage folder
+that aren't tracked in the core project file. These files, when discovered, are recovered and added
+back into the project.
 
 The discovered files are scanned for metadata that give clues as to where the document may
 previously have been located in the project. The project loading routine will try to put them back
@@ -152,10 +157,10 @@ Project Lockfile
 ----------------
 
 To prevent lost documents caused by file conflicts when novelWriter projects are synchronised via
-file synchronisation tools, a project lockfile is written to the project folder. If you try to open
-a project which has such a file present, you will be presented with a warning, and some information
-about where else novelWriter thinks the project is also open. You will be given the option to
-ignore this warning, and continue opening the project at your own risk.
+file synchronisation tools, a project lockfile is written to the project storage folder. If you try
+to open a project which has such a file present, you will be presented with a warning, and some
+information about where else novelWriter thinks the project is also open. You will be given the
+option to ignore this warning, and continue opening the project at your own risk.
 
 .. note::
    If, for some reason, novelWriter crashes, the lock file may remain even if there are no other
@@ -208,6 +213,18 @@ converting, splitting, or merging items. See :ref:`a_ui_tree_split_merge` for mo
 latter two.
 
 
+Document Templates
+------------------
+
+If you wish to create template documents to be used when creating new project documents, like for
+instance a character note template, you can add a :guilabel:`Templates` root folder to your
+project. Any document added to this root folder will show up in the :guilabel:`Add Item` menu in
+the project tree toolbar. When selected, a new document is created with its content copied from the
+chosen template.
+
+.. versionadded:: 2.3
+
+
 .. _a_proj_files_counts:
 
 Word Counts
@@ -227,6 +244,8 @@ the values in the project tree, which again depend on an up to date :term:`proje
 counts seem wrong, a full project word recount can be initiated by rebuilding the project's index.
 Either from the :guilabel:`Tools` menu, or by pressing :kbd:`F9`.
 
+The rules for how the counts are made is covered in more detail in :ref:`a_counting`.
+
 
 .. _a_proj_settings:
 
@@ -242,25 +261,23 @@ Settings Tab
 
 The :guilabel:`Settings` tab holds the project name, title, and author settings.
 
-The :guilabel:`Project Name` can be set to a different value than the :guilabel:`Novel Title`. The
-difference between them is simply that the :guilabel:`Project Name` is used for the GUI (main
-window title) and for generating backup files. The intention is that the :guilabel:`Project Name`
-should remain unchanged throughout the project's lifetime, otherwise the name of exported files and
-backup files may change too.
+The :guilabel:`Project Name` can be edited here. It is used for the GUI (main window title) and for
+generating backup files. So keep in mind that if you do change this setting, the backup file names
+will change too.
 
-The :guilabel:`Novel Title` and :guilabel:`Authors` settings are used when building the manuscript,
-for some formats.
+You can also change the :guilabel:`Authors` and :guilabel:`Project Language` setting. These are
+only used when building the manuscript, for some formats.
 
 If your project is in a different language than your main spell checking language is set to, you
-can override the default setting here. You can also override the automatic backup setting. The
-project language can also be changed from the :guilabel:`Tools` menu.
+can override the default setting here. The project language can also be changed from the
+:guilabel:`Tools` menu. You can also override the automatic backup setting if you wish.
 
 
 Status and Importance Tabs
 --------------------------
 
-Each document or folder of type :guilabel:`Novel` can be given a *Status* label accompanied by a
-coloured icon, and each document or folder of the remaining types can be given an *Importance*
+Each document or folder of type :guilabel:`Novel` can be given a "Status" label accompanied by a
+coloured icon, and each document or folder of the remaining types can be given an "Importance"
 label.
 
 These labels are there purely for your convenience, and you are not required to use them for any

docs/source/project_references.rst

@@ -4,21 +4,21 @@
 Tags and References
 *******************
 
-In novelWriter there are no forms or tables to fill in to define the characters, locations and
-other elements of your story. Instead, you can mark your :term:`project notes` as representing
-these story elements by creating a :term:`tag`. Whenever you want to link a piece of your story to
-a note defining a story element, like a character, you create a :term:`reference` back to that tag.
-You can also cross-link your project notes in the same way.
+In novelWriter there are no forms or tables to fill in to define characters, locations or other
+elements of your story. Instead, you create :term:`project notes` which you can mark as
+representing these story elements by creating a :term:`tag`. Whenever you want to link a piece of
+your story to a note defining a story element, like a character, you create a :term:`reference`
+back to that tag. You can also cross-link your project notes in the same way.
 
 This is perhaps one of the features that makes novelWriter different from other, similar
 applications. It is therefore not always obvious to new users how this is supposed to work, so
-this chapter hopes to explains in more detail how to use the tags and references system.
+this chapter hopes to explain in more detail how to use this tags and references system.
 
 .. tip::
    If you find the Tags and Reference system difficult to follow just from reading this chapter,
-   you can create a new project in novelWriter and select to "Fill the project with example files"
-   in the :guilabel:`New Project Wizard`. The example project contains several examples of tags and
-   references.
+   you can create a new project in the :guilabel:`Welcome` dialog's New project form and select 
+   "Create an example project" from the "Pre-fill project" option. The example project contains
+   several examples of tags and references.
 
 
 .. _a_references_metadata:
@@ -31,14 +31,15 @@ documents, not the documents themselves. See :ref:`a_struct_heads` for more deta
 metadata is also associated with headings, and not the documents directly.
 
 If you split your project into separate documents for each scene, this distinction may not matter.
-However, there are several benefits to using documents at a larger structural scale when starting
-your project. For instance, it may make more sense to define all your scenes, and even chapters, in
-a single document at first, or perhaps a document per act. You can later split these documents up
-using the document split feature. See :ref:`a_ui_tree_split_merge` for more details.
+However, there are several benefits to using documents at a larger structural scale when first
+starting your project. For instance, it may make more sense to define all your scenes, and even
+chapters, in a single document at first, or perhaps a document per act. You can later split these
+documents up using the document split feature. See :ref:`a_ui_tree_split_merge` for more details.
 
-The implication here is that you can treat each heading as an independent element of your notes
-that can be referenced somewhere else. In order to make it possible to reference a header section,
-you need to assign it a tag.
+You can do the same with your notes. You can treat each heading as an independent element of your
+notes that can be referenced somewhere else. That way you can collect all your minor or background
+characters in a single note file, and still be able to reference them individually by separating
+them with headings and assigning each a tag.
 
 
 .. _a_references_tags:
@@ -47,43 +48,63 @@ How to Use Tags
 ===============
 
 A "tag" in novelWriter is a word or phrase that you define as belonging to a heading. Tags are set
-by using the ``@tags`` :term:`keyword`. The full format of a tag is ``@tag: tagname``, where
-``tagname`` is an identifier of your choosing. You can only set *one* tag per heading, and the tag
-has to be unique across all documents in the project.
+by using the ``@tag`` :term:`keyword`.
 
-.. versionadded:: 2.2
-   Tags are now case insensitive.
+The basic format of a tag is ``@tag: tagName``.
 
-After the tags have been defined, they can then be referenced in the novel documents, or
-cross-referenced in other notes. they will also show up in the :guilabel:`Outline View` and in the
-back-reference panel when a document is opened in the viewer.
+An alternative format of a tag is ``@tag: tagName | displayName``.
+
+``tagName`` (Required)
+   This is a unique identifier of your choosing. It is the value you use later for making
+   references back to this document, or section of the document.
+
+``displayName`` (Optional)
+   This is an optional display name used for the tag. When you build your manuscript, you can for
+   instance insert the point of view character name directly into chapter headings. By default, the
+   ``tagName`` value is used in such headings, but if you use a shortened format internally in your
+   project, you can use this to specify a more suitable format for your manuscript headings.
+
+You can only set **one** tag per heading, and the tag has to be unique across **all** documents in
+the project.
+
+After a tag has been defined, it can be referenced in novel documents, or cross-referenced in other
+notes. Tags will also show up in the :guilabel:`Outline View` and in the references panel under the
+document viewer when a document is open in the viewer.
 
 The syntax highlighter will indicate to you that the keyword is correctly used and that the tag is
 allowed, that is, the tag is unique. Duplicate tags should be detected as long as the index is up
-to date. An invalid tag should have a green wiggly line under it, and will not receive the syntax
-colour that valid tags do.
+to date. An invalid tag should have a green wiggly line under it, and will not receive the colour
+that valid tags do.
 
 The tag is the only part of these notes that novelWriter uses. The rest of the document content is
 there for you to use in whatever way you wish. Of course, the content of the documents can be added
 to the manuscript, or an outline document. If you want to compile a single document of all your
 notes, you can do this from the :guilabel:`Manuscript Build` tool.
 
+.. versionadded:: 2.2
+   Tags are no longer case sensitive. The tags are by default displayed with the capitalisation you
+   use when defining the tag, but you don't have to use the same capitalisation when referencing
+   it later.
+
+.. versionadded:: 2.3
+   Tags can have an optional display name for manuscript builds.
+
 Example of a heading with a tag for a character of the story:
 
-.. code-block:: none
+.. code-block:: md
 
-   # Jane Doe
+   # Character: Jane Doe
 
-   @tag: Jane
+   @tag: Jane | Jane Doe
 
    Some information about the character Jane Doe.
 
 When this is done in a document in a :term:`Root Folder` of type "Characters", the tag is
-automatically treated as an available character in your project, and you will be able to reference
-it in any of your other documents using the reference keywords for characters. It will also show up
-in the Character tab in the Reference panel below the document viewer, and in the reference
-auto-completer menu in the editor when you fill in references. See :ref:`a_ui_view` and
-:ref:`a_references_completer`.
+automatically treated as an available character in your project with the value "Jane", and you will
+be able to reference it in any of your other documents using the reference keywords for characters.
+It will also show up in the Character tab in the Reference panel below the document viewer, and in
+the reference auto-completer menu in the editor when you fill in references. See :ref:`a_ui_view`
+and :ref:`a_references_completer`.
 
 It is the root folder type that defines what category of story elements the tag is indexed under.
 See the :ref:`a_proj_roots` section for an overview of available root folder types. They are also
@@ -172,7 +193,7 @@ highlight that two notes are related.
 
 Example of a novel document with references to characters and plots:
 
-.. code-block:: none
+.. code-block:: md
 
    ## Chapter 1
 

docs/source/project_structure.rst

@@ -7,10 +7,11 @@ Novel Structure
 This chapter covers the structure of a novel project.
 
 There are two different types of documents in a project, :guilabel:`Novel Documents` and
-:guilabel:`Project Notes`. Novel documents can only live in a :guilabel:`Novel` type root folder.
-You can also move them to :guilabel:`Archive` and :guilabel:`Trash` of course.
+:guilabel:`Project Notes`. Active novel documents can only live in a :guilabel:`Novel` type root
+folder. You can also move them to :guilabel:`Archive` and :guilabel:`Trash` of course, where they
+become inactive.
 
-The :guilabel:`Project Tree` can distinguish between the different header levels of the novel
+The :guilabel:`Project Tree` can distinguish between the different heading levels of the novel
 documents using coloured icons, and optionally add emphasis on the label, set in
 :guilabel:`Preferences`.
 
@@ -27,47 +28,47 @@ Four levels of headings are supported, signified by the number of hashes (``#``)
 title. See also the :ref:`a_fmt` section for more details about the markup syntax.
 
 .. note::
-   The header levels are not only important when generating the manuscript, they are also used by
+   The heading levels are not only important when generating the manuscript, they are also used by
    the indexer when building the outline tree in the :guilabel:`Outline View` as well as in the
    :guilabel:`Novel Tree`. Each heading also starts a new region where new Tags and References
    can be defined. See :ref:`a_references` for more details.
 
-The syntax for the four basic header types, and the two special header types, is listed in section
+The syntax for the four basic heading types, and the two special types, is listed in section
 :ref:`a_fmt_head`. The meaning of the four levels for the structure of your novel is as follows:
 
-**Header Level 1: Partition**
-   This header level signifies that the text refers to a top level partition. This is useful when
+**Heading Level 1: Partition**
+   This heading level signifies that the text refers to a top level partition. This is useful when
    you want to split the manuscript up into books, parts, or acts. These headings are not required.
-   The novel title itself should use the special header level ``#!`` covered in :ref:`a_fmt_head`.
+   The novel title itself should use the special heading level ``#!`` covered in :ref:`a_fmt_head`.
 
-**Header Level 2: Chapter**
-   This header level signifies a chapter level partition. Each time you want to start a new
+**Heading Level 2: Chapter**
+   This heading level signifies a chapter level partition. Each time you want to start a new
    chapter, you must add such a heading. If you choose to split your manuscript up into one
    document per scene, you need a single chapter document with just the heading. You can of course
    also add a synopsis and reference keywords to the chapter document. If you want to open the
    chapter with a quote or other introductory text that isn't part of a scene, this is also where
    you'd put that text.
 
-**Header Level 3: Scene**
-   This header level signifies a scene level partition. You must provide a title text, but the
+**Heading Level 3: Scene**
+   This heading level signifies a scene level partition. You must provide a title text, but the
    title text can be replaced with a scene separator or just skipped entirely when you build your
    manuscript.
 
-**Header Level 4: Section**
-   This header level signifies a sub-scene level partition, usually called a "section" in the
+**Heading Level 4: Section**
+   This heading level signifies a sub-scene level partition, usually called a "section" in the
    documentation and the user interface. These can be useful if you want to change references
    mid-scene, like if you change the point-of-view character. You are free to use sections as you
    wish, and you can filter them out of the final manuscript just like with scene titles.
 
-Page breaks are automatically added before level 1 and 2 headers when you build your project to a
-format that supports page breaks, or when you print the document directly from the
-:guilabel:`Manuscript Build` tool. If you want page breaks in other places, you have to specify
-them manually. See :ref:`a_fmt_break`.
+Page breaks are automatically added before partition and chapter headings 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:`a_fmt_break`.
 
 .. tip::
-   There are multiple options of how to process novel titles when building the manuscript. For
+   There are multiple options of how to process novel headings when building the manuscript. For
    instance, chapter numbers can be applied automatically, and so can scene numbers if you want
-   them in a draft manuscript. See the :ref:`a_manuscript` page for more details.
+   them in a draft manuscript. You can also insert point-of-view character names in chapter titles.
+   See the :ref:`a_manuscript` page for more details.
 
 
 .. _a_struct_heads_title:
@@ -76,17 +77,21 @@ Novel Title and Front Matter
 ----------------------------
 
 It is recommended that you add a document at the very top of each Novel root folder with the novel
-title as the first line. You should modify the level 1 header format code with an ``!`` in order to
-render it as a document title that is excluded from any automatic Table of Content in a manuscript
-build document, like so:
+title as the first line. You should modify the level 1 heading format code with an ``!`` in order
+to render it as a document title that is excluded from any automatic Table of Content in a
+manuscript build document, like so:
 
-``#! My Novel``
+.. code-block:: md
+
+   #! My Novel
+
+   >> _by Jane Doe_ <<
 
 The title is by default centred on the page. You can add more text to the page as you wish, like
 for instance the author's name and details.
 
 If you want an additional page of text after the title page, starting on a fresh page, you can add
-``[NEW PAGE]`` on a line by itself, and continue the text after it. This will insert a page break
+``[new page]`` on a line by itself, and continue the text after it. This will insert a page break
 before the text. See also :ref:`a_fmt_break`.
 
 
@@ -96,15 +101,19 @@ Unnumbered Chapter Headings
 ---------------------------
 
 If you use the automatic numbering feature for your chapters, but you want to keep some special
-chapters separate from this, you cam add an ``!`` to the level 2 header formatting code to tell the
-build tool to skip these chapters.
+chapters separate from this, you can add an ``!`` to the level 2 heading formatting code to tell
+the build tool to skip these chapters.
 
-``##! Unnumbered Chapter Title``
+.. code-block:: md
 
-There is a separate formatting feature for such chapters in the :guilabel:`Manuscript Build` tool
-as well. See the :ref:`a_manuscript` page for more details. When building a document of a format
-that supports page breaks, also unnumbered chapters will have a page break added just like for
-normal chapters.
+   ##! Unnumbered Chapter Title
+
+   Chapter Text
+
+There is a separate formatting feature for such chapter titles in the :guilabel:`Manuscript Build`
+tool as well. See the :ref:`a_manuscript` page for more details. When building a document of a
+format that supports page breaks, also unnumbered chapters will have a page break added just like
+for normal chapters.
 
 .. Note::
    Previously, you could also disable the automatic numbering of a chapter by adding an ``*`` as

docs/source/tech_storage.rst

@@ -33,7 +33,7 @@ itself. It is important to keep this file backed up, either through the built-in
 your own backup solution.
 
 The project XML file is indent-formatted, and is suitable for diff tools and version control since
-most of the file will stay static, although a timesetamp is set in the meta section on line 2, and
+most of the file will stay static, although a timestamp is set in the meta section on line 2, and
 various meta data entries incremented, on each save.
 
 .. only:: not html
@@ -91,11 +91,6 @@ If successful, the old data file is then removed, and the temporary file replace
 that the previously saved data is only replaced when the new data has been successfully saved to
 the storage medium.
 
-For the project XML file, a ``.bak`` file is in addition kept, which will always contain the
-previous version of the file, although when auto-save is enabled, they may have the same content.
-If the opening of a project file fails, novelWriter will automatically try to open the ``.bak``
-file instead.
-
 
 Project Meta Data
 =================

docs/source/usage_breakdown.rst

@@ -10,7 +10,7 @@ How it Works
 
 The main features of novelWriter are listed in the :ref:`a_intro` chapter. In this chapter, we go
 into some more details on how they are implemented. This is intended as an overview. Later on in
-this documentation, these features will be covered in more detail.
+this documentation these features will be covered in more detail.
 
 
 .. _a_breakdown_design:
@@ -23,6 +23,8 @@ at the same time provide useful features needed for writing a novel.
 
 The main window does not have an editor toolbar like many other applications do. This reduces
 clutter, and since the documents are formatted with style tags, it is more or less redundant.
+Still, a small formatting toolbar can be popped out by clicking the three dots in the header of the
+document editor to give quick access to standard formatting codes.
 
 Most formatting features supported are available through convenient keyboard shortcuts. They are
 also available in the main menu, so you don't have to look up formatting codes every time you need
@@ -31,7 +33,8 @@ them. For reference, a list of all shortcuts can be found in the :ref:`a_kb` cha
 .. note::
    novelWriter is not intended to be a full office type word processor. It doesn't support images,
    links, tables, and other complex structures and objects often needed for such documents.
-   Formatting is limited to headers, emphasis, text alignment, and a few other simple features.
+   Formatting is limited to headings, in-line basic text formats, text alignment, and a few other
+   simple features.
 
 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 :guilabel:`Build Manuscript` tool, and a set of
@@ -54,18 +57,18 @@ When in :guilabel:`Project Tree View` mode, the main work area of the main windo
 or optionally three, panels. The left-most panel contains the project tree and all the documents in
 your project. The second panel is the document editor.
 
-An optional third panel on the right contains a document viewer which can view any document in your
-project independently of what is open in the document editor. This panel is not intended as a
-preview window, although you can use it for this purpose if you wish as it will apply the
-formatting tags you have specified. The main purpose of the viewer is for viewing your notes next
-to your editor while you're writing.
+An optional third panel on the right side contains a document viewer which can view any document in
+your project independently of what is open in the document editor. This panel is not intended as a
+preview window, although you can use it for this purpose if you wish if you need to check that the
+formatting tags behave as you expected. The main purpose of the viewer is for viewing your notes
+next to your editor while you're writing.
 
 The editor also has a :guilabel:`Focus Mode` you can toggle either from the menu, from the icon in
 the editor's header, or by pressing :kbd:`F8`. When :guilabel:`Focus Mode` is enabled, all the user
 interface elements other than the document editor itself are hidden away.
 
 
-Novel Tree and Editor View
+Novel View and Editor View
 --------------------------
 
 .. figure:: images/fig_novel_tree_view.png
@@ -81,17 +84,17 @@ Each heading is indented according to the heading level. You can open and edit y
 from this view as well. All headings contained in the currently open document should be highlighted
 in the view to indicate which ones belong together in the same document.
 
-If you have multiple Novel root folders, the header of the novel view becomes a dropdown box. You
-can then switch between them by clicking the :guilabel:`Outline of ...` text. You can also click
-the novel icon button next to it.
+If you have multiple "Novel" type root folders, the header of the novel view becomes a dropdown
+box. You can then switch between them by clicking the :guilabel:`Outline of ...` text. You can also
+click the novel icon button next to it.
 
 Generally, the novel view should update when you make changes to the novel structure, including
 edits of the current document in the editor. The information is only updated when the automatic
 save of the document is triggered, or you manually press :kbd:`Ctrl+S` to save changes. (You can
 adjust the auto-save interval in :guilabel:`Preferences`.) You can also regenerate the whole novel
-view by pressing the refresh button at the top of the side panel.
+view by pressing the refresh button in the novel view header.
 
-It is possible to show an optional third column in the novel view, The settings are available from
+It is possible to show an optional third column in the novel view. The settings are available from
 the menu button in the toolbar.
 
 If you click the arrow icon to the right of each item, a tooltip will pop out showing you all the
@@ -123,12 +126,12 @@ neutral colours from :guilabel:`Preferences`. Other colour themes are also avail
 can be contributed to novelWriter on GitHub.
 
 Switching the GUI colour theme does not affect the colours of the editor and viewer. They have
-separate colour themes called :guilabel:`Editor Themes`. They are separated because there are a lot
-more options to choose from for the editor and viewer.
+separate colour selectable from the "Document colour theme" setting in :guilabel:`Preferences`.
+They are separated because there are a lot more options to choose from for the editor and viewer.
 
 .. note::
-   If you switch to 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.
+   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.
 
 
 .. _a_breakdown_project:
@@ -147,7 +150,7 @@ within those documents.
 
 .. figure:: images/fig_header_levels.png
 
-   An illustration of how header levels correspond to the novel structure.
+   An illustration of how heading levels correspond to the novel structure.
 
 The four heading levels (**H1** to **H4**) are treated as follows:
 
@@ -158,8 +161,8 @@ The four heading levels (**H1** to **H4**) are treated as follows:
 
 The project tree will select an icon for the document based on the first heading in it.
 
-This header level structure is only taken into account for :term:`novel documents`. For
-:term:`project notes`, the header levels have no structural meaning, and you are free to use them
+This heading level structure is only taken into account for :term:`novel documents`. For
+:term:`project notes`, the heading levels have no structural meaning, and you are free to use them
 however you want. See :ref:`a_struct` and :ref:`a_references` for more details.
 
 .. versionadded:: 2.0
@@ -171,8 +174,8 @@ however you want. See :ref:`a_struct` and :ref:`a_references` for more details.
 
 .. _a_breakdown_export:
 
-Building the Manuscript
-=======================
+Building a Manuscript
+=====================
 
 The project can at any time be assembled into a range of different formats through the
 :guilabel:`Build Manuscript` tool. Natively, novelWriter supports `Open Document`_, HTML5, and
@@ -217,8 +220,8 @@ Secondly, having multiple small files means it is very easy to synchronise them
 with standard file synchronisation tools.
 
 Thirdly, if you use version control software to track the changes to your project, the file formats
-used for the files are well suited. Also the JSON documents have line breaks and indents, which
-makes it easier to track them with version control software.
+used for the files are well suited. All the JSON documents have line breaks and indents as well,
+which makes it easier to track them with version control software.
 
 .. note::
    Since novelWriter has to keep track of a bunch of files and folders when a project is open, it

docs/source/usage_format.rst

@@ -6,8 +6,8 @@ Formatting Your Text
 
 The novelWriter text editor is a plain text editor that uses formatting codes for setting meta data
 values and allowing for some text formatting. The syntax is based on Markdown, but novelWriter is
-*not* a Markdown editor. It supports basic formatting like emphasis (italic), strong importance
-(bold) and strike through text, as well as four levels of headings. Form some further complex
+**not** a Markdown editor. It supports basic formatting like emphasis (italic), strong importance
+(bold) and strike through text, as well as four levels of headings. For some further complex
 formatting needs, a set of shortcodes can be used.
 
 In addition to formatting codes, novelWriter allows for comments, a synopsis tag, and a set of
@@ -30,7 +30,7 @@ dialogue in your text.
    An example of the colour highlighting of references. "Bob" is not defined, and "@blabla" is not
    a valid reference type.
 
-When you use the commands to set tags and references, these also change colour. Correct commands
+When you use the keywords to set tags and references, these also change colour. Correct keywords
 have a distinct colour, and the references themselves will get a colour if they are valid. Invalid
 references will get a squiggly error line underneath. The same applies to duplicate tags.
 
@@ -45,7 +45,7 @@ Headings
 
 .. figure:: images/fig_header_levels.png
 
-   An illustration of how header levels correspond to the novel structure.
+   An illustration of how heading levels correspond to the novel structure.
 
 Four levels of headings are allowed. For :term:`project notes`, they are free to be used as you see
 fit. That is, novelWriter doesn't assign the different headings any particular meaning. However,
@@ -53,34 +53,39 @@ for :term:`novel documents` they indicate the structural level of the novel and
 correctly to produce the intended result. See :ref:`a_struct_heads` for more details.
 
 ``# Title Text``
-   Heading level one. For novel documents, the header level indicates the start of a new partition.
+   Heading level one. For novel documents, the level indicates the start of a new partition.
 
 ``## Title Text``
-   Heading level two. For novel documents, the header level indicates the start of a new chapter.
-   Chapter numbers can be inserted automatically when building the manuscript.
+   Heading level two. For novel documents, the level indicates the start of a new chapter. Chapter
+   numbers can be inserted automatically when building the manuscript.
 
 ``### Title Text``
-   Heading level three. For novel documents, the header level indicates the start of a new scene.
-   Scene numbers or scene separators can be inserted automatically when building the manuscript,
-   so you can use the title field as a working title for your scenes if you wish.
+   Heading level three. For novel documents, the level indicates the start of a new scene. Scene
+   numbers or scene separators can be inserted automatically when building the manuscript, so you
+   can use the title field as a working title for your scenes if you wish.
 
 ``#### Title Text``
-   Heading level four. For novel documents, the header level indicates the start of a new section.
-   Section titles can be replaced by separators or ignored completely when building the manuscript.
+   Heading level four. For novel documents, the level indicates the start of a new section. Section
+   titles can be replaced by separators or ignored completely when building the manuscript.
 
-For headers level one and two, adding a ``!`` modifies the behaviour of the heading:
+For headings level one through three, adding a ``!`` modifies its meaning:
 
 ``#! Title Text``
-   This tells the build tool that the level one heading is intended to be used for the novel's
-   main title, like for instance on the front page. When building the manuscript, this will use a
-   different styling and will exclude the title from, for instance, a Table of Contents in Libre
-   Office.
+   This tells the build tool that the level one heading is intended to be used for the novel's or
+   notes folder's main title, like for instance on the front page. When building the manuscript,
+   this will use a different styling and will exclude the title from, for instance, a Table of
+   Contents in Libre Office.
 
 ``##! Title Text``
    This tells the build tool to not assign a chapter number to this chapter title if automatic
    chapter numbers are being used. Such titles are useful for a prologue for instance. See
    :ref:`a_struct_heads_unnum` for more details.
 
+``###! Title Text``
+   This is an alternative scene heading that can be formatted differently in the
+   :guilabel:`Manuscript Build` tool. It is intended for separating "soft" and "hard" scene breaks.
+   Otherwise, it behaves identically to a regular scene heading.
+
 .. note::
    The space after the ``#`` or ``!`` character is mandatory. The syntax highlighter will change
    colour and font size when the heading is correctly formatted.
@@ -99,10 +104,10 @@ In addition, the editor supports a few additional types of white spaces:
 
 * A non-breaking space can be inserted with :kbd:`Ctrl+K`, :kbd:`Space`.
 * Thin spaces are also supported, and can be inserted with :kbd:`Ctrl+K`, :kbd:`Shift+Space`.
-* Non-breaking thin space can be inserted  with :kbd:`Ctrl+K`, :kbd:`Ctrl+Space`.
+* Non-breaking thin space can be inserted with :kbd:`Ctrl+K`, :kbd:`Ctrl+Space`.
 
-These are all insert features, and the :guilabel:`Insert` menu has more. They are also listed
-in :ref:`a_kb_ins`.
+These are all insert features, and the :guilabel:`Insert` menu has more. The keyboard shortcuts for
+them are also listed in :ref:`a_kb_ins`.
 
 Non-breaking spaces are highlighted by the syntax highlighter with an alternate coloured
 background, depending on the selected theme.
@@ -118,7 +123,7 @@ background, depending on the selected theme.
 Text Emphasis
 =============
 
-A minimal set of text emphasis styles are supported for text paragraphs.
+A minimal set of Markdown text emphasis styles are supported for text paragraphs.
 
 ``_text_``
    The text is rendered as emphasised text (italicised).
@@ -141,7 +146,7 @@ In addition, the following rules apply:
    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*
+3. If using both ``**`` and ``_`` to wrap the same text, the underscore must be the **inner**
    wrapper. This is due to the underscore also being a valid word character, so if they are on the
    outside, they violate rule 2.
 4. Text emphasis does not span past line breaks. If you need to add emphasis to multiple lines or
@@ -214,9 +219,10 @@ indicate this by altering the colour of the word.
    document of the whole project.
 
 ``%Short: text ...``
-   This is a short description comment. It is identical to the synopsis comment, but is intended to
-   be used for project notes. The text shows up in the Reference panel below the document viewer in
-   the last column labelled :guilabel:`Short Description`.
+   This is a short description comment. It is identical to the synopsis comment (they are
+   interchangeable), but is intended to be used for project notes. The text shows up in the
+   Reference panel below the document viewer in the last column labelled
+   :guilabel:`Short Description`.
 
 .. note::
    Only one comment can be flagged as a synopsis or short comment for each heading. If multiple
@@ -232,11 +238,11 @@ Tags and References
 The document editor supports a set of keywords used for setting tags, and making references between
 documents.
 
-Tags use the command ``@tag:`` to define a tag. The tag can be set once per section defined by a
+Tags use the keyword ``@tag:`` to define a tag. The tag can be set once per section defined by a
 heading. Setting it multiple times under the same heading will just override the previous setting.
 
 ``@tag: value``
-   A tag command followed by the tag value, like for instance the name of a character.
+   A tag keyword followed by the tag value, like for instance the name of a character.
 
 References can be set anywhere within a section, and are collected according to their category.
 References are in the form:
@@ -282,7 +288,7 @@ Examples:
 .. note::
    The text editor will not show the alignment and indentation live. But the viewer will show them
    when you open the document there. It will of course also be reflected in the document generated
-   from the build tool as long as the format supports paragraph alignment.
+   from the manuscript build tool as long as the format supports paragraph alignment.
 
 
 .. _a_fmt_break:
@@ -290,37 +296,37 @@ Examples:
 Vertical Space and Page Breaks
 ==============================
 
-Adding more than one line break between paragraphs will *not* increase the space between those
+Adding more than one line break between paragraphs will **not** increase the space between those
 paragraphs when building the project. To add additional space between paragraphs, add the text
-``[VSPACE]`` on a line of its own, and the build tool will insert a blank paragraph in its place.
+``[vspace]`` on a line of its own, and the build tool will insert a blank paragraph in its place.
 
 If you need multiple blank paragraphs just add a colon and a number to the above code. For
-instance, writing ``[VSPACE:3]`` will insert three blank paragraphs.
+instance, writing ``[vspace:3]`` will insert three blank paragraphs.
 
-Normally, the build tool will insert a page break before all headers of level one and for all
-headers of level two for novel documents, i.e. chapters, but not for project notes.
+Normally, the manuscript build tool will insert a page break before all headings of level one and
+for all headings of level two for novel documents, i.e. chapters, but not for project notes.
 
-If you need to add a page break somewhere else, put the text ``[NEW PAGE]`` on a line by itself
+If you need to add a page break somewhere else, put the text ``[new page]`` on a line by itself
 before the text you wish to start on a new page.
 
 If you want page breaks for scenes and sections, you must add them manually.
 
 .. note::
    The page break code is applied to the text that follows it. It adds a "page break before" mark
-   to the text when exporting to HTML or Open Document. This means that a ``[NEW PAGE]`` which has
+   to the text when exporting to HTML or Open Document. This means that a ``[new page]`` which has
    no text following it, it will not result in a page break.
 
 **Example:**
 
-.. code-block:: markdown
+.. code-block:: md
 
    This is a text paragraph.
 
-   [VSPACE:2]
+   [vspace:2]
 
    This is another text paragraph, but there will be two empty paragraphs
    in-between them.
 
-   [NEWPAGE]
+   [new page]
 
    This text will always start on a new page if the build format has pages.

docs/source/usage_project.rst

@@ -86,7 +86,7 @@ Splitting Documents
 
    The :guilabel:`Split Document` dialog.
 
-The :guilabel:`Split Document by Header` option will open a dialog that allows you to split the
+The :guilabel:`Split Document by Heading` option will open a dialog that allows you to split the
 selected document into multiple new documents based on the headings it contains. You can select at
 which heading level the split is to be performed from the dropdown box. The list box will preview
 which headings will be split into new documents.
@@ -94,7 +94,7 @@ which headings will be split into new documents.
 You are given the option to create a folder for these new documents, and whether or not to create a
 hierarchy of documents. That is, put sections under scenes, and scenes under chapters.
 
-The source document *is not* deleted in the process, but you have the option to let the tool move
+The source document **is not** deleted in the process, but you have the option to let the tool move
 the source document to the :guilabel:`Trash` folder.
 
 
@@ -123,16 +123,16 @@ Document Importance and Status
 ------------------------------
 
 Each document or folder in your project can have either a "Status" or "Importance" flag set. These
-are flags that you control and define yourself. novelWriter doesn't do anything with them at all.
-To modify the labels, go to their respective tabs in :guilabel:`Project Settings`.
+are flags that you control and define yourself, and novelWriter doesn't use them for anything. To
+modify the labels, go to their respective tabs in :guilabel:`Project Settings`.
 
 The "Status" flag is intended to tag a :term:`novel document<novel documents>` as for instance a
 draft or as completed, and the "Importance" flag is intended to tag character notes, or other
 :term:`project notes`, as for instance a main, major, or minor character or story element.
 
 Whether a document uses a "Status" or "Importance" flag depends on which :term:`root folder` it
-lives in. If it's in a :guilabel:`Novel` folder, it uses the "Status" flag, otherwise it uses an
-"Importance" flag. Some folders, like :guilabel:`Trash` and :guilabel:`Archive` allow both.
+lives in. If it's in a Novel type folder, it uses the "Status" flag, otherwise it uses an
+"Importance" flag.
 
 
 .. _a_ui_tree_dnd:
@@ -155,32 +155,31 @@ interface framework novelWriter is built upon.
 
 Documents and their folders can be rearranged freely within their root folders. If you move a Novel
 document out of a Novel folder, it will be converted to a project note. Notes can be moved freely
-between all root folders, but keep in mind that if you move a note into a :guilabel:`Novel` root
-folder, its "Importance" setting will be switched with a "Status" setting. See
-:ref:`a_ui_tree_status`. The old value will not be overwritten though, and should be restored if
-you move it back at some point.
+between all root folders, but keep in mind that if you move a note into a Novel type root folder,
+its "Importance" setting will be switched with a "Status" setting. See :ref:`a_ui_tree_status`. The
+old value will not be overwritten though, and should be restored if you move it back at some point.
 
 Root folders in the project tree cannot be dragged and dropped at all. If you want to reorder them,
 you can move them up or down with respect to each other from the arrow buttons at the top of the
-project tree, or by pressing :kbd:`Ctrl+Shift+Up` or :kbd:`Ctrl+Shift+Down` when they are selected.
+project tree, or by pressing :kbd:`Ctrl+Up` or :kbd:`Ctrl+Down` when they are selected.
 
 
 .. _a_ui_tree_novel:
 
-The Novel Tree
-==============
+The Novel Tree View
+===================
 
 .. figure:: images/fig_novel_tree_view.png
 
    A screenshot of the Novel Tree View.
 
-An alternative way to view the project structure is the novel tree. You can switch to this view by
-selecting the :guilabel:`Novel Tree View` button in the sidebar. This view is a simplified version
-of the view in the :guilabel:`Outline View`. It is convenient when you want to browse the structure
+An alternative way to view the project structure is the novel view. You can switch to this view by
+selecting the :guilabel:`Novel View` button in the sidebar. This view is a simplified version of
+the view in the :guilabel:`Outline View`. It is convenient when you want to browse the structure
 of the story itself rather than the document files.
 
 .. note::
-   You cannot reorganise the entries in the novel tree, or add any new documents, as that would
+   You cannot reorganise the entries in the novel view, or add any new documents, as that would
    imply restructuring the content of the document files themselves. Any such editing must be done
    in the project tree. However, you can add new headings to existing documents, or change
    references, which will be updated in this view when the document is saved.
@@ -188,17 +187,17 @@ of the story itself rather than the document files.
 
 .. _a_ui_outline:
 
-Project Outline View
-====================
+The Novel Outline View
+======================
 
 .. figure:: images/fig_outline_view.png
 
    A screenshot of the Novel Outline View.
 
-The project's :guilabel:`Outline View` is available as another view option from the sidebar. The
-outline provides an overview of the novel structure, displaying a tree hierarchy of the elements of
-the novel, that is, the level 1 to 4 headings representing partitions, chapters, scenes and
-sections.
+The project's :guilabel:`Novel Outline View` is available as another view option from the sidebar.
+The outline provides an overview of the novel structure, displaying a tree hierarchy of the
+elements of the novel, that is, the level 1 to 4 headings representing partitions, chapters, scenes
+and sections.
 
 The document containing the heading can also be displayed as a separate column, as well as the line
 number where the heading is defined. Double-clicking an entry will open the corresponding document

docs/source/usage_shortcuts.rst

@@ -23,14 +23,14 @@ Main Window Shortcuts
    ":kbd:`F5`",           "Open the :guilabel:`Build Manuscript` tool"
    ":kbd:`F6`",           "Open the :guilabel:`Writing Statistics` tool"
    ":kbd:`F8`",           "Toggle :guilabel:`Focus Mode`"
-   ":kbd:`F9`",           "Re-build the project index"
+   ":kbd:`F9`",           "Re-build the project's index"
    ":kbd:`F11`",          "Toggle full screen mode"
    ":kbd:`Ctrl+,`",       "Open the :guilabel:`Preferences` dialog"
    ":kbd:`Ctrl+E`",       "Switch focus to the document editor"
-   ":kbd:`Ctrl+T`",       "Switch focus to the project/novel tree"
+   ":kbd:`Ctrl+T`",       "Switch or toggle focus for the project tree or novel view"
    ":kbd:`Ctrl+Q`",       "Exit novelWriter"
    ":kbd:`Ctrl+Shift+,`", "Open the :guilabel:`Project Settings` dialog"
-   ":kbd:`Ctrl+Shift+O`", "Open a project"
+   ":kbd:`Ctrl+Shift+O`", "Open the Welcome dialog to open or create a project"
    ":kbd:`Ctrl+Shift+S`", "Save the current project"
    ":kbd:`Ctrl+Shift+T`", "Switch focus to the outline view"
    ":kbd:`Ctrl+Shift+W`", "Close the current project"
@@ -55,12 +55,11 @@ Project Tree Shortcuts
    ":kbd:`Ctrl+.`",         "Open the context menu on the selected item"
    ":kbd:`Ctrl+L`",         "Open the :guilabel:`Quick Links` menu"
    ":kbd:`Ctrl+N`",         "Open the :guilabel:`Create New Item` menu"
-   ":kbd:`Ctrl+O`",         "Open selected document"
+   ":kbd:`Ctrl+O`",         "Open the selected document in the editor"
    ":kbd:`Ctrl+R`",         "Open the selected document in the viewer"
    ":kbd:`Ctrl+Up`",        "Move selected item one step up in the tree"
    ":kbd:`Ctrl+Down`",      "Move selected item one step down in the tree"
    ":kbd:`Ctrl+Shift+Del`", "Move the selected item to Trash"
-   ":kbd:`Ctrl+Shift+Z`",   "Undo the last move of a project item, if possible"
 
 
 .. _a_kb_editor:
@@ -92,21 +91,22 @@ 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 block format as comment"
-   ":kbd:`Ctrl+0`",       "Remove block formatting for block under cursor"
-   ":kbd:`Ctrl+1`",       "Change block format to header level 1"
-   ":kbd:`Ctrl+2`",       "Change block format to header level 2"
-   ":kbd:`Ctrl+3`",       "Change block format to header level 3"
-   ":kbd:`Ctrl+4`",       "Change block format to header level 4"
+   ":kbd:`Ctrl+/`",       "Toggle block format as comment for block under cursor, or selected text"
+   ":kbd:`Ctrl+0`",       "Remove block formatting for block under cursor, 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"
+   ":kbd:`Ctrl+4`",       "Change block format to heading level 4"
    ":kbd:`Ctrl+5`",       "Change block alignment to left-aligned"
    ":kbd:`Ctrl+6`",       "Change block alignment to centred"
    ":kbd:`Ctrl+7`",       "Change block alignment to right-aligned"
    ":kbd:`Ctrl+8`",       "Add a left margin to the block"
    ":kbd:`Ctrl+9`",       "Add a right margin to the block"
    ":kbd:`Ctrl+B`",       "Format selected text, or word under cursor, with strong emphasis (bold)"
-   ":kbd:`Ctrl+D`",       "Strike through selected text, or word under cursor"
+   ":kbd:`Ctrl+D`",       "Format selected text, or word under cursor, with strike through"
    ":kbd:`Ctrl+I`",       "Format selected text, or word under cursor, with emphasis (italic)"
-   ":kbd:`Ctrl+Shift+/`", "Remove block formatting for block under cursor"
+   ":kbd:`Ctrl+Shift+/`", "Remove block formatting for block under cursor, or selected text"
+   ":kbd:`Ctrl+Shift+D`", "Toggle block format as ignored text for block under cursor, or selected text"
 
 
 Other Editor Shortcuts
@@ -115,7 +115,7 @@ Other Editor Shortcuts
 .. csv-table::
    :header: "Shortcut", "Description"
 
-   ":kbd:`F7`",             "Re-run the spell checker"
+   ":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"
@@ -132,7 +132,6 @@ Other Editor Shortcuts
    ":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:`Ctrl+Shift+I`",   "Import text to the current document from a text file"
 
 
 .. _a_kb_ins:

docs/source/usage_writing.rst

@@ -42,13 +42,12 @@ the label and pressing :kbd:`Ctrl+Return`. You can also control-click them with
 Editor Auto-Completer
 ---------------------
 
-If you type the character ``@`` on a new line, a context menu will appear showing the different
-available keywords. The list will shorten as you type. Once a keyword command has been selected or
-typed, the editor may suggest further content based on your project content. See
-:ref:`a_references_completer` for more details.
+If you type the character ``@`` on a new line, a menu will appear showing the different available
+keywords. The list will shorten as you type. Once a keyword command has been selected or typed, the
+editor may suggest further content based on your project content. See :ref:`a_references_completer`
+for more details.
 
 .. versionadded:: 2.2
-   The auto-completer feature was added.
 
 
 .. _a_ui_view:

novelwriter/__init__.py

@@ -6,7 +6,7 @@ File History:
 Created: 2018-09-22 [0.0.1]
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -37,14 +37,14 @@ from novelwriter.shared import SharedData
 # ============
 
 __package__    = "novelwriter"
-__copyright__  = "Copyright 2018–2023, Veronica Berglyd Olsen"
+__copyright__  = "Copyright 2018–2024, Veronica Berglyd Olsen"
 __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.2"
-__hexversion__ = "0x020200f0"
-__date__       = "2023-12-17"
+__version__    = "2.4b1"
+__hexversion__ = "0x020400b1"
+__date__       = "2024-03-26"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 
@@ -131,7 +131,7 @@ def main(sysArgs: list | None = None):
         elif inOpt == "--debug":
             CONFIG.isDebug = True
             logLevel = logging.DEBUG
-            logFormat  = "[{asctime:}]  {filename:>17}:{lineno:<4d}  {levelname:8}  {message:}"
+            logFormat  = "[{asctime:}]  {filename:>18}:{lineno:<4d}  {levelname:8}  {message:}"
         elif inOpt == "--style":
             qtStyle = inArg
         elif inOpt == "--config":
@@ -195,7 +195,7 @@ def main(sysArgs: list | None = None):
 
     if CONFIG.osDarwin:
         try:
-            from Foundation import NSBundle
+            from Foundation import NSBundle  # type: ignore
             bundle = NSBundle.mainBundle()
             info = bundle.localizedInfoDictionary() or bundle.infoDictionary()
             info["CFBundleName"] = "novelWriter"
@@ -207,7 +207,7 @@ def main(sysArgs: list | None = None):
         try:
             import ctypes
             appID = f"io.novelwriter.{__version__}"
-            ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(appID)
+            ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(appID)  # type: ignore
         except Exception:
             logger.error("Failed to set application name")
             logException()

novelwriter/assets/i18n/project_de_DE.json

@@ -1,5 +1,6 @@
 {
   "Synopsis": "Synopsis",
+  "Short Description": "Kurzbeschreibung",
   "Comment": "Kommentar",
   "Notes": "Notizen",
   "Tag": "Schlagwort",

novelwriter/assets/i18n/project_nl_NL.json

@@ -1,7 +1,18 @@
 {
   "Synopsis": "Synopsis",
+  "Short Description": "Korte beschrijving",
   "Comment": "Opmerking",
   "Notes": "Notities",
+  "Tag": "Label",
+  "Point of View": "Perspectief",
+  "Focus": "Focus",
+  "Characters": "Personages",
+  "Plot": "Plot",
+  "Timeline": "Tijdslijn",
+  "Locations": "Locaties",
+  "Objects": "Objecten",
+  "Entities": "Entiteiten",
+  "Custom": "Aangepast",
   "0": "nul",
   "1": "één",
   "2": "twee",

novelwriter/assets/i18n/project_pt_BR.json

@@ -1,7 +1,18 @@
 {
   "Synopsis": "Sinopse",
+  "Short Description": "Descrição breve",
   "Comment": "Comentários",
   "Notes": "Notas",
+  "Tag": "Etiqueta",
+  "Point of View": "Ponto de vista",
+  "Focus": "Foco",
+  "Characters": "Personagens",
+  "Plot": "Trama",
+  "Timeline": "Linha do tempo",
+  "Locations": "Lugares",
+  "Objects": "Objetos",
+  "Entities": "Entidades",
+  "Custom": "Outros",
   "0": "Zero",
   "1": "Um",
   "2": "Dois",

novelwriter/assets/i18n/project_zh_CN.json

@@ -1,7 +1,18 @@
 {
   "Synopsis": "概要",
+  "Short Description": "简短描述",
   "Comment": "注释",
   "Notes": "笔记",
+  "Tag": "标签",
+  "Point of View": "视角",
+  "Focus": "聚焦",
+  "Characters": "角色",
+  "Plot": "情节",
+  "Timeline": "时间线",
+  "Locations": "地点",
+  "Objects": "物品",
+  "Entities": "条目",
+  "Custom": "自定义",
   "0": "零",
   "1": "一",
   "2": "二",

novelwriter/assets/icons/typicons_dark/icons.conf

@@ -17,6 +17,7 @@ licenseurl  = https://creativecommons.org/licenses/by-sa/4.0/
 
 [Map]
 add             = typ_plus.svg
+add_document    = typ_document-add.svg
 alert_error     = typ_delete-full.svg
 alert_info      = typ_lightbulb-full.svg
 alert_question  = typ_directions-full.svg
@@ -39,10 +40,12 @@ cls_none        = typ_cancel.svg
 cls_novel       = typ_book.svg
 cls_object      = typ_key.svg
 cls_plot        = typ_puzzle.svg
+cls_template    = mixed_document-new.svg
 cls_timeline    = typ_calendar.svg
 cls_trash       = typ_trash.svg
 cls_world       = typ_location.svg
 cross           = typ_times.svg
+document        = typ_document.svg
 down            = typ_chevron-down.svg
 edit            = typ_pencil.svg
 export          = typ_export.svg
@@ -50,16 +53,21 @@ fmt_bold        = nw_tb-bold.svg
 fmt_bold-md     = nw_tb-bold-md.svg
 fmt_italic      = nw_tb-italic.svg
 fmt_italic-md   = nw_tb-italic-md.svg
+fmt_mark        = nw_tb-mark.svg
 fmt_strike      = nw_tb-strike.svg
 fmt_strike-md   = nw_tb-strike-md.svg
 fmt_subscript   = nw_tb-subscript.svg
 fmt_superscript = nw_tb-superscript.svg
 fmt_underline   = nw_tb-underline.svg
 forward         = typ_chevron-right.svg
+import          = mixed_import.svg
+list            = typ_th-list.svg
 maximise        = typ_arrow-maximise.svg
 menu            = typ_th-dot-menu.svg
 minimise        = typ_arrow-minimise.svg
+more            = typ_th-dot-more.svg
 noncheckable    = mixed_input-none.svg
+open            = typ_folder.svg
 panel           = nw_panel.svg
 proj_chapter    = mixed_document-chapter.svg
 proj_details    = typ_th-list-grey.svg
@@ -83,6 +91,7 @@ search_regex    = nw_search-regex.svg
 search_replace  = mixed_search-replace.svg
 search_word     = nw_search-word.svg
 settings        = typ_cog.svg
+star            = typ_star.svg
 status_idle     = typ_media-pause-grey.svg
 status_lang     = typ_globe-grey.svg
 status_lines    = typ_th-list-grey.svg
@@ -91,12 +100,15 @@ status_time     = typ_stopwatch-grey.svg
 sticky-off      = typ_pin-outline.svg
 sticky-on       = typ_pin.svg
 unchecked       = mixed_input-unchecked.svg
+unfold-hide     = typ_arrow-right.svg
+unfold-show     = typ_arrow-down.svg
 up              = typ_chevron-up.svg
 view            = typ_eye.svg
 view_build      = typ_export-grey.svg
 view_editor     = mixed_edit.svg
 view_novel      = typ_book-grey.svg
 view_outline    = typ_puzzle-outline.svg
+view_search     = typ_search-grey.svg
 
 deco_doc_h0     = nw_deco-h0.svg
 deco_doc_h0_n   = nw_deco-h0.svg

novelwriter/assets/icons/typicons_dark/mixed_document-new.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5.8898 3.4449c-0.67467 1e-7 -1.2225 0.5478-1.2225 1.2225v14.665c0 0.67466 0.5478 1.2225 1.2225 1.2225h12.22c0.67466 0 1.2225-0.5478 1.2225-1.2225v-11h-1.8326c-1.6854 0-3.0551-1.3696-3.0551-3.0551v-1.8326zm9.7775 0.50488v1.3277c0 1.0108 0.82184 1.8326 1.8326 1.8326h1.3277z" fill="#e5e5e5" fill-opacity=".5" stroke-linecap="round" stroke-width=".55"/>
+ <path d="m5.8898 1c-2.0216 0-3.6674 1.6458-3.6674 3.6674v14.665c0 2.0216 1.6458 3.6674 3.6674 3.6674h12.22c2.0216 0 3.6674-1.6458 3.6674-3.6674v-12.222c0-0.32511-0.12901-0.63512-0.35879-0.86367l-4.8877-4.8877c-0.22856-0.22978-0.53856-0.35879-0.86367-0.35879zm0 2.4449h8.5551v1.8326c0 1.6854 1.3696 3.0551 3.0551 3.0551h1.8326v11c0 0.67466-0.5478 1.2225-1.2225 1.2225h-12.22c-0.67467 0-1.2225-0.5478-1.2225-1.2225v-14.665c0-0.67467 0.5478-1.2225 1.2225-1.2225zm9.7775 0.50488 3.1604 3.1604h-1.3277c-1.0108 0-1.8326-0.82184-1.8326-1.8326z" fill="#aeaeae" stroke-width="1.2222"/>
+ <path d="m10.105 9.9584-3.785 0.4196c-0.13651 0.01653-0.25722 0.10777-0.30249 0.24644-0.045266 0.13867 0 0.28308 0.10059 0.37434 1.1252 1.0267 2.8158 2.5643 2.8158 2.5643-0.00143 0-0.46415 2.2367-0.77166 3.729-0.025865 0.13508 0.022992 0.27806 0.14083 0.36356 0.11711 0.0855 0.268 0.08694 0.38655 0.02012 1.3249-0.753 3.3094-1.8853 3.3094-1.8853l3.308 1.886c0.12071 0.0661 0.27159 0.06467 0.38871-0.02084 0.11783-0.0855 0.16669-0.22848 0.1401-0.36284l-0.7695-3.7297 2.8158-2.5622c0.10059-0.09412 0.14514-0.23854 0.10059-0.37649-0.04454-0.13794-0.16525-0.22919-0.30177-0.245-1.5146-0.16956-3.7857-0.42104-3.7857-0.42104l-1.5685-3.4703c-0.05892-0.1243-0.1825-0.21124-0.32764-0.21124-0.14514 0-0.26944 0.087654-0.32548 0.21124z" fill="#ffff84" stroke-width=".7185"/>
+</svg>

novelwriter/assets/icons/typicons_dark/mixed_import.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.1113 3.666c-0.61332 0-1.1094 0.49689-1.1094 1.1113v15.557h-0.0019531c0 0.61443 0.498 1.1094 1.1113 1.1094h15.557c0.61332 0 1.1113-0.49494 1.1113-1.1094v-8.2578c-0.61899 0.57364-1.3634 1.0131-2.252 1.2578-0.004058 2.0524-0.007162 4.0735 0.005859 5.8887h-13.311v-13.318c1.6116-0.00848 2.8992 0 4.4648 0 0.75712-0.75269 1.5907-1.5005 2.3418-2.2383h-7.918z" fill="#9c9"/>
+ <path d="m21.996 3.1106v-0.55556c-1.8789 2.8644-4 4.3922-6.6667 4.4444v-3.3333c0-0.61222-0.56778-1.1111-1.27-1.1111-0.40444 0-0.75 0.17556-0.98111 0.43444-2.1478 2.2544-6.6378 6.7878-6.6378 6.7878s4.49 4.5356 6.6389 6.8189c0.23111 0.22778 0.57556 0.40333 0.98 0.40333 0.70222 0 1.27-0.49667 1.27-1.1111v-3.3333c5.1778 0 6.6667-5.4122 6.6667-9.4444z" fill="#9c9" stroke-width="1.1111"/>
+</svg>

novelwriter/assets/icons/typicons_dark/nw_tb-mark.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <rect x=".26458" y=".79375" width="5.8208" height="4.7625" fill="#ffff84" fill-opacity=".8" stroke-linecap="round" stroke-width=".1354"/>
+ <path d="m1.3229 5.2917v-4.2333h0.98087l0.6397 1.8829q0.060924 0.18829 0.11576 0.38957 0.054831 0.19479 0.11576 0.38957h0.024369q0.060924-0.19479 0.10966-0.38957 0.054831-0.20128 0.11576-0.38957l0.62752-1.8829h0.97478v4.2333h-0.81638v-1.5518q0-0.15583 0.012185-0.34412 0.012185-0.18829 0.030462-0.37658 0.018277-0.19479 0.036554-0.37658 0.018277-0.18829 0.036554-0.34412h-0.02437l-0.3229 1.0064-0.56659 1.6167h-0.49348l-0.56659-1.6167-0.3168-1.0064h-0.024369q0.018277 0.15583 0.036554 0.34412 0.018277 0.1818 0.036554 0.37658 0.018277 0.18829 0.030462 0.37658 0.012185 0.18829 0.012185 0.34412v1.5518z" fill="#808080" stroke-linecap="round" stroke-width=".11793"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#69c" stroke-width="1.1186"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#69c" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_dark/typ_arrow-down.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m1.5077 8.1077 10.492 10.662 10.492-10.662c0.33846-0.33846 0.50769-0.84615 0.50769-1.1846 0-0.33846-0.16923-0.84615-0.50769-1.1846-0.33846-0.33846-0.67692-0.50769-1.1846-0.50769h-18.615c-0.50769 0-0.84615 0.16923-1.1846 0.50769-0.33846 0.33846-0.50769 0.84615-0.50769 1.1846 0 0.33846 0.16923 0.84615 0.50769 1.1846z" fill="#aeaeae" stroke-width="1.6923"/>
+</svg>

novelwriter/assets/icons/typicons_dark/typ_arrow-right.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m8.1077 22.492 10.662-10.492-10.662-10.492c-0.33846-0.33846-0.84615-0.50769-1.1846-0.50769-0.33846 0-0.84615 0.16923-1.1846 0.50769-0.33846 0.33846-0.50769 0.67692-0.50769 1.1846v18.615c0 0.50769 0.16923 0.84615 0.50769 1.1846 0.33846 0.33846 0.84615 0.50769 1.1846 0.50769 0.33846 0 0.84615-0.16923 1.1846-0.50769z" fill="#aeaeae" stroke-width="1.6923"/>
+</svg>

novelwriter/assets/icons/typicons_dark/typ_document-add.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m15.667 12h-2.4444v-2.4444c0-0.67589-0.54633-1.2222-1.2222-1.2222s-1.2222 0.54633-1.2222 1.2222v2.4444h-2.4444c-0.67589 0-1.2222 0.54633-1.2222 1.2222s0.54633 1.2222 1.2222 1.2222h2.4444v2.4444c0 0.67589 0.54633 1.2222 1.2222 1.2222s1.2222-0.54633 1.2222-1.2222v-2.4444h2.4444c0.67589 0 1.2222-0.54633 1.2222-1.2222s-0.54633-1.2222-1.2222-1.2222zm5.753-5.753-4.8889-4.8889c-0.22856-0.22978-0.539-0.35811-0.86411-0.35811h-9.7778c-2.0216 0-3.6667 1.6451-3.6667 3.6667v14.667c0 2.0216 1.6451 3.6667 3.6667 3.6667h12.222c2.0216 0 3.6667-1.6451 3.6667-3.6667v-12.222c0-0.32511-0.12833-0.63556-0.35811-0.86411zm-2.5923 0.86411h-1.3273c-1.0108 0-1.8333-0.82256-1.8333-1.8333v-1.3273zm-0.71622 13.444h-12.222c-0.67467 0-1.2222-0.54756-1.2222-1.2222v-14.667c0-0.67467 0.54756-1.2222 1.2222-1.2222h8.5556v1.8333c0 1.6854 1.3701 3.0556 3.0556 3.0556h1.8333v11c0 0.67467-0.54756 1.2222-1.2222 1.2222z" fill="#aeaeae" stroke-width="1.2222"/>
+</svg>

novelwriter/assets/icons/typicons_dark/typ_document.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m21.42 6.247-4.8889-4.8889c-0.22856-0.22978-0.539-0.35811-0.86411-0.35811h-9.7778c-2.0216 0-3.6667 1.6451-3.6667 3.6667v14.667c0 2.0216 1.6451 3.6667 3.6667 3.6667h12.222c2.0216 0 3.6667-1.6451 3.6667-3.6667v-12.222c0-0.32511-0.12833-0.63556-0.35811-0.86411zm-2.5923 0.86411h-1.3273c-1.0108 0-1.8333-0.82256-1.8333-1.8333v-1.3273zm-0.71622 13.444h-12.222c-0.67467 0-1.2222-0.54756-1.2222-1.2222v-14.667c0-0.67467 0.54756-1.2222 1.2222-1.2222h8.5556v1.8333c0 1.6854 1.3701 3.0556 3.0556 3.0556h1.8333v11c0 0.67467-0.54756 1.2222-1.2222 1.2222z" fill="#aeaeae" stroke-width="1.2222"/>
+</svg>

novelwriter/assets/icons/typicons_dark/typ_refresh-flipped.svg

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m10.837 12.256h-6.8373v-6.8347c0.010667-1.5131 0.89467-1.877 1.964-0.80652l1.5387 1.5437c1.3533-1.0598 3.0093-1.6397 4.7547-1.6397 2.0667 0 4.012 0.80518 5.472 2.2676 1.4653 1.4557 2.2707 3.4034 2.2707 5.4696 0 2.0703-0.80533 4.0153-2.268 5.475-1.4627 1.4624-3.4067 2.2689-5.4747 2.2689-2.0667 0-4.012-0.80652-5.4747-2.2702-0.39467-0.39593-0.744-0.82784-1.04-1.2864-0.46267-0.7212-0.25333-1.6797 0.46667-2.1396 0.71867-0.46125 1.6773-0.25195 2.1387 0.46658 0.17733 0.27595 0.38933 0.53323 0.624 0.77319 0.87867 0.87717 2.0453 1.3597 3.2853 1.3597s2.4067-0.48124 3.2853-1.3597c0.876-0.87717 1.36-2.0436 1.36-3.2861 0-1.2398-0.48267-2.4062-1.36-3.2807-0.87867-0.87717-2.0453-1.3611-3.2853-1.3611-0.91733 0-1.7947 0.26795-2.5453 0.76252l1.9307 1.9343c1.0707 1.0691 0.70667 1.9436-0.80533 1.9436z" fill="#9c9" stroke-width="1.3332"/>
+ <path d="m10.692 12.288h-7.692v-7.689c0.012-1.7022 1.0065-2.1116 2.2095-0.90734l1.731 1.7367c1.5225-1.1923 3.3855-1.8447 5.349-1.8447 2.325 0 4.5135 0.90583 6.156 2.5511 1.6485 1.6377 2.5545 3.8288 2.5545 6.1533 0 2.3291-0.906 4.5172-2.5515 6.1594-1.6455 1.6452-3.8325 2.5525-6.159 2.5525-2.325 0-4.5135-0.90734-6.159-2.554-0.444-0.44542-0.837-0.93132-1.17-1.4472-0.5205-0.81135-0.285-1.8897 0.525-2.4071 0.8085-0.51891 1.887-0.28344 2.406 0.5249 0.1995 0.31044 0.438 0.59988 0.702 0.86984 0.9885 0.98682 2.301 1.5297 3.696 1.5297 1.395 0 2.7075-0.5414 3.696-1.5297 0.9855-0.98682 1.53-2.2991 1.53-3.6969 0-1.3948-0.543-2.707-1.53-3.6908-0.9885-0.98682-2.301-1.5312-3.696-1.5312-1.032 0-2.019 0.30144-2.8635 0.85784l2.172 2.1761c1.2045 1.2027 0.795 2.1866-0.906 2.1866z" fill="#9c9" stroke-width="1.3332"/>
 </svg>

novelwriter/assets/icons/typicons_dark/typ_refresh.svg

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m13.163 12.256h6.8373v-6.8347c-0.010667-1.5131-0.89467-1.877-1.964-0.80652l-1.5387 1.5437c-1.3533-1.0598-3.0093-1.6397-4.7547-1.6397-2.0667 0-4.012 0.80518-5.472 2.2676-1.4653 1.4557-2.2707 3.4034-2.2707 5.4696 0 2.0703 0.80533 4.0153 2.268 5.475 1.4627 1.4624 3.4067 2.2689 5.4747 2.2689 2.0667 0 4.012-0.80652 5.4747-2.2702 0.39467-0.39593 0.744-0.82784 1.04-1.2864 0.46267-0.7212 0.25333-1.6797-0.46667-2.1396-0.71867-0.46125-1.6773-0.25195-2.1387 0.46658-0.17733 0.27595-0.38933 0.53323-0.624 0.77319-0.87867 0.87717-2.0453 1.3597-3.2853 1.3597s-2.4067-0.48124-3.2853-1.3597c-0.876-0.87717-1.36-2.0436-1.36-3.2861 0-1.2398 0.48267-2.4062 1.36-3.2807 0.87867-0.87717 2.0453-1.3611 3.2853-1.3611 0.91733 0 1.7947 0.26795 2.5453 0.76252l-1.9307 1.9343c-1.0707 1.0691-0.70667 1.9436 0.80533 1.9436z" fill="#9c9" stroke-width="1.3332"/>
+ <path d="m13.308 12.288h7.692v-7.689c-0.012-1.7022-1.0065-2.1116-2.2095-0.90734l-1.731 1.7367c-1.5225-1.1923-3.3855-1.8447-5.349-1.8447-2.325 0-4.5135 0.90583-6.156 2.5511-1.6485 1.6377-2.5545 3.8288-2.5545 6.1533 0 2.3291 0.906 4.5172 2.5515 6.1594 1.6455 1.6452 3.8325 2.5525 6.159 2.5525 2.325 0 4.5135-0.90734 6.159-2.554 0.444-0.44542 0.837-0.93132 1.17-1.4472 0.5205-0.81135 0.285-1.8897-0.525-2.4071-0.8085-0.51891-1.887-0.28344-2.406 0.5249-0.1995 0.31044-0.438 0.59988-0.702 0.86984-0.9885 0.98682-2.301 1.5297-3.696 1.5297-1.395 0-2.7075-0.5414-3.696-1.5297-0.9855-0.98682-1.53-2.2991-1.53-3.6969 0-1.3948 0.543-2.707 1.53-3.6908 0.9885-0.98682 2.301-1.5312 3.696-1.5312 1.032 0 2.019 0.30144 2.8635 0.85784l-2.172 2.1761c-1.2045 1.2027-0.795 2.1866 0.906 2.1866z" fill="#9c9" stroke-width="1.3332"/>
 </svg>

novelwriter/assets/icons/typicons_dark/typ_search-grey.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20.547 14.707-0.7017-0.703-0.98054-0.98185c0.29717-0.90068 0.46343-1.859 0.46343-2.8578 0-5.0519-4.112-9.1639-9.1639-9.1639s-9.1639 4.112-9.1639 9.1639c0 5.0519 4.112 9.1639 9.1639 9.1639 0.99887 0 1.9585-0.16626 2.8591-0.46343l0.98185 0.98054 1.9794 1.9768 0.07986 0.07986 0.08378 0.072c0.78679 0.66242 1.7647 1.0264 2.7544 1.0264 2.2596 0 4.0976-1.838 4.0976-4.0989 0-1.0997-0.4294-2.1313-1.2096-2.9037zm-16.93-4.5427c0-3.6093 2.9364-6.5457 6.5457-6.5457s6.5457 2.9364 6.5457 6.5457-2.9364 6.5457-6.5457 6.5457-6.5457-2.9364-6.5457-6.5457z" fill="#aeaeae" stroke-width="1.3091"/>
+</svg>

novelwriter/assets/icons/typicons_dark/typ_th-dot-more.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="M 22,12 A 2.6315,2.6315 0 0 0 19.3686,9.3686 2.6315,2.6315 0 0 0 16.7372,12 2.6315,2.6315 0 0 0 19.3686,14.6314 2.6315,2.6315 0 0 0 22,12 Z m -7.3686,0 A 2.6315,2.6315 0 0 0 12,9.3686 2.6315,2.6315 0 0 0 9.3686,12 2.6315,2.6315 0 0 0 12,14.6314 2.6315,2.6315 0 0 0 14.6314,12 Z M 7.2628,12 A 2.6315,2.6315 0 0 0 4.6314,9.3686 2.6315,2.6315 0 0 0 2,12 2.6315,2.6315 0 0 0 4.6314,14.6314 2.6315,2.6315 0 0 0 7.2628,12 Z" fill="#aeaeae" stroke-width=".90909"/>
+</svg>

novelwriter/assets/icons/typicons_dark/typ_th-list.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#69c" stroke-width="1.0526">
+  <path d="m19.632 17.263h-7.3684c-1.1611 0-2.1053 0.94421-2.1053 2.1053s0.94421 2.1053 2.1053 2.1053h7.3684c1.1611 0 2.1053-0.94421 2.1053-2.1053s-0.94421-2.1053-2.1053-2.1053zm0-7.3684h-7.3684c-1.1611 0-2.1053 0.94421-2.1053 2.1053s0.94421 2.1053 2.1053 2.1053h7.3684c1.1611 0 2.1053-0.94421 2.1053-2.1053s-0.94421-2.1053-2.1053-2.1053zm0-7.3684h-7.3684c-1.1611 0-2.1053 0.94421-2.1053 2.1053 0 1.1611 0.94421 2.1053 2.1053 2.1053h7.3684c1.1611 0 2.1053-0.94421 2.1053-2.1053 0-1.1611-0.94421-2.1053-2.1053-2.1053z"/>
+  <circle cx="4.8947" cy="19.368" r="2.6316"/>
+  <circle cx="4.8947" cy="12" r="2.6316"/>
+  <circle cx="4.8947" cy="4.6316" r="2.6316"/>
+ </g>
+</svg>

novelwriter/assets/icons/typicons_dark/typ_times.svg

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m19.041 4.9586c-1.0144-1.0157-2.6635-1.0157-3.678 0l-3.3632 3.3632-3.3632-3.3632c-1.0144-1.0157-2.6635-1.0157-3.678 0-1.0157 1.0157-1.0157 2.6622 0 3.678l3.3619 3.3632-3.3619 3.3632c-1.0157 1.0157-1.0157 2.6622 0 3.678 0.50722 0.50852 1.1731 0.76212 1.839 0.76212 0.66588 0 1.3318-0.25361 1.839-0.76212l3.3632-3.3632 3.3632 3.3632c0.50722 0.50852 1.1731 0.76212 1.839 0.76212 0.66588 0 1.3318-0.25361 1.839-0.76212 1.0157-1.0157 1.0157-2.6622 0-3.678l-3.3619-3.3632 3.3619-3.3632c1.0157-1.0157 1.0157-2.6622 0-3.678z" fill="#d64848" stroke-width="1.3006"/>
+ <path d="m20.121 3.8786c-1.17-1.1715-3.072-1.1715-4.2421 0l-3.879 3.8791-3.879-3.8791c-1.17-1.1715-3.072-1.1715-4.2421 0-1.1715 1.1715-1.1715 3.0705 0 4.2421l3.8776 3.879-3.8776 3.879c-1.1715 1.1715-1.1715 3.0705 0 4.2421 0.58502 0.58652 1.353 0.87902 2.1211 0.87902 0.76801 0 1.5361-0.29251 2.1211-0.87902l3.879-3.879 3.879 3.879c0.58502 0.58652 1.353 0.87902 2.1211 0.87902 0.76801 0 1.5361-0.29251 2.1211-0.87902 1.1715-1.1715 1.1715-3.0705 0-4.2421l-3.8776-3.879 3.8776-3.879c1.1715-1.1715 1.1715-3.0705 0-4.2421z" fill="#d64848" stroke-width="1.5001"/>
 </svg>

novelwriter/assets/icons/typicons_light/icons.conf

@@ -17,6 +17,7 @@ licenseurl  = https://creativecommons.org/licenses/by-sa/4.0/
 
 [Map]
 add             = typ_plus.svg
+add_document    = typ_document-add.svg
 alert_error     = typ_delete-full.svg
 alert_info      = typ_lightbulb-full.svg
 alert_question  = typ_directions-full.svg
@@ -39,10 +40,12 @@ cls_none        = typ_cancel.svg
 cls_novel       = typ_book.svg
 cls_object      = typ_key.svg
 cls_plot        = typ_puzzle.svg
+cls_template    = mixed_document-new.svg
 cls_timeline    = typ_calendar.svg
 cls_trash       = typ_trash.svg
 cls_world       = typ_location.svg
 cross           = typ_times.svg
+document        = typ_document.svg
 down            = typ_chevron-down.svg
 edit            = typ_pencil.svg
 export          = typ_export.svg
@@ -50,16 +53,21 @@ fmt_bold        = nw_tb-bold.svg
 fmt_bold-md     = nw_tb-bold-md.svg
 fmt_italic      = nw_tb-italic.svg
 fmt_italic-md   = nw_tb-italic-md.svg
+fmt_mark        = nw_tb-mark.svg
 fmt_strike      = nw_tb-strike.svg
 fmt_strike-md   = nw_tb-strike-md.svg
 fmt_subscript   = nw_tb-subscript.svg
 fmt_superscript = nw_tb-superscript.svg
 fmt_underline   = nw_tb-underline.svg
 forward         = typ_chevron-right.svg
+import          = mixed_import.svg
+list            = typ_th-list.svg
 maximise        = typ_arrow-maximise.svg
 menu            = typ_th-dot-menu.svg
 minimise        = typ_arrow-minimise.svg
+more            = typ_th-dot-more.svg
 noncheckable    = mixed_input-none.svg
+open            = typ_folder.svg
 panel           = nw_panel.svg
 proj_chapter    = mixed_document-chapter.svg
 proj_details    = typ_th-list-grey.svg
@@ -83,6 +91,7 @@ search_regex    = nw_search-regex.svg
 search_replace  = mixed_search-replace.svg
 search_word     = nw_search-word.svg
 settings        = typ_cog.svg
+star            = typ_star.svg
 status_idle     = typ_media-pause-grey.svg
 status_lang     = typ_globe-grey.svg
 status_lines    = typ_th-list-grey.svg
@@ -91,12 +100,15 @@ status_time     = typ_stopwatch-grey.svg
 sticky-off      = typ_pin-outline.svg
 sticky-on       = typ_pin.svg
 unchecked       = mixed_input-unchecked.svg
+unfold-hide     = typ_arrow-right.svg
+unfold-show     = typ_arrow-down.svg
 up              = typ_chevron-up.svg
 view            = typ_eye.svg
 view_build      = typ_export-grey.svg
 view_editor     = mixed_edit.svg
 view_novel      = typ_book-grey.svg
 view_outline    = typ_puzzle-outline.svg
+view_search     = typ_search-grey.svg
 
 deco_doc_h0     = nw_deco-h0.svg
 deco_doc_h0_n   = nw_deco-h0.svg

novelwriter/assets/icons/typicons_light/mixed_document-new.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5.8898 3.4449c-0.67467 1e-7 -1.2225 0.5478-1.2225 1.2225v14.665c0 0.67466 0.5478 1.2225 1.2225 1.2225h12.22c0.67466 0 1.2225-0.5478 1.2225-1.2225v-11h-1.8326c-1.6854 0-3.0551-1.3696-3.0551-3.0551v-1.8326zm9.7775 0.50488v1.3277c0 1.0108 0.82184 1.8326 1.8326 1.8326h1.3277z" fill="#e5e5e5" stroke-linecap="round" stroke-width=".55"/>
+ <path d="m5.8898 1c-2.0216 0-3.6674 1.6458-3.6674 3.6674v14.665c0 2.0216 1.6458 3.6674 3.6674 3.6674h12.22c2.0216 0 3.6674-1.6458 3.6674-3.6674v-12.222c0-0.32511-0.12901-0.63512-0.35879-0.86367l-4.8877-4.8877c-0.22856-0.22978-0.53856-0.35879-0.86367-0.35879zm0 2.4449h8.5551v1.8326c0 1.6854 1.3696 3.0551 3.0551 3.0551h1.8326v11c0 0.67466-0.5478 1.2225-1.2225 1.2225h-12.22c-0.67467 0-1.2225-0.5478-1.2225-1.2225v-14.665c0-0.67467 0.5478-1.2225 1.2225-1.2225zm9.7775 0.50488 3.1604 3.1604h-1.3277c-1.0108 0-1.8326-0.82184-1.8326-1.8326z" fill="#333" stroke-width="1.2222"/>
+ <path d="m10.105 9.9584-3.785 0.4196c-0.13651 0.01653-0.25722 0.10777-0.30249 0.24644-0.04526 0.13867 0 0.28308 0.10059 0.37434 1.1252 1.0267 2.8158 2.5643 2.8158 2.5643-0.0014 0-0.46415 2.2367-0.77166 3.729-0.02587 0.13508 0.02299 0.27806 0.14082 0.36356 0.11711 0.0855 0.268 0.08694 0.38655 0.02012 1.3249-0.753 3.3094-1.8853 3.3094-1.8853l3.308 1.886c0.12071 0.0661 0.27159 0.06467 0.38871-0.02084 0.11783-0.0855 0.16669-0.22848 0.1401-0.36284l-0.7695-3.7297 2.8158-2.5622c0.10059-0.09412 0.14514-0.23854 0.10059-0.37649-0.04454-0.13795-0.16525-0.2292-0.30177-0.24501-1.5146-0.16956-3.7857-0.42103-3.7857-0.42103l-1.5685-3.4703c-0.05892-0.1243-0.1825-0.21124-0.32764-0.21124-0.14514 0-0.26944 0.087654-0.32548 0.21124z" fill="#eab700" stroke-width=".7185"/>
+</svg>

novelwriter/assets/icons/typicons_light/mixed_import.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.1113 3.666c-0.61332 0-1.1094 0.49689-1.1094 1.1113v15.557h-0.0019531c0 0.61443 0.498 1.1094 1.1113 1.1094h15.557c0.61332 0 1.1113-0.49494 1.1113-1.1094v-8.2578c-0.61899 0.57364-1.3634 1.0131-2.252 1.2578-0.004058 2.0524-0.007162 4.0735 0.005859 5.8887h-13.311v-13.318c1.6116-0.00848 2.8992 0 4.4648 0 0.75712-0.75269 1.5907-1.5005 2.3418-2.2383h-7.918z" fill="#718c00"/>
+ <path d="m21.996 3.1106v-0.55556c-1.8789 2.8644-4 4.3922-6.6667 4.4444v-3.3333c0-0.61222-0.56778-1.1111-1.27-1.1111-0.40444 0-0.75 0.17556-0.98111 0.43444-2.1478 2.2544-6.6378 6.7878-6.6378 6.7878s4.49 4.5356 6.6389 6.8189c0.23111 0.22778 0.57556 0.40333 0.98 0.40333 0.70222 0 1.27-0.49667 1.27-1.1111v-3.3333c5.1778 0 6.6667-5.4122 6.6667-9.4444z" fill="#718c00" stroke-width="1.1111"/>
+</svg>

novelwriter/assets/icons/typicons_light/nw_tb-mark.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <rect x=".26458" y=".79375" width="5.8208" height="4.7625" fill="#ad8700" fill-opacity=".8" stroke-linecap="round" stroke-width=".1354"/>
+ <path d="m1.3229 5.2917v-4.2333h0.98087l0.6397 1.8829q0.060924 0.18829 0.11576 0.38957 0.054831 0.19479 0.11576 0.38957h0.024369q0.060924-0.19479 0.10966-0.38957 0.054831-0.20128 0.11576-0.38957l0.62752-1.8829h0.97478v4.2333h-0.81638v-1.5518q0-0.15583 0.012185-0.34412 0.012185-0.18829 0.030462-0.37658 0.018277-0.19479 0.036554-0.37658 0.018277-0.18829 0.036554-0.34412h-0.02437l-0.3229 1.0064-0.56659 1.6167h-0.49348l-0.56659-1.6167-0.3168-1.0064h-0.024369q0.018277 0.15583 0.036554 0.34412 0.018277 0.1818 0.036554 0.37658 0.018277 0.18829 0.030462 0.37658 0.012185 0.18829 0.012185 0.34412v1.5518z" fill-opacity=".78039" stroke-linecap="round" stroke-width=".11793"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#4271ae" stroke-width="1.1186"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#4271ae" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_light/typ_arrow-down.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m1.5077 8.1077 10.492 10.662 10.492-10.662c0.33846-0.33846 0.50769-0.84615 0.50769-1.1846 0-0.33846-0.16923-0.84615-0.50769-1.1846-0.33846-0.33846-0.67692-0.50769-1.1846-0.50769h-18.615c-0.50769 0-0.84615 0.16923-1.1846 0.50769-0.33846 0.33846-0.50769 0.84615-0.50769 1.1846 0 0.33846 0.16923 0.84615 0.50769 1.1846z" fill-opacity=".78039" stroke-width="1.6923"/>
+</svg>

novelwriter/assets/icons/typicons_light/typ_arrow-right.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m8.1077 22.492 10.662-10.492-10.662-10.492c-0.33846-0.33846-0.84615-0.50769-1.1846-0.50769-0.33846 0-0.84615 0.16923-1.1846 0.50769-0.33846 0.33846-0.50769 0.67692-0.50769 1.1846v18.615c0 0.50769 0.16923 0.84615 0.50769 1.1846 0.33846 0.33846 0.84615 0.50769 1.1846 0.50769 0.33846 0 0.84615-0.16923 1.1846-0.50769z" fill-opacity=".78039" stroke-width="1.6923"/>
+</svg>

novelwriter/assets/icons/typicons_light/typ_document-add.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m15.667 12h-2.4444v-2.4444c0-0.67589-0.54633-1.2222-1.2222-1.2222s-1.2222 0.54633-1.2222 1.2222v2.4444h-2.4444c-0.67589 0-1.2222 0.54633-1.2222 1.2222s0.54633 1.2222 1.2222 1.2222h2.4444v2.4444c0 0.67589 0.54633 1.2222 1.2222 1.2222s1.2222-0.54633 1.2222-1.2222v-2.4444h2.4444c0.67589 0 1.2222-0.54633 1.2222-1.2222s-0.54633-1.2222-1.2222-1.2222zm5.753-5.753-4.8889-4.8889c-0.22856-0.22978-0.539-0.35811-0.86411-0.35811h-9.7778c-2.0216 0-3.6667 1.6451-3.6667 3.6667v14.667c0 2.0216 1.6451 3.6667 3.6667 3.6667h12.222c2.0216 0 3.6667-1.6451 3.6667-3.6667v-12.222c0-0.32511-0.12833-0.63556-0.35811-0.86411zm-2.5923 0.86411h-1.3273c-1.0108 0-1.8333-0.82256-1.8333-1.8333v-1.3273zm-0.71622 13.444h-12.222c-0.67467 0-1.2222-0.54756-1.2222-1.2222v-14.667c0-0.67467 0.54756-1.2222 1.2222-1.2222h8.5556v1.8333c0 1.6854 1.3701 3.0556 3.0556 3.0556h1.8333v11c0 0.67467-0.54756 1.2222-1.2222 1.2222z" fill-opacity=".78039" stroke-width="1.2222"/>
+</svg>

novelwriter/assets/icons/typicons_light/typ_document.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m21.42 6.247-4.8889-4.8889c-0.22856-0.22978-0.539-0.35811-0.86411-0.35811h-9.7778c-2.0216 0-3.6667 1.6451-3.6667 3.6667v14.667c0 2.0216 1.6451 3.6667 3.6667 3.6667h12.222c2.0216 0 3.6667-1.6451 3.6667-3.6667v-12.222c0-0.32511-0.12833-0.63556-0.35811-0.86411zm-2.5923 0.86411h-1.3273c-1.0108 0-1.8333-0.82256-1.8333-1.8333v-1.3273zm-0.71622 13.444h-12.222c-0.67467 0-1.2222-0.54756-1.2222-1.2222v-14.667c0-0.67467 0.54756-1.2222 1.2222-1.2222h8.5556v1.8333c0 1.6854 1.3701 3.0556 3.0556 3.0556h1.8333v11c0 0.67467-0.54756 1.2222-1.2222 1.2222z" fill-opacity=".78039" stroke-width="1.2222"/>
+</svg>

novelwriter/assets/icons/typicons_light/typ_refresh-flipped.svg

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m10.837 12.256h-6.8373v-6.8347c0.010667-1.5131 0.89467-1.877 1.964-0.80652l1.5387 1.5437c1.3533-1.0598 3.0093-1.6397 4.7547-1.6397 2.0667 0 4.012 0.80518 5.472 2.2676 1.4653 1.4557 2.2707 3.4034 2.2707 5.4696 0 2.0703-0.80533 4.0153-2.268 5.475-1.4627 1.4624-3.4067 2.2689-5.4747 2.2689-2.0667 0-4.012-0.80652-5.4747-2.2702-0.39467-0.39593-0.744-0.82784-1.04-1.2864-0.46267-0.7212-0.25333-1.6797 0.46667-2.1396 0.71867-0.46125 1.6773-0.25195 2.1387 0.46658 0.17733 0.27595 0.38933 0.53323 0.624 0.77319 0.87867 0.87717 2.0453 1.3597 3.2853 1.3597s2.4067-0.48124 3.2853-1.3597c0.876-0.87717 1.36-2.0436 1.36-3.2861 0-1.2398-0.48267-2.4062-1.36-3.2807-0.87867-0.87717-2.0453-1.3611-3.2853-1.3611-0.91733 0-1.7947 0.26795-2.5453 0.76252l1.9307 1.9343c1.0707 1.0691 0.70667 1.9436-0.80533 1.9436z" fill="#718c00" stroke-width="1.3332"/>
+ <path d="m10.692 12.288h-7.692v-7.689c0.012-1.7022 1.0065-2.1116 2.2095-0.90734l1.731 1.7367c1.5225-1.1923 3.3855-1.8447 5.349-1.8447 2.325 0 4.5135 0.90583 6.156 2.5511 1.6485 1.6377 2.5545 3.8288 2.5545 6.1533 0 2.3291-0.906 4.5172-2.5515 6.1594-1.6455 1.6452-3.8325 2.5525-6.159 2.5525-2.325 0-4.5135-0.90734-6.159-2.554-0.444-0.44542-0.837-0.93132-1.17-1.4472-0.5205-0.81135-0.285-1.8897 0.525-2.4071 0.8085-0.51891 1.887-0.28344 2.406 0.5249 0.1995 0.31044 0.438 0.59988 0.702 0.86984 0.9885 0.98682 2.301 1.5297 3.696 1.5297 1.395 0 2.7075-0.5414 3.696-1.5297 0.9855-0.98682 1.53-2.2991 1.53-3.6969 0-1.3948-0.543-2.707-1.53-3.6908-0.9885-0.98682-2.301-1.5312-3.696-1.5312-1.032 0-2.019 0.30144-2.8635 0.85784l2.172 2.1761c1.2045 1.2027 0.795 2.1866-0.906 2.1866z" fill="#718c00" stroke-width="1.4998"/>
 </svg>

novelwriter/assets/icons/typicons_light/typ_refresh.svg

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m13.163 12.256h6.8373v-6.8347c-0.010667-1.5131-0.89467-1.877-1.964-0.80652l-1.5387 1.5437c-1.3533-1.0598-3.0093-1.6397-4.7547-1.6397-2.0667 0-4.012 0.80518-5.472 2.2676-1.4653 1.4557-2.2707 3.4034-2.2707 5.4696 0 2.0703 0.80533 4.0153 2.268 5.475 1.4627 1.4624 3.4067 2.2689 5.4747 2.2689 2.0667 0 4.012-0.80652 5.4747-2.2702 0.39467-0.39593 0.744-0.82784 1.04-1.2864 0.46267-0.7212 0.25333-1.6797-0.46667-2.1396-0.71867-0.46125-1.6773-0.25195-2.1387 0.46658-0.17733 0.27595-0.38933 0.53323-0.624 0.77319-0.87867 0.87717-2.0453 1.3597-3.2853 1.3597s-2.4067-0.48124-3.2853-1.3597c-0.876-0.87717-1.36-2.0436-1.36-3.2861 0-1.2398 0.48267-2.4062 1.36-3.2807 0.87867-0.87717 2.0453-1.3611 3.2853-1.3611 0.91733 0 1.7947 0.26795 2.5453 0.76252l-1.9307 1.9343c-1.0707 1.0691-0.70667 1.9436 0.80533 1.9436z" fill="#718c00" stroke-width="1.3332"/>
+ <path d="m13.308 12.288h7.692v-7.689c-0.012001-1.7022-1.0065-2.1116-2.2095-0.90734l-1.731 1.7367c-1.5225-1.1923-3.3855-1.8447-5.349-1.8447-2.325 0-4.5135 0.90583-6.156 2.5511-1.6485 1.6377-2.5545 3.8288-2.5545 6.1533 0 2.3291 0.906 4.5172 2.5515 6.1594 1.6455 1.6452 3.8325 2.5525 6.159 2.5525 2.325 0 4.5135-0.90734 6.159-2.554 0.444-0.44542 0.837-0.93132 1.17-1.4472 0.5205-0.81135 0.285-1.8897-0.525-2.4071-0.8085-0.51891-1.887-0.28344-2.406 0.5249-0.1995 0.31044-0.438 0.59988-0.702 0.86984-0.9885 0.98682-2.301 1.5297-3.696 1.5297-1.395 0-2.7075-0.5414-3.696-1.5297-0.9855-0.98682-1.53-2.2991-1.53-3.6969 0-1.3948 0.543-2.707 1.53-3.6908 0.9885-0.98682 2.301-1.5312 3.696-1.5312 1.032 0 2.019 0.30144 2.8635 0.85784l-2.172 2.1761c-1.2045 1.2027-0.795 2.1866 0.906 2.1866z" fill="#718c00" stroke-width="1.4998"/>
 </svg>

novelwriter/assets/icons/typicons_light/typ_search-grey.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20.547 14.707-0.7017-0.703-0.98054-0.98185c0.29717-0.90068 0.46343-1.859 0.46343-2.8578 0-5.0519-4.112-9.1639-9.1639-9.1639s-9.1639 4.112-9.1639 9.1639c0 5.0519 4.112 9.1639 9.1639 9.1639 0.99887 0 1.9585-0.16626 2.8591-0.46343l0.98185 0.98054 1.9794 1.9768 0.07986 0.07986 0.08378 0.072c0.78679 0.66242 1.7647 1.0264 2.7544 1.0264 2.2596 0 4.0976-1.838 4.0976-4.0989 0-1.0997-0.4294-2.1313-1.2096-2.9037zm-16.93-4.5427c0-3.6093 2.9364-6.5457 6.5457-6.5457s6.5457 2.9364 6.5457 6.5457-2.9364 6.5457-6.5457 6.5457-6.5457-2.9364-6.5457-6.5457z" fill-opacity=".78039" stroke-width="1.3091"/>
+</svg>

novelwriter/assets/icons/typicons_light/typ_th-dot-more.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="M 22,12 A 2.6315,2.6315 0 0 0 19.3686,9.3686 2.6315,2.6315 0 0 0 16.7372,12 2.6315,2.6315 0 0 0 19.3686,14.6314 2.6315,2.6315 0 0 0 22,12 Z m -7.3686,0 A 2.6315,2.6315 0 0 0 12,9.3686 2.6315,2.6315 0 0 0 9.3686,12 2.6315,2.6315 0 0 0 12,14.6314 2.6315,2.6315 0 0 0 14.6314,12 Z M 7.2628,12 A 2.6315,2.6315 0 0 0 4.6314,9.3686 2.6315,2.6315 0 0 0 2,12 2.6315,2.6315 0 0 0 4.6314,14.6314 2.6315,2.6315 0 0 0 7.2628,12 Z" fill-opacity=".78039" stroke-width=".90909"/>
+</svg>

novelwriter/assets/icons/typicons_light/typ_th-list.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#4271ae" stroke-width="1.0526">
+  <path d="m19.632 17.263h-7.3684c-1.1611 0-2.1053 0.94421-2.1053 2.1053s0.94421 2.1053 2.1053 2.1053h7.3684c1.1611 0 2.1053-0.94421 2.1053-2.1053s-0.94421-2.1053-2.1053-2.1053zm0-7.3684h-7.3684c-1.1611 0-2.1053 0.94421-2.1053 2.1053s0.94421 2.1053 2.1053 2.1053h7.3684c1.1611 0 2.1053-0.94421 2.1053-2.1053s-0.94421-2.1053-2.1053-2.1053zm0-7.3684h-7.3684c-1.1611 0-2.1053 0.94421-2.1053 2.1053 0 1.1611 0.94421 2.1053 2.1053 2.1053h7.3684c1.1611 0 2.1053-0.94421 2.1053-2.1053 0-1.1611-0.94421-2.1053-2.1053-2.1053z"/>
+  <circle cx="4.8947" cy="19.368" r="2.6316"/>
+  <circle cx="4.8947" cy="12" r="2.6316"/>
+  <circle cx="4.8947" cy="4.6316" r="2.6316"/>
+ </g>
+</svg>

novelwriter/assets/icons/typicons_light/typ_times.svg

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m19.041 4.9586c-1.0144-1.0157-2.6635-1.0157-3.678 0l-3.3632 3.3632-3.3632-3.3632c-1.0144-1.0157-2.6635-1.0157-3.678 0-1.0157 1.0157-1.0157 2.6622 0 3.678l3.3619 3.3632-3.3619 3.3632c-1.0157 1.0157-1.0157 2.6622 0 3.678 0.50722 0.50852 1.1731 0.76212 1.839 0.76212 0.66588 0 1.3318-0.25361 1.839-0.76212l3.3632-3.3632 3.3632 3.3632c0.50722 0.50852 1.1731 0.76212 1.839 0.76212 0.66588 0 1.3318-0.25361 1.839-0.76212 1.0157-1.0157 1.0157-2.6622 0-3.678l-3.3619-3.3632 3.3619-3.3632c1.0157-1.0157 1.0157-2.6622 0-3.678z" fill="#c82829" stroke-width="1.3006"/>
+ <path d="m20.121 3.8786c-1.17-1.1715-3.072-1.1715-4.2421 0l-3.879 3.8791-3.879-3.8791c-1.17-1.1715-3.072-1.1715-4.2421 0-1.1715 1.1715-1.1715 3.0705 0 4.2421l3.8776 3.879-3.8776 3.879c-1.1715 1.1715-1.1715 3.0705 0 4.2421 0.58502 0.58652 1.353 0.87902 2.1211 0.87902 0.76801 0 1.5361-0.29251 2.1211-0.87902l3.879-3.879 3.879 3.879c0.58502 0.58652 1.353 0.87902 2.1211 0.87902 0.76801 0 1.5361-0.29251 2.1211-0.87902 1.1715-1.1715 1.1715-3.0705 0-4.2421l-3.8776-3.879 3.8776-3.879c1.1715-1.1715 1.1715-3.0705 0-4.2421z" fill="#c82829" stroke-width="1.5001"/>
 </svg>

novelwriter/assets/syntax/cyberpunk_night.conf

@@ -0,0 +1,26 @@
+[Main]
+name       = Cyberpunk Night
+author     = Anders Lemvigh
+url        = https://github.com/alemvigh
+license    = CC BY-SA 4.0
+licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
+
+[Syntax]
+background     =   0,   0,   0
+text           = 150, 150, 150
+link           =  77, 077, 255
+headertext     = 255, 255, 255
+headertag      =  50,   0, 180
+emphasis       =   0, 255, 255
+straightquotes =   7,  27, 219
+doublequotes   =   0, 255,   0
+singlequotes   =   0, 140, 255
+hidden         =  77,  77, 100
+shortcode      = 255, 255,   0
+keyword        = 255, 100, 255
+value          = 255, 150,  10
+spellcheckline = 242,  72,  23
+errorline      = 186, 218,   4
+replacetag     =   0,   0, 180
+modifier       = 144, 142, 176
+optional       = 180, 180, 180

novelwriter/assets/syntax/default_dark.conf

@@ -20,7 +20,9 @@ hidden         = 150, 150, 150
 shortcode      =   0, 155, 200
 keyword        = 200,  46,   0
 value          = 184, 200,   0
+optional       =   0, 155, 200
 spellcheckline = 200,  46,   0
 errorline      =  46, 200,   0
 replacetag     =   0, 184,  46
 modifier       = 200, 120,   0
+texthighlight  = 136, 200,   0, 96

novelwriter/assets/syntax/default_light.conf

@@ -20,7 +20,9 @@ hidden         = 100, 100, 100
 shortcode      =   0, 100,   0
 keyword        = 200,  50,  50
 value          =  50, 150,  50
+optional       =   0, 100,   0
 spellcheckline = 200,   0,   0
 errorline      =   0, 150,   0
 replacetag     =   0, 150,   0
 modifier       = 150, 110,  30
+texthighlight  = 150, 150,   0, 96

novelwriter/assets/syntax/grey_dark.conf

@@ -20,7 +20,9 @@ hidden         = 150, 150, 150
 shortcode      = 225, 225, 225
 keyword        = 225, 225, 225
 value          = 200, 200, 200
+optional       = 225, 225, 225
 spellcheckline = 200,  46,   0
 errorline      =  46, 200,   0
 replacetag     = 225, 225, 225
 modifier       = 225, 225, 225
+texthighlight  = 255, 255, 255, 64

novelwriter/assets/syntax/grey_light.conf

@@ -20,7 +20,9 @@ hidden         = 100, 100, 100
 shortcode      =   0,   0,   0
 keyword        =   0,   0,   0
 value          =  20,  20,  20
+optional       =   0,   0,   0
 spellcheckline = 200,   0,   0
 errorline      =   0, 150,   0
 replacetag     =   0,   0,   0
 modifier       =   0,   0,   0
+texthighlight  =   0,   0,   0, 64

novelwriter/assets/syntax/light_owl.conf

@@ -40,7 +40,9 @@ hidden         = 152, 159, 177
 shortcode      =  40, 142, 215
 keyword        = 222,  61,  58
 value          = 150,  74, 193
+optional       =  40, 142, 215
 spellcheckline = 222,  61,  58
 errorline      =   8, 145, 106
 replacetag     =  42, 162, 152
 modifier       = 224, 175,   5
+texthighlight  = 218, 170,   1, 96

novelwriter/assets/syntax/night_owl.conf

@@ -40,7 +40,9 @@ hidden         =  99, 119, 119
 shortcode      = 130, 170, 255
 keyword        = 247, 140, 108
 value          = 199, 146, 234
+optional       = 130, 170, 255
 spellcheckline = 247, 140, 108
 errorline      = 173, 219, 103
 replacetag     = 127, 219, 202
 modifier       = 236, 196, 141
+texthighlight  = 255, 235, 149, 96

novelwriter/assets/syntax/solarized_dark.conf

@@ -20,7 +20,9 @@ hidden         = 147, 161, 161
 shortcode      = 147, 161, 161
 keyword        = 133, 153,   0
 value          = 203,  75,  22
+optional       = 147, 161, 161
 spellcheckline = 203,  75,  22
 errorline      = 220,  50,  47
 replacetag     = 133, 153,   0
 modifier       = 181, 137,   0
+texthighlight  = 181, 137,   0, 96

novelwriter/assets/syntax/solarized_light.conf

@@ -20,7 +20,9 @@ hidden         =  88, 110, 117
 shortcode      =  88, 110, 117
 keyword        = 133, 153,   0
 value          = 203,  75,  22
+optional       =  88, 110, 117
 spellcheckline = 203,  75,  22
 errorline      = 220,  50,  47
 replacetag     = 133, 153,   0
 modifier       = 181, 137,   0
+texthighlight  = 181, 137,   0, 96

novelwriter/assets/syntax/tango.conf

@@ -0,0 +1,23 @@
+[Main]
+name   = Tango
+author = Veronica Berglyd Olsen (adaptation)
+
+[Syntax]
+background     =  48,  48,  47
+text           = 238, 238, 236
+link           = 115, 159, 207
+headertext     = 115, 159, 207
+headertag      =  52, 101, 164
+emphasis       = 196, 160,   0
+straightquotes = 239,  41,  41
+doublequotes   = 138, 226,  52
+singlequotes   = 252, 233,  79
+hidden         = 143, 143, 141
+shortcode      = 115, 159, 207
+keyword        = 239,  41,  41
+value          = 173, 127, 168
+optional       = 115, 159, 207
+spellcheckline = 239,  41,  41
+errorline      = 138, 226,  52
+replacetag     =  51, 226, 226
+modifier       = 196, 160,   0

novelwriter/assets/syntax/tomorrow.conf

@@ -40,7 +40,9 @@ hidden         = 142, 144, 140
 shortcode      =  66, 113, 174
 keyword        = 240,  40,  41
 value          = 137,  89, 168
+optional       =  66, 113, 174
 spellcheckline = 240,  40,  41
 errorline      = 113, 140,   0
 replacetag     =  62, 153, 159
 modifier       = 245, 135,  31
+texthighlight  = 234, 183,   0, 96

novelwriter/assets/syntax/tomorrow_night.conf

@@ -40,7 +40,9 @@ hidden         = 150, 152, 150
 shortcode      = 129, 162, 190
 keyword        = 204, 102, 102
 value          = 178, 148, 187
+optional       = 129, 162, 190
 spellcheckline = 204, 102, 102
 errorline      = 181, 189, 104
 replacetag     = 138, 190, 183
 modifier       = 222, 147,  95
+texthighlight  = 240, 198, 116, 96

novelwriter/assets/syntax/tomorrow_night_blue.conf

@@ -40,7 +40,9 @@ hidden         = 114, 133, 183
 shortcode      = 187, 218, 255
 keyword        = 255, 157, 164
 value          = 235, 187, 255
+optional       = 187, 218, 255
 spellcheckline = 255, 157, 164
 errorline      = 209, 241, 169
 replacetag     = 153, 255, 255
 modifier       = 255, 197, 143
+texthighlight  = 255, 238, 173, 96

novelwriter/assets/syntax/tomorrow_night_bright.conf

@@ -40,7 +40,9 @@ hidden         = 150, 152, 150
 shortcode      = 122, 166, 218
 keyword        = 213,  78,  83
 value          = 195, 151, 216
+optional       = 122, 166, 218
 spellcheckline = 213,  78,  83
 errorline      = 185, 202,  74
 replacetag     = 112, 192, 177
 modifier       = 231, 140,  69
+texthighlight  = 231, 197,  71, 128

novelwriter/assets/syntax/tomorrow_night_eighties.conf

@@ -40,7 +40,9 @@ hidden         = 153, 153, 153
 shortcode      = 102, 153, 204
 keyword        = 242, 119, 122
 value          = 204, 153, 204
+optional       = 102, 153, 204
 spellcheckline = 242, 119, 122
 errorline      = 153, 204, 153
 replacetag     = 102, 204, 204
 modifier       = 249, 145,  57
+texthighlight  = 255, 204, 102, 96

novelwriter/assets/text/credits_en.htm

@@ -2,40 +2,42 @@
 <html>
 <body>
 
-<h2>Credits</h2>
-
 <h3>Main Developer</h3>
 <p>Veronica Berglyd Olsen (<a href="https://github.com/vkbo">@vkbo</a>)</p>
 
 <h3>Contributors</h3>
 
 <p>
-  <b>Concept:</b> Marian Lückhof (<a href="https://github.com/Number042">@Number042</a>)<br>
-  <b>Internationalisation:</b> Bruno Meneguello (<a href="https://github.com/bkmeneguello">@bkmeneguello</a>)<br>
-  <b>Setup and Packaging:</b> Rachel Powers (<a href="https://github.com/Ryex">@Ryex</a>)
+&nbsp;&bull;&nbsp;<b>Concept:</b> Marian Lückhof (<a href="https://github.com/Number042">@Number042</a>)<br>
+&nbsp;&bull;&nbsp;<b>Internationalisation:</b> Bruno Meneguello (<a href="https://github.com/bkmeneguello">@bkmeneguello</a>)<br>
+&nbsp;&bull;&nbsp;<b>Setup and Packaging:</b> Rachel Powers (<a href="https://github.com/Ryex">@Ryex</a>)
 </p>
 <p>For other contributions, see the project's
 <a href="https://github.com/vkbo/novelWriter/graphs/contributors">Contributors</a> page.</p>
 
+<h3>Artwork</h3>
+
+<p>The artwork on the Welcome dialog was created by <a href="https://louisdurrant.art">Louis Durrant</a>.</p>
+
 <h3>Translations</h3>
 
 <p>The default language is English (UK) with English (US) as an option. These are the original
 translators for the languages currently available:</p>
 <p>
-  <b>Dutch:</b> Martijn van der Kleijn (<a href="https://github.com/mvdkleijn">@mvdkleijn</a>)<br>
-  <b>French:</b> Jan Lüdke (<a href="https://github.com/jyhelle">@jyhelle</a>)<br>
-  <b>German:</b> Myian (<a href="https://github.com/heymyian">@heymyian</a>)<br>
-  <b>Italian:</b> Riccardo Mangili<br>
-  <b>Japanese:</b> hebekeg (<a href="https://github.com/hebekeg">@hebekeg</a>)<br>
-  <b>Latin American Spanish:</b> Tommy Marplatt (<a href="https://github.com/tmarplatt">@tmarplatt</a>)<br>
-  <b>Norwegian:</b> Veronica Berglyd Olsen (<a href="https://github.com/vkbo">@vkbo</a>)<br>
-  <b>Portuguese:</b> Bruno Meneguello (<a href="https://github.com/bkmeneguello">@bkmeneguello</a>)<br>
-  <b>Simplified Chinese:</b> Qianzhi Long (<a href="https://github.com/longqzh">@longqzh</a>)
+&nbsp;&bull;&nbsp;<b>Dutch:</b> Martijn van der Kleijn (<a href="https://github.com/mvdkleijn">@mvdkleijn</a>)<br>
+&nbsp;&bull;&nbsp;<b>French:</b> Jan Lüdke (<a href="https://github.com/jyhelle">@jyhelle</a>)<br>
+&nbsp;&bull;&nbsp;<b>German:</b> Myian (<a href="https://github.com/heymyian">@heymyian</a>)<br>
+&nbsp;&bull;&nbsp;<b>Italian:</b> Riccardo Mangili<br>
+&nbsp;&bull;&nbsp;<b>Japanese:</b> hebekeg (<a href="https://github.com/hebekeg">@hebekeg</a>)<br>
+&nbsp;&bull;&nbsp;<b>Latin American Spanish:</b> Tommy Marplatt (<a href="https://github.com/tmarplatt">@tmarplatt</a>)<br>
+&nbsp;&bull;&nbsp;<b>Norwegian:</b> Veronica Berglyd Olsen (<a href="https://github.com/vkbo">@vkbo</a>)<br>
+&nbsp;&bull;&nbsp;<b>Portuguese:</b> Bruno Meneguello (<a href="https://github.com/bkmeneguello">@bkmeneguello</a>)<br>
+&nbsp;&bull;&nbsp;<b>Simplified Chinese:</b> Qianzhi Long (<a href="https://github.com/longqzh">@longqzh</a>)
 </p>
 
 <p>Additional larger translation contributions:</p>
 <p>
-  <b>French:</b> Albert Aribaud (<a href="https://github.com/aaribaud">@aaribaud</a>)
+&nbsp;&bull;&nbsp;<b>French:</b> Albert Aribaud (<a href="https://github.com/aaribaud">@aaribaud</a>)
 </p>
 
 <p>Translations are managed on <a href="https://crowdin.com/project/novelwriter">Crowdin</a>, and
@@ -45,27 +47,29 @@ more contributions are listed on the project's <a href="https://crowdin.com/proj
 
 <p>The following libraries are dependencies of novelWriter:</p>
 <p>
-  <a href="https://www.qt.io">Qt5</a> by Qt Company<br>
-  <a href="https://www.riverbankcomputing.com/software/pyqt">PyQt5</a> by Riverbank Computing<br>
-  <a href="https://abiword.github.io/enchant">Enchant</a> by Dom Lachowicz<br>
-  <a href="https://pyenchant.github.io/pyenchant">PyEnchant</a> by Dimitri Merejkowsky
+&nbsp;&bull;&nbsp;<a href="https://www.qt.io">Qt5</a> by Qt Company<br>
+&nbsp;&bull;&nbsp;<a href="https://www.riverbankcomputing.com/software/pyqt">PyQt5</a> by Riverbank Computing<br>
+&nbsp;&bull;&nbsp;<a href="https://abiword.github.io/enchant">Enchant</a> by Dom Lachowicz<br>
+&nbsp;&bull;&nbsp;<a href="https://pyenchant.github.io/pyenchant">PyEnchant</a> by Dimitri Merejkowsky
 </p>
 
 <h3>Assets</h3>
 
 <p>Some of the assets bundled with novelWriter were adapted from the following sources:</p>
 <p>
-  <a href="https://github.com/stephenhutchings/typicons.font">Typicons</a> icons by Stephen Hutchings (CC BY-SA 4.0)<br>
-  <a href="https://github.com/chriskempson/base16">Tomorrow</a> syntax themes by Chris Kempson (MIT License)<br>
-  <a href="https://github.com/sdras/night-owl-vscode-theme">Owl</a> syntax themes by Sarah Drasner (MIT License)<br>
-  <a href="https://github.com/altercation/solarized">Solarized</a> themes by Ethan Schoonover (MIT License)
+&nbsp;&bull;&nbsp;<a href="https://github.com/stephenhutchings/typicons.font">Typicons</a> icons by Stephen Hutchings (CC BY-SA 4.0)<br>
+&nbsp;&bull;&nbsp;<a href="https://github.com/chriskempson/base16">Tomorrow</a> syntax themes by Chris Kempson (MIT License)<br>
+&nbsp;&bull;&nbsp;<a href="https://github.com/sdras/night-owl-vscode-theme">Owl</a> syntax themes by Sarah Drasner (MIT License)<br>
+&nbsp;&bull;&nbsp;<a href="https://github.com/altercation/solarized">Solarized</a> themes by Ethan Schoonover (MIT License)
 </p>
 
 <h3>Fonts</h3>
 
-<p>The font used for the main novelWriter logo, mimetype and text banners is:</p>
+<p>The font used for the main novelWriter logo, mimetype and text banners is Pridi. Other fonts are
+used on buttons and icons.</p>
 <p>
-  Pridi by Cadson Demak (Open Font License, Version 1.1)
+&nbsp;&bull;&nbsp;Pridi by Cadson Demak (Open Font License, Version 1.1)<br>
+&nbsp;&bull;&nbsp;Source Sans Pro by Paul D. Hunt (SIL Open Font License)
 </p>
 
 <h3>Special Mentions</h3>