diff --git a/novelwriter/formats/shared.py b/novelwriter/formats/shared.py
index ef36e955..b7d7e7cc 100644
--- a/novelwriter/formats/shared.py
+++ b/novelwriter/formats/shared.py
@@ -3,9 +3,7 @@ novelWriter – Formats Shared
 ============================
 
 File History:
-Created: 2024-10-21 [2.6b1] TextFmt
-Created: 2024-10-21 [2.6b1] BlockTyp
-Created: 2024-10-21 [2.6b1] BlockFmt
+Created: 2024-10-21 [2.6b1]
 
 This file is a part of novelWriter
 Copyright 2018–2024, Veronica Berglyd Olsen
@@ -121,18 +119,21 @@ class BlockFmt(Flag):
     An enum of flags that can be combined to format a text block.
     """
 
-    NONE     = 0x0000  # No special style
-    LEFT     = 0x0001  # Left aligned
-    RIGHT    = 0x0002  # Right aligned
-    CENTRE   = 0x0004  # Centred
-    JUSTIFY  = 0x0008  # Justified
-    PBB      = 0x0010  # Page break before
-    PBA      = 0x0020  # Page break after
-    Z_TOPMRG = 0x0040  # Zero top margin
-    Z_BTMMRG = 0x0080  # Zero bottom margin
-    IND_L    = 0x0100  # Left indentation
-    IND_R    = 0x0200  # Right indentation
-    IND_T    = 0x0400  # Text indentation
+    NONE    = 0x0000  # No special style
+    LEFT    = 0x0001  # Left aligned
+    RIGHT   = 0x0002  # Right aligned
+    CENTRE  = 0x0004  # Centred
+    JUSTIFY = 0x0008  # Justified
+    PBB     = 0x0010  # Page break before
+    PBA     = 0x0020  # Page break after
+    Z_TOP   = 0x0040  # Zero top margin
+    Z_BTM   = 0x0080  # Zero bottom margin
+    IND_L   = 0x0100  # Left indentation
+    IND_R   = 0x0200  # Right indentation
+    IND_T   = 0x0400  # Text indentation
+
+    # Masks
+    ALIGNED = LEFT | RIGHT | CENTRE | JUSTIFY
 
 
 # Types
@@ -147,4 +148,4 @@ T_Note = tuple[str, T_Formats]
 
 # A tokenized text block, consisting of:
 # type, header number, text, text formats, and block format
-T_Block = tuple[BlockTyp, int, str, T_Formats, BlockFmt]
+T_Block = tuple[BlockTyp, str, str, T_Formats, BlockFmt]
diff --git a/novelwriter/formats/todocx.py b/novelwriter/formats/todocx.py
index 16772d7a..7c56e29f 100644
--- a/novelwriter/formats/todocx.py
+++ b/novelwriter/formats/todocx.py
@@ -140,7 +140,7 @@ class DocXParStyle(NamedTuple):
     after: float | None = None
     line: float | None = None
     indentFirst: float | None = None
-    indentHangning: float | None = None
+    hanging: float | None = None
     align: str | None = None
     default: bool = False
     level: int | None = None
@@ -214,8 +214,6 @@ class ToDocX(Tokenizer):
 
     def doConvert(self) -> None:
         """Convert the list of text tokens into XML elements."""
-        self._result = ""  # Not used, but cleared just in case
-
         bIndent = self._fontSize * self._blockIndent
 
         for tType, _, tText, tFormat, tStyle in self._blocks:
@@ -240,9 +238,9 @@ class ToDocX(Tokenizer):
                 if tStyle & BlockFmt.PBA:
                     par.setPageBreakAfter(True)
 
-                if tStyle & BlockFmt.Z_BTMMRG:
+                if tStyle & BlockFmt.Z_BTM:
                     par.setMarginBottom(0.0)
-                if tStyle & BlockFmt.Z_TOPMRG:
+                if tStyle & BlockFmt.Z_TOP:
                     par.setMarginTop(0.0)
 
                 if tStyle & BlockFmt.IND_T:
@@ -471,7 +469,7 @@ class ToDocX(Tokenizer):
 
     def _generateFootnote(self, key: str) -> ET.Element | None:
         """Generate a footnote XML object."""
-        if self._footnotes.get(key):
+        if key in self._footnotes:
             idx = len(self._usedNotes) + 1
             run = ET.Element(_wTag("r"))
             rPr = xmlSubElem(run, _wTag("rPr"))
@@ -625,7 +623,7 @@ class ToDocX(Tokenizer):
             before=0.0,
             after=fnSz * self._marginFoot[1],
             line=fnSz * self._lineHeight,
-            indentHangning=fnSz * self._marginFoot[0],
+            hanging=fnSz * self._marginFoot[0],
         ))
 
         # Add to Cache
@@ -746,10 +744,10 @@ class ToDocX(Tokenizer):
                 _wTag("after"): str(int(20.0 * firstFloat(style.after))),
                 _wTag("line"): str(int(20.0 * firstFloat(style.line, size))),
             })
-            if style.indentHangning is not None:
+            if style.hanging is not None:
                 xmlSubElem(pPr, _wTag("ind"), attrib={
-                    _wTag("left"): str(int(20.0 * style.indentHangning)),
-                    _wTag("hanging"): str(int(20.0 * style.indentHangning)),
+                    _wTag("left"): str(int(20.0 * style.hanging)),
+                    _wTag("hanging"): str(int(20.0 * style.hanging)),
                 })
             if style.align:
                 xmlSubElem(pPr, _wTag("jc"), attrib={_wTag("val"): style.align})
diff --git a/novelwriter/formats/tohtml.py b/novelwriter/formats/tohtml.py
index af46ee28..d129349f 100644
--- a/novelwriter/formats/tohtml.py
+++ b/novelwriter/formats/tohtml.py
@@ -79,25 +79,12 @@ class ToHtml(Tokenizer):
 
     def __init__(self, project: NWProject) -> None:
         super().__init__(project)
-
-        self._cssStyles = True
-        self._fullHTML: list[str] = []
-
-        # Internals
         self._trMap = {}
+        self._cssStyles = True
         self._usedNotes: dict[str, int] = {}
         self.setReplaceUnicode(False)
-
         return
 
-    ##
-    #  Properties
-    ##
-
-    @property
-    def fullHTML(self) -> list[str]:
-        return self._fullHTML
-
     ##
     #  Setters
     ##
@@ -128,7 +115,7 @@ class ToHtml(Tokenizer):
 
     def getFullResultSize(self) -> int:
         """Return the size of the full HTML result."""
-        return sum(len(x) for x in self._fullHTML)
+        return sum(len(x) for x in self._pages)
 
     def doPreProcessing(self) -> None:
         """Extend the auto-replace to also properly encode some unicode
@@ -140,8 +127,6 @@ class ToHtml(Tokenizer):
 
     def doConvert(self) -> None:
         """Convert the list of text tokens into an HTML document."""
-        self._result = ""
-
         if self._isNovel:
             # For story files, we bump the titles one level up
             h1Cl = " class='title'"
@@ -157,9 +142,7 @@ class ToHtml(Tokenizer):
             h4 = "h4"
 
         lines = []
-        tHandle = self._handle
-
-        for tType, nHead, tText, tFmt, tStyle in self._blocks:
+        for tType, tMeta, tText, tFmt, tStyle in self._blocks:
 
             # Replace < and > with HTML entities
             if tFmt:
@@ -200,9 +183,9 @@ class ToHtml(Tokenizer):
                 if tStyle & BlockFmt.PBA:
                     aStyle.append("page-break-after: always;")
 
-                if tStyle & BlockFmt.Z_BTMMRG:
+                if tStyle & BlockFmt.Z_BTM:
                     aStyle.append("margin-bottom: 0;")
-                if tStyle & BlockFmt.Z_TOPMRG:
+                if tStyle & BlockFmt.Z_TOP:
                     aStyle.append("margin-top: 0;")
 
                 if tStyle & BlockFmt.IND_L:
@@ -218,8 +201,8 @@ class ToHtml(Tokenizer):
             else:
                 hStyle = ""
 
-            if self._linkHeadings and tHandle:
-                aNm = f"<a name='{tHandle}:T{nHead:04d}'></a>"
+            if self._linkHeadings and tMeta:
+                aNm = f"<a name='{tMeta}'></a>"
             else:
                 aNm = ""
 
@@ -251,16 +234,16 @@ class ToHtml(Tokenizer):
                 lines.append(f"<p class='sep'{hStyle}>{tText}</p>\n")
 
             elif tType == BlockTyp.SKIP:
-                lines.append(f"<p class='skip'{hStyle}>&nbsp;</p>\n")
+                lines.append(f"<p{hStyle}>&nbsp;</p>\n")
 
             elif tType == BlockTyp.COMMENT:
                 lines.append(f"<p class='comment'{hStyle}>{self._formatText(tText, tFmt)}</p>\n")
 
             elif tType == BlockTyp.KEYWORD:
-                lines.append(f"<p class='meta'{hStyle}>{self._formatText(tText, tFmt)}</p>\n")
+                tClass = f"meta meta-{tMeta}"
+                lines.append(f"<p class='{tClass}'{hStyle}>{self._formatText(tText, tFmt)}</p>\n")
 
-        self._result = "".join(lines)
-        self._fullHTML.append(self._result)
+        self._pages.append("".join(lines))
 
         return
 
@@ -278,9 +261,7 @@ class ToHtml(Tokenizer):
                     lines.append(f"<li id='footnote_{index}'><p>{text}</p></li>\n")
             lines.append("</ol>\n")
 
-            result = "".join(lines)
-            self._result += result
-            self._fullHTML.append(result)
+            self._pages.append("".join(lines))
 
         return
 
@@ -297,7 +278,7 @@ class ToHtml(Tokenizer):
                 },
                 "text": {
                     "css": self.getStyleSheet(),
-                    "html": [t.replace("\t", "&#09;").rstrip().split("\n") for t in self.fullHTML],
+                    "html": [t.replace("\t", "&#09;").rstrip().split("\n") for t in self._pages],
                 }
             }
             with open(path, mode="w", encoding="utf-8") as fObj:
@@ -324,7 +305,7 @@ class ToHtml(Tokenizer):
                 ).format(
                     title=self._project.data.name,
                     style="\n".join(self.getStyleSheet()),
-                    body=("".join(self._fullHTML)).replace("\t", "&#09;").rstrip(),
+                    body=("".join(self._pages)).replace("\t", "&#09;").rstrip(),
                 ))
 
         logger.info("Wrote file: %s", path)
@@ -333,12 +314,11 @@ class ToHtml(Tokenizer):
 
     def replaceTabs(self, nSpaces: int = 8, spaceChar: str = "&nbsp;") -> None:
         """Replace tabs with spaces in the html."""
-        htmlText = []
+        pages = []
         tabSpace = spaceChar*nSpaces
-        for aLine in self._fullHTML:
-            htmlText.append(aLine.replace("\t", tabSpace))
-
-        self._fullHTML = htmlText
+        for aLine in self._pages:
+            pages.append(aLine.replace("\t", tabSpace))
+        self._pages = pages
         return
 
     def getStyleSheet(self) -> list[str]:
@@ -349,91 +329,54 @@ class ToHtml(Tokenizer):
         mScale = self._lineHeight/1.15
         tColor = self._theme.text.name(QtHexRgb)
         hColor = self._theme.head.name(QtHexRgb) if self._colorHeads else tColor
+        lColor = self._theme.head.name(QtHexRgb)
+        mColor = self._theme.highlight.name(QtHexRgb)
+
+        mtH0 = mScale * self._marginTitle[0]
+        mbH0 = mScale * self._marginTitle[1]
+        mtH1 = mScale * self._marginHead1[0]
+        mbH1 = mScale * self._marginHead1[1]
+        mtH2 = mScale * self._marginHead2[0]
+        mbH2 = mScale * self._marginHead2[1]
+        mtH3 = mScale * self._marginHead3[0]
+        mbH3 = mScale * self._marginHead3[1]
+        mtH4 = mScale * self._marginHead4[0]
+        mbH4 = mScale * self._marginHead4[1]
+        mtTT = mScale * self._marginText[0]
+        mbTT = mScale * self._marginText[1]
+        mtSP = mScale * self._marginSep[0]
+        mbSP = mScale * self._marginSep[1]
+
+        font = self._textFont
+        fFam = font.family()
+        fSz = font.pointSize()
+        fW = FONT_WEIGHTS.get(font.weight(), 400)
+        fS = FONT_STYLE.get(font.style(), "normal")
+
+        lHeight = round(100 * self._lineHeight)
 
         styles = []
-        font = self._textFont
-        styles.append((
-            "body {{"
-            "color: {0:s}; font-family: '{1:s}'; font-size: {2:d}pt; "
-            "font-weight: {3:d}; font-style: {4:s};"
-            "}}"
-        ).format(
-            tColor, font.family(), font.pointSize(),
-            FONT_WEIGHTS.get(font.weight(), 400),
-            FONT_STYLE.get(font.style(), "normal"),
-        ))
-        styles.append((
-            "p {{"
-            "text-align: {0}; line-height: {1:d}%; "
-            "margin-top: {2:.2f}em; margin-bottom: {3:.2f}em;"
-            "}}"
-        ).format(
-            self._defaultAlign,
-            round(100 * self._lineHeight),
-            mScale * self._marginText[0],
-            mScale * self._marginText[1],
-        ))
-        styles.append((
-            "h1 {{"
-            "color: {0:s}; "
-            "page-break-after: avoid; "
-            "margin-top: {1:.2f}em; "
-            "margin-bottom: {2:.2f}em;"
-            "}}"
-        ).format(
-            hColor, mScale * self._marginHead1[0], mScale * self._marginHead1[1]
-        ))
-        styles.append((
-            "h2 {{"
-            "color: {0:s}; "
-            "page-break-after: avoid; "
-            "margin-top: {1:.2f}em; "
-            "margin-bottom: {2:.2f}em;"
-            "}}"
-        ).format(
-            hColor, mScale * self._marginHead2[0], mScale * self._marginHead2[1]
-        ))
-        styles.append((
-            "h3 {{"
-            "color: {0:s}; "
-            "page-break-after: avoid; "
-            "margin-top: {1:.2f}em; "
-            "margin-bottom: {2:.2f}em;"
-            "}}"
-        ).format(
-            hColor, mScale * self._marginHead3[0], mScale * self._marginHead3[1]
-        ))
-        styles.append((
-            "h4 {{"
-            "color: {0:s}; "
-            "page-break-after: avoid; "
-            "margin-top: {1:.2f}em; "
-            "margin-bottom: {2:.2f}em;"
-            "}}"
-        ).format(
-            hColor, mScale * self._marginHead4[0], mScale * self._marginHead4[1]
-        ))
-        styles.append((
-            ".title {{"
-            "font-size: 2.5em; "
-            "margin-top: {0:.2f}em; "
-            "margin-bottom: {1:.2f}em;"
-            "}}"
-        ).format(
-            mScale * self._marginTitle[0], mScale * self._marginTitle[1]
-        ))
-        styles.append((
-            ".sep, .skip {{"
-            "text-align: center; "
-            "margin-top: {0:.2f}em; "
-            "margin-bottom: {1:.2f}em;"
-            "}}"
-        ).format(
-            mScale, mScale
-        ))
-
-        styles.append("a {{color: {0:s};}}".format(self._theme.head.name(QtHexRgb)))
-        styles.append("mark {{background: {0:s};}}".format(self._theme.highlight.name(QtHexRgb)))
+        styles.append(
+            f"body {{color: {tColor}; font-family: '{fFam}'; font-size: {fSz}pt; "
+            f"font-weight: {fW}; font-style: {fS};}}"
+        )
+        styles.append(
+            f"p {{text-align: {self._defaultAlign}; line-height: {lHeight}%; "
+            f"margin-top: {mtTT:.2f}em; margin-bottom: {mbTT:.2f}em;}}"
+        )
+        styles.append(f"a {{color: {lColor};}}")
+        styles.append(f"mark {{background: {mColor};}}")
+        styles.append(f"h1, h2, h3, h4 {{color: {hColor}; page-break-after: avoid;}}")
+        styles.append(f"h1 {{margin-top: {mtH1:.2f}em; margin-bottom: {mbH1:.2f}em;}}")
+        styles.append(f"h2 {{margin-top: {mtH2:.2f}em; margin-bottom: {mbH2:.2f}em;}}")
+        styles.append(f"h3 {{margin-top: {mtH3:.2f}em; margin-bottom: {mbH3:.2f}em;}}")
+        styles.append(f"h4 {{margin-top: {mtH4:.2f}em; margin-bottom: {mbH4:.2f}em;}}")
+        styles.append(
+            f".title {{font-size: 2.5em; margin-top: {mtH0:.2f}em; margin-bottom: {mbH0:.2f}em;}}"
+        )
+        styles.append(
+            f".sep {{text-align: center; margin-top: {mtSP:.2f}em; margin-bottom: {mbSP:.2f}em;}}"
+        )
 
         return styles
 
diff --git a/novelwriter/formats/tokenizer.py b/novelwriter/formats/tokenizer.py
index a6f67783..f01d6e85 100644
--- a/novelwriter/formats/tokenizer.py
+++ b/novelwriter/formats/tokenizer.py
@@ -24,21 +24,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-import json
 import logging
 import re
 
 from abc import ABC, abstractmethod
-from functools import partial
 from pathlib import Path
-from time import time
 from typing import NamedTuple
 
-from PyQt5.QtCore import QCoreApplication
 from PyQt5.QtGui import QColor, QFont
 
 from novelwriter import CONFIG
-from novelwriter.common import checkInt, formatTimeStamp, numberToRoman
+from novelwriter.common import checkInt, numberToRoman
 from novelwriter.constants import (
     nwHeadFmt, nwKeyWords, nwLabels, nwShortcode, nwStyles, nwUnicode, trConst
 )
@@ -60,6 +56,7 @@ class ComStyle(NamedTuple):
     textClass: str = ""
 
 
+B_EMPTY: T_Block = (BlockTyp.EMPTY, "", "", [], BlockFmt.NONE)
 COMMENT_STYLE = {
     nwComment.PLAIN:    ComStyle("Comment", "comment", "comment"),
     nwComment.IGNORE:   ComStyle(),
@@ -71,6 +68,13 @@ COMMENT_STYLE = {
     nwComment.STORY:    ComStyle("", "modifier", "note"),
 }
 
+# Lookups
+HEADINGS = [BlockTyp.TITLE, BlockTyp.HEAD1, BlockTyp.HEAD2, BlockTyp.HEAD3, BlockTyp.HEAD4]
+SKIP_INDENT = [
+    BlockTyp.TITLE, BlockTyp.HEAD1, BlockTyp.HEAD2, BlockTyp.HEAD2, BlockTyp.HEAD3,
+    BlockTyp.HEAD4, BlockTyp.SEP, BlockTyp.SKIP,
+]
+
 
 class Tokenizer(ABC):
     """Core: Text Tokenizer Abstract Base Class
@@ -81,18 +85,6 @@ class Tokenizer(ABC):
     subclasses.
     """
 
-    # Masks
-    M_ALIGNED = BlockFmt.LEFT | BlockFmt.RIGHT | BlockFmt.CENTRE | BlockFmt.JUSTIFY
-
-    # Lookups
-    L_HEADINGS = [
-        BlockTyp.TITLE, BlockTyp.HEAD1, BlockTyp.HEAD2, BlockTyp.HEAD3, BlockTyp.HEAD4,
-    ]
-    L_SKIP_INDENT = [
-        BlockTyp.TITLE, BlockTyp.HEAD1, BlockTyp.HEAD2, BlockTyp.HEAD2, BlockTyp.HEAD3,
-        BlockTyp.HEAD4, BlockTyp.SEP, BlockTyp.SKIP,
-    ]
-
     def __init__(self, project: NWProject) -> None:
 
         self._project = project
@@ -100,7 +92,6 @@ class Tokenizer(ABC):
         # Data Variables
         self._text    = ""     # The raw text to be tokenized
         self._handle  = None   # The item handle currently being processed
-        self._result  = ""     # The result of the last document
         self._keepRaw = False  # Whether to keep the raw text, used by ToRaw
 
         # Blocks and Meta Data (Per Document)
@@ -108,9 +99,10 @@ class Tokenizer(ABC):
         self._footnotes: dict[str, T_Note] = {}
 
         # Blocks and Meta Data (Per Instance)
+        self._raw: list[str] = []
+        self._pages: list[str] = []
         self._counts: dict[str, int] = {}
         self._outline: dict[str, str] = {}
-        self._markdown: list[str] = []
 
         # User Settings
         self._textFont     = QFont("Serif", 11)  # Output text font
@@ -183,7 +175,6 @@ class Tokenizer(ABC):
 
         # Function Mapping
         self._localLookup = self._project.localLookup
-        self.tr = partial(QCoreApplication.translate, "Tokenizer")
 
         # Format RegEx
         self._rxMarkdown = [
@@ -215,16 +206,6 @@ class Tokenizer(ABC):
     #  Properties
     ##
 
-    @property
-    def result(self) -> str:
-        """The result of the build process."""
-        return self._result
-
-    @property
-    def allMarkdown(self) -> list[str]:
-        """The combined novelWriter Markdown text."""
-        return self._markdown
-
     @property
     def textStats(self) -> dict[str, int]:
         """The collected stats about the text."""
@@ -487,10 +468,10 @@ class Tokenizer(ABC):
             title = f"{trNotes}: {tItem.itemName}"
             self._blocks = []
             self._blocks.append((
-                BlockTyp.TITLE, 1, title, [], textAlign
+                BlockTyp.TITLE, f"{self._handle}:T0001", title, [], textAlign
             ))
             if self._keepRaw:
-                self._markdown.append(f"#! {title}\n\n")
+                self._raw.append(f"#! {title}\n\n")
 
         return
 
@@ -538,6 +519,13 @@ class Tokenizer(ABC):
           4: The internal formatting map of the text, TxtFmt.*
           5: The formats of the block, BlockFmt.*
         """
+        # Cache Flags
+        isNovel = self._isNovel
+        keepRaw = self._keepRaw
+        doJustify = self._doJustify
+        indentFirst = self._indentFirst
+        firstIndent = self._firstIndent
+
         if self._isNovel:
             self._hFormatter.setHandle(self._handle)
 
@@ -545,18 +533,15 @@ class Tokenizer(ABC):
         breakNext = False
         tmpMarkdown = []
         tHandle = self._handle or ""
-        blocks: list[T_Block] = []
+        tBlocks: list[T_Block] = [B_EMPTY]
         for aLine in self._text.splitlines():
             sLine = aLine.strip().lower()
 
             # Check for blank lines
-            if len(sLine) == 0:
-                blocks.append((
-                    BlockTyp.EMPTY, nHead, "", [], BlockFmt.NONE
-                ))
-                if self._keepRaw:
+            if not sLine:
+                tBlocks.append(B_EMPTY)
+                if keepRaw:
                     tmpMarkdown.append("\n")
-
                 continue
 
             if breakNext:
@@ -580,20 +565,20 @@ class Tokenizer(ABC):
                     continue
 
                 elif sLine == "[vspace]":
-                    blocks.append(
-                        (BlockTyp.SKIP, nHead, "", [], sAlign)
+                    tBlocks.append(
+                        (BlockTyp.SKIP, "", "", [], sAlign)
                     )
                     continue
 
                 elif sLine.startswith("[vspace:") and sLine.endswith("]"):
                     nSkip = checkInt(sLine[8:-1], 0)
                     if nSkip >= 1:
-                        blocks.append(
-                            (BlockTyp.SKIP, nHead, "", [], sAlign)
+                        tBlocks.append(
+                            (BlockTyp.SKIP, "", "", [], sAlign)
                         )
                     if nSkip > 1:
-                        blocks += (nSkip - 1) * [
-                            (BlockTyp.SKIP, nHead, "", [], BlockFmt.NONE)
+                        tBlocks += (nSkip - 1) * [
+                            (BlockTyp.SKIP, "", "", [], BlockFmt.NONE)
                         ]
                     continue
 
@@ -612,22 +597,22 @@ class Tokenizer(ABC):
                 if cStyle == nwComment.PLAIN and not self._doComments:
                     continue
 
-                if self._doJustify and not sAlign & self.M_ALIGNED:
+                if doJustify and not sAlign & BlockFmt.ALIGNED:
                     sAlign |= BlockFmt.JUSTIFY
 
                 if cStyle in (nwComment.SYNOPSIS, nwComment.SHORT, nwComment.PLAIN):
                     bStyle = COMMENT_STYLE[cStyle]
                     tLine, tFmt = self._formatComment(bStyle, cKey, cText)
-                    blocks.append((
-                        BlockTyp.COMMENT, nHead, tLine, tFmt, sAlign
+                    tBlocks.append((
+                        BlockTyp.COMMENT, "", tLine, tFmt, sAlign
                     ))
-                    if self._keepRaw:
+                    if keepRaw:
                         tmpMarkdown.append(f"{aLine}\n")
 
                 elif cStyle == nwComment.FOOTNOTE:
                     tLine, tFmt = self._extractFormats(cText, skip=TextFmt.FNOTE)
                     self._footnotes[f"{tHandle}:{cKey}"] = (tLine, tFmt)
-                    if self._keepRaw:
+                    if keepRaw:
                         tmpMarkdown.append(f"{aLine}\n")
 
             elif aLine.startswith("@"):
@@ -636,16 +621,14 @@ class Tokenizer(ABC):
                 # Only valid keyword lines are parsed, and any ignored keywords
                 # are automatically skipped.
 
-                if not self._doKeywords:
-                    continue
-
-                tLine, tFmt = self._formatMeta(aLine)
-                if tLine:
-                    blocks.append((
-                        BlockTyp.KEYWORD, nHead, tLine, tFmt, sAlign
-                    ))
-                    if self._keepRaw:
-                        tmpMarkdown.append(f"{aLine}\n")
+                if self._doKeywords:
+                    tTag, tLine, tFmt = self._formatMeta(aLine)
+                    if tLine:
+                        tBlocks.append((
+                            BlockTyp.KEYWORD, tTag[1:], tLine, tFmt, sAlign
+                        ))
+                        if keepRaw:
+                            tmpMarkdown.append(f"{aLine}\n")
 
             elif aLine.startswith(("# ", "#! ")):
                 # Title or Partition Headings
@@ -663,7 +646,7 @@ class Tokenizer(ABC):
                 tType = BlockTyp.HEAD1 if isPlain else BlockTyp.TITLE
                 tStyle = BlockFmt.NONE if isPlain else self._titleStyle
                 sHide = self._hidePart if isPlain else False
-                if self._isNovel:
+                if isNovel:
                     if sHide:
                         tText = ""
                         tType = BlockTyp.EMPTY
@@ -677,10 +660,10 @@ class Tokenizer(ABC):
                         self._hFormatter.resetAll()
                     self._noSep = True
 
-                blocks.append((
-                    tType, nHead, tText, [], tStyle
+                tBlocks.append((
+                    tType, f"{tHandle}:T{nHead:04d}", tText, [], tStyle
                 ))
-                if self._keepRaw:
+                if keepRaw:
                     tmpMarkdown.append(f"{aLine}\n")
 
             elif aLine.startswith(("## ", "##! ")):
@@ -700,7 +683,7 @@ class Tokenizer(ABC):
                 tStyle = BlockFmt.NONE
                 sHide = self._hideChapter if isPlain else self._hideUnNum
                 tFormat = self._fmtChapter if isPlain else self._fmtUnNum
-                if self._isNovel:
+                if isNovel:
                     if isPlain:
                         self._hFormatter.incChapter()
                     if sHide:
@@ -712,10 +695,10 @@ class Tokenizer(ABC):
                     self._hFormatter.resetScene()
                     self._noSep = True
 
-                blocks.append((
-                    tType, nHead, tText, [], tStyle
+                tBlocks.append((
+                    tType, f"{tHandle}:T{nHead:04d}", tText, [], tStyle
                 ))
-                if self._keepRaw:
+                if keepRaw:
                     tmpMarkdown.append(f"{aLine}\n")
 
             elif aLine.startswith(("### ", "###! ")):
@@ -737,7 +720,7 @@ class Tokenizer(ABC):
                 tStyle = BlockFmt.NONE
                 sHide = self._hideScene if isPlain else self._hideHScene
                 tFormat = self._fmtScene if isPlain else self._fmtHScene
-                if self._isNovel:
+                if isNovel:
                     self._hFormatter.incScene()
                     if sHide:
                         tText = ""
@@ -753,10 +736,10 @@ class Tokenizer(ABC):
                             tStyle = BlockFmt.NONE if self._noSep else BlockFmt.CENTRE
                     self._noSep = False
 
-                blocks.append((
-                    tType, nHead, tText, [], tStyle
+                tBlocks.append((
+                    tType, f"{tHandle}:T{nHead:04d}", tText, [], tStyle
                 ))
-                if self._keepRaw:
+                if keepRaw:
                     tmpMarkdown.append(f"{aLine}\n")
 
             elif aLine.startswith("#### "):
@@ -771,7 +754,7 @@ class Tokenizer(ABC):
                 tText = aLine[5:].strip()
                 tType = BlockTyp.HEAD4
                 tStyle = BlockFmt.NONE
-                if self._isNovel:
+                if isNovel:
                     if self._hideSection:
                         tText = ""
                         tType = BlockTyp.EMPTY
@@ -783,10 +766,10 @@ class Tokenizer(ABC):
                             tType = BlockTyp.SEP
                             tStyle = BlockFmt.CENTRE
 
-                blocks.append((
-                    tType, nHead, tText, [], tStyle
+                tBlocks.append((
+                    tType, f"{tHandle}:T{nHead:04d}", tText, [], tStyle
                 ))
-                if self._keepRaw:
+                if keepRaw:
                     tmpMarkdown.append(f"{aLine}\n")
 
             else:
@@ -830,56 +813,47 @@ class Tokenizer(ABC):
                     sAlign |= BlockFmt.IND_R
 
                 # Process formats
-                tLine, tFmt = self._extractFormats(aLine, hDialog=self._isNovel)
-                blocks.append((
-                    BlockTyp.TEXT, nHead, tLine, tFmt, sAlign
+                tLine, tFmt = self._extractFormats(aLine, hDialog=isNovel)
+                tBlocks.append((
+                    BlockTyp.TEXT, "", tLine, tFmt, sAlign
                 ))
-                if self._keepRaw:
+                if keepRaw:
                     tmpMarkdown.append(f"{aLine}\n")
 
         # If we have content, turn off the first page flag
-        if self._isFirst and blocks:
+        if self._isFirst and len(tBlocks) > 1:
             self._isFirst = False  # First document has been processed
 
             # Make sure the blocks array doesn't start with a page break
             # on the very first page, adding a blank first page.
-            if blocks[0][4] & BlockFmt.PBB:
-                cBlock = blocks[0]
-                blocks[0] = (
+            if (cBlock := tBlocks[1])[4] & BlockFmt.PBB:
+                tBlocks[1] = (
                     cBlock[0], cBlock[1], cBlock[2], cBlock[3], cBlock[4] & ~BlockFmt.PBB
                 )
 
         # Always add an empty line at the end of the file
-        blocks.append((
-            BlockTyp.EMPTY, nHead, "", [], BlockFmt.NONE
-        ))
-        if self._keepRaw:
+        tBlocks.append(B_EMPTY)
+        if keepRaw:
             tmpMarkdown.append("\n")
-            self._markdown.append("".join(tmpMarkdown))
+            self._raw.append("".join(tmpMarkdown))
 
         # Second Pass
         # ===========
         # This second pass strips away consecutive blank lines, and
         # combines consecutive text lines into the same paragraph.
         # It also ensures that there isn't paragraph spacing between
-        # meta data lines for formats that has spacing.
-
-        self._blocks = []
-        pBlock: T_Block = (BlockTyp.EMPTY, 0, "", [], BlockFmt.NONE)
-        nBlock: T_Block = (BlockTyp.EMPTY, 0, "", [], BlockFmt.NONE)
+        # meta data lines for formats that have spacing.
 
         lineSep = "\n" if self._keepBreaks else " "
+
         pLines: list[T_Block] = []
+        sBlocks: list[T_Block] = []
+        for n, cBlock in enumerate(tBlocks[1:-1], 1):
 
-        tCount = len(blocks)
-        for n, cBlock in enumerate(blocks):
+            pBlock = tBlocks[n-1]  # Look behind
+            nBlock = tBlocks[n+1]  # Look ahead
 
-            if n > 0:
-                pBlock = blocks[n-1]  # Look behind
-            if n < tCount - 1:
-                nBlock = blocks[n+1]  # Look ahead
-
-            if cBlock[0] in self.L_SKIP_INDENT and not self._indentFirst:
+            if cBlock[0] in SKIP_INDENT and not indentFirst:
                 # Unless the indentFirst flag is set, we set up the next
                 # paragraph to not be indented if we see a block of a
                 # specific type
@@ -893,10 +867,10 @@ class Tokenizer(ABC):
                 # Adjust margins for lines in a list of keyword lines
                 aStyle = cBlock[4]
                 if pBlock[0] == BlockTyp.KEYWORD:
-                    aStyle |= BlockFmt.Z_TOPMRG
+                    aStyle |= BlockFmt.Z_TOP
                 if nBlock[0] == BlockTyp.KEYWORD:
-                    aStyle |= BlockFmt.Z_BTMMRG
-                self._blocks.append((
+                    aStyle |= BlockFmt.Z_BTM
+                sBlocks.append((
                     cBlock[0], cBlock[1], cBlock[2], cBlock[3], aStyle
                 ))
 
@@ -908,7 +882,7 @@ class Tokenizer(ABC):
                     # Next block is not text, so we add the buffer to blocks
                     nLines = len(pLines)
                     cStyle = pLines[0][4]
-                    if self._firstIndent and not (self._noIndent or cStyle & self.M_ALIGNED):
+                    if firstIndent and not (self._noIndent or cStyle & BlockFmt.ALIGNED):
                         # If paragraph indentation is enabled, not temporarily
                         # turned off, and the block is not aligned, we add the
                         # text indentation flag
@@ -918,9 +892,9 @@ class Tokenizer(ABC):
                         # The paragraph contains a single line, so we just save
                         # that directly to the blocks list. If justify is
                         # enabled, and there is no alignment, we apply it.
-                        if self._doJustify and not cStyle & self.M_ALIGNED:
+                        if doJustify and not cStyle & BlockFmt.ALIGNED:
                             cStyle |= BlockFmt.JUSTIFY
-                        self._blocks.append((
+                        sBlocks.append((
                             BlockTyp.TEXT, pLines[0][1], pLines[0][2], pLines[0][3], cStyle
                         ))
                     elif nLines > 1:
@@ -933,7 +907,7 @@ class Tokenizer(ABC):
                             tLen = len(tTxt)
                             tTxt += f"{aBlock[2]}{lineSep}"
                             tFmt.extend((p+tLen, fmt, key) for p, fmt, key in aBlock[3])
-                        self._blocks.append((
+                        sBlocks.append((
                             BlockTyp.TEXT, pLines[0][1], tTxt[:-1], tFmt, cStyle
                         ))
 
@@ -942,15 +916,16 @@ class Tokenizer(ABC):
                     self._noIndent = False
 
             else:
-                self._blocks.append(cBlock)
+                sBlocks.append(cBlock)
+
+        self._blocks = sBlocks
 
         return
 
     def buildOutline(self) -> None:
         """Build an outline of the text up to level 3 headings."""
-        tHandle = self._handle or ""
         isNovel = self._isNovel
-        for tType, nHead, tText, _, _ in self._blocks:
+        for tType, tKey, tText, _, _ in self._blocks:
             if tType == BlockTyp.TITLE:
                 prefix = "TT"
             elif tType == BlockTyp.HEAD1:
@@ -962,9 +937,8 @@ class Tokenizer(ABC):
             else:
                 continue
 
-            key = f"{tHandle}:T{nHead:04d}"
             text = tText.replace(nwHeadFmt.BR, " ").replace("&amp;", "&")
-            self._outline[key] = f"{prefix}|{text}"
+            self._outline[tKey] = f"{prefix}|{text}"
 
         return
 
@@ -1008,7 +982,7 @@ class Tokenizer(ABC):
                 allWordChars += nPWChars
                 textWordChars += nPWChars
 
-            elif tType in self.L_HEADINGS:
+            elif tType in HEADINGS:
                 titleCount += 1
                 allWords += nWords
                 titleWords += nWords
@@ -1045,33 +1019,6 @@ class Tokenizer(ABC):
 
         return
 
-    def saveRawDocument(self, path: str | Path, asJson: bool = False) -> None:
-        """Save the raw text to a plain text file."""
-        if asJson:
-            ts = time()
-            data = {
-                "meta": {
-                    "projectName": self._project.data.name,
-                    "novelAuthor": self._project.data.author,
-                    "buildTime": int(ts),
-                    "buildTimeStr": formatTimeStamp(ts),
-                },
-                "text": {
-                    "nwd": [page.rstrip("\n").split("\n") for page in self._markdown],
-                }
-            }
-            with open(path, mode="w", encoding="utf-8") as fObj:
-                json.dump(data, fObj, indent=2)
-
-        else:
-            with open(path, mode="w", encoding="utf-8") as outFile:
-                for nwdPage in self._markdown:
-                    outFile.write(nwdPage)
-
-        logger.info("Wrote file: %s", path)
-
-        return
-
     ##
     #  Internal Functions
     ##
@@ -1087,22 +1034,26 @@ class Tokenizer(ABC):
             rFmt = [(0, TextFmt.B_B, ""), (shift - 1, TextFmt.B_E, "")]
             if style.labelClass:
                 rFmt.insert(1, (0, TextFmt.COL_B, style.labelClass))
-                rFmt.append((shift - 1, TextFmt.COL_E, ""))
+                rFmt.insert(2, (shift - 1, TextFmt.COL_E, ""))
             rFmt.extend((p + shift, f, d) for p, f, d in tFmt)
         return tTxt, rFmt
 
-    def _formatMeta(self, text: str) -> tuple[str, T_Formats]:
-        """Parse a meta line into a """
+    def _formatMeta(self, text: str) -> tuple[str, str, T_Formats]:
+        """Apply formatting to a meta data line."""
+        tag = ""
         txt = []
         fmt = []
         valid, bits, _ = self._project.index.scanThis(text)
         if valid and bits and bits[0] in nwLabels.KEY_NAME and bits[0] not in self._skipKeywords:
+            tag = bits[0]
             pos = 0
-            lbl = f"{self._localLookup(nwLabels.KEY_NAME[bits[0]])}:"
+            lbl = f"{self._localLookup(nwLabels.KEY_NAME[tag])}:"
             end = len(lbl)
             fmt = [
-                (pos, TextFmt.B_B, ""), (pos, TextFmt.COL_B, "keyword"),
-                (end, TextFmt.B_E, ""), (end, TextFmt.COL_E, ""),
+                (pos, TextFmt.B_B, ""),
+                (pos, TextFmt.COL_B, "keyword"),
+                (end, TextFmt.COL_E, ""),
+                (end, TextFmt.B_E, ""),
             ]
             txt = [lbl, " "]
             pos = end + 1
@@ -1138,7 +1089,7 @@ class Tokenizer(ABC):
                             txt.append(", ")
                             pos += 2
 
-        return "".join(txt), fmt
+        return tag, "".join(txt), fmt
 
     def _extractFormats(
         self, text: str, skip: int = 0, hDialog: bool = False
diff --git a/novelwriter/formats/tomarkdown.py b/novelwriter/formats/tomarkdown.py
index e4e30ac3..198b7e7a 100644
--- a/novelwriter/formats/tomarkdown.py
+++ b/novelwriter/formats/tomarkdown.py
@@ -84,32 +84,20 @@ class ToMarkdown(Tokenizer):
 
     def __init__(self, project: NWProject, extended: bool) -> None:
         super().__init__(project)
-        self._fullMD: list[str] = []
-        self._usedNotes: dict[str, int] = {}
         self._extended = extended
+        self._usedNotes: dict[str, int] = {}
         return
 
-    ##
-    #  Properties
-    ##
-
-    @property
-    def fullMD(self) -> list[str]:
-        """Return the markdown as a list."""
-        return self._fullMD
-
     ##
     #  Class Methods
     ##
 
     def getFullResultSize(self) -> int:
         """Return the size of the full Markdown result."""
-        return sum(len(x) for x in self._fullMD)
+        return sum(len(x) for x in self._pages)
 
     def doConvert(self) -> None:
         """Convert the list of text tokens into a Markdown document."""
-        self._result = ""
-
         if self._extended:
             mTags = EXT_MD
             cSkip = nwUnicode.U_MMSP
@@ -154,11 +142,10 @@ class ToMarkdown(Tokenizer):
                 lines.append(f"{self._formatText(tText, tFormat, mTags)}\n\n")
 
             elif tType == BlockTyp.KEYWORD:
-                end = "  \n" if tStyle & BlockFmt.Z_BTMMRG else "\n\n"
+                end = "  \n" if tStyle & BlockFmt.Z_BTM else "\n\n"
                 lines.append(f"{self._formatText(tText, tFormat, mTags)}{end}")
 
-        self._result = "".join(lines)
-        self._fullMD.append(self._result)
+        self._pages.append("".join(lines))
 
         return
 
@@ -176,24 +163,21 @@ class ToMarkdown(Tokenizer):
                     text = self._formatText(content[0], content[1], tags)
                     lines.append(f"{marker}{text}\n")
             lines.append("\n")
-
-            result = "".join(lines)
-            self._result += result
-            self._fullMD.append(result)
+            self._pages.append("".join(lines))
 
         return
 
     def saveDocument(self, path: Path) -> None:
         """Save the data to a plain text file."""
         with open(path, mode="w", encoding="utf-8") as outFile:
-            outFile.write("".join(self._fullMD))
+            outFile.write("".join(self._pages))
         logger.info("Wrote file: %s", path)
         return
 
     def replaceTabs(self, nSpaces: int = 8, spaceChar: str = " ") -> None:
         """Replace tabs with spaces."""
         spaces = spaceChar*nSpaces
-        self._fullMD = [p.replace("\t", spaces) for p in self._fullMD]
+        self._pages = [p.replace("\t", spaces) for p in self._pages]
         return
 
     ##
diff --git a/novelwriter/formats/toodt.py b/novelwriter/formats/toodt.py
index a6d7f000..b4b61807 100644
--- a/novelwriter/formats/toodt.py
+++ b/novelwriter/formats/toodt.py
@@ -152,10 +152,8 @@ class ToOdt(Tokenizer):
         self._autoPara: dict[str, ODTParagraphStyle] = {}  # Auto-generated paragraph styles
         self._autoText: dict[str, ODTTextStyle] = {}       # Auto-generated text styles
 
-        # Footnotes
+        # Storage
         self._nNote = 0
-        self._etNotes: dict[str, ET.Element] = {}  # Generated note elements
-
         self._errData = []  # List of errors encountered
 
         # Properties
@@ -405,8 +403,6 @@ class ToOdt(Tokenizer):
 
     def doConvert(self) -> None:
         """Convert the list of text tokens into XML elements."""
-        self._result = ""  # Not used, but cleared just in case
-
         xText = self._xText
         for tType, _, tText, tFormat, tStyle in self._blocks:
 
@@ -427,9 +423,9 @@ class ToOdt(Tokenizer):
                 if tStyle & BlockFmt.PBA:
                     oStyle.setBreakAfter("page")
 
-                if tStyle & BlockFmt.Z_BTMMRG:
+                if tStyle & BlockFmt.Z_BTM:
                     oStyle.setMarginBottom("0.000cm")
-                if tStyle & BlockFmt.Z_TOPMRG:
+                if tStyle & BlockFmt.Z_TOP:
                     oStyle.setMarginTop("0.000cm")
 
                 if tStyle & BlockFmt.IND_L:
@@ -678,7 +674,6 @@ class ToOdt(Tokenizer):
         tKey = str(hFmt)
         if fClass and (color := self._classes.get(fClass)):
             tKey = f"{tKey}:{fClass}"
-
         if tKey in self._autoText:
             return self._autoText[tKey].name
 
@@ -1089,16 +1084,6 @@ class ODTParagraphStyle:
     def name(self) -> str:
         return self._name
 
-    ##
-    #  Checkers
-    ##
-
-    def isUnaligned(self) -> bool:
-        """Check if paragraph has any sort of alignment or margins."""
-        return all(
-            self._pAttr[n][1] is None for n in ["text-align", "margin-left", "margin-right"]
-        )
-
     ##
     #  Setters
     ##
diff --git a/novelwriter/formats/toqdoc.py b/novelwriter/formats/toqdoc.py
index 30ee9337..5c478276 100644
--- a/novelwriter/formats/toqdoc.py
+++ b/novelwriter/formats/toqdoc.py
@@ -37,7 +37,7 @@ from PyQt5.QtPrintSupport import QPrinter
 from novelwriter.constants import nwHeadFmt, nwStyles, nwUnicode
 from novelwriter.core.project import NWProject
 from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt
-from novelwriter.formats.tokenizer import Tokenizer
+from novelwriter.formats.tokenizer import HEADINGS, Tokenizer
 from novelwriter.types import (
     QtAlignAbsolute, QtAlignCenter, QtAlignJustify, QtAlignLeft, QtAlignRight,
     QtPageBreakAfter, QtPageBreakBefore, QtTransparent, QtVAlignNormal,
@@ -69,7 +69,6 @@ class ToQTextDocument(Tokenizer):
         self._document.setUndoRedoEnabled(False)
         self._document.setDocumentMargin(0)
 
-        self._styles: dict[int, T_TextStyle] = {}
         self._usedNotes: dict[str, int] = {}
 
         self._init = False
@@ -149,13 +148,13 @@ class ToQTextDocument(Tokenizer):
         # Text Formats
         # ============
 
+        QtPropLineHeight = QTextBlockFormat.LineHeightTypes.ProportionalHeight
+
         self._blockFmt = QTextBlockFormat()
         self._blockFmt.setTopMargin(self._mText[0])
         self._blockFmt.setBottomMargin(self._mText[1])
         self._blockFmt.setAlignment(QtAlignAbsolute)
-        self._blockFmt.setLineHeight(
-            100*self._lineHeight, QTextBlockFormat.LineHeightTypes.ProportionalHeight
-        )
+        self._blockFmt.setLineHeight(100.0*self._lineHeight, QtPropLineHeight)
 
         self._charFmt = QTextCharFormat()
         self._charFmt.setBackground(QtTransparent)
@@ -174,9 +173,8 @@ class ToQTextDocument(Tokenizer):
         cursor = QTextCursor(self._document)
         cursor.movePosition(QTextCursor.MoveOperation.End)
 
-        for tType, nHead, tText, tFormat, tStyle in self._blocks:
+        for tType, tMeta, tText, tFormat, tStyle in self._blocks:
 
-            # Styles
             bFmt = QTextBlockFormat(self._blockFmt)
             if tType in (BlockTyp.COMMENT, BlockTyp.KEYWORD):
                 bFmt.setTopMargin(self._mMeta[0])
@@ -200,9 +198,9 @@ class ToQTextDocument(Tokenizer):
                 if tStyle & BlockFmt.PBA:
                     bFmt.setPageBreakPolicy(QtPageBreakAfter)
 
-                if tStyle & BlockFmt.Z_BTMMRG:
+                if tStyle & BlockFmt.Z_BTM:
                     bFmt.setBottomMargin(0.0)
-                if tStyle & BlockFmt.Z_TOPMRG:
+                if tStyle & BlockFmt.Z_TOP:
                     bFmt.setTopMargin(0.0)
 
                 if tStyle & BlockFmt.IND_L:
@@ -216,8 +214,8 @@ class ToQTextDocument(Tokenizer):
                 newBlock(cursor, bFmt)
                 self._insertFragments(tText, tFormat, cursor, self._charFmt)
 
-            elif tType in self.L_HEADINGS:
-                bFmt, cFmt = self._genHeadStyle(tType, nHead, bFmt)
+            elif tType in HEADINGS:
+                bFmt, cFmt = self._genHeadStyle(tType, tMeta, bFmt)
                 newBlock(cursor, bFmt)
                 cursor.insertText(tText.replace(nwHeadFmt.BR, "\n"), cFmt)
 
@@ -234,7 +232,7 @@ class ToQTextDocument(Tokenizer):
         return
 
     def saveDocument(self, path: Path) -> None:
-        """Save the document to a PDF file."""
+        """Save the document as a PDF file."""
         m = self._pageMargins
 
         printer = QPrinter(QPrinter.PrinterMode.PrinterResolution)
@@ -256,7 +254,7 @@ class ToQTextDocument(Tokenizer):
             cursor = QTextCursor(self._document)
             cursor.movePosition(QTextCursor.MoveOperation.End)
 
-            bFmt, cFmt = self._genHeadStyle(BlockTyp.HEAD4, -1, self._blockFmt)
+            bFmt, cFmt = self._genHeadStyle(BlockTyp.HEAD4, "", self._blockFmt)
             newBlock(cursor, bFmt)
             cursor.insertText(self._localLookup("Footnotes"), cFmt)
 
@@ -358,7 +356,7 @@ class ToQTextDocument(Tokenizer):
 
         return
 
-    def _genHeadStyle(self, hType: BlockTyp, nHead: int, rFmt: QTextBlockFormat) -> T_TextStyle:
+    def _genHeadStyle(self, hType: BlockTyp, hKey: str, rFmt: QTextBlockFormat) -> T_TextStyle:
         """Generate a heading style set."""
         mTop, mBottom = self._mHead.get(hType, (0.0, 0.0))
 
@@ -366,16 +364,13 @@ class ToQTextDocument(Tokenizer):
         bFmt.setTopMargin(mTop)
         bFmt.setBottomMargin(mBottom)
 
-        self._cTitle = QTextCharFormat(self._charFmt)
-        self._cTitle.setFontWeight(self._bold if self._boldHeads else self._normal)
-
         hCol = self._colorHeads and hType != BlockTyp.TITLE
         cFmt = QTextCharFormat(self._charFmt)
         cFmt.setForeground(self._theme.head if hCol else self._theme.text)
         cFmt.setFontWeight(self._bold if self._boldHeads else self._normal)
         cFmt.setFontPointSize(self._sHead.get(hType, 1.0))
-        if nHead >= 0:
-            cFmt.setAnchorNames([f"{self._handle}:T{nHead:04d}"])
+        if hKey:
+            cFmt.setAnchorNames([hKey])
             cFmt.setAnchor(True)
 
         return bFmt, cFmt
diff --git a/novelwriter/formats/toraw.py b/novelwriter/formats/toraw.py
index d1c701b1..8e1ed47e 100644
--- a/novelwriter/formats/toraw.py
+++ b/novelwriter/formats/toraw.py
@@ -64,7 +64,7 @@ class ToRaw(Tokenizer):
                     "buildTimeStr": formatTimeStamp(ts),
                 },
                 "text": {
-                    "nwd": [page.rstrip("\n").split("\n") for page in self._markdown],
+                    "nwd": [page.rstrip("\n").split("\n") for page in self._raw],
                 }
             }
             with open(path, mode="w", encoding="utf-8") as fObj:
@@ -72,7 +72,7 @@ class ToRaw(Tokenizer):
 
         else:
             with open(path, mode="w", encoding="utf-8") as outFile:
-                for nwdPage in self._markdown:
+                for nwdPage in self._raw:
                     outFile.write(nwdPage)
 
         logger.info("Wrote file: %s", path)
@@ -82,5 +82,5 @@ class ToRaw(Tokenizer):
     def replaceTabs(self, nSpaces: int = 8, spaceChar: str = " ") -> None:
         """Replace tabs with spaces."""
         spaces = spaceChar*nSpaces
-        self._markdown = [p.replace("\t", spaces) for p in self._markdown]
+        self._raw = [p.replace("\t", spaces) for p in self._raw]
         return
diff --git a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm
index 2f4b9a3c..950562ca 100644
--- a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm
+++ b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm
@@ -7,14 +7,15 @@
 <style>
 body {color: #000000; font-family: 'Arial'; font-size: 12pt; font-weight: 400; font-style: normal;}
 p {text-align: left; line-height: 150%; margin-top: 0.00em; margin-bottom: 0.76em;}
-h1 {color: #4271ae; page-break-after: avoid; margin-top: 1.85em; margin-bottom: 0.65em;}
-h2 {color: #4271ae; page-break-after: avoid; margin-top: 2.18em; margin-bottom: 0.65em;}
-h3 {color: #4271ae; page-break-after: avoid; margin-top: 1.53em; margin-bottom: 0.65em;}
-h4 {color: #4271ae; page-break-after: avoid; margin-top: 1.53em; margin-bottom: 0.65em;}
-.title {font-size: 2.5em; margin-top: 1.85em; margin-bottom: 0.65em;}
-.sep, .skip {text-align: center; margin-top: 1.30em; margin-bottom: 1.30em;}
 a {color: #4271ae;}
 mark {background: #ffffa6;}
+h1, h2, h3, h4 {color: #4271ae; page-break-after: avoid;}
+h1 {margin-top: 1.85em; margin-bottom: 0.65em;}
+h2 {margin-top: 2.18em; margin-bottom: 0.65em;}
+h3 {margin-top: 1.53em; margin-bottom: 0.65em;}
+h4 {margin-top: 1.53em; margin-bottom: 0.65em;}
+.title {font-size: 2.5em; margin-top: 1.85em; margin-bottom: 0.65em;}
+.sep {text-align: center; margin-top: 1.53em; margin-bottom: 1.53em;}
 </style>
 <body>
 <article>
@@ -22,35 +23,35 @@ mark {background: #ffffa6;}
 <p style='text-align: center;'><strong>By lipsum.com</strong></p>
 <p style='text-align: center;'>“Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…”</p>
 <p style='text-align: center;'>“There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain…”</p>
-<p class='comment' style='text-align: justify; page-break-before: always;'><strong><span style='color: #646464'>Comment:</strong></span> <span style='color: #646464'>Exctracted from the lipsum.com website.</span></p>
+<p class='comment' style='text-align: justify; page-break-before: always;'><strong><span style='color: #646464'>Comment:</span></strong> <span style='color: #646464'>Exctracted from the lipsum.com website.</span></p>
 <p style='text-align: justify; text-indent: 1.40em;'>Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of “de Finibus Bonorum et Malorum” (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, “Lorem ipsum dolor sit amet..”, comes from a line in section 1.10.32.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from “de Finibus Bonorum et Malorum” by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.</p>
 <h1 style='page-break-before: always;'>Prologue</h1>
-<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Explanation from the lipsum.com website.</span></p>
+<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Explanation from the lipsum.com website.</span></p>
 <p style='text-align: justify;'><em>Lorem Ipsum</em> is simply dummy text<sup><a href='#footnote_1'>1</a></sup> of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</p>
 <h1 class='title' style='text-align: center; page-break-before: always;'>Part: Act One</h1>
 <p style='text-align: center;'>“Fusce maximus felis libero”</p>
 <h1 style='page-break-before: always;'>Chapter: Chapter One</h1>
-<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
-<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
-<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
-<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam.</span></p>
+<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
+<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
+<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
+<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam.</span></p>
 <p style='text-align: justify;'>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam. Praesent magna nunc, lacinia sit amet quam eget, aliquet ultrices justo. Morbi ornare enim et lorem rutrum finibus ut eu dolor. Aliquam a orci odio. Ut ultrices sem quis massa placerat, eget mollis nisl cursus. Cras vel sagittis justo. Ut non ultricies leo. Maecenas rutrum velit in est varius, et egestas massa pulvinar.</p>
 <h2>Scene: Scene One</h2>
-<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
-<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
-<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
-<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur.</span></p>
+<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
+<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
+<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
+<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur.</span></p>
 <p style='text-align: justify;'>Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur. Donec quis ante nunc. Mauris ut leo ipsum. Vestibulum est neque, hendrerit nec neque a, ullamcorper lobortis tellus. Fusce sollicitudin purus quis congue bibendum. Aliquam condimentum ipsum tristique blandit tristique. Donec pulvinar neque ac suscipit malesuada.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Aliquam ut nisl arcu. Ut ultricies, lorem dignissim rutrum convallis, risus orci tempus lectus, congue feugiat sem lectus vitae odio. Duis sit amet justo finibus, hendrerit nulla at, ullamcorper enim. Praesent vel tellus sit amet tellus vulputate bibendum. Morbi eleifend sagittis sem, ac volutpat ante congue non. In hac habitasse platea dictumst. Morbi lobortis fermentum elit, dignissim sagittis ligula volutpat lacinia. Vestibulum eu interdum odio. Integer ac purus commodo metus congue tempor non at urna. Sed eget tortor vel quam viverra egestas. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec non convallis mauris, ac feugiat ex.</p>
 <h3>Section: Scene One, Section Two</h3>
 <p style='text-align: justify;'>Integer vel libero ipsum. Donec varius aliquam libero, sit amet commodo urna hendrerit non. Nullam quis erat mollis nunc viverra volutpat tincidunt in odio. Nam vitae quam sem. Aliquam suscipit nulla non lorem pharetra semper. Ut suscipit erat eu ligula accumsan ultrices. Phasellus nisl tellus, placerat sed laoreet id, consectetur nec dolor. Sed fringilla ipsum id dapibus posuere. Aenean finibus pharetra tincidunt. Ut molestie malesuada nulla, id posuere lorem tincidunt eu. Aliquam tempor eros a est vulputate, scelerisque pulvinar ipsum fermentum. In hac habitasse platea dictumst.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Curabitur congue, justo quis interdum fermentum, tellus nulla imperdiet sapien, eu interdum enim tellus condimentum metus. Vivamus nunc velit, dignissim ut ultrices sit amet, ultricies quis enim. Donec ut vestibulum neque. Vivamus semper neque id ex ullamcorper varius. Fusce mattis nibh viverra lorem sagittis, et tempor arcu congue. Suspendisse sit amet felis sed urna facilisis mattis eget vitae arcu. Proin eu magna hendrerit, tristique sem maximus, placerat diam. Nulla tristique sed velit sit amet varius. Etiam vel ornare magna, in vulputate arcu. Cras velit orci, tincidunt sed volutpat cursus, bibendum vel sem. Nunc vulputate pharetra tortor, ac consectetur neque tincidunt sit amet. Nulla ornare mi sed mi dignissim ultricies. Ut tincidunt bibendum mauris, sed elementum ex vulputate vel. Mauris fermentum, felis nec vehicula congue, felis lorem facilisis erat, a dictum dolor augue vitae quam. Maecenas rutrum tortor nec consequat eleifend.</p>
 <h2>Scene: Scene Two</h2>
-<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
-<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
-<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
-<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci.</span></p>
+<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
+<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
+<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
+<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci.</span></p>
 <p style='text-align: justify;'>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. Vestibulum facilisis bibendum aliquam. Aliquam posuere, turpis ac bibendum varius, sem tellus venenatis risus, in elementum massa enim ac lorem. Integer in sem ac diam blandit ultricies ut in nulla. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam sit amet erat est. Curabitur vitae cursus justo, sit amet placerat dolor. Vivamus eu felis hendrerit, tincidunt massa rutrum, maximus arcu. Pellentesque commodo justo odio, vel rutrum nulla tincidunt eu. Integer non neque condimentum, convallis diam non, varius ligula. Aliquam eget sapien mauris. Aenean pharetra nunc nisi, vel maximus ante tristique sit amet. Aliquam risus metus, interdum non odio eu, consectetur lacinia sapien.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Proin vitae gravida nisl. Integer viverra orci turpis, sit amet pretium ligula facilisis consequat. Nulla interdum commodo metus, mollis consequat dui tincidunt et. Proin consequat bibendum justo id commodo. Fusce fermentum nunc turpis, eu vestibulum risus feugiat ut. Sed scelerisque vel ligula ut interdum. Suspendisse ac blandit ligula, sagittis fringilla dolor. In tincidunt convallis diam et ornare. Aenean id dignissim est, ut rhoncus quam. Donec vitae nisl velit. In convallis nibh ut augue dignissim, eu elementum quam cursus. Phasellus in lectus lorem. Curabitur in pellentesque nisi, at gravida sapien. Sed cursus justo volutpat lacus placerat, sit amet dignissim turpis commodo. Aliquam vitae orci eget nulla posuere condimentum in ut felis.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Nulla accumsan ante in pulvinar efficitur. Nulla non velit quis urna hendrerit bibendum. Suspendisse ultrices ante eu justo malesuada, sed fermentum enim rutrum. Nunc fermentum pharetra felis, vitae sollicitudin quam rutrum porta. Aliquam fringilla velit a mi laoreet, et luctus est rutrum. In gravida non ipsum sit amet tempus. Curabitur et eleifend purus. Nulla facilisi.</p>
@@ -59,30 +60,30 @@ mark {background: #ffffa6;}
 <p style='text-align: justify; text-indent: 1.40em;'>Vivamus ut venenatis lectus. Phasellus nec elit id sem dictum ornare. Quisque feugiat, diam eget sagittis ultricies, orci turpis efficitur nisi, et fringilla justo odio nec nibh. In hac habitasse platea dictumst. Sed tempus bibendum feugiat. Etiam luctus mauris arcu, non interdum ipsum ultrices id. Vivamus blandit urna sit amet scelerisque vulputate. Quisque in metus eget massa rutrum dictum sit amet sed nulla. Vivamus vel efficitur dolor.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Ut et consequat enim, quis ornare nibh. In lectus neque, mollis et suscipit et, vestibulum vitae augue. Praesent id ante sit amet odio venenatis placerat a at erat. Sed sed metus sed nisi dictum varius. Integer tincidunt fermentum purus ac porta. Fusce porttitor non risus eget tristique. Donec augue nunc, maximus at fermentum vel, varius et neque. Ut sed consectetur mauris. Quisque ipsum enim, porttitor vitae imperdiet sit amet, tempor et mauris. Aliquam malesuada tincidunt lectus quis blandit. Sed commodo orci felis, quis ultrices tellus facilisis sed. Nunc vel varius est. Duis ullamcorper eu metus in pulvinar. Morbi at sapien dictum, rutrum mauris eget, interdum tellus.</p>
 <h1 style='page-break-before: always;'>Why do we use it?</h1>
-<p class='comment' style='text-align: justify;'><strong><span style='color: #646464'>Comment:</strong></span> <span style='color: #646464'>Exctracted from the lipsum.com website.</span></p>
+<p class='comment' style='text-align: justify;'><strong><span style='color: #646464'>Comment:</span></strong> <span style='color: #646464'>Exctracted from the lipsum.com website.</span></p>
 <p style='text-align: justify;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like).</p>
 <h1 style='page-break-before: always;'>Chapter: Chapter Two</h1>
-<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
-<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
-<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
-<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue.</span></p>
+<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
+<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
+<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
+<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue.</span></p>
 <p style='text-align: justify;'>Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue. Vestibulum pharetra fermentum leo, sed faucibus eros placerat quis. In hac habitasse platea dictumst. Donec metus massa, rutrum quis consequat et, tincidunt ac felis. Duis mollis metus ac nunc tincidunt blandit. Ut aliquet velit eu odio pharetra condimentum. Integer rutrum lacus orci, id venenatis libero accumsan at.</p>
 <h2>Scene: Scene Three</h2>
-<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
-<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
-<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
-<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</span></p>
+<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
+<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
+<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
+<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</span></p>
 <p style='text-align: justify;'>Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean tincidunt lacus vitae nibh elementum eleifend. Sed rutrum condimentum sem quis blandit. Duis imperdiet libero metus, quis convallis quam faucibus a. Nulla ligula est, semper quis sollicitudin et, pretium id justo. Curabitur pharetra risus eget consectetur commodo. Duis mattis arcu non est condimentum, id venenatis risus volutpat. Pellentesque aliquet mauris non mauris porttitor ultrices. Phasellus ut vestibulum mi. Suspendisse malesuada metus lorem, a malesuada orci rhoncus a. Praesent euismod convallis ante, lacinia tincidunt ex egestas id. Praesent sit amet efficitur sapien. Morbi tincidunt volutpat nunc sed dictum. Aliquam ultrices metus id fermentum lobortis.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Pellentesque id sagittis dui. Praesent ut nisi sit amet libero euismod ornare. Vestibulum vehicula, lorem eget aliquet imperdiet, eros nulla iaculis mi, vel bibendum est dui sed orci. Nullam vitae lorem rutrum, euismod lacus id, ullamcorper lectus. Duis nec commodo mi, a fringilla diam. Vestibulum molestie nibh tristique, viverra augue non, aliquet metus. Phasellus a tellus ac nisl tempor aliquet. Nulla vitae sapien rutrum augue ornare ultrices a quis nisi. Sed pulvinar tincidunt ex. Fusce vel sem vitae ante pellentesque lobortis.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Maecenas ullamcorper lacus nec turpis finibus aliquet eget rutrum augue. Integer lorem erat, faucibus non lacus lacinia, pulvinar egestas felis. Proin rutrum nunc eget nulla varius, id blandit mauris tincidunt. Donec sit amet ullamcorper nisi, ut efficitur mi. Aliquam aliquet, nulla eget rhoncus tristique, justo lorem consectetur dui, id ornare leo odio sed tellus. Curabitur interdum velit a turpis condimentum venenatis. Nunc rhoncus sem ac augue auctor, nec malesuada ex fringilla. Vestibulum egestas diam sed leo consectetur vulputate quis eget enim. Nam tincidunt metus sit amet maximus ullamcorper. Sed placerat velit vitae massa efficitur viverra. Etiam eleifend dignissim ante, sed luctus nisl tristique a. In vestibulum pharetra dolor in molestie. Vivamus auctor massa ac magna imperdiet, sit amet iaculis turpis finibus.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Aenean dapibus vulputate purus, sit amet tempor nunc suscipit consequat. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Mauris auctor congue eros, non pellentesque neque dapibus ac. Vestibulum non leo nec urna lacinia eleifend quis et diam. Praesent eu nisi magna. Nulla at magna massa. Suspendisse porta varius scelerisque. Duis at auctor dolor, non dapibus urna. Nunc venenatis feugiat magna non molestie. Aliquam non ornare ex. Quisque eu ultrices velit, quis pellentesque eros. Phasellus eleifend, elit id imperdiet aliquam, nulla quam molestie turpis, at egestas odio ante et tortor. Suspendisse fringilla condimentum justo, at aliquet odio aliquam ac.</p>
 <h2>Scene: Scene Four</h2>
-<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
-<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
-<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
-<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo.</span></p>
+<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
+<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
+<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
+<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo.</span></p>
 <p style='text-align: justify;'>Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo. Nullam viverra dui et auctor pretium. Ut ullamcorper velit urna, sed imperdiet massa convallis a. Suspendisse efficitur, ipsum nec cursus pulvinar, eros urna posuere diam, nec elementum mi felis vitae sapien.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Duis efficitur metus pulvinar, molestie magna eget, feugiat dui. Fusce convallis vehicula ipsum convallis blandit. Duis eros risus, malesuada eu imperdiet in, hendrerit ac metus. Vestibulum id justo gravida, dignissim nibh non, iaculis diam. Fusce accumsan est ut massa porta ultricies. Nulla vitae justo in tortor laoreet mollis. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin eu libero justo. Vivamus aliquet placerat est, et auctor eros posuere venenatis. Nunc quam diam, tincidunt ac aliquet in, fermentum sit amet lectus. Proin commodo tincidunt blandit. Quisque erat arcu, semper nec dui non, consectetur gravida ipsum. Nullam pretium consectetur elit at condimentum.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Etiam sagittis, erat vitae accumsan tempor, neque augue scelerisque nulla, ut ultrices justo urna sit amet augue. Interdum et malesuada fames ac ante ipsum primis in faucibus. Aenean at pulvinar tortor. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Cras vel porta quam. Nullam eu mauris mollis, vehicula justo vel, placerat sapien. Phasellus viverra elit et vestibulum pharetra. Vestibulum commodo fermentum leo, eu porta nisi aliquam eget. Nulla tempus porttitor nisi nec mollis. Nam non mollis turpis. Nam finibus leo a bibendum tincidunt. Donec commodo velit magna, ac semper sapien mattis id. Proin sem velit, lobortis quis ultricies id, pharetra et lectus. Vestibulum condimentum neque vitae mi dapibus mollis. Mauris luctus vel sapien vitae hendrerit.</p>
@@ -90,10 +91,10 @@ mark {background: #ffffa6;}
 <p style='text-align: justify; text-indent: 1.40em;'>Donec ipsum eros, vestibulum sit amet cursus eget, iaculis quis dolor. Pellentesque magna augue, tristique dapibus mi vitae, molestie venenatis enim. Nam malesuada, turpis volutpat rhoncus ullamcorper, justo est eleifend orci, ut luctus risus ex rutrum arcu. Sed mi elit, feugiat rhoncus ornare sed, porta id leo. Pellentesque feugiat nulla tincidunt erat suscipit, eu congue lacus hendrerit. Morbi pulvinar enim sed consequat auctor. Ut eleifend enim sem, vitae euismod ex ultricies sit amet. Curabitur eu efficitur nisi, suscipit finibus sapien. In sodales blandit erat, vestibulum pulvinar ante volutpat nec. Vivamus dictum non libero at molestie. Donec sit amet neque in ante convallis pretium. Nunc vel iaculis dui.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Phasellus eu nunc ut nunc faucibus laoreet. Aliquam at magna risus. Praesent lobortis, risus finibus semper varius, magna purus vestibulum eros, at pulvinar sapien enim a ex. In scelerisque malesuada ex, sit amet egestas neque condimentum sed. Praesent vulputate efficitur massa. Cras at accumsan ligula. In elementum lectus eget blandit dictum. Nam vitae libero ut justo eleifend rutrum ac nec arcu. Aliquam sodales in quam congue vestibulum. Aliquam in accumsan sapien. Quisque lobortis nisl nisi, vitae bibendum turpis efficitur sed. Vestibulum tempor nulla eget nisi convallis, blandit sagittis ipsum convallis. Donec odio nibh, ultrices quis odio in, mollis euismod libero.</p>
 <h2>Scene: Scene Five</h2>
-<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
-<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
-<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
-<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</span></p>
+<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>
+<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
+<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>
+<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</span></p>
 <p style='text-align: justify;'>Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In sed felis auctor, rhoncus dui ac, consequat dolor. Integer volutpat libero sed nisl aliquet varius. Suspendisse et lorem sapien. Proin id ultrices nibh, ac suscipit diam. Suspendisse placerat varius porttitor. Curabitur elementum sed enim ultrices imperdiet.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>In ut lobortis lacus, nec luctus arcu. Vivamus condimentum sapien a ipsum malesuada sodales. Donec et vestibulum risus. Integer dictum euismod eros id tincidunt. Aliquam sagittis leo vitae consequat fermentum. Donec maximus ex eu ex iaculis porta. Praesent pharetra lacinia risus, et eleifend diam commodo non. Sed feugiat ipsum ut orci sagittis, quis faucibus lectus blandit. Sed tellus quam, gravida vitae laoreet quis, tempus lobortis dui. Vivamus semper accumsan ullamcorper. Praesent tempus pretium eros, non elementum risus. Pellentesque odio quam, auctor quis ex non, vulputate egestas dolor. Nunc luctus enim ut justo sodales consectetur. Sed aliquet a mauris vel posuere.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Donec luctus lectus efficitur, blandit nisi vitae, dignissim tellus. Pellentesque euismod pharetra augue gravida hendrerit. Quisque nisi mi, mattis ac nisi non, maximus malesuada ante. Nulla lobortis, diam eu ornare ornare, tellus enim feugiat arcu, non vestibulum tortor nunc eu justo. Integer blandit felis justo, eu semper est scelerisque vel. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nam ultricies, nisi vel elementum commodo, nisl dolor tincidunt magna, sed varius est nunc at lectus. Aliquam dolor tortor, sodales placerat ultricies quis, sodales quis sapien. Duis ullamcorper sollicitudin risus at mattis. Integer consequat et nunc at condimentum. Pellentesque cursus congue augue, non suscipit lectus sodales ut. Nam a mi bibendum, blandit nisl eu, accumsan nunc. Aliquam a ex mauris. Sed nec sem quis arcu dignissim tempus eget et turpis. Ut sed ex nec ipsum ultrices lobortis.</p>
@@ -101,19 +102,19 @@ mark {background: #ffffa6;}
 <p style='text-align: justify; text-indent: 1.40em;'>Integer egestas maximus leo eu facilisis. Nunc rhoncus dignissim lectus eu lacinia. Praesent lacinia urna porttitor aliquam condimentum. Nulla eu eros dictum, dictum nunc vitae, sagittis nibh. Integer ante neque, consequat nec sollicitudin id, consectetur vitae dolor. Nullam volutpat sem orci, quis viverra magna auctor a. Suspendisse potenti. Maecenas commodo sed neque pellentesque vehicula. Sed luctus nisl risus, elementum semper purus interdum vel. Ut pulvinar, massa sit amet venenatis placerat, nunc lacus hendrerit odio, non aliquet nunc risus eu lectus. Maecenas feugiat semper ligula, id lobortis sem porta eu. Integer posuere elit magna, at mollis eros bibendum et. Ut imperdiet purus vel nulla aliquam maximus. Morbi sodales purus tellus, a rhoncus sem rutrum sit amet. Quisque risus sem, laoreet nec convallis nec, rutrum vitae justo.</p>
 <h1 class='title' style='text-align: center; page-break-before: always;'>Notes: Characters</h1>
 <h1>Nobody Owens</h1>
-<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Tag:</strong></span> <span style='color: #4271ae'><a name='tag_bod'>Bod</a></span> | <span style='color: #4271ae'>Nobody Owens</span></p>
-<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
+<p class='meta meta-tag' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Tag:</span></strong> <span style='color: #4271ae'><a name='tag_bod'>Bod</a></span> | <span style='color: #4271ae'>Nobody Owens</span></p>
+<p class='meta meta-plot' style='margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
 <p style='text-align: justify;'>Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Nullam scelerisque velit et tortor congue vestibulum a at nisi. Vivamus sodales ut turpis a convallis. In dignissim nibh at luctus sodales. Etiam sit amet rhoncus massa. Phasellus ligula magna, sollicitudin non imperdiet sit amet, volutpat vel magna. Nunc vestibulum tempor lectus, sit amet porta nunc hendrerit in. Curabitur non odio sit amet massa tincidunt facilisis. Integer et luctus nunc, eget euismod leo. Praesent faucibus metus sed purus convallis scelerisque. Fusce viverra lorem et placerat malesuada. In at elit malesuada, ullamcorper risus vitae, sodales dolor. Donec quis elementum lectus. Quisque eu eros at dui imperdiet euismod ut id neque.</p>
 <h1 class='title' style='text-align: center; page-break-before: always;'>Notes: Plot</h1>
 <h1>Main Plot</h1>
-<p class='meta'><strong><span style='color: #f5871f'>Tag:</strong></span> <span style='color: #4271ae'><a name='tag_main'>Main</a></span></p>
+<p class='meta meta-tag'><strong><span style='color: #f5871f'>Tag:</span></strong> <span style='color: #4271ae'><a name='tag_main'>Main</a></span></p>
 <p style='text-align: justify;'>Suspendisse vulputate malesuada pellentesque. Aenean sollicitudin cursus mi, vitae ultricies felis ullamcorper eu. Duis luctus risus mi, in accumsan velit cursus ut. Vestibulum eleifend leo in magna eleifend fermentum. Proin nec ornare elit. Phasellus nec interdum risus. In a volutpat augue, quis egestas justo. Morbi porta mauris mattis bibendum imperdiet.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur.</p>
 <h1 class='title' style='text-align: center; page-break-before: always;'>Notes: World</h1>
 <h1>Ancient Europe</h1>
-<p class='meta'><strong><span style='color: #f5871f'>Tag:</strong></span> <span style='color: #4271ae'><a name='tag_europe'>Europe</a></span> | <span style='color: #4271ae'>Ancient Europe</span></p>
+<p class='meta meta-tag'><strong><span style='color: #f5871f'>Tag:</span></strong> <span style='color: #4271ae'><a name='tag_europe'>Europe</a></span> | <span style='color: #4271ae'>Ancient Europe</span></p>
 <p style='text-align: justify;'>Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Nunc ullamcorper magna quis elit condimentum rhoncus. Aenean dictum pulvinar dolor suscipit interdum. Aliquam elit massa, elementum nec cursus eu, maximus nec ipsum. Donec ullamcorper iaculis dolor eu commodo. Nunc eget tortor quis turpis consectetur varius. Vestibulum nec justo vel tellus venenatis condimentum. Duis auctor iaculis massa. Nunc risus magna, rutrum vitae eros non, tristique mollis enim.</p>
diff --git a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json
index e6e167e9..fa24817f 100644
--- a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json
+++ b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json
@@ -2,21 +2,22 @@
   "meta": {
     "projectName": "Lorem Ipsum",
     "novelAuthor": "lipsum.com",
-    "buildTime": 1729624698,
-    "buildTimeStr": "2024-10-22 21:18:18"
+    "buildTime": 1729676162,
+    "buildTimeStr": "2024-10-23 11:36:02"
   },
   "text": {
     "css": [
       "body {color: #000000; font-family: 'Arial'; font-size: 12pt; font-weight: 400; font-style: normal;}",
       "p {text-align: left; line-height: 150%; margin-top: 0.00em; margin-bottom: 0.76em;}",
-      "h1 {color: #4271ae; page-break-after: avoid; margin-top: 1.85em; margin-bottom: 0.65em;}",
-      "h2 {color: #4271ae; page-break-after: avoid; margin-top: 2.18em; margin-bottom: 0.65em;}",
-      "h3 {color: #4271ae; page-break-after: avoid; margin-top: 1.53em; margin-bottom: 0.65em;}",
-      "h4 {color: #4271ae; page-break-after: avoid; margin-top: 1.53em; margin-bottom: 0.65em;}",
-      ".title {font-size: 2.5em; margin-top: 1.85em; margin-bottom: 0.65em;}",
-      ".sep, .skip {text-align: center; margin-top: 1.30em; margin-bottom: 1.30em;}",
       "a {color: #4271ae;}",
-      "mark {background: #ffffa6;}"
+      "mark {background: #ffffa6;}",
+      "h1, h2, h3, h4 {color: #4271ae; page-break-after: avoid;}",
+      "h1 {margin-top: 1.85em; margin-bottom: 0.65em;}",
+      "h2 {margin-top: 2.18em; margin-bottom: 0.65em;}",
+      "h3 {margin-top: 1.53em; margin-bottom: 0.65em;}",
+      "h4 {margin-top: 1.53em; margin-bottom: 0.65em;}",
+      ".title {font-size: 2.5em; margin-top: 1.85em; margin-bottom: 0.65em;}",
+      ".sep {text-align: center; margin-top: 1.53em; margin-bottom: 1.53em;}"
     ],
     "html": [
       [
@@ -26,13 +27,13 @@
         "<p style='text-align: center;'>\u201cThere is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain\u2026\u201d</p>"
       ],
       [
-        "<p class='comment' style='text-align: justify; page-break-before: always;'><strong><span style='color: #646464'>Comment:</strong></span> <span style='color: #646464'>Exctracted from the lipsum.com website.</span></p>",
+        "<p class='comment' style='text-align: justify; page-break-before: always;'><strong><span style='color: #646464'>Comment:</span></strong> <span style='color: #646464'>Exctracted from the lipsum.com website.</span></p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of \u201cde Finibus Bonorum et Malorum\u201d (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, \u201cLorem ipsum dolor sit amet..\u201d, comes from a line in section 1.10.32.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from \u201cde Finibus Bonorum et Malorum\u201d by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.</p>"
       ],
       [
         "<h1 style='page-break-before: always;'>Prologue</h1>",
-        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Explanation from the lipsum.com website.</span></p>",
+        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Explanation from the lipsum.com website.</span></p>",
         "<p style='text-align: justify;'><em>Lorem Ipsum</em> is simply dummy text<sup><a href='#footnote_1'>1</a></sup> of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</p>"
       ],
       [
@@ -41,18 +42,18 @@
       ],
       [
         "<h1 style='page-break-before: always;'>Chapter: Chapter One</h1>",
-        "<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
-        "<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
-        "<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
-        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam.</span></p>",
+        "<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
+        "<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
+        "<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
+        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam.</span></p>",
         "<p style='text-align: justify;'>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam. Praesent magna nunc, lacinia sit amet quam eget, aliquet ultrices justo. Morbi ornare enim et lorem rutrum finibus ut eu dolor. Aliquam a orci odio. Ut ultrices sem quis massa placerat, eget mollis nisl cursus. Cras vel sagittis justo. Ut non ultricies leo. Maecenas rutrum velit in est varius, et egestas massa pulvinar.</p>"
       ],
       [
         "<h2>Scene: Scene One</h2>",
-        "<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
-        "<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
-        "<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
-        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur.</span></p>",
+        "<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
+        "<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
+        "<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
+        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur.</span></p>",
         "<p style='text-align: justify;'>Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur. Donec quis ante nunc. Mauris ut leo ipsum. Vestibulum est neque, hendrerit nec neque a, ullamcorper lobortis tellus. Fusce sollicitudin purus quis congue bibendum. Aliquam condimentum ipsum tristique blandit tristique. Donec pulvinar neque ac suscipit malesuada.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Aliquam ut nisl arcu. Ut ultricies, lorem dignissim rutrum convallis, risus orci tempus lectus, congue feugiat sem lectus vitae odio. Duis sit amet justo finibus, hendrerit nulla at, ullamcorper enim. Praesent vel tellus sit amet tellus vulputate bibendum. Morbi eleifend sagittis sem, ac volutpat ante congue non. In hac habitasse platea dictumst. Morbi lobortis fermentum elit, dignissim sagittis ligula volutpat lacinia. Vestibulum eu interdum odio. Integer ac purus commodo metus congue tempor non at urna. Sed eget tortor vel quam viverra egestas. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec non convallis mauris, ac feugiat ex.</p>",
         "<h3>Section: Scene One, Section Two</h3>",
@@ -61,10 +62,10 @@
       ],
       [
         "<h2>Scene: Scene Two</h2>",
-        "<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
-        "<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
-        "<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
-        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci.</span></p>",
+        "<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
+        "<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
+        "<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
+        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci.</span></p>",
         "<p style='text-align: justify;'>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. Vestibulum facilisis bibendum aliquam. Aliquam posuere, turpis ac bibendum varius, sem tellus venenatis risus, in elementum massa enim ac lorem. Integer in sem ac diam blandit ultricies ut in nulla. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam sit amet erat est. Curabitur vitae cursus justo, sit amet placerat dolor. Vivamus eu felis hendrerit, tincidunt massa rutrum, maximus arcu. Pellentesque commodo justo odio, vel rutrum nulla tincidunt eu. Integer non neque condimentum, convallis diam non, varius ligula. Aliquam eget sapien mauris. Aenean pharetra nunc nisi, vel maximus ante tristique sit amet. Aliquam risus metus, interdum non odio eu, consectetur lacinia sapien.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Proin vitae gravida nisl. Integer viverra orci turpis, sit amet pretium ligula facilisis consequat. Nulla interdum commodo metus, mollis consequat dui tincidunt et. Proin consequat bibendum justo id commodo. Fusce fermentum nunc turpis, eu vestibulum risus feugiat ut. Sed scelerisque vel ligula ut interdum. Suspendisse ac blandit ligula, sagittis fringilla dolor. In tincidunt convallis diam et ornare. Aenean id dignissim est, ut rhoncus quam. Donec vitae nisl velit. In convallis nibh ut augue dignissim, eu elementum quam cursus. Phasellus in lectus lorem. Curabitur in pellentesque nisi, at gravida sapien. Sed cursus justo volutpat lacus placerat, sit amet dignissim turpis commodo. Aliquam vitae orci eget nulla posuere condimentum in ut felis.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Nulla accumsan ante in pulvinar efficitur. Nulla non velit quis urna hendrerit bibendum. Suspendisse ultrices ante eu justo malesuada, sed fermentum enim rutrum. Nunc fermentum pharetra felis, vitae sollicitudin quam rutrum porta. Aliquam fringilla velit a mi laoreet, et luctus est rutrum. In gravida non ipsum sit amet tempus. Curabitur et eleifend purus. Nulla facilisi.</p>",
@@ -75,25 +76,25 @@
       ],
       [
         "<h1 style='page-break-before: always;'>Why do we use it?</h1>",
-        "<p class='comment' style='text-align: justify;'><strong><span style='color: #646464'>Comment:</strong></span> <span style='color: #646464'>Exctracted from the lipsum.com website.</span></p>",
+        "<p class='comment' style='text-align: justify;'><strong><span style='color: #646464'>Comment:</span></strong> <span style='color: #646464'>Exctracted from the lipsum.com website.</span></p>",
         "<p style='text-align: justify;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like).</p>"
       ],
       [
         "<h1 style='page-break-before: always;'>Chapter: Chapter Two</h1>",
-        "<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
-        "<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
-        "<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
-        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue.</span></p>",
+        "<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
+        "<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
+        "<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
+        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue.</span></p>",
         "<p style='text-align: justify;'>Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue. Vestibulum pharetra fermentum leo, sed faucibus eros placerat quis. In hac habitasse platea dictumst. Donec metus massa, rutrum quis consequat et, tincidunt ac felis. Duis mollis metus ac nunc tincidunt blandit. Ut aliquet velit eu odio pharetra condimentum. Integer rutrum lacus orci, id venenatis libero accumsan at.</p>"
       ],
       [
         "<h2>Scene: Scene Three</h2>",
-        "<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
-        "<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
-        "<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
-        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</span></p>",
+        "<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
+        "<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
+        "<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
+        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</span></p>",
         "<p style='text-align: justify;'>Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean tincidunt lacus vitae nibh elementum eleifend. Sed rutrum condimentum sem quis blandit. Duis imperdiet libero metus, quis convallis quam faucibus a. Nulla ligula est, semper quis sollicitudin et, pretium id justo. Curabitur pharetra risus eget consectetur commodo. Duis mattis arcu non est condimentum, id venenatis risus volutpat. Pellentesque aliquet mauris non mauris porttitor ultrices. Phasellus ut vestibulum mi. Suspendisse malesuada metus lorem, a malesuada orci rhoncus a. Praesent euismod convallis ante, lacinia tincidunt ex egestas id. Praesent sit amet efficitur sapien. Morbi tincidunt volutpat nunc sed dictum. Aliquam ultrices metus id fermentum lobortis.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Pellentesque id sagittis dui. Praesent ut nisi sit amet libero euismod ornare. Vestibulum vehicula, lorem eget aliquet imperdiet, eros nulla iaculis mi, vel bibendum est dui sed orci. Nullam vitae lorem rutrum, euismod lacus id, ullamcorper lectus. Duis nec commodo mi, a fringilla diam. Vestibulum molestie nibh tristique, viverra augue non, aliquet metus. Phasellus a tellus ac nisl tempor aliquet. Nulla vitae sapien rutrum augue ornare ultrices a quis nisi. Sed pulvinar tincidunt ex. Fusce vel sem vitae ante pellentesque lobortis.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Maecenas ullamcorper lacus nec turpis finibus aliquet eget rutrum augue. Integer lorem erat, faucibus non lacus lacinia, pulvinar egestas felis. Proin rutrum nunc eget nulla varius, id blandit mauris tincidunt. Donec sit amet ullamcorper nisi, ut efficitur mi. Aliquam aliquet, nulla eget rhoncus tristique, justo lorem consectetur dui, id ornare leo odio sed tellus. Curabitur interdum velit a turpis condimentum venenatis. Nunc rhoncus sem ac augue auctor, nec malesuada ex fringilla. Vestibulum egestas diam sed leo consectetur vulputate quis eget enim. Nam tincidunt metus sit amet maximus ullamcorper. Sed placerat velit vitae massa efficitur viverra. Etiam eleifend dignissim ante, sed luctus nisl tristique a. In vestibulum pharetra dolor in molestie. Vivamus auctor massa ac magna imperdiet, sit amet iaculis turpis finibus.</p>",
@@ -101,10 +102,10 @@
       ],
       [
         "<h2>Scene: Scene Four</h2>",
-        "<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
-        "<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
-        "<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
-        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo.</span></p>",
+        "<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
+        "<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
+        "<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
+        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo.</span></p>",
         "<p style='text-align: justify;'>Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo. Nullam viverra dui et auctor pretium. Ut ullamcorper velit urna, sed imperdiet massa convallis a. Suspendisse efficitur, ipsum nec cursus pulvinar, eros urna posuere diam, nec elementum mi felis vitae sapien.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Duis efficitur metus pulvinar, molestie magna eget, feugiat dui. Fusce convallis vehicula ipsum convallis blandit. Duis eros risus, malesuada eu imperdiet in, hendrerit ac metus. Vestibulum id justo gravida, dignissim nibh non, iaculis diam. Fusce accumsan est ut massa porta ultricies. Nulla vitae justo in tortor laoreet mollis. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin eu libero justo. Vivamus aliquet placerat est, et auctor eros posuere venenatis. Nunc quam diam, tincidunt ac aliquet in, fermentum sit amet lectus. Proin commodo tincidunt blandit. Quisque erat arcu, semper nec dui non, consectetur gravida ipsum. Nullam pretium consectetur elit at condimentum.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Etiam sagittis, erat vitae accumsan tempor, neque augue scelerisque nulla, ut ultrices justo urna sit amet augue. Interdum et malesuada fames ac ante ipsum primis in faucibus. Aenean at pulvinar tortor. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Cras vel porta quam. Nullam eu mauris mollis, vehicula justo vel, placerat sapien. Phasellus viverra elit et vestibulum pharetra. Vestibulum commodo fermentum leo, eu porta nisi aliquam eget. Nulla tempus porttitor nisi nec mollis. Nam non mollis turpis. Nam finibus leo a bibendum tincidunt. Donec commodo velit magna, ac semper sapien mattis id. Proin sem velit, lobortis quis ultricies id, pharetra et lectus. Vestibulum condimentum neque vitae mi dapibus mollis. Mauris luctus vel sapien vitae hendrerit.</p>",
@@ -114,10 +115,10 @@
       ],
       [
         "<h2>Scene: Scene Five</h2>",
-        "<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</strong></span> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
-        "<p class='meta' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
-        "<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</strong></span> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
-        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</strong></span> <span style='color: #813709'>Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</span></p>",
+        "<p class='meta meta-pov' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Point of View:</span></strong> <span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>",
+        "<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
+        "<p class='meta meta-location' style='margin-top: 0;'><strong><span style='color: #f5871f'>Locations:</span></strong> <span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>",
+        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Synopsis:</span></strong> <span style='color: #813709'>Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</span></p>",
         "<p style='text-align: justify;'>Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In sed felis auctor, rhoncus dui ac, consequat dolor. Integer volutpat libero sed nisl aliquet varius. Suspendisse et lorem sapien. Proin id ultrices nibh, ac suscipit diam. Suspendisse placerat varius porttitor. Curabitur elementum sed enim ultrices imperdiet.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>In ut lobortis lacus, nec luctus arcu. Vivamus condimentum sapien a ipsum malesuada sodales. Donec et vestibulum risus. Integer dictum euismod eros id tincidunt. Aliquam sagittis leo vitae consequat fermentum. Donec maximus ex eu ex iaculis porta. Praesent pharetra lacinia risus, et eleifend diam commodo non. Sed feugiat ipsum ut orci sagittis, quis faucibus lectus blandit. Sed tellus quam, gravida vitae laoreet quis, tempus lobortis dui. Vivamus semper accumsan ullamcorper. Praesent tempus pretium eros, non elementum risus. Pellentesque odio quam, auctor quis ex non, vulputate egestas dolor. Nunc luctus enim ut justo sodales consectetur. Sed aliquet a mauris vel posuere.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Donec luctus lectus efficitur, blandit nisi vitae, dignissim tellus. Pellentesque euismod pharetra augue gravida hendrerit. Quisque nisi mi, mattis ac nisi non, maximus malesuada ante. Nulla lobortis, diam eu ornare ornare, tellus enim feugiat arcu, non vestibulum tortor nunc eu justo. Integer blandit felis justo, eu semper est scelerisque vel. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nam ultricies, nisi vel elementum commodo, nisl dolor tincidunt magna, sed varius est nunc at lectus. Aliquam dolor tortor, sodales placerat ultricies quis, sodales quis sapien. Duis ullamcorper sollicitudin risus at mattis. Integer consequat et nunc at condimentum. Pellentesque cursus congue augue, non suscipit lectus sodales ut. Nam a mi bibendum, blandit nisl eu, accumsan nunc. Aliquam a ex mauris. Sed nec sem quis arcu dignissim tempus eget et turpis. Ut sed ex nec ipsum ultrices lobortis.</p>",
@@ -129,8 +130,8 @@
       ],
       [
         "<h1>Nobody Owens</h1>",
-        "<p class='meta' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Tag:</strong></span> <span style='color: #4271ae'><a name='tag_bod'>Bod</a></span> | <span style='color: #4271ae'>Nobody Owens</span></p>",
-        "<p class='meta' style='margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</strong></span> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
+        "<p class='meta meta-tag' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Tag:</span></strong> <span style='color: #4271ae'><a name='tag_bod'>Bod</a></span> | <span style='color: #4271ae'>Nobody Owens</span></p>",
+        "<p class='meta meta-plot' style='margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
         "<p style='text-align: justify;'>Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Nullam scelerisque velit et tortor congue vestibulum a at nisi. Vivamus sodales ut turpis a convallis. In dignissim nibh at luctus sodales. Etiam sit amet rhoncus massa. Phasellus ligula magna, sollicitudin non imperdiet sit amet, volutpat vel magna. Nunc vestibulum tempor lectus, sit amet porta nunc hendrerit in. Curabitur non odio sit amet massa tincidunt facilisis. Integer et luctus nunc, eget euismod leo. Praesent faucibus metus sed purus convallis scelerisque. Fusce viverra lorem et placerat malesuada. In at elit malesuada, ullamcorper risus vitae, sodales dolor. Donec quis elementum lectus. Quisque eu eros at dui imperdiet euismod ut id neque.</p>"
@@ -140,7 +141,7 @@
       ],
       [
         "<h1>Main Plot</h1>",
-        "<p class='meta'><strong><span style='color: #f5871f'>Tag:</strong></span> <span style='color: #4271ae'><a name='tag_main'>Main</a></span></p>",
+        "<p class='meta meta-tag'><strong><span style='color: #f5871f'>Tag:</span></strong> <span style='color: #4271ae'><a name='tag_main'>Main</a></span></p>",
         "<p style='text-align: justify;'>Suspendisse vulputate malesuada pellentesque. Aenean sollicitudin cursus mi, vitae ultricies felis ullamcorper eu. Duis luctus risus mi, in accumsan velit cursus ut. Vestibulum eleifend leo in magna eleifend fermentum. Proin nec ornare elit. Phasellus nec interdum risus. In a volutpat augue, quis egestas justo. Morbi porta mauris mattis bibendum imperdiet.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur.</p>"
       ],
@@ -149,7 +150,7 @@
       ],
       [
         "<h1>Ancient Europe</h1>",
-        "<p class='meta'><strong><span style='color: #f5871f'>Tag:</strong></span> <span style='color: #4271ae'><a name='tag_europe'>Europe</a></span> | <span style='color: #4271ae'>Ancient Europe</span></p>",
+        "<p class='meta meta-tag'><strong><span style='color: #f5871f'>Tag:</span></strong> <span style='color: #4271ae'><a name='tag_europe'>Europe</a></span> | <span style='color: #4271ae'>Ancient Europe</span></p>",
         "<p style='text-align: justify;'>Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Nunc ullamcorper magna quis elit condimentum rhoncus. Aenean dictum pulvinar dolor suscipit interdum. Aliquam elit massa, elementum nec cursus eu, maximus nec ipsum. Donec ullamcorper iaculis dolor eu commodo. Nunc eget tortor quis turpis consectetur varius. Vestibulum nec justo vel tellus venenatis condimentum. Duis auctor iaculis massa. Nunc risus magna, rutrum vitae eros non, tristique mollis enim.</p>"
diff --git a/tests/test_formats/test_fmt_todocx.py b/tests/test_formats/test_fmt_todocx.py
index 22df9e1c..a9214db9 100644
--- a/tests/test_formats/test_fmt_todocx.py
+++ b/tests/test_formats/test_fmt_todocx.py
@@ -71,7 +71,7 @@ def testFmtToDocX_ParagraphStyles(mockGUI):
 
     # Normal Text
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.TEXT, 0, "Hello World", [], BlockFmt.NONE)]
+    doc._blocks = [(BlockTyp.TEXT, "", "Hello World", [], BlockFmt.NONE)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -81,7 +81,7 @@ def testFmtToDocX_ParagraphStyles(mockGUI):
 
     # Title
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.TITLE, 0, "Hello World", [], BlockFmt.NONE)]
+    doc._blocks = [(BlockTyp.TITLE, "", "Hello World", [], BlockFmt.NONE)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -91,7 +91,7 @@ def testFmtToDocX_ParagraphStyles(mockGUI):
 
     # Heading Level 1
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.HEAD1, 0, "Hello World", [], BlockFmt.NONE)]
+    doc._blocks = [(BlockTyp.HEAD1, "", "Hello World", [], BlockFmt.NONE)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -101,7 +101,7 @@ def testFmtToDocX_ParagraphStyles(mockGUI):
 
     # Heading Level 2
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.HEAD2, 0, "Hello World", [], BlockFmt.NONE)]
+    doc._blocks = [(BlockTyp.HEAD2, "", "Hello World", [], BlockFmt.NONE)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -111,7 +111,7 @@ def testFmtToDocX_ParagraphStyles(mockGUI):
 
     # Heading Level 3
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.HEAD3, 0, "Hello World", [], BlockFmt.NONE)]
+    doc._blocks = [(BlockTyp.HEAD3, "", "Hello World", [], BlockFmt.NONE)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -121,7 +121,7 @@ def testFmtToDocX_ParagraphStyles(mockGUI):
 
     # Heading Level 4
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.HEAD4, 0, "Hello World", [], BlockFmt.NONE)]
+    doc._blocks = [(BlockTyp.HEAD4, "", "Hello World", [], BlockFmt.NONE)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -131,7 +131,7 @@ def testFmtToDocX_ParagraphStyles(mockGUI):
 
     # Separator
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.SEP, 0, "* * *", [], BlockFmt.NONE)]
+    doc._blocks = [(BlockTyp.SEP, "", "* * *", [], BlockFmt.NONE)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -141,7 +141,7 @@ def testFmtToDocX_ParagraphStyles(mockGUI):
 
     # Empty Paragraph
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.SKIP, 0, "* * *", [], BlockFmt.NONE)]
+    doc._blocks = [(BlockTyp.SKIP, "", "* * *", [], BlockFmt.NONE)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -241,7 +241,7 @@ def testFmtToDocX_ParagraphFormatting(mockGUI):
 
     # Left Align
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.TEXT, 0, "Hello World", [], BlockFmt.LEFT)]
+    doc._blocks = [(BlockTyp.TEXT, "", "Hello World", [], BlockFmt.LEFT)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -251,7 +251,7 @@ def testFmtToDocX_ParagraphFormatting(mockGUI):
 
     # Right Align
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.TEXT, 0, "Hello World", [], BlockFmt.RIGHT)]
+    doc._blocks = [(BlockTyp.TEXT, "", "Hello World", [], BlockFmt.RIGHT)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -261,7 +261,7 @@ def testFmtToDocX_ParagraphFormatting(mockGUI):
 
     # Center Align
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.TEXT, 0, "Hello World", [], BlockFmt.CENTRE)]
+    doc._blocks = [(BlockTyp.TEXT, "", "Hello World", [], BlockFmt.CENTRE)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -271,7 +271,7 @@ def testFmtToDocX_ParagraphFormatting(mockGUI):
 
     # Justify
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.TEXT, 0, "Hello World", [], BlockFmt.JUSTIFY)]
+    doc._blocks = [(BlockTyp.TEXT, "", "Hello World", [], BlockFmt.JUSTIFY)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -281,7 +281,7 @@ def testFmtToDocX_ParagraphFormatting(mockGUI):
 
     # Page Break Before
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.TEXT, 0, "Hello World", [], BlockFmt.PBB)]
+    doc._blocks = [(BlockTyp.TEXT, "", "Hello World", [], BlockFmt.PBB)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -293,7 +293,7 @@ def testFmtToDocX_ParagraphFormatting(mockGUI):
 
     # Page Break After
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.TEXT, 0, "Hello World", [], BlockFmt.PBA)]
+    doc._blocks = [(BlockTyp.TEXT, "", "Hello World", [], BlockFmt.PBA)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -305,7 +305,7 @@ def testFmtToDocX_ParagraphFormatting(mockGUI):
 
     # Zero Margins
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.TEXT, 0, "Hello World", [], BlockFmt.Z_TOPMRG | BlockFmt.Z_BTMMRG)]
+    doc._blocks = [(BlockTyp.TEXT, "", "Hello World", [], BlockFmt.Z_TOP | BlockFmt.Z_BTM)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -316,7 +316,7 @@ def testFmtToDocX_ParagraphFormatting(mockGUI):
 
     # Indent
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.TEXT, 0, "Hello World", [], BlockFmt.IND_L | BlockFmt.IND_R)]
+    doc._blocks = [(BlockTyp.TEXT, "", "Hello World", [], BlockFmt.IND_L | BlockFmt.IND_R)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
@@ -327,7 +327,7 @@ def testFmtToDocX_ParagraphFormatting(mockGUI):
 
     # First Line Indent
     xTest = ET.Element(_wTag("body"))
-    doc._blocks = [(BlockTyp.TEXT, 0, "Hello World", [], BlockFmt.IND_T)]
+    doc._blocks = [(BlockTyp.TEXT, "", "Hello World", [], BlockFmt.IND_T)]
     doc.doConvert()
     doc._pars[-1].toXml(xTest)
     assert xmlToText(xTest) == (
diff --git a/tests/test_formats/test_fmt_tohtml.py b/tests/test_formats/test_fmt_tohtml.py
index 24654591..68db421c 100644
--- a/tests/test_formats/test_fmt_tohtml.py
+++ b/tests/test_formats/test_fmt_tohtml.py
@@ -47,7 +47,7 @@ def testFmtToHtml_ConvertHeaders(mockGUI):
     html._text = "# Partition\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 class='title' style='text-align: center;'>Partition</h1>\n"
     )
 
@@ -55,7 +55,7 @@ def testFmtToHtml_ConvertHeaders(mockGUI):
     html._text = "## Chapter Title\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 style='page-break-before: always;'>Chapter Title</h1>\n"
     )
 
@@ -63,19 +63,19 @@ def testFmtToHtml_ConvertHeaders(mockGUI):
     html._text = "### Scene Title\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == "<h2>Scene Title</h2>\n"
+    assert html._pages[-1] == "<h2>Scene Title</h2>\n"
 
     # Header 4
     html._text = "#### Section Title\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == "<h3>Section Title</h3>\n"
+    assert html._pages[-1] == "<h3>Section Title</h3>\n"
 
     # Title
     html._text = "#! Title\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 class='title' style='text-align: center; page-break-before: always;'>Title</h1>\n"
     )
 
@@ -83,7 +83,7 @@ def testFmtToHtml_ConvertHeaders(mockGUI):
     html._text = "##! Prologue\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == "<h1 style='page-break-before: always;'>Prologue</h1>\n"
+    assert html._pages[-1] == "<h1 style='page-break-before: always;'>Prologue</h1>\n"
 
     # Note Files Headers
     # ==================
@@ -97,31 +97,31 @@ def testFmtToHtml_ConvertHeaders(mockGUI):
     html._text = "# Heading One\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == "<h1><a name='0000000000000:T0001'></a>Heading One</h1>\n"
+    assert html._pages[-1] == "<h1><a name='0000000000000:T0001'></a>Heading One</h1>\n"
 
     # Header 2
     html._text = "## Heading Two\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == "<h2><a name='0000000000000:T0001'></a>Heading Two</h2>\n"
+    assert html._pages[-1] == "<h2><a name='0000000000000:T0001'></a>Heading Two</h2>\n"
 
     # Header 3
     html._text = "### Heading Three\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == "<h3><a name='0000000000000:T0001'></a>Heading Three</h3>\n"
+    assert html._pages[-1] == "<h3><a name='0000000000000:T0001'></a>Heading Three</h3>\n"
 
     # Header 4
     html._text = "#### Heading Four\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == "<h4><a name='0000000000000:T0001'></a>Heading Four</h4>\n"
+    assert html._pages[-1] == "<h4><a name='0000000000000:T0001'></a>Heading Four</h4>\n"
 
     # Title
     html._text = "#! Heading One\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 class='title' style='text-align: center; page-break-before: always;'>"
         "<a name='0000000000000:T0001'></a>Heading One</h1>\n"
     )
@@ -130,7 +130,7 @@ def testFmtToHtml_ConvertHeaders(mockGUI):
     html._text = "##! Heading Two\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == "<h2><a name='0000000000000:T0001'></a>Heading Two</h2>\n"
+    assert html._pages[-1] == "<h2><a name='0000000000000:T0001'></a>Heading Two</h2>\n"
 
 
 @pytest.mark.core
@@ -150,7 +150,7 @@ def testFmtToHtml_ConvertParagraphs(mockGUI):
     html._text = "Some **nested bold and _italic_ and ~~strikethrough~~ text** here\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Some <strong>nested bold and <em>italic</em> and "
         "<del>strikethrough</del> text</strong> here</p>\n"
     )
@@ -162,7 +162,7 @@ def testFmtToHtml_ConvertParagraphs(mockGUI):
     )
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Some <strong>bold</strong>, <em>italic</em>, <del>strike</del>, "
         "<span style='text-decoration: underline;'>underline</span>, <mark>mark</mark>, "
         "super<sup>script</sup>, sub<sub>script</sub> here</p>\n"
@@ -172,7 +172,7 @@ def testFmtToHtml_ConvertParagraphs(mockGUI):
     html._text = "Line one\nLine two\nLine three\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Line one<br>Line two<br>Line three</p>\n"
     )
 
@@ -180,15 +180,15 @@ def testFmtToHtml_ConvertParagraphs(mockGUI):
     html._text = "%synopsis: The synopsis ...\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == ""
+    assert html._pages[-1] == ""
 
     html.setSynopsis(True)
     html._text = "%synopsis: The synopsis ...\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p class='comment'>"
-        "<strong><span style='color: #813709'>Synopsis:</strong></span> "
+        "<strong><span style='color: #813709'>Synopsis:</span></strong> "
         "<span style='color: #813709'>The synopsis ...</span>"
         "</p>\n"
     )
@@ -197,9 +197,9 @@ def testFmtToHtml_ConvertParagraphs(mockGUI):
     html._text = "%short: A short description ...\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p class='comment'>"
-        "<strong><span style='color: #813709'>Short Description:</strong></span> "
+        "<strong><span style='color: #813709'>Short Description:</span></strong> "
         "<span style='color: #813709'>A short description ...</span>"
         "</p>\n"
     )
@@ -208,15 +208,15 @@ def testFmtToHtml_ConvertParagraphs(mockGUI):
     html._text = "% A comment ...\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == ""
+    assert html._pages[-1] == ""
 
     html.setComments(True)
     html._text = "% A comment ...\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p class='comment'>"
-        "<strong><span style='color: #646464'>Comment:</strong></span> "
+        "<strong><span style='color: #646464'>Comment:</span></strong> "
         "<span style='color: #646464'>A comment ...</span>"
         "</p>\n"
     )
@@ -225,14 +225,15 @@ def testFmtToHtml_ConvertParagraphs(mockGUI):
     html._text = "@char: Bod, Jane\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == ""
+    assert html._pages[-1] == ""
 
     html.setKeywords(True)
     html._text = "@char: Bod, Jane\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
-        "<p class='meta'><strong><span style='color: #f5871f'>Characters:</strong></span> "
+    assert html._pages[-1] == (
+        "<p class='meta meta-char'><strong><span style='color: #f5871f'>"
+        "Characters:</span></strong> "
         "<span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span>, "
         "<span style='color: #4271ae'><a href='#tag_jane'>Jane</a></span></p>\n"
     )
@@ -241,16 +242,16 @@ def testFmtToHtml_ConvertParagraphs(mockGUI):
     html._text = "@tag: Bod\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
-        "<p class='meta'><strong><span style='color: #f5871f'>Tag:</strong></span> "
+    assert html._pages[-1] == (
+        "<p class='meta meta-tag'><strong><span style='color: #f5871f'>Tag:</span></strong> "
         "<span style='color: #4271ae'><a name='tag_bod'>Bod</a></span></p>\n"
     )
 
     html._text = "@tag: Bod | Nobody Owens\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
-        "<p class='meta'><strong><span style='color: #f5871f'>Tag:</strong></span> "
+    assert html._pages[-1] == (
+        "<p class='meta meta-tag'><strong><span style='color: #f5871f'>Tag:</span></strong> "
         "<span style='color: #4271ae'><a name='tag_bod'>Bod</a></span> | "
         "<span style='color: #4271ae'>Nobody Owens</span></p>\n"
     )
@@ -261,16 +262,16 @@ def testFmtToHtml_ConvertParagraphs(mockGUI):
     html._text = "## Chapter\n\n@pov: Bod\n@plot: Main\n@location: Europe\n\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 style='page-break-before: always;'>Chapter</h1>\n"
-        "<p class='meta' style='margin-bottom: 0;'>"
-        "<strong><span style='color: #f5871f'>Point of View:</strong></span> "
+        "<p class='meta meta-pov' style='margin-bottom: 0;'>"
+        "<strong><span style='color: #f5871f'>Point of View:</span></strong> "
         "<span style='color: #4271ae'><a href='#tag_bod'>Bod</a></span></p>\n"
-        "<p class='meta' style='margin-bottom: 0; margin-top: 0;'>"
-        "<strong><span style='color: #f5871f'>Plot:</strong></span> "
+        "<p class='meta meta-plot' style='margin-bottom: 0; margin-top: 0;'>"
+        "<strong><span style='color: #f5871f'>Plot:</span></strong> "
         "<span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>\n"
-        "<p class='meta' style='margin-top: 0;'>"
-        "<strong><span style='color: #f5871f'>Locations:</strong></span> "
+        "<p class='meta meta-location' style='margin-top: 0;'>"
+        "<strong><span style='color: #f5871f'>Locations:</span></strong> "
         "<span style='color: #4271ae'><a href='#tag_europe'>Europe</a></span></p>\n"
     )
 
@@ -279,7 +280,7 @@ def testFmtToHtml_ConvertParagraphs(mockGUI):
     html._text = "## Chapter\n\nThis text \u201chas dialogue\u201d in it.\n\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 style='page-break-before: always;'>Chapter</h1>\n"
         "<p>This text <span style='color: #4271ae'>“has dialogue”</span> in it.</p>\n"
     )
@@ -291,7 +292,7 @@ def testFmtToHtml_ConvertParagraphs(mockGUI):
     html._text = "## Chapter\n\nThis text ::has alt dialogue:: in it.\n\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 style='page-break-before: always;'>Chapter</h1>\n"
         "<p>This text <span style='color: #813709'>::has alt dialogue::</span> in it.</p>\n"
     )
@@ -305,15 +306,17 @@ def testFmtToHtml_ConvertParagraphs(mockGUI):
     )
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Text with one<sup><a href='#footnote_1'>1</a></sup> "
         "or two<sup>ERR</sup> footnotes.</p>\n"
     )
 
     html.appendFootnotes()
-    assert html.result == (
+    assert html._pages[-2] == (
         "<p>Text with one<sup><a href='#footnote_1'>1</a></sup> "
         "or two<sup>ERR</sup> footnotes.</p>\n"
+    )
+    assert html._pages[-1] == (
         "<h3>Footnotes</h3>\n"
         "<ol>\n"
         "<li id='footnote_1'><p>Footnote text A.</p></li>\n"
@@ -335,7 +338,7 @@ def testFmtToHtml_CloseTags(mockGUI):
     html._text = "Text [b][i][s][u][m][sup][sub]text text text.\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Text <strong><em><del><span style='text-decoration: underline;'><mark><sup><sub>"
         "text text text.</strong></em></del></span></mark></sup></sub></p>\n"
     )
@@ -344,7 +347,7 @@ def testFmtToHtml_CloseTags(mockGUI):
     html._text = "Text [b][i][s][u][m][sup][sub]text [b][i][s][u][m][sup][sub]text text.\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Text <strong><em><del><span style='text-decoration: underline;'><mark><sup><sub>"
         "text text text.</strong></em></del></span></mark></sup></sub></p>\n"
     )
@@ -353,7 +356,7 @@ def testFmtToHtml_CloseTags(mockGUI):
     html._text = "Text text [/b][/i][/s][/u][/m][/sup][/sub]text text.\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Text text text text.</p>\n"
     )
 
@@ -369,25 +372,27 @@ def testFmtToHtml_ConvertDirect(mockGUI):
     html._handle = "0000000000000"
     html.setLinkHeadings(True)
 
+    tMeta = "0000000000000:T0001"
+
     # Special Titles
     # ==============
 
     # Title
     html._blocks = [
-        (BlockTyp.TITLE, 1, "A Title", [], BlockFmt.PBB | BlockFmt.CENTRE),
+        (BlockTyp.TITLE, tMeta, "A Title", [], BlockFmt.PBB | BlockFmt.CENTRE),
     ]
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 class='title' style='text-align: center; page-break-before: always;'>"
         "<a name='0000000000000:T0001'></a>A Title</h1>\n"
     )
 
     # Unnumbered
     html._blocks = [
-        (BlockTyp.HEAD2, 1, "Prologue", [], BlockFmt.PBB),
+        (BlockTyp.HEAD2, tMeta, "Prologue", [], BlockFmt.PBB),
     ]
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 style='page-break-before: always;'>"
         "<a name='0000000000000:T0001'></a>Prologue</h1>\n"
     )
@@ -397,17 +402,17 @@ def testFmtToHtml_ConvertDirect(mockGUI):
 
     # Separator
     html._blocks = [
-        (BlockTyp.SEP, 1, "* * *", [], BlockFmt.CENTRE),
+        (BlockTyp.SEP, tMeta, "* * *", [], BlockFmt.CENTRE),
     ]
     html.doConvert()
-    assert html.result == "<p class='sep' style='text-align: center;'>* * *</p>\n"
+    assert html._pages[-1] == "<p class='sep' style='text-align: center;'>* * *</p>\n"
 
     # Skip
     html._blocks = [
-        (BlockTyp.SKIP, 1, "", [], BlockFmt.NONE),
+        (BlockTyp.SKIP, tMeta, "", [], BlockFmt.NONE),
     ]
     html.doConvert()
-    assert html.result == "<p class='skip'>&nbsp;</p>\n"
+    assert html._pages[-1] == "<p>&nbsp;</p>\n"
 
     # Alignment
     # =========
@@ -417,10 +422,10 @@ def testFmtToHtml_ConvertDirect(mockGUI):
     # Align Left
     html.setStyles(False)
     html._blocks = [
-        (BlockTyp.HEAD1, 1, "A Title", [], BlockFmt.LEFT),
+        (BlockTyp.HEAD1, tMeta, "A Title", [], BlockFmt.LEFT),
     ]
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 class='title'>A Title</h1>\n"
     )
 
@@ -428,37 +433,37 @@ def testFmtToHtml_ConvertDirect(mockGUI):
 
     # Align Left
     html._blocks = [
-        (BlockTyp.HEAD1, 1, "A Title", [], BlockFmt.LEFT),
+        (BlockTyp.HEAD1, tMeta, "A Title", [], BlockFmt.LEFT),
     ]
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 class='title' style='text-align: left;'>A Title</h1>\n"
     )
 
     # Align Right
     html._blocks = [
-        (BlockTyp.HEAD1, 1, "A Title", [], BlockFmt.RIGHT),
+        (BlockTyp.HEAD1, tMeta, "A Title", [], BlockFmt.RIGHT),
     ]
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 class='title' style='text-align: right;'>A Title</h1>\n"
     )
 
     # Align Centre
     html._blocks = [
-        (BlockTyp.HEAD1, 1, "A Title", [], BlockFmt.CENTRE),
+        (BlockTyp.HEAD1, tMeta, "A Title", [], BlockFmt.CENTRE),
     ]
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 class='title' style='text-align: center;'>A Title</h1>\n"
     )
 
     # Align Justify
     html._blocks = [
-        (BlockTyp.HEAD1, 1, "A Title", [], BlockFmt.JUSTIFY),
+        (BlockTyp.HEAD1, tMeta, "A Title", [], BlockFmt.JUSTIFY),
     ]
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 class='title' style='text-align: justify;'>A Title</h1>\n"
     )
 
@@ -467,10 +472,10 @@ def testFmtToHtml_ConvertDirect(mockGUI):
 
     # Page Break Always
     html._blocks = [
-        (BlockTyp.HEAD1, 1, "A Title", [], BlockFmt.PBB | BlockFmt.PBA),
+        (BlockTyp.HEAD1, tMeta, "A Title", [], BlockFmt.PBB | BlockFmt.PBA),
     ]
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 class='title' "
         "style='page-break-before: always; page-break-after: always;'>A Title</h1>\n"
     )
@@ -480,28 +485,28 @@ def testFmtToHtml_ConvertDirect(mockGUI):
 
     # Indent Left
     html._blocks = [
-        (BlockTyp.TEXT, 1, "Some text ...", [], BlockFmt.IND_L),
+        (BlockTyp.TEXT, tMeta, "Some text ...", [], BlockFmt.IND_L),
     ]
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p style='margin-left: 4.00em;'>Some text ...</p>\n"
     )
 
     # Indent Right
     html._blocks = [
-        (BlockTyp.TEXT, 1, "Some text ...", [], BlockFmt.IND_R),
+        (BlockTyp.TEXT, tMeta, "Some text ...", [], BlockFmt.IND_R),
     ]
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p style='margin-right: 4.00em;'>Some text ...</p>\n"
     )
 
     # Text Indent
     html._blocks = [
-        (BlockTyp.TEXT, 1, "Some text ...", [], BlockFmt.IND_T),
+        (BlockTyp.TEXT, tMeta, "Some text ...", [], BlockFmt.IND_T),
     ]
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p style='text-indent: 1.40em;'>Some text ...</p>\n"
     )
 
@@ -520,28 +525,28 @@ def testFmtToHtml_SpecialCases(mockGUI):
     html._text = "Text with > and < with some **bold text** in it.\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Text with &gt; and &lt; with some <strong>bold text</strong> in it.</p>\n"
     )
 
     html._text = "Text with some <**bold text**> in it.\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Text with some &lt;<strong>bold text</strong>&gt; in it.</p>\n"
     )
 
     html._text = "Let's > be > _difficult **shall** > we_?\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Let's &gt; be &gt; <em>difficult <strong>shall</strong> &gt; we</em>?</p>\n"
     )
 
     html._text = "Test > text _<**bold**>_ and more.\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Test &gt; text <em>&lt;<strong>bold</strong>&gt;</em> and more.</p>\n"
     )
 
@@ -553,9 +558,9 @@ def testFmtToHtml_SpecialCases(mockGUI):
     html._text = "% Test > text _<**bold**>_ and more.\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p class='comment'>"
-        "<strong><span style='color: #646464'>Comment:</strong></span> "
+        "<strong><span style='color: #646464'>Comment:</span></strong> "
         "<span style='color: #646464'>Test &gt; text <em>&lt;<strong>bold</strong>&gt;</em> "
         "and more.</span>"
         "</p>\n"
@@ -565,7 +570,7 @@ def testFmtToHtml_SpecialCases(mockGUI):
     html._text = "## Heading <1>\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<h1 style='page-break-before: always;'>Heading &lt;1&gt;</h1>\n"
     )
 
@@ -576,7 +581,7 @@ def testFmtToHtml_SpecialCases(mockGUI):
     html._text = "Test text \\**_bold_** and more.\n"
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Test text **<em>bold</em>** and more.</p>\n"
     )
 
@@ -629,9 +634,8 @@ def testFmtToHtml_Save(mockGUI, fncPath):
         html.doPreProcessing()
         html.tokenizeText()
         html.doConvert()
-        assert html.result == resText[i]
 
-    assert html.fullHTML == resText
+    assert html._pages == resText
 
     html.replaceTabs(nSpaces=2, spaceChar="&nbsp;")
     resText[6] = "<h3>A Section</h3>\n<p>&nbsp;&nbsp;More text in scene two.</p>\n"
@@ -692,7 +696,7 @@ def testFmtToHtml_Methods(mockGUI):
     html.doPreProcessing()
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Text with &lt;brackets&gt; &amp; short–dash, long—dash …</p>\n"
     )
 
@@ -703,7 +707,7 @@ def testFmtToHtml_Methods(mockGUI):
     html.doPreProcessing()
     html.tokenizeText()
     html.doConvert()
-    assert html.result == (
+    assert html._pages[-1] == (
         "<p>Text with &lt;brackets&gt; &amp; short&ndash;dash, long&mdash;dash &hellip;</p>\n"
     )
 
diff --git a/tests/test_formats/test_fmt_tokenizer.py b/tests/test_formats/test_fmt_tokenizer.py
index 2b494498..3750af7a 100644
--- a/tests/test_formats/test_fmt_tokenizer.py
+++ b/tests/test_formats/test_fmt_tokenizer.py
@@ -20,8 +20,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-import json
-
 import pytest
 
 from PyQt5.QtGui import QFont
@@ -35,7 +33,11 @@ from novelwriter.formats.tokenizer import COMMENT_STYLE, HeadingFormatter, Token
 from novelwriter.formats.tomarkdown import ToMarkdown
 from novelwriter.formats.toraw import ToRaw
 
-from tests.tools import C, buildTestProject, readFile
+from tests.tools import C, buildTestProject
+
+TMH = "0123456789abc"
+TM1 = f"{TMH}:T0001"
+TM2 = f"{TMH}:T0002"
 
 
 class BareTokenizer(Tokenizer):
@@ -153,8 +155,6 @@ def testFmtToken_Setters(mockGUI):
     assert tokens._doKeywords is True
 
     # Properties
-    assert tokens.result == ""
-    assert tokens.allMarkdown == []
     assert tokens.textStats == {}
     assert tokens.errData == []
 
@@ -207,16 +207,16 @@ def testFmtToken_TextOps(monkeypatch, mockGUI, mockRnd, fncPath):
 
     # First Page
     tokens.addRootHeading(C.hPlotRoot)
-    assert tokens.allMarkdown[-1] == "#! Notes: Plot\n\n"
+    assert tokens._raw[-1] == "#! Notes: Plot\n\n"
     assert tokens._blocks[-1] == (
-        BlockTyp.TITLE, 1, "Notes: Plot", [], BlockFmt.CENTRE
+        BlockTyp.TITLE, "0000000000009:T0001", "Notes: Plot", [], BlockFmt.CENTRE
     )
 
     # Not First Page
     tokens.addRootHeading(C.hPlotRoot)
-    assert tokens.allMarkdown[-1] == "#! Notes: Plot\n\n"
+    assert tokens._raw[-1] == "#! Notes: Plot\n\n"
     assert tokens._blocks[-1] == (
-        BlockTyp.TITLE, 1, "Notes: Plot", [], BlockFmt.CENTRE | BlockFmt.PBB
+        BlockTyp.TITLE, "0000000000009:T0001", "Notes: Plot", [], BlockFmt.CENTRE | BlockFmt.PBB
     )
 
     # Set Text
@@ -235,21 +235,6 @@ def testFmtToken_TextOps(monkeypatch, mockGUI, mockRnd, fncPath):
     tokens.doPreProcessing()
     assert tokens._text == docTextR
 
-    # Save File
-    savePath = fncPath / "dump.nwd"
-    tokens.saveRawDocument(savePath, asJson=False)
-    assert readFile(savePath) == (
-        "#! Notes: Plot\n\n"
-        "#! Notes: Plot\n\n"
-    )
-    tokens.saveRawDocument(savePath, asJson=True)
-    assert json.loads(readFile(savePath))["text"] == {
-        "nwd": [
-            ["#! Notes: Plot"],
-            ["#! Notes: Plot"]
-        ]
-    }
-
 
 @pytest.mark.core
 def testFmtToken_StripEscape():
@@ -265,6 +250,7 @@ def testFmtToken_HeaderFormat(mockGUI):
     """Test the tokenization of header formats in the Tokenizer class."""
     project = NWProject()
     tokens = ToRaw(project)
+    tokens._handle = TMH
 
     # Title
     # =====
@@ -276,9 +262,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.TITLE, 1, "Novel Title", [], BlockFmt.CENTRE),
+        (BlockTyp.TITLE, TM1, "Novel Title", [], BlockFmt.CENTRE),
     ]
-    assert tokens.allMarkdown[-1] == "#! Novel Title\n\n"
+    assert tokens._raw[-1] == "#! Novel Title\n\n"
 
     # Note File
     tokens._isNovel = False
@@ -287,9 +273,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.TITLE, 1, "Note Title", [], BlockFmt.CENTRE),
+        (BlockTyp.TITLE, TM1, "Note Title", [], BlockFmt.CENTRE),
     ]
-    assert tokens.allMarkdown[-1] == "#! Note Title\n\n"
+    assert tokens._raw[-1] == "#! Note Title\n\n"
 
     # Header 1
     # ========
@@ -301,9 +287,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "Novel Title", [], BlockFmt.CENTRE),
+        (BlockTyp.HEAD1, TM1, "Novel Title", [], BlockFmt.CENTRE),
     ]
-    assert tokens.allMarkdown[-1] == "# Novel Title\n\n"
+    assert tokens._raw[-1] == "# Novel Title\n\n"
 
     # Note File
     tokens._isNovel = False
@@ -312,9 +298,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "Note Title", [], BlockFmt.NONE),
+        (BlockTyp.HEAD1, TM1, "Note Title", [], BlockFmt.NONE),
     ]
-    assert tokens.allMarkdown[-1] == "# Note Title\n\n"
+    assert tokens._raw[-1] == "# Note Title\n\n"
 
     # Header 2
     # ========
@@ -325,9 +311,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD2, 1, "Chapter One", [], BlockFmt.PBB),
+        (BlockTyp.HEAD2, TM1, "Chapter One", [], BlockFmt.PBB),
     ]
-    assert tokens.allMarkdown[-1] == "## Chapter One\n\n"
+    assert tokens._raw[-1] == "## Chapter One\n\n"
 
     # Note File
     tokens._isNovel = False
@@ -335,9 +321,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD2, 1, "Heading 2", [], BlockFmt.NONE),
+        (BlockTyp.HEAD2, TM1, "Heading 2", [], BlockFmt.NONE),
     ]
-    assert tokens.allMarkdown[-1] == "## Heading 2\n\n"
+    assert tokens._raw[-1] == "## Heading 2\n\n"
 
     # Header 3
     # ========
@@ -348,9 +334,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD3, 1, "Scene One", [], BlockFmt.NONE),
+        (BlockTyp.HEAD3, TM1, "Scene One", [], BlockFmt.NONE),
     ]
-    assert tokens.allMarkdown[-1] == "### Scene One\n\n"
+    assert tokens._raw[-1] == "### Scene One\n\n"
 
     # Note File
     tokens._isNovel = False
@@ -358,9 +344,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD3, 1, "Heading 3", [], BlockFmt.NONE),
+        (BlockTyp.HEAD3, TM1, "Heading 3", [], BlockFmt.NONE),
     ]
-    assert tokens.allMarkdown[-1] == "### Heading 3\n\n"
+    assert tokens._raw[-1] == "### Heading 3\n\n"
 
     # Header 4
     # ========
@@ -371,9 +357,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD4, 1, "A Section", [], BlockFmt.NONE),
+        (BlockTyp.HEAD4, TM1, "A Section", [], BlockFmt.NONE),
     ]
-    assert tokens.allMarkdown[-1] == "#### A Section\n\n"
+    assert tokens._raw[-1] == "#### A Section\n\n"
 
     # Note File
     tokens._isNovel = False
@@ -381,9 +367,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD4, 1, "Heading 4", [], BlockFmt.NONE),
+        (BlockTyp.HEAD4, TM1, "Heading 4", [], BlockFmt.NONE),
     ]
-    assert tokens.allMarkdown[-1] == "#### Heading 4\n\n"
+    assert tokens._raw[-1] == "#### Heading 4\n\n"
 
     # Title
     # =====
@@ -395,9 +381,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.TITLE, 1, "Title", [], BlockFmt.PBB | BlockFmt.CENTRE),
+        (BlockTyp.TITLE, TM1, "Title", [], BlockFmt.PBB | BlockFmt.CENTRE),
     ]
-    assert tokens.allMarkdown[-1] == "#! Title\n\n"
+    assert tokens._raw[-1] == "#! Title\n\n"
 
     # Note File
     tokens._isNovel = False
@@ -406,9 +392,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.TITLE, 1, "Title", [], BlockFmt.PBB | BlockFmt.CENTRE),
+        (BlockTyp.TITLE, TM1, "Title", [], BlockFmt.PBB | BlockFmt.CENTRE),
     ]
-    assert tokens.allMarkdown[-1] == "#! Title\n\n"
+    assert tokens._raw[-1] == "#! Title\n\n"
 
     # Unnumbered
     # ==========
@@ -419,9 +405,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD2, 1, "Prologue", [], BlockFmt.PBB),
+        (BlockTyp.HEAD2, TM1, "Prologue", [], BlockFmt.PBB),
     ]
-    assert tokens.allMarkdown[-1] == "##! Prologue\n\n"
+    assert tokens._raw[-1] == "##! Prologue\n\n"
 
     # Note File
     tokens._isNovel = False
@@ -429,9 +415,9 @@ def testFmtToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD2, 1, "Prologue", [], BlockFmt.NONE),
+        (BlockTyp.HEAD2, TM1, "Prologue", [], BlockFmt.NONE),
     ]
-    assert tokens.allMarkdown[-1] == "##! Prologue\n\n"
+    assert tokens._raw[-1] == "##! Prologue\n\n"
 
 
 @pytest.mark.core
@@ -700,120 +686,124 @@ def testFmtToken_MetaFormat(mockGUI):
     """Test the tokenization of meta formats in the Tokenizer class."""
     project = NWProject()
     tokens = ToRaw(project)
+    tokens._handle = TMH
 
     # Ignore Text
     tokens._text = "%~ Some text\n"
     tokens.tokenizeText()
     assert tokens._blocks == []
-    assert tokens.allMarkdown[-1] == "\n"
+    assert tokens._raw[-1] == "\n"
 
     # Comment
     tokens.setComments(False)
     tokens._text = "% A comment\n"
     tokens.tokenizeText()
     assert tokens._blocks == []
-    assert tokens.allMarkdown[-1] == "\n"
+    assert tokens._raw[-1] == "\n"
 
     tokens.setComments(True)
     tokens._text = "% A comment\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.COMMENT, 0, "Comment: A comment", [
-            (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "comment"), (8, TextFmt.B_E, ""),
-            (8, TextFmt.COL_E, ""), (9, TextFmt.COL_B, "comment"), (18, TextFmt.COL_E, ""),
+        BlockTyp.COMMENT, "", "Comment: A comment", [
+            (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "comment"),
+            (8, TextFmt.COL_E, ""), (8, TextFmt.B_E, ""),
+            (9, TextFmt.COL_B, "comment"), (18, TextFmt.COL_E, ""),
         ], BlockFmt.NONE
     )]
-    assert tokens.allMarkdown[-1] == "% A comment\n\n"
+    assert tokens._raw[-1] == "% A comment\n\n"
 
     # Synopsis
     tokens.setSynopsis(False)
     tokens._text = "%synopsis: The synopsis\n"
     tokens.tokenizeText()
     assert tokens._blocks == []
-    assert tokens.allMarkdown[-1] == "\n"
+    assert tokens._raw[-1] == "\n"
 
     tokens.setSynopsis(True)
     tokens._text = "% synopsis: The synopsis\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.COMMENT, 0, "Synopsis: The synopsis", [
-            (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"), (9, TextFmt.B_E, ""),
-            (9, TextFmt.COL_E, ""), (10, TextFmt.COL_B, "synopsis"), (22, TextFmt.COL_E, "")
+        BlockTyp.COMMENT, "", "Synopsis: The synopsis", [
+            (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"),
+            (9, TextFmt.COL_E, ""), (9, TextFmt.B_E, ""),
+            (10, TextFmt.COL_B, "synopsis"), (22, TextFmt.COL_E, "")
         ], BlockFmt.NONE
     )]
-    assert tokens.allMarkdown[-1] == "% synopsis: The synopsis\n\n"
+    assert tokens._raw[-1] == "% synopsis: The synopsis\n\n"
 
     # Short
     tokens.setSynopsis(False)
     tokens._text = "% short: A short description\n"
     tokens.tokenizeText()
     assert tokens._blocks == []
-    assert tokens.allMarkdown[-1] == "\n"
+    assert tokens._raw[-1] == "\n"
 
     tokens.setSynopsis(True)
     tokens._text = "% short: A short description\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.COMMENT, 0, "Short Description: A short description", [
-            (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"), (18, TextFmt.B_E, ""),
-            (18, TextFmt.COL_E, ""), (19, TextFmt.COL_B, "synopsis"), (38, TextFmt.COL_E, ""),
+        BlockTyp.COMMENT, "", "Short Description: A short description", [
+            (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"),
+            (18, TextFmt.COL_E, ""), (18, TextFmt.B_E, ""),
+            (19, TextFmt.COL_B, "synopsis"), (38, TextFmt.COL_E, ""),
         ], BlockFmt.NONE
     )]
-    assert tokens.allMarkdown[-1] == "% short: A short description\n\n"
+    assert tokens._raw[-1] == "% short: A short description\n\n"
 
     # Keyword
     tokens.setKeywords(False)
     tokens._text = "@char: Bod\n"
     tokens.tokenizeText()
     assert tokens._blocks == []
-    assert tokens.allMarkdown[-1] == "\n"
+    assert tokens._raw[-1] == "\n"
 
     tokens.setKeywords(True)
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.KEYWORD, 0, "Characters: Bod", [
+        BlockTyp.KEYWORD, "char", "Characters: Bod", [
             (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "keyword"),
-            (11, TextFmt.B_E, ""), (11, TextFmt.COL_E, ""),
+            (11, TextFmt.COL_E, ""), (11, TextFmt.B_E, ""),
             (12, TextFmt.COL_B, "tag"), (12, TextFmt.HRF_B, "#tag_bod"),
             (15, TextFmt.HRF_E, ""), (15, TextFmt.COL_E, ""),
         ], BlockFmt.NONE
     )]
-    assert tokens.allMarkdown[-1] == "@char: Bod\n\n"
+    assert tokens._raw[-1] == "@char: Bod\n\n"
 
     tokens._text = "@pov: Bod\n@plot: Main\n@location: Europe\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.KEYWORD, 0, "Point of View: Bod", [
+        BlockTyp.KEYWORD, "pov", "Point of View: Bod", [
             (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "keyword"),
-            (14, TextFmt.B_E, ""), (14, TextFmt.COL_E, ""),
+            (14, TextFmt.COL_E, ""), (14, TextFmt.B_E, ""),
             (15, TextFmt.COL_B, "tag"), (15, TextFmt.HRF_B, "#tag_bod"),
             (18, TextFmt.HRF_E, ""), (18, TextFmt.COL_E, ""),
-        ], BlockFmt.Z_BTMMRG
+        ], BlockFmt.Z_BTM
     ), (
-        BlockTyp.KEYWORD, 0, "Plot: Main", [
+        BlockTyp.KEYWORD, "plot", "Plot: Main", [
             (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "keyword"),
-            (5, TextFmt.B_E, ""), (5, TextFmt.COL_E, ""),
+            (5, TextFmt.COL_E, ""), (5, TextFmt.B_E, ""),
             (6, TextFmt.COL_B, "tag"), (6, TextFmt.HRF_B, "#tag_main"),
             (10, TextFmt.HRF_E, ""), (10, TextFmt.COL_E, ""),
-        ], BlockFmt.Z_TOPMRG | BlockFmt.Z_BTMMRG
+        ], BlockFmt.Z_TOP | BlockFmt.Z_BTM
     ), (
-        BlockTyp.KEYWORD, 0, "Locations: Europe", [
+        BlockTyp.KEYWORD, "location", "Locations: Europe", [
             (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "keyword"),
-            (10, TextFmt.B_E, ""), (10, TextFmt.COL_E, ""),
+            (10, TextFmt.COL_E, ""), (10, TextFmt.B_E, ""),
             (11, TextFmt.COL_B, "tag"), (11, TextFmt.HRF_B, "#tag_europe"),
             (17, TextFmt.HRF_E, ""), (17, TextFmt.COL_E, ""),
-        ], BlockFmt.Z_TOPMRG
+        ], BlockFmt.Z_TOP
     )]
-    assert tokens.allMarkdown[-1] == "@pov: Bod\n@plot: Main\n@location: Europe\n\n"
+    assert tokens._raw[-1] == "@pov: Bod\n@plot: Main\n@location: Europe\n\n"
 
     # Ignored keywords
     tokens._text = "@pov: Bod\n@plot: Main\n@location: Europe\n"
     tokens.setIgnoredKeywords("@plot, @location")
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.KEYWORD, 0, "Point of View: Bod", [
+        BlockTyp.KEYWORD, "pov", "Point of View: Bod", [
             (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "keyword"),
-            (14, TextFmt.B_E, ""), (14, TextFmt.COL_E, ""),
+            (14, TextFmt.COL_E, ""), (14, TextFmt.B_E, ""),
             (15, TextFmt.COL_B, "tag"), (15, TextFmt.HRF_B, "#tag_bod"),
             (18, TextFmt.HRF_E, ""), (18, TextFmt.COL_E, ""),
         ], BlockFmt.NONE
@@ -841,16 +831,16 @@ def testFmtToken_MarginFormat(mockGUI):
     )
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.TEXT,  0, "Some regular text", [], BlockFmt.NONE),
-        (BlockTyp.TEXT,  0, "Some left-aligned text", [], BlockFmt.LEFT),
-        (BlockTyp.TEXT,  0, "Some right-aligned text", [], BlockFmt.RIGHT),
-        (BlockTyp.TEXT,  0, "Some centered text", [], BlockFmt.CENTRE),
-        (BlockTyp.TEXT,  0, "Left-indented block", [], BlockFmt.IND_L),
-        (BlockTyp.TEXT,  0, "Right-indented block", [], BlockFmt.IND_R),
-        (BlockTyp.TEXT,  0, "Double-indented block", [], dblIndent),
-        (BlockTyp.TEXT,  0, "Right-indent, right-aligned", [], rIndAlign),
+        (BlockTyp.TEXT, "", "Some regular text", [], BlockFmt.NONE),
+        (BlockTyp.TEXT, "", "Some left-aligned text", [], BlockFmt.LEFT),
+        (BlockTyp.TEXT, "", "Some right-aligned text", [], BlockFmt.RIGHT),
+        (BlockTyp.TEXT, "", "Some centered text", [], BlockFmt.CENTRE),
+        (BlockTyp.TEXT, "", "Left-indented block", [], BlockFmt.IND_L),
+        (BlockTyp.TEXT, "", "Right-indented block", [], BlockFmt.IND_R),
+        (BlockTyp.TEXT, "", "Double-indented block", [], dblIndent),
+        (BlockTyp.TEXT, "", "Right-indent, right-aligned", [], rIndAlign),
     ]
-    assert tokens.allMarkdown[-1] == (
+    assert tokens._raw[-1] == (
         "Some regular text\n\n"
         "Some left-aligned text\n\n"
         "Some right-aligned text\n\n"
@@ -973,13 +963,14 @@ def testFmtToken_Paragraphs(mockGUI):
     """Test the splitting of paragraphs."""
     project = NWProject()
     tokens = BareTokenizer(project)
+    tokens._handle = TMH
 
     # Collapse empty lines
     tokens._text = "First paragraph\n\n\nSecond paragraph\n\n\n"
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.TEXT, 0, "First paragraph", [], BlockFmt.NONE),
-        (BlockTyp.TEXT, 0, "Second paragraph", [], BlockFmt.NONE),
+        (BlockTyp.TEXT, "", "First paragraph", [], BlockFmt.NONE),
+        (BlockTyp.TEXT, "", "Second paragraph", [], BlockFmt.NONE),
     ]
 
     # Combine multi-line paragraphs, keep breaks
@@ -987,7 +978,7 @@ def testFmtToken_Paragraphs(mockGUI):
     tokens.setKeepLineBreaks(True)
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.TEXT, 0, "This is text\nspanning multiple\nlines", [], BlockFmt.NONE),
+        (BlockTyp.TEXT, "", "This is text\nspanning multiple\nlines", [], BlockFmt.NONE),
     ]
 
     # Combine multi-line paragraphs, remove breaks
@@ -995,7 +986,7 @@ def testFmtToken_Paragraphs(mockGUI):
     tokens.setKeepLineBreaks(False)
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.TEXT, 0, "This is text spanning multiple lines", [], BlockFmt.NONE),
+        (BlockTyp.TEXT, "", "This is text spanning multiple lines", [], BlockFmt.NONE),
     ]
 
     # Combine multi-line paragraphs, remove breaks, with formatting
@@ -1004,7 +995,7 @@ def testFmtToken_Paragraphs(mockGUI):
     tokens.tokenizeText()
     assert tokens._blocks == [
         (
-            BlockTyp.TEXT, 0,
+            BlockTyp.TEXT, "",
             "This is text spanning multiple lines",
             [
                 (5,  TextFmt.B_B, ""),
@@ -1021,16 +1012,16 @@ def testFmtToken_Paragraphs(mockGUI):
     tokens.setKeepLineBreaks(False)
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "Title", [], BlockFmt.NONE),
+        (BlockTyp.HEAD1, TM1, "Title", [], BlockFmt.NONE),
         (
-            BlockTyp.TEXT, 1, "Text on two lines.", [
+            BlockTyp.TEXT, "", "Text on two lines.", [
                 (5, TextFmt.I_B, ""),
                 (7, TextFmt.I_E, ""),
             ], BlockFmt.NONE
         ),
-        (BlockTyp.HEAD2, 2, "Chapter", [], BlockFmt.NONE),
+        (BlockTyp.HEAD2, TM2, "Chapter", [], BlockFmt.NONE),
         (
-            BlockTyp.TEXT, 2, "More text here.", [
+            BlockTyp.TEXT, "", "More text here.", [
                 (5,  TextFmt.B_B, ""),
                 (9,  TextFmt.B_E, ""),
                 (10, TextFmt.I_B, ""),
@@ -1045,50 +1036,51 @@ def testFmtToken_TextFormat(mockGUI):
     """Test the tokenization of text formats in the Tokenizer class."""
     project = NWProject()
     tokens = ToRaw(project)
+    tokens._handle = TMH
 
     # Text
     tokens._text = "Some plain text\non two lines\n\n\n"
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.TEXT, 0, "Some plain text\non two lines", [], BlockFmt.NONE),
+        (BlockTyp.TEXT, "", "Some plain text\non two lines", [], BlockFmt.NONE),
     ]
-    assert tokens.allMarkdown[-1] == "Some plain text\non two lines\n\n\n\n"
+    assert tokens._raw[-1] == "Some plain text\non two lines\n\n\n\n"
 
     tokens.setBodyText(False)
     tokens.tokenizeText()
     assert tokens._blocks == []
-    assert tokens.allMarkdown[-1] == "\n\n\n"
+    assert tokens._raw[-1] == "\n\n\n"
     tokens.setBodyText(True)
 
     # Text Emphasis
     tokens._text = "Some **bolded text** on this lines\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.TEXT, 0, "Some bolded text on this lines",
+        BlockTyp.TEXT, "", "Some bolded text on this lines",
         [
             (5,  TextFmt.B_B, ""),
             (16, TextFmt.B_E, ""),
         ],
         BlockFmt.NONE
     )]
-    assert tokens.allMarkdown[-1] == "Some **bolded text** on this lines\n\n"
+    assert tokens._raw[-1] == "Some **bolded text** on this lines\n\n"
 
     tokens._text = "Some _italic text_ on this lines\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.TEXT, 0, "Some italic text on this lines",
+        BlockTyp.TEXT, "", "Some italic text on this lines",
         [
             (5,  TextFmt.I_B, ""),
             (16, TextFmt.I_E, ""),
         ],
         BlockFmt.NONE
     )]
-    assert tokens.allMarkdown[-1] == "Some _italic text_ on this lines\n\n"
+    assert tokens._raw[-1] == "Some _italic text_ on this lines\n\n"
 
     tokens._text = "Some **_bold italic text_** on this lines\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.TEXT, 0, "Some bold italic text on this lines",
+        BlockTyp.TEXT, "", "Some bold italic text on this lines",
         [
             (5,  TextFmt.B_B, ""),
             (5,  TextFmt.I_B, ""),
@@ -1097,24 +1089,24 @@ def testFmtToken_TextFormat(mockGUI):
         ],
         BlockFmt.NONE
     )]
-    assert tokens.allMarkdown[-1] == "Some **_bold italic text_** on this lines\n\n"
+    assert tokens._raw[-1] == "Some **_bold italic text_** on this lines\n\n"
 
     tokens._text = "Some ~~strikethrough text~~ on this lines\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.TEXT, 0, "Some strikethrough text on this lines",
+        BlockTyp.TEXT, "", "Some strikethrough text on this lines",
         [
             (5,  TextFmt.D_B, ""),
             (23, TextFmt.D_E, ""),
         ],
         BlockFmt.NONE
     )]
-    assert tokens.allMarkdown[-1] == "Some ~~strikethrough text~~ on this lines\n\n"
+    assert tokens._raw[-1] == "Some ~~strikethrough text~~ on this lines\n\n"
 
     tokens._text = "Some **nested bold and _italic_ and ~~strikethrough~~ text** here\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.TEXT, 0, "Some nested bold and italic and strikethrough text here",
+        BlockTyp.TEXT, "", "Some nested bold and italic and strikethrough text here",
         [
             (5,  TextFmt.B_B, ""),
             (21, TextFmt.I_B, ""),
@@ -1125,7 +1117,7 @@ def testFmtToken_TextFormat(mockGUI):
         ],
         BlockFmt.NONE
     )]
-    assert tokens.allMarkdown[-1] == (
+    assert tokens._raw[-1] == (
         "Some **nested bold and _italic_ and ~~strikethrough~~ text** here\n\n"
     )
 
@@ -1146,13 +1138,14 @@ def testFmtToken_Dialogue(mockGUI):
     project = NWProject()
     tokens = BareTokenizer(project)
     tokens.setDialogueHighlight(True)
+    tokens._handle = TMH
     tokens._isNovel = True
 
     # Single quotes
     tokens._text = "Text with \u2018dialogue one,\u2019 and \u2018dialogue two.\u2019\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.TEXT, 0,
+        BlockTyp.TEXT, "",
         "Text with \u2018dialogue one,\u2019 and \u2018dialogue two.\u2019",
         [
             (10, TextFmt.COL_B, "dialog"),
@@ -1167,7 +1160,7 @@ def testFmtToken_Dialogue(mockGUI):
     tokens._text = "Text with \u201cdialogue one,\u201d and \u201cdialogue two.\u201d\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.TEXT, 0,
+        BlockTyp.TEXT, "",
         "Text with \u201cdialogue one,\u201d and \u201cdialogue two.\u201d",
         [
             (10, TextFmt.COL_B, "dialog"),
@@ -1182,7 +1175,7 @@ def testFmtToken_Dialogue(mockGUI):
     tokens._text = "Text with ::dialogue one,:: and ::dialogue two.::\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.TEXT, 0,
+        BlockTyp.TEXT, "",
         "Text with ::dialogue one,:: and ::dialogue two.::",
         [
             (10, TextFmt.COL_B, "altdialog"),
@@ -1197,7 +1190,7 @@ def testFmtToken_Dialogue(mockGUI):
     tokens._text = "\u2013 Dialogue with a narrator break, \u2013he said,\u2013 see?\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.TEXT, 0,
+        BlockTyp.TEXT, "",
         "\u2013 Dialogue with a narrator break, \u2013he said,\u2013 see?",
         [
             (0,  TextFmt.COL_B, "dialog"),
@@ -1215,7 +1208,7 @@ def testFmtToken_Dialogue(mockGUI):
     tokens._text = "[i]\u201cDialogue text.\u201d[/i]\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.TEXT, 0,
+        BlockTyp.TEXT, "",
         "\u201cDialogue text.\u201d",
         [
             (0,  TextFmt.I_B, ""),
@@ -1232,15 +1225,15 @@ def testFmtToken_SpecialFormat(mockGUI):
     """Test the tokenization of special formats in the Tokenizer class."""
     project = NWProject()
     tokens = BareTokenizer(project)
-
+    tokens._handle = TMH
     tokens._isNovel = True
 
     # New Page
     # ========
 
     correctResp = [
-        (BlockTyp.HEAD1, 1, "Title One", [], BlockFmt.CENTRE),
-        (BlockTyp.HEAD1, 2, "Title Two", [], BlockFmt.CENTRE | BlockFmt.PBB),
+        (BlockTyp.HEAD1, TM1, "Title One", [], BlockFmt.CENTRE),
+        (BlockTyp.HEAD1, TM2, "Title Two", [], BlockFmt.CENTRE | BlockFmt.PBB),
     ]
 
     # Command wo/Space
@@ -1283,9 +1276,9 @@ def testFmtToken_SpecialFormat(mockGUI):
     )
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
-        (BlockTyp.SKIP,  1, "", [], BlockFmt.NONE),
-        (BlockTyp.TEXT,  1, "Some text to go here ...", [], BlockFmt.NONE),
+        (BlockTyp.HEAD1, TM1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
+        (BlockTyp.SKIP,  "",  "", [], BlockFmt.NONE),
+        (BlockTyp.TEXT,  "",  "Some text to go here ...", [], BlockFmt.NONE),
     ]
 
     # Multiple Empty Paragraphs
@@ -1299,9 +1292,9 @@ def testFmtToken_SpecialFormat(mockGUI):
     )
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
-        (BlockTyp.SKIP,  1, "", [], BlockFmt.NONE),
-        (BlockTyp.TEXT,  1, "Some text to go here ...", [], BlockFmt.NONE),
+        (BlockTyp.HEAD1, TM1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
+        (BlockTyp.SKIP,  "",  "", [], BlockFmt.NONE),
+        (BlockTyp.TEXT,  "",  "Some text to go here ...", [], BlockFmt.NONE),
     ]
 
     # Three Skips
@@ -1312,11 +1305,11 @@ def testFmtToken_SpecialFormat(mockGUI):
     )
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
-        (BlockTyp.SKIP,  1, "", [], BlockFmt.NONE),
-        (BlockTyp.SKIP,  1, "", [], BlockFmt.NONE),
-        (BlockTyp.SKIP,  1, "", [], BlockFmt.NONE),
-        (BlockTyp.TEXT,  1, "Some text to go here ...", [], BlockFmt.NONE),
+        (BlockTyp.HEAD1, TM1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
+        (BlockTyp.SKIP,  "",  "", [], BlockFmt.NONE),
+        (BlockTyp.SKIP,  "",  "", [], BlockFmt.NONE),
+        (BlockTyp.SKIP,  "",  "", [], BlockFmt.NONE),
+        (BlockTyp.TEXT,  "",  "Some text to go here ...", [], BlockFmt.NONE),
     ]
 
     # Malformed Command, Case 1
@@ -1327,8 +1320,8 @@ def testFmtToken_SpecialFormat(mockGUI):
     )
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
-        (BlockTyp.TEXT,  1, "Some text to go here ...", [], BlockFmt.NONE),
+        (BlockTyp.HEAD1, TM1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
+        (BlockTyp.TEXT,  "",  "Some text to go here ...", [], BlockFmt.NONE),
     ]
 
     # Malformed Command, Case 2
@@ -1339,8 +1332,8 @@ def testFmtToken_SpecialFormat(mockGUI):
     )
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
-        (BlockTyp.TEXT,  1, "Some text to go here ...", [], BlockFmt.NONE),
+        (BlockTyp.HEAD1, TM1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
+        (BlockTyp.TEXT,  "",  "Some text to go here ...", [], BlockFmt.NONE),
     ]
 
     # Malformed Command, Case 3
@@ -1351,8 +1344,8 @@ def testFmtToken_SpecialFormat(mockGUI):
     )
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
-        (BlockTyp.TEXT,  1, "Some text to go here ...", [], BlockFmt.NONE),
+        (BlockTyp.HEAD1, TM1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
+        (BlockTyp.TEXT,  "",  "Some text to go here ...", [], BlockFmt.NONE),
     ]
 
     # Empty Paragraph and Page Break
@@ -1367,9 +1360,9 @@ def testFmtToken_SpecialFormat(mockGUI):
     )
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
-        (BlockTyp.SKIP,  1, "", [], BlockFmt.PBB),
-        (BlockTyp.TEXT,  1, "Some text to go here ...", [], BlockFmt.NONE),
+        (BlockTyp.HEAD1, TM1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
+        (BlockTyp.SKIP,  "",  "", [], BlockFmt.PBB),
+        (BlockTyp.TEXT,  "",  "Some text to go here ...", [], BlockFmt.NONE),
     ]
 
     # Multiple Skip
@@ -1381,11 +1374,11 @@ def testFmtToken_SpecialFormat(mockGUI):
     )
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
-        (BlockTyp.SKIP,  1, "", [], BlockFmt.PBB),
-        (BlockTyp.SKIP,  1, "", [], BlockFmt.NONE),
-        (BlockTyp.SKIP,  1, "", [], BlockFmt.NONE),
-        (BlockTyp.TEXT,  1, "Some text to go here ...", [], BlockFmt.NONE),
+        (BlockTyp.HEAD1, TM1, "Title One", [], BlockFmt.PBB | BlockFmt.CENTRE),
+        (BlockTyp.SKIP,  "",  "", [], BlockFmt.PBB),
+        (BlockTyp.SKIP,  "",  "", [], BlockFmt.NONE),
+        (BlockTyp.SKIP,  "",  "", [], BlockFmt.NONE),
+        (BlockTyp.TEXT,  "",  "Some text to go here ...", [], BlockFmt.NONE),
     ]
 
 
@@ -1395,6 +1388,7 @@ def testFmtToken_TextIndent(mockGUI):
     project = NWProject()
     tokens = BareTokenizer(project)
     tokens.setSynopsis(True)
+    tokens._handle = TMH
 
     # No First Indent
     tokens.setFirstLineIndent(True, 1.0, False)
@@ -1414,10 +1408,10 @@ def testFmtToken_TextIndent(mockGUI):
     )
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "Title One", [], BlockFmt.NONE),
-        (BlockTyp.HEAD3, 2, "Scene One", [], BlockFmt.NONE),
-        (BlockTyp.TEXT,  2, "First paragraph.", [], BlockFmt.NONE),
-        (BlockTyp.TEXT,  2, "Second paragraph.", [], BlockFmt.IND_T),
+        (BlockTyp.HEAD1, TM1, "Title One", [], BlockFmt.NONE),
+        (BlockTyp.HEAD3, TM2, "Scene One", [], BlockFmt.NONE),
+        (BlockTyp.TEXT,  "",  "First paragraph.", [], BlockFmt.NONE),
+        (BlockTyp.TEXT,  "",  "Second paragraph.", [], BlockFmt.IND_T),
     ]
     assert tokens._noIndent is False
 
@@ -1429,12 +1423,12 @@ def testFmtToken_TextIndent(mockGUI):
     )
     tokens.tokenizeText()
     tFmt = [
-        (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"), (9, TextFmt.B_E, ""),
-        (9, TextFmt.COL_E, ""), (10, TextFmt.COL_B, "synopsis"), (24, TextFmt.COL_E, ""),
+        (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"), (9, TextFmt.COL_E, ""),
+        (9, TextFmt.B_E, ""), (10, TextFmt.COL_B, "synopsis"), (24, TextFmt.COL_E, ""),
     ]
     assert tokens._blocks == [
-        (BlockTyp.HEAD3,   1, "Scene Two", [], BlockFmt.NONE),
-        (BlockTyp.COMMENT, 1, "Synopsis: Stuff happens.", tFmt, BlockFmt.NONE),
+        (BlockTyp.HEAD3,   TM1, "Scene Two", [], BlockFmt.NONE),
+        (BlockTyp.COMMENT, "",  "Synopsis: Stuff happens.", tFmt, BlockFmt.NONE),
     ]
     assert tokens._noIndent is True
 
@@ -1446,8 +1440,8 @@ def testFmtToken_TextIndent(mockGUI):
     )
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.TEXT, 0, "First paragraph.", [], BlockFmt.NONE),
-        (BlockTyp.TEXT, 0, "Second paragraph.", [], BlockFmt.IND_T),
+        (BlockTyp.TEXT, "", "First paragraph.", [], BlockFmt.NONE),
+        (BlockTyp.TEXT, "", "Second paragraph.", [], BlockFmt.IND_T),
     ]
     assert tokens._noIndent is False
 
@@ -1469,10 +1463,10 @@ def testFmtToken_TextIndent(mockGUI):
     )
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "Title One", [], BlockFmt.NONE),
-        (BlockTyp.HEAD3, 2, "Scene One", [], BlockFmt.NONE),
-        (BlockTyp.TEXT,  2, "First paragraph.", [], BlockFmt.IND_T),
-        (BlockTyp.TEXT,  2, "Second paragraph.", [], BlockFmt.IND_T),
+        (BlockTyp.HEAD1, TM1, "Title One", [], BlockFmt.NONE),
+        (BlockTyp.HEAD3, TM2, "Scene One", [], BlockFmt.NONE),
+        (BlockTyp.TEXT,  "",  "First paragraph.", [], BlockFmt.IND_T),
+        (BlockTyp.TEXT,  "",  "Second paragraph.", [], BlockFmt.IND_T),
     ]
     assert tokens._noIndent is False
 
@@ -1485,6 +1479,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     project._loadProjectLocalisation()
     tokens = BareTokenizer(project)
     tokens._isNovel = True
+    tokens._handle = TMH
 
     # Titles
     # ======
@@ -1495,7 +1490,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens.setPartitionFormat(f"T: {nwHeadFmt.TITLE}")
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "T: Part One", [], BlockFmt.CENTRE),
+        (BlockTyp.HEAD1, TM1, "T: Part One", [], BlockFmt.CENTRE),
     ]
 
     # H1: Title, Not First Page
@@ -1504,7 +1499,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens.setPartitionFormat(f"T: {nwHeadFmt.TITLE}")
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD1, 1, "T: Part One", [], BlockFmt.PBB | BlockFmt.CENTRE),
+        (BlockTyp.HEAD1, TM1, "T: Part One", [], BlockFmt.PBB | BlockFmt.CENTRE),
     ]
 
     # Chapters
@@ -1515,7 +1510,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens.setChapterFormat(f"C: {nwHeadFmt.TITLE}")
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD2, 1, "C: Chapter One", [], BlockFmt.PBB),
+        (BlockTyp.HEAD2, TM1, "C: Chapter One", [], BlockFmt.PBB),
     ]
 
     # H2: Unnumbered Chapter
@@ -1523,7 +1518,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens.setUnNumberedFormat(f"U: {nwHeadFmt.TITLE}")
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD2, 1, "U: Prologue", [], BlockFmt.PBB),
+        (BlockTyp.HEAD2, TM1, "U: Prologue", [], BlockFmt.PBB),
     ]
 
     # H2: Chapter Word Number
@@ -1532,7 +1527,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens._hFormatter._chCount = 0
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD2, 1, "Chapter One", [], BlockFmt.PBB),
+        (BlockTyp.HEAD2, TM1, "Chapter One", [], BlockFmt.PBB),
     ]
 
     # H2: Chapter Roman Number Upper Case
@@ -1540,7 +1535,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens.setChapterFormat(f"Chapter {nwHeadFmt.CH_ROMU}")
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD2, 1, "Chapter II", [], BlockFmt.PBB),
+        (BlockTyp.HEAD2, TM1, "Chapter II", [], BlockFmt.PBB),
     ]
 
     # H2: Chapter Roman Number Lower Case
@@ -1548,7 +1543,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens.setChapterFormat(f"Chapter {nwHeadFmt.CH_ROML}")
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD2, 1, "Chapter iii", [], BlockFmt.PBB),
+        (BlockTyp.HEAD2, TM1, "Chapter iii", [], BlockFmt.PBB),
     ]
 
     # Scenes
@@ -1559,7 +1554,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens.setSceneFormat(f"S: {nwHeadFmt.TITLE}", False)
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD3, 1, "S: Scene One", [], BlockFmt.NONE),
+        (BlockTyp.HEAD3, TM1, "S: Scene One", [], BlockFmt.NONE),
     ]
 
     # H3: Scene Hidden wo/Format
@@ -1581,7 +1576,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens._noSep = False
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.SKIP, 1, "", [], BlockFmt.NONE),
+        (BlockTyp.SKIP, TM1, "", [], BlockFmt.NONE),
     ]
 
     # H3: Scene Separator, first
@@ -1597,7 +1592,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens._noSep = False
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.SEP, 1, "* * *", [], BlockFmt.CENTRE),
+        (BlockTyp.SEP, TM1, "* * *", [], BlockFmt.CENTRE),
     ]
 
     # H3: Scene w/Absolute Number
@@ -1607,7 +1602,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens._hFormatter._scChCount = 0
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD3, 1, "Scene 1", [], BlockFmt.NONE),
+        (BlockTyp.HEAD3, TM1, "Scene 1", [], BlockFmt.NONE),
     ]
 
     # H3: Scene w/Chapter Number
@@ -1617,7 +1612,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens._hFormatter._scChCount = 1
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD3, 1, "Scene 3.2", [], BlockFmt.NONE),
+        (BlockTyp.HEAD3, TM1, "Scene 3.2", [], BlockFmt.NONE),
     ]
 
     # Sections
@@ -1634,7 +1629,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens.setSectionFormat("", False)
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.SKIP, 1, "", [], BlockFmt.NONE),
+        (BlockTyp.SKIP, TM1, "", [], BlockFmt.NONE),
     ]
 
     # H4: Section w/Format
@@ -1642,7 +1637,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens.setSectionFormat(f"X: {nwHeadFmt.TITLE}", False)
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.HEAD4, 1, "X: A Section", [], BlockFmt.NONE),
+        (BlockTyp.HEAD4, TM1, "X: A Section", [], BlockFmt.NONE),
     ]
 
     # H4: Section Separator
@@ -1650,7 +1645,7 @@ def testFmtToken_ProcessHeaders(mockGUI):
     tokens.setSectionFormat("* * *", False)
     tokens.tokenizeText()
     assert tokens._blocks == [
-        (BlockTyp.SEP, 1, "* * *", [], BlockFmt.CENTRE),
+        (BlockTyp.SEP, TM1, "* * *", [], BlockFmt.CENTRE),
     ]
 
     # Check the first scene detector, plain text
@@ -1679,7 +1674,7 @@ def testFmtToken_FormatComment(mockGUI):
     assert tokens._formatComment(style, "", "Hello world!") == (
         "Comment: Hello world!", [
             (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "comment"),
-            (8, TextFmt.B_E, ""), (8, TextFmt.COL_E, ""),
+            (8, TextFmt.COL_E, ""), (8, TextFmt.B_E, ""),
             (9, TextFmt.COL_B, "comment"), (21, TextFmt.COL_E, ""),
         ]
     )
@@ -1689,7 +1684,7 @@ def testFmtToken_FormatComment(mockGUI):
     assert tokens._formatComment(style, "", "Hello world!") == (
         "Synopsis: Hello world!", [
             (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"),
-            (9, TextFmt.B_E, ""), (9, TextFmt.COL_E, ""),
+            (9, TextFmt.COL_E, ""), (9, TextFmt.B_E, ""),
             (10, TextFmt.COL_B, "synopsis"), (22, TextFmt.COL_E, ""),
         ]
     )
@@ -1704,9 +1699,9 @@ def testFmtToken_FormatMeta(mockGUI):
     tokens = BareTokenizer(project)
 
     assert tokens._formatMeta("@tag: Jane | Jane Smith") == (
-        "Tag: Jane | Jane Smith", [
+        "@tag", "Tag: Jane | Jane Smith", [
             (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "keyword"),
-            (4, TextFmt.B_E, ""), (4, TextFmt.COL_E, ""),
+            (4, TextFmt.COL_E, ""), (4, TextFmt.B_E, ""),
             (5, TextFmt.COL_B, "tag"), (5, TextFmt.ANM_B, "tag_jane"),
             (9, TextFmt.ANM_E, ""), (9, TextFmt.COL_E, ""),
             (12, TextFmt.COL_B, "optional"), (22, TextFmt.COL_E, ""),
@@ -1714,9 +1709,9 @@ def testFmtToken_FormatMeta(mockGUI):
     )
 
     assert tokens._formatMeta("@char: Jane, John") == (
-        "Characters: Jane, John", [
+        "@char", "Characters: Jane, John", [
             (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "keyword"),
-            (11, TextFmt.B_E, ""), (11, TextFmt.COL_E, ""),
+            (11, TextFmt.COL_E, ""), (11, TextFmt.B_E, ""),
             (12, TextFmt.COL_B, "tag"), (12, TextFmt.HRF_B, "#tag_jane"),
             (16, TextFmt.HRF_E, ""), (16, TextFmt.COL_E, ""),
             (18, TextFmt.COL_B, "tag"), (18, TextFmt.HRF_B, "#tag_john"),
@@ -2018,7 +2013,7 @@ def testFmtToken_SceneSeparators(mockGUI):
     md.setHardSceneFormat("* * *", False)
     md.tokenizeText()
     md.doConvert()
-    assert md.result == (
+    assert md._pages[-1] == (
         "# T: Title One\n\n"
         "Text\n\n"
         "~\n\n"
@@ -2034,7 +2029,7 @@ def testFmtToken_SceneSeparators(mockGUI):
     md.setHardSceneFormat(f"H: {nwHeadFmt.TITLE}", False)
     md.tokenizeText()
     md.doConvert()
-    assert md.result == (
+    assert md._pages[-1] == (
         "# T: Title One\n\n"
         "### S: Scene One\n\n"
         "Text\n\n"
@@ -2072,7 +2067,7 @@ def testFmtToken_SceneSeparators(mockGUI):
     md.setHardSceneFormat("* * *", False)
     md.tokenizeText()
     md.doConvert()
-    assert md.result == (
+    assert md._pages[-1] == (
         "# T: Title One\n\n"
         "## C: Chapter One\n\n"
         "Text\n\n"
@@ -2089,7 +2084,7 @@ def testFmtToken_SceneSeparators(mockGUI):
     md.setHardSceneFormat(f"H: {nwHeadFmt.TITLE}", False)
     md.tokenizeText()
     md.doConvert()
-    assert md.result == (
+    assert md._pages[-1] == (
         "# T: Title One\n\n"
         "## C: Chapter One\n\n"
         "### S: Scene One\n\n"
@@ -2124,7 +2119,7 @@ def testFmtToken_SceneSeparators(mockGUI):
     md.setHardSceneFormat("* * *", False)
     md.tokenizeText()
     md.doConvert()
-    assert md.result == (
+    assert md._pages[-1] == (
         "Text\n\n"
         "\u205f\n\n"
         "Text\n\n"
@@ -2176,7 +2171,7 @@ def testFmtToken_HeaderVisibility(mockGUI):
 
     md.tokenizeText()
     md.doConvert()
-    assert md.result == (
+    assert md._pages[-1] == (
         "# Novel\n\n"
         "# Title One\n\n"
         "## Prologue\n\n"
@@ -2204,7 +2199,7 @@ def testFmtToken_HeaderVisibility(mockGUI):
 
     md.tokenizeText()
     md.doConvert()
-    assert md.result == (
+    assert md._pages[-1] == (
         "# Novel\n\n"
         "Text\n\n"
         "Text\n\n"
@@ -2228,7 +2223,7 @@ def testFmtToken_HeaderVisibility(mockGUI):
 
     md.tokenizeText()
     md.doConvert()
-    assert md.result == (
+    assert md._pages[-1] == (
         "# Novel\n\n"
         "# Title One\n\n"
         "## Prologue\n\n"
@@ -2302,7 +2297,7 @@ def testFmtToken_CounterHandling(mockGUI):
     # Two Novel Format
     md.tokenizeText()
     md.doConvert()
-    assert md.result == (
+    assert md._pages[-1] == (
         "# Novel One\n\n"
         "## U: Prologue\n\n"
         "Text\n\n"
diff --git a/tests/test_formats/test_fmt_tomarkdown.py b/tests/test_formats/test_fmt_tomarkdown.py
index 6d9a2e35..ad0633ae 100644
--- a/tests/test_formats/test_fmt_tomarkdown.py
+++ b/tests/test_formats/test_fmt_tomarkdown.py
@@ -31,161 +31,161 @@ from novelwriter.formats.tomarkdown import ToMarkdown
 def testFmtToMarkdown_ConvertHeaders(mockGUI):
     """Test header formats in the ToMarkdown class."""
     project = NWProject()
-    toMD = ToMarkdown(project, False)
+    md = ToMarkdown(project, False)
 
-    toMD._isNovel = True
-    toMD._isFirst = True
+    md._isNovel = True
+    md._isFirst = True
 
     # Header 1
-    toMD._text = "# Partition\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == "# Partition\n\n"
+    md._text = "# Partition\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == "# Partition\n\n"
 
     # Header 2
-    toMD._text = "## Chapter Title\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == "## Chapter Title\n\n"
+    md._text = "## Chapter Title\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == "## Chapter Title\n\n"
 
     # Header 3
-    toMD._text = "### Scene Title\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == "### Scene Title\n\n"
+    md._text = "### Scene Title\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == "### Scene Title\n\n"
 
     # Header 4
-    toMD._text = "#### Section Title\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == "#### Section Title\n\n"
+    md._text = "#### Section Title\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == "#### Section Title\n\n"
 
     # Title
-    toMD._text = "#! Title\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == "# Title\n\n"
+    md._text = "#! Title\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == "# Title\n\n"
 
     # Unnumbered
-    toMD._text = "##! Prologue\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == "## Prologue\n\n"
+    md._text = "##! Prologue\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == "## Prologue\n\n"
 
 
 @pytest.mark.core
 def testFmtToMarkdown_ConvertParagraphs(mockGUI):
     """Test paragraph formats in the ToMarkdown class."""
     project = NWProject()
-    toMD = ToMarkdown(project, False)
+    md = ToMarkdown(project, False)
 
-    toMD._isNovel = True
-    toMD._isFirst = True
+    md._isNovel = True
+    md._isFirst = True
 
     # Text for Extended Markdown
-    toMD._extended = True
-    toMD._text = "Some **nested bold and _italic_ and ~~strikethrough~~ text** here\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == (
+    md._extended = True
+    md._text = "Some **nested bold and _italic_ and ~~strikethrough~~ text** here\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == (
         "Some **nested bold and _italic_ and ~~strikethrough~~ text** here\n\n"
     )
 
     # Text for Standard Markdown
-    toMD._extended = False
-    toMD._text = "Some **nested bold and _italic_ and ~~strikethrough~~ text** here\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == (
+    md._extended = False
+    md._text = "Some **nested bold and _italic_ and ~~strikethrough~~ text** here\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == (
         "Some **nested bold and _italic_ and strikethrough text** here\n\n"
     )
 
     # Shortcodes for Extended Markdown
-    toMD._extended = True
-    toMD._text = (
+    md._extended = True
+    md._text = (
         "Some [b]bold[/b], [i]italic[/i], [s]strike[/s], [u]underline[/u], [m]mark[/m], "
         "super[sup]script[/sup], sub[sub]script[/sub] here\n"
     )
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == (
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == (
         "Some **bold**, _italic_, ~~strike~~, underline, ==mark==, "
         "super^script^, sub~script~ here\n\n"
     )
 
     # Shortcodes for Standard Markdown
-    toMD._extended = False
-    toMD._text = (
+    md._extended = False
+    md._text = (
         "Some [b]bold[/b], [i]italic[/i], [s]strike[/s], [u]underline[/u], [m]mark[/m], "
         "super[sup]script[/sup], sub[sub]script[/sub] here\n"
     )
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == (
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == (
         "Some **bold**, _italic_, strike, underline, mark, superscript, subscript here\n\n"
     )
 
     # Text w/Hard Break
-    toMD._text = "Line one\nLine two\nLine three\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == "Line one  \nLine two  \nLine three\n\n"
+    md._text = "Line one\nLine two\nLine three\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == "Line one  \nLine two  \nLine three\n\n"
 
     # Text wo/Hard Break
-    toMD._text = "Line one\nLine two\nLine three\n"
-    toMD.setKeepLineBreaks(False)
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == "Line one Line two Line three\n\n"
+    md._text = "Line one\nLine two\nLine three\n"
+    md.setKeepLineBreaks(False)
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == "Line one Line two Line three\n\n"
 
     # Synopsis, Short
-    toMD._text = "%synopsis: The synopsis ...\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == ""
+    md._text = "%synopsis: The synopsis ...\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == ""
 
-    toMD.setSynopsis(True)
-    toMD._text = "%synopsis: The synopsis ...\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == "**Synopsis:** The synopsis ...\n\n"
+    md.setSynopsis(True)
+    md._text = "%synopsis: The synopsis ...\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == "**Synopsis:** The synopsis ...\n\n"
 
-    toMD.setSynopsis(True)
-    toMD._text = "%short: A description ...\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == "**Short Description:** A description ...\n\n"
+    md.setSynopsis(True)
+    md._text = "%short: A description ...\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == "**Short Description:** A description ...\n\n"
 
     # Comment
-    toMD._text = "% A comment ...\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == ""
+    md._text = "% A comment ...\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == ""
 
-    toMD.setComments(True)
-    toMD._text = "% A comment ...\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == "**Comment:** A comment ...\n\n"
+    md.setComments(True)
+    md._text = "% A comment ...\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == "**Comment:** A comment ...\n\n"
 
     # Keywords
-    toMD._text = "@char: Bod, Jane\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == ""
+    md._text = "@char: Bod, Jane\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == ""
 
-    toMD.setKeywords(True)
-    toMD._text = "@char: Bod, Jane\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == "**Characters:** Bod, Jane\n\n"
+    md.setKeywords(True)
+    md._text = "@char: Bod, Jane\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == "**Characters:** Bod, Jane\n\n"
 
     # Multiple Keywords
-    toMD.setKeywords(True)
-    toMD._text = "## Chapter\n\n@pov: Bod\n@plot: Main\n@location: Europe\n\n"
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == (
+    md.setKeywords(True)
+    md._text = "## Chapter\n\n@pov: Bod\n@plot: Main\n@location: Europe\n\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == (
         "## Chapter\n\n"
         "**Point of View:** Bod  \n"
         "**Plot:** Main  \n"
@@ -193,17 +193,19 @@ def testFmtToMarkdown_ConvertParagraphs(mockGUI):
     )
 
     # Footnotes
-    toMD._text = (
+    md._text = (
         "Text with one[footnote:fa] or two[footnote:fb] footnotes.\n\n"
         "%footnote.fa: Footnote text A.\n\n"
     )
-    toMD.tokenizeText()
-    toMD.doConvert()
-    assert toMD.result == "Text with one[1] or two[ERR] footnotes.\n\n"
+    md.tokenizeText()
+    md.doConvert()
+    assert md._pages[-1] == "Text with one[1] or two[ERR] footnotes.\n\n"
 
-    toMD.appendFootnotes()
-    assert toMD.result == (
+    md.appendFootnotes()
+    assert md._pages[-2] == (
         "Text with one[1] or two[ERR] footnotes.\n\n"
+    )
+    assert md._pages[-1] == (
         "### Footnotes\n\n"
         "1. Footnote text A.\n\n"
     )
@@ -213,43 +215,43 @@ def testFmtToMarkdown_ConvertParagraphs(mockGUI):
 def testFmtToMarkdown_ConvertDirect(mockGUI):
     """Test the converter directly using the ToMarkdown class."""
     project = NWProject()
-    toMD = ToMarkdown(project, False)
-    toMD._isNovel = True
+    md = ToMarkdown(project, False)
+    md._isNovel = True
 
     # Special Titles
     # ==============
 
     # Title
-    toMD._blocks = [
-        (BlockTyp.TITLE, 1, "A Title", [], BlockFmt.PBB | BlockFmt.CENTRE),
+    md._blocks = [
+        (BlockTyp.TITLE, "", "A Title", [], BlockFmt.PBB | BlockFmt.CENTRE),
     ]
-    toMD.doConvert()
-    assert toMD.result == "# A Title\n\n"
+    md.doConvert()
+    assert md._pages[-1] == "# A Title\n\n"
 
     # Separators
     # ==========
 
     # Separator
-    toMD._blocks = [
-        (BlockTyp.SEP, 1, "* * *", [], BlockFmt.CENTRE),
+    md._blocks = [
+        (BlockTyp.SEP, "", "* * *", [], BlockFmt.CENTRE),
     ]
-    toMD.doConvert()
-    assert toMD.result == "* * *\n\n"
+    md.doConvert()
+    assert md._pages[-1] == "* * *\n\n"
 
     # Skip
-    toMD._blocks = [
-        (BlockTyp.SKIP, 1, "", [], BlockFmt.NONE),
+    md._blocks = [
+        (BlockTyp.SKIP, "", "", [], BlockFmt.NONE),
     ]
-    toMD.doConvert()
-    assert toMD.result == "\n\n"
+    md.doConvert()
+    assert md._pages[-1] == "\n\n"
 
 
 @pytest.mark.core
 def testFmtToMarkdown_Save(mockGUI, fncPath):
     """Test the save method of the ToMarkdown class."""
     project = NWProject()
-    toMD = ToMarkdown(project, False)
-    toMD._isNovel = True
+    md = ToMarkdown(project, False)
+    md._isNovel = True
 
     # Build Project
     # =============
@@ -274,22 +276,21 @@ def testFmtToMarkdown_Save(mockGUI, fncPath):
     ]
 
     for i in range(len(docText)):
-        toMD._text = docText[i]
-        toMD.doPreProcessing()
-        toMD.tokenizeText()
-        toMD.doConvert()
-        assert toMD.result == resText[i]
+        md._text = docText[i]
+        md.doPreProcessing()
+        md.tokenizeText()
+        md.doConvert()
 
-    assert toMD.fullMD == resText
-    assert toMD.getFullResultSize() == len("".join(resText))
+    assert md._pages == resText
+    assert md.getFullResultSize() == len("".join(resText))
 
-    toMD.replaceTabs(nSpaces=4, spaceChar=" ")
+    md.replaceTabs(nSpaces=4, spaceChar=" ")
     resText[6] = "#### A Section\n\n    More text in scene two.\n\n"
-    assert toMD.fullMD == resText
+    assert md._pages == resText
 
     # Check File
     # ==========
 
     saveFile = fncPath / "outFile.md"
-    toMD.saveDocument(saveFile)
+    md.saveDocument(saveFile)
     assert saveFile.read_text(encoding="utf-8") == "".join(resText)
diff --git a/tests/test_formats/test_fmt_toodt.py b/tests/test_formats/test_fmt_toodt.py
index ba7946b6..0da42138 100644
--- a/tests/test_formats/test_fmt_toodt.py
+++ b/tests/test_formats/test_fmt_toodt.py
@@ -724,7 +724,7 @@ def testFmtToOdt_ConvertDirect(mockGUI):
     # Justified
     doc = ToOdt(project, isFlat=True)
     doc._blocks = [
-        (BlockTyp.TEXT, 1, "This is a paragraph", [], BlockFmt.JUSTIFY),
+        (BlockTyp.TEXT, "", "This is a paragraph", [], BlockFmt.JUSTIFY),
     ]
     doc.initDocument()
     doc.doConvert()
@@ -744,7 +744,7 @@ def testFmtToOdt_ConvertDirect(mockGUI):
     # Page Break After
     doc = ToOdt(project, isFlat=True)
     doc._blocks = [
-        (BlockTyp.TEXT, 1, "This is a paragraph", [], BlockFmt.PBA),
+        (BlockTyp.TEXT, "", "This is a paragraph", [], BlockFmt.PBA),
     ]
     doc.initDocument()
     doc.doConvert()
@@ -951,8 +951,6 @@ def testFmtToOdt_ODTParagraphStyle():
     assert parStyle._pAttr["text-indent"]   == ["fo", None]
     assert parStyle._pAttr["line-height"]   == ["fo", None]
 
-    assert parStyle.isUnaligned() is True
-
     parStyle.setMarginTop("0.000cm")
     parStyle.setMarginBottom("0.000cm")
     parStyle.setMarginLeft("0.000cm")
@@ -967,8 +965,6 @@ def testFmtToOdt_ODTParagraphStyle():
     assert parStyle._pAttr["text-indent"]   == ["fo", "0.000cm"]
     assert parStyle._pAttr["line-height"]   == ["fo", "1.15"]
 
-    assert parStyle.isUnaligned() is False
-
     # Text Alignment
     assert parStyle._pAttr["text-align"] == ["fo", None]
     parStyle.setTextAlign("stuff")
diff --git a/tests/test_formats/test_fmt_toqdoc.py b/tests/test_formats/test_fmt_toqdoc.py
index 48c3b6cb..ce2a2060 100644
--- a/tests/test_formats/test_fmt_toqdoc.py
+++ b/tests/test_formats/test_fmt_toqdoc.py
@@ -410,8 +410,8 @@ def testFmtToQTextDocument_TextBlockFormats(mockGUI):
     doc.document.clear()
 
     doc._blocks = [
-        (BlockTyp.TEXT, 1, "This is justified", [], BlockFmt.JUSTIFY),
-        (BlockTyp.TEXT, 1, "This has a page break", [], BlockFmt.PBA),
+        (BlockTyp.TEXT, "", "This is justified", [], BlockFmt.JUSTIFY),
+        (BlockTyp.TEXT, "", "This has a page break", [], BlockFmt.PBA),
     ]
     doc.doConvert()
     assert doc.document.blockCount() == 2